pi-smart-compact 7.13.2 → 7.15.0

package/dist/index.js

@@ -16,7 +16,7 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // src/constants.ts
-var VERSION = "7.13.2", CHARS_PER_TOKEN = 3.8, COMPACT_SYSTEM_PREFIX, PROFILES, DEFAULT_CONFIG, NO_OP_RE, SHIFT_RE, CHOICE_RE, SINGLE_PASS_PREFIX, SINGLE_PASS_SUFFIX = `
+var VERSION = "7.15.0", CHARS_PER_TOKEN = 3.8, COMPACT_SYSTEM_PREFIX, PROFILES, DEFAULT_CONFIG, NO_OP_RE, SHIFT_RE, CHOICE_RE, SINGLE_PASS_PREFIX, SINGLE_PASS_SUFFIX = `
 {PREV_CONTEXT}
 
 {EXTRACTION_CONTEXT}
@@ -848,11 +848,8 @@ var init_services = __esm(() => {
 import fs3 from "fs";
 import path4 from "path";
 import crypto5 from "crypto";
-function getCompactSessionId() {
-  if (!_compactSessionId) {
-    _compactSessionId = "sc-" + Date.now().toString(36) + "-" + crypto5.randomBytes(4).toString("hex");
-  }
-  return _compactSessionId;
+function fallbackSessionId() {
+  return "sc-" + Date.now().toString(36) + "-" + crypto5.randomBytes(4).toString("hex");
 }
 function cacheOpts(opts, provider, phase, services) {
   if (phase && INTERNAL_PHASES.has(phase)) {
@@ -863,7 +860,7 @@ function cacheOpts(opts, provider, phase, services) {
   if (retention === "none") {
     return { ...opts, cacheRetention: "none" };
   }
-  return { ...opts, sessionId: services?.compactSessionId ?? getCompactSessionId(), cacheRetention: retention };
+  return { ...opts, sessionId: services?.compactSessionId ?? fallbackSessionId(), cacheRetention: retention };
 }
 function recordMetric(m, services = getDefaultServices()) {
   services.metrics.record(m);
@@ -1313,7 +1310,7 @@ function writeMetricsDashboard(entries = readMetricsLog(200)) {
     return null;
   }
 }
-var _compactSessionId = null, INTERNAL_PHASES, EXTRACTION_CACHE_TTL_MS, EXTRACTION_CACHE_PRUNE_MAX_AGE_MS, _extractionPruneInFlight = false;
+var INTERNAL_PHASES, EXTRACTION_CACHE_TTL_MS, EXTRACTION_CACHE_PRUNE_MAX_AGE_MS, _extractionPruneInFlight = false;
 var init_cache = __esm(() => {
   init_tokens();
   init_logger();
@@ -2205,8 +2202,8 @@ function buildExtractionContext(extraction, forRange) {
 function computeToolCharPercentage(branchEntries) {
   let totalChars = 0;
   let toolChars = 0;
-  for (const e of branchEntries) {
-    const m = e?.message;
+  for (const raw of branchEntries) {
+    const m = raw?.message;
     if (!m)
       continue;
     let mc = 0;
@@ -2336,6 +2333,9 @@ init_tokens();
 import path6 from "path";
 
 // src/utils/type-guards.ts
+function isTextBlock(c) {
+  return typeof c === "object" && c !== null && c.type === "text" && typeof c.text === "string";
+}
 function isToolCallBlock(c) {
   return typeof c === "object" && c !== null && c.type === "toolCall" && typeof c.name === "string";
 }
@@ -2411,6 +2411,37 @@ function sanitizeSmartCompactDetails(d) {
   return isValidSmartCompactDetails(repaired) ? repaired : null;
 }
 
+// src/utils/file-needles.ts
+var GENERIC_BASENAMES = new Set([
+  "index.ts",
+  "index.js",
+  "index.tsx",
+  "index.jsx",
+  "types.ts",
+  "helpers.ts",
+  "utils.ts",
+  "main.ts",
+  "main.js",
+  "mod.rs",
+  "lib.rs",
+  "__init__.py"
+]);
+var MIN_BARE_BASENAME_LEN = 5;
+function buildPathNeedles(filePath) {
+  const parts = filePath.toLowerCase().split("/").filter(Boolean);
+  if (parts.length === 0)
+    return [];
+  const needles = [];
+  const basename = parts[parts.length - 1];
+  if (!GENERIC_BASENAMES.has(basename) && basename.length >= MIN_BARE_BASENAME_LEN) {
+    needles.push(basename);
+  }
+  for (let j = parts.length - 2;j >= 0; j--) {
+    needles.push(parts.slice(j).join("/"));
+  }
+  return needles;
+}
+
 // src/utils/extraction.ts
 var TRUNCATE_RE = /\u2026\u2702\d+$/;
 function isTruncated(content) {
@@ -2422,18 +2453,33 @@ var READ_TOOL_HINTS = ["read", "view", "open"];
 function hasToolHint(tool, hints) {
   return hints.some((hint) => tool.includes(hint));
 }
+function flattenToolCallBlock(b) {
+  if (!isToolCallBlock(b))
+    return [];
+  if (b.name === "multi_tool_use.parallel" && Array.isArray(b.arguments?.tool_uses)) {
+    return b.arguments.tool_uses.map((u) => {
+      const recipient = u?.recipient_name ?? "";
+      return {
+        name: recipient.replace(/^functions\./, ""),
+        id: u?.id ?? undefined,
+        arguments: u?.parameters ?? {}
+      };
+    });
+  }
+  return [{ name: b.name, id: b.id, arguments: b.arguments }];
+}
 function extractText(content) {
   if (typeof content === "string")
     return content;
-  if (Array.isArray(content))
-    return content.map((b) => {
-      if (typeof b === "string")
-        return b;
-      if (b?.type === "text")
-        return b.text ?? "";
-      return "";
-    }).join("");
-  return "";
+  if (!Array.isArray(content))
+    return "";
+  return content.map((b) => {
+    if (typeof b === "string")
+      return b;
+    if (isTextBlock(b))
+      return b.text;
+    return "";
+  }).join("");
 }
 function mediaKind(type, mime) {
   const s = (type + " " + (mime ?? "")).toLowerCase();
@@ -2484,14 +2530,11 @@ function buildToolCallIndex(msgs) {
         idx.set(b.id, { name: b.name, arguments: b.arguments, msgIndex: i });
       }
       if (b.name === "multi_tool_use.parallel" && Array.isArray(b.arguments?.tool_uses)) {
-        for (let t = 0;t < b.arguments.tool_uses.length; t++) {
-          const use = b.arguments.tool_uses[t];
-          const recipient = use?.recipient_name ?? "";
-          const toolName = recipient.replace(/^functions\./, "");
-          const params = use?.parameters ?? {};
-          const realId = use?.id ?? undefined;
+        const nested = flattenToolCallBlock(b);
+        for (let t = 0;t < nested.length; t++) {
+          const tool = nested[t];
           const syntheticId = b.id ? b.id + "_" + t : "mtu_" + i + "_" + t;
-          idx.set(realId || syntheticId, { name: toolName, arguments: params, msgIndex: i });
+          idx.set(tool.id || syntheticId, { name: tool.name, arguments: tool.arguments, msgIndex: i });
         }
       }
     }
@@ -2556,20 +2599,6 @@ function catalogErrors(msgs, _tcIdx) {
       }
     }
   }
-  function flattenToolCallBlock(b) {
-    if (!isToolCallBlock(b))
-      return [];
-    if (b.name === "multi_tool_use.parallel" && Array.isArray(b.arguments?.tool_uses)) {
-      return b.arguments.tool_uses.map((u) => {
-        const recipient = u?.recipient_name ?? "";
-        return {
-          name: recipient.replace(/^functions\./, ""),
-          id: u?.id ?? undefined
-        };
-      });
-    }
-    return [{ name: b.name, id: b.id }];
-  }
   for (const err of errors) {
     for (let j = err.index + 1;j < Math.min(msgs.length, err.index + 6); j++) {
       if (msgs[j]?.role === "assistant") {
@@ -2666,33 +2695,24 @@ function segmentTopicsHeuristic(msgs, pc, maxSegs = 20, _tcIdx) {
     if (m.role === "assistant") {
       const blocks = Array.isArray(m.content) ? m.content : [];
       for (const b of blocks) {
-        if (!isToolCallBlock(b))
-          continue;
-        const nested = b.name === "multi_tool_use.parallel" && Array.isArray(b.arguments?.tool_uses) ? b.arguments.tool_uses.map((u) => {
-          const recipient = u?.recipient_name ?? "";
-          return {
-            name: recipient.replace(/^functions\./, ""),
-            args: u?.parameters ?? {}
-          };
-        }) : [{ name: b.name, args: b.arguments }];
-        for (const tool of nested) {
-          const fp = tool.args?.path ?? tool.args?.file_path;
-          if (fp) {
-            const fn = path6.basename(fp);
-            if (lastFile && fn !== lastFile && tokenAcc > pc.minChunkTokens)
-              brk = true;
-            lastFile = fn;
-            primaryFile = fp;
-            currentPrimaryFile = fp;
-            if (tool.name?.includes("write") || tool.name?.includes("edit")) {
-              type = "implementation";
-              if (currentType !== "implementation")
-                currentType = "implementation";
-            } else if (tool.name?.includes("read")) {
-              type = "review";
-              if (currentType === "exploration")
-                currentType = "review";
-            }
+        for (const tool of flattenToolCallBlock(b)) {
+          const fp = tool.arguments?.path ?? tool.arguments?.file_path;
+          if (!fp)
+            continue;
+          const fn = path6.basename(fp);
+          if (lastFile && fn !== lastFile && tokenAcc > pc.minChunkTokens)
+            brk = true;
+          lastFile = fn;
+          primaryFile = fp;
+          currentPrimaryFile = fp;
+          if (tool.name?.includes("write") || tool.name?.includes("edit")) {
+            type = "implementation";
+            if (currentType !== "implementation")
+              currentType = "implementation";
+          } else if (tool.name?.includes("read")) {
+            type = "review";
+            if (currentType === "exploration")
+              currentType = "review";
           }
         }
       }
@@ -2759,8 +2779,13 @@ function extractMainGoal(msgs) {
 function extractOpenLoops(msgs, extraction) {
   const loops = [];
   let loopId = 0;
+  const fileNeedles = extraction.modifiedFiles.map((f) => ({
+    path: f.path,
+    needles: buildPathNeedles(f.path)
+  }));
   for (const err of extraction.errors.filter((e) => !e.resolved)) {
-    const errFiles = extraction.modifiedFiles.filter((f) => err.message.toLowerCase().includes(f.path.split("/").pop()?.toLowerCase() ?? "__none__")).map((f) => f.path);
+    const errLower = err.message.toLowerCase();
+    const errFiles = fileNeedles.filter(({ needles }) => needles.some((n) => errLower.includes(n))).map(({ path: path7 }) => path7);
     loops.push({
       id: "loop-" + ++loopId,
       type: "bugfix",
@@ -2860,6 +2885,19 @@ function extractStructured(msgs, pc, precomputedTcIdx) {
   };
 }
 
+// src/infra/session-identity.ts
+import { randomUUID } from "crypto";
+var UNRESOLVED_PREFIX = "unresolved:";
+function resolveSessionId(ctx) {
+  const resolved = ctx.sessionManager?.getSessionId?.();
+  if (typeof resolved === "string" && resolved.length > 0)
+    return resolved;
+  return UNRESOLVED_PREFIX + randomUUID();
+}
+function isUnresolvedSessionId(id) {
+  return id.startsWith(UNRESOLVED_PREFIX);
+}
+
 // src/app/steps/window.ts
 function resolveCompactionWindow(rc) {
   const usage = rc.ctx.getContextUsage();
@@ -2886,7 +2924,7 @@ function resolveCompactionWindow(rc) {
     return null;
   const contextPercent = rc.ctx.model && totalTokens ? totalTokens / rc.ctx.model.contextWindow * 100 : 0;
   const firstKeptId = msgs[keepFrom]?.id ?? msgs[msgs.length - 1]?.id;
-  const sessionId = rc.ctx.sessionManager.getSessionId?.() ?? "unknown";
+  const sessionId = resolveSessionId(rc.ctx);
   const out = rc;
   out.sessionId = sessionId;
   out.branch = branch;
@@ -2906,9 +2944,32 @@ import { convertToLlm } from "@earendil-works/pi-coding-agent";
 
 // src/utils/session-log.ts
 import * as fs4 from "fs";
+import * as path7 from "path";
 init_logger();
 init_paths();
-import * as path7 from "path";
+
+// src/utils/lru.ts
+function lruGet(m, key) {
+  if (!m.has(key))
+    return;
+  const v = m.get(key);
+  m.delete(key);
+  m.set(key, v);
+  return v;
+}
+function lruSet(m, key, value, max) {
+  if (m.has(key))
+    m.delete(key);
+  m.set(key, value);
+  while (m.size > max) {
+    const oldest = m.keys().next().value;
+    if (oldest === undefined)
+      break;
+    m.delete(oldest);
+  }
+}
+
+// src/utils/session-log.ts
 function getSessionsDir() {
   return sessionsDir();
 }
@@ -2951,42 +3012,47 @@ function* streamJsonlLines(fp, chunkSize = 64 * 1024) {
   }
 }
 var LOG_PATH_CACHE_TTL_MS = 30000;
+var DEFAULT_CACHE_MAX_ENTRIES = 8;
+function getMaxEntries() {
+  const raw = process.env.SMART_COMPACT_LOG_CACHE_MAX;
+  if (!raw)
+    return DEFAULT_CACHE_MAX_ENTRIES;
+  const n = Number.parseInt(raw, 10);
+  return Number.isFinite(n) && n > 0 ? n : DEFAULT_CACHE_MAX_ENTRIES;
+}
 var logPathCache = new Map;
 var messageMapCache = new Map;
 function findSessionLogFile(sessionId) {
+  const home2 = process.env.HOME ?? "/tmp";
+  const now = Date.now();
+  const remember = (path8) => {
+    lruSet(logPathCache, sessionId, { path: path8, expiresAt: now + LOG_PATH_CACHE_TTL_MS, home: home2 }, getMaxEntries());
+    return path8;
+  };
   try {
-    const home2 = process.env.HOME ?? "/tmp";
-    const cached = logPathCache.get(sessionId);
-    if (cached && cached.home === home2 && cached.expiresAt > Date.now())
+    const cached = lruGet(logPathCache, sessionId);
+    if (cached && cached.home === home2 && cached.expiresAt > now)
       return cached.path;
     const sessionsDir2 = getSessionsDir();
-    if (!fs4.existsSync(sessionsDir2)) {
-      logPathCache.set(sessionId, { path: null, expiresAt: Date.now() + LOG_PATH_CACHE_TTL_MS, home: home2 });
-      return null;
-    }
+    if (!fs4.existsSync(sessionsDir2))
+      return remember(null);
     for (const subdir of fs4.readdirSync(sessionsDir2)) {
       const subdirPath = path7.join(sessionsDir2, subdir);
       const stat = fs4.statSync(subdirPath);
       if (!stat.isDirectory())
         continue;
       const exact = path7.join(subdirPath, sessionId + ".jsonl");
-      if (fs4.existsSync(exact)) {
-        logPathCache.set(sessionId, { path: exact, expiresAt: Date.now() + LOG_PATH_CACHE_TTL_MS, home: home2 });
-        return exact;
-      }
+      if (fs4.existsSync(exact))
+        return remember(exact);
       const files = fs4.readdirSync(subdirPath);
       const match = files.find((f) => f.endsWith("_" + sessionId + ".jsonl"));
-      if (match) {
-        const found = path7.join(subdirPath, match);
-        logPathCache.set(sessionId, { path: found, expiresAt: Date.now() + LOG_PATH_CACHE_TTL_MS, home: home2 });
-        return found;
-      }
+      if (match)
+        return remember(path7.join(subdirPath, match));
     }
   } catch (e) {
     debug("findSessionLogFile failed", e);
   }
-  logPathCache.set(sessionId, { path: null, expiresAt: Date.now() + LOG_PATH_CACHE_TTL_MS, home: process.env.HOME ?? "/tmp" });
-  return null;
+  return remember(null);
 }
 function normalizeLogMessage(msg) {
   if (!msg || !msg.role)
@@ -3014,7 +3080,7 @@ function readOriginalMessageMap(sessionId) {
   }
   try {
     const stat = fs4.statSync(logPath);
-    const cached = messageMapCache.get(sessionId);
+    const cached = lruGet(messageMapCache, sessionId);
     if (cached && cached.logPath === logPath && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) {
       return cached.map;
     }
@@ -3036,7 +3102,7 @@ function readOriginalMessageMap(sessionId) {
     }
     debug("readOriginalMessageMap: " + map.size + " msgs from " + logPath);
     if (map.size > 0) {
-      messageMapCache.set(sessionId, { logPath, mtimeMs: stat.mtimeMs, size: stat.size, map });
+      lruSet(messageMapCache, sessionId, { logPath, mtimeMs: stat.mtimeMs, size: stat.size, map }, getMaxEntries());
       return map;
     }
     return null;
@@ -3201,35 +3267,34 @@ function pruneRedundant(msgs, precomputedTcIdx) {
     keep.delete(statusIndices[i2]);
     reasonMap.set("pi-auto-context status", (reasonMap.get("pi-auto-context status") ?? 0) + 1);
   }
-  const kept = msgs.map((m, idx) => {
-    if (!keep.has(idx))
-      return null;
-    if (m.role !== "toolResult")
-      return m;
+  const keptIndices = [];
+  const finalMsgs = [];
+  let originalTokens = 0;
+  let prunedTokens = 0;
+  const half = Math.floor(MAX_TOOL_OUTPUT_CHARS / 2);
+  for (let idx = 0;idx < msgs.length; idx++) {
+    const m = msgs[idx];
     const text = extractText(m.content);
-    if (text.length > MAX_TOOL_OUTPUT_CHARS) {
-      const half = Math.floor(MAX_TOOL_OUTPUT_CHARS / 2);
+    if (text.length > 0)
+      originalTokens += estimateTokens(text);
+    if (!keep.has(idx))
+      continue;
+    if (m.role === "toolResult" && text.length > MAX_TOOL_OUTPUT_CHARS) {
       const head = text.slice(0, half);
       const tail = text.slice(-half);
       const truncated = head + `
 ... [truncated ` + (text.length - MAX_TOOL_OUTPUT_CHARS) + ` chars] ...
 ` + tail;
-      return { ...m, content: [{ type: "text", text: truncated }] };
+      finalMsgs.push({ ...m, content: [{ type: "text", text: truncated }] });
+      prunedTokens += estimateTokens(truncated);
+    } else {
+      finalMsgs.push(m);
+      if (text.length > 0)
+        prunedTokens += estimateTokens(text);
     }
-    return m;
-  });
-  const keptIndices = [];
-  const finalMsgs = [];
-  for (let idx = 0;idx < kept.length; idx++) {
-    const m = kept[idx];
-    if (m === null)
-      continue;
     keptIndices.push(idx);
-    finalMsgs.push(m);
   }
   const prunedCount = msgs.length - finalMsgs.length;
-  const originalTokens = estimateTokens(msgs.map((m) => extractText(m.content)).join(""));
-  const prunedTokens = estimateTokens(finalMsgs.map((m) => extractText(m.content)).join(""));
   const reasons = [...reasonMap.entries()].map(([reason, count]) => ({ count, reason }));
   return {
     messages: finalMsgs,
@@ -4378,6 +4443,27 @@ function failedChunkSummary(ch) {
 // src/phases/verify.ts
 init_constants();
 init_cache();
+init_tokens();
+
+// src/utils/file-ref-detect.ts
+var CODE_EXT_RE = /\.(ts|tsx|js|jsx|mjs|cjs|rs|py|go|java|rb|cs|cpp|c|h|hpp|swift|kt|scala|php|css|scss|html|json|yaml|yml|toml|md|mdx|sh|sql|tf|ini|env|lock|gradle|xml)$/i;
+var VERSION_RE = /^v?\d+(?:\.\d+)+(?:[-+][\w.-]+)?$/i;
+var FILE_REF_CANDIDATE_RE = /[\w.\/-]+\.[\w]+/g;
+function isLikelyFileRef(candidate) {
+  if (VERSION_RE.test(candidate))
+    return false;
+  if (candidate.includes("/")) {
+    const last = candidate.split("/").pop() ?? "";
+    return last.length > 0 && !VERSION_RE.test(last);
+  }
+  return CODE_EXT_RE.test(candidate);
+}
+function extractFileRefs(summary) {
+  const candidates = summary.match(FILE_REF_CANDIDATE_RE) ?? [];
+  return candidates.filter(isLikelyFileRef);
+}
+
+// src/phases/verify.ts
 init_logger();
 
 // src/domain/summary-schema.ts
@@ -4583,7 +4669,7 @@ function verifySummary(summary, extraction) {
       score -= 10;
     }
   }
-  const summaryFileRefs = (summary.match(/[\w.\/-]+\.[\w]+/g) ?? []).filter((p) => p.includes("/") || p.match(/\.(ts|tsx|js|jsx|rs|py|go|java|rb|css|html|json|yaml|yml|toml|md|sh|sql)$/i));
+  const summaryFileRefs = extractFileRefs(summary);
   const knownFiles = new Set([
     ...extraction.modifiedFiles.map((f) => f.path.toLowerCase()),
     ...extraction.readFiles.map((f) => f.toLowerCase())
@@ -4707,10 +4793,12 @@ Current summary:
 
 Return the COMPLETE updated summary with missing items integrated. Keep the same format.`;
   try {
+    const providerCap = getProviderCaps(model.provider).maxOutputTokens;
+    const maxTokens = Math.min(8192, providerCap);
     const resp = await trackedComplete("patch", model, {
       systemPrompt: COMPACT_SYSTEM_PREFIX,
       messages: [{ role: "user", content: [{ type: "text", text: patchPrompt }], timestamp: Date.now() }]
-    }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens: 8192, signal }, services);
+    }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens, signal }, services);
     const patched = resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `).trim();
     return patched.startsWith("##") ? patched : summary;
@@ -5150,10 +5238,10 @@ function stagePendingCompaction(rc) {
     firstKeptEntryId: rc.firstKeptId,
     tokensBefore: rc.totalTokens,
     details: rc.details,
-    compactionState: rc.compactionState
+    compactionState: rc.compactionState,
+    sessionId: rc.sessionId
   };
-  rc.pendingRef.value = pending;
-  rc.pendingRef.createdAt = Date.now();
+  rc.pendingRef.set(pending);
   return pending;
 }
 function applyCompaction(rc) {
@@ -5171,8 +5259,7 @@ function applyCompaction(rc) {
       rc.ctx.ui.notify("Applied \u2713", "info");
     },
     onError: (e) => {
-      rc.pendingRef.value = null;
-      rc.pendingRef.createdAt = 0;
+      rc.pendingRef.clear();
       rc.ctx.ui.notify("Failed: " + e.message, "error");
     }
   });
@@ -5342,8 +5429,7 @@ async function runSmartCompact(opts) {
       return;
     stagePendingCompaction(stated);
     if (stated.cancellation.timedOut) {
-      stated.pendingRef.value = null;
-      stated.pendingRef.createdAt = 0;
+      stated.pendingRef.clear();
       return;
     }
     runDamageDetection(stated);
@@ -5359,8 +5445,7 @@ async function runSmartCompact(opts) {
       }
     }
     if (stated.cancellation.timedOut) {
-      stated.pendingRef.value = null;
-      stated.pendingRef.createdAt = 0;
+      stated.pendingRef.clear();
       return;
     }
     applyCompaction(stated);
@@ -5372,12 +5457,13 @@ async function runSmartCompact(opts) {
       clearTimeout(base.cancellation.timeoutId);
     opts.isRunning.value = false;
     if (base.cancellation.timedOut) {
-      base.pendingRef.value = null;
-      base.pendingRef.createdAt = 0;
+      base.pendingRef.clear();
     }
     const pipelineMs = Date.now() - base.pipelineStart;
     if (base.flags.autoTriggered && !base.cancellation.timedOut) {
-      base.ctx.ui.notify("Compaction completed in " + (pipelineMs < 1000 ? pipelineMs + "ms" : (pipelineMs / 1000).toFixed(1) + "s"), "info");
+      const dur = pipelineMs < 1000 ? pipelineMs + "ms" : (pipelineMs / 1000).toFixed(1) + "s";
+      const hasPending = base.pendingRef.isPresent();
+      base.ctx.ui.notify(hasPending ? "Smart compact prepared in " + dur + " \u2014 awaiting native /compact" : "Smart compact run finished in " + dur, "info");
     }
   }
 }
@@ -5394,7 +5480,73 @@ function duration(rc) {
 
 // src/index.ts
 init_overlays();
+
+// src/app/pending-slot.ts
+function createPendingSlot(opts) {
+  const ttlMs = opts.ttlMs;
+  const now = opts.now ?? Date.now;
+  let value = null;
+  let createdAt = 0;
+  return {
+    set(pending) {
+      value = pending;
+      createdAt = now();
+    },
+    consume(ctx) {
+      const snapshotValue = value;
+      const snapshotCreatedAt = createdAt;
+      if (!snapshotValue)
+        return { kind: "empty" };
+      const ageMs = now() - snapshotCreatedAt;
+      if (ageMs > ttlMs) {
+        value = null;
+        createdAt = 0;
+        return { kind: "expired", ageMs };
+      }
+      const currentSessionId = resolveSessionId(ctx);
+      if (snapshotValue.sessionId !== currentSessionId) {
+        value = null;
+        createdAt = 0;
+        return {
+          kind: "mismatch",
+          expected: snapshotValue.sessionId,
+          actual: currentSessionId
+        };
+      }
+      value = null;
+      createdAt = 0;
+      return { kind: "ok", pending: snapshotValue };
+    },
+    clear() {
+      value = null;
+      createdAt = 0;
+    },
+    isPresent() {
+      return value !== null;
+    },
+    peek() {
+      return value;
+    }
+  };
+}
+
+// src/index.ts
 init_logger();
+function unwrapConsumed(result, ctx) {
+  switch (result.kind) {
+    case "ok":
+      return result.pending;
+    case "empty":
+      return null;
+    case "expired":
+      warn("Discarding expired pending smart compaction after " + Math.round(result.ageMs / 1000) + "s");
+      ctx.ui.notify("Expired pending smart compaction discarded", "warning");
+      return null;
+    case "mismatch":
+      warn("Discarding pending smart compaction prepared for a different session (" + result.expected + " vs " + result.actual + ")");
+      return null;
+  }
+}
 function resolveModelArg(ctx, modelArg) {
   const [p, ...r] = modelArg.split("/");
   return ctx.modelRegistry.find(p, r.join("/"));
@@ -5422,9 +5574,9 @@ function resolveModels(ctx, primary, config) {
   return { segModel, sumModel };
 }
 function smartCompactExtension(pi) {
-  const pendingRef = { value: null, createdAt: 0 };
-  const isRunning = { value: false };
   const PENDING_TTL_MS = 5 * 60 * 1000;
+  const pendingRef = createPendingSlot({ ttlMs: PENDING_TTL_MS });
+  const isRunning = { value: false };
   pi.registerCommand("smart-compact", {
     description: "EESV smart compaction v" + VERSION + ". Usage: /smart-compact [model] [light|balanced|aggressive] [verbose|debug|dry-run] [note]",
     getArgumentCompletions: (prefix) => {
@@ -5441,7 +5593,8 @@ function smartCompactExtension(pi) {
         if (flags.includes("metrics") || flags.includes("dashboard")) {
           if (flags.includes("dashboard")) {
             const entries = readMetricsLog(200);
-            const sessionId = ctx.sessionManager.getSessionId?.() ?? "unknown";
+            const resolved = resolveSessionId(ctx);
+            const sessionId = isUnresolvedSessionId(resolved) ? "(no session)" : resolved;
             const action = await showMetricsDashboardUI(ctx, {
               entries,
               currentSessionId: sessionId,
@@ -5499,19 +5652,9 @@ function smartCompactExtension(pi) {
     }
   });
   pi.on("session_before_compact", async (_event, ctx) => {
-    if (pendingRef.value) {
-      const age = Date.now() - pendingRef.createdAt;
-      if (age > PENDING_TTL_MS) {
-        warn("Discarding expired pending smart compaction after " + Math.round(age / 1000) + "s");
-        ctx.ui?.notify?.("Expired pending smart compaction discarded", "warning");
-        pendingRef.value = null;
-        pendingRef.createdAt = 0;
-      } else {
-        const c = pendingRef.value;
-        pendingRef.value = null;
-        pendingRef.createdAt = 0;
-        return { compaction: { summary: c.summary, firstKeptEntryId: c.firstKeptEntryId, tokensBefore: c.tokensBefore, details: c.details } };
-      }
+    const consumed = unwrapConsumed(pendingRef.consume(ctx), ctx);
+    if (consumed) {
+      return { compaction: { summary: consumed.summary, firstKeptEntryId: consumed.firstKeptEntryId, tokensBefore: consumed.tokensBefore, details: consumed.details } };
     }
     const config = loadConfig();
     if (!config.autoTrigger)
@@ -5557,11 +5700,9 @@ function smartCompactExtension(pi) {
         } finally {
           clearTimeout(timeoutId);
         }
-        const pending = pendingRef.value;
-        if (pending) {
-          pendingRef.value = null;
-          pendingRef.createdAt = 0;
-          return { compaction: { summary: pending.summary, firstKeptEntryId: pending.firstKeptEntryId, tokensBefore: pending.tokensBefore, details: pending.details } };
+        const fresh = unwrapConsumed(pendingRef.consume(ctx), ctx);
+        if (fresh) {
+          return { compaction: { summary: fresh.summary, firstKeptEntryId: fresh.firstKeptEntryId, tokensBefore: fresh.tokensBefore, details: fresh.details } };
         }
       }
     } catch (e) {
@@ -5601,7 +5742,6 @@ Dashboard: ` + fp : "") }], details: undefined };
       }
       const config = loadConfig();
       const resolvedProfile = profile ?? config.profile;
-      const cmdCtx = ctx;
       const usage = ctx.getContextUsage?.();
       const totalTokens = usage?.tokens ?? 0;
       const rawPct = ctx.model && totalTokens ? totalTokens / ctx.model.contextWindow * 100 : 0;
@@ -5612,17 +5752,18 @@ Dashboard: ` + fp : "") }], details: undefined };
       if (rawPct < config.minContextPercent) {
         return { content: [{ type: "text", text: "Context is only " + pct + "% full (" + totalTokens.toLocaleString() + " tokens). Compaction is not needed yet. The tool=97% in status means tool output ratio, NOT context usage." }], details: undefined };
       }
-      const cur = "model" in ctx ? ctx.model : undefined;
-      const { segModel, sumModel } = resolveModels(cmdCtx, cur, config);
+      const cur = ctx.model;
+      const { segModel, sumModel } = resolveModels(ctx, cur, config);
       if (!sumModel) {
         return { content: [{ type: "text", text: "Error: Could not resolve model." }], details: undefined };
       }
       try {
         const toolStart = Date.now();
-        await runSmartCompact({ ctx: cmdCtx, summaryModel: sumModel, segModel: segModel ?? sumModel, profile: resolvedProfile, verbose, dryRun, pendingRef, isRunning, autoTriggered: true, skipCompact: true });
+        await runSmartCompact({ ctx, summaryModel: sumModel, segModel: segModel ?? sumModel, profile: resolvedProfile, verbose, dryRun, pendingRef, isRunning, autoTriggered: true, skipCompact: true });
         const toolSecs = ((Date.now() - toolStart) / 1000).toFixed(1);
-        if (pendingRef.value) {
-          return { content: [{ type: "text", text: "Smart summary prepared (" + resolvedProfile + "). Tokens: " + (pendingRef.value.tokensBefore ?? 0).toLocaleString() + " \u2014 summary cached for " + Math.round(PENDING_TTL_MS / 60000) + " min. The next /compact will use this summary automatically." }], details: undefined };
+        const staged = pendingRef.peek();
+        if (staged) {
+          return { content: [{ type: "text", text: "Smart summary prepared (" + resolvedProfile + "). Tokens: " + (staged.tokensBefore ?? 0).toLocaleString() + " \u2014 summary cached for " + Math.round(PENDING_TTL_MS / 60000) + " min. The next /compact will use this summary automatically." }], details: undefined };
         }
         return { content: [{ type: "text", text: "Compaction finished (" + resolvedProfile + ") but no summary was generated." }], details: undefined };
       } catch (error) {