zelari-code 1.1.0 → 1.2.0

package/dist/cli/main.bundled.js

@@ -308,7 +308,7 @@ async function refreshGrokToken(options) {
   return parseTokenResponseBody(obj, accessToken);
 }
 async function openBrowser(url2) {
-  const { spawn: spawn6 } = await import("node:child_process");
+  const { spawn: spawn7 } = await import("node:child_process");
   const cmd = (() => {
     switch (process.platform) {
       case "darwin":
@@ -321,7 +321,7 @@ async function openBrowser(url2) {
   })();
   return new Promise((resolve, reject) => {
     try {
-      const child = spawn6(cmd.bin, cmd.args, {
+      const child = spawn7(cmd.bin, cmd.args, {
         stdio: "ignore",
         detached: true
       });
@@ -1535,10 +1535,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path25) {
-  if (!path25)
+function getElementAtPath(obj, path27) {
+  if (!path27)
     return obj;
-  return path25.reduce((acc, key) => acc?.[key], obj);
+  return path27.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(path25, issues) {
+function prefixIssues(path27, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path25);
+    iss.path.unshift(path27);
     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, path25 = []) => {
+  const processError = (error52, path27 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path25, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path27, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else {
-        const fullpath = [...path25, ...issue2.path];
+        const fullpath = [...path27, ...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, path25 = []) => {
+  const processError = (error52, path27 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path25, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path27, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else {
-        const fullpath = [...path25, ...issue2.path];
+        const fullpath = [...path27, ...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 path25 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path25) {
+  const path27 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path27) {
     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 path25 = ref.slice(1).split("/").filter(Boolean);
-  if (path25.length === 0) {
+  const path27 = ref.slice(1).split("/").filter(Boolean);
+  if (path27.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path25[0] === defsKey) {
-    const key = path25[1];
+  if (path27[0] === defsKey) {
+    const key = path27[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -17706,11 +17706,11 @@ var init_tools = __esm({
           if (!ctx.addDocument)
             return "Knowledge vault tool not available.";
           const title = args["title"] || "New Document";
-          const path25 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
+          const path27 = args["path"] || `notes/${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
           const content = args["content"] || "";
           const tags = args["tags"] || [];
           ctx.addDocument({
-            path: path25,
+            path: path27,
             title,
             content,
             format: "markdown",
@@ -17719,7 +17719,7 @@ var init_tools = __esm({
             workspaceId: ctx.workspaceId
           });
           ctx.addActivity("vault", "created document", title);
-          return `Document "${title}" created at "${path25}".`;
+          return `Document "${title}" created at "${path27}".`;
         }
       }
     ];
@@ -18725,11 +18725,174 @@ ${cached2}`;
   }
 });
 
+// packages/core/dist/core/providerStream.js
+function toLegacyMessages(messages) {
+  return messages.map((m) => ({ role: m.role, content: m.content }));
+}
+function toLegacyTools(tools) {
+  return tools.map((t) => ({
+    type: "function",
+    function: { name: t.name, description: t.description, parameters: t.parameters }
+  }));
+}
+function wrapLegacyStream(legacyStream, params, _messages, _tools) {
+  return async function* (providerParams) {
+    const accumulatedChunks = [];
+    const legacyParams = {
+      apiKey: params.apiKey,
+      model: providerParams.model,
+      provider: providerParams.provider,
+      messages: toLegacyMessages(providerParams.messages),
+      tools: toLegacyTools(providerParams.tools),
+      temperature: 0.7,
+      stream: true,
+      customBaseUrl: params.customBaseUrl,
+      customAuthStyle: params.customAuthStyle,
+      onChunk: (chunk) => {
+        accumulatedChunks.push(chunk);
+      },
+      onRequestId: void 0,
+      signal: providerParams.signal
+    };
+    const queue = [];
+    let resolveNext = null;
+    let done = false;
+    let error51 = null;
+    const promise2 = legacyStream(legacyParams).then((result) => {
+      for (const tc of result.toolCalls) {
+        queue.push({ kind: "tool_call", toolCallId: tc.id, toolName: tc.name, args: tc.args });
+      }
+      queue.push({ kind: "finish", reason: "stop" });
+    }).catch((err) => {
+      error51 = err;
+    }).finally(() => {
+      done = true;
+      if (resolveNext) {
+        resolveNext();
+        resolveNext = null;
+      }
+    });
+    let lastEmittedIndex = 0;
+    while (!done || queue.length > 0 || lastEmittedIndex < accumulatedChunks.length) {
+      while (lastEmittedIndex < accumulatedChunks.length) {
+        yield { kind: "text", delta: accumulatedChunks[lastEmittedIndex] };
+        lastEmittedIndex++;
+      }
+      while (queue.length > 0) {
+        const d = queue.shift();
+        yield d;
+      }
+      if (error51) {
+        throw error51;
+      }
+      if (done)
+        break;
+      await new Promise((resolve) => {
+        resolveNext = resolve;
+      });
+    }
+    await promise2;
+  };
+}
+var init_providerStream = __esm({
+  "packages/core/dist/core/providerStream.js"() {
+    "use strict";
+  }
+});
+
+// packages/core/dist/core/sessionJsonl.js
+import { promises as fs8 } from "node:fs";
+import path10 from "node:path";
+import os3 from "node:os";
+async function readSession(filePath) {
+  try {
+    const content = await fs8.readFile(filePath, "utf-8");
+    const events = [];
+    for (const line of content.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed)
+        continue;
+      try {
+        const parsed = JSON.parse(trimmed);
+        if (parsed && typeof parsed === "object" && "event" in parsed) {
+          events.push(parsed.event);
+        }
+      } catch {
+      }
+    }
+    return events;
+  } catch (err) {
+    if (err.code === "ENOENT")
+      return [];
+    throw err;
+  }
+}
+function defaultBaseDir() {
+  return path10.join(os3.tmpdir(), "zelari-code", "sessions");
+}
+var SessionJsonlWriter;
+var init_sessionJsonl = __esm({
+  "packages/core/dist/core/sessionJsonl.js"() {
+    "use strict";
+    SessionJsonlWriter = class {
+      filePath;
+      onError;
+      constructor(sessionId, options = {}) {
+        const baseDir = options.baseDir ?? defaultBaseDir();
+        this.filePath = path10.join(baseDir, `${sessionId}.jsonl`);
+        this.onError = options.onError ?? console.error;
+      }
+      /** Absolute path to the session JSONL file. */
+      get path() {
+        return this.filePath;
+      }
+      /** Append a BrainEvent as one JSON line. Creates the file + parent dirs if missing. */
+      async append(event) {
+        try {
+          await fs8.mkdir(path10.dirname(this.filePath), { recursive: true });
+          const line = JSON.stringify({
+            ts: event.ts,
+            sessionId: event.sessionId,
+            event
+          }) + "\n";
+          await fs8.appendFile(this.filePath, line, { encoding: "utf-8", mode: 420 });
+        } catch (err) {
+          this.onError(`[sessionJsonl] failed to append event to ${this.filePath}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+      }
+      /** Close the writer (no-op currently, but reserved for future buffered mode). */
+      async close() {
+      }
+    };
+  }
+});
+
+// packages/core/dist/harness/index.js
+var harness_exports = {};
+__export(harness_exports, {
+  AgentHarness: () => AgentHarness,
+  SessionJsonlWriter: () => SessionJsonlWriter,
+  hashToolCall: () => hashToolCall,
+  normalizeTextToolArgs: () => normalizeTextToolArgs,
+  parseTextToolCalls: () => parseTextToolCalls,
+  readSession: () => readSession,
+  wrapLegacyStream: () => wrapLegacyStream
+});
+var init_harness = __esm({
+  "packages/core/dist/harness/index.js"() {
+    "use strict";
+    init_AgentHarness();
+    init_providerStream();
+    init_sessionJsonl();
+  }
+});
+
 // src/cli/provider/openai-compatible.ts
 var openai_compatible_exports = {};
 __export(openai_compatible_exports, {
   PROVIDER_ENDPOINTS: () => PROVIDER_ENDPOINTS,
   openaiCompatibleProvider: () => openaiCompatibleProvider,
+  parseCachedPromptTokens: () => parseCachedPromptTokens,
   providerConfigFor: () => providerConfigFor,
   providerFromEnv: () => providerFromEnv,
   resolveActiveProvider: () => resolveActiveProvider,
@@ -18738,6 +18901,17 @@ __export(openai_compatible_exports, {
 function resolveActiveProvider() {
   return getProviderConfig().activeProviderId;
 }
+function parseCachedPromptTokens(usage) {
+  if (!usage || typeof usage !== "object") return 0;
+  const candidates = [
+    usage.prompt_tokens_details?.cached_tokens,
+    usage.prompt_cache_hit_tokens
+  ];
+  for (const c of candidates) {
+    if (typeof c === "number" && Number.isFinite(c) && c >= 0) return c;
+  }
+  return 0;
+}
 function resolveBaseUrl(providerId) {
   const custom2 = getCustomEndpoint(providerId);
   if (custom2) return custom2;
@@ -18849,9 +19023,15 @@ function openaiCompatibleProvider(config2) {
               const promptTokens = typeof parsed.usage.prompt_tokens === "number" ? parsed.usage.prompt_tokens : 0;
               const completionTokens = typeof parsed.usage.completion_tokens === "number" ? parsed.usage.completion_tokens : 0;
               const totalTokens = typeof parsed.usage.total_tokens === "number" ? parsed.usage.total_tokens : promptTokens + completionTokens;
+              const cachedPromptTokens = parseCachedPromptTokens(parsed.usage);
               yield {
                 kind: "usage",
-                usage: { promptTokens, completionTokens, totalTokens }
+                usage: {
+                  promptTokens,
+                  completionTokens,
+                  totalTokens,
+                  ...cachedPromptTokens > 0 ? { cachedPromptTokens } : {}
+                }
               };
             }
             if (typeof delta?.content === "string" && delta.content.length > 0) {
@@ -19925,7 +20105,7 @@ var init_parseCssMotion = __esm({
 });
 
 // packages/core/dist/council/verification/citeVerify.js
-import { existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync8, readFileSync as readFileSync5 } from "node:fs";
 import { join } from "node:path";
 function extractCitations(text) {
   const out = [];
@@ -19949,7 +20129,7 @@ function verifyCitations(projectRoot, synthesisText) {
   const results = [];
   for (const cite of extractCitations(synthesisText)) {
     const abs = join(projectRoot, cite.file);
-    if (!existsSync7(abs)) {
+    if (!existsSync8(abs)) {
       results.push({
         id: "synthesis.cite-invalid",
         severity: "error",
@@ -20225,14 +20405,14 @@ var init_synthesisAudit = __esm({
 });
 
 // packages/core/dist/council/verification/runChecks.js
-import { existsSync as existsSync8, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync9, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
 import { join as join2 } from "node:path";
 function loadNfrSpec(zelariRoot) {
-  const path25 = join2(zelariRoot, "nfr-spec.json");
-  if (!existsSync8(path25))
+  const path27 = join2(zelariRoot, "nfr-spec.json");
+  if (!existsSync9(path27))
     return null;
   try {
-    const raw = JSON.parse(readFileSync6(path25, "utf8"));
+    const raw = JSON.parse(readFileSync6(path27, "utf8"));
     if (raw.version !== 1 || !Array.isArray(raw.targets))
       return null;
     return raw;
@@ -20243,11 +20423,11 @@ function loadNfrSpec(zelariRoot) {
 function resolveTargets(projectRoot, spec) {
   const found = [];
   for (const rel2 of spec.targets) {
-    if (existsSync8(join2(projectRoot, rel2))) {
+    if (existsSync9(join2(projectRoot, rel2))) {
       found.push(rel2);
     }
   }
-  if (found.length === 0 && existsSync8(join2(projectRoot, "index.html"))) {
+  if (found.length === 0 && existsSync9(join2(projectRoot, "index.html"))) {
     return ["index.html"];
   }
   return found;
@@ -20303,7 +20483,7 @@ function checkDeadCssHooks(html, relFile) {
 }
 function checkPlanReality(projectRoot, zelariRoot, targets, keywords) {
   const planPath = join2(zelariRoot, "plan.json");
-  if (!existsSync8(planPath) || keywords.length === 0)
+  if (!existsSync9(planPath) || keywords.length === 0)
     return [];
   let plan;
   try {
@@ -20343,11 +20523,11 @@ function checkPlanReality(projectRoot, zelariRoot, targets, keywords) {
 }
 function checkReadmeStale(projectRoot, targets) {
   const readmePath = join2(projectRoot, "README.md");
-  if (!existsSync8(readmePath) || targets.length === 0)
+  if (!existsSync9(readmePath) || targets.length === 0)
     return [];
   const readme = readFileSync6(readmePath, "utf8");
   const htmlPath = join2(projectRoot, targets[0]);
-  if (!existsSync8(htmlPath))
+  if (!existsSync9(htmlPath))
     return [];
   const html = readFileSync6(htmlPath, "utf8");
   const sectionCount = (html.match(/<section\s+id=/gi) ?? []).length;
@@ -20473,7 +20653,7 @@ var init_runChecks = __esm({
 });
 
 // packages/core/dist/council/verification/microGate.js
-import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync10, readFileSync as readFileSync7 } from "node:fs";
 import { join as join3 } from "node:path";
 function checkDeadHooksInHtml(html) {
   const warnings = [];
@@ -20503,7 +20683,7 @@ function checkDeadHooksInHtml(html) {
 }
 function runMicroVerificationOnFile(projectRoot, relPath, zelariRoot) {
   const abs = join3(projectRoot, relPath);
-  if (!existsSync9(abs) || !/\.html?$/i.test(relPath))
+  if (!existsSync10(abs) || !/\.html?$/i.test(relPath))
     return [];
   const spec = (zelariRoot ? loadNfrSpec(zelariRoot) : null) ?? DEFAULT_NFR_SPEC;
   const anim = spec.animation ?? { compositorOnly: true, forbidLayoutProps: true };
@@ -20947,7 +21127,7 @@ var init_inlineJsAutofix = __esm({
 });
 
 // packages/core/dist/agents/councilApi.js
-import { existsSync as existsSync10 } from "node:fs";
+import { existsSync as existsSync11 } from "node:fs";
 import { join as join5 } from "node:path";
 function parseClarificationRequest(text) {
   const start = text.indexOf(QUESTION_MARKER);
@@ -21468,7 +21648,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
         const zelariRoot = `${chairmanProjectRoot}/.zelari`;
         const spec = loadNfrSpec(zelariRoot) ?? DEFAULT_NFR_SPEC;
         for (const rel2 of spec.targets) {
-          if (!existsSync10(join5(chairmanProjectRoot, rel2)))
+          if (!existsSync11(join5(chairmanProjectRoot, rel2)))
             continue;
           changedTargetFiles.add(rel2);
           for (const w of runChairmanMicroGate({ projectRoot: chairmanProjectRoot, relPath: rel2, zelariRoot })) {
@@ -21488,7 +21668,7 @@ async function* runCouncilPure(userMessage, config2, callbacks = {}) {
         const zelariRootReplay = `${chairmanProjectRoot}/.zelari`;
         const specReplay = loadNfrSpec(zelariRootReplay) ?? DEFAULT_NFR_SPEC;
         for (const rel2 of specReplay.targets) {
-          if (!existsSync10(join5(chairmanProjectRoot, rel2)))
+          if (!existsSync11(join5(chairmanProjectRoot, rel2)))
             continue;
           changedTargetFiles.add(rel2);
           for (const w of runChairmanMicroGate({
@@ -22421,9 +22601,9 @@ var init_types2 = __esm({
 import { readFileSync as readFileSync11 } from "node:fs";
 import { join as join8 } from "node:path";
 function readLessonsDeduped(zelariRoot) {
-  const path25 = join8(zelariRoot, LESSONS_FILE);
+  const path27 = join8(zelariRoot, LESSONS_FILE);
   try {
-    const raw = readFileSync11(path25, "utf8");
+    const raw = readFileSync11(path27, "utf8");
     const byId = /* @__PURE__ */ new Map();
     for (const line of raw.split(/\r?\n/)) {
       if (!line.trim())
@@ -22524,8 +22704,8 @@ function keywordsFrom(check2, signature) {
   return [.../* @__PURE__ */ new Set([...fromId, ...words])].slice(0, 12);
 }
 function writeLesson(zelariRoot, lesson) {
-  const path25 = join9(zelariRoot, LESSONS_FILE);
-  appendFileSync2(path25, `${JSON.stringify(lesson)}
+  const path27 = join9(zelariRoot, LESSONS_FILE);
+  appendFileSync2(path27, `${JSON.stringify(lesson)}
 `, "utf8");
 }
 function findSimilar(lessons, signature) {
@@ -23062,7 +23242,7 @@ var init_council = __esm({
 import {
   mkdirSync as mkdirSync6,
   writeFileSync as writeFileSync10,
-  existsSync as existsSync11,
+  existsSync as existsSync12,
   accessSync,
   constants,
   realpathSync
@@ -23089,7 +23269,7 @@ function hashProject(projectPath) {
 }
 function isWritableDir(dir) {
   try {
-    if (!existsSync11(dir)) return false;
+    if (!existsSync12(dir)) return false;
     accessSync(dir, constants.W_OK);
     return true;
   } catch {
@@ -23098,9 +23278,9 @@ function isWritableDir(dir) {
 }
 function ensureWorkspaceDir(workspaceDir) {
   mkdirSync6(workspaceDir, { recursive: true });
-  if (workspaceDir.endsWith("/.zelari") && existsSync11(join11(workspaceDir, "..", ".git"))) {
+  if (workspaceDir.endsWith("/.zelari") && existsSync12(join11(workspaceDir, "..", ".git"))) {
     const gitignorePath = join11(workspaceDir, ".gitignore");
-    if (!existsSync11(gitignorePath)) {
+    if (!existsSync12(gitignorePath)) {
       writeFileSync10(gitignorePath, "*\n!.gitignore\n");
     }
   }
@@ -23135,8 +23315,8 @@ __export(workspaceSummary_exports, {
   buildWorkspaceSummary: () => buildWorkspaceSummary,
   buildZelariReadHint: () => buildZelariReadHint
 });
-import { existsSync as existsSync12, readFileSync as readFileSync12, readdirSync, statSync as statSync3 } from "node:fs";
-import { join as join12, relative } from "node:path";
+import { existsSync as existsSync13, readFileSync as readFileSync12, readdirSync, statSync as statSync3 } from "node:fs";
+import { join as join12, relative as relative2 } from "node:path";
 function buildWorkspaceSummary(projectRoot = process.cwd(), options = {}) {
   const { maxEntries = 30 } = options;
   const name = safeProjectName(projectRoot);
@@ -23164,7 +23344,7 @@ function formatTaskLine(t) {
 function buildPlanSummary(projectRoot = process.cwd(), options) {
   const zelariRoot = resolveWorkspaceRoot(projectRoot);
   const planPath = join12(zelariRoot, "plan.json");
-  if (!existsSync12(planPath)) return null;
+  if (!existsSync13(planPath)) return null;
   let plan;
   try {
     plan = JSON.parse(readFileSync12(planPath, "utf8"));
@@ -23297,7 +23477,7 @@ function pickNextTask(open) {
 }
 function buildZelariReadHint(projectRoot = process.cwd()) {
   const planPath = join12(resolveWorkspaceRoot(projectRoot), "plan.json");
-  if (!existsSync12(planPath)) return "";
+  if (!existsSync13(planPath)) return "";
   return [
     "# Council workspace detected (.zelari/)",
     "This project has a council workspace: .zelari/plan.json holds the plan (phases, tasks, milestones) and .zelari/plan-tasks/ holds one detail file per task.",
@@ -23313,7 +23493,7 @@ function safeProjectName(root) {
 }
 function readPackageJson(projectRoot) {
   const p3 = join12(projectRoot, "package.json");
-  if (!existsSync12(p3)) return null;
+  if (!existsSync13(p3)) return null;
   try {
     return JSON.parse(readFileSync12(p3, "utf8"));
   } catch {
@@ -23349,7 +23529,7 @@ function listShallow(projectRoot, maxEntries) {
         out.push(`\u2026 (+${top.length - count} more)`);
         break;
       }
-      const rel2 = relative(projectRoot, join12(projectRoot, entry.name));
+      const rel2 = relative2(projectRoot, join12(projectRoot, entry.name));
       if (entry.isDirectory()) {
         let inner = "";
         try {
@@ -23406,7 +23586,7 @@ __export(storage_exports, {
 import {
   readFileSync as readFileSync13,
   writeFileSync as writeFileSync11,
-  existsSync as existsSync13,
+  existsSync as existsSync14,
   mkdirSync as mkdirSync7,
   readdirSync as readdirSync2,
   renameSync as renameSync2
@@ -23665,32 +23845,32 @@ var init_storage = __esm({
     VALID_SCALARS = /^(true|false|null|~)$/i;
     Storage = class {
       /** Read a Markdown file with frontmatter. Throws if not found. */
-      read(path25) {
-        if (!existsSync13(path25)) {
-          throw new Error(`File not found: ${path25}`);
+      read(path27) {
+        if (!existsSync14(path27)) {
+          throw new Error(`File not found: ${path27}`);
         }
-        const md = readFileSync13(path25, "utf8");
+        const md = readFileSync13(path27, "utf8");
         return parseFrontmatter(md);
       }
       /** Read a Markdown file; returns null if not found. */
-      readIfExists(path25) {
-        if (!existsSync13(path25)) return null;
-        return this.read(path25);
+      readIfExists(path27) {
+        if (!existsSync14(path27)) return null;
+        return this.read(path27);
       }
       /**
        * Write a Markdown file atomically (tmp + rename). Creates parent dirs.
        * The meta object is serialized as YAML frontmatter; body as Markdown.
        */
-      write(path25, meta3, body) {
-        mkdirSync7(dirname(path25), { recursive: true });
-        const tmp = path25 + ".tmp-" + process.pid;
+      write(path27, meta3, body) {
+        mkdirSync7(dirname(path27), { recursive: true });
+        const tmp = path27 + ".tmp-" + process.pid;
         const md = serializeFrontmatter(meta3, body);
         writeFileSync11(tmp, md, "utf8");
-        renameSync2(tmp, path25);
+        renameSync2(tmp, path27);
       }
       /** List all .md files in a directory (non-recursive). */
       listMarkdown(dir) {
-        if (!existsSync13(dir)) return [];
+        if (!existsSync14(dir)) return [];
         return readdirSync2(dir).filter((f) => f.endsWith(".md") && !f.startsWith(".")).map((f) => join13(dir, f));
       }
     };
@@ -23730,14 +23910,14 @@ __export(stubs_exports, {
   resolveWorkspaceRoot: () => resolveWorkspaceRoot
 });
 import {
-  existsSync as existsSync14,
+  existsSync as existsSync15,
   readdirSync as readdirSync3,
   writeFileSync as writeFileSync12,
   readFileSync as readFileSync14,
   mkdirSync as mkdirSync8,
   renameSync as renameSync3
 } from "node:fs";
-import { join as join14, basename as basename2, dirname as dirname2, relative as relative2 } from "node:path";
+import { join as join14, basename as basename2, dirname as dirname2, relative as relative3 } from "node:path";
 function createWorkspaceContext(projectRoot = process.cwd()) {
   const rootDir = resolveWorkspaceRoot(projectRoot);
   return {
@@ -23751,7 +23931,7 @@ function planJsonPath(ctx) {
 }
 function readPlan(ctx) {
   const jsonPath = planJsonPath(ctx);
-  if (existsSync14(jsonPath)) {
+  if (existsSync15(jsonPath)) {
     try {
       const parsed = JSON.parse(
         readFileSync14(jsonPath, "utf8")
@@ -23764,8 +23944,8 @@ function readPlan(ctx) {
     } catch {
     }
   }
-  const path25 = workspaceFile(ctx.rootDir, "plan");
-  const doc = ctx.storage.readIfExists(path25);
+  const path27 = workspaceFile(ctx.rootDir, "plan");
+  const doc = ctx.storage.readIfExists(path27);
   if (!doc) return { phases: [], tasks: [], milestones: [] };
   const meta3 = doc.meta;
   return {
@@ -23846,7 +24026,7 @@ function renderPlanBody(summary) {
 }
 function nextAdrId(ctx) {
   const decisionsDir = join14(ctx.rootDir, "decisions");
-  if (!existsSync14(decisionsDir)) return "001";
+  if (!existsSync15(decisionsDir)) return "001";
   const existing = readdirSync3(decisionsDir).filter((f) => f.endsWith(".md")).map((f) => f.match(/^(\d+)-/)).filter((m) => !!m).map((m) => parseInt(m[1], 10));
   const max = existing.length === 0 ? 0 : Math.max(...existing);
   return String(max + 1).padStart(3, "0");
@@ -23930,7 +24110,7 @@ function addMilestoneRecord(ctx, summary, input) {
     dueDate: input.dueDate,
     targetVersion: version2
   });
-  const path25 = join14(ctx.rootDir, "milestones", `${id}.md`);
+  const path27 = join14(ctx.rootDir, "milestones", `${id}.md`);
   const meta3 = {
     kind: "milestone",
     id,
@@ -23947,7 +24127,7 @@ function addMilestoneRecord(ctx, summary, input) {
     `Target version: ${version2}`,
     ""
   ].join("\n");
-  ctx.storage.write(path25, meta3, body);
+  ctx.storage.write(path27, meta3, body);
   return { id, created: true };
 }
 function readPlanSummary(ctx) {
@@ -24151,7 +24331,7 @@ function addIdeaStub(ctx) {
         const tags = args["tags"] ?? [];
         const category = args["category"] ?? "General";
         const id = `${nextAdrId(ctx)}-${slugify3(title)}`;
-        const path25 = workspaceArtifact(ctx.rootDir, "decisions", id);
+        const path27 = workspaceArtifact(ctx.rootDir, "decisions", id);
         const meta3 = {
           kind: "adr",
           status: "proposed",
@@ -24177,7 +24357,7 @@ function addIdeaStub(ctx) {
           ...consequences.map((c) => `- ${c}`),
           ""
         ].join("\n");
-        ctx.storage.write(path25, meta3, body);
+        ctx.storage.write(path27, meta3, body);
         return `ADR ${id} created: "${title}". Status: proposed. Promote to accepted via /update ADR or manual edit.`;
       });
     }
@@ -24259,14 +24439,14 @@ function createDocumentStub(ctx) {
           ctx.storage.write(risksPath, riskMeta, content);
           return `Document "${title}" created at risks.md (workspace root).`;
         }
-        const path25 = workspaceArtifact(ctx.rootDir, "docs", slug);
+        const path27 = workspaceArtifact(ctx.rootDir, "docs", slug);
         const meta3 = {
           kind: "doc",
           id: slug,
           date: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
           tags
         };
-        ctx.storage.write(path25, meta3, content);
+        ctx.storage.write(path27, meta3, content);
         return `Document "${title}" created at docs/${slug}.md.`;
       });
     }
@@ -24302,7 +24482,7 @@ function searchDocumentsStub(ctx) {
       ];
       const results = [];
       for (const file2 of files) {
-        if (!existsSync14(file2)) continue;
+        if (!existsSync15(file2)) continue;
         const raw = readFileSync14(file2, "utf8");
         const content = raw.toLowerCase();
         let idx = -1;
@@ -24330,7 +24510,7 @@ function searchDocumentsStub(ctx) {
         const end = Math.min(raw.length, idx + matchLen + 40);
         const snippet = "\u2026" + raw.slice(start, end).replace(/\n/g, " ").trim() + "\u2026";
         results.push({
-          path: relative2(ctx.rootDir, file2) || basename2(file2),
+          path: relative3(ctx.rootDir, file2) || basename2(file2),
           snippet
         });
         if (results.length >= limit) break;
@@ -24493,15 +24673,38 @@ __export(updater_exports, {
   compareSemver: () => compareSemver,
   fetchLatestVersion: () => fetchLatestVersion,
   getCurrentVersion: () => getCurrentVersion,
-  performUpdate: () => performUpdate
+  performUpdate: () => performUpdate,
+  resolveBundledNpmCli: () => resolveBundledNpmCli
 });
 import { createRequire } from "node:module";
-import { spawn as spawn2 } from "node:child_process";
-import path15 from "node:path";
+import { spawn as spawn3 } from "node:child_process";
+import { existsSync as existsSync16 } from "node:fs";
+import path16 from "node:path";
 import { fileURLToPath } from "node:url";
+function resolveBundledNpmCli(execPath = process.execPath) {
+  const dir = path16.dirname(execPath);
+  const candidates = [
+    // Windows: C:\...\node.exe → C:\...\node_modules\npm\bin\npm-cli.js
+    path16.join(dir, "node_modules", "npm", "bin", "npm-cli.js"),
+    // POSIX: <prefix>/bin/node → <prefix>/lib/node_modules/npm/bin/npm-cli.js
+    path16.join(dir, "..", "lib", "node_modules", "npm", "bin", "npm-cli.js")
+  ];
+  for (const candidate of candidates) {
+    try {
+      if (existsSync16(candidate)) return candidate;
+    } catch {
+    }
+  }
+  return null;
+}
+function looksLikeBrokenShim(exitCode, output) {
+  if (exitCode === 127) return true;
+  const h = output.toLowerCase();
+  return h.includes("shim target not found") || h.includes("is not recognized");
+}
 function getCurrentVersion() {
   try {
-    const pkgPath = path15.resolve(__dirname2, "..", "..", "package.json");
+    const pkgPath = path16.resolve(__dirname2, "..", "..", "package.json");
     const pkg = require2(pkgPath);
     return pkg.version;
   } catch {
@@ -24561,13 +24764,27 @@ async function checkForUpdate(fetcher = fetch, registryUrl) {
     updateAvailable: cmp < 0
   };
 }
-async function performUpdate(packageName = "zelari-code", executor = spawn2) {
+async function performUpdate(packageName = "zelari-code", executor = spawn3, resolveNpmCli = resolveBundledNpmCli) {
+  const args = ["install", "-g", `${packageName}@latest`];
+  const primary = await runNpm(executor, args, "shim");
+  if (primary.ok) return primary;
+  const npmCli = resolveNpmCli();
+  if (npmCli && looksLikeBrokenShim(primary.exitCode, primary.output)) {
+    const fallback = await runNpm(executor, args, "bundled", npmCli);
+    return {
+      ...fallback,
+      output: `[update] npm shim failed (${primary.error ?? "exit " + primary.exitCode}); retried via bundled npm (${npmCli}).
+${fallback.output}`
+    };
+  }
+  return primary;
+}
+function runNpm(executor, args, mode, npmCliPath) {
   return new Promise((resolve) => {
-    const args = ["install", "-g", `${packageName}@latest`];
     let stdout = "";
     let stderr = "";
     const stdio = ["ignore", "pipe", "pipe"];
-    const child = process.platform === "win32" ? executor(buildCmdLine("npm", args), { stdio, shell: true }) : executor("npm", args, { stdio });
+    const child = mode === "bundled" && npmCliPath ? executor(process.execPath, [npmCliPath, ...args], { stdio }) : process.platform === "win32" ? executor(buildCmdLine("npm", args), { stdio, shell: true }) : executor("npm", args, { stdio });
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
     });
@@ -24599,13 +24816,13 @@ var init_updater = __esm({
     "use strict";
     init_cmdline();
     require2 = createRequire(import.meta.url);
-    __dirname2 = path15.dirname(fileURLToPath(import.meta.url));
+    __dirname2 = path16.dirname(fileURLToPath(import.meta.url));
     REGISTRY_URL = "https://registry.npmjs.org/zelari-code/latest";
   }
 });
 
 // src/cli/mcp/mcpClient.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 var DEFAULT_REQUEST_TIMEOUT_MS, INIT_TIMEOUT_MS, MCP_PROTOCOL_VERSION, McpClient;
 var init_mcpClient = __esm({
   "src/cli/mcp/mcpClient.ts"() {
@@ -24633,10 +24850,10 @@ var init_mcpClient = __esm({
           env: { ...process.env, ...this.config.env ?? {} },
           windowsHide: true
         };
-        const child = process.platform === "win32" ? spawn3(buildCmdLine(this.config.command, this.config.args ?? []), {
+        const child = process.platform === "win32" ? spawn4(buildCmdLine(this.config.command, this.config.args ?? []), {
           ...spawnOpts,
           shell: true
-        }) : spawn3(this.config.command, this.config.args ?? [], spawnOpts);
+        }) : spawn4(this.config.command, this.config.args ?? [], spawnOpts);
         this.child = child;
         child.stdout.setEncoding("utf8");
         child.stdout.on("data", (chunk) => this.onStdout(chunk));
@@ -24780,7 +24997,7 @@ __export(mcpManager_exports, {
   readMcpConfig: () => readMcpConfig,
   registerMcpTools: () => registerMcpTools
 });
-import { existsSync as existsSync15, readFileSync as readFileSync15 } from "node:fs";
+import { existsSync as existsSync17, readFileSync as readFileSync15 } from "node:fs";
 import { join as join15 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function readMcpConfig(projectRoot = process.cwd()) {
@@ -24791,7 +25008,7 @@ function readMcpConfig(projectRoot = process.cwd()) {
     // later = higher precedence
   ];
   for (const p3 of paths) {
-    if (!existsSync15(p3)) continue;
+    if (!existsSync17(p3)) continue;
     try {
       const parsed = JSON.parse(readFileSync15(p3, "utf8"));
       for (const [name, cfg] of Object.entries(parsed.mcpServers ?? {})) {
@@ -24925,11 +25142,11 @@ var planDetect_exports = {};
 __export(planDetect_exports, {
   hasWorkspacePlan: () => hasWorkspacePlan
 });
-import { existsSync as existsSync16, readFileSync as readFileSync16 } from "node:fs";
+import { existsSync as existsSync18, readFileSync as readFileSync16 } from "node:fs";
 import { join as join16 } from "node:path";
 function hasWorkspacePlan(projectRoot = process.cwd()) {
   const planPath = join16(resolveWorkspaceRoot(projectRoot), "plan.json");
-  if (!existsSync16(planPath)) return false;
+  if (!existsSync18(planPath)) return false;
   try {
     const parsed = JSON.parse(readFileSync16(planPath, "utf8"));
     return Array.isArray(parsed.phases) && parsed.phases.length > 0;
@@ -25028,15 +25245,15 @@ __export(agentsMd_exports, {
   serializeAgentsMd: () => serializeAgentsMd,
   updateAgentsMd: () => updateAgentsMd
 });
-import { existsSync as existsSync17, readFileSync as readFileSync17, writeFileSync as writeFileSync13 } from "node:fs";
+import { existsSync as existsSync19, readFileSync as readFileSync17, writeFileSync as writeFileSync13 } from "node:fs";
 import { createHash as createHash2 } from "node:crypto";
 import { join as join17 } from "node:path";
 import { readFile } from "node:fs/promises";
 async function readPackageJson2(projectRoot) {
-  const path25 = join17(projectRoot, "package.json");
-  if (!existsSync17(path25)) return null;
+  const path27 = join17(projectRoot, "package.json");
+  if (!existsSync19(path27)) return null;
   try {
-    return JSON.parse(await readFile(path25, "utf8"));
+    return JSON.parse(await readFile(path27, "utf8"));
   } catch {
     return null;
   }
@@ -25059,7 +25276,7 @@ async function genTechStack(ctx) {
 }
 async function genDecisions(ctx) {
   const decisionsDir = join17(ctx.rootDir, "decisions");
-  if (!existsSync17(decisionsDir)) return "_No ADRs yet._";
+  if (!existsSync19(decisionsDir)) return "_No ADRs yet._";
   const files = ctx.storage.listMarkdown(decisionsDir).sort();
   const accepted = [];
   const proposed = [];
@@ -25085,7 +25302,7 @@ async function genDecisions(ctx) {
 async function genConventions(ctx) {
   const lines = [];
   const claudeMd = join17(ctx.projectRoot, "CLAUDE.MD");
-  if (existsSync17(claudeMd)) {
+  if (existsSync19(claudeMd)) {
     const content = readFileSync17(claudeMd, "utf8");
     const match = content.match(/## Architecture rules[\s\S]+?(?=\n## |\n*$)/);
     if (match) {
@@ -25118,9 +25335,9 @@ async function genBuild(ctx) {
   ].join("\n");
 }
 async function genOpenQuestions(ctx) {
-  const path25 = join17(ctx.rootDir, "risks.md");
-  if (!existsSync17(path25)) return "_No open questions._";
-  const content = readFileSync17(path25, "utf8");
+  const path27 = join17(ctx.rootDir, "risks.md");
+  if (!existsSync19(path27)) return "_No open questions._";
+  const content = readFileSync17(path27, "utf8");
   const lines = content.split("\n");
   const questions = [];
   let currentTitle = "";
@@ -25195,7 +25412,7 @@ function titleCase(id) {
 }
 async function updateAgentsMd(ctx, projectRoot) {
   const agentsPath = join17(projectRoot, "AGENTS.MD");
-  if (existsSync17(agentsPath)) {
+  if (existsSync19(agentsPath)) {
     const content = readFileSync17(agentsPath, "utf8");
     const hasAnyMarker = AUTO_SECTIONS.some((id) => content.includes(MARKER_OPEN(id)));
     if (!hasAnyMarker) {
@@ -25211,7 +25428,7 @@ async function updateAgentsMd(ctx, projectRoot) {
     newSections.set(id, await GENERATORS[id](ctx));
   }
   let manualContent = "";
-  if (existsSync17(agentsPath)) {
+  if (existsSync19(agentsPath)) {
     const { manualBlocks } = parseAgentsMd(readFileSync17(agentsPath, "utf8"));
     manualContent = manualBlocks.after;
   } else {
@@ -25228,7 +25445,7 @@ async function updateAgentsMd(ctx, projectRoot) {
       ""
     ].join("\n");
   }
-  const oldContent = existsSync17(agentsPath) ? readFileSync17(agentsPath, "utf8") : "";
+  const oldContent = existsSync19(agentsPath) ? readFileSync17(agentsPath, "utf8") : "";
   const { sections: oldSections } = parseAgentsMd(oldContent);
   const changedSections = [];
   for (const id of AUTO_SECTIONS) {
@@ -25365,8 +25582,8 @@ var init_completeDesign = __esm({
 });
 
 // src/cli/workspace/projectSmoke.ts
-import { spawn as spawn4 } from "node:child_process";
-import { existsSync as existsSync18, readFileSync as readFileSync18 } from "node:fs";
+import { spawn as spawn5 } from "node:child_process";
+import { existsSync as existsSync20, readFileSync as readFileSync18 } from "node:fs";
 import { join as join18 } from "node:path";
 function pickSmokeScript(scripts) {
   if (!scripts) return null;
@@ -25380,7 +25597,7 @@ async function runProjectSmoke(projectRoot, timeoutMs = DEFAULT_TIMEOUT_MS) {
     return { ran: false, reason: "ZELARI_SMOKE=0 (disabled)" };
   }
   const pkgPath = join18(projectRoot, "package.json");
-  if (!existsSync18(pkgPath)) {
+  if (!existsSync20(pkgPath)) {
     return { ran: false, reason: "no package.json (skipped)" };
   }
   let scripts = {};
@@ -25396,7 +25613,7 @@ async function runProjectSmoke(projectRoot, timeoutMs = DEFAULT_TIMEOUT_MS) {
   }
   return await new Promise((resolveRun) => {
     const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
-    const child = spawn4(npmCmd, ["run", script], {
+    const child = spawn5(npmCmd, ["run", script], {
       cwd: projectRoot,
       stdio: ["ignore", "pipe", "pipe"],
       env: process.env,
@@ -25468,8 +25685,8 @@ __export(postCouncilHook_exports, {
   runImplementationVerificationHook: () => runImplementationVerificationHook,
   runPostCouncilHook: () => runPostCouncilHook
 });
-import { spawn as spawn5 } from "node:child_process";
-import { existsSync as existsSync19, readFileSync as readFileSync19 } from "node:fs";
+import { spawn as spawn6 } from "node:child_process";
+import { existsSync as existsSync21, readFileSync as readFileSync19 } from "node:fs";
 import { join as join19 } from "node:path";
 async function runCompleteDesignPostProcessor(ctx, options) {
   if (options?.runMode === "implementation") {
@@ -25483,7 +25700,7 @@ async function runCompleteDesignPostProcessor(ctx, options) {
   }
   const planJsonPath2 = join19(ctx.rootDir, "plan.json");
   const scriptPath = join19(ctx.projectRoot, "complete-design.mjs");
-  if (!existsSync19(planJsonPath2)) {
+  if (!existsSync21(planJsonPath2)) {
     return {
       ran: false,
       reason: ".zelari/plan.json missing (not design-phase)"
@@ -25499,7 +25716,7 @@ async function runCompleteDesignPostProcessor(ctx, options) {
   if (phaseCount === 0) {
     return { ran: false, reason: ".zelari/plan.json has no phases" };
   }
-  if (!existsSync19(scriptPath)) {
+  if (!existsSync21(scriptPath)) {
     try {
       const builtin = await runBuiltinCompleteDesign(ctx);
       return {
@@ -25517,7 +25734,7 @@ async function runCompleteDesignPostProcessor(ctx, options) {
     }
   }
   return await new Promise((resolveRun) => {
-    const child = spawn5(process.execPath, [scriptPath], {
+    const child = spawn6(process.execPath, [scriptPath], {
       cwd: ctx.projectRoot,
       stdio: ["ignore", "pipe", "pipe"],
       env: process.env
@@ -25683,8 +25900,8 @@ async function runPostCouncilHook(ctx, options) {
           sources: scope.sources
         } : void 0
       });
-      const path25 = writeCouncilCompletion(ctx.rootDir, completion);
-      completionHook = { ran: true, path: path25, completion };
+      const path27 = writeCouncilCompletion(ctx.rootDir, completion);
+      completionHook = { ran: true, path: path27, completion };
     } catch (err) {
       completionHook = {
         ran: true,
@@ -25720,12 +25937,12 @@ var buildLessonsSummary_exports = {};
 __export(buildLessonsSummary_exports, {
   buildLessonsSummary: () => buildLessonsSummary
 });
-import { existsSync as existsSync20 } from "node:fs";
+import { existsSync as existsSync22 } from "node:fs";
 import { join as join20 } from "node:path";
 function buildLessonsSummary(projectRoot = process.cwd(), taskText) {
   if (process.env["ZELARI_LESSONS"] === "0") return null;
   const zelariRoot = resolveWorkspaceRoot(projectRoot);
-  if (!existsSync20(join20(zelariRoot, "lessons.jsonl"))) return null;
+  if (!existsSync22(join20(zelariRoot, "lessons.jsonl"))) return null;
   const lessons = recallLessons(zelariRoot, {
     maxLessons: 5,
     maxBytes: 2048,
@@ -25748,12 +25965,12 @@ __export(councilFeedback_exports, {
 });
 import {
   promises as fs12,
-  existsSync as existsSync21,
+  existsSync as existsSync23,
   readFileSync as readFileSync20,
   writeFileSync as writeFileSync14,
   mkdirSync as mkdirSync9
 } from "node:fs";
-import path16 from "node:path";
+import path17 from "node:path";
 import os7 from "node:os";
 var FeedbackStore;
 var init_councilFeedback = __esm({
@@ -25764,7 +25981,7 @@ var init_councilFeedback = __esm({
       now;
       entries = [];
       constructor(options = {}) {
-        this.file = options.file ?? (process.env.ANATHEMA_COUNCIL_FEEDBACK_FILE ?? path16.join(os7.homedir(), ".tmp", "zelari-code", "council-feedback.json"));
+        this.file = options.file ?? (process.env.ANATHEMA_COUNCIL_FEEDBACK_FILE ?? path17.join(os7.homedir(), ".tmp", "zelari-code", "council-feedback.json"));
         this.now = options.now ?? Date.now;
         this.load();
       }
@@ -25857,7 +26074,7 @@ var init_councilFeedback = __esm({
       }
       // --- persistence ---------------------------------------------------------
       load() {
-        if (!existsSync21(this.file)) return;
+        if (!existsSync23(this.file)) return;
         try {
           const raw = readFileSync20(this.file, "utf-8");
           const parsed = JSON.parse(raw);
@@ -25870,7 +26087,7 @@ var init_councilFeedback = __esm({
         }
       }
       save() {
-        mkdirSync9(path16.dirname(this.file), { recursive: true });
+        mkdirSync9(path17.dirname(this.file), { recursive: true });
         writeFileSync14(
           this.file,
           JSON.stringify({ entries: this.entries }, null, 2),
@@ -25905,7 +26122,7 @@ __export(fileBackend_exports, {
 });
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { promises as fs13 } from "node:fs";
-import * as path17 from "node:path";
+import * as path18 from "node:path";
 function tokenize(text) {
   return text.toLowerCase().split(/[^\p{L}\p{N}]+/u).filter((t) => t.length >= 3);
 }
@@ -25943,8 +26160,8 @@ var init_fileBackend = __esm({
       logPath = "";
       memoryDir = "";
       async init(projectRoot) {
-        this.memoryDir = path17.join(projectRoot, ".zelari", "memory");
-        this.logPath = path17.join(this.memoryDir, "log.jsonl");
+        this.memoryDir = path18.join(projectRoot, ".zelari", "memory");
+        this.logPath = path18.join(this.memoryDir, "log.jsonl");
         await fs13.mkdir(this.memoryDir, { recursive: true });
       }
       async add(content, metadata = {}, graph) {
@@ -26014,6 +26231,142 @@ var init_fileBackend = __esm({
   }
 });
 
+// src/cli/checkpoint/checkpointManager.ts
+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 path19 from "node:path";
+import { randomUUID as randomUUID3 } from "node:crypto";
+async function git(cwd, args, env) {
+  const { stdout } = await execFileAsync("git", ["-C", cwd, ...args], {
+    maxBuffer: 64 * 1024 * 1024,
+    env: env ? { ...process.env, ...env } : process.env
+  });
+  return stdout;
+}
+async function gitSafe(cwd, args, env) {
+  try {
+    return (await git(cwd, args, env)).trim();
+  } catch {
+    return null;
+  }
+}
+async function isGitRepo(cwd) {
+  return await gitSafe(cwd, ["rev-parse", "--is-inside-work-tree"]) === "true";
+}
+async function withTempIndex(fn) {
+  const dir = mkdtempSync(path19.join(tmpdir(), "zelari-ckpt-"));
+  const indexFile = path19.join(dir, "index");
+  try {
+    return await fn(indexFile);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+}
+async function snapshotTree(cwd) {
+  const head = await gitSafe(cwd, ["rev-parse", "HEAD"]);
+  return withTempIndex(async (indexFile) => {
+    const env = { GIT_INDEX_FILE: indexFile };
+    if (head) await git(cwd, ["read-tree", "HEAD"], env);
+    await git(cwd, ["add", "-A"], env);
+    const tree = (await git(cwd, ["write-tree"], env)).trim();
+    return { tree, head };
+  });
+}
+async function createCheckpoint(cwd, label = "checkpoint") {
+  if (!await isGitRepo(cwd)) {
+    return { ok: false, error: "not a git repository \u2014 checkpoints require git" };
+  }
+  try {
+    const { tree, head } = await snapshotTree(cwd);
+    const id = randomUUID3().slice(0, 8);
+    const createdAt = Date.now();
+    const message = `zelari-checkpoint ${id}: ${label}`;
+    const commitArgs = ["commit-tree", tree, "-m", message];
+    if (head) commitArgs.push("-p", head);
+    const commit = (await git(cwd, commitArgs)).trim();
+    await git(cwd, ["update-ref", `${REF_PREFIX}${id}`, commit]);
+    return { ok: true, value: { id, label, tree, head, commit, createdAt } };
+  } catch (err) {
+    return { ok: false, error: err instanceof Error ? err.message : String(err) };
+  }
+}
+async function listCheckpoints(cwd) {
+  const out = await gitSafe(cwd, [
+    "for-each-ref",
+    "--sort=-creatordate",
+    "--format=%(refname) %(objectname) %(creatordate:unix) %(contents:subject)",
+    REF_PREFIX
+  ]);
+  if (!out) return [];
+  const checkpoints = [];
+  for (const line of out.split("\n")) {
+    if (!line.trim()) continue;
+    const [refname, commit, unix, ...subjectParts] = line.split(" ");
+    if (!refname?.startsWith(REF_PREFIX)) continue;
+    const id = refname.slice(REF_PREFIX.length);
+    const subject = subjectParts.join(" ");
+    const label = subject.replace(/^zelari-checkpoint\s+\S+:\s*/, "") || "checkpoint";
+    const tree = await gitSafe(cwd, ["rev-parse", `${commit}^{tree}`]) ?? "";
+    checkpoints.push({
+      id,
+      label,
+      tree,
+      head: null,
+      commit: commit ?? "",
+      createdAt: (Number(unix) || 0) * 1e3
+    });
+  }
+  return checkpoints;
+}
+async function latestCheckpoint(cwd) {
+  return (await listCheckpoints(cwd))[0] ?? null;
+}
+async function restoreCheckpoint(cwd, id) {
+  if (!await isGitRepo(cwd)) {
+    return { ok: false, error: "not a git repository \u2014 checkpoints require git" };
+  }
+  try {
+    const target = id ? (await listCheckpoints(cwd)).find((c) => c.id === id) : await latestCheckpoint(cwd);
+    if (!target) {
+      return { ok: false, error: id ? `checkpoint "${id}" not found` : "no checkpoints to restore" };
+    }
+    const snapTree = target.tree || await gitSafe(cwd, ["rev-parse", `${target.commit}^{tree}`]);
+    if (!snapTree) return { ok: false, error: "could not resolve checkpoint tree" };
+    const current = await snapshotTree(cwd);
+    const addedOut = await gitSafe(cwd, [
+      "diff",
+      "--name-only",
+      "--diff-filter=A",
+      snapTree,
+      current.tree
+    ]);
+    const added = addedOut ? addedOut.split("\n").filter((l) => l.trim()) : [];
+    await git(cwd, ["read-tree", snapTree]);
+    await git(cwd, ["checkout-index", "-a", "-f"]);
+    const deleted = [];
+    for (const rel2 of added) {
+      try {
+        rmSync(path19.join(cwd, rel2), { force: true });
+        deleted.push(rel2);
+      } catch {
+      }
+    }
+    return { ok: true, value: { id: target.id, deleted } };
+  } catch (err) {
+    return { ok: false, error: err instanceof Error ? err.message : String(err) };
+  }
+}
+var execFileAsync, REF_PREFIX;
+var init_checkpointManager = __esm({
+  "src/cli/checkpoint/checkpointManager.ts"() {
+    "use strict";
+    execFileAsync = promisify(execFile2);
+    REF_PREFIX = "refs/zelari/checkpoints/";
+  }
+});
+
 // src/cli/zelariMission.ts
 var zelariMission_exports = {};
 __export(zelariMission_exports, {
@@ -26023,9 +26376,9 @@ __export(zelariMission_exports, {
   resolveMaxStall: () => resolveMaxStall,
   runZelariMission: () => runZelariMission
 });
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { promises as fs14 } from "node:fs";
-import * as path18 from "node:path";
+import * as path20 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;
@@ -26041,10 +26394,10 @@ function isMissionAutoStart(env = process.env) {
   return env.ZELARI_MISSION_AUTO === "1";
 }
 async function writeMissionState(projectRoot, state2) {
-  const dir = path18.join(projectRoot, ".zelari");
+  const dir = path20.join(projectRoot, ".zelari");
   await fs14.mkdir(dir, { recursive: true });
   await fs14.writeFile(
-    path18.join(dir, "mission-state.json"),
+    path20.join(dir, "mission-state.json"),
     JSON.stringify(state2, null, 2) + "\n",
     "utf8"
   );
@@ -26085,7 +26438,7 @@ async function runZelariMission(userMessage, brief, deps) {
   const now = deps.now ?? (() => /* @__PURE__ */ new Date());
   const maxIter = deps.maxIterations ?? resolveMaxIterations(deps.env);
   const maxStall = resolveMaxStall(deps.env);
-  const missionId = deps.missionId ?? `m_${randomUUID3().slice(0, 8)}`;
+  const missionId = deps.missionId ?? `m_${randomUUID4().slice(0, 8)}`;
   const startedAt = now().toISOString();
   const state2 = {
     missionId,
@@ -26100,6 +26453,14 @@ async function runZelariMission(userMessage, brief, deps) {
   };
   await deps.memory.init(deps.projectRoot);
   await writeMissionState(deps.projectRoot, state2);
+  if ((deps.env ?? process.env).ZELARI_CHECKPOINT !== "0") {
+    const cp = await createCheckpoint(deps.projectRoot, `zelari mission ${missionId}`);
+    if (cp.ok) {
+      deps.emit(
+        `[zelari] checkpoint ${cp.value.id} creato \u2014 se la missione va storta ripristina con \`/rollback ${cp.value.id}\`.`
+      );
+    }
+  }
   const designFirst = brief.phases[0]?.mode === "design-phase";
   let noWriteStreak = 0;
   for (let i = 1; i <= maxIter; i++) {
@@ -26167,6 +26528,7 @@ var init_zelariMission = __esm({
   "src/cli/zelariMission.ts"() {
     "use strict";
     init_fileBackend();
+    init_checkpointManager();
     DEFAULT_MAX_ITER = 10;
     DEFAULT_MAX_STALL = 2;
   }
@@ -26178,26 +26540,26 @@ __export(doctor_exports, {
   runDoctor: () => runDoctor
 });
 import { execSync } from "node:child_process";
-import { existsSync as existsSync26, readFileSync as readFileSync23, readlinkSync, statSync as statSync6 } from "node:fs";
+import { existsSync as existsSync28, readFileSync as readFileSync23, readlinkSync, statSync as statSync6 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import path24 from "node:path";
+import path26 from "node:path";
 function findPackageRoot(start) {
   let dir = start;
   for (let i = 0; i < 6; i += 1) {
-    const candidate = path24.join(dir, "package.json");
-    if (existsSync26(candidate)) {
+    const candidate = path26.join(dir, "package.json");
+    if (existsSync28(candidate)) {
       try {
         const pkg = JSON.parse(readFileSync23(candidate, "utf8"));
         if (pkg.name === "zelari-code") return dir;
       } catch {
       }
     }
-    const parent = path24.dirname(dir);
+    const parent = path26.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
-  return path24.resolve(__dirname3, "..", "..", "..");
+  return path26.resolve(__dirname3, "..", "..", "..");
 }
 function tryExec(cmd) {
   try {
@@ -26211,7 +26573,7 @@ function tryExec(cmd) {
 }
 function readPackageJson3() {
   try {
-    const pkgPath = path24.join(packageRoot, "package.json");
+    const pkgPath = path26.join(packageRoot, "package.json");
     return JSON.parse(readFileSync23(pkgPath, "utf8"));
   } catch {
     return null;
@@ -26227,8 +26589,8 @@ function checkShim(pkgName) {
   }
   const isWin = process.platform === "win32";
   const shimName = isWin ? "zelari-code.cmd" : "zelari-code";
-  const shimPath = path24.join(prefix, shimName);
-  if (!existsSync26(shimPath)) {
+  const shimPath = path26.join(prefix, shimName);
+  if (!existsSync28(shimPath)) {
     return FAIL(
       `shim not found at ${shimPath}
          fix:  npm install -g ${pkgName}@latest --force`
@@ -26255,8 +26617,8 @@ function checkShim(pkgName) {
          fix:  npm install -g ${pkgName}@latest --force`
       );
     }
-    const resolved = path24.resolve(path24.dirname(shimPath), target);
-    const expected = path24.join(
+    const resolved = path26.resolve(path26.dirname(shimPath), target);
+    const expected = path26.join(
       prefix,
       "node_modules",
       pkgName,
@@ -26295,8 +26657,8 @@ function checkNode(pkg) {
   return OK(`node ${raw}`);
 }
 function checkBundle() {
-  const bundle = path24.join(packageRoot, "dist", "cli", "main.bundled.js");
-  if (!existsSync26(bundle)) {
+  const bundle = path26.join(packageRoot, "dist", "cli", "main.bundled.js");
+  if (!existsSync28(bundle)) {
     return FAIL(
       `dist/cli/main.bundled.js missing at ${bundle}
          fix:  npm run build:cli   (then reinstall or run via tsx)`
@@ -26316,7 +26678,7 @@ function checkRuntimeDeps() {
   const missing = [];
   for (const dep of required2) {
     try {
-      const localReq = createRequire2(path24.join(packageRoot, "package.json"));
+      const localReq = createRequire2(path26.join(packageRoot, "package.json"));
       localReq.resolve(dep);
     } catch {
       missing.push(dep);
@@ -26398,7 +26760,7 @@ var init_doctor = __esm({
   "src/cli/utils/doctor.ts"() {
     "use strict";
     require3 = createRequire2(import.meta.url);
-    __dirname3 = path24.dirname(fileURLToPath2(import.meta.url));
+    __dirname3 = path26.dirname(fileURLToPath2(import.meta.url));
     packageRoot = findPackageRoot(__dirname3);
     OK = (message) => ({
       ok: true,
@@ -26845,6 +27207,81 @@ function StreamingTail(m) {
 // src/cli/components/StatusBar.tsx
 import React6 from "react";
 import { Box as Box5, Text as Text6 } from "ink";
+
+// src/cli/modelPricing.ts
+var PRICES_PER_MILLION = {
+  // xAI Grok
+  "grok-4": { input: 3, output: 15 },
+  "grok-4-fast": { input: 0.2, output: 0.5 },
+  "grok-3": { input: 3, output: 15 },
+  "grok-3-mini": { input: 0.3, output: 0.5 },
+  "grok-2-vision": { input: 2, output: 10 },
+  // GLM / Z.AI
+  "glm-4.6": { input: 0.6, output: 2.2 },
+  "glm-4.5": { input: 0.5, output: 2 },
+  "glm-4.5-air": { input: 0.1, output: 0.6 },
+  "glm-z1": { input: 0.5, output: 2 },
+  // MiniMax
+  "MiniMax-M2.5": { input: 0.2, output: 1.1 },
+  "MiniMax-M2": { input: 0.2, output: 1.1 },
+  "MiniMax-M2-her": { input: 0.3, output: 1.2 },
+  // DeepSeek (global platform) — estimated list prices; override via
+  // ANATHEMA_PRICE_DEEPSEEK_V4_FLASH / ANATHEMA_PRICE_DEEPSEEK_V4_PRO.
+  // DeepSeek prompt-cache hits are ~10× cheaper than a cache miss.
+  "deepseek-v4-flash": { input: 0.14, output: 0.28, cachedInput: 0.014 },
+  "deepseek-v4-pro": { input: 0.55, output: 2.19, cachedInput: 0.055 },
+  // OpenAI (for openai-compatible fallback)
+  "gpt-4o": { input: 2.5, output: 10 },
+  "gpt-4o-mini": { input: 0.15, output: 0.6 },
+  "gpt-4-turbo": { input: 10, output: 30 },
+  "o1-preview": { input: 15, output: 60 },
+  "o1-mini": { input: 3, output: 12 }
+};
+var DEFAULT_RATE = { input: 1, output: 3 };
+var DEFAULT_CACHE_DISCOUNT = 0.25;
+function envOverride(model) {
+  const key = `ANATHEMA_PRICE_${model.toUpperCase().replace(/[^A-Z0-9]/g, "_")}`;
+  const raw = process.env[key] ?? process.env.ANATHEMA_PRICE_DEFAULT;
+  return parseRateOverride(raw);
+}
+function parseRateOverride(raw) {
+  if (!raw) return null;
+  const [inStr, outStr] = raw.split("/");
+  const input = Number.parseFloat(inStr);
+  const output = outStr !== void 0 ? Number.parseFloat(outStr) : input;
+  if (!Number.isFinite(input) || !Number.isFinite(output)) return null;
+  return { input, output };
+}
+function getModelRate(model) {
+  if (!model) return DEFAULT_RATE;
+  return envOverride(model) ?? PRICES_PER_MILLION[model] ?? DEFAULT_RATE;
+}
+function calculateCost(model, promptTokens, completionTokens, cachedPromptTokens = 0) {
+  if (!Number.isFinite(promptTokens) || promptTokens < 0) return 0;
+  if (!Number.isFinite(completionTokens) || completionTokens < 0) return 0;
+  const rate = getModelRate(model);
+  const cached2 = Number.isFinite(cachedPromptTokens) && cachedPromptTokens > 0 ? Math.min(cachedPromptTokens, promptTokens) : 0;
+  const uncachedPrompt = promptTokens - cached2;
+  const cachedRate = rate.cachedInput ?? rate.input * DEFAULT_CACHE_DISCOUNT;
+  const inputCost = uncachedPrompt / 1e6 * rate.input + cached2 / 1e6 * cachedRate;
+  const outputCost = completionTokens / 1e6 * rate.output;
+  return Number((inputCost + outputCost).toFixed(6));
+}
+function formatCost(usd) {
+  if (!Number.isFinite(usd) || usd < 0) return "$0.0000";
+  if (usd === 0) return "$0.0000";
+  if (usd < 1e-4) return "<$0.0001";
+  return `$${usd.toFixed(4)}`;
+}
+function formatTokens(tokens) {
+  if (!Number.isFinite(tokens) || tokens < 0) return "0";
+  if (tokens < 1e3) return `${tokens}`;
+  if (tokens < 1e6) return `${(tokens / 1e3).toFixed(1)}k`;
+  if (tokens < 1e9) return `${(tokens / 1e6).toFixed(2)}M`;
+  return `${(tokens / 1e9).toFixed(2)}B`;
+}
+
+// src/cli/components/StatusBar.tsx
 function StatusBar({
   model,
   provider,
@@ -26855,7 +27292,9 @@ function StatusBar({
   mode = "agent",
   cwd,
   elapsedMs = null,
-  lastMs = null
+  lastMs = null,
+  costUsd = 0,
+  cachedTokens = 0
 }) {
   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,
@@ -26864,7 +27303,7 @@ function StatusBar({
       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, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "session ", sessionId))));
+  ), /* @__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))));
 }
 
 // src/cli/components/SelectList.tsx
@@ -29270,75 +29709,13 @@ registerCodingSkill(regressionTest);
 
 // src/cli/app.tsx
 init_providerConfig();
-
-// packages/core/dist/harness/index.js
-init_AgentHarness();
-
-// packages/core/dist/core/sessionJsonl.js
-import { promises as fs8 } from "node:fs";
-import path10 from "node:path";
-import os3 from "node:os";
-var SessionJsonlWriter = class {
-  filePath;
-  onError;
-  constructor(sessionId, options = {}) {
-    const baseDir = options.baseDir ?? defaultBaseDir();
-    this.filePath = path10.join(baseDir, `${sessionId}.jsonl`);
-    this.onError = options.onError ?? console.error;
-  }
-  /** Absolute path to the session JSONL file. */
-  get path() {
-    return this.filePath;
-  }
-  /** Append a BrainEvent as one JSON line. Creates the file + parent dirs if missing. */
-  async append(event) {
-    try {
-      await fs8.mkdir(path10.dirname(this.filePath), { recursive: true });
-      const line = JSON.stringify({
-        ts: event.ts,
-        sessionId: event.sessionId,
-        event
-      }) + "\n";
-      await fs8.appendFile(this.filePath, line, { encoding: "utf-8", mode: 420 });
-    } catch (err) {
-      this.onError(`[sessionJsonl] failed to append event to ${this.filePath}: ${err instanceof Error ? err.message : String(err)}`);
-    }
-  }
-  /** Close the writer (no-op currently, but reserved for future buffered mode). */
-  async close() {
-  }
-};
-async function readSession(filePath) {
-  try {
-    const content = await fs8.readFile(filePath, "utf-8");
-    const events = [];
-    for (const line of content.split("\n")) {
-      const trimmed = line.trim();
-      if (!trimmed)
-        continue;
-      try {
-        const parsed = JSON.parse(trimmed);
-        if (parsed && typeof parsed === "object" && "event" in parsed) {
-          events.push(parsed.event);
-        }
-      } catch {
-      }
-    }
-    return events;
-  } catch (err) {
-    if (err.code === "ENOENT")
-      return [];
-    throw err;
-  }
-}
-function defaultBaseDir() {
-  return path10.join(os3.tmpdir(), "zelari-code", "sessions");
-}
+init_harness();
 
 // src/cli/hooks/useSession.ts
 import { useState as useState5, useRef as useRef3, useCallback, useEffect as useEffect4 } from "react";
 
 // src/cli/sessionManager.ts
+init_harness();
 import { promises as fs9, existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync4, unlinkSync, statSync } from "node:fs";
 import path11 from "node:path";
 import os4 from "node:os";
@@ -29460,6 +29837,9 @@ async function loadSessionEvents(id) {
   return readSession(filePath);
 }
 
+// src/cli/hooks/useSession.ts
+init_harness();
+
 // src/cli/hooks/eventsToMessages.ts
 function eventsToMessages(events) {
   const out = [];
@@ -29740,6 +30120,7 @@ ${lines.join("\n")}`;
 }
 
 // src/cli/hooks/useChatTurn.ts
+init_harness();
 import { useState as useState6, useRef as useRef4, useCallback as useCallback2 } from "react";
 
 // src/cli/metrics.ts
@@ -30082,33 +30463,317 @@ function safeStringify(value) {
   }
 }
 
+// src/cli/diagnostics/engine.ts
+import { spawn as spawn2 } from "node:child_process";
+import { existsSync as existsSync7 } from "node:fs";
+import path15 from "node:path";
+function parseEslintJson(stdout, _file2) {
+  const json2 = safeJson(stdout);
+  if (!Array.isArray(json2)) return [];
+  const out = [];
+  for (const fileResult of json2) {
+    if (!fileResult || typeof fileResult !== "object") continue;
+    const fr = fileResult;
+    const filePath = typeof fr.filePath === "string" ? fr.filePath : _file2;
+    if (!Array.isArray(fr.messages)) continue;
+    for (const m of fr.messages) {
+      if (!m || typeof m !== "object") continue;
+      const msg = m;
+      out.push({
+        file: filePath,
+        line: typeof msg.line === "number" ? msg.line : 0,
+        ...typeof msg.column === "number" ? { column: msg.column } : {},
+        // ESLint severity: 2 = error, 1 = warning.
+        severity: msg.severity === 2 ? "error" : "warning",
+        message: typeof msg.message === "string" ? msg.message : "(no message)",
+        ...typeof msg.ruleId === "string" && msg.ruleId ? { code: msg.ruleId } : {},
+        source: "eslint"
+      });
+    }
+  }
+  return out;
+}
+function parseRuffJson(stdout, _file2) {
+  const json2 = safeJson(stdout);
+  if (!Array.isArray(json2)) return [];
+  const out = [];
+  for (const issue2 of json2) {
+    if (!issue2 || typeof issue2 !== "object") continue;
+    const it = issue2;
+    const code = typeof it.code === "string" ? it.code : void 0;
+    out.push({
+      file: typeof it.filename === "string" ? it.filename : _file2,
+      line: typeof it.location?.row === "number" ? it.location.row : 0,
+      ...typeof it.location?.column === "number" ? { column: it.location.column } : {},
+      // Ruff has no severity field; E999 is a syntax error, everything else
+      // is a lint warning.
+      severity: code === "E999" ? "error" : "warning",
+      message: typeof it.message === "string" ? it.message : "(no message)",
+      ...code ? { code } : {},
+      source: "ruff"
+    });
+  }
+  return out;
+}
+function safeJson(s) {
+  const trimmed = s.trim();
+  if (!trimmed) return null;
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return null;
+  }
+}
+var DEFAULT_PROVIDERS = [
+  {
+    name: "eslint",
+    bin: "eslint",
+    extensions: [".js", ".jsx", ".ts", ".tsx", ".mjs", ".cjs"],
+    args: (file2) => ["--format", "json", file2],
+    parse: parseEslintJson
+  },
+  {
+    name: "ruff",
+    bin: "ruff",
+    extensions: [".py"],
+    args: (file2) => ["check", "--output-format", "json", file2],
+    parse: parseRuffJson
+  }
+];
+function providerForFile(file2, providers = DEFAULT_PROVIDERS) {
+  const ext = path15.extname(file2).toLowerCase();
+  return providers.find((p3) => p3.extensions.includes(ext)) ?? null;
+}
+function resolveBin(bin, cwd) {
+  const suffixes = process.platform === "win32" ? [".cmd", ".exe", ""] : [""];
+  let dir = cwd;
+  for (let i = 0; i < 6; i += 1) {
+    for (const suffix of suffixes) {
+      const candidate = path15.join(dir, "node_modules", ".bin", `${bin}${suffix}`);
+      if (existsSync7(candidate)) return candidate;
+    }
+    const parent = path15.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return bin;
+}
+var defaultRunner = (cmd, args, opts) => new Promise((resolve) => {
+  let stdout = "";
+  let stderr = "";
+  let settled = false;
+  const done = (r) => {
+    if (settled) return;
+    settled = true;
+    resolve(r);
+  };
+  let child;
+  try {
+    child = process.platform === "win32" ? spawn2(`${cmd} ${args.join(" ")}`, { cwd: opts.cwd, shell: true }) : spawn2(cmd, args, { cwd: opts.cwd });
+  } catch {
+    done({ code: null, stdout: "", stderr: "" });
+    return;
+  }
+  const timer = setTimeout(() => {
+    try {
+      child.kill();
+    } catch {
+    }
+    done({ code: null, stdout, stderr });
+  }, opts.timeoutMs);
+  child.stdout?.on("data", (c) => {
+    stdout += c.toString();
+  });
+  child.stderr?.on("data", (c) => {
+    stderr += c.toString();
+  });
+  child.on("error", () => {
+    clearTimeout(timer);
+    done({ code: null, stdout: "", stderr: "" });
+  });
+  child.on("close", (code) => {
+    clearTimeout(timer);
+    done({ code, stdout, stderr });
+  });
+});
+async function runDiagnosticsForFile(file2, options = {}) {
+  const provider = providerForFile(file2, options.providers);
+  if (!provider) return [];
+  const cwd = options.cwd ?? process.cwd();
+  const timeoutMs = options.timeoutMs ?? 5e3;
+  const runner = options.runner ?? defaultRunner;
+  try {
+    const bin = options.runner ? provider.bin : resolveBin(provider.bin, cwd);
+    const result = await runner(bin, provider.args(file2), { cwd, timeoutMs });
+    return provider.parse(result.stdout, file2);
+  } catch {
+    return [];
+  }
+}
+function formatDiagnostics(diagnostics, opts = {}) {
+  if (diagnostics.length === 0) return "";
+  const maxLines = opts.maxLines ?? 20;
+  const rank = { error: 0, warning: 1, info: 2 };
+  const sorted = [...diagnostics].sort(
+    (a, b) => rank[a.severity] - rank[b.severity] || a.line - b.line
+  );
+  const errors = sorted.filter((d) => d.severity === "error").length;
+  const warnings = sorted.filter((d) => d.severity === "warning").length;
+  const header = `\u26A0 ${diagnostics.length} diagnostic${diagnostics.length === 1 ? "" : "s"} (${errors} error${errors === 1 ? "" : "s"}, ${warnings} warning${warnings === 1 ? "" : "s"}) \u2014 fix before continuing:`;
+  const shown = sorted.slice(0, maxLines).map((d) => {
+    const loc = opts.relativeTo ? relative(opts.relativeTo, d.file) : d.file;
+    const pos = d.column ? `${d.line}:${d.column}` : `${d.line}`;
+    const tag = d.severity === "error" ? "error" : d.severity === "warning" ? "warn" : "info";
+    const code = d.code ? ` [${d.code}]` : "";
+    return `  ${loc}:${pos} ${tag}${code}: ${d.message} (${d.source})`;
+  });
+  const overflow = sorted.length > maxLines ? [`  \u2026 and ${sorted.length - maxLines} more`] : [];
+  return [header, ...shown, ...overflow].join("\n");
+}
+function relative(from, to) {
+  try {
+    const rel2 = path15.relative(from, to);
+    return rel2 && !rel2.startsWith("..") ? rel2 : to;
+  } catch {
+    return to;
+  }
+}
+
+// src/cli/tools/taskTool.ts
+init_zod();
+init_toolTypes();
+var SUBAGENT_SYSTEM_PROMPT = [
+  "You are a focused sub-agent spawned to answer ONE bounded question or",
+  "complete ONE small research task for a parent coding agent.",
+  "",
+  "You have READ-ONLY tools (read files, list files, search, fetch URLs).",
+  "You cannot edit files or run shell commands \u2014 do not attempt to.",
+  "",
+  "Work efficiently: gather only what you need, then STOP and reply with a",
+  "concise, self-contained conclusion the parent can act on. Include concrete",
+  "references (file paths, line numbers, symbol names) but do not paste large",
+  "file dumps. Do not ask the parent follow-up questions \u2014 deliver your best",
+  "answer with what you can find."
+].join("\n");
+var TaskArgsSchema = external_exports.object({
+  description: external_exports.string().min(1).describe("A 3-6 word label for the sub-task (for logs/UI)."),
+  prompt: external_exports.string().min(1).describe(
+    "The full, self-contained instruction for the sub-agent. It has no access to this conversation, so include all context it needs."
+  )
+});
+async function runSubAgent(harness) {
+  let current = "";
+  let lastCompleted = "";
+  let error51;
+  for await (const ev of harness.run()) {
+    switch (ev.type) {
+      case "message_start":
+        current = "";
+        break;
+      case "message_delta":
+        current += ev.delta;
+        break;
+      case "message_end":
+        if (current.trim()) lastCompleted = current;
+        current = "";
+        break;
+      case "error":
+        error51 = ev.message;
+        break;
+      default:
+        break;
+    }
+  }
+  const result = (lastCompleted || current).trim();
+  return { result, ...error51 ? { error: error51 } : {} };
+}
+function createTaskTool(deps) {
+  return {
+    name: "task",
+    description: 'Delegate a focused, READ-ONLY research/exploration sub-task to an isolated sub-agent that has its own fresh context and returns only a concise conclusion. Use it to keep your own context lean \u2014 e.g. "find where feature X is implemented and summarize how it works" \u2014 on large codebases. The sub-agent cannot edit files or run shell commands. Provide a fully self-contained `prompt` (it cannot see this conversation).',
+    // The sub-agent reads the workspace and may hit the network (fetch/search),
+    // but never writes or runs shell commands.
+    permissions: ["read", "network"],
+    // Sub-agents run a full (bounded) agent loop — allow generous wall time.
+    timeoutMs: 3e5,
+    inputSchema: TaskArgsSchema,
+    execute: async (args, ctx) => {
+      let sub;
+      try {
+        sub = await deps.createSubAgentContext();
+      } catch (err) {
+        return typedErr(`task: could not initialize sub-agent \u2014 ${err instanceof Error ? err.message : String(err)}`);
+      }
+      if (!sub) {
+        return typedErr("task: no provider configured for the sub-agent (set an API key / run /login).");
+      }
+      const config2 = {
+        model: sub.model,
+        provider: sub.provider,
+        messages: [
+          { role: "system", content: SUBAGENT_SYSTEM_PROMPT },
+          { role: "user", content: args.prompt }
+        ],
+        tools: sub.tools,
+        toolRegistry: sub.registry,
+        providerStream: sub.providerStream,
+        cwd: ctx.cwd,
+        // Guard against a single turn ballooning context on "explore" tasks.
+        maxToolCallsPerTurn: 5
+      };
+      let harness;
+      try {
+        if (deps.harnessFactory) {
+          harness = deps.harnessFactory(config2);
+        } else {
+          const { AgentHarness: AgentHarness2 } = await Promise.resolve().then(() => (init_harness(), harness_exports));
+          harness = new AgentHarness2(config2);
+        }
+      } catch (err) {
+        return typedErr(`task: failed to start sub-agent \u2014 ${err instanceof Error ? err.message : String(err)}`);
+      }
+      const { result, error: error51 } = await runSubAgent(harness);
+      if (!result) {
+        return typedErr(`task: sub-agent produced no output${error51 ? ` (${error51})` : ""}.`);
+      }
+      return typedOk({ result });
+    }
+  };
+}
+
 // src/cli/toolRegistry.ts
+init_openai_compatible();
 function createBuiltinToolRegistry(options = {}) {
   const root = options.root ?? process.cwd();
   const audit = options.audit ?? new AuditLogger();
   const sessionId = options.sessionId ?? "cli";
+  const diagnosticsOn = options.diagnostics ?? process.env.ZELARI_DIAGNOSTICS !== "0";
+  const withDiag = (t) => diagnosticsOn ? wrapWithDiagnostics(t, root, options.diagnosticsRunner) : t;
   const safeReadFile = wrapWithSandbox(readFileTool, ["path"], root, audit, sessionId);
-  const safeWriteFile = wrapWithSandbox(writeFileTool, ["path"], root, audit, sessionId);
-  const safeEditFile = wrapWithSandbox(editFileTool, ["path"], root, audit, sessionId);
+  const safeWriteFile = withDiag(wrapWithSandbox(writeFileTool, ["path"], root, audit, sessionId));
+  const safeEditFile = withDiag(wrapWithSandbox(editFileTool, ["path"], root, audit, sessionId));
   const safeGrepContent = wrapWithSandbox(grepContentTool, ["path"], root, audit, sessionId);
   const safeListFiles = wrapWithSandbox(listFilesTool, ["path"], root, audit, sessionId);
   const safeShowDiff = wrapWithSandbox(showDiffTool, ["path"], root, audit, sessionId);
-  const safeApplyDiff = wrapWithSandbox(applyDiffTool, ["path"], root, audit, sessionId);
+  const safeApplyDiff = withDiag(wrapWithSandbox(applyDiffTool, ["path"], root, audit, sessionId));
   const safeBash = wrapWithShellSafety(bashTool, audit, sessionId);
   const safeFetchUrl = wrapWithAudit(fetchUrlTool, audit, sessionId);
   const safeWebSearch = wrapWithAudit(webSearchTool, audit, sessionId);
   const registry3 = new ToolRegistry();
+  const readOnly = options.readOnly === true;
   registry3.register(safeReadFile);
-  registry3.register(safeWriteFile);
-  registry3.register(safeEditFile);
-  registry3.register(safeBash);
   registry3.register(safeGrepContent);
   registry3.register(safeListFiles);
   registry3.register(safeShowDiff);
-  registry3.register(safeApplyDiff);
   registry3.register(safeFetchUrl);
   registry3.register(safeWebSearch);
-  const tools = [
+  if (!readOnly) {
+    registry3.register(safeWriteFile);
+    registry3.register(safeEditFile);
+    registry3.register(safeBash);
+    registry3.register(safeApplyDiff);
+  }
+  const summary = readOnly ? [safeReadFile, safeGrepContent, safeListFiles, safeShowDiff, safeFetchUrl, safeWebSearch] : [
     safeReadFile,
     safeWriteFile,
     safeEditFile,
@@ -30119,11 +30784,44 @@ function createBuiltinToolRegistry(options = {}) {
     safeApplyDiff,
     safeFetchUrl,
     safeWebSearch
-  ].map((t) => ({
+  ];
+  const tools = summary.map((t) => ({
     name: t.name,
     description: t.description,
     permissions: t.permissions ?? []
   }));
+  if (!readOnly && options.enableTask !== false) {
+    const taskTool = createTaskTool({
+      createSubAgentContext: async () => {
+        const cfg = await providerFromEnv();
+        if (!cfg) return null;
+        const { registry: subRegistry } = createBuiltinToolRegistry({
+          root,
+          audit,
+          sessionId,
+          readOnly: true,
+          diagnostics: false
+        });
+        return {
+          providerStream: openaiCompatibleProvider(cfg),
+          model: cfg.model,
+          provider: "openai-compatible",
+          registry: subRegistry,
+          tools: subRegistry.toOpenAITools().map((t) => ({
+            name: t.function.name,
+            description: t.function.description,
+            parameters: t.function.parameters
+          }))
+        };
+      }
+    });
+    registry3.register(taskTool);
+    tools.push({
+      name: taskTool.name,
+      description: taskTool.description,
+      permissions: taskTool.permissions ?? []
+    });
+  }
   return { registry: registry3, tools };
 }
 function wrapWithSandbox(original, pathArgs, root, audit, sessionId) {
@@ -30173,6 +30871,36 @@ function wrapWithSandbox(original, pathArgs, root, audit, sessionId) {
     }
   };
 }
+function wrapWithDiagnostics(original, root, runner) {
+  return {
+    ...original,
+    execute: async (rawArgs, ctx) => {
+      const result = await original.execute(rawArgs, ctx);
+      if (!result.ok) return result;
+      if (rawArgs.dryRun === true) return result;
+      const value = result.value;
+      const filePath = value && typeof value === "object" && typeof value.path === "string" ? value.path : void 0;
+      if (!filePath) return result;
+      try {
+        const timeoutMs = Number(process.env.ZELARI_DIAGNOSTICS_TIMEOUT_MS) || 5e3;
+        const diags = await runDiagnosticsForFile(filePath, {
+          cwd: root,
+          timeoutMs,
+          ...runner ? { runner } : {}
+        });
+        const formatted = formatDiagnostics(diags, { relativeTo: root });
+        if (formatted) {
+          return {
+            ok: true,
+            value: { ...value, diagnostics: formatted }
+          };
+        }
+      } catch {
+      }
+      return result;
+    }
+  };
+}
 function wrapWithAudit(original, audit, sessionId) {
   return {
     ...original,
@@ -30337,69 +31065,16 @@ function finalizeStreamingAssistant(setMessages) {
   });
 }
 
-// src/cli/modelPricing.ts
-var PRICES_PER_MILLION = {
-  // xAI Grok
-  "grok-4": { input: 3, output: 15 },
-  "grok-4-fast": { input: 0.2, output: 0.5 },
-  "grok-3": { input: 3, output: 15 },
-  "grok-3-mini": { input: 0.3, output: 0.5 },
-  "grok-2-vision": { input: 2, output: 10 },
-  // GLM / Z.AI
-  "glm-4.6": { input: 0.6, output: 2.2 },
-  "glm-4.5": { input: 0.5, output: 2 },
-  "glm-4.5-air": { input: 0.1, output: 0.6 },
-  "glm-z1": { input: 0.5, output: 2 },
-  // MiniMax
-  "MiniMax-M2.5": { input: 0.2, output: 1.1 },
-  "MiniMax-M2": { input: 0.2, output: 1.1 },
-  "MiniMax-M2-her": { input: 0.3, output: 1.2 },
-  // DeepSeek (global platform) — estimated list prices; override via
-  // ANATHEMA_PRICE_DEEPSEEK_V4_FLASH / ANATHEMA_PRICE_DEEPSEEK_V4_PRO.
-  "deepseek-v4-flash": { input: 0.14, output: 0.28 },
-  "deepseek-v4-pro": { input: 0.55, output: 2.19 },
-  // OpenAI (for openai-compatible fallback)
-  "gpt-4o": { input: 2.5, output: 10 },
-  "gpt-4o-mini": { input: 0.15, output: 0.6 },
-  "gpt-4-turbo": { input: 10, output: 30 },
-  "o1-preview": { input: 15, output: 60 },
-  "o1-mini": { input: 3, output: 12 }
-};
-var DEFAULT_RATE = { input: 1, output: 3 };
-function envOverride(model) {
-  const key = `ANATHEMA_PRICE_${model.toUpperCase().replace(/[^A-Z0-9]/g, "_")}`;
-  const raw = process.env[key] ?? process.env.ANATHEMA_PRICE_DEFAULT;
-  return parseRateOverride(raw);
-}
-function parseRateOverride(raw) {
-  if (!raw) return null;
-  const [inStr, outStr] = raw.split("/");
-  const input = Number.parseFloat(inStr);
-  const output = outStr !== void 0 ? Number.parseFloat(outStr) : input;
-  if (!Number.isFinite(input) || !Number.isFinite(output)) return null;
-  return { input, output };
-}
-function getModelRate(model) {
-  if (!model) return DEFAULT_RATE;
-  return envOverride(model) ?? PRICES_PER_MILLION[model] ?? DEFAULT_RATE;
-}
-function calculateCost(model, promptTokens, completionTokens) {
-  if (!Number.isFinite(promptTokens) || promptTokens < 0) return 0;
-  if (!Number.isFinite(completionTokens) || completionTokens < 0) return 0;
-  const rate = getModelRate(model);
-  const inputCost = promptTokens / 1e6 * rate.input;
-  const outputCost = completionTokens / 1e6 * rate.output;
-  return Number((inputCost + outputCost).toFixed(6));
-}
-
 // src/cli/hooks/chatStats.ts
 function computeSessionStatsDelta(realUsage, userText, assistantContent, model, prev2) {
   const promptTokens = realUsage ? realUsage.promptTokens : Math.ceil(userText.length / 4);
   const completionTokens = realUsage ? realUsage.completionTokens : Math.ceil(assistantContent.length / 4);
-  const turnCost = calculateCost(model, promptTokens, completionTokens);
+  const cachedPromptTokens = realUsage?.cachedPromptTokens ?? 0;
+  const turnCost = calculateCost(model, promptTokens, completionTokens, cachedPromptTokens);
   return {
     totalTokens: prev2.totalTokens + promptTokens + completionTokens,
-    totalCostUsd: prev2.totalCostUsd + turnCost
+    totalCostUsd: prev2.totalCostUsd + turnCost,
+    cachedTokens: (prev2.cachedTokens ?? 0) + cachedPromptTokens
   };
 }
 
@@ -31344,6 +32019,8 @@ function handleSlashCommand(text, availableSkills) {
   /new \u2014 start a fresh session
   /diff [--staged] \u2014 show uncommitted changes (or staged with --staged)
   /undo [--yes] \u2014 revert working-tree changes (destructive! requires --yes)
+  /checkpoint [label] \u2014 snapshot the working tree as a restore point
+  /rollback [id|latest] \u2014 restore the working tree to a checkpoint (no arg: list)
   /help \u2014 show this help
   /exit \u2014 exit the CLI
 
@@ -31681,6 +32358,25 @@ ${formatSkillList(availableSkills)}`
         message: "\u26A0 /undo is DESTRUCTIVE \u2014 it reverts all unstaged modifications and unstages everything.\nUse `/undo --yes` (or `/undo -y`) to confirm."
       };
     }
+    case "checkpoint": {
+      const label = args.join(" ").trim();
+      return {
+        handled: true,
+        kind: "checkpoint_create",
+        ...label ? { checkpointLabel: label } : {}
+      };
+    }
+    case "rollback": {
+      const target = args[0]?.trim();
+      if (!target) {
+        return { handled: true, kind: "rollback_list" };
+      }
+      return {
+        handled: true,
+        kind: "rollback",
+        ...target === "latest" ? {} : { rollbackId: target }
+      };
+    }
     case "workspace": {
       const sub = args[0];
       if (!sub || sub === "--help" || sub === "help") {
@@ -31744,13 +32440,13 @@ ${formatSkillList(availableSkills)}`
 }
 
 // src/cli/gitOps.ts
-import { execFile as execFile2 } from "node:child_process";
-import { promisify } from "node:util";
-import path19 from "node:path";
-var execFileAsync = promisify(execFile2);
-async function git(cwd, args) {
+import { execFile as execFile3 } from "node:child_process";
+import { promisify as promisify2 } from "node:util";
+import path21 from "node:path";
+var execFileAsync2 = promisify2(execFile3);
+async function git2(cwd, args) {
   try {
-    const { stdout } = await execFileAsync("git", ["-C", cwd, ...args], {
+    const { stdout } = await execFileAsync2("git", ["-C", cwd, ...args], {
       maxBuffer: 16 * 1024 * 1024
     });
     return stdout;
@@ -31758,15 +32454,15 @@ async function git(cwd, args) {
     return null;
   }
 }
-async function isGitRepo(cwd = process.cwd()) {
-  const out = await git(cwd, ["rev-parse", "--is-inside-work-tree"]);
+async function isGitRepo2(cwd = process.cwd()) {
+  const out = await git2(cwd, ["rev-parse", "--is-inside-work-tree"]);
   return out?.trim() === "true";
 }
 async function getWorkingDiff(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
   const maxChars = opts.maxChars ?? 5e4;
-  const unstaged = await git(cwd, ["diff"]) ?? "";
-  const staged = opts.staged ? await git(cwd, ["diff", "--cached"]) ?? "" : "";
+  const unstaged = await git2(cwd, ["diff"]) ?? "";
+  const staged = opts.staged ? await git2(cwd, ["diff", "--cached"]) ?? "" : "";
   const combined = [staged, unstaged].filter((s) => s.length > 0).join("\n");
   if (combined.length === 0) {
     return { diff: "", truncated: false, empty: true };
@@ -31779,11 +32475,11 @@ async function getWorkingDiff(opts = {}) {
 async function undoWorkingChanges(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
   const unstage = opts.unstage !== false;
-  const statusBefore = await git(cwd, ["status", "--porcelain"]) ?? "";
+  const statusBefore = await git2(cwd, ["status", "--porcelain"]) ?? "";
   const modified = statusBefore.split("\n").filter((line) => line.length > 0).filter((line) => !line.startsWith("??") && !line.startsWith("!!")).map((line) => line.slice(3).trim());
-  await git(cwd, ["checkout", "--", "."]);
+  await git2(cwd, ["checkout", "--", "."]);
   if (unstage) {
-    await git(cwd, ["reset", "HEAD", "--", "."]);
+    await git2(cwd, ["reset", "HEAD", "--", "."]);
   }
   return {
     reverted: modified,
@@ -31792,14 +32488,14 @@ async function undoWorkingChanges(opts = {}) {
   };
 }
 function defaultProjectRoot() {
-  return path19.resolve(__dirname, "..", "..", "..");
+  return path21.resolve(__dirname, "..", "..", "..");
 }
 
 // src/cli/slashHandlers/git.ts
 async function handleDiff(ctx, diffStaged) {
   try {
     const repoRoot = defaultProjectRoot();
-    if (!await isGitRepo(repoRoot)) {
+    if (!await isGitRepo2(repoRoot)) {
       appendSystem(ctx.setMessages, "[diff] not a git repository \u2014 nothing to show");
       return;
     }
@@ -31820,7 +32516,7 @@ async function handleUndo(ctx, warningMessage, doConfirm) {
   if (!doConfirm) return;
   try {
     const repoRoot = defaultProjectRoot();
-    if (!await isGitRepo(repoRoot)) {
+    if (!await isGitRepo2(repoRoot)) {
       appendSystem(ctx.setMessages, "[undo] not a git repository \u2014 nothing to revert");
       return;
     }
@@ -31836,6 +32532,57 @@ async function handleUndo(ctx, warningMessage, doConfirm) {
   }
 }
 
+// src/cli/slashHandlers/checkpoint.ts
+init_checkpointManager();
+function ago(ms) {
+  const s = Math.max(0, Math.round((Date.now() - ms) / 1e3));
+  if (s < 60) return `${s}s ago`;
+  if (s < 3600) return `${Math.round(s / 60)}m ago`;
+  return `${Math.round(s / 3600)}h ago`;
+}
+async function handleCheckpointCreate(ctx, label) {
+  const res = await createCheckpoint(ctx.cwd, label ?? "manual checkpoint");
+  if (res.ok) {
+    appendSystem(
+      ctx.setMessages,
+      `[checkpoint] \u2713 ${res.value.id} created${label ? ` (\u201C${label}\u201D)` : ""} \u2014 restore with \`/rollback ${res.value.id}\``
+    );
+  } else {
+    appendSystem(ctx.setMessages, `[checkpoint] \u2717 ${res.error}`);
+  }
+}
+async function handleRollbackList(ctx) {
+  const list = await listCheckpoints(ctx.cwd);
+  if (list.length === 0) {
+    appendSystem(
+      ctx.setMessages,
+      "[rollback] no checkpoints yet. Create one with `/checkpoint [label]` (Zelari missions create one automatically)."
+    );
+    return;
+  }
+  const lines = list.map(
+    (c, i) => `  ${i === 0 ? "\u2192" : " "} ${c.id}  ${ago(c.createdAt)}  ${c.label}`
+  );
+  appendSystem(
+    ctx.setMessages,
+    `[rollback] ${list.length} checkpoint${list.length === 1 ? "" : "s"} (newest first):
+${lines.join("\n")}
+Restore with \`/rollback <id>\` or \`/rollback latest\`.`
+  );
+}
+async function handleRollback(ctx, id) {
+  const res = await restoreCheckpoint(ctx.cwd, id);
+  if (res.ok) {
+    const removed = res.value.deleted.length > 0 ? ` (removed ${res.value.deleted.length} file${res.value.deleted.length === 1 ? "" : "s"} created after the checkpoint)` : "";
+    appendSystem(
+      ctx.setMessages,
+      `[rollback] \u2713 working tree restored to checkpoint ${res.value.id}${removed}.`
+    );
+  } else {
+    appendSystem(ctx.setMessages, `[rollback] \u2717 ${res.error}`);
+  }
+}
+
 // src/cli/compaction.ts
 function compactTranscript(messages, options = {}) {
   const threshold = options.threshold ?? 50;
@@ -31960,6 +32707,9 @@ ${output}`.toLowerCase();
   if (haystack.includes("eacces") || haystack.includes("eperm")) {
     return "\u{1F4A1} hint: permission denied. On macOS/Linux, avoid sudo with npm:\n         https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally\n   On Windows, re-run the terminal as Administrator.";
   }
+  if (haystack.includes("shim target not found") || haystack.includes("is not recognized") || exitCode === 127) {
+    return '\u{1F4A1} hint: `npm` could not be launched \u2014 its bin shim is broken.\n   "Shim target not found: npm.cmd" / exit 127 means a Node version\n   manager (Volta, nvm-windows, fnm) has a stale npm shim, so npm\n   itself won\'t run until you repair it:\n     \u2022 Volta:       volta install node   (reinstalls node + npm shims)\n     \u2022 nvm-windows: nvm use <version>     (re-links node + npm)\n     \u2022 fnm:         fnm use --install-if-missing\n   Then verify with `npm --version`, and re-run `/update --yes`.\n   (zelari-code retried automatically via the npm bundled with your\n   Node; if you still see this, that bundled npm was unavailable too.)';
+  }
   if (haystack.includes("enoent") && haystack.includes("npm")) {
     return '\u{1F4A1} hint: `npm` was not found on PATH for the spawned shell.\n   Re-open the terminal so it picks up your current PATH, or set:\n         export PATH="$(npm prefix -g)/bin:$PATH"   (POSIX)\n         $env:Path = "$(npm prefix -g);$env:Path"   (PowerShell)';
   }
@@ -31971,15 +32721,15 @@ ${output}`.toLowerCase();
 
 // src/cli/slashHandlers/promoteMember.ts
 import { promises as fs15 } from "node:fs";
-import path20 from "node:path";
+import path22 from "node:path";
 import os8 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 ?? path20.join(os8.homedir(), ".tmp", "zelari-code", "skills");
+    const skillDir = process.env.ANATHEMA_SKILL_DIR ?? path22.join(os8.homedir(), ".tmp", "zelari-code", "skills");
     await fs15.mkdir(skillDir, { recursive: true });
-    const filePath = path20.join(skillDir, `${skill.id}.md`);
+    const filePath = path22.join(skillDir, `${skill.id}.md`);
     await fs15.writeFile(filePath, markdown, "utf8");
     appendSystem(
       ctx.setMessages,
@@ -31996,29 +32746,29 @@ async function handlePromoteMember(ctx, memberId) {
 }
 
 // src/cli/branchManager.ts
-import { promises as fs16, existsSync as existsSync22, readFileSync as readFileSync21, writeFileSync as writeFileSync15, mkdirSync as mkdirSync10, statSync as statSync4, rmSync } from "node:fs";
-import path21 from "node:path";
+import { promises as fs16, existsSync as existsSync24, readFileSync as readFileSync21, writeFileSync as writeFileSync15, mkdirSync as mkdirSync10, statSync as statSync4, rmSync as rmSync2 } from "node:fs";
+import path23 from "node:path";
 import os9 from "node:os";
 var META_FILENAME = "meta.json";
 var SESSIONS_SUBDIR = "sessions";
 function getBranchesBaseDir() {
-  return process.env.ANATHEMA_BRANCHES_DIR ?? path21.join(os9.homedir(), ".tmp", "zelari-code", "branches");
+  return process.env.ANATHEMA_BRANCHES_DIR ?? path23.join(os9.homedir(), ".tmp", "zelari-code", "branches");
 }
 function getSessionsBaseDir() {
-  return process.env.ANATHEMA_SESSIONS_DIR ?? path21.join(os9.homedir(), ".tmp", "zelari-code", "sessions");
+  return process.env.ANATHEMA_SESSIONS_DIR ?? path23.join(os9.homedir(), ".tmp", "zelari-code", "sessions");
 }
 function branchPathFor(name, baseDir) {
-  return path21.join(baseDir, name);
+  return path23.join(baseDir, name);
 }
 function metaPathFor(name, baseDir) {
-  return path21.join(baseDir, name, META_FILENAME);
+  return path23.join(baseDir, name, META_FILENAME);
 }
 function sessionsPathFor(name, baseDir) {
-  return path21.join(baseDir, name, SESSIONS_SUBDIR);
+  return path23.join(baseDir, name, SESSIONS_SUBDIR);
 }
 function readBranchMeta(name, baseDir) {
   const metaPath = metaPathFor(name, baseDir);
-  if (!existsSync22(metaPath)) {
+  if (!existsSync24(metaPath)) {
     throw new BranchNotFoundError(`Branch "${name}" not found`);
   }
   try {
@@ -32039,7 +32789,7 @@ function readBranchMeta(name, baseDir) {
 }
 function writeBranchMeta(name, baseDir, meta3) {
   const metaPath = metaPathFor(name, baseDir);
-  mkdirSync10(path21.dirname(metaPath), { recursive: true });
+  mkdirSync10(path23.dirname(metaPath), { recursive: true });
   writeFileSync15(metaPath, JSON.stringify(meta3, null, 2), "utf-8");
 }
 async function countSessions(name, baseDir) {
@@ -32078,7 +32828,7 @@ var SessionNotFoundError = class extends Error {
 };
 function branchExists(name, baseDir = getBranchesBaseDir()) {
   const bp = branchPathFor(name, baseDir);
-  return existsSync22(bp) && existsSync22(metaPathFor(name, baseDir));
+  return existsSync24(bp) && existsSync24(metaPathFor(name, baseDir));
 }
 async function createBranch(name, fromSessionId, baseDir = getBranchesBaseDir(), sessionsBaseDir = getSessionsBaseDir()) {
   if (!name || name.trim().length === 0) {
@@ -32090,14 +32840,14 @@ async function createBranch(name, fromSessionId, baseDir = getBranchesBaseDir(),
   if (branchExists(name, baseDir)) {
     throw new BranchAlreadyExistsError(name);
   }
-  const sourcePath = path21.join(sessionsBaseDir, `${fromSessionId}.jsonl`);
-  if (!existsSync22(sourcePath)) {
+  const sourcePath = path23.join(sessionsBaseDir, `${fromSessionId}.jsonl`);
+  if (!existsSync24(sourcePath)) {
     throw new SessionNotFoundError(`Source session "${fromSessionId}" not found at ${sourcePath}`);
   }
   const branchPath = branchPathFor(name, baseDir);
   const branchSessionsPath = sessionsPathFor(name, baseDir);
   mkdirSync10(branchSessionsPath, { recursive: true });
-  const destPath = path21.join(branchSessionsPath, `${fromSessionId}.jsonl`);
+  const destPath = path23.join(branchSessionsPath, `${fromSessionId}.jsonl`);
   await fs16.copyFile(sourcePath, destPath);
   const meta3 = {
     name,
@@ -32124,7 +32874,7 @@ async function listBranches(baseDir = getBranchesBaseDir()) {
   const results = [];
   for (const entry of entries) {
     const metaPath = metaPathFor(entry, baseDir);
-    if (!existsSync22(metaPath)) continue;
+    if (!existsSync24(metaPath)) continue;
     try {
       const meta3 = readBranchMeta(entry, baseDir);
       const sessionCount = await countSessions(entry, baseDir);
@@ -32198,14 +32948,14 @@ async function handleBranchCheckout(ctx, branchName) {
 
 // src/cli/slashHandlers/workspace.ts
 import { promises as fs17 } from "node:fs";
-import path22 from "node:path";
+import path24 from "node:path";
 async function handleWorkspaceShow(ctx, what) {
   try {
-    const zelari = path22.join(process.cwd(), ".zelari");
+    const zelari = path24.join(process.cwd(), ".zelari");
     let content;
     switch (what) {
       case "plan": {
-        const planPath = path22.join(zelari, "plan.md");
+        const planPath = path24.join(zelari, "plan.md");
         try {
           content = await fs17.readFile(planPath, "utf-8");
         } catch {
@@ -32214,7 +32964,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "decisions": {
-        const decisionsDir = path22.join(zelari, "decisions");
+        const decisionsDir = path24.join(zelari, "decisions");
         try {
           const files = (await fs17.readdir(decisionsDir)).filter((f) => f.endsWith(".md")).sort();
           if (files.length === 0) {
@@ -32224,7 +32974,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 fs17.readFile(path22.join(decisionsDir, f), "utf-8");
+              const raw = await fs17.readFile(path24.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}`);
@@ -32237,7 +32987,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "risks": {
-        const risksPath = path22.join(zelari, "risks.md");
+        const risksPath = path24.join(zelari, "risks.md");
         try {
           content = await fs17.readFile(risksPath, "utf-8");
         } catch {
@@ -32246,7 +32996,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "agents": {
-        const agentsPath = path22.join(process.cwd(), "AGENTS.MD");
+        const agentsPath = path24.join(process.cwd(), "AGENTS.MD");
         try {
           content = await fs17.readFile(agentsPath, "utf-8");
         } catch {
@@ -32255,7 +33005,7 @@ async function handleWorkspaceShow(ctx, what) {
         break;
       }
       case "docs": {
-        const docsDir = path22.join(zelari, "docs");
+        const docsDir = path24.join(zelari, "docs");
         try {
           const files = (await fs17.readdir(docsDir)).filter((f) => f.endsWith(".md")).sort();
           content = files.length ? `# Docs (${files.length})
@@ -32297,7 +33047,7 @@ async function handleWorkspaceReset(ctx, force) {
     return;
   }
   try {
-    const target = path22.join(process.cwd(), ".zelari");
+    const target = path24.join(process.cwd(), ".zelari");
     await fs17.rm(target, { recursive: true, force: true });
     appendSystem(ctx.setMessages, "[workspace] .zelari/ removed");
   } catch (err) {
@@ -32656,11 +33406,11 @@ function handleModelsRefresh(ctx) {
 }
 
 // src/cli/slashHandlers/skills.ts
-import path23 from "node:path";
+import path25 from "node:path";
 import os10 from "node:os";
 
 // src/cli/skillHistory.ts
-import { promises as fs18, existsSync as existsSync23, statSync as statSync5, renameSync as renameSync4, appendFileSync as appendFileSync3, mkdirSync as mkdirSync11 } from "node:fs";
+import { promises as fs18, existsSync as existsSync25, statSync as statSync5, renameSync as renameSync4, appendFileSync as appendFileSync3, mkdirSync as mkdirSync11 } from "node:fs";
 var SKILL_HISTORY_ROTATE_BYTES = 10 * 1024 * 1024;
 async function readSkillHistory(file2) {
   let raw = "";
@@ -32758,7 +33508,7 @@ async function applySteerInterrupt(options) {
 
 // src/cli/slashHandlers/skills.ts
 async function handleSkillStats(ctx, skillId) {
-  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path23.join(os10.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
+  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path25.join(os10.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
   try {
     const records = await readSkillHistory(historyFile);
     const stats = getSkillStats(records, skillId);
@@ -32774,7 +33524,7 @@ async function handleSkillCompare(ctx, ids, fallbackMessage) {
     appendSystem(ctx.setMessages, fallbackMessage ?? "[skill-compare] missing args");
     return;
   }
-  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path23.join(os10.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
+  const historyFile = process.env.ANATHEMA_SKILL_HISTORY_FILE ?? path25.join(os10.homedir(), ".tmp", "zelari-code", "skill-history.jsonl");
   try {
     const formatted = await compareSkillsFromFile(ids[0], ids[1], historyFile);
     appendSystem(ctx.setMessages, formatted);
@@ -33075,6 +33825,21 @@ function useSlashDispatch(params) {
       setInput("");
       return;
     }
+    if (result.kind === "checkpoint_create") {
+      await handleCheckpointCreate({ ...baseCtx, cwd: process.cwd() }, result.checkpointLabel);
+      setInput("");
+      return;
+    }
+    if (result.kind === "rollback_list") {
+      await handleRollbackList({ ...baseCtx, cwd: process.cwd() });
+      setInput("");
+      return;
+    }
+    if (result.kind === "rollback") {
+      await handleRollback({ ...baseCtx, cwd: process.cwd() }, result.rollbackId);
+      setInput("");
+      return;
+    }
     if (result.kind === "promote_member" && result.promoteMemberId) {
       await handlePromoteMember(baseCtx, result.promoteMemberId);
       setInput("");
@@ -33254,7 +34019,7 @@ function App() {
   const [input, setInput] = useState8("");
   const [busy, setBusy] = useState8(false);
   const [providerConfig, setProviderConfig] = useState8(() => getProviderConfig());
-  const [sessionStats, setSessionStats] = useState8({ totalTokens: 0, totalCostUsd: 0 });
+  const [sessionStats, setSessionStats] = useState8({ totalTokens: 0, totalCostUsd: 0, cachedTokens: 0 });
   const [clearEpoch, setClearEpoch] = useState8(0);
   const [mode, setMode] = useState8("agent");
   const [picker, setPicker] = useState8(null);
@@ -33383,7 +34148,9 @@ cwd: ${cwd}
       mode,
       cwd,
       elapsedMs: timer.elapsedMs,
-      lastMs: timer.lastMs
+      lastMs: timer.lastMs,
+      costUsd: sessionStats.totalCostUsd,
+      cachedTokens: sessionStats.cachedTokens
     }
   )), showSidebar && /* @__PURE__ */ React9.createElement(Sidebar, { version: VERSION, changes: gitChanges, rows: size.rows })));
 }
@@ -33563,9 +34330,9 @@ function SplashGate({
 init_providerConfig();
 
 // src/cli/wizard/firstRun.ts
-import { existsSync as existsSync24 } from "node:fs";
+import { existsSync as existsSync26 } from "node:fs";
 function shouldRunWizard(input) {
-  const exists = input.exists ?? existsSync24;
+  const exists = input.exists ?? existsSync26;
   if (input.hasResetConfigFlag) {
     return { shouldRun: true, reason: "--reset-config flag forced wizard" };
   }
@@ -33920,6 +34687,7 @@ function emitEvent(event) {
 }
 
 // src/cli/runHeadless.ts
+init_harness();
 async function runHeadless(opts) {
   const { provider, model } = resolveHeadlessProvider(opts);
   const key = await resolveHeadlessKey(provider);
@@ -34054,7 +34822,7 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
 
 // src/cli/skillsMd.ts
 init_skills2();
-import { existsSync as existsSync25, readdirSync as readdirSync4, readFileSync as readFileSync22 } from "node:fs";
+import { existsSync as existsSync27, readdirSync as readdirSync4, readFileSync as readFileSync22 } from "node:fs";
 import { join as join23 } from "node:path";
 import { homedir as homedir5 } from "node:os";
 var CODING_CATEGORIES = /* @__PURE__ */ new Set([
@@ -34132,7 +34900,7 @@ function loadSkillMdSkills(projectRoot = process.cwd(), options = {}) {
   const summary = { loaded: [], skipped: [] };
   const seen = new Set(options.existingIds ?? []);
   for (const dir of skillMdSearchDirs(projectRoot)) {
-    if (!existsSync25(dir)) continue;
+    if (!existsSync27(dir)) continue;
     let entries;
     try {
       entries = readdirSync4(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
@@ -34141,7 +34909,7 @@ function loadSkillMdSkills(projectRoot = process.cwd(), options = {}) {
     }
     for (const entry of entries) {
       const skillPath = join23(dir, entry, "SKILL.md");
-      if (!existsSync25(skillPath)) continue;
+      if (!existsSync27(skillPath)) continue;
       try {
         const parsed = parseSkillMd(readFileSync22(skillPath, "utf8"), skillPath);
         if (!parsed) {