@sema-agent/core 1.450.0 → 1.452.0

package/dist/core/task-registry.js

@@ -1,6 +1,7 @@
 import { randomBytes } from "node:crypto";
 import { Type } from "typebox";
-import { defineTool } from "./tools.js";
+import { uuidv7 } from "../internal/harness.js";
+import { defineTool, errorResult } from "./tools.js";
 import { hasBackgroundShell } from "./background-shell.js";
 import { shutdownDebug } from "./shutdown-debug.js";
 import { summarizeWorkflowRun } from "./workflow-run-store.js";
@@ -8,6 +9,16 @@ import { canAccessAgentRecord, BackgroundAgentStoreError, } from "./background-a
 import { delimitUntrusted } from "./untrusted-text.js";
 import { boundedRedactedSummary } from "./untrusted-egress.js";
 import { clipWithFilePointer } from "./tool-errors.js";
+function mintCompletionId(target) {
+    if (target.completionId === undefined)
+        target.completionId = uuidv7();
+    return target.completionId;
+}
+function commitCompletionIdIfEmpty(target, value) {
+    if (target.completionId === undefined)
+        target.completionId = value;
+    return target.completionId;
+}
 const defaultMonitorTimers = {
     setInterval: (fn, ms) => {
         const h = setInterval(() => void fn(), ms);
@@ -49,6 +60,9 @@ export const MONITOR_DEFAULT_TIMEOUT_MS = 300_000;
 export const MONITOR_MAX_TIMEOUT_MS = 3_600_000;
 export const MONITOR_MAX_BATCHES_PER_MINUTE = 50;
 const MONITOR_EVENT_RESULT_CAP = 2_000;
+function clipMonitorEvent(s) {
+    return s.length <= MONITOR_EVENT_RESULT_CAP ? s : `${s.slice(0, MONITOR_EVENT_RESULT_CAP)}\n…[+${s.length - MONITOR_EVENT_RESULT_CAP} chars truncated]`;
+}
 const TASK_OUTPUT_DEFAULT_CHARS = 32_000;
 const TASK_OUTPUT_MAX_CHARS = 160_000;
 const TASK_OUTPUT_ALIASES = ["BashOutput", "AgentOutputTool", "BashOutputTool", "AgentOutput", "WorkflowStatus"];
@@ -79,6 +93,7 @@ function noTask(taskId) {
     return {
         content: JSON.stringify({ error: "task not found" }),
         details: { task_id: taskId, type: "unknown", status: "not_found", retrieval_status: "not_ready", error: "not_found" },
+        isError: true,
     };
 }
 export function normalizeAgentName(s) {
@@ -133,6 +148,7 @@ function noTaskForStop(taskId, enrich) {
     return {
         content,
         details: { task_id: taskId, type: "unknown", status: "not_found", retrieval_status: "not_ready", error: "not_found" },
+        isError: true,
     };
 }
 function bashTerminalResult(spool) {
@@ -163,6 +179,31 @@ function bashMirrorGapNote(handle) {
         ? " [!] The output file is INCOMPLETE (one or more writes to it failed) — trust the result text / TaskOutput over the file."
         : "";
 }
+function accountDroppedBytes(spool, poll) {
+    const d = poll.bytesDroppedBeforeCursor ?? 0;
+    if (d > 0)
+        spool.droppedBytes = (spool.droppedBytes ?? 0) + d;
+    else if (poll.truncated === true)
+        spool.dropUnknown = true;
+}
+function droppedGapNote(spool) {
+    if ((spool.droppedBytes ?? 0) > 0)
+        return ` [!] ${spool.droppedBytes} earlier byte(s) of output were permanently dropped before this window (execution-environment tail buffer evicted) — the event stream and this spool are INCOMPLETE.`;
+    if (spool.dropUnknown === true)
+        return " [!] An unknown amount of earlier output was permanently dropped before this window (execution-environment tail buffer evicted) — the event stream and this spool are INCOMPLETE.";
+    return "";
+}
+function firstDropNote(spool) {
+    if (spool.dropNotified === true)
+        return "";
+    const note = droppedGapNote(spool);
+    if (note !== "")
+        spool.dropNotified = true;
+    return note;
+}
+function alreadyTerminalStopNote(id, status) {
+    return `${id} already ${status} — nothing to stop; poll TaskOutput for its final state.`;
+}
 function monitorInTimeoutWindow(handle) {
     return handle.status === "running" && handle.deadlineAt !== undefined && handle.timers.now() < handle.deadlineAt;
 }
@@ -238,6 +279,19 @@ function formatWorkflowRun(run) {
             ...(overCap ? { agent_runs_note: `showing ${agentRows.length} of ${run.agents.length} agent rows (every non-completed row kept; completed rows trimmed).` } : {}),
             startedAt: run.startedAt,
             ...(run.endedAt !== undefined ? { endedAt: run.endedAt, elapsedMs: run.endedAt - run.startedAt } : {}),
+            ...(run.resume !== undefined
+                ? {
+                    resume: {
+                        from_run_id: run.resume.fromRunId,
+                        journal_entries: run.resume.journalEntries,
+                        replayed: run.resume.replayed,
+                        ...(run.resume.divergedAtOrdinal !== undefined
+                            ? { replay_stopped_at: run.resume.divergedAtOrdinal, replay_stopped_reason: run.resume.divergedReason }
+                            : {}),
+                    },
+                }
+                : {}),
+            ...(run.journalSkips !== undefined && run.journalSkips > 0 ? { journal_skipped: run.journalSkips } : {}),
             ...(run.status === "failed" && run.error ? { error: delimitUntrusted("workflow error", boundedRedactedSummary(run.error, 500)) } : {}),
             ...(run.status === "completed" && run.result !== undefined
                 ? { result: delimitUntrusted("workflow result", run.resultFull ?? run.result) }
@@ -268,6 +322,7 @@ function formatWorkflowRun(run) {
             type: "workflow",
             status: run.status,
             retrieval_status: "success",
+            ...(run.completionId !== undefined ? { completionId: run.completionId } : {}),
             details: summary,
         },
     };
@@ -762,6 +817,9 @@ export class TaskRegistry {
             return undefined;
         return handle.stoppedBy ?? handle.stopSource ?? "system";
     }
+    getCompletionId(id) {
+        return this.handles.get(id)?.completionId;
+    }
     parkBackgroundAgent(id, park) {
         const handle = this.handles.get(id);
         if (!handle || handle.type !== "background_agent")
@@ -819,8 +877,9 @@ export class TaskRegistry {
             handle.parkedCheckpointToken = undefined;
             handle.resolveParkedStop = undefined;
             handle.updatedAt = now;
+            mintCompletionId(handle);
             this.pokeBgQuiescence(handle.owner);
-            this.durableAgentWrite(handle, { status: "failed", error: handle.error, settledAt: now, stoppedBy: "system" }, ["parkedCheckpointToken", "parkClaimId", "parkedAt"]);
+            this.durableAgentWrite(handle, { status: "failed", error: handle.error, settledAt: now, stoppedBy: "system", completionId: handle.completionId }, ["parkedCheckpointToken", "parkClaimId", "parkedAt"]);
             liveFailed++;
         }
         const { reconcileParkedAgents: storeReconcile } = await import("./background-agent-store.js");
@@ -895,6 +954,7 @@ export class TaskRegistry {
             return "retry";
         }
         const now = Date.now();
+        const rollbackCompletionIdCandidate = uuidv7();
         const settleLocalParkedHandle = (error) => {
             const h = this.handles.get(ticket.handle);
             if (h !== undefined && h.type === "background_agent" && h.status === "parked") {
@@ -903,6 +963,7 @@ export class TaskRegistry {
                 h.parkedCheckpointToken = undefined;
                 h.resolveParkedStop = undefined;
                 h.updatedAt = now;
+                commitCompletionIdIfEmpty(h, rollbackCompletionIdCandidate);
                 this.pokeBgQuiescence(h.owner);
             }
         };
@@ -948,6 +1009,7 @@ export class TaskRegistry {
                         term.stoppedBy = "system";
                         term.settledAt = now;
                         term.updatedAt = now;
+                        term.completionId = rollbackCompletionIdCandidate;
                         delete term.parkedCheckpointToken;
                         delete term.parkClaimId;
                         delete term.parkedAt;
@@ -977,6 +1039,7 @@ export class TaskRegistry {
         failed.stoppedBy = "system";
         failed.settledAt = now;
         failed.updatedAt = now;
+        failed.completionId = rollbackCompletionIdCandidate;
         delete failed.parkedCheckpointToken;
         delete failed.parkClaimId;
         delete failed.parkedAt;
@@ -1053,6 +1116,7 @@ export class TaskRegistry {
         handle.parkedCheckpointToken = undefined;
         handle.resolveParkedStop = undefined;
         handle.updatedAt = Date.now();
+        handle.completionId = undefined;
         if (flipped.seq !== undefined)
             handle.cycleSeq = flipped.seq;
         return true;
@@ -1069,6 +1133,7 @@ export class TaskRegistry {
             return undefined;
         if (handle.status !== "running") {
             if (handle.status === "killed") {
+                mintCompletionId(handle);
                 let backfilled = false;
                 if (handle.result === undefined && outcome.result !== undefined && outcome.result !== "") {
                     handle.result = outcome.result;
@@ -1088,12 +1153,14 @@ export class TaskRegistry {
                         ...(handle.resultFull !== undefined ? { finalOutputFull: handle.resultFull } : {}),
                         ...(handle.resultIsPartial ? { resultIsPartial: true } : {}),
                         ...(handle.error !== undefined ? { error: handle.error } : {}),
+                        ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                     });
                 }
             }
             return handle.status === "completed" || handle.status === "failed" || handle.status === "killed" ? handle.status : undefined;
         }
         handle.status = outcome.status;
+        mintCompletionId(handle);
         handle.notify = undefined;
         for (const [, , qResolve] of handle.preAttachQueue ?? [])
             qResolve?.({ ok: false, reason: "not_running" });
@@ -1123,6 +1190,7 @@ export class TaskRegistry {
             ...(outcome.seq !== undefined ? { seq: outcome.seq } : {}),
             settledAt: Date.now(),
             ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+            ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
             ...(handle.result !== undefined ? { finalOutput: handle.result } : {}),
             ...(handle.resultFull !== undefined ? { finalOutputFull: handle.resultFull } : {}),
             ...(handle.resultIsPartial ? { resultIsPartial: true } : {}),
@@ -1195,6 +1263,7 @@ export class TaskRegistry {
                 handle.status = "killed";
                 handle.stoppedBy = handle.stopSource ?? source;
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 if (handle.outputFile !== undefined) {
                     try {
                         const drained = await handle.env.pollBackground(handle.shellId);
@@ -1221,6 +1290,7 @@ export class TaskRegistry {
                     stoppedBy: handle.stoppedBy,
                     summary: `${(handle.description ?? "background command").slice(0, 200)} — killed before completion (${clause(handle.stoppedBy)})${killFailed ? ` — kill attempt reported ${kill.ok ? "" : kill.error.code}: the process may still be terminating; the environment teardown retries` : ""}${bashMirrorGapNote(handle)}`,
                     ...(resultText.length > 0 ? { result: resultText, partial: true } : {}),
+                    ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                 }));
             }
             else {
@@ -1235,6 +1305,7 @@ export class TaskRegistry {
                 handle.status = "killed";
                 handle.stoppedBy = handle.stopSource ?? source;
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 const lastLines = handle.lineBuf !== "" ? [handle.lineBuf] : [];
                 handle.lineBuf = "";
                 this.notifyTerminalOnce(handle, () => handle.onEvent?.({
@@ -1245,6 +1316,7 @@ export class TaskRegistry {
                     stoppedBy: handle.stoppedBy,
                     summary: `${(handle.description ?? "monitor").slice(0, 200)} — killed before completion (${clause(handle.stoppedBy)}); watch ended.${killFailed ? ` Kill attempt reported ${kill.ok ? "" : kill.error.code}: the process may still be terminating; the environment teardown retries.` : ""}`,
                     ...(lastLines.length > 0 ? { lines: lastLines, result: lastLines.join("\n"), partial: true } : {}),
+                    ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                 }));
             }
             settled++;
@@ -1270,6 +1342,7 @@ export class TaskRegistry {
                 handle.status = "killed";
                 handle.stoppedBy = handle.stopSource ?? "system";
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 reaped++;
                 continue;
             }
@@ -1286,6 +1359,7 @@ export class TaskRegistry {
                 handle.status = "killed";
                 handle.stoppedBy = handle.stopSource ?? "system";
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 reaped++;
                 continue;
             }
@@ -1442,6 +1516,7 @@ export class TaskRegistry {
                         return;
                     handle.status = "failed";
                     handle.updatedAt = Date.now();
+                    mintCompletionId(handle);
                     stop();
                     const lostResult = bashTerminalResult(handle.spool);
                     this.notifyTerminalOnce(handle, () => onTerminal({
@@ -1452,11 +1527,13 @@ export class TaskRegistry {
                         status: "failed",
                         summary: `${(handle.description ?? "background command").slice(0, 200)} — lost its background process (${r.error.message}); no further output will arrive.${bashMirrorGapNote(handle)}`,
                         ...(lostResult.length > 0 ? { result: lostResult } : {}),
+                        ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                     }));
                     return;
                 }
                 pollFailures = 0;
                 const spool = handle.spool;
+                accountDroppedBytes(spool, r.value);
                 spool.stdout = roll(spool.stdout + r.value.stdout);
                 spool.stderr = roll(spool.stderr + r.value.stderr);
                 if (handle.outputFile !== undefined && (r.value.stdout.length > 0 || r.value.stderr.length > 0)) {
@@ -1470,6 +1547,7 @@ export class TaskRegistry {
                 }
                 handle.updatedAt = Date.now();
                 if (r.value.status !== "running") {
+                    mintCompletionId(handle);
                     spool.exitCode = r.value.exitCode;
                     if (r.value.timedOut === true) {
                         spool.timedOut = true;
@@ -1496,9 +1574,12 @@ export class TaskRegistry {
                                 ? r.value.timeoutSec !== undefined
                                     ? `${desc} — timed out after ${r.value.timeoutSec}s (its own background time budget); the process was killed`
                                     : `${desc} — timed out (its own background time budget); the process was killed`
-                                : `${desc} — ${r.value.status}`) + bashMirrorGapNote(handle),
+                                : `${desc} — ${r.value.status}`) +
+                            bashMirrorGapNote(handle) +
+                            droppedGapNote(spool),
                         ...(resultText.length > 0 ? { result: resultText } : {}),
                         ...(handle.status === "killed" && resultText.length > 0 ? { partial: true } : {}),
+                        ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                     }));
                 }
             }
@@ -1509,6 +1590,7 @@ export class TaskRegistry {
                     return;
                 handle.status = "failed";
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 stop();
                 const crashedResult = bashTerminalResult(handle.spool);
                 this.notifyTerminalOnce(handle, () => onTerminal({
@@ -1519,6 +1601,7 @@ export class TaskRegistry {
                     status: "failed",
                     summary: `${(handle.description ?? "background command").slice(0, 200)} — lost its background process (poll failed: ${e instanceof Error ? e.message : String(e)}); no further output will arrive.${bashMirrorGapNote(handle)}`,
                     ...(crashedResult.length > 0 ? { result: crashedResult } : {}),
+                    ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                 }));
             }
             finally {
@@ -1592,19 +1675,29 @@ export class TaskRegistry {
         this.startMonitorWatcher(id);
         return id;
     }
+    absorbMonitorPoll(handle, v) {
+        const spool = handle.spool;
+        accountDroppedBytes(spool, v);
+        const ROLL_CAP = 2 * TASK_OUTPUT_MAX_CHARS;
+        spool.stdout = rollSpoolText(spool, spool.stdout + v.stdout, ROLL_CAP);
+        spool.stderr = rollSpoolText(spool, spool.stderr + v.stderr, ROLL_CAP);
+        handle.lineBuf += v.stdout;
+        const parts = handle.lineBuf.split(/\r?\n/);
+        handle.lineBuf = parts.pop() ?? "";
+        return parts.filter((l) => l !== "");
+    }
+    emitMonitorEvent(handle, n) {
+        try {
+            handle.onEvent?.(n);
+        }
+        catch {
+        }
+    }
     startMonitorWatcher(id) {
         const handle = this.handles.get(id);
         if (!handle || handle.type !== "monitor")
             return;
         const timers = handle.timers;
-        const ROLL_CAP = 2 * TASK_OUTPUT_MAX_CHARS;
-        const roll = (s) => {
-            if (s.length <= ROLL_CAP)
-                return s;
-            const half = Math.floor(ROLL_CAP / 2);
-            handle.spool.rolledChars += s.length - 2 * half;
-            return s.slice(0, half) + s.slice(s.length - half);
-        };
         let ticking = false;
         const MAX_RETRYABLE_POLL_FAILURES = 3;
         let pollFailures = 0;
@@ -1614,14 +1707,7 @@ export class TaskRegistry {
                 handle.watcher = undefined;
             }
         };
-        const emit = (n) => {
-            try {
-                handle.onEvent?.(n);
-            }
-            catch {
-            }
-        };
-        const clipEvent = (s) => s.length <= MONITOR_EVENT_RESULT_CAP ? s : `${s.slice(0, MONITOR_EVENT_RESULT_CAP)}\n…[+${s.length - MONITOR_EVENT_RESULT_CAP} chars truncated]`;
+        const emit = (n) => this.emitMonitorEvent(handle, n);
         const pendingFinalLines = (lines) => {
             const out = handle.lineBuf !== "" ? [...lines, handle.lineBuf] : lines;
             handle.lineBuf = "";
@@ -1629,6 +1715,7 @@ export class TaskRegistry {
         };
         const terminal = (status, summary, finalLines) => {
             handle.updatedAt = Date.now();
+            mintCompletionId(handle);
             stop();
             this.notifyTerminalOnce(handle, () => emit({
                 task_id: id,
@@ -1636,14 +1723,16 @@ export class TaskRegistry {
                 ...(handle.toolUseId !== undefined ? { toolUseId: handle.toolUseId } : {}),
                 status,
                 ...(status === "killed" && handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
-                summary: `${(handle.description ?? "monitor").slice(0, 200)} — ${summary}`,
-                ...(finalLines.length > 0 ? { lines: finalLines, result: clipEvent(finalLines.join("\n")), ...(status === "killed" ? { partial: true } : {}) } : {}),
+                summary: `${(handle.description ?? "monitor").slice(0, 200)} — ${summary}${droppedGapNote(handle.spool)}`,
+                ...(finalLines.length > 0 ? { lines: finalLines, result: clipMonitorEvent(finalLines.join("\n")), ...(status === "killed" ? { partial: true } : {}) } : {}),
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
             }));
         };
         const tick = async () => {
             if (ticking)
                 return;
             ticking = true;
+            handle.tickInFlight = true;
             try {
                 if (this.handles.get(id) !== handle)
                     return stop();
@@ -1660,20 +1749,22 @@ export class TaskRegistry {
                 }
                 pollFailures = 0;
                 const spool = handle.spool;
-                spool.stdout = roll(spool.stdout + r.value.stdout);
-                spool.stderr = roll(spool.stderr + r.value.stderr);
-                handle.lineBuf += r.value.stdout;
-                const parts = handle.lineBuf.split(/\r?\n/);
-                handle.lineBuf = parts.pop() ?? "";
-                const lines = parts.filter((l) => l !== "");
+                const lines = this.absorbMonitorPoll(handle, r.value);
                 handle.status = statusFromBackground(r.value.status, r.value.exitCode);
                 if (r.value.status !== "running") {
                     spool.exitCode = r.value.exitCode;
                     if (handle.status === "killed" && handle.stoppedBy === undefined)
-                        handle.stoppedBy = handle.stopSource ?? "system";
+                        handle.stoppedBy = handle.stopSource ?? (r.value.timedOut === true ? "timeout" : "system");
+                    if (r.value.timedOut === true) {
+                        spool.timedOut = true;
+                        if (r.value.timeoutSec !== undefined)
+                            spool.timeoutSec = r.value.timeoutSec;
+                    }
                     const label = r.value.status === "exited"
                         ? `exited(code ${r.value.exitCode}); watch ended.`
-                        : `${r.value.status}; watch ended.`;
+                        : r.value.timedOut === true
+                            ? `timed out after ${r.value.timeoutSec !== undefined ? `${r.value.timeoutSec}s` : "its background time budget"} (the execution environment's background time budget); the process was killed and the watch ended.`
+                            : `${r.value.status}; watch ended.`;
                     return terminal(handle.status === "completed" ? "completed" : handle.status === "killed" ? "killed" : "failed", label, pendingFinalLines(lines));
                 }
                 const now = timers.now();
@@ -1721,8 +1812,8 @@ export class TaskRegistry {
                     status: "event",
                     seq: handle.seq,
                     lines,
-                    summary: `${(handle.description ?? "monitor").slice(0, 200)} — ${lines.length} new output line(s)`,
-                    result: clipEvent(lines.join("\n")),
+                    summary: `${(handle.description ?? "monitor").slice(0, 200)} — ${lines.length} new output line(s)${firstDropNote(spool)}`,
+                    result: clipMonitorEvent(lines.join("\n")),
                 });
             }
             catch (e) {
@@ -1735,6 +1826,7 @@ export class TaskRegistry {
             }
             finally {
                 ticking = false;
+                handle.tickInFlight = undefined;
             }
         };
         handle.watcher = timers.setInterval(tick, handle.batchWindowMs);
@@ -1769,11 +1861,18 @@ export class TaskRegistry {
             const r = run?.resultFull ?? run?.result;
             if (typeof r === "string")
                 handle.result = r;
+            if (run?.completionId !== undefined)
+                handle.completionId = run.completionId;
             handle.updatedAt = Date.now();
         }, (err) => {
             if (handle.status !== "cancelled")
                 handle.status = "failed";
             handle.error = boundedRedactedSummary(err instanceof Error ? err.message : String(err), 500);
+            const rejectedRun = err !== null && (typeof err === "object" || typeof err === "function")
+                ? err.workflowRun
+                : undefined;
+            if (rejectedRun?.completionId !== undefined)
+                handle.completionId = rejectedRun.completionId;
             handle.updatedAt = Date.now();
         });
         return id;
@@ -1825,6 +1924,7 @@ export class TaskRegistry {
 The durable record is still marked running (last update ${new Date(row.updatedAt).toISOString()}), but this engine instance is not executing it — the outcome is unknown here. If its host process is gone, a retention sweep (staleRunningMaxAgeMs) settles the record as interrupted.`;
                     return {
                         content: delimitUntrusted(`TaskOutput ${row.handle}`, body),
+                        isError: true,
                         details: {
                             task_id: row.handle,
                             type: "background_agent",
@@ -1867,6 +1967,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 ...(row.status === "killed" && row.stoppedBy !== undefined ? { stoppedBy: row.stoppedBy } : {}),
                 ...(row.seq !== undefined ? { seq: row.seq } : {}),
                 ...(row.resultIsPartial ? { partial_result: true } : {}),
+                ...(row.completionId !== undefined ? { completionId: row.completionId } : {}),
             },
         };
     }
@@ -1917,7 +2018,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                         ? `${row.handle} is not attached to this engine instance; cannot stop it here. If its host process is gone, a retention sweep (staleRunningMaxAgeMs) settles it as interrupted.`
                         : row.status === "parked"
                             ? `${row.handle} is parked on a pending approval — stop it by deciding (deny/expire) the pending approval in the durable approval inbox.`
-                            : `${row.handle} already ${row.status} — nothing to stop; poll TaskOutput for its final state.`,
+                            : alreadyTerminalStopNote(row.handle, row.status),
                     details: {
                         task_id: row.handle,
                         type: "background_agent",
@@ -1929,13 +2030,14 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 };
             }
         }
-        const byName = this.resolveBackgroundAgentByName(taskId, access);
+        const byName = this.resolveBackgroundAgentByName(taskId, access, { preferRunning: true });
         if (byName.status === "found")
             return this.stopBackgroundAgent(byName.handle);
         if (byName.status === "ambiguous") {
             return {
                 content: byName.message,
                 details: { task_id: taskId, retrieval_status: "not_ready", error: "ambiguous" },
+                isError: true,
             };
         }
         return noTaskForStop(taskId, {
@@ -1943,7 +2045,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
             runningAgents: this.runningBackgroundAgentLabels(access),
         });
     }
-    resolveBackgroundAgentByName(name, access) {
+    resolveBackgroundAgentByName(name, access, opts) {
         const key = normalizeAgentName(name);
         if (key === "")
             return { status: "not_found" };
@@ -1961,6 +2063,17 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
             if (h.name === name || normalizeAgentName(h.name) === key)
                 named.push(h);
         }
+        if (opts?.preferRunning === true) {
+            const namedRunning = named.filter((h) => h.status === "running");
+            if (namedRunning.length > 1) {
+                return {
+                    status: "ambiguous",
+                    message: `Multiple RUNNING background agents match "${name}": ${namedRunning.map((h) => `${h.id} (${h.name ?? h.description ?? "unnamed"})`).join(", ")}. Use the task ID.`,
+                };
+            }
+            if (namedRunning.length === 1)
+                return { status: "found", handle: namedRunning[0] };
+        }
         const namedWinner = latestOf(named);
         if (namedWinner !== undefined)
             return { status: "found", handle: namedWinner };
@@ -2038,10 +2151,11 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
         handle.error = undefined;
         handle.resultIsPartial = undefined;
         handle.stopSource = undefined;
+        handle.completionId = undefined;
         handle.reviveCycle = (handle.reviveCycle ?? 0) + 1;
         handle.cycleSeq = (handle.cycleSeq ?? 1) + 1;
         handle.updatedAt = Date.now();
-        this.durableAgentWrite(handle, { status: "running" }, ["settledAt", "stoppedBy", "finalOutput", "finalOutputFull", "error", "resultIsPartial", "summary", "recentSteps", "editedFiles", "usage"]);
+        this.durableAgentWrite(handle, { status: "running" }, ["settledAt", "stoppedBy", "finalOutput", "finalOutputFull", "error", "resultIsPartial", "completionId", "summary", "recentSteps", "editedFiles", "usage"]);
         return { ok: true, cycle: handle.reviveCycle };
     }
     settleRevivedAgent(id, cycle, outcome) {
@@ -2277,6 +2391,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 return {
                     content: `Error (TaskOutput): invalid filter regex: ${filter}`,
                     details: { task_id: handle.id, type: "background_bash", status: handle.status, retrieval_status: "not_ready" },
+                    isError: true,
                 };
             }
         }
@@ -2293,7 +2408,13 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
             const timedOutClause = spool.timedOut === true ? ` (timed out after ${spool.timeoutSec !== undefined ? `${spool.timeoutSec}s` : "its background time budget"})` : "";
             const displayStatus = (spool.exitCode !== undefined ? `exited(code ${spool.exitCode})` : running ? "running" : handle.status) + timedOutClause;
             const rolledNote = spool.rolledChars > 0 ? `[!] ${spool.rolledChars} earlier char(s) dropped from the spool (memory bound)\n` : "";
-            const body = `status: ${displayStatus}\n${rolledNote}--- stdout (full, re-readable) ---\n${shape(spool.stdout) || "(none)"}\n` +
+            const droppedNote = (spool.droppedBytes ?? 0) > 0
+                ? `[!] ${spool.droppedBytes} earlier byte(s) permanently dropped before this window (8MB buffer evicted)\n`
+                : spool.dropUnknown === true
+                    ? "[!] an unknown amount of earlier output was permanently dropped before this window (buffer evicted)\n"
+                    : "";
+            const stdoutHeading = droppedNote !== "" ? "stdout (re-readable spool — INCOMPLETE, see note above)" : "stdout (full, re-readable)";
+            const body = `status: ${displayStatus}\n${rolledNote}${droppedNote}--- ${stdoutHeading} ---\n${shape(spool.stdout) || "(none)"}\n` +
                 `--- stderr ---\n${shape(spool.stderr) || "(none)"}`;
             return {
                 content: delimitUntrusted(`TaskOutput ${handle.id}`, body),
@@ -2303,9 +2424,11 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                     status: handle.status,
                     retrieval_status: retrieval,
                     ...(handle.status === "killed" && handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                    ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                     details: {
                         status: running ? "running" : handle.status,
                         exitCode: spool.exitCode,
+                        ...(spool.droppedBytes !== undefined ? { bytesDroppedBeforeCursor: spool.droppedBytes } : {}),
                         ...(spool.timedOut === true ? { timedOut: true, ...(spool.timeoutSec !== undefined ? { timeoutSec: spool.timeoutSec } : {}) } : {}),
                     },
                 },
@@ -2335,6 +2458,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 return {
                     content: `Error (TaskOutput): ${r.error.message}${salvaged}`,
                     details: { task_id: handle.id, type: "background_bash", status: handle.status, retrieval_status, error: r.error.code },
+                    isError: true,
                 };
             }
             stdout = roll(stdout + r.value.stdout);
@@ -2345,6 +2469,8 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 handle.stoppedBy = handle.stopSource ?? (r.value.timedOut === true ? "timeout" : "system");
             handle.updatedAt = Date.now();
             const running = r.value.status === "running";
+            if (!running)
+                mintCompletionId(handle);
             if (!running || deadline === undefined || Date.now() >= deadline || signal?.aborted) {
                 const retrieval = running && deadline !== undefined && Date.now() >= deadline ? "timeout" : "success";
                 const shape = (text) => clipTaskOutput(rx ? text.split(/\r?\n/).filter((l) => rx.test(l)).join("\n") : text, handle.outputFile);
@@ -2362,6 +2488,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                         status: handle.status,
                         retrieval_status: retrieval,
                         ...(handle.status === "killed" && handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                        ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                         details: {
                             status: r.value.status,
                             exitCode: r.value.exitCode,
@@ -2435,10 +2562,12 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 type: "workflow",
                 status: handle.status,
                 retrieval_status: handle.status === "running" && deadline !== undefined && Date.now() >= deadline ? "timeout" : "success",
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
             },
         };
     }
     async stopBackgroundBash(handle) {
+        const wasRunning = handle.status === "running";
         if (handle.watcher !== undefined) {
             clearInterval(handle.watcher);
             handle.watcher = undefined;
@@ -2447,8 +2576,15 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
         const r = await handle.env.killBackground(handle.shellId);
         if (handle.status !== "running") {
             return {
-                content: `Terminated ${handle.id}.`,
-                details: { task_id: handle.id, type: "background_bash", status: handle.status, retrieval_status: "success", ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}) },
+                content: wasRunning ? `Terminated ${handle.id}.` : alreadyTerminalStopNote(handle.id, handle.status),
+                details: {
+                    task_id: handle.id,
+                    type: "background_bash",
+                    status: handle.status,
+                    retrieval_status: "success",
+                    ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                    ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
+                },
             };
         }
         if (!r.ok) {
@@ -2457,10 +2593,18 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                     handle.stoppedBy = handle.stopSource ?? "parent";
                 handle.status = "killed";
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 this.pokeBgQuiescence(handle.owner);
                 return {
                     content: `Terminated ${handle.id} (the process was already gone).`,
-                    details: { task_id: handle.id, type: "background_bash", status: "killed", retrieval_status: "success", stoppedBy: handle.stoppedBy },
+                    details: {
+                        task_id: handle.id,
+                        type: "background_bash",
+                        status: "killed",
+                        retrieval_status: "success",
+                        stoppedBy: handle.stoppedBy,
+                        ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
+                    },
                 };
             }
             const restored = handle.onTerminal !== undefined;
@@ -2471,16 +2615,25 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 content: `Error (TaskStop): ${r.error.message} — the kill did not land; the process may still be running.` +
                     (restored ? " Its watcher keeps running: TaskOutput still works and the completion notification will still fire." : " TaskOutput still reflects its live status."),
                 details: { task_id: handle.id, type: "background_bash", status: handle.status, retrieval_status, error: r.error.code },
+                isError: true,
             };
         }
         if (handle.stoppedBy === undefined)
             handle.stoppedBy = handle.stopSource ?? "parent";
         handle.status = "killed";
         handle.updatedAt = Date.now();
+        mintCompletionId(handle);
         this.pokeBgQuiescence(handle.owner);
         return {
             content: `Terminated ${handle.id}.`,
-            details: { task_id: handle.id, type: "background_bash", status: "killed", retrieval_status: "success", stoppedBy: handle.stoppedBy },
+            details: {
+                task_id: handle.id,
+                type: "background_bash",
+                status: "killed",
+                retrieval_status: "success",
+                stoppedBy: handle.stoppedBy,
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
+            },
         };
     }
     async pollMonitor(handle, filter, deadline, signal) {
@@ -2493,6 +2646,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 return {
                     content: `Error (TaskOutput): invalid filter regex: ${filter}`,
                     details: { task_id: handle.id, type: "monitor", status: handle.status, retrieval_status: "not_ready" },
+                    isError: true,
                 };
             }
         }
@@ -2503,9 +2657,17 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
         const shape = (text) => clipTaskOutput(rx ? text.split(/\r?\n/).filter((l) => rx.test(l)).join("\n") : text, handle.outputFile);
         const running = handle.status === "running";
         const retrieval = running && deadline !== undefined && Date.now() >= deadline ? "timeout" : "success";
-        const displayStatus = spool.exitCode !== undefined ? `exited(code ${spool.exitCode})` : running ? "running" : handle.status;
+        const timedOutClause = spool.timedOut === true ? ` (timed out after ${spool.timeoutSec !== undefined ? `${spool.timeoutSec}s` : "its background time budget"})` : "";
+        const displayStatus = (spool.exitCode !== undefined ? `exited(code ${spool.exitCode})` : running ? "running" : handle.status) + timedOutClause;
         const rolledNote = spool.rolledChars > 0 ? `[!] ${spool.rolledChars} earlier char(s) dropped from the spool (memory bound)\n` : "";
-        const body = `status: ${displayStatus}\n${rolledNote}--- stdout (full, re-readable) ---\n${shape(spool.stdout) || "(none)"}\n` +
+        const droppedNote = (spool.droppedBytes ?? 0) > 0
+            ? `[!] ${spool.droppedBytes} earlier byte(s) permanently dropped before this window (8MB buffer evicted)\n`
+            : spool.dropUnknown === true
+                ? "[!] an unknown amount of earlier output was permanently dropped before this window (buffer evicted)\n"
+                : "";
+        const drainNote = spool.drainFailed === true ? "[!] the final output drain at stop failed — the tail of the output may be missing\n" : "";
+        const stdoutHeading = droppedNote !== "" || drainNote !== "" ? "stdout (re-readable spool — INCOMPLETE, see note above)" : "stdout (full, re-readable)";
+        const body = `status: ${displayStatus}\n${rolledNote}${droppedNote}${drainNote}--- ${stdoutHeading} ---\n${shape(spool.stdout) || "(none)"}\n` +
             `--- stderr ---\n${shape(spool.stderr) || "(none)"}`;
         return {
             content: delimitUntrusted(`TaskOutput ${handle.id}`, body),
@@ -2515,21 +2677,66 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 status: handle.status,
                 retrieval_status: retrieval,
                 ...(handle.status === "killed" && handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
-                details: { status: running ? "running" : handle.status, exitCode: spool.exitCode },
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
+                details: {
+                    status: running ? "running" : handle.status,
+                    exitCode: spool.exitCode,
+                    ...(spool.droppedBytes !== undefined ? { bytesDroppedBeforeCursor: spool.droppedBytes } : {}),
+                    ...(spool.timedOut === true ? { timedOut: true, ...(spool.timeoutSec !== undefined ? { timeoutSec: spool.timeoutSec } : {}) } : {}),
+                },
             },
         };
     }
     async stopMonitor(handle) {
+        const wasRunning = handle.status === "running";
         if (handle.watcher !== undefined) {
             handle.timers.clearInterval(handle.watcher);
             handle.watcher = undefined;
         }
+        if (wasRunning && handle.tickInFlight !== true) {
+            try {
+                const drained = await handle.env.pollBackground(handle.shellId);
+                if (drained.ok) {
+                    const lines = this.absorbMonitorPoll(handle, drained.value);
+                    const finalLines = handle.lineBuf !== "" ? [...lines, handle.lineBuf] : lines;
+                    handle.lineBuf = "";
+                    if (finalLines.length > 0 && handle.status === "running") {
+                        handle.seq += 1;
+                        handle.updatedAt = Date.now();
+                        this.emitMonitorEvent(handle, {
+                            task_id: handle.id,
+                            task_type: "monitor",
+                            ...(handle.toolUseId !== undefined ? { toolUseId: handle.toolUseId } : {}),
+                            status: "event",
+                            seq: handle.seq,
+                            lines: finalLines,
+                            summary: `${(handle.description ?? "monitor").slice(0, 200)} — ${finalLines.length} final output line(s) drained at stop${firstDropNote(handle.spool)}`,
+                            result: clipMonitorEvent(finalLines.join("\n")),
+                        });
+                    }
+                }
+                else {
+                    handle.spool.drainFailed = true;
+                }
+            }
+            catch {
+                handle.spool.drainFailed = true;
+            }
+        }
+        const drainNote = handle.spool.drainFailed === true ? " (the final output drain failed — TaskOutput may be missing the last window)" : "";
         this.markStopSource(handle.id, "parent");
         const r = await handle.env.killBackground(handle.shellId);
         if (handle.status !== "running") {
             return {
-                content: `Terminated ${handle.id}.`,
-                details: { task_id: handle.id, type: "monitor", status: handle.status, retrieval_status: "success", ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}) },
+                content: wasRunning ? `Terminated ${handle.id}.${drainNote}` : alreadyTerminalStopNote(handle.id, handle.status),
+                details: {
+                    task_id: handle.id,
+                    type: "monitor",
+                    status: handle.status,
+                    retrieval_status: "success",
+                    ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                    ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
+                },
             };
         }
         if (!r.ok) {
@@ -2538,10 +2745,18 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                     handle.stoppedBy = handle.stopSource ?? "parent";
                 handle.status = "killed";
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 this.pokeBgQuiescence(handle.owner);
                 return {
-                    content: `Terminated ${handle.id} (the process was already gone).`,
-                    details: { task_id: handle.id, type: "monitor", status: "killed", retrieval_status: "success", stoppedBy: handle.stoppedBy },
+                    content: `Terminated ${handle.id} (the process was already gone).${drainNote}`,
+                    details: {
+                        task_id: handle.id,
+                        type: "monitor",
+                        status: "killed",
+                        retrieval_status: "success",
+                        stoppedBy: handle.stoppedBy,
+                        ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
+                    },
                 };
             }
             if (handle.watcher === undefined)
@@ -2549,6 +2764,7 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
             const retrieval_status = r.error.code === "timeout" ? "timeout" : "not_ready";
             return {
                 content: `Error (TaskStop): ${r.error.message} — the kill did not land; the process may still be running. The watch keeps running: events and the terminal notification still fire.`,
+                isError: true,
                 details: { task_id: handle.id, type: "monitor", status: handle.status, retrieval_status, error: r.error.code },
             };
         }
@@ -2557,16 +2773,18 @@ ${clipTaskOutput(row.finalOutputFull ?? row.finalOutput)}` : "(no result text)"}
                 handle.stoppedBy = handle.stopSource ?? "parent";
             handle.status = "killed";
             handle.updatedAt = Date.now();
+            mintCompletionId(handle);
             this.pokeBgQuiescence(handle.owner);
         }
         return {
-            content: `Terminated ${handle.id}.`,
+            content: `Terminated ${handle.id}.${drainNote}`,
             details: {
                 task_id: handle.id,
                 type: "monitor",
                 status: handle.status,
                 retrieval_status: "success",
                 ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
             },
         };
     }
@@ -2606,10 +2824,12 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
                 ...(handle.cycleSeq !== undefined ? { seq: handle.cycleSeq } : {}),
                 ...(handle.status === "killed" && handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
                 ...(handle.resultIsPartial ? { partial_result: true } : {}),
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
             },
         };
     }
     async stopBackgroundAgent(handle) {
+        const entryStatus = handle.status;
         if (handle.status === "parked") {
             const arbiter = handle.resolveParkedStop;
             if (arbiter === undefined) {
@@ -2632,6 +2852,7 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
                 handle.status = "killed";
                 handle.stoppedBy = handle.stopSource ?? "parent";
                 handle.updatedAt = Date.now();
+                mintCompletionId(handle);
                 handle.parkedCheckpointToken = undefined;
                 handle.resolveParkedStop = undefined;
                 this.pokeBgQuiescence(handle.owner);
@@ -2657,7 +2878,12 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
                         }
                     }
                 }
-                this.durableAgentWrite(handle, { status: "killed", settledAt: Date.now(), ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}) }, ["parkedCheckpointToken", "parkClaimId"]);
+                this.durableAgentWrite(handle, {
+                    status: "killed",
+                    settledAt: Date.now(),
+                    ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                    ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
+                }, ["parkedCheckpointToken", "parkClaimId"]);
                 return {
                     content: `Terminated ${handle.id} (pending approval expired).`,
                     details: {
@@ -2667,6 +2893,7 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
                         retrieval_status: "success",
                         ...(handle.cycleSeq !== undefined ? { seq: handle.cycleSeq } : {}),
                         ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                        ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
                     },
                 };
             }
@@ -2674,11 +2901,13 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
                 return {
                     content: `${handle.id} was not stopped: the approval arbitration store was unreachable — the row stays parked; retry the stop.`,
                     details: { task_id: handle.id, type: "background_agent", status: handle.status, retrieval_status: "not_ready", error: "park_arbiter_unreachable" },
+                    isError: true,
                 };
             }
             return {
                 content: `${handle.id} was not stopped: its pending approval was already consumed (a resume won the arbitration).`,
                 details: { task_id: handle.id, type: "background_agent", status: handle.status, retrieval_status: "not_ready", error: "park_resume_won" },
+                isError: true,
             };
         }
         if (handle.status === "running") {
@@ -2687,6 +2916,7 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
             handle.status = "killed";
             handle.stoppedBy = handle.stopSource ?? "parent";
             handle.updatedAt = Date.now();
+            mintCompletionId(handle);
             handle.notify = undefined;
             for (const [, , qResolve] of handle.preAttachQueue ?? [])
                 qResolve?.({ ok: false, reason: "not_running" });
@@ -2699,10 +2929,11 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
                 status: "killed",
                 settledAt: Date.now(),
                 ...(handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
             });
         }
         return {
-            content: `Terminated ${handle.id}.`,
+            content: entryStatus === "running" ? `Terminated ${handle.id}.` : alreadyTerminalStopNote(handle.id, handle.status),
             details: {
                 task_id: handle.id,
                 type: "background_agent",
@@ -2710,6 +2941,7 @@ ${clipTaskOutput(handle.resultFull ?? handle.result, handle.outputFile)}` : "(no
                 retrieval_status: "success",
                 ...(handle.cycleSeq !== undefined ? { seq: handle.cycleSeq } : {}),
                 ...(handle.status === "killed" && handle.stoppedBy !== undefined ? { stoppedBy: handle.stoppedBy } : {}),
+                ...(handle.completionId !== undefined ? { completionId: handle.completionId } : {}),
             },
         };
     }
@@ -2765,7 +2997,7 @@ export function createTaskOutputTool(opts) {
             const args = rawArgs;
             const id = firstString(args.task_id, args.bash_id, args.runId);
             if (!id)
-                return "Error (TaskOutput): Missing required parameter: task_id";
+                return errorResult("Error (TaskOutput): Missing required parameter: task_id");
             const requestedMs = typeof args.timeout === "number" ? args.timeout : undefined;
             let effectiveTimeoutMs = requestedMs;
             let waitClampNote = "";
@@ -2792,7 +3024,11 @@ export function createTaskOutputTool(opts) {
                 signal: ctx.signal,
             });
             const { type: taskType, ...rest } = r.details;
-            return { content: r.content + waitClampNote, details: { type: "task-output", ...(taskType !== undefined ? { taskType } : {}), ...(waitClampNote !== "" ? { waitClamped: true } : {}), ...rest } };
+            return {
+                content: r.content + waitClampNote,
+                details: { type: "task-output", ...(taskType !== undefined ? { taskType } : {}), ...(waitClampNote !== "" ? { waitClamped: true } : {}), ...rest },
+                ...(r.isError ? { isError: true } : {}),
+            };
         },
     });
 }
@@ -2815,12 +3051,13 @@ export function createTaskStopTool(opts) {
             const args = rawArgs;
             const id = firstString(args.task_id, args.shell_id, args.runId);
             if (!id)
-                return "Missing required parameter: task_id";
+                return errorResult("Missing required parameter: task_id");
             const r = await opts.registry.stopTask(id, { owner: ctx.taskId ?? opts.owner, scope: ctx.principal ?? opts.scope, ...((ctx.sessionId ?? opts.sessionId) !== undefined ? { sessionId: ctx.sessionId ?? opts.sessionId } : {}) }, { workflowStore: opts.workflowStore, agentStore: opts.agentStore });
             const { type: taskType, ...rest } = r.details;
             return {
                 content: r.content,
                 details: { type: "task-stop", message: r.content, task_type: taskType ?? "unknown", ...rest },
+                ...(r.isError ? { isError: true } : {}),
             };
         },
     });