zelari-code 1.13.0 → 1.14.3

package/dist/cli/main.bundled.js

@@ -741,10 +741,11 @@ var init_providerConfig = __esm({
     DEFAULTS = {
       activeProviderId: "openai-compatible",
       modelByProvider: {
-        "openai-compatible": "grok-4",
+        // grok-4.5: flagship; reasoning_effort defaults to "high" on the xAI API
+        "openai-compatible": "grok-4.5",
         "minimax": "MiniMax-M2.5",
         "glm": "glm-4.6",
-        "grok": "grok-4",
+        "grok": "grok-4.5",
         "deepseek": "deepseek-v4-pro",
         "custom": ""
       },
@@ -18345,7 +18346,9 @@ Earlier members' outputs are shared context. Build on them; do not re-derive or
 
 - Be concise and structured. Prefer short markdown sections and bullets over walls of text.
 - Be proactive but not reckless: if a single missing fact would change the design, ask one focused question; otherwise make a documented assumption and proceed.
-- Prefer action over description when the user wants code, fixes, or repo changes \u2014 use tools.
+- Prefer action over description when the user wants code, fixes, or repo changes \u2014 use tools (write_file/edit_file/bash), not prose-only plans.
+- When the user confirms a plan ("procedi", "s\xEC", "implementa"), the prior plan is work TO DO on disk. Reading alone is incomplete.
+- Never claim work is "already implemented" without verifying the real files (and writing if gaps remain).
 - Think step by step internally; surface conclusions and a brief rationale, not a full chain of thought.`
     };
     BEHAVIOR_COUNCIL = {
@@ -18416,11 +18419,12 @@ Earlier members' outputs are shared context. Build on them; do not re-derive or
       content: `# Coding Practices
 
 - **Read before edit**: open relevant files (and nearby callers/tests) before changing code.
+- **Then write**: if the task is to implement, follow reads with write_file/edit_file in the same turn. Do not end after exploration.
 - **Minimal diffs**: change only what the task requires; match existing style and patterns.
 - **Don't invent**: no fake APIs, deps, or config keys \u2014 discover from the tree or package manifests.
 - **Verify**: after non-trivial edits, run the project's tests/typecheck/build when available; fix failures you introduced.
 - **Use project scripts**: prefer package.json / Makefile / existing tooling over ad-hoc commands.
-- **Finish**: summarize what changed and how to verify.`
+- **Finish**: list the paths you wrote/edited and how to verify. If you wrote nothing, say so honestly \u2014 do not invent a done report.`
     };
     CLARIFICATION_PROTOCOL_MODULE = {
       type: "custom",
@@ -19832,7 +19836,7 @@ ${cached2}`
                 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) {
+              if ((/---TOOLS---/.test(turnText) || /<\/?minimax:tool_call\b/i.test(turnText) || /invoke\s+name\s*=/i.test(turnText) || /\]\s*<\s*\]\s*minimax\s*\[/i.test(turnText)) && textTools.length === 0) {
                 const parseErr = createBrainEvent("error", this.sessionId, {
                   severity: "recoverable",
                   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.",
@@ -19899,6 +19903,9 @@ ${cached2}`
                   finishRef.value = "tool_calls";
                 }
               }
+              if (turnToolResults.length > 0) {
+                finishRef.value = "tool_calls";
+              }
               if (finishRef.value === "tool_calls" && turnToolCalls.length === 0 && turnToolResults.length === 0) {
                 const truncErr = createBrainEvent("error", this.sessionId, {
                   severity: "recoverable",
@@ -20364,6 +20371,38 @@ function openaiCompatibleProvider(config2) {
     const decoder = new TextDecoder();
     let buffer = "";
     const toolCallAccumulator = /* @__PURE__ */ new Map();
+    let emittedToolCall = false;
+    let reasoningDetailsBuf = "";
+    const tryParseArgs = (raw) => {
+      const t = raw.trim();
+      if (t.length === 0) return {};
+      try {
+        const parsed = JSON.parse(t);
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+          return parsed;
+        }
+        return null;
+      } catch {
+        return null;
+      }
+    };
+    const flushToolAccumulator = function* () {
+      const entries = [...toolCallAccumulator.entries()].sort((a, b) => a[0] - b[0]);
+      for (const [idx, existing] of entries) {
+        if (!existing.name) continue;
+        const args = tryParseArgs(existing.argsJson);
+        if (args === null) continue;
+        toolCallAccumulator.delete(idx);
+        emittedToolCall = true;
+        yield {
+          kind: "tool_call",
+          toolCallId: existing.id || `tc-${idx}`,
+          toolName: existing.name,
+          args
+        };
+      }
+      toolCallAccumulator.clear();
+    };
     try {
       while (true) {
         const { value, done } = await reader.read();
@@ -20376,7 +20415,11 @@ function openaiCompatibleProvider(config2) {
           if (!trimmed.startsWith("data:")) continue;
           const data = trimmed.slice(5).trim();
           if (data === "[DONE]") {
-            yield { kind: "finish", reason: "stop" };
+            yield* flushToolAccumulator();
+            yield {
+              kind: "finish",
+              reason: emittedToolCall ? "tool_calls" : "stop"
+            };
             return;
           }
           try {
@@ -20405,6 +20448,22 @@ function openaiCompatibleProvider(config2) {
             if (typeof reasoning === "string" && reasoning.length > 0) {
               yield { kind: "thinking", delta: reasoning };
             }
+            const details = delta?.reasoning_details;
+            if (Array.isArray(details)) {
+              for (const d of details) {
+                if (!d || typeof d !== "object") continue;
+                const t = d.text;
+                if (typeof t !== "string" || t.length === 0) continue;
+                if (t.startsWith(reasoningDetailsBuf)) {
+                  const piece = t.slice(reasoningDetailsBuf.length);
+                  reasoningDetailsBuf = t;
+                  if (piece.length > 0) yield { kind: "thinking", delta: piece };
+                } else {
+                  reasoningDetailsBuf += t;
+                  yield { kind: "thinking", delta: t };
+                }
+              }
+            }
             if (Array.isArray(delta?.tool_calls)) {
               for (const tc of delta.tool_calls) {
                 const idx = tc.index ?? 0;
@@ -20418,27 +20477,34 @@ function openaiCompatibleProvider(config2) {
                 if (tc.function?.arguments) existing.argsJson += tc.function.arguments;
                 toolCallAccumulator.set(idx, existing);
                 if (existing.argsJson.trim().endsWith("}")) {
-                  try {
-                    const parsedArgs = JSON.parse(existing.argsJson);
+                  const parsedArgs = tryParseArgs(existing.argsJson);
+                  if (parsedArgs !== null && existing.name) {
                     toolCallAccumulator.delete(idx);
+                    emittedToolCall = true;
                     yield {
                       kind: "tool_call",
                       toolCallId: existing.id || `tc-${idx}`,
                       toolName: existing.name,
                       args: parsedArgs
                     };
-                  } catch {
                   }
                 }
               }
             }
             if (choice?.finish_reason) {
-              yield { kind: "finish", reason: choice.finish_reason };
+              yield* flushToolAccumulator();
+              const reason = choice.finish_reason === "stop" && emittedToolCall ? "tool_calls" : choice.finish_reason;
+              yield { kind: "finish", reason };
             }
           } catch {
           }
         }
       }
+      yield* flushToolAccumulator();
+      yield {
+        kind: "finish",
+        reason: emittedToolCall ? "tool_calls" : "stop"
+      };
     } finally {
       reader.releaseLock();
     }
@@ -24757,7 +24823,12 @@ function parseThinking(text) {
 }
 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, "");
+  const stripThink = opts.stripThink !== false;
+  let out = text;
+  if (stripThink) {
+    out = out.replace(/<think(?:ing)?>[\s\S]*?<\/think(?:ing)?>/gi, "").replace(/<think(?:ing)?>[\s\S]*$/gi, "").replace(/<\/think(?:ing)?>/gi, "");
+  }
+  out = out.replace(/<minimax:tool_call>[\s\S]*?<\/minimax:tool_call>/g, "");
   if (stripQuestion) {
     out = out.replace(/---QUESTION---[\s\S]*?---END---/g, "");
   }
@@ -26988,14 +27059,18 @@ var conversationContext_exports = {};
 __export(conversationContext_exports, {
   _resetConversationContextForTests: () => _resetConversationContextForTests,
   appendMessages: () => appendMessages,
+  buildAgentUserWithHistory: () => buildAgentUserWithHistory,
+  buildContinueUserMessage: () => buildContinueUserMessage,
   buildCouncilTaskWithHistory: () => buildCouncilTaskWithHistory,
   clearHistory: () => clearHistory,
   compactInPlace: () => compactInPlace,
+  expectsDiskImplementation: () => expectsDiskImplementation,
   formatHistoryForCouncil: () => formatHistoryForCouncil,
   formatHistoryMessages: () => formatHistoryMessages,
   getHistory: () => getHistory,
   getLastClarification: () => getLastClarification,
   hydrateHistory: () => hydrateHistory,
+  isShortContinueReply: () => isShortContinueReply,
   maybeAnchorShortAnswer: () => maybeAnchorShortAnswer,
   serializeHistory: () => serializeHistory,
   setHistory: () => setHistory,
@@ -27078,22 +27153,67 @@ ${body.slice(body.length - maxTotalChars)}`;
   }
   return body;
 }
-function buildCouncilTaskWithHistory(task, prior) {
-  const messages = prior ?? [];
+function isShortContinueReply(task) {
   const trimmed = task.trim();
-  let userPart = maybeAnchorShortAnswer(task) ?? task;
-  if (messages.length > 0 && (SHORT_CONTINUE.test(trimmed) || trimmed.length <= 40 && !trimmed.includes("\n"))) {
-    const lastAsst = [...messages].reverse().find((m) => m.role === "assistant" && m.content.trim());
-    if (lastAsst && SHORT_CONTINUE.test(trimmed)) {
-      userPart = `The user says "${trimmed}" \u2014 continue from the prior conversation. Do NOT restart from zero, do NOT re-ask for the overall goal, and do NOT ignore the prior plan/risks/decisions.
+  if (!trimmed) return false;
+  if (SHORT_CONTINUE.test(trimmed)) return true;
+  if (trimmed.length <= 80 && !trimmed.includes("\n") && SHORT_CONTINUE_LOOSE.test(trimmed)) {
+    return true;
+  }
+  return false;
+}
+function buildContinueUserMessage(task, prior, opts) {
+  if (!isShortContinueReply(task) || prior.length === 0) return null;
+  const lastAsst = [...prior].reverse().find((m) => m.role === "assistant" && (m.content ?? "").trim());
+  if (!lastAsst) return null;
+  const max = opts?.maxPriorChars ?? 8e3;
+  const trimmed = task.trim();
+  return `The user says "${trimmed}" \u2014 this is a CONTINUATION of an existing multi-turn session (the Desktop phase may have switched plan\u2194build; mode may have changed). This is NOT a new conversation and you DO have prior context below.
 
-## Prior assistant output (authoritative context)
-${truncate(lastAsst.content, 4500)}
+## CRITICAL \u2014 plan text \u2260 done on disk
+The prior assistant output is a PLAN / SPEC / PROPOSAL (or analysis). It is NOT proof that project files already contain those changes.
+The user CONFIRMED the plan and wants you to IMPLEMENT it ON DISK NOW.
+- You MUST use write_file and/or edit_file (and bash when needed) to apply every planned change.
+- Reading files alone is incomplete. Do not stop after read_file/list_files/grep.
+- Do NOT claim "already implemented" / "tutto fatto" unless you verified the changes exist on disk in THIS turn (read after your own successful writes).
+- Do NOT restart from zero or re-ask for the overall goal.
+
+## Prior assistant output (plan to implement \u2014 authoritative)
+${truncate(lastAsst.content, max)}
 
 ## Instruction
-Proceed with the next concrete steps implied by that context (implementation when the work phase is build; otherwise the next planned actions).`;
+Implement the plan on disk now with mutating tools, then briefly list the files you wrote/edited.`;
+}
+function expectsDiskImplementation(task, phase2, prior) {
+  if ((phase2 ?? "build") === "plan") return false;
+  const trimmed = task.trim();
+  if (!trimmed) return false;
+  if (isShortContinueReply(trimmed)) return true;
+  if (/\b(implement|implementa|scrivi|scriviamo|applica|modifica|fix|write|edit|crea|aggiungi|aggiorna|apply|patch)\b/i.test(
+    trimmed
+  )) {
+    return true;
+  }
+  if (prior && prior.length > 0 && isShortContinueReply(trimmed)) {
+    const lastAsst = [...prior].reverse().find((m) => m.role === "assistant" && (m.content ?? "").trim());
+    if (lastAsst && /\b(se confermi|passo alla|scriv|implement|on disk|write_file|modifiche proposte|riepilogo delle modifiche)\b/i.test(
+      lastAsst.content
+    )) {
+      return true;
     }
   }
+  return false;
+}
+function buildCouncilTaskWithHistory(task, prior) {
+  const messages = prior ?? [];
+  const trimmed = task.trim();
+  let userPart = maybeAnchorShortAnswer(task) ?? task;
+  const continued = buildContinueUserMessage(trimmed, messages, {
+    maxPriorChars: 4500
+  });
+  if (continued) {
+    userPart = continued;
+  }
   const block = formatHistoryMessages(messages, 6, 12e3);
   if (!block) return userPart;
   if (userPart.includes("Prior assistant output")) {
@@ -27104,6 +27224,12 @@ Proceed with the next concrete steps implied by that context (implementation whe
 ## Current user request
 ${userPart}`;
 }
+function buildAgentUserWithHistory(task, prior) {
+  const messages = prior ?? [];
+  const anchored = maybeAnchorShortAnswer(task);
+  if (anchored) return anchored;
+  return buildContinueUserMessage(task, messages, { maxPriorChars: 8e3 }) ?? task;
+}
 function truncate(s, max) {
   const t = s.replace(/\s+/g, " ").trim();
   if (t.length <= max) return t;
@@ -27113,14 +27239,15 @@ function _resetConversationContextForTests() {
   history = [];
   lastClarification = null;
 }
-var history, lastClarification, SHORT_CONTINUE;
+var history, lastClarification, SHORT_CONTINUE, SHORT_CONTINUE_LOOSE;
 var init_conversationContext = __esm({
   "src/cli/hooks/conversationContext.ts"() {
     "use strict";
     init_historyCompaction();
     history = [];
     lastClarification = null;
-    SHORT_CONTINUE = /^(procedi|continua|continue|go\s*ahead|go|ok|okay|sì|si|yes|vai|avanti|next|proceed)$/i;
+    SHORT_CONTINUE = /^(procedi|continua|continue|go\s*ahead|go|ok|okay|sì|si|yes|vai|avanti|next|proceed|conferma|confermo|applica|fai|scrivi|esegui|implementa|vai pure|fai pure|ok procedi|sì procedi|si procedi)$/i;
+    SHORT_CONTINUE_LOOSE = /\b(procedi|continua|continue|conferma|confermo|applica|implementa|scriv[ia]|esegui|vai pure|fai pure|go ahead|proceed)\b/i;
   }
 });
 
@@ -31869,7 +31996,9 @@ import { Box as Box5, Text as Text6 } from "ink";
 
 // src/cli/modelPricing.ts
 var PRICES_PER_MILLION = {
-  // xAI Grok
+  // xAI Grok (list prices; grok-4.5 default reasoning_effort is "high")
+  "grok-4.5": { input: 2, output: 6, cachedInput: 0.5 },
+  "grok-4.3": { input: 1.25, output: 2.5, cachedInput: 0.2 },
   "grok-4": { input: 3, output: 15 },
   "grok-4-fast": { input: 0.2, output: 0.5 },
   "grok-3": { input: 3, output: 15 },
@@ -35293,11 +35422,16 @@ function useChatTurn(params) {
           "- 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 ? [
+        ].join("\n") : workPhase === "build" ? [
           "",
           "# Work Phase: BUILD",
-          "Implement the approved plan. Prefer acting over describing. Update plan task statuses as you go."
-        ].join("\n") : "";
+          "Implement on disk. Prefer acting over describing.",
+          "- Prior plan/synthesis text is a SPEC to apply \u2014 not proof files already changed.",
+          "- You MUST use write_file/edit_file for every file you change before claiming done.",
+          "- After read_file: if the planned change is missing, WRITE it \u2014 do not stop at analysis.",
+          "- Never claim already-implemented based only on reading a plan or skimming code.",
+          planSummary ? "- An approved plan exists in the workspace \u2014 implement it and update task statuses as you go." : ""
+        ].filter(Boolean).join("\n") : "";
         const shellContextBlock = [
           "# Platform & Shell",
           `platform: ${process.platform}`,
@@ -35538,7 +35672,8 @@ function useChatTurn(params) {
                     (m) => m.role === "assistant" && m.content ? {
                       ...m,
                       content: cleanAgentContent(m.content, {
-                        stripQuestion: false
+                        stripQuestion: false,
+                        stripThink: false
                       })
                     } : m
                   )
@@ -37789,7 +37924,7 @@ async function handleLoginOAuthGrok(ctx) {
     });
     setActiveProviderId("grok");
     if (!getModelForProvider("grok")) {
-      setModelForProvider("grok", ctx.providerDefaults["grok"] ?? "grok-4");
+      setModelForProvider("grok", ctx.providerDefaults["grok"] ?? "grok-4.5");
     }
     const expiresHint = resultOAuth.expiresAt ? `, expires ${new Date(resultOAuth.expiresAt).toISOString()}` : "";
     const refreshHint = resultOAuth.refreshToken ? ", refresh token saved" : "";
@@ -38611,10 +38746,10 @@ function useTerminalSize(options = {}) {
 }
 
 // src/cli/app.tsx
-var MODEL = process.env.OPENAI_MODEL ?? "grok-4";
+var MODEL = process.env.OPENAI_MODEL ?? "grok-4.5";
 var providerDefaults = {
-  "openai-compatible": "grok-4",
-  "grok": "grok-4",
+  "openai-compatible": "grok-4.5",
+  "grok": "grok-4.5",
   "minimax": "MiniMax-chat-latest",
   "glm": "glm-4.5",
   "deepseek": "deepseek-v4-pro"
@@ -39471,7 +39606,21 @@ function parseHeadlessFlags(argv) {
             const parsedHist = JSON.parse(raw);
             if (Array.isArray(parsedHist)) {
               history2 = parsedHist.filter(
-                (m) => m && typeof m === "object" && typeof m.role === "string" && typeof m.content === "string"
+                (m) => !!m && typeof m === "object" && typeof m.role === "string"
+              ).map((m) => {
+                const role = String(m.role);
+                const raw2 = m.content;
+                const content = typeof raw2 === "string" ? raw2 : raw2 == null ? "" : typeof raw2 === "object" ? JSON.stringify(raw2) : String(raw2);
+                const msg = {
+                  role,
+                  content
+                };
+                if (typeof m.toolCallId === "string") {
+                  msg.toolCallId = m.toolCallId;
+                }
+                return msg;
+              }).filter(
+                (m) => m.role === "user" || m.role === "assistant" || m.role === "tool" || m.role === "system"
               );
             }
           } catch {
@@ -39535,6 +39684,7 @@ function emitEvent(event) {
 // src/cli/runHeadless.ts
 init_harness();
 init_conversationContext();
+init_council();
 init_toolRegistry();
 init_skills2();
 init_envNumber();
@@ -39708,7 +39858,19 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
         "The shell is NON-INTERACTIVE (stdin closed): pass non-interactive flags (--yes, --force, --template).",
         "",
         `# Work phase: ${opts.phase ?? "build"}`,
-        (opts.phase ?? "build") === "plan" ? "PLAN phase: explore and design only. Do not write project source files (write_file/edit_file/bash blocked). Plan artifacts under .zelari are allowed." : "BUILD phase: full tools; implement changes."
+        (opts.phase ?? "build") === "plan" ? [
+          "PLAN phase: explore and design only.",
+          "Do not write project source files (write_file/edit_file/bash blocked).",
+          "Plan artifacts under .zelari are allowed.",
+          "When the plan is ready, tell the user to switch to BUILD to implement on disk."
+        ].join(" ") : [
+          "BUILD phase \u2014 IMPLEMENT ON DISK (mandatory when the user wants code/file changes).",
+          "Prior chat may contain a plan or synthesis: that text is a SPEC to apply, NOT proof that files already changed.",
+          "You MUST call write_file and/or edit_file for every file you change before saying you are done.",
+          "After read_file: if the planned change is missing, WRITE it \u2014 do not stop at analysis.",
+          'Never claim "already implemented" / "tutto fatto" based only on reading a plan or skimming code.',
+          "Only claim done after successful mutating tool calls in THIS turn (or after proving the exact planned diff already exists on disk via read_file of the real files)."
+        ].join(" ")
       ].join("\n")
     };
     const { loadProjectInstructions: loadProjectInstructions2 } = await Promise.resolve().then(() => (init_projectInstructions(), projectInstructions_exports));
@@ -39753,95 +39915,202 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
       languageDirectiveContent
     ].join("\n");
   }
-  const historySeed = (opts.history ?? []).map(
-    (m) => m.role === "assistant" && m.content ? { ...m, content: cleanAgentContent(m.content, { stripQuestion: false }) } : m
-  );
-  const effectiveTask = maybeAnchorShortAnswer(opts.task) ?? opts.task;
-  const historySeedLen = historySeed.length;
-  const harness = new AgentHarness({
-    model,
-    provider,
-    sessionId,
-    messages: [
-      { role: "system", content: systemPrompt },
-      ...historySeed,
-      { role: "user", content: effectiveTask }
-    ],
-    tools,
-    toolRegistry,
-    providerStream,
-    maxToolLoopIterations: (() => {
-      const n = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_ITERATIONS, { default: 30, min: 1 });
-      return n;
-    })()
-  });
-  let finalReason = "completed";
-  let exitCode = 0;
-  const textBuffer = [];
-  const scrub = createStreamScrubber();
-  try {
-    for await (const event of harness.run()) {
-      if (event.type === "message_start") {
-        scrub.reset();
-      }
-      if (event.type === "message_delta" && typeof event.delta === "string") {
-        const cleanDelta = scrub.push(event.delta);
-        if (opts.output === "json") {
-          if (cleanDelta.length > 0) {
-            emitEvent({ ...event, delta: cleanDelta });
-          }
-        } else if (opts.output === "plain") {
-          if (cleanDelta.length > 0) process.stdout.write(cleanDelta);
-        } else {
-          if (cleanDelta.length > 0) textBuffer.push(cleanDelta);
+  const historySeed = (opts.history ?? []).filter((m) => m.role === "user" || m.role === "assistant").map(
+    (m) => m.role === "assistant" && m.content ? {
+      role: "assistant",
+      content: cleanAgentContent(m.content, {
+        stripQuestion: false,
+        stripThink: false
+      })
+    } : { role: m.role, content: m.content ?? "" }
+  ).filter((m) => (m.content ?? "").trim().length > 0);
+  const effectiveTask = buildAgentUserWithHistory(opts.task, historySeed);
+  const maxToolLoop = (() => {
+    const n = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_ITERATIONS, {
+      default: 30,
+      min: 1
+    });
+    return n;
+  })();
+  async function runSinglePass(messages, passSessionId) {
+    const harness = new AgentHarness({
+      model,
+      provider,
+      sessionId: passSessionId,
+      messages,
+      tools,
+      toolRegistry,
+      providerStream,
+      maxToolLoopIterations: maxToolLoop
+    });
+    let finalReason = "completed";
+    let exitCode = 0;
+    const textBuffer = [];
+    let successfulWrites = 0;
+    let emittedWrites = 0;
+    const pendingToolNames = /* @__PURE__ */ new Map();
+    const scrub = createStreamScrubber();
+    try {
+      for await (const event of harness.run()) {
+        if (event.type === "message_start") {
+          scrub.reset();
         }
-      } else {
-        if (opts.output === "json") {
-          emitEvent(event);
+        if (event.type === "tool_execution_start") {
+          const name = event.toolName ?? "";
+          const id = event.toolCallId ?? "";
+          if (id && name) pendingToolNames.set(id, name);
+          if (name === "write_file" || name === "edit_file" || name === "apply_diff") {
+            emittedWrites += 1;
+          }
+        }
+        if (event.type === "tool_execution_end") {
+          const id = event.toolCallId ?? "";
+          const name = pendingToolNames.get(id) ?? "";
+          pendingToolNames.delete(id);
+          const isError = !!event.isError;
+          const result = String(event.result ?? "");
+          if ((name === "write_file" || name === "edit_file" || name === "apply_diff") && !isError) {
+            const zeroEdit = name === "edit_file" && /occurrencesReplaced["']?\s*[:=]\s*0\b|0 occurrence|no changes/i.test(
+              result
+            );
+            if (!zeroEdit) successfulWrites += 1;
+          }
         }
-        if (event.type === "agent_end") {
-          const tail = scrub.flush();
-          if (tail.length > 0) {
-            if (opts.output === "plain") process.stdout.write(tail);
-            else textBuffer.push(tail);
+        if (event.type === "message_delta" && typeof event.delta === "string") {
+          const cleanDelta = scrub.push(event.delta);
+          if (opts.output === "json") {
+            if (cleanDelta.length > 0) {
+              emitEvent({ ...event, delta: cleanDelta });
+            }
+          } else if (opts.output === "plain") {
+            if (cleanDelta.length > 0) process.stdout.write(cleanDelta);
+          } else {
+            if (cleanDelta.length > 0) textBuffer.push(cleanDelta);
           }
-          finalReason = event.reason;
-          if (event.reason === "error") exitCode = 3;
-        } else if (event.type === "error") {
-          if (event.severity === "fatal") {
-            exitCode = 2;
+        } else {
+          if (opts.output === "json") {
+            emitEvent(event);
+          }
+          if (event.type === "agent_end") {
+            const tail = scrub.flush();
+            if (tail.length > 0) {
+              if (opts.output === "plain") process.stdout.write(tail);
+              else textBuffer.push(tail);
+            }
+            finalReason = event.reason;
+            if (event.reason === "error") exitCode = 3;
+          } else if (event.type === "error") {
+            if (event.severity === "fatal") {
+              exitCode = 2;
+            }
           }
         }
       }
+    } catch (err) {
+      process.stderr.write(
+        `[zelari-code --headless] runtime error: ${err instanceof Error ? err.message : String(err)}
+`
+      );
+      return {
+        finalReason: "error",
+        exitCode: 2,
+        textBuffer,
+        successfulWrites,
+        emittedWrites,
+        messages: harness.getMessages()
+      };
     }
-  } catch (err) {
-    process.stderr.write(
-      `[zelari-code --headless] runtime error: ${err instanceof Error ? err.message : String(err)}
+    return {
+      finalReason,
+      exitCode,
+      textBuffer,
+      successfulWrites,
+      emittedWrites,
+      messages: harness.getMessages()
+    };
+  }
+  const initialMessages = [
+    { role: "system", content: systemPrompt },
+    ...historySeed,
+    { role: "user", content: effectiveTask }
+  ];
+  let pass = await runSinglePass(initialMessages, sessionId);
+  const wantWrites = expectsDiskImplementation(
+    opts.task,
+    opts.phase,
+    historySeed
+  );
+  if (wantWrites && pass.successfulWrites === 0 && pass.finalReason === "completed" && pass.exitCode === 0) {
+    const retryPrompt = buildImplementationWriteRetryPrompt(opts.task);
+    if (opts.output === "json") {
+      emitEvent({
+        type: "log",
+        message: "[headless] BUILD: no successful write_file/edit_file \u2014 forcing implementation retry"
+      });
+    } else {
+      process.stderr.write(
+        `[zelari-code --headless] BUILD: no successful writes \u2014 forcing implementation retry
 `
-    );
-    return 2;
+      );
+    }
+    const retryMessages = [
+      ...pass.messages.filter((m) => m.role !== "system")
+    ];
+    const withSystem = [
+      { role: "system", content: systemPrompt },
+      ...retryMessages,
+      { role: "user", content: retryPrompt }
+    ];
+    const retry = await runSinglePass(withSystem, `${sessionId}-write-retry`);
+    pass = {
+      ...retry,
+      textBuffer: [...pass.textBuffer, ...retry.textBuffer],
+      successfulWrites: pass.successfulWrites + retry.successfulWrites,
+      emittedWrites: pass.emittedWrites + retry.emittedWrites
+    };
   }
-  if (opts.output === "plain" && textBuffer.length > 0) {
-    process.stdout.write(textBuffer.join(""));
+  if (opts.output === "plain" && pass.textBuffer.length > 0) {
+    process.stdout.write(pass.textBuffer.join(""));
   }
   process.stdout.write("");
-  if (finalReason !== "error" && opts.output === "json") {
+  if (pass.finalReason !== "error" && opts.output === "json") {
     try {
-      const all = harness.getMessages();
-      const seedLen = 1 + historySeedLen + 1;
-      if (all.length > seedLen) {
-        const tail = all.slice(seedLen).map(
-          (m) => m.role === "assistant" && m.content ? { ...m, content: cleanAgentContent(m.content, { stripQuestion: false }) } : m
-        );
-        if (tail.length > 0) {
-          emitEvent({ type: "history_snapshot", messages: tail });
+      const all = pass.messages;
+      let lastAsst = "";
+      for (let i = all.length - 1; i >= 0; i--) {
+        const m = all[i];
+        if (m?.role === "assistant" && (m.content ?? "").trim()) {
+          lastAsst = cleanAgentContent(m.content, {
+            stripQuestion: false,
+            stripThink: false
+          });
+          break;
         }
       }
+      if (!lastAsst.trim() && pass.textBuffer.length > 0) {
+        lastAsst = pass.textBuffer.join("").trim();
+      }
+      if (wantWrites && pass.successfulWrites === 0) {
+        lastAsst = (lastAsst ? `${lastAsst}
+
+` : "") + "[zelari] WARNING: BUILD turn ended with zero successful file writes. The planned changes may still need to be applied on disk.";
+        emitEvent({
+          type: "log",
+          message: "[headless] BUILD warning: still zero successful writes after retry"
+        });
+      }
+      const snapshot = [
+        { role: "user", content: opts.task },
+        ...lastAsst ? [{ role: "assistant", content: lastAsst }] : []
+      ];
+      if (snapshot.length > 0) {
+        emitEvent({ type: "history_snapshot", messages: snapshot });
+      }
     } catch {
     }
   }
-  if (finalReason === "error") return 3;
-  return exitCode;
+  if (pass.finalReason === "error") return 3;
+  return pass.exitCode;
 }
 async function buildCouncilToolRegistry(planMode, opts) {
   const { registry: toolRegistry } = createBuiltinToolRegistry({ planMode });
@@ -39870,7 +40139,13 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
   const { FeedbackStore: FeedbackStore2 } = await Promise.resolve().then(() => (init_councilFeedback(), councilFeedback_exports));
   const feedbackStore = new FeedbackStore2();
   const historySeed = (opts.history ?? []).map(
-    (m) => m.role === "assistant" && m.content ? { ...m, content: cleanAgentContent(m.content, { stripQuestion: false }) } : m
+    (m) => m.role === "assistant" && m.content ? {
+      ...m,
+      content: cleanAgentContent(m.content, {
+        stripQuestion: false,
+        stripThink: false
+      })
+    } : m
   );
   const effectiveTask = buildCouncilTaskWithHistory(opts.task, historySeed);
   let exitCode = 0;
@@ -39969,7 +40244,13 @@ async function runHeadlessZelari(opts, provider, model, providerStream) {
     }
   };
   const historySeed = (opts.history ?? []).map(
-    (m) => m.role === "assistant" && m.content ? { ...m, content: cleanAgentContent(m.content, { stripQuestion: false }) } : m
+    (m) => m.role === "assistant" && m.content ? {
+      ...m,
+      content: cleanAgentContent(m.content, {
+        stripQuestion: false,
+        stripThink: false
+      })
+    } : m
   );
   const missionTask = buildCouncilTaskWithHistory(opts.task, historySeed);
   emit(`[zelari] mission brief
@@ -40061,7 +40342,8 @@ ${ragContext}` : slicePrompt;
         }
         if (synthesisText.trim()) {
           lastMissionAssistant = cleanAgentContent(synthesisText, {
-            stripQuestion: false
+            stripQuestion: false,
+            stripThink: false
           });
         }
         return {