@iowarp/clio-coder 0.3.3 → 0.3.4

package/dist/{orchestrator-EM5MC3HM.js → orchestrator-ORHT43JB.js}

@@ -1,10 +1,27 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  ShareDomainModule
+} from "./chunk-WR67VIZY.js";
 import {
   bootstrapInputFromInitOptions,
   modelBootstrapGenerate,
   resolveBootstrapRoute
-} from "./chunk-FNTMWMX5.js";
+} from "./chunk-HV5X7OR2.js";
 import "./chunk-J5Q24KAG.js";
+import {
+  DEFAULT_KEEP_RECENT_TOKENS,
+  DEFAULT_RESERVE_TOKENS,
+  buildEvictionFields,
+  calculateContextTokens,
+  compactionCut,
+  estimateTokens,
+  findCutPoint,
+  getLastAssistantUsage,
+  planEviction,
+  projectWorkingSet,
+  resolveWorkingSetPolicy,
+  selectVisibleEntries
+} from "./chunk-TW3WDMVS.js";
 import {
   assistantSessionPayload,
   backendCacheVerdict,
@@ -37,37 +54,34 @@ import {
   toolNamesFromAgentState,
   toolResultSummary,
   toolSignatureFromState
-} from "./chunk-DSELYM6W.js";
+} from "./chunk-MEQ45TQ4.js";
 import {
   SchedulingDomainModule,
   createPromptsDomainModule,
   renderAgentCatalogSectionsFromSpecs
-} from "./chunk-LM5TQCJZ.js";
-import {
-  ShareDomainModule
-} from "./chunk-ORBHGJC5.js";
+} from "./chunk-3HZ5RWN2.js";
 import {
   AgentsDomainModule,
   SafetyDomainModule
-} from "./chunk-PAJK6MAQ.js";
+} from "./chunk-X6COSD2O.js";
 import {
   LifecycleDomainModule,
   describeUpgradeNotice
-} from "./chunk-5UFT4SUX.js";
+} from "./chunk-K6WL7QZT.js";
+import {
+  ensureClioState,
+  takeUpgradeNotice
+} from "./chunk-VAWWTKDP.js";
 import {
   ConfigDomainModule,
   createConfigDomainModule,
   loadDomains
-} from "./chunk-OC7FIQPC.js";
-import {
-  ensureClioState,
-  takeUpgradeNotice
-} from "./chunk-UFIIWP2H.js";
+} from "./chunk-KRPY7NTG.js";
 import {
   compileScoutTransition,
   createDispatchRunEventRegistry
-} from "./chunk-6SGHMWE3.js";
-import "./chunk-XBXAASKX.js";
+} from "./chunk-N4CZJQRK.js";
+import "./chunk-EFADSJET.js";
 import {
   monitorToolSurface
 } from "./chunk-FJ3H4MN5.js";
@@ -78,7 +92,7 @@ import {
   costAggregateForAmount,
   formatCostAggregate,
   readAccountabilitySummary
-} from "./chunk-4XUGQOHA.js";
+} from "./chunk-35MKKU5R.js";
 import "./chunk-HC4CLZ2Y.js";
 import "./chunk-HFSBBKSQ.js";
 import {
@@ -88,11 +102,11 @@ import {
   flushRawStdout,
   writeRawStdout
 } from "./chunk-2VTFPG5O.js";
-import "./chunk-CBCAPZAA.js";
+import "./chunk-E25LMLRW.js";
 import {
   createContextDomainModule,
   loadProjectClioMd
-} from "./chunk-PIWWS5BL.js";
+} from "./chunk-UZHIZC5S.js";
 import {
   renderCodewikiDigest
 } from "./chunk-5WIGXA4T.js";
@@ -107,7 +121,7 @@ import {
   taskMemoryBankSize,
   taskMemoryHandoffSeedOffer,
   taskMemoryTracePath
-} from "./chunk-V6RTAOC2.js";
+} from "./chunk-BRXQQJFP.js";
 import {
   ACP_MAX_CHUNK_BYTES,
   ACP_MAX_RAW_RECORD_BYTES,
@@ -118,31 +132,31 @@ import {
   ACP_USAGE_META_KEY,
   AcpRequestError,
   AcpTimeoutError,
-  SessionDomainModule,
   WORKER_OUTPUT_MAX_BYTES,
   acpErrorMessage,
-  collectSessionEntries,
   createDispatchDomainModule,
   createRunReceiptQuality,
   createStdioServerTransport,
   durableAssistantTextFromEvent,
   evidenceDirectory,
-  filterEntriesToActivePath,
   inspectEvidence,
   isGitRepository,
-  ledgerUsageCalls,
   listEvidenceOverviews,
   openLedger,
-  protectedArtifactEntryFromArtifact,
-  protectedArtifactStateFromSessionEntries,
   protectedResidencyModels,
-  readAuditRows,
   readGateDecisionArtifacts,
   readPendingGateDecisions,
   recoverCleanupReadyCompeteGroups,
   requireAgentSteps
-} from "./chunk-SRDMMSEP.js";
-import "./chunk-4BJ5BYCE.js";
+} from "./chunk-QQL5RT5M.js";
+import {
+  SessionDomainModule,
+  collectSessionEntries,
+  ledgerUsageCalls,
+  protectedArtifactEntryFromArtifact,
+  protectedArtifactStateFromSessionEntries,
+  readAuditRows
+} from "./chunk-QQK64KLB.js";
 import {
   parseRigorOverride,
   resolveRigor
@@ -150,8 +164,8 @@ import {
 import {
   isReceiptIntegrity,
   verifyReceiptIntegrity
-} from "./chunk-AGYYIBLL.js";
-import "./chunk-OOJYHWRB.js";
+} from "./chunk-3JLKSKD7.js";
+import "./chunk-34475P3I.js";
 import {
   shellQuote
 } from "./chunk-TXOTCRLG.js";
@@ -167,6 +181,16 @@ import {
   wikiStalenessAsync
 } from "./chunk-X4RCMKVQ.js";
 import "./chunk-MVVUPGPW.js";
+import {
+  buildRecallFields,
+  recallErrorMessage,
+  recallParentTurnId,
+  recallableRefListing,
+  resolveRecall
+} from "./chunk-VSNATDE6.js";
+import {
+  foldWorkingSet
+} from "./chunk-TZSKNMZG.js";
 import {
   createResourcesDomainModule
 } from "./chunk-MFFY33HR.js";
@@ -182,6 +206,9 @@ import "./chunk-2SFS6XQE.js";
 import {
   ExtensionsDomainModule
 } from "./chunk-ZWLZP4ZT.js";
+import {
+  filterEntriesToActivePath
+} from "./chunk-W6GROXXM.js";
 import {
   formatBootTrace,
   traceBoot
@@ -209,12 +236,10 @@ import {
   resolveSessionTools,
   sanitizeCallTargetText,
   sanitizeLockedSynthesisMessage
-} from "./chunk-LW6DSM3M.js";
+} from "./chunk-VMNQ6OZA.js";
 import {
-  HEADLESS_PERMISSION_DENIED_REASON,
-  combineBashOutput,
-  runBashCommand
-} from "./chunk-J7CWMCQD.js";
+  HEADLESS_PERMISSION_DENIED_REASON
+} from "./chunk-K7VKOLQQ.js";
 import {
   MIDDLEWARE_HOOK_TEXT_MAX_CHARS,
   MiddlewareDomainModule,
@@ -230,7 +255,7 @@ import {
   installUserHooks,
   openDetachedBatchViews,
   writeMiddlewareDiagnosticToStderr
-} from "./chunk-2DJ2KNFG.js";
+} from "./chunk-2LZI5CAG.js";
 import "./chunk-IR4CFBFN.js";
 import "./chunk-UOV2BYIW.js";
 import {
@@ -244,11 +269,11 @@ import {
   stringArg,
   timeoutMsArg,
   withResolvedDispatchPlan
-} from "./chunk-DUYJ5IO6.js";
+} from "./chunk-EDRHSCIE.js";
 import {
   TaskMemoryBank,
   createTaskMemoryTelemetrySink
-} from "./chunk-OAO4GE4M.js";
+} from "./chunk-2TZWSW76.js";
 import {
   DISPATCH_BRIEFING_MAX_BYTES,
   JUDGE_GATE_PROMPT,
@@ -257,53 +282,64 @@ import {
   approvedRouteCandidates,
   builtin,
   classifyResourceRead,
-  createTaskBoardStore,
-  foldSessionTaskHistory,
+  combineBashOutput,
   isToolProfileName,
+  runBashCommand,
   runKindSupportsLiveSteering,
-  taskBoardCounts,
   toolPresentationPolicy
-} from "./chunk-LWLEKMDQ.js";
+} from "./chunk-ZYKPLLNQ.js";
+import {
+  createTaskBoardStore,
+  foldSessionTaskHistory,
+  taskBoardCounts
+} from "./chunk-WPQLXFOZ.js";
 import {
   DEFAULT_AUTONOMY_LEVEL,
   DEFAULT_RECENT_ENTRY_LIMIT,
   assessFinishContract,
   parseScoutResult,
   resultContractSourceId
-} from "./chunk-STBPMHSX.js";
+} from "./chunk-7RXG6QRZ.js";
 import {
   agentRoleFactsResolver,
   defaultRoutingIntent,
   gateDeciderAgentId,
   requestExecutionRole,
   sameRouteIdentity
-} from "./chunk-GGXXDWE4.js";
+} from "./chunk-22NAGB7X.js";
+import "./chunk-AOCYTWAV.js";
 import {
   CLIO_PROJECT_DIR,
   toolMutationPaths
-} from "./chunk-5UUP6MWO.js";
+} from "./chunk-MV3K5QF2.js";
 import "./chunk-CMZWFGD2.js";
 import "./chunk-I4HZDVNP.js";
 import "./chunk-ZI647VB5.js";
