pi-smart-compact 7.15.0 → 7.16.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.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 = `
+var VERSION = "7.16.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}
@@ -77,7 +77,8 @@ var init_constants = __esm(() => {
     autoTriggerTimeoutMs: 120000,
     backupEnabled: true,
     backupDir: "",
-    minContextPercent: 60
+    minContextPercent: 60,
+    pinPaths: []
   };
   NO_OP_RE = /applied:\s*0|no changes applied|nothing to (?:do|change)|0 edits? applied/i;
   SHIFT_RE = /simdi|peki|bide|bi de|gecelim|bakalim|yapalim|baska|sonra|tamam simdi|now let|also|next|let's|moving on|switch to/i;
@@ -254,6 +255,9 @@ function projectFingerprintFile(projectId) {
 function compactionStateFile(projectId) {
   return path.join(compactionStateDir(), projectId + ".json");
 }
+function remediationHintsFile(projectId) {
+  return path.join(smartCompactCacheDir(), "remediation-" + projectId + ".json");
+}
 function metricsDashboardFile() {
   return path.join(cacheDir(), "smart-compact-report.html");
 }
@@ -1434,9 +1438,12 @@ var DASHBOARD_PAGE_SIZE = 24;
 var exports_overlays = {};
 __export(exports_overlays, {
   showResultScreen: () => showResultScreen,
+  showRestorePicker: () => showRestorePicker,
+  showRestoreAction: () => showRestoreAction,
   showProgressOverlay: () => showProgressOverlay,
   showMetricsDashboardUI: () => showMetricsDashboardUI,
   showCompactUI: () => showCompactUI,
+  showBackupViewer: () => showBackupViewer,
   selectProfile: () => selectProfile,
   selectModel: () => selectModel,
   renderTokenBar: () => renderTokenBar,
@@ -1797,6 +1804,121 @@ async function showCompactUI(ctx, opts) {
     return null;
   return { model: selectedModel, profile: selectedProfile };
 }
+async function showRestorePicker(ctx, backups) {
+  const items = backups.map((b) => ({
+    value: b.path,
+    label: new Date(b.date).toLocaleString() + "  \xB7  " + Math.max(1, Math.round(b.sizeBytes / 1024)) + "KB",
+    description: b.sessionId.slice(0, 20)
+  }));
+  return await ctx.ui.custom((tui, theme, _kb, done) => {
+    const c = new Container;
+    c.addChild(new DynamicBorder((s) => theme.fg("accent", s)));
+    c.addChild(new Text(theme.fg("accent", theme.bold("  \u21A9 Smart Compact \u2014 Restore")), 1, 0));
+    c.addChild(new Text(theme.fg("dim", "  Pick a backup to view its pre-compaction content"), 0, 0));
+    c.addChild(new Text("", 0, 0));
+    const sel = new SelectList(items, Math.min(items.length, 12), {
+      selectedPrefix: (t) => theme.fg("accent", t),
+      selectedText: (t) => theme.fg("accent", t),
+      description: (t) => theme.fg("muted", t),
+      scrollInfo: (t) => theme.fg("dim", t),
+      noMatch: (t) => theme.fg("warning", t)
+    });
+    sel.onSelect = (item) => done(item.value);
+    sel.onCancel = () => done(null);
+    c.addChild(sel);
+    c.addChild(new Text("", 0, 0));
+    c.addChild(new Text(theme.fg("dim", "  \u2191\u2193 navigate \xB7 enter view \xB7 esc cancel"), 0, 0));
+    c.addChild(new DynamicBorder((s) => theme.fg("accent", s)));
+    return {
+      render: (w) => c.render(w),
+      invalidate: () => c.invalidate(),
+      handleInput: (d) => {
+        sel.handleInput(d);
+        tui.requestRender();
+      }
+    };
+  });
+}
+async function showBackupViewer(ctx, content, fp) {
+  await ctx.ui.custom((tui, theme, keybindings, done) => {
+    const lines = content.split(`
+`);
+    const pageSize = 40;
+    let scroll = 0;
+    const maxScroll = Math.max(0, lines.length - pageSize);
+    return {
+      render: (w) => {
+        const out = [
+          truncateToWidth(theme.fg("accent", theme.bold("  \u21A9 Restored backup")) + theme.fg("dim", "  \xB7  " + lines.length + " lines \xB7 " + Math.max(1, Math.round(content.length / 1024)) + "KB"), w),
+          truncateToWidth(theme.fg("dim", "  " + fp), w),
+          truncateToWidth(theme.fg("borderMuted", "\u2500".repeat(Math.max(0, w))), w)
+        ];
+        for (const line of lines.slice(scroll, scroll + pageSize)) {
+          out.push(truncateToWidth(theme.fg("text", line), w));
+        }
+        if (lines.length > pageSize) {
+          out.push(truncateToWidth(theme.fg("dim", "  showing " + (scroll + 1) + "\u2013" + Math.min(lines.length, scroll + pageSize) + " of " + lines.length), w));
+        }
+        out.push("", truncateToWidth(theme.fg("dim", "  \u2191\u2193 scroll \xB7 pgup/pgdn \xB7 home/end \xB7 esc/q close"), w));
+        return out;
+      },
+      invalidate: () => {},
+      handleInput: (data) => {
+        if (keybindings.matches(data, "tui.select.cancel") || data === "q") {
+          done(undefined);
+          return;
+        }
+        if (matchesKey(data, Key.home))
+          scroll = 0;
+        else if (matchesKey(data, Key.end))
+          scroll = maxScroll;
+        else if (keybindings.matches(data, "tui.select.pageUp"))
+          scroll = Math.max(0, scroll - pageSize);
+        else if (keybindings.matches(data, "tui.select.pageDown"))
+          scroll = Math.min(maxScroll, scroll + pageSize);
+        else if (keybindings.matches(data, "tui.select.up"))
+          scroll = Math.max(0, scroll - 1);
+        else if (keybindings.matches(data, "tui.select.down"))
+          scroll = Math.min(maxScroll, scroll + 1);
+        tui.requestRender();
+      }
+    };
+  }, { overlay: true, overlayOptions: { width: "85%", anchor: "center", maxHeight: "85%" } });
+}
+async function showRestoreAction(ctx, backupPath) {
+  const items = [
+    { value: "view", label: "View content", description: "Read the pre-compaction conversation" },
+    { value: "restore", label: "Restore into a new session", description: "Fork from here + inject this backup as context" }
+  ];
+  return await ctx.ui.custom((tui, theme, _kb, done) => {
+    const c = new Container;
+    c.addChild(new DynamicBorder((s) => theme.fg("accent", s)));
+    c.addChild(new Text(theme.fg("accent", theme.bold("  \u21A9 Restore action")), 1, 0));
+    c.addChild(new Text(theme.fg("dim", "  " + backupPath), 0, 0));
+    c.addChild(new Text("", 0, 0));
+    const sel = new SelectList(items, 2, {
+      selectedPrefix: (t) => theme.fg("accent", t),
+      selectedText: (t) => theme.fg("accent", t),
+      description: (t) => theme.fg("muted", t),
+      scrollInfo: (t) => theme.fg("dim", t),
+      noMatch: (t) => theme.fg("warning", t)
+    });
+    sel.onSelect = (item) => done(item.value);
+    sel.onCancel = () => done(null);
+    c.addChild(sel);
+    c.addChild(new Text("", 0, 0));
+    c.addChild(new Text(theme.fg("dim", "  \u2191\u2193 navigate \xB7 enter select \xB7 esc cancel"), 0, 0));
+    c.addChild(new DynamicBorder((s) => theme.fg("accent", s)));
+    return {
+      render: (w) => c.render(w),
+      invalidate: () => c.invalidate(),
+      handleInput: (d) => {
+        sel.handleInput(d);
+        tui.requestRender();
+      }
+    };
+  });
+}
 var init_overlays = __esm(() => {
   init_cache();
   init_tokens();
@@ -1883,6 +2005,16 @@ function validateSmartCompactConfig(sc) {
       delete sc.minContextPercent;
     }
   }
+  if ("backupDir" in sc && sc.backupDir !== undefined && typeof sc.backupDir !== "string") {
+    warn("smart-compact config: backupDir must be a string, got " + typeof sc.backupDir + ". Using default.");
+    delete sc.backupDir;
+  }
+  if ("pinPaths" in sc && sc.pinPaths !== undefined) {
+    if (!Array.isArray(sc.pinPaths) || !sc.pinPaths.every((x) => typeof x === "string")) {
+      warn("smart-compact config: pinPaths must be a string[], ignoring.");
+      delete sc.pinPaths;
+    }
+  }
 }
 var _cfg = null;
 var _cfgMtime = 0;
@@ -1974,6 +2106,68 @@ function backupConversation(convText, sessionId) {
     return null;
   }
 }
+function listBackups(limit = 20) {
+  try {
+    const dir = loadConfig().backupDir;
+    if (!fs2.existsSync(dir))
+      return [];
+    const out = [];
+    for (const name of fs2.readdirSync(dir)) {
+      if (!name.endsWith(".md"))
+        continue;
+      const full = path3.join(dir, name);
+      try {
+        const stat = fs2.statSync(full);
+        if (!stat.isFile())
+          continue;
+        const head = fs2.readFileSync(full, "utf-8").split(`
+`).slice(0, 5).join(`
+`);
+        const date = head.match(/^# Date:\s*(.+)$/m)?.[1]?.trim();
+        const session = head.match(/^# Session:\s*(.+)$/m)?.[1]?.trim();
+        out.push({
+          path: full,
+          sessionId: session ?? name,
+          date: date ?? stat.mtime.toISOString(),
+          sizeBytes: stat.size
+        });
+      } catch {}
+    }
+    out.sort((a, b) => a.date < b.date ? 1 : a.date > b.date ? -1 : 0);
+    return out.slice(0, limit);
+  } catch (e) {
+    warn("listBackups failed", e);
+    return [];
+  }
+}
+function readBackupContent(fp) {
+  try {
+    const raw = fs2.readFileSync(fp, "utf-8");
+    const lines = raw.split(`
+`);
+    let i = 0;
+    while (i < lines.length && lines[i].startsWith("#"))
+      i++;
+    if (i < lines.length && lines[i].trim() === "")
+      i++;
+    return lines.slice(i).join(`
+`).trim() || null;
+  } catch (e) {
+    warn("readBackupContent failed", e);
+    return null;
+  }
+}
+function buildRestoreMessage(content, source) {
+  return {
+    customType: "smart-compact-restore",
+    content: `# Restored pre-compaction context (smart-compact backup)
+Source: ` + source + `
+
+` + content,
+    display: true,
+    details: { source, restoredAt: Date.now() }
+  };
+}
 function getPreviousCompactionContext(branch) {
   const compactions = branch.filter((e) => e.type === "compaction");
   if (!compactions.length)
@@ -2009,7 +2203,7 @@ function branchIndexToMsgIndex(branchEntries, branchIdx, msgs) {
       msgCount++;
     }
   }
-  return Math.min(msgCount - 1, msgs.length - 1);
+  return Math.max(0, Math.min(msgCount - 1, msgs.length - 1));
 }
 function smartKeepBoundary(msgs, keepFromIndex, branchEntries) {
   let adjusted = keepFromIndex;
@@ -2216,8 +2410,6 @@ function computeToolCharPercentage(branchEntries) {
         const block = part;
         if (block.type === "text" && typeof block.text === "string")
           mc += block.text.length;
-        else if (block.type === "text" && typeof block.content === "string")
-          mc += block.content.length;
       }
     }
     totalChars += mc;
@@ -2918,12 +3110,17 @@ function resolveCompactionWindow(rc) {
     }
   }
   keepFrom = smartKeepBoundary(msgs, keepFrom, branch);
+  if (keepFrom >= msgs.length)
+    keepFrom = msgs.length - 1;
   keepFrom = guardToolCallBoundary(msgs, keepFrom);
+  if (msgs[keepFrom]?.message?.role === "toolResult") {
+    return null;
+  }
   const toCompact = msgs.slice(0, keepFrom);
   if (!toCompact.length)
     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 firstKeptId = msgs[keepFrom].id;
   const sessionId = resolveSessionId(rc.ctx);
   const out = rc;
   out.sessionId = sessionId;
@@ -2942,6 +3139,14 @@ function resolveCompactionWindow(rc) {
 // src/app/steps/recover.ts
 import { convertToLlm } from "@earendil-works/pi-coding-agent";
 
+// src/infra/ai-messages.ts
+function asBranchMessage(message) {
+  return message;
+}
+function asSerializableMessages(msgs) {
+  return msgs;
+}
+
 // src/utils/session-log.ts
 import * as fs4 from "fs";
 import * as path7 from "path";
@@ -3054,17 +3259,19 @@ function findSessionLogFile(sessionId) {
   }
   return remember(null);
 }
-function normalizeLogMessage(msg) {
+function normalizeLogMessage(msg, entryTimestamp) {
   if (!msg || !msg.role)
     return null;
   const role = msg.role;
   if (role === "user" || role === "assistant" || role === "toolResult") {
+    const ts = entryTimestamp ? Date.parse(entryTimestamp) : NaN;
     return {
       role,
       content: msg.content,
       isError: msg.isError,
       toolCallId: msg.toolCallId,
-      timestamp: msg.content && typeof msg.content === "object" ? Date.now() : undefined
+      toolName: msg.toolName,
+      timestamp: Number.isFinite(ts) ? ts : undefined
     };
   }
   return null;
@@ -3095,7 +3302,7 @@ function readOriginalMessageMap(sessionId) {
         continue;
       }
       if (entry.type === "message" && entry.id && entry.message) {
-        const normalized = normalizeLogMessage(entry.message);
+        const normalized = normalizeLogMessage(entry.message, entry.timestamp);
         if (normalized)
           map.set(entry.id, normalized);
       }
@@ -3143,7 +3350,7 @@ function resolveCompactionMessages(sessionId, toCompactEntries) {
 
 // src/app/steps/recover.ts
 function recoverSessionLog(rc) {
-  let llmMessages = convertToLlm(rc.toCompact.map((e) => e.message));
+  let llmMessages = convertToLlm(rc.toCompact.map((e) => asBranchMessage(e.message)));
   if (hasTruncatedMessages(llmMessages)) {
     const fromLog = resolveCompactionMessages(rc.sessionId, rc.toCompact);
     if (fromLog) {
@@ -3546,7 +3753,7 @@ function extractWithCache(rc) {
   const pruneEnd = Date.now();
   markMeasuredPhase(rc, "prune", extractStepStart, pruneEnd);
   const extractionStart = pruneEnd;
-  const convText = serializeConversation(rc.llmMessages);
+  const convText = serializeConversation(asSerializableMessages(rc.llmMessages));
   const convTokens = estimateTokens(convText);
   const backupPath = backupConversation(convText, rc.sessionId);
   const prevContext = getPreviousCompactionContext(rc.branch);
@@ -3617,6 +3824,7 @@ function extractWithCache(rc) {
 init_overlays();
 
 // src/phases/explore.ts
+import { Type } from "typebox";
 init_constants();
 init_cache();
 init_tokens();
@@ -3639,32 +3847,32 @@ var EXPLORATION_TOOLS = [
   {
     name: "get_message_range",
     description: "Get compact summaries of messages from start to end index (0-based).",
-    parameters: { type: "object", properties: { start: { type: "number" }, end: { type: "number" } }, required: ["start", "end"] }
+    parameters: Type.Object({ start: Type.Number(), end: Type.Number() })
   },
   {
     name: "search_conversation",
     description: "Search for text in conversation messages.",
-    parameters: { type: "object", properties: { query: { type: "string" } }, required: ["query"] }
+    parameters: Type.Object({ query: Type.String() })
   },
   {
     name: "get_recent_user_messages",
     description: "Get the last N user messages.",
-    parameters: { type: "object", properties: { count: { type: "number" } } }
+    parameters: Type.Object({ count: Type.Optional(Type.Number()) })
   },
   {
     name: "get_context_around",
     description: "Get context around a specific message index.",
-    parameters: { type: "object", properties: { index: { type: "number" }, radius: { type: "number" } }, required: ["index"] }
+    parameters: Type.Object({ index: Type.Number(), radius: Type.Optional(Type.Number()) })
   },
   {
     name: "get_file_changes",
     description: "Get tool calls that modified a specific file.",
-    parameters: { type: "object", properties: { path: { type: "string" } }, required: ["path"] }
+    parameters: Type.Object({ path: Type.String() })
   },
   {
     name: "get_error_chain",
     description: "Get all messages related to a specific error.",
-    parameters: { type: "object", properties: { index: { type: "number" }, context_radius: { type: "number" } }, required: ["index"] }
+    parameters: Type.Object({ index: Type.Number(), context_radius: Type.Optional(Type.Number()) })
   }
 ];
 function executeExplorationTool(call, llmMessages) {
@@ -3761,56 +3969,72 @@ function parseExplorationReport(text, llmMessages) {
   const md = text.match(/```(?:json)?\s*([\s\S]*?)```/);
   if (md)
     json = md[1].trim();
-  let s = json.indexOf("{"), e = json.lastIndexOf("}");
-  if (s === -1 || e === -1)
+  const startIdx = json.indexOf("{"), endIdx = json.lastIndexOf("}");
+  if (startIdx === -1 || endIdx === -1)
     return fallbackExplorationReport(llmMessages);
-  let rawJson = json.slice(s, e + 1);
+  const rawJson = json.slice(startIdx, endIdx + 1);
   try {
     return buildExplorationReportFromParsed(JSON.parse(rawJson), llmMessages);
-  } catch (e2) {
-    debug("JSON parse attempt 1 failed", e2);
+  } catch (err) {
+    debug("JSON parse attempt 1 failed", err);
   }
   const cleaned = rawJson.replace(/,\s*([}\]])/g, "$1").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
   try {
     return buildExplorationReportFromParsed(JSON.parse(cleaned), llmMessages);
-  } catch (e2) {
-    debug("JSON parse attempt 2 (cleaned) failed", e2);
+  } catch (err) {
+    debug("JSON parse attempt 2 (cleaned) failed", err);
   }
   const boundaryMatch = rawJson.match(/"boundaries"\s*:\s*\[([\s\S]*?)\]/);
   if (boundaryMatch) {
     try {
       const boundaries = JSON.parse("[" + boundaryMatch[1] + "]");
-      return { ...fallbackExplorationReport(llmMessages), boundaries: boundaries.filter((b) => typeof b?.afterIndex === "number").map((b) => ({
-        afterIndex: Math.min(b.afterIndex, llmMessages.length - 2),
-        topic: String(b.topic ?? "").slice(0, 100),
-        priority: ["critical", "high", "normal", "low"].includes(b.priority) ? b.priority : "normal",
-        confidence: Math.min(1, Math.max(0, b.confidence ?? 0.5))
-      })) };
-    } catch (e2) {
-      debug("Boundary JSON parse failed", e2);
+      return { ...fallbackExplorationReport(llmMessages), boundaries: normalizeBoundaries(boundaries, llmMessages.length) };
+    } catch (err) {
+      debug("Boundary JSON parse failed", err);
     }
   }
   return fallbackExplorationReport(llmMessages);
 }
+var BOUNDARY_PRIORITIES = ["critical", "high", "normal", "low"];
+var SESSION_TYPES = ["implementation", "review", "debugging", "discussion"];
+function stringArray(v) {
+  return Array.isArray(v) ? v.map(String) : [];
+}
+function normalizeBoundaries(raw, llmLength) {
+  if (!Array.isArray(raw))
+    return [];
+  const maxIndex = Math.max(0, llmLength - 2);
+  return raw.filter((b) => !!b && typeof b === "object" && typeof b.afterIndex === "number").map((b) => {
+    const priority = b.priority;
+    const confidence = b.confidence;
+    return {
+      afterIndex: Math.max(0, Math.min(b.afterIndex, maxIndex)),
+      topic: String(b.topic ?? "").slice(0, 100),
+      priority: typeof priority === "string" && BOUNDARY_PRIORITIES.includes(priority) ? priority : "normal",
+      confidence: typeof confidence === "number" && Number.isFinite(confidence) ? Math.min(1, Math.max(0, confidence)) : 0.5
+    };
+  });
+}
 function buildExplorationReportFromParsed(parsed, llmMessages) {
+  if (typeof parsed !== "object" || parsed === null) {
+    return fallbackExplorationReport(llmMessages);
+  }
+  const p = parsed;
+  const statusAssessment = p.statusAssessment ?? null;
+  const sessionTypeRaw = p.sessionType;
   return {
-    boundaries: (parsed.boundaries ?? []).filter((b) => typeof b?.afterIndex === "number").map((b) => ({
-      afterIndex: Math.min(b.afterIndex, llmMessages.length - 2),
-      topic: String(b.topic ?? "").slice(0, 100),
-      priority: ["critical", "high", "normal", "low"].includes(b.priority) ? b.priority : "normal",
-      confidence: Math.min(1, Math.max(0, b.confidence ?? 0.5))
-    })),
-    mainGoal: parsed.mainGoal ?? "",
-    sessionType: ["implementation", "review", "debugging", "discussion"].includes(parsed.sessionType) ? parsed.sessionType : "implementation",
-    enrichedConstraints: Array.isArray(parsed.enrichedConstraints) ? parsed.enrichedConstraints.map(String) : [],
-    crossReferences: Array.isArray(parsed.crossReferences) ? parsed.crossReferences.map(String) : [],
+    boundaries: normalizeBoundaries(p.boundaries, llmMessages.length),
+    mainGoal: typeof p.mainGoal === "string" ? p.mainGoal : "",
+    sessionType: typeof sessionTypeRaw === "string" && SESSION_TYPES.includes(sessionTypeRaw) ? sessionTypeRaw : "implementation",
+    enrichedConstraints: stringArray(p.enrichedConstraints),
+    crossReferences: stringArray(p.crossReferences),
     statusAssessment: {
-      done: Array.isArray(parsed.statusAssessment?.done) ? parsed.statusAssessment.done.map(String) : [],
-      inProgress: Array.isArray(parsed.statusAssessment?.inProgress) ? parsed.statusAssessment.inProgress.map(String) : [],
-      blocked: Array.isArray(parsed.statusAssessment?.blocked) ? parsed.statusAssessment.blocked.map(String) : []
+      done: stringArray(statusAssessment?.done),
+      inProgress: stringArray(statusAssessment?.inProgress),
+      blocked: stringArray(statusAssessment?.blocked)
     },
-    criticalContext: Array.isArray(parsed.criticalContext) ? parsed.criticalContext.map(String) : [],
-    keyDecisions: Array.isArray(parsed.keyDecisions) ? parsed.keyDecisions.map(String) : []
+    criticalContext: stringArray(p.criticalContext),
+    keyDecisions: stringArray(p.keyDecisions)
   };
 }
 function fallbackExplorationReport(llmMessages) {
@@ -3878,7 +4102,7 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
       toolSupport.set(cacheKey, true, svc.clock.now());
       const messages = [
         { role: "user", content: [{ type: "text", text: userContent }], timestamp: Date.now() },
-        { role: "assistant", content: probeResp.content, timestamp: Date.now() }
+        probeResp
       ];
       for (const tc of toolCalls) {
         const result = executeExplorationTool({ name: tc.name, arguments: tc.arguments }, llmMessages);
@@ -3912,7 +4136,7 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
           }
           return { report: report2, rounds, toolSupported: true };
         }
-        messages.push({ role: "assistant", content: response.content, timestamp: Date.now() });
+        messages.push(response);
         for (const tc of nextToolCalls) {
           const result = executeExplorationTool({ name: tc.name, arguments: tc.arguments }, llmMessages);
           messages.push({ role: "toolResult", toolCallId: tc.id, toolName: tc.name, content: [{ type: "text", text: result }], isError: false, timestamp: Date.now() });
@@ -4228,6 +4452,19 @@ function assembleFallback(summaries, extraction) {
   ].join(`
 `);
 }
+function failedChunkSummary(ch) {
+  return {
+    topic: ch.topic,
+    startIndex: ch.startIndex,
+    endIndex: ch.endIndex,
+    summary: "[Failed] " + ch.messages.map((m) => extractText(m.content)).join(`
+`).slice(0, 300),
+    keyDecisions: [],
+    filesModified: [],
+    filesRead: [],
+    priority: ch.priority
+  };
+}
 
 // src/app/steps/synthesize.ts
 init_constants();
@@ -4346,10 +4583,15 @@ async function summarizeConversation(rc) {
     }
     const concurrency = rc.providerCaps.concurrencyLimit;
     if (totalBatches <= 1) {
-      try {
-        summaries.push(...await summarizeBatch(batches[0], extraction, rc.summaryModel, rc.summaryAuth, rc.cancellation.signal, rc.services));
-      } catch (err) {
-        summaries.push(...batches[0].map((ch) => failedChunkSummary(ch)));
+      const single = batches[0];
+      if (single) {
+        try {
+          summaries.push(...await summarizeBatch(single, extraction, rc.summaryModel, rc.summaryAuth, rc.cancellation.signal, rc.services));
+        } catch (err) {
+          summaries.push(...single.map((ch) => failedChunkSummary(ch)));
+        }
+      } else {
+        rc.vlog("Synthesize: 0 batches \u2014 skipping summarization, using fallback assembly");
       }
     } else {
       const results = new Array(totalBatches);
@@ -4426,19 +4668,6 @@ async function summarizeConversation(rc) {
   markMeasuredPhase(out, "synthesize", synthPhaseStart);
   return advance(out, "_synthesized");
 }
-function failedChunkSummary(ch) {
-  return {
-    topic: ch.topic,
-    startIndex: ch.startIndex,
-    endIndex: ch.endIndex,
-    summary: "[Failed] " + ch.messages.map((m) => extractText(m.content)).join(`
-`).slice(0, 300),
-    keyDecisions: [],
-    filesModified: [],
-    filesRead: [],
-    priority: ch.priority
-  };
-}
 
 // src/phases/verify.ts
 init_constants();
@@ -4582,7 +4811,7 @@ function renderSummary(summary, opts = {}) {
 `).trim() + `
 `;
 }
