zelari-code 1.17.0 → 1.18.0

package/dist/cli/main.bundled.js

@@ -18415,6 +18415,7 @@ Earlier members' outputs are shared context. Build on them; do not re-derive or
 - Pass complete, valid arguments. Required parameters must be present.
 - Prefer tools over asking the user to paste file contents.
 - After durable changes, briefly name what you created or modified.
+- **Act, don't narrate**: if you will edit/fix files, call the tools in this turn. Do not restate the same diagnosis or "I will fix\u2026" plan on a loop without tool calls.
 - Text-only tool blocks (\`---TOOLS---\` JSON) are a legacy fallback \u2014 use them only if the runtime has no native tool channel.`
     };
     CODING_PRACTICES_MODULE = {
@@ -18429,7 +18430,8 @@ Earlier members' outputs are shared context. Build on them; do not re-derive or
 - **Don't invent**: no fake APIs, deps, or config keys \u2014 discover from the tree or package manifests.
 - **Verify**: after non-trivial edits, run the project's tests/typecheck/build when available; fix failures you introduced.
 - **Use project scripts**: prefer package.json / Makefile / existing tooling over ad-hoc commands.
-- **Finish**: list the paths you wrote/edited and how to verify. If you wrote nothing, say so honestly \u2014 do not invent a done report.`
+- **Finish**: list the paths you wrote/edited and how to verify. If you wrote nothing, say so honestly \u2014 do not invent a done report.
+- **No spam**: never repeat the same paragraph or status line. One diagnosis, then tools (or one short final answer).`
     };
     CLARIFICATION_PROTOCOL_MODULE = {
       type: "custom",
@@ -19124,6 +19126,159 @@ var init_events = __esm({
   }
 });
 