-import "./chunk-TZK7PACC.js";
+import "./chunk-NILBFAPG.js";
+import "./chunk-FYYLNIL5.js";
 import {
   VERIFICATION_SCRIPT_FAMILY_HINT
-} from "./chunk-7MNJORFF.js";
+} from "./chunk-UL3WSD3F.js";
 import "./chunk-XN3L4EYL.js";
 import {
   escapeRegExp
 } from "./chunk-VG7TBQIY.js";
 import "./chunk-OQE5J4C6.js";
 import "./chunk-ECH6PKUQ.js";
-import "./chunk-OKGUZO2U.js";
+import "./chunk-SPULKLCF.js";
 import {
   SKILL_SUGGESTION_PREFIX,
   isSkillActivation,
   skillActivationFromToolDetails
-} from "./chunk-T6YILFSB.js";
+} from "./chunk-BEY543CS.js";
+import {
+  toolResultPresentationPolicy,
+  toolResultPresentationText
+} from "./chunk-5M54SPOL.js";
 import {
   formatSize
-} from "./chunk-VAKQQHWR.js";
+} from "./chunk-OZNBF4L3.js";
+import "./chunk-4BJ5BYCE.js";
 import {
   truncateUtf8
 } from "./chunk-6XLNIQDB.js";
@@ -332,38 +368,23 @@ import {
   InteropDomainModule,
   delegationEntryForKind,
   renderProposalEntry
-} from "./chunk-2TLUCQVG.js";
-import "./chunk-BMEMKKIT.js";
+} from "./chunk-RD5U66HV.js";
+import "./chunk-KOHPCX4K.js";
 import {
   source_default
 } from "./chunk-5TSRNF4G.js";
 import {
   AGENT_ROLE_TOOLS_REQUIRED_REASON,
-  AutoCompactionTrigger,
-  DEFAULT_COMPACTION_THRESHOLD,
   ProvidersDomainModule,
   VALID_THINKING_LEVELS,
-  appendContextSnapshot,
   applyModelCapabilityPatch,
-  buildContextLedger,
-  captureContextSnapshot,
-  ceilChars,
-  contentChars,
-  contextUsageSnapshot,
-  estimateAgentContextBreakdown,
-  estimateAgentContextTokens,
-  estimateAgentMessageTokens,
-  estimateReasoningTextTokens,
-  extractReasoningTokens,
   firstRuntimeResolutionError,
-  getLatestContextSnapshot,
   getRuntimeRegistry,
   isDispatchEligibleRuntime,
   isOrchestratorEligibleRuntime,
   modelCandidatesForStatus,
   modelIdsForStatus,
   modelResidencyForStatus,
-  reconcileSnapshot,
   refineRuntimeTargetWithModelHints,
   registerBuiltinRuntimes,
   resolveModelCapabilities,
@@ -375,13 +396,12 @@ import {
   runtimeResolutionWarnings,
   runtimeTargetSnapshot,
   setProtectedModelsProvider,
-  shouldCompact,
-  snapshotInputTokens,
   supportsAgentRoleTools,
   thinkingLevelChoiceLabel,
   thinkingLevelFromChoiceLabel,
   withRunOverrides
-} from "./chunk-LZSJBIVT.js";
+} from "./chunk-QWU7ZBO7.js";
+import "./chunk-CFGTUFWB.js";
 import {
   bindAgentProfileInSettings,
   readSettings,
@@ -390,28 +410,19 @@ import {
   setFleetProfileInSettings,
   updateSettings,
   useTargetInSettings
-} from "./chunk-A3CYT5EX.js";
+} from "./chunk-AD2SYQYC.js";
 import {
   DEFAULT_DELEGATION_PERMISSION_TIMEOUT_MS,
   DEFAULT_SETTINGS,
   THINKING_LEVELS
-} from "./chunk-ZDOOVTXZ.js";
+} from "./chunk-4OC57DA6.js";
+import "./chunk-LL4KHSZI.js";
 import {
   targetRequiresAuth
 } from "./chunk-4VP4KH3K.js";
