zelari-code 2.34.0 → 2.34.1

package/dist/cli/main.bundled.js

@@ -28372,6 +28372,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 +28798,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.`;
@@ -29562,7 +29693,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;
@@ -32128,101 +32259,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 +32597,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 +32634,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 +32643,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 +32677,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 +32697,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 +32707,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 +32738,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 +32772,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 +32800,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 +32829,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 +32873,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 +32907,7 @@ var init_chairmanDelivery = __esm({
     init_runChecks();
     init_inlineJsAutofix();
     init_retryTurn();
+    init_cancel();
     MAX_DELIVERY_ATTEMPTS = 2;
   }
 });
@@ -32887,6 +32969,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 +32991,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 +33020,7 @@ var init_chairmanFixLoop = __esm({
     init_microGate();
     init_chairmanDelivery();
     init_retryTurn();
+    init_cancel();
   }
 });
 
@@ -32976,6 +33062,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 +33102,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 +33149,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 +33171,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 +33254,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 +33303,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 +33325,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 +33385,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 +33432,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 +33496,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 +33517,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 +33646,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 +33665,7 @@ var init_councilApi = __esm({
     init_runChecks();
     init_implementationDelivery();
     init_types7();
+    init_cancel();
     init_types7();
     init_outputCleaning();
     init_outputCleaning();
@@ -34572,6 +34672,7 @@ __export(council_exports, {
   shouldRetryMember: () => shouldRetryMember,
   slugify: () => slugify2,
   stripClarificationProtocol: () => stripClarificationProtocol,
+  stripQuestionBlocks: () => stripQuestionBlocks,
   swapMembers: () => swapMembers,
   systemMessagesFromSplit: () => systemMessagesFromSplit,
   taskMatchesNfrKeywords: () => taskMatchesNfrKeywords,
@@ -38114,7 +38215,7 @@ var CORE_VERSION;
 var init_version = __esm({
   "packages/core/dist/version.js"() {
     "use strict";
-    CORE_VERSION = "2.34.0";
+    CORE_VERSION = "2.34.1";
   }
 });
 
@@ -38626,6 +38727,7 @@ __export(dist_exports, {
   strictBuildGate: () => strictBuildGate,
   stripAnsi: () => stripAnsi,
   stripClarificationProtocol: () => stripClarificationProtocol,
+  stripQuestionBlocks: () => stripQuestionBlocks,
   swapMembers: () => swapMembers,
   systemMessagesFromSplit: () => systemMessagesFromSplit,
   taskMatchesNfrKeywords: () => taskMatchesNfrKeywords,
@@ -44116,6 +44218,7 @@ __export(krakenModel_exports, {
   inferModelFamily: () => inferModelFamily,
   isCheapModelId: () => isCheapModelId,
   isKrakenAutoModelEnabled: () => isKrakenAutoModelEnabled,
+  isUnknownModelError: () => isUnknownModelError,
   parseQualifiedModelRef: () => parseQualifiedModelRef,
   pickCheapModel: () => pickCheapModel,
   pickDifferentFamily: () => pickDifferentFamily,
@@ -44227,6 +44330,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 +46135,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 +46622,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);
@@ -54082,6 +54225,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 +54325,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 +54360,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 +54368,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 +54394,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 +54413,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 +54474,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;
     }
   };
@@ -55654,6 +55810,25 @@ 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";
@@ -61040,7 +61215,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));
@@ -62798,6 +62974,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 +63037,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(
@@ -65972,11 +66162,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;
@@ -66214,215 +66405,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,39 +66667,277 @@ 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);
+}
+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
+  };
 }
-var dispatchContext, liveTurns;
-var init_sessionControl = __esm({
-  "src/cli/serve/sessionControl.ts"() {
+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();
   }
 });
 
@@ -67046,6 +67299,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 +67526,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);
@@ -68814,6 +69068,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 +69185,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 +69206,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 +69289,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 +69324,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 +69383,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 +69397,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 {
@@ -69148,7 +69416,7 @@ async function runHeadlessCouncil(opts, provider, model, providerStream, extras)
     } catch {
     }
   }
-  if (nativeMemory && memoryAutoWrite && lastAssistantText) {
+  if (nativeMemory && memoryAutoWrite && lastAssistantText && !signal.aborted) {
     try {
       await nativeMemory.remember({
         kind: councilRunMode === "design-phase" ? "decision" : "outcome",
@@ -69175,6 +69443,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 +69561,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 +69587,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 +69610,7 @@ ${ragContext}` : slicePrompt;
             tools: toolRegistry,
             feedbackStore,
             runMode: effectiveRunMode,
+            signal,
             maxToolCallsChairman: chairmanBudget,
             ...implementerRetry ? { skipSpecialists: true } : {},
             workspaceContext: composed2.workspaceContext,
@@ -69380,11 +69658,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 +69738,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 +69807,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 +69848,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 {
     }
@@ -69603,6 +69896,7 @@ var init_runHeadless = __esm({
     init_metrics3();
     init_headlessSpine();
     init_harnessStateEmit();
+    init_liveTurnAbort();
     init_policyGate();
     init_policyLoadMode();
     init_runOneTurn();
@@ -71190,38 +71484,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 +71550,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,18 +71564,104 @@ 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();
   }
 });
 
@@ -71372,7 +71778,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 +71805,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 +71841,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 +71855,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 +72023,7 @@ var init_harnessServer = __esm({
     init_policyGate();
     init_policyLoadMode();
     init_permissionBridge();
+    init_askUserBridge();
     init_spineLockSweep();
   }
 });
@@ -72647,7 +73066,12 @@ function readPackageJson4() {
   }
 }
 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(path95.join(packageRoot, "src", "cli", "main.ts")) && existsSync62(path95.join(packageRoot, "apps", "desktop", "package.json"));
 }
 function checkShim(pkgName) {
   const prefix = getGlobalPrefix();
@@ -72658,6 +73082,14 @@ function checkShim(pkgName) {
   const shimName = isWin ? "zelari-code.cmd" : "zelari-code";
   const shimPath = path95.join(prefix, shimName);
   if (!existsSync62(shimPath)) {
+    const localBin = path95.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`
@@ -73052,16 +73484,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 {
@@ -76700,22 +77131,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 +77224,7 @@ ${detail}${note}${claimsBlock}
 }
 
 // src/cli/hooks/useChatTurn.ts
+init_askUserTimeout();
 init_toolPermissions();
 init_skills2();
 init_fileStateStore();
@@ -78737,6 +79154,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);