Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/sim/blocks/blocks/pi.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/backend', () => ({
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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/backend'
import {
type BranchPullRequest,
fetchOpenPrForBranch,
findOpenPrForBranch,
setPullRequestDraftState,
} from '@/executor/handlers/pi/cloud/github-pr'
import {
buildPiScript,
CLONE_TIMEOUT_MS,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
MAX_ROUND_REPLY_LENGTH,
MAX_THREADS_PER_ROUND,
parseBabysitRound,
} from '@/executor/handlers/pi/babysit-round'
} from '@/executor/handlers/pi/cloud/babysit/round'

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type Static, type TSchema, Type } from 'typebox'
import { Check, Errors } from 'typebox/schema'
import { scrubPiSecrets } from '@/executor/handlers/pi/redaction'
import { scrubPiSecrets } from '@/executor/handlers/pi/core/redaction'

/** Sandbox path used for the single-use, agent-authored round decision file. */
export const BABYSIT_ROUND_PATH = '/workspace/sim-babysit-round.json'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
findOpenPrForBranch,
setPullRequestDraftState,
validateRepositoryCoordinates,
} from '@/executor/handlers/pi/github-pr'
} from '@/executor/handlers/pi/cloud/github-pr'

const HEAD_SHA = 'a'.repeat(40)
const BASE_SHA = 'b'.repeat(40)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ vi.mock('@/lib/execution/remote-sandbox', () => ({
fn({ run: mockRun, writeFile: mockWriteFile }),
}))
vi.mock('@/tools', () => ({ executeTool: mockExecuteTool }))
vi.mock('@/executor/handlers/pi/keys', () => ({ mapThinkingLevel: () => 'medium' }))
vi.mock('@/executor/handlers/pi/context', () => ({
vi.mock('@/executor/handlers/pi/core/keys', () => ({ mapThinkingLevel: () => 'medium' }))
vi.mock('@/executor/handlers/pi/core/context', () => ({
buildPiPrompt: ({ task, guidance }: { task: string; guidance: string }) => `${guidance}\n${task}`,
}))
vi.mock('@/executor/handlers/pi/cloud-review-tools', () => ({
vi.mock('@/executor/handlers/pi/cloud/review/tools', () => ({
CLOUD_REVIEW_TOOL_NAMES: [
'read_repo_file',
'search_repo',
Expand All @@ -83,16 +83,16 @@ vi.mock('@/executor/handlers/pi/cloud-review-tools', () => ({
createCloudReviewTools: mockCreateTools,
}))
// `toPiTool` stays real so the search tool's scrubbing boundary is the one shipped, not a stub.
vi.mock('@/executor/handlers/pi/pi-sdk', async (importOriginal) => ({
...(await importOriginal<typeof import('@/executor/handlers/pi/pi-sdk')>()),
vi.mock('@/executor/handlers/pi/core/pi-sdk', async (importOriginal) => ({
...(await importOriginal<typeof import('@/executor/handlers/pi/core/pi-sdk')>()),
loadPiSdk: () => Promise.resolve(mockSdk),
createPiModelRuntime: mockCreatePiModelRuntime,
resolvePiSdkModel: () => ({ id: 'claude', provider: 'anthropic' }),
createSealedPiResourceLoader: mockCreateSealedResourceLoader,
}))

import type { PiCloudReviewRunParams } from '@/executor/handlers/pi/backend'
import { runCloudReviewPi } from '@/executor/handlers/pi/cloud-review-backend'
import { runCloudReviewPi } from '@/executor/handlers/pi/cloud/review/backend'
import type { PiCloudReviewRunParams } from '@/executor/handlers/pi/core/backend'

/**
* The mock logger instance the global `@sim/logger` mock handed to the module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,42 @@ import { createLogger } from '@sim/logger'
import { truncate } from '@sim/utils/string'
import { withPiSandbox } from '@/lib/execution/remote-sandbox'
import { resolvePiRunLifetimeMs } from '@/lib/execution/remote-sandbox/pi-lifetime'
import type { PiBackendRun, PiCloudReviewRunParams } from '@/executor/handlers/pi/backend'
import {
fetchOpenPrSnapshot,
MAX_REVIEW_BODY_LENGTH,
type PullRequestSnapshot,
validateRepositoryCoordinates,
} from '@/executor/handlers/pi/cloud/github-pr'
import {
CLOUD_REVIEW_TOOL_NAMES,
createCloudReviewTools,
installCloudReviewTools,
preflightCloudReviewCheckout,
} from '@/executor/handlers/pi/cloud-review-tools'
} from '@/executor/handlers/pi/cloud/review/tools'
import {
CLONE_TIMEOUT_MS,
extractMarkerValues,
REPO_DIR,
raceAbort,
scrubGitSecrets,
} from '@/executor/handlers/pi/cloud-shared'
import { buildPiPrompt } from '@/executor/handlers/pi/context'
import { applyPiEvent, createPiTotals, normalizePiEvent } from '@/executor/handlers/pi/events'
import {
fetchOpenPrSnapshot,
MAX_REVIEW_BODY_LENGTH,
type PullRequestSnapshot,
validateRepositoryCoordinates,
} from '@/executor/handlers/pi/github-pr'
import { mapThinkingLevel } from '@/executor/handlers/pi/keys'
} from '@/executor/handlers/pi/cloud/shared'
import type { PiBackendRun, PiCloudReviewRunParams } from '@/executor/handlers/pi/core/backend'
import { buildPiPrompt } from '@/executor/handlers/pi/core/context'
import { applyPiEvent, createPiTotals, normalizePiEvent } from '@/executor/handlers/pi/core/events'
import { mapThinkingLevel } from '@/executor/handlers/pi/core/keys'
import {
createPiModelRuntime,
createSealedPiResourceLoader,
loadPiSdk,
resolvePiSdkModel,
toPiTool,
} from '@/executor/handlers/pi/pi-sdk'
} from '@/executor/handlers/pi/core/pi-sdk'
import {
createScrubbedPiError,
getScrubbedPiErrorMessage,
scrubPiEvent,
scrubPiSecrets,
} from '@/executor/handlers/pi/redaction'
} from '@/executor/handlers/pi/core/redaction'
import {
PI_SEARCH_TOOL_NAME,
PI_SEARCH_UNTRUSTED_SENTENCE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
CLOUD_REVIEW_TOOL_NAMES,
createCloudReviewTools,
installCloudReviewTools,
} from '@/executor/handlers/pi/cloud-review-tools'
} from '@/executor/handlers/pi/cloud/review/tools'

const BASE_SHA = 'b'.repeat(40)
const HEAD_SHA = 'a'.repeat(40)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { ToolDefinition } from '@earendil-works/pi-coding-agent'
import { Type } from 'typebox'
import type { PiSandboxRunner } from '@/lib/execution/remote-sandbox'
import { REVIEW_TOOLS_SCRIPT } from '@/executor/handlers/pi/cloud-review-tools-script'
import { raceAbort } from '@/executor/handlers/pi/cloud-shared'
import type { PiSdk } from '@/executor/handlers/pi/pi-sdk'
import { scrubPiSecrets } from '@/executor/handlers/pi/redaction'
import { REVIEW_TOOLS_SCRIPT } from '@/executor/handlers/pi/cloud/review/tools-script'
import { raceAbort } from '@/executor/handlers/pi/cloud/shared'
import type { PiSdk } from '@/executor/handlers/pi/core/pi-sdk'
import { scrubPiSecrets } from '@/executor/handlers/pi/core/redaction'
import {
parseReviewFindings,
type ReviewFindings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
FINALIZE_TIMEOUT_MS,
MIN_PI_TIMEOUT_MS,
resolvePiTimeoutMs,
} from '@/executor/handlers/pi/cloud-shared'
} from '@/executor/handlers/pi/cloud/shared'

describe('resolvePiTimeoutMs', () => {
it('reserves every command budget that brackets the agent turn', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
import { resolvePiSandboxLifetimeMs } from '@/lib/execution/remote-sandbox/pi-lifetime'
import { scrubPiSecrets } from '@/executor/handlers/pi/redaction'
import { scrubPiSecrets } from '@/executor/handlers/pi/core/redaction'

export const REPO_DIR = '/workspace/repo'
export const PROMPT_PATH = '/workspace/pi-prompt.txt'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import type { TSchema } from 'typebox'
import type { SSHConnectionConfig } from '@/app/api/tools/ssh/utils'
import type { Message } from '@/executor/handlers/agent/types'
import type { PiEvent, PiRunTotals } from '@/executor/handlers/pi/events'
import type { PiSearchProvider } from '@/executor/handlers/pi/keys'
import type { PiEvent, PiRunTotals } from '@/executor/handlers/pi/core/events'
import type { PiSearchProvider } from '@/executor/handlers/pi/core/keys'
import type { PiSupportedProvider } from '@/providers/pi-provider-configs'

/** A conversation message seeded into the Pi run (subset of the Agent block's message). */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { getErrorMessage } from '@sim/utils/errors'
import { memoryService } from '@/executor/handlers/agent/memory'
import { resolveSkillContentById } from '@/executor/handlers/agent/skills-resolver'
import type { AgentInputs, Message, SkillInput } from '@/executor/handlers/agent/types'
import type { PiMessage, PiSkill } from '@/executor/handlers/pi/backend'
import type { PiMessage, PiSkill } from '@/executor/handlers/pi/core/backend'
import type { ExecutionContext } from '@/executor/types'

const logger = createLogger('PiContext')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
normalizePiEvent,
parseJsonLine,
streamTextForEvent,
} from '@/executor/handlers/pi/events'
} from '@/executor/handlers/pi/core/events'

describe('normalizePiEvent', () => {
it('maps a text_delta message_update to a text event', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
providerApiKeyEnvVar,
resolvePiModelKey,
resolvePiSearchKey,
} from '@/executor/handlers/pi/keys'
} from '@/executor/handlers/pi/core/keys'

beforeAll(() => {
envFlagsMockFns.getCostMultiplier.mockReturnValue(2)
Expand Down
Loading
Loading