zelari-code 2.4.0 → 2.5.0

package/dist/cli/main.bundled.js

@@ -28340,6 +28340,292 @@ var init_types8 = __esm({
   }
 });
 
+// packages/core/dist/session/compactionState.js
+function asPositiveInt(value) {
+  return typeof value === "number" && Number.isInteger(value) && value > 0 ? value : void 0;
+}
+function recordOf(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function recordsOf(value) {
+  return Array.isArray(value) ? value.map(recordOf).filter((v) => v !== void 0) : [];
+}
+function stringsOf(value) {
+  return Array.isArray(value) ? value.filter((v) => typeof v === "string") : [];
+}
+function addBounded(target, value, maxLength = 260) {
+  const normalized = value.trim().replace(/\\/g, "/");
+  if (normalized && normalized.length <= maxLength)
+    target.add(normalized);
+}
+function collectPaths(value, target, depth = 0) {
+  if (depth > 4 || value === null || value === void 0)
+    return;
+  if (Array.isArray(value)) {
+    for (const item of value)
+      collectPaths(item, target, depth + 1);
+    return;
+  }
+  const record2 = recordOf(value);
+  if (record2) {
+    for (const [key, item] of Object.entries(record2)) {
+      if (typeof item === "string" && ["path", "file", "filepath", "filePath", "file_path", "target", "cwd"].includes(key)) {
+        addBounded(target, item);
+      } else {
+        collectPaths(item, target, depth + 1);
+      }
+    }
+    return;
+  }
+  if (typeof value !== "string")
+    return;
+  const pathLike = /(?:^|[\s"'])((?:[\w.@-]+[\\/])+[\w.@-]+\.[A-Za-z0-9]{1,10})/g;
+  let match;
+  while ((match = pathLike.exec(value)) !== null && target.size < 64) {
+    addBounded(target, match[1]);
+  }
+}
+function evidenceFromResults(results) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const result of results) {
+    for (const raw of recordsOf(result.evidence)) {
+      const seq = asPositiveInt(raw.seq);
+      const tier = typeof raw.tier === "string" ? raw.tier : void 0;
+      const ref = typeof raw.ref === "string" ? raw.ref : void 0;
+      const digest = typeof raw.digest === "string" ? raw.digest : void 0;
+      const capturedAt = typeof raw.capturedAt === "number" && Number.isInteger(raw.capturedAt) ? raw.capturedAt : void 0;
+      if (seq === void 0 && tier === void 0 && ref === void 0 && digest === void 0)
+        continue;
+      const key = [seq ?? "", tier ?? "", ref ?? "", digest ?? ""].join("|");
+      if (seen.has(key))
+        continue;
+      seen.add(key);
+      out.push({
+        ...seq !== void 0 ? { seq } : {},
+        ...tier !== void 0 ? { tier } : {},
+        ...ref !== void 0 ? { ref } : {},
+        ...digest !== void 0 ? { digest } : {},
+        ...capturedAt !== void 0 ? { capturedAt } : {}
+      });
+    }
+  }
+  return out;
+}
+function buildCompactionStateSnapshot(events, toSeq) {
+  const scoped = events.filter((event) => event.seq <= toSeq);
+  const latestVerification = [...scoped].reverse().find((event) => event.kind === "verification.run");
+  const verificationData = latestVerification?.data ?? {};
+  const native = recordOf(verificationData.native);
+  const results = recordsOf(native?.results ?? verificationData.results);
+  const criteriaRaw = recordsOf(native?.criteria ?? verificationData.criteria);
+  const statusById = new Map(results.filter((result) => typeof result.criterionId === "string").map((result) => [String(result.criterionId), String(result.status ?? "unknown")]));
+  const evidenceState = recordOf(verificationData.evidence);
+  const satisfied = stringsOf(evidenceState?.satisfied);
+  const unsatisfiedRaw = recordsOf(evidenceState?.unsatisfied);
+  const activeCriteria = criteriaRaw.filter((criterion) => typeof criterion.id === "string").map((criterion) => ({
+    id: String(criterion.id),
+    required: criterion.required !== false,
+    ...statusById.has(String(criterion.id)) ? { status: statusById.get(String(criterion.id)) } : {}
+  }));
+  if (activeCriteria.length === 0) {
+    const ids = /* @__PURE__ */ new Set([
+      ...results.map((result) => String(result.criterionId ?? "")).filter(Boolean),
+      ...satisfied,
+      ...unsatisfiedRaw.map((issue2) => String(issue2.id ?? "")).filter(Boolean)
+    ]);
+    for (const id of ids) {
+      activeCriteria.push({
+        id,
+        required: true,
+        status: statusById.get(id) ?? (satisfied.includes(id) ? "pass" : "unknown")
+      });
+    }
+  }
+  const unresolvedIssues = unsatisfiedRaw.length > 0 ? unsatisfiedRaw.filter((issue2) => typeof issue2.id === "string").map((issue2) => ({
+    id: String(issue2.id),
+    status: String(issue2.status ?? "unknown"),
+    ...typeof issue2.reason === "string" ? { reason: issue2.reason } : {}
+  })) : results.filter((result) => String(result.status ?? "unknown") !== "pass").map((result) => ({
+    id: String(result.criterionId ?? "unknown"),
+    status: String(result.status ?? "unknown"),
+    ...typeof result.detail === "string" ? { reason: result.detail } : {}
+  }));
+  const affectedFiles = /* @__PURE__ */ new Set();
+  for (const event of scoped.slice(-500)) {
+    if (event.kind === "tool.call" || event.kind === "tool.result" || event.kind === "verification.evidence") {
+      collectPaths(event.data, affectedFiles);
+    }
+  }
+  const userConstraints = /* @__PURE__ */ new Set();
+  for (const event of scoped) {
+    if (event.kind !== "user.message")
+      continue;
+    for (const constraint of stringsOf(event.data.constraints ?? event.data.userConstraints)) {
+      addBounded(userConstraints, constraint, 320);
+    }
+    const messageText = typeof event.data.text === "string" ? event.data.text : "";
+    for (const line of messageText.split(/\r?\n/)) {
+      if (CONSTRAINT_RE.test(line))
+        addBounded(userConstraints, line, 320);
+      if (userConstraints.size >= 12)
+        break;
+    }
+  }
+  const lastMissionPhase = [...scoped].reverse().find((event) => event.kind === "mission.phase");
+  const lastMissionAdvice = [...scoped].reverse().find((event) => event.kind === "mission.progress");
+  const missionState = lastMissionPhase || lastMissionAdvice ? {
+    ...typeof lastMissionPhase?.data.phase === "string" ? { phase: lastMissionPhase.data.phase } : {},
+    ...typeof lastMissionAdvice?.data.recommendation === "string" ? { recommendation: lastMissionAdvice.data.recommendation } : {},
+    ...stringsOf(lastMissionAdvice?.data.blockers).length > 0 ? { blockers: stringsOf(lastMissionAdvice?.data.blockers) } : {}
+  } : void 0;
+  return {
+    version: 1,
+    activeCriteria,
+    unresolvedIssues,
+    ...latestVerification ? {
+      latestVerification: {
+        seq: latestVerification.seq,
+        ...typeof verificationData.verdict === "string" ? { verdict: verificationData.verdict } : {},
+        ...typeof verificationData.summary === "string" ? { summary: verificationData.summary } : {}
+      }
+    } : {},
+    retainedEvidenceRefs: evidenceFromResults(results),
+    affectedFiles: [...affectedFiles].slice(0, 64),
+    userConstraints: [...userConstraints].slice(-12),
+    ...missionState ? { missionState } : {}
+  };
+}
+function formatCompactionStateSnapshot(snapshot) {
+  const lines = ['<compaction-state version="1">'];
+  if (snapshot.activeCriteria.length > 0) {
+    lines.push("activeCriteria: " + JSON.stringify(snapshot.activeCriteria));
+  }
+  if (snapshot.unresolvedIssues.length > 0) {
+    lines.push("unresolvedIssues: " + JSON.stringify(snapshot.unresolvedIssues));
+  }
+  if (snapshot.latestVerification) {
+    lines.push("latestVerification: " + JSON.stringify(snapshot.latestVerification));
+  }
+  if (snapshot.affectedFiles.length > 0) {
+    lines.push("affectedFiles: " + JSON.stringify(snapshot.affectedFiles));
+  }
+  if (snapshot.userConstraints.length > 0) {
+    lines.push("userConstraints: " + JSON.stringify(snapshot.userConstraints));
+  }
+  if (snapshot.missionState) {
+    lines.push("missionState: " + JSON.stringify(snapshot.missionState));
+  }
+  lines.push("</compaction-state>");
+  return lines.join("\n");
+}
+var CONSTRAINT_RE;
+var init_compactionState = __esm({
+  "packages/core/dist/session/compactionState.js"() {
+    "use strict";
+    CONSTRAINT_RE = /\b(must|never|required|only|do not|don't|constraint|vincolo|deve|devono|non\s+deve|senza)\b/i;
+  }
+});
+
+// packages/core/dist/session/compaction.js
+function asPositiveInt2(value) {
+  return typeof value === "number" && Number.isInteger(value) && value > 0 ? value : void 0;
+}
+function checkpointContent(data) {
+  const cp = data.checkpoint;
+  if (cp && typeof cp === "object") {
+    const content = cp.content;
+    if (typeof content === "string")
+      return content;
+  }
+  if (typeof data.summary === "string")
+    return data.summary;
+  return "[session compacted]";
+}
+function checkpointRole(data) {
+  const cp = data.checkpoint;
+  if (cp && typeof cp === "object") {
+    const role = cp.role;
+    if (role === "user" || role === "system")
+      return role;
+  }
+  return "system";
+}
+function strategyOf(data) {
+  return data.strategy === "extractive" || data.strategy === "llm" ? data.strategy : void 0;
+}
+function parseCompactedEvent(event) {
+  if (event.kind !== "session.compacted")
+    return null;
+  const fromSeq = asPositiveInt2(event.data.fromSeq);
+  const toSeq = asPositiveInt2(event.data.toSeq);
+  if (fromSeq === void 0 || toSeq === void 0 || fromSeq > toSeq)
+    return null;
+  if (event.seq <= toSeq)
+    return null;
+  const sourceRaw = event.data.sourceEventSeqs;
+  const sourceEventSeqs = Array.isArray(sourceRaw) ? sourceRaw.filter((n) => typeof n === "number" && Number.isInteger(n) && n > 0) : void 0;
+  return {
+    seq: event.seq,
+    fromSeq,
+    toSeq,
+    role: checkpointRole(event.data),
+    content: checkpointContent(event.data),
+    ...strategyOf(event.data) ? { strategy: strategyOf(event.data) } : {},
+    ...sourceEventSeqs && sourceEventSeqs.length > 0 ? { sourceEventSeqs } : {}
+  };
+}
+function coveringCompactions(events) {
+  const effective = events.map(parseCompactedEvent).filter((c) => c !== null).map((c) => ({
+    ...c,
+    ...c.sourceEventSeqs ? { sourceEventSeqs: [...c.sourceEventSeqs] } : {}
+  })).sort((a, b) => a.seq - b.seq);
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (let i = 0; i < effective.length; i++) {
+      const earlier = effective[i];
+      let target;
+      for (let j = i + 1; j < effective.length; j++) {
+        const later = effective[j];
+        if (earlier.seq >= later.fromSeq && earlier.seq <= later.toSeq) {
+          target = later;
+        }
+      }
+      if (!target)
+        continue;
+      target.fromSeq = Math.min(target.fromSeq, earlier.fromSeq);
+      target.toSeq = Math.max(target.toSeq, earlier.toSeq);
+      if (earlier.sourceEventSeqs?.length) {
+        target.sourceEventSeqs = [
+          .../* @__PURE__ */ new Set([...target.sourceEventSeqs ?? [], ...earlier.sourceEventSeqs])
+        ];
+      }
+      effective.splice(i, 1);
+      changed = true;
+      break;
+    }
+  }
+  return effective;
+}
+function shadowedSeqSet(coverings) {
+  const set2 = /* @__PURE__ */ new Set();
+  for (const c of coverings) {
+    for (let s = c.fromSeq; s <= c.toSeq; s++)
+      set2.add(s);
+  }
+  return set2;
+}
+function isSeqShadowed(seq, coverings) {
+  return coverings.some((c) => seq >= c.fromSeq && seq <= c.toSeq);
+}
+var init_compaction = __esm({
+  "packages/core/dist/session/compaction.js"() {
+    "use strict";
+    init_compactionState();
+  }
+});
+
 // packages/core/dist/session/modelSurface.js
 function isModelSurfaceEvent(event) {
   return MODEL_SURFACE_KINDS.has(event.kind);
@@ -28348,8 +28634,33 @@ function asString(value) {
   return typeof value === "string" ? value : void 0;
 }
 function deriveMessages(events, options = {}) {
+  const coverings = coveringCompactions(events);
+  const orderedCoverings = [...coverings].sort((a, b) => a.fromSeq - b.fromSeq || a.seq - b.seq);
+  const compactBySeq = new Map(coverings.map((c) => [c.seq, c]));
   const messages = [];
+  let nextCheckpoint = 0;
+  const pushCheckpoint = (compact) => {
+    messages.push({
+      role: compact.role,
+      content: compact.content,
+      seq: compact.seq,
+      compactedFromSeq: compact.fromSeq,
+      compactedToSeq: compact.toSeq,
+      ...compact.sourceEventSeqs ? { sourceEventSeqs: compact.sourceEventSeqs } : {}
+    });
+  };
+  const pushDueCheckpoints = (seq) => {
+    while (nextCheckpoint < orderedCoverings.length && orderedCoverings[nextCheckpoint].fromSeq <= seq) {
+      pushCheckpoint(orderedCoverings[nextCheckpoint]);
+      nextCheckpoint += 1;
+    }
+  };
   for (const e of events) {
+    pushDueCheckpoints(e.seq);
+    if (compactBySeq.has(e.seq))
+      continue;
+    if (isSeqShadowed(e.seq, coverings))
+      continue;
     if (!isModelSurfaceEvent(e))
       continue;
     const d = e.data;
@@ -28394,6 +28705,7 @@ function deriveMessages(events, options = {}) {
         break;
     }
   }
+  pushDueCheckpoints(Number.POSITIVE_INFINITY);
   return messages;
 }
 function pairToolCalls(events) {
@@ -28421,6 +28733,7 @@ var MODEL_SURFACE_KINDS;
 var init_modelSurface = __esm({
   "packages/core/dist/session/modelSurface.js"() {
     "use strict";
+    init_compaction();
     MODEL_SURFACE_KINDS = /* @__PURE__ */ new Set([
       "user.message",
       "assistant.message",
@@ -28438,6 +28751,14 @@ function derivedToAgentMessages(messages) {
     const agent = { role: m.role, content: m.content };
     if (m.toolCallId !== void 0)
       agent.toolCallId = m.toolCallId;
+    if (m.seq !== void 0)
+      agent.seq = m.seq;
+    if (m.compactedFromSeq !== void 0)
+      agent.compactedFromSeq = m.compactedFromSeq;
+    if (m.compactedToSeq !== void 0)
+      agent.compactedToSeq = m.compactedToSeq;
+    if (m.sourceEventSeqs !== void 0)
+      agent.sourceEventSeqs = [...m.sourceEventSeqs];
     out.push(agent);
   }
   return out;
@@ -29081,8 +29402,97 @@ function validateSessionTrace(events, mode = "minimal") {
       message: `session.ended seq ${firstEnded.seq} precedes verification.run seq ${firstVerification.seq}`
     });
   }
+  pushCompactionViolations(events, knownSeq, pairs, violations);
   return violations;
 }
+function pushCompactionViolations(events, knownSeq, pairs, violations) {
+  for (const e of events) {
+    if (e.kind !== "session.compacted")
+      continue;
+    const fromSeq = asSeq(e.data.fromSeq);
+    const toSeq = asSeq(e.data.toSeq);
+    if (fromSeq === void 0 && toSeq === void 0)
+      continue;
+    if (fromSeq === void 0 || toSeq === void 0 || fromSeq > toSeq) {
+      violations.push({
+        code: "COMPACTION_RANGE_INVALID",
+        seq: e.seq,
+        message: `session.compacted seq ${e.seq} has invalid fromSeq/toSeq`
+      });
+      continue;
+    }
+    if (e.seq <= toSeq) {
+      violations.push({
+        code: "COMPACTION_EVENT_INSIDE_RANGE",
+        seq: e.seq,
+        message: `session.compacted seq ${e.seq} must be > toSeq ${toSeq}`
+      });
+    }
+    if (!knownSeq.has(fromSeq) || !knownSeq.has(toSeq)) {
+      violations.push({
+        code: "COMPACTION_BOUNDARY_SEQ_MISSING",
+        seq: e.seq,
+        message: `session.compacted seq ${e.seq} range endpoints must exist in the trace`
+      });
+    }
+    const checkpoint = e.data.checkpoint;
+    if (!checkpoint || typeof checkpoint !== "object" || !["user", "system"].includes(String(checkpoint.role ?? "")) || typeof checkpoint.content !== "string") {
+      violations.push({
+        code: "COMPACTION_CHECKPOINT_INVALID",
+        seq: e.seq,
+        message: `session.compacted seq ${e.seq} must carry a user/system checkpoint with string content`
+      });
+    }
+    const sourceRaw = e.data.sourceEventSeqs;
+    if (Array.isArray(sourceRaw)) {
+      for (const raw of sourceRaw) {
+        const s = asSeq(raw);
+        if (s === void 0) {
+          violations.push({
+            code: "COMPACTION_SOURCE_SEQ_INVALID",
+            seq: e.seq,
+            message: "sourceEventSeqs entries must be positive integers"
+          });
+        } else if (!knownSeq.has(s)) {
+          violations.push({
+            code: "COMPACTION_SOURCE_SEQ_MISSING",
+            seq: e.seq,
+            message: `sourceEventSeqs ${s} is not an event in this trace`
+          });
+        } else if (s < fromSeq || s > toSeq) {
+          violations.push({
+            code: "COMPACTION_SOURCE_SEQ_OUTSIDE_RANGE",
+            seq: e.seq,
+            message: `sourceEventSeqs ${s} is outside ${fromSeq}..${toSeq}`
+          });
+        }
+      }
+    }
+    for (const pair of pairs) {
+      const callSeq = pair.call.seq;
+      const callInside = callSeq >= fromSeq && callSeq <= toSeq;
+      if (!pair.result) {
+        if (callInside) {
+          violations.push({
+            code: "COMPACTION_ACTIVE_TOOL_CALL",
+            seq: e.seq,
+            message: `tool.call seq ${callSeq} is compacted before a result or interruption`
+          });
+        }
+        continue;
+      }
+      const resultSeq = pair.result.seq;
+      const resultInside = resultSeq >= fromSeq && resultSeq <= toSeq;
+      if (callInside !== resultInside) {
+        violations.push({
+          code: "COMPACTION_TOOL_PAIR_SPLIT",
+          seq: e.seq,
+          message: `tool pair ${callSeq}/${resultSeq} is split by range ${fromSeq}..${toSeq}`
+        });
+      }
+    }
+  }
+}
 var init_invariants = __esm({
   "packages/core/dist/session/invariants.js"() {
     "use strict";
@@ -29096,6 +29506,7 @@ var init_session = __esm({
     "use strict";
     init_types8();
     init_modelSurface();
+    init_compaction();
     init_agentAdapter();
     init_writer();
     init_replay();
@@ -30764,6 +31175,7 @@ __export(dist_exports, {
   applyRetryIfMissing: () => applyRetryIfMissing,
   auditDegradedBanner: () => auditDegradedBanner,
   auditSynthesisTiers: () => auditSynthesisTiers,
+  buildCompactionStateSnapshot: () => buildCompactionStateSnapshot,
   buildCouncilCompletion: () => buildCouncilCompletion,
   buildCustomParameters: () => buildCustomParameters,
   buildDeliveryFixPrompt: () => buildDeliveryFixPrompt,
@@ -30802,6 +31214,7 @@ __export(dist_exports, {
   councilTierFromSize: () => councilTierFromSize,
   countByStatus: () => countByStatus,
   countEmittedWriteTools: () => countEmittedWriteTools,
+  coveringCompactions: () => coveringCompactions,
   createBrainEvent: () => createBrainEvent,
   createDefaultSystemPromptConfig: () => createDefaultSystemPromptConfig,
   createExecutionContext: () => createExecutionContext,
@@ -30834,6 +31247,7 @@ __export(dist_exports, {
   findSkillsByIds: () => findSkillsByIds,
   findSkillsByTag: () => findSkillsByTag,
   forkSession: () => forkSession,
+  formatCompactionStateSnapshot: () => formatCompactionStateSnapshot,
   formatLessonsForContext: () => formatLessonsForContext,
   getAgent: () => getAgent,
   getAllTools: () => getAllTools,
@@ -30881,6 +31295,7 @@ __export(dist_exports, {
   isGeneratedPath: () => isGeneratedPath,
   isModelSurfaceEvent: () => isModelSurfaceEvent,
   isReviewerKind: () => isReviewerKind,
+  isSeqShadowed: () => isSeqShadowed,
   isSettled: () => isSettled,
   isStatusTheaterUnit: () => isStatusTheaterUnit,
   isValidTool: () => isValidTool,
@@ -30903,6 +31318,7 @@ __export(dist_exports, {
   normalizeToolName: () => normalizeToolName,
   pairToolCalls: () => pairToolCalls,
   parseClarificationRequest: () => parseClarificationRequest,
+  parseCompactedEvent: () => parseCompactedEvent,
   parseEvidenceTier: () => parseEvidenceTier,
   parseMinimaxStyleToolCalls: () => parseMinimaxStyleToolCalls,
   parseNameOnlyDiff: () => parseNameOnlyDiff,
@@ -30959,6 +31375,7 @@ __export(dist_exports, {
   selectParallelWave: () => selectParallelWave,
   setWorkspaceStubs: () => setWorkspaceStubs,
   sha256Hex: () => sha256Hex,
+  shadowedSeqSet: () => shadowedSeqSet,
   shouldRetryMember: () => shouldRetryMember,
   sideEffectForTool: () => sideEffectForTool,
   slugify: () => slugify2,
@@ -31302,12 +31719,46 @@ function mapBrainEventToSpine(ev) {
           durationMs: ev.durationMs
         }
       };
-    case "session_compacted":
-      return {
-        kind: "session.compacted",
-        actor: ACTOR_SYSTEM,
-        data: { summary: ev.summary ?? "" }
-      };
+    case "session_compacted": {
+      const compact = ev;
+      const data = { summary: compact.summary ?? "" };
+      if (typeof compact.messagesRemoved === "number") data.messagesRemoved = compact.messagesRemoved;
+      if (typeof compact.fromSeq === "number" && typeof compact.toSeq === "number") {
+        data.fromSeq = compact.fromSeq;
+        data.toSeq = compact.toSeq;
+      }
+      if (compact.checkpoint && typeof compact.checkpoint === "object") data.checkpoint = compact.checkpoint;
+      if (compact.strategy === "extractive" || compact.strategy === "llm") data.strategy = compact.strategy;
+      if (Array.isArray(compact.sourceEventSeqs)) data.sourceEventSeqs = compact.sourceEventSeqs;
+      if (Array.isArray(compact.retainedCriterionIds)) {
+        data.retainedCriterionIds = compact.retainedCriterionIds;
+      }
+      if (Array.isArray(compact.retainedEvidenceRefs)) {
+        data.retainedEvidenceRefs = compact.retainedEvidenceRefs;
+      }
+      if (compact.retainedState && typeof compact.retainedState === "object") {
+        data.retainedState = compact.retainedState;
+      }
+      if (compact.stateSnapshot && typeof compact.stateSnapshot === "object") data.stateSnapshot = compact.stateSnapshot;
+      if (typeof compact.sourceRequestFingerprint === "string") {
+        data.sourceRequestFingerprint = compact.sourceRequestFingerprint;
+      }
+      if (typeof compact.headerFingerprint === "string") data.headerFingerprint = compact.headerFingerprint;
+      if (typeof compact.sourceEstimatedTokens === "number") {
+        data.sourceEstimatedTokens = compact.sourceEstimatedTokens;
+      }
+      if (typeof compact.cacheReuseExpected === "boolean") data.cacheReuseExpected = compact.cacheReuseExpected;
+      if (typeof compact.inputTokens === "number") data.inputTokens = compact.inputTokens;
+      if (typeof compact.outputTokens === "number") data.outputTokens = compact.outputTokens;
+      if (typeof compact.savedTokens === "number") data.savedTokens = compact.savedTokens;
+      if (typeof compact.recompactionRate === "number") data.recompactionRate = compact.recompactionRate;
+      if (compact.summaryStrategy === "extractive" || compact.summaryStrategy === "llm") {
+        data.summaryStrategy = compact.summaryStrategy;
+      }
+      if (typeof compact.provider === "string") data.provider = compact.provider;
+      if (typeof compact.model === "string") data.model = compact.model;
+      return { kind: "session.compacted", actor: ACTOR_SYSTEM, data };
+    }
     case "agent_start":
       return {
         kind: "note",
@@ -31421,6 +31872,16 @@ var init_sessionSpine = __esm({
         if (!report || report.events.length === 0) return null;
         return deriveMessages(report.events);
       }
+      /** Deterministic operational state retained beside a compact checkpoint. */
+      async compactionStateSnapshot(toSeq) {
+        if (this.status !== "active" && this.status !== "closed") return null;
+        await this.flush();
+        const report = await readSessionLog(
+          path21.join(this.sessionsDir, this.sessionId, "events.jsonl")
+        ).catch(() => null);
+        if (!report || report.events.length === 0) return null;
+        return buildCompactionStateSnapshot(report.events, toSeq);
+      }
       /**
        * E2.1 (ADR-0023 × ADR-0021): last recognizable strict verification record
        * in this session's log — the completion verdict is reconstructible from
@@ -31567,6 +32028,7 @@ var init_sessionSpine = __esm({
       }
       async flush() {
         await this.inner.flush?.();
+        await this.spine?.flush();
       }
       async close() {
         await this.inner.close();
@@ -31867,6 +32329,21 @@ async function readMetrics(file2) {
   }
   return out;
 }
+function recordCompactionMetrics(sessionId2, provider, model, metrics) {
+  getMetricsLogger().record({
+    kind: "compaction",
+    sessionId: sessionId2,
+    provider,
+    model,
+    compactionCount: metrics.count,
+    compactionInputTokens: metrics.inputTokens,
+    compactionOutputTokens: metrics.outputTokens,
+    compactionSavedTokens: metrics.savedTokens,
+    compactionRecompactionRate: metrics.recompactionRate,
+    compactionSummaryStrategy: metrics.summaryStrategy,
+    compactionRestoreFailures: metrics.restoreFailures
+  });
+}
 function getMetricsLogger() {
   if (!_singleton) {
     _singleton = new MetricsLogger();
@@ -40354,717 +40831,171 @@ var init_toolRegistry = __esm({
   }
 });
 
-// src/cli/phase.ts
-var phase_exports = {};
-__export(phase_exports, {
-  PHASES: () => PHASES,
-  PLAN_ALLOWED_WRITE_TOOLS: () => PLAN_ALLOWED_WRITE_TOOLS,
-  PLAN_BLOCKED_TOOLS: () => PLAN_BLOCKED_TOOLS,
-  describePhase: () => describePhase,
-  nextPhase: () => nextPhase,
-  parsePhase: () => parsePhase
-});
-function parsePhase(input) {
-  const v = input.trim().toLowerCase();
-  return PHASES.includes(v) ? v : null;
+// src/cli/state/fileStateStore.ts
+import { createHash as createHash11, randomUUID as randomUUID2 } from "node:crypto";
+import { promises as fs21 } from "node:fs";
+import * as path41 from "node:path";
+function shortId() {
+  return randomUUID2().replace(/-/g, "").slice(0, 12);
 }
-function nextPhase(current) {
-  return current === "plan" ? "build" : "plan";
+async function writeJsonAtomic(filePath, data) {
+  await fs21.mkdir(path41.dirname(filePath), { recursive: true });
+  const tmp = `${filePath}.${process.pid}.${Date.now()}.tmp`;
+  await fs21.writeFile(tmp, JSON.stringify(data, null, 2) + "\n", "utf8");
+  await fs21.rename(tmp, filePath);
 }
-function describePhase(phase2) {
-  switch (phase2) {
-    case "plan":
-      return "plan \u2014 explore & design only (no project writes; plan files allowed)";
-    default:
-      return "build \u2014 implement with full tools";
+async function readJsonFile(filePath) {
+  try {
+    const raw = await fs21.readFile(filePath, "utf8");
+    return JSON.parse(raw);
+  } catch {
+    return null;
   }
 }
-var PHASES, PLAN_ALLOWED_WRITE_TOOLS, PLAN_BLOCKED_TOOLS;
-var init_phase = __esm({
-  "src/cli/phase.ts"() {
-    "use strict";
-    PHASES = ["plan", "build"];
-    PLAN_ALLOWED_WRITE_TOOLS = /* @__PURE__ */ new Set([
-      // Workspace plan/docs — intentional plan-mode outputs
-      "createPlan",
-      "createTask",
-      "updateTask",
-      "createMilestone",
-      "createDocument",
-      "createDecision",
-      "linkDocuments"
-      // Soft writes that only touch .zelari / plan paths are still gated in
-      // toolRegistry by path when needed; write_file/edit_file stay DENIED.
-    ]);
-    PLAN_BLOCKED_TOOLS = /* @__PURE__ */ new Set([
-      "write_file",
-      "edit_file",
-      "apply_diff",
-      "bash"
-    ]);
-  }
-});
-
-// src/cli/mode.ts
-function nextMode(current) {
-  const i = MODES.indexOf(current);
-  return MODES[(i + 1) % MODES.length] ?? "kraken";
+function defaultSummary(input, discoveries) {
+  if (input.summary?.trim()) return input.summary.trim();
+  const lines = [
+    `# ${input.label}`,
+    "",
+    `- mode: ${input.mode}`,
+    input.layer ? `- layer: ${input.layer}` : null,
+    `- verification: ran=${input.verification.ran} ok=${input.verification.ok}`,
+    "",
+    "## Discoveries",
+    ...discoveries.map((d) => `- [${d.kind}] ${d.summary}`)
+  ].filter((x) => x !== null);
+  return lines.join("\n");
 }
-function parseMode(input) {
-  const v = input.trim().toLowerCase();
-  if (MODES.includes(v)) return v;
-  return MODE_ALIASES[v] ?? null;
+function stripStored(s) {
+  const { artifactDir: _a3, ...meta3 } = s;
+  return meta3;
 }
-function describeMode(mode) {
-  switch (mode) {
-    case "council":
-      return "council \u2014 multi-member plan/design (Caronte\u2026Lucifero; build needs ZELARI_COUNCIL_CAN_BUILD=1)";
-    case "zelari":
-      return "zelari \u2014 mission: plan@council \u2192 build@kraken (legacy: ZELARI_BUILD_VIA_AGENT=0)";
-    default:
-      return "kraken \u2014 super-agent lead (spawns explore/general/verify tentacles; default implementer)";
-  }
+function isStateEnabled(env = process.env) {
+  return env.ZELARI_STATE !== "0";
 }
-var MODES, MODE_ALIASES;
-var init_mode = __esm({
-  "src/cli/mode.ts"() {
-    "use strict";
-    MODES = ["kraken", "council", "zelari"];
-    MODE_ALIASES = {
-      agent: "kraken",
-      single: "kraken"
-    };
-  }
-});
-
-// src/cli/headless.ts
-import { readFileSync as readFileSync22 } from "node:fs";
-function defaultProfileForMode(mode) {
-  switch (mode) {
-    case "council":
-      return "council/v1";
-    case "zelari":
-      return "mission/v1";
-    default:
-      return "kraken/v1";
+async function getStateStore(projectRoot, env = process.env) {
+  if (!isStateEnabled(env)) return new NoopDurableStateStore();
+  const store6 = new FileDurableStateStore();
+  try {
+    await store6.init(projectRoot);
+    return store6;
+  } catch {
+    return new NoopDurableStateStore();
   }
 }
-function parseHeadlessFlags(argv) {
-  if (!argv.includes("--headless")) {
-    return { options: null };
-  }
-  let task;
-  let output = "json";
-  let mode = "kraken";
-  let phase2 = "build";
-  let modeExplicit = false;
-  let councilFlag = false;
-  let provider;
-  let model;
-  let history2;
-  let todos2;
-  let once = false;
-  let profile;
-  let resumeSessionId;
-  let exportSessionPath;
-  let strictDone = false;
-  let krakenGraph;
-  let planOnly = process.env.ZELARI_KRAKEN_PLAN_ONLY === "1" || process.env.ZELARI_KRAKEN_PLAN_ONLY === "true";
-  let runPlan = process.env.ZELARI_KRAKEN_RUN_PLAN;
-  let gauntlet = process.env.ZELARI_GAUNTLET === "1" || process.env.ZELARI_GAUNTLET === "true";
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i];
-    if (arg === "--headless") continue;
-    if (arg === "--output") {
-      const next = argv[i + 1];
-      if (next === "json" || next === "plain") {
-        output = next;
-        i++;
-      } else {
-        return {
-          options: null,
-          error: `--output requires 'json' or 'plain', got '${next ?? "(missing)"}'`
-        };
+function hashStablePrompt(stable) {
+  return createHash11("sha256").update(stable, "utf8").digest("hex").slice(0, 16);
+}
+var DEFAULT_MATERIALIZE_CHARS, FileDurableStateStore, NoopDurableStateStore;
+var init_fileStateStore = __esm({
+  "src/cli/state/fileStateStore.ts"() {
+    "use strict";
+    DEFAULT_MATERIALIZE_CHARS = 4e3;
+    FileDurableStateStore = class {
+      root = "";
+      stateDir = "";
+      commitsDir = "";
+      artifactsDir = "";
+      headPath = "";
+      indexPath = "";
+      async init(projectRoot) {
+        this.root = projectRoot;
+        this.stateDir = path41.join(projectRoot, ".zelari", "state");
+        this.commitsDir = path41.join(this.stateDir, "commits");
+        this.artifactsDir = path41.join(this.stateDir, "artifacts");
+        this.headPath = path41.join(this.stateDir, "HEAD.json");
+        this.indexPath = path41.join(this.stateDir, "index.jsonl");
+        await fs21.mkdir(this.commitsDir, { recursive: true });
+        await fs21.mkdir(this.artifactsDir, { recursive: true });
       }
-    } else if (arg === "--task") {
-      task = argv[i + 1];
-      i++;
-    } else if (arg === "--task-file") {
-      const next = argv[i + 1];
-      if (next) {
-        try {
-          const fromFile = readFileSync22(next, "utf-8");
-          if (fromFile.trim()) task = fromFile;
-        } catch {
+      async commit(input) {
+        if (!input.force && input.verification.ran && !input.verification.ok) {
+          throw new Error(
+            "DurableStateStore.commit refused: verification ran and failed (pass force:true for soft commit)"
+          );
         }
-      }
-      i++;
-    } else if (arg === "--council") {
-      councilFlag = true;
-    } else if (arg === "--mode") {
-      const next = argv[i + 1];
-      const parsed = next ? parseMode(next) : null;
-      if (!parsed) {
-        return {
-          options: null,
-          error: `--mode requires 'kraken', 'council', or 'zelari' (agent=alias), got '${next ?? "(missing)"}'`
+        const discoveries = input.discoveries ?? [];
+        const parent = await this.head();
+        const id = shortId();
+        const artifactRel = path41.join("artifacts", id);
+        const artifactAbs = path41.join(this.artifactsDir, id);
+        await fs21.mkdir(artifactAbs, { recursive: true });
+        const summary = defaultSummary(input, discoveries);
+        await fs21.writeFile(path41.join(artifactAbs, "summary.md"), summary + "\n", "utf8");
+        await writeJsonAtomic(path41.join(artifactAbs, "discoveries.json"), discoveries);
+        await writeJsonAtomic(path41.join(artifactAbs, "verification.json"), input.verification);
+        const meta3 = {
+          id,
+          parentId: parent?.id ?? null,
+          createdAt: Date.now(),
+          sessionId: input.sessionId,
+          mode: input.mode,
+          layer: input.layer,
+          label: input.label,
+          workspaceCheckpointId: input.workspaceCheckpointId,
+          verification: {
+            ...input.verification,
+            reportPath: input.verification.reportPath ?? path41.join(".zelari", "state", artifactRel, "verification.json").replace(/\\/g, "/")
+          },
+          changedPaths: input.changedPaths ?? [],
+          stablePromptHash: input.stablePromptHash,
+          discoveryCount: discoveries.length,
+          artifactDir: artifactRel.replace(/\\/g, "/")
         };
+        await writeJsonAtomic(path41.join(this.commitsDir, `${id}.json`), meta3);
+        await writeJsonAtomic(this.headPath, { id, updatedAt: meta3.createdAt });
+        await fs21.appendFile(this.indexPath, JSON.stringify({ id, createdAt: meta3.createdAt, label: meta3.label }) + "\n", "utf8");
+        return stripStored(meta3);
       }
-      mode = parsed;
-      modeExplicit = true;
-      i++;
-    } else if (arg === "--phase") {
-      const next = argv[i + 1];
-      const parsed = next ? parsePhase(next) : null;
-      if (!parsed) {
-        return {
-          options: null,
-          error: `--phase requires 'plan' or 'build', got '${next ?? "(missing)"}'`
-        };
+      async head() {
+        const head = await readJsonFile(this.headPath);
+        if (!head?.id) return null;
+        return this.get(head.id);
       }
-      phase2 = parsed;
-      i++;
-    } else if (arg === "--provider") {
-      provider = argv[i + 1];
-      i++;
-    } else if (arg === "--model") {
-      model = argv[i + 1];
-      i++;
-    } else if (arg === "--history" || arg === "--history-file") {
-      const next = argv[i + 1];
-      if (next) {
-        let raw = null;
-        if (arg === "--history-file") {
-          try {
-            raw = readFileSync22(next, "utf-8");
-          } catch {
-            raw = null;
-          }
-        } else {
-          raw = next;
+      async get(id) {
+        const stored = await readJsonFile(path41.join(this.commitsDir, `${id}.json`));
+        return stored ? stripStored(stored) : null;
+      }
+      async list(limit = 20) {
+        let raw;
+        try {
+          raw = await fs21.readFile(this.indexPath, "utf8");
+        } catch {
+          return [];
         }
-        if (raw) {
+        const ids = [];
+        for (const line of raw.split("\n")) {
+          const t = line.trim();
+          if (!t) continue;
           try {
-            const parsedHist = JSON.parse(raw);
-            if (Array.isArray(parsedHist)) {
-              history2 = parsedHist.filter(
-                (m) => !!m && typeof m === "object" && typeof m.role === "string"
-              ).map((m) => {
-                const role = String(m.role);
-                const raw2 = m.content;
-                const content = typeof raw2 === "string" ? raw2 : raw2 == null ? "" : typeof raw2 === "object" ? JSON.stringify(raw2) : String(raw2);
-                const msg = {
-                  role,
-                  content
-                };
-                if (typeof m.toolCallId === "string") {
-                  msg.toolCallId = m.toolCallId;
-                }
-                return msg;
-              }).filter(
-                (m) => m.role === "user" || m.role === "assistant" || m.role === "tool" || m.role === "system"
-              );
-            }
+            const row = JSON.parse(t);
+            if (row.id) ids.push(row.id);
           } catch {
           }
         }
-        i++;
+        const slice = ids.slice(-Math.max(1, limit)).reverse();
+        const out = [];
+        for (const id of slice) {
+          const m = await this.get(id);
+          if (m) out.push(m);
+        }
+        return out;
       }
-    } else if (arg === "--todos") {
-      const next = argv[i + 1];
-      if (next) {
-        try {
-          const parsed = JSON.parse(next);
-          if (Array.isArray(parsed)) {
-            todos2 = parsed.filter(
-              (t) => !!t && typeof t === "object" && typeof t.content === "string"
-            ).map((t) => ({
-              id: typeof t.id === "string" ? t.id : void 0,
-              content: String(t.content).slice(0, 500),
-              status: t.status
-            }));
-          }
-        } catch {
+      async setHead(id) {
+        const meta3 = await this.get(id);
+        if (!meta3) {
+          throw new Error(`DurableStateStore.setHead: unknown commit ${id}`);
         }
-        i++;
+        await writeJsonAtomic(this.headPath, { id, updatedAt: Date.now() });
+        return meta3;
       }
-    } else if (arg === "--once") {
-      once = true;
-    } else if (arg === "--profile") {
-      const next = argv[i + 1];
-      if (!next || next.startsWith("--")) {
-        return { options: null, error: `--profile requires a profile id (e.g. kraken/v1), got '${next ?? "(missing)"}'` };
-      }
-      try {
-        resolveProfile(next);
-      } catch (err) {
-        return {
-          options: null,
-          error: err instanceof Error ? err.message : String(err)
-        };
-      }
-      profile = next;
-      i++;
-    } else if (arg === "--resume") {
-      const next = argv[i + 1];
-      if (!next || next.startsWith("--")) {
-        return { options: null, error: `--resume requires a session id, got '${next ?? "(missing)"}'` };
-      }
-      resumeSessionId = next;
-      i++;
-    } else if (arg === "--export-session") {
-      const next = argv[i + 1];
-      if (!next || next.startsWith("--")) {
-        return { options: null, error: `--export-session requires a path (or - for stdout), got '${next ?? "(missing)"}'` };
-      }
-      exportSessionPath = next;
-      i++;
-    } else if (arg === "--strict-done") {
-      strictDone = true;
-    } else if (arg === "--no-strict-done") {
-      strictDone = false;
-      process.env.ZELARI_MISSION_STRICT = "0";
-    } else if (arg === "--kraken-graph") {
-      krakenGraph = argv[i + 1];
-      i++;
-    } else if (arg === "--kraken-graph-file") {
-      const next = argv[i + 1];
-      if (next) {
-        try {
-          const fromFile = readFileSync22(next, "utf-8");
-          if (fromFile.trim()) krakenGraph = fromFile;
-        } catch {
-        }
-      }
-      i++;
-    } else if (arg === "--plan-only") {
-      planOnly = true;
-    } else if (arg === "--run-plan") {
-      runPlan = argv[i + 1];
-      i++;
-    } else if (arg === "--gauntlet") {
-      gauntlet = true;
-    } else if (arg === "--no-gauntlet") {
-      gauntlet = false;
-    }
-  }
-  if (councilFlag && !modeExplicit) {
-    mode = "council";
-  } else if (councilFlag && modeExplicit && mode !== "council") {
-    return {
-      options: null,
-      error: `--council conflicts with --mode ${mode}`
-    };
-  }
-  if (task && krakenGraph) {
-    return { options: null, error: "--task and --kraken-graph are mutually exclusive" };
-  }
-  if ((!task || task.trim().length === 0) && (!krakenGraph || krakenGraph.trim().length === 0)) {
-    return { options: null, error: "--headless requires --task <prompt> or --kraken-graph <goal>" };
-  }
-  return {
-    options: {
-      task: task ?? "",
-      output,
-      mode,
-      phase: phase2,
-      useCouncil: mode === "council",
-      provider,
-      model,
-      ...history2 && history2.length > 0 ? { history: history2 } : {},
-      ...todos2 && todos2.length > 0 ? { todos: todos2 } : {},
-      ...once ? { once: true } : {},
-      ...profile ? { profile } : {},
-      ...resumeSessionId ? { resumeSessionId } : {},
-      ...exportSessionPath ? { exportSessionPath } : {},
-      ...strictDone ? { strictDone: true } : {},
-      ...krakenGraph ? { krakenGraph } : {},
-      ...planOnly ? { planOnly: true } : {},
-      ...runPlan ? { runPlan } : {},
-      ...gauntlet ? { gauntlet: true } : {}
-    }
-  };
-}
-async function resolveHeadlessKey(providerId) {
-  const spec = PROVIDERS.find((p3) => p3.id === providerId);
-  if (!spec) {
-    return { error: `unknown provider: '${providerId}'` };
-  }
-  const resolved = await resolveApiKeyWithMeta(providerId);
-  if (!resolved || !resolved.apiKey) {
-    return {
-      error: `no API key for provider '${providerId}'.
-Set the env var ${spec.envVar} or save a key via /login.`
-    };
-  }
-  const { resolveBaseUrl: resolveBaseUrl2 } = await Promise.resolve().then(() => (init_openai_compatible(), openai_compatible_exports));
-  return {
-    apiKey: resolved.apiKey,
-    baseUrl: resolveBaseUrl2(providerId)
-  };
-}
-function resolveHeadlessProvider(opts) {
-  const provider = opts.provider ?? getActiveProvider().id;
-  const model = opts.model ?? getModelForProvider(provider);
-  return { provider, model };
-}
-function emitEvent(event) {
-  process.stdout.write(JSON.stringify(event) + "\n");
-}
-var init_headless = __esm({
-  "src/cli/headless.ts"() {
-    "use strict";
-    init_keyStore();
-    init_providerConfig();
-    init_openai_compatible();
-    init_phase();
-    init_mode();
-    init_runtime2();
-  }
-});
-
-// src/cli/headlessSpine.ts
-var headlessSpine_exports = {};
-__export(headlessSpine_exports, {
-  derivedModelSeed: () => derivedModelSeed,
-  exportSessionById: () => exportSessionById,
-  missionStateFromSpine: () => missionStateFromSpine,
-  openHeadlessSpine: () => openHeadlessSpine,
-  resolveHeadlessProfileId: () => resolveHeadlessProfileId,
-  seedHeadlessModelHistory: () => seedHeadlessModelHistory,
-  sessionStartedEvent: () => sessionStartedEvent
-});
-function sessionStartedEvent(handle) {
-  return {
-    type: "session_started",
-    sessionId: handle.sessionId,
-    spine: handle.spine.status
-  };
-}
-function resolveHeadlessProfileId(mode, explicit) {
-  if (explicit) return resolveProfile(explicit).id;
-  return defaultProfileForMode(mode ?? "kraken");
-}
-async function openHeadlessSpine(opts) {
-  const profileId = resolveHeadlessProfileId(opts.mode, opts.profile);
-  let profileTools = [];
-  try {
-    profileTools = resolveProfile(profileId).tools;
-  } catch {
-    profileTools = [];
-  }
-  const extra = {
-    profile: profileId,
-    workspace: opts.workspace ?? process.cwd(),
-    toolManifestHash: profileTools.length > 0 ? toolManifestHash(profileTools) : void 0
-  };
-  const mirrorOpts = {
-    baseDir: opts.baseDir,
-    quiet: opts.quiet,
-    extraStarted: extra
-  };
-  const spine = await SessionSpineMirror.adopt(opts.sessionId, mirrorOpts);
-  if (spine.status === "active") {
-    spine.note("headless.profile", { profile: profileId, mode: opts.mode ?? "kraken" });
-  }
-  return {
-    sessionId: opts.sessionId,
-    profileId,
-    spine,
-    observe(ev) {
-      if (ev && typeof ev === "object" && "type" in ev) {
-        spine.mirrorBrainEvent(ev);
-      }
-    },
-    userMessage(text) {
-      spine.userMessage(text);
-    },
-    verificationRun(payload) {
-      spine.verificationRun(payload);
-    },
-    appendEvent(input) {
-      return spine.appendEvent(input);
-    },
-    lastVerificationRun() {
-      return spine.lastVerificationRun();
-    },
-    missionPhase(phase2, note) {
-      spine.missionPhase(phase2, note);
-    },
-    missionProgress(advice) {
-      spine.missionProgress(advice);
-    },
-    note(text, data) {
-      spine.note(text, data);
-    },
-    async close(reason = "host-exit") {
-      await spine.close(reason);
-    },
-    async interrupt(note) {
-      if (note) spine.note("headless.interrupt", { note });
-      await spine.release();
-    },
-    async exportJson() {
-      try {
-        const store6 = new SessionStore(resolveSessionsDir({ baseDir: opts.baseDir }));
-        if (!await store6.exists(opts.sessionId)) return null;
-        return await exportSessionJson(store6, opts.sessionId);
-      } catch {
-        return null;
-      }
-    }
-  };
-}
-async function exportSessionById(sessionId2, baseDir) {
-  try {
-    const store6 = SessionStore.withDefaults(baseDir ? { baseDir } : {});
-    if (!await store6.exists(sessionId2)) {
-      return { ok: false, error: `session not found: ${sessionId2}` };
-    }
-    return { ok: true, json: await exportSessionJson(store6, sessionId2) };
-  } catch (err) {
-    return { ok: false, error: err instanceof Error ? err.message : String(err) };
-  }
-}
-async function missionStateFromSpine(sessionId2, baseDir) {
-  try {
-    const store6 = SessionStore.withDefaults(baseDir ? { baseDir } : {});
-    if (!await store6.exists(sessionId2)) return null;
-    const projection = await store6.projection(sessionId2);
-    return deriveMissionState(projection);
-  } catch {
-    return null;
-  }
-}
-async function seedHeadlessModelHistory(handle, legacy) {
-  const mirror = handle.spine;
-  const legacySeed = filterLegacySeed(legacy);
-  if (mirror.status !== "active") {
-    return { history: legacySeed, importedCount: 0, source: "legacy-fallback" };
-  }
-  const existing = await mirror.derivedPriorTurns();
-  if (existing && existing.length > 0) {
-    return { history: derivedModelSeed(existing), importedCount: 0, source: "spine" };
-  }
-  if (legacySeed.length === 0) {
-    return { history: [], importedCount: 0, source: "spine" };
-  }
-  for (const m of legacySeed) {
-    if (m.role === "user") {
-      mirror.userMessage(m.content);
-    } else {
-      mirror.assistantMessage(m.content, { imported: "legacy-history" });
-    }
-  }
-  await mirror.flush();
-  const derived = await mirror.derivedPriorTurns() ?? [];
-  return {
-    history: derivedModelSeed(derived),
-    importedCount: legacySeed.length,
-    source: "spine-import"
-  };
-}
-function filterLegacySeed(legacy) {
-  return (legacy ?? []).filter((m) => m.role === "user" || m.role === "assistant").map(
-    (m) => m.role === "assistant" && m.content ? {
-      role: "assistant",
-      content: cleanAgentContent(m.content, {
-        stripQuestion: false,
-        stripThink: false
-      })
-    } : { role: m.role, content: m.content ?? "" }
-  ).filter((m) => (m.content ?? "").trim().length > 0);
-}
-function derivedModelSeed(derived) {
-  return derivedToAgentMessages(derived).map(
-    (m) => m.role === "system" ? { role: "user", content: m.content } : m
-  ).map(
-    (m) => m.role === "assistant" && m.content ? {
-      role: "assistant",
-      content: cleanAgentContent(m.content, {
-        stripQuestion: false,
-        stripThink: false
-      })
-    } : m
-  ).filter((m) => m.role === "user" || m.role === "assistant").filter((m) => (m.content ?? "").trim().length > 0);
-}
-var init_headlessSpine = __esm({
-  "src/cli/headlessSpine.ts"() {
-    "use strict";
-    init_dist();
-    init_session();
-    init_mission2();
-    init_runtime2();
-    init_sessionSpine();
-    init_headless();
-  }
-});
-
-// src/cli/state/fileStateStore.ts
-import { createHash as createHash11, randomUUID as randomUUID2 } from "node:crypto";
-import { promises as fs21 } from "node:fs";
-import * as path41 from "node:path";
-function shortId() {
-  return randomUUID2().replace(/-/g, "").slice(0, 12);
-}
-async function writeJsonAtomic(filePath, data) {
-  await fs21.mkdir(path41.dirname(filePath), { recursive: true });
-  const tmp = `${filePath}.${process.pid}.${Date.now()}.tmp`;
-  await fs21.writeFile(tmp, JSON.stringify(data, null, 2) + "\n", "utf8");
-  await fs21.rename(tmp, filePath);
-}
-async function readJsonFile(filePath) {
-  try {
-    const raw = await fs21.readFile(filePath, "utf8");
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-function defaultSummary(input, discoveries) {
-  if (input.summary?.trim()) return input.summary.trim();
-  const lines = [
-    `# ${input.label}`,
-    "",
-    `- mode: ${input.mode}`,
-    input.layer ? `- layer: ${input.layer}` : null,
-    `- verification: ran=${input.verification.ran} ok=${input.verification.ok}`,
-    "",
-    "## Discoveries",
-    ...discoveries.map((d) => `- [${d.kind}] ${d.summary}`)
-  ].filter((x) => x !== null);
-  return lines.join("\n");
-}
-function stripStored(s) {
-  const { artifactDir: _a3, ...meta3 } = s;
-  return meta3;
-}
-function isStateEnabled(env = process.env) {
-  return env.ZELARI_STATE !== "0";
-}
-async function getStateStore(projectRoot, env = process.env) {
-  if (!isStateEnabled(env)) return new NoopDurableStateStore();
-  const store6 = new FileDurableStateStore();
-  try {
-    await store6.init(projectRoot);
-    return store6;
-  } catch {
-    return new NoopDurableStateStore();
-  }
-}
-function hashStablePrompt(stable) {
-  return createHash11("sha256").update(stable, "utf8").digest("hex").slice(0, 16);
-}
-var DEFAULT_MATERIALIZE_CHARS, FileDurableStateStore, NoopDurableStateStore;
-var init_fileStateStore = __esm({
-  "src/cli/state/fileStateStore.ts"() {
-    "use strict";
-    DEFAULT_MATERIALIZE_CHARS = 4e3;
-    FileDurableStateStore = class {
-      root = "";
-      stateDir = "";
-      commitsDir = "";
-      artifactsDir = "";
-      headPath = "";
-      indexPath = "";
-      async init(projectRoot) {
-        this.root = projectRoot;
-        this.stateDir = path41.join(projectRoot, ".zelari", "state");
-        this.commitsDir = path41.join(this.stateDir, "commits");
-        this.artifactsDir = path41.join(this.stateDir, "artifacts");
-        this.headPath = path41.join(this.stateDir, "HEAD.json");
-        this.indexPath = path41.join(this.stateDir, "index.jsonl");
-        await fs21.mkdir(this.commitsDir, { recursive: true });
-        await fs21.mkdir(this.artifactsDir, { recursive: true });
-      }
-      async commit(input) {
-        if (!input.force && input.verification.ran && !input.verification.ok) {
-          throw new Error(
-            "DurableStateStore.commit refused: verification ran and failed (pass force:true for soft commit)"
-          );
-        }
-        const discoveries = input.discoveries ?? [];
-        const parent = await this.head();
-        const id = shortId();
-        const artifactRel = path41.join("artifacts", id);
-        const artifactAbs = path41.join(this.artifactsDir, id);
-        await fs21.mkdir(artifactAbs, { recursive: true });
-        const summary = defaultSummary(input, discoveries);
-        await fs21.writeFile(path41.join(artifactAbs, "summary.md"), summary + "\n", "utf8");
-        await writeJsonAtomic(path41.join(artifactAbs, "discoveries.json"), discoveries);
-        await writeJsonAtomic(path41.join(artifactAbs, "verification.json"), input.verification);
-        const meta3 = {
-          id,
-          parentId: parent?.id ?? null,
-          createdAt: Date.now(),
-          sessionId: input.sessionId,
-          mode: input.mode,
-          layer: input.layer,
-          label: input.label,
-          workspaceCheckpointId: input.workspaceCheckpointId,
-          verification: {
-            ...input.verification,
-            reportPath: input.verification.reportPath ?? path41.join(".zelari", "state", artifactRel, "verification.json").replace(/\\/g, "/")
-          },
-          changedPaths: input.changedPaths ?? [],
-          stablePromptHash: input.stablePromptHash,
-          discoveryCount: discoveries.length,
-          artifactDir: artifactRel.replace(/\\/g, "/")
-        };
-        await writeJsonAtomic(path41.join(this.commitsDir, `${id}.json`), meta3);
-        await writeJsonAtomic(this.headPath, { id, updatedAt: meta3.createdAt });
-        await fs21.appendFile(this.indexPath, JSON.stringify({ id, createdAt: meta3.createdAt, label: meta3.label }) + "\n", "utf8");
-        return stripStored(meta3);
-      }
-      async head() {
-        const head = await readJsonFile(this.headPath);
-        if (!head?.id) return null;
-        return this.get(head.id);
-      }
-      async get(id) {
-        const stored = await readJsonFile(path41.join(this.commitsDir, `${id}.json`));
-        return stored ? stripStored(stored) : null;
-      }
-      async list(limit = 20) {
-        let raw;
-        try {
-          raw = await fs21.readFile(this.indexPath, "utf8");
-        } catch {
-          return [];
-        }
-        const ids = [];
-        for (const line of raw.split("\n")) {
-          const t = line.trim();
-          if (!t) continue;
-          try {
-            const row = JSON.parse(t);
-            if (row.id) ids.push(row.id);
-          } catch {
-          }
-        }
-        const slice = ids.slice(-Math.max(1, limit)).reverse();
-        const out = [];
-        for (const id of slice) {
-          const m = await this.get(id);
-          if (m) out.push(m);
-        }
-        return out;
-      }
-      async setHead(id) {
-        const meta3 = await this.get(id);
-        if (!meta3) {
-          throw new Error(`DurableStateStore.setHead: unknown commit ${id}`);
-        }
-        await writeJsonAtomic(this.headPath, { id, updatedAt: Date.now() });
-        return meta3;
-      }
-      async loadDiscoveries(id) {
-        const meta3 = id ? await this.get(id) : await this.head();
-        if (!meta3) return [];
-        const stored = await readJsonFile(path41.join(this.commitsDir, `${meta3.id}.json`));
-        if (!stored?.artifactDir) return [];
-        const discPath = path41.join(this.stateDir, stored.artifactDir, "discoveries.json");
-        return await readJsonFile(discPath) ?? [];
+      async loadDiscoveries(id) {
+        const meta3 = id ? await this.get(id) : await this.head();
+        if (!meta3) return [];
+        const stored = await readJsonFile(path41.join(this.commitsDir, `${meta3.id}.json`));
+        if (!stored?.artifactDir) return [];
+        const discPath = path41.join(this.stateDir, stored.artifactDir, "discoveries.json");
+        return await readJsonFile(discPath) ?? [];
       }
       async materializeContext(id, maxChars = DEFAULT_MATERIALIZE_CHARS) {
         const meta3 = id ? await this.get(id) : await this.head();
@@ -41234,25 +41165,37 @@ function extractiveHistorySummary(dropped, opts) {
   if (dropped.length === 0) return "No prior turns.";
   const userGoals = [];
   const assistantNotes = [];
+  const userConstraints = [];
+  const unresolved = [];
+  const verification = [];
+  const decisions = [];
   const tools = /* @__PURE__ */ new Map();
   const files = /* @__PURE__ */ new Set();
   let toolResults = 0;
   for (const m of dropped) {
     if (m.role === "user" && m.content.trim()) {
-      userGoals.push(oneLine(m.content, 220));
+      const goal = oneLine(m.content, 220);
+      userGoals.push(goal);
+      if (/\b(must|never|required|only|do not|constraint|vincolo|deve|senza)\b/i.test(goal)) userConstraints.push(goal);
     } else if (m.role === "assistant") {
       if (m.content.trim()) {
-        assistantNotes.push(oneLine(m.content, 180));
+        const note = oneLine(m.content, 220);
+        assistantNotes.push(note);
+        if (/\b(fail|failed|error|unresolved|remaining|todo|blocked|gap|errore|fallit|irrisolt|manca)\b/i.test(note)) unresolved.push(note);
+        if (/\b(test|typecheck|build|verify|verification|passed|failed|green|red)\b/i.test(note)) verification.push(note);
+        if (/\b(decid|decision|chosen|choose|scelt|adopt|implement)\b/i.test(note)) decisions.push(note);
       }
       if (m.toolCalls) {
         for (const tc of m.toolCalls) {
           tools.set(tc.name, (tools.get(tc.name) ?? 0) + 1);
-          collectPaths(tc.args, files);
+          collectPaths2(tc.args, files);
         }
       }
     } else if (m.role === "tool") {
       toolResults += 1;
       collectPathsFromText(m.content, files);
+      if (/\b(fail|failed|error|exception|blocked|errore|fallit)\b/i.test(m.content)) unresolved.push(oneLine(m.content, 220));
+      if (/\b(test|typecheck|build|verify|passed|failed|success)\b/i.test(m.content)) verification.push(oneLine(m.content, 220));
     }
   }
   const parts = [
@@ -41263,6 +41206,22 @@ function extractiveHistorySummary(dropped, opts) {
     parts.push("## User goals / requests");
     for (const g of userGoals.slice(-6)) parts.push(`- ${g}`);
   }
+  if (userConstraints.length) {
+    parts.push("## User constraints (preserve exactly)");
+    for (const item of [...new Set(userConstraints)].slice(-8)) parts.push(`- ${item}`);
+  }
+  if (unresolved.length) {
+    parts.push("## Unresolved failures / pending repair");
+    for (const item of [...new Set(unresolved)].slice(-8)) parts.push(`- ${item}`);
+  }
+  if (verification.length) {
+    parts.push("## Latest verification state");
+    for (const item of [...new Set(verification)].slice(-6)) parts.push(`- ${item}`);
+  }
+  if (decisions.length) {
+    parts.push("## Recent active decisions");
+    for (const item of [...new Set(decisions)].slice(-6)) parts.push(`- ${item}`);
+  }
   if (assistantNotes.length) {
     parts.push("## Assistant conclusions (truncated)");
     for (const a of assistantNotes.slice(-5)) parts.push(`- ${a}`);
@@ -41289,7 +41248,7 @@ function oneLine(s, max) {
   if (t.length <= max) return t;
   return `${t.slice(0, max - 1)}\u2026`;
 }
-function collectPaths(args, out) {
+function collectPaths2(args, out) {
   if (!args || typeof args !== "object") return;
   const obj = args;
   for (const key of ["path", "file", "filepath", "filePath", "target", "cwd"]) {
@@ -41408,6 +41367,36 @@ Be concise.
 });
 
 // src/cli/hooks/historyCompaction.ts
+function compactedRangeFromDropped(dropped) {
+  if (dropped.length === 0) return void 0;
+  const seqs = [];
+  const sources = [];
+  for (const m of dropped) {
+    const hasCompactRange = typeof m.compactedFromSeq === "number" && Number.isInteger(m.compactedFromSeq) && m.compactedFromSeq > 0 && typeof m.compactedToSeq === "number" && Number.isInteger(m.compactedToSeq) && m.compactedToSeq >= m.compactedFromSeq;
+    if (hasCompactRange) {
+      seqs.push(m.compactedFromSeq, m.compactedToSeq);
+      sources.push(...m.sourceEventSeqs ?? []);
+      if (typeof m.seq === "number" && Number.isInteger(m.seq) && m.seq > 0) {
+        seqs.push(m.seq);
+        sources.push(m.seq);
+      }
+      continue;
+    }
+    if (typeof m.seq !== "number" || !Number.isInteger(m.seq) || m.seq < 1) return void 0;
+    seqs.push(m.seq);
+    sources.push(m.seq);
+  }
+  return {
+    fromSeq: Math.min(...seqs),
+    toSeq: Math.max(...seqs),
+    sourceEventSeqs: [...new Set(sources)]
+  };
+}
+function withDroppedRange(result, dropped, strategy) {
+  const range = compactedRangeFromDropped(dropped);
+  if (!range) return { ...result, strategy };
+  return { ...result, ...range, strategy };
+}
 function resolveMaxMessages(opts) {
   const envTurns = envNumber(process.env.ZELARI_HISTORY_TURNS, { default: 6, min: 0 });
   let turns = opts?.maxMessages ? Math.ceil(opts.maxMessages / 4) : envTurns;
@@ -41481,16 +41470,25 @@ function pruneToolResultsDetailed(messages, opts) {
 function compactHistory(messages, opts) {
   return compactHistoryDetailed(messages, opts).messages;
 }
-function buildCheckpointMessage(summaryText) {
+function buildCheckpointMessage(summaryText, range) {
   return {
     role: "user",
-    content: CHECKPOINT_WRAPPER_PREFIX + "\n\n<compacted-summary>\n" + summaryText + "\n</compacted-summary>"
+    content: CHECKPOINT_WRAPPER_PREFIX + "\n\n<compacted-summary>\n" + summaryText + "\n</compacted-summary>",
+    ...range ? {
+      compactedFromSeq: range.fromSeq,
+      compactedToSeq: range.toSeq,
+      sourceEventSeqs: [...range.sourceEventSeqs]
+    } : {}
   };
 }
 function compactHistoryDetailed(messages, opts) {
   const maxMessages = resolveMaxMessages(opts);
   if (maxMessages === 0) {
-    return { messages: [], compacted: true, messagesRemoved: messages.length, summary: "" };
+    return withDroppedRange(
+      { messages: [], compacted: true, messagesRemoved: messages.length, summary: "" },
+      messages,
+      "extractive"
+    );
   }
   if (messages.length <= maxMessages * 2 && !opts?.force) {
     return {
@@ -41511,19 +41509,25 @@ function compactHistoryDetailed(messages, opts) {
     };
   }
   const droppedMsgs = messages.slice(0, cut);
+  const droppedRange = compactedRangeFromDropped(droppedMsgs);
   const pruned = pruneToolResultsDetailed(messages.slice(cut));
   const kept = pruned.messages;
   const summaryText = extractiveHistorySummary(droppedMsgs);
   const summary = buildCheckpointMessage(
-    summaryText || `${COMPACT_MARKER} ${cut} earlier message(s) dropped.`
+    summaryText || `${COMPACT_MARKER} ${cut} earlier message(s) dropped.`,
+    droppedRange
+  );
+  return withDroppedRange(
+    {
+      messages: [summary, ...kept],
+      compacted: true,
+      messagesRemoved: cut,
+      summary: summary.content,
+      prunedToolResults: pruned.stats.pruned
+    },
+    droppedMsgs,
+    "extractive"
   );
-  return {
-    messages: [summary, ...kept],
-    compacted: true,
-    messagesRemoved: cut,
-    summary: summary.content,
-    prunedToolResults: pruned.stats.pruned
-  };
 }
 async function compactHistoryAsync(messages, opts) {
   const base = compactHistoryDetailed(messages, opts);
@@ -41559,16 +41563,21 @@ async function compactHistoryAsync(messages, opts) {
   }
   const pruned = pruneToolResultsDetailed(messages.slice(cut));
   const kept = pruned.messages;
-  const summary = buildCheckpointMessage(summaryText);
-  return {
-    messages: [summary, ...kept],
-    compacted: true,
-    messagesRemoved: cut,
-    summary: summaryText,
-    prunedToolResults: pruned.stats.pruned,
-    cacheReuseExpected,
-    replayExactPrefix
-  };
+  const summary = buildCheckpointMessage(summaryText, compactedRangeFromDropped(droppedMsgs));
+  const usedLlm = summaryText !== extractive && summaryText.trim().length > 40;
+  return withDroppedRange(
+    {
+      messages: [summary, ...kept],
+      compacted: true,
+      messagesRemoved: cut,
+      summary: summaryText,
+      prunedToolResults: pruned.stats.pruned,
+      cacheReuseExpected,
+      replayExactPrefix
+    },
+    droppedMsgs,
+    usedLlm ? "llm" : "extractive"
+  );
 }
 function roughTokens(msgs) {
   let n = 0;
@@ -41603,252 +41612,799 @@ function recordRequestUsage(sessionId2, usage) {
   if (!entry) return;
   entry.usage = usage;
 }
-function getRequestSnapshotWithUsage(sessionId2) {
-  return store5.get(sessionId2) ?? null;
+function getRequestSnapshotWithUsage(sessionId2) {
+  return store5.get(sessionId2) ?? null;
+}
+function clearAllRequestSnapshots() {
+  store5.clear();
+}
+var store5;
+var init_requestSnapshotStore = __esm({
+  "src/cli/budget/requestSnapshotStore.ts"() {
+    "use strict";
+    store5 = /* @__PURE__ */ new Map();
+  }
+});
+
+// src/cli/hooks/conversationContext.ts
+var conversationContext_exports = {};
+__export(conversationContext_exports, {
+  _resetConversationContextForTests: () => _resetConversationContextForTests,
+  appendMessages: () => appendMessages,
+  buildAgentUserWithHistory: () => buildAgentUserWithHistory,
+  buildContinueUserMessage: () => buildContinueUserMessage,
+  buildCouncilTaskWithHistory: () => buildCouncilTaskWithHistory,
+  clearHistory: () => clearHistory,
+  compactInPlace: () => compactInPlace,
+  expectsDiskImplementation: () => expectsDiskImplementation,
+  formatHistoryForCouncil: () => formatHistoryForCouncil,
+  formatHistoryMessages: () => formatHistoryMessages,
+  getHistory: () => getHistory,
+  getLastClarification: () => getLastClarification,
+  hydrateHistory: () => hydrateHistory,
+  isShortContinueReply: () => isShortContinueReply,
+  maybeAnchorShortAnswer: () => maybeAnchorShortAnswer,
+  serializeHistory: () => serializeHistory,
+  setHistory: () => setHistory,
+  setLastClarification: () => setLastClarification
+});
+import { existsSync as existsSync25 } from "node:fs";
+import { join as join19 } from "node:path";
+function getHistory() {
+  return history;
+}
+function setHistory(messages) {
+  const projected = applySessionSurface(messages);
+  history = projected === messages ? [...messages] : projected;
+}
+function compactInPlace(cwd = process.cwd()) {
+  const durableStatePresent = existsSync25(join19(cwd, ".zelari", "state", "HEAD.json"));
+  history = applySessionSurface(compactHistory(history, { durableStatePresent }));
+}
+function appendMessages(msgs) {
+  if (msgs.length === 0) return;
+  history = applySessionSurface(history.concat(msgs));
+}
+function clearHistory() {
+  history = [];
+  lastClarification = null;
+  clearAllRequestSnapshots();
+  clearSessionTodos();
+  clearSessionPermissionGrants();
+}
+function serializeHistory() {
+  return [...history];
+}
+function hydrateHistory(messages) {
+  const projected = applySessionSurface(messages);
+  history = projected === messages ? [...messages] : projected;
+}
+function getLastClarification() {
+  return lastClarification;
+}
+function setLastClarification(c) {
+  lastClarification = c ? { question: c.question, choices: c.choices, at: Date.now() } : null;
+}
+function maybeAnchorShortAnswer(userText) {
+  const clar = lastClarification;
+  if (!clar) return null;
+  const trimmed = userText.trim();
+  if (!trimmed) return null;
+  if (trimmed.length > 80 || trimmed.includes("\n")) return null;
+  const lower = trimmed.toLowerCase();
+  const choices = clar.choices;
+  const matched = choices.find((c) => c.toLowerCase() === lower) ?? choices.find((c) => c.toLowerCase().startsWith(lower)) ?? choices.find((c) => lower.startsWith(c.toLowerCase().slice(0, Math.min(4, c.length))));
+  let choiceLabel = matched ?? null;
+  if (!choiceLabel && /^\d{1,2}$/.test(trimmed)) {
+    const idx = Number.parseInt(trimmed, 10) - 1;
+    if (idx >= 0 && idx < choices.length) choiceLabel = choices[idx] ?? null;
+  }
+  if (!choiceLabel && trimmed.length > 24) return null;
+  const picked = choiceLabel ?? trimmed;
+  return `The user is answering your previous clarifying question.
+Question: ${clar.question}
+Choices were: ${choices.join(" | ")}
+User's answer: ${picked}
+Proceed using this answer; do not re-ask the same question unless the answer is still ambiguous.`;
+}
+function formatHistoryForCouncil(maxTurns = 4) {
+  return formatHistoryMessages(history, maxTurns);
+}
+function formatHistoryMessages(messages, maxTurns = 6, maxTotalChars = 12e3) {
+  if (messages.length === 0) return "";
+  let turns = 0;
+  const chunk = [];
+  for (let i = messages.length - 1; i >= 0 && turns < maxTurns; i--) {
+    const m = messages[i];
+    if (m.role === "user") {
+      chunk.push(`User: ${truncate(m.content, 800)}`);
+      turns += 1;
+    } else if (m.role === "assistant" && m.content.trim()) {
+      chunk.push(`Assistant: ${truncate(m.content, 2e3)}`);
+    }
+  }
+  if (chunk.length === 0) return "";
+  let body = ["## Prior conversation (rolling context)", ...chunk.reverse()].join(
+    "\n"
+  );
+  if (body.length > maxTotalChars) {
+    body = `\u2026
+${body.slice(body.length - maxTotalChars)}`;
+  }
+  return body;
+}
+function isShortContinueReply(task) {
+  const trimmed = task.trim();
+  if (!trimmed) return false;
+  if (SHORT_CONTINUE.test(trimmed)) return true;
+  if (trimmed.length <= 80 && !trimmed.includes("\n") && SHORT_CONTINUE_LOOSE.test(trimmed)) {
+    return true;
+  }
+  return false;
+}
+function buildContinueUserMessage(task, prior, opts) {
+  if (!isShortContinueReply(task) || prior.length === 0) return null;
+  const lastAsst = [...prior].reverse().find((m) => m.role === "assistant" && (m.content ?? "").trim());
+  if (!lastAsst) return null;
+  const max = opts?.maxPriorChars ?? 8e3;
+  const trimmed = task.trim();
+  return `The user says "${trimmed}" \u2014 this is a CONTINUATION of an existing multi-turn session (the Desktop phase may have switched plan\u2194build; mode may have changed). This is NOT a new conversation and you DO have prior context below.
+
+## CRITICAL \u2014 plan text \u2260 done on disk
+The prior assistant output is a PLAN / SPEC / PROPOSAL (or analysis). It is NOT proof that project files already contain those changes.
+The user CONFIRMED the plan and wants you to IMPLEMENT it ON DISK NOW.
+- You MUST use write_file and/or edit_file (and bash when needed) to apply every planned change.
+- Reading files alone is incomplete. Do not stop after read_file/list_files/grep.
+- Do NOT claim "already implemented" / "tutto fatto" unless you verified the changes exist on disk in THIS turn (read after your own successful writes).
+- Do NOT restart from zero or re-ask for the overall goal.
+
+## Prior assistant output (plan to implement \u2014 authoritative)
+${truncate(lastAsst.content, max)}
+
+## Instruction
+Implement the plan on disk now with mutating tools, then briefly list the files you wrote/edited.`;
+}
+function expectsDiskImplementation(task, phase2, prior) {
+  if ((phase2 ?? "build") === "plan") return false;
+  const trimmed = task.trim();
+  if (!trimmed) return false;
+  if (isShortContinueReply(trimmed)) return true;
+  if (/\b(implement|implementa|scrivi|scriviamo|applica|modifica|fix|write|edit|crea|aggiungi|aggiorna|apply|patch)\b/i.test(
+    trimmed
+  )) {
+    return true;
+  }
+  if (prior && prior.length > 0 && isShortContinueReply(trimmed)) {
+    const lastAsst = [...prior].reverse().find((m) => m.role === "assistant" && (m.content ?? "").trim());
+    if (lastAsst && /\b(se confermi|passo alla|scriv|implement|on disk|write_file|modifiche proposte|riepilogo delle modifiche)\b/i.test(
+      lastAsst.content
+    )) {
+      return true;
+    }
+  }
+  return false;
+}
+function buildCouncilTaskWithHistory(task, prior) {
+  const messages = prior ?? [];
+  const trimmed = task.trim();
+  let userPart = maybeAnchorShortAnswer(task) ?? task;
+  const continued = buildContinueUserMessage(trimmed, messages, {
+    maxPriorChars: 4500
+  });
+  if (continued) {
+    userPart = continued;
+  }
+  const block = formatHistoryMessages(messages, 6, 12e3);
+  if (!block) return userPart;
+  if (userPart.includes("Prior assistant output")) {
+    return userPart;
+  }
+  return `${block}
+
+## Current user request
+${userPart}`;
+}
+function buildAgentUserWithHistory(task, prior) {
+  const messages = prior ?? [];
+  const anchored = maybeAnchorShortAnswer(task);
+  if (anchored) return anchored;
+  return buildContinueUserMessage(task, messages, { maxPriorChars: 8e3 }) ?? task;
+}
+function truncate(s, max) {
+  const t = s.replace(/\s+/g, " ").trim();
+  if (t.length <= max) return t;
+  return `${t.slice(0, max - 1)}\u2026`;
+}
+function _resetConversationContextForTests() {
+  history = [];
+  lastClarification = null;
+  clearSessionTodos();
+  clearSessionPermissionGrants();
+}
+var history, lastClarification, SHORT_CONTINUE, SHORT_CONTINUE_LOOSE;
+var init_conversationContext = __esm({
+  "src/cli/hooks/conversationContext.ts"() {
+    "use strict";
+    init_toolPermissions();
+    init_sessionTodos();
+    init_historyCompaction();
+    init_requestSnapshotStore();
+    init_observationStore();
+    history = [];
+    lastClarification = null;
+    SHORT_CONTINUE = /^(procedi|continua|continue|go\s*ahead|go|ok|okay|sì|si|yes|vai|avanti|next|proceed|conferma|confermo|applica|fai|scrivi|esegui|implementa|vai pure|fai pure|ok procedi|sì procedi|si procedi)$/i;
+    SHORT_CONTINUE_LOOSE = /\b(procedi|continua|continue|conferma|confermo|applica|implementa|scriv[ia]|esegui|vai pure|fai pure|go ahead|proceed)\b/i;
+  }
+});
+
+// src/cli/phaseState.ts
+var phaseState_exports = {};
+__export(phaseState_exports, {
+  _resetPhaseForTests: () => _resetPhaseForTests,
+  getPhase: () => getPhase,
+  setPhase: () => setPhase
+});
+function getPhase() {
+  return phase;
+}
+function setPhase(next) {
+  phase = next;
+}
+function _resetPhaseForTests() {
+  phase = "build";
+}
+var phase;
+var init_phaseState = __esm({
+  "src/cli/phaseState.ts"() {
+    "use strict";
+    phase = "build";
+  }
+});
+
+// src/cli/phase.ts
+var phase_exports = {};
+__export(phase_exports, {
+  PHASES: () => PHASES,
+  PLAN_ALLOWED_WRITE_TOOLS: () => PLAN_ALLOWED_WRITE_TOOLS,
+  PLAN_BLOCKED_TOOLS: () => PLAN_BLOCKED_TOOLS,
+  describePhase: () => describePhase,
+  nextPhase: () => nextPhase,
+  parsePhase: () => parsePhase
+});
+function parsePhase(input) {
+  const v = input.trim().toLowerCase();
+  return PHASES.includes(v) ? v : null;
+}
+function nextPhase(current) {
+  return current === "plan" ? "build" : "plan";
+}
+function describePhase(phase2) {
+  switch (phase2) {
+    case "plan":
+      return "plan \u2014 explore & design only (no project writes; plan files allowed)";
+    default:
+      return "build \u2014 implement with full tools";
+  }
+}
+var PHASES, PLAN_ALLOWED_WRITE_TOOLS, PLAN_BLOCKED_TOOLS;
+var init_phase = __esm({
+  "src/cli/phase.ts"() {
+    "use strict";
+    PHASES = ["plan", "build"];
+    PLAN_ALLOWED_WRITE_TOOLS = /* @__PURE__ */ new Set([
+      // Workspace plan/docs — intentional plan-mode outputs
+      "createPlan",
+      "createTask",
+      "updateTask",
+      "createMilestone",
+      "createDocument",
+      "createDecision",
+      "linkDocuments"
+      // Soft writes that only touch .zelari / plan paths are still gated in
+      // toolRegistry by path when needed; write_file/edit_file stay DENIED.
+    ]);
+    PLAN_BLOCKED_TOOLS = /* @__PURE__ */ new Set([
+      "write_file",
+      "edit_file",
+      "apply_diff",
+      "bash"
+    ]);
+  }
+});
+
+// src/cli/mode.ts
+function nextMode(current) {
+  const i = MODES.indexOf(current);
+  return MODES[(i + 1) % MODES.length] ?? "kraken";
+}
+function parseMode(input) {
+  const v = input.trim().toLowerCase();
+  if (MODES.includes(v)) return v;
+  return MODE_ALIASES[v] ?? null;
+}
+function describeMode(mode) {
+  switch (mode) {
+    case "council":
+      return "council \u2014 multi-member plan/design (Caronte\u2026Lucifero; build needs ZELARI_COUNCIL_CAN_BUILD=1)";
+    case "zelari":
+      return "zelari \u2014 mission: plan@council \u2192 build@kraken (legacy: ZELARI_BUILD_VIA_AGENT=0)";
+    default:
+      return "kraken \u2014 super-agent lead (spawns explore/general/verify tentacles; default implementer)";
+  }
+}
+var MODES, MODE_ALIASES;
+var init_mode = __esm({
+  "src/cli/mode.ts"() {
+    "use strict";
+    MODES = ["kraken", "council", "zelari"];
+    MODE_ALIASES = {
+      agent: "kraken",
+      single: "kraken"
+    };
+  }
+});
+
+// src/cli/headless.ts
+import { readFileSync as readFileSync22 } from "node:fs";
+function defaultProfileForMode(mode) {
+  switch (mode) {
+    case "council":
+      return "council/v1";
+    case "zelari":
+      return "mission/v1";
+    default:
+      return "kraken/v1";
+  }
+}
+function parseHeadlessFlags(argv) {
+  if (!argv.includes("--headless")) {
+    return { options: null };
+  }
+  let task;
+  let output = "json";
+  let mode = "kraken";
+  let phase2 = "build";
+  let modeExplicit = false;
+  let councilFlag = false;
+  let provider;
+  let model;
+  let history2;
+  let todos2;
+  let once = false;
+  let profile;
+  let resumeSessionId;
+  let exportSessionPath;
+  let strictDone = false;
+  let krakenGraph;
+  let planOnly = process.env.ZELARI_KRAKEN_PLAN_ONLY === "1" || process.env.ZELARI_KRAKEN_PLAN_ONLY === "true";
+  let runPlan = process.env.ZELARI_KRAKEN_RUN_PLAN;
+  let gauntlet = process.env.ZELARI_GAUNTLET === "1" || process.env.ZELARI_GAUNTLET === "true";
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg === "--headless") continue;
+    if (arg === "--output") {
+      const next = argv[i + 1];
+      if (next === "json" || next === "plain") {
+        output = next;
+        i++;
+      } else {
+        return {
+          options: null,
+          error: `--output requires 'json' or 'plain', got '${next ?? "(missing)"}'`
+        };
+      }
+    } else if (arg === "--task") {
+      task = argv[i + 1];
+      i++;
+    } else if (arg === "--task-file") {
+      const next = argv[i + 1];
+      if (next) {
+        try {
+          const fromFile = readFileSync22(next, "utf-8");
+          if (fromFile.trim()) task = fromFile;
+        } catch {
+        }
+      }
+      i++;
+    } else if (arg === "--council") {
+      councilFlag = true;
+    } else if (arg === "--mode") {
+      const next = argv[i + 1];
+      const parsed = next ? parseMode(next) : null;
+      if (!parsed) {
+        return {
+          options: null,
+          error: `--mode requires 'kraken', 'council', or 'zelari' (agent=alias), got '${next ?? "(missing)"}'`
+        };
+      }
+      mode = parsed;
+      modeExplicit = true;
+      i++;
+    } else if (arg === "--phase") {
+      const next = argv[i + 1];
+      const parsed = next ? parsePhase(next) : null;
+      if (!parsed) {
+        return {
+          options: null,
+          error: `--phase requires 'plan' or 'build', got '${next ?? "(missing)"}'`
+        };
+      }
+      phase2 = parsed;
+      i++;
+    } else if (arg === "--provider") {
+      provider = argv[i + 1];
+      i++;
+    } else if (arg === "--model") {
+      model = argv[i + 1];
+      i++;
+    } else if (arg === "--history" || arg === "--history-file") {
+      const next = argv[i + 1];
+      if (next) {
+        let raw = null;
+        if (arg === "--history-file") {
+          try {
+            raw = readFileSync22(next, "utf-8");
+          } catch {
+            raw = null;
+          }
+        } else {
+          raw = next;
+        }
+        if (raw) {
+          try {
+            const parsedHist = JSON.parse(raw);
+            if (Array.isArray(parsedHist)) {
+              history2 = parsedHist.filter(
+                (m) => !!m && typeof m === "object" && typeof m.role === "string"
+              ).map((m) => {
+                const role = String(m.role);
+                const raw2 = m.content;
+                const content = typeof raw2 === "string" ? raw2 : raw2 == null ? "" : typeof raw2 === "object" ? JSON.stringify(raw2) : String(raw2);
+                const msg = {
+                  role,
+                  content
+                };
+                if (typeof m.toolCallId === "string") {
+                  msg.toolCallId = m.toolCallId;
+                }
+                return msg;
+              }).filter(
+                (m) => m.role === "user" || m.role === "assistant" || m.role === "tool" || m.role === "system"
+              );
+            }
+          } catch {
+          }
+        }
+        i++;
+      }
+    } else if (arg === "--todos") {
+      const next = argv[i + 1];
+      if (next) {
+        try {
+          const parsed = JSON.parse(next);
+          if (Array.isArray(parsed)) {
+            todos2 = parsed.filter(
+              (t) => !!t && typeof t === "object" && typeof t.content === "string"
+            ).map((t) => ({
+              id: typeof t.id === "string" ? t.id : void 0,
+              content: String(t.content).slice(0, 500),
+              status: t.status
+            }));
+          }
+        } catch {
+        }
+        i++;
+      }
+    } else if (arg === "--once") {
+      once = true;
+    } else if (arg === "--profile") {
+      const next = argv[i + 1];
+      if (!next || next.startsWith("--")) {
+        return { options: null, error: `--profile requires a profile id (e.g. kraken/v1), got '${next ?? "(missing)"}'` };
+      }
+      try {
+        resolveProfile(next);
+      } catch (err) {
+        return {
+          options: null,
+          error: err instanceof Error ? err.message : String(err)
+        };
+      }
+      profile = next;
+      i++;
+    } else if (arg === "--resume") {
+      const next = argv[i + 1];
+      if (!next || next.startsWith("--")) {
+        return { options: null, error: `--resume requires a session id, got '${next ?? "(missing)"}'` };
+      }
+      resumeSessionId = next;
+      i++;
+    } else if (arg === "--export-session") {
+      const next = argv[i + 1];
+      if (!next || next.startsWith("--")) {
+        return { options: null, error: `--export-session requires a path (or - for stdout), got '${next ?? "(missing)"}'` };
+      }
+      exportSessionPath = next;
+      i++;
+    } else if (arg === "--strict-done") {
+      strictDone = true;
+    } else if (arg === "--no-strict-done") {
+      strictDone = false;
+      process.env.ZELARI_MISSION_STRICT = "0";
+    } else if (arg === "--kraken-graph") {
+      krakenGraph = argv[i + 1];
+      i++;
+    } else if (arg === "--kraken-graph-file") {
+      const next = argv[i + 1];
+      if (next) {
+        try {
+          const fromFile = readFileSync22(next, "utf-8");
+          if (fromFile.trim()) krakenGraph = fromFile;
+        } catch {
+        }
+      }
+      i++;
+    } else if (arg === "--plan-only") {
+      planOnly = true;
+    } else if (arg === "--run-plan") {
+      runPlan = argv[i + 1];
+      i++;
+    } else if (arg === "--gauntlet") {
+      gauntlet = true;
+    } else if (arg === "--no-gauntlet") {
+      gauntlet = false;
+    }
+  }
+  if (councilFlag && !modeExplicit) {
+    mode = "council";
+  } else if (councilFlag && modeExplicit && mode !== "council") {
+    return {
+      options: null,
+      error: `--council conflicts with --mode ${mode}`
+    };
+  }
+  if (task && krakenGraph) {
+    return { options: null, error: "--task and --kraken-graph are mutually exclusive" };
+  }
+  if ((!task || task.trim().length === 0) && (!krakenGraph || krakenGraph.trim().length === 0)) {
+    return { options: null, error: "--headless requires --task <prompt> or --kraken-graph <goal>" };
+  }
+  return {
+    options: {
+      task: task ?? "",
+      output,
+      mode,
+      phase: phase2,
+      useCouncil: mode === "council",
+      provider,
+      model,
+      ...history2 && history2.length > 0 ? { history: history2 } : {},
+      ...todos2 && todos2.length > 0 ? { todos: todos2 } : {},
+      ...once ? { once: true } : {},
+      ...profile ? { profile } : {},
+      ...resumeSessionId ? { resumeSessionId } : {},
+      ...exportSessionPath ? { exportSessionPath } : {},
+      ...strictDone ? { strictDone: true } : {},
+      ...krakenGraph ? { krakenGraph } : {},
+      ...planOnly ? { planOnly: true } : {},
+      ...runPlan ? { runPlan } : {},
+      ...gauntlet ? { gauntlet: true } : {}
+    }
+  };
+}
+async function resolveHeadlessKey(providerId) {
+  const spec = PROVIDERS.find((p3) => p3.id === providerId);
+  if (!spec) {
+    return { error: `unknown provider: '${providerId}'` };
+  }
+  const resolved = await resolveApiKeyWithMeta(providerId);
+  if (!resolved || !resolved.apiKey) {
+    return {
+      error: `no API key for provider '${providerId}'.
+Set the env var ${spec.envVar} or save a key via /login.`
+    };
+  }
+  const { resolveBaseUrl: resolveBaseUrl2 } = await Promise.resolve().then(() => (init_openai_compatible(), openai_compatible_exports));
+  return {
+    apiKey: resolved.apiKey,
+    baseUrl: resolveBaseUrl2(providerId)
+  };
+}
+function resolveHeadlessProvider(opts) {
+  const provider = opts.provider ?? getActiveProvider().id;
+  const model = opts.model ?? getModelForProvider(provider);
+  return { provider, model };
 }
-function clearAllRequestSnapshots() {
-  store5.clear();
+function emitEvent(event) {
+  process.stdout.write(JSON.stringify(event) + "\n");
 }
-var store5;
-var init_requestSnapshotStore = __esm({
-  "src/cli/budget/requestSnapshotStore.ts"() {
+var init_headless = __esm({
+  "src/cli/headless.ts"() {
     "use strict";
-    store5 = /* @__PURE__ */ new Map();
+    init_keyStore();
+    init_providerConfig();
+    init_openai_compatible();
+    init_phase();
+    init_mode();
+    init_runtime2();
   }
 });
 
-// src/cli/hooks/conversationContext.ts
-var conversationContext_exports = {};
-__export(conversationContext_exports, {
-  _resetConversationContextForTests: () => _resetConversationContextForTests,
-  appendMessages: () => appendMessages,
-  buildAgentUserWithHistory: () => buildAgentUserWithHistory,
-  buildContinueUserMessage: () => buildContinueUserMessage,
-  buildCouncilTaskWithHistory: () => buildCouncilTaskWithHistory,
-  clearHistory: () => clearHistory,
-  compactInPlace: () => compactInPlace,
-  expectsDiskImplementation: () => expectsDiskImplementation,
-  formatHistoryForCouncil: () => formatHistoryForCouncil,
-  formatHistoryMessages: () => formatHistoryMessages,
-  getHistory: () => getHistory,
-  getLastClarification: () => getLastClarification,
-  hydrateHistory: () => hydrateHistory,
-  isShortContinueReply: () => isShortContinueReply,
-  maybeAnchorShortAnswer: () => maybeAnchorShortAnswer,
-  serializeHistory: () => serializeHistory,
-  setHistory: () => setHistory,
-  setLastClarification: () => setLastClarification
+// src/cli/headlessSpine.ts
+var headlessSpine_exports = {};
+__export(headlessSpine_exports, {
+  derivedModelSeed: () => derivedModelSeed,
+  exportSessionById: () => exportSessionById,
+  missionStateFromSpine: () => missionStateFromSpine,
+  openHeadlessSpine: () => openHeadlessSpine,
+  resolveHeadlessProfileId: () => resolveHeadlessProfileId,
+  seedHeadlessModelHistory: () => seedHeadlessModelHistory,
+  sessionStartedEvent: () => sessionStartedEvent
 });
-import { existsSync as existsSync25 } from "node:fs";
-import { join as join19 } from "node:path";
-function getHistory() {
-  return history;
-}
-function setHistory(messages) {
-  const projected = applySessionSurface(messages);
-  history = projected === messages ? [...messages] : projected;
-}
-function compactInPlace(cwd = process.cwd()) {
-  const durableStatePresent = existsSync25(join19(cwd, ".zelari", "state", "HEAD.json"));
-  history = applySessionSurface(compactHistory(history, { durableStatePresent }));
-}
-function appendMessages(msgs) {
-  if (msgs.length === 0) return;
-  history = applySessionSurface(history.concat(msgs));
-}
-function clearHistory() {
-  history = [];
-  lastClarification = null;
-  clearAllRequestSnapshots();
-  clearSessionTodos();
-  clearSessionPermissionGrants();
-}
-function serializeHistory() {
-  return [...history];
-}
-function hydrateHistory(messages) {
-  const projected = applySessionSurface(messages);
-  history = projected === messages ? [...messages] : projected;
-}
-function getLastClarification() {
-  return lastClarification;
+function sessionStartedEvent(handle) {
+  return {
+    type: "session_started",
+    sessionId: handle.sessionId,
+    spine: handle.spine.status
+  };
 }
-function setLastClarification(c) {
-  lastClarification = c ? { question: c.question, choices: c.choices, at: Date.now() } : null;
+function resolveHeadlessProfileId(mode, explicit) {
+  if (explicit) return resolveProfile(explicit).id;
+  return defaultProfileForMode(mode ?? "kraken");
 }
-function maybeAnchorShortAnswer(userText) {
-  const clar = lastClarification;
-  if (!clar) return null;
-  const trimmed = userText.trim();
-  if (!trimmed) return null;
-  if (trimmed.length > 80 || trimmed.includes("\n")) return null;
-  const lower = trimmed.toLowerCase();
-  const choices = clar.choices;
-  const matched = choices.find((c) => c.toLowerCase() === lower) ?? choices.find((c) => c.toLowerCase().startsWith(lower)) ?? choices.find((c) => lower.startsWith(c.toLowerCase().slice(0, Math.min(4, c.length))));
-  let choiceLabel = matched ?? null;
-  if (!choiceLabel && /^\d{1,2}$/.test(trimmed)) {
-    const idx = Number.parseInt(trimmed, 10) - 1;
-    if (idx >= 0 && idx < choices.length) choiceLabel = choices[idx] ?? null;
+async function openHeadlessSpine(opts) {
+  const profileId = resolveHeadlessProfileId(opts.mode, opts.profile);
+  let profileTools = [];
+  try {
+    profileTools = resolveProfile(profileId).tools;
+  } catch {
+    profileTools = [];
   }
-  if (!choiceLabel && trimmed.length > 24) return null;
-  const picked = choiceLabel ?? trimmed;
-  return `The user is answering your previous clarifying question.
-Question: ${clar.question}
-Choices were: ${choices.join(" | ")}
-User's answer: ${picked}
-Proceed using this answer; do not re-ask the same question unless the answer is still ambiguous.`;
-}
-function formatHistoryForCouncil(maxTurns = 4) {
-  return formatHistoryMessages(history, maxTurns);
+  const extra = {
+    profile: profileId,
+    workspace: opts.workspace ?? process.cwd(),
+    toolManifestHash: profileTools.length > 0 ? toolManifestHash(profileTools) : void 0
+  };
+  const mirrorOpts = {
+    baseDir: opts.baseDir,
+    quiet: opts.quiet,
+    extraStarted: extra
+  };
+  const spine = await SessionSpineMirror.adopt(opts.sessionId, mirrorOpts);
+  if (spine.status === "active") {
+    spine.note("headless.profile", { profile: profileId, mode: opts.mode ?? "kraken" });
+  }
+  return {
+    sessionId: opts.sessionId,
+    profileId,
+    spine,
+    observe(ev) {
+      if (ev && typeof ev === "object" && "type" in ev) {
+        spine.mirrorBrainEvent(ev);
+      }
+    },
+    userMessage(text) {
+      spine.userMessage(text);
+    },
+    verificationRun(payload) {
+      spine.verificationRun(payload);
+    },
+    appendEvent(input) {
+      return spine.appendEvent(input);
+    },
+    lastVerificationRun() {
+      return spine.lastVerificationRun();
+    },
+    missionPhase(phase2, note) {
+      spine.missionPhase(phase2, note);
+    },
+    missionProgress(advice) {
+      spine.missionProgress(advice);
+    },
+    note(text, data) {
+      spine.note(text, data);
+    },
+    async close(reason = "host-exit") {
+      await spine.close(reason);
+    },
+    async interrupt(note) {
+      if (note) spine.note("headless.interrupt", { note });
+      await spine.release();
+    },
+    async exportJson() {
+      try {
+        const store6 = new SessionStore(resolveSessionsDir({ baseDir: opts.baseDir }));
+        if (!await store6.exists(opts.sessionId)) return null;
+        return await exportSessionJson(store6, opts.sessionId);
+      } catch {
+        return null;
+      }
+    }
+  };
 }
-function formatHistoryMessages(messages, maxTurns = 6, maxTotalChars = 12e3) {
-  if (messages.length === 0) return "";
-  let turns = 0;
-  const chunk = [];
-  for (let i = messages.length - 1; i >= 0 && turns < maxTurns; i--) {
-    const m = messages[i];
-    if (m.role === "user") {
-      chunk.push(`User: ${truncate(m.content, 800)}`);
-      turns += 1;
-    } else if (m.role === "assistant" && m.content.trim()) {
-      chunk.push(`Assistant: ${truncate(m.content, 2e3)}`);
+async function exportSessionById(sessionId2, baseDir) {
+  try {
+    const store6 = SessionStore.withDefaults(baseDir ? { baseDir } : {});
+    if (!await store6.exists(sessionId2)) {
+      return { ok: false, error: `session not found: ${sessionId2}` };
     }
+    return { ok: true, json: await exportSessionJson(store6, sessionId2) };
+  } catch (err) {
+    return { ok: false, error: err instanceof Error ? err.message : String(err) };
   }
-  if (chunk.length === 0) return "";
-  let body = ["## Prior conversation (rolling context)", ...chunk.reverse()].join(
-    "\n"
-  );
-  if (body.length > maxTotalChars) {
-    body = `\u2026
-${body.slice(body.length - maxTotalChars)}`;
-  }
-  return body;
 }
-function isShortContinueReply(task) {
-  const trimmed = task.trim();
-  if (!trimmed) return false;
-  if (SHORT_CONTINUE.test(trimmed)) return true;
-  if (trimmed.length <= 80 && !trimmed.includes("\n") && SHORT_CONTINUE_LOOSE.test(trimmed)) {
-    return true;
+async function missionStateFromSpine(sessionId2, baseDir) {
+  try {
+    const store6 = SessionStore.withDefaults(baseDir ? { baseDir } : {});
+    if (!await store6.exists(sessionId2)) return null;
+    const projection = await store6.projection(sessionId2);
+    return deriveMissionState(projection);
+  } catch {
+    return null;
   }
-  return false;
-}
-function buildContinueUserMessage(task, prior, opts) {
-  if (!isShortContinueReply(task) || prior.length === 0) return null;
-  const lastAsst = [...prior].reverse().find((m) => m.role === "assistant" && (m.content ?? "").trim());
-  if (!lastAsst) return null;
-  const max = opts?.maxPriorChars ?? 8e3;
-  const trimmed = task.trim();
-  return `The user says "${trimmed}" \u2014 this is a CONTINUATION of an existing multi-turn session (the Desktop phase may have switched plan\u2194build; mode may have changed). This is NOT a new conversation and you DO have prior context below.
-
-## CRITICAL \u2014 plan text \u2260 done on disk
-The prior assistant output is a PLAN / SPEC / PROPOSAL (or analysis). It is NOT proof that project files already contain those changes.
-The user CONFIRMED the plan and wants you to IMPLEMENT it ON DISK NOW.
-- You MUST use write_file and/or edit_file (and bash when needed) to apply every planned change.
-- Reading files alone is incomplete. Do not stop after read_file/list_files/grep.
-- Do NOT claim "already implemented" / "tutto fatto" unless you verified the changes exist on disk in THIS turn (read after your own successful writes).
-- Do NOT restart from zero or re-ask for the overall goal.
-
-## Prior assistant output (plan to implement \u2014 authoritative)
-${truncate(lastAsst.content, max)}
-
-## Instruction
-Implement the plan on disk now with mutating tools, then briefly list the files you wrote/edited.`;
 }
-function expectsDiskImplementation(task, phase2, prior) {
-  if ((phase2 ?? "build") === "plan") return false;
-  const trimmed = task.trim();
-  if (!trimmed) return false;
-  if (isShortContinueReply(trimmed)) return true;
-  if (/\b(implement|implementa|scrivi|scriviamo|applica|modifica|fix|write|edit|crea|aggiungi|aggiorna|apply|patch)\b/i.test(
-    trimmed
-  )) {
-    return true;
-  }
-  if (prior && prior.length > 0 && isShortContinueReply(trimmed)) {
-    const lastAsst = [...prior].reverse().find((m) => m.role === "assistant" && (m.content ?? "").trim());
-    if (lastAsst && /\b(se confermi|passo alla|scriv|implement|on disk|write_file|modifiche proposte|riepilogo delle modifiche)\b/i.test(
-      lastAsst.content
-    )) {
-      return true;
-    }
+async function seedHeadlessModelHistory(handle, legacy) {
+  const mirror = handle.spine;
+  const legacySeed = filterLegacySeed(legacy);
+  if (mirror.status !== "active") {
+    return { history: legacySeed, importedCount: 0, source: "legacy-fallback" };
   }
-  return false;
-}
-function buildCouncilTaskWithHistory(task, prior) {
-  const messages = prior ?? [];
-  const trimmed = task.trim();
-  let userPart = maybeAnchorShortAnswer(task) ?? task;
-  const continued = buildContinueUserMessage(trimmed, messages, {
-    maxPriorChars: 4500
-  });
-  if (continued) {
-    userPart = continued;
+  const existing = await mirror.derivedPriorTurns();
+  if (existing && existing.length > 0) {
+    return { history: derivedModelSeed(existing), importedCount: 0, source: "spine" };
   }
-  const block = formatHistoryMessages(messages, 6, 12e3);
-  if (!block) return userPart;
-  if (userPart.includes("Prior assistant output")) {
-    return userPart;
+  if (legacySeed.length === 0) {
+    return { history: [], importedCount: 0, source: "spine" };
   }
-  return `${block}
-
-## Current user request
-${userPart}`;
-}
-function buildAgentUserWithHistory(task, prior) {
-  const messages = prior ?? [];
-  const anchored = maybeAnchorShortAnswer(task);
-  if (anchored) return anchored;
-  return buildContinueUserMessage(task, messages, { maxPriorChars: 8e3 }) ?? task;
-}
-function truncate(s, max) {
-  const t = s.replace(/\s+/g, " ").trim();
-  if (t.length <= max) return t;
-  return `${t.slice(0, max - 1)}\u2026`;
-}
-function _resetConversationContextForTests() {
-  history = [];
-  lastClarification = null;
-  clearSessionTodos();
-  clearSessionPermissionGrants();
-}
-var history, lastClarification, SHORT_CONTINUE, SHORT_CONTINUE_LOOSE;
-var init_conversationContext = __esm({
-  "src/cli/hooks/conversationContext.ts"() {
-    "use strict";
-    init_toolPermissions();
-    init_sessionTodos();
-    init_historyCompaction();
-    init_requestSnapshotStore();
-    init_observationStore();
-    history = [];
-    lastClarification = null;
-    SHORT_CONTINUE = /^(procedi|continua|continue|go\s*ahead|go|ok|okay|sì|si|yes|vai|avanti|next|proceed|conferma|confermo|applica|fai|scrivi|esegui|implementa|vai pure|fai pure|ok procedi|sì procedi|si procedi)$/i;
-    SHORT_CONTINUE_LOOSE = /\b(procedi|continua|continue|conferma|confermo|applica|implementa|scriv[ia]|esegui|vai pure|fai pure|go ahead|proceed)\b/i;
+  for (const m of legacySeed) {
+    if (m.role === "user") {
+      mirror.userMessage(m.content);
+    } else {
+      mirror.assistantMessage(m.content, { imported: "legacy-history" });
+    }
   }
-});
-
-// src/cli/phaseState.ts
-var phaseState_exports = {};
-__export(phaseState_exports, {
-  _resetPhaseForTests: () => _resetPhaseForTests,
-  getPhase: () => getPhase,
-  setPhase: () => setPhase
-});
-function getPhase() {
-  return phase;
+  await mirror.flush();
+  const derived = await mirror.derivedPriorTurns() ?? [];
+  return {
+    history: derivedModelSeed(derived),
+    importedCount: legacySeed.length,
+    source: "spine-import"
+  };
 }
-function setPhase(next) {
-  phase = next;
+function filterLegacySeed(legacy) {
+  return (legacy ?? []).filter((m) => m.role === "user" || m.role === "assistant").map(
+    (m) => m.role === "assistant" && m.content ? {
+      role: "assistant",
+      content: cleanAgentContent(m.content, {
+        stripQuestion: false,
+        stripThink: false
+      })
+    } : { role: m.role, content: m.content ?? "" }
+  ).filter((m) => (m.content ?? "").trim().length > 0);
 }
-function _resetPhaseForTests() {
-  phase = "build";
+function derivedModelSeed(derived) {
+  return derivedToAgentMessages(derived).map(
+    (m) => m.role === "system" ? { ...m, role: "user" } : m
+  ).map(
+    (m) => m.role === "assistant" && m.content ? {
+      ...m,
+      content: cleanAgentContent(m.content, {
+        stripQuestion: false,
+        stripThink: false
+      }),
+      ...m.seq !== void 0 ? { seq: m.seq } : {}
+    } : m
+  ).filter((m) => m.role === "user" || m.role === "assistant").filter((m) => (m.content ?? "").trim().length > 0);
 }
-var phase;
-var init_phaseState = __esm({
-  "src/cli/phaseState.ts"() {
+var init_headlessSpine = __esm({
+  "src/cli/headlessSpine.ts"() {
     "use strict";
-    phase = "build";
+    init_dist();
+    init_session();
+    init_mission2();
+    init_runtime2();
+    init_sessionSpine();
+    init_headless();
   }
 });
 
@@ -56992,9 +57548,6 @@ function strictGateEventPayload(evaluation) {
   };
 }
 
-// src/cli/hooks/useChatTurn.ts
-init_headlessSpine();
-
 // src/cli/hooks/permissionPicker.ts
 init_toolPermissions();
 
@@ -57143,6 +57696,15 @@ init_envNumber();
 init_historyCompaction();
 init_observationStore();
 init_capabilities();
+function mergeCompactRange(into, r) {
+  if (r.fromSeq !== void 0 && r.toSeq !== void 0) {
+    into.fromSeq = into.fromSeq === void 0 ? r.fromSeq : Math.min(into.fromSeq, r.fromSeq);
+    into.toSeq = into.toSeq === void 0 ? r.toSeq : Math.max(into.toSeq, r.toSeq);
+    if (r.sourceEventSeqs) into.sourceSeqs.push(...r.sourceEventSeqs);
+  }
+  if (r.strategy === "llm") into.strategy = "llm";
+  else if (r.strategy && !into.strategy) into.strategy = r.strategy;
+}
 function estimateTokens(text) {
   if (!text) return 0;
   return Math.max(1, Math.ceil(text.length / 4));
@@ -57186,21 +57748,23 @@ async function applyBudgetPolicyAsync(history2, phase2, opts) {
   const warnings = [];
   let { historyTurns, maxToolLoopIterations } = phaseKnobs(phase2);
   const envelope = opts?.requestSnapshot ?? null;
-  const replayBase = envelope ? {
-    provider: envelope.snapshot.provider,
-    model: envelope.snapshot.model,
-    systemMessages: envelope.snapshot.systemMessages,
-    tools: envelope.snapshot.tools
+  const surface = envelope?.snapshot ?? opts?.requestSurface ?? null;
+  const replayBase = surface ? {
+    provider: surface.provider,
+    model: surface.model,
+    systemMessages: surface.systemMessages,
+    tools: surface.tools
   } : opts?.providerStream ? { provider: "local", model: opts?.model ?? "unknown", systemMessages: [], tools: [] } : null;
-  const headerTokens = envelope ? estimateSystemTokensLite(envelope.snapshot.systemMessages) + estimateToolSchemaTokensLite(envelope.snapshot.tools) : 0;
+  const headerTokens = surface ? estimateSystemTokensLite(surface.systemMessages) + estimateToolSchemaTokensLite(surface.tools) : 0;
   const convTokensOf = (h) => estimateConversationTokensLite(h);
   let hist = history2;
-  let estimated = envelope ? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS : estimateHistoryTokens(hist) + sessionExtra;
+  let estimated = surface ? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS : estimateHistoryTokens(hist) + sessionExtra;
   let occupancy = Math.min(1, estimated / contextLimit);
   let compactSummary = "";
   let messagesRemoved = 0;
   let cacheReuseExpected;
   let prunedTotal = 0;
+  const compactRange = { sourceSeqs: [] };
   if (occupancy >= compact.warnAt && occupancy < compact.compactAt) {
     warnings.push(
       `[budget] context ~${Math.round(occupancy * 100)}% full (${estimated}/${contextLimit} tok full-request est.) \u2014 consider /compact or shorter replies.`
@@ -57211,7 +57775,7 @@ async function applyBudgetPolicyAsync(history2, phase2, opts) {
     if (pruned.stats.pruned > 0) {
       hist = pruned.messages;
       prunedTotal += pruned.stats.pruned;
-      estimated = envelope ? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS : estimateHistoryTokens(hist) + sessionExtra;
+      estimated = surface ? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS : estimateHistoryTokens(hist) + sessionExtra;
       occupancy = Math.min(1, estimated / contextLimit);
       warnings.push(
         `[budget] pruned ${pruned.stats.pruned} oversized tool result(s) \u2192 ${Math.round(occupancy * 100)}% (${estimated} tok).`
@@ -57223,11 +57787,12 @@ async function applyBudgetPolicyAsync(history2, phase2, opts) {
     if (r.compacted) {
       messagesRemoved += r.messagesRemoved;
       if (r.summary) compactSummary = r.summary;
+      mergeCompactRange(compactRange, r);
       if (r.cacheReuseExpected !== void 0) {
         cacheReuseExpected = r.cacheReuseExpected;
       }
     }
-    estimated = envelope ? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS : estimateHistoryTokens(hist) + sessionExtra;
+    estimated = surface ? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS : estimateHistoryTokens(hist) + sessionExtra;
     occupancy = Math.min(1, estimated / contextLimit);
     warnings.push(
       `[budget] ${label} \u2014 kept ~${forcedTurns} turns (${estimated} tok est.` + (r.messagesRemoved ? `, removed ${r.messagesRemoved} msgs` : "") + (r.cacheReuseExpected === false ? ", cache reuse NOT expected (model override)" : "") + ")."
@@ -57283,12 +57848,18 @@ async function applyBudgetPolicyAsync(history2, phase2, opts) {
     warnings,
     maxToolLoopIterations,
     historyTurns,
-    estimatedHistoryTokens: envelope ? convTokensOf(hist) : estimated,
+    estimatedHistoryTokens: surface ? convTokensOf(hist) : estimated,
     contextLimit,
     occupancy,
     compactSummary: compactSummary || void 0,
     messagesRemoved: messagesRemoved || void 0,
-    ...envelope ? { contextPressureTokens: estimated } : {},
+    ...compactRange.fromSeq !== void 0 && compactRange.toSeq !== void 0 ? {
+      compactedFromSeq: compactRange.fromSeq,
+      compactedToSeq: compactRange.toSeq,
+      compactSourceSeqs: compactRange.sourceSeqs,
+      compactStrategy: compactRange.strategy
+    } : {},
+    ...surface ? { contextPressureTokens: estimated } : {},
     ...cacheReuseExpected !== void 0 ? { cacheReuseExpected } : {},
     ...cacheMetricsLine ? { cacheMetricsLine } : {}
   };
@@ -57323,6 +57894,231 @@ function estimateConversationTokensLite(messages) {
   return n;
 }
 
+// src/cli/budget/requestMeter.ts
+init_harness();
+function estimateTokensLocal(text) {
+  if (!text) return 0;
+  return Math.max(1, Math.ceil(text.length / 4));
+}
+var MESSAGE_OVERHEAD_TOKENS = 4;
+function estimateMessageTokens(m) {
+  let n = MESSAGE_OVERHEAD_TOKENS + estimateTokensLocal(m.content ?? "");
+  if (m.toolCalls) {
+    for (const tc of m.toolCalls) {
+      n += estimateTokensLocal(tc.name) + estimateTokensLocal(tc.id);
+      n += estimateTokensLocal(JSON.stringify(tc.args ?? {}));
+    }
+  }
+  if (m.reasoningContent) n += estimateTokensLocal(m.reasoningContent);
+  if (m.toolCallId) n += estimateTokensLocal(m.toolCallId);
+  return n;
+}
+function estimateToolSchemaTokens(tools) {
+  let n = 0;
+  for (const t of tools) {
+    n += estimateTokensLocal(t.name) + estimateTokensLocal(t.description ?? "");
+    n += estimateTokensLocal(JSON.stringify(t.parameters ?? {}));
+  }
+  return n + tools.length * MESSAGE_OVERHEAD_TOKENS;
+}
+function estimateSystemTokens(systemMessages) {
+  let n = 0;
+  for (const m of systemMessages) n += estimateMessageTokens(m);
+  return n;
+}
+function estimateConversationTokens(conversation) {
+  let n = 0;
+  for (const m of conversation) n += estimateMessageTokens(m);
+  return n;
+}
+function createFingerprintOnly(input) {
+  return sha256Hex(
+    stableStringify({
+      provider: input.provider,
+      model: input.model,
+      systemMessages: input.systemMessages,
+      tools: canonicalTools(input.tools)
+    })
+  );
+}
+function measureRequest(input) {
+  const estimatedHeaderTokens = estimateSystemTokens(input.systemMessages) + estimateToolSchemaTokens(input.tools);
+  const currentConversationTokens = estimateConversationTokens(input.conversation);
+  let headerAnchored = false;
+  let headerTokens = estimatedHeaderTokens;
+  const anchorUsage = input.anchor?.usage;
+  const anchorSnapshot = input.anchor?.snapshot;
+  if (anchorUsage && anchorSnapshot) {
+    const currentHeaderFp = createFingerprintOnly({
+      provider: anchorSnapshot.provider,
+      model: anchorSnapshot.model,
+      systemMessages: input.systemMessages,
+      tools: input.tools
+    });
+    if (currentHeaderFp === anchorSnapshot.headerFingerprint) {
+      const anchorConv = estimateConversationTokens(anchorSnapshot.conversation);
+      const headerFromUsage = Math.max(0, anchorUsage.promptTokens - anchorConv);
+      if (headerFromUsage > 0) {
+        headerTokens = headerFromUsage;
+        headerAnchored = true;
+      }
+    }
+  }
+  const estimatedPromptTokens = headerTokens + currentConversationTokens;
+  const reservedOutput = input.reservedOutputTokens ?? 0;
+  const contextPressureTokens = estimatedPromptTokens + reservedOutput;
+  return {
+    estimatedPromptTokens,
+    estimatedHeaderTokens,
+    headerAnchored,
+    contextPressureTokens,
+    occupancy: Math.min(1, contextPressureTokens / input.contextLimit),
+    purpose: input.purpose ?? "conversation"
+  };
+}
+
+// src/cli/budget/persistCompact.ts
+init_dist();
+init_session();
+init_headlessSpine();
+function compactEventPayload(budget, stateSnapshot, telemetry) {
+  const summary = budget.compactSummary ?? "";
+  const first = budget.history[0];
+  const narrative = first?.role === "user" && first.content.includes("<compacted-summary>") ? first.content : summary;
+  const checkpointContent2 = stateSnapshot ? formatCompactionStateSnapshot(stateSnapshot) + "\n\n" + narrative : narrative;
+  const ranged = budget.compactedFromSeq !== void 0 && budget.compactedToSeq !== void 0;
+  return {
+    summary,
+    messagesRemoved: budget.messagesRemoved ?? 0,
+    ...telemetry ? { ...telemetry } : {},
+    ...ranged ? {
+      fromSeq: budget.compactedFromSeq,
+      toSeq: budget.compactedToSeq,
+      checkpoint: { role: "user", content: checkpointContent2 },
+      ...budget.compactStrategy ? { strategy: budget.compactStrategy } : {},
+      ...budget.compactSourceSeqs && budget.compactSourceSeqs.length > 0 ? { sourceEventSeqs: budget.compactSourceSeqs } : {},
+      ...stateSnapshot ? {
+        retainedCriterionIds: stateSnapshot.activeCriteria.filter((criterion) => criterion.required).map((criterion) => criterion.id),
+        retainedEvidenceRefs: stateSnapshot.retainedEvidenceRefs,
+        retainedState: {
+          unresolvedIssueIds: stateSnapshot.unresolvedIssues.map((issue2) => issue2.id),
+          affectedFiles: stateSnapshot.affectedFiles,
+          ...stateSnapshot.missionState?.phase ? { missionStateRef: "phase:" + stateSnapshot.missionState.phase } : {}
+        },
+        stateSnapshot
+      } : {}
+    } : {}
+  };
+}
+
+// src/cli/budget/modelContextBuilder.ts
+init_headlessSpine();
+function messageWasRecompacted(message, history2) {
+  if (message.compactedFromSeq === void 0) return false;
+  return !history2.some((candidate) => candidate.seq !== void 0 && candidate.seq === message.seq);
+}
+async function sessionHistory(session) {
+  if (!session || session.status !== "active") return null;
+  const derived = await session.derivedPriorTurns();
+  if (!derived || derived.length === 0) return null;
+  return derivedModelSeed(derived);
+}
+async function buildModelContext(input) {
+  const derived = await sessionHistory(input.session);
+  const source = derived ? "session" : "fallback";
+  const sourceHistory = derived ?? [...input.fallbackHistory];
+  const inputTokens = estimateHistoryTokens(sourceHistory);
+  const requestSurface = input.systemMessages || input.tools ? {
+    provider: input.provider ?? "local",
+    model: input.model ?? "unknown",
+    systemMessages: input.systemMessages ?? [],
+    tools: input.tools ?? []
+  } : null;
+  let budget = await applyBudgetPolicyAsync(sourceHistory, input.phase, {
+    model: input.model,
+    sessionTokens: input.sessionTokens,
+    sessionId: input.sessionId,
+    signal: input.signal,
+    requestSnapshot: input.requestSnapshot,
+    requestSurface,
+    providerStream: input.providerStream
+  });
+  let history2 = budget.history;
+  let compactionPayload;
+  let durableCompaction = false;
+  let reconstructedFromSession = false;
+  let compactionMetrics;
+  if ((budget.messagesRemoved ?? 0) > 0) {
+    const ranged = budget.compactedFromSeq !== void 0 && budget.compactedToSeq !== void 0;
+    const stateSnapshot = ranged && input.session?.compactionStateSnapshot ? await input.session.compactionStateSnapshot(budget.compactedToSeq) : null;
+    const outputTokens = estimateHistoryTokens(budget.history);
+    const telemetry = {
+      inputTokens,
+      outputTokens,
+      savedTokens: Math.max(0, inputTokens - outputTokens),
+      recompactionRate: sourceHistory.some(
+        (message) => messageWasRecompacted(message, budget.history)
+      ) ? 1 : 0,
+      summaryStrategy: budget.compactStrategy ?? "extractive",
+      ...budget.compactStrategy === "llm" && input.provider ? { provider: input.provider } : {},
+      ...budget.compactStrategy === "llm" && input.model ? { model: input.model } : {}
+    };
+    compactionPayload = compactEventPayload(budget, stateSnapshot, telemetry);
+    if (input.persistCompaction) {
+      await input.persistCompaction(compactionPayload, budget);
+      await input.session?.flush?.();
+      if (ranged && input.session?.status === "active") {
+        const replayed = await sessionHistory(input.session);
+        if (replayed) {
+          history2 = replayed;
+          durableCompaction = true;
+          reconstructedFromSession = true;
+        }
+      }
+    }
+    compactionMetrics = {
+      count: 1,
+      ...telemetry,
+      restoreFailures: ranged && input.persistCompaction && !reconstructedFromSession ? 1 : 0
+    };
+    input.onCompactionMetric?.(compactionMetrics);
+  }
+  if (requestSurface) {
+    const measured = measureRequest({
+      systemMessages: requestSurface.systemMessages,
+      tools: requestSurface.tools,
+      conversation: history2,
+      anchor: input.requestSnapshot,
+      contextLimit: budget.contextLimit,
+      reservedOutputTokens: 8192
+    });
+    budget = {
+      ...budget,
+      history: history2,
+      estimatedHistoryTokens: estimateHistoryTokens(history2),
+      occupancy: measured.occupancy,
+      contextPressureTokens: measured.contextPressureTokens
+    };
+  } else {
+    const estimated = estimateHistoryTokens(history2);
+    budget = {
+      ...budget,
+      history: history2,
+      estimatedHistoryTokens: estimated,
+      occupancy: Math.min(1, estimated / budget.contextLimit)
+    };
+  }
+  return {
+    history: history2,
+    budget,
+    source,
+    ...compactionPayload ? { compactionPayload } : {},
+    ...compactionMetrics ? { compactionMetrics } : {},
+    durableCompaction,
+    reconstructedFromSession
+  };
+}
+
 // src/cli/hooks/useChatTurn.ts
 init_requestSnapshotStore();
 function useChatTurn(params) {
@@ -57358,19 +58154,7 @@ function useChatTurn(params) {
       try {
         const anchored = maybeAnchorShortAnswer(userText);
         const effectiveUserText = anchored ?? userText;
-        let historyForModel;
-        {
-          const mirror = writerRef.current?.spine ?? null;
-          let spineSeed = null;
-          if (mirror && mirror.status === "active") {
-            const derived = await mirror.derivedPriorTurns();
-            if (derived && derived.length > 0) {
-              spineSeed = derivedModelSeed(derived);
-            }
-          }
-          historyForModel = spineSeed ?? getHistory();
-        }
-        writerRef.current?.spine?.userMessage(effectiveUserText);
+        let historyForModel = getHistory();
         const localCli = (process.env.ZELARI_LOCAL_CLI ?? "").trim();
         let localCliProvider = null;
         if (localCli) {
@@ -57499,33 +58283,42 @@ _(${req.context})_` : "") + "\n\u2192 scegli dalla lista (il turno continua dopo
           });
         }
         const cwd = process.cwd();
-        const budget = await applyBudgetPolicyAsync(historyForModel, getPhase(), {
+        const requestSnapshot = getRequestSnapshotWithUsage(sessionId2);
+        const modelContext = await buildModelContext({
+          fallbackHistory: historyForModel,
+          session: writerRef.current?.spine ?? null,
+          phase: workPhase,
           model: getActiveModel(),
+          provider: envConfig?.providerId ?? (localCli || "local"),
           sessionId: sessionId2,
-          // v1.36.0: envelope for full-request metering + cache-aware
-          // compaction replay (last warm prefix + provider usage anchor).
-          requestSnapshot: getRequestSnapshotWithUsage(sessionId2),
-          providerStream
+          requestSnapshot,
+          providerStream,
+          onCompactionMetric: (metrics2) => recordCompactionMetrics(
+            sessionId2,
+            envConfig?.providerId ?? (localCli || "local"),
+            getActiveModel(),
+            metrics2
+          ),
+          persistCompaction: async (payload, compactBudget) => {
+            const compactionEvent = createBrainEvent("session_compacted", sessionId2, {
+              ...payload,
+              ...requestSnapshot ? {
+                sourceRequestFingerprint: requestSnapshot.snapshot.requestFingerprint,
+                headerFingerprint: requestSnapshot.snapshot.headerFingerprint
+              } : {},
+              ...compactBudget.contextPressureTokens !== void 0 ? { sourceEstimatedTokens: compactBudget.contextPressureTokens } : {},
+              ...compactBudget.cacheReuseExpected !== void 0 ? { cacheReuseExpected: compactBudget.cacheReuseExpected } : {}
+            });
+            await writerRef.current?.append(compactionEvent);
+          }
         });
-        setHistory(budget.history);
-        for (const w of budget.warnings) {
-          appendSystem(setMessages, w, Date.now());
-        }
-        if ((budget.messagesRemoved ?? 0) > 0) {
-          const envelope = getRequestSnapshotWithUsage(sessionId2);
-          const compactionEvent = createBrainEvent("session_compacted", sessionId2, {
-            summary: budget.compactSummary ?? "",
-            messagesRemoved: budget.messagesRemoved ?? 0,
-            ...envelope ? {
-              sourceRequestFingerprint: envelope.snapshot.requestFingerprint,
-              headerFingerprint: envelope.snapshot.headerFingerprint
-            } : {},
-            ...budget.contextPressureTokens !== void 0 ? { sourceEstimatedTokens: budget.contextPressureTokens } : {},
-            ...budget.cacheReuseExpected !== void 0 ? { cacheReuseExpected: budget.cacheReuseExpected } : {}
-          });
-          void writerRef.current?.append(compactionEvent);
+        const budget = modelContext.budget;
+        historyForModel = modelContext.history;
+        setHistory(historyForModel);
+        for (const warning of budget.warnings) {
+          appendSystem(setMessages, warning, Date.now());
         }
-        historyForModel = budget.history;
+        writerRef.current?.spine?.userMessage(effectiveUserText);
         historySeedLen = historyForModel.length;
         let composedWorkspace = "";
         let composedInstructions = "";
@@ -58164,33 +58957,33 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
     return { completionOk: false, ran: false };
   }
   setBusy(true);
-  let councilHistory = getHistory();
-  {
-    const mirror = writerRef.current?.spine ?? null;
-    if (mirror && mirror.status === "active") {
-      const derived = await mirror.derivedPriorTurns();
-      if (derived && derived.length > 0) {
-        councilHistory = derivedModelSeed(derived);
-      }
+  const anchored = maybeAnchorShortAnswer(text);
+  const effectiveText = anchored ?? text;
+  const councilContext = await buildModelContext({
+    fallbackHistory: getHistory(),
+    session: writerRef.current?.spine ?? null,
+    phase: getPhase(),
+    model: envConfig.model,
+    provider: envConfig.providerId,
+    sessionId: sessionId2,
+    onCompactionMetric: (metrics) => recordCompactionMetrics(
+      sessionId2,
+      envConfig.providerId,
+      envConfig.model,
+      metrics
+    ),
+    persistCompaction: async (payload) => {
+      await writerRef.current?.append(
+        createBrainEvent("session_compacted", sessionId2, payload)
+      );
     }
-  }
-  const councilBudget = await applyBudgetPolicyAsync(councilHistory, getPhase(), {
-    model: envConfig.model
   });
-  setHistory(councilBudget.history);
-  for (const w of councilBudget.warnings) {
-    appendSystem(setMessages, w, Date.now());
-  }
-  if ((councilBudget.messagesRemoved ?? 0) > 0) {
-    void writerRef.current?.append(
-      createBrainEvent("session_compacted", sessionId2, {
-        summary: councilBudget.compactSummary ?? "",
-        messagesRemoved: councilBudget.messagesRemoved ?? 0
-      })
-    );
+  const councilBudget = councilContext.budget;
+  setHistory(councilContext.history);
+  for (const warning of councilBudget.warnings) {
+    appendSystem(setMessages, warning, Date.now());
   }
-  const anchored = maybeAnchorShortAnswer(text);
-  const effectiveText = anchored ?? text;
+  writerRef.current?.spine?.userMessage(effectiveText);
   appendSystem(
     setMessages,
     `[phase] ${describePhase(getPhase())}`,
@@ -63204,6 +63997,7 @@ async function runAdvisoryVerifierReview(evaluation, deps = {}) {
 }
 
 // src/cli/runHeadless.ts
+init_metrics2();
 init_headlessSpine();
 async function runHeadless(opts) {
   resetTaskSpawnCount();
@@ -63539,7 +64333,6 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
   });
   const seededHistory = await seedHeadlessModelHistory(spine, opts.history);
   emitEvent(sessionStartedEvent(spine));
-  if (opts.task) spine.userMessage(opts.task);
   resetKrakenCandidates();
   resetKrakenTurnMetrics();
   const { registry: toolRegistry } = createBuiltinToolRegistry({
@@ -63689,14 +64482,38 @@ async function runHeadlessSingle(opts, provider, model, providerStream) {
       }
     ];
   }
-  const historySeed = seededHistory.history;
+  const modelContext = await buildModelContext({
+    fallbackHistory: seededHistory.history,
+    session: spine.spine,
+    phase: opts.phase ?? "build",
+    model,
+    provider,
+    systemMessages,
+    tools,
+    sessionId: spine.sessionId,
+    providerStream,
+    onCompactionMetric: (metrics) => recordCompactionMetrics(spine.sessionId, provider, model, metrics),
+    persistCompaction: async (payload) => {
+      await spine.appendEvent({
+        kind: "session.compacted",
+        actor: { type: "system" },
+        data: { ...payload }
+      });
+    }
+  });
+  const historySeed = modelContext.history;
+  for (const warning of modelContext.budget.warnings) {
+    if (opts.output === "json") emitEvent({ type: "log", message: warning });
+    else process.stderr.write("[zelari-code --headless] " + warning + "\n");
+  }
   const effectiveTask = buildAgentUserWithHistory(opts.task, historySeed);
+  if (opts.task) spine.userMessage(effectiveTask);
   const maxToolLoop = (() => {
     const n = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_ITERATIONS, {
       default: 30,
       min: 1
     });
-    return n;
+    return Math.min(n, modelContext.budget.maxToolLoopIterations);
   })();
   async function runSinglePass(messages, passSessionId) {
     const harness = new AgentHarness({
@@ -63997,7 +64814,6 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
   });
   const seededHistory = await seedHeadlessModelHistory(spine, opts.history);
   emitEvent(sessionStartedEvent(spine));
-  if (opts.task) spine.userMessage(opts.task);
   const { shouldAllowCouncilBuild: shouldAllowCouncilBuild2 } = await Promise.resolve().then(() => (init_buildPolicy(), buildPolicy_exports));
   let councilRunMode = planModeFromOpts(opts) ? "design-phase" : "implementation";
   let softGated = false;
@@ -64014,8 +64830,36 @@ async function runHeadlessCouncil(opts, provider, model, providerStream) {
   );
   const { FeedbackStore: FeedbackStore2 } = await Promise.resolve().then(() => (init_councilFeedback(), councilFeedback_exports));
   const feedbackStore = new FeedbackStore2();
-  const historySeed = seededHistory.history;
+  const contextTools = toolRegistry.toOpenAITools().map((tool) => ({
+    name: tool.function.name,
+    description: tool.function.description,
+    parameters: tool.function.parameters
+  }));
+  const councilContext = await buildModelContext({
+    fallbackHistory: seededHistory.history,
+    session: spine.spine,
+    phase: councilRunMode === "design-phase" ? "plan" : "build",
+    model,
+    provider,
+    tools: contextTools,
+    sessionId: spine.sessionId,
+    providerStream,
+    onCompactionMetric: (metrics) => recordCompactionMetrics(spine.sessionId, provider, model, metrics),
+    persistCompaction: async (payload) => {
+      await spine.appendEvent({
+        kind: "session.compacted",
+        actor: { type: "system" },
+        data: { ...payload }
+      });
+    }
+  });
+  const historySeed = councilContext.history;
+  for (const warning of councilContext.budget.warnings) {
+    if (opts.output === "json") emitEvent({ type: "log", message: warning });
+    else process.stderr.write("[zelari-code --headless] " + warning + "\n");
+  }
   const effectiveTask = buildCouncilTaskWithHistory(opts.task, historySeed);
+  if (opts.task) spine.userMessage(effectiveTask);
   let exitCode = 0;
   const scrub = createStreamScrubber2();
   let lastAssistantText = "";
@@ -64125,7 +64969,6 @@ async function runHeadlessZelari(opts, provider, model, providerStream) {
   });
   const seededHistory = await seedHeadlessModelHistory(spine, opts.history);
   emitEvent(sessionStartedEvent(spine));
-  if (opts.task) spine.userMessage(opts.task);
   spine.missionPhase("design", "mission-start");
   const { buildMissionBrief: buildMissionBrief2 } = await Promise.resolve().then(() => (init_council(), council_exports));
   const { hasWorkspacePlan: hasWorkspacePlan2 } = await Promise.resolve().then(() => (init_planDetect(), planDetect_exports));
@@ -64157,8 +65000,33 @@ async function runHeadlessZelari(opts, provider, model, providerStream) {
       process.stderr.write(message + "\n");
     }
   };
-  const historySeed = seededHistory.history;
+  const contextTools = toolRegistry.toOpenAITools().map((tool) => ({
+    name: tool.function.name,
+    description: tool.function.description,
+    parameters: tool.function.parameters
+  }));
+  const missionContext = await buildModelContext({
+    fallbackHistory: seededHistory.history,
+    session: spine.spine,
+    phase: opts.phase ?? "build",
+    model,
+    provider,
+    tools: contextTools,
+    sessionId: spine.sessionId,
+    providerStream,
+    onCompactionMetric: (metrics) => recordCompactionMetrics(spine.sessionId, provider, model, metrics),
+    persistCompaction: async (payload) => {
+      await spine.appendEvent({
+        kind: "session.compacted",
+        actor: { type: "system" },
+        data: { ...payload }
+      });
+    }
+  });
+  const historySeed = missionContext.history;
+  for (const warning of missionContext.budget.warnings) emit(warning);
   const missionTask = buildCouncilTaskWithHistory(opts.task, historySeed);
+  if (opts.task) spine.userMessage(missionTask);
   emit(`[zelari] mission brief
 ${JSON.stringify({ deliverable: brief.deliverableThisMission, mvp: brief.sliceMvp?.title }, null, 0)}`);
   if (buildViaAgent) {