pi-smart-compact 7.9.4 → 7.10.0

package/dist/index.js

@@ -1,6 +1,6 @@
 // @bun
 // src/constants.ts
-var VERSION = "7.9.4";
+var VERSION = "7.9.5";
 var CHARS_PER_TOKEN = 3.8;
 var COMPACT_SYSTEM_PREFIX = "You are an expert conversation summarizer for a coding agent. " + "Produce structured markdown summaries. " + "Follow output format exactly. " + "Use EXACT names \u2014 never paraphrase code identifiers. " + "Trust deterministic extraction data over intuition.";
 var PROFILES = {
@@ -35,6 +35,7 @@ var DEFAULT_CONFIG = {
   summaryModel: null,
   segmentationModel: null,
   autoTrigger: true,
+  autoTriggerTimeoutMs: 45000,
   backupEnabled: true,
   backupDir: ""
 };
@@ -191,6 +192,9 @@ function warn(msg, err) {
   const detail = err instanceof Error ? err.message : err ?? "";
   console.error(LOG_PREFIX + " " + msg + (detail ? ": " + detail : ""));
 }
+function info(msg, ...args) {
+  console.error(LOG_PREFIX + " [info] " + msg, ...args);
+}
 function debug(msg, ...args) {
   if (DEBUG)
     console.error(LOG_PREFIX + " [debug] " + msg, ...args);
@@ -223,6 +227,13 @@ function validateSmartCompactConfig(sc) {
     warn("smart-compact config: profiles must be an object, got " + typeof sc.profiles);
     delete sc.profiles;
   }
+  if ("autoTriggerTimeoutMs" in sc) {
+    const v = sc.autoTriggerTimeoutMs;
+    if (typeof v !== "number" || !Number.isFinite(v) || v < 1000 || v > 300000) {
+      warn("smart-compact config: autoTriggerTimeoutMs must be 1000\u2013300000, got " + v + ". Using default " + DEFAULT_CONFIG.autoTriggerTimeoutMs + "ms.");
+      delete sc.autoTriggerTimeoutMs;
+    }
+  }
 }
 var _cfg = null;
 var _cfgMtime = 0;
@@ -244,7 +255,7 @@ function loadConfig() {
     _cfgMtime = stat.mtimeMs;
     return _cfg;
   } catch (e) {
-    warn("loadConfig failed, using defaults", e);
+    debug("loadConfig: settings.json not found or unreadable, using defaults", e);
     const fallback = { ...DEFAULT_CONFIG, backupDir: path.join(process.env.HOME ?? "/tmp", ".pi/agent/compact-backups") };
     _cfg = fallback;
     return fallback;
@@ -282,11 +293,47 @@ function getPreviousCompactionContext(branch) {
   return `
 [IMPORTANT: Previous compaction exists (` + (last.details?.method ?? "unknown") + "). Already summarized topics: " + topics.join(", ") + ". Build upon this, don't re-summarize the same content.]";
 }
-function smartKeepBoundary(msgs, keepFromIndex) {
-  if (keepFromIndex <= 0 || keepFromIndex >= msgs.length)
-    return keepFromIndex;
-  const last = msgs[keepFromIndex - 1];
-  const first = msgs[keepFromIndex];
+function findLastAnchorIndex(branchEntries) {
+  for (let i = branchEntries.length - 1;i >= 0; i--) {
+    const e = branchEntries[i];
+    if (e?.type !== "message")
+      continue;
+    const msg = e.message;
+    if (msg?.role !== "toolResult")
+      continue;
+    if (msg?.toolName === "context" && msg?.details?.anchor) {
+      return i;
+    }
+  }
+  return -1;
+}
+function branchIndexToMsgIndex(branchEntries, branchIdx, msgs) {
+  let msgCount = 0;
+  for (let i = 0;i <= branchIdx && i < branchEntries.length; i++) {
+    const e = branchEntries[i];
+    if (e?.type === "message") {
+      if (msgCount >= msgs.length)
+        return msgs.length - 1;
+      msgCount++;
+    }
+  }
+  return Math.min(msgCount - 1, msgs.length - 1);
+}
+function smartKeepBoundary(msgs, keepFromIndex, branchEntries) {
+  let adjusted = keepFromIndex;
+  if (branchEntries && branchEntries.length > 0) {
+    const lastAnchorBranchIdx = findLastAnchorIndex(branchEntries);
+    if (lastAnchorBranchIdx >= 0) {
+      const lastAnchorMsgIdx = branchIndexToMsgIndex(branchEntries, lastAnchorBranchIdx, msgs);
+      if (adjusted > lastAnchorMsgIdx && lastAnchorMsgIdx >= 0) {
+        adjusted = lastAnchorMsgIdx;
+      }
+    }
+  }
+  if (adjusted <= 0 || adjusted >= msgs.length)
+    return adjusted;
+  const last = msgs[adjusted - 1];
+  const first = msgs[adjusted];
   if (last && first) {
     const getText = (msg) => {
       const m = msg;
@@ -310,9 +357,45 @@ function smartKeepBoundary(msgs, keepFromIndex) {
     fileRe.lastIndex = 0;
     const keptFiles = new Set([...keptText.matchAll(fileRe)].map((m) => m[1].split("/").pop()));
     if ([...lastFiles].filter((f) => keptFiles.has(f)).length > 0)
-      return keepFromIndex - 1;
+      return adjusted - 1;
   }
-  return keepFromIndex;
+  return adjusted;
+}
+function guardToolCallBoundary(msgs, keepFrom) {
+  if (keepFrom <= 0 || keepFrom >= msgs.length)
+    return keepFrom;
+  const tcMap = new Map;
+  for (let i = 0;i < msgs.length; i++) {
+    const m = msgs[i].message;
+    if (m?.role !== "assistant")
+      continue;
+    const blocks = Array.isArray(m?.content) ? m.content : [];
+    for (const b of blocks) {
+      if (b?.type === "toolCall" && b.id) {
+        tcMap.set(b.id, i);
+      }
+    }
+  }
+  let adjusted = keepFrom;
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (let i = adjusted;i < msgs.length; i++) {
+      const m = msgs[i].message;
+      if (m?.role !== "toolResult")
+        continue;
+      const tcId = m?.toolCallId;
+      if (!tcId)
+        continue;
+      const tcIdx = tcMap.get(tcId);
+      if (tcIdx !== undefined && tcIdx < adjusted) {
+        adjusted = tcIdx;
+        changed = true;
+        break;
+      }
+    }
+  }
+  return Math.max(0, Math.min(adjusted, msgs.length));
 }
 function extractUserNote(args) {
   const SKIP = new Set(["verbose", "debug", "dry-run", "light", "balanced", "aggressive"]);
@@ -400,6 +483,39 @@ function buildExtractionContext(extraction, forRange) {
   ].join(`
 `);
 }
+function computeToolCharPercentage(branchEntries) {
+  let totalChars = 0;
+  let toolChars = 0;
+  for (const e of branchEntries) {
+    const m = e?.message;
+    if (!m)
+      continue;
+    let mc = 0;
+    if (typeof m.content === "string") {
+      mc = m.content.length;
+    } else if (Array.isArray(m.content)) {
+      for (const part of m.content) {
+        if (typeof part?.text === "string")
+          mc += part.text.length;
+        else if (typeof part?.content === "string")
+          mc += part.content.length;
+      }
+    }
+    totalChars += mc;
+    if (m.role === "toolResult")
+      toolChars += mc;
+  }
+  return totalChars > 0 ? Math.round(toolChars / totalChars * 100) : 0;
+}
+function selectCompactionTier(contextPercent, toolPercent, totalTokens, minThreshold) {
+  if (totalTokens < minThreshold)
+    return "none";
+  if (contextPercent < 45 && toolPercent < 60)
+    return "none";
+  if (contextPercent < 80)
+    return "light";
+  return "full";
+}
 function inferSessionType(extraction, report) {
   if (report?.sessionType)
     return report.sessionType;
@@ -588,7 +704,20 @@ function getCompactSessionId() {
 function resetCompactSessionId() {
   _compactSessionId = null;
 }
-function cacheOpts(opts, provider) {
+var INTERNAL_PHASES = new Set([
+  "explore",
+  "explore-loop",
+  "explore-retry",
+  "explore-direct",
+  "single-pass",
+  "batch",
+  "assemble",
+  "patch"
+]);
+function cacheOpts(opts, provider, phase) {
+  if (phase && INTERNAL_PHASES.has(phase)) {
+    return { ...opts, cacheRetention: "none" };
+  }
   const strategy = provider ? getProviderCaps(provider).cacheStrategy : "none";
   const retention = strategy === "none" ? "none" : opts.cacheRetention ?? "short";
   if (retention === "none") {
@@ -625,7 +754,8 @@ function getMetricsSummary() {
 async function trackedComplete(phase, model, reqBody, opts) {
   const start = Date.now();
   try {
-    const resp = await complete(model, reqBody, opts);
+    const resolvedOpts = cacheOpts(opts, model.provider, phase);
+    const resp = await complete(model, reqBody, resolvedOpts);
     const latency = Date.now() - start;
     const usage = resp.usage;
     const inputT = usage?.input ?? 0;
@@ -665,7 +795,7 @@ async function trackedComplete(phase, model, reqBody, opts) {
 function getCachePath(sessionId) {
   return path2.join(CACHE_DIR, "compact-extraction-" + sessionId.replace(/[^a-zA-Z0-9-]/g, "_") + ".json");
 }
-function saveCachedExtraction(sessionId, extraction, msgCount) {
+function saveCachedExtraction(sessionId, extraction, msgCount, firstEntryId, lastEntryId) {
   try {
     if (!fs2.existsSync(CACHE_DIR))
       fs2.mkdirSync(CACHE_DIR, { recursive: true });
@@ -673,7 +803,9 @@ function saveCachedExtraction(sessionId, extraction, msgCount) {
       lastMessageIndex: msgCount - 1,
       extraction,
       messageCount: msgCount,
-      timestamp: Date.now()
+      timestamp: Date.now(),
+      firstEntryId,
+      lastEntryId
     };
     fs2.writeFileSync(getCachePath(sessionId), JSON.stringify(cached));
   } catch (e) {
@@ -723,12 +855,18 @@ function mergeExtractions(base, delta, baseMsgCount) {
     messageCount: baseMsgCount + delta.messageCount
   };
 }
-function appendMetricsLog(sessionId) {
+function appendMetricsLog(sessionId, extra) {
   try {
     if (!fs2.existsSync(CACHE_DIR))
       fs2.mkdirSync(CACHE_DIR, { recursive: true });
     const logPath = path2.join(CACHE_DIR, "compact-metrics.jsonl");
-    const entry = { ts: new Date().toISOString(), sessionId, ...getMetricsSummary() };
+    const summary = getMetricsSummary();
+    const entry = {
+      ts: new Date().toISOString(),
+      sessionId,
+      ...summary,
+      ...extra
+    };
     fs2.appendFileSync(logPath, JSON.stringify(entry) + `
 `);
   } catch (e) {
@@ -755,6 +893,10 @@ function filterToolCalls(content) {
 }
 
 // src/utils/extraction.ts
+var TRUNCATE_RE = /\u2026\u2702\d+$/;
+function isTruncated(content) {
+  return TRUNCATE_RE.test(extractText(content));
+}
 function extractText(content) {
   if (typeof content === "string")
     return content;
@@ -776,9 +918,22 @@ function buildToolCallIndex(msgs) {
       continue;
     const blocks = Array.isArray(m.content) ? m.content : [];
     for (const b of blocks) {
-      if (isToolCallBlock(b) && b.id) {
+      if (!isToolCallBlock(b))
+        continue;
+      if (b.id) {
         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 syntheticId = b.id ? b.id + "_" + t : "mtu_" + i + "_" + t;
+          idx.set(realId || syntheticId, { name: toolName, arguments: params, msgIndex: i });
+        }
+      }
     }
   }
   return idx;
@@ -802,7 +957,10 @@ function trackFileOps(msgs, _tcIdx) {
     const tool = tc.name.toLowerCase();
     if (tool.includes("write") || tool.includes("edit")) {
       const resultText = extractText(m.content);
-      if (!NO_OP_RE.test(resultText)) {
+      if (isTruncated(resultText)) {
+        const existing = modMap.get(filePath);
+        modMap.set(filePath, { toolCalls: (existing?.toolCalls ?? 0) + 1, lastIdx: i });
+      } else if (!NO_OP_RE.test(resultText)) {
         const existing = modMap.get(filePath);
         modMap.set(filePath, { toolCalls: (existing?.toolCalls ?? 0) + 1, lastIdx: i });
       }
@@ -832,28 +990,46 @@ function catalogErrors(msgs, _tcIdx) {
     }
     if (tc?.name === "bash") {
       const txt = extractText(m.content);
-      const isLikelyError = /(?:command not found|no such file|permission denied|syntax error|cannot find|module not found|compilation error|build failed|test failed)/i.test(txt);
+      const isLikelyError = /(?:command not found|no such file|permission denied|syntax error|cannot find|module not found|compilation error|build failed|test failed|^FAIL\b|ERROR:)/i.test(txt);
       if (isLikelyError && txt.length < 2000) {
         errors.push({ index: i, tool: "bash", message: txt.slice(0, 300), retryAttempted: false, resolved: false });
       }
     }
   }
+  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") {
         const rawBlocks = msgs[j]?.content;
         const blocks = Array.isArray(rawBlocks) ? rawBlocks : [];
         for (const b of blocks) {
-          if (isToolCallBlock(b) && b.name === err.tool) {
-            err.retryAttempted = true;
-            for (let k = j + 1;k < Math.min(msgs.length, j + 10); k++) {
-              if (msgs[k]?.role === "toolResult" && msgs[k]?.toolCallId === b.id && !msgs[k]?.isError) {
-                err.resolved = true;
-                break;
+          for (const tool of flattenToolCallBlock(b)) {
+            if (tool.name === err.tool) {
+              err.retryAttempted = true;
+              for (let k = j + 1;k < Math.min(msgs.length, j + 10); k++) {
+                if (msgs[k]?.role === "toolResult" && msgs[k]?.toolCallId === tool.id && !msgs[k]?.isError) {
+                  err.resolved = true;
+                  break;
+                }
               }
+              break;
             }
-            break;
           }
+          if (err.retryAttempted)
+            break;
         }
         if (err.retryAttempted)
           break;
@@ -917,6 +1093,8 @@ function mineConstraints(msgs) {
 function segmentTopicsHeuristic(msgs, pc, maxSegs = 20, _tcIdx) {
   const topics = [];
   let startIdx = 0, tokenAcc = 0, lastFile = null, errAcc = 0;
+  let currentType = "exploration";
+  let currentPrimaryFile = null;
   const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
   for (let i = 0;i < msgs.length; i++) {
     const m = msgs[i];
@@ -928,18 +1106,33 @@ 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)) {
-          const fp = b.arguments?.path ?? b.arguments?.file_path;
+        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 = path3.basename(fp);
             if (lastFile && fn !== lastFile && tokenAcc > pc.minChunkTokens)
               brk = true;
             lastFile = fn;
             primaryFile = fp;
-            if (b.name?.includes("write") || b.name?.includes("edit"))
+            currentPrimaryFile = fp;
+            if (tool.name?.includes("write") || tool.name?.includes("edit")) {
               type = "implementation";
-            else if (b.name?.includes("read"))
+              if (currentType !== "implementation")
+                currentType = "implementation";
+            } else if (tool.name?.includes("read")) {
               type = "review";
+              if (currentType === "exploration")
+                currentType = "review";
+            }
           }
         }
       }
@@ -947,12 +1140,16 @@ function segmentTopicsHeuristic(msgs, pc, maxSegs = 20, _tcIdx) {
     if (m.role === "toolResult" && m.isError) {
       errAcc++;
       type = "debugging";
+      if (currentType !== "implementation")
+        currentType = "debugging";
     }
     if (m.role === "toolResult" && !m.isError) {
       const tc = tcIdx.get(m.toolCallId ?? "");
       if (tc?.name === "bash" && /error|fail/i.test(txt)) {
         errAcc++;
         type = "debugging";
+        if (currentType !== "implementation")
+          currentType = "debugging";
       }
     }
     if (m.role === "user" && SHIFT_RE.test(txt) && tokenAcc > pc.minChunkTokens)
@@ -960,15 +1157,17 @@ function segmentTopicsHeuristic(msgs, pc, maxSegs = 20, _tcIdx) {
     if (tokenAcc >= pc.maxChunkTokens)
       brk = true;
     if (brk && i > startIdx && topics.length < maxSegs - 1) {
-      topics.push({ startIndex: startIdx, endIndex: i, primaryFile, type, errorDensity: errAcc });
+      topics.push({ startIndex: startIdx, endIndex: i, primaryFile: currentPrimaryFile, type: currentType, errorDensity: errAcc });
       startIdx = i + 1;
       tokenAcc = 0;
       lastFile = null;
       errAcc = 0;
+      currentType = "exploration";
+      currentPrimaryFile = null;
     }
   }
   if (startIdx < msgs.length) {
-    topics.push({ startIndex: startIdx, endIndex: msgs.length - 1, primaryFile: null, type: "exploration", errorDensity: errAcc });
+    topics.push({ startIndex: startIdx, endIndex: msgs.length - 1, primaryFile: currentPrimaryFile, type: currentType, errorDensity: errAcc });
   }
   return topics;
 }
@@ -1099,18 +1298,127 @@ function extractStructured(msgs, pc) {
   };
 }
 
+// src/utils/session-log.ts
+import * as fs3 from "fs";
+import * as path4 from "path";
+function getSessionsDir() {
+  return path4.join(process.env.HOME ?? "/tmp", ".pi", "agent", "sessions");
+}
+function findSessionLogFile(sessionId) {
+  try {
+    const sessionsDir = getSessionsDir();
+    if (!fs3.existsSync(sessionsDir))
+      return null;
+    for (const subdir of fs3.readdirSync(sessionsDir)) {
+      const subdirPath = path4.join(sessionsDir, subdir);
+      const stat = fs3.statSync(subdirPath);
+      if (!stat.isDirectory())
+        continue;
+      const exact = path4.join(subdirPath, sessionId + ".jsonl");
+      if (fs3.existsSync(exact))
+        return exact;
+      const files = fs3.readdirSync(subdirPath);
+      const match = files.find((f) => f.endsWith("_" + sessionId + ".jsonl"));
+      if (match)
+        return path4.join(subdirPath, match);
+    }
+  } catch (e) {
+    debug("findSessionLogFile failed", e);
+  }
+  return null;
+}
+function normalizeLogMessage(msg) {
+  if (!msg || !msg.role)
+    return null;
+  const role = msg.role;
+  if (role === "user" || role === "assistant" || role === "toolResult") {
+    return {
+      role,
+      content: msg.content,
+      isError: msg.isError,
+      toolCallId: msg.toolCallId,
+      timestamp: msg.content && typeof msg.content === "object" ? Date.now() : undefined
+    };
+  }
+  return null;
+}
+function hasTruncatedMessages(msgs) {
+  return msgs.some((m) => TRUNCATE_RE.test(extractText(m.content)));
+}
+function readOriginalMessageMap(sessionId) {
+  const logPath = findSessionLogFile(sessionId);
+  if (!logPath) {
+    debug("Session log not found for " + sessionId);
+    return null;
+  }
+  try {
+    const raw = fs3.readFileSync(logPath, "utf-8");
+    const map = new Map;
+    for (const line of raw.split(`
+`)) {
+      if (!line.trim())
+        continue;
+      let entry;
+      try {
+        entry = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (entry.type === "message" && entry.id && entry.message) {
+        const normalized = normalizeLogMessage(entry.message);
+        if (normalized)
+          map.set(entry.id, normalized);
+      }
+    }
+    debug("readOriginalMessageMap: " + map.size + " msgs from " + logPath);
+    return map.size > 0 ? map : null;
+  } catch (e) {
+    debug("readOriginalMessageMap failed", e);
+    return null;
+  }
+}
+function entryToLlm(entry) {
+  const msg = entry.message;
+  return {
+    role: msg?.role ?? "user",
+    content: msg?.content,
+    toolCallId: msg?.toolCallId,
+    isError: msg?.isError
+  };
+}
+function resolveCompactionMessages(sessionId, toCompactEntries) {
+  const logMap = readOriginalMessageMap(sessionId);
+  if (!logMap)
+    return null;
+  let restoredCount = 0;
+  const result = [];
+  for (const entry of toCompactEntries) {
+    const logMsg = entry.id ? logMap.get(entry.id) : undefined;
+    if (logMsg && !hasTruncatedMessages([logMsg])) {
+      result.push(logMsg);
+      restoredCount++;
+    } else {
+      result.push(entryToLlm(entry));
+    }
+  }
+  if (restoredCount > 0) {
+    info("Session log recovery: " + restoredCount + "/" + toCompactEntries.length + " messages restored from log");
+  }
+  return result;
+}
+
 // src/utils/state.ts
-import fs3 from "fs";
-import path4 from "path";
-var STATE_DIR = path4.join(process.env.HOME ?? "/tmp", ".pi", "agent", ".cache", "smart-compact", "states");
+import fs4 from "fs";
+import path5 from "path";
+var STATE_DIR = path5.join(process.env.HOME ?? "/tmp", ".pi", "agent", ".cache", "smart-compact", "states");
 function getStatePath(projectId) {
-  return path4.join(STATE_DIR, projectId + ".json");
+  return path5.join(STATE_DIR, projectId + ".json");
 }
 function saveCompactionState(projectId, state) {
   try {
-    if (!fs3.existsSync(STATE_DIR))
-      fs3.mkdirSync(STATE_DIR, { recursive: true });
-    fs3.writeFileSync(getStatePath(projectId), JSON.stringify(state, null, 2));
+    if (!fs4.existsSync(STATE_DIR))
+      fs4.mkdirSync(STATE_DIR, { recursive: true });
+    fs4.writeFileSync(getStatePath(projectId), JSON.stringify(state, null, 2));
   } catch (e) {
     warn("saveCompactionState failed", e);
   }
@@ -1118,14 +1426,14 @@ function saveCompactionState(projectId, state) {
 function loadCompactionState(projectId) {
   try {
     const fp = getStatePath(projectId);
-    if (!fs3.existsSync(fp))
+    if (!fs4.existsSync(fp))
       return null;
-    const data = JSON.parse(fs3.readFileSync(fp, "utf8"));
+    const data = JSON.parse(fs4.readFileSync(fp, "utf8"));
     if (data.compactionVersion) {
       let updatedAt = data.updatedAt;
       if (!updatedAt) {
         try {
-          updatedAt = fs3.statSync(fp).mtimeMs;
+          updatedAt = fs4.statSync(fp).mtimeMs;
         } catch (e) {
           debug("statSync failed for state file", e);
           updatedAt = 0;
@@ -1313,6 +1621,7 @@ function extractCriticalContext(summary) {
 
 // src/utils/pruning.ts
 var ACK_RE = /^(?:I'?ll |let me |sure|ok[,.]?|got it|i understand|i see|now i|next,? i|alright|great|perfect|sounds good|i can|i will|checking|looking|right away)/i;
+var PI_STATUS_RE = /^\[pi-auto-context\]/;
 var MAX_TOOL_OUTPUT_CHARS = 800;
 function pruneRedundant(msgs) {
   if (msgs.length < 5)
@@ -1383,6 +1692,17 @@ function pruneRedundant(msgs) {
       reasonMap.set("Agent acknowledgments", (reasonMap.get("Agent acknowledgments") ?? 0) + 1);
     }
   }
+  const statusIndices = [];
+  for (let idx = 0;idx < msgs.length; idx++) {
+    const text = extractText(msgs[idx].content);
+    if (PI_STATUS_RE.test(text)) {
+      statusIndices.push(idx);
+    }
+  }
+  for (let i2 = 0;i2 < statusIndices.length - 1; i2++) {
+    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;
@@ -1413,10 +1733,11 @@ function pruneRedundant(msgs) {
 }
 
 // src/utils/fingerprint.ts
-import fs4 from "fs";
-import path5 from "path";
+import fs5 from "fs";
+import path6 from "path";
 import crypto3 from "crypto";
-var FINGERPRINT_DIR = path5.join(process.env.HOME ?? "/tmp", ".pi", "agent", ".cache", "smart-compact", "projects");
+import { execSync } from "child_process";
+var FINGERPRINT_DIR = path6.join(process.env.HOME ?? "/tmp", ".pi", "agent", ".cache", "smart-compact", "projects");
 var LANG_MAP = {
   ".ts": "typescript",
   ".tsx": "typescript",
@@ -1449,7 +1770,7 @@ var FRAMEWORK_SIGNALS = [
   { pattern: /package\.json/i, framework: "node" }
 ];
 function getFingerprintPath(projectId) {
-  return path5.join(FINGERPRINT_DIR, projectId + ".json");
+  return path6.join(FINGERPRINT_DIR, projectId + ".json");
 }
 var NOISE_PATH_RE = /(?:node_modules|[/\\]\.pi[/\\]agent|[/\\]\.cache|[/\\]\.npm|[/\\]\.bun|[/\\]\.git[/\\])/;
 function isProjectPath(filePath) {
@@ -1458,6 +1779,14 @@ function isProjectPath(filePath) {
 function hashProjectId(seed) {
   return "proj-" + crypto3.createHash("sha256").update(seed).digest("hex").slice(0, 12);
 }
+function findGitRoot(cwd) {
+  try {
+    const out = execSync("git rev-parse --show-toplevel", { cwd, encoding: "utf-8", timeout: 2000 });
+    return out.trim();
+  } catch {
+    return null;
+  }
+}
 function deriveFromAbsolutePaths(paths) {
   const segments = paths.map((p) => p.replace(/^\/+/, "").split("/").filter(Boolean)).filter((s) => s.length >= 3);
   if (segments.length < 2)
@@ -1499,36 +1828,42 @@ function deriveFromRelativePaths(paths) {
     }
   }
   const stableDirs = [...dir2Counts.entries()].sort((a, b) => b[1] - a[1]).slice(0, 8).map(([d]) => d).sort();
-  const fingerprint = topEntries.join(",") + "|" + stableDirs.join(",");
-  return hashProjectId(fingerprint);
+  return hashProjectId(topEntries.join(",") + "|" + stableDirs.join(","));
 }
-function deriveProjectId(extraction) {
+function deriveProjectId(cwd, extraction, sessionId) {
+  if (cwd && cwd !== "/" && cwd !== process.env.HOME) {
+    return hashProjectId(cwd);
+  }
   const allPaths = [
     ...extraction.modifiedFiles.map((f) => f.path),
     ...extraction.readFiles
   ].filter(isProjectPath);
-  if (!allPaths.length)
-    return "unknown";
-  const absolutePaths = allPaths.filter((p) => p.startsWith("/"));
-  const relativePaths = allPaths.filter((p) => !p.startsWith("/"));
-  if (absolutePaths.length >= 2) {
-    return deriveFromAbsolutePaths(absolutePaths);
+  if (allPaths.length) {
+    const absolutePaths = allPaths.filter((p) => p.startsWith("/"));
+    const relativePaths = allPaths.filter((p) => !p.startsWith("/"));
+    if (absolutePaths.length >= 2) {
+      return deriveFromAbsolutePaths(absolutePaths);
+    }
+    if (relativePaths.length >= 2) {
+      return deriveFromRelativePaths(relativePaths);
+    }
+    return hashProjectId(allPaths.sort().join("|"));
   }
-  if (relativePaths.length >= 2) {
-    return deriveFromRelativePaths(relativePaths);
+  if (sessionId && sessionId !== "unknown") {
+    return hashProjectId("session-" + sessionId);
   }
-  return hashProjectId(allPaths.sort().join("|"));
+  return "unknown";
 }
 function detectLanguage(extraction) {
   const extCounts = new Map;
   for (const f of extraction.modifiedFiles) {
-    const ext = path5.extname(f.path).toLowerCase();
+    const ext = path6.extname(f.path).toLowerCase();
     if (ext && LANG_MAP[ext]) {
       extCounts.set(LANG_MAP[ext], (extCounts.get(LANG_MAP[ext]) ?? 0) + 1);
     }
   }
   for (const f of extraction.readFiles) {
-    const ext = path5.extname(f).toLowerCase();
+    const ext = path6.extname(f).toLowerCase();
     if (ext && LANG_MAP[ext]) {
       extCounts.set(LANG_MAP[ext], (extCounts.get(LANG_MAP[ext]) ?? 0) + 1);
     }
@@ -1559,9 +1894,9 @@ function extractKeyDirs(extraction, maxDirs = 8) {
 function loadProjectFingerprint(projectId) {
   try {
     const fp = getFingerprintPath(projectId);
-    if (!fs4.existsSync(fp))
+    if (!fs5.existsSync(fp))
       return null;
-    const data = JSON.parse(fs4.readFileSync(fp, "utf8"));
+    const data = JSON.parse(fs5.readFileSync(fp, "utf8"));
     if (Date.now() - data.updatedAt > 30 * 24 * 60 * 60 * 1000)
       return null;
     return data;
@@ -1572,8 +1907,8 @@ function loadProjectFingerprint(projectId) {
 }
 function saveProjectFingerprint(projectId, extraction) {
   try {
-    if (!fs4.existsSync(FINGERPRINT_DIR))
-      fs4.mkdirSync(FINGERPRINT_DIR, { recursive: true });
+    if (!fs5.existsSync(FINGERPRINT_DIR))
+      fs5.mkdirSync(FINGERPRINT_DIR, { recursive: true });
     const existing = loadProjectFingerprint(projectId);
     const newKnownFiles = [...new Set([
       ...existing?.knownFiles ?? [],
@@ -1589,7 +1924,7 @@ function saveProjectFingerprint(projectId, extraction) {
       sessionCount: (existing?.sessionCount ?? 0) + 1,
       updatedAt: Date.now()
     };
-    fs4.writeFileSync(getFingerprintPath(projectId), JSON.stringify(fingerprint, null, 2));
+    fs5.writeFileSync(getFingerprintPath(projectId), JSON.stringify(fingerprint, null, 2));
   } catch (e) {
     warn("saveProjectFingerprint failed", e);
   }
@@ -1607,8 +1942,8 @@ function buildProjectContext(fingerprint) {
 }
 
 // src/utils/damage.ts
-import fs5 from "fs";
-import path6 from "path";
+import fs6 from "fs";
+import path7 from "path";
 var COMPLAINT_PATTERNS = [
   /(?:I already (?:told|said|mentioned|explained) you|(?:we|I) (?:already|just) (?:discussed|went over|covered) this|you forgot|you lost|nerede kald\u0131|hat\u0131rlam\u0131yor|unuttun)/i,
   /(?:that'?s? not (?:what I|right)|that'?s? wrong|yanl\u0131\u015F|hay\u0131r de\u011Fil|no that'|that doesn'?t match)/i,
@@ -1690,10 +2025,10 @@ function detectDamage(postMessages, details) {
 }
 function logDamageReport(sessionId, report, details) {
   try {
-    const dir = path6.join(process.env.HOME ?? "/tmp", ".pi", "agent", ".cache", "smart-compact");
-    if (!fs5.existsSync(dir))
-      fs5.mkdirSync(dir, { recursive: true });
-    const logPath = path6.join(dir, "damage-reports.jsonl");
+    const dir = path7.join(process.env.HOME ?? "/tmp", ".pi", "agent", ".cache", "smart-compact");
+    if (!fs6.existsSync(dir))
+      fs6.mkdirSync(dir, { recursive: true });
+    const logPath = path7.join(dir, "damage-reports.jsonl");
     const entry = {
       ts: new Date().toISOString(),
       sessionId,
@@ -1704,7 +2039,7 @@ function logDamageReport(sessionId, report, details) {
       signals: report.signals.length,
       summary: report.summary
     };
-    fs5.appendFileSync(logPath, JSON.stringify(entry) + `
+    fs6.appendFileSync(logPath, JSON.stringify(entry) + `
 `);
   } catch (e) {
     warn("logDamageReport failed", e);
@@ -1946,7 +2281,7 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
       systemPrompt: COMPACT_SYSTEM_PREFIX,
       messages: [{ role: "user", content: [{ type: "text", text: userContent }], timestamp: Date.now() }],
       tools: EXPLORATION_TOOLS
-    }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, signal }, model.provider));
+    }, { apiKey: auth.apiKey, headers: auth.headers, signal });
     const toolCalls = probeResp.content.filter((c) => c.type === "toolCall");
     if (toolCalls.length > 0) {
       supportsTools = true;
@@ -1970,7 +2305,7 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
 ` + EXPLORER_SYSTEM_PROMPT,
             messages,
             tools: EXPLORATION_TOOLS
-          }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, signal }, model.provider));
+          }, { apiKey: auth.apiKey, headers: auth.headers, signal });
         } catch (err) {
           warn("Explore loop error", err);
           break;
@@ -2042,7 +2377,7 @@ User steering: ` + userNote : "");
     const resp = await trackedComplete("explore-retry", model, {
       systemPrompt: COMPACT_SYSTEM_PREFIX,
       messages: [{ role: "user", content: [{ type: "text", text: retryPrompt }], timestamp: Date.now() }]
-    }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(4096, getProviderCaps(model.provider).maxOutputTokens), signal }, model.provider));
+    }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(4096, getProviderCaps(model.provider).maxOutputTokens), signal });
     const text = resp.content.filter((c) => c.type === "text").map((c) => c.text).join("").trim();
     return parseExplorationReport(text, llmMessages);
   } catch (e) {
@@ -2080,7 +2415,7 @@ Output ONLY JSON: {"mainGoal":"...","sessionType":"implementation|review|debuggi
     const resp = await trackedComplete("explore-direct", model, {
       systemPrompt: COMPACT_SYSTEM_PREFIX,
       messages: [{ role: "user", content: [{ type: "text", text: prompt }], timestamp: Date.now() }]
-    }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(4096, getProviderCaps(model.provider).maxOutputTokens), signal }, model.provider));
+    }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(4096, getProviderCaps(model.provider).maxOutputTokens), signal });
     const text = resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `).trim();
     return parseExplorationReport(text, llmMessages);
@@ -2166,7 +2501,7 @@ Session-specific instructions:
       { role: "user", content: [{ type: "text", text: adaptedPrefix }], timestamp: Date.now() },
       { role: "user", content: [{ type: "text", text: dynamicSuffix }], timestamp: Date.now() }
     ]
-  }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, maxTokens: getProviderCaps(model.provider).maxOutputTokens, signal }, model.provider));
+  }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens: getProviderCaps(model.provider).maxOutputTokens, signal });
   const summary = resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `).trim();
   if (!summary.startsWith("##"))
@@ -2197,7 +2532,7 @@ async function summarizeBatch(batch, extraction, model, auth, signal) {
       { role: "user", content: [{ type: "text", text: BATCH_PROMPT_PREFIX }], timestamp: Date.now() },
       { role: "user", content: [{ type: "text", text: dynamicSuffix }], timestamp: Date.now() }
     ]
-  }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(4096, getProviderCaps(model.provider).maxOutputTokens), signal }, model.provider));
+  }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(4096, getProviderCaps(model.provider).maxOutputTokens), signal });
   const output = resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `);
   const sections = output.split(/^### /m).filter((s) => s.trim());
@@ -2238,7 +2573,7 @@ async function assembleLLM(summaries, extraction, report, model, auth, budget, p
       { role: "user", content: [{ type: "text", text: ASSEMBLY_PROMPT_PREFIX }], timestamp: Date.now() },
       { role: "user", content: [{ type: "text", text: dynamicSuffix }], timestamp: Date.now() }
     ]
-  }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(budget, getProviderCaps(model.provider).maxOutputTokens), signal }, model.provider));
+  }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens: Math.min(budget, getProviderCaps(model.provider).maxOutputTokens), signal });
   return resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `).trim();
 }
@@ -2450,7 +2785,7 @@ Return the COMPLETE updated summary with missing items integrated. Keep the same
     const resp = await trackedComplete("patch", model, {
       systemPrompt: COMPACT_SYSTEM_PREFIX,
       messages: [{ role: "user", content: [{ type: "text", text: patchPrompt }], timestamp: Date.now() }]
-    }, cacheOpts({ apiKey: auth.apiKey, headers: auth.headers, maxTokens: 8192, signal }));
+    }, { apiKey: auth.apiKey, headers: auth.headers, maxTokens: 8192, signal });
     const patched = resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `).trim();
     return patched.startsWith("##") ? patched : summary;
@@ -2463,7 +2798,7 @@ Return the COMPLETE updated summary with missing items integrated. Keep the same
 // src/ui/overlays.ts
 import { DynamicBorder } from "@earendil-works/pi-coding-agent";
 import { Container, SelectList, Text } from "@earendil-works/pi-tui";
-import path7 from "path";
+import path8 from "path";
 function renderContextBar(theme, pct, tokens, barLen = 24) {
   const clamped = Math.min(Math.max(pct, 0), 100);
   const filled = Math.min(barLen, Math.round(clamped / 100 * barLen));
@@ -2639,7 +2974,7 @@ async function showResultScreen(ctx, details, extraction) {
         const f = modFiles[i];
         const fc = extraction.modifiedFiles.find((e) => e.path === f);
         const count = fc ? " (" + fc.toolCalls + "x)" : "";
-        c.addChild(new Text(theme.fg("success", "    \u270E ") + theme.fg("text", path7.basename(f)) + theme.fg("dim", count + " \u2192 " + f), 0, 0));
+        c.addChild(new Text(theme.fg("success", "    \u270E ") + theme.fg("text", path8.basename(f)) + theme.fg("dim", count + " \u2192 " + f), 0, 0));
       }
       if (modFiles.length > maxShow) {
         c.addChild(new Text(theme.fg("dim", "    + " + (modFiles.length - maxShow) + " more"), 0, 0));
@@ -2715,6 +3050,8 @@ async function runSmartCompact(opts) {
       ctx.ui.notify("Model resolve failed", "error");
     return;
   }
+  let timedOut = false;
+  let timeoutId = null;
   try {
     const config = loadConfig();
     const pc = { ...PROFILES[profile], ...config.profiles?.[profile] ?? {} };
@@ -2730,17 +3067,22 @@ async function runSmartCompact(opts) {
     const apiHeaders = auth.headers;
     const usage = ctx.getContextUsage();
     const totalTokens = usage?.tokens ?? 0;
-    if (!totalTokens || totalTokens < MIN_TOKEN_THRESHOLD) {
-      isRunning.value = false;
-      if (!autoTriggered)
-        ctx.ui.notify("Context OK or unknown", "info");
-      return;
-    }
     const notify = (msg, type = "info") => {
       ctx.ui.notify(msg, type === "success" ? "info" : type);
     };
+    const vlog = (msg) => {
+      if (verbose)
+        info(msg);
+    };
     const ctrl = new AbortController;
     const signal = ctrl.signal;
+    if (autoTriggered && config.autoTriggerTimeoutMs > 0) {
+      timeoutId = setTimeout(() => {
+        timedOut = true;
+        ctrl.abort();
+        notify("Smart compact auto-trigger timed out after " + config.autoTriggerTimeoutMs + "ms, falling back to native compact", "warning");
+      }, config.autoTriggerTimeoutMs);
+    }
     const modelLabel = summaryModel.provider + "/" + summaryModel.id;
     notify("Smart compact: " + modelLabel + ", " + profile + ", tokens=" + totalTokens, "info");
     notify("EESV Compact (" + modelLabel + ", " + profile + ") \u2014 " + (totalTokens ?? 0).toLocaleString() + "t", "info");
@@ -2761,7 +3103,8 @@ async function runSmartCompact(opts) {
         break;
       }
     }
-    keepFrom = smartKeepBoundary(msgs, keepFrom);
+    keepFrom = smartKeepBoundary(msgs, keepFrom, branch);
+    keepFrom = guardToolCallBoundary(msgs, keepFrom);
     const toCompact = msgs.slice(0, keepFrom);
     if (!toCompact.length) {
       isRunning.value = false;
@@ -2771,30 +3114,55 @@ async function runSmartCompact(opts) {
     if (!autoTriggered) {
       showProgressOverlay(ctx, { phase: 1, phaseName: "Extract", detail: "Preparing...", model: modelLabel, profile });
     }
-    const llmMessages = convertToLlm(toCompact.map((e) => e.message));
+    let llmMessages = convertToLlm(toCompact.map((e) => e.message));
+    if (hasTruncatedMessages(llmMessages)) {
+      const sessionId2 = ctx.sessionManager.getSessionId?.() ?? "unknown";
+      const fromLog = resolveCompactionMessages(sessionId2, toCompact);
+      if (fromLog) {
+        llmMessages = fromLog;
+        notify("Using untruncated session log (" + llmMessages.length + " msgs)", "info");
+      }
+    }
+    const contextPercent = ctx.model && totalTokens ? totalTokens / ctx.model.contextWindow * 100 : 0;
+    const toolPercent = computeToolCharPercentage(branch);
+    const tier = selectCompactionTier(contextPercent, toolPercent, totalTokens, MIN_TOKEN_THRESHOLD);
+    if (tier === "none") {
+      isRunning.value = false;
+      if (!autoTriggered)
+        ctx.ui.notify("Context OK (" + Math.round(contextPercent) + "%). pi-toolkit manages context well.", "info");
+      return;
+    }
+    const shouldSkipExplore = tier === "light";
     const pruning = pruneRedundant(llmMessages);
     if (pruning.prunedCount > 0) {
       notify("Pruning: " + pruning.prunedCount + " msgs removed (" + pruning.reasons.map((r) => r.count + "x " + r.reason).join(", ") + ")", "info");
     }
-    const prunedMessages = pruning.messages;
-    const convText = serializeConversation(prunedMessages);
+    llmMessages = pruning.messages;
+    const convText = serializeConversation(llmMessages);
     const convTokens = estimateTokens(convText);
     const sessionId = ctx.sessionManager.getSessionId?.() ?? "unknown";
     const backupPath = backupConversation(convText, sessionId);
     const prevContext = getPreviousCompactionContext(branch);
     const cachedExt = loadCachedExtraction(sessionId);
     let extraction;
-    if (cachedExt && cachedExt.lastMessageIndex < llmMessages.length - 1) {
+    const currentFirstId = toCompact[0]?.id;
+    const currentLastId = toCompact[toCompact.length - 1]?.id;
+    const cachedLastMsgId = toCompact[cachedExt?.lastMessageIndex ?? -1]?.id;
+    const idsMatch = cachedExt?.firstEntryId && cachedExt?.lastEntryId && cachedExt.firstEntryId === currentFirstId && cachedExt.lastEntryId === cachedLastMsgId;
+    const cacheUsable = idsMatch && cachedExt.messageCount <= llmMessages.length && cachedExt.lastMessageIndex < llmMessages.length - 1;
+    if (cacheUsable) {
       const newMsgs = llmMessages.slice(cachedExt.lastMessageIndex + 1);
       const delta = extractStructured(newMsgs, pc);
       extraction = mergeExtractions(cachedExt.extraction, delta, cachedExt.messageCount);
       notify("Phase 1 Incremental: " + (cachedExt.lastMessageIndex + 1) + " cached + " + newMsgs.length + " new messages", "info");
+      vlog("Incremental extraction \u2014 cached messages: " + cachedExt.messageCount + ", current: " + llmMessages.length);
     } else {
       extraction = extractStructured(llmMessages, pc);
       notify("Phase 1 Full: " + extraction.modifiedFiles.length + " files, " + extraction.errors.length + " errors", "info");
+      vlog("Full extraction \u2014 " + llmMessages.length + " messages, tier=" + tier);
     }
-    saveCachedExtraction(sessionId, extraction, llmMessages.length);
-    const projectId = deriveProjectId(extraction);
+    saveCachedExtraction(sessionId, extraction, llmMessages.length, currentFirstId, currentLastId);
+    const projectId = deriveProjectId(findGitRoot(ctx.cwd) ?? ctx.cwd, extraction, sessionId);
     const fingerprint = loadProjectFingerprint(projectId);
     if (fingerprint) {
       notify("Project: " + fingerprint.language + (fingerprint.framework ? "/" + fingerprint.framework : "") + " (" + fingerprint.sessionCount + " sessions)", "info");
@@ -2807,6 +3175,7 @@ async function runSmartCompact(opts) {
     let explorationReport = null;
     let explorationRounds = 0;
     let chunkCount = 0;
+    vlog("Tier=" + tier + " | convTokens=" + convTokens + " | singlePassMax=" + pc.singlePassMaxTokens);
     if (convTokens < pc.singlePassMaxTokens) {
       if (!autoTriggered)
         showProgressOverlay(ctx, { phase: 2, phaseName: "Explore", detail: "Single-pass (" + convTokens.toLocaleString() + "t)", model: modelLabel, profile, extraction });
@@ -2822,7 +3191,7 @@ async function runSmartCompact(opts) {
         llmCalls = 0;
       }
     } else {
-      const needsExploration = shouldExplore(extraction);
+      const needsExploration = !shouldSkipExplore && shouldExplore(extraction);
       if (needsExploration) {
         if (!autoTriggered)
           showProgressOverlay(ctx, { phase: 2, phaseName: "Explore", detail: "Exploring...", model: modelLabel, profile, extraction });
@@ -2831,6 +3200,7 @@ async function runSmartCompact(opts) {
           explorationReport = expResult.report;
           explorationRounds = expResult.rounds;
           notify("Phase 2 Explore: " + expResult.rounds + " rounds, " + explorationReport.boundaries.length + " boundaries" + (expResult.toolSupported ? "" : " (no tool support)"), "info");
+          vlog("Explore boundaries: " + explorationReport.boundaries.map((b) => b.afterIndex + "(" + b.confidence.toFixed(2) + ")").join(", "));
         } catch (err) {
           notify("Phase 2 Explore: failed - " + (err instanceof Error ? err.message : String(err)), "warning");
         }
@@ -2868,6 +3238,7 @@ async function runSmartCompact(opts) {
       const chunks = chunkLlmMessages(llmMessages, boundaries, pc);
       chunkCount = chunks.length;
       notify("Chunked: " + chunkCount + " chunks", "info");
+      vlog("Chunk topics: " + chunks.map((c) => c.topic + "[" + c.startIndex + "-" + c.endIndex + "]").join(", "));
       const batches = createBatches(chunks, pc.batchMaxTokens);
       const totalBatches = batches.length;
       if (!autoTriggered)
@@ -2947,6 +3318,7 @@ async function runSmartCompact(opts) {
     if (!autoTriggered)
       showProgressOverlay(ctx, { phase: 4, phaseName: "Verify", detail: "Checking...", model: modelLabel, profile, extraction, explorationRounds });
     const verification = verifySummary(finalSummary, extraction);
+    vlog("Verification score=" + verification.score + " ok=" + verification.ok + " gaps=" + verification.gaps.length);
     if (!verification.ok) {
       if (verification.score < 85) {
         notify("Phase 4 Verify: " + verification.gaps.length + " gap(s), score=" + verification.score + ", applying deterministic patch", "warning");
@@ -2973,6 +3345,7 @@ async function runSmartCompact(opts) {
     const pipelineMs = Date.now() - pipelineStart;
     const durationStr = pipelineMs < 1000 ? pipelineMs + "ms" : (pipelineMs / 1000).toFixed(1) + "s";
     notify("Done: " + pipelineInfo + " \u2014 saved " + (tokensSaved ?? 0).toLocaleString() + "t (" + durationStr + ")", "success");
+    vlog("Pipeline complete \u2014 method=" + method + " calls=" + llmCalls + " chunks=" + chunkCount + " tokensSaved=" + tokensSaved);
     const openLoops = extractOpenLoops(llmMessages, extraction);
     if (openLoops.length > 0) {
       notify("Open Loops: " + openLoops.length + " detected (" + openLoops.filter((l) => l.priority === "high").length + " high)", "info");
@@ -3015,11 +3388,24 @@ async function runSmartCompact(opts) {
       notify("DRY RUN (" + method + ", " + profile + ") \u2014 " + toCompact.length + " msgs, " + llmCalls + " calls", "info");
       return;
     }
+    if (timedOut) {
+      return;
+    }
     pendingRef.value = { summary: finalSummary, firstKeptEntryId: firstKeptId, tokensBefore: totalTokens, details, compactionState };
     pendingRef.createdAt = Date.now();
     saveProjectFingerprint(projectId, extraction);
     saveCompactionState(projectId, compactionState);
-    appendMetricsLog(sessionId);
+    appendMetricsLog(sessionId, {
+      profile,
+      tier,
+      contextPercent: Math.round(contextPercent),
+      toolPercent,
+      tokensBefore: totalTokens,
+      tokensSaved,
+      pruneSavedTokens: pruning.prunedTokenSaving,
+      chunkCount: chunkCount || 1,
+      verificationScore: verification.score
+    });
     try {
       const postCompactMsgs = msgs.slice(keepFrom).map((e) => convertToLlm([e.message])).flat();
       if (postCompactMsgs.length > 2) {
@@ -3049,23 +3435,27 @@ async function runSmartCompact(opts) {
         notify("Result screen skipped", "info");
       }
     }
-    if (!skipCompact) {
+    if (!skipCompact && !autoTriggered) {
       ctx.compact({
         customInstructions: "Use pre-computed smart summary from /smart-compact",
         onComplete: () => {
-          if (!autoTriggered)
-            ctx.ui.notify("Applied \u2713", "info");
+          ctx.ui.notify("Applied \u2713", "info");
         },
         onError: (e) => {
-          if (!autoTriggered)
-            ctx.ui.notify("Failed: " + e.message, "error");
+          ctx.ui.notify("Failed: " + e.message, "error");
         }
       });
     }
   } finally {
+    if (timeoutId)
+      clearTimeout(timeoutId);
     isRunning.value = false;
+    if (timedOut) {
+      pendingRef.value = null;
+      pendingRef.createdAt = 0;
+    }
     const pipelineMs = Date.now() - pipelineStart;
-    if (autoTriggered) {
+    if (autoTriggered && !timedOut) {
       ctx.ui.notify("Compaction completed in " + (pipelineMs < 1000 ? pipelineMs + "ms" : (pipelineMs / 1000).toFixed(1) + "s"), "info");
     }
   }
@@ -3185,7 +3575,22 @@ function smartCompactExtension(pi) {
       if (!sumModel)
         return;
       if (!isRunning.value) {
-        await runSmartCompact({ ctx, summaryModel: sumModel, segModel: segModel ?? sumModel, profile: config.profile, pendingRef, isRunning, autoTriggered: true });
+        const compactPromise = runSmartCompact({ ctx, summaryModel: sumModel, segModel: segModel ?? sumModel, profile: config.profile, pendingRef, isRunning, autoTriggered: true });
+        const timeoutPromise = new Promise((_, reject) => {
+          setTimeout(() => reject(new Error("smart-compact-timeout")), config.autoTriggerTimeoutMs);
+        });
+        try {
+          await Promise.race([compactPromise, timeoutPromise]);
+        } catch (e) {
+          if (e instanceof Error && e.message === "smart-compact-timeout") {
+            warn("Smart compact auto-trigger hard timeout after " + config.autoTriggerTimeoutMs + "ms");
+            isRunning.value = false;
+            pendingRef.value = null;
+            pendingRef.createdAt = 0;
+            return;
+          }
+          throw e;
+        }
         const pending = pendingRef.value;
         if (pending) {
           pendingRef.value = null;