zelari-code 1.8.2 → 1.9.2

package/dist/cli/main.bundled.js

@@ -18971,35 +18971,111 @@ function normalizeTextToolArgs(name, args) {
 }
 function parseTextToolCalls(text) {
   const m = /---TOOLS---\s*([\s\S]*?)---END---/.exec(text);
-  if (!m || !m[1])
-    return [];
-  let body = m[1].trim();
-  body = body.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
-  const candidates = [body];
-  if (/\]\s*\[/.test(body)) {
-    candidates.push(body.replace(/\]\s*\[/g, ","));
-  }
-  if (body.includes('\\"')) {
-    candidates.push(body.replace(/\\"/g, '"'));
+  if (m?.[1]) {
+    let body = m[1].trim();
+    body = body.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
+    const candidates = [body];
     if (/\]\s*\[/.test(body)) {
-      candidates.push(body.replace(/\\"/g, '"').replace(/\]\s*\[/g, ","));
+      candidates.push(body.replace(/\]\s*\[/g, ","));
+    }
+    if (body.includes('\\"')) {
+      candidates.push(body.replace(/\\"/g, '"'));
+      if (/\]\s*\[/.test(body)) {
+        candidates.push(body.replace(/\\"/g, '"').replace(/\]\s*\[/g, ","));
+      }
+    }
+    for (const cand of candidates) {
+      const items = tryParseToolArray(cand);
+      if (items.length > 0)
+        return items;
+    }
+    const arrays = extractJsonArrays(body);
+    if (arrays.length > 1) {
+      const merged = [];
+      for (const a of arrays) {
+        merged.push(...tryParseToolArray(a));
+      }
+      if (merged.length > 0)
+        return merged;
+    }
+    const objs = extractToolObjects(body);
+    if (objs.length > 0)
+      return objs;
+  }
+  const mini = parseMinimaxStyleToolCalls(text);
+  if (mini.length > 0)
+    return mini;
+  return [];
+}
+function parseMinimaxStyleToolCalls(text) {
+  const out = [];
+  const normalized = text.replace(/\]\s*<\s*\]\s*minimax\s*\[\s*>\s*\[</gi, "<minimax:").replace(/\]\s*<\s*\]\s*minimax\s*\[\s*>/gi, "<minimax:").replace(/minimax\s*\[\s*>\s*\[</gi, "minimax:").replace(/\]\s*</g, "<");
+  const blockRe = /<(?:minimax:)?tool_call[^>]*>([\s\S]*?)<\/(?:minimax:)?tool_call>|<invoke\s+name=["']([^"']+)["'][^>]*>([\s\S]*?)(?:<\/invoke>|(?=<invoke\s+name=)|$)/gi;
+  let match;
+  while ((match = blockRe.exec(normalized)) !== null) {
+    if (match[2]) {
+      out.push({ name: match[2], args: parseLooseArgs(match[3] ?? "") });
+    } else if (match[1]) {
+      const inner = match[1];
+      const inv = /invoke\s+name=["']([^"']+)["']/i.exec(inner);
+      if (inv) {
+        out.push({ name: inv[1], args: parseLooseArgs(inner) });
+      } else {
+        const jsonish = tryParseToolArray(inner.trim());
+        if (jsonish.length)
+          out.push(...jsonish);
+        else {
+          const objs = extractToolObjects(inner);
+          if (objs.length)
+            out.push(...objs);
+        }
+      }
+    }
+  }
+  if (out.length === 0) {
+    const loose = /invoke\s+name=["']([^"']+)["']([\s\S]*?)(?=invoke\s+name=|$)/gi;
+    let lm;
+    while ((lm = loose.exec(normalized)) !== null) {
+      const name = lm[1];
+      const args = parseLooseArgs(lm[2] ?? "");
+      if (name)
+        out.push({ name, args });
     }
   }
-  for (const cand of candidates) {
-    const items = tryParseToolArray(cand);
-    if (items.length > 0)
-      return items;
+  return out;
+}
+function parseLooseArgs(body) {
+  const args = {};
+  const paramTag = /(?:parameter\s+name=|<\s*)["']?([a-zA-Z_][\w]*)["']?\s*(?:>|=\s*["']?)([^<\]\n]+)/gi;
+  let m;
+  while ((m = paramTag.exec(body)) !== null) {
+    const key = m[1];
+    if (key === "invoke" || key === "minimax" || key === "tool_call")
+      continue;
+    args[key] = m[2].replace(/^["']|["']$/g, "").trim();
+  }
+  const lineRe = /(?:^|[\s\[>])([a-zA-Z_][\w]*)\s*[>:=]\s*([^\n<\]]+)/g;
+  while ((m = lineRe.exec(body)) !== null) {
+    const key = m[1];
+    if (args[key] !== void 0)
+      continue;
+    if (["invoke", "name", "minimax", "tool_call", "parameter"].includes(key))
+      continue;
+    args[key] = m[2].replace(/^["']|["']$/g, "").trim();
   }
-  const arrays = extractJsonArrays(body);
-  if (arrays.length > 1) {
-    const merged = [];
-    for (const a of arrays) {
-      merged.push(...tryParseToolArray(a));
+  if (Object.keys(args).length === 0) {
+    const brace = body.indexOf("{");
+    if (brace >= 0) {
+      try {
+        const parsed = JSON.parse(body.slice(brace));
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+          return parsed;
+        }
+      } catch {
+      }
     }
-    if (merged.length > 0)
-      return merged;
   }
-  return extractToolObjects(body);
+  return args;
 }
 function tryParseToolArray(raw) {
   let parsed;
@@ -19105,6 +19181,7 @@ var init_AgentHarness = __esm({
       sessionId;
       maxQueuedIterations;
       maxToolLoopIterations;
+      maxToolLoopHardCap;
       cancelled = false;
       activeController = null;
       queue = [];
@@ -19130,6 +19207,9 @@ var init_AgentHarness = __esm({
         this.sessionId = config2.sessionId ?? crypto.randomUUID();
         this.maxQueuedIterations = config2.maxQueuedIterations ?? 3;
         this.maxToolLoopIterations = config2.maxToolLoopIterations ?? 30;
+        const soft = this.maxToolLoopIterations;
+        const hardCfg = config2.maxToolLoopHardCap;
+        this.maxToolLoopHardCap = typeof hardCfg === "number" && hardCfg > 0 ? Math.max(soft, hardCfg) : Math.max(soft * 3, soft + 60);
       }
       /**
        * Snapshot of the live transcript (`this.config.messages`) as mutated
@@ -19406,7 +19486,11 @@ ${shared2.content}`,
         this.emit(initialMsgEnd);
         yield initialMsgEnd;
         let toolLoopTurns = 0;
-        while (!this.cancelled && !hadError && toolLoopTurns < this.maxToolLoopIterations && initialFinishRef.value === "tool_calls") {
+        let softCap = this.maxToolLoopIterations;
+        const hardCap = this.maxToolLoopHardCap;
+        let extensions = 0;
+        const maxExtensions = 8;
+        while (!this.cancelled && !hadError && toolLoopTurns < softCap && initialFinishRef.value === "tool_calls") {
           toolLoopTurns++;
           const turnMessageId = crypto.randomUUID();
           const msgStart = createBrainEvent("message_start", this.sessionId, { messageId: turnMessageId, role: "assistant", ...this.memberFields() });
@@ -19437,9 +19521,25 @@ ${shared2.content}`,
           initialFinishRef.value = turnFinishRef.value;
           if (hadError || this.cancelled)
             break;
+          if (initialFinishRef.value === "tool_calls" && toolLoopTurns >= softCap && toolLoopTurns < hardCap && extensions < maxExtensions) {
+            extensions++;
+            const chunk = this.maxToolLoopIterations;
+            softCap = Math.min(hardCap, softCap + chunk);
+            this.config.messages.push({
+              role: "user",
+              content: `[system] Soft tool budget reached (${toolLoopTurns}/${hardCap} hard). Work may be incomplete \u2014 CONTINUE with tools as needed to finish remaining steps. Prefer concrete progress over summarizing. Do not apologize for budgets.`
+            });
+            const note = createBrainEvent("error", this.sessionId, {
+              severity: "recoverable",
+              message: `Tool budget extended (${toolLoopTurns}\u2192${softCap}, hard ${hardCap}) to allow completion.`,
+              code: "tool_budget_extended"
+            });
+            this.emit(note);
+            yield note;
+          }
         }
-        const hitIterationCap = toolLoopTurns >= this.maxToolLoopIterations;
-        if (!this.cancelled && !hadError && initialFinishRef.value === "tool_calls" && hitIterationCap) {
+        const hitHardCap = toolLoopTurns >= hardCap || toolLoopTurns >= softCap && softCap >= hardCap;
+        if (!this.cancelled && !hadError && initialFinishRef.value === "tool_calls" && hitHardCap) {
           yield* this.runFinalAnswerTurn();
         }
         let turns = 0;
@@ -19603,13 +19703,14 @@ ${cached2}`
                 pendingNativeTools.length = 0;
               }
               const textTools = parseTextToolCalls(turnText);
-              const nativeWriteRan = turnToolCalls.some((t) => t.name === "write_file" || t.name === "edit_file");
-              const textWriteTools = textTools.filter((t) => t.name === "write_file" || t.name === "edit_file");
-              const toolsToRun = nativeWriteRan ? [] : turnToolCalls.length === 0 ? textTools : textWriteTools;
-              if (/---TOOLS---/.test(turnText) && textTools.length === 0) {
+              const toolsToRun = textTools.filter((tt) => {
+                const key = hashToolCall(tt.name, tt.args);
+                return !turnToolCalls.some((n) => hashToolCall(n.name, n.args) === key);
+              });
+              if ((/---TOOLS---/.test(turnText) || /minimax|invoke\s+name=/i.test(turnText)) && textTools.length === 0) {
                 const parseErr = createBrainEvent("error", this.sessionId, {
                   severity: "recoverable",
-                  message: "Found ---TOOLS--- block but JSON parse failed; tool calls were not executed. Emit valid JSON (escape newlines as \\n inside strings).",
+                  message: "Found text-format tool block but parse failed; tool calls were not executed. Prefer native tool_call, or ---TOOLS--- with ONE valid JSON array.",
                   code: "text_tools_parse_failed"
                 });
                 this.emit(parseErr);
@@ -19741,7 +19842,7 @@ ${cached2}`
         yield msgStart;
         this.config.messages.push({
           role: "user",
-          content: "[system] Tool iteration budget exhausted. Stop calling tools and answer the original request now using the information you have already gathered. Do not apologize for the tools."
+          content: "[system] Hard tool-iteration ceiling reached. Stop calling tools and give a clear status: what is DONE, what remains, and the exact next steps. Use what you already gathered. Do not apologize for the tools."
         });
         let totalLength = 0;
         const finishRef = { value: "stop" };
@@ -19940,6 +20041,7 @@ __export(harness_exports, {
   SessionJsonlWriter: () => SessionJsonlWriter,
   hashToolCall: () => hashToolCall,
   normalizeTextToolArgs: () => normalizeTextToolArgs,
+  parseMinimaxStyleToolCalls: () => parseMinimaxStyleToolCalls,
   parseTextToolCalls: () => parseTextToolCalls,
   readSession: () => readSession,
   wrapLegacyStream: () => wrapLegacyStream
@@ -30652,12 +30754,12 @@ var init_fixPath = __esm({
 });
 
 // src/cli/main.ts
-import React14 from "react";
+import React15 from "react";
 import { render } from "ink";
 
 // src/cli/app.tsx
-import React9, { useState as useState8, useMemo, useCallback as useCallback5, useEffect as useEffect7, useRef as useRef6 } from "react";
-import { Box as Box8, Static, useInput as useInput2, useStdin as useStdin2 } from "ink";
+import React10, { useState as useState8, useMemo, useCallback as useCallback5, useEffect as useEffect7 } from "react";
+import { Box as Box9, Static, useInput as useInput2, useStdin as useStdin2 } from "ink";
 
 // src/cli/components/InputBar.tsx
 import React from "react";
@@ -31171,8 +31273,7 @@ function StatusBar({
   costUsd = 0,
   cachedTokens = 0,
   contextUsed = 0,
-  contextLimit = 0,
-  brandVersion
+  contextLimit = 0
 }) {
   const ctxLabel = contextLimit > 0 ? `${formatTokens(contextUsed)}/${formatTokens(contextLimit)}` : contextUsed > 0 ? formatTokens(contextUsed) : null;
   return /* @__PURE__ */ React6.createElement(Box5, { paddingX: 1, width: "100%", justifyContent: "space-between", gap: 2 }, /* @__PURE__ */ React6.createElement(Box5, { flexShrink: 2 }, /* @__PURE__ */ React6.createElement(Text6, { wrap: "truncate" }, /* @__PURE__ */ React6.createElement(Text6, { color: sessionActive ? "green" : "gray" }, sessionActive ? "\u25CF" : "\u25CB"), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " "), /* @__PURE__ */ React6.createElement(Text6, { bold: true, color: phase2 === "plan" ? "yellow" : "green" }, phase2 === "plan" ? "\u25C7 plan" : "\u25C6 build"), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React6.createElement(
@@ -31182,7 +31283,7 @@ function StatusBar({
       color: mode === "council" ? "magenta" : mode === "zelari" ? "green" : "cyan"
     },
     mode === "council" ? "council" : mode === "zelari" ? "zelari" : "agent"
-  ), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React6.createElement(Text6, { bold: true, color: "cyan" }, provider), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React6.createElement(Text6, null, model), cwd ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React6.createElement(Text6, { color: "blue" }, cwd)) : null)), /* @__PURE__ */ React6.createElement(Box5, { flexShrink: 1 }, /* @__PURE__ */ React6.createElement(Text6, { wrap: "truncate" }, busy && elapsedMs !== null ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Spinner, { color: "yellow" }), /* @__PURE__ */ React6.createElement(Text6, { color: "yellow" }, " ", formatDuration(elapsedMs)), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : lastMs !== null ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "last ", formatDuration(lastMs)), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, queueCount > 0 ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "magenta" }, "queue ", queueCount), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, ctxLabel ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "cyan" }, ctxLabel), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, costUsd > 0 ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "green" }, formatCost(costUsd)), cachedTokens > 0 ? /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " (", formatTokens(cachedTokens), " cached)") : null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, brandVersion ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { bold: true, color: "white" }, "ZELARI"), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " v", brandVersion), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "session ", sessionId))));
+  ), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React6.createElement(Text6, { bold: true, color: "cyan" }, provider), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React6.createElement(Text6, null, model), cwd ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 "), /* @__PURE__ */ React6.createElement(Text6, { color: "blue" }, cwd)) : null)), /* @__PURE__ */ React6.createElement(Box5, { flexShrink: 1 }, /* @__PURE__ */ React6.createElement(Text6, { wrap: "truncate" }, busy && elapsedMs !== null ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Spinner, { color: "yellow" }), /* @__PURE__ */ React6.createElement(Text6, { color: "yellow" }, " ", formatDuration(elapsedMs)), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : lastMs !== null ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "last ", formatDuration(lastMs)), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, queueCount > 0 ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "magenta" }, "queue ", queueCount), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, ctxLabel ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "cyan" }, ctxLabel), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, costUsd > 0 ? /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "green" }, formatCost(costUsd)), cachedTokens > 0 ? /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " (", formatTokens(cachedTokens), " cached)") : null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " \xB7 ")) : null, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "session ", sessionId))));
 }
 
 // src/cli/components/SelectList.tsx
@@ -31230,14 +31331,47 @@ function SelectList({
 // src/cli/components/Sidebar.tsx
 import React8 from "react";
 import { Box as Box7, Text as Text8 } from "ink";
+
+// src/cli/components/brandArt.ts
+var BRAND_LOGO_ASCII = [
+  "    -#%=",
+  "   +%%%%#.",
+  " :#%%%%%%%-",
+  ":%%@@@@@@@@=",
+  "-%@@@@@@@@@@@+",
+  ":%@@@@@@%@@@@@@=",
+  "-%%@@@@@.+%@@%@+",
+  " -@@@@@@:%++%@=",
+  "=*%@@@@@@:@@%=*@#+.",
+  "%%%%%@@@@:+++-*%@@*",
+  ".%%%%%@@@@@+%+=:%@@@@:",
+  "*@@@@@@@@@@@@@%@@@@@@*"
+].join("\n");
+var BRAND_LOGO_COMPACT = [
+  "  -#%=",
+  " +%%%%#.",
+  ":%%@@@@=",
+  "*@@@@@@*"
+].join("\n");
+
+// src/cli/components/Sidebar.tsx
+var EMBLEM_BRAILLE = `\u2800\u2800\u2800\u2800\u2800\u2800\u2800\u2800\u2800\u2880\u28F4\u28FF\u28F7\u28C6\u2840
+\u2800\u2800\u2800\u2800\u2800\u2800\u2800\u2880\u28F6\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28E6\u2840
+\u2800\u2800\u2800\u2800\u2800\u2800\u28F0\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28E6
+\u2800\u2800\u2800\u2800\u28A0\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28F7\u2844
+\u2800\u2800\u2800\u2800\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u2819\u283B\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u2806
+\u2800\u2800\u2800\u2800\u28C8\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u2800\u28F7\u28EC\u285B\u28BF\u28FF\u28DF\u28C1
+\u2800\u2880\u28F4\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u2800\u287F\u28BF\u287F\u2883\u28C8\u28FB\u28FF\u28FF\u28F6
+\u2800\u28FC\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28E0\u28F4\u28C6\u283B\u280E\u28BF\u28FF\u28FF\u28FF\u28FF\u28E7
+\u28F0\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u28FF\u2847`;
 var SIDEBAR_WIDTH = 28;
 var SIDEBAR_MIN_COLUMNS = 96;
 var SIDEBAR_HIDE_COLUMNS = 88;
 var SIDEBAR_MIN_ROWS = 16;
 var SIDEBAR_HIDE_ROWS = 14;
-var MAX_FILES_SHORT = 4;
-var MAX_FILES_TALL = 8;
-var SIDEBAR_CHROME_LINES = 4;
+var BRAILLE_MIN_ROWS = 28;
+var MAX_FILES_SHORT = 6;
+var MAX_FILES_TALL = 10;
 function shouldShowSidebar(columns, rows) {
   return columns >= SIDEBAR_MIN_COLUMNS && rows >= SIDEBAR_MIN_ROWS;
 }
@@ -31247,18 +31381,19 @@ function sidebarVisibility(columns, rows, currentlyVisible) {
   }
   return shouldShowSidebar(columns, rows);
 }
-function maxSidebarFiles(rows) {
-  const budget = Math.max(2, rows - 14 - SIDEBAR_CHROME_LINES);
-  const cap = rows >= 28 ? MAX_FILES_TALL : MAX_FILES_SHORT;
-  return Math.min(cap, budget);
-}
 function truncatePath(p3, max) {
   if (p3.length <= max) return p3;
   return `\u2026${p3.slice(-(max - 1))}`;
 }
+function preferAsciiLogo() {
+  if (process.env.ZELARI_ASCII_LOGO === "1") return true;
+  if (process.env.ZELARI_ASCII_LOGO === "0") return false;
+  return process.platform === "win32";
+}
 function Sidebar({ version: version2, changes, rows }) {
-  void version2;
-  const maxFiles = maxSidebarFiles(rows);
+  const useBraille = !preferAsciiLogo() && rows >= BRAILLE_MIN_ROWS;
+  const logoLines = useBraille ? EMBLEM_BRAILLE.split("\n") : BRAND_LOGO_COMPACT.split("\n");
+  const maxFiles = rows >= BRAILLE_MIN_ROWS + 8 ? MAX_FILES_TALL : MAX_FILES_SHORT;
   const visible = changes.files.slice(0, maxFiles);
   const hidden = changes.files.length - visible.length;
   const innerWidth = SIDEBAR_WIDTH - 4;
@@ -31270,65 +31405,42 @@ function Sidebar({ version: version2, changes, rows }) {
       borderStyle: "single",
       borderColor: "gray",
       paddingX: 1,
-      flexShrink: 0,
-      height: Math.min(rows - 8, SIDEBAR_CHROME_LINES + maxFiles + 2),
-      overflow: "hidden"
+      flexShrink: 0
     },
-    /* @__PURE__ */ React8.createElement(Box7, { justifyContent: "center" }, /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, changes.branch ? truncatePath(changes.branch, 18) : "git")),
+    /* @__PURE__ */ React8.createElement(Box7, { flexDirection: "column", alignItems: "center" }, logoLines.map((line, i) => /* @__PURE__ */ React8.createElement(Text8, { key: i, color: "cyan" }, line))),
+    /* @__PURE__ */ React8.createElement(Box7, { justifyContent: "center" }, /* @__PURE__ */ React8.createElement(Text8, { bold: true, color: "white" }, "ZELARI CODE")),
+    /* @__PURE__ */ React8.createElement(Box7, { justifyContent: "center" }, /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, "v", version2, changes.branch ? ` \xB7 ${truncatePath(changes.branch, 12)}` : "")),
     /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, "\u2500".repeat(innerWidth)),
     !changes.isRepo ? /* @__PURE__ */ React8.createElement(Text8, { dimColor: true, italic: true }, "not a git repo") : changes.files.length === 0 ? /* @__PURE__ */ React8.createElement(Text8, { dimColor: true, italic: true }, "no changes") : /* @__PURE__ */ React8.createElement(React8.Fragment, null, /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, "changes (", changes.files.length, ")"), visible.map((f) => /* @__PURE__ */ React8.createElement(FileRow, { key: f.path, file: f, pathWidth: innerWidth - 10 })), hidden > 0 && /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, "  +", hidden, " more\u2026"))
   );
 }
