@xrkseek/harness-cli 0.0.5 → 0.0.7

package/node_modules/@xrkseek/core-agent-loop/dist/cancel-finalize.js

@@ -1,23 +1,56 @@
+import { settleDanglingTools, } from "@xrkseek/core-session";
 export function isAbortError(err, signal) {
     return (err instanceof DOMException &&
         err.name === "AbortError" &&
         signal?.aborted === true);
 }
-/** Fold logged stream chunks for one step into assistant text surfaces. */
+function parseArgsFragment(raw) {
+    try {
+        return raw ? JSON.parse(raw) : {};
+    }
+    catch {
+        return raw;
+    }
+}
+/** Fold logged stream chunks for one step into assistant text / tool surfaces. */
 export function foldStepStreamChunks(events, turnId, stepId) {
     let content = "";
     let reasoning = "";
+    const byIndex = new Map();
     for (const ev of events) {
         if (ev.type !== "assistant/chunk")
             continue;
         if (ev.turnId !== turnId || ev.stepId !== stepId)
             continue;
+        if (ev.kind === "usage")
+            continue;
+        if (ev.kind === "tool-call") {
+            const idx = ev.index ?? 0;
+            const cur = byIndex.get(idx) ?? {
+                id: ev.toolCallId ?? `call_${idx}`,
+                arguments: "",
+            };
+            if (ev.toolCallId)
+                cur.id = ev.toolCallId;
+            if (ev.toolName)
+                cur.name = ev.toolName;
+            cur.arguments += ev.argumentsDelta ?? ev.text;
+            byIndex.set(idx, cur);
+            continue;
+        }
         if (ev.kind === "reasoning")
             reasoning += ev.text;
         else
             content += ev.text;
     }
-    return { content, reasoning };
+    const toolCalls = [...byIndex.entries()]
+        .sort((a, b) => a[0] - b[0])
+        .map(([, acc]) => ({
+        id: acc.id,
+        name: acc.name ?? "unknown",
+        arguments: parseArgsFragment(acc.arguments),
+    }));
+    return { content, reasoning, toolCalls };
 }
 function stepHasAssistantMessage(events, turnId, stepId) {
     return events.some((e) => e.type === "assistant/message" &&
@@ -39,7 +72,9 @@ export function finalizeCancelledTurn(input) {
     if (input.stepId !== undefined && !stepHasEnd(events(), input.turnId, input.stepId)) {
         if (!stepHasAssistantMessage(events(), input.turnId, input.stepId)) {
             const folded = foldStepStreamChunks(events(), input.turnId, input.stepId);
-            if (folded.content.trim() || folded.reasoning.trim()) {
+            if (folded.content.trim() ||
+                folded.reasoning.trim() ||
+                folded.toolCalls.length > 0) {
                 input.store.append(input.sessionId, {
                     type: "assistant/message",
                     ts: input.now(),
@@ -49,6 +84,9 @@ export function finalizeCancelledTurn(input) {
                     ...(folded.reasoning.trim()
                         ? { reasoning: folded.reasoning }
                         : {}),
+                    ...(folded.toolCalls.length
+                        ? { toolCalls: folded.toolCalls }
+                        : {}),
                     interrupted: true,
                 });
             }
@@ -60,12 +98,20 @@ export function finalizeCancelledTurn(input) {
             stepId: input.stepId,
         });
     }
+    // Cancel path: settle open tools as ABORTED_BEFORE_DISPATCH (not crash-unknown).
+    settleDanglingTools(input.store, input.sessionId, {
+        now: input.now,
+        kind: "aborted-before-dispatch",
+    });
     if (!turnHasEnd(events(), input.turnId)) {
         input.store.append(input.sessionId, {
             type: "turn/end",
             ts: input.now(),
             turnId: input.turnId,
-            reason: { kind: "aborted" },
+            reason: {
+                kind: "aborted",
+                reason: input.cancelCause ?? { kind: "legacy" },
+            },
         });
     }
 }

package/node_modules/@xrkseek/core-agent-loop/dist/cancel-finalize.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancel-finalize.js","sourceRoot":"","sources":["../src/cancel-finalize.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cancel-finalize.js","sourceRoot":"","sources":["../src/cancel-finalize.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,GAEpB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,UAAU,YAAY,CAC1B,GAAY,EACZ,MAAoB;IAEpB,OAAO,CACL,GAAG,YAAY,YAAY;QAC3B,GAAG,CAAC,IAAI,KAAK,YAAY;QACzB,MAAM,EAAE,OAAO,KAAK,IAAI,CACzB,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,IAAI,CAAC;QACH,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,oBAAoB,CAClC,MAA+B,EAC/B,MAAc,EACd,MAAc;IAMd,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,MAAM,OAAO,GAAG,IAAI,GAAG,EAGpB,CAAC;IACJ,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;QACxB,IAAI,EAAE,CAAC,IAAI,KAAK,iBAAiB;YAAE,SAAS;QAC5C,IAAI,EAAE,CAAC,MAAM,KAAK,MAAM,IAAI,EAAE,CAAC,MAAM,KAAK,MAAM;YAAE,SAAS;QAC3D,IAAI,EAAE,CAAC,IAAI,KAAK,OAAO;YAAE,SAAS;QAClC,IAAI,EAAE,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC5B,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC;YAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI;gBAC9B,EAAE,EAAE,EAAE,CAAC,UAAU,IAAI,QAAQ,GAAG,EAAE;gBAClC,SAAS,EAAE,EAAE;aACd,CAAC;YACF,IAAI,EAAE,CAAC,UAAU;gBAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC;YAC1C,IAAI,EAAE,CAAC,QAAQ;gBAAE,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC;YACxC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC;YAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACtB,SAAS;QACX,CAAC;QACD,IAAI,EAAE,CAAC,IAAI,KAAK,WAAW;YAAE,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC;;YAC7C,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC;IAC1B,CAAC;IACD,MAAM,SAAS,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;SACrC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACjB,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,SAAS;QAC3B,SAAS,EAAE,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC;KAC5C,CAAC,CAAC,CAAC;IACN,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,uBAAuB,CAC9B,MAA+B,EAC/B,MAAc,EACd,MAAc;IAEd,OAAO,MAAM,CAAC,IAAI,CAChB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,mBAAmB;QAC9B,CAAC,CAAC,MAAM,KAAK,MAAM;QACnB,CAAC,CAAC,MAAM,KAAK,MAAM,CACtB,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CACjB,MAA+B,EAC/B,MAAc,EACd,MAAc;IAEd,OAAO,MAAM,CAAC,IAAI,CAChB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CACtE,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,MAA+B,EAAE,MAAc;IACjE,OAAO,MAAM,CAAC,IAAI,CAChB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CACpD,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAQrC;IACC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;IAE7D,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QACpF,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,MAAM,MAAM,GAAG,oBAAoB,CACjC,MAAM,EAAE,EACR,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,MAAM,CACb,CAAC;YACF,IACE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBACrB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE;gBACvB,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAC3B,CAAC;gBACD,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE;oBAClC,IAAI,EAAE,mBAAmB;oBACzB,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE;oBACf,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE;wBACzB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;wBACjC,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM;wBACzB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;wBACjC,CAAC,CAAC,EAAE,CAAC;oBACP,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE;YAClC,IAAI,EAAE,UAAU;YAChB,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE;YACf,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC,CAAC;IACL,CAAC;IAED,iFAAiF;IACjF,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE;QAChD,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,IAAI,EAAE,yBAAyB;KAChC,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QACxC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE;YAClC,IAAI,EAAE,UAAU;YAChB,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE;YACf,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;aAChD;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/node_modules/@xrkseek/core-agent-loop/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { type CompactionOptions, type SessionStore } from "@xrkseek/core-session";
 import { type ToolPipeline, type ToolRegistry } from "@xrkseek/core-tools";
-import { type LlmAdapter, type LlmChatRequest } from "@xrkseek/llm";
+import { type LlmAdapter, type LlmChatRequest, type ResolvedRetryPolicy } from "@xrkseek/llm";
 import type { MessageContent } from "@xrkseek/protocol";
 import { type ToolSettleMode } from "./settle-batch.js";
 export interface AssembleOptions {
@@ -8,6 +8,11 @@ export interface AssembleOptions {
     readonly mcpProtocol?: string;
     readonly owner?: string;
     readonly workspaceBlocks?: readonly string[];
+    /**
+     * Optional DSH `toolOrder` (exactly one `' '` rest). Forwarded to
+     * `assembleThreeLayers`; omit → lexicographic tool wire order.
+     */
+    readonly toolOrder?: readonly string[];
     /** When false, skip three-layer and use legacy system+history. Default true if assemble set. */
     readonly enabled?: boolean;
     /**
@@ -63,6 +68,12 @@ export interface RunTurnInput {
      * Pass `false` or omit to disable. Object enables auto + one overflow retry.
      */
     readonly compaction?: false | CompactionOptions;
+    /**
+     * Provider request retries within a step (DSH llm-retry).
+     * Default: normal mode, max 5, retryable EMPTY_RESPONSE / RATE_LIMIT /
+     * SERVER / TIMEOUT / TRANSPORT. Pass `false` to disable.
+     */
+    readonly llmRetry?: false | Partial<ResolvedRetryPolicy>;
 }
 export interface RunTurnResult {
     readonly turnId: string;

package/node_modules/@xrkseek/core-agent-loop/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/node_modules/@xrkseek/core-agent-loop/dist/index.js

@@ -1,13 +1,14 @@
-import { assertModelVisible, assertToolCallsSettled, deriveMessages, estimateMessagesTokens, settleDanglingTools, DEFAULT_COMPACTION_BUFFER_TOKENS, DEFAULT_COMPACTION_KEEP_TOKENS, } from "@xrkseek/core-session";
+import { assertModelVisible, assertToolCallsSettled, deriveMessages, estimateMessagesTokens, pruneOversizedToolResults, settleDanglingTools, DEFAULT_COMPACTION_BUFFER_TOKENS, DEFAULT_COMPACTION_KEEP_TOKENS, } from "@xrkseek/core-session";
 import { assembleThreeLayers, } from "@xrkseek/core-system-prompt";
 import { materializeTools, } from "@xrkseek/core-tools";
-import { isContextOverflowError, UnsupportedContentError, } from "@xrkseek/llm";
-import { contentHasImage, flattenText, parseSessionEvent, DEFAULT_PLAN_POLICY_SECTION, foldPlanMode, pendingPlanTarget, } from "@xrkseek/protocol";
+import { finalizeLlmChatResponse, isContextOverflowError, isEmptyResponseError, isIncompleteToolCallError, isLlmError, isProviderFinishError, isUnsupportedReasoningEffortError, UnsupportedContentError, } from "@xrkseek/llm";
+import { contentHasImage, flattenText, parseSessionEvent, parseTurnEndCancelCause, DEFAULT_PLAN_POLICY_SECTION, foldPlanMode, pendingPlanTarget, } from "@xrkseek/protocol";
 import { resolveCompactionOptions, runCompaction } from "./compaction.js";
 import { maybeAppendRequestHeader } from "./request-header-log.js";
 import { MAX_STEPS_PROMPT, MAX_STEPS_TOOL_DISABLED, } from "./max-steps.js";
 import { settleToolBatch } from "./settle-batch.js";
 import { finalizeCancelledTurn, isAbortError, } from "./cancel-finalize.js";
+import { invokeLlmWithRetry, resolveRetryPolicy, } from "./llm-retry.js";
 function id(prefix) {
     return `${prefix}_${Math.random().toString(36).slice(2, 10)}`;
 }
@@ -29,22 +30,34 @@ function llmAllowsImage(llm) {
     return (llm.inputModalities ?? ["text"]).includes("image");
 }
 function toLlmRequest(input, req) {
+    let reasoningEffort;
+    try {
+        reasoningEffort =
+            input.llm.ensureRoute?.()?.reasoningEffort ??
+                input.llm.peekRoute?.()?.reasoningEffort;
+    }
+    catch {
+        reasoningEffort = input.llm.peekRoute?.()?.reasoningEffort;
+    }
     return {
         messages: req.messages,
         ...(req.tools.length ? { tools: req.tools } : {}),
         ...(input.signal ? { signal: input.signal } : {}),
         ...(input.resolveImage ? { resolveImage: input.resolveImage } : {}),
+        ...(reasoningEffort !== undefined ? { reasoningEffort } : {}),
     };
 }
 async function invokeLlm(input, req, onChunk) {
     const request = toLlmRequest(input, req);
     if (!input.llm.stream) {
-        return input.llm.chat(request);
+        return finalizeLlmChatResponse(await input.llm.chat(request));
     }
     let content = "";
     let reasoning = "";
     let toolCalls;
     let usage;
+    let finishReason;
+    let finishError;
     for await (const ev of input.llm.stream(request)) {
         if (input.signal?.aborted) {
             throw new DOMException("aborted", "AbortError");
@@ -61,6 +74,16 @@ async function invokeLlm(input, req, onChunk) {
                 onChunk({ kind: "text", index: ev.index, text: ev.text });
             }
         }
+        else if (ev.type === "tool-call-delta") {
+            onChunk({
+                kind: "tool-call",
+                index: ev.index,
+                text: ev.argumentsDelta,
+                toolCallId: ev.id,
+                ...(ev.name ? { toolName: ev.name } : {}),
+                argumentsDelta: ev.argumentsDelta,
+            });
+        }
         else if (ev.type === "usage") {
             usage = ev.usage;
             onChunk({ kind: "usage", index: 0, text: "", usage: ev.usage });
@@ -73,14 +96,20 @@ async function invokeLlm(input, req, onChunk) {
                 toolCalls = ev.toolCalls;
             if (ev.usage)
                 usage = ev.usage;
+            if (ev.finishReason)
+                finishReason = ev.finishReason;
+            if (ev.finishError)
+                finishError = ev.finishError;
         }
     }
-    return {
+    return finalizeLlmChatResponse({
         content,
         ...(reasoning.trim() ? { reasoning } : {}),
         ...(toolCalls ? { toolCalls } : {}),
         ...(usage ? { usage } : {}),
-    };
+        ...(finishReason ? { finishReason } : {}),
+        ...(finishError ? { finishError } : {}),
+    });
 }
 function buildModelRequest(input) {
     const derived = deriveMessages(input.events);
@@ -148,6 +177,7 @@ function buildModelRequest(input) {
         includeCurrentMarker: input.firstStep === true,
         includeVolatileTime: input.firstStep === true,
         tools: toolDefs,
+        ...(input.assemble?.toolOrder ? { toolOrder: input.assemble.toolOrder } : {}),
         ...(input.assemble?.workspaceBlocks ||
             input.slashSystemExtra ||
             foldPlanMode(input.events)
@@ -223,6 +253,8 @@ export async function runTurn(input) {
         content: userContent,
     });
     let activeStepId;
+    /** Sticky: once any step hits max-tokens, the turn ends that way (DSH). */
+    let turnEndReason = { kind: "completed" };
     try {
         while (steps < maxSteps) {
             if (input.signal?.aborted) {
@@ -262,24 +294,37 @@ export async function runTurn(input) {
                     : {}),
             });
             let req = buildReq();
-            // Proactive compact when soft budget exceeded.
+            // Soft budget: prune only under pressure (DSH: below-pressure never prune),
+            // remeasure, then summarize only if still over.
             if (compaction?.auto !== false &&
                 compaction?.maxRequestTokens !== undefined) {
                 const buffer = compaction.bufferTokens ?? DEFAULT_COMPACTION_BUFFER_TOKENS;
-                const used = estimateMessagesTokens(req.messages);
-                if (used > compaction.maxRequestTokens - buffer) {
-                    const did = await runCompaction({
-                        store: input.store,
-                        sessionId: input.sessionId,
-                        llm: input.llm,
-                        reason: "auto",
-                        keepTokens: compaction.keepTokens ?? DEFAULT_COMPACTION_KEEP_TOKENS,
-                        turnId,
-                        ...(input.signal ? { signal: input.signal } : {}),
+                const softCeiling = compaction.maxRequestTokens - buffer;
+                let used = estimateMessagesTokens(req.messages);
+                if (used > softCeiling) {
+                    const pruned = pruneOversizedToolResults(input.store, input.sessionId, {
                         now,
+                        turnId,
+                        stepId,
                     });
-                    if (did.compacted)
+                    if (pruned.pruned > 0) {
                         req = buildReq();
+                        used = estimateMessagesTokens(req.messages);
+                    }
+                    if (used > softCeiling) {
+                        const did = await runCompaction({
+                            store: input.store,
+                            sessionId: input.sessionId,
+                            llm: input.llm,
+                            reason: "auto",
+                            keepTokens: compaction.keepTokens ?? DEFAULT_COMPACTION_KEEP_TOKENS,
+                            turnId,
+                            ...(input.signal ? { signal: input.signal } : {}),
+                            now,
+                        });
+                        if (did.compacted)
+                            req = buildReq();
+                    }
                 }
             }
             // Legacy invariant: logged history reconstructible (excluding ephemeral volatile).
@@ -309,6 +354,22 @@ export async function runTurn(input) {
                     });
                     return;
                 }
+                if (chunk.kind === "tool-call" && chunk.toolCallId) {
+                    const delta = chunk.argumentsDelta ?? chunk.text;
+                    append(input.store, input.sessionId, {
+                        type: "assistant/chunk",
+                        ts: now(),
+                        turnId,
+                        stepId,
+                        text: delta,
+                        kind: "tool-call",
+                        index: chunk.index,
+                        toolCallId: chunk.toolCallId,
+                        ...(chunk.toolName ? { toolName: chunk.toolName } : {}),
+                        argumentsDelta: delta,
+                    });
+                    return;
+                }
                 append(input.store, input.sessionId, {
                     type: "assistant/chunk",
                     ts: now(),
@@ -320,44 +381,114 @@ export async function runTurn(input) {
                 });
             };
             try {
-                response = await invokeLlm(input, req, onChunk);
+                response = await invokeLlmWithRetry({
+                    invoke: (onBuffered) => invokeLlm(input, req, onBuffered),
+                    flushChunk: onChunk,
+                    store: input.store,
+                    sessionId: input.sessionId,
+                    turnId,
+                    stepId,
+                    now,
+                    ...(input.signal ? { signal: input.signal } : {}),
+                    policy: resolveRetryPolicy(input.llmRetry),
+                    provider: input.llm.id,
+                });
             }
             catch (err) {
                 if (compaction &&
                     isContextOverflowError(err) &&
                     !overflowRecovered) {
                     overflowRecovered = true;
-                    const did = await runCompaction({
-                        store: input.store,
-                        sessionId: input.sessionId,
-                        llm: input.llm,
-                        reason: "overflow",
-                        keepTokens: compaction.keepTokens ?? DEFAULT_COMPACTION_KEEP_TOKENS,
-                        turnId,
-                        ...(input.signal ? { signal: input.signal } : {}),
+                    // Overflow: prune first, retry once; only summarize if still overflowing
+                    // (DSH compaction-basic: model-free prune before head reduction).
+                    const pruned = pruneOversizedToolResults(input.store, input.sessionId, {
                         now,
-                    });
-                    if (!did.compacted)
-                        throw err;
-                    req = buildReq();
-                    assertToolCallsSettled(input.store.get(input.sessionId).events);
-                    maybeAppendRequestHeader({
-                        store: input.store,
-                        sessionId: input.sessionId,
                         turnId,
-                        llm: input.llm,
-                        now,
-                        reason: "change",
-                        ...(req.system?.trim() ? { system: req.system } : {}),
-                        ...(req.tools.length ? { tools: req.tools } : {}),
+                        stepId,
                     });
-                    response = await invokeLlm(input, req, onChunk);
+                    if (pruned.pruned > 0) {
+                        req = buildReq();
+                        assertToolCallsSettled(input.store.get(input.sessionId).events);
+                        maybeAppendRequestHeader({
+                            store: input.store,
+                            sessionId: input.sessionId,
+                            turnId,
+                            llm: input.llm,
+                            now,
+                            reason: "change",
+                            ...(req.system?.trim() ? { system: req.system } : {}),
+                            ...(req.tools.length ? { tools: req.tools } : {}),
+                        });
+                        try {
+                            response = await invokeLlm(input, req, onChunk);
+                        }
+                        catch (retryErr) {
+                            if (!isContextOverflowError(retryErr))
+                                throw retryErr;
+                            const did = await runCompaction({
+                                store: input.store,
+                                sessionId: input.sessionId,
+                                llm: input.llm,
+                                reason: "overflow",
+                                keepTokens: compaction.keepTokens ?? DEFAULT_COMPACTION_KEEP_TOKENS,
+                                turnId,
+                                ...(input.signal ? { signal: input.signal } : {}),
+                                now,
+                            });
+                            if (!did.compacted)
+                                throw retryErr;
+                            req = buildReq();
+                            assertToolCallsSettled(input.store.get(input.sessionId).events);
+                            maybeAppendRequestHeader({
+                                store: input.store,
+                                sessionId: input.sessionId,
+                                turnId,
+                                llm: input.llm,
+                                now,
+                                reason: "change",
+                                ...(req.system?.trim() ? { system: req.system } : {}),
+                                ...(req.tools.length ? { tools: req.tools } : {}),
+                            });
+                            response = await invokeLlm(input, req, onChunk);
+                        }
+                    }
+                    else {
+                        const did = await runCompaction({
+                            store: input.store,
+                            sessionId: input.sessionId,
+                            llm: input.llm,
+                            reason: "overflow",
+                            keepTokens: compaction.keepTokens ?? DEFAULT_COMPACTION_KEEP_TOKENS,
+                            turnId,
+                            ...(input.signal ? { signal: input.signal } : {}),
+                            now,
+                        });
+                        if (!did.compacted)
+                            throw err;
+                        req = buildReq();
+                        assertToolCallsSettled(input.store.get(input.sessionId).events);
+                        maybeAppendRequestHeader({
+                            store: input.store,
+                            sessionId: input.sessionId,
+                            turnId,
+                            llm: input.llm,
+                            now,
+                            reason: "change",
+                            ...(req.system?.trim() ? { system: req.system } : {}),
+                            ...(req.tools.length ? { tools: req.tools } : {}),
+                        });
+                        response = await invokeLlm(input, req, onChunk);
+                    }
                 }
                 else {
                     throw err;
                 }
             }
             assistantText = response.content;
+            // DSH: max-tokens is sticky for the turn; keep/drop already stripped tools.
+            if (response.finishReason === "max-tokens") {
+                turnEndReason = { kind: "max-tokens" };
+            }
             append(input.store, input.sessionId, {
                 type: "assistant/message",
                 ts: now(),
@@ -424,7 +555,7 @@ export async function runTurn(input) {
                     call,
                 });
             }
-            const { outcomes } = await settleToolBatch({
+            const { outcomes, aborted: settleAborted } = await settleToolBatch({
                 calls,
                 registry: input.tools,
                 materialization: table,
@@ -469,6 +600,9 @@ export async function runTurn(input) {
                 batchContexts.push(...outcome.additionalContexts);
                 batchSafety.push(...outcome.safetyNotices);
             }
+            if (settleAborted || input.signal?.aborted) {
+                throw new DOMException("aborted", "AbortError");
+            }
             for (const notice of batchSafety) {
                 append(input.store, input.sessionId, {
                     type: "safety/notice",
@@ -495,12 +629,16 @@ export async function runTurn(input) {
                 stepId,
             });
             activeStepId = undefined;
+            // DSH: any successful tool with concludesTurn ends the turn at this step.
+            if (outcomes.some((o) => o.concludesTurn === true)) {
+                break;
+            }
         }
         append(input.store, input.sessionId, {
             type: "turn/end",
             ts: now(),
             turnId,
-            reason: { kind: "completed" },
+            reason: turnEndReason,
         });
         return { turnId, assistantText, steps, toolOk, toolFailed };
     }
@@ -512,6 +650,40 @@ export async function runTurn(input) {
                 turnId,
                 ...(activeStepId !== undefined ? { stepId: activeStepId } : {}),
                 now,
+                cancelCause: parseTurnEndCancelCause(input.signal?.reason),
+            });
+        }
+        else if (isEmptyResponseError(err) ||
+            isProviderFinishError(err) ||
+            isIncompleteToolCallError(err) ||
+            isUnsupportedReasoningEffortError(err) ||
+            isLlmError(err)) {
+            if (activeStepId !== undefined) {
+                append(input.store, input.sessionId, {
+                    type: "step/end",
+                    ts: now(),
+                    turnId,
+                    stepId: activeStepId,
+                });
+            }
+            const code = isProviderFinishError(err) ||
+                isEmptyResponseError(err) ||
+                isIncompleteToolCallError(err) ||
+                isUnsupportedReasoningEffortError(err) ||
+                isLlmError(err)
+                ? err.code
+                : "ERROR";
+            append(input.store, input.sessionId, {
+                type: "turn/end",
+                ts: now(),
+                turnId,
+                reason: {
+                    kind: "error",
+                    error: {
+                        message: err instanceof Error ? err.message : String(err),
+                        code,
+                    },
+                },
             });
         }
         throw err;