@pentoshi/clai 4.11.5 → 4.11.8

package/dist/agent/turn/finalizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"finalizer.js","sourceRoot":"","sources":["../../../src/agent/turn/finalizer.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AA2B1D,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,KAAyB,EACzB,KAAyB,EACZ,EAAE;IACf,KAAK,CAAC,sBAAsB,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,iBAAiB,CAC/B,yBAAyB,CAAC;QACxB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvE,CAAC,CACH,CAAC;IACF,MAAM,aAAa,GAAG,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;IAC3D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,eAAe,GACnB,KAAK,CAAC,aAAa,KAAK,SAAS;QAC/B,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,iBAAiB,CACf,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,aAAa,EAAE,EAC3C,aAAa,CACd,CAAC;IACR,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3B,KAAK,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,yBAAyB,EAAE,CAAC;IACpC,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QAC5E,CAAC;QAAC,MAAM,CAAC;QACT,CAAC;IACH,CAAC;IACD,KAAK,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1E,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAC7B,CAAC,KAAyB,EAAE,EAAE,CAC9B,CACE,MAAc,EACd,KAAa,EACb,SAA4B,WAAW,EACvC,oBAAuC,EAAE,EACzC,MAAe,EACf,aAAsB,EACtB,aAAiC,EACpB,EAAE,CACf,YAAY,CAAC,KAAK,EAAE;IAClB,MAAM;IACN,KAAK;IACL,MAAM;IACN,iBAAiB;IACjB,MAAM;IACN,aAAa;IACb,aAAa;CACd,CAAC,CAAC"}

package/dist/agent/turn/history-writer.d.ts

@@ -0,0 +1,17 @@
+import type { ChatImage, ChatMessage, CompletionResult } from "../../types.js";
+export declare const ACTION_CYCLE_RECOVERY_PREFIX = "[ACTION CYCLE RECOVERY] ";
+export interface TurnHistoryPorts {
+    readonly messages: ChatMessage[];
+    readonly images: readonly ChatImage[] | undefined;
+    readonly sanitizeAssistantText: (text: string) => string;
+    readonly visibleCommitted: () => boolean;
+    readonly writeAssistantMessage: (text: string) => void;
+}
+export interface TurnHistoryWriter {
+    readonly recoveryUserMessage: (content: string) => ChatMessage;
+    readonly upsertActionCycleRecovery: (content: string) => void;
+    readonly recoveryProse: (content: string) => string | undefined;
+    readonly pushAssistantHistory: (content: string, reasoning?: Pick<CompletionResult, "reasoningArtifacts" | "reasoningBlock">) => void;
+}
+export declare const recoveryProseFrom: (content: string) => string | undefined;
+export declare const createTurnHistoryWriter: (ports: TurnHistoryPorts) => TurnHistoryWriter;

package/dist/agent/turn/history-writer.js

