@markusylisiurunen/tau 0.3.93 → 0.3.95

package/dist/core/tools/bash_jobs.js

@@ -1,19 +1,9 @@
 import { randomUUID } from "node:crypto";
 import { StringDecoder } from "node:string_decoder";
-import stripAnsi from "strip-ansi";
-import { Type } from "typebox";
-import { z } from "zod";
-import { formatCwd } from "../utils/format.js";
-import { formatTokenEstimate } from "../utils/token.js";
-import { TRUNCATION_MARKER, truncateForTokens, truncateToBytesFromEnd } from "../utils/truncate.js";
-import { formatZodError } from "../utils/zod.js";
-import { formatBashToolResultText } from "./bash.js";
-import { buildToolRunPresentation, formatToolDurationMs } from "./presentation.js";
-import { createTextToolOutcome, executeTool } from "./registry.js";
-const MAX_JOBS = 64;
-const MAX_OUTPUT_BYTES = 64 * 1024;
-export const BASH_JOB_WAIT_DEFAULT_MS = 60_000;
-export const BASH_JOB_WAIT_MAX_MS = 300_000;
+import { truncateForTokens } from "../utils/truncate.js";
+import { MAX_JOBS, waitForJobs } from "./background_jobs.js";
+import { MAX_COMMAND_CAPTURE_BYTES, } from "./execution_backend.js";
+import { JobOutput } from "./job_output.js";
 export class BashJobRegistry {
     jobs = new Map();
     closed = false;
@@ -22,7 +12,7 @@ export class BashJobRegistry {
         if (this.closed)
             throw new Error("Bash jobs are closed.");
         if (this.jobs.size >= MAX_JOBS) {
-            const oldest = [...this.jobs.values()].find((job) => job.state.status !== "running");
+            const oldest = [...this.jobs.values()].find((job) => !job.active);
             if (!oldest)
                 throw new Error(`Bash job limit reached (${MAX_JOBS}). Stop a job before starting another.`);
             this.jobs.delete(oldest.id);
@@ -35,10 +25,10 @@ export class BashJobRegistry {
             id: randomUUID(),
             command: truncateForTokens(command, { maxTokens: 128, strategy: "middle" }).content,
             cwd: truncateForTokens(cwd, { maxTokens: 128, strategy: "middle" }).content,
-            output: "",
-            truncated: false,
+            log: new JobOutput(backend, MAX_COMMAND_CAPTURE_BYTES),
             controller: new AbortController(),
             done: Promise.resolve(),
+            active: true,
             state: { status: "running" },
         };
         this.jobs.set(job.id, job);
@@ -50,25 +40,28 @@ export class BashJobRegistry {
                 const result = await backend.runBash(command, {
                     cwd,
                     signal: job.controller.signal,
-                    maxCaptureBytes: MAX_OUTPUT_BYTES,
+                    maxCaptureBytes: MAX_COMMAND_CAPTURE_BYTES,
                     onStarted: started,
                     onOutput: (chunk) => {
-                        const output = job.output + decoder.write(chunk);
-                        job.truncated ||= Buffer.byteLength(output) > MAX_OUTPUT_BYTES;
-                        job.output = truncateToBytesFromEnd(output, MAX_OUTPUT_BYTES);
+                        const text = decoder.write(chunk);
+                        job.log.capture.appendText(text);
                     },
                 });
-                job.output = truncateToBytesFromEnd(job.output + decoder.end(), MAX_OUTPUT_BYTES);
-                job.truncated ||= result.truncated;
+                const tail = decoder.end();
+                job.log.capture.appendText(tail);
+                job.log.capture.truncated ||= result.truncated;
                 const { exitCode, aborted, closeSignal } = result;
                 job.state = { status: "finished", result: { exitCode, aborted, closeSignal } };
             }
             catch (error) {
+                job.log.capture.appendText(`\n${error instanceof Error ? error.message : String(error)}`);
                 job.state = {
                     status: "failed",
                     error: error instanceof Error ? error.message : String(error),
                 };
             }
+            await job.log.finish();
+            job.active = false;
         })();
         try {
             await Promise.race([launched, job.done]);
@@ -95,8 +88,8 @@ export class BashJobRegistry {
                 id: job.id,
                 command: job.command,
                 workingDirectory: job.cwd,
-                ...(includeOutput ? { output: stripAnsi(job.output) } : {}),
-                truncated: job.truncated,
+                ...(includeOutput ? { output: job.log.capture.text } : {}),
+                truncated: job.log.capture.truncated,
                 status: state.status === "finished"
                     ? state.result.aborted
                         ? "stopped"
@@ -105,52 +98,40 @@ export class BashJobRegistry {
                             : "failed"
                     : state.status,
                 ...(state.status === "finished" ? state.result : {}),
-                ...(state.status === "failed" ? { error: state.error } : {}),
+                ...(includeOutput && state.status === "failed" ? { error: state.error } : {}),
             };
         });
     }
