klaus-agent 0.3.1 → 0.4.1

package/dist/task-graph/tools.js

@@ -0,0 +1,106 @@
+// Task graph tools — CRUD + dependency management + background execution
+import { Type } from "@sinclair/typebox";
+import { TASK_GRAPH_TOOL_NAMES } from "./types.js";
+export function createTaskGraphTools(graph) {
+    return [
+        {
+            name: TASK_GRAPH_TOOL_NAMES.create,
+            label: "Create Task",
+            description: "Create a new task in the task graph. Tasks start as pending. " +
+                "Use task_depend to set up dependency ordering.",
+            parameters: Type.Object({
+                subject: Type.String({ description: "Short title for the task." }),
+                description: Type.Optional(Type.String({ description: "Detailed description." })),
+            }),
+            async execute(_id, params) {
+                const task = graph.create(params.subject, params.description);
+                return text(`Created task ${task.id}: ${task.subject}\n\n${graph.render()}`);
+            },
+        },
+        {
+            name: TASK_GRAPH_TOOL_NAMES.depend,
+            label: "Add Task Dependency",
+            description: "Add a dependency: task_id cannot start until blocked_by_id completes. " +
+                "Rejects if this would create a cycle.",
+            parameters: Type.Object({
+                task_id: Type.String({ description: "Task that is blocked." }),
+                blocked_by_id: Type.String({ description: "Task that must complete first." }),
+            }),
+            async execute(_id, params) {
+                graph.addDependency(params.task_id, params.blocked_by_id);
+                return text(`Dependency added: ${params.task_id} blocked by ${params.blocked_by_id}\n\n${graph.render()}`);
+            },
+        },
+        {
+            name: TASK_GRAPH_TOOL_NAMES.update,
+            label: "Update Task",
+            description: "Update a task's status, owner, or result. " +
+                "Setting status to 'completed' auto-unblocks dependent tasks. " +
+                "Cannot start a task that has unfinished blockers.",
+            parameters: Type.Object({
+                task_id: Type.String({ description: "Task ID." }),
+                status: Type.Optional(Type.Union([Type.Literal("pending"), Type.Literal("in_progress"), Type.Literal("completed"), Type.Literal("failed")], { description: "New status." })),
+                owner: Type.Optional(Type.String({ description: "Assign to an agent or user." })),
+                result: Type.Optional(Type.String({ description: "Result summary." })),
+            }),
+            async execute(_id, params) {
+                const task = graph.update(params.task_id, {
+                    status: params.status,
+                    owner: params.owner,
+                    result: params.result,
+                });
+                return text(`Updated task ${task.id}\n\n${graph.render()}`);
+            },
+        },
+        {
+            name: TASK_GRAPH_TOOL_NAMES.list,
+            label: "List Tasks",
+            description: "List all tasks with their status, dependencies, and progress.",
+            parameters: Type.Object({
+                filter: Type.Optional(Type.Union([Type.Literal("all"), Type.Literal("ready"), Type.Literal("blocked"), Type.Literal("in_progress"), Type.Literal("completed")], { description: "Filter tasks by category. Default: all." })),
+            }),
+            async execute(_id, params) {
+                let tasks;
+                switch (params.filter) {
+                    case "ready":
+                        tasks = graph.listReady();
+                        break;
+                    case "blocked":
+                        tasks = graph.listBlocked();
+                        break;
+                    case "in_progress":
+                        tasks = graph.listAll().filter((t) => t.status === "in_progress");
+                        break;
+                    case "completed":
+                        tasks = graph.listAll().filter((t) => t.status === "completed");
+                        break;
+                    default: tasks = graph.listAll();
+                }
+                if (tasks.length === 0)
+                    return text(`No tasks matching filter: ${params.filter ?? "all"}`);
+                if (!params.filter || params.filter === "all")
+                    return text(graph.render());
+                const lines = tasks.map((t) => `${t.id}: ${t.subject} [${t.status}]`);
+                return text(`${params.filter}: ${tasks.length} task(s)\n${lines.join("\n")}`);
+            },
+        },
+        {
+            name: TASK_GRAPH_TOOL_NAMES.get,
+            label: "Get Task",
+            description: "Get detailed information about a specific task.",
+            parameters: Type.Object({
+                task_id: Type.String({ description: "Task ID." }),
+            }),
+            async execute(_id, params) {
+                const task = graph.get(params.task_id);
+                if (!task)
+                    return text(`Task not found: ${params.task_id}`);
+                return text(JSON.stringify(task, null, 2));
+            },
+        },
+    ];
+}
+function text(t) {
+    return { content: [{ type: "text", text: t }] };
+}
+//# sourceMappingURL=tools.js.map