@@ -0,0 +1,72 @@
+import { stripSentinelTokens, textBeforeToolCall, } from "../tool-call-parser.js";
+import { hasReasoningMarker } from "../../llm/reasoning-marker.js";
+import { stripThinking } from "../../ui/thinking.js";
+import { legacyReasoningBlockFromArtifacts, reasoningArtifactsForPersistence, } from "../../llm/reasoning-artifacts.js";
+export const ACTION_CYCLE_RECOVERY_PREFIX = "[ACTION CYCLE RECOVERY] ";
+const looksLikeToolPayload = (text) => /^```|^\{|<tool_call>|<\|tool_call(?:s_section)?_begin\|>/i.test(text) ||
+    /\n\s*\{[\s\S]*\}\s*$/.test(text);
+export const recoveryProseFrom = (content) => {
+    const text = textBeforeToolCall(stripSentinelTokens(content)).trim();
+    if (!text || looksLikeToolPayload(text))
+        return undefined;
+    return text;
+};
+const buildRecoveryUserMessage = (ports, content) => {
+    const message = { role: "user", content, internal: true };
+    if (ports.images && ports.images.length > 0) {
+        message.images = [...ports.images];
+    }
+    return message;
+};
+const replaceActionCycleRecovery = (ports, content) => {
+    const prefix = ACTION_CYCLE_RECOVERY_PREFIX;
+    for (let index = ports.messages.length - 1; index >= 0; index -= 1) {
+        const message = ports.messages[index];
+        if (message.role === "user" &&
+            message.internal &&
+            message.content.startsWith(prefix)) {
+            ports.messages.splice(index, 1);
+            break;
+        }
+    }
+    ports.messages.push(buildRecoveryUserMessage(ports, prefix + content));
+};
+const persistedReasoning = (reasoning) => {
+    const persistedArtifacts = reasoningArtifactsForPersistence({
+        artifacts: reasoning?.reasoningArtifacts,
+        hasToolCalls: false,
+    });
+    const reasoningBlock = persistedArtifacts
+        ? legacyReasoningBlockFromArtifacts(persistedArtifacts)
+        : reasoning?.reasoningArtifacts
+            ? undefined
+            : reasoning?.reasoningBlock;
+    return {
+        ...(reasoningBlock?.text || reasoningBlock?.items?.length
+            ? { reasoningBlock }
+            : {}),
+        ...(persistedArtifacts ? { reasoningArtifacts: persistedArtifacts } : {}),
+    };
+};
+const appendAssistantHistory = (ports, content, reasoning) => {
+    const cleaned = ports.sanitizeAssistantText(hasReasoningMarker(content) ? stripThinking(content).visible : content);
+    if (!ports.visibleCommitted()) {
+        const prose = recoveryProseFrom(cleaned);
+        if (prose)
+            ports.writeAssistantMessage(prose);
+    }
+    ports.messages.push({
+        role: "assistant",
+        content: cleaned.trim()
+            ? cleaned
+            : "[No visible assistant response was produced.]",
+        ...persistedReasoning(reasoning),
+    });
+};
+export const createTurnHistoryWriter = (ports) => ({
+    recoveryUserMessage: (content) => buildRecoveryUserMessage(ports, content),
+    upsertActionCycleRecovery: (content) => replaceActionCycleRecovery(ports, content),
+    recoveryProse: recoveryProseFrom,
+    pushAssistantHistory: (content, reasoning) => appendAssistantHistory(ports, content, reasoning),
+});
+//# sourceMappingURL=history-writer.js.map

package/dist/agent/turn/history-writer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"history-writer.js","sourceRoot":"","sources":["../../../src/agent/turn/history-writer.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EACL,iCAAiC,EACjC,gCAAgC,GACjC,MAAM,kCAAkC,CAAC;AAE1C,MAAM,CAAC,MAAM,4BAA4B,GAAG,0BAA0B,CAAC;AAwBvE,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAW,EAAE,CACrD,2DAA2D,CAAC,IAAI,CAAC,IAAI,CAAC;IACtE,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAsB,EAAE;IACvE,MAAM,IAAI,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrE,IAAI,CAAC,IAAI,IAAI,oBAAoB,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC/B,KAAuB,EACvB,OAAe,EACF,EAAE;IACf,MAAM,OAAO,GAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACvE,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,OAAO,CAAC,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CACjC,KAAuB,EACvB,OAAe,EACT,EAAE;IACR,MAAM,MAAM,GAAG,4BAA4B,CAAC;IAC5C,KAAK,IAAI,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACnE,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAE,CAAC;QACvC,IACE,OAAO,CAAC,IAAI,KAAK,MAAM;YACvB,OAAO,CAAC,QAAQ;YAChB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAClC,CAAC;YACD,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAChC,MAAM;QACR,CAAC;IACH,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,SAAyB,EACmC,EAAE;IAC9D,MAAM,kBAAkB,GAAG,gCAAgC,CAAC;QAC1D,SAAS,EAAE,SAAS,EAAE,kBAAkB;QACxC,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,kBAAkB;QACvC,CAAC,CAAC,iCAAiC,CAAC,kBAAkB,CAAC;QACvD,CAAC,CAAC,SAAS,EAAE,kBAAkB;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,EAAE,cAAc,CAAC;IAChC,OAAO;QACL,GAAG,CAAC,cAAc,EAAE,IAAI,IAAI,cAAc,EAAE,KAAK,EAAE,MAAM;YACvD,CAAC,CAAC,EAAE,cAAc,EAAE;YACpB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC7B,KAAuB,EACvB,OAAe,EACf,SAAyB,EACnB,EAAE;IACR,MAAM,OAAO,GAAG,KAAK,CAAC,qBAAqB,CACzC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CACvE,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,KAAK;YAAE,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClB,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE;YACrB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,+CAA+C;QACnD,GAAG,kBAAkB,CAAC,SAAS,CAAC;KACjC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,KAAuB,EACJ,EAAE,CAAC,CAAC;IACvB,mBAAmB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,CAAC;IAC1E,yBAAyB,EAAE,CAAC,OAAO,EAAE,EAAE,CACrC,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC;IAC5C,aAAa,EAAE,iBAAiB;IAChC,oBAAoB,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAC3C,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC;CACpD,CAAC,CAAC"}

package/dist/agent/turn/inserted-text.d.ts

@@ -0,0 +1 @@
+export declare const insertedText: (value: string, prefix: string) => string;

package/dist/agent/turn/inserted-text.js

@@ -0,0 +1,2 @@
+export const insertedText = (value, prefix) => value.startsWith(prefix) ? value.slice(prefix.length) : value;
+//# sourceMappingURL=inserted-text.js.map

package/dist/agent/turn/inserted-text.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inserted-text.js","sourceRoot":"","sources":["../../../src/agent/turn/inserted-text.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,MAAc,EAAU,EAAE,CACpE,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC"}

package/dist/agent/turn/loop/answer-assessment.d.ts

@@ -0,0 +1,22 @@
+import type { PlanStatus, SessionPlan } from "../../../store/plan.js";
+export interface CompletionAssessmentInput {
+    readonly visible: string;
+    readonly canonicalVisible: string;
+    readonly livePlan: SessionPlan | undefined;
+    readonly activePlanStatus: PlanStatus | undefined;
+    readonly planApproved: boolean;
+    readonly informationalQuery: boolean;
+    readonly idleOrSocialPrompt: boolean;
+    readonly buildLikeTurn: boolean;
+    readonly pentestLikeTurn: boolean;
+}
+export interface CompletionAssessment {
+    readonly displayCleaned: string;
+    readonly cleaned: string;
+    readonly narratedAction: boolean;
+    readonly narratedWebAction: boolean;
+    readonly planHasOpenWorkNow: boolean;
+    readonly completedPlanDuringThisTurn: boolean;
+    readonly wantsAction: boolean;
+}
+export declare const assessCompletion: (input: CompletionAssessmentInput) => CompletionAssessment;

package/dist/agent/turn/loop/answer-assessment.js

@@ -0,0 +1,30 @@
+import { collapseRepeatedText, looksLikeActionNarration, looksLikeWebActionNarration, stripSentinelTokens, } from "../../tool-call-parser.js";
+import { planHasOpenWork } from "../../session-policy.js";
+export const assessCompletion = (input) => {
+    const displayCleaned = collapseRepeatedText(stripSentinelTokens(input.visible));
+    const cleaned = collapseRepeatedText(stripSentinelTokens(input.canonicalVisible));
+    const narratedAction = looksLikeActionNarration(cleaned);
+    const narratedWebAction = looksLikeWebActionNarration(cleaned);
+    const planStatus = input.livePlan?.status ?? input.activePlanStatus;
+    const completedPlanDuringThisTurn = input.activePlanStatus !== "completed" && planStatus === "completed";
+    const planHasOpenWorkNow = planHasOpenWork(planStatus);
+    const userExpectsWork = (planHasOpenWorkNow && input.planApproved) ||
+        (!input.informationalQuery &&
+            !input.idleOrSocialPrompt &&
+            (input.buildLikeTurn || input.pentestLikeTurn));
+    const wantsAction = !completedPlanDuringThisTurn &&
+        !input.idleOrSocialPrompt &&
+        (userExpectsWork ||
+            (narratedAction && !input.informationalQuery) ||
+            (narratedWebAction && !input.informationalQuery));
+    return {
+        displayCleaned,
+        cleaned,
+        narratedAction,
+        narratedWebAction,
+        planHasOpenWorkNow,
+        completedPlanDuringThisTurn,
+        wantsAction,
+    };
+};
+//# sourceMappingURL=answer-assessment.js.map

package/dist/agent/turn/loop/answer-assessment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"answer-assessment.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/answer-assessment.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAwB1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,KAAgC,EACV,EAAE;IACxB,MAAM,cAAc,GAAG,oBAAoB,CACzC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CACnC,CAAC;IACF,MAAM,OAAO,GAAG,oBAAoB,CAClC,mBAAmB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC5C,CAAC;IACF,MAAM,cAAc,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC;IACpE,MAAM,2BAA2B,GAC/B,KAAK,CAAC,gBAAgB,KAAK,WAAW,IAAI,UAAU,KAAK,WAAW,CAAC;IACvE,MAAM,kBAAkB,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,eAAe,GACnB,CAAC,kBAAkB,IAAI,KAAK,CAAC,YAAY,CAAC;QAC1C,CAAC,CAAC,KAAK,CAAC,kBAAkB;YACxB,CAAC,KAAK,CAAC,kBAAkB;YACzB,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;IACpD,MAAM,WAAW,GACf,CAAC,2BAA2B;QAC5B,CAAC,KAAK,CAAC,kBAAkB;QACzB,CAAC,eAAe;YACd,CAAC,cAAc,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;YAC7C,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACtD,OAAO;QACL,cAAc;QACd,OAAO;QACP,cAAc;QACd,iBAAiB;QACjB,kBAAkB;QAClB,2BAA2B;QAC3B,WAAW;KACZ,CAAC;AACJ,CAAC,CAAC"}

package/dist/agent/turn/loop/answer-path.d.ts

@@ -0,0 +1,20 @@
+import type { TurnOutcome } from "../../turn-outcome.js";
+import type { TurnLoopDeps } from "./deps.js";
+export type AnswerPathResult = {
+    readonly kind: "continue";
+} | {
+    readonly kind: "finished";
+    readonly outcome: TurnOutcome;
+};
+export interface AnswerPathInput {
+    readonly assistantText: {
+        visible: string;
+        thinkContent: string;
+        hasThinking: boolean;
+    };
+    readonly canonicalAssistantVisible: string;
+    readonly bareArgsOnly: boolean;
+    readonly toolsAttached: boolean;
+    readonly commitAssistantRetry: (historyText: string) => void;
+}
+export declare const resolveAnswerPath: (deps: TurnLoopDeps, input: AnswerPathInput) => Promise<AnswerPathResult>;

package/dist/agent/turn/loop/answer-path.js

@@ -0,0 +1,92 @@
+import { auditLog } from "../../../store/logs.js";
+import { loadPlan } from "../../../store/plan.js";
+import { saveOutcomeState } from "../../outcomes.js";
+import { assessCompletion } from "../../turn/loop/answer-assessment.js";
+import { resolveFinalOutcome } from "../../turn/loop/final-outcome.js";
+import { handleModelOnlyRound } from "../../turn/loop/model-only-rounds.js";
+import { recoverMissingToolCall } from "../../turn/loop/tool-call-recovery.js";
+const finished = (outcome) => ({
+    kind: "finished",
+    outcome,
+});
+export const resolveAnswerPath = async (deps, input) => {
+    const { assistantText, canonicalAssistantVisible, bareArgsOnly, toolsAttached, commitAssistantRetry } = input;
+    deps.counters.consecutiveModelOnlyRounds += 1;
+    const recoveryLadderState = {
+        bareToolJsonRetries: deps.counters.bareToolJsonRetries,
+        truncatedToolRetries: deps.counters.truncatedToolRetries,
+        malformedFenceRetries: deps.counters.malformedFenceRetries,
+    };
+    const recoveryDecision = await recoverMissingToolCall({
+        messages: deps.messages,
+        toolsAttached,
+        planModeWithoutPlan: deps.isPlanMode && !deps.activePlan,
+        notify: deps.writeNotice,
+        commitAssistantRetry,
+        recoveryUserMessage: deps.recoveryUserMessage,
+        applySalvagedWrite: deps.applySalvagedWrite,
+    }, recoveryLadderState, { visible: assistantText.visible, bareArgsOnly });
+    deps.counters.bareToolJsonRetries = recoveryLadderState.bareToolJsonRetries;
+    deps.counters.truncatedToolRetries = recoveryLadderState.truncatedToolRetries;
+    deps.counters.malformedFenceRetries = recoveryLadderState.malformedFenceRetries;
+    if (recoveryDecision === "retry")
+        return { kind: "continue" };
+    const livePlanAtCompletion = await loadPlan(deps.session.sessionId).catch(() => undefined);
+    const assessment = assessCompletion({
+        visible: assistantText.visible,
+        canonicalVisible: canonicalAssistantVisible,
+        livePlan: livePlanAtCompletion,
+        activePlanStatus: deps.activePlan?.status,
+        planApproved: deps.session.planApproved.value,
+        informationalQuery: deps.informationalQuery,
+        idleOrSocialPrompt: deps.idleOrSocialPrompt,
+        buildLikeTurn: deps.buildLikeTurn,
+        pentestLikeTurn: deps.pentestLikeTurn,
+    });
+    const cleaned = assessment.cleaned;
+    const displayCleaned = assessment.displayCleaned;
+    const modelOnly = handleModelOnlyRound({
+        messages: deps.messages,
+        provider: deps.loop.provider,
+        model: deps.loop.model,
+        toolsAttached,
+        notify: deps.writeNotice,
+        commitAssistantRetry,
+        recoveryUserMessage: deps.recoveryUserMessage,
+        writeAssistantMessage: deps.writeAssistantMessage,
+        unreadResponderIds: () => deps.responderClaims.ids(),
+    }, {
+        assistantVisible: assistantText.visible,
+        wantsAction: assessment.wantsAction,
+        consecutiveModelOnlyRounds: deps.counters.consecutiveModelOnlyRounds,
+        plan: livePlanAtCompletion,
+    });
+    if (modelOnly.kind === "continue-round")
+        return { kind: "continue" };
+    if (modelOnly.kind === "stop") {
+        deps.outcomeState.outcome.status = "partial";
+        await saveOutcomeState(deps.outcomeState);
+        deps.moveTurn("partial", "repeated model-only responses");
+        return finished(deps.finishTurn(modelOnly.answer, deps.counters.productiveSteps, "partial", modelOnly.remainingCriteria, modelOnly.reason));
+    }
+    const finalOutcome = await resolveFinalOutcome({
+        outcomeState: deps.outcomeState,
+        planApproved: deps.session.planApproved.value,
+        loadPlan: () => loadPlan(deps.session.sessionId).catch(() => undefined),
+        saveOutcomeState,
+    }, cleaned);
+    const outcomeStatus = finalOutcome.status;
+    const remainingCriteria = finalOutcome.remainingCriteria;
+    deps.moveTurn("verifying", "evaluating current criterion-linked evidence");
+    deps.moveTurn(outcomeStatus, `turn completed with ${outcomeStatus} evidence status`);
+    await auditLog("agent.final", {
+        provider: deps.loop.provider,
+        model: deps.loop.model,
+        steps: deps.loop.step + 1,
+        outcomeStatus,
+        remainingCriteria,
+    });
+    deps.loop.lastAnswer = cleaned;
+    return finished(deps.finishTurn(deps.loop.lastAnswer, deps.loop.step + 1, outcomeStatus, remainingCriteria, finalOutcome.reason, deps.loop.interruptedVisible ? cleaned : displayCleaned));
+};
+//# sourceMappingURL=answer-path.js.map

package/dist/agent/turn/loop/answer-path.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"answer-path.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/answer-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAQ/E,MAAM,QAAQ,GAAG,CAAC,OAAoB,EAAoB,EAAE,CAAC,CAAC;IAC5D,IAAI,EAAE,UAAU;IAChB,OAAO;CACR,CAAC,CAAC;AAcH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,IAAkB,EAClB,KAAsB,EACK,EAAE;IAC7B,MAAM,EAAE,aAAa,EAAE,yBAAyB,EAAE,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,GACnG,KAAK,CAAC;IACR,IAAI,CAAC,QAAQ,CAAC,0BAA0B,IAAI,CAAC,CAAC;IAC9C,MAAM,mBAAmB,GAAG;QAC1B,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,mBAAmB;QACtD,oBAAoB,EAAE,IAAI,CAAC,QAAQ,CAAC,oBAAoB;QACxD,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,qBAAqB;KAC3D,CAAC;IACF,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD;QACE,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,aAAa;QACb,mBAAmB,EAAE,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU;QACxD,MAAM,EAAE,IAAI,CAAC,WAAW;QACxB,oBAAoB;QACpB,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;KAC5C,EACD,mBAAmB,EACnB,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,CACjD,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,mBAAmB,CAAC;IAC5E,IAAI,CAAC,QAAQ,CAAC,oBAAoB,GAAG,mBAAmB,CAAC,oBAAoB,CAAC;IAC9E,IAAI,CAAC,QAAQ,CAAC,qBAAqB,GAAG,mBAAmB,CAAC,qBAAqB,CAAC;IAChF,IAAI,gBAAgB,KAAK,OAAO;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAE9D,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CACvE,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;IACF,MAAM,UAAU,GAAG,gBAAgB,CAAC;QAClC,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,gBAAgB,EAAE,yBAAyB;QAC3C,QAAQ,EAAE,oBAAoB;QAC9B,gBAAgB,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;QACzC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK;QAC7C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,eAAe,EAAE,IAAI,CAAC,eAAe;KACtC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACnC,MAAM,cAAc,GAAG,UAAU,CAAC,cAAc,CAAC;IAEjD,MAAM,SAAS,GAAG,oBAAoB,CACpC;QACE,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;QAC5B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;QACtB,aAAa;QACb,MAAM,EAAE,IAAI,CAAC,WAAW;QACxB,oBAAoB;QACpB,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE;KACrD,EACD;QACE,gBAAgB,EAAE,aAAa,CAAC,OAAO;QACvC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,0BAA0B,EAAE,IAAI,CAAC,QAAQ,CAAC,0BAA0B;QACpE,IAAI,EAAE,oBAAoB;KAC3B,CACF,CAAC;IACF,IAAI,SAAS,CAAC,IAAI,KAAK,gBAAgB;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IACrE,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;QAC7C,MAAM,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC;QAC1D,OAAO,QAAQ,CAAC,IAAI,CAAC,UAAU,CAC7B,SAAS,CAAC,MAAM,EAChB,IAAI,CAAC,QAAQ,CAAC,eAAe,EAC7B,SAAS,EACT,SAAS,CAAC,iBAAiB,EAC3B,SAAS,CAAC,MAAM,CACjB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAC5C;QACE,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK;QAC7C,QAAQ,EAAE,GAAG,EAAE,CACb,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACzD,gBAAgB;KACjB,EACD,OAAO,CACR,CAAC;IACF,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CAAC;IAC1C,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;IACzD,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,8CAA8C,CAAC,CAAC;IAC3E,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,uBAAuB,aAAa,kBAAkB,CAAC,CAAC;IACrF,MAAM,QAAQ,CAAC,aAAa,EAAE;QAC5B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;QAC5B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;QACtB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;QACzB,aAAa;QACb,iBAAiB;KAClB,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;IAC/B,OAAO,QAAQ,CAAC,IAAI,CAAC,UAAU,CAC7B,IAAI,CAAC,IAAI,CAAC,UAAU,EACpB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,EAClB,aAAa,EACb,iBAAiB,EACjB,YAAY,CAAC,MAAM,EACnB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CACxD,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/agent/turn/loop/call-binding.d.ts

@@ -0,0 +1,17 @@
+import type { ChatMessage, NativeToolCall, ToolCall } from "../../../types.js";
+import type { BoundCall } from "../contracts.js";
+import { type ToolNameCanonicalizer } from "./canonicalize-turn-call.js";
+export declare const syntheticToolCallId: (index: number) => string;
+export declare const bindToolCalls: (input: {
+    readonly nativeToolCalls: readonly NativeToolCall[];
+    readonly visible: string;
+    readonly thinkContent: string;
+    readonly primaryCall: ToolCall | undefined;
+    readonly mcpRuntime?: ToolNameCanonicalizer | undefined;
+}) => BoundCall[];
+export interface ReconciledCallIds {
+    readonly historyNativeCalls: NativeToolCall[];
+    readonly bound: BoundCall[];
+    readonly toRun: BoundCall[];
+}
+export declare const reconcileToolCallIds: (bound: readonly BoundCall[], toRun: readonly BoundCall[], messages: readonly ChatMessage[]) => ReconciledCallIds;

package/dist/agent/turn/loop/call-binding.js

@@ -0,0 +1,42 @@
+import { parseAllToolCalls } from "../../tool-call-parser.js";
+import { ensureUniqueToolCallIds, toolCallIdsInHistory, } from "../../tool-history.js";
+import { canonicalizeTurnCall, } from "./canonicalize-turn-call.js";
+export const syntheticToolCallId = (index) => `call_text_${index}`;
+const boundFromNative = (native, index, mcpRuntime) => {
+    const call = native.args?._parseError
+        ? {
+            name: native.name || "unknown",
+            args: {
+                __nativeParseError: true,
+                _raw: native.args._raw,
+            },
+        }
+        : canonicalizeTurnCall({ name: native.name, args: native.args }, mcpRuntime);
+    return { index, id: native.id, call, native, wireId: native.id };
+};
+const boundFromText = (rawCall, index, mcpRuntime) => {
+    const call = canonicalizeTurnCall(rawCall, mcpRuntime);
+    const id = syntheticToolCallId(index);
+    return { index, id, call, native: { id, name: call.name, args: call.args } };
+};
+export const bindToolCalls = (input) => {
+    if (input.nativeToolCalls.length) {
+        return input.nativeToolCalls.map((native, index) => boundFromNative(native, index, input.mcpRuntime));
+    }
+    let parsed = parseAllToolCalls(input.visible || input.thinkContent);
+    if (parsed.length === 0 && input.primaryCall)
+        parsed = [input.primaryCall];
+    return parsed.map((rawCall, index) => boundFromText(rawCall, index, input.mcpRuntime));
+};
+export const reconcileToolCallIds = (bound, toRun, messages) => {
+    const historyNativeCalls = ensureUniqueToolCallIds(bound.map((entry) => entry.native), toolCallIdsInHistory(messages));
+    const rebound = bound.map((entry, index) => {
+        const fixed = historyNativeCalls[index];
+        return { ...entry, id: fixed.id, native: fixed };
+    });
+    const reboundToRun = toRun
+        .map((old) => rebound.find((entry) => entry.call === old.call) ?? old)
+        .map((entry, index) => ({ ...entry, index }));
+    return { historyNativeCalls, bound: rebound, toRun: reboundToRun };
+};
+//# sourceMappingURL=call-binding.js.map

package/dist/agent/turn/loop/call-binding.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-binding.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/call-binding.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/loop/canonicalize-turn-call.d.ts

@@ -0,0 +1,5 @@
+import type { ToolCall } from "../../../types.js";
+export type ToolNameCanonicalizer = {
+    canonicalizeToolName(name: string): string;
+};
+export declare const canonicalizeTurnCall: (rawCall: ToolCall, mcpRuntime?: ToolNameCanonicalizer | undefined) => ToolCall;

package/dist/agent/turn/loop/canonicalize-turn-call.js

@@ -0,0 +1,12 @@
+import { normalizeToolCall } from "../../../tools/registry.js";
+import { stripSupersededElidedArgs } from "../../message-slim.js";
+export const canonicalizeTurnCall = (rawCall, mcpRuntime) => {
+    const normalized = normalizeToolCall(rawCall);
+    const canonicalMcpName = mcpRuntime?.canonicalizeToolName(normalized.name);
+    const named = canonicalMcpName && canonicalMcpName !== normalized.name
+        ? { ...normalized, name: canonicalMcpName }
+        : normalized;
+    const args = stripSupersededElidedArgs(named.args);
+    return args === named.args ? named : { ...named, args };
+};
+//# sourceMappingURL=canonicalize-turn-call.js.map

package/dist/agent/turn/loop/canonicalize-turn-call.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonicalize-turn-call.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/canonicalize-turn-call.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAMlE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAiB,EACjB,UAA8C,EACpC,EAAE;IACZ,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,UAAU,EAAE,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,KAAK,GACT,gBAAgB,IAAI,gBAAgB,KAAK,UAAU,CAAC,IAAI;QACtD,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE;QAC3C,CAAC,CAAC,UAAU,CAAC;IACjB,MAAM,IAAI,GAAG,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnD,OAAO,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;AAC1D,CAAC,CAAC"}

package/dist/agent/turn/loop/completion-interpretation.d.ts

@@ -0,0 +1,34 @@
+import type { CompletionResult, ProviderId, TokenUsage } from "../../../types.js";
+import { contextAttemptFromOperationUsage } from "../../../llm/context-snapshot.js";
+export interface CompletionUsagePorts {
+    readonly dispatchedRawRequestTokens: number;
+    readonly dispatchedRequestRoute: {
+        provider: ProviderId;
+        model: string;
+    } | undefined;
+    readonly emitTokenUsage: (input: {
+        usage: TokenUsage;
+        provider: ProviderId;
+        model: string;
+        api?: string | undefined;
+        attempt?: ReturnType<typeof contextAttemptFromOperationUsage> | undefined;
+    }) => void;
+    readonly audit: (event: string, payload: Readonly<Record<string, string | number | boolean | undefined>>) => Promise<void>;
+}
+export declare const accountCompletionUsage: (ports: CompletionUsagePorts, completion: CompletionResult) => Promise<void>;
+export interface AssistantTextParts {
+    readonly visible: string;
+    readonly hasThinking: boolean;
+    readonly thinkContent: string;
+}
+export interface InterpretedCompletion {
+    readonly assistantText: AssistantTextParts;
+    readonly canonicalVisible: string;
+    readonly thinkContent: string;
+    readonly retryReasoning: Pick<CompletionResult, "reasoningArtifacts" | "reasoningBlock">;
+}
+export declare const interpretCompletion: (input: {
+    readonly completion: CompletionResult;
+    readonly streamedReasoningText: string;
+    readonly interruptedVisible: string;
+}) => InterpretedCompletion;

package/dist/agent/turn/loop/completion-interpretation.js

@@ -0,0 +1,71 @@
+import { stripThinking } from "../../../ui/thinking.js";
+import { trimExactContinuationOverlap } from "../continuation-overlap.js";
+import { recordRequestTokenObservation } from "../../../llm/token-estimate-calibration.js";
+import { contextAttemptFromOperationUsage } from "../../../llm/context-snapshot.js";
+export const accountCompletionUsage = async (ports, completion) => {
+    const usage = completion.usage;
+    if (!usage)
+        return;
+    const requestRouteMatched = ports.dispatchedRequestRoute?.provider === completion.provider &&
+        ports.dispatchedRequestRoute.model === completion.model;
+    if (usage.exact &&
+        usage.promptTokens > 0 &&
+        requestRouteMatched) {
+        recordRequestTokenObservation({
+            provider: completion.provider,
+            model: completion.model,
+            estimatedRequestTokens: ports.dispatchedRawRequestTokens,
+            actualPromptTokens: usage.promptTokens,
+        });
+    }
+    const attempt = contextAttemptFromOperationUsage(completion.operationUsage);
+    ports.emitTokenUsage({
+        usage,
+        provider: completion.provider,
+        model: completion.model,
+        ...(completion.api ? { api: completion.api } : {}),
+        ...(attempt.kind === "generation" ? { attempt } : {}),
+    });
+    const cacheRead = usage.cachedPromptTokens ?? 0;
+    const cacheCreated = usage.cacheCreationTokens ?? 0;
+    if (cacheRead === 0 && cacheCreated === 0)
+        return;
+    await ports.audit("agent.prompt.cache", {
+        provider: completion.provider,
+        model: completion.model,
+        promptTokens: usage.promptTokens,
+        cacheReadTokens: cacheRead,
+        cacheCreationTokens: cacheCreated,
+        hitRatio: usage.promptTokens > 0
+            ? Number((cacheRead / usage.promptTokens).toFixed(3))
+            : 0,
+    });
+};
+export const interpretCompletion = (input) => {
+    const split = stripThinking(input.completion.text);
+    const thinkContent = [
+        input.streamedReasoningText.trim() ||
+            (input.completion.reasoningBlock?.text ?? "").trim(),
+        split.thinkContent,
+    ]
+        .filter(Boolean)
+        .join("\n\n");
+    const continuedVisible = trimExactContinuationOverlap(input.interruptedVisible, split.visible);
+    const hasThinking = thinkContent.length > 0;
+    return {
+        assistantText: {
+            visible: continuedVisible,
+            hasThinking,
+            thinkContent,
+        },
+        canonicalVisible: input.interruptedVisible + continuedVisible,
+        thinkContent,
+        retryReasoning: input.completion.reasoningArtifacts?.length ||
+            input.completion.reasoningBlock
+            ? input.completion
+            : hasThinking
+                ? { reasoningBlock: { text: thinkContent } }
+                : input.completion,
+    };
+};
+//# sourceMappingURL=completion-interpretation.js.map

package/dist/agent/turn/loop/completion-interpretation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"completion-interpretation.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/completion-interpretation.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/loop/deps.d.ts

@@ -0,0 +1,98 @@
+import type { ChatMessage, CompletionResult, ProviderId, ReasoningPreference, SuccessfulRequestSnapshot, ToolCall, ToolDefinition } from "../../../types.js";
+import type { SessionPlan } from "../../../store/plan.js";
+import type { LoopGuardStopInfo, TurnOutcome, TurnOutcomeStatus } from "../../turn-outcome.js";
+import type { TurnState } from "../../turn-state.js";
+import type { ResponderNotification } from "../../../tools/jobs.js";
+import type { AgentEvent } from "../../events.js";
+import type { SessionPolicy } from "../../session-policy.js";
+import type { LoopGuard } from "../../loop-guard.js";
+import type { OutcomeEnvelope } from "../../outcomes.js";
+import type { McpRuntime } from "../../../mcp/runtime.js";
+import type { ToolDialect } from "../../../llm/tool-protocol.js";
+import type { SingleToolResult, TurnOutputState } from "../contracts.js";
+import type { TurnEvidenceFlags } from "../evidence-flags.js";
+import type { TurnCounters } from "../turn-counters.js";
+import type { ToolExecutionState } from "../tool-execution/state.js";
+import type { ResponderClaimLedger } from "../responder-claims.js";
+import type { WireOccurrenceLedger } from "./wire-occurrences.js";
+import type { StreamRecoveryState } from "../../stream-recovery.js";
+import type { TurnLoopState } from "./state.js";
+import type { SalvagedWrite } from "../../tool-call-parser.js";
+import type { SalvagedWriteReceipt } from "../tool-call-preparation.js";
+import type { TurnWriters } from "../tool-execution/deps.js";
+export interface ResponderDelivery {
+    readonly id: string;
+}
+export interface LoopOptions {
+    readonly signal?: AbortSignal | undefined;
+    readonly onMessages?: ((messages: ChatMessage[]) => void) | undefined;
+    readonly onSuccessfulRequest?: ((snapshot: SuccessfulRequestSnapshot) => void) | undefined;
+}
+export interface TurnLoopDeps extends TurnWriters {
+    readonly loop: TurnLoopState;
+    readonly counters: TurnCounters;
+    readonly toolState: ToolExecutionState;
+    readonly evidenceFlags: TurnEvidenceFlags;
+    readonly session: SessionPolicy;
+    readonly options: LoopOptions;
+    readonly emit: (event: AgentEvent) => void;
+    readonly messages: ChatMessage[];
+    readonly prompt: string;
+    readonly outputState: TurnOutputState;
+    readonly maxIterations: number;
+    readonly isPlanMode: boolean;
+    readonly activePlan: SessionPlan | undefined;
+    readonly buildLike: boolean;
+    readonly buildLikeTurn: boolean;
+    readonly pentestLike: boolean;
+    readonly pentestLikeTurn: boolean;
+    readonly pentestSession: boolean;
+    readonly featureAppAsk: boolean;
+    readonly informationalQuery: boolean;
+    readonly idleOrSocialPrompt: boolean;
+    readonly useCompactSystemPrompt: boolean;
+    readonly thinking: ReasoningPreference | undefined;
+    readonly loopGuard: LoopGuard;
+    readonly mcpRuntime: McpRuntime | undefined;
+    readonly mcpLease: {
+        release: () => void;
+    } | undefined;
+    readonly outcomeState: OutcomeEnvelope;
+    readonly responderClaims: ResponderClaimLedger;
+    readonly responderWakeTurn: boolean;
+    readonly responderWakeNotificationId: string | undefined;
+    readonly wireOccurrences: WireOccurrenceLedger;
+    readonly recoveryState: StreamRecoveryState;
+    readonly toolResultHashes: Map<string, {
+        toolName: string;
+        count: number;
+    }>;
+    readonly alreadyPrintedIds: Set<string>;
+    readonly deferredPostToolMessages: ChatMessage[];
+    readonly deferredResponderLedgerNotifications: ResponderNotification[];
+    readonly dialect: () => ToolDialect;
+    readonly setDialect: (dialect: ToolDialect, native: boolean) => void;
+    readonly nativeToolsActive: () => boolean;
+    readonly composeCurrentSystemPrompt: (native: boolean) => string;
+    readonly currentContextLimitTokens: () => number | undefined;
+    readonly estimateNextRequestTokens: (messages: readonly ChatMessage[]) => number;
+    readonly selectToolDefs: (native: boolean, compact: boolean) => ToolDefinition[] | undefined;
+    readonly maybeAutoCompact: (reason: string, force?: boolean) => Promise<void>;
+    readonly resolveNativeTools: (provider: ProviderId, model: string) => {
+        dialect: ToolDialect;
+        native: boolean;
+    };
+    readonly refreshResponderInbox: () => ResponderDelivery | undefined;
+    readonly refreshAgentInstructions: () => Promise<void>;
+    readonly refreshSessionState: (plan?: SessionPlan | null | undefined) => void;
+    readonly recoveryUserMessage: (text: string) => ChatMessage;
+    readonly applySalvagedWrite: (salvaged: SalvagedWrite) => Promise<SalvagedWriteReceipt>;
+    readonly nextToolEventId: () => string;
+    readonly pushAssistantHistory: (text: string, reasoning?: Pick<CompletionResult, "reasoningBlock" | "reasoningArtifacts">) => void;
+    readonly liveMessages: () => ChatMessage[];
+    readonly upsertActionCycleRecovery: (message: string) => void;
+    readonly probeStateKey: (call: ToolCall) => string | undefined;
+    readonly moveTurn: (to: TurnState, reason?: string) => void;
+    readonly finishTurn: (answer: string, steps: number, status?: TurnOutcomeStatus, remainingCriteria?: readonly string[], reason?: string, displayAnswer?: string, loopGuardStop?: LoopGuardStopInfo) => TurnOutcome;
+    readonly executeSingleTool: (call: ToolCall, toolEventId: string, parentSignal: AbortSignal) => Promise<SingleToolResult>;
+}

package/dist/agent/turn/loop/deps.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=deps.js.map

package/dist/agent/turn/loop/deps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/deps.ts"],"names":[],"mappings":""}

package/dist/agent/turn/loop/empty-response.d.ts

@@ -0,0 +1,22 @@
+import type { ChatMessage } from "../../../types.js";
+export interface EmptyResponseState {
+    emptyVisibleRetries: number;
+    retryWithoutThinking: boolean;
+    interruptedReasoning: string;
+}
+export interface EmptyResponsePorts {
+    readonly messages: ChatMessage[];
+    readonly toolsAttached: boolean;
+    readonly planModeWithoutPlan: boolean;
+    readonly notify: (level: "info" | "warn", message: string) => void;
+    readonly commitAssistantRetry: (text: string) => void;
+    readonly recoveryUserMessage: (content: string) => ChatMessage;
+}
+export interface EmptyResponseInput {
+    readonly assistantVisible: string;
+    readonly assistantThinkContent: string;
+    readonly hasThinking: boolean;
+    readonly incompleteNativeStream: boolean;
+}
+export type EmptyResponseDecision = "continue-round" | "stop";
+export declare const handleEmptyResponse: (ports: EmptyResponsePorts, state: EmptyResponseState, input: EmptyResponseInput) => EmptyResponseDecision;