-    format(ids = [...this.jobs.keys()], includeOutput = true) {
-        return this.formatJobs(ids.map((id) => this.get(id)), includeOutput);
-    }
-    formatJobs(jobs, includeOutput) {
+    format(ids = [...this.jobs.keys()], includeOutput = true, maxOutputTokens = 8192) {
+        ids = [...new Set(ids)];
         let truncated = false;
-        const text = jobs
-            .map((job) => {
-            const id = job.id;
-            const state = job.state;
-            const status = state.status === "finished"
-                ? state.result.aborted
-                    ? "stopped"
-                    : state.result.exitCode === 0
-                        ? "succeeded"
-                        : "failed"
-                : state.status;
-            const lines = [`\`${id}\` · ${job.command}`, status, `cwd ${job.cwd}`];
-            if (state.status === "failed")
-                lines.push(state.error);
-            if (state.status === "finished") {
-                lines.push(state.result.exitCode === null ? "exit ?" : `exit ${state.result.exitCode}`);
-                if (state.result.aborted)
-                    lines.push("Command was cancelled.");
-                if (state.result.closeSignal)
-                    lines.push(`Command was terminated by signal ${state.result.closeSignal}.`);
-            }
+        const text = ids
+            .map((id) => {
+            const job = this.get(id);
+            const state = this.read([id], false)[0];
+            const lines = [
+                `id: ${id}`,
+                `status: ${state.status}`,
+                `command: ${JSON.stringify(job.command)}`,
+                `cwd: ${JSON.stringify(job.cwd)}`,
+            ];
+            if ("exitCode" in state)
+                lines.push(`exit_code: ${state.exitCode ?? "null"}`);
+            if ("closeSignal" in state && state.closeSignal)
+                lines.push(`signal: ${state.closeSignal}`);
             if (includeOutput) {
-                const model = truncateForTokens(stripAnsi(job.output), {
-                    maxTokens: Math.min(2048, Math.floor(8192 / Math.max(1, jobs.length))),
-                    strategy: "tail",
-                });
-                truncated ||= model.truncated || job.truncated;
-                lines.push("", formatBashToolResultText({
-                    truncationInfo: { output: model.content, model, captureTruncated: job.truncated },
-                    exitCode: null,
-                }));
+                const output = job.log.format(Math.floor(maxOutputTokens / Math.max(1, ids.length)));
+                truncated ||= output.truncated;
+                lines.push(...output.metadata, "", "--- output ---", output.projection.content);
             }
             return lines.join("\n");
         })
             .join("\n\n") || "No Bash jobs.";
         return { text, truncated };
     }
+    async inspect(ids, includeOutput = true, maxOutputTokens = 8192) {
+        return this.format(ids, includeOutput, maxOutputTokens);
+    }
     async stopJob(id) {
         const job = this.get(id);
         job.controller.abort();
@@ -158,48 +139,11 @@ export class BashJobRegistry {
         if (job.state.status === "failed")
             throw new Error(job.state.error);
     }
-    async stop(id, includeOutput) {
-        await this.stopJob(id);
-        return this.format([id], includeOutput);
-    }
     async waitJobs(ids, timeout, signal) {
-        if (!Number.isInteger(timeout) || timeout <= 0 || timeout > BASH_JOB_WAIT_MAX_MS)
-            throw new Error(`timeout must be a positive integer up to ${BASH_JOB_WAIT_MAX_MS}.`);
-        const jobs = [...new Set(ids)].map((id) => this.get(id));
-        if (!jobs.length)
-            throw new Error("ids must not be empty.");
-        signal.throwIfAborted();
-        let timer;
-        let abort;
-        try {
-            const timedOut = await Promise.race([
-                ...jobs.map((job) => job.done.then(() => false)),
-                new Promise((resolve) => {
-                    timer = setTimeout(() => resolve(true), timeout);
-                }),
-                new Promise((_, reject) => {
-                    abort = () => reject(signal.reason);
-                    signal.addEventListener("abort", abort, { once: true });
-                }),
-            ]);
-            return timedOut;
-        }
-        finally {
-            clearTimeout(timer);
-            signal.removeEventListener("abort", abort);
-        }
-    }
-    async wait(ids, timeout, signal, includeOutput) {
-        const timedOut = await this.waitJobs(ids, timeout, signal);
-        const result = this.format(ids, includeOutput);
-        return {
-            ...result,
-            text: `${result.text}${timedOut ? `\n\nWait timed out after ${timeout}ms; jobs are still running.` : ""}`,
-            timedOut,
-        };
+        return waitForJobs([...new Set(ids)].map((id) => this.get(id)), timeout, signal);
     }
     get hasRunning() {
-        return [...this.jobs.values()].some((job) => job.state.status === "running");
+        return [...this.jobs.values()].some((job) => job.active);
     }
     async waitForIdle() {
         while (this.hasRunning) {
@@ -208,7 +152,7 @@ export class BashJobRegistry {
     }
     async dispose() {
         this.closed = true;
-        const running = [...this.jobs.values()].filter((job) => job.state.status === "running");
+        const running = [...this.jobs.values()].filter((job) => job.active);
         for (const job of running)
             job.controller.abort();
         await Promise.all(running.map((job) => job.done));
@@ -217,142 +161,4 @@ export class BashJobRegistry {
             throw new AggregateError(errors, "failed to stop Bash jobs");
     }
 }
-export function buildBashJobMetadata(args) {
-    const lines = args.text.split("\n").length;
-    return [
-        ...(args.truncated ? [TRUNCATION_MARKER] : []),
-        ...(args.workingDirectory ? [formatCwd(args.workingDirectory)] : []),
-        formatToolDurationMs(args.durationMs),
-        formatTokenEstimate(Buffer.byteLength(args.text, "utf8")),
-        `${lines} line${lines === 1 ? "" : "s"}`,
-        ...(args.timedOut ? ["timed out"] : []),
-    ];
-}
-function buildBashJobPresentation(toolName, args, text, metadata) {
-    const detailText = text?.replace(/\r\n?/g, "\n").trimEnd();
-    return buildToolRunPresentation({
-        toolName,
-        operation: "bash",
-        subject: args ? (args.ids?.join(", ") ?? args.id ?? "jobs") : "(invalid arguments)",
-        details: detailText ? detailText.split("\n").map((text) => ({ text })) : [],
-        metadata,
-    });
-}
-export function createBashJobToolDefinitions(jobs) {
-    const id = Type.String({ minLength: 1, pattern: "^[^\\r\\n]+$" });
-    const idSchema = z
-        .string()
-        .min(1)
-        .regex(/^[^\r\n]+$/);
-    const includeOutput = Type.Optional(Type.Boolean({
-        description: "Include the captured output tail; defaults to true. Set false for metadata only. Status, exit code, termination reason, and operational errors are always included.",
-    }));
-    return [
-        {
-            name: "list_bash_jobs",
-            description: "List session-owned Bash jobs and their status. Up to 64 records are retained; older completed jobs are evicted when needed.",
-            parameters: Type.Object({}, { additionalProperties: false }),
-            parser: z.object({}).strict(),
-        },
-        {
-            name: "read_bash_job",
-            description: "Read a Bash job's status and bounded output tail immediately (up to 2048 tokens from 64 KiB retained output).",
-            parameters: Type.Object({ id, includeOutput }, { additionalProperties: false }),
-            parser: z.object({ id: idSchema, includeOutput: z.boolean().optional() }).strict(),
-        },
-        {
-            name: "stop_bash_job",
-            description: "Stop a Bash job and its process group, escalating to forced termination if needed.",
-            parameters: Type.Object({ id, includeOutput }, { additionalProperties: false }),
-            parser: z.object({ id: idSchema, includeOutput: z.boolean().optional() }).strict(),
-        },
-        {
-            name: "wait_for_bash_jobs",
-            description: "Wait for any requested Bash job to exit, not for readiness. Use logs or readiness checks for servers. Returns after 60 seconds by default, at most 5 minutes. Timeout and interruption cancel only the wait, not jobs. Completed results remain readable.",
-            parameters: Type.Object({
-                includeOutput,
-                ids: Type.Array(id, { minItems: 1, maxItems: MAX_JOBS }),
-                timeout: Type.Optional(Type.Integer({
-                    minimum: 1,
-                    maximum: BASH_JOB_WAIT_MAX_MS,
-                    description: "Wait timeout in milliseconds; defaults to 60000.",
-                })),
-            }, { additionalProperties: false }),
-            parser: z
-                .object({
-                includeOutput: z.boolean().optional(),
-                ids: z.array(idSchema).min(1).max(MAX_JOBS),
-                timeout: z.number().int().positive().max(BASH_JOB_WAIT_MAX_MS).optional(),
-            })
-                .strict(),
-        },
-    ].map(({ parser, ...schema }) => ({
-        schema,
-        describe: (call) => {
-            const parsed = parser.safeParse(call.arguments);
-            return {
-                presentation: buildBashJobPresentation(schema.name, parsed.success ? parsed.data : undefined),
-            };
-        },
-        execute: (call, context) => executeTool(context, async () => {
-            const startedAt = Date.now();
-            const parsed = parser.safeParse(call.arguments);
-            if (!parsed.success) {
-                const reason = `Invalid arguments: ${formatZodError(parsed.error)}`;
-                return {
-                    ...createTextToolOutcome(reason, "blocked"),
-                    uiEvent: {
-                        type: "tool_call_blocked",
-                        toolCallId: call.id,
-                        toolName: schema.name,
-                        reason,
-                        presentation: buildBashJobPresentation(schema.name, undefined, reason),
-                    },
-                };
-            }
-            const args = parsed.data;
-            try {
-                context.signal.throwIfAborted();
-                const result = "ids" in args
-                    ? await jobs.wait(args.ids, args.timeout ?? BASH_JOB_WAIT_DEFAULT_MS, context.signal, args.includeOutput ?? true)
-                    : "id" in args
-                        ? schema.name === "stop_bash_job"
-                            ? await jobs.stop(args.id, args.includeOutput ?? true)
-                            : jobs.format([args.id], args.includeOutput ?? true)
-                        : jobs.format(undefined, false);
-                const { text } = result;
-                return {
-                    ...createTextToolOutcome(text, "succeeded"),
-                    uiEvent: {
-                        type: "tool_call_finished",
-                        toolCallId: call.id,
-                        toolName: schema.name,
-                        status: "success",
-                        presentation: buildBashJobPresentation(schema.name, args, text, buildBashJobMetadata({
-                            ...result,
-                            durationMs: Math.max(0, Date.now() - startedAt),
-                        })),
-                    },
-                };
-            }
-            catch (error) {
-                const reason = context.signal.aborted
-                    ? "Bash job operation was cancelled."
-                    : error instanceof Error
-                        ? error.message
-                        : String(error);
-                return {
-                    ...createTextToolOutcome(reason, context.signal.aborted ? "cancelled" : "failed"),
-                    uiEvent: {
-                        type: "tool_call_finished",
-                        toolCallId: call.id,
-                        toolName: schema.name,
-                        status: "error",
-                        presentation: buildBashJobPresentation(schema.name, args, context.signal.aborted ? undefined : reason),
-                    },
-                };
-            }
-        }),
-    }));
-}
 //# sourceMappingURL=bash_jobs.js.map

package/dist/core/tools/bash_jobs.js.map

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

package/dist/core/tools/catalog.js

@@ -1,105 +1,70 @@
 import { McpManager } from "../mcp/manager.js";
 import { AgentSupervisor } from "../subagents/agent_supervisor.js";
+import { AgentJobRegistry } from "./agent_jobs.js";
+import { createJobToolDefinitions } from "./background_jobs.js";
 import { createBashToolDefinition } from "./bash.js";
-import { BashJobRegistry, createBashJobToolDefinitions } from "./bash_jobs.js";
 import { createCodeToolDefinition } from "./code.js";
 import { createEditToolDefinition } from "./edit.js";
 import { scopeToolExecutionBackend } from "./execution_backend.js";
-import { createInterruptAgentToolDefinition } from "./interrupt_agent.js";
-import { createListAgentsToolDefinition } from "./list_agents.js";
 import { ToolRegistry } from "./registry.js";
-import { createSendInputToAgentToolDefinition } from "./send_input_to_agent.js";
-import { createSpawnAgentToolDefinition } from "./spawn_agent.js";
 import { createTauDocsToolDefinition } from "./tau_docs.js";
-import { TOOL_NAME_BASH, TOOL_NAME_EDIT, TOOL_NAME_VIEW_IMAGE, TOOL_NAME_WRITE, } from "./tool_names.js";
+import { TOOL_NAME_BASH } from "./tool_names.js";
 import { createViewImageToolDefinition } from "./view_image.js";
 import { createWaitForAgentsToolDefinition } from "./wait_for_agents.js";
 import { createWriteToolDefinition } from "./write.js";
+function createCommonTools(options) {
+    const backend = scopeToolExecutionBackend(options.backend, options.cwd);
+    const enabled = new Set(options.allowedTools);
+    const tools = [
+        createBashToolDefinition(backend, options.cwd, options.bashJobs),
+        createWriteToolDefinition(backend),
+        createEditToolDefinition(backend),
+        createViewImageToolDefinition(backend),
+    ];
+    const code = createCodeToolDefinition({ ...options, backend });
+    return [
+        ...tools.filter((tool) => enabled.has(tool.schema.name)),
+        ...(code ? [code, ...createJobToolDefinitions(options.codeJobs, "code")] : []),
+        ...(enabled.has(TOOL_NAME_BASH) ? createJobToolDefinitions(options.bashJobs, "bash") : []),
+        createTauDocsToolDefinition(),
+    ];
+}
 export const ToolCatalog = {
     createDebugRegistry(options) {
+        const jobs = new AgentJobRegistry();
         return this.createSessionRegistry({
             ...options,
+            jobs,
+            ...jobs.create(),
             mcp: new McpManager(options.config.mcpServers),
-            bashJobs: new BashJobRegistry(),
             subagentSystemPrompt: undefined,
             supervisor: new AgentSupervisor({ onEvent: () => { } }),
         });
     },
     createSessionRegistry(options) {
-        const tools = [
-            createBashToolDefinition(options.backend, options.cwd, options.bashJobs),
-            createWriteToolDefinition(options.backend),
-            createEditToolDefinition(options.backend),
-            createViewImageToolDefinition(options.backend),
-            createSpawnAgentToolDefinition({
-                backend: options.backend,
-                supervisor: options.supervisor,
-                bashJobs: options.bashJobs,
-                persona: options.persona,
-                config: options.config,
-                modelResolver: options.modelResolver,
-                subagentSystemPrompt: options.subagentSystemPrompt,
-                history: options.history,
-                mcp: options.mcp,
-                cwd: options.cwd,
-                ...(options.resolveSubagentPrompt
-                    ? { resolveSubagentPrompt: options.resolveSubagentPrompt }
-                    : {}),
-            }),
-            createSendInputToAgentToolDefinition(options.supervisor),
-            createWaitForAgentsToolDefinition(options.supervisor),
-            createListAgentsToolDefinition(options.supervisor),
-            createInterruptAgentToolDefinition(options.supervisor),
-        ];
-        const code = createCodeToolDefinition({ ...options, allowedTools: options.persona.tools });
+        const tools = [createWaitForAgentsToolDefinition(options.supervisor)];
         const enabledToolNames = new Set(options.persona.tools);
         return new ToolRegistry([
-            ...tools.filter((tool) => enabledToolNames.has(tool.schema.name)),
-            ...(code ? [code] : []),
-            ...(enabledToolNames.has(TOOL_NAME_BASH)
-                ? createBashJobToolDefinitions(options.bashJobs)
-                : []),
-            createTauDocsToolDefinition(),
+            ...createCommonTools({
+                ...options,
+                allowedTools: options.persona.tools,
+                ...(enabledToolNames.has("agents") ? { agents: options } : {}),
+            }),
+            ...(enabledToolNames.has("agents") ? tools : []),
+            ...(options.clientTools?.() ?? []),
         ]);
     },
-    createSubagentRegistry(allowedTools, backend, cwd, config, bashJobs, history, mcp) {
-        const scopedBackend = scopeToolExecutionBackend(backend, cwd);
-        const definitions = [];
-        const seen = new Set();
-        for (const tool of allowedTools) {
-            if (seen.has(tool))
-                continue;
-            seen.add(tool);
-            switch (tool) {
-                case TOOL_NAME_BASH:
-                    definitions.push(createBashToolDefinition(scopedBackend, cwd, bashJobs));
-                    definitions.push(...createBashJobToolDefinitions(bashJobs));
-                    break;
-                case TOOL_NAME_WRITE:
-                    definitions.push(createWriteToolDefinition(scopedBackend));
-                    break;
-                case TOOL_NAME_EDIT:
-                    definitions.push(createEditToolDefinition(scopedBackend));
-                    break;
-                case TOOL_NAME_VIEW_IMAGE:
-                    definitions.push(createViewImageToolDefinition(scopedBackend));
-                    break;
-            }
-        }
-        const code = createCodeToolDefinition({
-            backend: scopedBackend,
+    createSubagentRegistry(allowedTools, backend, cwd, config, bashJobs, codeJobs, history, mcp) {
+        return new ToolRegistry(createCommonTools({
+            backend,
             cwd,
-            allowedTools,
             config,
             bashJobs,
+            codeJobs,
             history,
             mcp,
-        });
-        return new ToolRegistry([
-            ...definitions,
-            ...(code ? [code] : []),
-            createTauDocsToolDefinition(),
-        ]);
+            allowedTools,
+        }));
     },
 };
 //# sourceMappingURL=catalog.js.map

package/dist/core/tools/catalog.js.map

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