-import {
-  atomicWrite,
-  cwdHash,
-  openSession,
-  readSessionTailTurns,
-  sessionCurrentPath,
-  sessionPaths
-} from "./chunk-M6SHUN7Q.js";
-import "./chunk-R346GLFC.js";
-import "./chunk-VPAYEGVX.js";
 import {
   setGitCommitAttributionEnabled
-} from "./chunk-COU2UHX6.js";
+} from "./chunk-VEZEGCGW.js";
 import {
   MAX_TIMER_DELAY_MS,
   rawDurationMs
@@ -421,11 +432,37 @@ import "./chunk-3I7MS7N2.js";
 import {
   interopAgentKind
 } from "./chunk-IHXBNWMM.js";
+import {
+  AutoCompactionTrigger,
+  DEFAULT_COMPACTION_THRESHOLD,
+  appendContextSnapshot,
+  buildContextLedger,
+  captureContextSnapshot,
+  ceilChars,
+  contentChars,
+  contextUsageSnapshot,
+  estimateAgentContextBreakdown,
+  estimateAgentContextTokens,
+  estimateReasoningTextTokens,
+  extractReasoningTokens,
+  getLatestContextSnapshot,
+  reconcileSnapshot,
+  shouldCompact,
+  snapshotInputTokens
+} from "./chunk-BPGS2WCQ.js";
 import "./chunk-SST6Z5JA.js";
+import {
+  atomicWrite,
+  cwdHash,
+  openSession,
+  readSessionTailTurns,
+  sessionCurrentPath,
+  sessionPaths
+} from "./chunk-FO5ZOVUY.js";
+import "./chunk-R346GLFC.js";
 import {
   configureGuardrails
 } from "./chunk-4ZG3XFUR.js";
-import "./chunk-APJ265NV.js";
 import {
   StringEnum,
   cleanupEngineSessionResources,
@@ -433,6 +470,7 @@ import {
   isEngineRetryableAssistantError,
   stream
 } from "./chunk-FCSXB6T2.js";
+import "./chunk-APJ265NV.js";
 import "./chunk-YXLYO42X.js";
 import {
   clioConfigDir,
@@ -503,12 +541,14 @@ import {
 } from "./chunk-ZWMF7253.js";
 import {
   getTerminationCoordinator
-} from "./chunk-TZTZS7QK.js";
+} from "./chunk-HXG4IURW.js";
+import {
+  getSharedBus
+} from "./chunk-ZGVHUX3M.js";
 import {
   BusChannels,
-  getSharedBus,
   isRunAbortedPayload
-} from "./chunk-OQ33BKR3.js";
+} from "./chunk-TTNYS3EA.js";
 import "./chunk-JVCV3ICN.js";
 import "./chunk-7CR24IG7.js";
 import {
@@ -1509,190 +1549,6 @@ ${truncate(entry.output, TOOL_RESULT_MAX_CHARS)}`);
   return parts.join("\n\n");
 }
 
-// src/domains/session/compaction/cut-point.ts
-init_esm_shims();
-
-// src/domains/session/compaction/tokens.ts
-init_esm_shims();
-function estimateMessage(entry) {
-  return estimateAgentMessageTokens(entry);
-}
-function estimateBashExecution(entry) {
-  return ceilChars(entry.command.length + entry.output.length);
-}
-function estimateCustom(entry) {
-  if (entry.data === void 0) return 0;
-  return ceilChars(contentChars(entry.data));
-}
-function estimateSummary(entry) {
-  return ceilChars(entry.summary.length);
-}
-function estimateTokens(entry) {
-  switch (entry.kind) {
-    case "message":
-      return estimateMessage(entry);
-    case "bashExecution":
-      return estimateBashExecution(entry);
-    case "custom":
-      return estimateCustom(entry);
-    case "skillActivation":
-      return ceilChars(JSON.stringify(entry.activation).length);
-    case "branchSummary":
-    case "compactionSummary":
-      return estimateSummary(entry);
-    case "modelChange":
-    case "thinkingLevelChange":
-    case "fileEntry":
-    case "sessionInfo":
-    case "label":
-    case "protectedArtifact":
-    case "taskLedger":
-    case "decisionLedger":
-    case "workerRun":
-      return 0;
-  }
-}
-function usageTotalTokens(usage) {
-  return usage.totalTokens || usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
-}
-function extractUsage(payload) {
-  if (!payload || typeof payload !== "object") return void 0;
-  const p = payload;
-  if (p.contextUsageInvalidated === true) return void 0;
-  if (p.stopReason === "aborted" || p.stopReason === "error") return void 0;
-  const u = p.usage;
-  if (!u || typeof u !== "object") return void 0;
-  const usage = u;
-  if (typeof usage.input !== "number" || typeof usage.output !== "number") return void 0;
-  return usage;
-}
-function getLastAssistantUsage(entries) {
-  for (let i = entries.length - 1; i >= 0; i--) {
-    const entry = entries[i];
-    if (entry?.kind !== "message" || entry?.role !== "assistant") continue;
-    const usage = extractUsage(entry.payload);
-    if (usage) return usage;
-  }
-  return void 0;
-}
-function findLastAssistantUsageIndex(entries) {
-  for (let i = entries.length - 1; i >= 0; i--) {
-    const entry = entries[i];
-    if (entry?.kind !== "message" || entry?.role !== "assistant") continue;
-    if (extractUsage(entry.payload)) return i;
-  }
-  return -1;
-}
-function calculateContextTokens(entries, lastUsage) {
-  const usage = lastUsage ?? getLastAssistantUsage(entries);
-  if (usage) {
-    const anchorTokens = usageTotalTokens(usage);
-    const anchorIndex = findLastAssistantUsageIndex(entries);
-    let trailing = 0;
-    for (let i = anchorIndex + 1; i < entries.length; i++) {
-      const entry = entries[i];
-      if (entry) trailing += estimateTokens(entry);
-    }
-    return anchorTokens + trailing;
-  }
-  let total = 0;
-  for (const entry of entries) total += estimateTokens(entry);
-  return total;
-}
-
-// src/domains/session/compaction/cut-point.ts
-function findTurnStartIndex(entries, entryIndex, startIndex = 0) {
-  for (let i = entryIndex; i >= startIndex; i--) {
-    const entry = entries[i];
-    if (!entry) continue;
-    if (entry.kind === "branchSummary") return i;
-    if (entry.kind === "bashExecution") return i;
-    if (entry.kind === "message" && entry.role === "user") return i;
-  }
-  return -1;
-}
-function isValidCutPoint(entry) {
-  switch (entry.kind) {
-    case "message":
-      return entry.role !== "tool_result";
-    case "bashExecution":
-    case "custom":
-    case "skillActivation":
-    case "branchSummary":
-    case "compactionSummary":
-      return true;
-    case "modelChange":
-    case "thinkingLevelChange":
-    case "fileEntry":
-    case "sessionInfo":
-    case "label":
-    case "protectedArtifact":
-    case "taskLedger":
-    case "decisionLedger":
-    case "workerRun":
-      return false;
-  }
-}
-function findValidCutPoints(entries, startIndex, endIndex) {
-  const cuts = [];
-  for (let i = startIndex; i < endIndex; i++) {
-    const entry = entries[i];
-    if (!entry) continue;
-    if (isValidCutPoint(entry)) cuts.push(i);
-  }
-  return cuts;
-}
-function findCutPoint(entries, keepRecentTokens, opts = {}) {
-  const startIndex = opts.startIndex ?? 0;
-  const endIndex = opts.endIndex ?? entries.length;
-  const cutPoints = findValidCutPoints(entries, startIndex, endIndex);
-  if (cutPoints.length === 0) {
-    return { firstKeptEntryIndex: startIndex, turnStartIndex: -1, isSplitTurn: false };
-  }
-  let accumulated = 0;
-  let cutIndex = -1;
-  for (let i = endIndex - 1; i >= startIndex; i--) {
-    const entry = entries[i];
-    if (!entry) continue;
-    accumulated += estimateTokens(entry);
-    if (accumulated >= keepRecentTokens) {
-      for (const candidate of cutPoints) {
-        if (candidate >= i) {
-          cutIndex = candidate;
-          break;
-        }
-      }
-      break;
-    }
-  }
-  if (cutIndex === -1) {
-    const lastTurnStart = findTurnStartIndex(entries, endIndex - 1, startIndex);
-    cutIndex = lastTurnStart !== -1 ? lastTurnStart : cutPoints[0] ?? startIndex;
-  }
-  while (cutIndex > startIndex) {
-    const prev = entries[cutIndex - 1];
-    if (!prev) break;
-    if (prev.kind === "compactionSummary") break;
-    if (prev.kind === "message" || prev.kind === "bashExecution" || prev.kind === "custom" || prev.kind === "skillActivation" || prev.kind === "branchSummary") {
-      break;
-    }
-    cutIndex--;
-  }
-  const cutEntry = entries[cutIndex];
-  const cutIsUserTurn = !!cutEntry && cutEntry.kind === "message" && cutEntry.role === "user";
-  const turnStartIndex = cutIsUserTurn ? -1 : findTurnStartIndex(entries, cutIndex, startIndex);
-  return {
-    firstKeptEntryIndex: cutIndex,
-    turnStartIndex,
-    isSplitTurn: !cutIsUserTurn && turnStartIndex !== -1
-  };
-}
-
-// src/domains/session/compaction/defaults.ts
-init_esm_shims();
-var DEFAULT_RESERVE_TOKENS = 16384;
-var DEFAULT_KEEP_RECENT_TOKENS = 2e4;
-
 // src/domains/session/compaction/compact.ts
 var COMPACTION_SYSTEM_PROMPT = [
   "You are a context summarization assistant.",
@@ -1903,6 +1759,26 @@ ${modified.join("\n")}
 
 ${sections.join("\n\n")}` : "";
 }
+function formatRecallableRefs(entries, firstKeptEntryIndex) {
+  const entryIndexes = /* @__PURE__ */ new Map();
+  for (let index = 0; index < entries.length; index += 1) {
+    const entry = entries[index];
+    if (entry) entryIndexes.set(entry.turnId, index);
+  }
+  const view = foldWorkingSet(entries);
+  const evictedBeforeCut = new Map(
+    [...view.evicted].filter(([ref]) => (entryIndexes.get(ref) ?? Number.POSITIVE_INFINITY) < firstKeptEntryIndex)
+  );
+  const listing = recallableRefListing(entries, { ...view, evicted: evictedBeforeCut });
+  if (listing.refs.length === 0) return "";
+  const rows = [...listing.refs];
+  if (listing.remaining > 0) rows.push(`and ${listing.remaining} more`);
+  return `
+
+<recallable-refs>
+${rows.join("\n")}
+</recallable-refs>`;
+}
 function numberOrZero(value) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
 }
