pi-smart-compact 7.15.1 → 7.18.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.1", 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.18.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}
@@ -39,7 +39,7 @@ IMMUTABLE CONTEXT (verified deterministic data):
 {EXPLORATION_CONTEXT}
 {PREV_CONTEXT}
 
-<summaries>{SUMMARIES}</summaries>`, SESSION_TYPE_INSTRUCTIONS, SECTION_GOAL = "## Goal", SECTION_CONSTRAINTS = "## Constraints & Preferences", SECTION_PROGRESS = "## Progress", SECTION_DECISIONS = "## Key Decisions", SECTION_FILES_MODIFIED = "## Files Modified", SECTION_FILES_READ = "## Files Read", SECTION_NEXT_STEPS = "## Next Steps", SECTION_CRITICAL_CONTEXT = "## Critical Context", SECTION_TOPICS = "## Topics Covered", SECTION_OPEN_LOOPS = "## Open Loops", SECTION_CHANGES = "## Changes Since Last Compaction", LOG_PREFIX = "[smart-compact]", MIN_TOKEN_THRESHOLD = 5000, MAX_EXPLORATION_ROUNDS = 8, BACKUP_MAX_FILES = 20, BACKUP_MAX_AGE_MS, MAX_TOOL_OUTPUT_CHARS = 800, METRICS_BUFFER_MAX = 200, CONFIG_KEY = "smartCompact", CONFIG_KEY_ALT = "semanticCompact", EXPLORER_SYSTEM_PROMPT;
+<summaries>{SUMMARIES}</summaries>`, SESSION_TYPE_INSTRUCTIONS, SECTION_GOAL = "## Goal", SECTION_CONSTRAINTS = "## Constraints & Preferences", SECTION_PROGRESS = "## Progress", SECTION_DECISIONS = "## Key Decisions", SECTION_FILES_MODIFIED = "## Files Modified", SECTION_FILES_READ = "## Files Read", SECTION_NEXT_STEPS = "## Next Steps", SECTION_CRITICAL_CONTEXT = "## Critical Context", SECTION_TOPICS = "## Topics Covered", SECTION_OPEN_LOOPS = "## Open Loops", SECTION_CHANGES = "## Changes Since Last Compaction", LOG_PREFIX = "[smart-compact]", MIN_TOKEN_THRESHOLD = 5000, MAX_EXPLORATION_ROUNDS = 8, BACKUP_MAX_FILES = 20, BACKUP_MAX_AGE_MS, FIVE_MINUTES_MS, ONE_HOUR_MS, SEVEN_DAYS_MS, THIRTY_DAYS_MS, EXTRACTION_CACHE_PREFIX = "compact-extraction-", ID_PREFIX, TUNING, TRUNC, MAX_TOOL_OUTPUT_CHARS = 800, LIKELY_ERROR_RE, ERROR_SCAN_MAX_LEN = 2000, ERROR_RETRY_WINDOW = 6, ERROR_RESOLVE_WINDOW = 10, METRICS_BUFFER_MAX = 200, CONFIG_KEY = "smartCompact", CONFIG_KEY_ALT = "semanticCompact", EXPLORER_SYSTEM_PROMPT;
 var init_constants = __esm(() => {
   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.";
   PROFILES = {
@@ -77,10 +77,11 @@ 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;
+  SHIFT_RE = /\u015Fimdi|simdi|peki|bi de|bide|ge\u00E7elim|gecelim|bakal\u0131m|bakalim|yapal\u0131m|yapalim|ba\u015Fka|baska|sonra|tamam \u015Fimdi|tamam simdi|now let|also|next|let's|moving on|switch to/iu;
   CHOICE_RE = /use\s+\S+\s+(?:instead|not|rather)|don't\s+use|avoid\s+|switch\s+to\s+|go\s+with\s+|prefer\s+/i;
   SINGLE_PASS_PREFIX = `Summarize this coding agent conversation. Produce ONE structured summary.
 ` + `
@@ -177,6 +178,56 @@ Rules for Accuracy:
     discussion: "Focus on: decisions made, trade-offs discussed, consensus reached. Prioritize rationale over implementation details."
   };
   BACKUP_MAX_AGE_MS = 14 * 24 * 60 * 60 * 1000;
+  FIVE_MINUTES_MS = 5 * 60 * 1000;
+  ONE_HOUR_MS = 60 * 60 * 1000;
+  SEVEN_DAYS_MS = 7 * 24 * 60 * 60 * 1000;
+  THIRTY_DAYS_MS = 30 * 24 * 60 * 60 * 1000;
+  ID_PREFIX = {
+    PROJECT: "proj-",
+    COMPACT_SESSION: "sc-",
+    MULTI_TOOL_USE_SYNTHETIC: "mtu_",
+    OPEN_LOOP: "loop-",
+    DECISION: "decision-",
+    ERROR: "error-"
+  };
+  TUNING = {
+    EMA_PREV: 0.7,
+    EMA_SAMPLE: 0.3,
+    CALIBRATION_CLAMP_MIN: 0.3,
+    CALIBRATION_CLAMP_MAX: 3,
+    CONFIDENCE_HIGH: 0.85,
+    CONFIDENCE_MEDIUM: 0.8,
+    CONFIDENCE_LOW: 0.6
+  };
+  TRUNC = {
+    MESSAGE: 300,
+    ERROR_DETAIL: 500,
+    DECISION_SUMMARY: 200,
+    USER_RESPONSE: 300,
+    CONSTRAINT_TEXT: 300,
+    OPEN_LOOP_SUMMARY: 120,
+    TIMELINE_EVENT: 150,
+    TIMELINE_ERROR: 100,
+    SNIPPET: 80,
+    PREVIEW: 150,
+    PREVIEW_MID: 200,
+    DETAIL: 300,
+    PREVIEW_LONG: 400,
+    PREVIEW_XL: 500,
+    CHUNK_FALLBACK: 180,
+    DECISION_DETAIL: 60,
+    TOPIC_LABEL: 100,
+    PROJ_ID_HASH: 12,
+    CONV_HASH: 8,
+    RESULT_GAPS: 5,
+    SESSION_ID_DISPLAY: 20,
+    ERROR_SNIPPET: 30,
+    TIMELINE_DISPLAY: 10,
+    EXPLORE_RESULTS: 15,
+    BACKUP_PREVIEW_LINES: 5,
+    FINGERPRINT_SEG: 2
+  };
+  LIKELY_ERROR_RE = /(?: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;
   EXPLORER_SYSTEM_PROMPT = `You are a conversation analyst. You have deterministic extraction data and can query the raw conversation using tools.
 
 ` + `Your job:
@@ -246,7 +297,7 @@ function damageReportsFile() {
   return path.join(smartCompactCacheDir(), "damage-reports.jsonl");
 }
 function extractionCacheFile(sessionId) {
-  return path.join(cacheDir(), "compact-extraction-" + sessionId.replace(/[^a-zA-Z0-9-]/g, "_") + ".json");
+  return path.join(cacheDir(), EXTRACTION_CACHE_PREFIX + sessionId.replace(/[^a-zA-Z0-9-]/g, "_") + ".json");
 }
 function projectFingerprintFile(projectId) {
   return path.join(projectFingerprintDir(), projectId + ".json");
@@ -254,10 +305,15 @@ 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");
 }
-var init_paths = () => {};
+var init_paths = __esm(() => {
+  init_constants();
+});
 
 // src/infra/fs.ts
 import fs from "fs";
@@ -385,8 +441,8 @@ class TokenCalibrationStore {
     const key = calibrationKey(provider, model);
     const prev = this.factors.get(key) ?? 1;
     const sample = actual / estimated;
-    const clamped = Math.max(0.3, Math.min(3, sample));
-    this.factors.set(key, prev * 0.7 + clamped * 0.3);
+    const clamped = Math.max(TUNING.CALIBRATION_CLAMP_MIN, Math.min(TUNING.CALIBRATION_CLAMP_MAX, sample));
+    this.factors.set(key, prev * TUNING.EMA_PREV + clamped * TUNING.EMA_SAMPLE);
   }
 }
 function calibrationKey(provider, model) {
@@ -394,7 +450,21 @@ function calibrationKey(provider, model) {
 }
 function estimateTokens(text, provider, model, calibration = _fallbackCalibration) {
   const baseRatio = provider ? getProviderCaps(provider).tokenRatioEstimate : CHARS_PER_TOKEN;
-  const jsonPenalty = text.startsWith("[") || text.startsWith("{") ? 0.85 : 1;
+  const startsJson = text.startsWith("[") || text.startsWith("{");
+  let jsonPenalty = 1;
+  if (startsJson) {
+    jsonPenalty = JSON_PENALTY;
+  } else if (text.length > 0) {
+    const sample = text.length > JSON_DENSITY_SCAN_CAP ? text.slice(0, JSON_DENSITY_SCAN_CAP) : text;
+    let structural = 0;
+    for (let i = 0;i < sample.length; i++) {
+      const c = sample.charCodeAt(i);
+      if (c === 34 || c === 91 || c === 93 || c === 123 || c === 125)
+        structural++;
+    }
+    if (structural / sample.length > JSON_DENSITY_THRESHOLD)
+      jsonPenalty = JSON_PENALTY;
+  }
   const langPenalty = /[\u00E7\u011F\u0131\u00F6\u015F\u00FC\u00C7\u011E\u0130\u00D6\u015E\u00DC]/.test(text) ? 0.9 : 1;
   const factor = calibration.get(provider, model);
   return Math.ceil(text.length / baseRatio * jsonPenalty * langPenalty * factor);
@@ -402,7 +472,7 @@ function estimateTokens(text, provider, model, calibration = _fallbackCalibratio
 function calibrateFromResponse(estimated, actual, provider, model, calibration = _fallbackCalibration) {
   calibration.calibrate(estimated, actual, provider, model);
 }
-var PROVIDER_MAP, PROVIDER_ALIASES, DEFAULT_CAPS, _fallbackCalibration;
+var PROVIDER_MAP, PROVIDER_ALIASES, DEFAULT_CAPS, _fallbackCalibration, JSON_PENALTY = 0.85, JSON_DENSITY_THRESHOLD = 0.05, JSON_DENSITY_SCAN_CAP = 8192;
 var init_tokens = __esm(() => {
   init_constants();
   PROVIDER_MAP = {
@@ -740,7 +810,7 @@ import crypto4 from "crypto";
 class ToolSupportCache {
   entries = new Map;
   ttlMs;
-  constructor(ttlMs = 60 * 60 * 1000) {
+  constructor(ttlMs = ONE_HOUR_MS) {
     this.ttlMs = ttlMs;
   }
   get(key, now) {
@@ -846,11 +916,7 @@ var init_services = __esm(() => {
 
 // src/utils/cache.ts
 import fs3 from "fs";
-import path4 from "path";
-import crypto5 from "crypto";
-function fallbackSessionId() {
-  return "sc-" + Date.now().toString(36) + "-" + crypto5.randomBytes(4).toString("hex");
-}
+import path5 from "path";
 function cacheOpts(opts, provider, phase, services) {
   if (phase && INTERNAL_PHASES.has(phase)) {
     return { ...opts, cacheRetention: "none" };
@@ -860,7 +926,7 @@ function cacheOpts(opts, provider, phase, services) {
   if (retention === "none") {
     return { ...opts, cacheRetention: "none" };
   }
-  return { ...opts, sessionId: services?.compactSessionId ?? fallbackSessionId(), cacheRetention: retention };
+  return { ...opts, sessionId: services?.compactSessionId ?? makeCompactSessionId(), cacheRetention: retention };
 }
 function recordMetric(m, services = getDefaultServices()) {
   services.metrics.record(m);
@@ -966,14 +1032,14 @@ function scheduleExtractionCacheCleanup() {
   _extractionPruneInFlight = true;
   queueMicrotask(() => {
     try {
-      const dir = path4.dirname(getCachePath("_"));
+      const dir = path5.dirname(getCachePath("_"));
       if (!fs3.existsSync(dir))
         return;
       const now = Date.now();
       for (const name of fs3.readdirSync(dir)) {
-        if (!name.startsWith("compact-extraction-") || !name.endsWith(".json"))
+        if (!name.startsWith(EXTRACTION_CACHE_PREFIX) || !name.endsWith(".json"))
           continue;
-        const fp = path4.join(dir, name);
+        const fp = path5.join(dir, name);
         try {
           const stat = fs3.statSync(fp);
           if (now - stat.mtimeMs > EXTRACTION_CACHE_PRUNE_MAX_AGE_MS) {
@@ -1019,9 +1085,9 @@ function mergeExtractions(base, delta, baseMsgCount) {
     constraints: [...base.constraints, ...offsetConstraints],
     topics: [...base.topics, ...offsetTopics],
     timeline: [...base.timeline, ...offsetTimeline],
-    mainGoal: delta.mainGoal ?? base.mainGoal,
-    lastUserMessages: delta.lastUserMessages.length > 0 ? delta.lastUserMessages : base.lastUserMessages,
-    lastErrors: delta.lastErrors.length > 0 ? delta.lastErrors : base.lastErrors,
+    mainGoal: base.mainGoal ?? delta.mainGoal,
+    lastUserMessages: [...base.lastUserMessages, ...delta.lastUserMessages].slice(-5),
+    lastErrors: [...base.lastErrors, ...delta.lastErrors].slice(-3),
     messageCount: baseMsgCount + delta.messageCount
   };
 }
@@ -1317,6 +1383,7 @@ var init_cache = __esm(() => {
   init_llm_client();
   init_paths();
   init_fs();
+  init_constants();
   init_id_fingerprint();
   init_services();
   INTERNAL_PHASES = new Set([
@@ -1329,8 +1396,8 @@ var init_cache = __esm(() => {
     "assemble",
     "patch"
   ]);
-  EXTRACTION_CACHE_TTL_MS = 60 * 60 * 1000;
-  EXTRACTION_CACHE_PRUNE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
+  EXTRACTION_CACHE_TTL_MS = ONE_HOUR_MS;
+  EXTRACTION_CACHE_PRUNE_MAX_AGE_MS = SEVEN_DAYS_MS;
 });
 
 // src/ui/dashboard-format.ts
@@ -1434,9 +1501,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,
@@ -1444,7 +1514,7 @@ __export(exports_overlays, {
 });
 import { DynamicBorder } from "@earendil-works/pi-coding-agent";
 import { Container, Key, matchesKey, SelectList, Text, truncateToWidth } from "@earendil-works/pi-tui";
-import path5 from "path";
+import path6 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));
@@ -1627,7 +1697,7 @@ async function showResultScreen(ctx, details, extraction, services) {
         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", path5.basename(f)) + theme.fg("dim", count + " \u2192 " + f), 0, 0));
+        c.addChild(new Text(theme.fg("success", "    \u270E ") + theme.fg("text", path6.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));
@@ -1650,7 +1720,7 @@ async function showResultScreen(ctx, details, extraction, services) {
       c.addChild(new Text(theme.fg("success", "    \u2705 All facts verified \u2014 no gaps detected"), 0, 0));
     } else if (details.gaps.length > 0) {
       c.addChild(new Text(theme.fg("warning", "    \u26A0\uFE0F  " + details.gaps.length + " gap(s) patched:"), 0, 0));
-      for (const g of details.gaps.slice(0, 5)) {
+      for (const g of details.gaps.slice(0, TRUNC.RESULT_GAPS)) {
         c.addChild(new Text(theme.fg("dim", "      \u2022 " + g), 0, 0));
       }
     }
@@ -1797,7 +1867,123 @@ 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, TRUNC.SESSION_ID_DISPLAY)
+  }));
+  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_constants();
   init_cache();
   init_tokens();
 });
@@ -1810,1081 +1996,1161 @@ init_constants();
 init_logger();
 init_paths();
 init_fs();
-init_constants();
 import fs2 from "fs";
-import path3 from "path";
+import path4 from "path";
 import crypto2 from "crypto";
-var VALID_PROFILES = ["light", "balanced", "aggressive"];
-var PROFILE_NUMERIC_KEYS = ["summaryBudgetTokens", "keepRecentTokens", "minChunkTokens", "maxChunkTokens", "singlePassMaxTokens", "batchMaxTokens"];
-function validateSmartCompactConfig(sc) {
-  if ("profile" in sc && !VALID_PROFILES.includes(sc.profile)) {
-    warn("smart-compact config: invalid profile '" + sc.profile + "', expected light|balanced|aggressive. Using default 'balanced'.");
-    delete sc.profile;
-  }
-  if ("autoTrigger" in sc && typeof sc.autoTrigger !== "boolean") {
-    warn("smart-compact config: autoTrigger must be boolean, got " + typeof sc.autoTrigger);
-    delete sc.autoTrigger;
-  }
-  if ("backupEnabled" in sc && typeof sc.backupEnabled !== "boolean") {
-    warn("smart-compact config: backupEnabled must be boolean, got " + typeof sc.backupEnabled);
-    delete sc.backupEnabled;
-  }
-  if ("summaryModel" in sc && sc.summaryModel !== null && typeof sc.summaryModel !== "string") {
-    warn("smart-compact config: summaryModel must be string|null, got " + typeof sc.summaryModel);
-    delete sc.summaryModel;
-  }
-  if ("segmentationModel" in sc && sc.segmentationModel !== null && typeof sc.segmentationModel !== "string") {
-    warn("smart-compact config: segmentationModel must be string|null, got " + typeof sc.segmentationModel);
-    delete sc.segmentationModel;
-  }
-  if ("profiles" in sc) {
-    if (typeof sc.profiles !== "object" || sc.profiles === null || Array.isArray(sc.profiles)) {
-      warn("smart-compact config: profiles must be an object, got " + typeof sc.profiles);
-      delete sc.profiles;
-    } else {
-      const profiles = sc.profiles;
-      for (const [profileName, value] of Object.entries(profiles)) {
-        if (!VALID_PROFILES.includes(profileName)) {
-          warn("smart-compact config: ignoring unknown profile override '" + profileName + "'.");
-          delete profiles[profileName];
-          continue;
-        }
-        if (typeof value !== "object" || value === null || Array.isArray(value)) {
-          warn("smart-compact config: profile '" + profileName + "' must be an object.");
-          delete profiles[profileName];
-          continue;
-        }
-        const profileCfg = value;
-        for (const [key, raw] of Object.entries(profileCfg)) {
-          if (!PROFILE_NUMERIC_KEYS.includes(key)) {
-            warn("smart-compact config: ignoring unknown profile key '" + profileName + "." + key + "'.");
-            delete profileCfg[key];
-            continue;
-          }
-          if (typeof raw !== "number" || !Number.isFinite(raw) || raw <= 0 || raw > 1e6) {
-            warn("smart-compact config: profile '" + profileName + "." + key + "' must be a positive finite number.");
-            delete profileCfg[key];
-          }
-        }
-      }
-    }
-  }
-  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;
-    }
-  }
-  if ("minContextPercent" in sc) {
-    const v = sc.minContextPercent;
-    if (typeof v !== "number" || !Number.isFinite(v) || v < 0 || v > 100) {
-      warn("smart-compact config: minContextPercent must be 0\u2013100, got " + v + ". Using default " + DEFAULT_CONFIG.minContextPercent + ".");
-      delete sc.minContextPercent;
-    }
-  }
+
+// src/utils/extraction.ts
+init_constants();
+init_tokens();
+import path3 from "path";
+
+// src/utils/type-guards.ts
+function isTextBlock(c) {
+  return typeof c === "object" && c !== null && c.type === "text" && typeof c.text === "string";
 }
-var _cfg = null;
-var _cfgMtime = 0;
-var _cfgPath = null;
-function loadConfig() {
-  try {
-    const p = settingsFile();
-    const stat = fs2.statSync(p);
-    if (_cfg && _cfgPath === p && stat.mtimeMs === _cfgMtime)
-      return _cfg;
-    const raw = JSON.parse(fs2.readFileSync(p, "utf-8"));
-    const sc = raw[CONFIG_KEY] ?? raw[CONFIG_KEY_ALT] ?? {};
-    validateSmartCompactConfig(sc);
-    const merged = { ...DEFAULT_CONFIG, ...sc };
-    if (sc.profiles)
-      merged.profiles = { ...PROFILES, ...sc.profiles };
-    if (!merged.backupDir)
-      merged.backupDir = defaultBackupDir();
-    _cfg = merged;
-    _cfgMtime = stat.mtimeMs;
-    _cfgPath = p;
-    return _cfg;
-  } catch (e) {
-    debug("loadConfig: settings.json not found or unreadable, using defaults", e);
-    const fallback = { ...DEFAULT_CONFIG, backupDir: defaultBackupDir() };
-    _cfg = fallback;
-    _cfgPath = null;
-    return fallback;
-  }
+function isToolCallBlock(c) {
+  return typeof c === "object" && c !== null && c.type === "toolCall" && typeof c.name === "string";
 }
-var _pruneInFlight = new Set;
-function prunePass(dir) {
-  try {
-    const entries = fs2.readdirSync(dir).filter((name) => name.endsWith(".md")).map((name) => {
-      const full = path3.join(dir, name);
-      try {
-        return { full, mtimeMs: fs2.statSync(full).mtimeMs };
-      } catch {
-        return null;
-      }
-    }).filter((v) => v !== null);
-    const now = Date.now();
-    const overAge = entries.filter((e) => now - e.mtimeMs > BACKUP_MAX_AGE_MS);
-    const sorted = entries.sort((a, b) => b.mtimeMs - a.mtimeMs);
-    const overCount = sorted.slice(BACKUP_MAX_FILES);
-    const toRemove = new Set([...overAge, ...overCount].map((e) => e.full));
-    for (const full of toRemove) {
-      try {
-        fs2.unlinkSync(full);
-      } catch (e) {
-        debug("prunePass unlink failed", e);
-      }
-    }
-  } catch (e) {
-    debug("prunePass scan failed", e);
-  }
+function getToolCallNames(content) {
+  if (!Array.isArray(content))
+    return [];
+  return content.filter(isToolCallBlock).map((b) => b.name);
 }
-function schedulePruneBackups(dir) {
-  if (_pruneInFlight.has(dir))
-    return;
-  _pruneInFlight.add(dir);
-  queueMicrotask(() => {
-    try {
-      prunePass(dir);
-    } finally {
-      _pruneInFlight.delete(dir);
-    }
-  });
+function filterToolCalls(content) {
+  if (!Array.isArray(content))
+    return [];
+  return content.filter(isToolCallBlock);
 }
-function backupConversation(convText, sessionId) {
-  try {
-    const cfg = loadConfig();
-    if (!cfg.backupEnabled)
-      return null;
-    const dir = cfg.backupDir;
-    ensureDir(dir);
-    const ts = new Date().toISOString().replace(/[:.]/g, "-");
-    const hash = crypto2.createHash("sha256").update(convText).digest("hex").slice(0, 8);
-    const fp = path3.join(dir, sessionId + "-" + ts + "-" + hash + ".md");
-    atomicWriteFileSync(fp, `# Smart Compact Backup
-# Date: ` + new Date().toISOString() + `
-# Session: ` + sessionId + `
-
-` + convText);
-    schedulePruneBackups(dir);
-    return fp;
-  } catch (e) {
-    warn("backupConversation failed", e);
-    return null;
-  }
+var KNOWN_METHODS = new Set(["eesv", "single-pass", "heuristic"]);
+var KNOWN_PROFILES = new Set(["light", "balanced", "aggressive"]);
+function isStringArray(v) {
+  return Array.isArray(v) && v.every((x) => typeof x === "string");
 }
-function getPreviousCompactionContext(branch) {
-  const compactions = branch.filter((e) => e.type === "compaction");
-  if (!compactions.length)
-    return "";
-  const last = compactions[compactions.length - 1];
-  const topics = last.details?.topics ?? [];
-  if (!topics.length)
-    return "";
-  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 isValidSmartCompactDetails(d) {
+  if (!d || typeof d !== "object")
+    return false;
+  const r = d;
+  if (!isStringArray(r.modifiedFiles))
+    return false;
+  if (!isStringArray(r.readFiles))
+    return false;
+  if (!isStringArray(r.topics))
+    return false;
+  if (typeof r.method !== "string" || !KNOWN_METHODS.has(r.method))
+    return false;
+  if (typeof r.profile !== "string" || !KNOWN_PROFILES.has(r.profile))
+    return false;
+  if (typeof r.qualityScore !== "number" || !Number.isFinite(r.qualityScore))
+    return false;
+  if (typeof r.totalMessages !== "number" || !Number.isFinite(r.totalMessages))
+    return false;
+  if (r.gaps !== undefined && !isStringArray(r.gaps))
+    return false;
+  if (r.verified !== undefined && typeof r.verified !== "boolean")
+    return false;
+  if (r.backupPath !== undefined && r.backupPath !== null && typeof r.backupPath !== "string")
+    return false;
+  return true;
 }
-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;
-    }
+function sanitizeSmartCompactDetails(d) {
+  if (isValidSmartCompactDetails(d))
+    return d;
+  if (!d || typeof d !== "object")
+    return null;
+  const r = d;
+  if (!isStringArray(r.modifiedFiles) || !isStringArray(r.readFiles) || !isStringArray(r.topics))
+    return null;
+  const repaired = {
+    method: KNOWN_METHODS.has(r.method) ? r.method : "heuristic",
+    chunkCount: typeof r.chunkCount === "number" ? r.chunkCount : 0,
+    topics: r.topics,
+    readFiles: r.readFiles,
+    modifiedFiles: r.modifiedFiles,
+    totalMessages: typeof r.totalMessages === "number" ? r.totalMessages : 0,
+    totalTokensSummarized: typeof r.totalTokensSummarized === "number" ? r.totalTokensSummarized : 0,
+    llmCalls: typeof r.llmCalls === "number" ? r.llmCalls : 0,
+    profile: KNOWN_PROFILES.has(r.profile) ? r.profile : "balanced",
+    backupPath: typeof r.backupPath === "string" ? r.backupPath : null,
+    tokensSaved: typeof r.tokensSaved === "number" ? r.tokensSaved : 0,
+    verified: typeof r.verified === "boolean" ? r.verified : false,
+    gaps: isStringArray(r.gaps) ? r.gaps : [],
+    explorationRounds: typeof r.explorationRounds === "number" ? r.explorationRounds : 0,
+    explorationBoundaries: typeof r.explorationBoundaries === "number" ? r.explorationBoundaries : 0,
+    model: typeof r.model === "string" ? r.model : "unknown",
+    qualityScore: typeof r.qualityScore === "number" ? r.qualityScore : 0,
+    tokensBefore: typeof r.tokensBefore === "number" ? r.tokensBefore : 0
+  };
+  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);
   }
-  return -1;
+  for (let j = parts.length - 2;j >= 0; j--) {
+    needles.push(parts.slice(j).join("/"));
+  }
+  return needles;
 }
-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++;
-    }
+
+// src/domain/tool-semantics.ts
+var PATH_KEYS = ["path", "file_path", "filePath", "filename", "file"];
+var PAYLOAD_KEYS = ["content", "newText", "oldText", "edits", "patch", "replacement"];
+var COMMAND_KEYS = ["command", "cmd", "script"];
+function hasPresent(args, keys) {
+  return keys.some((k) => args[k] != null);
+}
+function extractToolPath(args) {
+  if (!args || typeof args !== "object")
+    return;
+  const a = args;
+  for (const k of PATH_KEYS) {
+    const v = a[k];
+    if (typeof v === "string" && v.length > 0)
+      return v;
+  }
+  return;
+}
+function classifyTool(args) {
+  if (!args || typeof args !== "object")
+    return "other";
+  const a = args;
+  const hasPath = extractToolPath(a) !== undefined;
+  const hasPayload = hasPresent(a, PAYLOAD_KEYS);
+  const hasCommand = hasPresent(a, COMMAND_KEYS);
+  if (hasPath && hasPayload)
+    return "mutates";
+  if (hasCommand)
+    return "executes";
+  if (hasPath)
+    return "accesses";
+  return "other";
+}
+
+// src/utils/extraction.ts
+var TRUNCATE_RE = /\u2026\u2702\d+$/;
+function isTruncated(content) {
+  return TRUNCATE_RE.test(extractText(content));
+}
+var DELETE_RESULT_RE = /\b(?:deleted|removed|unlinked)\b/i;
+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 Math.max(0, Math.min(msgCount - 1, msgs.length - 1));
+  return [{ name: b.name, id: b.id, arguments: b.arguments }];
 }
-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;
+function extractText(content) {
+  if (typeof content === "string")
+    return content;
+  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();
+  if (/image|input_image|image_url/.test(s))
+    return "image";
+  if (/audio/.test(s))
+    return "audio";
+  if (/video/.test(s))
+    return "video";
+  if (/file|document|pdf|attachment/.test(s))
+    return "file";
+  return "unknown";
+}
+function extractMediaAttachments(msgs) {
+  const out = [];
+  for (let i = 0;i < msgs.length; i++) {
+    const blocks = Array.isArray(msgs[i].content) ? msgs[i].content : [];
+    for (const b of blocks) {
+      if (!b || typeof b !== "object")
+        continue;
+      const rec = b;
+      const type = String(rec.type ?? "");
+      if (type === "text" || type === "toolCall" || type === "tool_use")
+        continue;
+      const mimeType = rec.mimeType ?? rec.mime_type ?? rec.mediaType ?? rec.media_type;
+      const name = rec.name ?? rec.filename ?? rec.fileName ?? rec.title;
+      const sizeBytes = rec.sizeBytes ?? rec.size_bytes ?? rec.size;
+      const source = typeof rec.url === "string" ? "url" : typeof rec.path === "string" ? "path" : typeof rec.data === "string" || typeof rec.base64 === "string" ? "inline" : undefined;
+      const kind = mediaKind(type, mimeType);
+      if (kind !== "unknown" || source || mimeType || name) {
+        out.push({ index: i, kind, mimeType, name, sizeBytes: typeof sizeBytes === "number" ? sizeBytes : undefined, source });
       }
     }
   }
-  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;
-      const c = m?.content;
-      if (typeof c === "string")
-        return c;
-      if (Array.isArray(c))
-        return c.map((b) => {
-          if (typeof b === "string")
-            return b;
-          if (typeof b === "object" && b !== null && b.type === "text")
-            return b.text ?? "";
-          return "";
-        }).join("");
-      return "";
-    };
-    const lastText = getText(last.message).toLowerCase();
-    const keptText = getText(first.message).toLowerCase();
-    const fileRe = /(?:path|file)=["']([^"']+)["']/g;
-    const lastFiles = new Set([...lastText.matchAll(fileRe)].map((m) => m[1].split("/").pop()));
-    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 adjusted - 1;
-  }
-  return adjusted;
+  return out;
 }
-function collectToolCallIds(blocks, msgIndex, out) {
-  for (const b of blocks) {
-    const block = b;
-    if (block?.type === "toolCall") {
-      if (typeof block.id === "string") {
-        out.set(block.id, msgIndex);
+function buildToolCallIndex(msgs) {
+  const idx = new Map;
+  for (let i = 0;i < msgs.length; i++) {
+    const m = msgs[i];
+    if (m.role !== "assistant")
+      continue;
+    const blocks = Array.isArray(m.content) ? m.content : [];
+    for (const b of blocks) {
+      if (!isToolCallBlock(b))
+        continue;
+      if (b.id) {
+        idx.set(b.id, { name: b.name, arguments: b.arguments, msgIndex: i });
       }
-      const args = block.arguments;
-      if (block.name === "multi_tool_use.parallel" && args && Array.isArray(args.tool_uses)) {
-        for (const nested of args.tool_uses) {
-          const n = nested;
-          if (typeof n.id === "string") {
-            out.set(n.id, msgIndex);
-          }
+      if (b.name === "multi_tool_use.parallel" && Array.isArray(b.arguments?.tool_uses)) {
+        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(tool.id || syntheticId, { name: tool.name, arguments: tool.arguments, msgIndex: i });
         }
       }
     }
   }
+  return idx;
 }
-function guardToolCallBoundary(msgs, keepFrom) {
-  if (keepFrom <= 0 || keepFrom >= msgs.length)
-    return keepFrom;
-  const tcMap = new Map;
+function trackFileOps(msgs, _tcIdx) {
+  const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
+  const modMap = new Map;
+  const readSet = new Set;
+  const delSet = new Set;
   for (let i = 0;i < msgs.length; i++) {
-    const m = msgs[i].message;
-    if (m?.role !== "assistant")
+    const m = msgs[i];
+    if (m.role !== "toolResult" || m.isError)
       continue;
-    const blocks = Array.isArray(m?.content) ? m.content : [];
-    collectToolCallIds(blocks, i, tcMap);
-  }
-  let adjusted = keepFrom;
-  let changed = true;
-  const MAX_ITER = msgs.length + 1;
-  let iter = 0;
-  while (changed) {
-    if (++iter > MAX_ITER) {
-      warn("guardToolCallBoundary hit MAX_ITER=" + MAX_ITER + " at adjusted=" + adjusted);
-      break;
+    const tc = tcIdx.get(m.toolCallId ?? "");
+    if (!tc)
+      continue;
+    const filePath = extractToolPath(tc.arguments);
+    if (!filePath)
+      continue;
+    const cls = classifyTool(tc.arguments);
+    if (cls === "mutates") {
+      const resultText = extractText(m.content);
+      if (isTruncated(resultText) || !NO_OP_RE.test(resultText)) {
+        const existing = modMap.get(filePath);
+        modMap.set(filePath, { toolCalls: (existing?.toolCalls ?? 0) + 1, lastIdx: i });
+      }
+    } else if (cls === "accesses") {
+      if (DELETE_RESULT_RE.test(extractText(m.content)))
+        delSet.add(filePath);
+      else
+        readSet.add(filePath);
     }
-    changed = false;
-    for (let i = adjusted;i < msgs.length; i++) {
-      const m = msgs[i].message;
-      if (m?.role !== "toolResult")
+  }
+  return {
+    modified: [...modMap.entries()].map(([p, d]) => ({ path: p, toolCalls: d.toolCalls, lastModifiedIndex: d.lastIdx })),
+    read: [...readSet],
+    deleted: [...delSet]
+  };
+}
+function catalogErrors(msgs, _tcIdx) {
+  const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
+  const errors = [];
+  for (let i = 0;i < msgs.length; i++) {
+    const m = msgs[i];
+    if (m.role !== "toolResult")
+      continue;
+    const tc = tcIdx.get(m.toolCallId ?? "");
+    if (m.isError) {
+      errors.push({ index: i, tool: tc?.name ?? "unknown", message: extractText(m.content).slice(0, TRUNC.ERROR_DETAIL), retryAttempted: false, resolved: false });
+      continue;
+    }
+    if (tc && classifyTool(tc.arguments) === "executes") {
+      const txt = extractText(m.content);
+      if (LIKELY_ERROR_RE.test(txt) && txt.length < ERROR_SCAN_MAX_LEN) {
+        errors.push({ index: i, tool: tc.name, message: txt.slice(0, TRUNC.MESSAGE), retryAttempted: false, resolved: false });
+      }
+    }
+  }
+  for (const err of errors) {
+    for (let j = err.index + 1;j < Math.min(msgs.length, err.index + ERROR_RETRY_WINDOW); j++) {
+      if (msgs[j]?.role !== "assistant")
         continue;
-      const tcId = m?.toolCallId;
-      if (!tcId)
+      const rawBlocks = msgs[j]?.content;
+      const blocks = Array.isArray(rawBlocks) ? rawBlocks : [];
+      const retryTool = blocks.flatMap((b) => flattenToolCallBlock(b)).find((t) => t.name === err.tool);
+      if (!retryTool)
         continue;
-      const tcIdx = tcMap.get(tcId);
-      if (tcIdx !== undefined && tcIdx < adjusted) {
-        adjusted = tcIdx;
-        changed = true;
-        break;
+      err.retryAttempted = true;
+      for (let k = j + 1;k < Math.min(msgs.length, j + ERROR_RESOLVE_WINDOW); k++) {
+        const mk = msgs[k];
+        if (mk?.role !== "toolResult" || mk.isError)
+          continue;
+        const resolved = retryTool.id != null ? mk.toolCallId === retryTool.id : tcIdx.get(mk.toolCallId ?? "")?.name === err.tool;
+        if (resolved) {
+          err.resolved = true;
+          break;
+        }
       }
+      break;
     }
   }
-  return Math.max(0, Math.min(adjusted, msgs.length));
-}
-function extractUserNote(args) {
-  const SKIP = new Set(["verbose", "debug", "dry-run", "light", "balanced", "aggressive"]);
-  const tokens = args.trim().split(/\s+/).filter(Boolean);
-  const isOptionToken = (t) => t.startsWith("--") || SKIP.has(t.toLowerCase()) || /^[a-z0-9_.-]+\/[a-z0-9_.:-]+$/i.test(t);
-  const nonFlags = tokens.filter((t) => !isOptionToken(t));
-  return nonFlags.length > 0 ? nonFlags.join(" ") : undefined;
+  return errors;
 }
-function createBatches(chunks, maxTokens) {
-  const batches = [];
-  let batch = [], bt = 0;
-  for (const ch of chunks) {
-    if (batch.length && bt + ch.tokenEstimate > maxTokens) {
-      batches.push(batch);
-      batch = [];
-      bt = 0;
+function extractDecisions(msgs, _tcIdx) {
+  const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
+  const decisions = [];
+  for (const [id, tc] of tcIdx) {
+    if (tc.name !== "ask_user")
+      continue;
+    const args = tc.arguments;
+    const question = typeof args === "string" ? args : args?.question ?? args?.prompt ?? "";
+    if (!question)
+      continue;
+    for (let i = tc.msgIndex + 1;i < Math.min(msgs.length, tc.msgIndex + 4); i++) {
+      if (msgs[i]?.role === "toolResult" && msgs[i]?.toolCallId === id) {
+        decisions.push({ index: tc.msgIndex, type: "explicit", summary: question.slice(0, TRUNC.DECISION_SUMMARY), userResponse: extractText(msgs[i].content).slice(0, TRUNC.USER_RESPONSE) });
+        break;
+      }
     }
-    batch.push(ch);
-    bt += ch.tokenEstimate;
   }
-  if (batch.length)
-    batches.push(batch);
-  return batches;
-}
-function allocateTopicBudgets(summaries, totalBudget) {
-  const n = summaries.length;
-  if (n === 0)
-    return new Map;
-  const weights = summaries.map((s, i) => {
-    let w = 1;
-    if (s.priority === "critical")
-      w *= 2;
-    else if (s.priority === "high")
-      w *= 1.5;
-    else if (s.priority === "low")
-      w *= 0.6;
-    const errorKeywords = (s.summary.match(/error|fail|bug|fix|crash|exception/gi) ?? []).length;
-    w *= 1 + errorKeywords * 0.2;
-    const recency = (i + 1) / n;
-    w *= 0.6 + recency * 0.4;
-    if (s.keyDecisions.length > 0)
-      w *= 1.3;
-    return w;
-  });
-  const totalWeight = weights.reduce((a, b) => a + b, 0);
-  const baseTokensPerTopic = Math.floor(totalBudget / n);
-  const budgetMap = new Map;
-  for (let i = 0;i < summaries.length; i++) {
-    const allocated = Math.round(baseTokensPerTopic * (weights[i] / (totalWeight / n)));
-    budgetMap.set(summaries[i].topic, Math.max(200, allocated));
+  for (let i = 0;i < msgs.length; i++) {
+    if (msgs[i]?.role !== "user")
+      continue;
+    const txt = extractText(msgs[i].content);
+    if (CHOICE_RE.test(txt)) {
+      decisions.push({ index: i, type: "implicit", summary: txt.slice(0, TRUNC.DECISION_SUMMARY) });
+    }
   }
-  return budgetMap;
-}
-function preProcessSummaries(summaries, budgetTokens) {
-  const topicBudgets = budgetTokens ? allocateTopicBudgets(summaries, budgetTokens) : null;
-  return {
-    decisions: [...new Set(summaries.flatMap((s) => s.keyDecisions))],
-    modified: [...new Set(summaries.flatMap((s) => s.filesModified))].sort(),
-    read: [...new Set(summaries.flatMap((s) => s.filesRead))].sort(),
-    text: summaries.map((cs, i) => {
-      const budgetHint = topicBudgets?.get(cs.topic);
-      const budgetLine = budgetHint ? `
-Budget: ~` + budgetHint + " tokens" : "";
-      return "### Segment " + (i + 1) + ": " + cs.topic + `
-Priority: ` + cs.priority + " | msgs " + cs.startIndex + "-" + cs.endIndex + budgetLine + `
-
-` + cs.summary + `
-
-Decisions: ` + (cs.keyDecisions.join("; ") || "None") + `
-Modified: ` + (cs.filesModified.join(", ") || "None") + `
-Read: ` + (cs.filesRead.join(", ") || "None");
-    }).join(`
----
-`)
-  };
-}
-function buildExtractionContext(extraction, forRange) {
-  const files = forRange ? extraction.modifiedFiles.filter((f) => f.lastModifiedIndex >= forRange.start && f.lastModifiedIndex <= forRange.end) : extraction.modifiedFiles;
-  const errors = forRange ? extraction.errors.filter((e) => e.index >= forRange.start && e.index <= forRange.end) : extraction.errors;
-  const media = forRange ? (extraction.mediaAttachments ?? []).filter((a) => a.index >= forRange.start && a.index <= forRange.end) : extraction.mediaAttachments ?? [];
-  return [
-    "## Deterministic Extraction (verified facts)",
-    "Files modified: " + (files.map((f) => f.path).join(", ") || "none"),
-    "Errors: " + (errors.map((e) => "[" + e.tool + "] " + e.message.slice(0, 80) + (e.resolved ? " \u2713" : "")).join("; ") || "none"),
-    "Decisions: " + (extraction.decisions.map((d) => d.type + ": " + d.summary.slice(0, 60)).join("; ") || "none"),
-    "Constraints: " + (extraction.constraints.map((c) => "[" + c.category + "] " + c.text.slice(0, 60)).join("; ") || "none"),
-    "Media attachments: " + (media.map((a) => a.kind + (a.name ? ":" + a.name : "") + (a.mimeType ? " (" + a.mimeType + ")" : "") + " @msg" + a.index).join("; ") || "none")
-  ].join(`
-`);
+  return decisions;
 }
-function computeToolCharPercentage(branchEntries) {
-  let totalChars = 0;
-  let toolChars = 0;
-  for (const raw of branchEntries) {
-    const m = raw?.message;
-    if (!m)
+var CONSTRAINT_PATTERNS = [
+  { re: /\b(?:must|need|require|has to|important)\b.*\b(?:be|use|have|include|support)\b/i, cat: "requirement", conf: TUNING.CONFIDENCE_HIGH },
+  { re: /\b(?:don't|never|avoid|shouldn't|must not|do not|no\s+(?:need|want))\b/i, cat: "prohibition", conf: TUNING.CONFIDENCE_MEDIUM },
+  { re: /\b(?:prefer|like|want|would rather|should)\b.*\b(?:use|be|have|with)\b/i, cat: "preference", conf: TUNING.CONFIDENCE_LOW },
+  { re: /(?<![A-Za-z0-9_])(?:kritik|kritikal|\u00F6nemli|onemli|\u015Fart|sart|zorunlu|\u015Fart ko\u015Ful|\u00F6nemli \u015Fart|kesinlikle|kesinlikle \u015Fart|asla|sak\u0131n|sak\u0131nha|bunu yapma|b\u00F6yle olsun|b\u00F6yle yap\u0131n|\u015F\u00F6yle olsun|\u015F\u00F6yle yap\u0131n)(?![A-Za-z0-9_])/iu, cat: "requirement", conf: TUNING.CONFIDENCE_MEDIUM },
+  { re: /(?<![A-Za-z0-9_])(?:yapma|kullanma|sak\u0131n|asla\s+(?:kullanma|yapma|getirme))(?![A-Za-z0-9_])/iu, cat: "prohibition", conf: TUNING.CONFIDENCE_MEDIUM },
+  { re: /(?<![A-Za-z0-9_])(?:tercih|isterim|olsun|kullanal\u0131m|yapal\u0131m|istiyorum)(?![A-Za-z0-9_])/iu, cat: "preference", conf: TUNING.CONFIDENCE_LOW }
+];
+function mineConstraints(msgs) {
+  const constraints = [];
+  for (let i = 0;i < msgs.length; i++) {
+    if (msgs[i]?.role !== "user")
       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 (!part || typeof part !== "object")
-          continue;
-        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;
+    const txt = extractText(msgs[i].content);
+    if (txt.length < 10 || txt.startsWith("/"))
+      continue;
+    for (const { re, cat, conf } of CONSTRAINT_PATTERNS) {
+      if (re.test(txt)) {
+        constraints.push({ index: i, text: txt.slice(0, TRUNC.CONSTRAINT_TEXT), category: cat, confidence: conf });
+        break;
       }
     }
-    totalChars += mc;
-    if (m.role === "toolResult")
-      toolChars += mc;
   }
-  return totalChars > 0 ? Math.round(toolChars / totalChars * 100) : 0;
+  return constraints;
 }
-function selectCompactionTier(contextPercent, toolPercent, totalTokens, minThreshold, minContextPercent = 60) {
-  if (totalTokens < minThreshold)
-    return "none";
-  if (contextPercent < minContextPercent)
-    return "none";
-  if (contextPercent < 80)
-    return "light";
-  return "full";
+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];
+    const txt = extractText(m.content);
+    tokenAcc += estimateTokens(txt);
+    let brk = false;
+    if (m.role === "assistant") {
+      const blocks = Array.isArray(m.content) ? m.content : [];
+      for (const b of blocks) {
+        for (const tool of flattenToolCallBlock(b)) {
+          const fp = extractToolPath(tool.arguments);
+          if (!fp)
+            continue;
+          const fn = path3.basename(fp);
+          if (lastFile && fn !== lastFile && tokenAcc > pc.minChunkTokens)
+            brk = true;
+          lastFile = fn;
+          currentPrimaryFile = fp;
+          const toolCls = classifyTool(tool.arguments);
+          if (toolCls === "mutates") {
+            if (currentType !== "implementation")
+              currentType = "implementation";
+          } else if (toolCls === "accesses") {
+            if (currentType === "exploration")
+              currentType = "review";
+          }
+        }
+      }
+    }
+    if (m.role === "toolResult" && m.isError) {
+      errAcc++;
+      if (currentType !== "implementation")
+        currentType = "debugging";
+    }
+    if (m.role === "toolResult" && !m.isError) {
+      const tc = tcIdx.get(m.toolCallId ?? "");
+      if (tc && classifyTool(tc.arguments) === "executes" && /error|fail/i.test(txt)) {
+        errAcc++;
+        if (currentType !== "implementation")
+          currentType = "debugging";
+      }
+    }
+    if (m.role === "user" && SHIFT_RE.test(txt) && tokenAcc > pc.minChunkTokens)
+      brk = true;
+    if (tokenAcc >= pc.maxChunkTokens)
+      brk = true;
+    if (brk && i > startIdx && topics.length < maxSegs - 1) {
+      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: currentPrimaryFile, type: currentType, errorDensity: errAcc });
+  }
+  return topics;
 }
-function inferSessionType(extraction, report) {
-  if (report?.sessionType)
-    return report.sessionType;
-  const hasModifications = extraction.modifiedFiles.length > 0;
-  const hasUnresolvedErrors = extraction.errors.some((e) => !e.resolved);
-  const hasResolvedErrors = extraction.errors.some((e) => e.resolved);
-  const hasReadsOnly = extraction.readFiles.length > 2 && !hasModifications;
-  const hasDecisions = extraction.decisions.length > 0;
-  if (hasUnresolvedErrors && (hasModifications || hasResolvedErrors))
-    return "debugging";
-  if (hasReadsOnly && !hasDecisions)
-    return "review";
-  if (hasDecisions && !hasModifications && !hasUnresolvedErrors)
-    return "discussion";
-  if (hasModifications)
-    return "implementation";
-  return "implementation";
-}
-function buildExplorationContext(report) {
-  if (!report.mainGoal && !report.crossReferences.length && !report.enrichedConstraints.length)
-    return "";
-  return [
-    "## Exploration Report",
-    "Main goal: " + report.mainGoal,
-    "Session type: " + report.sessionType,
-    report.crossReferences.length ? "Cross-references: " + report.crossReferences.join("; ") : "",
-    report.enrichedConstraints.length ? "Enriched constraints: " + report.enrichedConstraints.join("; ") : "",
-    report.statusAssessment.done.length ? "Assessed done: " + report.statusAssessment.done.join("; ") : "",
-    report.statusAssessment.inProgress.length ? "Assessed in-progress: " + report.statusAssessment.inProgress.join("; ") : "",
-    report.criticalContext.length ? "Critical context: " + report.criticalContext.join("; ") : ""
-  ].filter(Boolean).join(`
-`);
-}
-
-// src/index.ts
-init_tokens();
-init_cache();
-
-// src/app/run-smart-compact.ts
-init_overlays();
-init_logger();
-
-// src/app/run-context.ts
-function markMeasuredPhase(rc, phase, startMs, endMs = Date.now()) {
-  rc.phaseTimings.push({ phase, durationMs: Math.max(0, endMs - startMs) });
-  rc.phaseStart = endMs;
-}
-function markPhase(rc, phase) {
-  markMeasuredPhase(rc, phase, rc.phaseStart);
+function buildTimeline(msgs, errors) {
+  const timeline = [];
+  const errorIndices = new Set(errors.map((e) => e.index));
+  for (let i = 0;i < msgs.length; i++) {
+    const m = msgs[i];
+    if (m.role === "user") {
+      const txt = extractText(m.content);
+      if (!txt.startsWith("/"))
+        timeline.push({ index: i, event: "user_request", summary: txt.slice(0, TRUNC.TIMELINE_EVENT) });
+    }
+    if (errorIndices.has(i))
+      timeline.push({ index: i, event: "error", summary: errors.find((e) => e.index === i)?.message.slice(0, TRUNC.TIMELINE_ERROR) ?? "error" });
+  }
+  return timeline.length > 30 ? [...timeline.filter((t) => t.event === "user_request").slice(0, TRUNC.TIMELINE_DISPLAY), ...timeline.filter((t) => t.event === "error")] : timeline;
 }
-function advance(rc, _stage) {
-  return rc;
+function extractMainGoal(msgs) {
+  for (const m of msgs) {
+    if (m?.role !== "user")
+      continue;
+    const txt = extractText(m.content).trim();
+    if (txt && !txt.startsWith("/"))
+      return txt.slice(0, TRUNC.MESSAGE);
+  }
+  return null;
 }
-
-// src/app/run-smart-compact.ts
-init_services();
-
-// src/app/steps/prepare.ts
-init_constants();
-init_tokens();
-init_logger();
-async function prepareRun(rc) {
-  const config = loadConfig();
-  const profileCfg = { ...PROFILES[rc.profile], ...config.profiles?.[rc.profile] ?? {} };
-  const providerCaps = getProviderCaps(rc.summaryModel.provider);
-  const auth = await rc.ctx.modelRegistry.getApiKeyAndHeaders(rc.summaryModel);
-  const segAuth = rc.segModel !== rc.summaryModel ? await rc.ctx.modelRegistry.getApiKeyAndHeaders(rc.segModel) : auth;
-  if (!auth.ok || !auth.apiKey || (!segAuth.ok || !segAuth.apiKey)) {
-    if (!rc.flags.autoTriggered)
-      rc.ctx.ui.notify("Auth failed", "error");
-    return null;
+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 errLower = err.message.toLowerCase();
+    const errFiles = fileNeedles.filter(({ needles }) => needles.some((n) => errLower.includes(n))).map(({ path: path4 }) => path4);
+    loops.push({
+      id: ID_PREFIX.OPEN_LOOP + ++loopId,
+      type: "bugfix",
+      priority: err.retryAttempted ? "high" : "normal",
+      status: "open",
+      summary: err.message.slice(0, TRUNC.OPEN_LOOP_SUMMARY),
+      files: errFiles,
+      sourceIndex: err.index
+    });
   }
-  if (rc.timeoutMs > 0) {
-    rc.cancellation.timeoutId = setTimeout(() => {
-      rc.cancellation.timedOut = true;
-      rc.cancellation.controller.abort();
-      rc.notify("Smart compact auto-trigger exceeded " + rc.timeoutMs + "ms; Pi will use native compact for this run", "warning");
-    }, rc.timeoutMs);
+  const FOLLOWUP_RE = /(?:next\s+(?:step|thing)|todo|action item|follow\s*up|still (?:need|have) to|gotta|yapalim|yapal\u0131m|yapmamiz|yapmam\u0131z|gerekiyor|eklenecek|d\u00FCzeltilecek|duzeltilecek|bitmedi|kaldi|kald\u0131)/iu;
+  for (let idx = 0;idx < msgs.length; idx++) {
+    const msg = msgs[idx];
+    if (msg.role !== "user")
+      continue;
+    const txt = extractText(msg.content);
+    if (txt.length < 10 || txt.startsWith("/"))
+      continue;
+    if (FOLLOWUP_RE.test(txt)) {
+      const isDup = loops.some((l) => Math.abs((l.sourceIndex ?? 0) - idx) < 5);
+      if (!isDup) {
+        loops.push({
+          id: ID_PREFIX.OPEN_LOOP + ++loopId,
+          type: "follow-up",
+          priority: "normal",
+          status: "open",
+          summary: txt.slice(0, TRUNC.OPEN_LOOP_SUMMARY),
+          files: [],
+          sourceIndex: idx
+        });
+      }
+    }
   }
-  debug("prepareRun: profile=" + rc.profile + " model=" + rc.modelLabel);
-  const out = rc;
-  out.config = config;
-  out.profileCfg = profileCfg;
-  out.providerCaps = providerCaps;
-  out.summaryAuth = { apiKey: auth.apiKey, headers: auth.headers };
-  out.segAuth = { apiKey: segAuth.apiKey, headers: segAuth.headers };
-  return advance(out, "_prepared");
-}
-
-// src/app/steps/window.ts
-init_tokens();
-
-// src/utils/extraction.ts
-init_constants();
-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";
-}
-function getToolCallNames(content) {
-  if (!Array.isArray(content))
-    return [];
-  return content.filter(isToolCallBlock).map((b) => b.name);
-}
-function filterToolCalls(content) {
-  if (!Array.isArray(content))
-    return [];
-  return content.filter(isToolCallBlock);
-}
-var KNOWN_METHODS = new Set(["eesv", "single-pass", "heuristic"]);
-var KNOWN_PROFILES = new Set(["light", "balanced", "aggressive"]);
-function isStringArray(v) {
-  return Array.isArray(v) && v.every((x) => typeof x === "string");
-}
-function isValidSmartCompactDetails(d) {
-  if (!d || typeof d !== "object")
-    return false;
-  const r = d;
-  if (!isStringArray(r.modifiedFiles))
-    return false;
-  if (!isStringArray(r.readFiles))
-    return false;
-  if (!isStringArray(r.topics))
-    return false;
-  if (typeof r.method !== "string" || !KNOWN_METHODS.has(r.method))
-    return false;
-  if (typeof r.profile !== "string" || !KNOWN_PROFILES.has(r.profile))
-    return false;
-  if (typeof r.qualityScore !== "number" || !Number.isFinite(r.qualityScore))
-    return false;
-  if (typeof r.totalMessages !== "number" || !Number.isFinite(r.totalMessages))
-    return false;
-  if (r.gaps !== undefined && !isStringArray(r.gaps))
-    return false;
-  if (r.verified !== undefined && typeof r.verified !== "boolean")
-    return false;
-  if (r.backupPath !== undefined && r.backupPath !== null && typeof r.backupPath !== "string")
-    return false;
-  return true;
+  const BLOCKED_RE = /blocked|waiting for|depend|ba[\u011Fg]li|bekliyor|engell/i;
+  for (let idx = 0;idx < msgs.length; idx++) {
+    const msg = msgs[idx];
+    if (msg.role !== "user")
+      continue;
+    const txt = extractText(msg.content);
+    if (BLOCKED_RE.test(txt)) {
+      const isDup = loops.some((l) => Math.abs((l.sourceIndex ?? 0) - idx) < 5);
+      if (!isDup) {
+        loops.push({
+          id: ID_PREFIX.OPEN_LOOP + ++loopId,
+          type: "blocked",
+          priority: "high",
+          status: "open",
+          summary: txt.slice(0, TRUNC.OPEN_LOOP_SUMMARY),
+          files: [],
+          sourceIndex: idx
+        });
+      }
+    }
+  }
+  for (const err of extraction.errors.filter((e) => e.retryAttempted && !e.resolved)) {
+    const exists = loops.some((l) => l.type === "bugfix" && l.sourceIndex === err.index);
+    if (!exists) {
+      loops.push({
+        id: ID_PREFIX.OPEN_LOOP + ++loopId,
+        type: "retry",
+        priority: "high",
+        status: "open",
+        summary: "Retried but unresolved: " + err.message.slice(0, TRUNC.SNIPPET),
+        files: [],
+        sourceIndex: err.index
+      });
+    }
+  }
+  return loops;
 }
-function sanitizeSmartCompactDetails(d) {
-  if (isValidSmartCompactDetails(d))
-    return d;
-  if (!d || typeof d !== "object")
-    return null;
-  const r = d;
-  if (!isStringArray(r.modifiedFiles) || !isStringArray(r.readFiles) || !isStringArray(r.topics))
-    return null;
-  const repaired = {
-    method: KNOWN_METHODS.has(r.method) ? r.method : "heuristic",
-    chunkCount: typeof r.chunkCount === "number" ? r.chunkCount : 0,
-    topics: r.topics,
-    readFiles: r.readFiles,
-    modifiedFiles: r.modifiedFiles,
-    totalMessages: typeof r.totalMessages === "number" ? r.totalMessages : 0,
-    totalTokensSummarized: typeof r.totalTokensSummarized === "number" ? r.totalTokensSummarized : 0,
-    llmCalls: typeof r.llmCalls === "number" ? r.llmCalls : 0,
-    profile: KNOWN_PROFILES.has(r.profile) ? r.profile : "balanced",
-    backupPath: typeof r.backupPath === "string" ? r.backupPath : null,
-    tokensSaved: typeof r.tokensSaved === "number" ? r.tokensSaved : 0,
-    verified: typeof r.verified === "boolean" ? r.verified : false,
-    gaps: isStringArray(r.gaps) ? r.gaps : [],
-    explorationRounds: typeof r.explorationRounds === "number" ? r.explorationRounds : 0,
-    explorationBoundaries: typeof r.explorationBoundaries === "number" ? r.explorationBoundaries : 0,
-    model: typeof r.model === "string" ? r.model : "unknown",
-    qualityScore: typeof r.qualityScore === "number" ? r.qualityScore : 0,
-    tokensBefore: typeof r.tokensBefore === "number" ? r.tokensBefore : 0
+function extractStructured(msgs, pc, precomputedTcIdx) {
+  const tcIdx = precomputedTcIdx ?? buildToolCallIndex(msgs);
+  const { modified, read, deleted } = trackFileOps(msgs, tcIdx);
+  const errors = catalogErrors(msgs, tcIdx);
+  const decisions = extractDecisions(msgs, tcIdx);
+  const constraints = mineConstraints(msgs);
+  const topics = segmentTopicsHeuristic(msgs, pc, 20, tcIdx);
+  const timeline = buildTimeline(msgs, errors);
+  const mediaAttachments = extractMediaAttachments(msgs);
+  const mainGoal = extractMainGoal(msgs);
+  const lastUserMessages = msgs.filter((m) => m.role === "user").slice(-5).map((m) => extractText(m.content));
+  const lastErrors = errors.slice(-3).map((e) => e.message);
+  return {
+    modifiedFiles: modified,
+    readFiles: read,
+    deletedFiles: deleted,
+    errors,
+    decisions,
+    constraints,
+    topics,
+    timeline,
+    mediaAttachments,
+    mainGoal,
+    lastUserMessages,
+    lastErrors,
+    messageCount: msgs.length
   };
-  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);
+// src/utils/helpers.ts
+init_constants();
+var VALID_PROFILES = ["light", "balanced", "aggressive"];
+var PROFILE_NUMERIC_KEYS = ["summaryBudgetTokens", "keepRecentTokens", "minChunkTokens", "maxChunkTokens", "singlePassMaxTokens", "batchMaxTokens"];
+function validateSmartCompactConfig(sc) {
+  if ("profile" in sc && !VALID_PROFILES.includes(sc.profile)) {
+    warn("smart-compact config: invalid profile '" + sc.profile + "', expected light|balanced|aggressive. Using default 'balanced'.");
+    delete sc.profile;
   }
-  for (let j = parts.length - 2;j >= 0; j--) {
-    needles.push(parts.slice(j).join("/"));
+  if ("autoTrigger" in sc && typeof sc.autoTrigger !== "boolean") {
+    warn("smart-compact config: autoTrigger must be boolean, got " + typeof sc.autoTrigger);
+    delete sc.autoTrigger;
   }
-  return needles;
-}
-
-// src/utils/extraction.ts
-var TRUNCATE_RE = /\u2026\u2702\d+$/;
-function isTruncated(content) {
-  return TRUNCATE_RE.test(extractText(content));
-}
-var WRITE_TOOL_HINTS = ["write", "edit", "patch", "create", "append", "update", "apply"];
-var DELETE_TOOL_HINTS = ["delete", "remove", "unlink"];
-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 ?? {}
-      };
-    });
+  if ("backupEnabled" in sc && typeof sc.backupEnabled !== "boolean") {
+    warn("smart-compact config: backupEnabled must be boolean, got " + typeof sc.backupEnabled);
+    delete sc.backupEnabled;
+  }
+  if ("summaryModel" in sc && sc.summaryModel !== null && typeof sc.summaryModel !== "string") {
+    warn("smart-compact config: summaryModel must be string|null, got " + typeof sc.summaryModel);
+    delete sc.summaryModel;
+  }
+  if ("segmentationModel" in sc && sc.segmentationModel !== null && typeof sc.segmentationModel !== "string") {
+    warn("smart-compact config: segmentationModel must be string|null, got " + typeof sc.segmentationModel);
+    delete sc.segmentationModel;
+  }
+  if ("profiles" in sc) {
+    if (typeof sc.profiles !== "object" || sc.profiles === null || Array.isArray(sc.profiles)) {
+      warn("smart-compact config: profiles must be an object, got " + typeof sc.profiles);
+      delete sc.profiles;
+    } else {
+      const profiles = sc.profiles;
+      for (const [profileName, value] of Object.entries(profiles)) {
+        if (!VALID_PROFILES.includes(profileName)) {
+          warn("smart-compact config: ignoring unknown profile override '" + profileName + "'.");
+          delete profiles[profileName];
+          continue;
+        }
+        if (typeof value !== "object" || value === null || Array.isArray(value)) {
+          warn("smart-compact config: profile '" + profileName + "' must be an object.");
+          delete profiles[profileName];
+          continue;
+        }
+        const profileCfg = value;
+        for (const [key, raw] of Object.entries(profileCfg)) {
+          if (!PROFILE_NUMERIC_KEYS.includes(key)) {
+            warn("smart-compact config: ignoring unknown profile key '" + profileName + "." + key + "'.");
+            delete profileCfg[key];
+            continue;
+          }
+          if (typeof raw !== "number" || !Number.isFinite(raw) || raw <= 0 || raw > 1e6) {
+            warn("smart-compact config: profile '" + profileName + "." + key + "' must be a positive finite number.");
+            delete profileCfg[key];
+          }
+        }
+      }
+    }
+  }
+  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;
+    }
+  }
+  if ("minContextPercent" in sc) {
+    const v = sc.minContextPercent;
+    if (typeof v !== "number" || !Number.isFinite(v) || v < 0 || v > 100) {
+      warn("smart-compact config: minContextPercent must be 0\u2013100, got " + v + ". Using default " + DEFAULT_CONFIG.minContextPercent + ".");
+      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;
+    }
   }
-  return [{ name: b.name, id: b.id, arguments: b.arguments }];
-}
-function extractText(content) {
-  if (typeof content === "string")
-    return content;
-  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();
-  if (/image|input_image|image_url/.test(s))
-    return "image";
-  if (/audio/.test(s))
-    return "audio";
-  if (/video/.test(s))
-    return "video";
-  if (/file|document|pdf|attachment/.test(s))
-    return "file";
-  return "unknown";
+var _cfg = null;
+var _cfgMtime = 0;
+var _cfgPath = null;
+function loadConfig() {
+  try {
+    const p = settingsFile();
+    const stat = fs2.statSync(p);
+    if (_cfg && _cfgPath === p && stat.mtimeMs === _cfgMtime)
+      return _cfg;
+    const raw = JSON.parse(fs2.readFileSync(p, "utf-8"));
+    const sc = raw[CONFIG_KEY] ?? raw[CONFIG_KEY_ALT] ?? {};
+    validateSmartCompactConfig(sc);
+    const merged = { ...DEFAULT_CONFIG, ...sc };
+    if (sc.profiles)
+      merged.profiles = { ...PROFILES, ...sc.profiles };
+    if (!merged.backupDir)
+      merged.backupDir = defaultBackupDir();
+    _cfg = merged;
+    _cfgMtime = stat.mtimeMs;
+    _cfgPath = p;
+    return _cfg;
+  } catch (e) {
+    debug("loadConfig: settings.json not found or unreadable, using defaults", e);
+    const fallback = { ...DEFAULT_CONFIG, backupDir: defaultBackupDir() };
+    _cfg = fallback;
+    _cfgPath = null;
+    return fallback;
+  }
 }
-function extractMediaAttachments(msgs) {
-  const out = [];
-  for (let i = 0;i < msgs.length; i++) {
-    const blocks = Array.isArray(msgs[i].content) ? msgs[i].content : [];
-    for (const b of blocks) {
-      if (!b || typeof b !== "object")
-        continue;
-      const rec = b;
-      const type = String(rec.type ?? "");
-      if (type === "text" || type === "toolCall" || type === "tool_use")
-        continue;
-      const mimeType = rec.mimeType ?? rec.mime_type ?? rec.mediaType ?? rec.media_type;
-      const name = rec.name ?? rec.filename ?? rec.fileName ?? rec.title;
-      const sizeBytes = rec.sizeBytes ?? rec.size_bytes ?? rec.size;
-      const source = typeof rec.url === "string" ? "url" : typeof rec.path === "string" ? "path" : typeof rec.data === "string" || typeof rec.base64 === "string" ? "inline" : undefined;
-      const kind = mediaKind(type, mimeType);
-      if (kind !== "unknown" || source || mimeType || name) {
-        out.push({ index: i, kind, mimeType, name, sizeBytes: typeof sizeBytes === "number" ? sizeBytes : undefined, source });
+var _pruneInFlight = new Set;
+function prunePass(dir) {
+  try {
+    const entries = fs2.readdirSync(dir).filter((name) => name.endsWith(".md")).map((name) => {
+      const full = path4.join(dir, name);
+      try {
+        return { full, mtimeMs: fs2.statSync(full).mtimeMs };
+      } catch {
+        return null;
+      }
+    }).filter((v) => v !== null);
+    const now = Date.now();
+    const overAge = entries.filter((e) => now - e.mtimeMs > BACKUP_MAX_AGE_MS);
+    const sorted = entries.sort((a, b) => b.mtimeMs - a.mtimeMs);
+    const overCount = sorted.slice(BACKUP_MAX_FILES);
+    const toRemove = new Set([...overAge, ...overCount].map((e) => e.full));
+    for (const full of toRemove) {
+      try {
+        fs2.unlinkSync(full);
+      } catch (e) {
+        debug("prunePass unlink failed", e);
       }
     }
+  } catch (e) {
+    debug("prunePass scan failed", e);
   }
-  return out;
 }
-function buildToolCallIndex(msgs) {
-  const idx = new Map;
-  for (let i = 0;i < msgs.length; i++) {
-    const m = msgs[i];
-    if (m.role !== "assistant")
-      continue;
-    const blocks = Array.isArray(m.content) ? m.content : [];
-    for (const b of blocks) {
-      if (!isToolCallBlock(b))
+function schedulePruneBackups(dir) {
+  if (_pruneInFlight.has(dir))
+    return;
+  _pruneInFlight.add(dir);
+  queueMicrotask(() => {
+    try {
+      prunePass(dir);
+    } finally {
+      _pruneInFlight.delete(dir);
+    }
+  });
+}
+function backupConversation(convText, sessionId) {
+  try {
+    const cfg = loadConfig();
+    if (!cfg.backupEnabled)
+      return null;
+    const dir = cfg.backupDir;
+    ensureDir(dir);
+    const ts = new Date().toISOString().replace(/[:.]/g, "-");
+    const hash = crypto2.createHash("sha256").update(convText).digest("hex").slice(0, TRUNC.CONV_HASH);
+    const fp = path4.join(dir, sessionId + "-" + ts + "-" + hash + ".md");
+    atomicWriteFileSync(fp, `# Smart Compact Backup
+# Date: ` + new Date().toISOString() + `
+# Session: ` + sessionId + `
+
+` + convText);
+    schedulePruneBackups(dir);
+    return fp;
+  } catch (e) {
+    warn("backupConversation failed", e);
+    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;
-      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)) {
-        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(tool.id || syntheticId, { name: tool.name, arguments: tool.arguments, msgIndex: i });
-        }
-      }
+      const full = path4.join(dir, name);
+      try {
+        const stat = fs2.statSync(full);
+        if (!stat.isFile())
+          continue;
+        const head = fs2.readFileSync(full, "utf-8").split(`
+`).slice(0, TRUNC.BACKUP_PREVIEW_LINES).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 [];
   }
-  return idx;
 }
-function trackFileOps(msgs, _tcIdx) {
-  const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
-  const modMap = new Map;
-  const readSet = new Set;
-  const delSet = new Set;
-  for (let i = 0;i < msgs.length; i++) {
-    const m = msgs[i];
-    if (m.role !== "toolResult" || m.isError)
-      continue;
-    const tc = tcIdx.get(m.toolCallId ?? "");
-    if (!tc)
-      continue;
-    const args = tc.arguments;
-    const filePath = args?.path ?? args?.file_path ?? args?.filePath;
-    if (!filePath)
-      continue;
-    const tool = tc.name.toLowerCase();
-    if (hasToolHint(tool, WRITE_TOOL_HINTS)) {
-      const resultText = extractText(m.content);
-      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 });
-      }
-    } else if (hasToolHint(tool, DELETE_TOOL_HINTS)) {
-      delSet.add(filePath);
-    } else if (hasToolHint(tool, READ_TOOL_HINTS)) {
-      readSet.add(filePath);
-    }
+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 {
-    modified: [...modMap.entries()].map(([p, d]) => ({ path: p, toolCalls: d.toolCalls, lastModifiedIndex: d.lastIdx })),
-    read: [...readSet],
-    deleted: [...delSet]
+    customType: "smart-compact-restore",
+    content: `# Restored pre-compaction context (smart-compact backup)
+Source: ` + source + `
+
+` + content,
+    display: true,
+    details: { source, restoredAt: Date.now() }
   };
 }
-function catalogErrors(msgs, _tcIdx) {
-  const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
-  const errors = [];
-  for (let i = 0;i < msgs.length; i++) {
-    const m = msgs[i];
-    if (m.role !== "toolResult")
+function getPreviousCompactionContext(branch) {
+  const compactions = branch.filter((e) => e.type === "compaction");
+  if (!compactions.length)
+    return "";
+  const last = compactions[compactions.length - 1];
+  const topics = last.details?.topics ?? [];
+  if (!topics.length)
+    return "";
+  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 findLastAnchorIndex(branchEntries) {
+  for (let i = branchEntries.length - 1;i >= 0; i--) {
+    const e = branchEntries[i];
+    if (e?.type !== "message")
       continue;
-    const tc = tcIdx.get(m.toolCallId ?? "");
-    if (m.isError) {
-      errors.push({ index: i, tool: tc?.name ?? "unknown", message: extractText(m.content).slice(0, 500), retryAttempted: false, resolved: false });
+    const msg = e.message;
+    if (msg?.role !== "toolResult")
       continue;
-    }
-    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|^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 });
-      }
+    if (msg?.toolName === "context" && msg?.details?.anchor) {
+      return i;
     }
   }
-  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) {
-          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;
-            }
-          }
-          if (err.retryAttempted)
-            break;
-        }
-        if (err.retryAttempted)
-          break;
-      }
+  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 errors;
+  return Math.max(0, Math.min(msgCount - 1, msgs.length - 1));
 }
-function extractDecisions(msgs, _tcIdx) {
-  const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
-  const decisions = [];
-  for (const [id, tc] of tcIdx) {
-    if (tc.name !== "ask_user")
-      continue;
-    const args = tc.arguments;
-    const question = typeof args === "string" ? args : args?.question ?? args?.prompt ?? "";
-    if (!question)
-      continue;
-    for (let i = tc.msgIndex + 1;i < Math.min(msgs.length, tc.msgIndex + 4); i++) {
-      if (msgs[i]?.role === "toolResult" && msgs[i]?.toolCallId === id) {
-        decisions.push({ index: tc.msgIndex, type: "explicit", summary: question.slice(0, 200), userResponse: extractText(msgs[i].content).slice(0, 300) });
-        break;
+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;
       }
     }
   }
-  for (let i = 0;i < msgs.length; i++) {
-    if (msgs[i]?.role !== "user")
-      continue;
-    const txt = extractText(msgs[i].content);
-    if (CHOICE_RE.test(txt)) {
-      decisions.push({ index: i, type: "implicit", summary: txt.slice(0, 200) });
-    }
-  }
-  return decisions;
-}
-var CONSTRAINT_PATTERNS = [
-  { re: /\b(?:must|need|require|has to|important)\b.*\b(?:be|use|have|include|support)\b/i, cat: "requirement", conf: 0.85 },
-  { re: /\b(?:don't|never|avoid|shouldn't|must not|do not|no\s+(?:need|want))\b/i, cat: "prohibition", conf: 0.8 },
-  { re: /\b(?:prefer|like|want|would rather|should)\b.*\b(?:use|be|have|with)\b/i, cat: "preference", conf: 0.6 },
-  { re: /\b(?:kritik|kritikal|\u00f6nemli|onemli|\u015fart|sart|zorunlu|\u015fart ko\u015ful|\u00f6nemli \u015fart|kesinlikle|kesinlikle \u015fart|asla|sak\u0131n|sak\u0131nha|bunu yapma|b\u00f6yle olsun|b\u00f6yle yap\u0131n|\u015f\u00f6yle olsun|\u015f\u00f6yle yap\u0131n)\b/iu, cat: "requirement", conf: 0.8 },
-  { re: /\b(?:yapma|kullanma|sak\u0131n|asla\s+(?:kullanma|yapma|getirme))\b/iu, cat: "prohibition", conf: 0.8 },
-  { re: /\b(?:tercih|isterim|olsun|kullanal\u0131m|yapal\u0131m|istiyorum)\b/iu, cat: "preference", conf: 0.6 }
-];
-function mineConstraints(msgs) {
-  const constraints = [];
-  for (let i = 0;i < msgs.length; i++) {
-    if (msgs[i]?.role !== "user")
-      continue;
-    const txt = extractText(msgs[i].content);
-    if (txt.length < 10 || txt.startsWith("/"))
-      continue;
-    for (const { re, cat, conf } of CONSTRAINT_PATTERNS) {
-      if (re.test(txt)) {
-        constraints.push({ index: i, text: txt.slice(0, 300), category: cat, confidence: conf });
-        break;
+  if (adjusted <= 0 || adjusted >= msgs.length)
+    return adjusted;
+  const touchedFiles = (msg) => {
+    const m = msg;
+    const blocks = Array.isArray(m?.content) ? m.content : [];
+    const files = new Set;
+    for (const b of blocks) {
+      for (const tc of flattenToolCallBlock(b)) {
+        const fp = extractToolPath(tc.arguments);
+        if (fp)
+          files.add(fp.split("/").pop() ?? fp);
       }
     }
+    return files;
+  };
+  const lastFiles = touchedFiles(msgs[adjusted - 1].message);
+  if (lastFiles.size > 0) {
+    const keptFiles = touchedFiles(msgs[adjusted].message);
+    if ([...lastFiles].some((f) => keptFiles.has(f)))
+      return adjusted - 1;
   }
-  return constraints;
+  return adjusted;
 }
-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];
-    const txt = extractText(m.content);
-    tokenAcc += estimateTokens(txt);
-    let brk = false;
-    let type = "exploration";
-    let primaryFile = null;
-    if (m.role === "assistant") {
-      const blocks = Array.isArray(m.content) ? m.content : [];
-      for (const b of blocks) {
-        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";
+function collectToolCallIds(blocks, msgIndex, out) {
+  for (const b of blocks) {
+    const block = b;
+    if (block?.type === "toolCall") {
+      if (typeof block.id === "string") {
+        out.set(block.id, msgIndex);
+      }
+      const args = block.arguments;
+      if (block.name === "multi_tool_use.parallel" && args && Array.isArray(args.tool_uses)) {
+        for (const nested of args.tool_uses) {
+          const n = nested;
+          if (typeof n.id === "string") {
+            out.set(n.id, msgIndex);
           }
         }
       }
     }
-    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)
-      brk = true;
-    if (tokenAcc >= pc.maxChunkTokens)
-      brk = true;
-    if (brk && i > startIdx && topics.length < maxSegs - 1) {
-      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: currentPrimaryFile, type: currentType, errorDensity: errAcc });
   }
-  return topics;
 }
-function buildTimeline(msgs, errors) {
-  const timeline = [];
-  const errorIndices = new Set(errors.map((e) => e.index));
+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];
-    if (m.role === "user") {
-      const txt = extractText(m.content);
-      if (!txt.startsWith("/"))
-        timeline.push({ index: i, event: "user_request", summary: txt.slice(0, 150) });
+    const m = msgs[i].message;
+    if (m?.role !== "assistant")
+      continue;
+    const blocks = Array.isArray(m?.content) ? m.content : [];
+    collectToolCallIds(blocks, i, tcMap);
+  }
+  let adjusted = keepFrom;
+  let changed = true;
+  const MAX_ITER = msgs.length + 1;
+  let iter = 0;
+  while (changed) {
+    if (++iter > MAX_ITER) {
+      warn("guardToolCallBoundary hit MAX_ITER=" + MAX_ITER + " at adjusted=" + adjusted);
+      break;
+    }
+    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;
+      }
     }
-    if (errorIndices.has(i))
-      timeline.push({ index: i, event: "error", summary: errors.find((e) => e.index === i)?.message.slice(0, 100) ?? "error" });
   }
-  return timeline.length > 30 ? [...timeline.filter((t) => t.event === "user_request").slice(0, 10), ...timeline.filter((t) => t.event === "error")] : timeline;
+  return Math.max(0, Math.min(adjusted, msgs.length));
 }
-function extractMainGoal(msgs) {
-  for (const m of msgs) {
-    if (m?.role !== "user")
-      continue;
-    const txt = extractText(m.content).trim();
-    if (txt && !txt.startsWith("/"))
-      return txt.slice(0, 300);
-  }
-  return null;
+function extractUserNote(args) {
+  const SKIP = new Set(["verbose", "debug", "dry-run", "light", "balanced", "aggressive"]);
+  const tokens = args.trim().split(/\s+/).filter(Boolean);
+  const isOptionToken = (t) => t.startsWith("--") || SKIP.has(t.toLowerCase()) || /^[a-z0-9_.-]+\/[a-z0-9_.:-]+$/i.test(t);
+  const nonFlags = tokens.filter((t) => !isOptionToken(t));
+  return nonFlags.length > 0 ? nonFlags.join(" ") : undefined;
 }
-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 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",
-      priority: err.retryAttempted ? "high" : "normal",
-      status: "open",
-      summary: err.message.slice(0, 120),
-      files: errFiles,
-      sourceIndex: err.index
-    });
-  }
-  const FOLLOWUP_RE = /(?:next\s+(?:step|thing)|todo|action item|follow\s*up|still (?:need|have) to|gotta|yapalim|yapal\u0131m|yapmamiz|yapmam\u0131z|gerekiyor|eklenecek|d\u00FCzeltilecek|duzeltilecek|bitmedi|kaldi|kald\u0131)/iu;
-  for (let idx = 0;idx < msgs.length; idx++) {
-    const msg = msgs[idx];
-    if (msg.role !== "user")
-      continue;
-    const txt = extractText(msg.content);
-    if (txt.length < 10 || txt.startsWith("/"))
-      continue;
-    if (FOLLOWUP_RE.test(txt)) {
-      const isDup = loops.some((l) => Math.abs((l.sourceIndex ?? 0) - idx) < 5);
-      if (!isDup) {
-        loops.push({
-          id: "loop-" + ++loopId,
-          type: "follow-up",
-          priority: "normal",
-          status: "open",
-          summary: txt.slice(0, 120),
-          files: [],
-          sourceIndex: idx
-        });
-      }
+function createBatches(chunks, maxTokens) {
+  const batches = [];
+  let batch = [], bt = 0;
+  for (const ch of chunks) {
+    if (batch.length && bt + ch.tokenEstimate > maxTokens) {
+      batches.push(batch);
+      batch = [];
+      bt = 0;
     }
+    batch.push(ch);
+    bt += ch.tokenEstimate;
   }
-  const BLOCKED_RE = /blocked|waiting for|depend|ba[\u011Fg]li|bekliyor|engell/i;
-  for (let idx = 0;idx < msgs.length; idx++) {
-    const msg = msgs[idx];
-    if (msg.role !== "user")
+  if (batch.length)
+    batches.push(batch);
+  return batches;
+}
+function allocateTopicBudgets(summaries, totalBudget) {
+  const n = summaries.length;
+  if (n === 0)
+    return new Map;
+  const weights = summaries.map((s, i) => {
+    let w = 1;
+    if (s.priority === "critical")
+      w *= 2;
+    else if (s.priority === "high")
+      w *= 1.5;
+    else if (s.priority === "low")
+      w *= 0.6;
+    const errorKeywords = (s.summary.match(/error|fail|bug|fix|crash|exception/gi) ?? []).length;
+    w *= 1 + errorKeywords * 0.2;
+    const recency = (i + 1) / n;
+    w *= 0.6 + recency * 0.4;
+    if (s.keyDecisions.length > 0)
+      w *= 1.3;
+    return w;
+  });
+  const totalWeight = weights.reduce((a, b) => a + b, 0);
+  const baseTokensPerTopic = Math.floor(totalBudget / n);
+  const budgetMap = new Map;
+  for (let i = 0;i < summaries.length; i++) {
+    const allocated = Math.round(baseTokensPerTopic * (weights[i] / (totalWeight / n)));
+    budgetMap.set(summaries[i].topic, Math.max(200, allocated));
+  }
+  return budgetMap;
+}
+function preProcessSummaries(summaries, budgetTokens) {
+  const topicBudgets = budgetTokens ? allocateTopicBudgets(summaries, budgetTokens) : null;
+  return {
+    decisions: [...new Set(summaries.flatMap((s) => s.keyDecisions))],
+    modified: [...new Set(summaries.flatMap((s) => s.filesModified))].sort(),
+    read: [...new Set(summaries.flatMap((s) => s.filesRead))].sort(),
+    text: summaries.map((cs, i) => {
+      const budgetHint = topicBudgets?.get(cs.topic);
+      const budgetLine = budgetHint ? `
+Budget: ~` + budgetHint + " tokens" : "";
+      return "### Segment " + (i + 1) + ": " + cs.topic + `
+Priority: ` + cs.priority + " | msgs " + cs.startIndex + "-" + cs.endIndex + budgetLine + `
+
+` + cs.summary + `
+
+Decisions: ` + (cs.keyDecisions.join("; ") || "None") + `
+Modified: ` + (cs.filesModified.join(", ") || "None") + `
+Read: ` + (cs.filesRead.join(", ") || "None");
+    }).join(`
+---
+`)
+  };
+}
+function buildExtractionContext(extraction, forRange) {
+  const files = forRange ? extraction.modifiedFiles.filter((f) => f.lastModifiedIndex >= forRange.start && f.lastModifiedIndex <= forRange.end) : extraction.modifiedFiles;
+  const errors = forRange ? extraction.errors.filter((e) => e.index >= forRange.start && e.index <= forRange.end) : extraction.errors;
+  const media = forRange ? (extraction.mediaAttachments ?? []).filter((a) => a.index >= forRange.start && a.index <= forRange.end) : extraction.mediaAttachments ?? [];
+  return [
+    "## Deterministic Extraction (verified facts)",
+    "Files modified: " + (files.map((f) => f.path).join(", ") || "none"),
+    "Errors: " + (errors.map((e) => "[" + e.tool + "] " + e.message.slice(0, TRUNC.SNIPPET) + (e.resolved ? " \u2713" : "")).join("; ") || "none"),
+    "Decisions: " + (extraction.decisions.map((d) => d.type + ": " + d.summary.slice(0, TRUNC.DECISION_DETAIL)).join("; ") || "none"),
+    "Constraints: " + (extraction.constraints.map((c) => "[" + c.category + "] " + c.text.slice(0, TRUNC.DECISION_DETAIL)).join("; ") || "none"),
+    "Media attachments: " + (media.map((a) => a.kind + (a.name ? ":" + a.name : "") + (a.mimeType ? " (" + a.mimeType + ")" : "") + " @msg" + a.index).join("; ") || "none")
+  ].join(`
+`);
+}
+function computeToolCharPercentage(branchEntries) {
+  let totalChars = 0;
+  let toolChars = 0;
+  for (const raw of branchEntries) {
+    const m = raw?.message;
+    if (!m)
       continue;
-    const txt = extractText(msg.content);
-    if (BLOCKED_RE.test(txt)) {
-      const isDup = loops.some((l) => Math.abs((l.sourceIndex ?? 0) - idx) < 5);
-      if (!isDup) {
-        loops.push({
-          id: "loop-" + ++loopId,
-          type: "blocked",
-          priority: "high",
-          status: "open",
-          summary: txt.slice(0, 120),
-          files: [],
-          sourceIndex: idx
-        });
+    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 (!part || typeof part !== "object")
+          continue;
+        const block = part;
+        if (block.type === "text" && typeof block.text === "string")
+          mc += block.text.length;
       }
     }
+    totalChars += mc;
+    if (m.role === "toolResult")
+      toolChars += mc;
   }
-  for (const err of extraction.errors.filter((e) => e.retryAttempted && !e.resolved)) {
-    const exists = loops.some((l) => l.type === "bugfix" && l.sourceIndex === err.index);
-    if (!exists) {
-      loops.push({
-        id: "loop-" + ++loopId,
-        type: "retry",
-        priority: "high",
-        status: "open",
-        summary: "Retried but unresolved: " + err.message.slice(0, 80),
-        files: [],
-        sourceIndex: err.index
-      });
-    }
+  return totalChars > 0 ? Math.round(toolChars / totalChars * 100) : 0;
+}
+function selectCompactionTier(contextPercent, toolPercent, totalTokens, minThreshold, minContextPercent = 60) {
+  if (totalTokens < minThreshold)
+    return "none";
+  if (contextPercent < minContextPercent)
+    return "none";
+  if (contextPercent < 80)
+    return "light";
+  return "full";
+}
+function inferSessionType(extraction, report) {
+  if (report?.sessionType)
+    return report.sessionType;
+  const hasModifications = extraction.modifiedFiles.length > 0;
+  const hasUnresolvedErrors = extraction.errors.some((e) => !e.resolved);
+  const hasResolvedErrors = extraction.errors.some((e) => e.resolved);
+  const hasReadsOnly = extraction.readFiles.length > 2 && !hasModifications;
+  const hasDecisions = extraction.decisions.length > 0;
+  if (hasUnresolvedErrors && (hasModifications || hasResolvedErrors))
+    return "debugging";
+  if (hasReadsOnly && !hasDecisions)
+    return "review";
+  if (hasDecisions && !hasModifications && !hasUnresolvedErrors)
+    return "discussion";
+  if (hasModifications)
+    return "implementation";
+  return "implementation";
+}
+function buildExplorationContext(report) {
+  if (!report.mainGoal && !report.crossReferences.length && !report.enrichedConstraints.length)
+    return "";
+  return [
+    "## Exploration Report",
+    "Main goal: " + report.mainGoal,
+    "Session type: " + report.sessionType,
+    report.crossReferences.length ? "Cross-references: " + report.crossReferences.join("; ") : "",
+    report.enrichedConstraints.length ? "Enriched constraints: " + report.enrichedConstraints.join("; ") : "",
+    report.statusAssessment.done.length ? "Assessed done: " + report.statusAssessment.done.join("; ") : "",
+    report.statusAssessment.inProgress.length ? "Assessed in-progress: " + report.statusAssessment.inProgress.join("; ") : "",
+    report.criticalContext.length ? "Critical context: " + report.criticalContext.join("; ") : ""
+  ].filter(Boolean).join(`
+`);
+}
+
+// src/index.ts
+init_tokens();
+init_cache();
+
+// src/app/run-smart-compact.ts
+init_overlays();
+init_logger();
+
+// src/app/run-context.ts
+function markMeasuredPhase(rc, phase, startMs, endMs = Date.now()) {
+  rc.phaseTimings.push({ phase, durationMs: Math.max(0, endMs - startMs) });
+  rc.phaseStart = endMs;
+}
+function markPhase(rc, phase) {
+  markMeasuredPhase(rc, phase, rc.phaseStart);
+}
+function advance(rc, _stage) {
+  return rc;
+}
+
+// src/app/run-smart-compact.ts
+init_services();
+
+// src/app/steps/prepare.ts
+init_constants();
+init_tokens();
+init_logger();
+async function prepareRun(rc) {
+  const config = loadConfig();
+  const profileCfg = { ...PROFILES[rc.profile], ...config.profiles?.[rc.profile] ?? {} };
+  const providerCaps = getProviderCaps(rc.summaryModel.provider);
+  const auth = await rc.ctx.modelRegistry.getApiKeyAndHeaders(rc.summaryModel);
+  const segAuth = rc.segModel !== rc.summaryModel ? await rc.ctx.modelRegistry.getApiKeyAndHeaders(rc.segModel) : auth;
+  if (!auth.ok || !auth.apiKey || (!segAuth.ok || !segAuth.apiKey)) {
+    if (!rc.flags.autoTriggered)
+      rc.ctx.ui.notify("Auth failed", "error");
+    return null;
   }
-  return loops;
-}
-function extractStructured(msgs, pc, precomputedTcIdx) {
-  const tcIdx = precomputedTcIdx ?? buildToolCallIndex(msgs);
-  const { modified, read, deleted } = trackFileOps(msgs, tcIdx);
-  const errors = catalogErrors(msgs, tcIdx);
-  const decisions = extractDecisions(msgs, tcIdx);
-  const constraints = mineConstraints(msgs);
-  const topics = segmentTopicsHeuristic(msgs, pc, 20, tcIdx);
-  const timeline = buildTimeline(msgs, errors);
-  const mediaAttachments = extractMediaAttachments(msgs);
-  const mainGoal = extractMainGoal(msgs);
-  const lastUserMessages = msgs.filter((m) => m.role === "user").slice(-5).map((m) => extractText(m.content));
-  const lastErrors = errors.slice(-3).map((e) => e.message);
-  return {
-    modifiedFiles: modified,
-    readFiles: read,
-    deletedFiles: deleted,
-    errors,
-    decisions,
-    constraints,
-    topics,
-    timeline,
-    mediaAttachments,
-    mainGoal,
-    lastUserMessages,
-    lastErrors,
-    messageCount: msgs.length
-  };
+  if (rc.timeoutMs > 0) {
+    rc.cancellation.timeoutId = setTimeout(() => {
+      rc.cancellation.timedOut = true;
+      rc.cancellation.controller.abort();
+      rc.notify("Smart compact auto-trigger exceeded " + rc.timeoutMs + "ms; Pi will use native compact for this run", "warning");
+    }, rc.timeoutMs);
+  }
+  debug("prepareRun: profile=" + rc.profile + " model=" + rc.modelLabel);
+  const out = rc;
+  out.config = config;
+  out.profileCfg = profileCfg;
+  out.providerCaps = providerCaps;
+  out.summaryAuth = { apiKey: auth.apiKey, headers: auth.headers };
+  out.segAuth = { apiKey: segAuth.apiKey, headers: segAuth.headers };
+  return advance(out, "_prepared");
 }
 
+// src/app/steps/window.ts
+init_tokens();
+
 // src/infra/session-identity.ts
 import { randomUUID } from "crypto";
 var UNRESOLVED_PREFIX = "unresolved:";
@@ -2947,6 +3213,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";
@@ -3059,17 +3333,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;
@@ -3100,7 +3376,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);
       }
@@ -3148,7 +3424,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) {
@@ -3203,9 +3479,9 @@ function pruneRedundant(msgs, precomputedTcIdx) {
     if (msgs[i2].role !== "toolResult")
       continue;
     const tc = tcIdx.get(msgs[i2].toolCallId ?? "");
-    if (!tc || tc.name !== "read")
+    if (!tc || classifyTool(tc.arguments) !== "accesses")
       continue;
-    const fp = tc?.arguments?.path ?? tc?.arguments?.file_path;
+    const fp = extractToolPath(tc.arguments);
     if (!fp)
       continue;
     const arr = readIndices.get(fp) ?? [];
@@ -3284,7 +3560,8 @@ function pruneRedundant(msgs, precomputedTcIdx) {
       originalTokens += estimateTokens(text);
     if (!keep.has(idx))
       continue;
-    if (m.role === "toolResult" && text.length > MAX_TOOL_OUTPUT_CHARS) {
+    const protectFromTruncation = m.role === "toolResult" && text.length > MAX_TOOL_OUTPUT_CHARS && text.length < ERROR_SCAN_MAX_LEN && LIKELY_ERROR_RE.test(text);
+    if (m.role === "toolResult" && text.length > MAX_TOOL_OUTPUT_CHARS && !protectFromTruncation) {
       const head = text.slice(0, half);
       const tail = text.slice(-half);
       const truncated = head + `
@@ -3319,7 +3596,7 @@ init_logger();
 init_paths();
 init_fs();
 import path8 from "path";
-import crypto6 from "crypto";
+import crypto5 from "crypto";
 
 // src/infra/git.ts
 init_logger();
@@ -3343,6 +3620,7 @@ function findGitRoot(cwd) {
 }
 
 // src/utils/fingerprint.ts
+init_constants();
 var LANG_MAP = {
   ".ts": "typescript",
   ".tsx": "typescript",
@@ -3382,7 +3660,7 @@ function isProjectPath(filePath) {
   return !NOISE_PATH_RE.test(filePath);
 }
 function hashProjectId(seed) {
-  return "proj-" + crypto6.createHash("sha256").update(seed).digest("hex").slice(0, 12);
+  return ID_PREFIX.PROJECT + crypto5.createHash("sha256").update(seed).digest("hex").slice(0, TRUNC.PROJ_ID_HASH);
 }
 function findGitRoot2(cwd) {
   return findGitRoot(cwd);
@@ -3423,11 +3701,11 @@ function deriveFromRelativePaths(paths) {
   for (const p of paths) {
     const segs = p.split("/").filter(Boolean);
     if (segs.length >= 2) {
-      const d2 = segs.slice(0, 2).join("/");
+      const d2 = segs.slice(0, TRUNC.FINGERPRINT_SEG).join("/");
       dir2Counts.set(d2, (dir2Counts.get(d2) ?? 0) + 1);
     }
   }
-  const stableDirs = [...dir2Counts.entries()].sort((a, b) => b[1] - a[1]).slice(0, 8).map(([d]) => d).sort();
+  const stableDirs = [...dir2Counts.entries()].sort((a, b) => b[1] - a[1]).slice(0, TRUNC.CONV_HASH).map(([d]) => d).sort();
   return hashProjectId(topEntries.join(",") + "|" + stableDirs.join(","));
 }
 function deriveProjectId(cwd, extraction, sessionId) {
@@ -3495,7 +3773,7 @@ function loadProjectFingerprint(projectId) {
   const data = readJsonSync(getFingerprintPath(projectId));
   if (!data)
     return null;
-  if (Date.now() - data.updatedAt > 30 * 24 * 60 * 60 * 1000)
+  if (Date.now() - data.updatedAt > THIRTY_DAYS_MS)
     return null;
   return data;
 }
@@ -3551,7 +3829,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);
@@ -3622,6 +3900,7 @@ function extractWithCache(rc) {
 init_overlays();
 
 // src/phases/explore.ts
+import { Type } from "typebox";
 init_constants();
 init_cache();
 init_tokens();
@@ -3644,32 +3923,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) {
@@ -3680,7 +3959,7 @@ function executeExplorationTool(call, llmMessages) {
       return JSON.stringify(llmMessages.slice(s, e).map((m, i) => ({
         idx: s + i,
         role: m?.role,
-        preview: extractText(m?.content).slice(0, 150),
+        preview: extractText(m?.content).slice(0, TRUNC.PREVIEW),
         toolCalls: getToolCallNames(m?.content),
         isError: m?.isError
       })));
@@ -3703,7 +3982,7 @@ function executeExplorationTool(call, llmMessages) {
       return JSON.stringify(matches.map(({ idx, m }) => ({
         idx,
         role: m?.role,
-        preview: extractText(m?.content).slice(0, 150)
+        preview: extractText(m?.content).slice(0, TRUNC.PREVIEW)
       })));
     }
     case "get_recent_user_messages": {
@@ -3716,7 +3995,7 @@ function executeExplorationTool(call, llmMessages) {
       return JSON.stringify(llmMessages.slice(s, e).map((m, i) => ({
         idx: s + i,
         role: m?.role,
-        text: extractText(m?.content).slice(0, 300),
+        text: extractText(m?.content).slice(0, TRUNC.DETAIL),
         toolCalls: getToolCallNames(m?.content),
         isError: m?.isError
       })));
@@ -3728,22 +4007,16 @@ function executeExplorationTool(call, llmMessages) {
         const tcs = filterToolCalls(llmMessages[i]?.content);
         for (const block of tcs) {
           const a = block.arguments ?? {};
-          const fileFields = [
-            a.path,
-            a.file,
-            a.filePath,
-            a.file_path
-          ].filter((v) => typeof v === "string").map((v) => v.toLowerCase());
+          const fileFields = [a.path, a.file, a.filePath, a.file_path].filter((v) => typeof v === "string").map((v) => v.toLowerCase());
           const matchesPath = fileFields.some((f) => f.includes(target));
-          if (block.name === "edit" && matchesPath) {
-            results.push({ idx: i, role: "assistant", toolCall: "edit", args: block.arguments, preview: extractText(llmMessages[i]?.content).slice(0, 400) });
-          }
-          if (block.name === "write" && matchesPath) {
-            results.push({ idx: i, role: "assistant", toolCall: "write", preview: extractText(llmMessages[i]?.content).slice(0, 400) });
+          if (classifyTool(block.arguments) === "mutates" && matchesPath) {
+            const surgical = a.oldText != null || a.newText != null || a.edits != null || a.patch != null;
+            const preview = extractText(llmMessages[i]?.content).slice(0, TRUNC.PREVIEW_LONG);
+            results.push(surgical ? { idx: i, role: "assistant", toolCall: block.name ?? "mutates", args: block.arguments, preview } : { idx: i, role: "assistant", toolCall: block.name ?? "mutates", preview });
           }
         }
       }
-      return JSON.stringify(results.slice(0, 15) || [{ info: "No edits found for: " + args.path }]);
+      return JSON.stringify(results.slice(0, TRUNC.EXPLORE_RESULTS) || [{ info: "No edits found for: " + args.path }]);
     }
     case "get_error_chain": {
       const errIdx = args.index ?? 0;
@@ -3752,7 +4025,7 @@ function executeExplorationTool(call, llmMessages) {
       return JSON.stringify(llmMessages.slice(s, e).map((m, i) => ({
         idx: s + i,
         role: m?.role,
-        text: extractText(m?.content).slice(0, 500),
+        text: extractText(m?.content).slice(0, TRUNC.PREVIEW_XL),
         isError: m?.isError,
         toolCalls: getToolCallNames(m?.content)
       })));
@@ -3785,40 +4058,53 @@ function parseExplorationReport(text, llmMessages) {
   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))
-      })) };
+      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, TRUNC.TOPIC_LABEL),
+      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) {
@@ -3841,12 +4127,12 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
     "Main goal: " + (extraction.mainGoal ?? "unknown"),
     "Files modified (" + extraction.modifiedFiles.length + "): " + (extraction.modifiedFiles.map((f) => f.path).join(", ") || "none"),
     "Files read (" + extraction.readFiles.length + "): " + (extraction.readFiles.join(", ") || "none"),
-    "Errors (" + extraction.errors.length + "): " + (extraction.errors.map((e) => "[" + e.tool + "] " + e.message.slice(0, 80) + (e.resolved ? " (resolved)" : e.retryAttempted ? " (retry attempted)" : "")).join("; ") || "none"),
-    "Decisions (" + extraction.decisions.length + "): " + (extraction.decisions.map((d) => d.type + ": " + d.summary.slice(0, 80)).join("; ") || "none"),
-    "Constraints (" + extraction.constraints.length + "): " + (extraction.constraints.map((cc) => "[" + cc.category + "] " + cc.text.slice(0, 80)).join("; ") || "none"),
+    "Errors (" + extraction.errors.length + "): " + (extraction.errors.map((e) => "[" + e.tool + "] " + e.message.slice(0, TRUNC.SNIPPET) + (e.resolved ? " (resolved)" : e.retryAttempted ? " (retry attempted)" : "")).join("; ") || "none"),
+    "Decisions (" + extraction.decisions.length + "): " + (extraction.decisions.map((d) => d.type + ": " + d.summary.slice(0, TRUNC.SNIPPET)).join("; ") || "none"),
+    "Constraints (" + extraction.constraints.length + "): " + (extraction.constraints.map((cc) => "[" + cc.category + "] " + cc.text.slice(0, TRUNC.SNIPPET)).join("; ") || "none"),
     "Heuristic topics (" + extraction.topics.length + "): " + (extraction.topics.map((t) => "[" + t.startIndex + "-" + t.endIndex + "] " + t.type).join("; ") || "none"),
-    extraction.lastUserMessages.length ? "Last user messages: " + extraction.lastUserMessages.map((m) => m.slice(0, 100)).join(" | ") : "",
-    extraction.lastErrors.length ? "Last errors: " + extraction.lastErrors.map((e) => e.slice(0, 100)).join(" | ") : ""
+    extraction.lastUserMessages.length ? "Last user messages: " + extraction.lastUserMessages.map((m) => m.slice(0, TRUNC.TOPIC_LABEL)).join(" | ") : "",
+    extraction.lastErrors.length ? "Last errors: " + extraction.lastErrors.map((e) => e.slice(0, TRUNC.TOPIC_LABEL)).join(" | ") : ""
   ].filter(Boolean).join(`
 `);
   const userContent = `Explore this conversation and produce the structured report.
@@ -3886,7 +4172,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);
@@ -3920,7 +4206,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() });
@@ -3961,7 +4247,7 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
   return { report, rounds: 1, toolSupported: supportsTools };
 }
 async function explorationRetry(model, auth, llmMessages, extraction, prevSummary, userNote, signal, services) {
-  const last5 = llmMessages.slice(-5).map((m) => "[" + m?.role + "] " + extractText(m?.content).slice(0, 150)).join(`
+  const last5 = llmMessages.slice(-5).map((m) => "[" + m?.role + "] " + extractText(m?.content).slice(0, TRUNC.PREVIEW)).join(`
 `);
   const retryPrompt = `IMPORTANT: Output ONLY valid raw JSON. No markdown. No explanation. No code fences. Just the JSON object.
 
@@ -3987,10 +4273,10 @@ User steering: ` + userNote : "");
   }
 }
 async function directExploration(llmMessages, extraction, model, auth, prevSummary, userNote, signal, services) {
-  const first3 = llmMessages.filter((m) => m?.role === "user").slice(0, 3).map((m) => extractText(m?.content).slice(0, 200)).join(`
+  const first3 = llmMessages.filter((m) => m?.role === "user").slice(0, 3).map((m) => extractText(m?.content).slice(0, TRUNC.PREVIEW_MID)).join(`
 ---
 `);
-  const last30 = llmMessages.slice(-30).map((m) => "[" + m?.role + "] " + extractText(m?.content).slice(0, 300)).join(`
+  const last30 = llmMessages.slice(-30).map((m) => "[" + m?.role + "] " + extractText(m?.content).slice(0, TRUNC.DETAIL)).join(`
 `);
   const prompt = `Analyze this conversation and produce a JSON report.
 
@@ -3999,9 +4285,9 @@ First user messages:
 
 Deterministic data:
 ` + "- Files modified: " + (extraction.modifiedFiles.map((f) => f.path).join(", ") || "none") + `
-- Errors: ` + (extraction.errors.map((e) => e.message.slice(0, 80)).join("; ") || "none") + `
-- Decisions: ` + (extraction.decisions.map((d) => d.summary.slice(0, 80)).join("; ") || "none") + `
-- Constraints: ` + (extraction.constraints.map((c) => c.text.slice(0, 80)).join("; ") || "none") + `
+- Errors: ` + (extraction.errors.map((e) => e.message.slice(0, TRUNC.SNIPPET)).join("; ") || "none") + `
+- Decisions: ` + (extraction.decisions.map((d) => d.summary.slice(0, TRUNC.SNIPPET)).join("; ") || "none") + `
+- Constraints: ` + (extraction.constraints.map((c) => c.text.slice(0, TRUNC.SNIPPET)).join("; ") || "none") + `
 
 Last 30 messages:
 ` + last30 + (prevSummary ? `
@@ -4114,7 +4400,7 @@ Session-specific instructions:
 async function summarizeBatch(batch, extraction, model, auth, signal, services) {
   const range = { start: batch[0].startIndex, end: batch[batch.length - 1].endIndex };
   const extractionCtx = buildExtractionContext(extraction, range);
-  const activeDecisions = extraction.decisions.filter((d) => d.index < range.start).map((d) => "- " + d.summary.slice(0, 120) + (d.userResponse ? " \u2192 " + d.userResponse.slice(0, 60) : ""));
+  const activeDecisions = extraction.decisions.filter((d) => d.index < range.start).map((d) => "- " + d.summary.slice(0, TRUNC.OPEN_LOOP_SUMMARY) + (d.userResponse ? " \u2192 " + d.userResponse.slice(0, TRUNC.DECISION_DETAIL) : ""));
   const decisionCtx = activeDecisions.length ? `
 ## Active Decisions from previous segments (honour these):
 ` + activeDecisions.join(`
@@ -4124,8 +4410,8 @@ async function summarizeBatch(batch, extraction, model, auth, signal, services)
     return "--- CHUNK " + id + ": " + ch.topic + " (" + ch.priority + `) ---
 ` + ch.messages.map((m) => {
       const role = m?.role ?? "unknown";
-      const content = extractText(m?.content).slice(0, 500);
-      const toolCalls = filterToolCalls(m?.content).map((tc) => tc.name + " " + JSON.stringify(tc.arguments).slice(0, 300)).join("; ");
+      const content = extractText(m?.content).slice(0, TRUNC.PREVIEW_XL);
+      const toolCalls = filterToolCalls(m?.content).map((tc) => tc.name + " " + JSON.stringify(tc.arguments).slice(0, TRUNC.DETAIL)).join("; ");
       const toolSuffix = toolCalls ? `
 [tool_calls] ` + toolCalls : "";
       return "[" + role + "] " + content + toolSuffix;
@@ -4167,9 +4453,9 @@ async function summarizeBatch(batch, extraction, model, auth, signal, services)
     const prio = f("Priority").toLowerCase();
     const sectionFallback = sec.split(`
 `).slice(1).join(`
-`).trim().slice(0, 500);
-    const chunkFallback = ch.messages.map((m) => "[" + (m?.role ?? "unknown") + "] " + extractText(m?.content).slice(0, 180)).join(`
-`).slice(0, 500);
+`).trim().slice(0, TRUNC.PREVIEW_XL);
+    const chunkFallback = ch.messages.map((m) => "[" + (m?.role ?? "unknown") + "] " + extractText(m?.content).slice(0, TRUNC.CHUNK_FALLBACK)).join(`
+`).slice(0, TRUNC.PREVIEW_XL);
     return {
       topic: ch.topic,
       startIndex: ch.startIndex,
@@ -4206,18 +4492,18 @@ function assembleFallback(summaries, extraction) {
     extraction.mainGoal ?? "See topics below.",
     "",
     "## Constraints & Preferences",
-    ...extraction.constraints.map((c) => "- [" + c.category + "] " + c.text.slice(0, 200)),
+    ...extraction.constraints.map((c) => "- [" + c.category + "] " + c.text.slice(0, TRUNC.PREVIEW_MID)),
     "",
     "## Progress",
     "### Done",
     "- See topics below",
     "### In Progress",
-    ...summaries.filter((s) => s.priority === "high").map((s) => "- [ ] " + s.summary.slice(0, 150)),
+    ...summaries.filter((s) => s.priority === "high").map((s) => "- [ ] " + s.summary.slice(0, TRUNC.PREVIEW)),
     "### Blocked",
     "- None",
     "",
     "## Key Decisions",
-    ...extraction.decisions.map((d) => "- **" + d.summary.slice(0, 100) + "**" + (d.userResponse ? " \u2192 " + d.userResponse : "")),
+    ...extraction.decisions.map((d) => "- **" + d.summary.slice(0, TRUNC.TOPIC_LABEL) + "**" + (d.userResponse ? " \u2192 " + d.userResponse : "")),
     "",
     "## Files Modified",
     ...detModified.map((f) => "- " + f),
@@ -4229,13 +4515,26 @@ function assembleFallback(summaries, extraction) {
     "1. See topics below",
     "",
     "## Critical Context",
-    ...extraction.errors.filter((e) => !e.resolved).map((e) => "- Unresolved error: " + e.message.slice(0, 100)),
+    ...extraction.errors.filter((e) => !e.resolved).map((e) => "- Unresolved error: " + e.message.slice(0, TRUNC.TOPIC_LABEL)),
     "",
     "## Topics Covered",
-    ...summaries.map((s) => "- **" + s.topic + "** [" + s.priority + "]: " + s.summary.slice(0, 200))
+    ...summaries.map((s) => "- **" + s.topic + "** [" + s.priority + "]: " + s.summary.slice(0, TRUNC.PREVIEW_MID))
   ].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, TRUNC.DETAIL),
+    keyDecisions: [],
+    filesModified: [],
+    filesRead: [],
+    priority: ch.priority
+  };
+}
 
 // src/app/steps/synthesize.ts
 init_constants();
@@ -4354,10 +4653,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);
@@ -4434,19 +4738,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();
@@ -4639,6 +4930,16 @@ function appendToSection(summary, kind, text, fallbackBody = "") {
 ` : "") + text.trim());
 }
 
+// src/domain/keywords.ts
+function extractCheckKeywords(text, max) {
+  const words = text.split(/\s+/).map((w) => w.replace(/^[^\p{L}\p{N}]+|[^\p{L}\p{N}]+$/gu, "")).filter((w) => w.length > 3);
+  if (!words.length)
+    return [];
+  const salient = (w) => /^[A-Z\u00C0-\u00DE]/.test(w) || /[0-9]/.test(w);
+  const preferred = words.filter(salient);
+  return (preferred.length ? preferred : words).slice(0, max);
+}
+
 // src/phases/verify.ts
 function verifySummary(summary, extraction) {
   const parsed = parseSummary(summary);
@@ -4670,22 +4971,22 @@ function verifySummary(summary, extraction) {
     }
   }
   for (const e of extraction.errors.filter((e2) => !e2.resolved)) {
-    const snippet = e.message.slice(0, 30).toLowerCase();
+    const snippet = e.message.trim().replace(/\s+/g, " ").slice(0, TRUNC.ERROR_SNIPPET).toLowerCase();
     if (snippet.length > 5 && !lower.includes(snippet)) {
-      gaps.push("Missing error: " + e.message.slice(0, 80));
+      gaps.push("Missing error: " + e.message.slice(0, TRUNC.SNIPPET));
       score -= 5;
     }
   }
   for (const c of extraction.constraints.filter((c2) => c2.confidence >= 0.8)) {
-    const keywords = c.text.split(/\s+/).filter((w) => w.length > 4).slice(0, 3);
+    const keywords = extractCheckKeywords(c.text, 3);
     const found = keywords.some((k) => lower.includes(k.toLowerCase()));
     if (!found && keywords.length > 0) {
-      gaps.push("Missing constraint: " + c.text.slice(0, 100));
+      gaps.push("Missing constraint: " + c.text.slice(0, TRUNC.TOPIC_LABEL));
       score -= 3;
     }
   }
   if (extraction.mainGoal) {
-    const goalWords = extraction.mainGoal.split(/\s+/).filter((w) => w.length > 3).slice(0, 4);
+    const goalWords = extractCheckKeywords(extraction.mainGoal, 4);
     const goalFound = goalWords.some((w) => lower.includes(w.toLowerCase()));
     if (!goalFound) {
       gaps.push("Main goal may be missing from summary");
@@ -4728,9 +5029,9 @@ function verifySummary(summary, extraction) {
     const decisionSection = findSection(parsed, "decisions");
     const decisionBody = decisionSection?.body.toLowerCase() ?? "";
     for (const d of highConfDecisions) {
-      const keywords = d.summary.split(/\s+/).filter((w) => w.length > 4).slice(0, 3);
+      const keywords = extractCheckKeywords(d.summary, 3);
       if (keywords.length > 0 && !keywords.some((k) => decisionBody.includes(k.toLowerCase()))) {
-        gaps.push("Missing decision: " + d.summary.slice(0, 100));
+        gaps.push("Missing decision: " + d.summary.slice(0, TRUNC.TOPIC_LABEL));
         score -= 3;
       }
     }
@@ -4909,7 +5210,7 @@ function loadCompactionState(projectId) {
         updatedAt = 0;
       }
     }
-    if (Date.now() - updatedAt > 7 * 24 * 60 * 60 * 1000)
+    if (Date.now() - updatedAt > SEVEN_DAYS_MS)
       return null;
   }
   return data;
@@ -4918,17 +5219,18 @@ function buildCompactionState(extraction, openLoops, report, nextActions, critic
   let decisionId = 0;
   let constraintId = 0;
   let errorId = 0;
+  const fileNeedles = extraction.modifiedFiles.map((f) => ({ path: f.path, needles: buildPathNeedles(f.path) }));
   return {
     goal: extraction.mainGoal,
     decisions: extraction.decisions.map((d) => ({
-      id: "decision-" + ++decisionId,
-      summary: d.summary.slice(0, 200),
-      ...d.userResponse ? { userResponse: d.userResponse.slice(0, 300) } : {},
+      id: ID_PREFIX.DECISION + ++decisionId,
+      summary: d.summary.slice(0, TRUNC.DECISION_SUMMARY),
+      ...d.userResponse ? { userResponse: d.userResponse.slice(0, TRUNC.USER_RESPONSE) } : {},
       type: d.type
     })),
     constraints: extraction.constraints.map((c) => ({
       id: "constraint-" + ++constraintId,
-      text: c.text.slice(0, 300),
+      text: c.text.slice(0, TRUNC.CONSTRAINT_TEXT),
       category: c.category,
       confidence: c.confidence
     })),
@@ -4936,17 +5238,18 @@ 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 match = fileNeedles.find(({ needles }) => needles.some((n) => msgLower.includes(n)));
       return {
-        id: "error-" + ++errorId,
-        message: e.message.slice(0, 300),
+        id: ID_PREFIX.ERROR + ++errorId,
+        message: e.message.slice(0, TRUNC.MESSAGE),
         tool: e.tool,
-        files: bn ? [bn.path] : []
+        files: match ? [match.path] : []
       };
     }),
     resolvedErrors: extraction.errors.filter((e) => e.resolved).map((e) => ({
-      id: "error-" + ++errorId,
-      message: e.message.slice(0, 300),
+      id: ID_PREFIX.ERROR + ++errorId,
+      message: e.message.slice(0, TRUNC.MESSAGE),
       tool: e.tool
     })),
     openLoops,
@@ -4976,28 +5279,28 @@ function injectOpenLoopsSection(summary, openLoops) {
   return renderSummary(updated);
 }
 function computeDelta(prev, current) {
-  const prevDecisionTexts = new Set(prev.decisions.map((d) => d.summary.toLowerCase().slice(0, 60)));
-  const currDecisionTexts = new Set(current.decisions.map((d) => d.summary.toLowerCase().slice(0, 60)));
-  const newDecisions = current.decisions.filter((d) => !prevDecisionTexts.has(d.summary.toLowerCase().slice(0, 60))).map((d) => d.summary);
-  const removedDecisions = prev.decisions.filter((d) => !currDecisionTexts.has(d.summary.toLowerCase().slice(0, 60))).map((d) => d.summary);
-  const prevLoopSummaries = new Map(prev.openLoops.map((l) => [l.summary.toLowerCase().slice(0, 50), l]));
-  const currLoopSummaries = new Map(current.openLoops.map((l) => [l.summary.toLowerCase().slice(0, 50), l]));
+  const key = (s) => s.toLowerCase().replace(/\s+/g, " ").trim();
+  const prevDecisionTexts = new Set(prev.decisions.map((d) => key(d.summary)));
+  const currDecisionTexts = new Set(current.decisions.map((d) => key(d.summary)));
+  const newDecisions = current.decisions.filter((d) => !prevDecisionTexts.has(key(d.summary))).map((d) => d.summary);
+  const removedDecisions = prev.decisions.filter((d) => !currDecisionTexts.has(key(d.summary))).map((d) => d.summary);
+  const prevLoopSummaries = new Map(prev.openLoops.map((l) => [key(l.summary), l]));
+  const currLoopKeys = new Set(current.openLoops.map((l) => key(l.summary)));
   const resolvedLoops = [];
   const persistentLoops = [];
-  for (const [key, loop] of prevLoopSummaries) {
-    if (currLoopSummaries.has(key)) {
+  for (const [k, loop] of prevLoopSummaries) {
+    if (currLoopKeys.has(k))
       persistentLoops.push(loop.summary);
-    } else {
+    else
       resolvedLoops.push(loop.summary);
-    }
   }
-  const newLoops = current.openLoops.filter((l) => !prevLoopSummaries.has(l.summary.toLowerCase().slice(0, 50))).map((l) => l.summary);
+  const newLoops = current.openLoops.filter((l) => !prevLoopSummaries.has(key(l.summary))).map((l) => l.summary);
   const prevFiles = new Set(prev.modifiedFiles);
   const newModifiedFiles = current.modifiedFiles.filter((f) => !prevFiles.has(f));
-  const prevErrorMsgs = new Set(prev.unresolvedErrors.map((e) => e.message.toLowerCase().slice(0, 40)));
-  const currErrorMsgs = new Set(current.unresolvedErrors.map((e) => e.message.toLowerCase().slice(0, 40)));
-  const resolvedErrors = prev.unresolvedErrors.filter((e) => !currErrorMsgs.has(e.message.toLowerCase().slice(0, 40))).map((e) => e.message);
-  const newErrors = current.unresolvedErrors.filter((e) => !prevErrorMsgs.has(e.message.toLowerCase().slice(0, 40))).map((e) => e.message);
+  const prevErrorMsgs = new Set(prev.unresolvedErrors.map((e) => key(e.message)));
+  const currErrorMsgs = new Set(current.unresolvedErrors.map((e) => key(e.message)));
+  const resolvedErrors = prev.unresolvedErrors.filter((e) => !currErrorMsgs.has(key(e.message))).map((e) => e.message);
+  const newErrors = current.unresolvedErrors.filter((e) => !prevErrorMsgs.has(key(e.message))).map((e) => e.message);
   const goalChanged = prev.goal !== current.goal && prev.goal !== null && current.goal !== null;
   return {
     newDecisions,
@@ -5018,22 +5321,22 @@ function formatDeltaSection(delta) {
     lines.push("- **Goal shifted**: " + (delta.previousGoal ?? "?") + " \u2192 see current goal above");
   }
   if (delta.resolvedLoops.length) {
-    lines.push("- **Resolved loops**: " + delta.resolvedLoops.map((s) => "~~" + s.slice(0, 60) + "~~").join(", "));
+    lines.push("- **Resolved loops**: " + delta.resolvedLoops.map((s) => "~~" + s.slice(0, TRUNC.DECISION_DETAIL) + "~~").join(", "));
   }
   if (delta.persistentLoops.length) {
-    lines.push("- **Still open**: " + delta.persistentLoops.map((s) => s.slice(0, 60)).join("; "));
+    lines.push("- **Still open**: " + delta.persistentLoops.map((s) => s.slice(0, TRUNC.DECISION_DETAIL)).join("; "));
   }
   if (delta.newLoops.length) {
-    lines.push("- **New loops**: " + delta.newLoops.map((s) => s.slice(0, 60)).join("; "));
+    lines.push("- **New loops**: " + delta.newLoops.map((s) => s.slice(0, TRUNC.DECISION_DETAIL)).join("; "));
   }
   if (delta.newDecisions.length) {
-    lines.push("- **New decisions**: " + delta.newDecisions.map((s) => s.slice(0, 80)).join("; "));
+    lines.push("- **New decisions**: " + delta.newDecisions.map((s) => s.slice(0, TRUNC.SNIPPET)).join("; "));
   }
   if (delta.resolvedErrors.length) {
-    lines.push("- **Resolved errors**: " + delta.resolvedErrors.map((s) => s.slice(0, 60)).join("; "));
+    lines.push("- **Resolved errors**: " + delta.resolvedErrors.map((s) => s.slice(0, TRUNC.DECISION_DETAIL)).join("; "));
   }
   if (delta.newErrors.length) {
-    lines.push("- **New errors**: " + delta.newErrors.map((s) => s.slice(0, 60)).join("; "));
+    lines.push("- **New errors**: " + delta.newErrors.map((s) => s.slice(0, TRUNC.DECISION_DETAIL)).join("; "));
   }
   if (delta.newModifiedFiles.length) {
     lines.push("- **New files touched**: " + delta.newModifiedFiles.join(", "));
@@ -5055,81 +5358,38 @@ function injectDeltaSection(summary, delta) {
   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) {
-  const match = summary.match(/## Next Steps\s*\n([\s\S]*?)(?=##|$)/);
-  if (!match)
+  const section = findSection(summary, "next-steps");
+  if (!section)
     return [];
-  return match[1].split(`
+  return section.body.split(`
 `).map((l) => l.replace(/^\d+\.\s*/, "").trim()).filter((l) => l.length > 0);
 }
 function extractCriticalContext(summary) {
-  const match = summary.match(/## Critical Context\s*\n([\s\S]*?)(?=##|$)/);
-  if (!match)
+  const section = findSection(summary, "critical-context");
+  if (!section)
     return [];
-  return match[1].split(`
+  return section.body.split(`
 `).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();
 init_fs();
+init_constants();
 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,
@@ -5137,6 +5397,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++) {
@@ -5145,8 +5406,8 @@ function detectDamage(postMessages, details) {
     if (msg.role === "assistant") {
       const blocks = Array.isArray(msg.content) ? msg.content : [];
       for (const b of blocks) {
-        if (isToolCallBlock(b) && (b.name === "read" || b.name === "bash")) {
-          const fp = b.arguments?.path ?? b.arguments?.file_path;
+        if (isToolCallBlock(b) && classifyTool(b.arguments) === "accesses") {
+          const fp = extractToolPath(b.arguments);
           if (fp) {
             const fpLower = fp.toLowerCase();
             if (compactedFiles.has(fpLower) || compactedReadFiles.has(fpLower)) {
@@ -5155,6 +5416,8 @@ function detectDamage(postMessages, details) {
                 severity: "medium",
                 detail: "Agent re-read compacted file: " + fp
               });
+              if (!reReadFiles.includes(fp))
+                reReadFiles.push(fp);
             }
           }
         }
@@ -5166,18 +5429,18 @@ function detectDamage(postMessages, details) {
           signals.push({
             type: "user-complaint",
             severity: "high",
-            detail: 'User complaint after compaction: "' + text.slice(0, 100) + '"'
+            detail: 'User complaint after compaction: "' + text.slice(0, TRUNC.TOPIC_LABEL) + '"'
           });
           break;
         }
       }
       for (const t of details.topics) {
-        const topicWords = t.toLowerCase().split(/\s+/).filter((w) => w.length > 4).slice(0, 3);
-        if (topicWords.length >= 2 && topicWords.some((w) => text.includes(w))) {
+        const topicWords = extractCheckKeywords(t, 3);
+        if (topicWords.length > 0 && topicWords.some((w) => text.includes(w.toLowerCase()))) {
           signals.push({
             type: "re-question",
             severity: "low",
-            detail: "User mentions compacted topic: " + t.slice(0, 80)
+            detail: "User mentions compacted topic: " + t.slice(0, TRUNC.SNIPPET)
           });
         }
       }
@@ -5206,7 +5469,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) {
@@ -5226,6 +5490,92 @@ function logDamageReport(sessionId, report, details) {
     warn("logDamageReport failed", e);
   }
 }
+var REMEDIATION_TTL_MS = SEVEN_DAYS_MS;
+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";
@@ -5236,7 +5586,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];
@@ -5252,6 +5602,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);
   }
@@ -5461,8 +5814,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");
@@ -5571,40 +5932,35 @@ function unwrapConsumed(result, ctx) {
       return null;
   }
 }
-function resolveModelArg(ctx, modelArg) {
-  const [p, ...r] = modelArg.split("/");
+function findModelById(ctx, modelId) {
+  const [p, ...r] = modelId.split("/");
   return ctx.modelRegistry.find(p, r.join("/"));
 }
 function resolveModels(ctx, primary, config) {
   const fallback = primary ?? ctx.model;
   const available = ctx.modelRegistry.getAvailable();
   let sumModel = fallback;
-  const configuredSumModels = [config.summaryModel].filter(Boolean);
-  for (const modelId of configuredSumModels) {
-    const [p, ...r] = modelId.split("/");
-    const found = ctx.modelRegistry.find(p, r.join("/"));
-    if (found) {
+  if (config.summaryModel) {
+    const found = findModelById(ctx, config.summaryModel);
+    if (found)
       sumModel = found;
-      break;
-    }
   }
   if (sumModel === fallback && !fallback)
     sumModel = available[0];
   let segModel = sumModel;
   if (config.segmentationModel) {
-    const [p, ...r] = config.segmentationModel.split("/");
-    segModel = ctx.modelRegistry.find(p, r.join("/")) ?? sumModel;
+    segModel = findModelById(ctx, config.segmentationModel) ?? sumModel;
   }
   return { segModel, sumModel };
 }
 function smartCompactExtension(pi) {
-  const PENDING_TTL_MS = 5 * 60 * 1000;
+  const PENDING_TTL_MS = FIVE_MINUTES_MS;
   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) => {
@@ -5633,6 +5989,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;
@@ -5661,7 +6059,7 @@ function smartCompactExtension(pi) {
           await runSmartCompact({ ctx, summaryModel: sumModel2, segModel: segModel2 ?? sumModel2, profile: selected.profile, pendingRef, isRunning, force: true });
           return;
         }
-        const { segModel, sumModel } = resolveModels(ctx, modelArg ? resolveModelArg(ctx, modelArg) : ctx.model, loadConfig());
+        const { segModel, sumModel } = resolveModels(ctx, modelArg ? findModelById(ctx, modelArg) : ctx.model, loadConfig());
         if (!sumModel) {
           ctx.ui.notify("Could not resolve model", "error");
           return;