-function upsertSection(summary, kind, body, before) {
+function upsertSection(summary, kind, body, placement) {
   const heading = canonicalHeading(kind);
   const existing = summary.sections.findIndex((s) => s.kind === kind);
   if (existing >= 0) {
@@ -4590,15 +4819,30 @@ function upsertSection(summary, kind, body, before) {
     sections[existing] = { kind, heading, body: body.trim() };
     return { sections };
   }
+  const hint = placement == null ? {} : typeof placement === "string" ? { before: placement } : placement;
   const section = { kind, heading, body: body.trim() };
-  if (before) {
-    const idx = summary.sections.findIndex((s) => s.kind === before);
+  if (hint.before) {
+    const idx = summary.sections.findIndex((s) => s.kind === hint.before);
     if (idx >= 0) {
       const sections = summary.sections.slice();
       sections.splice(idx, 0, section);
       return { sections };
     }
   }
+  if (hint.after) {
+    let idx = -1;
+    for (let i = summary.sections.length - 1;i >= 0; i--) {
+      if (summary.sections[i].kind === hint.after) {
+        idx = i;
+        break;
+      }
+    }
+    if (idx >= 0) {
+      const sections = summary.sections.slice();
+      sections.splice(idx + 1, 0, section);
+      return { sections };
+    }
+  }
   return { sections: [...summary.sections, section] };
 }
 function appendToSection(summary, kind, text, fallbackBody = "") {
@@ -4895,6 +5139,10 @@ function buildCompactionState(extraction, openLoops, report, nextActions, critic
   let decisionId = 0;
   let constraintId = 0;
   let errorId = 0;
+  const modifiedBasenames = extraction.modifiedFiles.map((f) => ({
+    path: f.path,
+    bn: f.path.split("/").pop()?.toLowerCase() ?? ""
+  }));
   return {
     goal: extraction.mainGoal,
     decisions: extraction.decisions.map((d) => ({
@@ -4913,7 +5161,8 @@ function buildCompactionState(extraction, openLoops, report, nextActions, critic
     readFiles: extraction.readFiles,
     deletedFiles: extraction.deletedFiles,
     unresolvedErrors: extraction.errors.filter((e) => !e.resolved).map((e) => {
-      const bn = extraction.modifiedFiles.find((f) => e.message.toLowerCase().includes(f.path.split("/").pop()?.toLowerCase() ?? "__none__"));
+      const msgLower = e.message.toLowerCase();
+      const bn = modifiedBasenames.find((f) => f.bn.length > 0 && msgLower.includes(f.bn));
       return {
         id: "error-" + ++errorId,
         message: e.message.slice(0, 300),
@@ -5028,7 +5277,20 @@ function injectDeltaSection(summary, delta) {
     return summary;
   const parsed = parseSummary(summary);
   const hasOpenLoops = parsed.sections.some((s) => s.kind === "open-loops");
-  const updated = upsertSection(parsed, "changes", body, hasOpenLoops ? "next-steps" : "next-steps");
+  const placement = hasOpenLoops ? { after: "open-loops" } : { before: "next-steps" };
+  const updated = upsertSection(parsed, "changes", body, placement);
+  return renderSummary(updated);
+}
+function ensurePinnedPaths(summary, pinned) {
+  if (!pinned.length)
+    return summary;
+  const lower = summary.toLowerCase();
+  const missing = pinned.filter((p) => p && p.trim().length > 0 && !lower.includes(p.toLowerCase()));
+  if (!missing.length)
+    return summary;
+  const parsed = parseSummary(summary);
+  const updated = appendToSection(parsed, "files-read", missing.map((p) => "- " + p).join(`
+`), "- Pinned by config (always preserved):");
   return renderSummary(updated);
 }
 function extractNextActions(summary) {
@@ -5046,62 +5308,6 @@ function extractCriticalContext(summary) {
 `).map((l) => l.replace(/^-\s*/, "").trim()).filter((l) => l.length > 0);
 }
 
-// src/app/steps/state.ts
-init_tokens();
-function buildState(rc) {
-  const extraction = rc.extraction;
-  let summary = rc.finalSummary;
-  const openLoops = extractOpenLoops(rc.llmMessages, extraction);
-  if (openLoops.length > 0) {
-    rc.notify("Open Loops: " + openLoops.length + " detected (" + openLoops.filter((l) => l.priority === "high").length + " high)", "info");
-    summary = injectOpenLoopsSection(summary, openLoops);
-  }
-  const nextActions = extractNextActions(summary);
-  const criticalContextItems = extractCriticalContext(summary);
-  const compactionState = buildCompactionState(extraction, openLoops, rc.explorationReport, nextActions, criticalContextItems);
-  const prevState = loadCompactionState(rc.projectId);
-  if (prevState) {
-    const delta = computeDelta(prevState, compactionState);
-    if (delta.newLoops.length || delta.resolvedLoops.length || delta.newDecisions.length || delta.newErrors.length || delta.newModifiedFiles.length) {
-      summary = injectDeltaSection(summary, delta);
-      rc.notify("Delta: " + delta.newLoops.length + " new loops, " + delta.resolvedLoops.length + " resolved, " + delta.newModifiedFiles.length + " new files", "info");
-    }
-  }
-  const detModified = extraction.modifiedFiles.map((f) => f.path);
-  const detRead = extraction.readFiles;
-  const estimatedAfter = estimateTokens(summary) + rc.accTokens;
-  const tokensSaved = Math.max(0, rc.totalTokens - estimatedAfter);
-  const details = {
-    method: rc.method,
-    chunkCount: rc.chunkCount || 1,
-    topics: rc.summaries.length ? rc.summaries.map((s) => s.topic) : [rc.method],
-    readFiles: detRead,
-    modifiedFiles: detModified,
-    totalMessages: rc.toCompact.length,
-    totalTokensSummarized: rc.convTokens,
-    llmCalls: rc.llmCalls,
-    profile: rc.profile,
-    backupPath: rc.backupPath,
-    tokensSaved,
-    verified: rc.verified,
-    gaps: rc.verificationGaps,
-    explorationRounds: rc.explorationRounds,
-    explorationBoundaries: rc.explorationReport?.boundaries.length ?? 0,
-    model: rc.modelLabel,
-    qualityScore: rc.verificationScore,
-    tokensBefore: rc.totalTokens,
-    compactionState,
-    openLoops
-  };
-  const out = rc;
-  out.finalSummary = summary;
-  out.openLoops = openLoops;
-  out.compactionState = compactionState;
-  out.details = details;
-  out.tokensSaved = tokensSaved;
-  return advance(out, "_stated");
-}
-
 // src/utils/damage.ts
 init_logger();
 init_paths();
@@ -5113,6 +5319,7 @@ var COMPLAINT_PATTERNS = [
 ];
 function detectDamage(postMessages, details) {
   const signals = [];
+  const reReadFiles = [];
   const compactedFiles = new Set(details.modifiedFiles.map((f) => f.toLowerCase()));
   const compactedReadFiles = new Set(details.readFiles.map((f) => f.toLowerCase()));
   for (let i = 0;i < postMessages.length; i++) {
@@ -5131,6 +5338,8 @@ function detectDamage(postMessages, details) {
                 severity: "medium",
                 detail: "Agent re-read compacted file: " + fp
               });
+              if (!reReadFiles.includes(fp))
+                reReadFiles.push(fp);
             }
           }
         }
@@ -5182,7 +5391,8 @@ function detectDamage(postMessages, details) {
   return {
     signals,
     damageScore,
-    summary: parts.length ? "Damage score: " + damageScore + "/100 \u2014 " + parts.join(", ") : "No regression signals detected (score: 0)"
+    summary: parts.length ? "Damage score: " + damageScore + "/100 \u2014 " + parts.join(", ") : "No regression signals detected (score: 0)",
+    reReadFiles
   };
 }
 function logDamageReport(sessionId, report, details) {
@@ -5202,6 +5412,92 @@ function logDamageReport(sessionId, report, details) {
     warn("logDamageReport failed", e);
   }
 }
+var REMEDIATION_TTL_MS = 7 * 24 * 60 * 60 * 1000;
+function writeRemediationHints(projectId, files) {
+  if (!files.length)
+    return;
+  const cleaned = [...new Set(files.map((f) => (f ?? "").trim()).filter((f) => f.length > 0))];
+  if (!cleaned.length)
+    return;
+  try {
+    writeJsonSync(remediationHintsFile(projectId), { files: cleaned, updatedAt: Date.now() });
+  } catch (e) {
+    warn("writeRemediationHints failed", e);
+  }
+}
+function readRemediationHints(projectId) {
+  const data = readJsonSync(remediationHintsFile(projectId));
+  if (!data || !Array.isArray(data.files))
+    return [];
+  if (typeof data.updatedAt === "number" && Date.now() - data.updatedAt > REMEDIATION_TTL_MS)
+    return [];
+  return data.files.filter((f) => typeof f === "string");
+}
+
+// src/app/steps/state.ts
+init_tokens();
+function buildState(rc) {
+  const extraction = rc.extraction;
+  let summary = rc.finalSummary;
+  const openLoops = extractOpenLoops(rc.llmMessages, extraction);
+  if (openLoops.length > 0) {
+    rc.notify("Open Loops: " + openLoops.length + " detected (" + openLoops.filter((l) => l.priority === "high").length + " high)", "info");
+    summary = injectOpenLoopsSection(summary, openLoops);
+  }
+  const pinPaths = rc.config.pinPaths ?? [];
+  const remediated = readRemediationHints(rc.projectId);
+  const preserve = remediated.length ? Array.from(new Set([...pinPaths, ...remediated])) : pinPaths;
+  if (remediated.length) {
+    rc.notify("Remediation: re-preserving " + remediated.length + " file(s) lost in a prior compaction", "info");
+  }
+  if (preserve.length > 0) {
+    summary = ensurePinnedPaths(summary, preserve);
+  }
+  const nextActions = extractNextActions(summary);
+  const criticalContextItems = extractCriticalContext(summary);
+  const compactionState = buildCompactionState(extraction, openLoops, rc.explorationReport, nextActions, criticalContextItems);
+  const prevState = loadCompactionState(rc.projectId);
+  if (prevState) {
+    const delta = computeDelta(prevState, compactionState);
+    if (delta.newLoops.length || delta.resolvedLoops.length || delta.newDecisions.length || delta.newErrors.length || delta.newModifiedFiles.length) {
+      summary = injectDeltaSection(summary, delta);
+      rc.notify("Delta: " + delta.newLoops.length + " new loops, " + delta.resolvedLoops.length + " resolved, " + delta.newModifiedFiles.length + " new files", "info");
+    }
+  }
+  const detModified = extraction.modifiedFiles.map((f) => f.path);
+  const detRead = extraction.readFiles;
+  const estimatedAfter = estimateTokens(summary) + rc.accTokens;
+  const tokensSaved = Math.max(0, rc.totalTokens - estimatedAfter);
+  const details = {
+    method: rc.method,
+    chunkCount: rc.chunkCount || 1,
+    topics: rc.summaries.length ? rc.summaries.map((s) => s.topic) : [rc.method],
+    readFiles: detRead,
+    modifiedFiles: detModified,
+    totalMessages: rc.toCompact.length,
+    totalTokensSummarized: rc.convTokens,
+    llmCalls: rc.llmCalls,
+    profile: rc.profile,
+    backupPath: rc.backupPath,
+    tokensSaved,
+    verified: rc.verified,
+    gaps: rc.verificationGaps,
+    explorationRounds: rc.explorationRounds,
+    explorationBoundaries: rc.explorationReport?.boundaries.length ?? 0,
+    model: rc.modelLabel,
+    qualityScore: rc.verificationScore,
+    tokensBefore: rc.totalTokens,
+    compactionState,
+    openLoops
+  };
+  const out = rc;
+  out.finalSummary = summary;
+  out.openLoops = openLoops;
+  out.compactionState = compactionState;
+  out.details = details;
+  out.tokensSaved = tokensSaved;
+  return advance(out, "_stated");
+}
 
 // src/app/steps/persist.ts
 import { convertToLlm as convertToLlm2 } from "@earendil-works/pi-coding-agent";
@@ -5212,7 +5508,7 @@ function persistDurableState(rc) {
 }
 function runDamageDetection(rc) {
   try {
-    const postCompactMsgs = rc.msgs.slice(rc.keepFrom).map((e) => convertToLlm2([e.message])).flat();
+    const postCompactMsgs = rc.msgs.slice(rc.keepFrom).map((e) => convertToLlm2([asBranchMessage(e.message)])).flat();
     if (postCompactMsgs.length <= 2)
       return;
     const lastCompaction = rc.branch.filter((e) => e?.type === "compaction").slice(-1)[0];
@@ -5228,6 +5524,9 @@ function runDamageDetection(rc) {
       rc.notify("Previous compaction damage: " + damage.summary, "warning");
     }
     logDamageReport(rc.sessionId, damage, safeDetails);
+    if (damage.reReadFiles.length > 0) {
+      writeRemediationHints(rc.projectId, damage.reReadFiles);
+    }
   } catch (err) {
     warn("Damage detection error", err);
   }
@@ -5437,8 +5736,16 @@ async function runSmartCompact(opts) {
     recordSuccessMetrics(stated, "success");
     if (!stated.flags.autoTriggered) {
       try {
-        const timeoutPromise = new Promise((resolve) => setTimeout(resolve, 5000));
-        await Promise.race([showResultScreen(stated.ctx, stated.details, stated.extraction, stated.services), timeoutPromise]);
+        let resultTimer;
+        const timeoutPromise = new Promise((resolve) => {
+          resultTimer = setTimeout(resolve, 5000);
+        });
+        try {
+          await Promise.race([showResultScreen(stated.ctx, stated.details, stated.extraction, stated.services), timeoutPromise]);
+        } finally {
+          if (resultTimer)
+            clearTimeout(resultTimer);
+        }
       } catch (err) {
         warn("Result screen error", err);
         stated.notify("Result screen skipped", "info");
@@ -5578,9 +5885,9 @@ function smartCompactExtension(pi) {
   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]",
+    description: "EESV smart compaction v" + VERSION + ". Usage: /smart-compact [model] [light|balanced|aggressive] [verbose|debug|dry-run|restore|metrics|dashboard] [note]",
     getArgumentCompletions: (prefix) => {
-      const m = ["verbose", "debug", "dry-run", "metrics", "dashboard", "light", "balanced", "aggressive"].filter((o) => o.startsWith(prefix)).map((o) => ({ value: o, label: o }));
+      const m = ["verbose", "debug", "dry-run", "metrics", "dashboard", "restore", "light", "balanced", "aggressive"].filter((o) => o.startsWith(prefix)).map((o) => ({ value: o, label: o }));
       return m.length ? m : null;
     },
     handler: async (args, ctx) => {
@@ -5609,6 +5916,48 @@ function smartCompactExtension(pi) {
           }
           return;
         }
+        if (flags.includes("restore")) {
+          const backups = listBackups();
+          if (!backups.length) {
+            ctx.ui.notify("No smart-compact backups found", "info");
+            return;
+          }
+          const selected = await showRestorePicker(ctx, backups);
+          if (!selected) {
+            ctx.ui.notify("Cancelled", "info");
+            return;
+          }
+          const content = readBackupContent(selected);
+          if (!content) {
+            ctx.ui.notify("Could not read backup: " + selected, "error");
+            return;
+          }
+          const action = await showRestoreAction(ctx, selected);
+          if (action === "restore") {
+            const branch = ctx.sessionManager.getBranch();
+            const leafId = branch.length ? branch[branch.length - 1].id : undefined;
+            if (!leafId) {
+              ctx.ui.notify("Cannot restore: no session leaf to fork from \u2014 showing content instead", "warning");
+              await showBackupViewer(ctx, content, selected);
+              return;
+            }
+            try {
+              const result = await ctx.fork(leafId, {
+                withSession: async (rctx) => {
+                  await rctx.sendMessage(buildRestoreMessage(content, selected), { deliverAs: "nextTurn" });
+                }
+              });
+              ctx.ui.notify(result.cancelled ? "Restore cancelled" : "Restored backup into a new session", "info");
+            } catch (e) {
+              warn("Restore fork failed", e);
+              ctx.ui.notify("Restore failed (" + (e instanceof Error ? e.message : String(e)) + ") \u2014 showing content instead", "warning");
+              await showBackupViewer(ctx, content, selected);
+            }
+          } else if (action === "view") {
+            await showBackupViewer(ctx, content, selected);
+          }
+          return;
+        }
         const modelArg = tokens.find((t) => t.includes("/"));
         const profileArg = tokens.find((t) => ["light", "balanced", "aggressive"].includes(t));
         const profile = profileArg ?? loadConfig().profile;