@@ -2016,7 +1892,10 @@ async function compact(input) {
 ${prefixSummary.text}`);
     }
   }
-  const summary = `${summaryParts.join("\n\n---\n\n").trim()}${formatFileOperations(fileOps)}`.trim();
+  const summary = `${summaryParts.join("\n\n---\n\n").trim()}${formatFileOperations(fileOps)}${formatRecallableRefs(
+    input.entries,
+    cut.firstKeptEntryIndex
+  )}`.trim();
   return {
     summary,
     firstKeptEntryIndex: cut.firstKeptEntryIndex,
@@ -2790,6 +2669,8 @@ function applyStopReason(active, message) {
 function outputText(value) {
   if (typeof value === "string") return value;
   if (!isRecord3(value)) return "";
+  const presentationText = toolResultPresentationText(value);
+  if (presentationText !== null) return presentationText;
   if (Array.isArray(value.content)) return contentText(value.content);
   if (typeof value.output === "string") return value.output;
   if (typeof value.text === "string") return value.text;
@@ -4469,6 +4350,9 @@ function readPromptCompileManifest(meta, stateDir) {
   }
 }
 
+// src/interactive/model-session-replay.ts
+init_esm_shims();
+
 // src/interactive/chat-renderer.ts
 init_esm_shims();
 
@@ -5056,6 +4940,7 @@ function ledgerTail(finished) {
     if (details?.outputCapped === true) parts.push("output capped");
   }
   if (finished.excludeFromContext === true) parts.push("excluded from context");
+  if (finished.evictedReason !== void 0) parts.push("evicted", finished.evictedReason);
   const offloadPath = executed ? offloadPathOf(finished) : null;
   return {
     facts: parts.length > 0 ? dim(` \xB7 ${parts.join(" \xB7 ")}`) : "",
@@ -5064,7 +4949,8 @@ function ledgerTail(finished) {
 }
 var FAILURE_EXCERPT_LIMIT = 80;
 function failureExcerpt(finished, width) {
-  if (!finished.isError || !toolPresentationPolicy(finished.toolName, finished.args).failureExcerpt) return "";
+  const presentation = toolResultPresentationPolicy(finished.result) ?? toolPresentationPolicy(finished.toolName, finished.args);
+  if (!finished.isError || !presentation.failureExcerpt) return "";
   if (isNonExecutedOutcome(finished.outcome)) return "";
   const text = unwrapResultEnvelope(finished.result);
   if (typeof text !== "string") return "";
@@ -5321,6 +5207,8 @@ function renderArgsBody(toolName2, args, width, isError) {
 }
 function unwrapResultEnvelope(result) {
   if (typeof result === "string" || result === null || result === void 0) return result;
+  const presentationText = toolResultPresentationText(result);
+  if (presentationText !== null) return presentationText;
   const blocks = Array.isArray(result) ? result : isPlainObject(result) && Array.isArray(result.content) ? result.content : null;
   if (blocks === null) return result;
   const parts = [];
@@ -5453,6 +5341,7 @@ function outputFacts(finished) {
   }
   if (isPlainObject(finished.result) && finished.result.terminate === true) parts.push("terminal result");
   if (finished.excludeFromContext === true) parts.push("excluded from context");
+  if (finished.evictedReason !== void 0) parts.push("evicted", finished.evictedReason);
   return parts;
 }
 function renderOutputMeta(finished, width, isError, label = "output") {
@@ -5511,7 +5400,8 @@ function sublineStatus(call) {
 function foldedDiffRows(finished, width, opts) {
   if (opts.foldedExtras === "none") return [];
   if (finished.isError || isNonExecutedOutcome(finished.outcome)) return [];
-  if (!toolPresentationPolicy(finished.toolName, finished.args).showDiffWhenFolded) return [];
+  const presentation = toolResultPresentationPolicy(finished.result) ?? toolPresentationPolicy(finished.toolName, finished.args);
+  if (!presentation.showDiffWhenFolded) return [];
   const diff = resultDiff(finished.result);
   if (diff === null) return [];
   return truncateRowsMiddle(
@@ -6288,6 +6178,10 @@ function renderContextMeterGrid(ledger, cols, rows, theme6 = clioTheme()) {
   }
   return lines;
 }
+function renderEvictedTokensLine(evictedTokens2, theme6 = clioTheme()) {
+  const tokens = Math.round(Math.max(0, evictedTokens2)).toLocaleString("en-US");
+  return `${theme6.fg("dim", GLYPH.contextReserve)} ${theme6.fg("muted", "evicted (outside window)")} ${theme6.fg("dim", `${tokens} tokens`)}`;
+}
 function contextCategorySwatch(category, theme6 = clioTheme()) {
   return theme6.fg(CONTEXT_CATEGORY_TOKEN[category], contextCategoryGlyph(category));
 }
@@ -10859,7 +10753,8 @@ function toolResultContent(result, unbounded = false) {
   return [{ type: "text", text: stringifyPreview3(result, unbounded ? Number.POSITIVE_INFINITY : 1e4) }];
 }
 function displayReplayToolResult(result, unbounded = false) {
-  const content = toolResultContent(result, unbounded);
+  const presentationText = toolResultPresentationText(result);
+  const content = presentationText === null ? toolResultContent(result, unbounded) : [{ type: "text", text: unbounded ? presentationText : truncateReplayText(presentationText) }];
   const details = payloadObject3(result)?.details;
   return details !== null && details !== void 0 && typeof details === "object" ? { content, details } : content;
 }
@@ -11091,12 +10986,6 @@ function truncateAtTurn(entries, uptoTurnId) {
   if (index < 0) return [...entries];
   return entries.slice(0, index + 1);
 }
-function latestCompactionIndex(entries) {
-  for (let i = entries.length - 1; i >= 0; i--) {
-    if (entries[i]?.kind === "compactionSummary") return i;
-  }
-  return -1;
-}
 function toolCallIdsInEntry(entry) {
   if (entry.kind !== "message") return [];
   if (entry.role === "tool_call") return [extractToolCall(entry).id];
@@ -11149,16 +11038,11 @@ function repairToolResultOrphans(allEntries, selected, compactionIndex) {
 function selectReplayEntries(turns, options = {}) {
   const active = filterEntriesToActivePath(turns, options.activeLeafTurnId ?? options.uptoTurnId);
   const entries = truncateAtTurn(active, options.uptoTurnId);
-  const compactionIndex = latestCompactionIndex(entries);
-  if (compactionIndex < 0) return dropLegacyToolResultAssistantDuplicates(entries);
-  const compaction = entries[compactionIndex];
-  const selected = [compaction];
-  const firstKeptIndex = compaction.firstKeptTurnId ? entries.findIndex((entry) => entry.turnId === compaction.firstKeptTurnId) : -1;
-  if (firstKeptIndex >= 0 && firstKeptIndex < compactionIndex) {
-    selected.push(...entries.slice(firstKeptIndex, compactionIndex));
-  }
-  selected.push(...entries.slice(compactionIndex + 1));
-  return dropLegacyToolResultAssistantDuplicates(repairToolResultOrphans(entries, selected, compactionIndex));
+  const cut = compactionCut(entries);
+  if (cut.compactionIndex < 0) return dropLegacyToolResultAssistantDuplicates(entries);
+  const compaction = entries[cut.compactionIndex];
+  const selected = [compaction, ...cut.visible];
+  return dropLegacyToolResultAssistantDuplicates(repairToolResultOrphans(entries, selected, cut.compactionIndex));
 }
 function dropLegacyToolResultAssistantDuplicates(entries) {
   const out = [];
@@ -11253,6 +11137,11 @@ function buildReplayAgentMessagesFromTurns(turns, options = {}) {
       // It reaches the model only when an operator shares it, and a share
       // is already a user message by the time it lands in the ledger.
       case "workerRun":
+      // Working-set entries are folded into a view by the context domain
+      // and applied as a projection before this builder runs; the
+      // entries themselves never become messages.
+      case "contextEviction":
+      case "contextRecall":
         break;
     }
   }
@@ -11262,6 +11151,7 @@ function rehydrateChatPanelFromTurns(chatPanel, turns, options = {}) {
   const pendingToolIds = [];
   let runAssistantMessages = [];
   const selected = selectReplayEntries(turns, options);
+  const workingSet = foldWorkingSet(turns, options.activeLeafTurnId ?? options.uptoTurnId);
   const workerStates = workerEntriesFromRunEntries(
     selected.filter((entry) => entry.kind === "workerRun"),
     options.readWorkerReceipt ?? readWorkerReceiptFactsForReplay
@@ -11306,6 +11196,7 @@ function rehydrateChatPanelFromTurns(chatPanel, turns, options = {}) {
         }
         if (entry.role === "tool_result") {
           const result = extractToolResult(entry);
+          const evictedReason = workingSet.evicted.get(entry.turnId)?.reason;
           const fallbackId = result.id ?? pendingToolIds.pop() ?? null;
           if (fallbackId) {
             const pendingIndex = pendingToolIds.indexOf(fallbackId);
@@ -11319,7 +11210,8 @@ function rehydrateChatPanelFromTurns(chatPanel, turns, options = {}) {
               ...result.durationMs !== void 0 ? { durationMs: result.durationMs } : {},
               ...result.resultSummary !== void 0 ? { resultSummary: result.resultSummary } : {},
               ...result.outcome !== void 0 ? { outcome: result.outcome } : {},
-              ...result.blockReason !== void 0 ? { blockReason: result.blockReason } : {}
+              ...result.blockReason !== void 0 ? { blockReason: result.blockReason } : {},
+              ...evictedReason !== void 0 ? { evictedReason } : {}
             });
           } else {
             chatPanel.appendReplayBlock(
@@ -11332,7 +11224,8 @@ function rehydrateChatPanelFromTurns(chatPanel, turns, options = {}) {
                   ...result.durationMs !== void 0 ? { durationMs: result.durationMs } : {},
                   ...result.resultSummary !== void 0 ? { resultSummary: result.resultSummary } : {},
                   ...result.outcome === "blocked" ? { outcome: "blocked" } : {},
-                  ...result.blockReason !== void 0 ? { blockReason: result.blockReason } : {}
+                  ...result.blockReason !== void 0 ? { blockReason: result.blockReason } : {},
+                  ...evictedReason !== void 0 ? { evictedReason } : {}
                 },
                 width,
                 { unbounded: options.unboundedToolBodies === true }
@@ -11417,6 +11310,8 @@ function rehydrateChatPanelFromTurns(chatPanel, turns, options = {}) {
       case "label":
       case "taskLedger":
       case "decisionLedger":
+      case "contextEviction":
+      case "contextRecall":
         break;
     }
   }
@@ -11432,6 +11327,13 @@ function rehydrateChatPanelFromTurns(chatPanel, turns, options = {}) {
   chatPanel.clearFoldOverrides();
 }
 
+// src/interactive/model-session-replay.ts
+function buildModelReplayAgentMessagesFromTurns(entries, options = {}) {
+  const activeLeafTurnId = options.activeLeafTurnId ?? options.uptoTurnId;
+  const projected = projectWorkingSet(entries, foldWorkingSet(entries, activeLeafTurnId));
+  return buildReplayAgentMessagesFromTurns(projected, options);
+}
+
 // src/interactive/turn-context.ts
 function createTurnContext(deps) {
   const { state, middleware } = deps;
@@ -11444,20 +11346,37 @@ function createTurnContext(deps) {
   let sessionPromptKey = null;
   const sessionWorkingContextPaths = /* @__PURE__ */ new Set();
   let pendingPromptLogEntry = null;
+  let emptyAutoCompactTurnId = null;
   const pendingColdReasons = /* @__PURE__ */ new Set();
   let runExpectedColdReasons = [];
-  let stampColdReasonsPending = false;
+  let nextAssistantColdReasons = [];
+  const TIER_INDEPENDENT_COLD_REASONS = /* @__PURE__ */ new Set(["working_set_evict"]);
+  const stampsOnTier = (reason, runtimeId) => TIER_INDEPENDENT_COLD_REASONS.has(reason) || runtimeId !== void 0 && deps.providers.getRuntime(runtimeId)?.tier === "local-native";
+  const noteColdReason = (reason) => {
+    if (!state.streaming) {
+      pendingColdReasons.add(reason);
+      return;
+    }
+    if (!stampsOnTier(reason, state.runtime?.runtimeId)) return;
+    if (!runExpectedColdReasons.includes(reason)) runExpectedColdReasons.push(reason);
+    if (nextAssistantColdReasons.includes(reason)) return;
+    nextAssistantColdReasons.push(reason);
+    deps.emitNotice(`[context engine] backend prefix cache likely cold this turn: ${reason}`);
+  };
   const unsubscribeColdReasonSources = [
     ...[BusChannels.DispatchStarted, BusChannels.DispatchCompleted, BusChannels.DispatchFailed].map(
       (channel) => deps.bus?.on(channel, () => {
-        pendingColdReasons.add("dispatch");
+        noteColdReason("dispatch");
       }) ?? null
     ),
     ...[BusChannels.CompactionBegin, BusChannels.CompactionEnd].map(
       (channel) => deps.bus?.on(channel, () => {
-        pendingColdReasons.add("compaction");
+        noteColdReason("compaction");
       }) ?? null
-    )
+    ),
+    deps.bus?.on(BusChannels.ContextRecalled, (payload) => {
+      middleware.fireCompactionHook("working_set_recall", payload.trigger);
+    }) ?? null
   ];
   let snapshotPersistPending = false;
   let lastContextWindowWarning = null;
@@ -11525,7 +11444,7 @@ function createTurnContext(deps) {
   };
   const refreshAgentMessagesFromSession = (agentRuntime) => {
     const refreshedEntries = deps.readSessionEntries?.() ?? [];
-    agentRuntime.agent.state.messages = buildReplayAgentMessagesFromTurns(refreshedEntries, {
+    agentRuntime.agent.state.messages = buildModelReplayAgentMessagesFromTurns(refreshedEntries, {
       ...state.lastTurnId ? { activeLeafTurnId: state.lastTurnId } : {}
     });
     state.replayedContextMessages = [];
@@ -11563,11 +11482,17 @@ function createTurnContext(deps) {
     );
   };
   const runAutoCompact = async (agentRuntime, force, instructions, triggerOverride, pendingUserText) => {
-    if (!deps.autoCompact || !deps.readSessionEntries) return false;
+    if (!deps.readSessionEntries) return false;
+    const activeAutoTurnId = force ? null : state.activeUserTurnId;
+    if (activeAutoTurnId && emptyAutoCompactTurnId === activeAutoTurnId) return false;
     const settings = deps.getSettings();
     const cfg = settings.compaction;
     const autoEnabled = cfg?.auto !== false;
     if (!force && !autoEnabled) return false;
+    let preSummaryStageActed = false;
+    const rememberEmptyAutomaticAttempt = () => {
+      if (!force && !preSummaryStageActed && activeAutoTurnId) emptyAutoCompactTurnId = activeAutoTurnId;
+    };
     const compactionThreshold = cfg?.threshold ?? DEFAULT_COMPACTION_THRESHOLD;
     const trigger = triggerOverride ?? (force ? "force" : "auto");
     if (!force) {
@@ -11576,78 +11501,176 @@ function createTurnContext(deps) {
       if (!verdict.shouldCompact) return false;
       if (deps.session?.current()) {
         const beforeSnapshotId2 = currentContextSnapshot?.snapshotId ?? null;
-        let masked;
-        try {
-          masked = maskStaleObservations(deps.readSessionEntries() ?? [], cfg?.excludeLastTurns ?? 6);
-        } catch (error) {
-          middleware.fireCompactionHook("mask_observations", trigger, estimate.tokens);
-          deps.bus?.emit(BusChannels.CompactionBegin, { trigger, at: Date.now() });
-          emitCompactionActivity("started", "compacting context (mask stage)");
-          emitCompactionActivity("failed", compactionFailureMessage(error));
-          deps.bus?.emit(BusChannels.CompactionEnd, { trigger, at: Date.now() });
-          throw error;
-        }
-        if (masked.changed) {
-          middleware.fireCompactionHook("mask_observations", trigger, estimate.tokens);
-          deps.bus?.emit(BusChannels.CompactionBegin, { trigger, at: Date.now() });
-          emitCompactionActivity("started", "compacting context (mask stage)");
-          deps.session.replaceEntries(masked.entries);
-          refreshAgentMessagesFromSession(agentRuntime);
-          deps.bus?.emit(BusChannels.CompactionEnd, { trigger, at: Date.now() });
-          const postMaskSnapshot = captureRuntimeContextSnapshot(
-            agentRuntime,
-            state.activeUserTurnId || "compaction",
-            compactionThreshold
-          );
-          currentContextSnapshot = postMaskSnapshot;
-          persistContextSnapshot(postMaskSnapshot);
-          const tokensAfterMask = snapshotInputTokens(postMaskSnapshot);
-          lastCompactionEvent = {
-            stage: "mask_observations",
-            tokensBefore: estimate.tokens,
-            tokensAfter: tokensAfterMask,
-            trigger
-          };
-          deps.bus?.emit(BusChannels.ContextPruned, {
-            stage: "mask_observations",
-            pressure: verdict.pressure,
-            tokensBefore: estimate.tokens,
-            tokensAfter: tokensAfterMask,
-            maskedObservations: masked.maskedObservations,
-            maskedThinkingBlocks: masked.maskedThinkingBlocks,
-            maskedThinkingChars: masked.maskedThinkingChars,
-            trigger,
-            snapshotIdBefore: beforeSnapshotId2,
-            snapshotIdAfter: postMaskSnapshot.snapshotId,
-            at: Date.now()
-          });
-          emitCompactionActivity("completed", `${masked.maskedObservations} observations masked`);
-          const thinkingNote = masked.maskedThinkingBlocks > 0 ? `, ${masked.maskedThinkingBlocks} thinking blocks dropped (~${masked.maskedThinkingChars} chars)` : "";
-          deps.emitNotice(
-            `[context engine] mask_observations: ${masked.maskedObservations} observations masked${thinkingNote}; ~${estimate.tokens} tokens -> ~${tokensAfterMask} tokens`
-          );
-          const after = liveContextEstimate(agentRuntime, pendingUserText);
-          if (!shouldCompact(after.tokens, compactionThreshold, after.contextWindow).shouldCompact) return true;
+        if (process.env.CLIO_CODER_LEGACY_MASK === "1") {
+          let masked;
+          try {
+            masked = maskStaleObservations(deps.readSessionEntries() ?? [], cfg?.excludeLastTurns ?? 6);
+          } catch (error) {
+            middleware.fireCompactionHook("mask_observations", trigger, estimate.tokens);
+            deps.bus?.emit(BusChannels.CompactionBegin, { trigger, at: Date.now() });
+            emitCompactionActivity("started", "compacting context (mask stage)");
+            emitCompactionActivity("failed", compactionFailureMessage(error));
+            deps.bus?.emit(BusChannels.CompactionEnd, { trigger, at: Date.now() });
+            throw error;
+          }
+          if (masked.changed) {
+            preSummaryStageActed = true;
+            middleware.fireCompactionHook("mask_observations", trigger, estimate.tokens);
+            deps.bus?.emit(BusChannels.CompactionBegin, { trigger, at: Date.now() });
+            emitCompactionActivity("started", "compacting context (mask stage)");
+            deps.session.replaceEntries(masked.entries);
+            refreshAgentMessagesFromSession(agentRuntime);
+            deps.bus?.emit(BusChannels.CompactionEnd, { trigger, at: Date.now() });
+            const postMaskSnapshot = captureRuntimeContextSnapshot(
+              agentRuntime,
+              state.activeUserTurnId || "compaction",
+              compactionThreshold
+            );
+            currentContextSnapshot = postMaskSnapshot;
+            persistContextSnapshot(postMaskSnapshot);
+            const tokensAfterMask = snapshotInputTokens(postMaskSnapshot);
+            lastCompactionEvent = {
+              stage: "mask_observations",
+              tokensBefore: estimate.tokens,
+              tokensAfter: tokensAfterMask,
+              trigger
+            };
+            deps.bus?.emit(BusChannels.ContextPruned, {
+              stage: "mask_observations",
+              pressure: verdict.pressure,
+              tokensBefore: estimate.tokens,
+              tokensAfter: tokensAfterMask,
+              maskedObservations: masked.maskedObservations,
+              maskedThinkingBlocks: masked.maskedThinkingBlocks,
+              maskedThinkingChars: masked.maskedThinkingChars,
+              trigger,
+              snapshotIdBefore: beforeSnapshotId2,
+              snapshotIdAfter: postMaskSnapshot.snapshotId,
+              at: Date.now()
+            });
+            emitCompactionActivity("completed", `${masked.maskedObservations} observations masked`);
+            const thinkingNote = masked.maskedThinkingBlocks > 0 ? `, ${masked.maskedThinkingBlocks} thinking blocks dropped (~${masked.maskedThinkingChars} chars)` : "";
+            deps.emitNotice(
+              `[context engine] mask_observations: ${masked.maskedObservations} observations masked${thinkingNote}; ~${estimate.tokens} tokens -> ~${tokensAfterMask} tokens`
+            );
+            const after = liveContextEstimate(agentRuntime, pendingUserText);
+            if (!shouldCompact(after.tokens, compactionThreshold, after.contextWindow).shouldCompact) return true;
+          }
+        } else if (settings.context.workingSet.enabled) {
+          let planned;
+          try {
+            const entries = deps.readSessionEntries() ?? [];
+            const view = foldWorkingSet(entries, state.lastTurnId ?? void 0);
+            const policy = resolveWorkingSetPolicy(settings.context.workingSet.policy);
+            planned = (deps.planEviction ?? planEviction)(policy, {
+              entries: selectVisibleEntries(entries, state.lastTurnId ?? void 0),
+              view,
+              cwd: deps.session.current()?.cwd ?? null,
+              settings: settings.context.workingSet,
+              pressure: {
+                tokens: estimate.tokens,
+                contextWindow: estimate.contextWindow,
+                threshold: compactionThreshold,
+                target: settings.context.workingSet.target
+              },
+              estimateTokens
+            });
+          } catch (error) {
+            middleware.fireCompactionHook("working_set_evict", "pressure", estimate.tokens);
+            emitCompactionActivity("started", "compacting context (working-set eviction)");
+            emitCompactionActivity("failed", compactionFailureMessage(error));
+            throw error;
+          }
+          if (planned) {
+            preSummaryStageActed = true;
+            middleware.fireCompactionHook("working_set_evict", "pressure", estimate.tokens);
+            emitCompactionActivity("started", "compacting context (working-set eviction)");
+            try {
+              deps.session.appendEntry({
+                ...buildEvictionFields(planned, {
+                  trigger: "pressure",
+                  pressureBefore: verdict.pressure,
+                  snapshotIdBefore: beforeSnapshotId2
+                }),
+                // appendEntry does not infer this anchor; the interactive
+                // cursor is the leaf the next message will extend.
+                parentTurnId: state.lastTurnId
+              });
+              noteColdReason("working_set_evict");
+              refreshAgentMessagesFromSession(agentRuntime);
+              const postEvictionSnapshot = captureRuntimeContextSnapshot(
+                agentRuntime,
+                state.activeUserTurnId || "compaction",
+                compactionThreshold
+              );
+              currentContextSnapshot = postEvictionSnapshot;
+              persistContextSnapshot(postEvictionSnapshot);
+              lastCompactionEvent = {
+                stage: "working_set",
+                tokensBefore: planned.tokensBefore,
+                tokensAfter: planned.tokensAfter,
+                trigger
+              };
+              deps.bus?.emit(BusChannels.ContextPruned, {
+                stage: "working_set",
+                pressure: verdict.pressure,
+                tokensBefore: planned.tokensBefore,
+                tokensAfter: planned.tokensAfter,
+                trigger,
+                snapshotIdBefore: beforeSnapshotId2,
+                snapshotIdAfter: postEvictionSnapshot.snapshotId,
+                policyId: planned.policyId,
+                evictedItems: planned.items.length,
+                at: Date.now()
+              });
+              const itemsWord = planned.items.length === 1 ? "item" : "items";
+              emitCompactionActivity("completed", `${planned.items.length} working-set ${itemsWord} evicted`);
+              deps.emitNotice(
+                `[context engine] working set: ${planned.items.length} ${itemsWord} evicted by ${planned.policyId}; ~${planned.tokensBefore} -> ~${planned.tokensAfter} tokens, recall by ref with context(scope="recall")`
+              );
+              const after = liveContextEstimate(agentRuntime, pendingUserText);
+              if (!shouldCompact(after.tokens, compactionThreshold, after.contextWindow).shouldCompact) return true;
+            } catch (error) {
+              emitCompactionActivity("failed", compactionFailureMessage(error));
+              throw error;
+            }
+          }
         }
       }
     }
-    middleware.fireCompactionHook("llm_summary", trigger);
-    deps.bus?.emit(BusChannels.CompactionBegin, { trigger, at: Date.now() });
-    emitCompactionActivity("started", "compacting context (summary)");
+    if (!deps.autoCompact) {
+      rememberEmptyAutomaticAttempt();
+      return false;
+    }
+    let summaryLifecycleStarted = false;
+    const startSummaryLifecycle = () => {
+      middleware.fireCompactionHook("llm_summary", trigger);
+      deps.bus?.emit(BusChannels.CompactionBegin, { trigger, at: Date.now() });
+      emitCompactionActivity("started", "compacting context (summary)");
+      summaryLifecycleStarted = true;
+    };
+    if (force) startSummaryLifecycle();
     let result = null;
     const beforeSnapshotId = currentContextSnapshot?.snapshotId ?? null;
     try {
       result = await compactionTrigger.fire(() => (deps.autoCompact ?? (async () => null))(instructions, trigger));
     } catch (error) {
+      if (!summaryLifecycleStarted) startSummaryLifecycle();
       emitCompactionActivity("failed", compactionFailureMessage(error));
-      throw error;
-    } finally {
       deps.bus?.emit(BusChannels.CompactionEnd, { trigger, at: Date.now() });
+      throw error;
     }
     if (!result || result.summary.length === 0) {
-      emitCompactionActivity("completed", "nothing to compact");
+      if (summaryLifecycleStarted) {
+        deps.bus?.emit(BusChannels.CompactionEnd, { trigger, at: Date.now() });
+        emitCompactionActivity("completed", "nothing to compact");
+      } else {
+        rememberEmptyAutomaticAttempt();
+      }
       return false;
     }
+    if (!summaryLifecycleStarted) startSummaryLifecycle();
+    deps.bus?.emit(BusChannels.CompactionEnd, { trigger, at: Date.now() });
     recordCompactionUsage(agentRuntime, result);
     refreshAgentMessagesFromSession(agentRuntime);
     const postCompactSnapshot = captureRuntimeContextSnapshot(
@@ -11943,13 +11966,13 @@ function createTurnContext(deps) {
     },
     consumeExpectedColdReasons(runtimeId) {
       runExpectedColdReasons = [];
-      stampColdReasonsPending = false;
+      nextAssistantColdReasons = [];
       if (pendingColdReasons.size > 0) {
-        const reasons = [...pendingColdReasons];
+        const reasons = [...pendingColdReasons].filter((reason) => stampsOnTier(reason, runtimeId));
         pendingColdReasons.clear();
-        if (deps.providers.getRuntime(runtimeId)?.tier === "local-native") {
+        if (reasons.length > 0) {
           runExpectedColdReasons = reasons;
-          stampColdReasonsPending = true;
+          nextAssistantColdReasons = reasons;
           deps.emitNotice(`[context engine] backend prefix cache likely cold this turn: ${reasons.join(", ")}`);
         }
       }
@@ -11964,9 +11987,9 @@ function createTurnContext(deps) {
         cacheWrite,
         backendVerdict: backendCacheVerdict(input, cacheRead)
       };
-      if (stampColdReasonsPending && runExpectedColdReasons.length > 0) {
-        promptCache.expectedColdReasons = [...runExpectedColdReasons];
-        stampColdReasonsPending = false;
+      if (nextAssistantColdReasons.length > 0) {
+        promptCache.expectedColdReasons = [...nextAssistantColdReasons];
+        nextAssistantColdReasons = [];
       }
       return promptCache;
     },
@@ -11978,7 +12001,8 @@ function createTurnContext(deps) {
           cacheReadTokens: cacheSummary.cacheRead > 0 || cacheSummary.cacheWrite > 0 ? cacheSummary.cacheRead : null,
           cacheWriteTokens: cacheSummary.cacheRead > 0 || cacheSummary.cacheWrite > 0 ? cacheSummary.cacheWrite : null,
           uncachedInputTokens: cacheSummary.input,
-          backendVerdict: runFirstCallVerdict
+          backendVerdict: runFirstCallVerdict,
+          ...runExpectedColdReasons.length > 0 ? { expectedColdReasons: [...runExpectedColdReasons] } : {}
         };
       }
     },
@@ -11988,6 +12012,7 @@ function createTurnContext(deps) {
       sessionPromptKey = null;
       sessionWorkingContextPaths.clear();
       pendingPromptLogEntry = null;
+      emptyAutoCompactTurnId = null;
       const session = deps.session?.current();
       currentContextSnapshot = session ? getLatestContextSnapshot(session) : null;
     },
@@ -12141,9 +12166,9 @@ function createTurnMiddleware(deps) {
       }
     },
     /**
-     * Observe-only lifecycle point fired before each compaction stage, at the
-     * existing CompactionBegin emit sites. Consumers record telemetry or state
-     * ahead of context loss; returned effects are discarded by design.
+     * Observe-only lifecycle point fired before each compaction or working-set
+     * stage. Consumers record telemetry or state around projected context
+     * changes; returned effects are discarded by design.
      */
     fireCompactionHook(stage, trigger, tokensBefore) {
       if (!deps.middleware) return;
@@ -16192,7 +16217,43 @@ function legendRow2(group, contentWidth) {
   const labelText = group.label.length > leftWidth ? group.label.slice(0, leftWidth) : group.label.padEnd(leftWidth);
   return `${swatch} ${theme6.fg(labelToken, labelText)} ${theme6.fg("muted", right)}`;
 }
-function renderContextLedgerLines(ledger, contentWidth) {
+function evictedTokens(view) {
+  let total = 0;
+  for (const state of view.evicted.values()) total += state.tokensFreed;
+  return total;
+}
+function formatChurn(view) {
+  if (view.itemsEvicted === 0) return "n/a";
+  return (view.recalls / view.itemsEvicted).toFixed(2);
+}
+function coldReasonLabel(reason) {
+  switch (reason) {
+    case "working_set_evict":
+      return "working-set eviction";
+    case "compaction":
+      return "compaction";
+    case "dispatch":
+      return "dispatch traffic";
+    default:
+      return reason;
+  }
+}
+function renderWorkingSetLines(view) {
+  const theme6 = clioTheme();
+  const items = view.evicted.size;
+  const summary = [
+    `${items} evicted item${items === 1 ? "" : "s"}`,
+    `${formatTokens(evictedTokens(view))} tokens`,
+    `${view.evictionEvents} event${view.evictionEvents === 1 ? "" : "s"}`,
+    `${view.recalls} recall${view.recalls === 1 ? "" : "s"}`,
+    `churn ${formatChurn(view)}`
+  ].join(" \xB7 ");
+  return [
+    `${theme6.fg("muted", "working set")} ${theme6.fg("dim", "\xB7")} ${theme6.fg("accent", `policy ${view.lastPolicyId ?? "none"}`)}`,
+    theme6.fg("dim", summary)
+  ];
+}
+function renderContextLedgerLines(ledger, contentWidth, workingSet) {
   const theme6 = clioTheme();
   const lines = [];
   const provider = ledger.provider ?? "no target";
@@ -16217,7 +16278,12 @@ function renderContextLedgerLines(ledger, contentWidth) {
   }
   lines.push("");
   for (const group of ledger.meter) lines.push(legendRow2(group, contentWidth));
+  if (workingSet && workingSet.evicted.size > 0) lines.push(renderEvictedTokensLine(evictedTokens(workingSet), theme6));
   lines.push("");
+  if (workingSet) {
+    for (const line of renderWorkingSetLines(workingSet)) lines.push(line);
+    lines.push("");
+  }
   if (ledger.projectPreload && ledger.groups.some((group) => group.category === "project")) {
     lines.push(theme6.fg("dim", `project preload: ${ledger.projectPreload}`));
   }
@@ -16235,8 +16301,13 @@ function renderContextLedgerLines(ledger, contentWidth) {
     const read = cache2.cacheReadTokens !== null ? `cache read ${formatTokens(cache2.cacheReadTokens)}` : "cache read n/a";
     const uncached = cache2.uncachedInputTokens !== null ? `uncached input ${formatTokens(cache2.uncachedInputTokens)}` : null;
     const line = ["prompt cache:", shell, "\xB7", backend, "\xB7", read, ...uncached ? ["\xB7", uncached] : []].join(" ");
-    const misleading = cache2.shellReused && cache2.backendVerdict === "cold";
+    const coldReasons = cache2.backendVerdict === "cold" ? cache2.expectedColdReasons ?? [] : [];
+    const misleading = cache2.shellReused && cache2.backendVerdict === "cold" && coldReasons.length === 0;
     lines.push(theme6.fg(misleading ? "warning" : "dim", line));
+    if (coldReasons.length > 0) {
+      const reasons = coldReasons.map(coldReasonLabel).join(", ");
+      lines.push(theme6.fg("dim", `last cold turn: ${reasons} (expected)`));
+    }
   }
   if (ledger.lastCompaction) {
     const pruneInfo = `last compaction: reclaimed ${formatTokens(ledger.lastCompaction.tokensBefore)} -> ${formatTokens(ledger.lastCompaction.tokensAfter)} tokens (${ledger.lastCompaction.stage})`;
@@ -16246,7 +16317,8 @@ function renderContextLedgerLines(ledger, contentWidth) {
 }
 var STREAMING_FALLBACK_TICK_MS = 1e3;
 function openContextOverlay(tui, getLedger, options) {
-  const text = new Text(renderContextLedgerLines(getLedger(), DEFAULT_CONTENT_WIDTH).join("\n"), 0, 0);
+  const render2 = () => renderContextLedgerLines(getLedger(), DEFAULT_CONTENT_WIDTH, options?.getWorkingSet?.() ?? null).join("\n");
+  const text = new Text(render2(), 0, 0);
   const handle = showClioOverlayFrame(tui, text, {
     anchor: "center",
     width: CONTEXT_OVERLAY_WIDTH,
@@ -16254,7 +16326,7 @@ function openContextOverlay(tui, getLedger, options) {
     footerHint: buildHint([])
   });
   const refresh = () => {
-    text.setText(renderContextLedgerLines(getLedger(), DEFAULT_CONTENT_WIDTH).join("\n"));
+    text.setText(render2());
     text.invalidate();
     tui.requestRender();
   };
@@ -21366,6 +21438,7 @@ function isSettingsSectionId(value) {
 var COMPACT_POSITIONALS = [
   { name: "instructions", required: false, rest: true }
 ];
+var RECALL_POSITIONALS = [{ name: "ref", required: true }];
 function fromArgsOrUsage(name, command) {
   return (parsed) => parsed.error ? { kind: "usage-error", command: name, reason: parsed.error } : command;
 }
@@ -21711,11 +21784,12 @@ ${usage}` : usage);
   },
   {
     name: "context",
-    description: "Context hub: window overlay plus compact, init, refresh, and reset",
+    description: "Context hub: window overlay plus compact, recall, init, refresh, and reset",
     group: "Inspect",
-    kinds: ["context-view", "compact", "init", "context-clear", "context-refresh"],
+    kinds: ["context-view", "compact", "context-recall", "init", "context-clear", "context-refresh"],
     subcommandDescriptions: {
       compact: "Compact session context",
+      recall: "Recall an evicted result",
       init: "Initialize project context",
       refresh: "Refresh project context",
       reset: "Reset project context"
@@ -21723,6 +21797,7 @@ ${usage}` : usage);
     args: {
       subcommands: {
         compact: { positionals: [...COMPACT_POSITIONALS] },
+        recall: { positionals: [...RECALL_POSITIONALS] },
         init: {},
         refresh: {},
         reset: {}
@@ -21733,6 +21808,8 @@ ${usage}` : usage);
       switch (parsed.subcommand) {
         case "compact":
           return { kind: "compact", instructions: parsed.rest };
+        case "recall":
+          return { kind: "context-recall", ref: parsed.positionals[0] ?? "" };
         case "init":
           return { kind: "init", options: {} };
         case "refresh":
@@ -21751,6 +21828,13 @@ ${usage}` : usage);
         case "compact":
           ctx.runCompact(command.instructions);
           return;
+        case "context-recall":
+          if (ctx.runContextRecall) {
+            ctx.runContextRecall(command.ref);
+          } else {
+            ctx.notice("error", "context recall is not wired; no session is bound to this process");
+          }
+          return;
         case "init":
           ctx.runInit(command.options);
           return;
@@ -22611,7 +22695,12 @@ function createOverlayGeneralOpeners(deps) {
     deps.transitions.state = "context-view";
     deps.transitions.handle = openContextOverlayFactory(deps.tui, deps.getContextLedger, {
       bus: deps.bus,
-      chat: deps.contextChat
+      chat: deps.contextChat,
+      getWorkingSet: () => {
+        const readSessionEntries = deps.readSessionEntries;
+        if (!readSessionEntries) return null;
+        return foldWorkingSet(readSessionEntries(), deps.getSessionMeta()?.pinnedLeafTurnId ?? void 0);
+      }
     });
     deps.requestRender();
   };
@@ -25005,7 +25094,7 @@ function createOverlaySessionLifecycle(deps) {
           const replayOptions = leafTurnId ? { activeLeafTurnId: leafTurnId } : {};
           deps.resetTranscript();
           rehydrateChatPanelFromTurns(deps.chatPanel, turns, replayOptions);
-          const replayMessages = buildReplayAgentMessagesFromTurns(turns, replayOptions);
+          const replayMessages = buildModelReplayAgentMessagesFromTurns(turns, replayOptions);
           deps.chat.resetForSession(leafTurnId, replayMessages);
           rescopeToBranch(session, turns, leafTurnId);
         } catch (error) {
@@ -25055,7 +25144,7 @@ function createOverlaySessionLifecycle(deps) {
           const turns = deps.readStructuredEntries(sessionId);
           deps.resetTranscript();
           rehydrateChatPanelFromTurns(deps.chatPanel, turns, { uptoTurnId: turnId });
-          const replayMessages = buildReplayAgentMessagesFromTurns(turns, { uptoTurnId: turnId });
+          const replayMessages = buildModelReplayAgentMessagesFromTurns(turns, { uptoTurnId: turnId });
           deps.chat.resetForSession(turnId, replayMessages);
           rescopeToBranch(session, turns, turnId);
         } catch (error) {
@@ -25121,8 +25210,11 @@ function createOverlaySessionLifecycle(deps) {
     try {
       const turns = deps.readStructuredEntries(forkedSessionId);
       rehydrateChatPanelFromTurns(deps.chatPanel, turns);
-      const replayMessages = buildReplayAgentMessagesFromTurns(turns);
       const leafTurnId = session.tree(forkedSessionId).leafId ?? parentTurnId;
+      const replayMessages = buildModelReplayAgentMessagesFromTurns(
+        turns,
+        leafTurnId ? { activeLeafTurnId: leafTurnId } : {}
+      );
       deps.chat.resetForSession(leafTurnId, replayMessages);
       rescopeToBranch(session, turns, leafTurnId);
     } catch (error) {
@@ -27950,7 +28042,7 @@ function styleStatusVerb(text, toneHint) {
 function policySegmentFold(seg, detail) {
   if (!seg.finished) return policyRunningToolFold(detail);
   if (seg.isError && detail.errors === "body") return "expanded";
-  return policyToolFold(detail, toolPresentationPolicy(seg.name, seg.args));
+  return policyToolFold(detail, toolResultPresentationPolicy(seg.result) ?? toolPresentationPolicy(seg.name, seg.args));
 }
 function toolSegmentExpanded(seg, detail) {
   return resolveFold(seg.fold, policySegmentFold(seg, detail)) === "expanded";
@@ -27978,7 +28070,8 @@ function renderToolSegmentLines(seg, width, expandKey, latestHintToolId, nowMs,
         durationMs: seg.durationMs,
         resultSummary: seg.resultSummary,
         outcome: seg.settlement,
-        blockReason: seg.blockReason
+        blockReason: seg.blockReason,
+        evictedReason: seg.evictedReason
       } : { toolCallId: seg.id, toolName: seg.name, args: seg.args, elapsedMs, phase },
       width,
       hintKey,
@@ -28009,7 +28102,8 @@ function renderToolSegmentLines(seg, width, expandKey, latestHintToolId, nowMs,
       durationMs: seg.durationMs,
       resultSummary: seg.resultSummary,
       outcome: seg.settlement,
-      blockReason: seg.blockReason
+      blockReason: seg.blockReason,
+      evictedReason: seg.evictedReason
     },
     width,
     { unbounded: unboundedToolBodies, diffStyle: seg.replayed === true ? "plain" : "color" }
@@ -28706,6 +28800,7 @@ function createChatPanel(options = {}) {
           tool.result = event.result;
           tool.isError = event.isError;
           const enriched = event;
+          tool.evictedReason = typeof enriched.evictedReason === "string" && enriched.evictedReason.length > 0 ? enriched.evictedReason : void 0;
           const settled = toolSettlement(enriched);
           tool.settlement = settled?.settlement;
           tool.blockReason = settled?.reason;
@@ -30342,6 +30437,57 @@ init_esm_shims();
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { join as join9, resolve as resolve4 } from "node:path";
 
+// src/interactive/context-recall-command.ts
+init_esm_shims();
+function formatTokens3(tokens) {
+  return tokens.toLocaleString("en-US");
+}
+function headlineFor(ref, tokens, state, offloadPath) {
+  const parts = [ref];
+  if (state !== void 0) {
+    parts.push(state.by === void 0 ? `evicted: ${state.reason}` : `evicted: ${state.reason} by ${state.by}`);
+  }
+  parts.push(`${formatTokens3(tokens)} tokens`);
+  if (offloadPath !== void 0) parts.push(`offload: ${offloadPath}`);
+  return `[/context recall] ${parts.join(" \xB7 ")}`;
+}
+function runOperatorRecall(ref, deps) {
+  if (!deps.hasSession()) {
+    return { ok: false, message: "[/context recall] no active session; start one with /new or /resume first" };
+  }
+  const trimmed = ref.trim();
+  if (trimmed.length === 0) {
+    return { ok: false, message: "[/context recall] needs a ref: the turnId named in an [evicted ...] marker" };
+  }
+  const entries = deps.readEntries();
+  const leaf = deps.activeLeafTurnId();
+  const view = foldWorkingSet(entries, leaf);
+  const resolved = resolveRecall(entries, view, trimmed, leaf);
+  if (!resolved.ok)
+    return { ok: false, message: `[/context recall] ${recallErrorMessage(resolved.error, entries, view)}` };
+  const { result } = resolved;
+  const fields = buildRecallFields(result, { trigger: "operator" });
+  try {
+    deps.appendEntry({ ...fields, parentTurnId: recallParentTurnId(entries, leaf) });
+  } catch (err) {
+    return {
+      ok: false,
+      message: `[/context recall] recall of ${result.ref.entry} could not be recorded: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+  deps.onRecalled?.({
+    ref: result.ref.entry,
+    trigger: "operator",
+    tokensReadmitted: result.tokens,
+    at: deps.now?.() ?? Date.now()
+  });
+  return {
+    ok: true,
+    headline: headlineFor(result.ref.entry, result.tokens, view.evicted.get(result.ref.entry), result.offloadPath),
+    body: result.body
+  };
+}
+
 // src/interactive/export-html/index.ts
 init_esm_shims();
 
@@ -30899,6 +31045,34 @@ function createInteractiveSlashRuntime(deps) {
       }
       deps.openContextReset();
     },
