pi-subagents 0.70.0 → 0.71.0

package/src/runs/background/workflow-terminal-proof.d.ts

@@ -0,0 +1,18 @@
+import type { AsyncStatus, ProcessTerminal, WorkflowChildSummary, WorkflowTerminalProof } from "../../shared/types.ts";
+export declare function isTerminalAsyncState(state: AsyncStatus["state"]): boolean;
+export type WorkflowChildProcessEvidence = {
+    state: "observed";
+    children: ProcessTerminal[];
+} | {
+    state: "pending" | "unknown";
+    reason: string;
+};
+/**
+ * Process evidence for a workflow's async children. Status proofs and capacity
+ * release both use this so they cannot disagree about the same workflow.
+ * Synchronous children run inside the workflow host and have no process of their own.
+ */
+export declare function readWorkflowChildProcessEvidence(workflowAsyncDir: string, steps: AsyncStatus["steps"]): WorkflowChildProcessEvidence;
+/** A persistent workflow host is terminal only after dispatch closes and every async child has process evidence. */
+export declare function readWorkflowTerminalProof(asyncDir: string, steps: AsyncStatus["steps"], summary: WorkflowChildSummary, hostCommandCount: number, closedAt: number): WorkflowTerminalProof;
+//# sourceMappingURL=workflow-terminal-proof.d.ts.map

package/src/runs/background/workflow-terminal-proof.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-terminal-proof.d.ts","sourceRoot":"","sources":["../../../../src/runs/background/workflow-terminal-proof.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAMvH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAEzE;AAED,MAAM,MAAM,4BAA4B,GACrC;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,eAAe,EAAE,CAAA;CAAE,GAClD;IAAE,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,4BAA4B,CA2BpI;AAMD,oHAAoH;AACpH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,qBAAqB,CAYzL"}

package/src/runs/background/workflow-terminal-proof.js

@@ -0,0 +1,68 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { readStatus } from "../../shared/utils.js";
+import { readProcessTerminal } from "./process-terminal.js";
+const TERMINAL_WORKFLOW_STATES = new Set(["completed", "failed", "stopped"]);
+export function isTerminalAsyncState(state) {
+    return state !== "queued" && state !== "running" && state !== "paused";
+}
+/**
+ * Process evidence for a workflow's async children. Status proofs and capacity
+ * release both use this so they cannot disagree about the same workflow.
+ * Synchronous children run inside the workflow host and have no process of their own.
+ */
+export function readWorkflowChildProcessEvidence(workflowAsyncDir, steps) {
+    if (!steps)
+        return { state: "unknown", reason: "workflow child roster is missing" };
+    const children = [];
+    for (const step of steps) {
+        const label = step.workflowKey ?? step.agent;
+        if (typeof step.async !== "boolean")
+            return { state: "unknown", reason: `workflow child ${label} is missing async classification` };
+        if (!step.async)
+            continue;
+        if (!step.runId || path.basename(step.runId) !== step.runId)
+            return { state: "unknown", reason: `async workflow child ${label} is missing run id` };
+        const childDir = path.join(path.dirname(workflowAsyncDir), step.runId);
+        if (!fs.existsSync(childDir))
+            return { state: "unknown", reason: `async workflow child ${label} directory is missing` };
+        const childStatus = readStatus(childDir);
+        if (!childStatus)
+            return { state: "unknown", reason: `async workflow child ${label} status is missing or unreadable` };
+        if (!isTerminalAsyncState(childStatus.state))
+            return { state: "pending", reason: `async workflow child ${label} is still ${childStatus.state}` };
+        const recorded = childStatus.processTerminal;
+        if (!recorded?.runnerProcessInstanceId)
+            return { state: "unknown", reason: `async workflow child ${label} has no runner process identity` };
+        // A runner startup failure records `not-started` in status and never writes a process-terminal sidecar.
+        if (recorded.state === "not-started" && recorded.runId === step.runId && typeof childStatus.error === "string" && childStatus.error) {
+            children.push(recorded);
+            continue;
+        }
+        const proof = readProcessTerminal(childDir, { runId: step.runId, runnerProcessInstanceId: recorded.runnerProcessInstanceId });
+        if (proof?.state !== "observed" || proof.runId !== step.runId) {
+            return { state: !proof || proof.state === "pending" ? "pending" : "unknown", reason: `async workflow child ${label} process-terminal proof is ${proof?.state ?? "missing"}` };
+        }
+        children.push(proof);
+    }
+    return { state: "observed", children };
+}
+function unresolved(runId, state, dispatchClosed, reason) {
+    return { version: 1, kind: "workflow", runId, state, dispatchClosed, reason };
+}
+/** A persistent workflow host is terminal only after dispatch closes and every async child has process evidence. */
+export function readWorkflowTerminalProof(asyncDir, steps, summary, hostCommandCount, closedAt) {
+    const runId = summary.workflowRunId;
+    if (!summary.inventoryComplete || !TERMINAL_WORKFLOW_STATES.has(summary.workflowState)) {
+        return unresolved(runId, "pending", false, "Workflow dispatch is still open.");
+    }
+    if (hostCommandCount > 0) {
+        return unresolved(runId, "unknown", true, "Workflow host commands have no process-terminal proof.");
+    }
+    const evidence = readWorkflowChildProcessEvidence(asyncDir, steps);
+    if (evidence.state !== "observed")
+        return unresolved(runId, evidence.state, true, evidence.reason);
+    const observedAt = Math.max(closedAt, ...evidence.children.map((child) => child.state === "observed" ? child.observedAt : 0));
+    return { version: 1, kind: "workflow", runId, state: "observed", dispatchClosed: true, observedAt, children: evidence.children };
+}
+//# sourceMappingURL=workflow-terminal-proof.js.map

