@cjhyy/code-shell 0.1.0-alpha.0 → 0.1.0-alpha.1

package/dist/{chunk-QHDYFC5U.cjs → chunk-Q6BYFYGD.cjs}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13; var _class14; var _class15; var _class16; var _class17; var _class18; var _class19; var _class20; var _class21; var _class22;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13; var _class14; var _class15; var _class16; var _class17; var _class18; var _class19; var _class20; var _class21; var _class22; var _class23; var _class24;
 
 var _chunk3QR52LL5cjs = require('./chunk-3QR52LL5.cjs');
 
@@ -443,7 +443,7 @@ var FileStateCache = (_class2 = class {constructor() { _class2.prototype.__init3
       if (s.mtimeMs === entry.mtimeMs) return entry.content;
       this.cache.delete(filePath);
       return null;
-    } catch (e2) {
+    } catch (e3) {
       this.cache.delete(filePath);
       return null;
     }
@@ -664,7 +664,7 @@ async function globTool(args) {
         try {
           const s = await _promises.stat.call(void 0, filePath);
           return { path: filePath, size: s.size, mtime: s.mtimeMs };
-        } catch (e3) {
+        } catch (e4) {
           return { path: filePath, size: 0, mtime: 0 };
         }
       })
@@ -814,7 +814,7 @@ var bashToolDef = {
       command: { type: "string", description: "The shell command to execute" },
       timeout: {
         type: "number",
-        description: "Timeout in milliseconds (default: 120000, max: 600000)"
+        description: "Timeout in milliseconds (default: 120000). Outer registry caps at 1h."
       },
       description: {
         type: "string",
@@ -828,7 +828,7 @@ var MAX_OUTPUT = 1e5;
 async function bashTool(args) {
   const command = args.command;
   if (!command) return "Error: command is required";
-  const timeout = Math.min(args.timeout || 12e4, 6e5);
+  const timeout = args.timeout || 12e4;
   try {
     const { stdout, stderr } = await execAsync(command, {
       timeout,
@@ -903,6 +903,63 @@ async function askUserTool(args) {
 // src/tool-system/builtin/agent.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
 init_plan();
+
+// src/tool-system/builtin/agent-registry.ts
+_chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
+var AsyncAgentRegistry = (_class3 = class {constructor() { _class3.prototype.__init4.call(this); }
+  __init4() {this.agents = /* @__PURE__ */ new Map()}
+  register(entry) {
+    this.agents.set(entry.agentId, entry);
+  }
+  get(agentId) {
+    return this.agents.get(agentId);
+  }
+  list() {
+    return [...this.agents.values()];
+  }
+  markCompleted(agentId, result) {
+    const e = this.agents.get(agentId);
+    if (!e) return;
+    if (e.status !== "running") return;
+    e.status = "completed";
+    e.result = result;
+    e.finishedAt = Date.now();
+  }
+  markFailed(agentId, error) {
+    const e = this.agents.get(agentId);
+    if (!e) return;
+    if (e.status !== "running") return;
+    e.status = "failed";
+    e.error = error;
+    e.finishedAt = Date.now();
+  }
+  cancel(agentId) {
+    const e = this.agents.get(agentId);
+    if (!e) return false;
+    if (e.status !== "running") return false;
+    try {
+      e.abort();
+    } catch (e5) {
+    }
+    e.status = "cancelled";
+    e.finishedAt = Date.now();
+    return true;
+  }
+  reset() {
+    for (const e of this.agents.values()) {
+      if (e.status === "running") {
+        try {
+          e.abort();
+        } catch (e6) {
+        }
+      }
+    }
+    this.agents.clear();
+  }
+}, _class3);
+var asyncAgentRegistry = new AsyncAgentRegistry();
+
+// src/tool-system/builtin/agent.ts
 var _nanoid = require('nanoid');
 var agentToolDef = {
   name: "Agent",
@@ -921,6 +978,10 @@ var agentToolDef = {
       max_turns: {
         type: "number",
         description: "Maximum turns for the sub-agent (default: 15)"
+      },
+      run_in_background: {
+        type: "boolean",
+        description: "If true, launch the sub-agent in the background and return an agent_id immediately instead of waiting for it to finish. Use AgentStatus(agent_id) to check progress and AgentCancel(agent_id) to stop it. The agent runs in this process; restarting loses its state. Default: false (synchronous wait)."
       }
     },
     required: ["description", "prompt"]
@@ -930,35 +991,21 @@ var _subAgentConfig;
 function setSubAgentConfig(config) {
   _subAgentConfig = config;
 }
-async function agentTool(args) {
-  const prompt = args.prompt;
-  const description = args.description || "sub-agent";
-  if (!prompt) return "Error: prompt is required";
-  if (!_subAgentConfig) {
-    return "Error: Agent tool is not configured.";
-  }
-  const signal = args.__signal;
-  if (_optionalChain([signal, 'optionalAccess', _5 => _5.aborted])) {
-    return "Agent aborted before starting.";
-  }
-  const maxTurns = Math.min(args.max_turns || 15, 30);
-  const agentId = _nanoid.nanoid.call(void 0, 8);
-  const parentStream = _subAgentConfig.onStream;
-  _optionalChain([parentStream, 'optionalCall', _6 => _6({ type: "agent_start", agentId, description })]);
+async function runSubAgent(opts) {
+  if (!_subAgentConfig) throw new Error("Agent tool is not configured.");
+  const { agentId, description, prompt, maxTurns, signal, parentStream } = opts;
+  _optionalChain([parentStream, 'optionalCall', _5 => _5({ type: "agent_start", agentId, description })]);
   const childStream = (event) => {
     if (!parentStream) return;
     const tagged = { ...event, agentId };
     parentStream(tagged);
   };
+  const parentWasInPlanMode = isInPlanMode();
+  if (parentWasInPlanMode) resetPlanMode();
   try {
-    const parentWasInPlanMode = isInPlanMode();
-    if (parentWasInPlanMode) {
-      resetPlanMode();
-    }
     const engine = _subAgentConfig.createEngine({
       llm: {
         ..._subAgentConfig.llm,
-        timeout: Math.min(_nullishCoalesce(_subAgentConfig.llm.timeout, () => ( 12e4)), 6e4),
         retryMaxAttempts: 2
       },
       cwd: _subAgentConfig.cwd,
@@ -972,27 +1019,142 @@ async function agentTool(args) {
       maxContextTokens: _subAgentConfig.maxContextTokens,
       sessionStorageDir: _subAgentConfig.sessionStorageDir
     });
-    let result;
-    try {
-      result = await engine.run(prompt, { signal, onStream: childStream });
-    } finally {
-      if (parentWasInPlanMode) {
-        restorePlanMode();
+    const result = await engine.run(prompt, { signal, onStream: childStream });
+    _optionalChain([parentStream, 'optionalCall', _6 => _6({ type: "agent_end", agentId, description })]);
+    return result.text || `Agent completed (${result.reason}) but produced no text output.`;
+  } finally {
+    if (parentWasInPlanMode) restorePlanMode();
+  }
+}
+async function agentTool(args) {
+  const prompt = args.prompt;
+  const description = args.description || "sub-agent";
+  if (!prompt) return "Error: prompt is required";
+  if (!_subAgentConfig) {
+    return "Error: Agent tool is not configured.";
+  }
+  const parentSignal = args.__signal;
+  if (_optionalChain([parentSignal, 'optionalAccess', _7 => _7.aborted])) {
+    return "Agent aborted before starting.";
+  }
+  const maxTurns = args.max_turns || 15;
+  const runInBackground = args.run_in_background === true;
+  const agentId = _nanoid.nanoid.call(void 0, 8);
+  const parentStream = _subAgentConfig.onStream;
+  if (runInBackground) {
+    const controller = new AbortController();
+    asyncAgentRegistry.register({
+      agentId,
+      description,
+      status: "running",
+      startedAt: Date.now(),
+      abort: () => controller.abort()
+    });
+    void runSubAgent({
+      agentId,
+      description,
+      prompt,
+      maxTurns,
+      signal: controller.signal,
+      parentStream
+    }).then((text) => asyncAgentRegistry.markCompleted(agentId, text)).catch((err) => {
+      if (controller.signal.aborted) {
+        return;
       }
-    }
-    _optionalChain([parentStream, 'optionalCall', _7 => _7({ type: "agent_end", agentId, description })]);
-    if (result.text) {
-      return result.text;
-    }
-    return `Agent completed (${result.reason}) but produced no text output.`;
+      asyncAgentRegistry.markFailed(agentId, err.message);
+    });
+    return [
+      `Agent launched in background.`,
+      `agent_id: ${agentId}`,
+      `description: ${description}`,
+      ``,
+      `Use AgentStatus(agent_id="${agentId}") to check progress or fetch the result.`,
+      `Use AgentCancel(agent_id="${agentId}") to stop it.`
+    ].join("\n");
+  }
+  try {
+    return await runSubAgent({
+      agentId,
+      description,
+      prompt,
+      maxTurns,
+      signal: _nullishCoalesce(parentSignal, () => ( new AbortController().signal)),
+      parentStream
+    });
   } catch (err) {
     _optionalChain([parentStream, 'optionalCall', _8 => _8({ type: "agent_end", agentId, description, error: err.message })]);
-    if (_optionalChain([signal, 'optionalAccess', _9 => _9.aborted])) {
+    if (_optionalChain([parentSignal, 'optionalAccess', _9 => _9.aborted])) {
       return "Agent was aborted.";
     }
     return `Agent error: ${err.message}`;
   }
 }
+var agentStatusToolDef = {
+  name: "AgentStatus",
+  description: "Check the status of a background agent launched with Agent(run_in_background=true). Returns running / completed / failed / cancelled, plus the result text once finished. Omit agent_id to list all background agents in this process.",
+  inputSchema: {
+    type: "object",
+    properties: {
+      agent_id: {
+        type: "string",
+        description: "The agent_id returned by Agent(run_in_background=true). Omit to list all."
+      }
+    }
+  }
+};
+async function agentStatusTool(args) {
+  const agentId = args.agent_id;
+  if (!agentId) {
+    const all = asyncAgentRegistry.list();
+    if (all.length === 0) return "No background agents in this process.";
+    return all.map((e2) => {
+      const dur2 = ((_nullishCoalesce(e2.finishedAt, () => ( Date.now()))) - e2.startedAt) / 1e3;
+      return `${e2.agentId} [${e2.status}] ${e2.description} (${dur2.toFixed(1)}s)`;
+    }).join("\n");
+  }
+  const e = asyncAgentRegistry.get(agentId);
+  if (!e) return `Error: agent_id "${agentId}" not found.`;
+  const dur = ((_nullishCoalesce(e.finishedAt, () => ( Date.now()))) - e.startedAt) / 1e3;
+  const lines = [
+    `agent_id: ${e.agentId}`,
+    `status:   ${e.status}`,
+    `description: ${e.description}`,
+    `duration: ${dur.toFixed(1)}s`
+  ];
+  if (e.status === "completed" && e.result) {
+    lines.push("", "\u2500\u2500 result \u2500\u2500", e.result);
+  } else if (e.status === "failed" && e.error) {
+    lines.push("", "\u2500\u2500 error \u2500\u2500", e.error);
+  } else if (e.status === "running") {
+    lines.push("", "(still running \u2014 call AgentStatus again later)");
+  }
+  return lines.join("\n");
+}
+var agentCancelToolDef = {
+  name: "AgentCancel",
+  description: "Cancel a background agent launched with Agent(run_in_background=true). The agent's current LLM call and any in-flight tools will be aborted.",
+  inputSchema: {
+    type: "object",
+    properties: {
+      agent_id: {
+        type: "string",
+        description: "The agent_id to cancel."
+      }
+    },
+    required: ["agent_id"]
+  }
+};
+async function agentCancelTool(args) {
+  const agentId = args.agent_id;
+  if (!agentId) return "Error: agent_id is required.";
+  const e = asyncAgentRegistry.get(agentId);
+  if (!e) return `Error: agent_id "${agentId}" not found.`;
+  if (e.status !== "running") {
+    return `Agent ${agentId} is already ${e.status}; nothing to cancel.`;
+  }
+  const ok = asyncAgentRegistry.cancel(agentId);
+  return ok ? `Agent ${agentId} cancelled.` : `Failed to cancel agent ${agentId}.`;
+}
 
 // src/tool-system/builtin/index.ts
 init_plan();
@@ -1102,7 +1264,7 @@ function createWorktree(cwd, slug, sessionId) {
       encoding: "utf-8",
       timeout: 5e3
     }).trim();
-  } catch (e4) {
+  } catch (e7) {
   }
   _child_process.execSync.call(void 0, `git worktree add -b "${branchName}" "${worktreePath}"`, {
     cwd: gitRoot,
@@ -1136,10 +1298,10 @@ function removeWorktree(worktreePath, removeBranch = false) {
         if (branch.startsWith("worktree/")) {
           _child_process.execSync.call(void 0, `git branch -D "${branch}"`, { cwd: gitRoot, timeout: 1e4 });
         }
-      } catch (e5) {
+      } catch (e8) {
       }
     }
-  } catch (e6) {
+  } catch (e9) {
   }
 }
 function symlinkLargeDirectories(sourceRoot, worktreePath) {
@@ -1150,7 +1312,7 @@ function symlinkLargeDirectories(sourceRoot, worktreePath) {
     if (_fs.existsSync.call(void 0, source) && _fs.lstatSync.call(void 0, source).isDirectory() && !_fs.existsSync.call(void 0, target)) {
       try {
         _fs.symlinkSync.call(void 0, source, target, "dir");
-      } catch (e7) {
+      } catch (e10) {
       }
     }
   }
@@ -1638,10 +1800,10 @@ _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
 
 // src/cron/scheduler.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var CronScheduler = (_class3 = class {constructor() { _class3.prototype.__init4.call(this);_class3.prototype.__init5.call(this);_class3.prototype.__init6.call(this); }
-  __init4() {this.jobs = /* @__PURE__ */ new Map()}
-  __init5() {this.timers = /* @__PURE__ */ new Map()}
-  __init6() {this.nextId = 1}
+var CronScheduler = (_class4 = class {constructor() { _class4.prototype.__init5.call(this);_class4.prototype.__init6.call(this);_class4.prototype.__init7.call(this); }
+  __init5() {this.jobs = /* @__PURE__ */ new Map()}
+  __init6() {this.timers = /* @__PURE__ */ new Map()}
+  __init7() {this.nextId = 1}
   
   setExecutor(fn) {
     this.onExecute = fn;
@@ -1713,12 +1875,12 @@ var CronScheduler = (_class3 = class {constructor() { _class3.prototype.__init4.
       job.nextRun = Date.now() + intervalMs;
       try {
         await _optionalChain([this, 'access', _20 => _20.onExecute, 'optionalCall', _21 => _21(job)]);
-      } catch (e8) {
+      } catch (e11) {
       }
     }, intervalMs);
     this.timers.set(job.id, timer);
   }
-}, _class3);
+}, _class4);
 function parseSchedule(schedule) {
   const match = schedule.match(/^(\d+)(s|m|h|d)$/);
   if (match) {
@@ -2321,7 +2483,9 @@ var BUILTIN_TOOLS = [
       source: "builtin",
       permissionDefault: "ask",
       isReadOnly: false,
-      isConcurrencySafe: false
+      isConcurrencySafe: false,
+      timeoutMs: 36e5
+      // 1h — supports long-running shell loops (e.g. `until` polling)
     },
     execute: bashTool
   },
@@ -2361,10 +2525,32 @@ var BUILTIN_TOOLS = [
       source: "builtin",
       permissionDefault: "allow",
       isReadOnly: true,
-      isConcurrencySafe: true
+      isConcurrencySafe: true,
+      timeoutMs: 18e5
+      // 30min — sub-agent runs may execute many tool calls
     },
     execute: agentTool
   },
+  {
+    definition: {
+      ...agentStatusToolDef,
+      source: "builtin",
+      permissionDefault: "allow",
+      isReadOnly: true,
+      isConcurrencySafe: true
+    },
+    execute: agentStatusTool
+  },
+  {
+    definition: {
+      ...agentCancelToolDef,
+      source: "builtin",
+      permissionDefault: "allow",
+      isReadOnly: false,
+      isConcurrencySafe: false
+    },
+    execute: agentCancelTool
+  },
   {
     definition: {
       ...enterPlanModeToolDef,
@@ -2647,7 +2833,9 @@ var BUILTIN_TOOLS = [
       source: "builtin",
       permissionDefault: "ask",
       isReadOnly: true,
-      isConcurrencySafe: false
+      isConcurrencySafe: false,
+      timeoutMs: 18e5
+      // 30min — multi-model debate rounds take time
     },
     execute: arenaTool
   }
@@ -2655,10 +2843,11 @@ var BUILTIN_TOOLS = [
 
 // src/tool-system/registry.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var ToolRegistry = (_class4 = class {
-  __init7() {this.tools = /* @__PURE__ */ new Map()}
-  __init8() {this.builtinExecutors = /* @__PURE__ */ new Map()}
-  constructor(options = {}) {;_class4.prototype.__init7.call(this);_class4.prototype.__init8.call(this);
+var DEFAULT_TOOL_TIMEOUT_MS = 12e4;
+var ToolRegistry = (_class5 = class {
+  __init8() {this.tools = /* @__PURE__ */ new Map()}
+  __init9() {this.builtinExecutors = /* @__PURE__ */ new Map()}
+  constructor(options = {}) {;_class5.prototype.__init8.call(this);_class5.prototype.__init9.call(this);
     this.registerBuiltins(options.builtinTools);
   }
   registerBuiltins(selectedBuiltinTools) {
@@ -2709,10 +2898,7 @@ var ToolRegistry = (_class4 = class {
     if (!executor) {
       throw new (0, _chunkEL2RL5DGcjs.ToolExecutionError)(name, "No executor registered for this tool");
     }
-    const LONG_TIMEOUT_TOOLS = /* @__PURE__ */ new Set(["Agent", "Arena"]);
-    const isLongRunning = LONG_TIMEOUT_TOOLS.has(name);
-    const defaultTimeout = isLongRunning ? 18e5 : 12e4;
-    const timeout = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _46 => _46.timeoutMs]), () => ( defaultTimeout));
+    const timeout = _nullishCoalesce(_nullishCoalesce(_optionalChain([options, 'optionalAccess', _46 => _46.timeoutMs]), () => ( tool.timeoutMs)), () => ( DEFAULT_TOOL_TIMEOUT_MS));
     const parentSignal = _optionalChain([options, 'optionalAccess', _47 => _47.signal]);
     const id = `tool_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
     if (_optionalChain([parentSignal, 'optionalAccess', _48 => _48.aborted])) {
@@ -2762,7 +2948,7 @@ var ToolRegistry = (_class4 = class {
   listToolsDetailed() {
     return [...this.tools.values()];
   }
-}, _class4);
+}, _class5);
 
 // src/tool-system/executor.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
@@ -2796,7 +2982,7 @@ function validateToolArgs(toolName, args, schema) {
       }
     }
     return null;
-  } catch (e9) {
+  } catch (e12) {
     return null;
   }
 }
@@ -3115,9 +3301,9 @@ var AutoApprovalBackend = class {
     return false;
   }
 };
-var InteractiveApprovalBackend = (_class5 = class {constructor() { _class5.prototype.__init9.call(this);_class5.prototype.__init10.call(this); }
-  __init9() {this.sessionRules = /* @__PURE__ */ new Map()}
-  __init10() {this.promptFn = null}
+var InteractiveApprovalBackend = (_class6 = class {constructor() { _class6.prototype.__init10.call(this);_class6.prototype.__init11.call(this); }
+  __init10() {this.sessionRules = /* @__PURE__ */ new Map()}
+  __init11() {this.promptFn = null}
   setPromptFn(fn) {
     this.promptFn = fn;
   }
@@ -3126,7 +3312,7 @@ var InteractiveApprovalBackend = (_class5 = class {constructor() { _class5.proto
     if (toolRule === "allow") return { approved: true };
     if (toolRule === "deny") return { approved: false };
     if (!this.promptFn) {
-      return { approved: true };
+      return { approved: false, reason: "interactive approval backend has no prompt function" };
     }
     const result = await this.promptFn(req);
     if (result.always && result.approved) {
@@ -3141,7 +3327,7 @@ var InteractiveApprovalBackend = (_class5 = class {constructor() { _class5.proto
     if (args.command) return String(args.command).slice(0, 50);
     return "";
   }
-}, _class5);
+}, _class6);
 var _interactiveBackend = null;
 function getInteractiveApprovalBackend() {
   if (!_interactiveBackend) {
@@ -3212,11 +3398,11 @@ function classifyBashCommand(command) {
   }
   return "unsafe";
 }
-var DenialTracker = (_class6 = class {
-  __init11() {this.denials = /* @__PURE__ */ new Map()}
+var DenialTracker = (_class7 = class {
+  __init12() {this.denials = /* @__PURE__ */ new Map()}
   
   
-  constructor(opts) {;_class6.prototype.__init11.call(this);
+  constructor(opts) {;_class7.prototype.__init12.call(this);
     this.periodMs = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _64 => _64.periodMs]), () => ( 60 * 60 * 1e3));
     this.maxDenials = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _65 => _65.maxDenials]), () => ( 5));
   }
@@ -3250,18 +3436,18 @@ var DenialTracker = (_class6 = class {
   clear() {
     this.denials.clear();
   }
-}, _class6);
+}, _class7);
 var _runtimeBypass = false;
 function setRuntimeBypass(enabled) {
   _runtimeBypass = enabled;
 }
-var PermissionClassifier = (_class7 = class {
-  constructor(rules, defaultMode = "default", approvalBackend = new HeadlessApprovalBackend("deny-all")) {;_class7.prototype.__init12.call(this);
+var PermissionClassifier = (_class8 = class {
+  constructor(rules, defaultMode = "default", approvalBackend = new HeadlessApprovalBackend("deny-all")) {;_class8.prototype.__init13.call(this);
     this.rules = rules;
     this.defaultMode = defaultMode;
     this.approvalBackend = approvalBackend;
   }
-  __init12() {this.denialTracker = new DenialTracker()}
+  __init13() {this.denialTracker = new DenialTracker()}
   classify(toolName, args) {
     if (_runtimeBypass) return "allow";
     for (const rule of this.rules) {
@@ -3352,12 +3538,12 @@ var PermissionClassifier = (_class7 = class {
         return `${toolName}(${JSON.stringify(args).slice(0, 100)})`;
     }
   }
-}, _class7);
+}, _class8);
 
 // src/hooks/registry.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var HookRegistry = (_class8 = class {constructor() { _class8.prototype.__init13.call(this); }
-  __init13() {this.hooks = /* @__PURE__ */ new Map()}
+var HookRegistry = (_class9 = class {constructor() { _class9.prototype.__init14.call(this); }
+  __init14() {this.hooks = /* @__PURE__ */ new Map()}
   register(eventName, handler, priority = 0, name) {
     if (!this.hooks.has(eventName)) {
       this.hooks.set(eventName, []);
@@ -3419,7 +3605,7 @@ var HookRegistry = (_class8 = class {constructor() { _class8.prototype.__init13.
   countHandlers(eventName) {
     return _nullishCoalesce(_optionalChain([this, 'access', _71 => _71.hooks, 'access', _72 => _72.get, 'call', _73 => _73(eventName), 'optionalAccess', _74 => _74.length]), () => ( 0));
   }
-}, _class8);
+}, _class9);
 
 // src/context/manager.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
@@ -3430,11 +3616,11 @@ var DEFAULT_CONFIG = {
   summarizeAtRatio: 0.8,
   maxToolResultChars: 3e4
 };
-var ContextManager = (_class9 = class {
+var ContextManager = (_class10 = class {
   
-  __init14() {this.toolCallHashes = /* @__PURE__ */ new Map()}
+  __init15() {this.toolCallHashes = /* @__PURE__ */ new Map()}
   
-  __init15() {this.consecutiveSummaryFailures = 0}
+  __init16() {this.consecutiveSummaryFailures = 0}
   
   /** Last known actual token count from API usage data. */
   
@@ -3442,7 +3628,7 @@ var ContextManager = (_class9 = class {
   
   /** Path to session transcript — passed to summary compaction for on-demand access. */
   
-  constructor(config) {;_class9.prototype.__init14.call(this);_class9.prototype.__init15.call(this);
+  constructor(config) {;_class10.prototype.__init15.call(this);_class10.prototype.__init16.call(this);
     this.config = { ...DEFAULT_CONFIG, ...config };
   }
   /**
@@ -3632,12 +3818,12 @@ var ContextManager = (_class9 = class {
   hashCall(toolName, args) {
     return `${toolName}:${JSON.stringify(args)}`;
   }
-}, _class9);
+}, _class10);
 
 // src/prompt/section-cache.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var SectionCache = (_class10 = class {constructor() { _class10.prototype.__init16.call(this); }
-  __init16() {this.cache = /* @__PURE__ */ new Map()}
+var SectionCache = (_class11 = class {constructor() { _class11.prototype.__init17.call(this); }
+  __init17() {this.cache = /* @__PURE__ */ new Map()}
   async resolve(sections) {
     const results = [];
     for (const section of sections) {
@@ -3661,7 +3847,7 @@ var SectionCache = (_class10 = class {constructor() { _class10.prototype.__init1
   has(name) {
     return this.cache.has(name);
   }
-}, _class10);
+}, _class11);
 
 // src/prompt/instruction-scanner.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
@@ -3723,7 +3909,7 @@ function tryAddFile(path, source, depth, entries) {
     if (content) {
       entries.push({ path, content, source, depth });
     }
-  } catch (e10) {
+  } catch (e13) {
   }
 }
 function tryAddRulesDir(dir, source, depth, entries) {
@@ -3733,7 +3919,7 @@ function tryAddRulesDir(dir, source, depth, entries) {
     for (const file of files) {
       tryAddFile(_path.join.call(void 0, dir, file), source, depth, entries);
     }
-  } catch (e11) {
+  } catch (e14) {
   }
 }
 function findGitRoot2(cwd) {
@@ -3744,7 +3930,7 @@ function findGitRoot2(cwd) {
       timeout: 3e3,
       stdio: ["pipe", "pipe", "pipe"]
     }).trim() || null;
-  } catch (e12) {
+  } catch (e15) {
     return null;
   }
 }
@@ -3870,6 +4056,8 @@ var GENERAL_BUILTIN_TOOLS = [
   "WebFetch",
   "AskUserQuestion",
   "Agent",
+  "AgentStatus",
+  "AgentCancel",
   "EnterPlanMode",
   "ExitPlanMode",
   "ToolSearch",
@@ -3909,6 +4097,8 @@ var GENERAL_PERMISSION_RULES = [
   { tool: "WebFetch", decision: "allow" },
   { tool: "AskUserQuestion", decision: "allow" },
   { tool: "Agent", decision: "allow" },
+  { tool: "AgentStatus", decision: "allow" },
+  { tool: "AgentCancel", decision: "allow" },
   { tool: "EnterPlanMode", decision: "allow" },
   { tool: "ExitPlanMode", decision: "allow" },
   { tool: "ToolSearch", decision: "allow" },
@@ -3983,12 +4173,12 @@ function resolveBuiltinToolNames(options) {
 
 // src/prompt/composer.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var PromptComposer = (_class11 = class {
-  constructor(options) {;_class11.prototype.__init17.call(this);_class11.prototype.__init18.call(this);
+var PromptComposer = (_class12 = class {
+  constructor(options) {;_class12.prototype.__init18.call(this);_class12.prototype.__init19.call(this);
     this.options = options;
   }
-  __init17() {this.sectionCache = new SectionCache()}
-  __init18() {this.cachedInstructions = null}
+  __init18() {this.sectionCache = new SectionCache()}
+  __init19() {this.cachedInstructions = null}
   /**
    * Build the system prompt from sections.
    */
@@ -4053,7 +4243,7 @@ ${status}`;
 Recent commits:
 ${log}`;
       }
-    } catch (e13) {
+    } catch (e16) {
     }
     return gitStatus;
   }
@@ -4130,11 +4320,11 @@ ${toolLines.join("\n\n")}`;
     try {
       const mm = new (0, _chunk3EAEC566cjs.MemoryManager)(this.options.cwd);
       return mm.buildMemoryContext();
-    } catch (e14) {
+    } catch (e17) {
       return "";
     }
   }
-}, _class11);
+}, _class12);
 
 // src/engine/engine.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
@@ -4326,13 +4516,13 @@ function checkTokenBudget(turnOutputTokens, budget, tracker) {
 
 // src/engine/streaming-tool-queue.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var StreamingToolQueue = (_class12 = class {
+var StreamingToolQueue = (_class13 = class {
   
-  __init19() {this.pending = /* @__PURE__ */ new Map()}
-  __init20() {this.unsafeQueue = []}
-  __init21() {this.callOrder = []}
-  __init22() {this.draining = false}
-  constructor(executor) {;_class12.prototype.__init19.call(this);_class12.prototype.__init20.call(this);_class12.prototype.__init21.call(this);_class12.prototype.__init22.call(this);
+  __init20() {this.pending = /* @__PURE__ */ new Map()}
+  __init21() {this.unsafeQueue = []}
+  __init22() {this.callOrder = []}
+  __init23() {this.draining = false}
+  constructor(executor) {;_class13.prototype.__init20.call(this);_class13.prototype.__init21.call(this);_class13.prototype.__init22.call(this);_class13.prototype.__init23.call(this);
     this.executor = executor;
   }
   /**
@@ -4368,17 +4558,17 @@ var StreamingToolQueue = (_class12 = class {
   get size() {
     return this.callOrder.length;
   }
-}, _class12);
+}, _class13);
 
 // src/engine/turn-loop.ts
-var TurnLoop = (_class13 = class {
-  constructor(deps, config) {;_class13.prototype.__init23.call(this);_class13.prototype.__init24.call(this);
+var TurnLoop = (_class14 = class {
+  constructor(deps, config) {;_class14.prototype.__init24.call(this);_class14.prototype.__init25.call(this);
     this.deps = deps;
     this.config = config;
   }
-  __init23() {this.turnCount = 0}
+  __init24() {this.turnCount = 0}
   /** Tool IDs already emitted as tool_use_start during streaming (to avoid duplicates). */
-  __init24() {this.streamedToolIds = /* @__PURE__ */ new Set()}
+  __init25() {this.streamedToolIds = /* @__PURE__ */ new Set()}
   /**
    * Run the multi-turn agent loop until completion.
    */
@@ -4433,19 +4623,19 @@ var TurnLoop = (_class13 = class {
             } catch (retryErr) {
               if (!(retryErr instanceof _chunkEL2RL5DGcjs.ContextLimitError)) {
                 _optionalChain([this, 'access', _85 => _85.config, 'access', _86 => _86.onStream, 'optionalCall', _87 => _87({ type: "error", error: retryErr.message })]);
-                return { text: finalText, reason: "model_error" };
+                return { text: finalText, reason: "model_error", messages };
               }
             }
           }
           if (!recovered) {
             this.patchOrphanedToolUses(messages);
             _optionalChain([this, 'access', _88 => _88.config, 'access', _89 => _89.onStream, 'optionalCall', _90 => _90({ type: "error", error: "Context limit exceeded after 3 recovery attempts" })]);
-            return { text: finalText, reason: "prompt_too_long" };
+            return { text: finalText, reason: "prompt_too_long", messages };
           }
         } else {
           this.patchOrphanedToolUses(messages);
           _optionalChain([this, 'access', _91 => _91.config, 'access', _92 => _92.onStream, 'optionalCall', _93 => _93({ type: "error", error: err.message })]);
-          return { text: finalText, reason: "model_error" };
+          return { text: finalText, reason: "model_error", messages };
         }
       }
       if (_optionalChain([response, 'access', _94 => _94.usage, 'optionalAccess', _95 => _95.promptTokens]) !== void 0) {
@@ -4476,14 +4666,14 @@ var TurnLoop = (_class13 = class {
               response = { ...contResponse, text: combinedText };
               break;
             }
-          } catch (e15) {
+          } catch (e18) {
             break;
           }
         }
         response = { ...response, text: combinedText };
       }
       if (_optionalChain([this, 'access', _96 => _96.config, 'access', _97 => _97.signal, 'optionalAccess', _98 => _98.aborted])) {
-        return { text: finalText, reason: "aborted_streaming" };
+        return { text: finalText, reason: "aborted_streaming", messages };
       }
       if (response.text) {
         finalText = response.text;
@@ -4502,7 +4692,8 @@ var TurnLoop = (_class13 = class {
           turnNumber: this.turnCount,
           hasToolUse: false
         });
-        return { text: finalText, reason: "completed" };
+        messages.push({ role: "assistant", content: finalText });
+        return { text: finalText, reason: "completed", messages };
       }
       _chunkIMMTBZ33cjs.logger.info("turn.tool_use", { turn: this.turnCount, tools: response.toolCalls.map((t) => t.toolName) });
       const toolCalls = response.toolCalls.slice(0, this.config.maxToolCallsPerTurn);
@@ -4566,7 +4757,8 @@ var TurnLoop = (_class13 = class {
           type: "assistant_message",
           message: { role: "assistant", content: finalText }
         })]);
-        return { text: finalText, reason: "completed" };
+        messages.push({ role: "assistant", content: finalText });
+        return { text: finalText, reason: "completed", messages };
       }
       if (budgetDecision === "nudge") {
         messages.push({
@@ -4599,7 +4791,7 @@ var TurnLoop = (_class13 = class {
       if (summaryResponse.text) {
         finalText = summaryResponse.text;
       }
-    } catch (e16) {
+    } catch (e19) {
       _chunkIMMTBZ33cjs.logger.warn("turn.summary_failed");
     }
     if (finalText) {
@@ -4607,9 +4799,10 @@ var TurnLoop = (_class13 = class {
         type: "assistant_message",
         message: { role: "assistant", content: finalText }
       })]);
+      messages.push({ role: "assistant", content: finalText });
     }
     _optionalChain([this, 'access', _121 => _121.config, 'access', _122 => _122.onStream, 'optionalCall', _123 => _123({ type: "turn_complete", reason: "max_turns" })]);
-    return { text: finalText, reason: "max_turns" };
+    return { text: finalText, reason: "max_turns", messages };
   }
   /**
    * Call model with streaming fallback.
@@ -4731,15 +4924,15 @@ var TurnLoop = (_class13 = class {
       return;
     }
   }
-}, _class13);
+}, _class14);
 
 // src/engine/engine.ts
 init_plan();
 _chunkFGZGCFJXcjs.init_manager.call(void 0, );
 
 
-var Engine = class _Engine {
-  constructor(config) {
+var Engine = (_class15 = class _Engine {
+  constructor(config) {;_class15.prototype.__init26.call(this);
     this.config = config;
     this.preset = resolveAgentPreset(config.preset);
     this.toolRegistry = new ToolRegistry({
@@ -4750,6 +4943,9 @@ var Engine = class _Engine {
       })
     });
     this.hooks = new HookRegistry();
+    for (const hook of _nullishCoalesce(config.hooks, () => ( []))) {
+      this.hooks.register(hook.event, hook.handler, hook.priority, hook.name);
+    }
     this.sessionManager = new (0, _chunkNG73UR3Lcjs.SessionManager)(config.sessionStorageDir);
     this.modelPool = new (0, _chunkUK2SU23Scjs.ModelPool)();
     try {
@@ -4771,7 +4967,7 @@ var Engine = class _Engine {
         const match = settings.models.find((m) => m.model === currentModel);
         if (match) this.modelPool.switch(match.key);
       }
-    } catch (e17) {
+    } catch (e20) {
     }
   }
   
@@ -4819,7 +5015,7 @@ var Engine = class _Engine {
     let messages;
     if (_optionalChain([options, 'optionalAccess', _132 => _132.sessionId])) {
       session = this.sessionManager.resume(options.sessionId);
-      messages = session.transcript.toMessages();
+      messages = this.compactedMessagesBySession.get(options.sessionId) ? [...this.compactedMessagesBySession.get(options.sessionId)] : session.transcript.toMessages();
       if (session.state.costState && this.config.costStore) {
         this.config.costStore.restore(session.state.costState);
       }
@@ -4851,7 +5047,7 @@ var Engine = class _Engine {
       if (_optionalChain([settings, 'access', _133 => _133.permissions, 'optionalAccess', _134 => _134.rules, 'optionalAccess', _135 => _135.length])) {
         defaultRules.unshift(...settings.permissions.rules);
       }
-    } catch (e18) {
+    } catch (e21) {
     }
     let approvalBackend;
     if (this.config.approvalBackend) {
@@ -4860,7 +5056,7 @@ var Engine = class _Engine {
       approvalBackend = new AutoApprovalBackend();
     } else {
       approvalBackend = new HeadlessApprovalBackend(
-        mode === "bypassPermissions" ? "approve-all" : mode === "dontAsk" ? "deny-all" : "approve-all"
+        mode === "bypassPermissions" ? "approve-all" : mode === "dontAsk" ? "deny-all" : "deny-all"
       );
     }
     const permission = new PermissionClassifier(defaultRules, mode, approvalBackend);
@@ -4912,6 +5108,8 @@ var Engine = class _Engine {
     if (userContextMsg) {
       messages.unshift(userContextMsg);
     }
+    this.lastSessionId = session.state.sessionId;
+    this.lastMessages = messages;
     contextManager.setTranscriptPath(session.transcript.getFilePath());
     contextManager.setSummarizeFn(async (prompt) => {
       const summaryResponse = await llmClient.createMessage({
@@ -4977,6 +5175,11 @@ var Engine = class _Engine {
       }
     );
     const result = await turnLoop.run(messages);
+    this.lastMessages = result.messages;
+    this.compactedMessagesBySession.set(
+      session.state.sessionId,
+      this.stripUserContextMessage(result.messages, userContextMsg)
+    );
     _chunkIMMTBZ33cjs.logger.info("engine.done", {
       sessionId: session.state.sessionId,
       reason: result.reason,
@@ -5059,19 +5262,29 @@ var Engine = class _Engine {
    * Returns token stats before/after.
    */
   forceCompact() {
-    if (!this.lastContextManager || !this.lastMessages) {
+    const sessionId = this.lastSessionId;
+    if (!this.lastContextManager || !sessionId) {
       return { before: 0, after: 0, strategy: "none (no active session)" };
     }
     const { estimateTokens: estimateTokens2 } = (_chunkLRAY5IYCcjs.init_compaction.call(void 0, ), _chunkIJSHQGMPcjs.__toCommonJS.call(void 0, _chunkLRAY5IYCcjs.compaction_exports));
-    const before = estimateTokens2(this.lastMessages);
-    this.lastMessages = this.lastContextManager.manage(this.lastMessages);
-    const after = estimateTokens2(this.lastMessages);
+    const sourceMessages = _nullishCoalesce(this.compactedMessagesBySession.get(sessionId), () => ( this.sessionManager.resume(sessionId).transcript.toMessages()));
+    const before = estimateTokens2(sourceMessages);
+    const compacted = this.lastContextManager.manage(sourceMessages);
+    const after = estimateTokens2(compacted);
+    this.compactedMessagesBySession.set(sessionId, compacted);
+    this.lastMessages = compacted;
     return {
       before,
       after,
       strategy: before === after ? "no compaction needed" : "compacted"
     };
   }
+  stripUserContextMessage(messages, userContextMsg) {
+    if (!userContextMsg || messages[0] !== userContextMsg) {
+      return [...messages];
+    }
+    return messages.slice(1);
+  }
   /**
    * Update a config setting at runtime.
    */
@@ -5090,7 +5303,9 @@ var Engine = class _Engine {
   /** Track last context manager and messages for /compact support. */
   
   
-};
+  
+  __init26() {this.compactedMessagesBySession = /* @__PURE__ */ new Map()}
+}, _class15);
 
 // src/run/types.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
@@ -5126,9 +5341,9 @@ _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
 
 
 
-var FileRunStore = (_class14 = class {
+var FileRunStore = (_class16 = class {
   
-  constructor(storageDir) {;_class14.prototype.__init25.call(this);
+  constructor(storageDir) {;_class16.prototype.__init27.call(this);
     this.runsDir = _nullishCoalesce(storageDir, () => ( _path.join.call(void 0, _os.homedir.call(void 0, ), ".code-shell", "runs")));
     _fs.mkdirSync.call(void 0, this.runsDir, { recursive: true });
   }
@@ -5154,7 +5369,7 @@ var FileRunStore = (_class14 = class {
     return JSON.parse(_fs.readFileSync.call(void 0, filePath, "utf-8"));
   }
   /** Serializes concurrent JSONL appends per file path. */
-  __init25() {this.appendLocks = /* @__PURE__ */ new Map()}
+  __init27() {this.appendLocks = /* @__PURE__ */ new Map()}
   async appendJsonl(filePath, data) {
     const prev = _nullishCoalesce(this.appendLocks.get(filePath), () => ( Promise.resolve()));
     const current = prev.then(() => {
@@ -5274,17 +5489,17 @@ var FileRunStore = (_class14 = class {
       _path.join.call(void 0, this.runDir(runId), "artifacts", "refs.jsonl")
     );
   }
-}, _class14);
+}, _class16);
 
 // src/run/RunQueue.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var RunQueue = (_class15 = class {
+var RunQueue = (_class17 = class {
   
-  __init26() {this.pending = []}
-  __init27() {this.active = /* @__PURE__ */ new Set()}
-  __init28() {this.executor = null}
-  __init29() {this.draining = false}
-  constructor(config) {;_class15.prototype.__init26.call(this);_class15.prototype.__init27.call(this);_class15.prototype.__init28.call(this);_class15.prototype.__init29.call(this);
+  __init28() {this.pending = []}
+  __init29() {this.active = /* @__PURE__ */ new Set()}
+  __init30() {this.executor = null}
+  __init31() {this.draining = false}
+  constructor(config) {;_class17.prototype.__init28.call(this);_class17.prototype.__init29.call(this);_class17.prototype.__init30.call(this);_class17.prototype.__init31.call(this);
     this.concurrency = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _151 => _151.concurrency]), () => ( 1));
   }
   setExecutor(fn) {
@@ -5336,18 +5551,18 @@ var RunQueue = (_class15 = class {
       });
     }
   }
-}, _class15);
+}, _class17);
 
 // src/run/RunApprovalBackend.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var RunApprovalBackend = (_class16 = class {constructor() { _class16.prototype.__init30.call(this);_class16.prototype.__init31.call(this);_class16.prototype.__init32.call(this); }
-  __init30() {this.pendingApproval = null}
-  __init31() {this.hooks = null}
+var RunApprovalBackend = (_class18 = class {constructor() { _class18.prototype.__init32.call(this);_class18.prototype.__init33.call(this);_class18.prototype.__init34.call(this); }
+  __init32() {this.pendingApproval = null}
+  __init33() {this.hooks = null}
   setHooks(hooks) {
     this.hooks = hooks;
   }
   /** Max time (ms) to wait for approval before auto-rejecting. Default: 24h */
-  __init32() {this.timeoutMs = 24 * 60 * 60 * 1e3}
+  __init34() {this.timeoutMs = 24 * 60 * 60 * 1e3}
   setTimeout(ms) {
     this.timeoutMs = ms;
   }
@@ -5382,7 +5597,7 @@ var RunApprovalBackend = (_class16 = class {constructor() { _class16.prototype._
   hasPendingApproval() {
     return this.pendingApproval !== null;
   }
-}, _class16);
+}, _class18);
 function createRunAskUserFn(hooks) {
   let pending = null;
   const askUserFn = async (question) => {
@@ -5415,16 +5630,16 @@ var PHASE_PATTERNS = [
   { pattern: /\breview\b.*\b(complete|done|finished)\b/i, phase: "review_complete" },
   { pattern: /\brefactor\b.*\b(complete|done|finished)\b/i, phase: "refactor_complete" }
 ];
-var CheckpointWriter = (_class17 = class {
+var CheckpointWriter = (_class19 = class {
   
   
-  __init33() {this.currentTurn = 0}
-  __init34() {this.lastCheckpointTurn = 0}
-  __init35() {this.touchedTools = /* @__PURE__ */ new Set()}
-  __init36() {this.lastAssistantText = ""}
-  __init37() {this.sessionId = null}
-  __init38() {this.detectedPhases = /* @__PURE__ */ new Set()}
-  constructor(config) {;_class17.prototype.__init33.call(this);_class17.prototype.__init34.call(this);_class17.prototype.__init35.call(this);_class17.prototype.__init36.call(this);_class17.prototype.__init37.call(this);_class17.prototype.__init38.call(this);
+  __init35() {this.currentTurn = 0}
+  __init36() {this.lastCheckpointTurn = 0}
+  __init37() {this.touchedTools = /* @__PURE__ */ new Set()}
+  __init38() {this.lastAssistantText = ""}
+  __init39() {this.sessionId = null}
+  __init40() {this.detectedPhases = /* @__PURE__ */ new Set()}
+  constructor(config) {;_class19.prototype.__init35.call(this);_class19.prototype.__init36.call(this);_class19.prototype.__init37.call(this);_class19.prototype.__init38.call(this);_class19.prototype.__init39.call(this);_class19.prototype.__init40.call(this);
     this.config = config;
     this.turnInterval = _nullishCoalesce(config.turnInterval, () => ( 10));
   }
@@ -5510,16 +5725,16 @@ var CheckpointWriter = (_class17 = class {
     }
     return truncated.trim() + (text.length > 400 ? "..." : "");
   }
-}, _class17);
+}, _class19);
 
 // src/run/ArtifactTracker.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
 
-var ArtifactTracker = (_class18 = class {
+var ArtifactTracker = (_class20 = class {
   
-  __init39() {this.pendingCalls = /* @__PURE__ */ new Map()}
-  __init40() {this.recordedPaths = /* @__PURE__ */ new Set()}
-  constructor(config) {;_class18.prototype.__init39.call(this);_class18.prototype.__init40.call(this);
+  __init41() {this.pendingCalls = /* @__PURE__ */ new Map()}
+  __init42() {this.recordedPaths = /* @__PURE__ */ new Set()}
+  constructor(config) {;_class20.prototype.__init41.call(this);_class20.prototype.__init42.call(this);
     this.config = config;
   }
   /**
@@ -5630,7 +5845,7 @@ var ArtifactTracker = (_class18 = class {
       return;
     }
   }
-}, _class18);
+}, _class20);
 function extractFileName(filePath) {
   const parts = filePath.split("/");
   return parts[parts.length - 1] || filePath;
@@ -5662,11 +5877,11 @@ function check(file, options) {
 }
 
 // src/run/RunLock.ts
-var RunLock = (_class19 = class {
+var RunLock = (_class21 = class {
   
   
-  __init41() {this.releaseFns = /* @__PURE__ */ new Map()}
-  constructor(config) {;_class19.prototype.__init41.call(this);
+  __init43() {this.releaseFns = /* @__PURE__ */ new Map()}
+  constructor(config) {;_class21.prototype.__init43.call(this);
     this.runsDir = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _154 => _154.runsDir]), () => ( _path.join.call(void 0, _os.homedir.call(void 0, ), ".code-shell", "runs")));
     this.staleMs = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _155 => _155.staleMs]), () => ( 6e4));
   }
@@ -5684,7 +5899,7 @@ var RunLock = (_class19 = class {
       this.releaseFns.set(runId, release);
       _chunkIMMTBZ33cjs.logger.info("run.lock.acquired", { runId });
       return true;
-    } catch (e19) {
+    } catch (e22) {
       return false;
     }
   }
@@ -5696,7 +5911,7 @@ var RunLock = (_class19 = class {
     if (releaseFn) {
       try {
         await releaseFn();
-      } catch (e20) {
+      } catch (e23) {
       }
       this.releaseFns.delete(runId);
       _chunkIMMTBZ33cjs.logger.info("run.lock.released", { runId });
@@ -5710,7 +5925,7 @@ var RunLock = (_class19 = class {
     if (!_fs.existsSync.call(void 0, lockTarget)) return false;
     try {
       return await check(lockTarget, { stale: this.staleMs });
-    } catch (e21) {
+    } catch (e24) {
       return false;
     }
   }
@@ -5723,7 +5938,7 @@ var RunLock = (_class19 = class {
     try {
       await unlock(lockTarget);
       _chunkIMMTBZ33cjs.logger.info("run.lock.force_unlocked", { runId });
-    } catch (e22) {
+    } catch (e25) {
     }
   }
   /**
@@ -5737,18 +5952,18 @@ var RunLock = (_class19 = class {
   lockTarget(runId) {
     return _path.join.call(void 0, this.runsDir, runId, "run.json");
   }
-}, _class19);
+}, _class21);
 
 // src/run/Heartbeat.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
 
 
 
-var Heartbeat = (_class20 = class {
+var Heartbeat = (_class22 = class {
   
   
-  __init42() {this.timers = /* @__PURE__ */ new Map()}
-  constructor(config) {;_class20.prototype.__init42.call(this);
+  __init44() {this.timers = /* @__PURE__ */ new Map()}
+  constructor(config) {;_class22.prototype.__init44.call(this);
     this.runsDir = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _156 => _156.runsDir]), () => ( _path.join.call(void 0, _os.homedir.call(void 0, ), ".code-shell", "runs")));
     this.intervalMs = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _157 => _157.intervalMs]), () => ( 5e3));
   }
@@ -5790,7 +6005,7 @@ var Heartbeat = (_class20 = class {
     if (!_fs.existsSync.call(void 0, filePath)) return null;
     try {
       return JSON.parse(_fs.readFileSync.call(void 0, filePath, "utf-8"));
-    } catch (e23) {
+    } catch (e26) {
       return null;
     }
   }
@@ -5813,7 +6028,7 @@ var Heartbeat = (_class20 = class {
     try {
       process.kill(data.pid, 0);
       return true;
-    } catch (e24) {
+    } catch (e27) {
       return false;
     }
   }
@@ -5825,7 +6040,7 @@ var Heartbeat = (_class20 = class {
     };
     try {
       _fs.writeFileSync.call(void 0, this.filePath(runId), JSON.stringify(data), "utf-8");
-    } catch (e25) {
+    } catch (e28) {
     }
   }
   remove(runId) {
@@ -5834,22 +6049,22 @@ var Heartbeat = (_class20 = class {
       if (_fs.existsSync.call(void 0, filePath)) {
         _fs.unlinkSync.call(void 0, filePath);
       }
-    } catch (e26) {
+    } catch (e29) {
     }
   }
   filePath(runId) {
     return _path.join.call(void 0, this.runsDir, runId, "heartbeat");
   }
-}, _class20);
+}, _class22);
 
 // src/run/Evaluator.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
-var NoopEvaluator = (_class21 = class {constructor() { _class21.prototype.__init43.call(this); }
-  __init43() {this.name = "noop"}
+var NoopEvaluator = (_class23 = class {constructor() { _class23.prototype.__init45.call(this); }
+  __init45() {this.name = "noop"}
   async evaluate() {
     return { verdict: "passed", findings: [] };
   }
-}, _class21);
+}, _class23);
 var CompositeEvaluator = class {
   
   
@@ -5921,6 +6136,7 @@ var EngineRunner = class {
       appendSystemPrompt: this.config.appendSystemPrompt,
       sessionStorageDir: this.config.sessionStorageDir,
       mcpServers: this.config.mcpServers,
+      hooks: this.config.hooks,
       approvalBackend,
       askUser: askUserFn,
       ...context.engineConfigOverrides
@@ -5954,18 +6170,20 @@ var EngineRunner = class {
 // src/run/RunManager.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
 
-var RunManager = (_class22 = class {
+var RunManager = (_class24 = class {
+  
+  
   
   
   
   
   
   
-  __init44() {this.subscribers = /* @__PURE__ */ new Map()}
-  __init45() {this.abortControllers = /* @__PURE__ */ new Map()}
+  __init46() {this.subscribers = /* @__PURE__ */ new Map()}
+  __init47() {this.abortControllers = /* @__PURE__ */ new Map()}
   /** Active execution handles — used to resolve pending approvals/input while Engine is suspended */
-  __init46() {this.executionHandles = /* @__PURE__ */ new Map()}
-  constructor(config) {;_class22.prototype.__init44.call(this);_class22.prototype.__init45.call(this);_class22.prototype.__init46.call(this);
+  __init48() {this.executionHandles = /* @__PURE__ */ new Map()}
+  constructor(config) {;_class24.prototype.__init46.call(this);_class24.prototype.__init47.call(this);_class24.prototype.__init48.call(this);
     this.store = config.store;
     this.queue = new RunQueue({ concurrency: _nullishCoalesce(config.concurrency, () => ( 1)) });
     this.runner = isRunExecutor(config.executor) ? config.executor : new EngineRunner(config.executor);
@@ -5978,6 +6196,8 @@ var RunManager = (_class22 = class {
       intervalMs: config.heartbeatIntervalMs
     });
     this.evaluator = _nullishCoalesce(config.evaluator, () => ( new NoopEvaluator()));
+    this.defaultTags = _nullishCoalesce(config.defaultTags, () => ( []));
+    this.defaultMetadata = _nullishCoalesce(config.defaultMetadata, () => ( {}));
     this.queue.setExecutor((runId) => this.executeRun(runId));
   }
   // ─── Submit ────────────────────────────────────────────────────
@@ -6002,8 +6222,8 @@ var RunManager = (_class22 = class {
       latestApprovalId: null,
       summary: null,
       error: null,
-      tags: _nullishCoalesce(input.tags, () => ( [])),
-      metadata: _nullishCoalesce(input.metadata, () => ( {}))
+      tags: [.../* @__PURE__ */ new Set([...this.defaultTags, ..._nullishCoalesce(input.tags, () => ( []))])],
+      metadata: { ...this.defaultMetadata, ..._nullishCoalesce(input.metadata, () => ( {})) }
     };
     await this.store.create(snapshot);
     await this.emitRunEvent(runId, "run_created", { objective: input.objective });
@@ -6454,7 +6674,7 @@ var RunManager = (_class22 = class {
     if (!run) throw new Error(`Run not found: ${runId}`);
     return run;
   }
-}, _class22);
+}, _class24);
 function isRunExecutor(obj) {
   return obj != null && typeof obj.execute === "function";
 }
@@ -6508,4 +6728,5 @@ function isRunExecutor(obj) {
 
 
 
-exports.setAskUserFn = setAskUserFn; exports.isInPlanMode = isInPlanMode; exports.setInPlanMode = setInPlanMode; exports.plan_exports = plan_exports; exports.init_plan = init_plan; exports.taskManager = taskManager; exports.BUILTIN_TOOLS = BUILTIN_TOOLS; exports.ToolRegistry = ToolRegistry; exports.ToolExecutor = ToolExecutor; exports.HeadlessApprovalBackend = HeadlessApprovalBackend; exports.AutoApprovalBackend = AutoApprovalBackend; exports.setInteractiveApprovalFn = setInteractiveApprovalFn; exports.setRuntimeBypass = setRuntimeBypass; exports.PermissionClassifier = PermissionClassifier; exports.HookRegistry = HookRegistry; exports.ContextManager = ContextManager; exports.SectionCache = SectionCache; exports.scanInstructions = scanInstructions; exports.combineInstructions = combineInstructions; exports.registerSection = registerSection; exports.loadSection = loadSection; exports.loadSections = loadSections; exports.availableSections = availableSections; exports.BUILTIN_AGENT_PRESETS = BUILTIN_AGENT_PRESETS; exports.DEFAULT_AGENT_PRESET = DEFAULT_AGENT_PRESET; exports.DEFAULT_CLI_PRESET = DEFAULT_CLI_PRESET; exports.registerPreset = registerPreset; exports.listPresetNames = listPresetNames; exports.resolveAgentPreset = resolveAgentPreset; exports.buildPresetSystemPrompt = buildPresetSystemPrompt; exports.resolveBuiltinToolNames = resolveBuiltinToolNames; exports.PromptComposer = PromptComposer; exports.updateLastInteractionTime = updateLastInteractionTime; exports.flushInteractionTime = flushInteractionTime; exports.Engine = Engine; exports.VALID_TRANSITIONS = VALID_TRANSITIONS; exports.FileRunStore = FileRunStore; exports.RunQueue = RunQueue; exports.RunApprovalBackend = RunApprovalBackend; exports.createRunAskUserFn = createRunAskUserFn; exports.CheckpointWriter = CheckpointWriter; exports.ArtifactTracker = ArtifactTracker; exports.RunLock = RunLock; exports.Heartbeat = Heartbeat; exports.NoopEvaluator = NoopEvaluator; exports.CompositeEvaluator = CompositeEvaluator; exports.EngineRunner = EngineRunner; exports.RunManager = RunManager;
+
+exports.setAskUserFn = setAskUserFn; exports.isInPlanMode = isInPlanMode; exports.setInPlanMode = setInPlanMode; exports.plan_exports = plan_exports; exports.init_plan = init_plan; exports.taskManager = taskManager; exports.BUILTIN_TOOLS = BUILTIN_TOOLS; exports.ToolRegistry = ToolRegistry; exports.ToolExecutor = ToolExecutor; exports.HeadlessApprovalBackend = HeadlessApprovalBackend; exports.AutoApprovalBackend = AutoApprovalBackend; exports.getInteractiveApprovalBackend = getInteractiveApprovalBackend; exports.setInteractiveApprovalFn = setInteractiveApprovalFn; exports.setRuntimeBypass = setRuntimeBypass; exports.PermissionClassifier = PermissionClassifier; exports.HookRegistry = HookRegistry; exports.ContextManager = ContextManager; exports.SectionCache = SectionCache; exports.scanInstructions = scanInstructions; exports.combineInstructions = combineInstructions; exports.registerSection = registerSection; exports.loadSection = loadSection; exports.loadSections = loadSections; exports.availableSections = availableSections; exports.BUILTIN_AGENT_PRESETS = BUILTIN_AGENT_PRESETS; exports.DEFAULT_AGENT_PRESET = DEFAULT_AGENT_PRESET; exports.DEFAULT_CLI_PRESET = DEFAULT_CLI_PRESET; exports.registerPreset = registerPreset; exports.listPresetNames = listPresetNames; exports.resolveAgentPreset = resolveAgentPreset; exports.buildPresetSystemPrompt = buildPresetSystemPrompt; exports.resolveBuiltinToolNames = resolveBuiltinToolNames; exports.PromptComposer = PromptComposer; exports.updateLastInteractionTime = updateLastInteractionTime; exports.flushInteractionTime = flushInteractionTime; exports.Engine = Engine; exports.VALID_TRANSITIONS = VALID_TRANSITIONS; exports.FileRunStore = FileRunStore; exports.RunQueue = RunQueue; exports.RunApprovalBackend = RunApprovalBackend; exports.createRunAskUserFn = createRunAskUserFn; exports.CheckpointWriter = CheckpointWriter; exports.ArtifactTracker = ArtifactTracker; exports.RunLock = RunLock; exports.Heartbeat = Heartbeat; exports.NoopEvaluator = NoopEvaluator; exports.CompositeEvaluator = CompositeEvaluator; exports.EngineRunner = EngineRunner; exports.RunManager = RunManager;