zelari-code 2.34.0 → 2.35.0

package/dist/cli/main.bundled.js

@@ -3414,10 +3414,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path99) {
-  if (!path99)
+function getElementAtPath(obj, path100) {
+  if (!path100)
     return obj;
-  return path99.reduce((acc, key) => acc?.[key], obj);
+  return path100.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -3745,11 +3745,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path99, issues) {
+function prefixIssues(path100, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path99);
+    iss.path.unshift(path100);
     return iss;
   });
 }
@@ -3967,16 +3967,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path99 = []) => {
+  const processError = (error52, path100 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path99, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path100, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path99, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path100, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path99, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path100, ...issue2.path]);
       } else {
-        const fullpath = [...path99, ...issue2.path];
+        const fullpath = [...path100, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -4003,17 +4003,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path99 = []) => {
+  const processError = (error52, path100 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path99, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path100, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path99, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path100, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path99, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path100, ...issue2.path]);
       } else {
-        const fullpath = [...path99, ...issue2.path];
+        const fullpath = [...path100, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -4045,8 +4045,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path99 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path99) {
+  const path100 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path100) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -17549,13 +17549,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path99 = ref.slice(1).split("/").filter(Boolean);
-  if (path99.length === 0) {
+  const path100 = ref.slice(1).split("/").filter(Boolean);
+  if (path100.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path99[0] === defsKey) {
-    const key = path99[1];
+  if (path100[0] === defsKey) {
+    const key = path100[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -18327,7 +18327,9 @@ var init_zod = __esm({
 });
 
 // packages/core/dist/core/tools/toolTypes.js
-function typedOk(value, meta3) {
+function typedOk(value, meta3, images) {
+  if (images && images.length > 0)
+    return { ok: true, value, meta: meta3, images };
   return meta3 ? { ok: true, value, meta: meta3 } : { ok: true, value };
 }
 function typedErr(error51, meta3) {
@@ -18387,17 +18389,17 @@ var init_newlines = __esm({
 });
 
 // packages/core/dist/core/tools/builtin/fileEvents.js
-function fileReadEvent(path99, snapshotId) {
-  return { kind: "file.read", actor: { type: "tool" }, data: { path: path99, snapshotId } };
+function fileReadEvent(path100, snapshotId) {
+  return { kind: "file.read", actor: { type: "tool" }, data: { path: path100, snapshotId } };
 }
-function fileAppliedEvent(path99, snapshotId, bytes) {
-  return { kind: "file.applied", actor: { type: "tool" }, data: { path: path99, snapshotId, bytes } };
+function fileAppliedEvent(path100, snapshotId, bytes) {
+  return { kind: "file.applied", actor: { type: "tool" }, data: { path: path100, snapshotId, bytes } };
 }
-function fileRejectedEvent(path99, reason, hint) {
+function fileRejectedEvent(path100, reason, hint) {
   return {
     kind: "file.rejected",
     actor: { type: "tool" },
-    data: hint === void 0 ? { path: path99, reason } : { path: path99, reason, hint }
+    data: hint === void 0 ? { path: path100, reason } : { path: path100, reason, hint }
   };
 }
 function reReadHint(reject) {
@@ -19313,8 +19315,8 @@ async function searchFile(absPath, relPath, regex, contextLines, remainingSlots)
 }
 async function isDirectory(p3) {
   try {
-    const stat7 = await fs7.stat(p3);
-    return stat7.isDirectory();
+    const stat8 = await fs7.stat(p3);
+    return stat8.isDirectory();
   } catch {
     return false;
   }
@@ -20266,11 +20268,11 @@ var init_tools = __esm({
           if (!ctx.addDocument)
             return "Knowledge vault tool not available.";
           const title = args["title"] || "New Document";
-          const path99 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
+          const path100 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
           const content = args["content"] || "";
           const tags = args["tags"] || [];
           ctx.addDocument({
-            path: path99,
+            path: path100,
             title,
             content,
             format: "markdown",
@@ -20279,7 +20281,7 @@ var init_tools = __esm({
             workspaceId: ctx.workspaceId
           });
           ctx.addActivity("vault", "created document", title);
-          return `Document "${title}" created at "${path99}".`;
+          return `Document "${title}" created at "${path100}".`;
         }
       }
     ];
@@ -25104,16 +25106,16 @@ function runRetentionFromEnv() {
     maxTotalBytes: Number.isFinite(parseMb) && parseMb > 0 ? Math.round(parseMb * 1024 * 1024) : DEFAULT_RUN_RETENTION_MAX_MB * 1024 * 1024
   };
 }
-async function dirSize(path99) {
+async function dirSize(path100) {
   let total = 0;
   let entries;
   try {
-    entries = await readdir(path99, { withFileTypes: true });
+    entries = await readdir(path100, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const child = join3(path99, entry.name);
+    const child = join3(path100, entry.name);
     if (entry.isDirectory())
       total += await dirSize(child);
     else {
@@ -25140,19 +25142,19 @@ async function enforceRunRetention(runsDir, options = {}) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const path99 = join3(runsDir, entry.name);
+    const path100 = join3(runsDir, entry.name);
     let startedAt = 0;
     let endedAt;
     let completed = false;
     try {
-      const manifest = JSON.parse(await readFile(join3(path99, "manifest.json"), "utf8"));
+      const manifest = JSON.parse(await readFile(join3(path100, "manifest.json"), "utf8"));
       startedAt = manifest.startedAt ?? 0;
       endedAt = manifest.endedAt;
       completed = Boolean(endedAt) && manifest.status !== "running";
     } catch {
       completed = false;
     }
-    infos.push({ name: entry.name, path: path99, startedAt, endedAt, completed, bytes: await dirSize(path99) });
+    infos.push({ name: entry.name, path: path100, startedAt, endedAt, completed, bytes: await dirSize(path100) });
   }
   const remove = async (info) => {
     await rm(info.path, { recursive: true, force: true });
@@ -25639,12 +25641,12 @@ var init_engine = __esm({
        * content digest) and the returned ref carries the event seq when the
        * emitter resolved one.
        */
-      async fsEvidence(observation, path99, sha256, content, extra = {}) {
+      async fsEvidence(observation, path100, sha256, content, extra = {}) {
         const digest = sha256 && content !== void 0 ? sha256(content) : void 0;
-        const seq = await this.emitEvidence({ observation, path: path99, ...extra, ...digest ? { digest } : {} });
+        const seq = await this.emitEvidence({ observation, path: path100, ...extra, ...digest ? { digest } : {} });
         return {
           tier: "fs-observation",
-          ref: path99,
+          ref: path100,
           capturedAt: Date.now(),
           ...digest ? { digest } : {},
           ...seq !== void 0 ? { seq } : {}
@@ -28372,6 +28374,136 @@ var init_textLoopDetect = __esm({
   }
 });
 
+// packages/core/dist/agents/council/outputCleaning.js
+function extractBalancedJsonObject(s) {
+  const start = s.indexOf("{");
+  if (start < 0)
+    return null;
+  let depth = 0;
+  let inString = false;
+  let escape = false;
+  for (let i = start; i < s.length; i++) {
+    const ch = s[i];
+    if (inString) {
+      if (escape) {
+        escape = false;
+        continue;
+      }
+      if (ch === "\\") {
+        escape = true;
+        continue;
+      }
+      if (ch === '"')
+        inString = false;
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      continue;
+    }
+    if (ch === "{")
+      depth++;
+    else if (ch === "}") {
+      depth--;
+      if (depth === 0)
+        return s.slice(start, i + 1);
+    }
+  }
+  return null;
+}
+function parseClarificationRequest(text) {
+  const start = text.indexOf(QUESTION_MARKER);
+  if (start < 0)
+    return null;
+  const rest = text.slice(start + QUESTION_MARKER.length);
+  const end = rest.indexOf(QUESTION_END_MARKER);
+  const block = end >= 0 ? rest.slice(0, end) : rest;
+  const cleaned = block.replace(/```json\n?/g, "").replace(/```\n?/g, "").trim();
+  const jsonText = extractBalancedJsonObject(cleaned) ?? (() => {
+    const objStart = cleaned.indexOf("{");
+    const objEnd = cleaned.lastIndexOf("}");
+    return objStart >= 0 && objEnd > objStart ? cleaned.slice(objStart, objEnd + 1) : cleaned;
+  })();
+  try {
+    const parsed = JSON.parse(jsonText);
+    if (typeof parsed.question !== "string" || !parsed.question.trim())
+      return null;
+    return {
+      question: parsed.question.trim(),
+      choices: Array.isArray(parsed.choices) ? parsed.choices.filter((c) => typeof c === "string" && c.trim().length > 0).map((c) => c.trim()) : void 0,
+      context: typeof parsed.context === "string" ? parsed.context.trim() : void 0
+    };
+  } catch {
+    return null;
+  }
+}
+function hasInteractiveClarification(text) {
+  const c = parseClarificationRequest(text);
+  return !!(c && c.choices && c.choices.length >= 2);
+}
+function stripQuestionBlocks(text) {
+  let out = "";
+  let rest = text;
+  while (true) {
+    const start = rest.indexOf(QUESTION_MARKER);
+    if (start < 0) {
+      out += rest;
+      break;
+    }
+    out += rest.slice(0, start);
+    const afterMarker = rest.slice(start + QUESTION_MARKER.length);
+    const trimmed = afterMarker.replace(/^\s+/, "");
+    if (!trimmed.startsWith("{")) {
+      out += QUESTION_MARKER;
+      rest = afterMarker;
+      continue;
+    }
+    const endIdx = afterMarker.indexOf(QUESTION_END_MARKER);
+    if (endIdx >= 0) {
+      rest = afterMarker.slice(endIdx + QUESTION_END_MARKER.length);
+      continue;
+    }
+    const json3 = extractBalancedJsonObject(trimmed);
+    if (json3) {
+      const jsonAt = afterMarker.indexOf(json3);
+      rest = afterMarker.slice(jsonAt + json3.length);
+      continue;
+    }
+    break;
+  }
+  return out.replace(/\n{3,}/g, "\n\n").trim();
+}
+function parseThinking(text) {
+  const complete = text.match(/<think(?:ing)?>([\s\S]*?)<\/think(?:ing)?>/i);
+  if (complete)
+    return complete[1].trim();
+  const open2 = text.match(/<think(?:ing)?>([\s\S]*)$/i);
+  return open2 ? open2[1].trim() : "";
+}
+function cleanAgentContent(text, opts = {}) {
+  const stripQuestion = opts.stripQuestion !== false;
+  const stripThink = opts.stripThink !== false;
+  let out = text;
+  if (stripThink) {
+    out = out.replace(/<think(?:ing)?>[\s\S]*?<\/think(?:ing)?>/gi, "").replace(/<think(?:ing)?>[\s\S]*$/gi, "").replace(/<\/think(?:ing)?>/gi, "");
+  }
+  out = out.replace(/<minimax:tool_call>[\s\S]*?<\/minimax:tool_call>/gi, "").replace(/<\/?minimax:tool_call>/gi, "").replace(/<tool_call>[\s\S]*?<\/tool_call>/gi, "").replace(/<\/?tool_call>/gi, "").replace(/<function_call>[\s\S]*?<\/function_call>/gi, "").replace(/<\/?function_call>/gi, "").replace(/<invoke\b[^>]*>[\s\S]*?<\/invoke>/gi, "").replace(/<\/invoke>/gi, "").replace(/<parameter\b[^>]*>[\s\S]*?<\/parameter>/gi, "").replace(/<\/parameter>/gi, "").replace(/\]\s*<\]\s*minimax\s*\[>\s*\[?<invoke\b[^>]*>[\s\S]*?<\/invoke>/gi, "").replace(/<minimax:tool_call>[\s\S]*$/gi, "").replace(/<tool_call>[\s\S]*$/gi, "").replace(/<function_call>[\s\S]*$/gi, "").replace(/<invoke\b[^>]*>[\s\S]*$/gi, "").replace(/\]\s*<\]\s*minimax\s*\[>[\s\S]*$/gi, "").replace(/^\s*\]\s*<\]\s*minimax\s*\[>.*$/gim, "").replace(/^\s*<\/?(?:tool_call|function_call|invoke|parameter|minimax:tool_call)\b[^>]*>\s*$/gim, "");
+  if (stripQuestion) {
+    out = stripQuestionBlocks(out);
+  }
+  out = out.replace(/\n{3,}/g, "\n\n").trim();
+  return scrubProprietaryLeak(out);
+}
+var QUESTION_MARKER, QUESTION_END_MARKER;
+var init_outputCleaning = __esm({
+  "packages/core/dist/agents/council/outputCleaning.js"() {
+    "use strict";
+    init_secrecyPolicy();
+    QUESTION_MARKER = "---QUESTION---";
+    QUESTION_END_MARKER = "---END---";
+  }
+});
+
 // packages/core/dist/core/AgentHarness.js
 function gateAdvice(hardLimit) {
   return hardLimit ? "Finalize now with the evidence already collected; no further tool calls will run this turn." : "Prioritize verification/repair actions (test, typecheck, build, read failures) or finalize honestly.";
@@ -28668,6 +28800,7 @@ var init_AgentHarness = __esm({
     init_requestSnapshot();
     init_textLoopDetect();
     init_ObserverBus();
+    init_outputCleaning();
     init_textLoopDetect();
     TOOL_CALL_TRUNCATED_RECOVERY_MARKER = "[harness] Previous tool call was truncated";
     TOOL_CALL_TRUNCATED_RECOVERY_USER = `${TOOL_CALL_TRUNCATED_RECOVERY_MARKER} by the provider before completion (finish_reason=tool_calls but no complete tool_call arrived). Retry with a shorter payload or split the work into smaller tool calls.`;
@@ -28975,7 +29108,8 @@ ${shared.content}`,
             return {
               content: resultStr,
               isError: !result.ok,
-              durationMs: Date.now() - startMs
+              durationMs: Date.now() - startMs,
+              ...result.ok && result.images && result.images.length > 0 ? { images: result.images } : {}
             };
           })();
           inflight.set(callKey, prom);
@@ -28996,7 +29130,8 @@ ${shared.content}`,
             toolCallId: p3.toolCallId,
             content: r.content,
             isError: r.isError,
-            endEvent
+            endEvent,
+            ...r.images ? { images: r.images } : {}
             // Cache already written in invokeOne; no need to re-set.
           };
         };
@@ -29548,7 +29683,8 @@ ${cached2}`
                   yield item.endEvent;
                   turnToolResults.push({
                     toolCallId: item.toolCallId,
-                    content: item.content
+                    content: item.content,
+                    ...item.images ? { images: item.images } : {}
                   });
                   if (item.cacheKey && item.content && !item.isError) {
                     this.toolCallCache.set(item.cacheKey, item.content);
@@ -29562,7 +29698,7 @@ ${cached2}`
                 }
                 pendingNativeTools.length = 0;
               }
-              const clarificationPause = /---QUESTION---/.test(turnText) && /"choices"\s*:\s*\[/.test(turnText);
+              const clarificationPause = hasInteractiveClarification(turnText);
               if (clarificationPause) {
                 finishRef.value = "stop";
                 finishRef.clarificationRequested = true;
@@ -29728,7 +29864,8 @@ ${cached2}`
                 this.config.messages.push({
                   role: "tool",
                   toolCallId: tr.toolCallId,
-                  content: tr.content
+                  content: tr.content,
+                  ...tr.images ? { images: tr.images } : {}
                 });
               }
               if (truncatedToolCall) {
@@ -31529,11 +31666,11 @@ var init_synthesisAudit = __esm({
 import { existsSync as existsSync10, readFileSync as readFileSync9, writeFileSync as writeFileSync6 } from "node:fs";
 import { join as join5 } from "node:path";
 function loadNfrSpec(zelariRoot) {
-  const path99 = join5(zelariRoot, "nfr-spec.json");
-  if (!existsSync10(path99))
+  const path100 = join5(zelariRoot, "nfr-spec.json");
+  if (!existsSync10(path100))
     return null;
   try {
-    const raw = JSON.parse(readFileSync9(path99, "utf8"));
+    const raw = JSON.parse(readFileSync9(path100, "utf8"));
     if (raw.version !== 1 || !Array.isArray(raw.targets))
       return null;
     return raw;
@@ -32128,101 +32265,36 @@ var init_types7 = __esm({
   }
 });
 
-// packages/core/dist/agents/council/outputCleaning.js
-function extractBalancedJsonObject(s) {
-  const start = s.indexOf("{");
-  if (start < 0)
-    return null;
-  let depth = 0;
-  let inString = false;
-  let escape = false;
-  for (let i = start; i < s.length; i++) {
-    const ch = s[i];
-    if (inString) {
-      if (escape) {
-        escape = false;
-        continue;
-      }
-      if (ch === "\\") {
-        escape = true;
-        continue;
-      }
-      if (ch === '"')
-        inString = false;
-      continue;
-    }
-    if (ch === '"') {
-      inString = true;
-      continue;
-    }
-    if (ch === "{")
-      depth++;
-    else if (ch === "}") {
-      depth--;
-      if (depth === 0)
-        return s.slice(start, i + 1);
-    }
-  }
-  return null;
+// packages/core/dist/agents/council/cancel.js
+function isCouncilCancelled(signal) {
+  return signal?.aborted === true;
 }
-function parseClarificationRequest(text) {
-  const start = text.indexOf(QUESTION_MARKER);
-  if (start < 0)
-    return null;
-  const rest = text.slice(start + QUESTION_MARKER.length);
-  const end = rest.indexOf(QUESTION_END_MARKER);
-  const block = end >= 0 ? rest.slice(0, end) : rest;
-  const cleaned = block.replace(/```json\n?/g, "").replace(/```\n?/g, "").trim();
-  const jsonText = extractBalancedJsonObject(cleaned) ?? (() => {
-    const objStart = cleaned.indexOf("{");
-    const objEnd = cleaned.lastIndexOf("}");
-    return objStart >= 0 && objEnd > objStart ? cleaned.slice(objStart, objEnd + 1) : cleaned;
-  })();
-  try {
-    const parsed = JSON.parse(jsonText);
-    if (typeof parsed.question !== "string" || !parsed.question.trim())
-      return null;
-    return {
-      question: parsed.question.trim(),
-      choices: Array.isArray(parsed.choices) ? parsed.choices.filter((c) => typeof c === "string" && c.trim().length > 0).map((c) => c.trim()) : void 0,
-      context: typeof parsed.context === "string" ? parsed.context.trim() : void 0
-    };
-  } catch {
-    return null;
+function bindHarnessAbort(harness, signal) {
+  if (!signal)
+    return () => void 0;
+  if (signal.aborted) {
+    harness.cancel();
+    return () => void 0;
   }
+  const onAbort = () => {
+    harness.cancel();
+  };
+  signal.addEventListener("abort", onAbort);
+  return () => {
+    signal.removeEventListener("abort", onAbort);
+  };
 }
-function hasInteractiveClarification(text) {
-  const c = parseClarificationRequest(text);
-  return !!(c && c.choices && c.choices.length >= 2);
-}
-function parseThinking(text) {
-  const complete = text.match(/<think(?:ing)?>([\s\S]*?)<\/think(?:ing)?>/i);
-  if (complete)
-    return complete[1].trim();
-  const open2 = text.match(/<think(?:ing)?>([\s\S]*)$/i);
-  return open2 ? open2[1].trim() : "";
-}
-function cleanAgentContent(text, opts = {}) {
-  const stripQuestion = opts.stripQuestion !== false;
-  const stripThink = opts.stripThink !== false;
-  let out = text;
-  if (stripThink) {
-    out = out.replace(/<think(?:ing)?>[\s\S]*?<\/think(?:ing)?>/gi, "").replace(/<think(?:ing)?>[\s\S]*$/gi, "").replace(/<\/think(?:ing)?>/gi, "");
-  }
-  out = out.replace(/<minimax:tool_call>[\s\S]*?<\/minimax:tool_call>/gi, "").replace(/<\/?minimax:tool_call>/gi, "").replace(/<tool_call>[\s\S]*?<\/tool_call>/gi, "").replace(/<\/?tool_call>/gi, "").replace(/<function_call>[\s\S]*?<\/function_call>/gi, "").replace(/<\/?function_call>/gi, "").replace(/<invoke\b[^>]*>[\s\S]*?<\/invoke>/gi, "").replace(/<\/invoke>/gi, "").replace(/<parameter\b[^>]*>[\s\S]*?<\/parameter>/gi, "").replace(/<\/parameter>/gi, "").replace(/\]\s*<\]\s*minimax\s*\[>\s*\[?<invoke\b[^>]*>[\s\S]*?<\/invoke>/gi, "").replace(/<minimax:tool_call>[\s\S]*$/gi, "").replace(/<tool_call>[\s\S]*$/gi, "").replace(/<function_call>[\s\S]*$/gi, "").replace(/<invoke\b[^>]*>[\s\S]*$/gi, "").replace(/\]\s*<\]\s*minimax\s*\[>[\s\S]*$/gi, "").replace(/^\s*\]\s*<\]\s*minimax\s*\[>.*$/gim, "").replace(/^\s*<\/?(?:tool_call|function_call|invoke|parameter|minimax:tool_call)\b[^>]*>\s*$/gim, "");
-  if (stripQuestion) {
-    out = out.replace(/---QUESTION---[\s\S]*?---END---/g, "").replace(/---QUESTION---[\s\S]*$/g, "");
+async function* runHarnessWithAbort(harness, signal) {
+  const unbind = bindHarnessAbort(harness, signal);
+  try {
+    yield* harness.run();
+  } finally {
+    unbind();
   }
-  out = out.replace(/\n{3,}/g, "\n\n").trim();
-  return scrubProprietaryLeak(out);
 }
-var QUESTION_MARKER, QUESTION_END_MARKER;
-var init_outputCleaning = __esm({
-  "packages/core/dist/agents/council/outputCleaning.js"() {
+var init_cancel = __esm({
+  "packages/core/dist/agents/council/cancel.js"() {
     "use strict";
-    init_secrecyPolicy();
-    QUESTION_MARKER = "---QUESTION---";
-    QUESTION_END_MARKER = "---END---";
   }
 });
 
@@ -32531,6 +32603,8 @@ function buildRetryPrompt(missingToolNames) {
   return `You did not emit the required workspace tools: ${names}. Call ${names} NOW with concrete arguments. No prose. No search.`;
 }
 async function* runRetryTurnForMember(args) {
+  if (isCouncilCancelled(args.signal))
+    return [];
   const executableMissing = args.executableTools ? args.missingToolNames.filter((n) => args.executableTools.has(n)) : args.missingToolNames;
   if (executableMissing.length === 0) {
     return [];
@@ -32566,7 +32640,7 @@ async function* runRetryTurnForMember(args) {
     providerStream: (params) => args.providerStream(params)
   });
   const retryEmitted = [];
-  for await (const event of retryHarness.run()) {
+  for await (const event of runHarnessWithAbort(retryHarness, args.signal)) {
     if (event.type === "tool_execution_start") {
       retryEmitted.push(event.toolName);
     }
@@ -32575,6 +32649,8 @@ async function* runRetryTurnForMember(args) {
   return retryEmitted;
 }
 async function* applyRetryIfMissing(args) {
+  if (isCouncilCancelled(args.config.signal))
+    return;
   if (args.check.ok)
     return;
   const missingToolNames = args.check.missing.map((m) => m.split(" ")[0]);
@@ -32607,7 +32683,8 @@ async function* applyRetryIfMissing(args) {
       toolRegistry: args.config.tools,
       providerStream: args.config.providerStream,
       runMode: args.config.runMode,
-      languageModule: args.languageModule
+      languageModule: args.languageModule,
+      signal: args.config.signal
     });
     for await (const event of retryGenerator) {
       if (event.type === "tool_execution_start") {
@@ -32626,6 +32703,7 @@ var init_retryTurn = __esm({
   "packages/core/dist/agents/council/retryTurn.js"() {
     "use strict";
     init_AgentHarness();
+    init_cancel();
     init_toolSchemas();
     init_memberMessages();
     init_toolEmission();
@@ -32635,6 +32713,8 @@ var init_retryTurn = __esm({
 
 // packages/core/dist/agents/council/chairmanDelivery.js
 async function* applyCompletionRetry(args) {
+  if (isCouncilCancelled(args.config.signal))
+    return;
   const check2 = checkImplementationCompletion(args.emittedToolNames);
   if (check2.ok)
     return;
@@ -32664,7 +32744,8 @@ async function* applyCompletionRetry(args) {
       providerStream: args.config.providerStream,
       runMode: args.config.runMode,
       retryPrompt: buildImplementationVerifyRetryPrompt(retryTool),
-      languageModule: args.languageModule
+      languageModule: args.languageModule,
+      signal: args.config.signal
     });
     for await (const event of retryGenerator) {
       if (event.type === "tool_execution_start") {
@@ -32697,6 +32778,8 @@ ${blocks}
 Rules: animate ONLY transform and opacity. Replace any box-shadow / background / background-position / filter / color / border-color / width / height / grid-template-rows used in @keyframes or transitions with transform/opacity equivalents (e.g. render a glow via a pseudo-element that scales and fades). For every classList.add('x') in the script, add a matching '.x' CSS rule. Use read_file to see the exact lines, then edit_file. When the listed items are fixed, stop \u2014 no summary.`;
 }
 async function* applyImplementationWriteRetry(args) {
+  if (isCouncilCancelled(args.config.signal))
+    return;
   if (args.check.ok)
     return;
   if (!shouldRetryMember(["write_file"], 0))
@@ -32723,7 +32806,8 @@ async function* applyImplementationWriteRetry(args) {
       providerStream: args.config.providerStream,
       runMode: "implementation",
       retryPrompt: buildImplementationWriteRetryPrompt(args.userMessage),
-      languageModule: args.languageModule
+      languageModule: args.languageModule,
+      signal: args.config.signal
     });
     for await (const event of retryGenerator) {
       if (event.type === "tool_execution_start")
@@ -32751,6 +32835,8 @@ async function* runChairmanDeliveryLoop(args) {
   const zelariRoot = `${args.projectRoot}/.zelari`;
   let attempt = 0;
   while (attempt < maxAttempts) {
+    if (isCouncilCancelled(args.config.signal))
+      return false;
     const report = runImplementationVerification({
       projectRoot: args.projectRoot,
       zelariRoot
@@ -32793,7 +32879,8 @@ async function* runChairmanDeliveryLoop(args) {
         providerStream: args.config.providerStream,
         runMode: "implementation",
         retryPrompt: buildDeliveryFixPrompt(blocking, args.userMessage),
-        languageModule: args.languageModule
+        languageModule: args.languageModule,
+        signal: args.config.signal
       });
       for await (const event of fixGenerator) {
         if (event.type === "tool_execution_start")
@@ -32826,6 +32913,7 @@ var init_chairmanDelivery = __esm({
     init_runChecks();
     init_inlineJsAutofix();
     init_retryTurn();
+    init_cancel();
     MAX_DELIVERY_ATTEMPTS = 2;
   }
 });
@@ -32887,6 +32975,8 @@ async function* runChairmanFixLoop(args) {
   let current = Array.from(args.violations.values());
   let attempt = 0;
   while (current.length > 0 && attempt < maxAttempts) {
+    if (isCouncilCancelled(args.config.signal))
+      return;
     attempt++;
     try {
       const fixGenerator = runRetryTurnForMember({
@@ -32907,7 +32997,8 @@ async function* runChairmanFixLoop(args) {
         providerStream: args.config.providerStream,
         runMode: "implementation",
         retryPrompt: buildMotionFixPrompt(current),
-        languageModule: args.languageModule
+        languageModule: args.languageModule,
+        signal: args.config.signal
       });
       for await (const event of fixGenerator) {
         if (event.type === "tool_execution_start")
@@ -32935,6 +33026,7 @@ var init_chairmanFixLoop = __esm({
     init_microGate();
     init_chairmanDelivery();
     init_retryTurn();
+    init_cancel();
   }
 });
 
@@ -32976,6 +33068,17 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
     model: config2.model,
     provider: config2.provider ?? "minimax"
   };
+  if (isCouncilCancelled(config2.signal)) {
+    yield {
+      type: "agent_end",
+      id: crypto.randomUUID(),
+      ts: Date.now(),
+      sessionId: sessionId2,
+      reason: "cancelled",
+      durationMs: 0
+    };
+    return;
+  }
   const emitMemberCost = (input) => {
     const usage = input.usage;
     const prompt = usage?.promptTokens ?? 0;
@@ -33005,6 +33108,8 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
   const oracle = agents.find((a) => a.id === "minos") ?? (config2.skipSpecialists ? getAgent("minos") : void 0);
   const chairman = agents.find((a) => a.id === "lucifer") ?? (config2.skipSpecialists ? getAgent("lucifer") : void 0);
   for (const agent of specialists) {
+    if (isCouncilCancelled(config2.signal))
+      break;
     if (completedIds.has(agent.id))
       continue;
     callbacks.onAgentStart?.(agent);
@@ -33050,7 +33155,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
     const emittedToolNames = [];
     const memberStart = Date.now();
     try {
-      for await (const event of harness.run()) {
+      for await (const event of runHarnessWithAbort(harness, config2.signal)) {
         yield event;
         if (event.type === "tool_execution_start") {
           toolCalls += 1;
@@ -33072,7 +33177,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
       fullText = `Error: ${err instanceof Error ? err.message : "Unknown"}`;
       errored = true;
     }
-    if (isDesignPhase && !errored && !NON_RETRY_AGENTS.has(agent.id)) {
+    if (isDesignPhase && !errored && !NON_RETRY_AGENTS.has(agent.id) && !isCouncilCancelled(config2.signal)) {
       const specialistCheck = enforceDesignPhaseToolEmissions(agent.id, emittedToolNames);
       yield* applyRetryIfMissing({
         agent,
@@ -33155,7 +33260,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
       }
     }
   }
-  if (oracle && !completedIds.has(oracle.id)) {
+  if (oracle && !completedIds.has(oracle.id) && !isCouncilCancelled(config2.signal)) {
     callbacks.onAgentStart?.(oracle);
     const override = config2.agentModels?.[oracle.id];
     const effectiveProvider = override?.providerId ?? config2.provider ?? "minimax";
@@ -33204,7 +33309,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
     const emittedToolNames = [];
     const memberStart = Date.now();
     try {
-      for await (const event of harness.run()) {
+      for await (const event of runHarnessWithAbort(harness, config2.signal)) {
         yield event;
         if (event.type === "tool_execution_start") {
           toolCalls += 1;
@@ -33226,7 +33331,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
       fullText = `Review error: ${err instanceof Error ? err.message : "Unknown"}`;
       errored = true;
     }
-    if (isDesignPhase && !errored) {
+    if (isDesignPhase && !errored && !isCouncilCancelled(config2.signal)) {
       const oracleCheck = enforceDesignPhaseToolEmissions(oracle.id, emittedToolNames);
       yield* applyRetryIfMissing({
         agent: oracle,
@@ -33286,7 +33391,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
     });
     agentOutputs.push({ name: oracle.name, role: oracle.role, content: cleaned });
   }
-  if (chairman && !completedIds.has(chairman.id)) {
+  if (chairman && !completedIds.has(chairman.id) && !isCouncilCancelled(config2.signal)) {
     callbacks.onSynthesisStart?.();
     callbacks.onAgentStart?.(chairman);
     const override = config2.agentModels?.[chairman.id];
@@ -33333,7 +33438,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
     let chairmanProjectRoot = parseProjectRootFromWorkspaceContext(config2.workspaceContext ?? "");
     const memberStart = Date.now();
     try {
-      for await (const event of chairmanHarness.run()) {
+      for await (const event of runHarnessWithAbort(chairmanHarness, config2.signal)) {
         yield event;
         if (event.type === "tool_execution_start") {
           toolCalls += 1;
@@ -33397,7 +33502,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
       errored = true;
       lastErrorMessage = err instanceof Error ? err.message : String(err);
     }
-    if (isDesignPhase && !errored) {
+    if (isDesignPhase && !errored && !isCouncilCancelled(config2.signal)) {
       const chairmanCheck = enforceDesignPhaseToolEmissions(chairman.id, emittedToolNames);
       yield* applyRetryIfMissing({
         agent: chairman,
@@ -33418,7 +33523,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
       });
     } else if (isDesignPhase) {
       enforceDesignPhaseToolEmissions(chairman.id, emittedToolNames);
-    } else if (!errored) {
+    } else if (!errored && !isCouncilCancelled(config2.signal)) {
       if (chairmanProjectRoot) {
         const zelariRoot = `${chairmanProjectRoot}/.zelari`;
         const spec = loadNfrSpec(zelariRoot) ?? DEFAULT_NFR_SPEC;
@@ -33547,7 +33652,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
     id: crypto.randomUUID(),
     ts: Date.now(),
     sessionId: sessionId2,
-    reason: "completed",
+    reason: isCouncilCancelled(config2.signal) ? "cancelled" : "completed",
     durationMs: 0
   };
 }
@@ -33566,6 +33671,7 @@ var init_councilApi = __esm({
     init_runChecks();
     init_implementationDelivery();
     init_types7();
+    init_cancel();
     init_types7();
     init_outputCleaning();
     init_outputCleaning();
@@ -33947,9 +34053,9 @@ var init_types9 = __esm({
 import { readFileSync as readFileSync14 } from "node:fs";
 import { join as join11 } from "node:path";
 function readLessonsDeduped(zelariRoot) {
-  const path99 = join11(zelariRoot, LESSONS_FILE);
+  const path100 = join11(zelariRoot, LESSONS_FILE);
   try {
-    const raw = readFileSync14(path99, "utf8");
+    const raw = readFileSync14(path100, "utf8");
     const byId = /* @__PURE__ */ new Map();
     for (const line of raw.split(/\r?\n/)) {
       if (!line.trim())
@@ -34050,8 +34156,8 @@ function keywordsFrom(check2, signature) {
   return [.../* @__PURE__ */ new Set([...fromId, ...words])].slice(0, 12);
 }
 function writeLesson(zelariRoot, lesson) {
-  const path99 = join12(zelariRoot, LESSONS_FILE);
-  appendFileSync(path99, `${JSON.stringify(lesson)}
+  const path100 = join12(zelariRoot, LESSONS_FILE);
+  appendFileSync(path100, `${JSON.stringify(lesson)}
 `, "utf8");
 }
 function findSimilar(lessons, signature) {
@@ -34572,6 +34678,7 @@ __export(council_exports, {
   shouldRetryMember: () => shouldRetryMember,
   slugify: () => slugify2,
   stripClarificationProtocol: () => stripClarificationProtocol,
+  stripQuestionBlocks: () => stripQuestionBlocks,
   swapMembers: () => swapMembers,
   systemMessagesFromSplit: () => systemMessagesFromSplit,
   taskMatchesNfrKeywords: () => taskMatchesNfrKeywords,
@@ -36017,9 +36124,9 @@ function findCycle(nodes) {
     if (color.get(start) !== WHITE)
       continue;
     const stack = [[start, 0]];
-    const path99 = [];
+    const path100 = [];
     color.set(start, GRAY);
-    path99.push(start);
+    path100.push(start);
     while (stack.length > 0) {
       const top = stack[stack.length - 1];
       const [id3, idx] = top;
@@ -36032,17 +36139,17 @@ function findCycle(nodes) {
           continue;
         const c = color.get(dep);
         if (c === GRAY) {
-          const at = path99.indexOf(dep);
-          return [...path99.slice(at), dep];
+          const at = path100.indexOf(dep);
+          return [...path100.slice(at), dep];
         }
         if (c === WHITE) {
           color.set(dep, GRAY);
-          path99.push(dep);
+          path100.push(dep);
           stack.push([dep, 0]);
         }
       } else {
         color.set(id3, BLACK);
-        path99.pop();
+        path100.pop();
         stack.pop();
       }
     }
@@ -36962,8 +37069,8 @@ var init_runner = __esm({
           failed: [...this.tentaclesById.values()].filter((r) => r.status === "error"),
           pending: []
         };
-        const path99 = await this.host.saveSnapshot(snapshot, ".zelari/kraken/snapshots");
-        this.host.log(`checkpoint: ${label ?? "auto"} \u2192 ${path99}`);
+        const path100 = await this.host.saveSnapshot(snapshot, ".zelari/kraken/snapshots");
+        this.host.log(`checkpoint: ${label ?? "auto"} \u2192 ${path100}`);
         return snapshot;
       }
       callLog(msg, data) {
@@ -38114,7 +38221,7 @@ var CORE_VERSION;
 var init_version = __esm({
   "packages/core/dist/version.js"() {
     "use strict";
-    CORE_VERSION = "2.34.0";
+    CORE_VERSION = "2.35.0";
   }
 });
 
@@ -38626,6 +38733,7 @@ __export(dist_exports, {
   strictBuildGate: () => strictBuildGate,
   stripAnsi: () => stripAnsi,
   stripClarificationProtocol: () => stripClarificationProtocol,
+  stripQuestionBlocks: () => stripQuestionBlocks,
   swapMembers: () => swapMembers,
   systemMessagesFromSplit: () => systemMessagesFromSplit,
   taskMatchesNfrKeywords: () => taskMatchesNfrKeywords,
@@ -40571,9 +40679,9 @@ function spillToolOutput(fullText, meta3) {
     const rnd = randomBytes3(3).toString("hex");
     const safeTool = (meta3?.toolName ?? "tool").replace(/[^a-zA-Z0-9._-]+/g, "_").slice(0, 32);
     const file2 = `${stamp}-${safeTool}-${hash3}-${rnd}.txt`;
-    const path99 = join14(dir, file2);
-    writeFileSync12(path99, fullText, "utf8");
-    return path99;
+    const path100 = join14(dir, file2);
+    writeFileSync12(path100, fullText, "utf8");
+    return path100;
   } catch {
     return null;
   }
@@ -40619,10 +40727,10 @@ function truncateToolResult(text, capOrOpts = TOOL_RESULT_LINE_CAP) {
 ${tail2}`;
   }
   if (doSpill) {
-    const path99 = spillToolOutput(text, { toolName: opts.toolName });
-    if (path99) {
+    const path100 = spillToolOutput(text, { toolName: opts.toolName });
+    if (path100) {
       const spillNote = `
-\u2026 [full output spilled to: ${path99} \u2014 re-read with read_file if you need the complete text] \u2026`;
+\u2026 [full output spilled to: ${path100} \u2014 re-read with read_file if you need the complete text] \u2026`;
       if (preview.includes("] \u2026\n")) {
         preview = preview.replace("] \u2026\n", `] \u2026${spillNote}
 `);
@@ -41393,28 +41501,28 @@ var init_storage = __esm({
     VALID_SCALARS = /^(true|false|null|~)$/i;
     Storage = class {
       /** Read a Markdown file with frontmatter. Throws if not found. */
-      read(path99) {
-        if (!existsSync19(path99)) {
-          throw new Error(`File not found: ${path99}`);
+      read(path100) {
+        if (!existsSync19(path100)) {
+          throw new Error(`File not found: ${path100}`);
         }
-        const md = readFileSync17(path99, "utf8");
+        const md = readFileSync17(path100, "utf8");
         return parseFrontmatter(md);
       }
       /** Read a Markdown file; returns null if not found. */
-      readIfExists(path99) {
-        if (!existsSync19(path99)) return null;
-        return this.read(path99);
+      readIfExists(path100) {
+        if (!existsSync19(path100)) return null;
+        return this.read(path100);
       }
       /**
        * Write a Markdown file atomically (tmp + rename). Creates parent dirs.
        * The meta object is serialized as YAML frontmatter; body as Markdown.
        */
-      write(path99, meta3, body) {
-        mkdirSync10(dirname2(path99), { recursive: true });
-        const tmp = path99 + ".tmp-" + process.pid;
+      write(path100, meta3, body) {
+        mkdirSync10(dirname2(path100), { recursive: true });
+        const tmp = path100 + ".tmp-" + process.pid;
         const md = serializeFrontmatter(meta3, body);
         writeFileSync14(tmp, md, "utf8");
-        renameSync2(tmp, path99);
+        renameSync2(tmp, path100);
       }
       /** List all .md files in a directory (non-recursive). */
       listMarkdown(dir) {
@@ -41489,8 +41597,8 @@ function nextPlanTaskId(store6) {
   return `t${store6.counter}`;
 }
 function writePlanTaskArtifact(rootDir, task) {
-  const path99 = join17(rootDir, "plan-tasks", `${task.id}.md`);
-  mkdirSync11(dirname3(path99), { recursive: true });
+  const path100 = join17(rootDir, "plan-tasks", `${task.id}.md`);
+  mkdirSync11(dirname3(path100), { recursive: true });
   const meta3 = {
     kind: "task",
     id: task.id,
@@ -41511,7 +41619,7 @@ function writePlanTaskArtifact(rootDir, task) {
     task.notes?.trim() ? task.notes.trim() : "_(no notes)_",
     ""
   ].filter((l) => l !== null).join("\n");
-  new Storage().write(path99, meta3, body);
+  new Storage().write(path100, meta3, body);
 }
 function loadHandle(rootDir) {
   const jsonPath = join17(rootDir, "plan.json");
@@ -44116,6 +44224,7 @@ __export(krakenModel_exports, {
   inferModelFamily: () => inferModelFamily,
   isCheapModelId: () => isCheapModelId,
   isKrakenAutoModelEnabled: () => isKrakenAutoModelEnabled,
+  isUnknownModelError: () => isUnknownModelError,
   parseQualifiedModelRef: () => parseQualifiedModelRef,
   pickCheapModel: () => pickCheapModel,
   pickDifferentFamily: () => pickDifferentFamily,
@@ -44227,6 +44336,12 @@ function resolveKrakenSubModel(agent, parentModel, env = process.env, opts = {})
   }
   return parentModel;
 }
+function isUnknownModelError(message) {
+  if (!message) return false;
+  const m = message.toLowerCase();
+  if (!/model/.test(m)) return false;
+  return /http\s*404/.test(m) || /not-found/.test(m) || /not_found/.test(m) || /does not exist/.test(m) || /unknown model/.test(m) || /model_not_found/.test(m);
+}
 function resolveKrakenPlannerModel(parentModel, env = process.env) {
   const specific = env.ZELARI_KRAKEN_PLANNER_MODEL?.trim();
   if (specific) return specific;
@@ -46026,6 +46141,12 @@ ${failed.error ?? "unknown error"}`,
 // src/cli/tools/taskTool.ts
 import { existsSync as existsSync26 } from "node:fs";
 import { randomUUID as randomUUID4 } from "node:crypto";
+function permissionsForTaskAgent(agent) {
+  const kind2 = agent ?? "explore";
+  if (kind2 === "general") return ["read", "write", "execute", "network"];
+  if (kind2 === "verify") return ["read", "execute", "network"];
+  return ["read"];
+}
 function resetTaskSpawnCount() {
   const g = globalThis;
   g.__zelariTaskSpawnCount = 0;
@@ -46507,17 +46628,45 @@ ${taskUserContent}`,
     };
   }
   const startedTools = /* @__PURE__ */ new Map();
-  const { result, error: error51, aborted: aborted2, usage, toolTrace } = await runSubAgent(harness, {
+  const onHarnessEvent = (ev) => {
+    if (ev.type === "tool_execution_start") {
+      startedTools.set(ev.toolCallId, ev.toolName);
+      emitActivity({ type: "agent_tool", agentId: liveId, toolCallId: ev.toolCallId, tool: ev.toolName, status: "started", ...ev.args ? { summary: toolCommandHint(ev.args) } : {}, ts: Date.now() });
+    } else if (ev.type === "tool_execution_end") {
+      emitActivity({ type: "agent_tool", agentId: liveId, toolCallId: ev.toolCallId, tool: startedTools.get(ev.toolCallId) ?? "unknown", status: ev.isError ? "failed" : "completed", durationMs: ev.durationMs, ts: Date.now() });
+    }
+  };
+  let { result, error: error51, aborted: aborted2, usage, toolTrace } = await runSubAgent(harness, {
     ...opts.signal ? { signal: opts.signal } : {},
-    onEvent: (ev) => {
-      if (ev.type === "tool_execution_start") {
-        startedTools.set(ev.toolCallId, ev.toolName);
-        emitActivity({ type: "agent_tool", agentId: liveId, toolCallId: ev.toolCallId, tool: ev.toolName, status: "started", ...ev.args ? { summary: toolCommandHint(ev.args) } : {}, ts: Date.now() });
-      } else if (ev.type === "tool_execution_end") {
-        emitActivity({ type: "agent_tool", agentId: liveId, toolCallId: ev.toolCallId, tool: startedTools.get(ev.toolCallId) ?? "unknown", status: ev.isError ? "failed" : "completed", durationMs: ev.durationMs, ts: Date.now() });
+    onEvent: onHarnessEvent
+  });
+  if (!aborted2 && !result && sub.fallback && sub.fallback.model !== sub.model) {
+    const { isUnknownModelError: isUnknownModelError2 } = await Promise.resolve().then(() => (init_krakenModel(), krakenModel_exports));
+    if (isUnknownModelError2(error51)) {
+      emitPhase(`model ${sub.model} unavailable \u2014 retrying with ${sub.fallback.model}`);
+      const retryConfig = {
+        ...config2,
+        model: sub.fallback.model,
+        provider: sub.fallback.provider,
+        providerStream: sub.fallback.providerStream
+      };
+      try {
+        harness = deps.harnessFactory ? deps.harnessFactory(retryConfig) : new (await Promise.resolve().then(() => (init_harness(), harness_exports))).AgentHarness(retryConfig);
+        const retry = await runSubAgent(harness, {
+          ...opts.signal ? { signal: opts.signal } : {},
+          onEvent: onHarnessEvent
+        });
+        result = retry.result;
+        error51 = retry.error;
+        aborted2 = retry.aborted;
+        usage = retry.usage;
+        toolTrace = retry.toolTrace;
+        sub = { ...sub, model: sub.fallback.model, provider: sub.fallback.provider };
+      } catch (err) {
+        error51 = err instanceof Error ? err.message : String(err);
       }
     }
-  });
+  }
   const durationMs = Date.now() - started;
   if (aborted2) {
     if (worktree && !shouldKeepWorktree()) await cleanupKrakenWorktree(worktree);
@@ -50672,12 +50821,9 @@ function backoffDelay(attempt, retryAfterHeader) {
   }
   return Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_CAP_MS);
 }
-function modelSupportsVision(model) {
+function modelSupportsVision(_model) {
   const force = process.env.ZELARI_VISION;
-  if (force === "1" || force === "true" || force === "on") return true;
-  if (force === "0" || force === "false" || force === "off") return false;
-  const m = model.toLowerCase();
-  return VISION_MODEL_HINTS.some((hint) => m.includes(hint));
+  return !(force === "0" || force === "false" || force === "off");
 }
 function dataUriFromImage(img) {
   return `data:${img.mime};base64,${img.dataBase64}`;
@@ -50772,6 +50918,22 @@ ${notes}
   }
   return { role: m.role, content: m.content };
 }
+function imagesFollowUpMessage(images) {
+  const labels = images.map((img) => img.alt ?? img.mime).join(", ");
+  return {
+    role: "user",
+    content: [
+      {
+        type: "text",
+        text: `[Immagine(i) dal tool: ${labels} \u2014 usa questi pixel per l'analisi visiva.]`
+      },
+      ...images.map((img) => ({
+        type: "image_url",
+        image_url: { url: dataUriFromImage(img) }
+      }))
+    ]
+  };
+}
 function positiveEnvInt(name) {
   const raw = process.env[name];
   if (!raw) return void 0;
@@ -50782,15 +50944,27 @@ function openaiCompatibleProvider(config2) {
   return async function* (params) {
     const capabilities = capabilitiesFor(params.model, config2.providerId);
     const vision = modelSupportsVision(params.model);
-    const messages = params.messages.map((m) => {
+    const msgsIn = params.messages;
+    let toolRunImages = [];
+    const messages = msgsIn.flatMap((m, i) => {
       const cacheable = !(m.role === "user" && m.images && m.images.length > 0);
       if (cacheable) {
         const cached2 = messageMappingCache.get(m);
-        if (cached2) return cached2;
+        if (cached2) return [cached2];
       }
       const mapped = mapAgentMessage(m, vision);
       if (cacheable) messageMappingCache.set(m, mapped);
-      return mapped;
+      if (m.role === "tool") {
+        if (m.images && m.images.length > 0) toolRunImages.push(...m.images);
+        const next = msgsIn[i + 1];
+        const runEnds = !next || next.role !== "tool";
+        if (runEnds && vision && toolRunImages.length > 0) {
+          const followUp = imagesFollowUpMessage(toolRunImages);
+          toolRunImages = [];
+          return [mapped, followUp];
+        }
+      }
+      return [mapped];
     });
     const generation = params.generation;
     const body = {
@@ -51114,7 +51288,7 @@ async function providerConfigFor(providerId) {
     ...extraFromStored(providerId)
   };
 }
-var RETRYABLE_STATUSES, MAX_RETRIES, BACKOFF_BASE_MS, BACKOFF_CAP_MS, PROVIDER_CONNECT_TIMEOUT_MS, PROVIDER_STREAM_IDLE_MS, PROVIDER_STREAM_MAX_MS, VISION_MODEL_HINTS, PROVIDER_ENDPOINTS, messageMappingCache;
+var RETRYABLE_STATUSES, MAX_RETRIES, BACKOFF_BASE_MS, BACKOFF_CAP_MS, PROVIDER_CONNECT_TIMEOUT_MS, PROVIDER_STREAM_IDLE_MS, PROVIDER_STREAM_MAX_MS, PROVIDER_ENDPOINTS, messageMappingCache;
 var init_openai_compatible = __esm({
   "src/cli/provider/openai-compatible.ts"() {
     "use strict";
@@ -51145,33 +51319,6 @@ var init_openai_compatible = __esm({
       const n = raw ? Number.parseInt(raw, 10) : 18e5;
       return Number.isFinite(n) && n >= 6e4 ? n : 18e5;
     })();
-    VISION_MODEL_HINTS = [
-      "grok-4",
-      "grok-3",
-      "grok-2-vision",
-      "grok-vision",
-      "glm-4v",
-      "glm-4.5v",
-      "glm-4.1v",
-      "glm-5v",
-      "qwen-vl",
-      "qwen2-vl",
-      "qwen2.5-vl",
-      "qwen3-vl",
-      "gpt-4o",
-      "gpt-4.1",
-      "gpt-4.5",
-      "gpt-4-vision",
-      "gpt-5",
-      "claude-3",
-      "claude-4",
-      "gemini-",
-      "gemini/",
-      "minimax-m1",
-      "minimax-m2",
-      "minimax-m3",
-      "deepseek-vl"
-    ];
     PROVIDER_ENDPOINTS = {
       "openai-compatible": "https://api.x.ai/v1",
       "minimax": "https://api.minimax.io/v1",
@@ -51566,6 +51713,16 @@ var init_driver = __esm({
 // src/cli/browser/tools.ts
 import path56 from "node:path";
 import os3 from "node:os";
+import { readFile as readFile7 } from "node:fs/promises";
+async function loadImageBlock(filePath) {
+  try {
+    const buf = await readFile7(filePath);
+    if (buf.byteLength > SCREENSHOT_MAX_BYTES) return void 0;
+    return { mime: "image/png", dataBase64: buf.toString("base64"), alt: path56.basename(filePath) };
+  } catch {
+    return void 0;
+  }
+}
 function createBrowserTool(deps = {}) {
   return {
     name: "browser_check",
@@ -51618,17 +51775,23 @@ function createBrowserTool(deps = {}) {
           note: "Weak smoke only: no selector/text/evaluate assertions. No console/page errors is necessary but not sufficient to claim a logic fix. Add waitForSelector, waitForText, or evaluate (DOM/read hooks) for stronger evidence.",
           smokeStrength: "weak"
         } : { smokeStrength: "asserted" }
-      });
+      }, void 0, await toolImages(result.screenshotPath));
     }
   };
 }
-var ActionSchema;
+async function toolImages(screenshotPath) {
+  if (!screenshotPath) return void 0;
+  const image = await loadImageBlock(screenshotPath);
+  return image ? [image] : void 0;
+}
+var SCREENSHOT_MAX_BYTES, ActionSchema;
 var init_tools5 = __esm({
   "src/cli/browser/tools.ts"() {
     "use strict";
     init_zod();
     init_toolTypes();
     init_driver();
+    SCREENSHOT_MAX_BYTES = 8 * 1024 * 1024;
     ActionSchema = external_exports.discriminatedUnion("type", [
       external_exports.object({ type: external_exports.literal("click"), selector: external_exports.string().min(1) }),
       external_exports.object({ type: external_exports.literal("fill"), selector: external_exports.string().min(1), value: external_exports.string() }),
@@ -51653,6 +51816,92 @@ var init_tools5 = __esm({
   }
 });
 
+// src/cli/tools/screenshotTool.ts
+import { execFile as execFile5 } from "node:child_process";
+import { mkdir as mkdir3, readFile as readFile8, stat as stat7 } from "node:fs/promises";
+import path57 from "node:path";
+import { promisify as promisify4 } from "node:util";
+async function captureWindows(target) {
+  const script = `Add-Type -AssemblyName System.Windows.Forms,System.Drawing;$b=[System.Windows.Forms.SystemInformation]::VirtualScreen;$bmp=New-Object System.Drawing.Bitmap $b.Width,$b.Height;$g=[System.Drawing.Graphics]::FromImage($bmp);$g.CopyFromScreen($b.Left,$b.Top,0,0,$bmp.Size);$g.Dispose(); $bmp.Save('${target.replace(/'/g, "''")}'); $bmp.Dispose();`;
+  await execFileAsync4("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], {
+    timeout: 12e3,
+    windowsHide: true
+  });
+}
+async function captureUnixLike(target) {
+  const attempts = process.platform === "darwin" ? [["screencapture", ["-x", target]]] : [
+    ["gnome-screenshot", ["-f", target]],
+    ["scrot", [target]],
+    ["import", ["-window", "root", target]]
+  ];
+  let lastErr = null;
+  for (const [bin, args] of attempts) {
+    try {
+      await execFileAsync4(bin, args, { timeout: 12e3 });
+      return;
+    } catch (e) {
+      lastErr = e;
+    }
+  }
+  throw lastErr ?? new Error("no screen-capture utility available");
+}
+function createScreenshotTool(deps = {}) {
+  return {
+    name: "screenshot",
+    description: "Capture a screenshot of the user screen(s) as PNG. Use it when the user asks to see/check something on screen (running app, game, dialog, error window) or when you need to LOOK at the current UI state to debug it. The image is returned to you as pixels (vision) and saved to disk; give the path back to the user so they can open it.",
+    permissions: ["ui"],
+    timeoutMs: 2e4,
+    inputSchema: external_exports.object({
+      note: external_exports.string().max(200).optional().describe("Why you are capturing (shown to the user with the permission prompt).")
+    }),
+    execute: async (args, ctx) => {
+      const a = args;
+      const dir = deps.outDir ?? path57.join(ctx.cwd ?? process.cwd(), ".zelari", "screenshots");
+      const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
+      const target = path57.join(dir, `screenshot-${stamp}.png`);
+      const capture = deps.capture ?? (process.platform === "win32" ? captureWindows : captureUnixLike);
+      try {
+        await mkdir3(dir, { recursive: true });
+        await capture(target);
+        const meta3 = await stat7(target);
+        if (meta3.size === 0) return typedErr(`capture produced an empty file: ${target}`);
+        const buf = await readFile8(target);
+        const image = {
+          mime: "image/png",
+          dataBase64: buf.toString("base64"),
+          alt: path57.basename(target)
+        };
+        const attachable = meta3.size <= SCREENSHOT_MAX_BYTES2;
+        return typedOk(
+          {
+            ok: true,
+            path: target,
+            bytes: meta3.size,
+            ...a.note ? { note: a.note } : {},
+            ...attachable ? {} : { warning: "PNG over 8MB: pixels not attached to the model context; open the path instead." }
+          },
+          void 0,
+          attachable ? [image] : void 0
+        );
+      } catch (e) {
+        return typedErr(
+          `screen capture failed on ${process.platform}: ${e instanceof Error ? e.message : String(e)}`
+        );
+      }
+    }
+  };
+}
+var execFileAsync4, SCREENSHOT_MAX_BYTES2;
+var init_screenshotTool = __esm({
+  "src/cli/tools/screenshotTool.ts"() {
+    "use strict";
+    init_zod();
+    init_toolTypes();
+    execFileAsync4 = promisify4(execFile5);
+    SCREENSHOT_MAX_BYTES2 = 8 * 1024 * 1024;
+  }
+});
+
 // src/cli/ssh/targets.ts
 var targets_exports = {};
 __export(targets_exports, {
@@ -51694,21 +51943,21 @@ function normalizeAuth(auth) {
   return "agent";
 }
 function readSecrets() {
-  const path99 = getSshSecretsPath();
-  if (!existsSync30(path99)) return {};
+  const path100 = getSshSecretsPath();
+  if (!existsSync30(path100)) return {};
   try {
-    return JSON.parse(readFileSync22(path99, "utf8"));
+    return JSON.parse(readFileSync22(path100, "utf8"));
   } catch {
     return {};
   }
 }
 function writeSecrets(data) {
-  const path99 = getSshSecretsPath();
-  mkdirSync13(dirname4(path99), { recursive: true });
-  writeFileSync16(path99, `${JSON.stringify(data, null, 2)}
+  const path100 = getSshSecretsPath();
+  mkdirSync13(dirname4(path100), { recursive: true });
+  writeFileSync16(path100, `${JSON.stringify(data, null, 2)}
 `, "utf8");
   try {
-    chmodSync(path99, 384);
+    chmodSync(path100, 384);
   } catch {
   }
 }
@@ -51737,10 +51986,10 @@ function deleteSshPassword(id3) {
   writeSecrets({ passwords });
 }
 function readStore2() {
-  const path99 = getSshTargetsPath();
-  if (!existsSync30(path99)) return [];
+  const path100 = getSshTargetsPath();
+  if (!existsSync30(path100)) return [];
   try {
-    const parsed = JSON.parse(readFileSync22(path99, "utf8"));
+    const parsed = JSON.parse(readFileSync22(path100, "utf8"));
     const list = Array.isArray(parsed.targets) ? parsed.targets : [];
     return list.filter(
       (t) => t && typeof t.id === "string" && typeof t.host === "string" && typeof t.user === "string"
@@ -51755,11 +52004,11 @@ function readStore2() {
   }
 }
 function writeStore2(targets) {
-  const path99 = getSshTargetsPath();
-  mkdirSync13(dirname4(path99), { recursive: true });
+  const path100 = getSshTargetsPath();
+  mkdirSync13(dirname4(path100), { recursive: true });
   const clean = targets.map(({ hasPassword: _hp, ...t }) => t);
   writeFileSync16(
-    path99,
+    path100,
     `${JSON.stringify({ targets: clean }, null, 2)}
 `,
     "utf8"
@@ -52005,11 +52254,11 @@ function formatSshTargetsForPrompt() {
   ];
   for (const t of targets) {
     const tags = t.tags?.length ? ` tags=[${t.tags.join(",")}]` : "";
-    const path99 = t.defaultRemotePath ? ` remotePath=${t.defaultRemotePath}` : "";
+    const path100 = t.defaultRemotePath ? ` remotePath=${t.defaultRemotePath}` : "";
     const allow = t.allowedCommands?.length ? ` allowed=${t.allowedCommands.join("|")}` : " allowed=status-only";
     const auth = t.auth === "password" ? " auth=password" : t.auth === "keyPath" ? " auth=key" : " auth=agent";
     lines.push(
-      `- id=${t.id} name=${t.name} ${t.user}@${t.host}:${t.port ?? 22}${auth}${path99}${tags}${allow}`
+      `- id=${t.id} name=${t.name} ${t.user}@${t.host}:${t.port ?? 22}${auth}${path100}${tags}${allow}`
     );
   }
   return lines.join("\n");
@@ -52995,12 +53244,12 @@ __export(folderTrust_exports, {
   untrustFolder: () => untrustFolder
 });
 import { existsSync as existsSync31, mkdirSync as mkdirSync14, readFileSync as readFileSync23, writeFileSync as writeFileSync17 } from "node:fs";
-import path57 from "node:path";
+import path58 from "node:path";
 function trustStorePath() {
   return _overrideStorePath ?? trustConfigPath();
 }
 function normalize6(p3) {
-  const resolved = path57.resolve(p3);
+  const resolved = path58.resolve(p3);
   return process.platform === "win32" ? resolved.toLowerCase() : resolved;
 }
 function readStore3() {
@@ -53016,7 +53265,7 @@ function readStore3() {
 function writeStore3(store6) {
   const p3 = trustStorePath();
   try {
-    mkdirSync14(path57.dirname(p3), { recursive: true });
+    mkdirSync14(path58.dirname(p3), { recursive: true });
     writeFileSync17(p3, JSON.stringify(store6, null, 2), "utf8");
   } catch (err) {
     throw new Error(
@@ -53042,7 +53291,7 @@ function isFolderTrusted(folderPath) {
 }
 function trustFolder(folderPath) {
   const store6 = readStore3();
-  const normalized = path57.resolve(folderPath);
+  const normalized = path58.resolve(folderPath);
   if (!store6.folders.some((f) => normalize6(f.path) === normalize6(normalized))) {
     store6.folders.push({ path: normalized, trustedAt: (/* @__PURE__ */ new Date()).toISOString() });
     writeStore3(store6);
@@ -53168,7 +53417,7 @@ var init_lifecycleHooks = __esm({
 
 // src/cli/safety/astGate.ts
 import { promises as fs23 } from "node:fs";
-import path58 from "node:path";
+import path59 from "node:path";
 function astGateEnabled() {
   return process.env.ZELARI_AST_GATE !== "0";
 }
@@ -53203,9 +53452,9 @@ function wrapWithAstGate(original, opts) {
   const containedPathOf = (args) => {
     const raw = args["path"];
     if (typeof raw !== "string" || raw.length === 0) return null;
-    const absPath = path58.isAbsolute(raw) ? raw : path58.join(opts.root, raw);
-    const rel2 = path58.relative(opts.root, absPath);
-    if (rel2.startsWith("..") || path58.isAbsolute(rel2)) return null;
+    const absPath = path59.isAbsolute(raw) ? raw : path59.join(opts.root, raw);
+    const rel2 = path59.relative(opts.root, absPath);
+    if (rel2.startsWith("..") || path59.isAbsolute(rel2)) return null;
     return absPath;
   };
   return {
@@ -53230,7 +53479,7 @@ function wrapWithAstGate(original, opts) {
       if (!result.ok) return result;
       if (gateTarget !== null && !isAstSupported(gateTarget)) {
         process.stderr.write(
-          `[ast_gate] LOUD SKIP (unsupported-extension): ${original.name} ${gateTarget} \u2014 ${path58.extname(gateTarget) || "(no extension)"} is outside the AST surface; write KEPT, NOT syntax-gated.
+          `[ast_gate] LOUD SKIP (unsupported-extension): ${original.name} ${gateTarget} \u2014 ${path59.extname(gateTarget) || "(no extension)"} is outside the AST surface; write KEPT, NOT syntax-gated.
 `
         );
         return result;
@@ -53247,7 +53496,7 @@ function wrapWithAstGate(original, opts) {
           return result;
         }
         const post = await fs23.readFile(absPath, "utf8");
-        const syntaxError = firstSyntaxError(ts, path58.basename(absPath), post);
+        const syntaxError = firstSyntaxError(ts, path59.basename(absPath), post);
         if (!syntaxError) return result;
         const parseError = `${syntaxError.message} (line ${syntaxError.line}, col ${syntaxError.character})`;
         let revertedTo;
@@ -53258,7 +53507,7 @@ function wrapWithAstGate(original, opts) {
           await fs23.writeFile(absPath, preContent, "utf8");
           revertedTo = snapshotIdOf(preContent);
         }
-        const relLabel = path58.relative(opts.root, absPath) || path58.basename(absPath);
+        const relLabel = path59.relative(opts.root, absPath) || path59.basename(absPath);
         return typedErr(
           `[ast_gate_reverted] ${original.name}: ${absPath} written but the file no longer parses \u2014 write REVERTED (revertedTo=${revertedTo}). ${parseError}. Fix the syntax and re-apply (read_file first for a fresh snapshotId).`,
           {
@@ -53683,7 +53932,7 @@ var init_resourceClaims = __esm({
 // src/cli/toolResultCache.ts
 import { createHash as createHash15 } from "node:crypto";
 import { promises as fs24 } from "node:fs";
-import path59 from "node:path";
+import path60 from "node:path";
 function isToolCacheEnabled() {
   const raw = process.env.ZELARI_TOOL_CACHE;
   return raw !== "0" && raw !== "false" && raw !== "off";
@@ -53768,7 +54017,7 @@ async function statKey(toolName, input, ctx) {
   if (!input || typeof input !== "object") return null;
   const rawPath = input.path;
   if (typeof rawPath !== "string" || rawPath.length === 0) return null;
-  const abs = path59.isAbsolute(rawPath) ? rawPath : path59.join(ctx.cwd, rawPath);
+  const abs = path60.isAbsolute(rawPath) ? rawPath : path60.join(ctx.cwd, rawPath);
   try {
     const st = await fs24.stat(abs);
     return hashKey({
@@ -53824,7 +54073,7 @@ __export(toolRegistry_exports, {
   wrapWithSandbox: () => wrapWithSandbox
 });
 import { existsSync as existsSync32 } from "node:fs";
-import path60 from "node:path";
+import path61 from "node:path";
 function createBuiltinToolRegistry(options = {}) {
   const root = options.root ?? process.cwd();
   const audit = options.audit ?? new AuditLogger();
@@ -54049,6 +54298,15 @@ function createBuiltinToolRegistry(options = {}) {
       permissions: browserTool.permissions ?? []
     });
   }
+  if (!readOnly && !gauntletParent && process.env.ZELARI_SCREENSHOT !== "0") {
+    const screenshotTool = createScreenshotTool();
+    registry4.register(screenshotTool);
+    tools.push({
+      name: screenshotTool.name,
+      description: screenshotTool.description,
+      permissions: screenshotTool.permissions ?? []
+    });
+  }
   if (!readOnly && !gauntletParent && process.env.ZELARI_SSH !== "0") {
     for (const t of createSshTools()) {
       registry4.register(t);
@@ -54082,6 +54340,7 @@ function createBuiltinToolRegistry(options = {}) {
           // registry's own policy (permPolicy above) — they can never
           // exceed it.
           parentPolicy: permPolicy,
+          ...options.onPermissionAsk ? { onPermissionAsk: options.onPermissionAsk } : {},
           ...options.subAgentProvider ? { provider: options.subAgentProvider } : {},
           ...options.subAgentModel ? { model: options.subAgentModel } : {}
         }),
@@ -54181,12 +54440,13 @@ function taskAgentToProfile(agent) {
   return "explore";
 }
 function createKrakenSubAgentContextFactory(opts) {
-  const { root, audit, sessionId: sessionId2, provider: providerOverride, model: modelOverride, parentPolicy } = opts;
+  const { root, audit, sessionId: sessionId2, provider: providerOverride, model: modelOverride, parentPolicy, onPermissionAsk } = opts;
   return async ({ agent, cwd: subCwd }) => {
     const cfg = providerOverride ? await providerConfigFor(providerOverride) : await providerFromEnv();
     if (!cfg) return null;
     const { resolveKrakenSubModel: resolveKrakenSubModel2, parseQualifiedModelRef: parseQualifiedModelRef2 } = await Promise.resolve().then(() => (init_krakenModel(), krakenModel_exports));
-    const resolvedModel = resolveKrakenSubModel2(agent, modelOverride || cfg.model);
+    const parentModel = modelOverride || cfg.model;
+    const resolvedModel = resolveKrakenSubModel2(agent, parentModel);
     let effCfg = cfg;
     let model = resolvedModel;
     const ref = parseQualifiedModelRef2(resolvedModel);
@@ -54215,6 +54475,7 @@ function createKrakenSubAgentContextFactory(opts) {
       diagnostics: false,
       lspProvider: null,
       permissionPolicy: effectiveSubPolicy,
+      ...onPermissionAsk ? { onPermissionAsk } : {},
       // P0.5: the tentacle's agent identity drives per-agent policy rules.
       policyAgent: agent
     });
@@ -54222,6 +54483,13 @@ function createKrakenSubAgentContextFactory(opts) {
       providerStream: buildProviderStream(subCfg),
       model,
       provider: subCfg.providerId,
+      ...model !== parentModel ? {
+        fallback: {
+          model: parentModel,
+          provider: cfg.providerId,
+          providerStream: buildProviderStream({ ...cfg, model: parentModel })
+        }
+      } : {},
       registry: subRegistry,
       tools: subRegistry.toOpenAITools().map((t) => ({
         name: t.function.name,
@@ -54241,11 +54509,14 @@ function wrapWithPermissions(original, policy, onAsk, agentLayers, precedence =
   return {
     ...original,
     execute: async (input, ctx) => {
-      const decision = resolveToolPermission(original.name, required2, policy);
+      const requiredNow = original.name === "task" ? permissionsForTaskAgent(
+        input?.agent
+      ) : required2;
+      const decision = resolveToolPermission(original.name, requiredNow, policy);
       const rule = agentLayers ? matchAgentPolicyRuleLayered(
         agentLayers,
         precedence,
-        required2,
+        requiredNow,
         input ?? {},
         root ?? process.cwd()
       ) : null;
@@ -54257,25 +54528,25 @@ function wrapWithPermissions(original, policy, onAsk, agentLayers, precedence =
         root ?? process.cwd()
       ) : void 0;
       const contractRule = matchContractCapabilityRule(
-        required2,
+        requiredNow,
         input ?? {},
         root ?? process.cwd()
       );
       let action = intersectEffects(mergeRuleEffect(decision.action, rule), claims?.effect, contractRule?.effect);
       let actionReason = decision.reason;
-      if (action !== "deny" && (required2.includes("write") || required2.includes("execute"))) {
+      if (action !== "deny" && (requiredNow.includes("write") || requiredNow.includes("execute"))) {
         const provHit = provenanceMatchIn(JSON.stringify(input ?? {}));
-        if (provHit && provenanceAppliesTo(provHit.source, required2)) {
+        if (provHit && provenanceAppliesTo(provHit.source, requiredNow)) {
           const provNote = `[provenance] args embed non-user ${provHit.source} content (via ${provHit.tool})`;
           if (action === "allow") {
             action = "ask";
-            actionReason = `${provNote} \u2014 confirm before ${required2.join("+")}`;
+            actionReason = `${provNote} \u2014 confirm before ${requiredNow.join("+")}`;
           } else {
             actionReason = `${decision.reason} \xB7 ${provNote}`;
           }
         }
       }
-      if (action === "allow" && required2.includes("execute") && activePermissionPreset() !== "yolo" && !isSessionGranted(original.name, required2)) {
+      if (action === "allow" && requiredNow.includes("execute") && activePermissionPreset() !== "yolo" && !isSessionGranted(original.name, requiredNow)) {
         const destructiveHit = destructiveCommandHit(input ?? {});
         if (destructiveHit) {
           action = "ask";
@@ -54318,7 +54589,7 @@ function wrapWithPermissions(original, policy, onAsk, agentLayers, precedence =
         }
       }
       const outcome = await original.execute(input, ctx);
-      recordResultForProvenance(original.name, required2, outcome);
+      recordResultForProvenance(original.name, requiredNow, outcome);
       return outcome;
     }
   };
@@ -54420,14 +54691,14 @@ function wrapWithDiagnostics(original, root, runner) {
 function claimedSourcePath(token, args, root) {
   const cleaned = token.replace(/^["']|["']$/g, "");
   if (!cleaned || cleaned.startsWith("-")) return null;
-  if (!DIAG_SOURCE_EXTENSIONS.has(path60.extname(cleaned).toLowerCase())) return null;
+  if (!DIAG_SOURCE_EXTENSIONS.has(path61.extname(cleaned).toLowerCase())) return null;
   const bases = [root];
   const cwd = args["cwd"];
   if (typeof cwd === "string" && cwd.length > 0) {
-    bases.unshift(path60.isAbsolute(cwd) ? cwd : path60.resolve(root, cwd));
+    bases.unshift(path61.isAbsolute(cwd) ? cwd : path61.resolve(root, cwd));
   }
   for (const base2 of bases) {
-    const candidate = path60.isAbsolute(cleaned) ? path60.normalize(cleaned) : path60.resolve(base2, cleaned);
+    const candidate = path61.isAbsolute(cleaned) ? path61.normalize(cleaned) : path61.resolve(base2, cleaned);
     try {
       const contained = resolveSandboxedPath(candidate, { root });
       if (existsSync32(contained)) return contained;
@@ -54697,6 +54968,7 @@ var init_toolRegistry = __esm({
     init_tools3();
     init_tools4();
     init_tools5();
+    init_screenshotTool();
     init_tools6();
     init_worldModel();
     init_openai_compatible();
@@ -54743,7 +55015,7 @@ var init_toolRegistry = __esm({
 
 // src/cli/metrics.ts
 import { promises as fs25, existsSync as existsSync33, statSync as statSync4, renameSync as renameSync4, appendFileSync as appendFileSync3, mkdirSync as mkdirSync15 } from "node:fs";
-import path61 from "node:path";
+import path62 from "node:path";
 async function readMetrics(file2) {
   let raw = "";
   try {
@@ -54793,7 +55065,7 @@ var init_metrics3 = __esm({
       writeQueue = Promise.resolve();
       constructor(file2) {
         this.file = file2 ?? metricsPath();
-        mkdirSync15(path61.dirname(this.file), { recursive: true });
+        mkdirSync15(path62.dirname(this.file), { recursive: true });
       }
       /** Metrics file path — doctor/summary readers use this. */
       get filePath() {
@@ -54830,8 +55102,8 @@ var init_metrics3 = __esm({
       maybeRotate() {
         if (!existsSync33(this.file)) return;
         try {
-          const stat7 = statSync4(this.file);
-          if (stat7.size >= METRICS_ROTATE_BYTES) {
+          const stat8 = statSync4(this.file);
+          if (stat8.size >= METRICS_ROTATE_BYTES) {
             const rotated = this.file.replace(/\.jsonl$/, ".1.jsonl");
             renameSync4(this.file, rotated);
           }
@@ -55125,15 +55397,15 @@ __export(completionProofProbe_exports, {
   gatherGitAttestation: () => gatherGitAttestation,
   harnessManifest: () => harnessManifest
 });
-import { execFile as execFile5 } from "node:child_process";
-import { promisify as promisify4 } from "node:util";
+import { execFile as execFile6 } from "node:child_process";
+import { promisify as promisify5 } from "node:util";
 async function readHarnessVersion() {
   if (cachedHarnessVersion !== null) return cachedHarnessVersion;
   try {
-    const { readFile: readFile9 } = await import("node:fs/promises");
+    const { readFile: readFile11 } = await import("node:fs/promises");
     const { fileURLToPath: fileURLToPath4 } = await import("node:url");
     const pkgPath = fileURLToPath4(new URL("../../../package.json", import.meta.url));
-    const parsed = JSON.parse(await readFile9(pkgPath, "utf8"));
+    const parsed = JSON.parse(await readFile11(pkgPath, "utf8"));
     if (typeof parsed.version === "string" && parsed.version.length > 0) {
       return cachedHarnessVersion = parsed.version;
     }
@@ -55157,7 +55429,7 @@ async function harnessManifest(env = process.env) {
 }
 async function git5(cwd, args) {
   try {
-    const { stdout } = await execFileAsync4("git", ["-C", cwd, ...args], {
+    const { stdout } = await execFileAsync5("git", ["-C", cwd, ...args], {
       maxBuffer: 32 * 1024 * 1024,
       windowsHide: true
     });
@@ -55199,7 +55471,7 @@ function activeTaskContractSnapshot() {
     return void 0;
   }
 }
-var HARNESS_VERSION_FALLBACK, ADAPTER_IDS, cachedHarnessVersion, execFileAsync4;
+var HARNESS_VERSION_FALLBACK, ADAPTER_IDS, cachedHarnessVersion, execFileAsync5;
 var init_completionProofProbe = __esm({
   "src/cli/kraken/completionProofProbe.ts"() {
     "use strict";
@@ -55207,7 +55479,7 @@ var init_completionProofProbe = __esm({
     HARNESS_VERSION_FALLBACK = "2.13.0";
     ADAPTER_IDS = ["node", "python", "rust", "go", "java", "dotnet"];
     cachedHarnessVersion = null;
-    execFileAsync4 = promisify4(execFile5);
+    execFileAsync5 = promisify5(execFile6);
   }
 });
 
@@ -55311,7 +55583,7 @@ var init_completionProofAttestation = __esm({
 // src/cli/kraken/completionProofPersist.ts
 import { open, rename as rename2, rm as rm2 } from "node:fs/promises";
 import { randomBytes as randomBytes5 } from "node:crypto";
-import path62 from "node:path";
+import path63 from "node:path";
 function isTruthyFlag2(v) {
   const n = v?.trim().toLowerCase();
   return n === "1" || n === "true" || n === "yes" || n === "on";
@@ -55353,8 +55625,8 @@ function isWindowsRenameBlock(err) {
   return code === "EPERM" || code === "ENOTEMPTY" || code === "EEXIST";
 }
 async function writeFileAtomic(target, data) {
-  const dir = path62.dirname(target);
-  const tmp = path62.join(dir, `.${path62.basename(target)}.${randomBytes5(6).toString("hex")}.tmp`);
+  const dir = path63.dirname(target);
+  const tmp = path63.join(dir, `.${path63.basename(target)}.${randomBytes5(6).toString("hex")}.tmp`);
   let fh = null;
   try {
     fh = await open(tmp, "w");
@@ -55399,8 +55671,8 @@ var init_completionProofPersist = __esm({
 });
 
 // src/cli/kraken/completionProof.ts
-import { mkdir as mkdir3 } from "node:fs/promises";
-import path63 from "node:path";
+import { mkdir as mkdir4 } from "node:fs/promises";
+import path64 from "node:path";
 function verdictOf(evaluation) {
   return evaluation.evaluation?.verdict ?? (evaluation.blocked ? "BLOCKED" : "PASS");
 }
@@ -55545,8 +55817,8 @@ async function writeCompletionProofDetailed(evaluation, options = {}) {
   const mode = options.persistenceMode ?? activeProofPersistenceMode();
   try {
     const baseDir = options.baseDir ?? process.cwd();
-    const dir = path63.join(baseDir, ".zelari");
-    await mkdir3(dir, { recursive: true });
+    const dir = path64.join(baseDir, ".zelari");
+    await mkdir4(dir, { recursive: true });
     const requested = options.attestation ?? {};
     const plan = requested.skipProbes || requested.verificationPlan !== void 0 ? void 0 : await defaultVerificationPlanSnapshot(baseDir);
     const wrapper = await buildAttestedWrapper(
@@ -55565,8 +55837,8 @@ async function writeCompletionProofDetailed(evaluation, options = {}) {
       baseDir
     );
     const rendered = renderCompletionProof(evaluation, options.meta ?? {}, wrapper.attestation);
-    const markdownPath = path63.join(dir, "completion-proof.md");
-    const jsonPath = path63.join(dir, "completion-proof.json");
+    const markdownPath = path64.join(dir, "completion-proof.md");
+    const jsonPath = path64.join(dir, "completion-proof.json");
     await writeFileAtomic(markdownPath, rendered.markdown);
     await writeFileAtomic(jsonPath, rendered.json);
     return { paths: { markdownPath, jsonPath }, mode, requiredBlockReason: null };
@@ -55654,15 +55926,34 @@ var init_spineTelemetry = __esm({
   }
 });
 
+// src/cli/hooks/askUserTimeout.ts
+function askUserTimeoutMs() {
+  const raw = process.env.ZELARI_ASK_USER_TIMEOUT_MS?.trim();
+  if (!raw) return 3e5;
+  const n = Number.parseInt(raw, 10);
+  if (!Number.isFinite(n) || n < 0) return 3e5;
+  return n;
+}
+function armPickerTimeout(onFire, ms) {
+  if (ms <= 0) return () => void 0;
+  const id3 = setTimeout(onFire, ms);
+  return () => clearTimeout(id3);
+}
+var init_askUserTimeout = __esm({
+  "src/cli/hooks/askUserTimeout.ts"() {
+    "use strict";
+  }
+});
+
 // src/cli/state/fileStateStore.ts
 import { createHash as createHash17, randomUUID as randomUUID5 } from "node:crypto";
 import { promises as fs26 } from "node:fs";
-import * as path64 from "node:path";
+import * as path65 from "node:path";
 function shortId() {
   return randomUUID5().replace(/-/g, "").slice(0, 12);
 }
 async function writeJsonAtomic(filePath, data) {
-  await fs26.mkdir(path64.dirname(filePath), { recursive: true });
+  await fs26.mkdir(path65.dirname(filePath), { recursive: true });
   const tmp = `${filePath}.${process.pid}.${Date.now()}.tmp`;
   await fs26.writeFile(tmp, JSON.stringify(data, null, 2) + "\n", "utf8");
   await fs26.rename(tmp, filePath);
@@ -55723,11 +56014,11 @@ var init_fileStateStore = __esm({
       indexPath = "";
       async init(projectRoot) {
         this.root = projectRoot;
-        this.stateDir = path64.join(projectRoot, ".zelari", "state");
-        this.commitsDir = path64.join(this.stateDir, "commits");
-        this.artifactsDir = path64.join(this.stateDir, "artifacts");
-        this.headPath = path64.join(this.stateDir, "HEAD.json");
-        this.indexPath = path64.join(this.stateDir, "index.jsonl");
+        this.stateDir = path65.join(projectRoot, ".zelari", "state");
+        this.commitsDir = path65.join(this.stateDir, "commits");
+        this.artifactsDir = path65.join(this.stateDir, "artifacts");
+        this.headPath = path65.join(this.stateDir, "HEAD.json");
+        this.indexPath = path65.join(this.stateDir, "index.jsonl");
         await fs26.mkdir(this.commitsDir, { recursive: true });
         await fs26.mkdir(this.artifactsDir, { recursive: true });
       }
@@ -55740,13 +56031,13 @@ var init_fileStateStore = __esm({
         const discoveries = input.discoveries ?? [];
         const parent = await this.head();
         const id3 = shortId();
-        const artifactRel = path64.join("artifacts", id3);
-        const artifactAbs = path64.join(this.artifactsDir, id3);
+        const artifactRel = path65.join("artifacts", id3);
+        const artifactAbs = path65.join(this.artifactsDir, id3);
         await fs26.mkdir(artifactAbs, { recursive: true });
         const summary = defaultSummary(input, discoveries);
-        await fs26.writeFile(path64.join(artifactAbs, "summary.md"), summary + "\n", "utf8");
-        await writeJsonAtomic(path64.join(artifactAbs, "discoveries.json"), discoveries);
-        await writeJsonAtomic(path64.join(artifactAbs, "verification.json"), input.verification);
+        await fs26.writeFile(path65.join(artifactAbs, "summary.md"), summary + "\n", "utf8");
+        await writeJsonAtomic(path65.join(artifactAbs, "discoveries.json"), discoveries);
+        await writeJsonAtomic(path65.join(artifactAbs, "verification.json"), input.verification);
         const meta3 = {
           id: id3,
           parentId: parent?.id ?? null,
@@ -55758,14 +56049,14 @@ var init_fileStateStore = __esm({
           workspaceCheckpointId: input.workspaceCheckpointId,
           verification: {
             ...input.verification,
-            reportPath: input.verification.reportPath ?? path64.join(".zelari", "state", artifactRel, "verification.json").replace(/\\/g, "/")
+            reportPath: input.verification.reportPath ?? path65.join(".zelari", "state", artifactRel, "verification.json").replace(/\\/g, "/")
           },
           changedPaths: input.changedPaths ?? [],
           stablePromptHash: input.stablePromptHash,
           discoveryCount: discoveries.length,
           artifactDir: artifactRel.replace(/\\/g, "/")
         };
-        await writeJsonAtomic(path64.join(this.commitsDir, `${id3}.json`), meta3);
+        await writeJsonAtomic(path65.join(this.commitsDir, `${id3}.json`), meta3);
         await writeJsonAtomic(this.headPath, { id: id3, updatedAt: meta3.createdAt });
         await fs26.appendFile(this.indexPath, JSON.stringify({ id: id3, createdAt: meta3.createdAt, label: meta3.label }) + "\n", "utf8");
         return stripStored(meta3);
@@ -55776,7 +56067,7 @@ var init_fileStateStore = __esm({
         return this.get(head.id);
       }
       async get(id3) {
-        const stored = await readJsonFile(path64.join(this.commitsDir, `${id3}.json`));
+        const stored = await readJsonFile(path65.join(this.commitsDir, `${id3}.json`));
         return stored ? stripStored(stored) : null;
       }
       async list(limit = 20) {
@@ -55815,9 +56106,9 @@ var init_fileStateStore = __esm({
       async loadDiscoveries(id3) {
         const meta3 = id3 ? await this.get(id3) : await this.head();
         if (!meta3) return [];
-        const stored = await readJsonFile(path64.join(this.commitsDir, `${meta3.id}.json`));
+        const stored = await readJsonFile(path65.join(this.commitsDir, `${meta3.id}.json`));
         if (!stored?.artifactDir) return [];
-        const discPath = path64.join(this.stateDir, stored.artifactDir, "discoveries.json");
+        const discPath = path65.join(this.stateDir, stored.artifactDir, "discoveries.json");
         return await readJsonFile(discPath) ?? [];
       }
       async materializeContext(id3, maxChars = DEFAULT_MATERIALIZE_CHARS) {
@@ -56420,10 +56711,10 @@ var init_mode = __esm({
 
 // src/cli/headless.ts
 import { readFileSync as readFileSync24 } from "node:fs";
-import path65 from "node:path";
+import path66 from "node:path";
 function resolveHeadlessCwd(opts) {
   const raw = typeof opts.cwd === "string" ? opts.cwd.trim() : "";
-  return path65.resolve(raw.length > 0 ? raw : process.cwd());
+  return path66.resolve(raw.length > 0 ? raw : process.cwd());
 }
 function defaultProfileForMode(mode) {
   switch (mode) {
@@ -57525,7 +57816,7 @@ var init_planDetect = __esm({
 // src/cli/memory/legacyImport.ts
 import { createHash as createHash18 } from "node:crypto";
 import { promises as fs27 } from "node:fs";
-import * as path66 from "node:path";
+import * as path67 from "node:path";
 function sourceId(fact, line) {
   return `jsonl:${fact.id ?? createHash18("sha256").update(line).digest("hex")}`;
 }
@@ -57543,7 +57834,7 @@ function timestamp(value) {
 }
 async function importLegacyMemoryLog(backend, service) {
   const result = { found: 0, imported: 0, skipped: 0, corrupt: 0 };
-  const logPath = path66.join(path66.dirname(backend.databasePath), "log.jsonl");
+  const logPath = path67.join(path67.dirname(backend.databasePath), "log.jsonl");
   let raw;
   try {
     raw = await fs27.readFile(logPath, "utf8");
@@ -57726,7 +58017,7 @@ var init_sqliteCodec = __esm({
 // src/cli/memory/sqliteRpc.ts
 import { existsSync as existsSync36 } from "node:fs";
 import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL2 } from "node:url";
-import * as path67 from "node:path";
+import * as path68 from "node:path";
 import { Worker } from "node:worker_threads";
 function isBusy(error51) {
   const candidate = error51;
@@ -57735,10 +58026,10 @@ function isBusy(error51) {
   );
 }
 function resolveWorkerUrl() {
-  const here = path67.dirname(fileURLToPath2(import.meta.url));
-  const direct = path67.join(here, "sqliteWorker.mjs");
+  const here = path68.dirname(fileURLToPath2(import.meta.url));
+  const direct = path68.join(here, "sqliteWorker.mjs");
   if (existsSync36(direct)) return pathToFileURL2(direct);
-  return pathToFileURL2(path67.join(here, "memory", "sqliteWorker.mjs"));
+  return pathToFileURL2(path68.join(here, "memory", "sqliteWorker.mjs"));
 }
 var SqliteWorkerRpc;
 var init_sqliteRpc = __esm({
@@ -58027,7 +58318,7 @@ WHERE NOT EXISTS (SELECT 1 FROM memory_fts f WHERE f.node_id = n.id);
 // src/cli/memory/sqliteBackend.ts
 import { createHash as createHash19, randomUUID as randomUUID6 } from "node:crypto";
 import { promises as fs28 } from "node:fs";
-import * as path68 from "node:path";
+import * as path69 from "node:path";
 function boundedLimit(value, fallback = 50) {
   return Math.max(1, Math.min(Math.floor(value ?? fallback), 1e5));
 }
@@ -58089,20 +58380,20 @@ VALUES (${Array.from({ length: 19 }, () => "?").join(",")})`;
         try {
           resolved = await fs28.realpath(projectRoot);
         } catch {
-          resolved = path68.resolve(projectRoot);
+          resolved = path69.resolve(projectRoot);
         }
         if (this.initialized && resolved === this.projectRoot) return;
         if (this.initialized) await this.close();
         const filename = this.options.filename ?? "memory.db";
-        if (path68.basename(filename) !== filename || filename === "." || filename === "..") {
+        if (path69.basename(filename) !== filename || filename === "." || filename === "..") {
           throw new Error("SQLite memory filename must not contain a path.");
         }
-        const zelariDirectory = path68.join(resolved, ".zelari");
-        const directory = path68.join(zelariDirectory, "memory");
+        const zelariDirectory = path69.join(resolved, ".zelari");
+        const directory = path69.join(zelariDirectory, "memory");
         for (const candidate of [zelariDirectory, directory]) {
-          let stat7;
+          let stat8;
           try {
-            stat7 = await fs28.lstat(candidate);
+            stat8 = await fs28.lstat(candidate);
           } catch (error51) {
             if (error51.code !== "ENOENT") throw error51;
             try {
@@ -58110,19 +58401,19 @@ VALUES (${Array.from({ length: 19 }, () => "?").join(",")})`;
             } catch (mkdirError) {
               if (mkdirError.code !== "EEXIST") throw mkdirError;
             }
-            stat7 = await fs28.lstat(candidate);
+            stat8 = await fs28.lstat(candidate);
           }
-          if (stat7.isSymbolicLink() || !stat7.isDirectory()) {
+          if (stat8.isSymbolicLink() || !stat8.isDirectory()) {
             throw new Error(`Memory directory is not a real directory: ${candidate}`);
           }
         }
         const canonicalDirectory = await fs28.realpath(directory);
-        const relativeDirectory = path68.relative(resolved, canonicalDirectory);
-        if (relativeDirectory.startsWith("..") || path68.isAbsolute(relativeDirectory)) {
+        const relativeDirectory = path69.relative(resolved, canonicalDirectory);
+        if (relativeDirectory.startsWith("..") || path69.isAbsolute(relativeDirectory)) {
           throw new Error("SQLite memory directory resolves outside the active project.");
         }
         this.projectRoot = resolved;
-        this.databasePath = path68.join(canonicalDirectory, filename);
+        this.databasePath = path69.join(canonicalDirectory, filename);
         const opened = await this.rpc.open({
           dbPath: this.databasePath,
           schemaSql: SQLITE_MEMORY_BASE_SCHEMA,
@@ -58655,7 +58946,7 @@ __export(serviceFactory_exports, {
 });
 import { createHash as createHash20 } from "node:crypto";
 import { promises as fs29 } from "node:fs";
-import * as path69 from "node:path";
+import * as path70 from "node:path";
 function isMemoryV2Enabled(env = process.env) {
   if (env.ZELARI_MEMORY === "0") return false;
   if (env.ZELARI_MEMORY_BACKEND === "file" || env.ZELARI_MEMORY_BACKEND === "jsonl") return false;
@@ -58676,7 +58967,7 @@ async function canonicalProjectId(projectRoot) {
   try {
     canonical = await fs29.realpath(projectRoot);
   } catch {
-    canonical = path69.resolve(projectRoot);
+    canonical = path70.resolve(projectRoot);
   }
   canonical = canonical.replace(/\\/g, "/").replace(/\/$/, "");
   if (process.platform === "win32") canonical = canonical.toLocaleLowerCase("en-US");
@@ -59378,8 +59669,8 @@ function readPlan(ctx) {
     } catch {
     }
   }
-  const path99 = workspaceFile(ctx.rootDir, "plan");
-  const doc = ctx.storage.readIfExists(path99);
+  const path100 = workspaceFile(ctx.rootDir, "plan");
+  const doc = ctx.storage.readIfExists(path100);
   if (!doc) return { phases: [], tasks: [], milestones: [] };
   const meta3 = doc.meta;
   return {
@@ -59560,7 +59851,7 @@ function addMilestoneRecord(ctx, summary, input) {
     dueDate: input.dueDate,
     targetVersion: version2
   });
-  const path99 = join31(ctx.rootDir, "milestones", `${id3}.md`);
+  const path100 = join31(ctx.rootDir, "milestones", `${id3}.md`);
   const meta3 = {
     kind: "milestone",
     id: id3,
@@ -59577,7 +59868,7 @@ function addMilestoneRecord(ctx, summary, input) {
     `Target version: ${version2}`,
     ""
   ].join("\n");
-  ctx.storage.write(path99, meta3, body);
+  ctx.storage.write(path100, meta3, body);
   return { id: id3, created: true };
 }
 function readPlanSummary(ctx) {
@@ -59781,7 +60072,7 @@ function addIdeaStub(ctx) {
         const tags = args["tags"] ?? [];
         const category = args["category"] ?? "General";
         const id3 = `${nextAdrId(ctx)}-${slugify3(title)}`;
-        const path99 = workspaceArtifact(ctx.rootDir, "decisions", id3);
+        const path100 = workspaceArtifact(ctx.rootDir, "decisions", id3);
         const meta3 = {
           kind: "adr",
           status: "proposed",
@@ -59807,7 +60098,7 @@ function addIdeaStub(ctx) {
           ...consequences.map((c) => `- ${c}`),
           ""
         ].join("\n");
-        ctx.storage.write(path99, meta3, body);
+        ctx.storage.write(path100, meta3, body);
         return `ADR ${id3} created: "${title}". Status: proposed. Promote to accepted via /update ADR or manual edit.`;
       });
     }
@@ -59889,14 +60180,14 @@ function createDocumentStub(ctx) {
           ctx.storage.write(risksPath, riskMeta, content);
           return `Document "${title}" created at risks.md (workspace root).`;
         }
-        const path99 = workspaceArtifact(ctx.rootDir, "docs", slug);
+        const path100 = workspaceArtifact(ctx.rootDir, "docs", slug);
         const meta3 = {
           kind: "doc",
           id: slug,
           date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
           tags
         };
-        ctx.storage.write(path99, meta3, content);
+        ctx.storage.write(path100, meta3, content);
         return `Document "${title}" created at docs/${slug}.md.`;
       });
     }
@@ -60521,10 +60812,10 @@ function getUserMcpPath() {
 function getProjectMcpPath(projectRoot) {
   return join32(projectRoot, ".zelari", "mcp.json");
 }
-function readFile7(path99) {
-  if (!existsSync42(path99)) return {};
+function readFile9(path100) {
+  if (!existsSync42(path100)) return {};
   try {
-    const parsed = JSON.parse(readFileSync30(path99, "utf8"));
+    const parsed = JSON.parse(readFileSync30(path100, "utf8"));
     const out = {};
     for (const [name, cfg] of Object.entries(parsed.mcpServers ?? {})) {
       const hasCommand = !!cfg && typeof cfg.command === "string" && !!cfg.command.trim();
@@ -60546,17 +60837,17 @@ function readFile7(path99) {
     return {};
   }
 }
-function writeFile3(path99, servers) {
-  mkdirSync17(dirname9(path99), { recursive: true });
+function writeFile3(path100, servers) {
+  mkdirSync17(dirname9(path100), { recursive: true });
   const body = { mcpServers: servers };
-  writeFileSync19(path99, `${JSON.stringify(body, null, 2)}
+  writeFileSync19(path100, `${JSON.stringify(body, null, 2)}
 `, "utf8");
 }
 function listMcpServers(projectRoot) {
   const userPath = getUserMcpPath();
-  const userServers = readFile7(userPath);
+  const userServers = readFile9(userPath);
   const projectPath = projectRoot && projectRoot.trim() ? getProjectMcpPath(projectRoot.trim()) : null;
-  const projectServers = projectPath ? readFile7(projectPath) : {};
+  const projectServers = projectPath ? readFile9(projectPath) : {};
   const servers = [];
   for (const [name, cfg] of Object.entries(userServers)) {
     servers.push({ name, ...cfg, scope: "user", path: userPath });
@@ -60587,9 +60878,9 @@ function upsertMcpServer(opts) {
       error: "either command (stdio) or url (http) is required"
     };
   }
-  let path99;
+  let path100;
   if (opts.scope === "user") {
-    path99 = getUserMcpPath();
+    path100 = getUserMcpPath();
   } else {
     const root = opts.projectRoot?.trim();
     if (!root) {
@@ -60598,9 +60889,9 @@ function upsertMcpServer(opts) {
         error: "projectRoot required for project scope (Open Folder first)"
       };
     }
-    path99 = getProjectMcpPath(root);
+    path100 = getProjectMcpPath(root);
   }
-  const current = readFile7(path99);
+  const current = readFile9(path100);
   current[name] = {
     command: hasCommand ? opts.config.command.trim() : void 0,
     args: opts.config.args,
@@ -60611,21 +60902,21 @@ function upsertMcpServer(opts) {
     serial: opts.config.serial,
     enabled: opts.config.enabled !== false
   };
-  writeFile3(path99, current);
-  return { ok: true, path: path99 };
+  writeFile3(path100, current);
+  return { ok: true, path: path100 };
 }
 function removeMcpServer(opts) {
-  const path99 = opts.scope === "user" ? getUserMcpPath() : opts.projectRoot ? getProjectMcpPath(opts.projectRoot) : null;
-  if (!path99) {
+  const path100 = opts.scope === "user" ? getUserMcpPath() : opts.projectRoot ? getProjectMcpPath(opts.projectRoot) : null;
+  if (!path100) {
     return { ok: false, error: "projectRoot required for project scope" };
   }
-  const current = readFile7(path99);
+  const current = readFile9(path100);
   if (!(opts.name in current)) {
-    return { ok: false, error: `Server "${opts.name}" not found in ${path99}` };
+    return { ok: false, error: `Server "${opts.name}" not found in ${path100}` };
   }
   delete current[opts.name];
-  writeFile3(path99, current);
-  return { ok: true, path: path99 };
+  writeFile3(path100, current);
+  return { ok: true, path: path100 };
 }
 var init_mcpConfigIo = __esm({
   "src/cli/mcp/mcpConfigIo.ts"() {
@@ -61040,7 +61331,8 @@ async function* dispatchCouncil(userMessage, options) {
     maxToolLoopIterations: options.maxToolLoopIterations,
     maxToolLoopHardCap: options.maxToolLoopHardCap,
     skipSpecialists: options.skipSpecialists,
-    feedbackStore: options.feedbackStore
+    feedbackStore: options.feedbackStore,
+    signal: options.signal
   };
   if (!options.disableWorkspaceTools) {
     const { setWorkspaceStubs: setWorkspaceStubs2 } = await Promise.resolve().then(() => (init_skills2(), skills_exports));
@@ -61093,12 +61385,12 @@ __export(agentsMd_exports, {
 import { existsSync as existsSync44, readFileSync as readFileSync32, writeFileSync as writeFileSync20 } from "node:fs";
 import { createHash as createHash21 } from "node:crypto";
 import { join as join34 } from "node:path";
-import { readFile as readFile8 } from "node:fs/promises";
+import { readFile as readFile10 } from "node:fs/promises";
 async function readPackageJson3(projectRoot) {
-  const path99 = join34(projectRoot, "package.json");
-  if (!existsSync44(path99)) return null;
+  const path100 = join34(projectRoot, "package.json");
+  if (!existsSync44(path100)) return null;
   try {
-    return JSON.parse(await readFile8(path99, "utf8"));
+    return JSON.parse(await readFile10(path100, "utf8"));
   } catch {
     return null;
   }
@@ -61180,9 +61472,9 @@ async function genBuild(ctx) {
   ].join("\n");
 }
 async function genOpenQuestions(ctx) {
-  const path99 = join34(ctx.rootDir, "risks.md");
-  if (!existsSync44(path99)) return "_No open questions._";
-  const content = readFileSync32(path99, "utf8");
+  const path100 = join34(ctx.rootDir, "risks.md");
+  if (!existsSync44(path100)) return "_No open questions._";
+  const content = readFileSync32(path100, "utf8");
   const lines = content.split("\n");
   const questions = [];
   let currentTitle = "";
@@ -61456,9 +61748,9 @@ function versionKey(value) {
 function firstString2(v) {
   return typeof v === "string" && v.trim().length > 0 ? v : null;
 }
-function readFileSyncSafe(path99) {
+function readFileSyncSafe(path100) {
   try {
-    return readFileSync33(path99, "utf8");
+    return readFileSync33(path100, "utf8");
   } catch {
     return null;
   }
@@ -61706,7 +61998,7 @@ __export(evidenceFromSpine_exports, {
   evidenceRefsFromEventLines: () => evidenceRefsFromEventLines
 });
 import { existsSync as existsSync47, readFileSync as readFileSync35 } from "node:fs";
-import path70 from "node:path";
+import path71 from "node:path";
 function asRecord2(v) {
   return v && typeof v === "object" && !Array.isArray(v) ? v : void 0;
 }
@@ -61744,7 +62036,7 @@ function evidenceRefsFromEventLines(lines) {
 }
 function collectSessionEvidenceRefs(sessionId2) {
   try {
-    const file2 = path70.join(sessionsDir(), sessionId2, "events.jsonl");
+    const file2 = path71.join(sessionsDir(), sessionId2, "events.jsonl");
     if (!existsSync47(file2)) return [];
     return evidenceRefsFromEventLines(readFileSync35(file2, "utf8").split("\n"));
   } catch {
@@ -61994,8 +62286,8 @@ async function runPostCouncilHook(ctx, options) {
           sources: scope.sources
         } : void 0
       });
-      const path99 = writeCouncilCompletion(ctx.rootDir, completion);
-      completionHook = { ran: true, path: path99, completion };
+      const path100 = writeCouncilCompletion(ctx.rootDir, completion);
+      completionHook = { ran: true, path: path100, completion };
     } catch (err) {
       completionHook = {
         ran: true,
@@ -62040,7 +62332,7 @@ import {
   writeFileSync as writeFileSync22,
   mkdirSync as mkdirSync18
 } from "node:fs";
-import path71 from "node:path";
+import path72 from "node:path";
 var FeedbackStore;
 var init_councilFeedback = __esm({
   "src/cli/councilFeedback.ts"() {
@@ -62157,7 +62449,7 @@ var init_councilFeedback = __esm({
         }
       }
       save() {
-        mkdirSync18(path71.dirname(this.file), { recursive: true });
+        mkdirSync18(path72.dirname(this.file), { recursive: true });
         writeFileSync22(
           this.file,
           JSON.stringify({ entries: this.entries }, null, 2),
@@ -62232,12 +62524,12 @@ __export(ledger_exports, {
   readLedger: () => readLedger
 });
 import { appendFileSync as appendFileSync4, existsSync as existsSync50, mkdirSync as mkdirSync19, readFileSync as readFileSync38 } from "node:fs";
-import path72 from "node:path";
+import path73 from "node:path";
 function evolutionMode(env = process.env) {
   return env[EVOLUTION_ENV] === "shadow" ? "shadow" : "0";
 }
 function ledgerPath(cwd) {
-  return path72.join(cwd, LEDGER_REL);
+  return path73.join(cwd, LEDGER_REL);
 }
 function appendLedgerEntry(cwd, entry) {
   if (evolutionMode() === "0") {
@@ -62245,7 +62537,7 @@ function appendLedgerEntry(cwd, entry) {
   }
   try {
     const file2 = ledgerPath(cwd);
-    mkdirSync19(path72.dirname(file2), { recursive: true });
+    mkdirSync19(path73.dirname(file2), { recursive: true });
     appendFileSync4(file2, `${JSON.stringify(entry)}
 `, "utf8");
     return { written: true, path: file2 };
@@ -62346,7 +62638,7 @@ var init_ledger = __esm({
   "src/cli/evolution/ledger.ts"() {
     "use strict";
     EVOLUTION_ENV = "ZELARI_EVOLUTION";
-    LEDGER_REL = path72.join(".zelari", "evolution", "ledger.jsonl");
+    LEDGER_REL = path73.join(".zelari", "evolution", "ledger.jsonl");
     TIER_WEIGHTS = {
       build: 1,
       "tool-output": 1,
@@ -62488,7 +62780,7 @@ __export(fileBackend_exports, {
 });
 import { randomUUID as randomUUID7 } from "node:crypto";
 import { promises as fs31 } from "node:fs";
-import * as path73 from "node:path";
+import * as path74 from "node:path";
 function tokenize2(text) {
   return text.toLowerCase().split(/[^\p{L}\p{N}]+/u).filter((t) => t.length >= 3);
 }
@@ -62541,8 +62833,8 @@ var init_fileBackend = __esm({
       logPath = "";
       memoryDir = "";
       async init(projectRoot) {
-        this.memoryDir = path73.join(projectRoot, ".zelari", "memory");
-        this.logPath = path73.join(this.memoryDir, "log.jsonl");
+        this.memoryDir = path74.join(projectRoot, ".zelari", "memory");
+        this.logPath = path74.join(this.memoryDir, "log.jsonl");
         await fs31.mkdir(this.memoryDir, { recursive: true });
       }
       async add(content, metadata2 = {}, graph) {
@@ -62615,12 +62907,12 @@ var init_fileBackend = __esm({
 
 // src/cli/traceStore.ts
 import { promises as fs32 } from "node:fs";
-import * as path74 from "node:path";
+import * as path75 from "node:path";
 function traceDir(projectRoot) {
-  return path74.join(projectRoot, ".zelari", "trace");
+  return path75.join(projectRoot, ".zelari", "trace");
 }
 function tracePath(projectRoot, missionId) {
-  return path74.join(traceDir(projectRoot), `${missionId}.json`);
+  return path75.join(traceDir(projectRoot), `${missionId}.json`);
 }
 async function saveTrace(projectRoot, missionId, entries) {
   const dir = traceDir(projectRoot);
@@ -62657,7 +62949,7 @@ __export(zelariMission_exports, {
 });
 import { randomUUID as randomUUID8 } from "node:crypto";
 import { promises as fs33 } from "node:fs";
-import * as path75 from "node:path";
+import * as path76 from "node:path";
 function resolveMaxIterations(env = process.env) {
   const raw = env.ZELARI_MISSION_MAX_ITER;
   const n = raw ? Number.parseInt(raw, 10) : DEFAULT_MAX_ITER;
@@ -62700,10 +62992,10 @@ function isMissionAutoStart(env = process.env) {
   return env.ZELARI_MISSION_AUTO === "1";
 }
 async function writeMissionState(projectRoot, state3) {
-  const dir = path75.join(projectRoot, ".zelari");
+  const dir = path76.join(projectRoot, ".zelari");
   await fs33.mkdir(dir, { recursive: true });
   await fs33.writeFile(
-    path75.join(dir, "mission-state.json"),
+    path76.join(dir, "mission-state.json"),
     JSON.stringify(state3, null, 2) + "\n",
     "utf8"
   );
@@ -62798,6 +63090,13 @@ async function runZelariMission(userMessage, brief, deps) {
   let forcePivot = false;
   const missionStartMs = now().getTime();
   while (true) {
+    if (deps.signal?.aborted) {
+      state3.status = "cancelled";
+      state3.updatedAt = now().toISOString();
+      await persist();
+      deps.emit("[zelari] missione cancellata.");
+      return state3;
+    }
     const runMode = pendingDesign ? "design-phase" : "implementation";
     if (runMode === "implementation") {
       deps.onMissionPhase?.("build", `impl-${implStep + 1}`);
@@ -62854,6 +63153,13 @@ async function runZelariMission(userMessage, brief, deps) {
       );
       return state3;
     }
+    if (deps.signal?.aborted) {
+      state3.status = "cancelled";
+      state3.updatedAt = now().toISOString();
+      await persist();
+      deps.emit("[zelari] missione cancellata.");
+      return state3;
+    }
     if (typeof result.costUsd === "number") cumulativeCostUsd += result.costUsd;
     if (typeof result.costTokens === "number") cumulativeTokens += result.costTokens;
     await deps.memory.add(
@@ -63378,7 +63684,7 @@ function safeSocketPath(socketPath) {
   return socketPath.trim();
 }
 function startPermissionBroker(socketPath, handlers, opts) {
-  const path99 = safeSocketPath(socketPath);
+  const path100 = safeSocketPath(socketPath);
   const requestTimeoutMs = opts?.requestTimeoutMs ?? PERMISSION_BROKER_DEFAULT_TIMEOUT_MS;
   const sockets = /* @__PURE__ */ new Set();
   const server = createServer2((socket) => {
@@ -63478,10 +63784,10 @@ function startPermissionBroker(socketPath, handlers, opts) {
   return new Promise((resolve9, reject) => {
     const onError = (err) => reject(err);
     server.once("error", onError);
-    server.listen(path99, () => {
+    server.listen(path100, () => {
       server.removeListener("error", onError);
       resolve9({
-        socketPath: path99,
+        socketPath: path100,
         stop: () => new Promise((res) => {
           for (const s of sockets) s.destroy();
           sockets.clear();
@@ -63492,7 +63798,7 @@ function startPermissionBroker(socketPath, handlers, opts) {
             if (done) return;
             done = true;
             if (process.platform !== "win32") {
-              unlink(path99, () => res());
+              unlink(path100, () => res());
             } else {
               res();
             }
@@ -63505,11 +63811,11 @@ function startPermissionBroker(socketPath, handlers, opts) {
   });
 }
 function requestBrokerAsk(socketPath, ask, opts) {
-  const path99 = safeSocketPath(socketPath);
+  const path100 = safeSocketPath(socketPath);
   const requestTimeoutMs = opts?.requestTimeoutMs ?? PERMISSION_BROKER_DEFAULT_TIMEOUT_MS;
   const connectTimeoutMs = opts?.connectTimeoutMs ?? PERMISSION_BROKER_DEFAULT_CONNECT_TIMEOUT_MS;
   return new Promise((resolve9, reject) => {
-    const socket = connect(path99);
+    const socket = connect(path100);
     let buffer = "";
     let settled = false;
     const settle = (fn) => {
@@ -63524,7 +63830,7 @@ function requestBrokerAsk(socketPath, ask, opts) {
       settle(
         () => reject(
           new Error(
-            `permission broker unavailable at "${path99}" (connect timed out after ${connectTimeoutMs}ms)`
+            `permission broker unavailable at "${path100}" (connect timed out after ${connectTimeoutMs}ms)`
           )
         )
       );
@@ -64713,7 +65019,7 @@ var init_prereqChecks = __esm({
 
 // src/cli/plugins/prefs.ts
 import { existsSync as existsSync53, readFileSync as readFileSync40, writeFileSync as writeFileSync23, mkdirSync as mkdirSync20 } from "node:fs";
-import path81 from "node:path";
+import path82 from "node:path";
 function getPluginPrefsPath() {
   return pluginsPrefsPath();
 }
@@ -64736,7 +65042,7 @@ function getPluginPrefs() {
 }
 function writePluginPrefs(prefs) {
   const file2 = getPluginPrefsPath();
-  mkdirSync20(path81.dirname(file2), { recursive: true });
+  mkdirSync20(path82.dirname(file2), { recursive: true });
   writeFileSync23(file2, JSON.stringify(prefs, null, 2), {
     encoding: "utf-8",
     mode: 384
@@ -64774,7 +65080,7 @@ __export(registry_exports, {
   isBinaryOnPath: () => isBinaryOnPath
 });
 import { existsSync as existsSync54 } from "node:fs";
-import path82 from "node:path";
+import path83 from "node:path";
 function detectLocalBin(bin) {
   return (cwd) => {
     try {
@@ -64792,7 +65098,7 @@ function isBinaryOnPath(bin, opts = {}) {
   const platform = opts.platform ?? process.platform;
   const exists = opts.exists ?? existsSync54;
   const pathEnv = opts.pathEnv ?? process.env.PATH ?? "";
-  const pathMod = platform === "win32" ? path82.win32 : path82.posix;
+  const pathMod = platform === "win32" ? path83.win32 : path83.posix;
   const sep4 = platform === "win32" ? ";" : ":";
   const dirs = pathEnv.split(sep4).filter((d) => d.length > 0);
   const candidates = [bin];
@@ -65887,7 +66193,7 @@ var init_policy = __esm({
 
 // src/cli/orchestration/facts.ts
 import { promises as fs43 } from "node:fs";
-import path86 from "node:path";
+import path87 from "node:path";
 async function collectRepoFileCount(root = process.cwd()) {
   try {
     await fs43.readdir(root);
@@ -65907,7 +66213,7 @@ async function collectRepoFileCount(root = process.cwd()) {
       }
       for (const e of entries) {
         if (e.isDirectory()) {
-          if (!SKIP_DIRS.has(e.name)) queue.push(path86.join(dir, e.name));
+          if (!SKIP_DIRS.has(e.name)) queue.push(path87.join(dir, e.name));
         } else if (e.isFile()) {
           count++;
           if (count > MAX_WALK_FILES) return count;
@@ -65972,11 +66278,12 @@ var init_facts = __esm({
 });
 
 // src/cli/utils/streamScrub.ts
-function createStreamScrubber2() {
+function createStreamScrubber2(opts = {}) {
+  const stripQuestion = opts.stripQuestion !== false;
   let rawBuf = "";
   let emittedLen = 0;
   const snapshot = () => {
-    const cleaned = cleanAgentContent(rawBuf);
+    const cleaned = cleanAgentContent(rawBuf, { stripQuestion });
     if (cleaned.length <= emittedLen) return "";
     const delta = cleaned.slice(emittedLen);
     emittedLen = cleaned.length;
@@ -66004,7 +66311,7 @@ var init_streamScrub = __esm({
 });
 
 // src/cli/harnessState.ts
-import path87 from "node:path";
+import path88 from "node:path";
 function asString4(v) {
   return typeof v === "string" ? v : "";
 }
@@ -66179,7 +66486,7 @@ function contractFor(t) {
   };
 }
 async function readHarnessState(sessionDir) {
-  const report = await readSessionLog(path87.join(sessionDir, "events.jsonl"));
+  const report = await readSessionLog(path88.join(sessionDir, "events.jsonl"));
   return deriveHarnessState(report.events);
 }
 var init_harnessState = __esm({
@@ -66190,12 +66497,12 @@ var init_harnessState = __esm({
 });
 
 // src/cli/headless/harnessStateEmit.ts
-import path88 from "node:path";
+import path89 from "node:path";
 async function emitHarnessStateEvent(opts) {
   if (opts.output !== "json") return;
   try {
     const sessionsDir2 = resolveSessionsDir({ workspaceRoot: opts.workspaceRoot });
-    const state3 = await readHarnessState(path88.join(sessionsDir2, opts.spine.sessionId));
+    const state3 = await readHarnessState(path89.join(sessionsDir2, opts.spine.sessionId));
     opts.emitEvent({ type: "harness_state", ...state3 });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -66214,215 +66521,39 @@ var init_harnessStateEmit = __esm({
   }
 });
 
-// src/cli/headless/policyGate.ts
-import { isAbsolute as isAbsolute5, resolve as resolve7 } from "node:path";
-import { randomUUID as randomUUID9 } from "node:crypto";
-function checkStrictPolicyLoad(root, opts) {
-  if (isPolicyEngineDisabled()) return { blocked: false, warnings: [] };
-  try {
-    const set2 = loadPolicySet(root, opts);
-    return { blocked: false, warnings: set2.warnings };
-  } catch (err) {
-    if (!(err instanceof PolicyLoadError)) throw err;
-    const file2 = isAbsolute5(err.file) ? err.file : resolve7(root, err.file);
-    return {
-      blocked: true,
-      warnings: [],
-      block: {
-        reason: POLICY_LOAD_BLOCK_REASON,
-        exitCode: POLICY_LOAD_EXIT_CODE,
-        code: err.code,
-        file: file2,
-        ...err.message ? { detail: err.message } : {}
-      }
-    };
-  }
-}
-function reportPolicyLoadBlocked(block, output) {
-  const where = `${block.file}${block.detail ? ` \u2014 ${block.detail}` : ""}`;
-  process.stderr.write(`[zelari-code --headless] ${block.reason}: ${where}
-`);
-  if (output === "json") {
-    emitEvent({
-      type: "error",
-      severity: "fatal",
-      message: `${block.reason}: ${where}`,
-      code: block.reason
-    });
-  }
-}
-async function recordPolicyLoadBlockedOnSpine(block, opts = {}) {
-  try {
-    const { openHeadlessSpine: openHeadlessSpine2 } = await Promise.resolve().then(() => (init_headlessSpine(), headlessSpine_exports));
-    const sessionId2 = opts.resumeSessionId ?? randomUUID9();
-    const spine = await openHeadlessSpine2({
-      sessionId: sessionId2,
-      ...opts.mode ? { mode: opts.mode } : {},
-      ...opts.profile ? { profile: opts.profile } : {},
-      workspace: opts.workspace ?? process.cwd()
-    });
-    if (opts.mode === "zelari") {
-      spine.missionPhase("dispatch", block.reason);
-    }
-    spine.note(block.reason, {
-      code: block.code,
-      file: block.file,
-      exitCode: block.exitCode,
-      ...block.detail ? { detail: block.detail } : {}
-    });
-    await spine.close("error");
-  } catch {
-  }
-}
-var init_policyGate = __esm({
-  "src/cli/headless/policyGate.ts"() {
-    "use strict";
-    init_policyEngine();
-    init_policyLoadMode();
-    init_headless();
-  }
-});
-
-// src/cli/kraken/verifierResolution.ts
-function verifierOverrideToModelSelection(override) {
-  if (override && typeof override.provider === "string" && typeof override.model === "string" && override.provider.trim().length > 0 && override.model.trim().length > 0) {
-    return {
-      mode: "fixed",
-      provider: override.provider.trim(),
-      model: override.model.trim()
-    };
-  }
-  return { mode: "inherit" };
-}
-function loadVerifierModelSelection() {
-  return verifierOverrideToModelSelection(getKrakenVerifierOverride());
-}
-var init_verifierResolution = __esm({
-  "src/cli/kraken/verifierResolution.ts"() {
-    "use strict";
-    init_providerConfig();
-  }
-});
-
-// src/cli/kraken/verifierLifecycle.ts
-function verifierReviewEnabled(selection = loadVerifierModelSelection(), env = process.env) {
-  const v = env.ZELARI_VERIFIER_REVIEW?.toLowerCase();
-  if (v === "0" || v === "false" || v === "off") return false;
-  if (v === "1" || v === "true" || v === "on") return true;
-  return selection.mode === "fixed";
+// src/cli/serve/sessionControl.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+function runWithSession(sessionId2, fn) {
+  return dispatchContext.run({ sessionId: sessionId2, token: {} }, fn);
 }
-function makeVerifierCallModel(loadStream, identity, timeoutMs2 = 12e4) {
-  return async ({ system, user }) => {
-    const stream = await loadStream(identity.provider, identity.model);
-    if (!stream) {
-      throw new Error(`no provider config for verifier "${identity.provider}"`);
+function registerLiveTurnControl(control) {
+  const store6 = dispatchContext.getStore();
+  if (!store6) return void 0;
+  const registered = { ...control, token: store6.token };
+  liveTurns.set(store6.sessionId, registered);
+  return () => {
+    if (liveTurns.get(store6.sessionId) === registered) {
+      liveTurns.delete(store6.sessionId);
     }
-    const { text } = await collectProviderText(stream, {
-      messages: [
-        { role: "system", content: system },
-        { role: "user", content: user }
-      ],
-      model: identity.model,
-      provider: identity.provider,
-      tools: [],
-      signal: AbortSignal.timeout(timeoutMs2)
-    });
-    return { text, provider: identity.provider, model: identity.model };
   };
 }
-function isTestEvidenceCriterion(criterionId2) {
-  const id3 = criterionId2.toLowerCase();
-  return ["test", "typecheck", "build", "lint"].some((k) => id3.includes(k));
-}
-function extractTestOutputExcerpt(results, maxChars = 4e3) {
-  const lines = [];
-  for (const r of results) {
-    if (!isTestEvidenceCriterion(r.criterionId)) continue;
-    lines.push([r.criterionId, r.status, r.detail].filter(Boolean).join(" \u2014 "));
-  }
-  if (lines.length === 0) return "";
-  return lines.join("\n").slice(0, maxChars);
-}
-async function buildBlindReviewInput(evaluation, deps) {
-  const results = evaluation.results ?? [];
-  const passed = results.filter((r) => r.status === "pass").length;
-  const verdict = evaluation.evaluation?.verdict ?? "UNKNOWN";
-  const summary = `Kraken BUILD turn \u2014 deterministic evidence: ${passed}/${results.length} criteria pass, completion verdict ${verdict}.`;
-  const task = deps.task?.trim();
-  const testOutputExcerpt = extractTestOutputExcerpt(results);
-  let diffSummary;
-  try {
-    const res = await (deps.getDiff ?? getWorkingDiff)({
-      cwd: deps.cwd ?? process.cwd(),
-      maxChars: 8e3,
-      staged: true
-    });
-    if (res && !res.empty && res.diff) diffSummary = res.diff;
-  } catch {
-  }
-  return {
-    ...task ? { task } : {},
-    summary,
-    ...diffSummary !== void 0 ? { diffSummary } : {},
-    ...testOutputExcerpt ? { testOutputExcerpt } : {},
-    results
-  };
+function getLiveTurnControl(sessionId2) {
+  return liveTurns.get(sessionId2);
 }
-async function runAdvisoryVerifierReview(evaluation, deps = {}) {
-  if (!evaluation.evaluation || !evaluation.results) return null;
-  const env = deps.env ?? process.env;
-  const selection = deps.selection ?? loadVerifierModelSelection();
-  if (!verifierReviewEnabled(selection, env)) return null;
-  const risk = deps.risk ?? activeRisk(env);
-  if (risk === "low") return null;
-  const route = resolveVerifierRouting(
-    selection.mode === "fixed" ? { provider: selection.provider, model: selection.model } : null,
-    risk,
-    {
-      selectionMode: selection.mode === "fixed" ? "fixed" : "inherit",
-      session: deps.session ?? null,
-      familyCandidates: deps.familyCandidates,
-      env
-    }
-  );
-  const reviewers = route.reviewers;
-  let callModel = deps.callModel;
-  if (reviewers.length === 0 || !callModel && !deps.loadStream) return null;
-  const blind = await buildBlindReviewInput(evaluation, deps);
-  const reviews = [];
-  for (const reviewer of reviewers) {
-    const call = callModel ?? makeVerifierCallModel(deps.loadStream, reviewer.identity, deps.timeoutMs);
-    const service = new VerifierService({
-      callModel: call,
-      config: {
-        enabled: true,
-        model: selection,
-        progressScoring: false,
-        bon: { enabled: false, n: 3 }
-      },
-      emit: deps.emit,
-      env
-    });
-    reviews.push(await service.reviewCompletion({ ...blind, session: deps.session }));
-  }
-  const review = reviews.length > 1 ? mergeVerifierVerdicts(reviews) : reviews[0];
-  evaluation.review = review;
-  if (reviews.length > 1 && risk === "critical") {
-    evaluation.reviewDivergence = divergenceFromReviews(
-      reviews,
-      reviewers.map((r) => ({ family: r.family, role: r.role }))
-    );
+function clearSessionTurnControl(sessionId2) {
+  const store6 = dispatchContext.getStore();
+  if (!store6 || store6.sessionId !== sessionId2) return;
+  const registered = liveTurns.get(sessionId2);
+  if (registered && registered.token === store6.token) {
+    liveTurns.delete(sessionId2);
   }
-  return review;
 }
-var init_verifierLifecycle = __esm({
-  "src/cli/kraken/verifierLifecycle.ts"() {
+var dispatchContext, liveTurns;
+var init_sessionControl = __esm({
+  "src/cli/serve/sessionControl.ts"() {
     "use strict";
-    init_verification();
-    init_krakenSelectTool();
-    init_gitOps();
-    init_verifierResolution();
-    init_verifierRouting();
+    dispatchContext = new AsyncLocalStorage();
+    liveTurns = /* @__PURE__ */ new Map();
   }
 });
 
@@ -66652,51 +66783,289 @@ var init_controlBridge = __esm({
   }
 });
 
-// src/cli/serve/sessionControl.ts
-import { AsyncLocalStorage } from "node:async_hooks";
-function runWithSession(sessionId2, fn) {
-  return dispatchContext.run({ sessionId: sessionId2, token: {} }, fn);
+// src/cli/headless/liveTurnAbort.ts
+function attachHeadlessLiveCancel(opts) {
+  const abort = new AbortController();
+  const controlQueue = new RuntimeControlQueue();
+  const cancel = () => {
+    if (!abort.signal.aborted) abort.abort();
+    return true;
+  };
+  const controlPlane = opts?.output === "json" && process.stdin.isTTY !== true && process.env.ZELARI_SERVE_HARNESS !== "1" ? (() => {
+    emitEvent(protocolInfoEvent());
+    return attachControlPlane({
+      input: process.stdin,
+      queue: controlQueue,
+      emit: emitEvent,
+      onCancel: () => {
+        cancel();
+      }
+    });
+  })() : void 0;
+  const unregister = process.env.ZELARI_SERVE_HARNESS === "1" ? registerLiveTurnControl({
+    queue: controlQueue,
+    cancel
+  }) : void 0;
+  if (unregister) {
+    const appliedBoundary = {
+      steer: "turn-end",
+      follow_up: "run-end",
+      cancel: "cancel"
+    };
+    controlQueue.onDrained = (events) => {
+      for (const event of events) {
+        emitEvent(
+          controlAppliedEvent(
+            event.id,
+            event.type,
+            appliedBoundary[event.type] ?? "unknown"
+          )
+        );
+      }
+    };
+  }
+  return {
+    signal: abort.signal,
+    cancel,
+    dispose() {
+      controlPlane?.finalize();
+      controlPlane?.dispose();
+      unregister?.();
+    }
+  };
 }
-function registerLiveTurnControl(control) {
-  const store6 = dispatchContext.getStore();
-  if (!store6) return void 0;
-  const registered = { ...control, token: store6.token };
-  liveTurns.set(store6.sessionId, registered);
-  return () => {
-    if (liveTurns.get(store6.sessionId) === registered) {
-      liveTurns.delete(store6.sessionId);
+var init_liveTurnAbort = __esm({
+  "src/cli/headless/liveTurnAbort.ts"() {
+    "use strict";
+    init_runtime();
+    init_sessionControl();
+    init_controlBridge();
+    init_protocol2();
+    init_headless();
+  }
+});
+
+// src/cli/headless/policyGate.ts
+import { isAbsolute as isAbsolute5, resolve as resolve7 } from "node:path";
+import { randomUUID as randomUUID9 } from "node:crypto";
+function checkStrictPolicyLoad(root, opts) {
+  if (isPolicyEngineDisabled()) return { blocked: false, warnings: [] };
+  try {
+    const set2 = loadPolicySet(root, opts);
+    return { blocked: false, warnings: set2.warnings };
+  } catch (err) {
+    if (!(err instanceof PolicyLoadError)) throw err;
+    const file2 = isAbsolute5(err.file) ? err.file : resolve7(root, err.file);
+    return {
+      blocked: true,
+      warnings: [],
+      block: {
+        reason: POLICY_LOAD_BLOCK_REASON,
+        exitCode: POLICY_LOAD_EXIT_CODE,
+        code: err.code,
+        file: file2,
+        ...err.message ? { detail: err.message } : {}
+      }
+    };
+  }
+}
+function reportPolicyLoadBlocked(block, output) {
+  const where = `${block.file}${block.detail ? ` \u2014 ${block.detail}` : ""}`;
+  process.stderr.write(`[zelari-code --headless] ${block.reason}: ${where}
+`);
+  if (output === "json") {
+    emitEvent({
+      type: "error",
+      severity: "fatal",
+      message: `${block.reason}: ${where}`,
+      code: block.reason
+    });
+  }
+}
+async function recordPolicyLoadBlockedOnSpine(block, opts = {}) {
+  try {
+    const { openHeadlessSpine: openHeadlessSpine2 } = await Promise.resolve().then(() => (init_headlessSpine(), headlessSpine_exports));
+    const sessionId2 = opts.resumeSessionId ?? randomUUID9();
+    const spine = await openHeadlessSpine2({
+      sessionId: sessionId2,
+      ...opts.mode ? { mode: opts.mode } : {},
+      ...opts.profile ? { profile: opts.profile } : {},
+      workspace: opts.workspace ?? process.cwd()
+    });
+    if (opts.mode === "zelari") {
+      spine.missionPhase("dispatch", block.reason);
     }
+    spine.note(block.reason, {
+      code: block.code,
+      file: block.file,
+      exitCode: block.exitCode,
+      ...block.detail ? { detail: block.detail } : {}
+    });
+    await spine.close("error");
+  } catch {
+  }
+}
+var init_policyGate = __esm({
+  "src/cli/headless/policyGate.ts"() {
+    "use strict";
+    init_policyEngine();
+    init_policyLoadMode();
+    init_headless();
+  }
+});
+
+// src/cli/kraken/verifierResolution.ts
+function verifierOverrideToModelSelection(override) {
+  if (override && typeof override.provider === "string" && typeof override.model === "string" && override.provider.trim().length > 0 && override.model.trim().length > 0) {
+    return {
+      mode: "fixed",
+      provider: override.provider.trim(),
+      model: override.model.trim()
+    };
+  }
+  return { mode: "inherit" };
+}
+function loadVerifierModelSelection() {
+  return verifierOverrideToModelSelection(getKrakenVerifierOverride());
+}
+var init_verifierResolution = __esm({
+  "src/cli/kraken/verifierResolution.ts"() {
+    "use strict";
+    init_providerConfig();
+  }
+});
+
+// src/cli/kraken/verifierLifecycle.ts
+function verifierReviewEnabled(selection = loadVerifierModelSelection(), env = process.env) {
+  const v = env.ZELARI_VERIFIER_REVIEW?.toLowerCase();
+  if (v === "0" || v === "false" || v === "off") return false;
+  if (v === "1" || v === "true" || v === "on") return true;
+  return selection.mode === "fixed";
+}
+function makeVerifierCallModel(loadStream, identity, timeoutMs2 = 12e4) {
+  return async ({ system, user }) => {
+    const stream = await loadStream(identity.provider, identity.model);
+    if (!stream) {
+      throw new Error(`no provider config for verifier "${identity.provider}"`);
+    }
+    const { text } = await collectProviderText(stream, {
+      messages: [
+        { role: "system", content: system },
+        { role: "user", content: user }
+      ],
+      model: identity.model,
+      provider: identity.provider,
+      tools: [],
+      signal: AbortSignal.timeout(timeoutMs2)
+    });
+    return { text, provider: identity.provider, model: identity.model };
   };
 }
-function getLiveTurnControl(sessionId2) {
-  return liveTurns.get(sessionId2);
+function isTestEvidenceCriterion(criterionId2) {
+  const id3 = criterionId2.toLowerCase();
+  return ["test", "typecheck", "build", "lint"].some((k) => id3.includes(k));
 }
-function clearSessionTurnControl(sessionId2) {
-  const store6 = dispatchContext.getStore();
-  if (!store6 || store6.sessionId !== sessionId2) return;
-  const registered = liveTurns.get(sessionId2);
-  if (registered && registered.token === store6.token) {
-    liveTurns.delete(sessionId2);
+function extractTestOutputExcerpt(results, maxChars = 4e3) {
+  const lines = [];
+  for (const r of results) {
+    if (!isTestEvidenceCriterion(r.criterionId)) continue;
+    lines.push([r.criterionId, r.status, r.detail].filter(Boolean).join(" \u2014 "));
   }
+  if (lines.length === 0) return "";
+  return lines.join("\n").slice(0, maxChars);
 }
-var dispatchContext, liveTurns;
-var init_sessionControl = __esm({
-  "src/cli/serve/sessionControl.ts"() {
+async function buildBlindReviewInput(evaluation, deps) {
+  const results = evaluation.results ?? [];
+  const passed = results.filter((r) => r.status === "pass").length;
+  const verdict = evaluation.evaluation?.verdict ?? "UNKNOWN";
+  const summary = `Kraken BUILD turn \u2014 deterministic evidence: ${passed}/${results.length} criteria pass, completion verdict ${verdict}.`;
+  const task = deps.task?.trim();
+  const testOutputExcerpt = extractTestOutputExcerpt(results);
+  let diffSummary;
+  try {
+    const res = await (deps.getDiff ?? getWorkingDiff)({
+      cwd: deps.cwd ?? process.cwd(),
+      maxChars: 8e3,
+      staged: true
+    });
+    if (res && !res.empty && res.diff) diffSummary = res.diff;
+  } catch {
+  }
+  return {
+    ...task ? { task } : {},
+    summary,
+    ...diffSummary !== void 0 ? { diffSummary } : {},
+    ...testOutputExcerpt ? { testOutputExcerpt } : {},
+    results
+  };
+}
+async function runAdvisoryVerifierReview(evaluation, deps = {}) {
+  if (!evaluation.evaluation || !evaluation.results) return null;
+  const env = deps.env ?? process.env;
+  const selection = deps.selection ?? loadVerifierModelSelection();
+  if (!verifierReviewEnabled(selection, env)) return null;
+  const risk = deps.risk ?? activeRisk(env);
+  if (risk === "low") return null;
+  const route = resolveVerifierRouting(
+    selection.mode === "fixed" ? { provider: selection.provider, model: selection.model } : null,
+    risk,
+    {
+      selectionMode: selection.mode === "fixed" ? "fixed" : "inherit",
+      session: deps.session ?? null,
+      familyCandidates: deps.familyCandidates,
+      env
+    }
+  );
+  const reviewers = route.reviewers;
+  let callModel = deps.callModel;
+  if (reviewers.length === 0 || !callModel && !deps.loadStream) return null;
+  const blind = await buildBlindReviewInput(evaluation, deps);
+  const reviews = [];
+  for (const reviewer of reviewers) {
+    const call = callModel ?? makeVerifierCallModel(deps.loadStream, reviewer.identity, deps.timeoutMs);
+    const service = new VerifierService({
+      callModel: call,
+      config: {
+        enabled: true,
+        model: selection,
+        progressScoring: false,
+        bon: { enabled: false, n: 3 }
+      },
+      emit: deps.emit,
+      env
+    });
+    reviews.push(await service.reviewCompletion({ ...blind, session: deps.session }));
+  }
+  const review = reviews.length > 1 ? mergeVerifierVerdicts(reviews) : reviews[0];
+  evaluation.review = review;
+  if (reviews.length > 1 && risk === "critical") {
+    evaluation.reviewDivergence = divergenceFromReviews(
+      reviews,
+      reviewers.map((r) => ({ family: r.family, role: r.role }))
+    );
+  }
+  return review;
+}
+var init_verifierLifecycle = __esm({
+  "src/cli/kraken/verifierLifecycle.ts"() {
     "use strict";
-    dispatchContext = new AsyncLocalStorage();
-    liveTurns = /* @__PURE__ */ new Map();
+    init_verification();
+    init_krakenSelectTool();
+    init_gitOps();
+    init_verifierResolution();
+    init_verifierRouting();
   }
 });
 
 // src/cli/extensions/sandboxedFs.ts
 import { promises as fsp } from "node:fs";
-import path89 from "node:path";
+import path90 from "node:path";
 function errText(prefix, p3, err) {
   const msg = err instanceof Error ? err.message : String(err);
   return `[extension-fs] ${prefix} "${p3}": ${msg}`;
 }
 function bindSandboxedFs(root) {
-  const resolvedRoot = path89.resolve(root);
+  const resolvedRoot = path90.resolve(root);
   return {
     root: resolvedRoot,
     async readFile(relativePath) {
@@ -66712,7 +67081,7 @@ function bindSandboxedFs(root) {
       try {
         const target = resolveSandboxedPath(relativePath, { root: resolvedRoot });
         verifyContainment(target, { root: resolvedRoot });
-        await fsp.mkdir(path89.dirname(target), { recursive: true });
+        await fsp.mkdir(path90.dirname(target), { recursive: true });
         await fsp.writeFile(target, data, "utf8");
         return typedOk({ path: target });
       } catch (err) {
@@ -66897,7 +67266,7 @@ var init_loader = __esm({
 
 // src/cli/headless/runOneTurn.ts
 import { promises as fs44 } from "node:fs";
-import path90 from "node:path";
+import path91 from "node:path";
 function planModeFromOpts(opts) {
   return (opts.phase ?? "build") === "plan";
 }
@@ -67046,6 +67415,7 @@ async function runOneTurn(opts, provider, model, providerStream, extras) {
     // an interactive approval (permission.request over NDJSON) instead of
     // the fail-closed typedErr. Absent handler ⇒ unchanged fail-closed.
     ...opts.onPermissionAsk ? { onPermissionAsk: opts.onPermissionAsk } : {},
+    ...opts.onAskUser ? { onAskUser: opts.onAskUser } : {},
     permissionPolicy: defaultPermissionPolicy2(),
     ...nativeMemory ? { memoryService: nativeMemory } : {},
     memoryAutoWrite,
@@ -67272,7 +67642,7 @@ async function runOneTurn(opts, provider, model, providerStream, extras) {
     let finalReason = "completed";
     let exitCode = 0;
     const textBuffer = [];
-    const scrub = createStreamScrubber2();
+    const scrub = createStreamScrubber2({ stripQuestion: opts.output !== "json" });
     try {
       for await (const event of harness.run()) {
         progressRuntime.observe(event);
@@ -67463,7 +67833,7 @@ async function runOneTurn(opts, provider, model, providerStream, extras) {
       if (json3) {
         if (opts.exportSessionPath === "-") process.stdout.write(json3 + "\n");
         else {
-          await fs44.mkdir(path90.dirname(opts.exportSessionPath), { recursive: true }).catch(() => void 0);
+          await fs44.mkdir(path91.dirname(opts.exportSessionPath), { recursive: true }).catch(() => void 0);
           await fs44.writeFile(opts.exportSessionPath, json3, "utf8");
         }
       }
@@ -68442,9 +68812,9 @@ __export(triggerLock_exports, {
   releaseLock: () => releaseLock
 });
 import { promises as fs45 } from "node:fs";
-import * as path91 from "node:path";
+import * as path92 from "node:path";
 function lockPath(projectRoot) {
-  return path91.join(projectRoot, ".zelari", "trigger.lock");
+  return path92.join(projectRoot, ".zelari", "trigger.lock");
 }
 function isPidAlive(pid) {
   try {
@@ -68457,7 +68827,7 @@ function isPidAlive(pid) {
 }
 async function acquireLock(projectRoot, now = () => /* @__PURE__ */ new Date()) {
   const lp = lockPath(projectRoot);
-  const dir = path91.dirname(lp);
+  const dir = path92.dirname(lp);
   await fs45.mkdir(dir, { recursive: true });
   try {
     const raw = await fs45.readFile(lp, "utf8");
@@ -68489,7 +68859,7 @@ var init_triggerLock = __esm({
 
 // src/cli/runHeadless.ts
 import { promises as fs46 } from "node:fs";
-import path92 from "node:path";
+import path93 from "node:path";
 import { randomUUID as randomUUID10 } from "node:crypto";
 async function runHeadless(opts) {
   resetTaskSpawnCount();
@@ -68733,7 +69103,7 @@ async function runHeadlessKrakenGraph(opts, provider, model) {
   try {
     let preflightGraph;
     if (opts.runPlan && opts.runPlan.trim() !== "") {
-      const planPath = path92.join(cwd, ".zelari", "radio", `plan-${opts.runPlan}.json`);
+      const planPath = path93.join(cwd, ".zelari", "radio", `plan-${opts.runPlan}.json`);
       log(`loading pre-flight plan: ${planPath}`);
       let raw;
       try {
@@ -68776,8 +69146,8 @@ async function runHeadlessKrakenGraph(opts, provider, model) {
     log(formatKrakenGraphAscii2(graph));
     if (opts.planOnly) {
       const planId = randomUUID10();
-      const planDir = path92.join(cwd, ".zelari", "radio");
-      const planPath = path92.join(planDir, `plan-${planId}.json`);
+      const planDir = path93.join(cwd, ".zelari", "radio");
+      const planPath = path93.join(planDir, `plan-${planId}.json`);
       await fs46.mkdir(planDir, { recursive: true });
       await fs46.writeFile(
         planPath,
@@ -68814,6 +69184,7 @@ async function runHeadlessKrakenGraph(opts, provider, model) {
           // ask without a UI fails closed), so this intersection actually
           // bites: tentacles can never exceed the preset.
           parentPolicy: defaultPermissionPolicy2(),
+          ...opts.onPermissionAsk ? { onPermissionAsk: opts.onPermissionAsk } : {},
           // Anchor every tentacle to the SAME provider/model this run
           // resolved (Desktop's selector, or --provider/--model), instead
           // of the persisted provider.json default the factory falls back
@@ -68930,6 +69301,8 @@ async function buildCouncilToolRegistry(planMode, opts, memoryService, memoryAut
     planMode,
     ...extras?.lspProvider ? { lspProvider: extras.lspProvider } : {},
     permissionPolicy: defaultPermissionPolicy2(),
+    ...opts?.onPermissionAsk ? { onPermissionAsk: opts.onPermissionAsk } : {},
+    ...opts?.onAskUser ? { onAskUser: opts.onAskUser } : {},
     ...memoryService ? { memoryService } : {},
     memoryAutoWrite
   });
@@ -68949,6 +69322,14 @@ async function buildCouncilToolRegistry(planMode, opts, memoryService, memoryAut
   return { toolRegistry, workspaceCtx: realCtx };
 }
 async function runHeadlessCouncil(opts, provider, model, providerStream, extras) {
+  const live = attachHeadlessLiveCancel({ output: opts.output });
+  try {
+    return await runHeadlessCouncilBody(opts, provider, model, providerStream, extras, live.signal);
+  } finally {
+    live.dispose();
+  }
+}
+async function runHeadlessCouncilBody(opts, provider, model, providerStream, extras, signal) {
   const { dispatchCouncil: dispatchCouncil2 } = await Promise.resolve().then(() => (init_councilDispatcher(), councilDispatcher_exports));
   const sessionId2 = crypto.randomUUID();
   const cwd = resolveHeadlessCwd(opts);
@@ -69024,7 +69405,7 @@ async function runHeadlessCouncil(opts, provider, model, providerStream, extras)
   const effectiveTask = buildCouncilTaskWithHistory(opts.task, historySeed);
   if (opts.task) spine.userMessage(effectiveTask);
   let exitCode = 0;
-  const scrub = createStreamScrubber2();
+  const scrub = createStreamScrubber2({ stripQuestion: opts.output !== "json" });
   let lastAssistantText = "";
   let currentAssistantText = "";
   try {
@@ -69059,6 +69440,7 @@ async function runHeadlessCouncil(opts, provider, model, providerStream, extras)
       tools: toolRegistry,
       feedbackStore,
       runMode: councilRunMode,
+      signal,
       // t23: an auto-SELECTED council runs the LITE tier (3 members) unless
       // ZELARI_COUNCIL_TIER / ZELARI_COUNCIL_SIZE explicitly opt into full.
       ...opts.orchestrationDecision?.strategy === "council" && process.env["ZELARI_COUNCIL_TIER"] === void 0 && process.env["ZELARI_COUNCIL_SIZE"] === void 0 ? { councilSize: COUNCIL_TIER_SIZES.lite } : {},
@@ -69117,7 +69499,9 @@ async function runHeadlessCouncil(opts, provider, model, providerStream, extras)
     return 2;
   }
   try {
-    await spine.close(exitCode === 0 ? "completed" : "error");
+    await spine.close(
+      signal.aborted ? "stopped" : exitCode === 0 ? "completed" : "error"
+    );
   } catch {
   }
   try {
@@ -69129,7 +69513,7 @@ async function runHeadlessCouncil(opts, provider, model, providerStream, extras)
         at: (/* @__PURE__ */ new Date()).toISOString(),
         mode: "shadow",
         taskClass: classifyTask2({ prompt: effectiveTask }).taskClass,
-        verdict: exitCode === 0 ? "PASS" : exitCode === 3 ? "FAIL" : "UNKNOWN"
+        verdict: signal.aborted ? "UNKNOWN" : exitCode === 0 ? "PASS" : exitCode === 3 ? "FAIL" : "UNKNOWN"
       });
     }
   } catch {
@@ -69141,14 +69525,14 @@ async function runHeadlessCouncil(opts, provider, model, providerStream, extras)
       if (json3) {
         if (opts.exportSessionPath === "-") process.stdout.write(json3 + "\n");
         else {
-          await fs46.mkdir(path92.dirname(opts.exportSessionPath), { recursive: true }).catch(() => void 0);
+          await fs46.mkdir(path93.dirname(opts.exportSessionPath), { recursive: true }).catch(() => void 0);
           await fs46.writeFile(opts.exportSessionPath, json3, "utf8");
         }
       }
     } catch {
     }
   }
-  if (nativeMemory && memoryAutoWrite && lastAssistantText) {
+  if (nativeMemory && memoryAutoWrite && lastAssistantText && !signal.aborted) {
     try {
       await nativeMemory.remember({
         kind: councilRunMode === "design-phase" ? "decision" : "outcome",
@@ -69175,6 +69559,14 @@ async function runHeadlessCouncil(opts, provider, model, providerStream, extras)
   return exitCode;
 }
 async function runHeadlessZelari(opts, provider, model, providerStream, extras) {
+  const live = attachHeadlessLiveCancel({ output: opts.output });
+  try {
+    return await runHeadlessZelariBody(opts, provider, model, providerStream, extras, live.signal);
+  } finally {
+    live.dispose();
+  }
+}
+async function runHeadlessZelariBody(opts, provider, model, providerStream, extras, signal) {
   const projectRoot = resolveHeadlessCwd(opts);
   const sessionId2 = opts.resumeSessionId ?? crypto.randomUUID();
   const spine = await openHeadlessSpine({
@@ -69285,6 +69677,7 @@ ${JSON.stringify({ deliverable: brief.deliverableThisMission, mvp: brief.sliceMv
       memory,
       emit,
       buildViaAgent,
+      signal,
       onMissionPhase: (phase2, note) => spine.missionPhase(phase2, note),
       onMissionProgress: (advice, iteration) => spine.missionProgress({
         recommendation: advice.recommendation,
@@ -69310,7 +69703,7 @@ ${ragContext}` : slicePrompt;
           let writeCount = 0;
           let chairmanErrored = false;
           let membersCompleted = 0;
-          const scrub = createStreamScrubber2();
+          const scrub = createStreamScrubber2({ stripQuestion: opts.output !== "json" });
           const { composeProjectContext: composeProjectContext3 } = await Promise.resolve().then(() => (init_composeContext(), composeContext_exports));
           const { loadDurableContext: loadDurableContext3 } = await Promise.resolve().then(() => (init_loadDurableContext(), loadDurableContext_exports));
           const memOnly = ragContext?.trim() ? ragContext : void 0;
@@ -69333,6 +69726,7 @@ ${ragContext}` : slicePrompt;
             tools: toolRegistry,
             feedbackStore,
             runMode: effectiveRunMode,
+            signal,
             maxToolCallsChairman: chairmanBudget,
             ...implementerRetry ? { skipSpecialists: true } : {},
             workspaceContext: composed2.workspaceContext,
@@ -69380,11 +69774,20 @@ ${ragContext}` : slicePrompt;
           }
           let completionOk = false;
           let degraded = false;
+          if (signal.aborted) {
+            return {
+              completionOk: false,
+              ran: membersCompleted > 0 || synthesisText.length > 0,
+              synthesisText: synthesisText || void 0,
+              writeCount,
+              degraded: true
+            };
+          }
           try {
             const { detectDegradedRun: detectDegradedRun3 } = await Promise.resolve().then(() => (init_council(), council_exports));
             const d = detectDegradedRun3({
               chairmanErrored,
-              councilAborted: false,
+              councilAborted: signal.aborted,
               luciferWriteCount: writeCount,
               synthesisText,
               runMode: effectiveRunMode
@@ -69451,7 +69854,9 @@ ${ragContext}` : slicePrompt;
         const { registry: agentRegistry } = createBuiltinToolRegistry2({
           root: projectRoot,
           planMode: false,
-          permissionPolicy: defaultPermissionPolicy2()
+          permissionPolicy: defaultPermissionPolicy2(),
+          ...opts.onPermissionAsk ? { onPermissionAsk: opts.onPermissionAsk } : {},
+          ...opts.onAskUser ? { onAskUser: opts.onAskUser } : {}
         });
         await registerHeadlessMcp(agentRegistry, opts);
         const durableState = await loadDurableContext2(projectRoot);
@@ -69518,7 +69923,10 @@ ${ragContext}` : slicePrompt;
       }
     });
     if (state3.status === "error") exitCode = exitCode || 3;
-    else if (state3.status === "success") {
+    else if (state3.status === "cancelled") {
+      exitCode = 0;
+      spine.missionPhase("verification", "mission-cancelled");
+    } else if (state3.status === "success") {
       const missionGate = await evaluateStrictBuildGate("build", {
         emit: (input) => spine.appendEvent(input),
         surface: "mission",
@@ -69556,7 +69964,8 @@ ${ragContext}` : slicePrompt;
     }
     await memory.close().catch(() => void 0);
     try {
-      if (exitCode === 0) await spine.close("completed");
+      if (signal.aborted) await spine.close("stopped");
+      else if (exitCode === 0) await spine.close("completed");
       else await spine.close(exitCode === 2 ? "error" : "stopped");
     } catch {
     }
@@ -69567,7 +69976,7 @@ ${ragContext}` : slicePrompt;
         if (json3) {
           if (opts.exportSessionPath === "-") process.stdout.write(json3 + "\n");
           else {
-            await fs46.mkdir(path92.dirname(opts.exportSessionPath), { recursive: true }).catch(() => void 0);
+            await fs46.mkdir(path93.dirname(opts.exportSessionPath), { recursive: true }).catch(() => void 0);
             await fs46.writeFile(opts.exportSessionPath, json3, "utf8");
           }
         }
@@ -69603,6 +70012,7 @@ var init_runHeadless = __esm({
     init_metrics3();
     init_headlessSpine();
     init_harnessStateEmit();
+    init_liveTurnAbort();
     init_policyGate();
     init_policyLoadMode();
     init_runOneTurn();
@@ -70179,7 +70589,7 @@ function upsertSkill(opts) {
     }
     dir = getProjectSkillsDir(root);
   }
-  const path99 = skillFilePath(dir, name);
+  const path100 = skillFilePath(dir, name);
   const content = serializeSkillMd({
     name,
     description,
@@ -70188,13 +70598,13 @@ function upsertSkill(opts) {
     tools: opts.tools,
     cost: opts.cost
   });
-  const parsed = parseSkillMd(content, path99);
+  const parsed = parseSkillMd(content, path100);
   if (!parsed) {
     return { ok: false, error: "Generated SKILL.md failed validation" };
   }
-  mkdirSync23(dirname13(path99), { recursive: true });
-  writeFileSync25(path99, content, "utf8");
-  return { ok: true, path: path99 };
+  mkdirSync23(dirname13(path100), { recursive: true });
+  writeFileSync25(path100, content, "utf8");
+  return { ok: true, path: path100 };
 }
 function removeSkill(opts) {
   const name = opts.name.trim().toLowerCase();
@@ -70212,8 +70622,8 @@ function removeSkill(opts) {
     dir = getProjectSkillsDir(root);
   }
   const skillDir = join46(dir, name);
-  const path99 = skillFilePath(dir, name);
-  if (!existsSync59(path99) && !existsSync59(skillDir)) {
+  const path100 = skillFilePath(dir, name);
+  if (!existsSync59(path100) && !existsSync59(skillDir)) {
     return { ok: false, error: `Skill "${name}" not found in ${dir}` };
   }
   try {
@@ -70224,7 +70634,7 @@ function removeSkill(opts) {
       error: err instanceof Error ? err.message : String(err)
     };
   }
-  return { ok: true, path: path99 };
+  return { ok: true, path: path100 };
 }
 var NAME_RE, BUILTIN_SKILL_MODULES, builtinsLoaded;
 var init_skillConfigIo = __esm({
@@ -70345,7 +70755,7 @@ var init_jsonApi = __esm({
 });
 
 // src/cli/memory/mcpAdapter.ts
-import * as path93 from "node:path";
+import * as path94 from "node:path";
 var id2, projectId, source, SearchSchema, AddSchema, LinkSchema, RetractSchema, MEMORY_MCP_TOOLS, MemoryMcpAdapter;
 var init_mcpAdapter = __esm({
   "src/cli/memory/mcpAdapter.ts"() {
@@ -70515,8 +70925,8 @@ var init_mcpAdapter = __esm({
         this.takeWrite();
         const externalFile = args.source?.file;
         if (externalFile) {
-          const normalized = path93.normalize(externalFile);
-          if (path93.isAbsolute(normalized) || normalized === ".." || normalized.startsWith(`..${path93.sep}`)) {
+          const normalized = path94.normalize(externalFile);
+          if (path94.isAbsolute(normalized) || normalized === ".." || normalized.startsWith(`..${path94.sep}`)) {
             throw new Error("source.file must be project-relative and cannot escape the project");
           }
         }
@@ -71043,12 +71453,12 @@ function ensureHome() {
   }
 }
 function loadCompanionConfig() {
-  const path99 = getCompanionConfigPath();
-  if (!existsSync60(path99)) {
+  const path100 = getCompanionConfigPath();
+  if (!existsSync60(path100)) {
     return { projects: [] };
   }
   try {
-    const raw = JSON.parse(readFileSync45(path99, "utf8"));
+    const raw = JSON.parse(readFileSync45(path100, "utf8"));
     const projects = Array.isArray(raw.projects) ? raw.projects.filter(
       (p3) => p3 && typeof p3.path === "string" && p3.path.trim() && typeof (p3.id ?? p3.name) === "string"
     ).map((p3) => ({
@@ -71086,16 +71496,16 @@ function loadOrCreateToken(explicit) {
     return { token: explicit.trim(), created: false };
   }
   ensureHome();
-  const path99 = getCompanionTokenPath();
-  if (existsSync60(path99)) {
-    const t = readFileSync45(path99, "utf8").trim();
+  const path100 = getCompanionTokenPath();
+  if (existsSync60(path100)) {
+    const t = readFileSync45(path100, "utf8").trim();
     if (t) return { token: t, created: false };
   }
   const token = randomBytes7(24).toString("base64url");
-  writeFileSync26(path99, token + "\n", "utf8");
+  writeFileSync26(path100, token + "\n", "utf8");
   try {
     const fs48 = __require("node:fs");
-    fs48.chmodSync?.(path99, 384);
+    fs48.chmodSync?.(path100, 384);
   } catch {
   }
   return { token, created: true };
@@ -71120,17 +71530,17 @@ function mergeProjects(cfg, extraPaths) {
     byId.set(p3.id, p3);
   }
   for (const raw of extraPaths) {
-    const path99 = raw.trim();
-    if (!path99) continue;
-    let id3 = slugFromPath(path99);
+    const path100 = raw.trim();
+    if (!path100) continue;
+    let id3 = slugFromPath(path100);
     let n = 2;
-    while (byId.has(id3) && byId.get(id3).path !== path99) {
-      id3 = `${slugFromPath(path99)}-${n++}`;
+    while (byId.has(id3) && byId.get(id3).path !== path100) {
+      id3 = `${slugFromPath(path100)}-${n++}`;
     }
     byId.set(id3, {
       id: id3,
-      name: slugFromPath(path99),
-      path: path99
+      name: slugFromPath(path100),
+      path: path100
     });
   }
   return [...byId.values()];
@@ -71190,38 +71600,61 @@ function applyTurnPermissionPreset(input) {
   process.env[PRESET_ENV] = value;
   return true;
 }
+function isPermissionDecision(value) {
+  return typeof value === "string" && PERMISSION_DECISIONS.includes(value);
+}
 function createServePermissionBridge(write, timeoutMs2 = 12e4) {
   const pending = /* @__PURE__ */ new Map();
   let seq = 0;
-  const settle = (requestId, decision) => {
+  const settle = (requestId, decision, timedOut = false) => {
     const entry = pending.get(requestId);
     if (!entry) return false;
     pending.delete(requestId);
     clearTimeout(entry.timer);
+    write(
+      JSON.stringify({
+        type: "permission.settled",
+        requestId,
+        decision,
+        ...timedOut ? { timedOut: true } : {}
+      })
+    );
     entry.resolve(decision);
     return true;
   };
   return {
     onPermissionAsk(payload) {
       const requestId = `perm-${Date.now()}-${++seq}`;
+      const categories = payload.categories && payload.categories.length > 0 ? payload.categories : payload.category ? payload.category.split(",").map((c) => c.trim()).filter(Boolean) : [];
       return new Promise((resolve9) => {
         const timer = setTimeout(() => {
-          settle(requestId, "deny");
+          settle(requestId, "deny", true);
         }, timeoutMs2);
-        pending.set(requestId, { resolve: resolve9, timer });
+        pending.set(requestId, { resolve: resolve9, timer, payload });
         write(
           JSON.stringify({
             type: "permission.request",
             requestId,
             tool: payload.tool,
             category: payload.category,
+            categories,
             ...payload.inputPreview !== void 0 ? { inputPreview: payload.inputPreview } : {},
             ...payload.reason !== void 0 ? { reason: payload.reason } : {}
           })
         );
       });
     },
-    respond: settle,
+    respond: (requestId, decision) => settle(requestId, decision, false),
+    releaseGranted() {
+      let n = 0;
+      for (const [id3, entry] of [...pending]) {
+        const cats = entry.payload.categories && entry.payload.categories.length > 0 ? entry.payload.categories : entry.payload.category ? entry.payload.category.split(",").map((c) => c.trim()).filter(Boolean) : [];
+        if (isSessionGranted(entry.payload.tool, cats)) {
+          if (settle(id3, "allow", false)) n += 1;
+        }
+      }
+      return n;
+    },
     pendingCount: () => pending.size
   };
 }
@@ -71233,8 +71666,11 @@ function servePermissionRespond(bridge, params) {
   if (typeof requestId !== "string" || requestId.length === 0) {
     return { accepted: false, reason: "permission.respond requires a non-empty string requestId" };
   }
-  if (decision !== "allow" && decision !== "deny") {
-    return { accepted: false, reason: "permission.respond decision must be 'allow' or 'deny'" };
+  if (!isPermissionDecision(decision)) {
+    return {
+      accepted: false,
+      reason: "permission.respond decision must be 'allow' | 'deny' | 'always-tool' | 'always-category'"
+    };
   }
   return { accepted: bridge.respond(requestId, decision) };
 }
@@ -71244,24 +71680,110 @@ function asRegistryAskHandler(bridge) {
     const decision = await bridge.onPermissionAsk({
       tool: req.toolName,
       category: req.categories.join(",") || "other",
+      categories: req.categories,
       reason,
       ...req.claims && req.claims.length > 0 ? { inputPreview: req.claims.map((c) => c.summary).join(" \xB7 ") } : {}
     });
-    return decision === "allow";
+    if (decision === "deny") return false;
+    if (decision === "always-tool") {
+      grantSessionTool(req.toolName);
+      bridge.releaseGranted();
+    } else if (decision === "always-category") {
+      for (const cat of req.categories) {
+        grantSessionCategory(cat);
+      }
+      grantSessionTool(req.toolName);
+      bridge.releaseGranted();
+    }
+    return true;
   };
 }
-var SERVE_PERMISSION_PRESETS, PRESET_ENV;
+var SERVE_PERMISSION_PRESETS, PRESET_ENV, PERMISSION_DECISIONS;
 var init_permissionBridge = __esm({
   "src/cli/serve/permissionBridge.ts"() {
     "use strict";
+    init_toolPermissions();
     SERVE_PERMISSION_PRESETS = ["standard", "strict", "yolo"];
     PRESET_ENV = "ZELARI_PERMISSION_PRESET";
+    PERMISSION_DECISIONS = [
+      "allow",
+      "deny",
+      "always-tool",
+      "always-category"
+    ];
+  }
+});
+
+// src/cli/serve/askUserBridge.ts
+function createServeAskUserBridge(write, timeoutMs2 = askUserTimeoutMs()) {
+  const pending = /* @__PURE__ */ new Map();
+  let seq = 0;
+  const settle = (requestId, answer, timedOut = false) => {
+    const entry = pending.get(requestId);
+    if (!entry) return false;
+    pending.delete(requestId);
+    clearTimeout(entry.timer);
+    write(
+      JSON.stringify({
+        type: "ask_user.settled",
+        requestId,
+        answer,
+        ...timedOut ? { timedOut: true } : {}
+      })
+    );
+    entry.resolve(answer);
+    return true;
+  };
+  return {
+    onAskUser(req) {
+      const question = req.question.trim();
+      const choices = req.choices.map((c) => c.trim()).filter(Boolean);
+      if (choices.length < 2) return Promise.resolve(null);
+      const requestId = `ask-${Date.now()}-${++seq}`;
+      return new Promise((resolve9) => {
+        const timer = setTimeout(() => {
+          settle(requestId, null, true);
+        }, timeoutMs2);
+        pending.set(requestId, { resolve: resolve9, timer });
+        write(
+          JSON.stringify({
+            type: "ask_user.request",
+            requestId,
+            question,
+            choices,
+            ...req.context ? { context: req.context } : {}
+          })
+        );
+      });
+    },
+    respond: (requestId, answer) => settle(requestId, answer, false),
+    pendingCount: () => pending.size
+  };
+}
+function serveAskUserRespond(bridge, params) {
+  if (!params || typeof params !== "object") {
+    return { accepted: false, reason: "ask_user.respond requires an object params" };
+  }
+  const { requestId, answer } = params;
+  if (typeof requestId !== "string" || requestId.length === 0) {
+    return { accepted: false, reason: "ask_user.respond requires a non-empty string requestId" };
+  }
+  if (answer !== null && typeof answer !== "string") {
+    return { accepted: false, reason: "ask_user.respond answer must be a string or null" };
+  }
+  const text = typeof answer === "string" ? answer.trim() : null;
+  return { accepted: bridge.respond(requestId, text && text.length > 0 ? text : null) };
+}
+var init_askUserBridge = __esm({
+  "src/cli/serve/askUserBridge.ts"() {
+    "use strict";
+    init_askUserTimeout();
   }
 });
 
 // src/cli/serve/spineLockSweep.ts
 import { promises as fs47 } from "node:fs";
-import path94 from "node:path";
+import path95 from "node:path";
 async function sweepOrphanSpineLocks(sessionsDir2, options = {}) {
   const dir = sessionsDir2 ?? resolveSessionsDir();
   const onSwept = options.onSwept ?? ((sessionId2, reason) => {
@@ -71279,7 +71801,7 @@ async function sweepOrphanSpineLocks(sessionsDir2, options = {}) {
     return result;
   }
   for (const sessionId2 of entries) {
-    const lockPath2 = path94.join(dir, sessionId2, "writer.lock");
+    const lockPath2 = path95.join(dir, sessionId2, "writer.lock");
     try {
       const raw = await fs47.readFile(lockPath2, "utf-8");
       let lockInfo = {};
@@ -71372,7 +71894,7 @@ function resolveTurnLspProvider(services) {
   const candidate = services?.lspManager;
   return candidate instanceof LspManager ? candidate : void 0;
 }
-function createCliRunTurn(onPermissionAsk) {
+function createCliRunTurn(onPermissionAsk, onAskUser) {
   let streamPromise = null;
   const ensureStream = () => {
     if (!streamPromise) {
@@ -71399,6 +71921,7 @@ function createCliRunTurn(onPermissionAsk) {
     const { provider, model, stream } = await ensureStream();
     const opts = bindHarnessTurnOptions(input, deps.session.workspaceRoot);
     if (onPermissionAsk) opts.onPermissionAsk = onPermissionAsk;
+    if (onAskUser) opts.onAskUser = onAskUser;
     applyTurnPermissionPreset(input);
     const lspProvider = resolveTurnLspProvider(deps.services);
     const exitCode = await dispatchHeadlessTurn(
@@ -71434,6 +71957,7 @@ function startHarnessServer(options = {}) {
     write(JSON.stringify(envelope));
   };
   const permissionBridge = createServePermissionBridge(write);
+  const askUserBridge = createServeAskUserBridge(write);
   const dispatch = async (req) => {
     if (typeof req.method !== "string") {
       return { id: req.id ?? null, ok: false, error: { code: "bad_request", message: "missing method" } };
@@ -71447,11 +71971,21 @@ function startHarnessServer(options = {}) {
           result: servePermissionRespond(permissionBridge, params)
         };
       }
+      case "ask_user.respond": {
+        return {
+          id: req.id ?? null,
+          ok: true,
+          result: serveAskUserRespond(askUserBridge, params)
+        };
+      }
       case "session.create": {
         const root = typeof params.workspaceRoot === "string" ? params.workspaceRoot : process.cwd();
         const session = server.createSession({
           workspaceRoot: root,
-          runTurn: options.runTurn ?? createCliRunTurn(asRegistryAskHandler(permissionBridge))
+          runTurn: options.runTurn ?? createCliRunTurn(
+            asRegistryAskHandler(permissionBridge),
+            askUserBridge.onAskUser
+          )
         });
         return { id: req.id ?? null, ok: true, result: { sessionId: session.id, workspaceRoot: session.workspaceRoot } };
       }
@@ -71605,6 +72139,7 @@ var init_harnessServer = __esm({
     init_policyGate();
     init_policyLoadMode();
     init_permissionBridge();
+    init_askUserBridge();
     init_spineLockSweep();
   }
 });
@@ -72263,9 +72798,9 @@ async function runCompanionServe(opts = {}) {
       return;
     }
     const url2 = parseUrl(req);
-    const path99 = url2.pathname.replace(/\/+$/, "") || "/";
+    const path100 = url2.pathname.replace(/\/+$/, "") || "/";
     try {
-      if (req.method === "GET" && (path99 === "/health" || path99 === "/v1/health")) {
+      if (req.method === "GET" && (path100 === "/health" || path100 === "/v1/health")) {
         sendJson2(res, 200, {
           ok: true,
           service: "zelari-companion",
@@ -72277,18 +72812,18 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      if (path99.startsWith("/v1")) {
+      if (path100.startsWith("/v1")) {
         if (!tokenMatches(token, getBearer(req))) {
           sendJson2(res, 401, { ok: false, error: "unauthorized" });
           return;
         }
       }
-      if (req.method === "GET" && path99 === "/v1/config") {
+      if (req.method === "GET" && path100 === "/v1/config") {
         const snap = buildDesktopConfigSnapshot();
         sendJson2(res, 200, { ok: true, ...snap });
         return;
       }
-      if (req.method === "GET" && path99 === "/v1/projects") {
+      if (req.method === "GET" && path100 === "/v1/projects") {
         sendJson2(res, 200, {
           ok: true,
           projects: projects.map((p3) => ({
@@ -72299,7 +72834,7 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      if (req.method === "GET" && path99 === "/v1/runs") {
+      if (req.method === "GET" && path100 === "/v1/runs") {
         sendJson2(res, 200, {
           ok: true,
           active: runs.getActive(),
@@ -72317,7 +72852,7 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      if (req.method === "POST" && path99 === "/v1/runs") {
+      if (req.method === "POST" && path100 === "/v1/runs") {
         const raw = await readBody(req);
         let body = {};
         try {
@@ -72365,7 +72900,7 @@ async function runCompanionServe(opts = {}) {
         });
         return;
       }
-      const eventsMatch = /^\/v1\/runs\/([^/]+)\/events$/.exec(path99);
+      const eventsMatch = /^\/v1\/runs\/([^/]+)\/events$/.exec(path100);
       if (req.method === "GET" && eventsMatch) {
         const runId = eventsMatch[1];
         const run = runs.getRun(runId);
@@ -72430,7 +72965,7 @@ async function runCompanionServe(opts = {}) {
         }, 500);
         return;
       }
-      const cancelMatch = /^\/v1\/runs\/([^/]+)\/cancel$/.exec(path99);
+      const cancelMatch = /^\/v1\/runs\/([^/]+)\/cancel$/.exec(path100);
       if (req.method === "POST" && cancelMatch) {
         const runId = cancelMatch[1];
         const result = runs.cancel(runId);
@@ -72441,7 +72976,7 @@ async function runCompanionServe(opts = {}) {
         sendJson2(res, 200, { ok: true, cancelled: runId });
         return;
       }
-      const steerMatch = /^\/v1\/runs\/([^/]+)\/steer$/.exec(path99);
+      const steerMatch = /^\/v1\/runs\/([^/]+)\/steer$/.exec(path100);
       if (req.method === "POST" && steerMatch) {
         const runId = steerMatch[1];
         const raw = await readBody(req);
@@ -72610,11 +73145,11 @@ import { execSync as execSync2 } from "node:child_process";
 import { existsSync as existsSync62, readFileSync as readFileSync46, readlinkSync, statSync as statSync10 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import path95 from "node:path";
+import path96 from "node:path";
 function findPackageRoot(start) {
   let dir = start;
   for (let i = 0; i < 6; i += 1) {
-    const candidate = path95.join(dir, "package.json");
+    const candidate = path96.join(dir, "package.json");
     if (existsSync62(candidate)) {
       try {
         const pkg = JSON.parse(readFileSync46(candidate, "utf8"));
@@ -72622,11 +73157,11 @@ function findPackageRoot(start) {
       } catch {
       }
     }
-    const parent = path95.dirname(dir);
+    const parent = path96.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
-  return path95.resolve(__dirname3, "..", "..", "..");
+  return path96.resolve(__dirname3, "..", "..", "..");
 }
 function tryExec(cmd) {
   try {
@@ -72640,14 +73175,19 @@ function tryExec(cmd) {
 }
 function readPackageJson4() {
   try {
-    const pkgPath = path95.join(packageRoot, "package.json");
+    const pkgPath = path96.join(packageRoot, "package.json");
     return JSON.parse(readFileSync46(pkgPath, "utf8"));
   } catch {
     return null;
   }
 }
 function getGlobalPrefix() {
-  return (process.env.npm_config_prefix || process.env.NPM_CONFIG_PREFIX || "").trim() || tryExec("npm prefix -g");
+  const fromNpm = tryExec("npm prefix -g");
+  if (fromNpm) return fromNpm;
+  return (process.env.npm_config_prefix || process.env.NPM_CONFIG_PREFIX || "").trim();
+}
+function isSourceCheckout() {
+  return existsSync62(path96.join(packageRoot, "src", "cli", "main.ts")) && existsSync62(path96.join(packageRoot, "apps", "desktop", "package.json"));
 }
 function checkShim(pkgName) {
   const prefix = getGlobalPrefix();
@@ -72656,8 +73196,16 @@ function checkShim(pkgName) {
   }
   const isWin = process.platform === "win32";
   const shimName = isWin ? "zelari-code.cmd" : "zelari-code";
-  const shimPath = path95.join(prefix, shimName);
+  const shimPath = path96.join(prefix, shimName);
   if (!existsSync62(shimPath)) {
+    const localBin = path96.join(packageRoot, "bin", "zelari-code.js");
+    if (isSourceCheckout() && existsSync62(localBin)) {
+      return WARN(
+        `global shim not found at ${shimPath}
+         source checkout \u2014 using ${localBin}
+         optional: npm install -g ${pkgName}@latest --force`
+      );
+    }
     return FAIL(
       `shim not found at ${shimPath}
          fix:  npm install -g ${pkgName}@latest --force`
@@ -72684,8 +73232,8 @@ function checkShim(pkgName) {
          fix:  npm install -g ${pkgName}@latest --force`
       );
     }
-    const resolved = path95.resolve(path95.dirname(shimPath), target);
-    const expected = path95.join(
+    const resolved = path96.resolve(path96.dirname(shimPath), target);
+    const expected = path96.join(
       prefix,
       "node_modules",
       pkgName,
@@ -72727,7 +73275,7 @@ function checkNode(pkg) {
   return OK(`node ${raw} (engines.node ${enginesNode ?? ">= 20.0.0"})`);
 }
 function checkBundle() {
-  const bundle = path95.join(packageRoot, "dist", "cli", "main.bundled.js");
+  const bundle = path96.join(packageRoot, "dist", "cli", "main.bundled.js");
   if (!existsSync62(bundle)) {
     return FAIL(
       `dist/cli/main.bundled.js missing at ${bundle}
@@ -72748,7 +73296,7 @@ function checkRuntimeDeps() {
   const missing = [];
   for (const dep of required2) {
     try {
-      const localReq = createRequire3(path95.join(packageRoot, "package.json"));
+      const localReq = createRequire3(path96.join(packageRoot, "package.json"));
       localReq.resolve(dep);
     } catch {
       missing.push(dep);
@@ -73025,7 +73573,7 @@ var init_doctor = __esm({
     init_metrics3();
     init_contextGrowthSummary();
     require3 = createRequire3(import.meta.url);
-    __dirname3 = path95.dirname(fileURLToPath3(import.meta.url));
+    __dirname3 = path96.dirname(fileURLToPath3(import.meta.url));
     packageRoot = findPackageRoot(__dirname3);
     OK = (message) => ({
       ok: true,
@@ -73052,16 +73600,15 @@ __export(fixPath_exports, {
 });
 import { spawnSync as spawnSync3 } from "node:child_process";
 function getGlobalPrefix2() {
-  return (process.env.npm_config_prefix || process.env.NPM_CONFIG_PREFIX || "").trim() || (() => {
-    try {
-      return spawnSync3("npm", ["prefix", "-g"], {
-        encoding: "utf8",
-        stdio: ["ignore", "pipe", "ignore"]
-      }).stdout?.trim() ?? "";
-    } catch {
-      return "";
-    }
-  })();
+  try {
+    const fromNpm = spawnSync3("npm", ["prefix", "-g"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    }).stdout?.trim() ?? "";
+    if (fromNpm) return fromNpm;
+  } catch {
+  }
+  return (process.env.npm_config_prefix || process.env.NPM_CONFIG_PREFIX || "").trim();
 }
 function powershell(script) {
   try {
@@ -73135,7 +73682,7 @@ __export(userSettings_exports, {
   settingsOverrides: () => settingsOverrides
 });
 import { existsSync as existsSync63, readFileSync as readFileSync47 } from "node:fs";
-import path96 from "node:path";
+import path97 from "node:path";
 function parseBool(raw) {
   const v = raw.trim().toLowerCase();
   if (["1", "true", "yes", "on"].includes(v)) return true;
@@ -73202,8 +73749,8 @@ function envValueFor(key, env) {
 function resolveUserSettings(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
   const env = opts.env ?? process.env;
-  const userPath = path96.join(zelariHome(), SETTINGS_FILE_NAME);
-  const projectPath = path96.join(cwd, ".zelari", SETTINGS_FILE_NAME);
+  const userPath = path97.join(zelariHome(), SETTINGS_FILE_NAME);
+  const projectPath = path97.join(cwd, ".zelari", SETTINGS_FILE_NAME);
   const warnings = [];
   const userLayer = loadFileLayer(userPath, "user", warnings);
   const projectLayer = loadFileLayer(projectPath, "project", warnings);
@@ -73417,7 +73964,7 @@ __export(inspectSession_exports, {
   renderInspectReport: () => renderInspectReport,
   runInspectSession: () => runInspectSession
 });
-import path97 from "node:path";
+import path98 from "node:path";
 import { existsSync as existsSync64 } from "node:fs";
 function formatLimit(limit) {
   return `${Math.round(limit / 1e3)}k`;
@@ -73451,8 +73998,8 @@ function renderInspectReport(state3) {
 }
 async function runInspectSession(opts) {
   const sessionsDir2 = resolveSessionsDir({ workspaceRoot: opts.cwd ?? process.cwd() });
-  const sessionDir = path97.join(sessionsDir2, opts.sessionId);
-  const eventsPath = path97.join(sessionDir, "events.jsonl");
+  const sessionDir = path98.join(sessionsDir2, opts.sessionId);
+  const eventsPath = path98.join(sessionDir, "events.jsonl");
   if (!existsSync64(sessionDir)) {
     console.error(`zelari-code inspect: no session directory at ${sessionDir}`);
     return 1;
@@ -73486,14 +74033,14 @@ __export(inspect_exports, {
   collectInspectReport: () => collectInspectReport,
   runInspect: () => runInspect
 });
-import path98 from "node:path";
+import path99 from "node:path";
 import { existsSync as existsSync65, readFileSync as readFileSync48, readdirSync as readdirSync13 } from "node:fs";
 async function collectInspectReport(cwd = process.cwd()) {
   ensureBuiltinSkillsLoadedSync();
   const snap = listSkillsSnapshot(cwd);
   const mcp = listMcpServers(cwd);
-  const userMcpPath = path98.join(zelariHome(), "mcp.json");
-  const projectMcpPath = path98.join(cwd, ".zelari", "mcp.json");
+  const userMcpPath = path99.join(zelariHome(), "mcp.json");
+  const projectMcpPath = path99.join(cwd, ".zelari", "mcp.json");
   const globalHooks = globalHooksDir();
   const projectHooks = projectHooksDir(cwd);
   const projectTrusted = isFolderTrusted(cwd);
@@ -73521,9 +74068,9 @@ async function collectInspectReport(cwd = process.cwd()) {
     configSources: [
       { path: userMcpPath, exists: existsSync65(userMcpPath) },
       { path: projectMcpPath, exists: existsSync65(projectMcpPath) },
-      { path: path98.join(zelariHome(), "provider.json"), exists: existsSync65(path98.join(zelariHome(), "provider.json")) },
-      { path: path98.join(cwd, ".zelari", "AGENTS.md"), exists: existsSync65(path98.join(cwd, ".zelari", "AGENTS.md")) },
-      { path: path98.join(cwd, "AGENTS.md"), exists: existsSync65(path98.join(cwd, "AGENTS.md")) }
+      { path: path99.join(zelariHome(), "provider.json"), exists: existsSync65(path99.join(zelariHome(), "provider.json")) },
+      { path: path99.join(cwd, ".zelari", "AGENTS.md"), exists: existsSync65(path99.join(cwd, ".zelari", "AGENTS.md")) },
+      { path: path99.join(cwd, "AGENTS.md"), exists: existsSync65(path99.join(cwd, "AGENTS.md")) }
     ],
     skills: {
       total: snap.skills.length,
@@ -73563,8 +74110,8 @@ function listJsonFiles(dir) {
 }
 function findAgentsMd(cwd) {
   const candidates = [
-    path98.join(cwd, "AGENTS.md"),
-    path98.join(cwd, ".zelari", "AGENTS.md")
+    path99.join(cwd, "AGENTS.md"),
+    path99.join(cwd, ".zelari", "AGENTS.md")
   ];
   const found = [];
   for (const c of candidates) {
@@ -76700,22 +77247,7 @@ init_spineTelemetry();
 
 // src/cli/hooks/permissionPicker.ts
 init_toolPermissions();
-
-// src/cli/hooks/askUserTimeout.ts
-function askUserTimeoutMs() {
-  const raw = process.env.ZELARI_ASK_USER_TIMEOUT_MS?.trim();
-  if (!raw) return 3e5;
-  const n = Number.parseInt(raw, 10);
-  if (!Number.isFinite(n) || n < 0) return 3e5;
-  return n;
-}
-function armPickerTimeout(onFire, ms) {
-  if (ms <= 0) return () => void 0;
-  const id3 = setTimeout(onFire, ms);
-  return () => clearTimeout(id3);
-}
-
-// src/cli/hooks/permissionPicker.ts
+init_askUserTimeout();
 function createPermissionAskHandler(opts) {
   const { setPicker: setPicker2, appendSystem: appendSystem2 } = opts;
   return (req) => new Promise((resolve9) => {
@@ -76808,6 +77340,7 @@ ${detail}${note}${claimsBlock}
 }
 
 // src/cli/hooks/useChatTurn.ts
+init_askUserTimeout();
 init_toolPermissions();
 init_skills2();
 init_fileStateStore();
@@ -78737,6 +79270,7 @@ init_permissionBroker();
 init_brokerHandlers();
 import { useEffect as useEffect5, useRef as useRef5 } from "react";
 init_messageHelpers();
+init_askUserTimeout();
 function usePermissionBroker(opts) {
   const { setPicker: setPicker2, setMessages } = opts;
   const handleRef = useRef5(null);
@@ -78832,10 +79366,10 @@ init_ledger();
 
 // src/cli/evolution/proposals.ts
 import { existsSync as existsSync51, readFileSync as readFileSync39 } from "node:fs";
-import path76 from "node:path";
-var PROPOSALS_REL = path76.join(".zelari", "evolution", "proposals.jsonl");
+import path77 from "node:path";
+var PROPOSALS_REL = path77.join(".zelari", "evolution", "proposals.jsonl");
 function proposalsPath(cwd) {
-  return path76.join(cwd, PROPOSALS_REL);
+  return path77.join(cwd, PROPOSALS_REL);
 }
 function readProposalStore(cwd) {
   const file2 = proposalsPath(cwd);
@@ -79927,11 +80461,11 @@ function handleCacheStats(ctx) {
 init_messageHelpers();
 init_serviceFactory();
 import { promises as fs35 } from "node:fs";
-import * as path78 from "node:path";
+import * as path79 from "node:path";
 
 // src/cli/memory/promotion.ts
 import { promises as fs34 } from "node:fs";
-import * as path77 from "node:path";
+import * as path78 from "node:path";
 var START = "<!-- zelari:memory-promotions:start -->";
 var END = "<!-- zelari:memory-promotions:end -->";
 var DURABLE_KINDS = /* @__PURE__ */ new Set(["fact", "decision", "constraint", "preference", "procedure"]);
@@ -79942,16 +80476,16 @@ function lineFor(node) {
 }
 async function promoteMemoryToAgentsMd(projectRoot, node) {
   if (node.status !== "active") {
-    return { added: false, path: path77.join(projectRoot, "AGENTS.md"), reason: `memory is ${node.status}` };
+    return { added: false, path: path78.join(projectRoot, "AGENTS.md"), reason: `memory is ${node.status}` };
   }
   if (!DURABLE_KINDS.has(node.kind)) {
-    return { added: false, path: path77.join(projectRoot, "AGENTS.md"), reason: `${node.kind} is not a durable instruction kind` };
+    return { added: false, path: path78.join(projectRoot, "AGENTS.md"), reason: `${node.kind} is not a durable instruction kind` };
   }
-  const root = await fs34.realpath(projectRoot).catch(() => path77.resolve(projectRoot));
-  const target = path77.join(root, "AGENTS.md");
+  const root = await fs34.realpath(projectRoot).catch(() => path78.resolve(projectRoot));
+  const target = path78.join(root, "AGENTS.md");
   try {
-    const stat7 = await fs34.lstat(target);
-    if (stat7.isSymbolicLink() || !stat7.isFile()) throw new Error("AGENTS.md must be a regular project file.");
+    const stat8 = await fs34.lstat(target);
+    if (stat8.isSymbolicLink() || !stat8.isFile()) throw new Error("AGENTS.md must be a regular project file.");
   } catch (error51) {
     if (error51.code !== "ENOENT") throw error51;
   }
@@ -80013,25 +80547,25 @@ function sourceLine(source2) {
   return entries.length ? entries.map(([key, value]) => `${key}=${value}`).join(" \xB7 ") : "unknown";
 }
 function isInside(root, target) {
-  const relative6 = path78.relative(root, target);
-  return relative6 === "" || !relative6.startsWith("..") && !path78.isAbsolute(relative6);
+  const relative6 = path79.relative(root, target);
+  return relative6 === "" || !relative6.startsWith("..") && !path79.isAbsolute(relative6);
 }
 async function safeExportPath(cwd, requested) {
-  const lexicalRoot = path78.resolve(cwd);
+  const lexicalRoot = path79.resolve(cwd);
   const root = await fs35.realpath(lexicalRoot).catch(() => lexicalRoot);
-  const fallback = path78.join(root, ".zelari", "memory", `export-${Date.now()}.json`);
-  const target = requested?.trim() ? path78.resolve(root, requested.trim()) : fallback;
+  const fallback = path79.join(root, ".zelari", "memory", `export-${Date.now()}.json`);
+  const target = requested?.trim() ? path79.resolve(root, requested.trim()) : fallback;
   if (!isInside(root, target)) {
     throw new Error("Export path must stay inside the active project.");
   }
-  const parent = path78.dirname(target);
-  const relativeParent = path78.relative(root, parent);
+  const parent = path79.dirname(target);
+  const relativeParent = path79.relative(root, parent);
   let cursor = root;
-  for (const segment of relativeParent.split(path78.sep).filter(Boolean)) {
-    cursor = path78.join(cursor, segment);
+  for (const segment of relativeParent.split(path79.sep).filter(Boolean)) {
+    cursor = path79.join(cursor, segment);
     try {
-      const stat7 = await fs35.lstat(cursor);
-      if (stat7.isSymbolicLink()) {
+      const stat8 = await fs35.lstat(cursor);
+      if (stat8.isSymbolicLink()) {
         throw new Error("Export path must not traverse a symbolic link.");
       }
     } catch (error51) {
@@ -80200,9 +80734,9 @@ ${message}` : message
       }
       case "export": {
         const target = await safeExportPath(ctx.cwd, args.join(" ").trim() || void 0);
-        await fs35.mkdir(path78.dirname(target), { recursive: true });
-        const root = await fs35.realpath(ctx.cwd).catch(() => path78.resolve(ctx.cwd));
-        const realParent = await fs35.realpath(path78.dirname(target));
+        await fs35.mkdir(path79.dirname(target), { recursive: true });
+        const root = await fs35.realpath(ctx.cwd).catch(() => path79.resolve(ctx.cwd));
+        const realParent = await fs35.realpath(path79.dirname(target));
         if (!isInside(root, realParent)) {
           throw new Error("Export path resolves outside the active project.");
         }
@@ -80417,7 +80951,7 @@ import { promises as fs37 } from "node:fs";
 init_zod();
 init_taskTool();
 import { promises as fs36 } from "node:fs";
-import path79 from "node:path";
+import path80 from "node:path";
 import { randomBytes as randomBytes6 } from "node:crypto";
 var CsvFanoutArgsSchema = external_exports.object({
   csv_path: external_exports.string().min(1),
@@ -80511,8 +81045,8 @@ function resolveMaxConcurrency(env = process.env) {
 }
 async function runCsvFanout(args, deps, opts) {
   const start = Date.now();
-  const absCsv = path79.isAbsolute(args.csv_path) ? args.csv_path : path79.join(opts.parentCwd, args.csv_path);
-  const absOut = path79.isAbsolute(args.output_csv_path) ? args.output_csv_path : path79.join(opts.parentCwd, args.output_csv_path);
+  const absCsv = path80.isAbsolute(args.csv_path) ? args.csv_path : path80.join(opts.parentCwd, args.csv_path);
+  const absOut = path80.isAbsolute(args.output_csv_path) ? args.output_csv_path : path80.join(opts.parentCwd, args.output_csv_path);
   const { headers: headers2, rows } = await readCsv(absCsv);
   if (headers2.length === 0) {
     throw new Error(`kraken_csv_fanout: ${absCsv} is empty`);
@@ -80568,7 +81102,7 @@ async function runCsvFanout(args, deps, opts) {
         errored += 1;
         errors.push(`${row[args.id_column] ?? i}: ${res.error}`);
       }
-      await fs36.mkdir(path79.dirname(absOut), { recursive: true });
+      await fs36.mkdir(path80.dirname(absOut), { recursive: true });
       await queueWrite(serializeCsv(outHeaders, outputRecords));
     }
   }
@@ -80763,7 +81297,7 @@ function splitArgs(s) {
 // src/cli/slashHandlers/krakenWorkbench.ts
 init_messageHelpers();
 import { promises as fs38 } from "node:fs";
-import path80 from "node:path";
+import path81 from "node:path";
 
 // src/cli/kraken/workbenchView.ts
 var EMPTY = {
@@ -80880,17 +81414,17 @@ function formatWorkbenchForTerminal(p3) {
 
 // src/cli/slashHandlers/krakenWorkbench.ts
 async function handleKrakenWorkbench(ctx) {
-  const dir = path80.join(ctx.cwd, ".zelari", "radio");
+  const dir = path81.join(ctx.cwd, ".zelari", "radio");
   let latest = null;
   let latestMtime = 0;
   try {
     const files = await fs38.readdir(dir);
     for (const f of files) {
       if (!f.startsWith("workbench-") || !f.endsWith(".md")) continue;
-      const full = path80.join(dir, f);
-      const stat7 = await fs38.stat(full);
-      if (stat7.mtimeMs > latestMtime) {
-        latestMtime = stat7.mtimeMs;
+      const full = path81.join(dir, f);
+      const stat8 = await fs38.stat(full);
+      if (stat8.mtimeMs > latestMtime) {
+        latestMtime = stat8.mtimeMs;
         latest = full;
       }
     }
@@ -80904,10 +81438,10 @@ async function handleKrakenWorkbench(ctx) {
   const parsed = parseWorkbench(content);
   const rendered = formatWorkbenchForTerminal(parsed);
   if (!rendered.trim()) {
-    appendSystem(ctx.setMessages, `[kraken workbench] ${path80.basename(latest)}: (no nodes / no events yet)`);
+    appendSystem(ctx.setMessages, `[kraken workbench] ${path81.basename(latest)}: (no nodes / no events yet)`);
     return;
   }
-  appendSystem(ctx.setMessages, `[kraken workbench] ${path80.basename(latest)}:
+  appendSystem(ctx.setMessages, `[kraken workbench] ${path81.basename(latest)}:
 ${rendered}`);
 }
 
@@ -81215,14 +81749,14 @@ ${result.output.split("\n").slice(-8).join("\n")}` : "";
 init_messageHelpers();
 init_paths();
 import { promises as fs39 } from "node:fs";
-import path83 from "node:path";
+import path84 from "node:path";
 async function handlePromoteMember(ctx, memberId) {
   try {
     const { promoteMember: promoteMember2 } = await Promise.resolve().then(() => (init_council(), council_exports));
     const { skill, markdown } = promoteMember2(memberId);
     const skillDir = skillsDir();
     await fs39.mkdir(skillDir, { recursive: true });
-    const filePath = path83.join(skillDir, `${skill.id}.md`);
+    const filePath = path84.join(skillDir, `${skill.id}.md`);
     const previous = await fs39.readFile(filePath, "utf8").catch(() => null);
     const { createHash: createHash24 } = await import("node:crypto");
     const sha = (s) => createHash24("sha256").update(s, "utf8").digest("hex");
@@ -81248,7 +81782,7 @@ ${lineage}
 // src/cli/branchManager.ts
 init_paths();
 import { promises as fs40, existsSync as existsSync55, readFileSync as readFileSync41, writeFileSync as writeFileSync24, mkdirSync as mkdirSync21, statSync as statSync7, rmSync as rmSync3 } from "node:fs";
-import path84 from "node:path";
+import path85 from "node:path";
 var META_FILENAME = "meta.json";
 var SESSIONS_SUBDIR = "sessions";
 function getBranchesBaseDir() {
@@ -81258,13 +81792,13 @@ function getSessionsBaseDir() {
   return sessionsDir();
 }
 function branchPathFor(name, baseDir) {
-  return path84.join(baseDir, name);
+  return path85.join(baseDir, name);
 }
 function metaPathFor(name, baseDir) {
-  return path84.join(baseDir, name, META_FILENAME);
+  return path85.join(baseDir, name, META_FILENAME);
 }
 function sessionsPathFor(name, baseDir) {
-  return path84.join(baseDir, name, SESSIONS_SUBDIR);
+  return path85.join(baseDir, name, SESSIONS_SUBDIR);
 }
 function readBranchMeta(name, baseDir) {
   const metaPath = metaPathFor(name, baseDir);
@@ -81289,7 +81823,7 @@ function readBranchMeta(name, baseDir) {
 }
 function writeBranchMeta(name, baseDir, meta3) {
   const metaPath = metaPathFor(name, baseDir);
-  mkdirSync21(path84.dirname(metaPath), { recursive: true });
+  mkdirSync21(path85.dirname(metaPath), { recursive: true });
   writeFileSync24(metaPath, JSON.stringify(meta3, null, 2), "utf-8");
 }
 async function countSessions(name, baseDir) {
@@ -81340,14 +81874,14 @@ async function createBranch(name, fromSessionId, baseDir = getBranchesBaseDir(),
   if (branchExists(name, baseDir)) {
     throw new BranchAlreadyExistsError(name);
   }
-  const sourcePath = path84.join(sessionsBaseDir, `${fromSessionId}.jsonl`);
+  const sourcePath = path85.join(sessionsBaseDir, `${fromSessionId}.jsonl`);
   if (!existsSync55(sourcePath)) {
     throw new SessionNotFoundError(`Source session "${fromSessionId}" not found at ${sourcePath}`);
   }
   const branchPath = branchPathFor(name, baseDir);
   const branchSessionsPath = sessionsPathFor(name, baseDir);
   mkdirSync21(branchSessionsPath, { recursive: true });
-  const destPath = path84.join(branchSessionsPath, `${fromSessionId}.jsonl`);
+  const destPath = path85.join(branchSessionsPath, `${fromSessionId}.jsonl`);
   await fs40.copyFile(sourcePath, destPath);
   const meta3 = {
     name,
@@ -81451,14 +81985,14 @@ async function handleBranchCheckout(ctx, branchName) {
 // src/cli/slashHandlers/workspace.ts
 init_messageHelpers();
 import { promises as fs41 } from "node:fs";
-import path85 from "node:path";
+import path86 from "node:path";
 async function handleWorkspaceShow(ctx, what) {
   try {
-    const zelari = path85.join(process.cwd(), ".zelari");
+    const zelari = path86.join(process.cwd(), ".zelari");
     let content;
     switch (what) {
       case "plan": {
-        const planPath = path85.join(zelari, "plan.md");
+        const planPath = path86.join(zelari, "plan.md");
         try {
           content = await fs41.readFile(planPath, "utf-8");
         } catch {
@@ -81467,7 +82001,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "decisions": {
-        const decisionsDir = path85.join(zelari, "decisions");
+        const decisionsDir = path86.join(zelari, "decisions");
         try {
           const files = (await fs41.readdir(decisionsDir)).filter((f) => f.endsWith(".md")).sort();
           if (files.length === 0) {
@@ -81477,7 +82011,7 @@ async function handleWorkspaceShow(ctx, what) {
 `];
             const { parseFrontmatter: parseFrontmatter2 } = await Promise.resolve().then(() => (init_storage(), storage_exports));
             for (const f of files) {
-              const raw = await fs41.readFile(path85.join(decisionsDir, f), "utf-8");
+              const raw = await fs41.readFile(path86.join(decisionsDir, f), "utf-8");
               const { meta: meta3, body } = parseFrontmatter2(raw);
               const title = meta3.title ?? body.split("\n")[0]?.replace(/^#\s*/, "").trim() ?? f;
               lines.push(`- **${f.replace(/\.md$/, "")}** [${meta3.status ?? "unknown"}] ${title}`);
@@ -81490,7 +82024,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "risks": {
-        const risksPath = path85.join(zelari, "risks.md");
+        const risksPath = path86.join(zelari, "risks.md");
         try {
           content = await fs41.readFile(risksPath, "utf-8");
         } catch {
@@ -81499,7 +82033,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "agents": {
-        const agentsPath = path85.join(process.cwd(), "AGENTS.MD");
+        const agentsPath = path86.join(process.cwd(), "AGENTS.MD");
         try {
           content = await fs41.readFile(agentsPath, "utf-8");
         } catch {
@@ -81508,7 +82042,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "docs": {
-        const docsDir = path85.join(zelari, "docs");
+        const docsDir = path86.join(zelari, "docs");
         try {
           const files = (await fs41.readdir(docsDir)).filter((f) => f.endsWith(".md")).sort();
           content = files.length ? `# Docs (${files.length})
@@ -81550,7 +82084,7 @@ async function handleWorkspaceReset(ctx, force) {
     return;
   }
   try {
-    const target = path85.join(process.cwd(), ".zelari");
+    const target = path86.join(process.cwd(), ".zelari");
     await fs41.rm(target, { recursive: true, force: true });
     appendSystem(ctx.setMessages, "[workspace] .zelari/ removed");
   } catch (err) {
@@ -83433,8 +83967,8 @@ function normalizeDraft(raw, sourceUrl, provider, model) {
   let name = String(o.name ?? "").trim().toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64);
   if (!name || !/^[a-z0-9][a-z0-9-]{0,63}$/.test(name)) {
     try {
-      const path99 = new URL(sourceUrl).pathname.split("/").filter(Boolean).pop()?.replace(/\.[a-z0-9]+$/i, "").toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
-      name = path99 && /^[a-z0-9]/.test(path99) ? path99 : "imported-skill";
+      const path100 = new URL(sourceUrl).pathname.split("/").filter(Boolean).pop()?.replace(/\.[a-z0-9]+$/i, "").toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48);
+      name = path100 && /^[a-z0-9]/.test(path100) ? path100 : "imported-skill";
     } catch {
       name = "imported-skill";
     }