@markusylisiurunen/tau 0.3.33 → 0.3.35

package/dist/core/session/runner.js

@@ -1,5 +1,20 @@
 import { MessageAccumulator } from "./message_accumulator.js";
 const ASSISTANT_PARTIAL_MIN_INTERVAL_MS = 33;
+export class ProviderStreamError extends Error {
+    providerError;
+    constructor(providerError) {
+        super(providerError instanceof Error
+            ? providerError.message
+            : providerError &&
+                typeof providerError === "object" &&
+                "errorMessage" in providerError &&
+                typeof providerError.errorMessage === "string"
+                ? providerError.errorMessage
+                : String(providerError));
+        this.providerError = providerError;
+        this.name = "ProviderStreamError";
+    }
+}
 function getStreamingToolCallIdentity(event) {
     const content = event.partial.content[event.contentIndex];
     if (content?.type !== "toolCall" || !content.id.trim() || !content.name.trim()) {
@@ -11,7 +26,13 @@ export async function* runModelSubturn(options) {
     const { model, context, streamModel, streamOptions, signal, emitPartials, retry } = options;
     let hasEmittedCompletedToolCall = false;
     const runAttempt = async function* (attemptOptions) {
-        const stream = streamModel(context, attemptOptions);
+        let stream;
+        try {
+            stream = streamModel(context, attemptOptions);
+        }
+        catch (error) {
+            throw new ProviderStreamError(error);
+        }
         const accumulator = emitPartials ? new MessageAccumulator() : undefined;
         let lastPartialEmittedAt = 0;
         let hasPendingPartial = false;
@@ -69,8 +90,51 @@ export async function* runModelSubturn(options) {
             yield { type: "assistant_partial", snapshot };
             lastPartialEmittedAt = Date.now();
         };
+        const streamIterator = stream[Symbol.asyncIterator]();
+        const readStreamEvent = async () => {
+            try {
+                return { type: "stream_event", result: await streamIterator.next() };
+            }
+            catch (error) {
+                throw new ProviderStreamError(error);
+            }
+        };
+        let pendingStreamEvent;
         try {
-            for await (const event of stream) {
+            while (true) {
+                pendingStreamEvent ??= readStreamEvent();
+                let next;
+                if (accumulator && hasPendingPartial && lastPartialEmittedAt !== 0) {
+                    const delayMs = Math.max(0, ASSISTANT_PARTIAL_MIN_INTERVAL_MS - (Date.now() - lastPartialEmittedAt));
+                    if (delayMs === 0) {
+                        yield* emitPartialIfPending();
+                        continue;
+                    }
+                    let timer;
+                    const partialFlush = new Promise((resolve) => {
+                        timer = setTimeout(() => resolve({ type: "partial_flush" }), delayMs);
+                    });
+                    try {
+                        next = await Promise.race([pendingStreamEvent, partialFlush]);
+                    }
+                    finally {
+                        if (timer) {
+                            clearTimeout(timer);
+                        }
+                    }
+                }
+                else {
+                    next = await pendingStreamEvent;
+                }
+                if (next.type === "partial_flush") {
+                    yield* emitPartialIfPending();
+                    continue;
+                }
+                if (next.result.done) {
+                    break;
+                }
+                pendingStreamEvent = undefined;
+                const event = next.result.value;
                 if (accumulator && event.type !== "toolcall_end") {
                     accumulator.processEvent(event);
                 }
@@ -153,11 +217,19 @@ export async function* runModelSubturn(options) {
             }
             throw error;
         }
+        finally {
+            await streamIterator.return?.();
+        }
         yield* emitPartialIfPending();
         for (const discarded of discardStreamingToolCalls()) {
             yield discarded;
         }
-        return await stream.result();
+        try {
+            return await stream.result();
+        }
+        catch (error) {
+            throw new ProviderStreamError(error);
+        }
     };
     const retryNotice = retry?.notice
         ? {
@@ -211,9 +283,10 @@ export async function* runModelSubturn(options) {
             return result;
         }
         catch (error) {
-            if (!hasEmittedCompletedToolCall &&
+            if (error instanceof ProviderStreamError &&
+                !hasEmittedCompletedToolCall &&
                 attempt < maxRetries &&
-                retry?.shouldRetryAfterError?.({ error, model })) {
+                retry?.shouldRetryAfterError?.({ error: error.providerError, model })) {
                 attempt += 1;
                 retry?.onRetry?.();
                 yield { type: "model_retry_scheduled", attempt, delayMs };

package/dist/core/session/runner.js.map

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

package/dist/core/subagents/agent_supervisor.js

@@ -2,11 +2,20 @@ import { randomUUID } from "node:crypto";
 import { AgentRuntime, createAgentSpec } from "../agent/agent_runtime.js";
 import { resolveAgentModel } from "../runtime/agent_model.js";
 import { createDefaultCoreDeps } from "../runtime/deps.js";
+import { createAutoCompactionArchiver } from "../session/auto_compaction_archive.js";
 import { ToolCatalog } from "../tools/catalog.js";
 import { appendUsageLogEntry, getUsageCostTotal, getUsageTotals, } from "../usage/logs.js";
 import { extractAssistantText } from "../utils/messages.js";
-import { extractAssistantTextForProgress, formatToolUiEventForProgress, getToolResultFirstLine, } from "../utils/subagent_utils.js";
+import { formatToolUiEventForProgress, getToolResultFirstLine, normalizeOneLine, } from "../utils/subagent_utils.js";
+import { formatActiveSubagentsForCompaction } from "./format.js";
 const MAX_ACTIVE_SUBAGENTS = 8;
+const MAX_SUBAGENT_ACTIVITY_CHARS = 500;
+function normalizeSubagentActivity(text) {
+    const normalized = normalizeOneLine(text);
+    return normalized.length <= MAX_SUBAGENT_ACTIVITY_CHARS
+        ? normalized
+        : `${normalized.slice(0, MAX_SUBAGENT_ACTIVITY_CHARS - 3)}...`;
+}
 async function raceWithAbort(promise, signal) {
     if (!signal)
         return await promise;
@@ -42,20 +51,18 @@ export class AgentSupervisor {
             record.runtime.dispose();
         }
     }
+    getCapacity() {
+        return { running: this.getActiveCount(), limit: MAX_ACTIVE_SUBAGENTS };
+    }
     getActiveCount() {
-        return [...this.records.values()].filter((record) => record.status === "running").length;
+        return [...this.records.values()].filter((record) => record.run.status === "running").length;
     }
     getActiveCompactionContext() {
-        const active = [...this.records.values()].filter((record) => record.status === "running");
+        const active = this.listSnapshots().filter((state) => state.availability === "running");
         if (active.length === 0)
             return undefined;
-        const entries = active
-            .map((record) => {
-            const abort = record.abortRequested ? ", abort requested" : "";
-            return `- ${record.id}: ${record.title} (name: ${record.name}, status: ${record.status}${abort})`;
-        })
-            .join("\n");
-        return `<active-subagents>\n${entries}\n</active-subagents>`;
+        const state = formatActiveSubagentsForCompaction(active);
+        return `<active-subagents>\n${state}\n</active-subagents>`;
     }
     spawn(options) {
         if (this.getActiveCount() >= MAX_ACTIVE_SUBAGENTS) {
@@ -92,22 +99,31 @@ export class AgentSupervisor {
             }),
             eventSink: async (event) => await this.recordAgentEvent(id, event),
             clock: this.deps.clock,
+            archiveAutoCompaction: createAutoCompactionArchiver(options.backend),
         });
+        const createdAt = this.deps.clock.now();
         const record = {
             id,
             name: runtimeConfig.name,
             title: options.title,
-            modelLabel: options.modelLabel,
+            model: {
+                provider: runtimeConfig.model.provider,
+                id: runtimeConfig.model.id,
+                reasoning: runtime.spec.attribution.reasoningEffort,
+            },
+            workingDirectory,
+            createdAt,
             originHistoryEntryId: options.originHistoryEntryId,
             runtimeConfig,
-            config: options.config,
-            backend: options.backend,
             personaId: options.personaId,
             runtime,
-            status: "running",
+            run: {
+                revision: 1,
+                status: "running",
+                startedAt: createdAt,
+                interruptRequested: false,
+            },
             costTotal: 0,
-            turns: 0,
-            toolCalls: 0,
             usage: {
                 input: 0,
                 output: 0,
@@ -116,19 +132,17 @@ export class AgentSupervisor {
                 contextWindowUsageTokens: 0,
                 contextWindow: runtimeConfig.model.contextWindow,
             },
-            startedAt: Date.now(),
-            abortRequested: false,
             completion: Promise.resolve(undefined),
         };
         this.records.set(id, record);
-        this.startRun(record, options.prompt);
-        return { ok: true, id };
+        this.startRun(record, options.prompt, "subagent_spawned");
+        return { ok: true, state: this.toSnapshot(record), capacity: this.getCapacity() };
     }
     sendInput(options) {
         const record = this.records.get(options.id);
         if (!record)
             return { ok: false, reason: `Unknown subagent ID: ${options.id}` };
-        if (record.status === "running") {
+        if (record.run.status === "running") {
             return {
                 ok: false,
                 reason: `Subagent ${options.id} is already running. Wait for it to finish before sending input.`,
@@ -140,26 +154,37 @@ export class AgentSupervisor {
                 reason: `Subagent limit reached (max ${MAX_ACTIVE_SUBAGENTS} active). Wait for existing agents to finish.`,
             };
         }
-        this.startRun(record, options.prompt);
-        return { ok: true, id: record.id, name: record.name, title: record.title };
+        record.run = {
+            revision: record.run.revision + 1,
+            status: "running",
+            startedAt: this.deps.clock.now(),
+            interruptRequested: false,
+        };
+        this.startRun(record, options.prompt, "subagent_run_started");
+        return { ok: true, state: this.toSnapshot(record), capacity: this.getCapacity() };
     }
     async waitForAgents(ids, signal) {
         const missing = ids.filter((id) => !this.records.has(id));
         if (missing.length > 0)
             throw new Error(`Unknown subagent ID(s): ${missing.join(", ")}`);
         await raceWithAbort(Promise.race(ids.map((id) => this.waitForRecord(id))), signal);
-        return this.getCompletedRecords(ids).map((record) => this.toResult(record));
+        return ids.map((id) => {
+            const record = this.records.get(id);
+            if (!record)
+                throw new Error(`Unknown subagent ID: ${id}`);
+            return this.toSnapshot(record);
+        });
     }
-    async terminate(id, signal) {
+    async interrupt(id, signal) {
         const record = this.records.get(id);
         if (!record)
             return undefined;
-        if (record.status === "running") {
-            record.abortRequested = true;
+        if (record.run.status === "running") {
+            record.run.interruptRequested = true;
             record.runtime.interrupt();
-            await this.emit({ type: "subagent_abort_requested", id });
+            await this.emit({ type: "subagent_interrupt_requested", state: this.toSnapshot(record) });
         }
-        return this.toResult(await raceWithAbort(this.waitForRecord(id), signal));
+        return this.toSnapshot(await raceWithAbort(this.waitForRecord(id), signal));
     }
     getSnapshot(id) {
         const record = this.records.get(id);
@@ -168,91 +193,140 @@ export class AgentSupervisor {
     listSnapshots() {
         return [...this.records.values()].map((record) => this.toSnapshot(record));
     }
-    startRun(record, prompt) {
-        record.status = "running";
-        record.startedAt = Date.now();
-        record.finishedAt = undefined;
-        record.abortRequested = false;
-        record.error = undefined;
-        record.finalText = undefined;
-        record.completion = this.emit({ type: "subagent_spawned", state: this.toSnapshot(record) })
+    startRun(record, prompt, eventType) {
+        record.completion = this.emit({ type: eventType, state: this.toSnapshot(record) })
             .then(async () => {
-            if (record.abortRequested) {
-                throw new Error("subagent was interrupted");
+            if (record.run.interruptRequested) {
+                return {
+                    aborted: true,
+                    terminalResult: { aborted: true },
+                };
             }
             return await record.runtime.submit(prompt);
         })
             .then((result) => {
-            if (record.abortRequested || result.aborted) {
-                throw new Error("subagent was interrupted");
-            }
-            if (result.blocked)
-                throw new Error(result.blocked.message);
-            if (result.limitReached)
-                throw new Error(result.limitReached.message);
-            const assistant = [...record.runtime.rawHistory]
-                .reverse()
-                .find((message) => message.role === "assistant");
-            const finalText = assistant ? extractAssistantText(assistant).trim() : "";
-            if (!finalText)
-                throw new Error("Sub-agent produced an empty response.");
-            record.status = "success";
-            record.finalText = finalText;
+            this.applyTurnResult(record, result);
             return record;
         })
             .catch((error) => {
-            const aborted = record.abortRequested;
-            record.status = aborted ? "aborted" : "error";
-            record.error = aborted ? undefined : error instanceof Error ? error.message : String(error);
+            if (record.run.interruptRequested) {
+                this.finishInterrupted(record);
+            }
+            else {
+                this.finishFailed(record, {
+                    kind: "runtime-error",
+                    message: error instanceof Error ? error.message : String(error),
+                });
+            }
             return record;
         })
             .then(async (resolved) => {
-            resolved.finishedAt = Date.now();
             if (this.records.get(resolved.id) === resolved) {
                 await this.emit({ type: "subagent_finished", state: this.toSnapshot(resolved) });
             }
             return resolved;
         });
     }
+    applyTurnResult(record, result) {
+        if (record.run.interruptRequested ||
+            result.aborted ||
+            result.finalMessage?.stopReason === "aborted") {
+            this.finishInterrupted(record);
+            return;
+        }
+        if (result.blocked) {
+            this.finishFailed(record, {
+                kind: result.blocked.reason,
+                message: result.blocked.message,
+            });
+            return;
+        }
+        if (result.limitReached) {
+            this.finishFailed(record, {
+                kind: result.limitReached.reason,
+                message: result.limitReached.message,
+            });
+            return;
+        }
+        if (!result.finalMessage) {
+            this.finishFailed(record, {
+                kind: "runtime-error",
+                message: "Subagent run completed without a final assistant message.",
+            });
+            return;
+        }
+        if (result.finalMessage.stopReason === "error") {
+            this.finishFailed(record, {
+                kind: "provider-error",
+                message: result.finalMessage.errorMessage ?? "Model returned an unspecified error.",
+                stopReason: result.finalMessage.stopReason,
+            });
+            return;
+        }
+        record.run = {
+            revision: record.run.revision,
+            status: "succeeded",
+            startedAt: record.run.startedAt,
+            finishedAt: this.deps.clock.now(),
+            interruptRequested: false,
+            response: extractAssistantText(result.finalMessage).trim(),
+        };
+    }
+    finishInterrupted(record) {
+        record.run = {
+            revision: record.run.revision,
+            status: "interrupted",
+            startedAt: record.run.startedAt,
+            finishedAt: this.deps.clock.now(),
+            interruptRequested: true,
+            failure: { kind: "interrupted", message: "Subagent run was interrupted." },
+        };
+    }
+    finishFailed(record, failure) {
+        record.run = {
+            revision: record.run.revision,
+            status: "failed",
+            startedAt: record.run.startedAt,
+            finishedAt: this.deps.clock.now(),
+            interruptRequested: record.run.interruptRequested,
+            failure,
+        };
+    }
     async recordAgentEvent(id, event) {
         const record = this.records.get(id);
         if (!record)
             return;
-        let text = "";
+        if (event.type === "assistant_final") {
+            const usage = getUsageTotals(event.message.usage);
+            const cost = getUsageCostTotal(event.message.usage);
+            record.costTotal += cost;
+            record.usage = {
+                input: record.usage.input + usage.input,
+                output: record.usage.output + usage.output,
+                cacheRead: record.usage.cacheRead + usage.cacheRead,
+                cacheWrite: record.usage.cacheWrite + usage.cacheWrite,
+                contextWindowUsageTokens: usage.input + usage.output + usage.cacheRead + usage.cacheWrite,
+                contextWindow: record.runtimeConfig.model.contextWindow,
+            };
+            (this.options.recordUsage ?? appendUsageLogEntry)({
+                timestamp: event.message.timestamp,
+                sessionId: record.id,
+                personaId: record.personaId ?? event.personaId,
+                provider: event.message.provider,
+                model: event.message.model,
+                api: event.message.api,
+                reasoningEffort: event.reasoningEffort,
+                usage,
+                cost: { total: cost },
+                agent: { type: "subagent", name: record.name },
+            });
+            await this.emit({ type: "subagent_updated", state: this.toSnapshot(record) });
+            return;
+        }
+        let text;
         switch (event.type) {
-            case "assistant_final": {
-                const usage = getUsageTotals(event.message.usage);
-                const cost = getUsageCostTotal(event.message.usage);
-                record.turns += 1;
-                record.costTotal += cost;
-                record.usage = {
-                    input: record.usage.input + usage.input,
-                    output: record.usage.output + usage.output,
-                    cacheRead: record.usage.cacheRead + usage.cacheRead,
-                    cacheWrite: record.usage.cacheWrite + usage.cacheWrite,
-                    contextWindowUsageTokens: usage.input + usage.output + usage.cacheRead + usage.cacheWrite,
-                    contextWindow: record.runtimeConfig.model.contextWindow,
-                };
-                (this.options.recordUsage ?? appendUsageLogEntry)({
-                    timestamp: event.message.timestamp,
-                    sessionId: record.id,
-                    personaId: record.personaId ?? event.personaId,
-                    provider: event.message.provider,
-                    model: event.message.model,
-                    api: event.message.api,
-                    reasoningEffort: event.reasoningEffort,
-                    usage,
-                    cost: { total: cost },
-                    agent: { type: "subagent", name: record.name },
-                });
-                text = extractAssistantTextForProgress(event.message) ?? "";
-                break;
-            }
-            case "tool_call_admitted":
-                record.toolCalls += 1;
-                return;
             case "tool_activity":
-                text = formatToolUiEventForProgress(event.activity) ?? "";
+                text = formatToolUiEventForProgress(event.activity);
                 break;
             case "tool_result":
                 if (event.message.isError) {
@@ -265,31 +339,21 @@ export class AgentSupervisor {
             case "turn_started":
                 text = "assistant: thinking";
                 break;
-            case "turn_finished":
-                if (event.outcome === "completed")
-                    text = "done";
-                break;
             case "notice":
                 text = event.text;
                 break;
             default:
                 return;
         }
+        const normalized = normalizeSubagentActivity(text ?? "");
+        if (!normalized)
+            return;
         await this.emit({
-            type: "subagent_progress",
-            id,
-            text,
-            costTotal: record.costTotal,
-            turns: record.turns,
-            toolCalls: record.toolCalls,
-            usage: { ...record.usage },
+            type: "subagent_activity",
+            state: this.toSnapshot(record),
+            text: normalized,
         });
     }
-    getCompletedRecords(ids) {
-        return ids
-            .map((id) => this.records.get(id))
-            .filter((record) => record !== undefined && record.status !== "running");
-    }
     async waitForRecord(id) {
         const record = this.records.get(id);
         if (!record)
@@ -301,33 +365,13 @@ export class AgentSupervisor {
             id: record.id,
             name: record.name,
             title: record.title,
-            modelLabel: record.modelLabel,
-            status: record.status,
+            availability: record.run.status === "running" ? "running" : "idle",
+            model: { ...record.model },
+            workingDirectory: record.workingDirectory,
+            createdAt: record.createdAt,
+            run: structuredClone(record.run),
             costTotal: record.costTotal,
-            turns: record.turns,
-            toolCalls: record.toolCalls,
             usage: { ...record.usage },
-            startedAt: record.startedAt,
-            finishedAt: record.finishedAt,
-            abortRequested: record.abortRequested,
-            error: record.error,
-            finalText: record.finalText,
-        };
-    }
-    toResult(record) {
-        const { usage: _usage, runtime: _runtime, completion: _completion, ...result } = record;
-        return {
-            id: result.id,
-            name: result.name,
-            title: result.title,
-            status: result.status,
-            costTotal: result.costTotal,
-            turns: result.turns,
-            toolCalls: result.toolCalls,
-            finalText: result.finalText,
-            error: result.error,
-            startedAt: result.startedAt,
-            finishedAt: result.finishedAt,
         };
     }
     async emit(event) {