-function FileRow({ file: file2, pathWidth }) {
+function FileRow({
+  file: file2,
+  pathWidth
+}) {
   const name = truncatePath(file2.path, Math.max(6, pathWidth));
   return /* @__PURE__ */ React8.createElement(Box7, null, /* @__PURE__ */ React8.createElement(Text8, { wrap: "truncate" }, /* @__PURE__ */ React8.createElement(Text8, { color: file2.untracked ? "yellow" : "white" }, name), file2.untracked ? /* @__PURE__ */ React8.createElement(Text8, { color: "yellow" }, " new") : /* @__PURE__ */ React8.createElement(React8.Fragment, null, /* @__PURE__ */ React8.createElement(Text8, { color: "green" }, " +", file2.added ?? "\xB7"), /* @__PURE__ */ React8.createElement(Text8, { color: "red" }, " -", file2.removed ?? "\xB7"))));
 }
 
-// src/cli/components/brandArt.ts
-var BRAND_LOGO_ASCII = [
-  "    -#%=",
-  "   +%%%%#.",
-  " :#%%%%%%%-",
-  ":%%@@@@@@@@=",
-  "-%@@@@@@@@@@@+",
-  ":%@@@@@@%@@@@@@=",
-  "-%%@@@@@.+%@@%@+",
-  " -@@@@@@:%++%@=",
-  "=*%@@@@@@:@@%=*@#+.",
-  "%%%%%@@@@:+++-*%@@*",
-  ".%%%%%@@@@@+%+=:%@@@@:",
-  "*@@@@@@@@@@@@@%@@@@@@*"
-].join("\n");
-var BRAND_LOGO_COMPACT = [
-  "  -#%=",
-  " +%%%%#.",
-  ":%%@@@@=",
-  "*@@@@@@*"
-].join("\n");
-function formatBannerWithLogoRight(opts) {
-  const logoSrc = opts.compact ? BRAND_LOGO_COMPACT : BRAND_LOGO_ASCII;
-  const logoLines = logoSrc.split("\n");
-  const logoWidth = Math.max(...logoLines.map((l) => l.length));
-  const cols = Math.max(logoWidth + 20, Math.min(opts.columns, 120));
-  const left = [...opts.leftLines];
-  const wordmark = `ZELARI CODE  v${opts.version}`;
-  const rightExtra = [wordmark];
-  const rightBlock = [...logoLines, ...rightExtra];
-  const rows = Math.max(left.length, rightBlock.length);
-  const out = [];
-  for (let i = 0; i < rows; i++) {
-    const L = left[i] ?? "";
-    const R = rightBlock[i] ?? "";
-    if (!R) {
-      out.push(L);
-      continue;
-    }
-    const maxLeft = Math.max(0, cols - R.length - 2);
-    const leftClipped = L.length > maxLeft ? L.slice(0, Math.max(0, maxLeft - 1)) + "\u2026" : L;
-    const pad = Math.max(2, cols - leftClipped.length - R.length);
-    out.push(leftClipped + " ".repeat(pad) + R);
-  }
-  return out.join("\n");
+// src/cli/components/StartupBanner.tsx
+import React9 from "react";
+import { Box as Box8, Text as Text9 } from "ink";
+function StartupBanner({
+  version: version2,
+  providerId,
+  model,
+  cwd,
+  columns,
+  rows
+}) {
+  const compact = columns < 72 || rows < 20;
+  const logo = (compact ? BRAND_LOGO_COMPACT : BRAND_LOGO_ASCII).split("\n");
+  const leftLines = [
+    `zelari-code v${version2} \u2014 ${providerId}/${model}`,
+    `cwd: ${cwd}`,
+    `/help \xB7 /plan \xB7 /build \xB7 /view-plan \xB7 shift+tab mode`
+  ];
+  return /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "row", justifyContent: "space-between", marginBottom: 1, width: "100%" }, /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", flexGrow: 1, marginRight: 2 }, leftLines.map((line, i) => /* @__PURE__ */ React9.createElement(Text9, { key: i, color: i === 0 ? "cyan" : void 0, dimColor: i > 0 }, line))), /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", flexShrink: 0, alignItems: "flex-end" }, logo.map((line, i) => /* @__PURE__ */ React9.createElement(Text9, { key: i, color: "cyan" }, line)), /* @__PURE__ */ React9.createElement(Text9, { bold: true, color: "white" }, "ZELARI CODE"), /* @__PURE__ */ React9.createElement(Text9, { dimColor: true }, "v", version2)));
 }
 
 // src/cli/modelDiscovery.ts
