zelari-code 1.7.1 → 1.8.2

package/dist/cli/main.bundled.js

@@ -1535,10 +1535,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path34) {
-  if (!path34)
+function getElementAtPath(obj, path36) {
+  if (!path36)
     return obj;
-  return path34.reduce((acc, key) => acc?.[key], obj);
+  return path36.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1866,11 +1866,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path34, issues) {
+function prefixIssues(path36, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path34);
+    iss.path.unshift(path36);
     return iss;
   });
 }
@@ -2088,16 +2088,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path34 = []) => {
+  const processError = (error52, path36 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path34, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path36, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path36, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path36, ...issue2.path]);
       } else {
-        const fullpath = [...path34, ...issue2.path];
+        const fullpath = [...path36, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -2124,17 +2124,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path34 = []) => {
+  const processError = (error52, path36 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path34, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path36, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path36, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path34, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path36, ...issue2.path]);
       } else {
-        const fullpath = [...path34, ...issue2.path];
+        const fullpath = [...path36, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -2166,8 +2166,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path34 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path34) {
+  const path36 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path36) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -15670,13 +15670,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path34 = ref.slice(1).split("/").filter(Boolean);
-  if (path34.length === 0) {
+  const path36 = ref.slice(1).split("/").filter(Boolean);
+  if (path36.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path34[0] === defsKey) {
-    const key = path34[1];
+  if (path36[0] === defsKey) {
+    const key = path36[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -16880,6 +16880,25 @@ var init_walk = __esm({
 // packages/core/dist/core/tools/builtin/search.js
 import { promises as fs6 } from "node:fs";
 import path7 from "node:path";
+function coerceStringList(value, fallback) {
+  if (value === void 0 || value === null)
+    return fallback;
+  if (Array.isArray(value)) {
+    const cleaned = value.filter((x) => typeof x === "string" && x.trim().length > 0);
+    return cleaned.length > 0 ? cleaned : fallback;
+  }
+  if (typeof value === "string") {
+    const s = value.trim();
+    if (!s)
+      return fallback;
+    if (s.includes(",") && !s.includes("{")) {
+      const parts = s.split(",").map((x) => x.trim()).filter(Boolean);
+      return parts.length > 0 ? parts : fallback;
+    }
+    return [s];
+  }
+  return fallback;
+}
 async function searchFile(absPath, relPath, regex, contextLines, remainingSlots) {
   let buf;
   try {
@@ -16923,13 +16942,14 @@ async function isDirectory(p3) {
     return false;
   }
 }
-var GrepContentArgsSchema, grepContentTool;
+var stringOrStringArray, GrepContentArgsSchema, grepContentTool;
 var init_search = __esm({
   "packages/core/dist/core/tools/builtin/search.js"() {
     "use strict";
     init_zod();
     init_toolTypes();
     init_walk();
+    stringOrStringArray = external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]);
     GrepContentArgsSchema = external_exports.object({
       /** File OR directory to search (relative to cwd or absolute). */
       path: external_exports.string().min(1),
@@ -16940,21 +16960,22 @@ var init_search = __esm({
       /** Max matches returned (total matches still counted). */
       maxMatches: external_exports.number().int().positive().max(1e3).default(50),
       /**
-       * Glob patterns to INCLUDE when path is a directory (e.g. ['*.ts', '*.tsx']).
+       * Glob pattern(s) to INCLUDE when path is a directory.
+       * Accepts a string OR string[] (models often emit a bare string).
        * Default ['*'] = all files. Ignored when path is a file.
        */
-      include: external_exports.array(external_exports.string()).default(["*"]),
+      include: stringOrStringArray.optional().default(["*"]),
       /**
-       * Glob patterns to EXCLUDE when path is a directory (e.g. ['*.test.ts']).
-       * Defaults to common noise dirs. Ignored when path is a file.
+       * Glob pattern(s) to EXCLUDE when path is a directory.
+       * Accepts a string OR string[]. Defaults to common noise dirs.
        */
-      exclude: external_exports.array(external_exports.string()).default(DEFAULT_EXCLUDES),
+      exclude: stringOrStringArray.optional().default(DEFAULT_EXCLUDES),
       /** Max recursion depth when path is a directory (default 8). */
       maxDepth: external_exports.number().int().positive().max(15).default(8)
     });
     grepContentTool = {
       name: "grep_content",
-      description: "Regex search for content in a file OR recursively in a directory. When path is a directory, include/exclude globs filter which files are searched (default: all files, excluding node_modules/dist/.git/etc.). Returns matches with line numbers and surrounding context. Single-file mode preserves v0.3.x behavior.",
+      description: 'Regex search for content in a file OR recursively in a directory. When path is a directory, include/exclude globs filter which files are searched (default: all files, excluding node_modules/dist/.git/etc.). include/exclude accept a single glob string (e.g. "*.ts") OR an array of globs. Returns matches with line numbers and surrounding context.',
       permissions: ["read"],
       timeoutMs: 3e4,
       inputSchema: GrepContentArgsSchema,
@@ -16962,6 +16983,8 @@ var init_search = __esm({
         try {
           const absRoot = path7.isAbsolute(args.path) ? args.path : path7.join(ctx.cwd, args.path);
           const regex = new RegExp(args.pattern, "gm");
+          const include = coerceStringList(args.include, ["*"]);
+          const exclude = coerceStringList(args.exclude, DEFAULT_EXCLUDES);
           if (!await isDirectory(absRoot)) {
             const single = await searchFile(absRoot, args.path, regex, args.contextLines, args.maxMatches);
             return typedOk({
@@ -16973,8 +16996,8 @@ var init_search = __esm({
             });
           }
           const allEntries = [];
-          await walk(absRoot, "", 0, args.maxDepth, args.exclude, allEntries, ctx.signal);
-          const matchedFiles = filterByInclude(allEntries, args.include);
+          await walk(absRoot, "", 0, args.maxDepth, exclude, allEntries, ctx.signal);
+          const matchedFiles = filterByInclude(allEntries, include);
           const allMatches = [];
           let totalMatches = 0;
           let truncated = false;
@@ -17753,11 +17776,11 @@ var init_tools = __esm({
           if (!ctx.addDocument)
             return "Knowledge vault tool not available.";
           const title = args["title"] || "New Document";
-          const path34 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
+          const path36 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
           const content = args["content"] || "";
           const tags = args["tags"] || [];
           ctx.addDocument({
-            path: path34,
+            path: path36,
             title,
             content,
             format: "markdown",
@@ -17766,7 +17789,7 @@ var init_tools = __esm({
             workspaceId: ctx.workspaceId
           });
           ctx.addActivity("vault", "created document", title);
-          return `Document "${title}" created at "${path34}".`;
+          return `Document "${title}" created at "${path36}".`;
         }
       }
     ];
@@ -18271,20 +18294,24 @@ The council shares a context window across turns. Follow these rules:
         type: "tool-usage-guidelines",
         title: "Tool Usage",
         priority: 60,
-        content: `# Tool Usage Guidelines
-
-- Use tools to create or modify durable state (tasks, ideas, documents, mind maps, milestones).
-- Tool calls go in a dedicated block at the end of your response using the exact format documented below.
-- Only use tools listed in the AVAILABLE TOOLS section. Never invent tool names.
-- Pass arguments as JSON. Required parameters must be present.
-- One tool call per entry. Multiple entries are allowed in a single block.
-
-Format:
-\`\`\`
----TOOLS---
-[{"name":"<toolName>","args":{...}}]
----END---
-\`\`\``
+        content: [
+          "# Tool Usage Guidelines",
+          "",
+          "- Use tools to create or modify durable state (tasks, ideas, documents, mind maps, milestones).",
+          "- Tool calls go in a dedicated block at the end of your response using the exact format documented below.",
+          "- Only use tools listed in the AVAILABLE TOOLS section. Never invent tool names.",
+          "- Pass arguments as JSON. Required parameters must be present.",
+          "- One tool call per entry. Multiple entries are allowed in a single block.",
+          "",
+          "Format (ONE JSON array only - never multiple arrays stacked):",
+          "```",
+          "---TOOLS---",
+          '[{"name":"<toolName>","args":{"key":"value"}},{"name":"<toolName2>","args":{"key":"value"}}]',
+          "---END---",
+          "```",
+          "Rules: valid JSON; escape newlines inside strings as \\n; do NOT stack separate",
+          "JSON arrays (one tool per array) - put every call in the SAME outer array."
+        ].join("\n")
       },
       {
         type: "custom",
@@ -18946,16 +18973,53 @@ 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 (/\]\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;
+  }
+  return extractToolObjects(body);
+}
+function tryParseToolArray(raw) {
   let parsed;
   try {
-    parsed = JSON.parse(m[1].trim());
+    parsed = JSON.parse(raw.trim());
   } catch {
     return [];
   }
-  if (!Array.isArray(parsed))
-    return [];
+  if (!Array.isArray(parsed)) {
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      parsed = [parsed];
+    } else {
+      return [];
+    }
+  }
+  return normalizeToolItems(parsed);
+}
+function normalizeToolItems(items) {
   const out = [];
-  for (const item of parsed) {
+  for (const item of items) {
     if (item && typeof item === "object" && typeof item.name === "string") {
       const rawArgs = item.args;
       out.push({
@@ -18966,6 +19030,70 @@ function parseTextToolCalls(text) {
   }
   return out;
 }
+function extractJsonArrays(text) {
+  const out = [];
+  let i = 0;
+  while (i < text.length) {
+    if (text[i] !== "[") {
+      i++;
+      continue;
+    }
+    let depth = 0;
+    let inStr = false;
+    let esc2 = false;
+    let end = -1;
+    for (let j = i; j < text.length; j++) {
+      const c = text[j];
+      if (inStr) {
+        if (esc2)
+          esc2 = false;
+        else if (c === "\\")
+          esc2 = true;
+        else if (c === '"')
+          inStr = false;
+        continue;
+      }
+      if (c === '"') {
+        inStr = true;
+        continue;
+      }
+      if (c === "[")
+        depth++;
+      else if (c === "]") {
+        depth--;
+        if (depth === 0) {
+          end = j;
+          break;
+        }
+      }
+    }
+    if (end > i) {
+      out.push(text.slice(i, end + 1));
+      i = end + 1;
+    } else {
+      i++;
+    }
+  }
+  return out;
+}
+function extractToolObjects(text) {
+  const out = [];
+  const re = /\{\s*"name"\s*:\s*"([^"]+)"\s*,\s*"args"\s*:\s*(\{[\s\S]*?\})\s*\}/g;
+  let match;
+  while ((match = re.exec(text)) !== null) {
+    const name = match[1];
+    let args = {};
+    try {
+      const parsed = JSON.parse(match[2]);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        args = parsed;
+      }
+    } catch {
+    }
+    out.push({ name, args });
+  }
+  return out;
+}
 var AgentHarness;
 var init_AgentHarness = __esm({
   "packages/core/dist/core/AgentHarness.js"() {
@@ -19037,6 +19165,145 @@ var init_AgentHarness = __esm({
           ...this.config.memberName ? { memberName: this.config.memberName } : {}
         };
       }
+      /**
+       * v1.8.0: true when a tool may run concurrently with other parallel-safe
+       * tools. Write/execute tools stay serial (preserve file/order safety).
+       * `task` is parallel-safe (read-only sub-agents). Opt out: ZELARI_PARALLEL_TOOLS=0.
+       */
+      isParallelSafeTool(toolName) {
+        if (process.env.ZELARI_PARALLEL_TOOLS === "0")
+          return false;
+        if (toolName === "task")
+          return true;
+        const def = this.config.toolRegistry?.get(toolName);
+        if (!def) {
+          if (toolName.startsWith("mcp_")) {
+            const lower = toolName.toLowerCase();
+            if (lower.includes("write") || lower.includes("edit") || lower.includes("delete")) {
+              return false;
+            }
+            return true;
+          }
+          return false;
+        }
+        const perms = def.permissions ?? [];
+        if (perms.includes("write") || perms.includes("execute"))
+          return false;
+        return true;
+      }
+      /**
+       * Execute buffered native tool calls: consecutive parallel-safe tools run
+       * via Promise.all (chunked by ZELARI_MAX_PARALLEL_TOOLS, default 6); write/
+       * execute tools run one-at-a-time in order.
+       */
+      async executePendingTools(pending, maxToolCalls) {
+        const out = new Array(pending.length);
+        const maxParallel = Math.max(1, Number.parseInt(process.env.ZELARI_MAX_PARALLEL_TOOLS ?? "6", 10) || 6);
+        const inflight = /* @__PURE__ */ new Map();
+        const invokeOne = async (p3) => {
+          if (p3.cached !== void 0) {
+            return {
+              content: p3.cached,
+              isError: p3.skipped || p3.cached.startsWith("[skipped]"),
+              durationMs: 0
+            };
+          }
+          if (p3.skipped || !this.config.toolRegistry) {
+            return {
+              content: `[skipped] maxToolCallsPerTurn reached (limit=${maxToolCalls})`,
+              isError: true,
+              durationMs: 0
+            };
+          }
+          const callKey = hashToolCall(p3.toolName, p3.args);
+          const fromRunCache = this.toolCallCache.get(callKey);
+          if (fromRunCache !== void 0) {
+            return {
+              content: `[duplicate call \u2014 result repeated; do not call this tool again with the same arguments]
+${fromRunCache}`,
+              isError: false,
+              durationMs: 0
+            };
+          }
+          const existing = inflight.get(callKey);
+          if (existing) {
+            const shared2 = await existing;
+            return {
+              content: `[duplicate call \u2014 result repeated; do not call this tool again with the same arguments]
+${shared2.content}`,
+              isError: false,
+              durationMs: 0
+            };
+          }
+          const startMs = Date.now();
+          const prom = (async () => {
+            const result = await this.config.toolRegistry.invoke(p3.toolName, p3.args, {
+              cwd: this.config.cwd,
+              sessionId: this.sessionId,
+              signal: this.activeController?.signal
+            });
+            let resultStr = "";
+            if (result.ok) {
+              if (typeof result.value === "string")
+                resultStr = result.value;
+              else if (typeof result.value === "object" && result.value !== null) {
+                resultStr = JSON.stringify(result.value, null, 2);
+              } else
+                resultStr = String(result.value);
+            } else {
+              resultStr = result.error;
+            }
+            return {
+              content: resultStr,
+              isError: !result.ok,
+              durationMs: Date.now() - startMs
+            };
+          })();
+          inflight.set(callKey, prom);
+          const r = await prom;
+          if (!r.isError)
+            this.toolCallCache.set(callKey, r.content);
+          return { ...r, cacheKey: callKey };
+        };
+        const toOut = (p3, r) => {
+          const endEvent = createBrainEvent("tool_execution_end", this.sessionId, {
+            toolCallId: p3.toolCallId,
+            result: r.content,
+            isError: r.isError,
+            durationMs: r.durationMs
+          });
+          return {
+            toolCallId: p3.toolCallId,
+            content: r.content,
+            isError: r.isError,
+            endEvent
+            // Cache already written in invokeOne; no need to re-set.
+          };
+        };
+        let i = 0;
+        while (i < pending.length) {
+          const p3 = pending[i];
+          if (p3.skipped || p3.cached !== void 0 || !this.isParallelSafeTool(p3.toolName)) {
+            out[i] = toOut(p3, await invokeOne(p3));
+            i += 1;
+            continue;
+          }
+          let j = i;
+          while (j < pending.length && !pending[j].skipped && pending[j].cached === void 0 && this.isParallelSafeTool(pending[j].toolName)) {
+            j += 1;
+          }
+          for (let off = i; off < j; off += maxParallel) {
+            const end = Math.min(off + maxParallel, j);
+            const slice = pending.slice(off, end);
+            const results = await Promise.all(slice.map((item) => invokeOne(item)));
+            for (let k = 0; k < results.length; k++) {
+              out[off + k] = toOut(slice[k], results[k]);
+            }
+          }
+          i = j;
+        }
+        return out;
+      }
       /**
        * Cancel the in-flight run. Events drain until end of stream.
        *
@@ -19254,6 +19521,7 @@ var init_AgentHarness = __esm({
           let turnText = "";
           const turnToolCalls = [];
           const turnToolResults = [];
+          const pendingNativeTools = [];
           for await (const delta of stream) {
             if (this.cancelled) {
               const cancelEvent = createBrainEvent("error", this.sessionId, {
@@ -19288,73 +19556,52 @@ var init_AgentHarness = __esm({
               this.emit(toolStartEvent);
               yield toolStartEvent;
               const skipped = typeof maxToolCalls === "number" && toolCallsThisTurn > maxToolCalls;
-              if (this.config.toolRegistry && !skipped) {
+              if (!this.config.toolRegistry) {
+              } else if (skipped) {
+                pendingNativeTools.push({
+                  toolCallId: delta.toolCallId,
+                  toolName: delta.toolName,
+                  args: delta.args,
+                  skipped: true
+                });
+              } else {
                 const callKey = hashToolCall(delta.toolName, delta.args);
                 const cached2 = this.toolCallCache.get(callKey);
                 if (cached2 !== void 0) {
-                  const dupResult = `[duplicate call \u2014 result repeated; do not call this tool again with the same arguments]
-${cached2}`;
-                  const endEvent = createBrainEvent("tool_execution_end", this.sessionId, {
-                    toolCallId: delta.toolCallId,
-                    result: dupResult,
-                    isError: false,
-                    durationMs: 0
-                  });
-                  this.emit(endEvent);
-                  yield endEvent;
-                  turnToolResults.push({
+                  pendingNativeTools.push({
                     toolCallId: delta.toolCallId,
-                    content: dupResult
+                    toolName: delta.toolName,
+                    args: delta.args,
+                    skipped: false,
+                    cached: `[duplicate call \u2014 result repeated; do not call this tool again with the same arguments]
+${cached2}`
                   });
                 } else {
-                  const startMs = Date.now();
-                  const result = await this.config.toolRegistry.invoke(delta.toolName, delta.args, {
-                    cwd: this.config.cwd,
-                    sessionId: this.sessionId,
-                    signal: this.activeController?.signal
-                  });
-                  let resultStr = "";
-                  if (result.ok) {
-                    if (typeof result.value === "string") {
-                      resultStr = result.value;
-                    } else if (typeof result.value === "object" && result.value !== null) {
-                      resultStr = JSON.stringify(result.value, null, 2);
-                    } else {
-                      resultStr = String(result.value);
-                    }
-                  } else {
-                    resultStr = result.error;
-                  }
-                  const endEvent = createBrainEvent("tool_execution_end", this.sessionId, {
-                    toolCallId: delta.toolCallId,
-                    result: resultStr,
-                    isError: !result.ok,
-                    durationMs: Date.now() - startMs
-                  });
-                  this.emit(endEvent);
-                  yield endEvent;
-                  turnToolResults.push({
+                  pendingNativeTools.push({
                     toolCallId: delta.toolCallId,
-                    content: resultStr
+                    toolName: delta.toolName,
+                    args: delta.args,
+                    skipped: false
                   });
-                  this.toolCallCache.set(callKey, resultStr);
                 }
-              } else if (skipped) {
-                const endEvent = createBrainEvent("tool_execution_end", this.sessionId, {
-                  toolCallId: delta.toolCallId,
-                  result: `[skipped] maxToolCallsPerTurn reached (limit=${maxToolCalls})`,
-                  isError: true,
-                  durationMs: 0
-                });
-                this.emit(endEvent);
-                yield endEvent;
-                turnToolResults.push({
-                  toolCallId: delta.toolCallId,
-                  content: `[skipped] maxToolCallsPerTurn reached (limit=${maxToolCalls})`
-                });
               }
             } else if (delta.kind === "finish") {
               finishRef.value = delta.reason;
+              if (pendingNativeTools.length > 0) {
+                const executed = await this.executePendingTools(pendingNativeTools, maxToolCalls);
+                for (const item of executed) {
+                  this.emit(item.endEvent);
+                  yield item.endEvent;
+                  turnToolResults.push({
+                    toolCallId: item.toolCallId,
+                    content: item.content
+                  });
+                  if (item.cacheKey && item.content && !item.isError) {
+                    this.toolCallCache.set(item.cacheKey, item.content);
+                  }
+                }
+                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");
@@ -21705,12 +21952,44 @@ var init_tools4 = __esm({
 });
 
 // src/cli/browser/driver.ts
-async function runBrowserCheck(options, loader = defaultPlaywrightLoader) {
+import { createRequire } from "node:module";
+import path21 from "node:path";
+import { pathToFileURL } from "node:url";
+function asPlaywright(mod) {
+  if (!mod || typeof mod !== "object") return null;
+  const m = mod;
+  if (m.chromium && typeof m.chromium.launch === "function") return m;
+  const d = m.default;
+  if (d && d.chromium && typeof d.chromium.launch === "function") return d;
+  return null;
+}
+async function loadPlaywright(cwd) {
+  const base = cwd && cwd.length > 0 ? path21.resolve(cwd) : void 0;
+  if (base) {
+    try {
+      const req = createRequire(path21.join(base, "package.json"));
+      const resolved = req.resolve("playwright");
+      const mod = await import(pathToFileURL(resolved).href);
+      const pw = asPlaywright(mod);
+      if (pw) return pw;
+    } catch {
+    }
+  }
+  try {
+    const pkg = "playwright";
+    const mod = await import(pkg);
+    return asPlaywright(mod);
+  } catch {
+    return null;
+  }
+}
+async function runBrowserCheck(options, loader) {
   const consoleErrors = [];
   const pageErrors = [];
   const failedRequests = [];
   const base = { ok: false, consoleErrors, pageErrors, failedRequests };
-  const pw = await loader();
+  const resolve = loader ?? (() => loadPlaywright(options.cwd ?? process.cwd()));
+  const pw = await resolve();
   if (!pw) {
     return {
       ...base,
@@ -21786,25 +22065,14 @@ async function runBrowserCheck(options, loader = defaultPlaywrightLoader) {
     }
   }
 }
-var defaultPlaywrightLoader;
 var init_driver = __esm({
   "src/cli/browser/driver.ts"() {
     "use strict";
-    defaultPlaywrightLoader = async () => {
-      try {
-        const pkg = "playwright";
-        const mod = await import(pkg);
-        if (mod && mod.chromium && typeof mod.chromium.launch === "function") return mod;
-        return null;
-      } catch {
-        return null;
-      }
-    };
   }
 });
 
 // src/cli/browser/tools.ts
-import path21 from "node:path";
+import path22 from "node:path";
 import os7 from "node:os";
 function createBrowserTool(deps = {}) {
   return {
@@ -21819,13 +22087,14 @@ function createBrowserTool(deps = {}) {
       waitForSelector: external_exports.string().optional().describe("Assert this CSS selector is present after actions."),
       screenshot: external_exports.boolean().optional().describe("Save a screenshot (default true).")
     }),
-    execute: async (args) => {
+    execute: async (args, ctx) => {
       const a = args;
       const dir = deps.screenshotDir ?? os7.tmpdir();
-      const screenshotPath = a.screenshot === false ? void 0 : path21.join(dir, `zelari-browser-${Date.now()}.png`);
+      const screenshotPath = a.screenshot === false ? void 0 : path22.join(dir, `zelari-browser-${Date.now()}.png`);
       const result = await runBrowserCheck(
         {
           url: a.url,
+          cwd: ctx.cwd,
           ...a.actions ? { actions: a.actions } : {},
           ...a.waitForSelector ? { waitForSelector: a.waitForSelector } : {},
           ...screenshotPath ? { screenshotPath } : {}
@@ -21890,7 +22159,7 @@ function createBuiltinToolRegistry(options = {}) {
   const safeFetchUrl = wrapWithAudit(fetchUrlTool, audit, sessionId);
   const safeWebSearch = wrapWithAudit(webSearchTool, audit, sessionId);
   const registry3 = new ToolRegistry();
-  const readOnly = options.readOnly === true;
+  const readOnly = options.readOnly === true || options.planMode === true;
   registry3.register(safeReadFile);
   registry3.register(safeGrepContent);
   registry3.register(safeListFiles);
@@ -23047,11 +23316,11 @@ var init_synthesisAudit = __esm({
 import { existsSync as existsSync10, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "node:fs";
 import { join as join2 } from "node:path";
 function loadNfrSpec(zelariRoot) {
-  const path34 = join2(zelariRoot, "nfr-spec.json");
-  if (!existsSync10(path34))
+  const path36 = join2(zelariRoot, "nfr-spec.json");
+  if (!existsSync10(path36))
     return null;
   try {
-    const raw = JSON.parse(readFileSync8(path34, "utf8"));
+    const raw = JSON.parse(readFileSync8(path36, "utf8"));
     if (raw.version !== 1 || !Array.isArray(raw.targets))
       return null;
     return raw;
@@ -23793,11 +24062,19 @@ function parseClarificationRequest(text) {
   }
 }
 function parseThinking(text) {
-  const match = text.match(/<think>([\s\S]*?)<\/think>/);
-  return match ? match[1].trim() : "";
+  const complete = text.match(/<think(?:ing)?>([\s\S]*?)<\/think(?:ing)?>/i);
+  if (complete)
+    return complete[1].trim();
+  const open = text.match(/<think(?:ing)?>([\s\S]*)$/i);
+  return open ? open[1].trim() : "";
 }
-function cleanAgentContent(text) {
-  return text.replace(/<think>[\s\S]*?<\/think>/g, "").replace(/<minimax:tool_call>[\s\S]*?<\/minimax:tool_call>/g, "").replace(/---QUESTION---[\s\S]*?---END---/g, "").trim();
+function cleanAgentContent(text, opts = {}) {
+  const stripQuestion = opts.stripQuestion !== false;
+  let out = text.replace(/<think(?:ing)?>[\s\S]*?<\/think(?:ing)?>/gi, "").replace(/<think(?:ing)?>[\s\S]*$/gi, "").replace(/<\/think(?:ing)?>/gi, "").replace(/<minimax:tool_call>[\s\S]*?<\/minimax:tool_call>/g, "");
+  if (stripQuestion) {
+    out = out.replace(/---QUESTION---[\s\S]*?---END---/g, "");
+  }
+  return out.replace(/\n{3,}/g, "\n\n").trim();
 }
 function restrictImplementationWrites(toolNames, opts) {
   if (opts.runMode !== "implementation" || opts.isImplementer)
@@ -24035,6 +24312,19 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
         role: "system",
         content: `(Agent ${agent.name} asked: ${clarification.question})`
       });
+      if (callbacks.onClarification && clarification.choices && clarification.choices.length >= 2) {
+        try {
+          const answer = await callbacks.onClarification(clarification);
+          if (answer && answer.trim()) {
+            agentOutputs.push({
+              name: "User",
+              role: "user",
+              content: `Answer to clarifying question "${clarification.question}": ${answer.trim()}`
+            });
+          }
+        } catch {
+        }
+      }
     }
   }
   if (oracle && !completedIds.has(oracle.id)) {
@@ -25263,9 +25553,9 @@ var init_types2 = __esm({
 import { readFileSync as readFileSync13 } from "node:fs";
 import { join as join8 } from "node:path";
 function readLessonsDeduped(zelariRoot) {
-  const path34 = join8(zelariRoot, LESSONS_FILE);
+  const path36 = join8(zelariRoot, LESSONS_FILE);
   try {
-    const raw = readFileSync13(path34, "utf8");
+    const raw = readFileSync13(path36, "utf8");
     const byId = /* @__PURE__ */ new Map();
     for (const line of raw.split(/\r?\n/)) {
       if (!line.trim())
@@ -25366,8 +25656,8 @@ function keywordsFrom(check2, signature) {
   return [.../* @__PURE__ */ new Set([...fromId, ...words])].slice(0, 12);
 }
 function writeLesson(zelariRoot, lesson) {
-  const path34 = join9(zelariRoot, LESSONS_FILE);
-  appendFileSync2(path34, `${JSON.stringify(lesson)}
+  const path36 = join9(zelariRoot, LESSONS_FILE);
+  appendFileSync2(path36, `${JSON.stringify(lesson)}
 `, "utf8");
 }
 function findSimilar(lessons, signature) {
@@ -25901,6 +26191,273 @@ var init_council = __esm({
   }
 });
 
+// src/cli/utils/envNumber.ts
+function envNumber(raw, opts) {
+  const { default: def, min, max } = opts;
+  if (raw === void 0 || raw === null) return def;
+  const trimmed = raw.trim();
+  if (trimmed.length === 0) return def;
+  if (trimmed.toLowerCase() === "undefined" || trimmed.toLowerCase() === "null") return def;
+  const parsed = Number.parseInt(trimmed, 10);
+  if (!Number.isFinite(parsed)) return def;
+  const absStr = `${Math.abs(parsed)}`;
+  const body = trimmed.replace(/^[-+]/, "").replace(/^0+(?=\d)/, "");
+  if (body !== absStr) return def;
+  const firstChar = trimmed[0];
+  const expectedSign = parsed < 0 ? "-" : /[0-9+]/.test(firstChar ?? "");
+  const actualSign = parsed < 0 ? firstChar === "-" : firstChar !== "-";
+  if (!expectedSign || !actualSign) return def;
+  let clamped = parsed;
+  if (min !== void 0 && clamped < min) clamped = min;
+  if (max !== void 0 && clamped > max) clamped = max;
+  return clamped;
+}
+var init_envNumber = __esm({
+  "src/cli/utils/envNumber.ts"() {
+    "use strict";
+  }
+});
+
+// src/cli/hooks/historyCompaction.ts
+function resolveMaxMessages(opts) {
+  const envTurns = envNumber(process.env.ZELARI_HISTORY_TURNS, { default: 6, min: 0 });
+  const turns = opts?.maxMessages ? Math.ceil(opts.maxMessages / 4) : envTurns;
+  if (turns <= 0) return 0;
+  return turns * 4;
+}
+function findValidCutIndex(messages, naiveCut) {
+  let cut = naiveCut;
+  while (cut < messages.length) {
+    const kept = messages.slice(cut);
+    const declared = /* @__PURE__ */ new Set();
+    for (const m of kept) {
+      if (m.role === "assistant" && m.toolCalls) {
+        for (const tc of m.toolCalls) declared.add(tc.id);
+      }
+    }
+    let moved = false;
+    for (let k = 0; k < kept.length; k++) {
+      const m = kept[k];
+      if (m.role === "tool" && m.toolCallId && !declared.has(m.toolCallId)) {
+        for (let j = cut - 1; j >= 0; j--) {
+          const prev2 = messages[j];
+          if (prev2.role === "assistant" && prev2.toolCalls && prev2.toolCalls.some((tc) => tc.id === m.toolCallId)) {
+            cut = j;
+            moved = true;
+            break;
+          }
+        }
+        break;
+      }
+    }
+    if (!moved) break;
+  }
+  return cut;
+}
+function compactHistory(messages, opts) {
+  const maxMessages = resolveMaxMessages(opts);
+  if (maxMessages === 0) return [];
+  if (messages.length <= maxMessages * 2) return messages;
+  const naiveCut = messages.length - maxMessages;
+  const cut = findValidCutIndex(messages, naiveCut);
+  const dropped = cut;
+  if (dropped === 0) return messages;
+  const kept = messages.slice(cut);
+  const summary = {
+    role: "system",
+    content: `${COMPACT_MARKER} ${dropped} earlier message(s) dropped.`
+  };
+  return [summary, ...kept];
+}
+var COMPACT_MARKER;
+var init_historyCompaction = __esm({
+  "src/cli/hooks/historyCompaction.ts"() {
+    "use strict";
+    init_envNumber();
+    COMPACT_MARKER = "[history] Earlier turns were compacted to stay within the context budget.";
+  }
+});
+
+// src/cli/hooks/conversationContext.ts
+var conversationContext_exports = {};
+__export(conversationContext_exports, {
+  _resetConversationContextForTests: () => _resetConversationContextForTests,
+  appendMessages: () => appendMessages,
+  clearHistory: () => clearHistory,
+  compactInPlace: () => compactInPlace,
+  formatHistoryForCouncil: () => formatHistoryForCouncil,
+  getHistory: () => getHistory,
+  getLastClarification: () => getLastClarification,
+  hydrateHistory: () => hydrateHistory,
+  maybeAnchorShortAnswer: () => maybeAnchorShortAnswer,
+  serializeHistory: () => serializeHistory,
+  setHistory: () => setHistory,
+  setLastClarification: () => setLastClarification
+});
+function getHistory() {
+  return history;
+}
+function setHistory(messages) {
+  history = [...messages];
+}
+function compactInPlace() {
+  history = compactHistory(history);
+}
+function appendMessages(msgs) {
+  if (msgs.length === 0) return;
+  history = history.concat(msgs);
+}
+function clearHistory() {
+  history = [];
+  lastClarification = null;
+}
+function serializeHistory() {
+  return [...history];
+}
+function hydrateHistory(messages) {
+  history = [...messages];
+}
+function getLastClarification() {
+  return lastClarification;
+}
+function setLastClarification(c) {
+  lastClarification = c ? { question: c.question, choices: c.choices, at: Date.now() } : null;
+}
+function maybeAnchorShortAnswer(userText) {
+  const clar = lastClarification;
+  if (!clar) return null;
+  const trimmed = userText.trim();
+  if (!trimmed) return null;
+  if (trimmed.length > 80 || trimmed.includes("\n")) return null;
+  const lower = trimmed.toLowerCase();
+  const choices = clar.choices;
+  const matched = choices.find((c) => c.toLowerCase() === lower) ?? choices.find((c) => c.toLowerCase().startsWith(lower)) ?? choices.find((c) => lower.startsWith(c.toLowerCase().slice(0, Math.min(4, c.length))));
+  let choiceLabel = matched ?? null;
+  if (!choiceLabel && /^\d{1,2}$/.test(trimmed)) {
+    const idx = Number.parseInt(trimmed, 10) - 1;
+    if (idx >= 0 && idx < choices.length) choiceLabel = choices[idx] ?? null;
+  }
+  if (!choiceLabel && trimmed.length > 24) return null;
+  const picked = choiceLabel ?? trimmed;
+  return `The user is answering your previous clarifying question.
+Question: ${clar.question}
+Choices were: ${choices.join(" | ")}
+User's answer: ${picked}
+Proceed using this answer; do not re-ask the same question unless the answer is still ambiguous.`;
+}
+function formatHistoryForCouncil(maxTurns = 4) {
+  if (history.length === 0) return "";
+  const lines = [];
+  let turns = 0;
+  const chunk = [];
+  for (let i = history.length - 1; i >= 0 && turns < maxTurns; i--) {
+    const m = history[i];
+    if (m.role === "user") {
+      chunk.push(`User: ${truncate(m.content, 400)}`);
+      turns += 1;
+    } else if (m.role === "assistant" && m.content.trim()) {
+      chunk.push(`Assistant: ${truncate(m.content, 600)}`);
+    }
+  }
+  if (chunk.length === 0) return "";
+  lines.push("## Prior conversation (rolling context)");
+  lines.push(...chunk.reverse());
+  return lines.join("\n");
+}
+function truncate(s, max) {
+  const t = s.replace(/\s+/g, " ").trim();
+  if (t.length <= max) return t;
+  return `${t.slice(0, max - 1)}\u2026`;
+}
+function _resetConversationContextForTests() {
+  history = [];
+  lastClarification = null;
+}
+var history, lastClarification;
+var init_conversationContext = __esm({
+  "src/cli/hooks/conversationContext.ts"() {
+    "use strict";
+    init_historyCompaction();
+    history = [];
+    lastClarification = null;
+  }
+});
+
+// src/cli/phaseState.ts
+var phaseState_exports = {};
+__export(phaseState_exports, {
+  _resetPhaseForTests: () => _resetPhaseForTests,
+  getPhase: () => getPhase,
+  setPhase: () => setPhase
+});
+function getPhase() {
+  return phase;
+}
+function setPhase(next) {
+  phase = next;
+}
+function _resetPhaseForTests() {
+  phase = "build";
+}
+var phase;
+var init_phaseState = __esm({
+  "src/cli/phaseState.ts"() {
+    "use strict";
+    phase = "build";
+  }
+});
+
+// src/cli/phase.ts
+var phase_exports = {};
+__export(phase_exports, {
+  PHASES: () => PHASES,
+  PLAN_ALLOWED_WRITE_TOOLS: () => PLAN_ALLOWED_WRITE_TOOLS,
+  PLAN_BLOCKED_TOOLS: () => PLAN_BLOCKED_TOOLS,
+  describePhase: () => describePhase,
+  nextPhase: () => nextPhase,
+  parsePhase: () => parsePhase
+});
+function parsePhase(input) {
+  const v = input.trim().toLowerCase();
+  return PHASES.includes(v) ? v : null;
+}
+function nextPhase(current) {
+  return current === "plan" ? "build" : "plan";
+}
+function describePhase(phase2) {
+  switch (phase2) {
+    case "plan":
+      return "plan \u2014 explore & design only (no project writes; plan files allowed)";
+    default:
+      return "build \u2014 implement with full tools";
+  }
+}
+var PHASES, PLAN_ALLOWED_WRITE_TOOLS, PLAN_BLOCKED_TOOLS;
+var init_phase = __esm({
+  "src/cli/phase.ts"() {
+    "use strict";
+    PHASES = ["plan", "build"];
+    PLAN_ALLOWED_WRITE_TOOLS = /* @__PURE__ */ new Set([
+      // Workspace plan/docs — intentional plan-mode outputs
+      "createPlan",
+      "createTask",
+      "updateTask",
+      "createMilestone",
+      "createDocument",
+      "createDecision",
+      "linkDocuments"
+      // Soft writes that only touch .zelari / plan paths are still gated in
+      // toolRegistry by path when needed; write_file/edit_file stay DENIED.
+    ]);
+    PLAN_BLOCKED_TOOLS = /* @__PURE__ */ new Set([
+      "write_file",
+      "edit_file",
+      "apply_diff",
+      "bash"
+    ]);
+  }
+});
+
 // src/cli/workspace/paths.ts
 import {
   mkdirSync as mkdirSync6,
@@ -26082,12 +26639,12 @@ function buildPlanSummary(projectRoot = process.cwd(), options) {
       scopedOpen = [...inScope, ...neutral];
     }
   }
-  for (const phase of [...phases].sort(
+  for (const phase2 of [...phases].sort(
     (a, b) => (a.order ?? 0) - (b.order ?? 0)
   )) {
-    const phaseTasks = scopedOpen.filter((t) => t.phaseId === phase.id);
-    parts.push("", `## ${phase.order ?? "?"}. ${phase.name ?? phase.id}`);
-    if (phase.description) parts.push(phase.description);
+    const phaseTasks = scopedOpen.filter((t) => t.phaseId === phase2.id);
+    parts.push("", `## ${phase2.order ?? "?"}. ${phase2.name ?? phase2.id}`);
+    if (phase2.description) parts.push(phase2.description);
     for (const t of phaseTasks.slice(0, PLAN_SUMMARY_MAX_TASKS)) {
       parts.push(formatTaskLine(t));
     }
@@ -26508,28 +27065,28 @@ var init_storage = __esm({
     VALID_SCALARS = /^(true|false|null|~)$/i;
     Storage = class {
       /** Read a Markdown file with frontmatter. Throws if not found. */
-      read(path34) {
-        if (!existsSync15(path34)) {
-          throw new Error(`File not found: ${path34}`);
+      read(path36) {
+        if (!existsSync15(path36)) {
+          throw new Error(`File not found: ${path36}`);
         }
-        const md = readFileSync15(path34, "utf8");
+        const md = readFileSync15(path36, "utf8");
         return parseFrontmatter(md);
       }
       /** Read a Markdown file; returns null if not found. */
-      readIfExists(path34) {
-        if (!existsSync15(path34)) return null;
-        return this.read(path34);
+      readIfExists(path36) {
+        if (!existsSync15(path36)) return null;
+        return this.read(path36);
       }
       /**
        * Write a Markdown file atomically (tmp + rename). Creates parent dirs.
        * The meta object is serialized as YAML frontmatter; body as Markdown.
        */
-      write(path34, meta3, body) {
-        mkdirSync7(dirname2(path34), { recursive: true });
-        const tmp = path34 + ".tmp-" + process.pid;
+      write(path36, meta3, body) {
+        mkdirSync7(dirname2(path36), { recursive: true });
+        const tmp = path36 + ".tmp-" + process.pid;
         const md = serializeFrontmatter(meta3, body);
         writeFileSync11(tmp, md, "utf8");
-        renameSync2(tmp, path34);
+        renameSync2(tmp, path36);
       }
       /** List all .md files in a directory (non-recursive). */
       listMarkdown(dir) {
@@ -26607,8 +27164,8 @@ function readPlan(ctx) {
     } catch {
     }
   }
-  const path34 = workspaceFile(ctx.rootDir, "plan");
-  const doc = ctx.storage.readIfExists(path34);
+  const path36 = workspaceFile(ctx.rootDir, "plan");
+  const doc = ctx.storage.readIfExists(path36);
   if (!doc) return { phases: [], tasks: [], milestones: [] };
   const meta3 = doc.meta;
   return {
@@ -26642,11 +27199,11 @@ function renderPlanBody(summary) {
   if (summary.phases.length === 0) {
     lines.push(`_(none yet)_`);
   } else {
-    for (const phase of [...summary.phases].sort(
+    for (const phase2 of [...summary.phases].sort(
       (a, b) => (a.order ?? 0) - (b.order ?? 0)
     )) {
       lines.push(
-        `### ${phase.order ?? "?"}. ${phase.id} \`${phase.color ?? ""}\``
+        `### ${phase2.order ?? "?"}. ${phase2.id} \`${phase2.color ?? ""}\``
       );
       lines.push("");
     }
@@ -26773,7 +27330,7 @@ function addMilestoneRecord(ctx, summary, input) {
     dueDate: input.dueDate,
     targetVersion: version2
   });
-  const path34 = join14(ctx.rootDir, "milestones", `${id}.md`);
+  const path36 = join14(ctx.rootDir, "milestones", `${id}.md`);
   const meta3 = {
     kind: "milestone",
     id,
@@ -26790,7 +27347,7 @@ function addMilestoneRecord(ctx, summary, input) {
     `Target version: ${version2}`,
     ""
   ].join("\n");
-  ctx.storage.write(path34, meta3, body);
+  ctx.storage.write(path36, meta3, body);
   return { id, created: true };
 }
 function readPlanSummary(ctx) {
@@ -26994,7 +27551,7 @@ function addIdeaStub(ctx) {
         const tags = args["tags"] ?? [];
         const category = args["category"] ?? "General";
         const id = `${nextAdrId(ctx)}-${slugify3(title)}`;
-        const path34 = workspaceArtifact(ctx.rootDir, "decisions", id);
+        const path36 = workspaceArtifact(ctx.rootDir, "decisions", id);
         const meta3 = {
           kind: "adr",
           status: "proposed",
@@ -27020,7 +27577,7 @@ function addIdeaStub(ctx) {
           ...consequences.map((c) => `- ${c}`),
           ""
         ].join("\n");
-        ctx.storage.write(path34, meta3, body);
+        ctx.storage.write(path36, meta3, body);
         return `ADR ${id} created: "${title}". Status: proposed. Promote to accepted via /update ADR or manual edit.`;
       });
     }
@@ -27102,14 +27659,14 @@ function createDocumentStub(ctx) {
           ctx.storage.write(risksPath, riskMeta, content);
           return `Document "${title}" created at risks.md (workspace root).`;
         }
-        const path34 = workspaceArtifact(ctx.rootDir, "docs", slug);
+        const path36 = workspaceArtifact(ctx.rootDir, "docs", slug);
         const meta3 = {
           kind: "doc",
           id: slug,
           date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
           tags
         };
-        ctx.storage.write(path34, meta3, content);
+        ctx.storage.write(path36, meta3, content);
         return `Document "${title}" created at docs/${slug}.md.`;
       });
     }
@@ -27325,18 +27882,18 @@ __export(updater_exports, {
   performUpdate: () => performUpdate,
   resolveBundledNpmCli: () => resolveBundledNpmCli
 });
-import { createRequire } from "node:module";
+import { createRequire as createRequire2 } from "node:module";
 import { spawn as spawn4 } from "node:child_process";
 import { existsSync as existsSync17 } from "node:fs";
-import path22 from "node:path";
+import path23 from "node:path";
 import { fileURLToPath } from "node:url";
 function resolveBundledNpmCli(execPath = process.execPath) {
-  const dir = path22.dirname(execPath);
+  const dir = path23.dirname(execPath);
   const candidates = [
     // Windows: C:\...\node.exe → C:\...\node_modules\npm\bin\npm-cli.js
-    path22.join(dir, "node_modules", "npm", "bin", "npm-cli.js"),
+    path23.join(dir, "node_modules", "npm", "bin", "npm-cli.js"),
     // POSIX: <prefix>/bin/node → <prefix>/lib/node_modules/npm/bin/npm-cli.js
-    path22.join(dir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js")
+    path23.join(dir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js")
   ];
   for (const candidate of candidates) {
     try {
@@ -27353,7 +27910,7 @@ function looksLikeBrokenShim(exitCode, output) {
 }
 function getCurrentVersion() {
   try {
-    const pkgPath = path22.resolve(__dirname2, "..", "..", "package.json");
+    const pkgPath = path23.resolve(__dirname2, "..", "..", "package.json");
     const pkg = require2(pkgPath);
     return pkg.version;
   } catch {
@@ -27464,8 +28021,8 @@ var init_updater = __esm({
   "src/cli/updater.ts"() {
     "use strict";
     init_cmdline();
-    require2 = createRequire(import.meta.url);
-    __dirname2 = path22.dirname(fileURLToPath(import.meta.url));
+    require2 = createRequire2(import.meta.url);
+    __dirname2 = path23.dirname(fileURLToPath(import.meta.url));
     REGISTRY_URL = "https://registry.npmjs.org/zelari-code/latest";
   }
 });
@@ -27870,6 +28427,9 @@ async function* dispatchCouncil(userMessage, options) {
   if (options.onCouncilStatus) {
     callbacks.onCouncilStatus = options.onCouncilStatus;
   }
+  if (options.onClarification) {
+    callbacks.onClarification = options.onClarification;
+  }
   yield* runCouncilPure(userMessage, config2, callbacks);
 }
 var CouncilDispatchError;
@@ -27903,10 +28463,10 @@ import { createHash as createHash3 } from "node:crypto";
 import { join as join17 } from "node:path";
 import { readFile as readFile2 } from "node:fs/promises";
 async function readPackageJson2(projectRoot) {
-  const path34 = join17(projectRoot, "package.json");
-  if (!existsSync20(path34)) return null;
+  const path36 = join17(projectRoot, "package.json");
+  if (!existsSync20(path36)) return null;
   try {
-    return JSON.parse(await readFile2(path34, "utf8"));
+    return JSON.parse(await readFile2(path36, "utf8"));
   } catch {
     return null;
   }
@@ -27988,9 +28548,9 @@ async function genBuild(ctx) {
   ].join("\n");
 }
 async function genOpenQuestions(ctx) {
-  const path34 = join17(ctx.rootDir, "risks.md");
-  if (!existsSync20(path34)) return "_No open questions._";
-  const content = readFileSync19(path34, "utf8");
+  const path36 = join17(ctx.rootDir, "risks.md");
+  if (!existsSync20(path36)) return "_No open questions._";
+  const content = readFileSync19(path36, "utf8");
   const lines = content.split("\n");
   const questions = [];
   let currentTitle = "";
@@ -28141,9 +28701,9 @@ var init_agentsMd = __esm({
 });
 
 // src/cli/workspace/completeDesign.ts
-function curatedTasksForPhase(phase) {
-  const label = (phase.name ?? phase.id).trim();
-  const scope = phase.description?.trim() ? ` Scope: ${phase.description.trim()}` : "";
+function curatedTasksForPhase(phase2) {
+  const label = (phase2.name ?? phase2.id).trim();
+  const scope = phase2.description?.trim() ? ` Scope: ${phase2.description.trim()}` : "";
   return [
     {
       title: `Specify ${label} deliverables`,
@@ -28190,15 +28750,15 @@ async function runBuiltinCompleteDesign(ctx) {
   const createMilestone = stubs.find((s) => s.name === "createMilestone");
   const stubCtx = ctx;
   let tasksAdded = 0;
-  for (const phase of summary.phases) {
-    const existingTasks = summary.tasks.filter((t) => t.phaseId === phase.id);
+  for (const phase2 of summary.phases) {
+    const existingTasks = summary.tasks.filter((t) => t.phaseId === phase2.id);
     if (existingTasks.length >= MIN_TASKS_PER_PHASE) continue;
     const existingTitles = new Set(existingTasks.map((t) => t.name ?? ""));
-    const templates = curatedTasksForPhase(phase).filter((t) => !existingTitles.has(t.title)).slice(0, MIN_TASKS_PER_PHASE - existingTasks.length);
+    const templates = curatedTasksForPhase(phase2).filter((t) => !existingTitles.has(t.title)).slice(0, MIN_TASKS_PER_PHASE - existingTasks.length);
     for (const t of templates) {
       await createTask.execute(
         {
-          phaseId: phase.id,
+          phaseId: phase2.id,
           title: t.title,
           description: t.description,
           fileRefs: t.fileRefs,
@@ -28557,8 +29117,8 @@ async function runPostCouncilHook(ctx, options) {
           sources: scope.sources
         } : void 0
       });
-      const path34 = writeCouncilCompletion(ctx.rootDir, completion);
-      completionHook = { ran: true, path: path34, completion };
+      const path36 = writeCouncilCompletion(ctx.rootDir, completion);
+      completionHook = { ran: true, path: path36, completion };
     } catch (err) {
       completionHook = {
         ran: true,
@@ -28627,7 +29187,7 @@ import {
   writeFileSync as writeFileSync14,
   mkdirSync as mkdirSync9
 } from "node:fs";
-import path23 from "node:path";
+import path24 from "node:path";
 import os8 from "node:os";
 var FeedbackStore;
 var init_councilFeedback = __esm({
@@ -28638,7 +29198,7 @@ var init_councilFeedback = __esm({
       now;
       entries = [];
       constructor(options = {}) {
-        this.file = options.file ?? (process.env.ANATHEMA_COUNCIL_FEEDBACK_FILE ?? path23.join(os8.homedir(), ".tmp", "zelari-code", "council-feedback.json"));
+        this.file = options.file ?? (process.env.ANATHEMA_COUNCIL_FEEDBACK_FILE ?? path24.join(os8.homedir(), ".tmp", "zelari-code", "council-feedback.json"));
         this.now = options.now ?? Date.now;
         this.load();
       }
@@ -28744,7 +29304,7 @@ var init_councilFeedback = __esm({
         }
       }
       save() {
-        mkdirSync9(path23.dirname(this.file), { recursive: true });
+        mkdirSync9(path24.dirname(this.file), { recursive: true });
         writeFileSync14(
           this.file,
           JSON.stringify({ entries: this.entries }, null, 2),
@@ -28779,7 +29339,7 @@ __export(fileBackend_exports, {
 });
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { promises as fs14 } from "node:fs";
-import * as path24 from "node:path";
+import * as path25 from "node:path";
 function tokenize(text) {
   return text.toLowerCase().split(/[^\p{L}\p{N}]+/u).filter((t) => t.length >= 3);
 }
@@ -28817,8 +29377,8 @@ var init_fileBackend = __esm({
       logPath = "";
       memoryDir = "";
       async init(projectRoot) {
-        this.memoryDir = path24.join(projectRoot, ".zelari", "memory");
-        this.logPath = path24.join(this.memoryDir, "log.jsonl");
+        this.memoryDir = path25.join(projectRoot, ".zelari", "memory");
+        this.logPath = path25.join(this.memoryDir, "log.jsonl");
         await fs14.mkdir(this.memoryDir, { recursive: true });
       }
       async add(content, metadata = {}, graph) {
@@ -28893,7 +29453,7 @@ import { execFile as execFile2 } from "node:child_process";
 import { promisify } from "node:util";
 import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
-import path25 from "node:path";
+import path26 from "node:path";
 import { randomUUID as randomUUID3 } from "node:crypto";
 async function git(cwd, args, env) {
   const { stdout } = await execFileAsync("git", ["-C", cwd, ...args], {
@@ -28913,8 +29473,8 @@ async function isGitRepo(cwd) {
   return await gitSafe(cwd, ["rev-parse", "--is-inside-work-tree"]) === "true";
 }
 async function withTempIndex(fn) {
-  const dir = mkdtempSync(path25.join(tmpdir(), "zelari-ckpt-"));
-  const indexFile = path25.join(dir, "index");
+  const dir = mkdtempSync(path26.join(tmpdir(), "zelari-ckpt-"));
+  const indexFile = path26.join(dir, "index");
   try {
     return await fn(indexFile);
   } finally {
@@ -29005,7 +29565,7 @@ async function restoreCheckpoint(cwd, id) {
     const deleted = [];
     for (const rel2 of added) {
       try {
-        rmSync(path25.join(cwd, rel2), { force: true });
+        rmSync(path26.join(cwd, rel2), { force: true });
         deleted.push(rel2);
       } catch {
       }
@@ -29035,7 +29595,7 @@ __export(zelariMission_exports, {
 });
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { promises as fs15 } from "node:fs";
-import * as path26 from "node:path";
+import * as path27 from "node:path";
 function resolveMaxIterations(env = process.env) {
   const raw = env.ZELARI_MISSION_MAX_ITER;
   const n = raw ? Number.parseInt(raw, 10) : DEFAULT_MAX_ITER;
@@ -29051,10 +29611,10 @@ function isMissionAutoStart(env = process.env) {
   return env.ZELARI_MISSION_AUTO === "1";
 }
 async function writeMissionState(projectRoot, state2) {
-  const dir = path26.join(projectRoot, ".zelari");
+  const dir = path27.join(projectRoot, ".zelari");
   await fs15.mkdir(dir, { recursive: true });
   await fs15.writeFile(
-    path26.join(dir, "mission-state.json"),
+    path27.join(dir, "mission-state.json"),
     JSON.stringify(state2, null, 2) + "\n",
     "utf8"
   );
@@ -29505,10 +30065,10 @@ var init_prereqChecks = __esm({
 
 // src/cli/plugins/prefs.ts
 import { existsSync as existsSync26, readFileSync as readFileSync23, writeFileSync as writeFileSync15, mkdirSync as mkdirSync10 } from "node:fs";
-import path28 from "node:path";
+import path29 from "node:path";
 import os9 from "node:os";
 function getPluginPrefsPath() {
-  return process.env.ZELARI_PLUGINS_PREFS_FILE ?? path28.join(os9.homedir(), ".tmp", "zelari-code", "plugins.json");
+  return process.env.ZELARI_PLUGINS_PREFS_FILE ?? path29.join(os9.homedir(), ".tmp", "zelari-code", "plugins.json");
 }
 function getPluginPrefs() {
   const file2 = getPluginPrefsPath();
@@ -29529,7 +30089,7 @@ function getPluginPrefs() {
 }
 function writePluginPrefs(prefs) {
   const file2 = getPluginPrefsPath();
-  mkdirSync10(path28.dirname(file2), { recursive: true });
+  mkdirSync10(path29.dirname(file2), { recursive: true });
   writeFileSync15(file2, JSON.stringify(prefs, null, 2), {
     encoding: "utf-8",
     mode: 384
@@ -29562,9 +30122,11 @@ var registry_exports = {};
 __export(registry_exports, {
   PLUGINS: () => PLUGINS,
   detectMissingPlugins: () => detectMissingPlugins,
-  findPlugin: () => findPlugin
+  findPlugin: () => findPlugin,
+  isBinaryOnPath: () => isBinaryOnPath
 });
-import { spawnSync as spawnSync3 } from "node:child_process";
+import { existsSync as existsSync27 } from "node:fs";
+import path30 from "node:path";
 function detectLocalBin(bin) {
   return (cwd) => {
     try {
@@ -29575,27 +30137,48 @@ function detectLocalBin(bin) {
     }
   };
 }
-function detectGlobalBin(bin) {
-  return () => {
+function isBinaryOnPath(bin, opts = {}) {
+  if (!bin || bin.includes("/") || bin.includes("\\") || bin.includes("..")) {
+    return false;
+  }
+  const platform = opts.platform ?? process.platform;
+  const exists = opts.exists ?? existsSync27;
+  const pathEnv = opts.pathEnv ?? process.env.PATH ?? "";
+  const pathMod = platform === "win32" ? path30.win32 : path30.posix;
+  const sep = platform === "win32" ? ";" : ":";
+  const dirs = pathEnv.split(sep).filter((d) => d.length > 0);
+  const candidates = [bin];
+  if (platform === "win32") {
+    const pathExt = opts.pathExt ?? process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM";
+    for (const ext of pathExt.split(";")) {
+      if (!ext) continue;
+      candidates.push(bin + ext);
+      const lower = ext.toLowerCase();
+      if (lower !== ext) candidates.push(bin + lower);
+    }
+  }
+  for (const dir of dirs) {
+    for (const name of candidates) {
+      try {
+        if (exists(pathMod.join(dir, name))) return true;
+      } catch {
+      }
+    }
+  }
+  return false;
+}
+function detectPathBin(bin) {
+  return (cwd) => {
     try {
-      const args = ["--version"];
-      const res = process.platform === "win32" ? spawnSync3(buildCmdLine(bin, args), {
-        stdio: ["ignore", "pipe", "ignore"],
-        shell: true,
-        timeout: 4e3
-      }) : spawnSync3(bin, args, {
-        stdio: ["ignore", "pipe", "ignore"],
-        timeout: 4e3
-      });
-      return Promise.resolve(res.status === 0 || res.stdout != null && res.stdout.toString().trim().length > 0 && res.error === void 0);
+      if (resolveBin(bin, cwd) !== bin) return Promise.resolve(true);
     } catch {
-      return Promise.resolve(false);
     }
+    return Promise.resolve(isBinaryOnPath(bin));
   };
 }
-async function detectPlaywright() {
+async function detectPlaywright(cwd) {
   try {
-    const mod = await defaultPlaywrightLoader();
+    const mod = await loadPlaywright(cwd);
     return mod !== null;
   } catch {
     return false;
@@ -29633,7 +30216,6 @@ var PLUGINS;
 var init_registry2 = __esm({
   "src/cli/plugins/registry.ts"() {
     "use strict";
-    init_cmdline();
     init_engine();
     init_driver();
     init_engine();
@@ -29663,7 +30245,7 @@ var init_registry2 = __esm({
         label: "Playwright (browser_check tool)",
         npmPackage: "playwright",
         installScope: "dev",
-        detect: () => detectPlaywright(),
+        detect: detectPlaywright,
         postInstallHint: "Then fetch the browser binary: `npx playwright install chromium`",
         featureGate: "ZELARI_BROWSER",
         description: "Powers the browser_check tool (URL probing, click/fill/wait, screenshots)."
@@ -29673,7 +30255,7 @@ var init_registry2 = __esm({
         label: "typescript-language-server (LSP for TS/JS)",
         npmPackage: "typescript-language-server",
         installScope: "global",
-        detect: detectGlobalBin(binForLspLanguage("typescript")),
+        detect: detectPathBin(binForLspLanguage("typescript")),
         featureGate: "ZELARI_LSP",
         description: "Powers go_to_definition / find_references / hover_type / rename_symbol for TS/JS."
       },
@@ -29682,9 +30264,24 @@ var init_registry2 = __esm({
         label: "pyright (LSP for Python)",
         npmPackage: "pyright",
         installScope: "global",
-        detect: detectGlobalBin(binForLspLanguage("python")),
+        // Detect the langserver binary runtime spawns (pyright-langserver), not
+        // the `pyright` CLI — and never via --version (langserver rejects it).
+        detect: detectPathBin(binForLspLanguage("python")),
         featureGate: "ZELARI_LSP",
         description: "Powers go_to_definition / find_references / hover_type / rename_symbol for Python."
+      },
+      {
+        // fff — high-performance codebase search MCP (fffind / ffgrep).
+        // Installed as a global CLI; wire it in ~/.zelari-code/mcp.json (see
+        // postInstallHint). Kill-switch: ZELARI_FFF=0.
+        id: "fff",
+        label: "fff (fast codebase search MCP)",
+        npmPackage: "fff-mcp",
+        installScope: "global",
+        detect: detectPathBin("fff-mcp"),
+        postInstallHint: 'Add to ~/.zelari-code/mcp.json: {"mcpServers":{"fff":{"command":"fff-mcp","args":[]}}} then restart. Prefer mcp_fff_* tools for search.',
+        featureGate: "ZELARI_FFF",
+        description: "Accelerates codebase search via fff MCP (fffind, ffgrep, fff-multi-grep) \u2014 faster and more token-efficient than plain grep."
       }
     ];
   }
@@ -29696,26 +30293,26 @@ __export(doctor_exports, {
   runDoctor: () => runDoctor
 });
 import { execSync as execSync2 } from "node:child_process";
-import { existsSync as existsSync31, readFileSync as readFileSync26, readlinkSync, statSync as statSync6 } from "node:fs";
-import { createRequire as createRequire2 } from "node:module";
+import { existsSync as existsSync32, readFileSync as readFileSync26, readlinkSync, statSync as statSync6 } from "node:fs";
+import { createRequire as createRequire3 } from "node:module";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import path33 from "node:path";
+import path35 from "node:path";
 function findPackageRoot(start) {
   let dir = start;
   for (let i = 0; i < 6; i += 1) {
-    const candidate = path33.join(dir, "package.json");
-    if (existsSync31(candidate)) {
+    const candidate = path35.join(dir, "package.json");
+    if (existsSync32(candidate)) {
       try {
         const pkg = JSON.parse(readFileSync26(candidate, "utf8"));
         if (pkg.name === "zelari-code") return dir;
       } catch {
       }
     }
-    const parent = path33.dirname(dir);
+    const parent = path35.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
-  return path33.resolve(__dirname3, "..", "..", "..");
+  return path35.resolve(__dirname3, "..", "..", "..");
 }
 function tryExec(cmd) {
   try {
@@ -29729,7 +30326,7 @@ function tryExec(cmd) {
 }
 function readPackageJson3() {
   try {
-    const pkgPath = path33.join(packageRoot, "package.json");
+    const pkgPath = path35.join(packageRoot, "package.json");
     return JSON.parse(readFileSync26(pkgPath, "utf8"));
   } catch {
     return null;
@@ -29745,8 +30342,8 @@ function checkShim(pkgName) {
   }
   const isWin = process.platform === "win32";
   const shimName = isWin ? "zelari-code.cmd" : "zelari-code";
-  const shimPath = path33.join(prefix, shimName);
-  if (!existsSync31(shimPath)) {
+  const shimPath = path35.join(prefix, shimName);
+  if (!existsSync32(shimPath)) {
     return FAIL(
       `shim not found at ${shimPath}
          fix:  npm install -g ${pkgName}@latest --force`
@@ -29773,8 +30370,8 @@ function checkShim(pkgName) {
          fix:  npm install -g ${pkgName}@latest --force`
       );
     }
-    const resolved = path33.resolve(path33.dirname(shimPath), target);
-    const expected = path33.join(
+    const resolved = path35.resolve(path35.dirname(shimPath), target);
+    const expected = path35.join(
       prefix,
       "node_modules",
       pkgName,
@@ -29813,8 +30410,8 @@ function checkNode(pkg) {
   return OK(`node ${raw}`);
 }
 function checkBundle() {
-  const bundle = path33.join(packageRoot, "dist", "cli", "main.bundled.js");
-  if (!existsSync31(bundle)) {
+  const bundle = path35.join(packageRoot, "dist", "cli", "main.bundled.js");
+  if (!existsSync32(bundle)) {
     return FAIL(
       `dist/cli/main.bundled.js missing at ${bundle}
          fix:  npm run build:cli   (then reinstall or run via tsx)`
@@ -29834,7 +30431,7 @@ function checkRuntimeDeps() {
   const missing = [];
   for (const dep of required2) {
     try {
-      const localReq = createRequire2(path33.join(packageRoot, "package.json"));
+      const localReq = createRequire3(path35.join(packageRoot, "package.json"));
       localReq.resolve(dep);
     } catch {
       missing.push(dep);
@@ -29954,8 +30551,8 @@ var init_doctor = __esm({
   "src/cli/utils/doctor.ts"() {
     "use strict";
     init_prereqChecks();
-    require3 = createRequire2(import.meta.url);
-    __dirname3 = path33.dirname(fileURLToPath2(import.meta.url));
+    require3 = createRequire3(import.meta.url);
+    __dirname3 = path35.dirname(fileURLToPath2(import.meta.url));
     packageRoot = findPackageRoot(__dirname3);
     OK = (message) => ({
       ok: true,
@@ -29980,11 +30577,11 @@ var fixPath_exports = {};
 __export(fixPath_exports, {
   repairWindowsUserPath: () => repairWindowsUserPath
 });
-import { spawnSync as spawnSync4 } from "node:child_process";
+import { spawnSync as spawnSync3 } from "node:child_process";
 function getGlobalPrefix2() {
   return (process.env.npm_config_prefix || process.env.NPM_CONFIG_PREFIX || "").trim() || (() => {
     try {
-      return spawnSync4("npm", ["prefix", "-g"], {
+      return spawnSync3("npm", ["prefix", "-g"], {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"]
       }).stdout?.trim() ?? "";
@@ -29995,7 +30592,7 @@ function getGlobalPrefix2() {
 }
 function powershell(script) {
   try {
-    const res = spawnSync4(
+    const res = spawnSync3(
       "powershell.exe",
       ["-NoProfile", "-NonInteractive", "-Command", script],
       { encoding: "utf8" }
@@ -30059,7 +30656,7 @@ import React14 from "react";
 import { render } from "ink";
 
 // src/cli/app.tsx
-import React9, { useState as useState8, useMemo, useCallback as useCallback5, useEffect as useEffect7 } from "react";
+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";
 
 // src/cli/components/InputBar.tsx
@@ -30457,9 +31054,12 @@ function WorkingIndicator({
 
 // src/cli/components/LiveRegion.tsx
 var LIVE_STREAM_TAIL_LINES = 10;
+var MAX_LIVE_TOOLS = 4;
 function LiveRegion({ live, busy, elapsedMs = null }) {
   const { streaming, runningTools } = live;
   if (!streaming && runningTools.length === 0 && !busy) return null;
+  const visibleTools = runningTools.slice(0, MAX_LIVE_TOOLS);
+  const hiddenTools = runningTools.length - visibleTools.length;
   return /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", paddingX: 1 }, streaming && streaming.role === "assistant" && /* @__PURE__ */ React5.createElement(
     StreamingTail,
     {
@@ -30469,7 +31069,7 @@ function LiveRegion({ live, busy, elapsedMs = null }) {
       memberName: streaming.memberName,
       memberId: streaming.memberId
     }
-  ), runningTools.map((t) => /* @__PURE__ */ React5.createElement(Box4, { key: t.id, flexDirection: "column" }, renderMessage(t, true))), busy && runningTools.length === 0 && !streaming && /* @__PURE__ */ React5.createElement(WorkingIndicator, { elapsedMs }));
+  ), visibleTools.map((t) => /* @__PURE__ */ React5.createElement(Box4, { key: t.id, flexDirection: "column" }, renderMessage(t, true))), hiddenTools > 0 ? /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "  \u2026 +", hiddenTools, " more tools") : null, busy && runningTools.length === 0 && !streaming && /* @__PURE__ */ React5.createElement(WorkingIndicator, { elapsedMs }));
 }
 function StreamingTail(m) {
   const lines = m.content.split("\n");
@@ -30564,20 +31164,25 @@ function StatusBar({
   queueCount = 0,
   busy = false,
   mode = "agent",
+  phase: phase2 = "build",
   cwd,
   elapsedMs = null,
   lastMs = null,
   costUsd = 0,
-  cachedTokens = 0
+  cachedTokens = 0,
+  contextUsed = 0,
+  contextLimit = 0,
+  brandVersion
 }) {
-  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(
+  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(
     Text6,
     {
       bold: true,
       color: mode === "council" ? "magenta" : mode === "zelari" ? "green" : "cyan"
     },
-    mode === "council" ? "\u26EC council" : mode === "zelari" ? "\u26A1 zelari" : "\u23F5 agent"
-  ), /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, " (shift+tab)"), /* @__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, 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))));
+    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))));
 }
 
 // src/cli/components/SelectList.tsx
@@ -30625,30 +31230,35 @@ function SelectList({
 // src/cli/components/Sidebar.tsx
 import React8 from "react";
 import { Box as Box7, Text as Text8 } from "ink";
-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 EMBLEM_MIN_ROWS = 26;
-var MAX_FILES_SHORT = 6;
-var MAX_FILES_TALL = 10;
+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;
 function shouldShowSidebar(columns, rows) {
-  return columns >= SIDEBAR_MIN_COLUMNS && rows >= 16;
+  return columns >= SIDEBAR_MIN_COLUMNS && rows >= SIDEBAR_MIN_ROWS;
+}
+function sidebarVisibility(columns, rows, currentlyVisible) {
+  if (currentlyVisible) {
+    return columns >= SIDEBAR_HIDE_COLUMNS && rows >= SIDEBAR_HIDE_ROWS;
+  }
+  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 Sidebar({ version: version2, changes, rows }) {
-  const showEmblem = rows >= EMBLEM_MIN_ROWS;
-  const maxFiles = rows >= EMBLEM_MIN_ROWS + 8 ? MAX_FILES_TALL : MAX_FILES_SHORT;
+  void version2;
+  const maxFiles = maxSidebarFiles(rows);
   const visible = changes.files.slice(0, maxFiles);
   const hidden = changes.files.length - visible.length;
   const innerWidth = SIDEBAR_WIDTH - 4;
@@ -30660,11 +31270,11 @@ function Sidebar({ version: version2, changes, rows }) {
       borderStyle: "single",
       borderColor: "gray",
       paddingX: 1,
-      flexShrink: 0
+      flexShrink: 0,
+      height: Math.min(rows - 8, SIDEBAR_CHROME_LINES + maxFiles + 2),
+      overflow: "hidden"
     },
-    showEmblem && /* @__PURE__ */ React8.createElement(Box7, { justifyContent: "center" }, /* @__PURE__ */ React8.createElement(Text8, { color: "cyan" }, EMBLEM_BRAILLE)),
-    /* @__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(Box7, { justifyContent: "center" }, /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, changes.branch ? truncatePath(changes.branch, 18) : "git")),
     /* @__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"))
   );
@@ -30674,6 +31284,53 @@ function FileRow({ file: file2, 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/modelDiscovery.ts
 import { promises as fs3, existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
 import { homedir } from "node:os";
@@ -33649,80 +34306,8 @@ function finalizeStreamingAssistant(setMessages) {
   });
 }
 
-// src/cli/utils/envNumber.ts
-function envNumber(raw, opts) {
-  const { default: def, min, max } = opts;
-  if (raw === void 0 || raw === null) return def;
-  const trimmed = raw.trim();
-  if (trimmed.length === 0) return def;
-  if (trimmed.toLowerCase() === "undefined" || trimmed.toLowerCase() === "null") return def;
-  const parsed = Number.parseInt(trimmed, 10);
-  if (!Number.isFinite(parsed)) return def;
-  const absStr = `${Math.abs(parsed)}`;
-  const body = trimmed.replace(/^[-+]/, "").replace(/^0+(?=\d)/, "");
-  if (body !== absStr) return def;
-  const firstChar = trimmed[0];
-  const expectedSign = parsed < 0 ? "-" : /[0-9+]/.test(firstChar ?? "");
-  const actualSign = parsed < 0 ? firstChar === "-" : firstChar !== "-";
-  if (!expectedSign || !actualSign) return def;
-  let clamped = parsed;
-  if (min !== void 0 && clamped < min) clamped = min;
-  if (max !== void 0 && clamped > max) clamped = max;
-  return clamped;
-}
-
-// src/cli/hooks/historyCompaction.ts
-var COMPACT_MARKER = "[history] Earlier turns were compacted to stay within the context budget.";
-function resolveMaxMessages(opts) {
-  const envTurns = envNumber(process.env.ZELARI_HISTORY_TURNS, { default: 6, min: 0 });
-  const turns = opts?.maxMessages ? Math.ceil(opts.maxMessages / 4) : envTurns;
-  if (turns <= 0) return 0;
-  return turns * 4;
-}
-function findValidCutIndex(messages, naiveCut) {
-  let cut = naiveCut;
-  while (cut < messages.length) {
-    const kept = messages.slice(cut);
-    const declared = /* @__PURE__ */ new Set();
-    for (const m of kept) {
-      if (m.role === "assistant" && m.toolCalls) {
-        for (const tc of m.toolCalls) declared.add(tc.id);
-      }
-    }
-    let moved = false;
-    for (let k = 0; k < kept.length; k++) {
-      const m = kept[k];
-      if (m.role === "tool" && m.toolCallId && !declared.has(m.toolCallId)) {
-        for (let j = cut - 1; j >= 0; j--) {
-          const prev2 = messages[j];
-          if (prev2.role === "assistant" && prev2.toolCalls && prev2.toolCalls.some((tc) => tc.id === m.toolCallId)) {
-            cut = j;
-            moved = true;
-            break;
-          }
-        }
-        break;
-      }
-    }
-    if (!moved) break;
-  }
-  return cut;
-}
-function compactHistory(messages, opts) {
-  const maxMessages = resolveMaxMessages(opts);
-  if (maxMessages === 0) return [];
-  if (messages.length <= maxMessages * 2) return messages;
-  const naiveCut = messages.length - maxMessages;
-  const cut = findValidCutIndex(messages, naiveCut);
-  const dropped = cut;
-  if (dropped === 0) return messages;
-  const kept = messages.slice(cut);
-  const summary = {
-    role: "system",
-    content: `${COMPACT_MARKER} ${dropped} earlier message(s) dropped.`
-  };
-  return [summary, ...kept];
-}
+// src/cli/hooks/useChatTurn.ts
+init_conversationContext();
 
 // src/cli/hooks/chatStats.ts
 function computeSessionStatsDelta(realUsage, userText, assistantContent, model, prev2) {
@@ -33737,6 +34322,83 @@ function computeSessionStatsDelta(realUsage, userText, assistantContent, model,
   };
 }
 
+// src/cli/hooks/useChatTurn.ts
+init_envNumber();
+init_phaseState();
+init_phase();
+
+// src/cli/budget/tokenBudget.ts
+init_envNumber();
+init_historyCompaction();
+function estimateTokens(text) {
+  if (!text) return 0;
+  return Math.max(1, Math.ceil(text.length / 4));
+}
+function estimateHistoryTokens(messages) {
+  let n = 0;
+  for (const m of messages) {
+    n += estimateTokens(m.content);
+    if (m.toolCalls) {
+      for (const tc of m.toolCalls) {
+        n += estimateTokens(tc.name) + estimateTokens(JSON.stringify(tc.args ?? {}));
+      }
+    }
+  }
+  return n;
+}
+function resolveContextLimit() {
+  return envNumber(process.env.ZELARI_CONTEXT_LIMIT, {
+    default: 2e5,
+    min: 4e3,
+    max: 2e6
+  });
+}
+function applyBudgetPolicy(history2, phase2, opts) {
+  const contextLimit = resolveContextLimit();
+  const warnings = [];
+  let historyTurns = phase2 === "plan" ? envNumber(process.env.ZELARI_HISTORY_TURNS, { default: 8, min: 0 }) : envNumber(process.env.ZELARI_HISTORY_TURNS, { default: 6, min: 0 });
+  let maxToolLoopIterations = phase2 === "plan" ? envNumber(process.env.ZELARI_MAX_TOOL_LOOP_ITERATIONS, { default: 40, min: 1 }) : envNumber(process.env.ZELARI_MAX_TOOL_LOOP_ITERATIONS, { default: 90, min: 1 });
+  let hist = history2;
+  let estimated = estimateHistoryTokens(hist);
+  const sessionExtra = opts?.sessionTokens ?? 0;
+  let occupancy = Math.min(1, (estimated + sessionExtra) / contextLimit);
+  if (occupancy >= 0.7 && occupancy < 0.85) {
+    warnings.push(
+      `[budget] context ~${Math.round(occupancy * 100)}% full (${estimated + sessionExtra}/${contextLimit} tok est.) \u2014 consider /compact or shorter replies.`
+    );
+  }
+  if (occupancy >= 0.85) {
+    const forcedTurns = Math.max(1, Math.floor(historyTurns / 2));
+    historyTurns = forcedTurns;
+    hist = compactHistory(hist, { maxMessages: forcedTurns * 4 });
+    estimated = estimateHistoryTokens(hist);
+    occupancy = Math.min(1, (estimated + sessionExtra) / contextLimit);
+    warnings.push(
+      `[budget] auto-compact at 85% \u2014 kept ~${forcedTurns} turns (${estimated} tok history est.).`
+    );
+    maxToolLoopIterations = Math.min(maxToolLoopIterations, phase2 === "plan" ? 24 : 40);
+  }
+  if (occupancy >= 0.95) {
+    hist = compactHistory(hist, { maxMessages: 8 });
+    estimated = estimateHistoryTokens(hist);
+    occupancy = Math.min(1, (estimated + sessionExtra) / contextLimit);
+    historyTurns = 2;
+    maxToolLoopIterations = Math.min(maxToolLoopIterations, 16);
+    warnings.push(
+      `[budget] HARD context pressure (\u226595%) \u2014 history cut to last ~2 turns. Prefer /clear or a new session if quality drops.`
+    );
+  }
+  return {
+    history: hist,
+    warnings,
+    maxToolLoopIterations,
+    historyTurns,
+    estimatedHistoryTokens: estimated,
+    contextLimit,
+    occupancy
+  };
+}
+
 // src/cli/hooks/useChatTurn.ts
 function useChatTurn(params) {
   const {
@@ -33754,8 +34416,10 @@ function useChatTurn(params) {
   } = params;
   const harnessRef = useRef4(null);
   const [queueCount, setQueueCount] = useState6(0);
-  const historyRef = useRef4([]);
   const useLiveModel = !!(setLive && liveRef);
+  const clearConversationHistory = useCallback2(() => {
+    clearHistory();
+  }, []);
   const dispatchPrompt = useCallback2(
     async (userText, opts) => {
       let envConfig;
@@ -33763,8 +34427,15 @@ function useChatTurn(params) {
       let historySeedLen = 0;
       let turnSucceeded = false;
       try {
-        historyRef.current = compactHistory(historyRef.current);
-        historySeedLen = historyRef.current.length;
+        compactInPlace();
+        const budget = applyBudgetPolicy(getHistory(), getPhase());
+        setHistory(budget.history);
+        for (const w of budget.warnings) {
+          appendSystem(setMessages, w, Date.now());
+        }
+        historySeedLen = getHistory().length;
+        const anchored = maybeAnchorShortAnswer(userText);
+        const effectiveUserText = anchored ?? userText;
         envConfig = await providerFromEnv();
         if (!envConfig) {
           const active = resolveActiveProvider();
@@ -33776,7 +34447,10 @@ function useChatTurn(params) {
           return;
         }
         setBusy(true);
-        const { registry: toolRegistry } = createBuiltinToolRegistry();
+        const workPhase = getPhase();
+        const { registry: toolRegistry } = createBuiltinToolRegistry({
+          planMode: workPhase === "plan"
+        });
         const baseProviderStream = openaiCompatibleProvider(envConfig);
         const failoverResolution = await resolveFailoverStream({
           failoverEnabled: process.env.ANATHEMA_FAILOVER !== "0",
@@ -33856,12 +34530,26 @@ function useChatTurn(params) {
         const isWindows = process.platform === "win32";
         const shellGuidance = resolvedShell.isBash ? `The bash tool runs commands via Git Bash / MSYS2 (${resolvedShell.shell}). Write POSIX commands: ls, grep, $VAR, &&, /c/Users/... all work.` : isWindows ? `The bash tool runs commands via cmd.exe (Git Bash not found). Write Windows-native commands: use dir (not ls), %VAR% (not $VAR), avoid POSIX-only syntax.` : `The bash tool runs commands via /bin/sh.`;
         const nonInteractiveGuidance = "The shell is NON-INTERACTIVE (stdin closed): commands that prompt for input fail immediately. Always pass non-interactive flags (--yes, -y, --template, --force). If a scaffolder still insists on prompting (e.g. `npm create vite` in a non-empty directory), do NOT retry it \u2014 scaffold into a fresh empty subdirectory and move the files, or write package.json/configs/sources yourself with write_file, then run `npm install`.";
+        const planPhaseBlock = workPhase === "plan" ? [
+          "",
+          "# Work Phase: PLAN",
+          "You are in PLAN mode. Explore and design only.",
+          "- Do NOT implement production code or run destructive shell commands.",
+          "- write_file / edit_file / bash / apply_diff are unavailable.",
+          "- Produce a clear plan, ask clarifying questions (---QUESTION---), use workspace plan tools when relevant.",
+          "- When the plan is ready, tell the user to run /build to implement."
+        ].join("\n") : workPhase === "build" && planSummary ? [
+          "",
+          "# Work Phase: BUILD",
+          "Implement the approved plan. Prefer acting over describing. Update plan task statuses as you go."
+        ].join("\n") : "";
         const shellContextBlock = [
           "# Platform & Shell",
           `platform: ${process.platform}`,
           `shell: ${resolvedShell.via}`,
           shellGuidance,
           nonInteractiveGuidance,
+          planPhaseBlock,
           "",
           "# Working Directory",
           `You are running in: ${cwd}`,
@@ -33915,20 +34603,17 @@ function useChatTurn(params) {
           default: 25,
           min: 1
         });
-        const maxToolLoopIterations = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_ITERATIONS, {
-          default: 90,
-          min: 1
-        });
+        const maxToolLoopIterations = budget.maxToolLoopIterations;
         const harness2 = new AgentHarness({
           model: envConfig.model,
           provider: "openai-compatible",
           messages: [
             { role: "system", content: systemPrompt },
-            // v1.6.0: seed prior turns so the model sees its own last
-            // question when the user answers briefly. historyRef.current
-            // is compacted above (possibly empty if ZELARI_HISTORY_TURNS=0).
-            ...historyRef.current,
-            { role: "user", content: userText }
+            // v1.8.0: shared rolling history (agent/council/zelari) so short
+            // answers bind to prior ---QUESTION--- blocks. Possibly empty
+            // when ZELARI_HISTORY_TURNS=0.
+            ...getHistory(),
+            { role: "user", content: effectiveUserText }
           ],
           tools: toolRegistry.toOpenAITools().map((t) => ({
             name: t.function.name,
@@ -33995,15 +34680,16 @@ function useChatTurn(params) {
             if (event.type === "message_delta") {
               assistantContent += event.delta;
               streamContent += event.delta;
+              const displayContent = cleanAgentContent(streamContent);
               if (useLiveModel) {
-                setStreaming(commitStreaming, streamContent, Date.now(), {
+                setStreaming(commitStreaming, displayContent, Date.now(), {
                   ...event.memberId ? { memberId: event.memberId } : {},
                   ...event.memberName ? { memberName: event.memberName } : {}
                 });
               } else {
                 appendOrExtendStreamingAssistant(
                   commitStreaming,
-                  streamContent,
+                  displayContent,
                   Date.now(),
                   {
                     ...event.memberId ? { memberId: event.memberId } : {},
@@ -34069,38 +34755,53 @@ function useChatTurn(params) {
               const all = h.getMessages();
               const seedLen = 1 + historySeedLen + 1;
               if (all.length > seedLen) {
-                historyRef.current = historyRef.current.concat(
-                  all.slice(seedLen)
+                appendMessages(
+                  all.slice(seedLen).map(
+                    (m) => m.role === "assistant" && m.content ? {
+                      ...m,
+                      content: cleanAgentContent(m.content, {
+                        stripQuestion: false
+                      })
+                    } : m
+                  )
                 );
               }
             }
           } catch {
           }
-          if (turnSucceeded && setPicker && assistantContent) {
+          if (turnSucceeded && assistantContent) {
             try {
+              const needsScrub = assistantContent.includes("<think") || assistantContent.includes("<thinking") || assistantContent.includes("---QUESTION---");
+              if (needsScrub) {
+                setMessages(
+                  (prev2) => prev2.map((m) => {
+                    if (m.role !== "assistant") return m;
+                    if (!m.content.includes("<think") && !m.content.includes("<thinking") && !m.content.includes("---QUESTION---")) {
+                      return m;
+                    }
+                    const cleaned = cleanAgentContent(m.content);
+                    return cleaned === m.content ? m : { ...m, content: cleaned };
+                  })
+                );
+              }
               const clar = parseClarificationRequest(assistantContent);
               if (clar && clar.choices && clar.choices.length >= 2) {
-                const cleaned = cleanAgentContent(assistantContent);
-                if (cleaned !== assistantContent) {
-                  setMessages((prev2) => {
-                    const next = [...prev2];
-                    for (let i = next.length - 1; i >= 0; i--) {
-                      if (next[i].role === "assistant") {
-                        next[i] = { ...next[i], content: cleaned };
-                        break;
-                      }
+                setLastClarification({
+                  question: clar.question,
+                  choices: clar.choices
+                });
+                if (setPicker) {
+                  setPicker({
+                    kind: "clarification",
+                    title: clar.question,
+                    items: clar.choices.map((c) => ({ value: c, label: c })),
+                    onAnswer: (value) => {
+                      void dispatchPrompt(value);
                     }
-                    return next;
                   });
                 }
-                setPicker({
-                  kind: "clarification",
-                  title: clar.question,
-                  items: clar.choices.map((c) => ({ value: c, label: c })),
-                  onAnswer: (value) => {
-                    void dispatchPrompt(value);
-                  }
-                });
+              } else {
+                setLastClarification(null);
               }
             } catch {
             }
@@ -34152,7 +34853,8 @@ function useChatTurn(params) {
         setBusy,
         setQueueCount,
         setLive,
-        liveRef
+        liveRef,
+        setPicker
       });
     },
     [
@@ -34164,7 +34866,8 @@ function useChatTurn(params) {
       setBusy,
       setQueueCount,
       setLive,
-      liveRef
+      liveRef,
+      setPicker
     ]
   );
   const pendingZelariRef = useRef4(null);
@@ -34204,7 +34907,8 @@ function useChatTurn(params) {
     dispatchZelariPrompt,
     harnessRef,
     queueCount,
-    setQueueCount
+    setQueueCount,
+    clearConversationHistory
   };
 }
 async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
@@ -34216,7 +34920,8 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
     flushStreaming,
     setBusy,
     setLive,
-    liveRef
+    liveRef,
+    setPicker
   } = deps;
   const useLiveModel = !!(setLive && liveRef);
   const envConfig = await providerFromEnv();
@@ -34230,6 +34935,19 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
     return { completionOk: false, ran: false };
   }
   setBusy(true);
+  compactInPlace();
+  const councilBudget = applyBudgetPolicy(getHistory(), getPhase());
+  setHistory(councilBudget.history);
+  for (const w of councilBudget.warnings) {
+    appendSystem(setMessages, w, Date.now());
+  }
+  const anchored = maybeAnchorShortAnswer(text);
+  const effectiveText = anchored ?? text;
+  appendSystem(
+    setMessages,
+    `[phase] ${describePhase(getPhase())}`,
+    Date.now()
+  );
   const { dispatchCouncil: dispatchCouncil2 } = await Promise.resolve().then(() => (init_councilDispatcher(), councilDispatcher_exports));
   const { createWorkspaceContext: createWorkspaceContext2, createWorkspaceStubs: createWorkspaceStubs2 } = await Promise.resolve().then(() => (init_stubs(), stubs_exports));
   const { createWorkspaceToolRegistry: createWorkspaceToolRegistry2 } = await Promise.resolve().then(() => (init_toolRegistry2(), toolRegistry_exports2));
@@ -34238,13 +34956,18 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
   const { buildWorkspaceSummary: buildWorkspaceSummary2, buildPlanSummary: buildPlanSummary2 } = await Promise.resolve().then(() => (init_workspaceSummary(), workspaceSummary_exports));
   const { buildLessonsSummary: buildLessonsSummary2 } = await Promise.resolve().then(() => (init_buildLessonsSummary(), buildLessonsSummary_exports));
   const { FeedbackStore: FeedbackStore2 } = await Promise.resolve().then(() => (init_councilFeedback(), councilFeedback_exports));
-  const { registry: councilToolRegistry } = createBuiltinToolRegistry();
+  const workPhase = getPhase();
+  const { registry: councilToolRegistry } = createBuiltinToolRegistry({
+    planMode: workPhase === "plan"
+  });
   const workspaceCtx = createWorkspaceContext2();
   const workspaceReg = createWorkspaceToolRegistry2(workspaceCtx);
   for (const name of workspaceReg.list()) {
     const td = workspaceReg.get(name);
-    if (td) councilToolRegistry.register(td);
+    if (!td) continue;
+    councilToolRegistry.register(td);
   }
+  const phaseRunMode = overrides.runMode ?? (workPhase === "plan" ? "design-phase" : "implementation");
   try {
     const { registerMcpTools: registerMcpTools2 } = await Promise.resolve().then(() => (init_mcpManager(), mcpManager_exports));
     const mcp = await registerMcpTools2(councilToolRegistry);
@@ -34273,7 +34996,7 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
   let sliceDegraded = false;
   const PROVIDER_ERROR_ABORT_THRESHOLD = 2;
   try {
-    for await (const event of dispatchCouncil2(text, {
+    for await (const event of dispatchCouncil2(effectiveText, {
       apiKey: envConfig.apiKey,
       model: envConfig.model,
       provider: "openai-compatible",
@@ -34287,20 +35010,49 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
       // on and projected their identity onto the task.
       // v0.7.3: append the existing plan (if any) so a follow-up /council
       // continues it instead of re-planning from scratch.
+      // v1.8.0: rolling conversation context so short answers bind across
+      // council turns (same history store as the single-agent path).
       workspaceContext: [
         buildWorkspaceSummary2(process.cwd()),
-        buildPlanSummary2(process.cwd(), { userMessage: text }),
-        buildLessonsSummary2(process.cwd(), text)
+        buildPlanSummary2(process.cwd(), { userMessage: effectiveText }),
+        buildLessonsSummary2(process.cwd(), effectiveText),
+        formatHistoryForCouncil(4)
       ].filter(Boolean).join("\n\n"),
       maxToolCallsPerTurn: councilMaxToolCalls,
       // v1.0: Zelari-mode per-slice overrides (memory RAG, forced run mode,
       // raised chairman budget). No-ops for a normal /council run.
       ...overrides.ragContext ? { ragContext: overrides.ragContext } : {},
-      ...overrides.runMode ? { runMode: overrides.runMode } : {},
+      runMode: phaseRunMode,
       ...overrides.maxToolCallsChairman ? { maxToolCallsChairman: overrides.maxToolCallsChairman } : {},
       onCouncilStatus: (message) => {
         appendSystem(setMessages, message, Date.now());
-      }
+      },
+      // v1.8.0: pause council when a member asks a structured question.
+      onClarification: setPicker ? (req) => new Promise((resolve) => {
+        const choices = req.choices ?? [];
+        if (choices.length < 2) {
+          resolve(null);
+          return;
+        }
+        setLastClarification({
+          question: req.question,
+          choices
+        });
+        let settled = false;
+        const finish = (value) => {
+          if (settled) return;
+          settled = true;
+          setPicker(null);
+          resolve(value);
+        };
+        setPicker({
+          kind: "clarification",
+          title: req.question,
+          items: choices.map((c) => ({ value: c, label: c })),
+          onAnswer: (value) => finish(value),
+          onCancel: () => finish(null)
+        });
+      }) : void 0
     })) {
       if (councilAborted) {
         if (writerRef.current) await writerRef.current.append(event);
@@ -34326,17 +35078,23 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
             streamMemberId = memberId;
           }
           streamContent += event.delta;
-          setStreaming(commitStreaming, streamContent, event.ts, {
-            ...event.memberId ? { memberId: event.memberId } : {},
-            ...event.memberName ? { memberName: event.memberName } : {}
-          });
+          setStreaming(
+            commitStreaming,
+            cleanAgentContent(streamContent),
+            event.ts,
+            {
+              ...event.memberId ? { memberId: event.memberId } : {},
+              ...event.memberName ? { memberName: event.memberName } : {}
+            }
+          );
         } else {
           commitStreaming((prev2) => {
             const last = prev2[prev2.length - 1];
             if (last && last.role === "assistant" && last.id.startsWith("streaming-") && (last.memberId ?? null) === (event.memberId ?? null)) {
+              const nextContent = cleanAgentContent(last.content + event.delta);
               return [
                 ...prev2.slice(0, -1),
-                { ...last, content: last.content + event.delta }
+                { ...last, content: nextContent }
               ];
             }
             return [
@@ -34344,7 +35102,7 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
               {
                 id: `streaming-${crypto.randomUUID()}`,
                 role: "assistant",
-                content: event.delta,
+                content: cleanAgentContent(event.delta),
                 ts: event.ts,
                 ...event.memberId ? { memberId: event.memberId } : {},
                 ...event.memberName ? { memberName: event.memberName } : {}
@@ -34451,6 +35209,18 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
     flushStreaming();
     if (useLiveModel) finalizeStreaming(setMessages, setLive);
     else finalizeStreamingAssistant(setMessages);
+    if (membersCompleted > 0 || chairmanProducedOutput) {
+      try {
+        appendMessages([
+          { role: "user", content: effectiveText },
+          {
+            role: "assistant",
+            content: chairmanSynthesisText.trim() || "[council completed without chairman synthesis text]"
+          }
+        ]);
+      } catch {
+      }
+    }
     const hookShouldRun = membersCompleted > 0 || chairmanProducedOutput;
     sliceRan = hookShouldRun;
     if (hookShouldRun) {
@@ -34473,7 +35243,7 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
         }
         const hook = await runPostCouncilHook2(workspaceCtx, {
           runMode: councilRunMode,
-          userMessage: text,
+          userMessage: effectiveText,
           synthesisText: chairmanSynthesisText || void 0,
           degradedRun: degraded.degraded,
           degradedReasons: degraded.reasons
@@ -35123,6 +35893,27 @@ ${formatSkillList(availableSkills)}`
       }
       return { handled: true, kind: "mode_set" };
     }
+    case "plan": {
+      const goal = args.join(" ").trim();
+      return {
+        handled: true,
+        kind: "phase_set",
+        phaseTarget: "plan",
+        ...goal ? { phaseGoal: goal } : {}
+      };
+    }
+    case "build": {
+      const goal = args.join(" ").trim();
+      return {
+        handled: true,
+        kind: "phase_set",
+        phaseTarget: "build",
+        ...goal ? { phaseGoal: goal } : {}
+      };
+    }
+    case "view-plan": {
+      return { handled: true, kind: "view_plan" };
+    }
     case "index": {
       return args[0] === "status" ? { handled: true, kind: "index_status" } : { handled: true, kind: "index_build" };
     }
@@ -35210,7 +36001,7 @@ ${formatSkillList(availableSkills)}`
 // src/cli/gitOps.ts
 import { execFile as execFile3 } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
-import path27 from "node:path";
+import path28 from "node:path";
 var execFileAsync2 = promisify2(execFile3);
 async function git2(cwd, args) {
   try {
@@ -35256,7 +36047,7 @@ async function undoWorkingChanges(opts = {}) {
   };
 }
 function defaultProjectRoot() {
-  return path27.resolve(__dirname, "..", "..", "..");
+  return path28.resolve(__dirname, "..", "..", "..");
 }
 
 // src/cli/slashHandlers/git.ts
@@ -35664,15 +36455,15 @@ ${result.output.split("\n").slice(-8).join("\n")}` : "";
 
 // src/cli/slashHandlers/promoteMember.ts
 import { promises as fs16 } from "node:fs";
-import path29 from "node:path";
+import path31 from "node:path";
 import os10 from "node:os";
 async function handlePromoteMember(ctx, memberId) {
   try {
     const { promoteMember: promoteMember2 } = await Promise.resolve().then(() => (init_council(), council_exports));
     const { skill, markdown } = promoteMember2(memberId);
-    const skillDir = process.env.ANATHEMA_SKILL_DIR ?? path29.join(os10.homedir(), ".tmp", "zelari-code", "skills");
+    const skillDir = process.env.ANATHEMA_SKILL_DIR ?? path31.join(os10.homedir(), ".tmp", "zelari-code", "skills");
     await fs16.mkdir(skillDir, { recursive: true });
-    const filePath = path29.join(skillDir, `${skill.id}.md`);
+    const filePath = path31.join(skillDir, `${skill.id}.md`);
     await fs16.writeFile(filePath, markdown, "utf8");
     appendSystem(
       ctx.setMessages,
@@ -35689,29 +36480,29 @@ async function handlePromoteMember(ctx, memberId) {
 }
 
 // src/cli/branchManager.ts
-import { promises as fs17, existsSync as existsSync27, readFileSync as readFileSync24, writeFileSync as writeFileSync16, mkdirSync as mkdirSync11, statSync as statSync4, rmSync as rmSync2 } from "node:fs";
-import path30 from "node:path";
+import { promises as fs17, existsSync as existsSync28, readFileSync as readFileSync24, writeFileSync as writeFileSync16, mkdirSync as mkdirSync11, statSync as statSync4, rmSync as rmSync2 } from "node:fs";
+import path32 from "node:path";
 import os11 from "node:os";
 var META_FILENAME = "meta.json";
 var SESSIONS_SUBDIR = "sessions";
 function getBranchesBaseDir() {
-  return process.env.ANATHEMA_BRANCHES_DIR ?? path30.join(os11.homedir(), ".tmp", "zelari-code", "branches");
+  return process.env.ANATHEMA_BRANCHES_DIR ?? path32.join(os11.homedir(), ".tmp", "zelari-code", "branches");
 }
 function getSessionsBaseDir() {
-  return process.env.ANATHEMA_SESSIONS_DIR ?? path30.join(os11.homedir(), ".tmp", "zelari-code", "sessions");
+  return process.env.ANATHEMA_SESSIONS_DIR ?? path32.join(os11.homedir(), ".tmp", "zelari-code", "sessions");
 }
 function branchPathFor(name, baseDir) {
-  return path30.join(baseDir, name);
+  return path32.join(baseDir, name);
 }
 function metaPathFor(name, baseDir) {
-  return path30.join(baseDir, name, META_FILENAME);
+  return path32.join(baseDir, name, META_FILENAME);
 }
 function sessionsPathFor(name, baseDir) {
-  return path30.join(baseDir, name, SESSIONS_SUBDIR);
+  return path32.join(baseDir, name, SESSIONS_SUBDIR);
 }
 function readBranchMeta(name, baseDir) {
   const metaPath = metaPathFor(name, baseDir);
-  if (!existsSync27(metaPath)) {
+  if (!existsSync28(metaPath)) {
     throw new BranchNotFoundError(`Branch "${name}" not found`);
   }
   try {
@@ -35732,7 +36523,7 @@ function readBranchMeta(name, baseDir) {
 }
 function writeBranchMeta(name, baseDir, meta3) {
   const metaPath = metaPathFor(name, baseDir);
-  mkdirSync11(path30.dirname(metaPath), { recursive: true });
+  mkdirSync11(path32.dirname(metaPath), { recursive: true });
   writeFileSync16(metaPath, JSON.stringify(meta3, null, 2), "utf-8");
 }
 async function countSessions(name, baseDir) {
@@ -35771,7 +36562,7 @@ var SessionNotFoundError = class extends Error {
 };
 function branchExists(name, baseDir = getBranchesBaseDir()) {
   const bp = branchPathFor(name, baseDir);
-  return existsSync27(bp) && existsSync27(metaPathFor(name, baseDir));
+  return existsSync28(bp) && existsSync28(metaPathFor(name, baseDir));
 }
 async function createBranch(name, fromSessionId, baseDir = getBranchesBaseDir(), sessionsBaseDir = getSessionsBaseDir()) {
   if (!name || name.trim().length === 0) {
@@ -35783,14 +36574,14 @@ async function createBranch(name, fromSessionId, baseDir = getBranchesBaseDir(),
   if (branchExists(name, baseDir)) {
     throw new BranchAlreadyExistsError(name);
   }
-  const sourcePath = path30.join(sessionsBaseDir, `${fromSessionId}.jsonl`);
-  if (!existsSync27(sourcePath)) {
+  const sourcePath = path32.join(sessionsBaseDir, `${fromSessionId}.jsonl`);
+  if (!existsSync28(sourcePath)) {
     throw new SessionNotFoundError(`Source session "${fromSessionId}" not found at ${sourcePath}`);
   }
   const branchPath = branchPathFor(name, baseDir);
   const branchSessionsPath = sessionsPathFor(name, baseDir);
   mkdirSync11(branchSessionsPath, { recursive: true });
-  const destPath = path30.join(branchSessionsPath, `${fromSessionId}.jsonl`);
+  const destPath = path32.join(branchSessionsPath, `${fromSessionId}.jsonl`);
   await fs17.copyFile(sourcePath, destPath);
   const meta3 = {
     name,
@@ -35817,7 +36608,7 @@ async function listBranches(baseDir = getBranchesBaseDir()) {
   const results = [];
   for (const entry of entries) {
     const metaPath = metaPathFor(entry, baseDir);
-    if (!existsSync27(metaPath)) continue;
+    if (!existsSync28(metaPath)) continue;
     try {
       const meta3 = readBranchMeta(entry, baseDir);
       const sessionCount = await countSessions(entry, baseDir);
@@ -35891,14 +36682,14 @@ async function handleBranchCheckout(ctx, branchName) {
 
 // src/cli/slashHandlers/workspace.ts
 import { promises as fs18 } from "node:fs";
-import path31 from "node:path";
+import path33 from "node:path";
 async function handleWorkspaceShow(ctx, what) {
   try {
-    const zelari = path31.join(process.cwd(), ".zelari");
+    const zelari = path33.join(process.cwd(), ".zelari");
     let content;
     switch (what) {
       case "plan": {
-        const planPath = path31.join(zelari, "plan.md");
+        const planPath = path33.join(zelari, "plan.md");
         try {
           content = await fs18.readFile(planPath, "utf-8");
         } catch {
@@ -35907,7 +36698,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "decisions": {
-        const decisionsDir = path31.join(zelari, "decisions");
+        const decisionsDir = path33.join(zelari, "decisions");
         try {
           const files = (await fs18.readdir(decisionsDir)).filter((f) => f.endsWith(".md")).sort();
           if (files.length === 0) {
@@ -35917,7 +36708,7 @@ async function handleWorkspaceShow(ctx, what) {
 `];
             const { parseFrontmatter: parseFrontmatter2 } = await Promise.resolve().then(() => (init_storage(), storage_exports));
             for (const f of files) {
-              const raw = await fs18.readFile(path31.join(decisionsDir, f), "utf-8");
+              const raw = await fs18.readFile(path33.join(decisionsDir, f), "utf-8");
               const { meta: meta3, body } = parseFrontmatter2(raw);
               const title = meta3.title ?? body.split("\n")[0]?.replace(/^#\s*/, "").trim() ?? f;
               lines.push(`- **${f.replace(/\.md$/, "")}** [${meta3.status ?? "unknown"}] ${title}`);
@@ -35930,7 +36721,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "risks": {
-        const risksPath = path31.join(zelari, "risks.md");
+        const risksPath = path33.join(zelari, "risks.md");
         try {
           content = await fs18.readFile(risksPath, "utf-8");
         } catch {
@@ -35939,7 +36730,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "agents": {
-        const agentsPath = path31.join(process.cwd(), "AGENTS.MD");
+        const agentsPath = path33.join(process.cwd(), "AGENTS.MD");
         try {
           content = await fs18.readFile(agentsPath, "utf-8");
         } catch {
@@ -35948,7 +36739,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "docs": {
-        const docsDir = path31.join(zelari, "docs");
+        const docsDir = path33.join(zelari, "docs");
         try {
           const files = (await fs18.readdir(docsDir)).filter((f) => f.endsWith(".md")).sort();
           content = files.length ? `# Docs (${files.length})
@@ -35990,7 +36781,7 @@ async function handleWorkspaceReset(ctx, force) {
     return;
   }
   try {
-    const target = path31.join(process.cwd(), ".zelari");
+    const target = path33.join(process.cwd(), ".zelari");
     await fs18.rm(target, { recursive: true, force: true });
     appendSystem(ctx.setMessages, "[workspace] .zelari/ removed");
   } catch (err) {
@@ -36349,11 +37140,11 @@ function handleModelsRefresh(ctx) {
 }
 
 // src/cli/slashHandlers/skills.ts
-import path32 from "node:path";
+import path34 from "node:path";
 import os12 from "node:os";
 
 // src/cli/skillHistory.ts
-import { promises as fs19, existsSync as existsSync28, statSync as statSync5, renameSync as renameSync4, appendFileSync as appendFileSync3, mkdirSync as mkdirSync12 } from "node:fs";
+import { promises as fs19, existsSync as existsSync29, statSync as statSync5, renameSync as renameSync4, appendFileSync as appendFileSync3, mkdirSync as mkdirSync12 } from "node:fs";
 var SKILL_HISTORY_ROTATE_BYTES = 10 * 1024 * 1024;
 async function readSkillHistory(file2) {
   let raw = "";
@@ -36451,7 +37242,7 @@ async function applySteerInterrupt(options) {
 
 // src/cli/slashHandlers/skills.ts
 async function handleSkillStats(ctx, skillId) {
-  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path32.join(os12.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
+  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path34.join(os12.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
   try {
     const records = await readSkillHistory(historyFile);
     const stats = getSkillStats(records, skillId);
@@ -36467,7 +37258,7 @@ async function handleSkillCompare(ctx, ids, fallbackMessage) {
     appendSystem(ctx.setMessages, fallbackMessage ?? "[skill-compare] missing args");
     return;
   }
-  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path32.join(os12.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
+  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path34.join(os12.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
   try {
     const formatted = await compareSkillsFromFile(ids[0], ids[1], historyFile);
     appendSystem(ctx.setMessages, formatted);
@@ -36593,6 +37384,11 @@ function useSlashDispatch(params) {
         setSessionId(id);
         setMessages([]);
         setSessionActive(false);
+        try {
+          const { clearHistory: clearHistory2 } = await Promise.resolve().then(() => (init_conversationContext(), conversationContext_exports));
+          clearHistory2();
+        } catch {
+        }
         onNewSession?.(id);
       }
       setInput("");
@@ -36825,6 +37621,40 @@ function useSlashDispatch(params) {
       setInput("");
       return;
     }
+    if (result.kind === "phase_set" && result.phaseTarget) {
+      const { setPhase: setPhase2 } = await Promise.resolve().then(() => (init_phaseState(), phaseState_exports));
+      const { describePhase: describePhase2 } = await Promise.resolve().then(() => (init_phase(), phase_exports));
+      setPhase2(result.phaseTarget);
+      params.onPhaseChange?.(result.phaseTarget);
+      appendSystem(setMessages, `[phase] ${describePhase2(result.phaseTarget)}`);
+      setInput("");
+      if (result.phaseGoal) {
+        appendUser(setMessages, result.phaseGoal);
+        setSessionActive(true);
+        if (mode === "zelari") {
+          await dispatchZelariPrompt(result.phaseGoal);
+        } else if (mode === "council") {
+          await dispatchCouncilPrompt(result.phaseGoal);
+        } else {
+          await dispatchPrompt(result.phaseGoal);
+        }
+      }
+      return;
+    }
+    if (result.kind === "view_plan") {
+      try {
+        const { buildPlanSummary: buildPlanSummary2 } = await Promise.resolve().then(() => (init_workspaceSummary(), workspaceSummary_exports));
+        const summary = buildPlanSummary2(process.cwd(), { userMessage: "" });
+        appendSystem(
+          setMessages,
+          summary?.trim() ? summary : "[plan] No plan found. Run /plan <goal> or /workspace show plan after a design council."
+        );
+      } catch {
+        appendSystem(setMessages, "[plan] Unable to read plan (workspace summary failed).");
+      }
+      setInput("");
+      return;
+    }
     if (result.kind === "promote_member" && result.promoteMemberId) {
       await handlePromoteMember(baseCtx, result.promoteMemberId);
       setInput("");
@@ -36856,6 +37686,11 @@ function useSlashDispatch(params) {
     }
     if (result.kind === "clear") {
       handleClearChat(setMessages, setSessionActive);
+      try {
+        const { clearHistory: clearHistory2 } = await Promise.resolve().then(() => (init_conversationContext(), conversationContext_exports));
+        clearHistory2();
+      } catch {
+      }
       params.onClear?.();
       setInput("");
       return;
@@ -36952,8 +37787,9 @@ function useBatchedMessages(state2, setState, cadenceMs = 16) {
 // src/cli/hooks/useTerminalSize.ts
 import { useEffect as useEffect6, useState as useState7 } from "react";
 import { useStdout as useStdout2 } from "ink";
+var DEFAULT_COALESCE_MS = 120;
 function useTerminalSize(options = {}) {
-  const { defaults = { columns: 80, rows: 24 }, coalesceMs = 16 } = options;
+  const { defaults = { columns: 80, rows: 24 }, coalesceMs = DEFAULT_COALESCE_MS } = options;
   const { stdout } = useStdout2();
   const [size, setSize] = useState7({
     columns: stdout?.columns ?? defaults.columns,
@@ -36961,25 +37797,25 @@ function useTerminalSize(options = {}) {
   });
   useEffect6(() => {
     if (!stdout) return;
-    setSize({
+    const read = () => ({
       columns: stdout.columns ?? defaults.columns,
       rows: stdout.rows ?? defaults.rows
     });
+    const commit = (next) => {
+      setSize(
+        (prev2) => prev2.columns === next.columns && prev2.rows === next.rows ? prev2 : next
+      );
+    };
+    commit(read());
     let rafId = null;
     const handleResize = () => {
       if (coalesceMs <= 0) {
-        setSize({
-          columns: stdout.columns ?? defaults.columns,
-          rows: stdout.rows ?? defaults.rows
-        });
+        commit(read());
         return;
       }
       if (rafId !== null) clearTimeout(rafId);
       rafId = setTimeout(() => {
-        setSize({
-          columns: stdout.columns ?? defaults.columns,
-          rows: stdout.rows ?? defaults.rows
-        });
+        commit(read());
         rafId = null;
       }, coalesceMs);
     };
@@ -37008,6 +37844,7 @@ function App() {
   const [sessionStats, setSessionStats] = useState8({ totalTokens: 0, totalCostUsd: 0, cachedTokens: 0 });
   const [clearEpoch, setClearEpoch] = useState8(0);
   const [mode, setMode] = useState8("agent");
+  const [phase2, setPhaseUi] = useState8("build");
   const [picker, setPicker] = useState8(null);
   const activeProviderSpec = getActiveProvider();
   const activeModel = providerConfig.modelByProvider[activeProviderSpec.id];
@@ -37086,7 +37923,8 @@ function App() {
     openPicker: setPicker,
     onNewSession,
     onExit,
-    onClear
+    onClear,
+    onPhaseChange: setPhaseUi
   });
   const onPickerSelect = useCallback5((value) => {
     if (!picker) return;
@@ -37098,54 +37936,90 @@ function App() {
     const cmd = `${picker.commandPrefix} ${value}`;
     void handleSubmit(cmd);
   }, [picker, handleSubmit]);
-  const onPickerCancel = useCallback5(() => setPicker(null), []);
+  const onPickerCancel = useCallback5(() => {
+    if (picker?.kind === "clarification") {
+      picker.onCancel?.();
+    }
+    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: `zelari-code v${VERSION} \u2014 ${activeProviderSpec.id}/${activeModel}
-cwd: ${cwd}
-/help for commands \xB7 /skill <name> \xB7 shift+tab toggles agent/council`
+      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 showSidebar = shouldShowSidebar(size.columns, size.rows);
-  return /* @__PURE__ */ React9.createElement(React9.Fragment, null, /* @__PURE__ */ React9.createElement(Static, { key: staticKey, items: staticItems }, (item) => renderMessage(item)), /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "row" }, /* @__PURE__ */ React9.createElement(Box8, { flexDirection: "column", flexGrow: 1, paddingX: 1 }, /* @__PURE__ */ React9.createElement(LiveRegion, { live: session.live, busy, elapsedMs: timer.elapsedMs }), picker ? /* @__PURE__ */ React9.createElement(
-    SelectList,
+  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,
     {
-      title: picker.title,
-      items: picker.items,
-      onSelect: onPickerSelect,
-      onCancel: onPickerCancel,
-      maxVisible: Math.max(4, Math.min(10, size.rows - 10))
-    }
-  ) : /* @__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,
-      cwd,
-      elapsedMs: timer.elapsedMs,
-      lastMs: timer.lastMs,
-      costUsd: sessionStats.totalCostUsd,
-      cachedTokens: sessionStats.cachedTokens
-    }
-  )), showSidebar && /* @__PURE__ */ React9.createElement(Sidebar, { version: VERSION, changes: gitChanges, rows: size.rows })));
+      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 })
+  ));
 }
 
 // src/cli/components/SplashScreen.tsx
@@ -37329,28 +38203,28 @@ var CHOICE_LATER = "__later__";
 var CHOICE_NEVER = "__never__";
 function PluginGate({ cwd, children }) {
   const { isRawModeSupported } = useStdin4();
-  const [phase, setPhase] = useState10("detecting");
+  const [phase2, setPhase2] = useState10("detecting");
   const [queue, setQueue] = useState10([]);
   const [current, setCurrent] = useState10(null);
   const [result, setResult] = useState10(null);
   const skipGate = process.env.ZELARI_NO_PLUGIN_PROMPT === "1" || isRawModeSupported !== true;
   useEffect9(() => {
     if (skipGate) {
-      setPhase("done");
+      setPhase2("done");
       return;
     }
     let cancelled = false;
     void detectMissingPlugins(cwd).then((missing) => {
       if (cancelled) return;
       if (missing.length === 0) {
-        setPhase("done");
+        setPhase2("done");
         return;
       }
       setQueue(missing);
       setCurrent(missing[0] ?? null);
-      setPhase(missing[0] ? "prompting" : "done");
+      setPhase2(missing[0] ? "prompting" : "done");
     }).catch(() => {
-      if (!cancelled) setPhase("done");
+      if (!cancelled) setPhase2("done");
     });
     return () => {
       cancelled = true;
@@ -37360,12 +38234,12 @@ function PluginGate({ cwd, children }) {
     setQueue((q) => {
       const rest = q.slice(1);
       if (rest.length === 0) {
-        setPhase("done");
+        setPhase2("done");
         setCurrent(null);
         return rest;
       }
       setCurrent(rest[0] ?? null);
-      setPhase(rest[0] ? "prompting" : "done");
+      setPhase2(rest[0] ? "prompting" : "done");
       setResult(null);
       return rest;
     });
@@ -37379,31 +38253,49 @@ function PluginGate({ cwd, children }) {
         markDontAskAgain(current.id);
         advance();
       } else if (value === CHOICE_INSTALL) {
-        setPhase("installing");
-        void installPlugin(current, cwd).then((r) => {
+        setPhase2("installing");
+        void installPlugin(current, cwd).then(async (r) => {
+          if (r.ok) {
+            let present = false;
+            try {
+              present = await current.detect(cwd);
+            } catch {
+              present = false;
+            }
+            if (!present) {
+              setResult({
+                ok: false,
+                output: r.output,
+                exitCode: r.exitCode,
+                error: `npm reported success but ${current.label} is still not detectable from this workspace. Try \`/plugins install ${current.id}\` or see the post-install hint.`
+              });
+              setPhase2("result");
+              return;
+            }
+          }
           setResult(r);
-          setPhase("result");
+          setPhase2("result");
         }).catch(() => {
           setResult({ ok: false, output: "", exitCode: null, error: "unexpected error" });
-          setPhase("result");
+          setPhase2("result");
         });
       }
     },
     [current, cwd, advance]
   );
-  if (phase === "done") {
+  if (phase2 === "done") {
     return /* @__PURE__ */ React11.createElement(React11.Fragment, null, children);
   }
-  if (phase === "detecting") {
+  if (phase2 === "detecting") {
     return /* @__PURE__ */ React11.createElement(Box10, { paddingX: 1 }, /* @__PURE__ */ React11.createElement(Text11, { dimColor: true }, "Checking for optional tool plugins\u2026"));
   }
   if (!current) {
     return /* @__PURE__ */ React11.createElement(React11.Fragment, null, children);
   }
-  if (phase === "installing") {
+  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));
   }
-  if (phase === "result") {
+  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 }));
   }
@@ -37441,9 +38333,9 @@ function ContinueKey({ onContinue }) {
 init_providerConfig();
 
 // src/cli/wizard/firstRun.ts
-import { existsSync as existsSync29 } from "node:fs";
+import { existsSync as existsSync30 } from "node:fs";
 function shouldRunWizard(input) {
-  const exists = input.exists ?? existsSync29;
+  const exists = input.exists ?? existsSync30;
   if (input.hasResetConfigFlag) {
     return { shouldRun: true, reason: "--reset-config flag forced wizard" };
   }
@@ -37801,6 +38693,7 @@ function emitEvent(event) {
 init_harness();
 init_toolRegistry();
 init_skills2();
+init_envNumber();
 async function runHeadless(opts) {
   const { provider, model } = resolveHeadlessProvider(opts);
   const key = await resolveHeadlessKey(provider);
@@ -37989,7 +38882,7 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
 
 // src/cli/skillsMd.ts
 init_skills2();
-import { existsSync as existsSync30, readdirSync as readdirSync4, readFileSync as readFileSync25 } from "node:fs";
+import { existsSync as existsSync31, readdirSync as readdirSync4, readFileSync as readFileSync25 } from "node:fs";
 import { join as join23 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 var CODING_CATEGORIES = /* @__PURE__ */ new Set([
@@ -38067,7 +38960,7 @@ function loadSkillMdSkills(projectRoot = process.cwd(), options = {}) {
   const summary = { loaded: [], skipped: [] };
   const seen = new Set(options.existingIds ?? []);
   for (const dir of skillMdSearchDirs(projectRoot)) {
-    if (!existsSync30(dir)) continue;
+    if (!existsSync31(dir)) continue;
     let entries;
     try {
       entries = readdirSync4(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
@@ -38076,7 +38969,7 @@ function loadSkillMdSkills(projectRoot = process.cwd(), options = {}) {
     }
     for (const entry of entries) {
       const skillPath = join23(dir, entry, "SKILL.md");
-      if (!existsSync30(skillPath)) continue;
+      if (!existsSync31(skillPath)) continue;
       try {
         const parsed = parseSkillMd(readFileSync25(skillPath, "utf8"), skillPath);
         if (!parsed) {