diff --git a/server/src/services/native-runtime/native-provider-turn-wait.ts b/server/src/services/native-runtime/native-provider-turn-wait.ts index d933ac46589..1e0e8e136f4 100644 --- a/server/src/services/native-runtime/native-provider-turn-wait.ts +++ b/server/src/services/native-runtime/native-provider-turn-wait.ts @@ -3,7 +3,7 @@ import { agentWakeupRequests, heartbeatRunEvents, heartbeatRuns, issueComments, import type { createDeliveryWorkCoordinator } from "../delivery-work-coordinator.js"; import { DELIVERY_QUEUES, subscribeDeliveryWork } from "../delivery-work-notifications.js"; -import type { ProviderTurnWaitOptions } from "../../vendor/paperclip-runner/index.js"; +import type { NativeExecutionInput, ProviderTurnWaitOptions } from "../../vendor/paperclip-runner/index.js"; type NativeRunScope = { companyId: string; runId: string; issueId: string; agentId: string }; @@ -101,6 +101,10 @@ export function awaitPersonCommentDuringNativeRun(db: Db, scope: NativeRunScope, }); } +export function nativeProviderStartedTurns(provider: NativeExecutionInput["provider"]) { + return provider.kind === "acpx" && provider.agent === "claude"; +} + export async function nativeProviderTurnWaitOptions(db: Db, scope: NativeRunScope): Promise { return { startedAtMs: await nativeProviderTurnWaitStartedAt(db, scope), diff --git a/server/src/services/native-runtime/native-session-executor.test.ts b/server/src/services/native-runtime/native-session-executor.test.ts index cb08e585392..685c85c9f8b 100644 --- a/server/src/services/native-runtime/native-session-executor.test.ts +++ b/server/src/services/native-runtime/native-session-executor.test.ts @@ -17325,7 +17325,7 @@ describe("runnerd provider runtime wiring", () => { state.createBackend.mock.calls.at(-1)![1].codexTransportFactory!(); expect(state.createTransport.mock.calls.at(-1)![0]).toMatchObject({ provider: "acpx", acpxAgent: "claude", acpxPermissionMode: "approve-all", - acpxPermissionModePinned: true, claudeEffort: "high", homeMode, + acpxPermissionModePinned: true, claudeEffort: "high", homeMode, providerStartedTurns: true, }); }); @@ -17346,6 +17346,7 @@ describe("runnerd provider runtime wiring", () => { provider: "acpx", acpxAgent: "grok", acpxPermissionMode: "approve-all", acpxPermissionModePinned: true, grokEffort: "high", grokDisableWebSearch: disableWebSearch, homeMode, }); + expect(state.createTransport.mock.calls.at(-1)![0]).not.toHaveProperty("providerStartedTurns"); }); it("requires explicit Grok credentials before v10 daemon startup", async () => { @@ -18894,7 +18895,8 @@ describe("runnerd provider runtime wiring", () => { expect(owner.mock.results.at(-1)!.value.credentialsUpdated).toHaveBeenCalledWith(notification); expect(options).toMatchObject({ ...driver, runnerArtifact: { version: "fixture" }, prpIdentity: { environmentLeaseId: "plugin-task-lease" } }); - if (kind === "acpx") expect(options).toMatchObject({ acpxAgent: "claude", claudeEffort: "high" }); + if (kind === "acpx") expect(options).toMatchObject({ acpxAgent: "claude", claudeEffort: "high", providerStartedTurns: true }); + else expect(options).not.toHaveProperty("providerStartedTurns"); for (const key of ["environment", "codexCommand", "codexArgs", "runnerRuntimePaths", "readRunnerState", "archiveExternalRunnerState"]) { expect(options).not.toHaveProperty(key); } diff --git a/server/src/services/native-runtime/native-session-executor.ts b/server/src/services/native-runtime/native-session-executor.ts index 914ceded34a..7dfc7a616ad 100644 --- a/server/src/services/native-runtime/native-session-executor.ts +++ b/server/src/services/native-runtime/native-session-executor.ts @@ -31,7 +31,7 @@ import { prepareRemoteOpenCodeArtifacts, type OpenCodeLaunchArtifacts } from "./ import { prepareRuntimeContextSource, rehydratePinnedInstructionAsset } from "./runtime-context.js"; import { createNativeUsageDelivery } from "./native-usage-delivery.js"; import { createNativeRecoveryUsageDelivery } from "./native-recovery-usage-delivery.js"; -import { nativeProviderTurnWaitOptions } from "./native-provider-turn-wait.js"; +import { nativeProviderStartedTurns, nativeProviderTurnWaitOptions } from "./native-provider-turn-wait.js"; import { createNativeTurnAccounting, NATIVE_LOST_TURN_USAGE_EVIDENCE, nativeUsageCostUsd, nativeUsageBiller, normalizeNativeUsage, usesNativeUsageDelivery, isNativeUsageAccountingEvent, isNativeUsageDeliveryEvent } from "./native-usage-accounting.js"; import { crashPoint } from "@paperclipai/shared/crash-points"; export { nativeUsageCostUsd, nativeUsageBiller, normalizeNativeUsage } from "./native-usage-accounting.js"; @@ -12412,7 +12412,7 @@ async function executePaperclipNativeSessionAttempt( startedAtMs: nativeSessionExecuteStartedAtMs, }); trace.activate(runnerSessionStartupScope); - const providerTurnWait = input.execution.provider.kind === "acpx" && input.execution.provider.agent === "claude" + const providerTurnWait = nativeProviderStartedTurns(input.execution.provider) ? await nativeProviderTurnWaitOptions(input.db, input.execution.binding) : undefined; const runExecution = () => executeNativeSession({ @@ -16724,6 +16724,7 @@ async function createRunnerdBackendWithinSessionClaim( grokEffort: "grokEffort" in provider ? provider.grokEffort : undefined, grokDisableWebSearch: "grokDisableWebSearch" in provider ? provider.grokDisableWebSearch : undefined, acpxPermissionModePinned: true } : {}), + ...(nativeProviderStartedTurns(provider) ? { providerStartedTurns: true } : {}), ...(provider.kind === "opencode" ? { opencodePermissionMode: provider.permissionMode } : {}), runnerReconnectGraceMs: REMOTE_RUNNER_RECONNECT_GRACE_MS, runnerProcessReconnectGraceMs: null, lifecyclePolicy: input.execution.session.lifecyclePolicy, @@ -18481,6 +18482,7 @@ async function createRunnerdBackendWithinSessionClaim( ), } : {}), + ...(nativeProviderStartedTurns(input.execution.provider) ? { providerStartedTurns: true } : {}), ...(input.execution.provider.kind === "cursor_cloud" ? { cursorCloud: input.execution.provider.cursorCloud } : {}), ...(input.execution.provider.kind === "opencode" ? {