@@ -34315,10 +34427,12 @@ function computeSessionStatsDelta(realUsage, userText, assistantContent, model,
   const completionTokens = realUsage ? realUsage.completionTokens : Math.ceil(assistantContent.length / 4);
   const cachedPromptTokens = realUsage?.cachedPromptTokens ?? 0;
   const turnCost = calculateCost(model, promptTokens, completionTokens, cachedPromptTokens);
+  const contextTokens = realUsage ? realUsage.totalTokens || promptTokens + completionTokens : promptTokens + completionTokens;
   return {
     totalTokens: prev2.totalTokens + promptTokens + completionTokens,
     totalCostUsd: prev2.totalCostUsd + turnCost,
-    cachedTokens: (prev2.cachedTokens ?? 0) + cachedPromptTokens
+    cachedTokens: (prev2.cachedTokens ?? 0) + cachedPromptTokens,
+    contextTokens
   };
 }
 
@@ -34604,6 +34718,11 @@ function useChatTurn(params) {
           min: 1
         });
         const maxToolLoopIterations = budget.maxToolLoopIterations;
+        const maxToolLoopHardCap = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_HARD, {
+          default: 0,
+          // 0 → harness default (soft×3, min soft+60)
+          min: 0
+        });
         const harness2 = new AgentHarness({
           model: envConfig.model,
           provider: "openai-compatible",
@@ -34624,7 +34743,8 @@ function useChatTurn(params) {
           providerStream,
           cwd,
           maxToolCallsPerTurn,
-          maxToolLoopIterations
+          maxToolLoopIterations,
+          ...maxToolLoopHardCap > 0 ? { maxToolLoopHardCap } : {}
         });
         harnessRef.current = harness2;
         setQueueCount(harness2.queueLength);
@@ -34699,7 +34819,15 @@ function useChatTurn(params) {
               }
             } else if (event.type === "error") {
               flushStreaming();
-              appendSystem(setMessages, `[error] ${event.message}`, Date.now());
+              if (event.code === "tool_budget_extended") {
+                appendSystem(
+                  setMessages,
+                  `[budget] ${event.message}`,
+                  Date.now()
+                );
+              } else {
+                appendSystem(setMessages, `[error] ${event.message}`, Date.now());
+              }
             } else if (event.type === "tool_execution_start") {
               toolNameById.set(event.toolCallId, event.toolName);
               flushStreaming();
@@ -36193,6 +36321,10 @@ function nextMode(current) {
   const i = MODES.indexOf(current);
   return MODES[(i + 1) % MODES.length] ?? "agent";
 }
+function parseMode(input) {
+  const v = input.trim().toLowerCase();
+  return MODES.includes(v) ? v : null;
+}
 function describeMode(mode) {
   switch (mode) {
     case "council":
@@ -37841,7 +37973,12 @@ function App() {
   const [input, setInput] = useState8("");
   const [busy, setBusy] = useState8(false);
   const [providerConfig, setProviderConfig] = useState8(() => getProviderConfig());
-  const [sessionStats, setSessionStats] = useState8({ totalTokens: 0, totalCostUsd: 0, cachedTokens: 0 });
+  const [sessionStats, setSessionStats] = useState8({
+    totalTokens: 0,
+    totalCostUsd: 0,
+    cachedTokens: 0,
+    contextTokens: 0
+  });
   const [clearEpoch, setClearEpoch] = useState8(0);
   const [mode, setMode] = useState8("agent");
   const [phase2, setPhaseUi] = useState8("build");
@@ -37942,89 +38079,73 @@ function App() {
     }
     setPicker(null);
   }, [picker]);
-  const bannerColsRef = useRef6(null);
-  if (bannerColsRef.current === null) {
-    bannerColsRef.current = size.columns > 0 ? size.columns : 80;
-  }
   const banner = useMemo(() => {
-    const cols = bannerColsRef.current ?? 80;
-    const content = formatBannerWithLogoRight({
-      leftLines: [
-        `zelari-code \xB7 ${activeProviderSpec.id}/${activeModel}`,
-        `cwd: ${cwd}`,
-        `/help \xB7 /plan \xB7 /build \xB7 /view-plan \xB7 shift+tab mode`
-      ],
-      version: VERSION,
-      columns: cols,
-      compact: cols < 72
-    });
     return {
       id: "banner-once",
       role: "system",
       ts: 0,
-      content
+      content: ""
     };
-  }, [activeProviderSpec.id, activeModel, cwd]);
+  }, []);
   const [sidebarOpen, setSidebarOpen] = useState8(false);
   useEffect7(() => {
     setSidebarOpen((prev2) => sidebarVisibility(size.columns, size.rows, prev2));
   }, [size.columns, size.rows]);
   const staticKey = `${session.sessionId || "pre-bootstrap"}-${clearEpoch}`;
   const staticItems = session.sessionId ? [banner, ...session.messages] : [];