+    ...deps.session ? {
+      runContextRecall: (ref) => {
+        const session = deps.session;
+        if (!session) return;
+        const outcome = runOperatorRecall(ref, {
+          hasSession: () => session.current() !== null,
+          readEntries: () => {
+            const sessionId = deps.chat.getSessionId();
+            return sessionId ? deps.readStructuredEntries(sessionId) : [];
+          },
+          activeLeafTurnId: () => {
+            const meta = session.current();
+            return meta ? session.tree(meta.id).leafId ?? void 0 : void 0;
+          },
+          appendEntry: (entry) => session.appendEntry(entry),
+          onRecalled: (payload) => deps.bus.emit(BusChannels.ContextRecalled, payload),
+          ...deps.now ? { now: () => (deps.now?.() ?? /* @__PURE__ */ new Date()).getTime() } : {}
+        });
+        if (!outcome.ok) {
+          appendCommandNotice("error", outcome.message);
+          return;
+        }
+        appendCommandNotice("success", outcome.headline);
+        deps.io.stdout(`${outcome.body}
+`);
+        deps.requestRender();
+      }
+    } : {},
     runContextRefresh: () => {
       if (!deps.onContextRefresh) {
         deps.io.stderr("[/context refresh] context refresh not wired; pass onContextRefresh to startInteractive\n");
@@ -31160,7 +31334,7 @@ function createSessionTranscript(deps) {
     const turns = deps.readSessionEntries();
     deps.chat.resetForSession(
       leafTurnId,
-      buildReplayAgentMessagesFromTurns(turns, {
+      buildModelReplayAgentMessagesFromTurns(turns, {
         ...leafTurnId ? { activeLeafTurnId: leafTurnId } : {}
       })
     );
@@ -32518,7 +32692,7 @@ function createDispatchTool(inputDeps, surfaceOptions = {}) {
   const admission = createDispatchAdmissionController(deps);
   let runnerPromise = null;
   const loadRunner = () => {
-    runnerPromise ??= (surfaceOptions.loadRunner ?? (() => import("./dispatch-runner-QPRDDBDX.js")))();
+    runnerPromise ??= (surfaceOptions.loadRunner ?? (() => import("./dispatch-runner-MSWN72NK.js")))();
     return runnerPromise;
   };
   return {
@@ -32722,7 +32896,7 @@ function registerAllTools(registry, deps = {}) {
       ...builtin(
         lazyTool(
           monitorToolSurface,
-          async () => (await import("./monitor-GE4ID3IA.js")).createMonitorTool({ dispatch, runEvents: dispatchRunEvents })
+          async () => (await import("./monitor-2F3T5KHP.js")).createMonitorTool({ dispatch, runEvents: dispatchRunEvents })
         ),
         {
           path: "src/tools/monitor.ts",
@@ -33552,7 +33726,14 @@ async function bootOrchestrator(options = {}) {
   });
   const dispatchBackground = createDispatchBackgroundRegistry();
   registerAllTools(toolRegistry, {
-    ...session ? { session } : {},
+    ...session ? {
+      session,
+      readSessionEntries: () => {
+        const meta = session.current();
+        return meta ? readSessionEntriesForCompact(meta.id) : [];
+      },
+      onContextRecalled: (payload) => bus.emit(BusChannels.ContextRecalled, payload)
+    } : {},
     taskBoard,
     userTasks,
     dispatch,
@@ -33808,7 +33989,10 @@ async function bootOrchestrator(options = {}) {
       try {
         chat.resetForSession(
           leafTurnId,
-          buildReplayAgentMessagesFromTurns(readCurrentSessionEntries(), leafTurnId ? { activeLeafTurnId: leafTurnId } : {})
+          buildModelReplayAgentMessagesFromTurns(
+            readCurrentSessionEntries(),
+            leafTurnId ? { activeLeafTurnId: leafTurnId } : {}
+          )
         );
       } catch (err) {
         chat.resetForSession(leafTurnId);
@@ -33846,7 +34030,7 @@ async function bootOrchestrator(options = {}) {
         ...session ? { session } : {},
         ...session ? {
           readSessionEntries: readSessionEntriesForCompact,
-          buildReplayMessages: (entries, leafTurnId) => buildReplayAgentMessagesFromTurns(entries, leafTurnId === null ? {} : { activeLeafTurnId: leafTurnId })
+          buildReplayMessages: (entries, leafTurnId) => buildModelReplayAgentMessagesFromTurns(entries, leafTurnId === null ? {} : { activeLeafTurnId: leafTurnId })
         } : {},
         providers,
         settings: {
@@ -34156,4 +34340,4 @@ export {
   resolveApiKeyForTarget,
   synthesizeOrchestratorModel
 };
-//# sourceMappingURL=orchestrator-EM5MC3HM.js.map
+//# sourceMappingURL=orchestrator-ORHT43JB.js.map