zelari-code 1.8.0 → 1.8.3

package/dist/cli/main.bundled.js

@@ -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;
@@ -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",
@@ -18944,18 +18971,131 @@ function normalizeTextToolArgs(name, args) {
 }
 function parseTextToolCalls(text) {
   const m = /---TOOLS---\s*([\s\S]*?)---END---/.exec(text);
-  if (!m || !m[1])
-    return [];
+  if (m?.[1]) {
+    let body = m[1].trim();
+    body = body.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
+    const candidates = [body];
+    if (/\]\s*\[/.test(body)) {
+      candidates.push(body.replace(/\]\s*\[/g, ","));
+    }
+    if (body.includes('\\"')) {
+      candidates.push(body.replace(/\\"/g, '"'));
+      if (/\]\s*\[/.test(body)) {
+        candidates.push(body.replace(/\\"/g, '"').replace(/\]\s*\[/g, ","));
+      }
+    }
+    for (const cand of candidates) {
+      const items = tryParseToolArray(cand);
+      if (items.length > 0)
+        return items;
+    }
+    const arrays = extractJsonArrays(body);
+    if (arrays.length > 1) {
+      const merged = [];
+      for (const a of arrays) {
+        merged.push(...tryParseToolArray(a));
+      }
+      if (merged.length > 0)
+        return merged;
+    }
+    const objs = extractToolObjects(body);
+    if (objs.length > 0)
+      return objs;
+  }
+  const mini = parseMinimaxStyleToolCalls(text);
+  if (mini.length > 0)
+    return mini;
+  return [];
+}
+function parseMinimaxStyleToolCalls(text) {
+  const out = [];
+  const normalized = text.replace(/\]\s*<\s*\]\s*minimax\s*\[\s*>\s*\[</gi, "<minimax:").replace(/\]\s*<\s*\]\s*minimax\s*\[\s*>/gi, "<minimax:").replace(/minimax\s*\[\s*>\s*\[</gi, "minimax:").replace(/\]\s*</g, "<");
+  const blockRe = /<(?:minimax:)?tool_call[^>]*>([\s\S]*?)<\/(?:minimax:)?tool_call>|<invoke\s+name=["']([^"']+)["'][^>]*>([\s\S]*?)(?:<\/invoke>|(?=<invoke\s+name=)|$)/gi;
+  let match;
+  while ((match = blockRe.exec(normalized)) !== null) {
+    if (match[2]) {
+      out.push({ name: match[2], args: parseLooseArgs(match[3] ?? "") });
+    } else if (match[1]) {
+      const inner = match[1];
+      const inv = /invoke\s+name=["']([^"']+)["']/i.exec(inner);
+      if (inv) {
+        out.push({ name: inv[1], args: parseLooseArgs(inner) });
+      } else {
+        const jsonish = tryParseToolArray(inner.trim());
+        if (jsonish.length)
+          out.push(...jsonish);
+        else {
+          const objs = extractToolObjects(inner);
+          if (objs.length)
+            out.push(...objs);
+        }
+      }
+    }
+  }
+  if (out.length === 0) {
+    const loose = /invoke\s+name=["']([^"']+)["']([\s\S]*?)(?=invoke\s+name=|$)/gi;
+    let lm;
+    while ((lm = loose.exec(normalized)) !== null) {
+      const name = lm[1];
+      const args = parseLooseArgs(lm[2] ?? "");
+      if (name)
+        out.push({ name, args });
+    }
+  }
+  return out;
+}
+function parseLooseArgs(body) {
+  const args = {};
+  const paramTag = /(?:parameter\s+name=|<\s*)["']?([a-zA-Z_][\w]*)["']?\s*(?:>|=\s*["']?)([^<\]\n]+)/gi;
+  let m;
+  while ((m = paramTag.exec(body)) !== null) {
+    const key = m[1];
+    if (key === "invoke" || key === "minimax" || key === "tool_call")
+      continue;
+    args[key] = m[2].replace(/^["']|["']$/g, "").trim();
+  }
+  const lineRe = /(?:^|[\s\[>])([a-zA-Z_][\w]*)\s*[>:=]\s*([^\n<\]]+)/g;
+  while ((m = lineRe.exec(body)) !== null) {
+    const key = m[1];
+    if (args[key] !== void 0)
+      continue;
+    if (["invoke", "name", "minimax", "tool_call", "parameter"].includes(key))
+      continue;
+    args[key] = m[2].replace(/^["']|["']$/g, "").trim();
+  }
+  if (Object.keys(args).length === 0) {
+    const brace = body.indexOf("{");
+    if (brace >= 0) {
+      try {
+        const parsed = JSON.parse(body.slice(brace));
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+          return parsed;
+        }
+      } catch {
+      }
+    }
+  }
+  return args;
+}
+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 +19106,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"() {
@@ -18977,6 +19181,7 @@ var init_AgentHarness = __esm({
       sessionId;
       maxQueuedIterations;
       maxToolLoopIterations;
+      maxToolLoopHardCap;
       cancelled = false;
       activeController = null;
       queue = [];
@@ -19002,6 +19207,9 @@ var init_AgentHarness = __esm({
         this.sessionId = config2.sessionId ?? crypto.randomUUID();
         this.maxQueuedIterations = config2.maxQueuedIterations ?? 3;
         this.maxToolLoopIterations = config2.maxToolLoopIterations ?? 30;
+        const soft = this.maxToolLoopIterations;
+        const hardCfg = config2.maxToolLoopHardCap;
+        this.maxToolLoopHardCap = typeof hardCfg === "number" && hardCfg > 0 ? Math.max(soft, hardCfg) : Math.max(soft * 3, soft + 60);
       }
       /**
        * Snapshot of the live transcript (`this.config.messages`) as mutated
@@ -19278,7 +19486,11 @@ ${shared2.content}`,
         this.emit(initialMsgEnd);
         yield initialMsgEnd;
         let toolLoopTurns = 0;
-        while (!this.cancelled && !hadError && toolLoopTurns < this.maxToolLoopIterations && initialFinishRef.value === "tool_calls") {
+        let softCap = this.maxToolLoopIterations;
+        const hardCap = this.maxToolLoopHardCap;
+        let extensions = 0;
+        const maxExtensions = 8;
+        while (!this.cancelled && !hadError && toolLoopTurns < softCap && initialFinishRef.value === "tool_calls") {
           toolLoopTurns++;
           const turnMessageId = crypto.randomUUID();
           const msgStart = createBrainEvent("message_start", this.sessionId, { messageId: turnMessageId, role: "assistant", ...this.memberFields() });
@@ -19309,9 +19521,25 @@ ${shared2.content}`,
           initialFinishRef.value = turnFinishRef.value;
           if (hadError || this.cancelled)
             break;
+          if (initialFinishRef.value === "tool_calls" && toolLoopTurns >= softCap && toolLoopTurns < hardCap && extensions < maxExtensions) {
+            extensions++;
+            const chunk = this.maxToolLoopIterations;
+            softCap = Math.min(hardCap, softCap + chunk);
+            this.config.messages.push({
+              role: "user",
+              content: `[system] Soft tool budget reached (${toolLoopTurns}/${hardCap} hard). Work may be incomplete \u2014 CONTINUE with tools as needed to finish remaining steps. Prefer concrete progress over summarizing. Do not apologize for budgets.`
+            });
+            const note = createBrainEvent("error", this.sessionId, {
+              severity: "recoverable",
+              message: `Tool budget extended (${toolLoopTurns}\u2192${softCap}, hard ${hardCap}) to allow completion.`,
+              code: "tool_budget_extended"
+            });
+            this.emit(note);
+            yield note;
+          }
         }
-        const hitIterationCap = toolLoopTurns >= this.maxToolLoopIterations;
-        if (!this.cancelled && !hadError && initialFinishRef.value === "tool_calls" && hitIterationCap) {
+        const hitHardCap = toolLoopTurns >= hardCap || toolLoopTurns >= softCap && softCap >= hardCap;
+        if (!this.cancelled && !hadError && initialFinishRef.value === "tool_calls" && hitHardCap) {
           yield* this.runFinalAnswerTurn();
         }
         let turns = 0;
@@ -19475,13 +19703,14 @@ ${cached2}`
                 pendingNativeTools.length = 0;
               }
               const textTools = parseTextToolCalls(turnText);
-              const nativeWriteRan = turnToolCalls.some((t) => t.name === "write_file" || t.name === "edit_file");
-              const textWriteTools = textTools.filter((t) => t.name === "write_file" || t.name === "edit_file");
-              const toolsToRun = nativeWriteRan ? [] : turnToolCalls.length === 0 ? textTools : textWriteTools;
-              if (/---TOOLS---/.test(turnText) && textTools.length === 0) {
+              const toolsToRun = textTools.filter((tt) => {
+                const key = hashToolCall(tt.name, tt.args);
+                return !turnToolCalls.some((n) => hashToolCall(n.name, n.args) === key);
+              });
+              if ((/---TOOLS---/.test(turnText) || /minimax|invoke\s+name=/i.test(turnText)) && textTools.length === 0) {
                 const parseErr = createBrainEvent("error", this.sessionId, {
                   severity: "recoverable",
-                  message: "Found ---TOOLS--- block but JSON parse failed; tool calls were not executed. Emit valid JSON (escape newlines as \\n inside strings).",
+                  message: "Found text-format tool block but parse failed; tool calls were not executed. Prefer native tool_call, or ---TOOLS--- with ONE valid JSON array.",
                   code: "text_tools_parse_failed"
                 });
                 this.emit(parseErr);
@@ -19613,7 +19842,7 @@ ${cached2}`
         yield msgStart;
         this.config.messages.push({
           role: "user",
-          content: "[system] Tool iteration budget exhausted. Stop calling tools and answer the original request now using the information you have already gathered. Do not apologize for the tools."
+          content: "[system] Hard tool-iteration ceiling reached. Stop calling tools and give a clear status: what is DONE, what remains, and the exact next steps. Use what you already gathered. Do not apologize for the tools."
         });
         let totalLength = 0;
         const finishRef = { value: "stop" };
@@ -19812,6 +20041,7 @@ __export(harness_exports, {
   SessionJsonlWriter: () => SessionJsonlWriter,
   hashToolCall: () => hashToolCall,
   normalizeTextToolArgs: () => normalizeTextToolArgs,
+  parseMinimaxStyleToolCalls: () => parseMinimaxStyleToolCalls,
   parseTextToolCalls: () => parseTextToolCalls,
   readSession: () => readSession,
   wrapLegacyStream: () => wrapLegacyStream
@@ -23934,11 +24164,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)
@@ -30520,7 +30758,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
@@ -30918,9 +31156,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,
     {
@@ -30930,7 +31171,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");
@@ -31093,11 +31334,25 @@ import React8 from "react";
 import { Box as Box7, Text as Text8 } from "ink";
 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;
@@ -31105,7 +31360,7 @@ function truncatePath(p3, max) {
 }
 function Sidebar({ version: version2, changes, rows }) {
   void version2;
-  const maxFiles = rows >= EMBLEM_MIN_ROWS + 8 ? MAX_FILES_TALL : MAX_FILES_SHORT;
+  const maxFiles = maxSidebarFiles(rows);
   const visible = changes.files.slice(0, maxFiles);
   const hidden = changes.files.length - visible.length;
   const innerWidth = SIDEBAR_WIDTH - 4;
@@ -31117,7 +31372,9 @@ 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"
     },
     /* @__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)),
@@ -31129,6 +31386,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";
@@ -34113,10 +34417,12 @@ function computeSessionStatsDelta(realUsage, userText, assistantContent, model,
   const completionTokens = realUsage ? realUsage.completionTokens : Math.ceil(assistantContent.length / 4);
   const cachedPromptTokens = realUsage?.cachedPromptTokens ?? 0;
   const turnCost = calculateCost(model, promptTokens, completionTokens, cachedPromptTokens);
+  const contextTokens = realUsage ? realUsage.totalTokens || promptTokens + completionTokens : promptTokens + completionTokens;
   return {
     totalTokens: prev2.totalTokens + promptTokens + completionTokens,
     totalCostUsd: prev2.totalCostUsd + turnCost,
-    cachedTokens: (prev2.cachedTokens ?? 0) + cachedPromptTokens
+    cachedTokens: (prev2.cachedTokens ?? 0) + cachedPromptTokens,
+    contextTokens
   };
 }
 
@@ -34402,6 +34708,11 @@ function useChatTurn(params) {
           min: 1
         });
         const maxToolLoopIterations = budget.maxToolLoopIterations;
+        const maxToolLoopHardCap = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_HARD, {
+          default: 0,
+          // 0 → harness default (soft×3, min soft+60)
+          min: 0
+        });
         const harness2 = new AgentHarness({
           model: envConfig.model,
           provider: "openai-compatible",
@@ -34422,7 +34733,8 @@ function useChatTurn(params) {
           providerStream,
           cwd,
           maxToolCallsPerTurn,
-          maxToolLoopIterations
+          maxToolLoopIterations,
+          ...maxToolLoopHardCap > 0 ? { maxToolLoopHardCap } : {}
         });
         harnessRef.current = harness2;
         setQueueCount(harness2.queueLength);
@@ -34478,15 +34790,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 } : {},
@@ -34496,7 +34809,15 @@ function useChatTurn(params) {
               }
             } else if (event.type === "error") {
               flushStreaming();
-              appendSystem(setMessages, `[error] ${event.message}`, Date.now());
+              if (event.code === "tool_budget_extended") {
+                appendSystem(
+                  setMessages,
+                  `[budget] ${event.message}`,
+                  Date.now()
+                );
+              } else {
+                appendSystem(setMessages, `[error] ${event.message}`, Date.now());
+              }
             } else if (event.type === "tool_execution_start") {
               toolNameById.set(event.toolCallId, event.toolName);
               flushStreaming();
@@ -34552,32 +34873,41 @@ function useChatTurn(params) {
               const all = h.getMessages();
               const seedLen = 1 + historySeedLen + 1;
               if (all.length > seedLen) {
-                appendMessages(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 && 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) {
                 setLastClarification({
                   question: clar.question,
                   choices: clar.choices
                 });
-                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;
-                      }
-                    }
-                    return next;
-                  });
-                }
                 if (setPicker) {
                   setPicker({
                     kind: "clarification",
@@ -34866,17 +35196,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 [
@@ -34884,7 +35220,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 } : {}
@@ -37569,8 +37905,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,
@@ -37578,25 +37915,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);
     };
@@ -37622,7 +37959,12 @@ function App() {
   const [input, setInput] = useState8("");
   const [busy, setBusy] = useState8(false);
   const [providerConfig, setProviderConfig] = useState8(() => getProviderConfig());
-  const [sessionStats, setSessionStats] = useState8({ totalTokens: 0, totalCostUsd: 0, cachedTokens: 0 });
+  const [sessionStats, setSessionStats] = useState8({
+    totalTokens: 0,
+    totalCostUsd: 0,
+    cachedTokens: 0,
+    contextTokens: 0
+  });
   const [clearEpoch, setClearEpoch] = useState8(0);
   const [mode, setMode] = useState8("agent");
   const [phase2, setPhaseUi] = useState8("build");
@@ -37723,60 +38065,84 @@ function App() {
     }
     setPicker(null);
   }, [picker]);
+  const bannerColsRef = useRef6(null);
+  if (bannerColsRef.current === null) {
+    bannerColsRef.current = size.columns > 0 ? size.columns : 80;
+  }
   const banner = useMemo(() => {
-    const left = `zelari-code \xB7 ${activeProviderSpec.id}/${activeModel}`;
-    const right = `ZELARI CODE  v${VERSION}`;
-    const pad = Math.max(2, 72 - left.length - right.length);
+    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: `${left}${" ".repeat(pad)}${right}
-cwd: ${cwd}
-/help \xB7 /plan \xB7 /build \xB7 /view-plan \xB7 shift+tab mode (agent/council/zelari)`
+      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,
-      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
-    }
-  )), 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.contextTokens || 0,
+        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