package/dist/task-graph/tools.js.map

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

package/dist/task-graph/types.d.ts

@@ -0,0 +1,44 @@
+export declare const TASK_GRAPH_TOOL_NAMES: {
+    readonly create: "task_create";
+    readonly depend: "task_depend";
+    readonly update: "task_update";
+    readonly list: "task_list";
+    readonly get: "task_get";
+};
+export type TaskStatus = "pending" | "in_progress" | "completed" | "failed";
+export interface TaskNode {
+    id: string;
+    subject: string;
+    description: string;
+    status: TaskStatus;
+    /** IDs of tasks that must complete before this one can start. */
+    blockedBy: string[];
+    /** IDs of tasks that this task blocks (reverse edges, maintained automatically). */
+    blocks: string[];
+    /** Agent or user assigned to this task. */
+    owner: string;
+    /** Result summary after completion/failure. */
+    result?: string;
+    /** Background execution handle ID, if running in background. */
+    backgroundId?: string;
+    createdAt: number;
+    updatedAt: number;
+}
+export interface TaskGraphConfig {
+    /** Directory for persisting task graph to disk. If omitted, in-memory only. */
+    persistDir?: string;
+    /** Maximum number of tasks. Default: 100. */
+    maxTasks?: number;
+    /**
+     * Auto-inject completed background task results before each LLM call.
+     * Default: true.
+     */
+    autoInjectResults?: boolean;
+}
+export interface CompletedTaskResult {
+    taskId: string;
+    subject: string;
+    result: string;
+    status: "completed" | "failed";
+    unblockedTasks: string[];
+}

package/dist/task-graph/types.js

@@ -0,0 +1,9 @@
+// Task graph types — dependency-aware task DAG with background execution
+export const TASK_GRAPH_TOOL_NAMES = {
+    create: "task_create",
+    depend: "task_depend",
+    update: "task_update",
+    list: "task_list",
+    get: "task_get",
+};
+//# sourceMappingURL=types.js.map

package/dist/task-graph/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/task-graph/types.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAEzE,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,MAAM,EAAE,aAAa;IACrB,MAAM,EAAE,aAAa;IACrB,MAAM,EAAE,aAAa;IACrB,IAAI,EAAE,WAAW;IACjB,GAAG,EAAE,UAAU;CACP,CAAC"}

package/dist/tools/executor.d.ts

@@ -1,7 +1,7 @@
 import type { AgentTool, AgentToolResult, BeforeToolCallContext, BeforeToolCallResult, AfterToolCallContext, AfterToolCallResult } from "./types.js";
 import type { ToolCallBlock } from "../llm/types.js";
 import type { Approval } from "../approval/types.js";
