chore(pi): organize mode implementations

Author: Bill Leoutsakos

apps/sim/blocks/blocks/pi.test.ts

@@ -18,7 +18,7 @@ vi.mock('@/lib/core/config/env', async (importOriginal) => {
 
 import { evaluateSubBlockCondition } from '@/lib/workflows/subblocks/visibility'
 import { PiBlock } from '@/blocks/blocks/pi'
-import { PI_SEARCH_PROVIDERS } from '@/executor/handlers/pi/keys'
+import { PI_SEARCH_PROVIDERS } from '@/executor/handlers/pi/core/keys'
 
 const searchProviderField = PiBlock.subBlocks.find((subBlock) => subBlock.id === 'searchProvider')
 const searchApiKeyField = PiBlock.subBlocks.find((subBlock) => subBlock.id === 'searchApiKey')

apps/sim/blocks/blocks/pi.ts

@@ -1,5 +1,13 @@
 import { PiIcon } from '@/components/icons'
 import { getEnv, isTruthy } from '@/lib/core/config/env'
+import {
+  isPiByokOnlyMode,
+  PI_CLOUD_AUTHORING_MODES,
+  PI_CLOUD_MODES,
+  PI_CONTEXTUAL_MODES,
+  PI_MODE_DEFINITIONS,
+  PI_MODE_IDS,
+} from '@/lib/pi/modes'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import {
@@ -8,7 +16,6 @@ import {
   getProviderCredentialSubBlocks,
   PROVIDER_CREDENTIAL_INPUTS,
 } from '@/blocks/utils'
-import { isPiByokOnlyMode } from '@/providers/pi-providers'
 import type { ToolResponse } from '@/tools/types'
 
 interface PiResponse extends ToolResponse {
@@ -59,11 +66,11 @@ const CLOUD_ANY: {
   value: Array<'cloud' | 'cloud_branch' | 'cloud_review'>
 } = {
   field: 'mode',
-  value: ['cloud', 'cloud_branch', 'cloud_review'],
+  value: [...PI_CLOUD_MODES],
 }
 const CLOUD_AUTHORING: { field: 'mode'; value: Array<'cloud' | 'cloud_branch'> } = {
   field: 'mode',
-  value: ['cloud', 'cloud_branch'],
+  value: [...PI_CLOUD_AUTHORING_MODES],
 }
 const BABYSIT_ENABLED_VALUES: Array<true | 'true'> = [true, 'true']
 const CLOUD_WITH_BABYSIT: {
@@ -72,7 +79,7 @@ const CLOUD_WITH_BABYSIT: {
   and: { field: 'babysitMode'; value: Array<true | 'true'> }
 } = {
   field: 'mode',
-  value: ['cloud', 'cloud_branch'],
+  value: [...PI_CLOUD_AUTHORING_MODES],
   and: { field: 'babysitMode', value: BABYSIT_ENABLED_VALUES },
 }
 function getCloudWithoutBabysitCondition(values?: Record<string, unknown>): {
@@ -106,12 +113,12 @@ function getCloudBranchWithoutBabysitCondition(values?: Record<string, unknown>)
   }
 }
 const LOCAL: { field: 'mode'; value: 'local' } = { field: 'mode', value: 'local' }
-const AUTHORING_MODES: {
+const CONTEXTUAL_MODES: {
   field: 'mode'
   value: Array<'cloud' | 'cloud_branch' | 'local'>
 } = {
   field: 'mode',
-  value: ['cloud', 'cloud_branch', 'local'],
+  value: [...PI_CONTEXTUAL_MODES],
 }
 const MEMORY_TYPES = ['conversation', 'sliding_window', 'sliding_window_tokens']
 
@@ -182,35 +189,15 @@ export const PiBlock: BlockConfig<PiResponse> = {
       type: 'dropdown',
       /** Cloud modes require E2B and stay hidden when it is disabled. */
       value: () => (isTruthy(getEnv('NEXT_PUBLIC_E2B_ENABLED')) ? 'cloud' : 'local'),
-      options: () => {
-        const options = [
-          {
-            label: 'Local Dev',
-            id: 'local',
-            description: 'Edits files on your own machine over SSH',
-          },
-        ]
-        if (isTruthy(getEnv('NEXT_PUBLIC_E2B_ENABLED'))) {
-          options.unshift(
-            {
-              label: 'Create PR',
-              id: 'cloud',
-              description: 'Runs in an isolated sandbox, clones your repo, and opens a PR',
-            },
-            {
-              label: 'Update PR',
-              id: 'cloud_branch',
-              description: 'Updates an existing branch and creates or updates its pull request',
-            },
-            {
-              label: 'Review Code',
-              id: 'cloud_review',
-              description: 'Reviews an existing PR and posts GitHub review comments',
-            }
-          )
-        }
-        return options
-      },
+      options: () =>
+        PI_MODE_IDS.filter(
+          (mode) =>
+            isTruthy(getEnv('NEXT_PUBLIC_E2B_ENABLED')) || !PI_MODE_DEFINITIONS[mode].requiresE2B
+        ).map((mode) => ({
+          id: mode,
+          label: PI_MODE_DEFINITIONS[mode].label,
+          description: PI_MODE_DEFINITIONS[mode].description,
+        })),
     },
     {
       id: 'task',
@@ -524,7 +511,7 @@ export const PiBlock: BlockConfig<PiResponse> = {
       type: 'skill-input',
       defaultValue: [],
       mode: 'advanced',
-      condition: AUTHORING_MODES,
+      condition: CONTEXTUAL_MODES,
     },
     {
       id: 'thinkingLevel',
@@ -554,7 +541,7 @@ export const PiBlock: BlockConfig<PiResponse> = {
         { label: 'Sliding window (tokens)', id: 'sliding_window_tokens' },
       ],
       mode: 'advanced',
-      condition: AUTHORING_MODES,
+      condition: CONTEXTUAL_MODES,
     },
     {
       id: 'conversationId',
@@ -564,12 +551,12 @@ export const PiBlock: BlockConfig<PiResponse> = {
       mode: 'advanced',
       required: {
         field: 'mode',
-        value: ['cloud', 'cloud_branch', 'local'],
+        value: [...PI_CONTEXTUAL_MODES],
         and: { field: 'memoryType', value: MEMORY_TYPES },
       },
       condition: {
         field: 'mode',
-        value: ['cloud', 'cloud_branch', 'local'],
+        value: [...PI_CONTEXTUAL_MODES],
         and: { field: 'memoryType', value: MEMORY_TYPES },
       },
       dependsOn: ['memoryType'],
@@ -582,7 +569,7 @@ export const PiBlock: BlockConfig<PiResponse> = {
       mode: 'advanced',
       condition: {
         field: 'mode',
-        value: ['cloud', 'cloud_branch', 'local'],
+        value: [...PI_CONTEXTUAL_MODES],
         and: { field: 'memoryType', value: ['sliding_window'] },
       },
       dependsOn: ['memoryType'],
@@ -595,7 +582,7 @@ export const PiBlock: BlockConfig<PiResponse> = {
       mode: 'advanced',
       condition: {
         field: 'mode',
-        value: ['cloud', 'cloud_branch', 'local'],
+        value: [...PI_CONTEXTUAL_MODES],
         and: { field: 'memoryType', value: ['sliding_window_tokens'] },
       },
       dependsOn: ['memoryType'],

…ecutor/handlers/pi/cloud-backend.test.ts …dlers/pi/cloud/authoring/backend.test.tsapps/sim/executor/handlers/pi/cloud-backend.test.ts renamed to apps/sim/executor/handlers/pi/cloud/authoring/backend.test.ts apps/sim/executor/handlers/pi/cloud-backend.test.ts renamed to apps/sim/executor/handlers/pi/cloud/authoring/backend.test.ts

@@ -30,19 +30,19 @@ vi.mock('@/lib/execution/remote-sandbox/pi-lifetime', () => ({
   // lifetime is the ceiling because there is nothing shorter to narrow to.
   resolvePiRunLifetimeMs: () => 40 * 60 * 1000,
 }))
-vi.mock('@/executor/handlers/pi/babysit-backend', () => ({
+vi.mock('@/executor/handlers/pi/cloud/babysit', () => ({
   runBabysitPi: mockRunBabysit,
 }))
 vi.mock('@/tools', () => ({ executeTool: mockExecuteTool }))
-vi.mock('@/executor/handlers/pi/keys', () => ({
+vi.mock('@/executor/handlers/pi/core/keys', () => ({
   providerApiKeyEnvVar: mockProviderEnvVar,
   mapThinkingLevel: () => 'medium',
 }))
-vi.mock('@/executor/handlers/pi/context', () => ({ buildPiPrompt: () => 'PROMPT' }))
+vi.mock('@/executor/handlers/pi/core/context', () => ({ buildPiPrompt: () => 'PROMPT' }))
 
 import { createTimeoutAbortController } from '@/lib/core/execution-limits'
-import type { PiCloudBranchRunParams, PiCloudRunParams } from '@/executor/handlers/pi/backend'
-import { runCloudBranchPi, runCloudPi } from '@/executor/handlers/pi/cloud-backend'
+import { runCloudBranchPi, runCloudPi } from '@/executor/handlers/pi/cloud/authoring/backend'
+import type { PiCloudBranchRunParams, PiCloudRunParams } from '@/executor/handlers/pi/core/backend'
 
 function baseParams(overrides: Partial<PiCloudRunParams> = {}): PiCloudRunParams {
   return {

…im/executor/handlers/pi/cloud-backend.ts …r/handlers/pi/cloud/authoring/backend.tsapps/sim/executor/handlers/pi/cloud-backend.ts renamed to apps/sim/executor/handlers/pi/cloud/authoring/backend.ts apps/sim/executor/handlers/pi/cloud-backend.ts renamed to apps/sim/executor/handlers/pi/cloud/authoring/backend.ts

@@ -28,14 +28,13 @@ import {
   resolvePiRunLifetimeMs,
   resolvePiSandboxLifetimeMs,
 } from '@/lib/execution/remote-sandbox/pi-lifetime'
-import { runBabysitPi } from '@/executor/handlers/pi/babysit-backend'
-import type {
-  PiBackendRun,
-  PiCloudBranchRunParams,
-  PiCloudRunParams,
-  PiRunContext,
-  PiRunResult,
-} from '@/executor/handlers/pi/backend'
+import { runBabysitPi } from '@/executor/handlers/pi/cloud/babysit'
+import {
+  type BranchPullRequest,
+  fetchOpenPrForBranch,
+  findOpenPrForBranch,
+  setPullRequestDraftState,
+} from '@/executor/handlers/pi/cloud/github-pr'
 import {
   buildPiScript,
   CLONE_TIMEOUT_MS,
@@ -54,26 +53,27 @@ import {
   raceAbort,
   resolvePiTimeoutMs,
   scrubGitSecrets,
-} from '@/executor/handlers/pi/cloud-shared'
-import { buildPiPrompt } from '@/executor/handlers/pi/context'
+} from '@/executor/handlers/pi/cloud/shared'
+import type {
+  PiBackendRun,
+  PiCloudBranchRunParams,
+  PiCloudRunParams,
+  PiRunContext,
+  PiRunResult,
+} from '@/executor/handlers/pi/core/backend'
+import { buildPiPrompt } from '@/executor/handlers/pi/core/context'
 import {
   applyPiEvent,
   createPiTotals,
   type PiRunTotals,
   parseJsonLine,
-} from '@/executor/handlers/pi/events'
-import {
-  type BranchPullRequest,
-  fetchOpenPrForBranch,
-  findOpenPrForBranch,
-  setPullRequestDraftState,
-} from '@/executor/handlers/pi/github-pr'
-import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/keys'
+} from '@/executor/handlers/pi/core/events'
+import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/core/keys'
 import {
   createScrubbedPiError,
   scrubPiEvent,
   scrubPiSecrets,
-} from '@/executor/handlers/pi/redaction'
+} from '@/executor/handlers/pi/core/redaction'
 import {
   PI_SEARCH_API_KEY_ENV_VAR,
   PI_SEARCH_EXTENSION_PATH,

apps/sim/executor/handlers/pi/cloud/authoring/index.ts

@@ -0,0 +1 @@
+export { runCloudBranchPi, runCloudPi } from '@/executor/handlers/pi/cloud/authoring/backend'

…utor/handlers/pi/babysit-backend.test.ts …andlers/pi/cloud/babysit/backend.test.tsapps/sim/executor/handlers/pi/babysit-backend.test.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/backend.test.ts apps/sim/executor/handlers/pi/babysit-backend.test.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/backend.test.ts

@@ -46,8 +46,9 @@ vi.mock('@/lib/execution/remote-sandbox/pi-lifetime', async (importOriginal) =>
     resolvePiSandboxLifetimeMs: mockResolvePiSandboxLifetime,
   }
 })
-vi.mock('@/executor/handlers/pi/babysit-github', async (importOriginal) => {
-  const original = await importOriginal<typeof import('@/executor/handlers/pi/babysit-github')>()
+vi.mock('@/executor/handlers/pi/cloud/babysit/github', async (importOriginal) => {
+  const original =
+    await importOriginal<typeof import('@/executor/handlers/pi/cloud/babysit/github')>()
   return {
     ...original,
     fetchBabysitSnapshot: mockFetchSnapshot,
@@ -64,10 +65,10 @@ import { createTimeoutAbortController, getMaxExecutionTimeout } from '@/lib/core
 import {
   resolveBabysitExecutionBudgetMs,
   runBabysitPiWithOptions,
-} from '@/executor/handlers/pi/babysit-backend'
-import { BABYSIT_ROUND_PATH } from '@/executor/handlers/pi/babysit-round'
-import type { PiBabysitContinuationParams } from '@/executor/handlers/pi/backend'
-import { DIFF_PATH } from '@/executor/handlers/pi/cloud-shared'
+} from '@/executor/handlers/pi/cloud/babysit/backend'
+import { BABYSIT_ROUND_PATH } from '@/executor/handlers/pi/cloud/babysit/round'
+import { DIFF_PATH } from '@/executor/handlers/pi/cloud/shared'
+import type { PiBabysitContinuationParams } from '@/executor/handlers/pi/core/backend'
 
 afterAll(resetEnvMock)
 

…/executor/handlers/pi/babysit-backend.ts …tor/handlers/pi/cloud/babysit/backend.tsapps/sim/executor/handlers/pi/babysit-backend.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/backend.ts apps/sim/executor/handlers/pi/babysit-backend.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/backend.ts

@@ -29,18 +29,13 @@ import {
   fetchBabysitThreads,
   replyAndResolveBabysitThreads,
   requestBabysitReview,
-} from '@/executor/handlers/pi/babysit-github'
+} from '@/executor/handlers/pi/cloud/babysit/github'
 import {
   BABYSIT_ROUND_PATH,
   MAX_ROUND_FILE_BYTES,
   MAX_THREADS_PER_ROUND,
   parseBabysitRound,
-} from '@/executor/handlers/pi/babysit-round'
-import type {
-  PiBabysitContinuationParams,
-  PiRunContext,
-  PiRunResult,
-} from '@/executor/handlers/pi/backend'
+} from '@/executor/handlers/pi/cloud/babysit/round'
 import {
   buildPiScript,
   CLONE_TIMEOUT_MS,
@@ -58,20 +53,25 @@ import {
   raceAbort,
   resolvePiTimeoutMs,
   scrubGitSecrets,
-} from '@/executor/handlers/pi/cloud-shared'
-import { buildPiPrompt } from '@/executor/handlers/pi/context'
+} from '@/executor/handlers/pi/cloud/shared'
+import type {
+  PiBabysitContinuationParams,
+  PiRunContext,
+  PiRunResult,
+} from '@/executor/handlers/pi/core/backend'
+import { buildPiPrompt } from '@/executor/handlers/pi/core/context'
 import {
   applyPiEvent,
   createPiTotals,
   type PiRunTotals,
   parseJsonLine,
-} from '@/executor/handlers/pi/events'
-import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/keys'
+} from '@/executor/handlers/pi/core/events'
+import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/core/keys'
 import {
   createScrubbedPiError,
   scrubPiEvent,
   scrubPiSecrets,
-} from '@/executor/handlers/pi/redaction'
+} from '@/executor/handlers/pi/core/redaction'
 import {
   PI_SEARCH_API_KEY_ENV_VAR,
   PI_SEARCH_EXTENSION_PATH,

…cutor/handlers/pi/babysit-github.test.ts …handlers/pi/cloud/babysit/github.test.tsapps/sim/executor/handlers/pi/babysit-github.test.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/github.test.ts apps/sim/executor/handlers/pi/babysit-github.test.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/github.test.ts

@@ -12,7 +12,7 @@ import {
   fetchBabysitSnapshot,
   fetchBabysitThreads,
   replyAndResolveBabysitThreads,
-} from '@/executor/handlers/pi/babysit-github'
+} from '@/executor/handlers/pi/cloud/babysit/github'
 
 const HEAD_SHA = 'a'.repeat(40)
 const BASE_SHA = 'b'.repeat(40)

…m/executor/handlers/pi/babysit-github.ts …utor/handlers/pi/cloud/babysit/github.tsapps/sim/executor/handlers/pi/babysit-github.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/github.ts apps/sim/executor/handlers/pi/babysit-github.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/github.ts

@@ -1,13 +1,13 @@
 import { getErrorMessage } from '@sim/utils/errors'
 import { truncate } from '@sim/utils/string'
-import type { BabysitRoundDecision } from '@/executor/handlers/pi/babysit-round'
+import type { BabysitRoundDecision } from '@/executor/handlers/pi/cloud/babysit/round'
 import {
   fetchPrSnapshot,
   type PullRequestCoordinates,
   type PullRequestSnapshot,
   validateRepositoryCoordinates,
-} from '@/executor/handlers/pi/github-pr'
-import { scrubPiSecrets } from '@/executor/handlers/pi/redaction'
+} from '@/executor/handlers/pi/cloud/github-pr'
+import { scrubPiSecrets } from '@/executor/handlers/pi/core/redaction'
 import { executeTool } from '@/tools'
 import {
   isRecord,

apps/sim/executor/handlers/pi/cloud/babysit/index.ts

@@ -0,0 +1 @@
+export { runBabysitPi } from '@/executor/handlers/pi/cloud/babysit/backend'