Skip to content

Commit a477a52

Browse files
BillLeoutsakosvl346Bill Leoutsakos
BillLeoutsakosvl346
and
Bill Leoutsakos
authored
chore(pi): organize mode implementations (#6362)
Co-authored-by: Bill Leoutsakos <billleoutsakos@Bills-MacBook-Pro.local>
1 parent c5499f7 commit a477a52

39 files changed

Lines changed: 124 additions & 124 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vi.mock('@/lib/core/config/env', async (importOriginal) => {
1818

1919
import { evaluateSubBlockCondition } from '@/lib/workflows/subblocks/visibility'
2020
import { PiBlock } from '@/blocks/blocks/pi'
21-
import { PI_SEARCH_PROVIDERS } from '@/executor/handlers/pi/keys'
21+
import { PI_SEARCH_PROVIDERS } from '@/executor/handlers/pi/core/keys'
2222

2323
const searchProviderField = PiBlock.subBlocks.find((subBlock) => subBlock.id === 'searchProvider')
2424
const searchApiKeyField = PiBlock.subBlocks.find((subBlock) => subBlock.id === 'searchApiKey')

apps/sim/executor/handlers/pi/cloud-backend.test.ts renamed to apps/sim/executor/handlers/pi/cloud/authoring/backend.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ vi.mock('@/lib/execution/remote-sandbox/pi-lifetime', () => ({
3030
// lifetime is the ceiling because there is nothing shorter to narrow to.
3131
resolvePiRunLifetimeMs: () => 40 * 60 * 1000,
3232
}))
33-
vi.mock('@/executor/handlers/pi/babysit-backend', () => ({
33+
vi.mock('@/executor/handlers/pi/cloud/babysit/backend', () => ({
3434
runBabysitPi: mockRunBabysit,
3535
}))
3636
vi.mock('@/tools', () => ({ executeTool: mockExecuteTool }))
37-
vi.mock('@/executor/handlers/pi/keys', () => ({
37+
vi.mock('@/executor/handlers/pi/core/keys', () => ({
3838
providerApiKeyEnvVar: mockProviderEnvVar,
3939
mapThinkingLevel: () => 'medium',
4040
}))
41-
vi.mock('@/executor/handlers/pi/context', () => ({ buildPiPrompt: () => 'PROMPT' }))
41+
vi.mock('@/executor/handlers/pi/core/context', () => ({ buildPiPrompt: () => 'PROMPT' }))
4242

4343
import { createTimeoutAbortController } from '@/lib/core/execution-limits'
44-
import type { PiCloudBranchRunParams, PiCloudRunParams } from '@/executor/handlers/pi/backend'
45-
import { runCloudBranchPi, runCloudPi } from '@/executor/handlers/pi/cloud-backend'
44+
import { runCloudBranchPi, runCloudPi } from '@/executor/handlers/pi/cloud/authoring/backend'
45+
import type { PiCloudBranchRunParams, PiCloudRunParams } from '@/executor/handlers/pi/core/backend'
4646

4747
function baseParams(overrides: Partial<PiCloudRunParams> = {}): PiCloudRunParams {
4848
return {

apps/sim/executor/handlers/pi/cloud-backend.ts renamed to apps/sim/executor/handlers/pi/cloud/authoring/backend.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ import {
2727
resolvePiRunLifetimeMs,
2828
resolvePiSandboxLifetimeMs,
2929
} from '@/lib/execution/remote-sandbox/pi-lifetime'
30-
import { runBabysitPi } from '@/executor/handlers/pi/babysit-backend'
31-
import type {
32-
PiBackendRun,
33-
PiCloudBranchRunParams,
34-
PiCloudRunParams,
35-
PiRunContext,
36-
PiRunResult,
37-
} from '@/executor/handlers/pi/backend'
30+
import { runBabysitPi } from '@/executor/handlers/pi/cloud/babysit/backend'
31+
import {
32+
type BranchPullRequest,
33+
fetchOpenPrForBranch,
34+
findOpenPrForBranch,
35+
setPullRequestDraftState,
36+
} from '@/executor/handlers/pi/cloud/github-pr'
3837
import {
3938
buildPiScript,
4039
CLONE_TIMEOUT_MS,
@@ -53,22 +52,23 @@ import {
5352
raceAbort,
5453
resolvePiTimeoutMs,
5554
scrubGitSecrets,
56-
} from '@/executor/handlers/pi/cloud-shared'
57-
import { buildPiPrompt } from '@/executor/handlers/pi/context'
55+
} from '@/executor/handlers/pi/cloud/shared'
56+
import type {
57+
PiBackendRun,
58+
PiCloudBranchRunParams,
59+
PiCloudRunParams,
60+
PiRunContext,
61+
PiRunResult,
62+
} from '@/executor/handlers/pi/core/backend'
63+
import { buildPiPrompt } from '@/executor/handlers/pi/core/context'
5864
import {
5965
applyPiEvent,
6066
createPiTotals,
6167
type PiRunTotals,
6268
parseJsonLine,
63-
} from '@/executor/handlers/pi/events'
64-
import {
65-
type BranchPullRequest,
66-
fetchOpenPrForBranch,
67-
findOpenPrForBranch,
68-
setPullRequestDraftState,
69-
} from '@/executor/handlers/pi/github-pr'
70-
import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/keys'
71-
import { createScrubbedPiError, scrubPiEvent } from '@/executor/handlers/pi/redaction'
69+
} from '@/executor/handlers/pi/core/events'
70+
import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/core/keys'
71+
import { createScrubbedPiError, scrubPiEvent } from '@/executor/handlers/pi/core/redaction'
7272
import {
7373
PI_SEARCH_API_KEY_ENV_VAR,
7474
PI_SEARCH_EXTENSION_PATH,

apps/sim/executor/handlers/pi/babysit-backend.test.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/backend.test.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ vi.mock('@/lib/execution/remote-sandbox/pi-lifetime', async (importOriginal) =>
4646
resolvePiSandboxLifetimeMs: mockResolvePiSandboxLifetime,
4747
}
4848
})
49-
vi.mock('@/executor/handlers/pi/babysit-github', async (importOriginal) => {
50-
const original = await importOriginal<typeof import('@/executor/handlers/pi/babysit-github')>()
49+
vi.mock('@/executor/handlers/pi/cloud/babysit/github', async (importOriginal) => {
50+
const original =
51+
await importOriginal<typeof import('@/executor/handlers/pi/cloud/babysit/github')>()
5152
return {
5253
...original,
5354
fetchBabysitSnapshot: mockFetchSnapshot,
@@ -64,10 +65,10 @@ import { createTimeoutAbortController, getMaxExecutionTimeout } from '@/lib/core
6465
import {
6566
resolveBabysitExecutionBudgetMs,
6667
runBabysitPiWithOptions,
67-
} from '@/executor/handlers/pi/babysit-backend'
68-
import { BABYSIT_ROUND_PATH } from '@/executor/handlers/pi/babysit-round'
69-
import type { PiBabysitContinuationParams } from '@/executor/handlers/pi/backend'
70-
import { DIFF_PATH } from '@/executor/handlers/pi/cloud-shared'
68+
} from '@/executor/handlers/pi/cloud/babysit/backend'
69+
import { BABYSIT_ROUND_PATH } from '@/executor/handlers/pi/cloud/babysit/round'
70+
import { DIFF_PATH } from '@/executor/handlers/pi/cloud/shared'
71+
import type { PiBabysitContinuationParams } from '@/executor/handlers/pi/core/backend'
7172

7273
afterAll(resetEnvMock)
7374

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,13 @@ import {
2929
fetchBabysitThreads,
3030
replyAndResolveBabysitThreads,
3131
requestBabysitReview,
32-
} from '@/executor/handlers/pi/babysit-github'
32+
} from '@/executor/handlers/pi/cloud/babysit/github'
3333
import {
3434
BABYSIT_ROUND_PATH,
3535
MAX_ROUND_FILE_BYTES,
3636
MAX_THREADS_PER_ROUND,
3737
parseBabysitRound,
38-
} from '@/executor/handlers/pi/babysit-round'
39-
import type {
40-
PiBabysitContinuationParams,
41-
PiRunContext,
42-
PiRunResult,
43-
} from '@/executor/handlers/pi/backend'
38+
} from '@/executor/handlers/pi/cloud/babysit/round'
4439
import {
4540
buildPiScript,
4641
CLONE_TIMEOUT_MS,
@@ -58,20 +53,25 @@ import {
5853
raceAbort,
5954
resolvePiTimeoutMs,
6055
scrubGitSecrets,
61-
} from '@/executor/handlers/pi/cloud-shared'
62-
import { buildPiPrompt } from '@/executor/handlers/pi/context'
56+
} from '@/executor/handlers/pi/cloud/shared'
57+
import type {
58+
PiBabysitContinuationParams,
59+
PiRunContext,
60+
PiRunResult,
61+
} from '@/executor/handlers/pi/core/backend'
62+
import { buildPiPrompt } from '@/executor/handlers/pi/core/context'
6363
import {
6464
applyPiEvent,
6565
createPiTotals,
6666
type PiRunTotals,
6767
parseJsonLine,
68-
} from '@/executor/handlers/pi/events'
69-
import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/keys'
68+
} from '@/executor/handlers/pi/core/events'
69+
import { mapThinkingLevel, providerApiKeyEnvVar } from '@/executor/handlers/pi/core/keys'
7070
import {
7171
createScrubbedPiError,
7272
scrubPiEvent,
7373
scrubPiSecrets,
74-
} from '@/executor/handlers/pi/redaction'
74+
} from '@/executor/handlers/pi/core/redaction'
7575
import {
7676
PI_SEARCH_API_KEY_ENV_VAR,
7777
PI_SEARCH_EXTENSION_PATH,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
fetchBabysitSnapshot,
1313
fetchBabysitThreads,
1414
replyAndResolveBabysitThreads,
15-
} from '@/executor/handlers/pi/babysit-github'
15+
} from '@/executor/handlers/pi/cloud/babysit/github'
1616

1717
const HEAD_SHA = 'a'.repeat(40)
1818
const BASE_SHA = 'b'.repeat(40)

apps/sim/executor/handlers/pi/babysit-github.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/github.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { getErrorMessage } from '@sim/utils/errors'
22
import { truncate } from '@sim/utils/string'
3-
import type { BabysitRoundDecision } from '@/executor/handlers/pi/babysit-round'
3+
import type { BabysitRoundDecision } from '@/executor/handlers/pi/cloud/babysit/round'
44
import {
55
fetchPrSnapshot,
66
type PullRequestCoordinates,
77
type PullRequestSnapshot,
88
validateRepositoryCoordinates,
9-
} from '@/executor/handlers/pi/github-pr'
10-
import { scrubPiSecrets } from '@/executor/handlers/pi/redaction'
9+
} from '@/executor/handlers/pi/cloud/github-pr'
10+
import { scrubPiSecrets } from '@/executor/handlers/pi/core/redaction'
1111
import { executeTool } from '@/tools'
1212
import {
1313
isRecord,

apps/sim/executor/handlers/pi/babysit-round.test.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/round.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
MAX_ROUND_REPLY_LENGTH,
88
MAX_THREADS_PER_ROUND,
99
parseBabysitRound,
10-
} from '@/executor/handlers/pi/babysit-round'
10+
} from '@/executor/handlers/pi/cloud/babysit/round'
1111

1212
const allowed = new Set(['thread-1', 'thread-2'])
1313

apps/sim/executor/handlers/pi/babysit-round.ts renamed to apps/sim/executor/handlers/pi/cloud/babysit/round.ts

File renamed without changes.

apps/sim/executor/handlers/pi/github-pr.test.ts renamed to apps/sim/executor/handlers/pi/cloud/github-pr.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
findOpenPrForBranch,
1414
setPullRequestDraftState,
1515
validateRepositoryCoordinates,
16-
} from '@/executor/handlers/pi/github-pr'
16+
} from '@/executor/handlers/pi/cloud/github-pr'
1717

1818
const HEAD_SHA = 'a'.repeat(40)
1919
const BASE_SHA = 'b'.repeat(40)

0 commit comments

Comments
 (0)