-  const dynamicMaxRows = Math.max(8, Math.min(18, size.rows - 2));
-  return /* @__PURE__ */ React9.createElement(React9.Fragment, null, /* @__PURE__ */ React9.createElement(Static, { key: staticKey, items: staticItems }, (item) => renderMessage(item)), /* @__PURE__ */ React9.createElement(
-    Box8,
+  return /* @__PURE__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement(Static, { key: staticKey, items: staticItems }, (item) => item.id === "banner-once" ? /* @__PURE__ */ React10.createElement(
+    StartupBanner,
     {
-      flexDirection: "row",
-      width: size.columns > 0 ? size.columns : void 0,
-      height: dynamicMaxRows,
-      overflow: "hidden"
-    },
-    /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", flexGrow: 1, paddingX: 1, overflow: "hidden" }, /* @__PURE__ */ React9.createElement(LiveRegion, { live: session.live, busy, elapsedMs: timer.elapsedMs }), picker ? /* @__PURE__ */ React9.createElement(
-      SelectList,
-      {
-        title: picker.title,
-        items: picker.items,
-        onSelect: onPickerSelect,
-        onCancel: onPickerCancel,
-        maxVisible: Math.max(3, Math.min(8, size.rows - 12))
-      }
-    ) : /* @__PURE__ */ React9.createElement(
-      InputBar,
-      {
-        value: input,
-        onChange: setInput,
-        onSubmit: handleSubmit,
-        disabled: busy
-      }
-    ), /* @__PURE__ */ React9.createElement(
-      StatusBar,
-      {
-        model: activeModel,
-        provider: activeProviderSpec.id,
-        sessionId: session.sessionId ? session.sessionId.slice(0, 8) : "...",
-        sessionActive: session.sessionActive,
-        queueCount: chatTurn.queueCount,
-        busy,
-        mode,
-        phase: phase2,
-        cwd,
-        elapsedMs: timer.elapsedMs,
-        lastMs: timer.lastMs,
-        costUsd: sessionStats.totalCostUsd,
-        cachedTokens: sessionStats.cachedTokens,
-        contextUsed: sessionStats.totalTokens,
-        contextLimit: Number(process.env.ZELARI_CONTEXT_LIMIT) || 2e5,
-        brandVersion: VERSION
-      }
-    )),
-    sidebarOpen && /* @__PURE__ */ React9.createElement(Sidebar, { version: VERSION, changes: gitChanges, rows: size.rows })
-  ));
+      key: item.id,
+      version: VERSION,
+      providerId: activeProviderSpec.id,
+      model: activeModel,
+      cwd,
+      columns: size.columns || 80,
+      rows: size.rows || 24
+    }
+  ) : renderMessage(item)), /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "row" }, /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", flexGrow: 1, paddingX: 1 }, /* @__PURE__ */ React10.createElement(LiveRegion, { live: session.live, busy, elapsedMs: timer.elapsedMs }), picker ? /* @__PURE__ */ React10.createElement(
+    SelectList,
+    {
+      title: picker.title,
+      items: picker.items,
+      onSelect: onPickerSelect,
+      onCancel: onPickerCancel,
+      maxVisible: Math.max(4, Math.min(10, size.rows - 10))
+    }
+  ) : /* @__PURE__ */ React10.createElement(
+    InputBar,
+    {
+      value: input,
+      onChange: setInput,
+      onSubmit: handleSubmit,
+      disabled: busy
+    }
+  ), /* @__PURE__ */ React10.createElement(
+    StatusBar,
+    {
+      model: activeModel,
+      provider: activeProviderSpec.id,
+      sessionId: session.sessionId ? session.sessionId.slice(0, 8) : "...",
+      sessionActive: session.sessionActive,
+      queueCount: chatTurn.queueCount,
+      busy,
+      mode,
+      phase: phase2,
+      cwd,
+      elapsedMs: timer.elapsedMs,
+      lastMs: timer.lastMs,
+      costUsd: sessionStats.totalCostUsd,
+      cachedTokens: sessionStats.cachedTokens,
+      contextUsed: sessionStats.contextTokens || 0,
+      contextLimit: Number(process.env.ZELARI_CONTEXT_LIMIT) || 2e5
+    }
+  )), sidebarOpen && /* @__PURE__ */ React10.createElement(Sidebar, { version: VERSION, changes: gitChanges, rows: size.rows })));
 }
 
 // src/cli/components/SplashScreen.tsx