package/src/runs/background/workflow-terminal-proof.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-terminal-proof.js","sourceRoot":"","sources":["../../../../src/runs/background/workflow-terminal-proof.ts"],"names":[],"mappings":"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"}

package/src/runs/foreground/execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../../../src/runs/foreground/execution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAA0E,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAWlI,OAAO,EAIN,KAAK,cAAc,EACnB,KAAK,YAAY,EAQjB,MAAM,uBAAuB,CAAC;AA+jE/B;;;GAGG;AACH,wBAAsB,OAAO,CAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,YAAY,CAAC,CAwHvB"}
+{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../../../src/runs/foreground/execution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAA0E,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAWlI,OAAO,EAIN,KAAK,cAAc,EACnB,KAAK,YAAY,EAQjB,MAAM,uBAAuB,CAAC;AAo/D/B;;;GAGG;AACH,wBAAsB,OAAO,CAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,WAAW,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,YAAY,CAAC,CAwHvB"}

package/src/runs/foreground/execution.js

@@ -13,9 +13,6 @@ import { DEFAULT_CONTROL_CONFIG, buildControlEvent, claimControlNotification, de
 import { getFinalOutput, findLatestSessionFile, detectSubagentError, hasEmptyTerminalAssistantResponse, formatEmptyTerminalAssistantResponseError, extractToolArgsPreview, extractTextFromContent, MAX_STREAMED_RECENT_TOOLS, boundStreamedRecentTools, boundStreamedRecentOutput, boundStreamedToolCalls, } from "../../shared/utils.js";
 import { resolveSkillsWithFallback } from "../../agents/skills.js";
 import { effectiveToolTimeoutMs, formatToolTimeoutMessage, resolveToolTimeoutMs, toolTimeoutCallKey, toolTimeoutFromEnv } from "../shared/tool-timeout.js";
-import { evaluateCompletionMutationGuard, expectsImplementationMutation, hasMutationToolCapability, validateImplementationToolContract } from "../shared/completion-guard.js";
-import { planCompletionEvidence } from "../shared/completion-evidence.js";
-import { arbitrateCompletionGuardRescue } from "../shared/llm-intent-arbiter.js";
 import { preflightLaunchCwd } from "../shared/launch-cwd.js";
 import { createJsonlWriter } from "../../shared/jsonl-writer.js";
 import { createOrcaProgressTab } from "../shared/orca-progress-tabs.js";
@@ -25,7 +22,7 @@ import { deriveChildSessionName } from "../../shared/child-session-name.js";
 import { assertAgentAllowedByCapabilityCeiling, intersectSubagentCapabilityCeilings, resolveCurrentSubagentCapabilityCeiling } from "../shared/capability-ceiling.js";
 import { resolveEffectiveThinking } from "../../shared/model-info.js";
 import { assertThinkingWithinCeiling, intersectThinkingCeilings } from "../../shared/thinking-ceiling.js";
-import { MISSING_STRUCTURED_ACCEPTANCE_REPORT_ERROR, MISSING_STRUCTURED_OUTPUT_CALL_ERROR } from "../shared/structured-output.js";
+import { formatStructuredOutputRejectionError, MISSING_STRUCTURED_ACCEPTANCE_REPORT_ERROR, MISSING_STRUCTURED_OUTPUT_CALL_ERROR } from "../shared/structured-output.js";
 import { formatMidToolExitError, isOrdinaryToolForMidToolExit } from "../shared/process-signal.js";
 import { formatChildToolDiagnostic } from "../shared/tool-availability.js";
 import { formatChildModelResolutionDiagnostic, isChildModelResolutionFailure } from "../shared/model-resolution-diagnostic.js";
@@ -210,6 +207,7 @@ function captureStructuredDelegationProgressState(progress, result) {
         model: progress.model ?? result.model,
         toolCount: progress.toolCount,
         tokens: progress.tokens,
+        turnCount: progress.turnCount,
     };
 }
 function structuredDelegationProgressChanged(previous, progress, result) {
@@ -219,6 +217,7 @@ function structuredDelegationProgressChanged(previous, progress, result) {
         || previous.model !== (progress.model ?? result.model)
         || previous.toolCount !== progress.toolCount
         || previous.tokens !== progress.tokens
+        || previous.turnCount !== progress.turnCount
         || previous.recentOutput.length !== progress.recentOutput.length)
         return true;
     for (let index = 0; index < progress.recentOutput.length; index++) {
@@ -236,6 +235,9 @@ function structuredDelegationProgressChanged(previous, progress, result) {
     }
     return false;
 }
+function isCompleteUsageCounter(value) {
+    return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
 const STOPPED_BEFORE_COMPLETION_ERROR = "Subagent stopped before completion.";
 const AFTER_COMPACTION_SETTLEMENT = Symbol("afterCompactionSettlement");
 async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared) {
@@ -323,34 +325,6 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         shared.launchWarnings.emitted = true;
     }
     const effectiveSystemPrompt = shared.systemPrompt;
-    const contractTools = toolPlan.explicitToolAllowlist ? toolPlan.effectiveToolAllowlist : undefined;
-    const contractError = validateImplementationToolContract({
-        agent: agent.name,
-        task: shared.originalTask ?? task,
-        tools: contractTools,
-        mcpDirectTools: toolPlan.effectiveMcpTools,
-        configuredExtensions: toolPlan.configuredExtensions,
-        requestedTools: toolPlan.requestedBuiltinTools,
-        acceptanceRole: agent.acceptanceRole,
-        completionGuard: agent.completionGuard,
-    });
-    if (contractError) {
-        return {
-            index: options.index ?? 0,
-            agent: agent.name,
-            task,
-            ...(childSessionName ? { sessionName: childSessionName } : {}),
-            messages: [],
-            finalOutput: "",
-            exitCode: 1,
-            error: contractError,
-            usage: emptyUsage(),
-            model: modelArg,
-            progressSummary: { status: "failed", toolCount: 0, tokens: 0, durationMs: 0 },
-            ...(toolPlan.capabilityCeiling ? { capabilityCeiling: toolPlan.capabilityCeiling } : {}),
-            ...(toolPlan.capabilityAudit ? { capabilityAudit: toolPlan.capabilityAudit } : {}),
-        };
-    }
     const fast = options.fast ?? agent.fast;
     const { launchContractDigest } = resolveLaunchBinding({
         agent,
@@ -403,6 +377,10 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         pendingControlEvents.push(event);
         options.onControlEvent?.(event);
     };
+    let inputUsageComplete = true;
+    let outputUsageComplete = true;
+    let cacheReadUsageComplete = true;
+    let cacheWriteUsageComplete = true;
     const progress = {
         index: options.index ?? 0,
         agent: agent.name,
@@ -416,12 +394,28 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         tokens: 0,
         ...(modelArg ? { model: modelArg } : {}),
         ...(resolvedThinking ? { thinking: resolvedThinking } : {}),
-        inputTokens: 0,
-        outputTokens: 0,
         durationMs: 0,
         lastActivityAt: startTime,
     };
     result.progress = progress;
+    const projectCompleteUsage = () => {
+        if (inputUsageComplete)
+            progress.inputTokens = result.usage.input;
+        else
+            delete progress.inputTokens;
+        if (outputUsageComplete)
+            progress.outputTokens = result.usage.output;
+        else
+            delete progress.outputTokens;
+        if (cacheReadUsageComplete)
+            progress.cacheRead = result.usage.cacheRead;
+        else
+            delete progress.cacheRead;
+        if (cacheWriteUsageComplete)
+            progress.cacheWrite = result.usage.cacheWrite;
+        else
+            delete progress.cacheWrite;
+    };
     const attemptTimeout = resolveAttemptTimeout(options);
     if (attemptTimeout?.remainingMs === 0) {
         result.exitCode = 1;
@@ -438,7 +432,6 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         return result;
     }
     const mutationSnapshot = options.machine ? { source: "tracked-files", trackedOnly: true, cwd: options.cwd ?? runtimeCwd, dirtyFiles: [], fingerprints: {}, unavailable: "Local Git evidence is not authoritative for a pane-native remote run." } : snapshotTrackedMutations(options.cwd ?? runtimeCwd);
-    let observedMutationAttempt = false;
     let structuredOutputToolInvoked = false;
     let structuredOutputMessageStartIndex;
     let toolAvailabilityError;
@@ -968,7 +961,6 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                     result.toolBudget = toolBudgetState(options.toolBudget, progress.toolCount);
                 }
                 const mutates = isMutatingTool(evt.toolName, toolArgs, agent.mutationTools);
-                observedMutationAttempt = observedMutationAttempt || mutates;
                 pendingToolResult = { tool: evt.toolName ?? "tool", path: activeTool?.path, mutates, startedAt: now };
                 fireUpdate();
             }
@@ -1001,6 +993,10 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                     const hasToolCall = toolCalls.length > 0;
                     const terminalAssistantStop = evt.message.stopReason === "stop" && !hasToolCall;
                     const u = evt.message.usage;
+                    inputUsageComplete &&= isCompleteUsageCounter(u?.input);
+                    outputUsageComplete &&= isCompleteUsageCounter(u?.output);
+                    cacheReadUsageComplete &&= isCompleteUsageCounter(u?.cacheRead);
+                    cacheWriteUsageComplete &&= isCompleteUsageCounter(u?.cacheWrite);
                     if (u) {
                         const window = (u.input || 0) + (u.cacheRead || 0);
                         result.usage.input += u.input || 0;
@@ -1009,11 +1005,10 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                         result.usage.cacheWrite += u.cacheWrite || 0;
                         result.usage.cost += u.cost?.total || 0;
                         progress.tokens = result.usage.input + result.usage.output;
-                        progress.inputTokens = result.usage.input;
-                        progress.outputTokens = result.usage.output;
                         progress.window = window;
                         progress.windowPeak = Math.max(progress.windowPeak ?? 0, window);
                     }
+                    projectCompleteUsage();
                     if (evt.message.model) {
                         progress.model = evt.message.model;
                         if (!result.model)
@@ -1250,8 +1245,7 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
             if (session && messageBaseline !== undefined) {
                 result.usage = reconcileAttemptUsage(result.usage, session.messages, messageBaseline);
                 progress.tokens = result.usage.input + result.usage.output;
-                progress.inputTokens = result.usage.input;
-                progress.outputTokens = result.usage.output;
+                projectCompleteUsage();
                 progress.turnCount = result.usage.turns;
             }
             finish(finalCode);
@@ -1384,16 +1378,11 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         result.exitCode = 1;
     }
     let validatedStructuredOutput = false;
-    if (options.structuredOutput && result.exitCode === 0 && !result.error) {
+    if (options.structuredOutput) {
         result.structuredOutputSchemaPath = options.structuredOutput.schemaPath;
         result.structuredOutputPath = options.structuredOutput.outputPath;
         const structured = capture.structuredOutput();
-        if (!structuredOutputToolInvoked || !structured.called) {
-            result.exitCode = 1;
-            result.error = MISSING_STRUCTURED_OUTPUT_CALL_ERROR;
-            result.structuredOutputFailed = true;
-        }
-        else {
+        if (structuredOutputToolInvoked && structured.called) {
             result.structuredOutput = structured.value;
             const acceptanceMode = options.structuredOutput.acceptanceReportPath
                 ? options.structuredOutput.acceptanceReportRequired ? "required" : "optional"
@@ -1406,6 +1395,13 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
             writeStructuredOutputArtifacts(options.structuredOutput, structured.value, acceptanceMode ? structured.acceptanceReport : undefined);
             validatedStructuredOutput = true;
         }
+        else if (result.exitCode === 0 && !result.error) {
+            result.exitCode = 1;
+            result.error = structuredOutputToolInvoked
+                ? formatStructuredOutputRejectionError(result.messages ?? [])
+                : MISSING_STRUCTURED_OUTPUT_CALL_ERROR;
+            result.structuredOutputFailed = true;
+        }
     }
     if (result.exitCode === 0 && !result.error) {
         const messages = result.messages ?? [];
@@ -1475,70 +1471,6 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
             ? `${timeoutMessage}\n\n${result.timeoutRecovery.message}\n\nPartial output before timeout:\n${fullOutput}`
             : `${timeoutMessage}\n\n${result.timeoutRecovery.message}`;
     }
-    const completionGuardEnabled = isAgentContract(options.agentContract) ? agent.completionGuard === true : agent.completionGuard !== false;
-    const completionGuard = ((result.exitCode === 0 && !result.error) || toolAvailabilityError) && completionGuardEnabled
-        ? evaluateCompletionMutationGuard({
-            agent: agent.name,
-            task: shared.originalTask ?? task,
-            messages: result.messages ?? [],
-            tools: contractTools,
-            mcpDirectTools: toolPlan.effectiveMcpTools,
-            mutationTools: agent.mutationTools,
-            toolAvailabilityError,
-            mutationEvidence,
-        })
-        : undefined;
-    const mutationAttemptObserved = observedMutationAttempt || mutationEvidence.attemptedMutation;
-    let completionGuardTriggered = completionGuard?.triggered === true && !mutationAttemptObserved;
-    // The classifier is deliberately narrow, so a read-only review task can
-    // still be misread as implementation. Arbitrate BEFORE any failure side
-    // effect is published (effects, exit code, progress, notifications,
-    // acceptance, output persistence): only a confident read-only verdict
-    // rescues, and the task text alone is evidence — never the child's own
-    // final message.
-    let arbiterRescued = false;
-    if (completionGuardTriggered) {
-        const arbitration = await arbitrateCompletionGuardRescue({
-            guardTriggered: true,
-            task: shared.originalTask ?? task,
-            arbiter: options.llmIntentArbiter,
-        });
-        completionGuardTriggered = arbitration.triggered;
-        arbiterRescued = arbitration.rescued;
-    }
-    const completionEvidence = planCompletionEvidence({
-        guard: completionGuard,
-        guardTriggered: completionGuardTriggered,
-        completionGuardEnabled,
-        mutationCapable: hasMutationToolCapability(contractTools, toolPlan.effectiveMcpTools),
-        implementationMutationExpected: expectsImplementationMutation(agent.name, shared.originalTask ?? task),
-        mutationAttemptObserved,
-        mutationEvidence,
-        arbiterRescued,
-        agentContractEnabled: isAgentContract(options.agentContract),
-    });
-    if (completionEvidence.fileMutation) {
-        result.effects = {
-            ...(result.effects ?? {}),
-            fileMutation: completionEvidence.fileMutation,
-        };
-    }
-    if (completionEvidence.legacyFailureError) {
-        result.exitCode = 1;
-        result.error = completionEvidence.legacyFailureError;
-        progress.status = "failed";
-        progress.error = result.error;
-        emitControlEvent(buildControlEvent({
-            from: progress.activityState,
-            to: "needs_attention",
-            runId: options.runId ?? agent.name,
-            agent: agent.name,
-            index: options.index,
-            ts: Date.now(),
-            message: `${agent.name} completed without making edits for an implementation task`,
-            reason: "completion_guard",
-        }));
-    }
     if (options.outputPath && result.exitCode === 0) {
         const resolvedOutput = resolveSingleOutput(options.outputPath, fullOutput, shared.outputSnapshot, options.outputClaimPath);
         fullOutput = stripAcceptanceReport(resolvedOutput.fullOutput);