-export interface ToolExecutorConfig {
+interface ToolExecutorConfig {
     tools: AgentTool[];
     mode: "sequential" | "parallel";
     approval: Approval;
@@ -11,7 +11,7 @@ export interface ToolExecutorConfig {
     afterToolCall?: (ctx: AfterToolCallContext) => Promise<AfterToolCallResult | void>;
     onEvent: (event: ToolExecutorEvent) => void;
 }
-export type ToolExecutorEvent = {
+type ToolExecutorEvent = {
     type: "tool_execution_start";
     toolCallId: string;
     toolName: string;
@@ -35,3 +35,4 @@ export interface ToolCallResult {
     isError: boolean;
 }
 export declare function executeToolCalls(toolCalls: ToolCallBlock[], config: ToolExecutorConfig): Promise<ToolCallResult[]>;
+export {};

package/dist/tools/mcp-adapter.js

@@ -88,15 +88,32 @@ export class MCPAdapter {
             async execute(toolCallId, params, context) {
                 // Approval is handled by the executor via approvalAction field
                 // No need to request approval here
-                // Call with timeout
+                // Call with timeout and abort signal support
                 const callPromise = client.callTool(def.name, params);
                 let result;
+                let timer;
+                let abortHandler;
+                const racers = [callPromise];
                 if (timeout) {
-                    const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error(`MCP tool ${def.name} timed out after ${timeout}ms`)), timeout));
-                    result = await Promise.race([callPromise, timeoutPromise]);
+                    racers.push(new Promise((_, reject) => {
+                        timer = setTimeout(() => reject(new Error(`MCP tool ${def.name} timed out after ${timeout}ms`)), timeout);
+                    }));
                 }
-                else {
-                    result = await callPromise;
+                if (context.signal.aborted)
+                    throw new Error("Aborted");
+                racers.push(new Promise((_, reject) => {
+                    abortHandler = () => reject(new Error("Aborted"));
+                    context.signal.addEventListener("abort", abortHandler, { once: true });
+                }));
+                try {
+                    result = await Promise.race(racers);
+                }
+                finally {
+                    if (timer !== undefined)
+                        clearTimeout(timer);
+                    if (abortHandler) {
+                        context.signal.removeEventListener("abort", abortHandler);
+                    }
                 }
                 // Convert MCP result to AgentToolResult
                 const content = result.content

package/dist/tools/mcp-adapter.js.map

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

package/dist/utils/id.js

@@ -1,9 +1,5 @@
+import { randomBytes } from "node:crypto";
 export function generateId() {
-    const chars = "0123456789abcdefghijklmnopqrstuvwxyz";
-    let id = "";
-    for (let i = 0; i < 12; i++) {
-        id += chars[Math.floor(Math.random() * chars.length)];
-    }
-    return id;
+    return randomBytes(9).toString("base64url").slice(0, 12);
 }
 //# sourceMappingURL=id.js.map

package/dist/utils/id.js.map

@@ -1 +1 @@
-{"version":3,"file":"id.js","sourceRoot":"","sources":["../../src/utils/id.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU;IACxB,MAAM,KAAK,GAAG,sCAAsC,CAAC;IACrD,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
+{"version":3,"file":"id.js","sourceRoot":"","sources":["../../src/utils/id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,UAAU,UAAU;IACxB,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3D,CAAC"}

package/dist/wire/wire.d.ts

@@ -1,5 +1,5 @@
 import type { WireMessage, WireSubscriber, WireSubscription } from "./types.js";
-export interface WireOptions {
+interface WireOptions {
     /** Max messages to buffer for replay to late subscribers. 0 = no buffering. */
     bufferSize?: number;
 }
@@ -18,3 +18,4 @@ export declare class Wire {
     getBuffer(): readonly WireMessage[];
     dispose(): void;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klaus-agent",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "Universal agent framework",
   "type": "module",
   "main": "dist/index.js",

package/src/approval/approval.ts

@@ -8,21 +8,27 @@ interface PendingRequest {
   resolve: (approved: boolean) => void;
 }
 
+interface SharedApprovalState {
+  yolo: boolean;
+  autoApproveActions: Set<string>;
+}
+
 export class ApprovalImpl implements Approval {
-  private _yolo: boolean;
-  private _autoApproveActions: Set<string>;
+  private _shared: SharedApprovalState;
   private _pending = new Map<string, PendingRequest>();
   private _queue: ApprovalRequest[] = [];
   private _waiters: ((req: ApprovalRequest) => void)[] = [];
 
-  constructor(config?: ApprovalConfig) {
-    this._yolo = config?.yolo ?? false;
-    this._autoApproveActions = new Set(config?.autoApproveActions ?? []);
+  constructor(config?: ApprovalConfig, sharedState?: SharedApprovalState) {
+    this._shared = sharedState ?? {
+      yolo: config?.yolo ?? false,
+      autoApproveActions: new Set(config?.autoApproveActions ?? []),
+    };
   }
 
   async request(sender: string, action: string, description: string, toolCallId: string): Promise<boolean> {
-    if (this._yolo) return true;
-    if (this._autoApproveActions.has(action)) return true;
+    if (this._shared.yolo) return true;
+    if (this._shared.autoApproveActions.has(action)) return true;
 
     const req: ApprovalRequest = {
       id: generateId(),
@@ -72,7 +78,7 @@ export class ApprovalImpl implements Approval {
     this._pending.delete(requestId);
 
     if (response === "approve_for_session") {
-      this._autoApproveActions.add(pending.request.action);
+      this._shared.autoApproveActions.add(pending.request.action);
       pending.resolve(true);
     } else {
       pending.resolve(response === "approve");
@@ -80,29 +86,29 @@ export class ApprovalImpl implements Approval {
   }
 
   setYolo(yolo: boolean): void {
-    this._yolo = yolo;
+    this._shared.yolo = yolo;
   }
 
   isYolo(): boolean {
-    return this._yolo;
+    return this._shared.yolo;
   }
 
   get autoApproveActions(): Set<string> {
-    return this._autoApproveActions;
+    return this._shared.autoApproveActions;
   }
 
   share(): Approval {
-    // Shared state (yolo, autoApproveActions), independent queue
-    // Use a shared state object so changes propagate bidirectionally
-    const shared = new ApprovalImpl();
-    shared._autoApproveActions = this._autoApproveActions; // same reference
-    // Share yolo via getter/setter delegation
-    const parent = this;
-    Object.defineProperty(shared, '_yolo', {
-      get() { return parent._yolo; },
-      set(v: boolean) { parent._yolo = v; },
-      configurable: true,
-    });
-    return shared;
+    // Shared state (yolo, autoApproveActions) via same reference, independent queue
+    return new ApprovalImpl(undefined, this._shared);
+  }
+
+  dispose(): void {
+    this.cancelPendingWaiters();
+    // Reject all pending approval requests so blocked tools don't hang forever
+    for (const [id, pending] of this._pending) {
+      pending.resolve(false);
+    }
+    this._pending.clear();
+    this._queue = [];
   }
 }

package/src/approval/types.ts

@@ -23,4 +23,5 @@ export interface Approval {
   isYolo(): boolean;
   readonly autoApproveActions: Set<string>;
   share(): Approval;
+  dispose(): void;
 }

package/src/background/task-manager.ts

@@ -82,6 +82,23 @@ export class BackgroundTaskManager {
     }
   }
 
+  /** Remove completed/failed tasks older than `maxAgeMs` (default: 5 minutes). */
+  prune(maxAgeMs = 5 * 60 * 1000): number {
+    const now = Date.now();
+    let removed = 0;
+    for (const [id, task] of this._tasks) {
+      if (
+        (task.status === "completed" || task.status === "failed") &&
+        task.completedAt &&
+        now - task.completedAt > maxAgeMs
+      ) {
+        this._tasks.delete(id);
+        removed++;
+      }
+    }
+    return removed;
+  }
+
   dispose(): void {
     this.abortAll();
     this._tasks.clear();

package/src/compaction/compaction.ts

@@ -75,6 +75,14 @@ export function findCutPoint(
     }
   }
 
+  // If all messages fit within keepRecentTokens, nothing can be discarded.
+  // Return firstKeptIndex: 0 so callers know there's nothing to cut —
+  // this prevents infinite compaction loops when context exceeds max but
+  // all messages fall within the keep window.
+  if (cutIndex >= messages.length) {
+    return { firstKeptIndex: 0, isSplitTurn: false };
+  }
+
   // Ensure we don't cut at a tool_result (must follow its tool_call)
   while (cutIndex < messages.length) {
     const msg = messages[cutIndex];
@@ -85,8 +93,8 @@ export function findCutPoint(
     }
   }
 
-  // Don't cut if nothing to discard
-  if (cutIndex <= 1) {
+  // After adjusting for tool_results, check if we've pushed past all messages
+  if (cutIndex >= messages.length || cutIndex <= 1) {
     return { firstKeptIndex: 0, isSplitTurn: false };
   }
 
@@ -108,25 +116,24 @@ export function microCompact(messages: Message[], keepRecent: number): Message[]
 
   if (toolResultIndices.length <= keepRecent) return messages;
 
+  // Build toolCallId → toolName map in one pass
+  const toolCallNames = new Map<string, string>();
+  for (const msg of messages) {
+    if (msg.role === "assistant") {
+      for (const b of msg.content) {
+        if (b.type === "tool_call") {
+          toolCallNames.set(b.id, b.name);
+        }
+      }
+    }
+  }
+
   const toReplace = toolResultIndices.slice(0, -keepRecent);
   const result = [...messages];
 
   for (const idx of toReplace) {
     const msg = result[idx] as ToolResultMessage;
-
-    let toolName = "tool";
-    for (let j = idx - 1; j >= 0; j--) {
-      const prev = result[j];
-      if (prev.role === "assistant") {
-        const call = prev.content.find(
-          (b): b is ToolCallBlock => b.type === "tool_call" && b.id === msg.toolCallId,
-        );
-        if (call) {
-          toolName = call.name;
-          break;
-        }
-      }
-    }
+    const toolName = toolCallNames.get(msg.toolCallId) ?? "tool";
 
     result[idx] = {
       role: "tool_result",
@@ -139,23 +146,3 @@ export function microCompact(messages: Message[], keepRecent: number): Message[]
   return result;
 }
 
-export function messagesToText(messages: AgentMessage[]): string {
-  const parts: string[] = [];
-  for (const msg of messages) {
-    if (!msg || typeof msg !== "object" || !("role" in msg)) continue;
-    const m = msg as Message;
-
-    if (m.role === "user") {
-      const text = typeof m.content === "string" ? m.content : m.content.filter((b) => b.type === "text").map((b) => (b as { text: string }).text).join("\n");
-      parts.push(`User: ${text}`);
-    } else if (m.role === "assistant") {
-      const text = m.content.filter((b) => b.type === "text").map((b) => (b as { text: string }).text).join("\n");
-      const toolCalls = m.content.filter((b) => b.type === "tool_call").map((b) => (b as { name: string }).name);
-      parts.push(`Assistant: ${text}${toolCalls.length ? ` [tools: ${toolCalls.join(", ")}]` : ""}`);
-    } else if (m.role === "tool_result") {
-      const text = typeof m.content === "string" ? m.content : m.content.filter((b) => b.type === "text").map((b) => (b as { text: string }).text).join("\n");
-      parts.push(`Tool result: ${text.slice(0, 500)}`);
-    }
-  }
-  return parts.join("\n");
-}

package/src/compaction/summarizer.ts

@@ -3,7 +3,6 @@
 import type { LLMProvider, LLMRequestOptions, AssistantMessage } from "../llm/types.js";
 import type { AgentMessage } from "../types.js";
 import type { CompactionSummarizer, CompactionInput } from "./types.js";
-import { messagesToText } from "./compaction.js";
 
 const SUMMARIZE_PROMPT = `You are a conversation summarizer. Summarize the following conversation history concisely, preserving:
 - Key decisions and outcomes
@@ -42,13 +41,9 @@ export class LLMSummarizer implements CompactionSummarizer {
 
     let result = "";
     for await (const event of this.provider.stream(options)) {
-      if (event.type === "text") {
-        result += event.text;
-      } else if (event.type === "done") {
+      if (event.type === "done") {
         const textBlocks = event.message.content.filter((b) => b.type === "text");
-        if (textBlocks.length > 0) {
-          result = textBlocks.map((b) => (b as { text: string }).text).join("");
-        }
+        result = textBlocks.map((b) => (b as { text: string }).text).join("");
       }
     }
 

package/src/core/agent-loop.ts

@@ -29,7 +29,7 @@ import { estimateTokens, shouldCompact, findCutPoint, microCompact } from "../co
 import { normalizeHistory } from "../injection/history-normalizer.js";
 import { calculateCost } from "../providers/shared.js";
 
-export interface AgentLoopConfig {
+interface AgentLoopConfig {
   provider: LLMProvider;
   modelId: string;
   systemPrompt: string;
@@ -91,7 +91,7 @@ function toolResultsToMessages(results: ToolCallResult[]): ToolResultMessage[] {
     role: "tool_result" as const,
     toolCallId: r.toolCallId,
     content: r.result.content,
-    isError: r.isError || undefined,
+    isError: r.isError,
   }));
 }
 
@@ -185,14 +185,10 @@ export async function runAgentLoop(
                 }
                 allMessages.push(...toKeep);
 
-                // Persist compaction to session
-                // Append compaction entry as boundary marker, then re-append
-                // kept messages after it so buildSessionContext picks them up
+                // Persist compaction boundary marker to session.
+                // Kept messages are already in the session tree — only append the compaction entry.
                 if (sessionManager) {
                   await sessionManager.appendCompaction(summary, sessionManager.getLeafId() ?? "", tokens);
-                  for (const msg of toKeep) {
-                    await sessionManager.appendMessage(msg);
-                  }
                 }
 
                 onEvent({ type: "compaction_end", summary });
@@ -257,7 +253,7 @@ export async function runAgentLoop(
 
         // --- Phase-aware tool filtering ---
         let visibleTools = allTools;
-        if (config.planningManager?.phase === "planning" && config.planningManager.allowedInPlanning.size > 2) {
+        if (config.planningManager?.phase === "planning" && config.planningManager.hasConfiguredReadOnlyTools) {
           visibleTools = allTools.filter((t) => config.planningManager!.allowedInPlanning.has(t.name));
         }
 
@@ -442,9 +438,20 @@ export async function runAgentLoop(
       }
     }
   } catch (err) {
-    if (!(err instanceof Error && err.name === "AbortError")) {
+    const isAbort = err instanceof Error && err.name === "AbortError";
+    if (!isAbort) {
       onEvent({ type: "error", error: err instanceof Error ? err : new Error(String(err)) });
     }
+
+    onEvent({ type: "agent_end", messages: allMessages });
+    await extensionRunner?.emitSimple("agent_end", { messages: allMessages });
+
+    // Re-throw non-abort errors so the caller (Agent._runLoop) can set error state.
+    // AbortError is intentional (user called agent.abort()), not an error condition.
+    if (!isAbort) {
+      throw err;
+    }
+    return allMessages;
   }
 
   onEvent({ type: "agent_end", messages: allMessages });