-import React10, { useEffect as useEffect8, useState as useState9 } from "react";
-import { Box as Box9, Text as Text10, useInput as useInput3, useStdin as useStdin3 } from "ink";
+import React11, { useEffect as useEffect8, useState as useState9 } from "react";
+import { Box as Box10, Text as Text11, useInput as useInput3, useStdin as useStdin3 } from "ink";
 var SPLASH_DURATION_MS = 2e3;
 var EMBLEM_LARGE = `                              =%@*-
                             =%@@@@@#:
@@ -38160,8 +38281,8 @@ function Splash({ onDone, version: version2 }) {
     { isActive: isRawModeSupported === true }
   );
   if (!picked) return null;
-  return /* @__PURE__ */ React10.createElement(
-    Box9,
+  return /* @__PURE__ */ React11.createElement(
+    Box10,
     {
       flexDirection: "column",
       alignItems: "center",
@@ -38169,10 +38290,10 @@ function Splash({ onDone, version: version2 }) {
       width: columns,
       height: rows - 1
     },
-    /* @__PURE__ */ React10.createElement(Text10, { color: "cyan" }, picked.art),
-    /* @__PURE__ */ React10.createElement(Box9, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, { bold: true, color: "white" }, "Z E L A R I   C O D E")),
-    !picked.compact && /* @__PURE__ */ React10.createElement(Text10, { dimColor: true }, `${version2 ? `v${version2} \u2014 ` : ""}N-THEM Studio`),
-    !picked.compact && /* @__PURE__ */ React10.createElement(Text10, { dimColor: true, italic: true }, "press any key to skip")
+    /* @__PURE__ */ React11.createElement(Text11, { color: "cyan" }, picked.art),
+    /* @__PURE__ */ React11.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React11.createElement(Text11, { bold: true, color: "white" }, "Z E L A R I   C O D E")),
+    !picked.compact && /* @__PURE__ */ React11.createElement(Text11, { dimColor: true }, `${version2 ? `v${version2} \u2014 ` : ""}N-THEM Studio`),
+    !picked.compact && /* @__PURE__ */ React11.createElement(Text11, { dimColor: true, italic: true }, "press any key to skip")
   );
 }
 function SplashGate({
@@ -38188,14 +38309,14 @@ function SplashGate({
     })
   );
   if (show) {
-    return /* @__PURE__ */ React10.createElement(Splash, { onDone: () => setShow(false), version: version2 });
+    return /* @__PURE__ */ React11.createElement(Splash, { onDone: () => setShow(false), version: version2 });
   }
-  return /* @__PURE__ */ React10.createElement(React10.Fragment, null, children);
+  return /* @__PURE__ */ React11.createElement(React11.Fragment, null, children);
 }
 
 // src/cli/components/PluginGate.tsx
-import React11, { useEffect as useEffect9, useState as useState10, useCallback as useCallback6 } from "react";
-import { Box as Box10, Text as Text11, useStdin as useStdin4 } from "ink";
+import React12, { useEffect as useEffect9, useState as useState10, useCallback as useCallback6 } from "react";
+import { Box as Box11, Text as Text12, useStdin as useStdin4 } from "ink";
 init_registry2();
 init_prefs();
 var CHOICE_INSTALL = "__install__";
@@ -38284,20 +38405,20 @@ function PluginGate({ cwd, children }) {
     [current, cwd, advance]
   );
   if (phase2 === "done") {
-    return /* @__PURE__ */ React11.createElement(React11.Fragment, null, children);
+    return /* @__PURE__ */ React12.createElement(React12.Fragment, null, children);
   }
   if (phase2 === "detecting") {
-    return /* @__PURE__ */ React11.createElement(Box10, { paddingX: 1 }, /* @__PURE__ */ React11.createElement(Text11, { dimColor: true }, "Checking for optional tool plugins\u2026"));
+    return /* @__PURE__ */ React12.createElement(Box11, { paddingX: 1 }, /* @__PURE__ */ React12.createElement(Text12, { dimColor: true }, "Checking for optional tool plugins\u2026"));
   }
   if (!current) {
-    return /* @__PURE__ */ React11.createElement(React11.Fragment, null, children);
+    return /* @__PURE__ */ React12.createElement(React12.Fragment, null, children);
   }
   if (phase2 === "installing") {
-    return /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(Text11, { color: "cyan" }, "\u23F3 Installing ", current.label, "\u2026"), /* @__PURE__ */ React11.createElement(Text11, { dimColor: true }, "npm install ", current.installScope === "global" ? "-g" : "-D", " ", current.npmPackage));
+    return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, "\u23F3 Installing ", current.label, "\u2026"), /* @__PURE__ */ React12.createElement(Text12, { dimColor: true }, "npm install ", current.installScope === "global" ? "-g" : "-D", " ", current.npmPackage));
   }
   if (phase2 === "result") {
     const ok = result?.ok === true;
-    return /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(Text11, { color: ok ? "green" : "red" }, ok ? "\u2713" : "\u2717", " ", ok ? "Installed" : "Install failed", ": ", current.label), !ok && result?.error ? /* @__PURE__ */ React11.createElement(Text11, { dimColor: true }, result.error) : null, ok && current.postInstallHint ? /* @__PURE__ */ React11.createElement(Text11, { color: "yellow" }, "  \u2192 ", current.postInstallHint) : null, /* @__PURE__ */ React11.createElement(Text11, { dimColor: true }, "Press any key to continue\u2026"), /* @__PURE__ */ React11.createElement(ContinueKey, { onContinue: advance }));
+    return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React12.createElement(Text12, { color: ok ? "green" : "red" }, ok ? "\u2713" : "\u2717", " ", ok ? "Installed" : "Install failed", ": ", current.label), !ok && result?.error ? /* @__PURE__ */ React12.createElement(Text12, { dimColor: true }, result.error) : null, ok && current.postInstallHint ? /* @__PURE__ */ React12.createElement(Text12, { color: "yellow" }, "  \u2192 ", current.postInstallHint) : null, /* @__PURE__ */ React12.createElement(Text12, { dimColor: true }, "Press any key to continue\u2026"), /* @__PURE__ */ React12.createElement(ContinueKey, { onContinue: advance }));
   }
   const items = [
     {
@@ -38308,7 +38429,7 @@ function PluginGate({ cwd, children }) {
     { value: CHOICE_LATER, label: "Maybe later" },
     { value: CHOICE_NEVER, label: "Don't ask again" }
   ];
-  return /* @__PURE__ */ React11.createElement(
+  return /* @__PURE__ */ React12.createElement(
     SelectList,
     {
       title: `Optional plugin missing: ${current.label}`,
@@ -38370,15 +38491,15 @@ function parseWizardFlags(argv) {
 }
 
 // src/cli/wizard/runWizard.tsx
-import React13, { useEffect as useEffect10, useState as useState11 } from "react";
-import { Box as Box12, Text as Text13 } from "ink";
+import React14, { useEffect as useEffect10, useState as useState11 } from "react";
+import { Box as Box13, Text as Text14 } from "ink";
 import { useInput as useInput4 } from "ink";
 init_keyStore();
 init_providerConfig();
 
 // src/cli/wizard/index.tsx
-import React12 from "react";
-import { Box as Box11, Text as Text12 } from "ink";
+import React13 from "react";
+import { Box as Box12, Text as Text13 } from "ink";
 
 // src/cli/wizard/useWizardState.ts
 init_providerConfig();
@@ -38494,16 +38615,16 @@ var API_KEY_OPTIONS = ["env", "keystore", "skip"];
 
 // src/cli/wizard/index.tsx
 function Frame({ children }) {
-  return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1 }, children);
+  return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1 }, children);
 }
 function Step(props) {
-  return /* @__PURE__ */ React12.createElement(Box11, null, /* @__PURE__ */ React12.createElement(Text12, { color: props.active ? "cyan" : "gray", inverse: props.active }, " ", props.index, "/", props.total, " ", props.name, " "));
+  return /* @__PURE__ */ React13.createElement(Box12, null, /* @__PURE__ */ React13.createElement(Text13, { color: props.active ? "cyan" : "gray", inverse: props.active }, " ", props.index, "/", props.total, " ", props.name, " "));
 }
 function renderProviderList(providers, cursor) {
-  return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column" }, providers.map((p3, i) => {
+  return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column" }, providers.map((p3, i) => {
     const arrow = i === cursor ? "\u279C " : "  ";
     const color = i === cursor ? "cyan" : void 0;
-    return /* @__PURE__ */ React12.createElement(Text12, { key: p3.id, color }, arrow, p3.displayName, " ", /* @__PURE__ */ React12.createElement(Text12, { color: "gray" }, "(", p3.id, ", uses env ", p3.envVar, ")"));
+    return /* @__PURE__ */ React13.createElement(Text13, { key: p3.id, color }, arrow, p3.displayName, " ", /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "(", p3.id, ", uses env ", p3.envVar, ")"));
   }));
 }
 function renderApiKeyOptions(cursor) {
@@ -38512,18 +38633,18 @@ function renderApiKeyOptions(cursor) {
     keystore: "Save to local keyStore (encrypted)",
     skip: "Skip for now (chat will fail until key is set)"
   };
-  return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column" }, API_KEY_OPTIONS.map((choice, i) => {
+  return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column" }, API_KEY_OPTIONS.map((choice, i) => {
     const arrow = i === cursor ? "\u279C " : "  ";
     const color = i === cursor ? "cyan" : void 0;
-    return /* @__PURE__ */ React12.createElement(Text12, { key: choice, color }, arrow, labels[choice]);
+    return /* @__PURE__ */ React13.createElement(Text13, { key: choice, color }, arrow, labels[choice]);
   }));
 }
 function Wizard({ state: state2, providers }) {
   const s = state2.state;
   if (s.committed) {
-    return /* @__PURE__ */ React12.createElement(Frame, null, /* @__PURE__ */ React12.createElement(Text12, { color: "green" }, "\u2713 Setup complete!"), /* @__PURE__ */ React12.createElement(Text12, null, "Provider: ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, s.providerId), " | ", "Model: ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, s.model), " | ", "API key: ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, s.apiKeyChoice ?? "n/a")), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text12, { color: "gray" }, "Launching zelari-code\u2026 (press any key)")));
+    return /* @__PURE__ */ React13.createElement(Frame, null, /* @__PURE__ */ React13.createElement(Text13, { color: "green" }, "\u2713 Setup complete!"), /* @__PURE__ */ React13.createElement(Text13, null, "Provider: ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, s.providerId), " | ", "Model: ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, s.model), " | ", "API key: ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, s.apiKeyChoice ?? "n/a")), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "Launching zelari-code\u2026 (press any key)")));
   }
-  return /* @__PURE__ */ React12.createElement(Frame, null, /* @__PURE__ */ React12.createElement(Text12, { color: "cyan", bold: true }, "zelari-code v", VERSION, " \u2014 first-time setup"), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1, marginBottom: 1, flexDirection: "row" }, /* @__PURE__ */ React12.createElement(Step, { index: 1, total: 5, name: "welcome", active: s.step === "welcome" }), /* @__PURE__ */ React12.createElement(Step, { index: 2, total: 5, name: "provider", active: s.step === "provider" }), /* @__PURE__ */ React12.createElement(Step, { index: 3, total: 5, name: "model", active: s.step === "model" }), /* @__PURE__ */ React12.createElement(Step, { index: 4, total: 5, name: "apikey", active: s.step === "apikey" }), /* @__PURE__ */ React12.createElement(Step, { index: 5, total: 5, name: "confirm", active: s.step === "confirm" })), s.step === "welcome" && /* @__PURE__ */ React12.createElement(React12.Fragment, null, /* @__PURE__ */ React12.createElement(Text12, null, "Welcome! Let's get you coding in under two minutes."), /* @__PURE__ */ React12.createElement(Text12, { color: "gray" }, "We'll pick a provider, default model, and how to handle your API key."), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text12, null, "Press "), /* @__PURE__ */ React12.createElement(Text12, { color: "cyan", inverse: true }, " Enter "), /* @__PURE__ */ React12.createElement(Text12, null, " to continue, or "), /* @__PURE__ */ React12.createElement(Text12, { color: "red", inverse: true }, " Q "), /* @__PURE__ */ React12.createElement(Text12, null, " to quit (re-run with "), /* @__PURE__ */ React12.createElement(Text12, { color: "gray" }, "--no-wizard"), /* @__PURE__ */ React12.createElement(Text12, null, " to skip later)."))), s.step === "provider" && /* @__PURE__ */ React12.createElement(React12.Fragment, null, /* @__PURE__ */ React12.createElement(Text12, null, "Choose your LLM provider:"), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, renderProviderList(providers, s.providerCursor)), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text12, { color: "gray" }, "\u2191/\u2193 to move, Enter to confirm"))), s.step === "model" && /* @__PURE__ */ React12.createElement(React12.Fragment, null, /* @__PURE__ */ React12.createElement(Text12, null, "Model for ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, s.providerId), ":"), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1, borderStyle: "single", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React12.createElement(Text12, null, s.model ?? "(empty)")), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text12, null, "Press ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan", inverse: true }, " Enter "), "to accept, or type a new name. ", /* @__PURE__ */ React12.createElement(Text12, { color: "gray" }, "(default kept on empty input)")))), s.step === "apikey" && /* @__PURE__ */ React12.createElement(React12.Fragment, null, /* @__PURE__ */ React12.createElement(Text12, null, "How should we handle the API key?"), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, renderApiKeyOptions(s.apiKeyCursor)), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text12, { color: "gray" }, "\u2191/\u2193 to move, Enter to confirm"))), s.step === "confirm" && /* @__PURE__ */ React12.createElement(React12.Fragment, null, /* @__PURE__ */ React12.createElement(Text12, null, "Confirm your setup:"), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React12.createElement(Text12, null, "Provider: ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, s.providerId)), /* @__PURE__ */ React12.createElement(Text12, null, "Model:    ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, s.model)), /* @__PURE__ */ React12.createElement(Text12, null, "API key:  ", /* @__PURE__ */ React12.createElement(Text12, { color: "cyan" }, s.apiKeyChoice ?? "(unset)"))), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text12, null, "Press ", /* @__PURE__ */ React12.createElement(Text12, { color: "green", inverse: true }, " Enter "), "to save and launch, or ", /* @__PURE__ */ React12.createElement(Text12, { color: "yellow", inverse: true }, " B "), "to go back."))));
+  return /* @__PURE__ */ React13.createElement(Frame, null, /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "zelari-code v", VERSION, " \u2014 first-time setup"), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1, marginBottom: 1, flexDirection: "row" }, /* @__PURE__ */ React13.createElement(Step, { index: 1, total: 5, name: "welcome", active: s.step === "welcome" }), /* @__PURE__ */ React13.createElement(Step, { index: 2, total: 5, name: "provider", active: s.step === "provider" }), /* @__PURE__ */ React13.createElement(Step, { index: 3, total: 5, name: "model", active: s.step === "model" }), /* @__PURE__ */ React13.createElement(Step, { index: 4, total: 5, name: "apikey", active: s.step === "apikey" }), /* @__PURE__ */ React13.createElement(Step, { index: 5, total: 5, name: "confirm", active: s.step === "confirm" })), s.step === "welcome" && /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(Text13, null, "Welcome! Let's get you coding in under two minutes."), /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "We'll pick a provider, default model, and how to handle your API key."), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, null, "Press "), /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", inverse: true }, " Enter "), /* @__PURE__ */ React13.createElement(Text13, null, " to continue, or "), /* @__PURE__ */ React13.createElement(Text13, { color: "red", inverse: true }, " Q "), /* @__PURE__ */ React13.createElement(Text13, null, " to quit (re-run with "), /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "--no-wizard"), /* @__PURE__ */ React13.createElement(Text13, null, " to skip later)."))), s.step === "provider" && /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(Text13, null, "Choose your LLM provider:"), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, renderProviderList(providers, s.providerCursor)), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "\u2191/\u2193 to move, Enter to confirm"))), s.step === "model" && /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(Text13, null, "Model for ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, s.providerId), ":"), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1, borderStyle: "single", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React13.createElement(Text13, null, s.model ?? "(empty)")), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, null, "Press ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", inverse: true }, " Enter "), "to accept, or type a new name. ", /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "(default kept on empty input)")))), s.step === "apikey" && /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(Text13, null, "How should we handle the API key?"), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, renderApiKeyOptions(s.apiKeyCursor)), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "\u2191/\u2193 to move, Enter to confirm"))), s.step === "confirm" && /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(Text13, null, "Confirm your setup:"), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React13.createElement(Text13, null, "Provider: ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, s.providerId)), /* @__PURE__ */ React13.createElement(Text13, null, "Model:    ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, s.model)), /* @__PURE__ */ React13.createElement(Text13, null, "API key:  ", /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, s.apiKeyChoice ?? "(unset)"))), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, null, "Press ", /* @__PURE__ */ React13.createElement(Text13, { color: "green", inverse: true }, " Enter "), "to save and launch, or ", /* @__PURE__ */ React13.createElement(Text13, { color: "yellow", inverse: true }, " B "), "to go back."))));
 }
 
 // src/cli/wizard/runWizard.tsx
@@ -38599,9 +38720,9 @@ function RunWizard(_props) {
     }
   });
   if (wiz.state.committed) {
-    return /* @__PURE__ */ React13.createElement(PostCommitBridge, null);
+    return /* @__PURE__ */ React14.createElement(PostCommitBridge, null);
   }
-  return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React13.createElement(Wizard, { state: wiz, providers: PROVIDERS }));
+  return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React14.createElement(Wizard, { state: wiz, providers: PROVIDERS }));
 }
 function PostCommitBridge() {
   const [showApp, setShowApp] = useState11(false);
@@ -38610,22 +38731,26 @@ function PostCommitBridge() {
     return () => clearTimeout(t);
   }, []);
   if (showApp) {
-    return /* @__PURE__ */ React13.createElement(App, null);
+    return /* @__PURE__ */ React14.createElement(App, null);
   }
-  return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React13.createElement(Box12, { borderStyle: "round", borderColor: "green", paddingX: 2, paddingY: 1, flexDirection: "column" }, /* @__PURE__ */ React13.createElement(Text13, { color: "green", bold: true }, "\u2713 Setup complete! Launching zelari-code\u2026"), /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, "Press Ctrl+C any time to exit.")));
+  return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React14.createElement(Box13, { borderStyle: "round", borderColor: "green", paddingX: 2, paddingY: 1, flexDirection: "column" }, /* @__PURE__ */ React14.createElement(Text14, { color: "green", bold: true }, "\u2713 Setup complete! Launching zelari-code\u2026"), /* @__PURE__ */ React14.createElement(Text14, { color: "gray" }, "Press Ctrl+C any time to exit.")));
 }
 
 // src/cli/headless.ts
 init_keyStore();
 init_providerConfig();
 init_openai_compatible();
+init_phase();
 function parseHeadlessFlags(argv) {
   if (!argv.includes("--headless")) {
     return { options: null };
   }
   let task;
   let output = "json";
-  let useCouncil = false;
+  let mode = "agent";
+  let phase2 = "build";
+  let modeExplicit = false;
+  let councilFlag = false;
   let provider;
   let model;
   for (let i = 0; i < argv.length; i++) {
@@ -38646,7 +38771,30 @@ function parseHeadlessFlags(argv) {
       task = argv[i + 1];
       i++;
     } else if (arg === "--council") {
-      useCouncil = true;
+      councilFlag = true;
+    } else if (arg === "--mode") {
+      const next = argv[i + 1];
+      const parsed = next ? parseMode(next) : null;
+      if (!parsed) {
+        return {
+          options: null,
+          error: `--mode requires 'agent', 'council', or 'zelari', got '${next ?? "(missing)"}'`
+        };
+      }
+      mode = parsed;
+      modeExplicit = true;
+      i++;
+    } else if (arg === "--phase") {
+      const next = argv[i + 1];
+      const parsed = next ? parsePhase(next) : null;
+      if (!parsed) {
+        return {
+          options: null,
+          error: `--phase requires 'plan' or 'build', got '${next ?? "(missing)"}'`
+        };
+      }
+      phase2 = parsed;
+      i++;
     } else if (arg === "--provider") {
       provider = argv[i + 1];
       i++;
@@ -38655,11 +38803,27 @@ function parseHeadlessFlags(argv) {
       i++;
     }
   }
+  if (councilFlag && !modeExplicit) {
+    mode = "council";
+  } else if (councilFlag && modeExplicit && mode !== "council") {
+    return {
+      options: null,
+      error: `--council conflicts with --mode ${mode}`
+    };
+  }
   if (!task || task.trim().length === 0) {
     return { options: null, error: "--headless requires --task <prompt>" };
   }
   return {
-    options: { task, output, useCouncil, provider, model }
+    options: {
+      task,
+      output,
+      mode,
+      phase: phase2,
+      useCouncil: mode === "council",
+      provider,
+      model
+    }
   };
 }
 async function resolveHeadlessKey(providerId) {
@@ -38694,7 +38858,10 @@ init_harness();
 init_toolRegistry();
 init_skills2();
 init_envNumber();
+init_phaseState();
+init_phase();
 async function runHeadless(opts) {
+  setPhase(opts.phase ?? "build");
   const { provider, model } = resolveHeadlessProvider(opts);
   const key = await resolveHeadlessKey(provider);
   if ("error" in key) {
@@ -38708,14 +38875,34 @@ async function runHeadless(opts) {
     baseUrl: key.baseUrl,
     model
   });
-  if (opts.useCouncil) {
+  const mode = opts.mode ?? (opts.useCouncil ? "council" : "agent");
+  if (opts.output === "json") {
+    emitEvent({
+      type: "log",
+      message: `[headless] mode=${mode} phase=${opts.phase ?? "build"} provider=${provider} model=${model}`
+    });
+  } else {
+    process.stderr.write(
+      `[zelari-code --headless] mode=${mode} phase=${describePhase(opts.phase ?? "build")}
+`
+    );
+  }
+  if (mode === "zelari") {
+    return runHeadlessZelari(opts, provider, model, providerStream);
+  }
+  if (mode === "council" || opts.useCouncil) {
     return runHeadlessCouncil(opts, provider, model, providerStream);
   }
   return runHeadlessSingle(opts, provider, model, providerStream);
 }
+function planModeFromOpts(opts) {
+  return (opts.phase ?? "build") === "plan";
+}
 async function runHeadlessSingle(opts, provider, model, providerStream) {
   const sessionId = crypto.randomUUID();
-  const { registry: toolRegistry } = createBuiltinToolRegistry();
+  const { registry: toolRegistry } = createBuiltinToolRegistry({
+    planMode: planModeFromOpts(opts)
+  });
   const tools = toolRegistry.toOpenAITools().map((t) => ({
     name: t.function.name,
     description: t.function.description,
@@ -38738,10 +38925,6 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
       color: "#00d9a3",
       avatar: "\u25C6",
       tools: toolNames,
-      // v1.7.0 fix (agy audit): include platform/shell context in the role
-      // prompt so the agent knows its cwd and shell — previously this was
-      // empty (systemPrompt: '') and the agent lacked the platform block
-      // the TUI single-agent path gets.
       systemPrompt: [
         "# Platform",
         `platform: ${process.platform}`,
@@ -38750,7 +38933,10 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
         "# Working Directory",
         `You are running in: ${process.cwd()}`,
         "All relative file paths are resolved against this directory.",
-        "The shell is NON-INTERACTIVE (stdin closed): pass non-interactive flags (--yes, --force, --template)."
+        "The shell is NON-INTERACTIVE (stdin closed): pass non-interactive flags (--yes, --force, --template).",
+        "",
+        `# Work phase: ${opts.phase ?? "build"}`,
+        (opts.phase ?? "build") === "plan" ? "PLAN phase: explore and design only. Do not write project source files (write_file/edit_file/bash blocked). Plan artifacts under .zelari are allowed." : "BUILD phase: full tools; implement changes."
       ].join("\n")
     };
     systemPrompt = buildSystemPrompt(headlessRole, {
@@ -38829,18 +39015,11 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
   if (finalReason === "error") return 3;
   return exitCode;
 }
-async function runHeadlessCouncil(opts, provider, model, providerStream) {
-  const { dispatchCouncil: dispatchCouncil2 } = await Promise.resolve().then(() => (init_councilDispatcher(), councilDispatcher_exports));
-  const sessionId = crypto.randomUUID();
-  const { registry: toolRegistry } = createBuiltinToolRegistry();
-  const workspaceCtx = {
-    projectRoot: process.cwd(),
-    getActiveBranch: () => null
-  };
+async function buildCouncilToolRegistry(planMode) {
+  const { registry: toolRegistry } = createBuiltinToolRegistry({ planMode });
   const { createWorkspaceContext: createWorkspaceContext2, createWorkspaceStubs: createWorkspaceStubs2 } = await Promise.resolve().then(() => (init_stubs(), stubs_exports));
   const { createWorkspaceToolRegistry: createWorkspaceToolRegistry2 } = await Promise.resolve().then(() => (init_toolRegistry2(), toolRegistry_exports2));
   const { setWorkspaceStubs: setWorkspaceStubs2 } = await Promise.resolve().then(() => (init_skills2(), skills_exports));
-  const { FeedbackStore: FeedbackStore2 } = await Promise.resolve().then(() => (init_councilFeedback(), councilFeedback_exports));
   const realCtx = createWorkspaceContext2();
   const realReg = createWorkspaceToolRegistry2(realCtx);
   for (const name of realReg.list()) {
@@ -38848,6 +39027,13 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
     if (td) toolRegistry.register(td);
   }
   setWorkspaceStubs2(createWorkspaceStubs2(realCtx));
+  return { toolRegistry, workspaceCtx: realCtx };
+}
+async function runHeadlessCouncil(opts, provider, model, providerStream) {
+  const { dispatchCouncil: dispatchCouncil2 } = await Promise.resolve().then(() => (init_councilDispatcher(), councilDispatcher_exports));
+  const sessionId = crypto.randomUUID();
+  const { toolRegistry } = await buildCouncilToolRegistry(planModeFromOpts(opts));
+  const { FeedbackStore: FeedbackStore2 } = await Promise.resolve().then(() => (init_councilFeedback(), councilFeedback_exports));
   const feedbackStore = new FeedbackStore2();
   let exitCode = 0;
   try {
@@ -38858,7 +39044,8 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
       providerStream,
       sessionId,
       tools: toolRegistry,
-      feedbackStore
+      feedbackStore,
+      runMode: planModeFromOpts(opts) ? "design-phase" : "implementation"
     })) {
       if (opts.output === "json") {
         emitEvent(event);
@@ -38879,6 +39066,378 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
   }
   return exitCode;
 }
+async function runHeadlessZelari(opts, provider, model, providerStream) {
+  const projectRoot = process.cwd();
+  const { buildMissionBrief: buildMissionBrief2 } = await Promise.resolve().then(() => (init_council(), council_exports));
+  const { hasWorkspacePlan: hasWorkspacePlan2 } = await Promise.resolve().then(() => (init_planDetect(), planDetect_exports));
+  const { getMemoryBackend: getMemoryBackend2 } = await Promise.resolve().then(() => (init_fileBackend(), fileBackend_exports));
+  const { runZelariMission: runZelariMission2 } = await Promise.resolve().then(() => (init_zelariMission(), zelariMission_exports));
+  const { dispatchCouncil: dispatchCouncil2 } = await Promise.resolve().then(() => (init_councilDispatcher(), councilDispatcher_exports));
+  const { FeedbackStore: FeedbackStore2 } = await Promise.resolve().then(() => (init_councilFeedback(), councilFeedback_exports));
+  const { runPostCouncilHook: runPostCouncilHook2 } = await Promise.resolve().then(() => (init_postCouncilHook(), postCouncilHook_exports));
+  const brief = buildMissionBrief2({
+    userMessage: opts.task,
+    hasPlan: hasWorkspacePlan2(projectRoot)
+  });
+  const memory = await getMemoryBackend2(projectRoot);
+  const { toolRegistry, workspaceCtx } = await buildCouncilToolRegistry(planModeFromOpts(opts));
+  const feedbackStore = new FeedbackStore2();
+  const chairmanBudget = envNumber(process.env.ZELARI_MODE_MAX_TOOLS_LUCIFER, {
+    default: 30,
+    min: 1
+  });
+  const emit = (message) => {
+    if (opts.output === "json") {
+      emitEvent({ type: "log", message });
+    } else {
+      process.stderr.write(message + "\n");
+    }
+  };
+  emit(`[zelari] mission brief
+${JSON.stringify({ deliverable: brief.deliverableThisMission, mvp: brief.sliceMvp?.title }, null, 0)}`);
+  let exitCode = 0;
+  try {
+    const state2 = await runZelariMission2(opts.task, brief, {
+      projectRoot,
+      memory,
+      emit,
+      runSlice: async ({ userMessage: slicePrompt, runMode, ragContext }) => {
+        const sessionId = crypto.randomUUID();
+        const fullPrompt = ragContext ? `${slicePrompt}
+
+## Memory context
+${ragContext}` : slicePrompt;
+        let synthesisText = "";
+        let writeCount = 0;
+        let chairmanErrored = false;
+        let membersCompleted = 0;
+        for await (const event of dispatchCouncil2(fullPrompt, {
+          apiKey: "REDACTED",
+          model,
+          provider: "openai-compatible",
+          providerStream,
+          sessionId,
+          tools: toolRegistry,
+          feedbackStore,
+          runMode: planModeFromOpts(opts) ? "design-phase" : runMode,
+          maxToolCallsChairman: chairmanBudget
+        })) {
+          if (opts.output === "json") {
+            emitEvent(event);
+          } else if (event.type === "message_delta") {
+            process.stdout.write(event.delta);
+          }
+          if (event.type === "message_delta" && typeof event.delta === "string") {
+            synthesisText += event.delta;
+          }
+          if (event.type === "tool_execution_end") {
+            const name = event.toolName ?? event.name ?? "";
+            if (name === "write_file" || name === "edit_file" || name === "apply_diff") {
+              writeCount += 1;
+            }
+          }
+          if (event.type === "agent_end") {
+            membersCompleted += 1;
+            if (event.reason === "error") chairmanErrored = true;
+          }
+          if (event.type === "error" && event.severity === "fatal") {
+            chairmanErrored = true;
+            exitCode = 2;
+          }
+        }
+        let completionOk = false;
+        let degraded = false;
+        try {
+          const { detectDegradedRun: detectDegradedRun2 } = await Promise.resolve().then(() => (init_council(), council_exports));
+          const d = detectDegradedRun2({
+            chairmanErrored,
+            councilAborted: false,
+            luciferWriteCount: writeCount,
+            synthesisText,
+            runMode
+          });
+          degraded = d.degraded;
+          const hook = await runPostCouncilHook2(workspaceCtx, {
+            runMode,
+            userMessage: opts.task,
+            synthesisText: synthesisText || void 0,
+            degradedRun: d.degraded,
+            degradedReasons: d.reasons
+          });
+          completionOk = hook.completion?.completion?.ok ?? false;
+          if (completionOk) {
+            emit(`[zelari] slice completion ok`);
+          }
+        } catch {
+        }
+        return {
+          completionOk,
+          ran: membersCompleted > 0 || synthesisText.length > 0,
+          synthesisText: synthesisText || void 0,
+          writeCount,
+          degraded
+        };
+      }
+    });
+    if (state2.status === "error") exitCode = exitCode || 3;
+    else if (state2.status === "success") exitCode = 0;
+    else if (state2.status === "stalled" || state2.status === "stopped") exitCode = exitCode || 0;
+  } catch (err) {
+    process.stderr.write(
+      `[zelari-code --headless] zelari error: ${err instanceof Error ? err.message : String(err)}
+`
+    );
+    return 2;
+  } finally {
+    await memory.close().catch(() => void 0);
+  }
+  return exitCode;
+}
+
+// src/cli/desktopConfig.ts
+init_keyStore();
+init_providerConfig();
+init_updater();
+function wantsPrintConfig(argv) {
+  return argv.includes("--print-config");
+}
+function wantsSetKey(argv) {
+  return argv.includes("--set-key");
+}
+function wantsDiscoverModels(argv) {
+  return argv.includes("--discover-models");
+}
+function parseSetConfigFlags(argv) {
+  if (!argv.includes("--set-config")) {
+    return { request: null };
+  }
+  let provider;
+  let model;
+  let endpoint;
+  let endpointClear = false;
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === "--provider") {
+      provider = argv[i + 1];
+      i++;
+    } else if (arg === "--model") {
+      model = argv[i + 1];
+      i++;
+    } else if (arg === "--endpoint") {
+      endpoint = argv[i + 1];
+      i++;
+    } else if (arg === "--endpoint-clear") {
+      endpointClear = true;
+    }
+  }
+  if (!provider && !model && !endpoint && !endpointClear) {
+    return {
+      request: null,
+      error: "--set-config requires --provider, --model, --endpoint, and/or --endpoint-clear"
+    };
+  }
+  if (provider !== void 0 && provider.trim().length === 0) {
+    return { request: null, error: "--provider cannot be empty" };
+  }
+  if (model !== void 0 && model.trim().length === 0) {
+    return { request: null, error: "--model cannot be empty" };
+  }
+  if (endpoint !== void 0 && endpoint.trim().length === 0) {
+    return { request: null, error: "--endpoint cannot be empty" };
+  }
+  if (endpoint && endpointClear) {
+    return { request: null, error: "--endpoint and --endpoint-clear conflict" };
+  }
+  return {
+    request: {
+      provider: provider?.trim(),
+      model: model?.trim(),
+      endpoint: endpoint?.trim(),
+      endpointClear: endpointClear || void 0
+    }
+  };
+}
+function parseSetKeyFlags(argv) {
+  if (!argv.includes("--set-key")) {
+    return { request: null };
+  }
+  let provider;
+  let key;
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === "--provider") {
+      provider = argv[i + 1];
+      i++;
+    } else if (arg === "--key") {
+      key = argv[i + 1];
+      i++;
+    }
+  }
+  if (!provider || provider.trim().length === 0) {
+    return { request: null, error: "--set-key requires --provider <id>" };
+  }
+  if (!key || key.trim().length === 0) {
+    return { request: null, error: "--set-key requires --key <secret>" };
+  }
+  return {
+    request: {
+      provider: provider.trim(),
+      key: key.trim()
+    }
+  };
+}
+function parseDiscoverModelsFlags(argv) {
+  if (!argv.includes("--discover-models")) {
+    return { provider: null, present: false };
+  }
+  let provider;
+  for (let i = 0; i < argv.length; i++) {
+    if (argv[i] === "--provider") {
+      provider = argv[i + 1];
+      i++;
+    }
+  }
+  return {
+    present: true,
+    provider: provider?.trim() || null
+  };
+}
+function buildDesktopConfigSnapshot() {
+  const config2 = getProviderConfig();
+  const providers = PROVIDERS.map((p3) => {
+    const cached2 = getCachedModels(p3.id);
+    const models = cached2?.models.map((m) => m.id) ?? [];
+    const defaultModel = config2.modelByProvider[p3.id] ?? "";
+    if (defaultModel && !models.includes(defaultModel)) {
+      models.unshift(defaultModel);
+    }
+    const custom2 = getCustomEndpoint(p3.id);
+    const builtin = p3.baseUrl ?? null;
+    return {
+      id: p3.id,
+      displayName: p3.displayName,
+      hasKey: !!resolveApiKey(p3.id),
+      envVar: p3.envVar,
+      models,
+      defaultModel,
+      endpoint: custom2 ?? null,
+      baseUrl: custom2 ?? builtin
+    };
+  });
+  return {
+    activeProviderId: config2.activeProviderId,
+    modelByProvider: { ...config2.modelByProvider },
+    providers,
+    cliVersion: getCurrentVersion(),
+    configPaths: {
+      provider: getProviderConfigPath(),
+      keys: getKeyStorePath()
+    }
+  };
+}
+function printDesktopConfig() {
+  const snap = buildDesktopConfigSnapshot();
+  process.stdout.write(JSON.stringify(snap, null, 2) + "\n");
+}
+function applySetConfig(req) {
+  try {
+    const config2 = getProviderConfig();
+    let targetProvider = req.provider ?? config2.activeProviderId;
+    if (req.provider) {
+      const exists = PROVIDERS.some((p3) => p3.id === req.provider);
+      if (!exists) {
+        return {
+          ok: false,
+          error: `unknown provider '${req.provider}'. Available: ${PROVIDERS.map((p3) => p3.id).join(", ")}`
+        };
+      }
+      setActiveProviderId(req.provider);
+      targetProvider = req.provider;
+    }
+    if (req.endpointClear) {
+      clearCustomEndpoint(targetProvider);
+    }
+    if (req.endpoint) {
+      setCustomEndpoint(targetProvider, req.endpoint);
+    }
+    if (req.model) {
+      setModelForProvider(targetProvider, req.model);
+    }
+    const after = getProviderConfig();
+    const ep = getCustomEndpoint(after.activeProviderId);
+    return {
+      ok: true,
+      message: `activeProvider=${after.activeProviderId} model=${after.modelByProvider[after.activeProviderId]}` + (ep ? ` endpoint=${ep}` : "")
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+function applySetKey(req) {
+  try {
+    const exists = PROVIDERS.some((p3) => p3.id === req.provider);
+    if (!exists) {
+      return {
+        ok: false,
+        error: `unknown provider '${req.provider}'. Available: ${PROVIDERS.map((p3) => p3.id).join(", ")}`
+      };
+    }
+    setApiKey(req.provider, req.key);
+    setActiveProviderId(req.provider);
+    return {
+      ok: true,
+      provider: req.provider,
+      masked: maskKey(req.key)
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+var DISCOVERABLE = [
+  "grok",
+  "glm",
+  "minimax",
+  "deepseek",
+  "openai-compatible"
+];
+async function runDiscoverModels(providerArg) {
+  const config2 = getProviderConfig();
+  const providerId = (providerArg ?? config2.activeProviderId).trim();
+  if (!DISCOVERABLE.includes(providerId)) {
+    if (providerId === "custom") {
+    } else {
+      return {
+        ok: false,
+        error: `provider '${providerId}' is not discoverable. Use: ${DISCOVERABLE.join(", ")}`
+      };
+    }
+  }
+  const discoveryId = providerId === "custom" ? "openai-compatible" : providerId;
+  try {
+    const entry = await discoverModelsForProvider(discoveryId);
+    return {
+      ok: true,
+      payload: {
+        ok: true,
+        provider: providerId,
+        models: entry.models.map((m) => m.id),
+        fetchedAt: entry.fetchedAt,
+        baseUrl: entry.baseUrl
+      }
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
 
 // src/cli/skillsMd.ts
 init_skills2();
@@ -39088,10 +39647,85 @@ function pickRootComponent() {
   }
   if (argv.includes("--help") || argv.includes("-h")) {
     console.log(
-      "zelari-code \u2014 AI Council coding agent CLI.\n\nUsage: zelari-code [options]\n\nOptions:\n  --version, -v       Print version and exit\n  --help, -h          Print this help and exit\n  --doctor            Diagnose install health (shim, bundle, PATH, deps,\n                      node/git/bash in the agent shell)\n  --fix-path          Add the npm global prefix to the user PATH\n                      (Windows only; fixes 'command not found' after install)\n  --skip-checks       Skip the boot-time prerequisite check\n                      (alias for ZELARI_SKIP_PREFLIGHT=1)\n  --no-wizard         Skip the first-run wizard\n  --reset-config      Re-run the wizard (clears provider.json on commit)\n  --headless          Run a single task without mounting the TUI\n    --task <text>       Task prompt (required in headless mode)\n    --output json|plain Output format (default: json)\n    --council          Use the 6-member council pipeline\n    --provider <id>    Provider override (default: active)\n    --model <id>       Model override (default: provider default)\n\nEnvironment:\n  ZELARI_NO_WIZARD=1    Skip the first-run wizard\n  ZELARI_SKIP_PREFLIGHT=1  Skip the boot prerequisite check\n  ZELARI_NO_PLUGIN_PROMPT=1  Skip the boot plugin-install prompt\n  ANATHEMA_DEV=1        Disable background update check + preflight\n"
+      "zelari-code \u2014 AI Council coding agent CLI.\n\nUsage: zelari-code [options]\n\nOptions:\n  --version, -v       Print version and exit\n  --help, -h          Print this help and exit\n  --doctor            Diagnose install health (shim, bundle, PATH, deps,\n                      node/git/bash in the agent shell)\n  --fix-path          Add the npm global prefix to the user PATH\n                      (Windows only; fixes 'command not found' after install)\n  --skip-checks       Skip the boot-time prerequisite check\n                      (alias for ZELARI_SKIP_PREFLIGHT=1)\n  --no-wizard         Skip the first-run wizard\n  --reset-config      Re-run the wizard (clears provider.json on commit)\n  --headless          Run a single task without mounting the TUI\n    --task <text>       Task prompt (required in headless mode)\n    --output json|plain Output format (default: json)\n    --mode agent|council|zelari  Dispatch mode (default: agent)\n    --council          Alias for --mode council\n    --phase plan|build  Work phase (default: build)\n    --provider <id>    Provider override (default: active)\n    --model <id>       Model override (default: provider default)\n  --print-config      Print provider/model config as JSON (no secrets)\n  --set-config        Persist provider/model/endpoint\n    --provider <id>    Set active provider\n    --model <id>       Set model for that provider\n    --endpoint <url>   Custom OpenAI-compatible base URL\n    --endpoint-clear   Remove custom endpoint override\n  --set-key           Store an API key (never printed back)\n    --provider <id>    Provider id (required)\n    --key <secret>     API key (required)\n  --discover-models   Refresh model list for a provider\n    --provider <id>    Provider (default: active)\n\nEnvironment:\n  ZELARI_NO_WIZARD=1    Skip the first-run wizard\n  ZELARI_SKIP_PREFLIGHT=1  Skip the boot prerequisite check\n  ZELARI_NO_PLUGIN_PROMPT=1  Skip the boot plugin-install prompt\n  ANATHEMA_DEV=1        Disable background update check + preflight\n"
     );
     process.exit(0);
   }
+  if (wantsPrintConfig(argv)) {
+    try {
+      printDesktopConfig();
+      process.exit(0);
+    } catch (err) {
+      console.error(
+        `[zelari-code --print-config] ${err instanceof Error ? err.message : String(err)}`
+      );
+      process.exit(1);
+    }
+  }
+  const setConfigParse = parseSetConfigFlags(argv);
+  if (setConfigParse.error) {
+    console.error(`[zelari-code --set-config] ${setConfigParse.error}`);
+    process.exit(1);
+  }
+  if (setConfigParse.request) {
+    const result = applySetConfig(setConfigParse.request);
+    if (!result.ok) {
+      console.error(`[zelari-code --set-config] ${result.error}`);
+      process.exit(1);
+    }
+    console.log(JSON.stringify({ ok: true, message: result.message }));
+    process.exit(0);
+  }
+  if (wantsSetKey(argv)) {
+    const keyParse = parseSetKeyFlags(argv);
+    if (keyParse.error || !keyParse.request) {
+      console.error(
+        `[zelari-code --set-key] ${keyParse.error ?? "invalid arguments"}`
+      );
+      process.exit(1);
+    }
+    const result = applySetKey(keyParse.request);
+    if (!result.ok) {
+      console.error(`[zelari-code --set-key] ${result.error}`);
+      process.exit(1);
+    }
+    console.log(
+      JSON.stringify({
+        ok: true,
+        provider: result.provider,
+        masked: result.masked
+      })
+    );
+    process.exit(0);
+  }
+  if (wantsDiscoverModels(argv)) {
+    const disc = parseDiscoverModelsFlags(argv);
+    void runDiscoverModels(disc.provider).then(async (result) => {
+      if (!result.ok) {
+        console.error(JSON.stringify({ ok: false, error: result.error }));
+        await new Promise((r) => setImmediate(r));
+        process.exit(1);
+        return;
+      }
+      console.log(JSON.stringify(result.payload));
+      try {
+        await getMetricsLogger().flush();
+      } catch {
+      }
+      await new Promise((r) => setImmediate(r));
+      process.exit(0);
+    }).catch(async (err) => {
+      console.error(
+        JSON.stringify({
+          ok: false,
+          error: err instanceof Error ? err.message : String(err)
+        })
+      );
+      await new Promise((r) => setImmediate(r));
+      process.exit(1);
+    });
+    return { kind: "done" };
+  }
   const headlessParse = parseHeadlessFlags(argv);
   if (headlessParse.options !== null) {
     return { kind: "headless", headlessOpts: headlessParse.options };
@@ -39109,16 +39743,16 @@ function pickRootComponent() {
   });
   if (decision.shouldRun) {
     console.error(`[zelari-code] starting wizard: ${decision.reason}`);
-    return { kind: "wizard", element: React14.createElement(RunWizard) };
+    return { kind: "wizard", element: React15.createElement(RunWizard) };
   }
   return {
     kind: "app",
-    element: React14.createElement(
+    element: React15.createElement(
       SplashGate,
       { version: VERSION },
-      React14.createElement(PluginGate, {
+      React15.createElement(PluginGate, {
         cwd: process.cwd(),
-        children: React14.createElement(App)
+        children: React15.createElement(App)
       })
     )
   };
@@ -39144,10 +39778,27 @@ function main() {
   runPreflight();
   loadUserSkills();
   if (picked.kind === "headless") {
-    void runHeadless(picked.headlessOpts).then((code) => {
-      void getMetricsLogger().flush().catch(() => {
-      });
+    void runHeadless(picked.headlessOpts).then(async (code) => {
+      try {
+        await getMetricsLogger().flush();
+      } catch {
+      }
+      try {
+        const { closeMcpClients: closeMcpClients2 } = await Promise.resolve().then(() => (init_mcpManager(), mcpManager_exports));
+        closeMcpClients2();
+      } catch {
+      }
+      await new Promise((resolve) => setImmediate(resolve));
       process.exit(code);
+    }).catch(async (err) => {
+      console.error(
+        `[zelari-code --headless] fatal: ${err instanceof Error ? err.message : String(err)}`
+      );
+      try {
+        await getMetricsLogger().flush();
+      } catch {
+      }
+      process.exit(2);
     });
     return;
   }