+// packages/core/dist/core/textLoopDetect.js
+function normalizeLoopUnit(s) {
+  return s.replace(/<\/?small>/gi, "").replace(/<\/?(?:p|div|span|b|i|em|strong|br)\b[^>]*>/gi, "").replace(/\s+/g, " ").trim();
+}
+function detectChunkSequenceLoop(chunks, kind) {
+  if (chunks.length < MIN_REPEATS)
+    return { looping: false };
+  const maxK = Math.min(12, Math.floor(chunks.length / MIN_REPEATS));
+  for (let k = 1; k <= maxK; k++) {
+    const unitParts = chunks.slice(chunks.length - k);
+    const unitKey = unitParts.join("\n");
+    if (normalizeLoopUnit(unitKey).length < MIN_UNIT)
+      continue;
+    let count = 1;
+    let pos = chunks.length - k;
+    while (pos - k >= 0) {
+      const prev2 = chunks.slice(pos - k, pos);
+      let same = true;
+      for (let i = 0; i < k; i++) {
+        if (prev2[i] !== unitParts[i]) {
+          same = false;
+          break;
+        }
+      }
+      if (!same)
+        break;
+      count++;
+      pos -= k;
+    }
+    if (count >= MIN_REPEATS) {
+      return {
+        looping: true,
+        unit: unitKey,
+        count,
+        kind
+      };
+    }
+  }
+  return { looping: false };
+}
+function detectSuffixPeriod(text) {
+  const compact = text.replace(/\s+/g, " ").trim();
+  if (compact.length < MIN_UNIT * MIN_REPEATS)
+    return { looping: false };
+  const tail = compact.slice(-Math.min(compact.length, MAX_TAIL));
+  const maxP = Math.min(MAX_PERIOD, Math.floor(tail.length / MIN_REPEATS));
+  for (let period = MIN_UNIT; period <= maxP; period++) {
+    const need = period * MIN_REPEATS;
+    if (tail.length < need)
+      continue;
+    const unit = tail.slice(tail.length - period);
+    if (normalizeLoopUnit(unit).length < MIN_UNIT * 0.55)
+      continue;
+    let ok = true;
+    for (let r = 1; r < MIN_REPEATS; r++) {
+      const start = tail.length - period * (r + 1);
+      if (tail.slice(start, start + period) !== unit) {
+        ok = false;
+        break;
+      }
+    }
+    if (!ok)
+      continue;
+    let count = MIN_REPEATS;
+    let end = tail.length - period * MIN_REPEATS;
+    while (end >= period && tail.slice(end - period, end) === unit) {
+      count++;
+      end -= period;
+    }
+    return {
+      looping: true,
+      unit,
+      count,
+      kind: "suffix"
+    };
+  }
+  return { looping: false };
+}
+function detectAssistantTextLoop(text) {
+  if (!text || text.length < MIN_UNIT * MIN_REPEATS) {
+    return { looping: false };
+  }
+  const nl = text.replace(/\r\n/g, "\n");
+  const paragraphs = nl.split(/\n\s*\n+/).map((p3) => normalizeLoopUnit(p3)).filter((p3) => p3.length > 0);
+  const paraHit = detectChunkSequenceLoop(paragraphs, "paragraph");
+  if (paraHit.looping)
+    return paraHit;
+  const lines = nl.split("\n").map((l) => normalizeLoopUnit(l)).filter((l) => l.length > 0);
+  const lineHit = detectChunkSequenceLoop(lines, "line");
+  if (lineHit.looping)
+    return lineHit;
+  return detectSuffixPeriod(nl);
+}
+function collapseLoopedAssistantText(text) {
+  const hit = detectAssistantTextLoop(text);
+  if (!hit.looping)
+    return text;
+  const note = `
+
+[system: stopped repeating the same text \xD7${hit.count}; call tools or finish.]`;
+  if (hit.kind === "paragraph" || hit.kind === "line") {
+    const joinSep = hit.kind === "paragraph" ? "\n\n" : "\n";
+    const unitParts = hit.unit.split("\n").map((p3) => normalizeLoopUnit(p3));
+    const k = unitParts.length;
+    if (k === 0)
+      return text + note;
+    const rawParts = text.replace(/\r\n/g, "\n").split(hit.kind === "paragraph" ? /\n\s*\n+/ : /\n/).filter((p3) => normalizeLoopUnit(p3).length > 0);
+    if (rawParts.length < k * MIN_REPEATS) {
+      return collapseByCharBudget(text, hit.unit, hit.count) + note;
+    }
+    let trailBlocks = 0;
+    let pos = rawParts.length;
+    while (pos >= k) {
+      let same = true;
+      for (let i = 0; i < k; i++) {
+        if (normalizeLoopUnit(rawParts[pos - k + i]) !== unitParts[i]) {
+          same = false;
+          break;
+        }
+      }
+      if (!same)
+        break;
+      trailBlocks++;
+      pos -= k;
+    }
+    if (trailBlocks < MIN_REPEATS) {
+      return collapseByCharBudget(text, hit.unit, hit.count) + note;
+    }
+    const keepBlocks = 2;
+    const keepParts = rawParts.slice(0, rawParts.length - k * (trailBlocks - keepBlocks));
+    return keepParts.join(joinSep).trimEnd() + note;
+  }
+  return collapseByCharBudget(text, hit.unit, hit.count) + note;
+}
+function collapseByCharBudget(text, unit, count) {
+  const unitLen = Math.max(unit.length, MIN_UNIT);
+  if (count < MIN_REPEATS)
+    return text;
+  const drop = unitLen * (count - 2);
+  const cut = Math.max(0, text.length - drop);
+  return text.slice(0, cut).trimEnd();
+}
+var MIN_UNIT, MIN_REPEATS, MAX_TAIL, MAX_PERIOD;
+var init_textLoopDetect = __esm({
+  "packages/core/dist/core/textLoopDetect.js"() {
+    "use strict";
+    MIN_UNIT = 48;
+    MIN_REPEATS = 3;
+    MAX_TAIL = 6e3;
+    MAX_PERIOD = 600;
+  }
+});
+
 // packages/core/dist/core/AgentHarness.js
 function hashToolCall(toolName, args) {
   const canonical = stableStringify(args);
@@ -19362,6 +19517,8 @@ var init_AgentHarness = __esm({
   "packages/core/dist/core/AgentHarness.js"() {
     "use strict";
     init_events();
+    init_textLoopDetect();
+    init_textLoopDetect();
     AgentHarness = class {
       config;
       eventBus;
@@ -19811,6 +19968,7 @@ ${shared2.content}`,
           const turnToolCalls = [];
           const turnToolResults = [];
           const pendingNativeTools = [];
+          let lastLoopCheckLen = 0;
           for await (const delta of stream) {
             if (this.cancelled) {
               const cancelEvent = createBrainEvent("error", this.sessionId, {
@@ -19827,6 +19985,29 @@ ${shared2.content}`,
               const deltaEvent = createBrainEvent("message_delta", this.sessionId, { messageId, delta: delta.delta, ...this.memberFields() });
               this.emit(deltaEvent);
               yield deltaEvent;
+              if (turnText.length >= 48 * 3 && turnText.length - lastLoopCheckLen >= 48) {
+                lastLoopCheckLen = turnText.length;
+                const loopHit = detectAssistantTextLoop(turnText);
+                if (loopHit.looping) {
+                  const loopErr = createBrainEvent("error", this.sessionId, {
+                    severity: "recoverable",
+                    message: `Assistant text loop detected (same block \xD7${loopHit.count}). Stopped generation \u2014 model was repeating instead of calling tools or finishing. Retry or ask it to apply changes with tools.`,
+                    code: "assistant_text_loop"
+                  });
+                  this.emit(loopErr);
+                  yield loopErr;
+                  finishRef.value = "stop";
+                  const sealed = collapseLoopedAssistantText(turnText);
+                  if (sealed.length > 0 || turnReasoning.length > 0) {
+                    this.config.messages.push({
+                      role: "assistant",
+                      content: sealed,
+                      ...turnReasoning.length > 0 ? { reasoningContent: turnReasoning } : {}
+                    });
+                  }
+                  break;
+                }
+              }
             } else if (delta.kind === "thinking") {
               turnReasoning += delta.delta;
               const thinkEvent = createBrainEvent("thinking_delta", this.sessionId, {
@@ -20247,7 +20428,10 @@ var harness_exports = {};
 __export(harness_exports, {
   AgentHarness: () => AgentHarness,
   SessionJsonlWriter: () => SessionJsonlWriter,
+  collapseLoopedAssistantText: () => collapseLoopedAssistantText,
+  detectAssistantTextLoop: () => detectAssistantTextLoop,
   hashToolCall: () => hashToolCall,
+  normalizeLoopUnit: () => normalizeLoopUnit,
   normalizeTextToolArgs: () => normalizeTextToolArgs,
   parseMinimaxStyleToolCalls: () => parseMinimaxStyleToolCalls,
   parseTextToolCalls: () => parseTextToolCalls,
@@ -22449,7 +22633,7 @@ async function runBrowserCheck(options, loader) {
   if (!pw) {
     return {
       ...base,
-      error: "browser automation unavailable \u2014 install Playwright (`npm i -D playwright && npx playwright install chromium`) to enable browser_check"
+      error: "browser automation unavailable \u2014 Playwright is not installed in this workspace. Install it with: `zelari-code --plugins-install playwright --cwd .` (or Desktop banner \u201CInstall\u201D, or CLI `/plugins install playwright`, or `npm i -D playwright && npx playwright install chromium`). Then re-run browser_check."
     };
   }
   const timeout = options.timeoutMs ?? 15e3;
@@ -28622,7 +28806,7 @@ function composeProjectContext(input) {
     default: 3e3,
     min: 200
   });
-  const wantDurable = input.includeDurableState ?? (input.mode === "council" || input.mode === "zelari");
+  const wantDurable = input.includeDurableState ?? (process.env.ZELARI_STATE !== "0" && (input.mode === "council" || input.mode === "zelari" || input.mode === "agent"));
   let durableRaw = input.durableState?.trim() ?? "";
   if (!durableRaw && wantDurable) {
     durableRaw = readDurableHeadSync(cwd);
@@ -28712,6 +28896,42 @@ var init_planDetect = __esm({
   }
 });
 
+// src/cli/state/loadDurableContext.ts
+var loadDurableContext_exports = {};
+__export(loadDurableContext_exports, {
+  clearDurableContextCache: () => clearDurableContextCache,
+  loadDurableContext: () => loadDurableContext
+});
+function clearDurableContextCache() {
+  cache = null;
+}
+async function loadDurableContext(projectRoot, opts) {
+  const env = opts?.env ?? process.env;
+  if (!isStateEnabled(env)) return "";
+  const cacheMs = opts?.cacheMs ?? DEFAULT_CACHE_MS;
+  const now = Date.now();
+  if (cache && cache.projectRoot === projectRoot && now - cache.at < cacheMs) {
+    return cache.text;
+  }
+  try {
+    const store = await getStateStore(projectRoot, env);
+    const text = await store.materializeContext(void 0, opts?.maxChars);
+    cache = { text: text || "", at: now, projectRoot };
+    return cache.text;
+  } catch {
+    return "";
+  }
+}
+var DEFAULT_CACHE_MS, cache;
+var init_loadDurableContext = __esm({
+  "src/cli/state/loadDurableContext.ts"() {
+    "use strict";
+    init_fileStateStore();
+    DEFAULT_CACHE_MS = 2e3;
+    cache = null;
+  }
+});
+
 // src/cli/workspace/storage.ts
 var storage_exports = {};
 __export(storage_exports, {
@@ -31539,8 +31759,8 @@ __export(commitHelpers_exports, {
 async function tryStateCommit(args) {
   try {
     const store = args.store ?? await getStateStore(args.projectRoot, args.env);
-    let workspaceCheckpointId;
-    if (args.withCheckpoint && (args.env ?? process.env).ZELARI_CHECKPOINT !== "0") {
+    let workspaceCheckpointId = args.workspaceCheckpointId;
+    if (!workspaceCheckpointId && args.withCheckpoint && (args.env ?? process.env).ZELARI_CHECKPOINT !== "0") {
       const cp = await createCheckpoint(
         args.projectRoot,
         `state ${args.layer ?? args.label}`.slice(0, 80)
@@ -31556,9 +31776,15 @@ async function tryStateCommit(args) {
       verification: args.verification,
       changedPaths: args.changedPaths,
       discoveries: args.discoveries,
+      stablePromptHash: args.stablePromptHash,
       force: args.force
     });
     if (!meta3.id) return { ok: false, error: "noop store", checkpointId: workspaceCheckpointId };
+    try {
+      const { clearDurableContextCache: clearDurableContextCache2 } = await Promise.resolve().then(() => (init_loadDurableContext(), loadDurableContext_exports));
+      clearDurableContextCache2();
+    } catch {
+    }
     return { ok: true, meta: meta3, checkpointId: workspaceCheckpointId };
   } catch (err) {
     return {
@@ -31840,14 +32066,7 @@ async function runZelariMission(userMessage, brief, deps) {
       limit: 8,
       metadataFilter: { projectRoot: deps.projectRoot }
     });
-    let durableBlock = "";
-    try {
-      durableBlock = await stateStore.materializeContext();
-    } catch {
-      durableBlock = "";
-    }
-    const memBlock = formatMemoryHits(hits);
-    const ragContext = [durableBlock, memBlock].filter(Boolean).join("\n\n");
+    const ragContext = formatMemoryHits(hits);
     const promptIter = runMode === "implementation" ? implStep : 1;
     const slicePrompt = buildSlicePrompt(brief, userMessage, runMode, promptIter);
     const implementerRetry = runMode === "implementation" && implStep > 1;
@@ -31919,7 +32138,9 @@ async function runZelariMission(userMessage, brief, deps) {
         sessionId: missionId,
         verification: { ok: hard, ran: result.ran },
         force: !hard,
-        withCheckpoint: hard,
+        // Prefer linking the mission-start checkpoint (no explosion).
+        workspaceCheckpointId: missionCheckpointId,
+        withCheckpoint: hard && !missionCheckpointId,
         discoveries: discoveriesFromOutcome({
           stepId: `${missionId}-${step}`,
           synthesis: result.synthesisText,
@@ -31930,7 +32151,7 @@ async function runZelariMission(userMessage, brief, deps) {
       if (commitRes.ok && commitRes.meta?.id) {
         if (hard) {
           state2.lastGoodCommitId = commitRes.meta.id;
-          if (commitRes.checkpointId) {
+          if (commitRes.checkpointId && !missionCheckpointId) {
             missionCheckpointId = commitRes.checkpointId;
           }
         }
@@ -36673,6 +36894,48 @@ function finalizeStreamingAssistant(setMessages) {
 // src/cli/hooks/useChatTurn.ts
 init_conversationContext();
 
+// src/cli/state/promptCacheStats.ts
+function emptyPromptCacheStats() {
+  return {
+    promptTokens: 0,
+    cachedTokens: 0,
+    premiumTokens: 0,
+    hitRate: 0,
+    estimatedCostUsd: 0,
+    stableBustCount: 0,
+    turns: 0
+  };
+}
+function accumulatePromptCacheStats(prev2, turn) {
+  const promptTokens = prev2.promptTokens + Math.max(0, turn.promptTokens);
+  const cachedTokens = prev2.cachedTokens + Math.max(0, turn.cachedTokens);
+  const premiumDelta = Math.max(0, turn.promptTokens - turn.cachedTokens);
+  const premiumTokens = prev2.premiumTokens + premiumDelta;
+  const hitRate = promptTokens > 0 ? cachedTokens / promptTokens : 0;
+  let stableBustCount = prev2.stableBustCount;
+  let lastStableHash = prev2.lastStableHash;
+  if (turn.stableHash) {
+    if (lastStableHash && lastStableHash !== turn.stableHash) {
+      stableBustCount += 1;
+    }
+    lastStableHash = turn.stableHash;
+  }
+  return {
+    promptTokens,
+    cachedTokens,
+    premiumTokens,
+    hitRate,
+    estimatedCostUsd: prev2.estimatedCostUsd + (turn.costUsd ?? 0),
+    lastStableHash,
+    stableBustCount,
+    turns: prev2.turns + 1
+  };
+}
+function formatCacheStatsLine(stats) {
+  const pct = stats.promptTokens > 0 ? Math.round(stats.hitRate * 100) : 0;
+  return `cache hit ${pct}% \xB7 premium ${stats.premiumTokens} \xB7 cached ${stats.cachedTokens} \xB7 stable busts ${stats.stableBustCount} \xB7 turns ${stats.turns}`;
+}
+
 // src/cli/hooks/chatStats.ts
 function computeSessionStatsDelta(realUsage, userText, assistantContent, model, prev2, opts) {
   const promptTokens = realUsage ? realUsage.promptTokens : Math.ceil(userText.length / 4);
@@ -36680,31 +36943,41 @@ function computeSessionStatsDelta(realUsage, userText, assistantContent, model,
   const cachedPromptTokens = realUsage?.cachedPromptTokens ?? 0;
   const turnCost = calculateCost(model, promptTokens, completionTokens, cachedPromptTokens);
   const contextTokens = realUsage ? realUsage.totalTokens || promptTokens + completionTokens : promptTokens + completionTokens;
-  const nextCached = (prev2.cachedTokens ?? 0) + cachedPromptTokens;
-  const nextPrompt = (prev2.promptTokens ?? 0) + promptTokens;
-  const premiumDelta = Math.max(0, promptTokens - cachedPromptTokens);
-  const nextPremium = (prev2.premiumTokens ?? 0) + premiumDelta;
-  const cacheHitRate = nextPrompt > 0 ? nextCached / nextPrompt : 0;
-  let stableBustCount = prev2.stableBustCount ?? 0;
-  let lastStableHash = prev2.lastStableHash;
-  if (opts?.stableHash) {
-    if (lastStableHash && lastStableHash !== opts.stableHash) {
-      stableBustCount += 1;
-    }
-    lastStableHash = opts.stableHash;
-  }
+  const prevCache = {
+    ...emptyPromptCacheStats(),
+    promptTokens: prev2.promptTokens ?? 0,
+    cachedTokens: prev2.cachedTokens ?? 0,
+    premiumTokens: prev2.premiumTokens ?? 0,
+    hitRate: prev2.cacheHitRate ?? 0,
+    estimatedCostUsd: prev2.totalCostUsd,
+    lastStableHash: prev2.lastStableHash,
+    stableBustCount: prev2.stableBustCount ?? 0,
+    turns: 0
+  };
+  const nextCache = accumulatePromptCacheStats(prevCache, {
+    promptTokens,
+    cachedTokens: cachedPromptTokens,
+    costUsd: turnCost,
+    stableHash: opts?.stableHash
+  });
   return {
     totalTokens: prev2.totalTokens + promptTokens + completionTokens,
     totalCostUsd: prev2.totalCostUsd + turnCost,
-    cachedTokens: nextCached,
+    cachedTokens: nextCache.cachedTokens,
     contextTokens,
-    premiumTokens: nextPremium,
-    cacheHitRate,
-    promptTokens: nextPrompt,
-    lastStableHash,
-    stableBustCount
+    premiumTokens: nextCache.premiumTokens,
+    cacheHitRate: nextCache.hitRate,
+    promptTokens: nextCache.promptTokens,
+    lastStableHash: nextCache.lastStableHash,
+    stableBustCount: nextCache.stableBustCount
   };
 }
+function resolvePromptCacheTtl(env = process.env) {
+  const raw = (env.ZELARI_PROMPT_CACHE_TTL ?? "auto").toLowerCase().trim();
+  if (raw === "1h" || raw === "1hour" || raw === "long") return "1h";
+  if (raw === "5m" || raw === "5min" || raw === "short") return "5m";
+  return "auto";
+}
 
 // src/cli/hooks/useChatTurn.ts
 init_envNumber();
@@ -36901,14 +37174,22 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il turno continua dopo
           const { composeProjectContext: composeProjectContext2 } = await Promise.resolve().then(() => (init_composeContext(), composeContext_exports));
           const { hasWorkspacePlan: hasWorkspacePlan2 } = await Promise.resolve().then(() => (init_planDetect(), planDetect_exports));
           hasPlan = hasWorkspacePlan2(cwd);
+          const { loadDurableContext: loadDurableContext2 } = await Promise.resolve().then(() => (init_loadDurableContext(), loadDurableContext_exports));
+          const durableState = await loadDurableContext2(cwd);
           const composed = composeProjectContext2({
             mode: "agent",
             cwd,
             userMessage: userText,
-            includeLessons: false
+            includeLessons: false,
+            durableState: durableState || void 0,
+            // Pre-loaded async — skip sync fallback double-read.
+            includeDurableState: false
           });
           composedWorkspace = composed.workspaceContext;
           composedInstructions = composed.projectInstructions;
+          if (composed.ragContext) {
+            composedWorkspace = [composedWorkspace, composed.ragContext].filter(Boolean).join("\n\n");
+          }
           for (const w of composed.warnings) {
             appendSystem(setMessages, w, Date.now());
           }
@@ -37514,6 +37795,35 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il membro riprende dop
   let sliceRan = false;
   let sliceDegraded = false;
   const PROVIDER_ERROR_ABORT_THRESHOLD = 2;
+  let councilCompose = { workspaceContext: formatHistoryForCouncil(4) || "" };
+  try {
+    const { loadDurableContext: loadDurableContext2 } = await Promise.resolve().then(() => (init_loadDurableContext(), loadDurableContext_exports));
+    const durableState = await loadDurableContext2(process.cwd());
+    const composed = composeProjectContext2({
+      mode: overrides.ragContext ? "zelari" : "council",
+      cwd: process.cwd(),
+      userMessage: effectiveText,
+      memoryHits: overrides.ragContext,
+      durableState: durableState || void 0,
+      historySnippet: formatHistoryForCouncil(4) || void 0,
+      includeLessons: true,
+      includeDurableState: false
+    });
+    for (const w of composed.warnings) {
+      appendSystem(setMessages, w, Date.now());
+    }
+    councilCompose = {
+      workspaceContext: composed.workspaceContext,
+      ...composed.ragContext ? { ragContext: composed.ragContext } : {}
+    };
+  } catch {
+    if (overrides.ragContext) {
+      councilCompose = {
+        workspaceContext: formatHistoryForCouncil(4) || "",
+        ragContext: overrides.ragContext
+      };
+    }
+  }
   try {
     for await (const event of dispatchCouncil2(effectiveText, {
       apiKey: envConfig.apiKey,
@@ -37523,33 +37833,8 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il membro riprende dop
       sessionId,
       tools: councilToolRegistry,
       feedbackStore: councilFeedbackStore,
-      // v1.16: unified compose — product truth + draft plan ops + design index
-      // (not full vault). Memory RAG only via overrides.ragContext.
-      // Fail-soft: never block a council run if compose throws in tests/odd cwd.
-      ...(() => {
-        try {
-          const composed = composeProjectContext2({
-            mode: overrides.ragContext ? "zelari" : "council",
-            cwd: process.cwd(),
-            userMessage: effectiveText,
-            memoryHits: overrides.ragContext,
-            historySnippet: formatHistoryForCouncil(4) || void 0,
-            includeLessons: true
-          });
-          for (const w of composed.warnings) {
-            appendSystem(setMessages, w, Date.now());
-          }
-          return {
-            workspaceContext: composed.workspaceContext,
-            ...composed.ragContext ? { ragContext: composed.ragContext } : {}
-          };
-        } catch {
-          return {
-            workspaceContext: formatHistoryForCouncil(4) || "",
-            ...overrides.ragContext ? { ragContext: overrides.ragContext } : {}
-          };
-        }
-      })(),
+      workspaceContext: councilCompose.workspaceContext,
+      ...councilCompose.ragContext ? { ragContext: councilCompose.ragContext } : {},
       maxToolCallsPerTurn: councilMaxToolCalls,
       maxToolLoopIterations: councilMaxToolLoop,
       ...councilMaxToolLoopHard > 0 ? { maxToolLoopHardCap: councilMaxToolLoopHard } : {},
@@ -38848,20 +39133,28 @@ async function handleStateStatus(ctx) {
   if (!head) {
     appendSystem(
       ctx.setMessages,
-      "[state] no durable commits yet. Run a verified Zelari slice or `/state commit [label]`."
+      "[state] no durable commits yet. Run a verified Zelari slice or `/state commit [label]`.\n  Kill switch: ZELARI_STATE=0 disables the store."
     );
     return;
   }
-  const recent = await store.list(5);
+  const discoveries = await store.loadDiscoveries(head.id);
+  const reusable = discoveries.filter((d) => d.reusable).length;
+  const recent = await store.list(8);
   const lines = recent.map((c, i) => {
-    const ver = c.verification.ran ? c.verification.ok ? "ok" : "fail" : "n/a";
-    return `  ${i === 0 ? "\u2192" : " "} ${c.id}  ${ago2(c.createdAt)}  ${c.label}  ver=${ver}` + (c.layer ? `  [${c.layer}]` : "");
+    const ver2 = c.verification.ran ? c.verification.ok ? "ok" : "fail" : "n/a";
+    return `  ${i === 0 ? "\u2192" : " "} ${c.id}  ${ago2(c.createdAt)}  ${c.label}  ver=${ver2}` + (c.layer ? `  [${c.layer}]` : "") + (c.stablePromptHash ? `  hash=${c.stablePromptHash.slice(0, 8)}` : "");
   });
+  const ver = head.verification;
   appendSystem(
     ctx.setMessages,
-    `[state] HEAD ${head.id} \xB7 ${head.discoveryCount} discoveries \xB7 mode ${head.mode}
-` + (head.workspaceCheckpointId ? `linked checkpoint: ${head.workspaceCheckpointId}
-` : "") + lines.join("\n")
+    `[state] HEAD ${head.id} \xB7 mode ${head.mode}` + (head.layer ? ` \xB7 layer ${head.layer}` : "") + `
+  discoveries: ${head.discoveryCount} total, ${reusable} reusable
+  verification: ran=${ver.ran} ok=${ver.ok}` + (ver.reportPath ? `  report=${ver.reportPath}` : "") + (head.parentId ? `
+  parent: ${head.parentId}` : "") + (head.workspaceCheckpointId ? `
+  workspaceCheckpoint: ${head.workspaceCheckpointId}` : "") + (head.stablePromptHash ? `
+  stablePromptHash: ${head.stablePromptHash}` : "") + `
+  created: ${ago2(head.createdAt)}
+` + lines.join("\n")
   );
 }
 async function handleStateCommit(ctx, label) {
@@ -38916,19 +39209,16 @@ async function handleStateRestore(ctx, id, opts) {
   appendSystem(ctx.setMessages, res.message);
 }
 
-// src/cli/state/promptCacheStats.ts
-function formatCacheStatsLine(stats) {
-  const pct = stats.promptTokens > 0 ? Math.round(stats.hitRate * 100) : 0;
-  return `cache hit ${pct}% \xB7 premium ${stats.premiumTokens} \xB7 cached ${stats.cachedTokens} \xB7 stable busts ${stats.stableBustCount} \xB7 turns ${stats.turns}`;
-}
-
 // src/cli/slashHandlers/cache.ts
 function handleCacheStats(ctx) {
+  const ttl = resolvePromptCacheTtl();
   const s = ctx.sessionStats;
   if (!s || !(s.promptTokens || s.cachedTokens || s.totalTokens)) {
     appendSystem(
       ctx.setMessages,
-      "[cache] no session usage yet. Complete a model turn to see hit rate.\n  Tip: stable prompt (identity+tools) should stay byte-stable; workspace/plan is volatile.\n  Env: ZELARI_PROMPT_CACHE_TTL=1h|5m|auto (Anthropic path when available)."
+      `[cache] no session usage yet. Complete a model turn to see hit rate.
+  Tip: stable prompt (identity+tools) should stay byte-stable; workspace/plan is volatile.
+  ZELARI_PROMPT_CACHE_TTL=${ttl} (OpenAI-compat: automatic prefix cache; TTL is a preference for future Anthropic markers).`
     );
     return;
   }
@@ -38938,15 +39228,18 @@ function handleCacheStats(ctx) {
     premiumTokens: s.premiumTokens ?? Math.max(0, (s.promptTokens ?? 0) - (s.cachedTokens ?? 0)),
     hitRate: s.cacheHitRate ?? 0,
     estimatedCostUsd: s.totalCostUsd ?? 0,
+    lastStableHash: s.lastStableHash,
     stableBustCount: s.stableBustCount ?? 0,
     turns: 0
   };
   const pct = stats.promptTokens > 0 ? Math.round(stats.hitRate * 100) : 0;
+  const hashShort = stats.lastStableHash ? stats.lastStableHash.slice(0, 8) : "\u2014";
   appendSystem(
     ctx.setMessages,
     `[cache] ${formatCacheStatsLine(stats)}
-  hit rate: ${pct}%  \xB7 cost ~$${stats.estimatedCostUsd.toFixed(4)}
-  (OpenAI-compat: automatic prefix cache; keep system stable prefix free of plan/memory churn.)`
+  hit rate: ${pct}%  \xB7 premium ${stats.premiumTokens}  \xB7 cached ${stats.cachedTokens}
+  cost ~$${stats.estimatedCostUsd.toFixed(4)}  \xB7 stable hash ${hashShort}  \xB7 busts ${stats.stableBustCount}
+  TTL pref: ${ttl} (OpenAI-compat path uses automatic prefix caching; keep stable prefix free of plan/memory churn.)`
   );
 }
 
@@ -39168,18 +39461,65 @@ import { spawn as spawn10 } from "node:child_process";
 async function installPlugin(spec, cwd, executor = spawn10) {
   const scopeFlag = spec.installScope === "global" ? "-g" : "-D";
   const args = ["install", scopeFlag, spec.npmPackage];
-  const primary = await runNpm2(executor, args, cwd, "shim");
-  if (primary.ok) return primary;
-  const npmCli = resolveBundledNpmCli();
-  if (npmCli && looksLikeBrokenShim(primary.exitCode, primary.output)) {
-    const fallback = await runNpm2(executor, args, cwd, "bundled", npmCli);
-    return {
-      ...fallback,
-      output: `[plugins] npm shim failed (${primary.error ?? "exit " + primary.exitCode}); retried via bundled npm (${npmCli}).
+  let result = await runNpm2(executor, args, cwd, "shim");
+  if (!result.ok) {
+    const npmCli = resolveBundledNpmCli();
+    if (npmCli && looksLikeBrokenShim(result.exitCode, result.output)) {
+      const fallback = await runNpm2(executor, args, cwd, "bundled", npmCli);
+      result = {
+        ...fallback,
+        output: `[plugins] npm shim failed (${result.error ?? "exit " + result.exitCode}); retried via bundled npm (${npmCli}).
 ${fallback.output}`
+      };
+    }
+  }
+  if (!result.ok) return result;
+  if (spec.id === "playwright") {
+    const browsers = await runPlaywrightInstallChromium(cwd, executor);
+    result = {
+      ...result,
+      ok: browsers.ok ? true : result.ok,
+      // Prefer package success even if browser download fails — surface both.
+      output: (result.output ? result.output + "\n" : "") + (browsers.output ? `[playwright browsers]
+${browsers.output}` : "") + (browsers.ok ? "" : `
+[playwright] Chromium install failed: ${browsers.error ?? "unknown"}. Run: npx playwright install chromium`),
+      error: browsers.ok ? result.error : result.error ?? `playwright package installed but Chromium download failed: ${browsers.error ?? "unknown"}`
     };
+    result = { ...result, ok: true };
   }
-  return primary;
+  return result;
+}
+function runPlaywrightInstallChromium(cwd, executor) {
+  return new Promise((resolve) => {
+    let stdout = "";
+    let stderr = "";
+    const stdio = ["ignore", "pipe", "pipe"];
+    const args = ["playwright", "install", "chromium"];
+    const child = process.platform === "win32" ? executor(buildCmdLine("npx", args), { stdio, shell: true, cwd }) : executor("npx", args, { stdio, cwd });
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", (err) => {
+      resolve({
+        ok: false,
+        output: stdout + stderr,
+        error: err.message,
+        exitCode: null
+      });
+    });
+    child.on("close", (code) => {
+      const ok = code === 0;
+      resolve({
+        ok,
+        output: stdout + stderr,
+        exitCode: code,
+        error: ok ? void 0 : `npx playwright install chromium exited ${code}`
+      });
+    });
+  });
 }
 function runNpm2(executor, args, cwd, mode, npmCliPath) {
   return new Promise((resolve) => {
@@ -40702,7 +41042,8 @@ function App() {
     premiumTokens: 0,
     cacheHitRate: 0,
     promptTokens: 0,
-    stableBustCount: 0
+    stableBustCount: 0,
+    lastStableHash: void 0
   });
   const [clearEpoch, setClearEpoch] = useState8(0);
   const [mode, setMode] = useState8("agent");
@@ -41816,11 +42157,16 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
       ].join("\n")
     };
     const { composeProjectContext: composeProjectContext2 } = await Promise.resolve().then(() => (init_composeContext(), composeContext_exports));
+    const { loadDurableContext: loadDurableContext2 } = await Promise.resolve().then(() => (init_loadDurableContext(), loadDurableContext_exports));
+    const cwd = process.cwd();
+    const durableState = await loadDurableContext2(cwd);
     const composed = composeProjectContext2({
       mode: "agent",
-      cwd: process.cwd(),
+      cwd,
       userMessage: opts.task,
-      includeLessons: false
+      includeLessons: false,
+      durableState: durableState || void 0,
+      includeDurableState: false
     });
     let sshBlock = "";
     try {
@@ -41829,6 +42175,7 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
     } catch {
     }
     const rolePrompt = [headlessRole.systemPrompt, sshBlock].filter(Boolean).join("\n\n");
+    const agentWorkspace = [composed.workspaceContext, composed.ragContext].filter(Boolean).join("\n\n");
     systemPrompt = buildSystemPrompt(
       { ...headlessRole, systemPrompt: rolePrompt },
       {
@@ -41836,7 +42183,7 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
         toolNames,
         mode: "agent",
         projectInstructions: composed.projectInstructions || void 0,
-        workspaceContext: composed.workspaceContext || void 0,
+        workspaceContext: agentWorkspace || void 0,
         // Plan lives in workspaceContext as draft ops — never as RAG.
         ragContext: void 0,
         aiConfig: {
@@ -42104,11 +42451,16 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
   let currentAssistantText = "";
   try {
     const { composeProjectContext: composeProjectContext2 } = await Promise.resolve().then(() => (init_composeContext(), composeContext_exports));
+    const { loadDurableContext: loadDurableContext2 } = await Promise.resolve().then(() => (init_loadDurableContext(), loadDurableContext_exports));
+    const cwd = process.cwd();
+    const durableState = await loadDurableContext2(cwd);
     const composed = composeProjectContext2({
       mode: "council",
-      cwd: process.cwd(),
+      cwd,
       userMessage: opts.task,
-      includeLessons: true
+      includeLessons: true,
+      durableState: durableState || void 0,
+      includeDurableState: false
     });
     for await (const event of dispatchCouncil2(effectiveTask, {
       apiKey: "REDACTED",
@@ -42249,13 +42601,17 @@ ${ragContext}` : slicePrompt;
         let membersCompleted = 0;
         const scrub = createStreamScrubber();
         const { composeProjectContext: composeProjectContext2 } = await Promise.resolve().then(() => (init_composeContext(), composeContext_exports));
+        const { loadDurableContext: loadDurableContext2 } = await Promise.resolve().then(() => (init_loadDurableContext(), loadDurableContext_exports));
         const memOnly = ragContext?.trim() ? ragContext : void 0;
+        const durableState = await loadDurableContext2(projectRoot);
         const composed = composeProjectContext2({
           mode: "zelari",
           cwd: projectRoot,
           userMessage: slicePrompt,
           memoryHits: memOnly,
-          includeLessons: true
+          durableState: durableState || void 0,
+          includeLessons: true,
+          includeDurableState: false
         });
         for await (const event of dispatchCouncil2(fullPrompt, {
           apiKey: "REDACTED",
@@ -42625,6 +42981,98 @@ async function runDiscoverModels(providerArg) {
   }
 }
 
+// src/cli/plugins/cliFlags.ts
+init_registry2();
+function getArg(argv, flag) {
+  const i = argv.indexOf(flag);
+  if (i < 0) return void 0;
+  return argv[i + 1];
+}
+function resolveCwd(argv) {
+  return getArg(argv, "--cwd") ?? process.cwd();
+}
+function wantsPluginsStatus(argv) {
+  return argv.includes("--plugins-status");
+}
+function wantsPluginsInstall(argv) {
+  return argv.includes("--plugins-install");
+}
+async function runPluginsStatus(argv) {
+  const cwd = resolveCwd(argv);
+  const plugins = [];
+  for (const spec of PLUGINS) {
+    let present = false;
+    try {
+      present = await spec.detect(cwd);
+    } catch {
+      present = false;
+    }
+    plugins.push({
+      id: spec.id,
+      label: spec.label,
+      present,
+      description: spec.description,
+      postInstallHint: spec.postInstallHint ?? null,
+      npmPackage: spec.npmPackage,
+      installScope: spec.installScope
+    });
+  }
+  process.stdout.write(JSON.stringify({ cwd, plugins }, null, 2) + "\n");
+  return 0;
+}
+async function runPluginsInstall(argv) {
+  const cwd = resolveCwd(argv);
+  const id = getArg(argv, "--plugins-install");
+  if (!id) {
+    process.stderr.write(
+      "[plugins] usage: zelari-code --plugins-install <id> [--cwd <path>]\n"
+    );
+    process.stdout.write(
+      JSON.stringify({
+        ok: false,
+        id: "",
+        message: "missing plugin id"
+      }) + "\n"
+    );
+    return 1;
+  }
+  const spec = findPlugin(id);
+  if (!spec) {
+    const msg = `unknown plugin id: ${id}. Available: ${PLUGINS.map((p3) => p3.id).join(", ")}`;
+    process.stderr.write(`[plugins] ${msg}
+`);
+    process.stdout.write(
+      JSON.stringify({ ok: false, id, message: msg }) + "\n"
+    );
+    return 1;
+  }
+  process.stderr.write(
+    `[plugins] installing ${spec.label} into ${cwd}\u2026
+`
+  );
+  const result = await installPlugin(spec, cwd);
+  const payload = {
+    ok: result.ok,
+    id: spec.id,
+    message: result.ok ? `Installed ${spec.label}` : result.error ?? `Install failed for ${spec.label}`,
+    output: result.output?.slice(-4e3),
+    postInstallHint: spec.postInstallHint ?? null
+  };
+  process.stdout.write(JSON.stringify(payload, null, 2) + "\n");
+  if (!result.ok) {
+    process.stderr.write(`[plugins] \u2717 ${payload.message}
+`);
+    return 1;
+  }
+  process.stderr.write(`[plugins] \u2713 ${payload.message}
+`);
+  if (spec.postInstallHint) {
+    process.stderr.write(`[plugins] \u2192 ${spec.postInstallHint}
+`);
+  }
+  return 0;
+}
+
 // src/cli/skillsMd.ts
 init_skills2();
 import { existsSync as existsSync36, readdirSync as readdirSync5, readFileSync as readFileSync30 } from "node:fs";
@@ -42809,6 +43257,14 @@ function pickRootComponent() {
     console.log(`zelari-code v${VERSION}`);
     process.exit(0);
   }
+  if (wantsPluginsStatus(argv)) {
+    void runPluginsStatus(argv).then((code) => process.exit(code));
+    return { kind: "done" };
+  }
+  if (wantsPluginsInstall(argv)) {
+    void runPluginsInstall(argv).then((code) => process.exit(code));
+    return { kind: "done" };
+  }
   if (argv.includes("--doctor") || argv.includes("doctor")) {
     const { runDoctor: runDoctor2 } = (init_doctor(), __toCommonJS(doctor_exports));
     void runDoctor2().then((healthy) => process.exit(healthy ? 0 : 1));
@@ -42838,7 +43294,7 @@ function pickRootComponent() {
   }
   if (argv.includes("--help") || argv.includes("-h")) {
     console.log(
-      "zelari-code \u2014 AI Council coding agent CLI.\n\nUsage: zelari-code [options]\n\nOptions:\n  --version, -v       Print version and exit\n  --help, -h          Print this help and exit\n  --doctor            Diagnose install health (shim, bundle, PATH, deps,\n                      node/git/bash in the agent shell)\n  --fix-path          Add the npm global prefix to the user PATH\n                      (Windows only; fixes 'command not found' after install)\n  --skip-checks       Skip the boot-time prerequisite check\n                      (alias for ZELARI_SKIP_PREFLIGHT=1)\n  --no-wizard         Skip the first-run wizard\n  --reset-config      Re-run the wizard (clears provider.json on commit)\n  --headless          Run a single task without mounting the TUI\n    --task <text>       Task prompt (required in headless mode)\n    --output json|plain Output format (default: json)\n    --mode agent|council|zelari  Dispatch mode (default: agent)\n    --council          Alias for --mode council\n    --phase plan|build  Work phase (default: build)\n    --provider <id>    Provider override (default: active)\n    --model <id>       Model override (default: provider default)\n  --print-config      Print provider/model config as JSON (no secrets)\n  --set-config        Persist provider/model/endpoint\n    --provider <id>    Set active provider\n    --model <id>       Set model for that provider\n    --endpoint <url>   Custom OpenAI-compatible base URL\n    --endpoint-clear   Remove custom endpoint override\n  --set-key           Store an API key (never printed back)\n    --provider <id>    Provider id (required)\n    --key <secret>     API key (required)\n  --discover-models   Refresh model list for a provider\n    --provider <id>    Provider (default: active)\n  --print-mcp         Print MCP server config (user + project)\n    --cwd <path>      Project root for .zelari/mcp.json\n  --set-mcp           Add/update an MCP server entry\n    --name <id>       Server name (required)\n    --command <bin>   Executable (required)\n    --args <json>     JSON array of args (optional)\n    --scope user|project  Default: user\n    --enabled true|false  Default: true\n    --cwd <path>      Required when scope=project\n  --set-mcp-preset    Install a named MCP preset (e.g. cua)\n    --preset cua      Cua Driver desktop computer-use (MCP)\n    --scope user|project  Default: user\n    --cwd <path>      Required when scope=project\n  --remove-mcp        Remove an MCP server entry\n    --name <id> --scope user|project [--cwd <path>]\n  --print-ssh-targets Print SSH deploy/monitor targets\n  --set-ssh-target    Upsert target (--json '{...}' or flags)\n  --remove-ssh-target --id <id>\n  --test-ssh-target   --id <id>  (BatchMode ssh true)\n  --print-ssh-pubkey  --path <private-or-.pub>  (display public key)\n\nEnvironment:\n  ZELARI_NO_WIZARD=1    Skip the first-run wizard\n  ZELARI_SKIP_PREFLIGHT=1  Skip the boot prerequisite check\n  ZELARI_NO_PLUGIN_PROMPT=1  Skip the boot plugin-install prompt\n  ANATHEMA_DEV=1        Disable background update check + preflight\n"
+      "zelari-code \u2014 AI Council coding agent CLI.\n\nUsage: zelari-code [options]\n\nOptions:\n  --version, -v       Print version and exit\n  --help, -h          Print this help and exit\n  --doctor            Diagnose install health (shim, bundle, PATH, deps,\n                      node/git/bash in the agent shell)\n  --fix-path          Add the npm global prefix to the user PATH\n                      (Windows only; fixes 'command not found' after install)\n  --skip-checks       Skip the boot-time prerequisite check\n                      (alias for ZELARI_SKIP_PREFLIGHT=1)\n  --no-wizard         Skip the first-run wizard\n  --reset-config      Re-run the wizard (clears provider.json on commit)\n  --headless          Run a single task without mounting the TUI\n    --task <text>       Task prompt (required in headless mode)\n    --output json|plain Output format (default: json)\n    --mode agent|council|zelari  Dispatch mode (default: agent)\n    --council          Alias for --mode council\n    --phase plan|build  Work phase (default: build)\n    --provider <id>    Provider override (default: active)\n    --model <id>       Model override (default: provider default)\n  --print-config      Print provider/model config as JSON (no secrets)\n  --plugins-status    JSON status of optional plugins (Playwright, eslint, \u2026)\n  --plugins-install <id>  Install plugin (playwright also fetches Chromium)\n    --cwd <path>       Workspace for -D installs (default: process.cwd())\n  --set-config        Persist provider/model/endpoint\n    --provider <id>    Set active provider\n    --model <id>       Set model for that provider\n    --endpoint <url>   Custom OpenAI-compatible base URL\n    --endpoint-clear   Remove custom endpoint override\n  --set-key           Store an API key (never printed back)\n    --provider <id>    Provider id (required)\n    --key <secret>     API key (required)\n  --discover-models   Refresh model list for a provider\n    --provider <id>    Provider (default: active)\n  --print-mcp         Print MCP server config (user + project)\n    --cwd <path>      Project root for .zelari/mcp.json\n  --set-mcp           Add/update an MCP server entry\n    --name <id>       Server name (required)\n    --command <bin>   Executable (required)\n    --args <json>     JSON array of args (optional)\n    --scope user|project  Default: user\n    --enabled true|false  Default: true\n    --cwd <path>      Required when scope=project\n  --set-mcp-preset    Install a named MCP preset (e.g. cua)\n    --preset cua      Cua Driver desktop computer-use (MCP)\n    --scope user|project  Default: user\n    --cwd <path>      Required when scope=project\n  --remove-mcp        Remove an MCP server entry\n    --name <id> --scope user|project [--cwd <path>]\n  --print-ssh-targets Print SSH deploy/monitor targets\n  --set-ssh-target    Upsert target (--json '{...}' or flags)\n  --remove-ssh-target --id <id>\n  --test-ssh-target   --id <id>  (BatchMode ssh true)\n  --print-ssh-pubkey  --path <private-or-.pub>  (display public key)\n\nEnvironment:\n  ZELARI_NO_WIZARD=1    Skip the first-run wizard\n  ZELARI_SKIP_PREFLIGHT=1  Skip the boot prerequisite check\n  ZELARI_NO_PLUGIN_PROMPT=1  Skip the boot plugin-install prompt\n  ANATHEMA_DEV=1        Disable background update check + preflight\n"
     );
     process.exit(0);
   }