@proxysoul/soulforge 2.16.5 → 2.17.0

package/dist/index.js

@@ -45146,7 +45146,17 @@ class SessionManager {
     const updatedTabs = updatedTabsRaw.map((t) => {
       let msgs;
       if (t.id === tabMeta.id) {
-        msgs = messages;
+        if (tabIdx >= 0) {
+          const prevRange = oldTabs[tabIdx]?.messageRange;
+          const priorSlice = prevRange ? existingAllMessages.slice(prevRange.startLine, prevRange.endLine) : [];
+          if (messages.length < priorSlice.length) {
+            msgs = priorSlice;
+          } else {
+            msgs = messages;
+          }
+        } else {
+          msgs = messages;
+        }
       } else {
         const prevRange = t.messageRange;
         msgs = existingAllMessages.slice(prevRange.startLine, prevRange.endLine);
@@ -45195,6 +45205,97 @@ class SessionManager {
       await rename(coreTmp, corePath);
     }
   }
+  async pruneTabsNotIn(sessionId, keepIds) {
+    const sessionDir = join10(this.dir, sessionId);
+    const metaPath = join10(sessionDir, "meta.json");
+    if (!existsSync9(metaPath))
+      return;
+    const prev = this.saveChains.get(sessionId) ?? Promise.resolve();
+    const next = prev.catch(() => {}).then(async () => {
+      let meta3;
+      try {
+        meta3 = JSON.parse(readFileSync9(metaPath, "utf-8"));
+      } catch {
+        return;
+      }
+      const keptTabs = meta3.tabs.filter((t) => keepIds.has(t.id));
+      if (keptTabs.length === meta3.tabs.length)
+        return;
+      const jsonlPath = join10(sessionDir, "messages.jsonl");
+      const allMessages = [];
+      if (existsSync9(jsonlPath)) {
+        const content = readFileSync9(jsonlPath, "utf-8").trim();
+        if (content) {
+          for (const line of content.split(`
+`)) {
+            if (!line.trim())
+              continue;
+            try {
+              allMessages.push(JSON.parse(line));
+            } catch {
+              break;
+            }
+          }
+        }
+      }
+      const rebuiltAll = [];
+      const updatedTabs = keptTabs.map((t) => {
+        const { startLine, endLine } = t.messageRange;
+        const slice = allMessages.slice(startLine, endLine);
+        const newStart = rebuiltAll.length;
+        for (const m of slice)
+          rebuiltAll.push(m);
+        return { ...t, messageRange: { startLine: newStart, endLine: rebuiltAll.length } };
+      });
+      const updatedMeta = { ...meta3, tabs: updatedTabs, updatedAt: Date.now() };
+      const corePath = join10(sessionDir, "core.json");
+      let updatedCore = null;
+      if (existsSync9(corePath)) {
+        try {
+          const coreData = JSON.parse(readFileSync9(corePath, "utf-8"));
+          updatedCore = {};
+          for (const id of keepIds) {
+            if (coreData[id])
+              updatedCore[id] = coreData[id];
+          }
+        } catch {
+          updatedCore = null;
+        }
+      }
+      const lines = rebuiltAll.map((m) => JSON.stringify(m)).join(`
+`);
+      const suffix = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+      const metaTmp = `${metaPath}.${suffix}.tmp`;
+      const jsonlTmp = `${jsonlPath}.${suffix}.tmp`;
+      await writeFile(metaTmp, JSON.stringify(updatedMeta, null, 2), {
+        encoding: "utf-8",
+        mode: 384
+      });
+      await writeFile(jsonlTmp, lines ? `${lines}
+` : "", {
+        encoding: "utf-8",
+        mode: 384
+      });
+      await rename(jsonlTmp, jsonlPath);
+      await rename(metaTmp, metaPath);
+      if (updatedCore) {
+        const coreTmp = `${corePath}.${suffix}.tmp`;
+        await writeFile(coreTmp, JSON.stringify(updatedCore), {
+          encoding: "utf-8",
+          mode: 384
+        });
+        await rename(coreTmp, corePath);
+      }
+    });
+    this.saveChains.set(sessionId, next);
+    try {
+      await next;
+    } finally {
+      if (this.saveChains.get(sessionId) === next) {
+        this.saveChains.delete(sessionId);
+      }
+    }
+  }
 }
 var init_manager = __esm(() => {
   init_errors();
@@ -64339,7 +64440,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@proxysoul/soulforge",
-    version: "2.16.5",
+    version: "2.17.0",
     description: "Graph-powered code intelligence \u2014 multi-agent coding with codebase-aware AI",
     repository: {
       type: "git",
@@ -97616,7 +97717,7 @@ Speak once, at the end. Exceptions: (a) destructive/irreversible action needs co
 
 Reasoning is unchanged \u2014 think as deeply as the task needs, internally. Compression applies to OUTPUT only.
 
-Commit boundary \u2014 when a turn uses 2+ tool calls (parallel batches count), call \`set_lockin({on:false})\` as the last tool immediately before the final answer. Skip on zero/one-tool turns. Never call before another tool.
+Commit boundary \u2014 when a turn uses 2+ tool calls (parallel batches count), the LAST tool call before your final answer text MUST be \`set_lockin({on:false})\`. Sequence is strict: [last real tool] \u2192 [set_lockin({on:false})] \u2192 [final answer text]. Never write prose, then call lockin \u2014 by then the answer is already streaming and the marker arrives too late. Skip lockin entirely on zero/one-tool turns.
 </tool_loop>
 
 <answer_voice>
@@ -98494,6 +98595,19 @@ var init_hooks = __esm(() => {
   init_tool_names();
 });
 
+// src/core/utils/hash.ts
+function hash32(s) {
+  let h = 2166136261;
+  for (let i2 = 0;i2 < s.length; i2++) {
+    h ^= s.charCodeAt(i2);
+    h = Math.imul(h, 16777619);
+  }
+  return h >>> 0;
+}
+function hash32Hex(s) {
+  return hash32(s).toString(16).padStart(8, "0");
+}
+
 // src/core/memory/embedder.ts
 var exports_embedder = {};
 __export(exports_embedder, {
@@ -98562,18 +98676,10 @@ function charNgrams(text2, n) {
     out2.push(compact.slice(i2, i2 + n));
   return out2;
 }
-function hashToken(token) {
-  let h = 2166136261;
-  for (let i2 = 0;i2 < token.length; i2++) {
-    h ^= token.charCodeAt(i2);
-    h = Math.imul(h, 16777619);
-  }
-  return h >>> 0;
-}
 function project(vec, token, weight, dim) {
-  const h = hashToken(token);
+  const h = hash32(token);
   const bin = h % dim;
-  const sign = (hashToken(`s:${token}`) & 1) === 0 ? 1 : -1;
+  const sign = (hash32(`s:${token}`) & 1) === 0 ? 1 : -1;
   vec[bin] = (vec[bin] ?? 0) + sign * weight;
 }
 function embed2(text2, dim = EMBED_DIM) {
@@ -99215,6 +99321,9 @@ ${normalize(details)}`;
     }
   }
   close() {
+    try {
+      this.db.run("PRAGMA optimize");
+    } catch {}
     this.db.close();
   }
   findDuplicates() {
@@ -99536,6 +99645,32 @@ ${normalize(details)}`;
       }
     } catch {}
   }
+  topCategoriesByPath(paths) {
+    const out2 = new Map;
+    if (paths.length === 0)
+      return out2;
+    const placeholders = paths.map(() => "?").join(",");
+    const rows = this.db.query(`SELECT mf.path, m.category, m.pinned
+         FROM memories m
+         JOIN memory_files mf ON mf.memory_id = m.id
+         WHERE mf.path IN (${placeholders}) AND m.hidden = 0`).all(...paths);
+    const priority = { gotcha: 4, pref: 3, decision: 2, context: 1 };
+    for (const r of rows) {
+      const cur = out2.get(r.path);
+      if (!cur) {
+        out2.set(r.path, { category: r.category, count: 1, pinned: r.pinned });
+        continue;
+      }
+      cur.count += 1;
+      if (r.pinned > cur.pinned)
+        cur.pinned = r.pinned;
+      const a = cur.category ? priority[cur.category] ?? 0 : 0;
+      const b = r.category ? priority[r.category] ?? 0 : 0;
+      if (b > a)
+        cur.category = r.category;
+    }
+    return out2;
+  }
 }
 function normalize(s) {
   return s.replace(/\s+/g, " ").trim().toLowerCase();
@@ -100322,16 +100457,25 @@ var init_cache = () => {};
 
 // src/core/intelligence/types.ts
 function detectLanguageFromPath(file2) {
-  const dot = file2.lastIndexOf(".");
-  if (dot === -1) {
-    const name38 = file2.slice(file2.lastIndexOf("/") + 1);
-    if (name38 === "Dockerfile" || name38.startsWith("Dockerfile."))
-      return "dockerfile";
+  const slash = file2.lastIndexOf("/");
+  const base = (slash === -1 ? file2 : file2.slice(slash + 1)).toLowerCase();
+  const bare = BARE_FILENAME_TO_LANGUAGE[base];
+  if (bare)
+    return bare;
+  if (base.startsWith("dockerfile."))
+    return "dockerfile";
+  if (base.startsWith("containerfile."))
+    return "dockerfile";
+  if (base.startsWith("makefile."))
+    return "makefile";
+  if (base.startsWith("justfile."))
+    return "just";
+  const dot = base.lastIndexOf(".");
+  if (dot === -1)
     return "unknown";
-  }
-  return EXT_TO_LANGUAGE[file2.slice(dot).toLowerCase()] ?? "unknown";
+  return EXT_TO_LANGUAGE[base.slice(dot)] ?? "unknown";
 }
-var EXT_TO_LANGUAGE;
+var EXT_TO_LANGUAGE, BARE_FILENAME_TO_LANGUAGE;
 var init_types2 = __esm(() => {
   EXT_TO_LANGUAGE = {
     ".ts": "typescript",
@@ -100385,7 +100529,35 @@ var init_types2 = __esm(() => {
     ".toml": "toml",
     ".yaml": "yaml",
     ".yml": "yaml",
+    ".xml": "xml",
+    ".md": "markdown",
+    ".markdown": "markdown",
+    ".mdx": "mdx",
+    ".sql": "sql",
+    ".graphql": "graphql",
+    ".gql": "graphql",
+    ".proto": "proto",
+    ".env": "env",
+    ".ini": "ini",
+    ".cfg": "ini",
+    ".conf": "ini",
+    ".properties": "properties",
     ".dockerfile": "dockerfile",
+    ".mk": "makefile",
+    ".nix": "nix",
+    ".hcl": "hcl",
+    ".tf": "hcl",
+    ".tfvars": "hcl",
+    ".bzl": "bazel",
+    ".star": "bazel",
+    ".bazel": "bazel",
+    ".jsonnet": "jsonnet",
+    ".libsonnet": "jsonnet",
+    ".svg": "svg",
+    ".csv": "csv",
+    ".tsv": "csv",
+    ".lock": "lockfile",
+    ".lockb": "lockfile",
     ".vue": "vue",
     ".res": "rescript",
     ".resi": "rescript",
@@ -100393,6 +100565,39 @@ var init_types2 = __esm(() => {
     ".tla": "tlaplus",
     ".el": "elisp"
   };
+  BARE_FILENAME_TO_LANGUAGE = {
+    dockerfile: "dockerfile",
+    containerfile: "dockerfile",
+    makefile: "makefile",
+    gnumakefile: "makefile",
+    justfile: "just",
+    ".justfile": "just",
+    build: "bazel",
+    "build.bazel": "bazel",
+    workspace: "bazel",
+    "workspace.bazel": "bazel",
+    "module.bazel": "bazel",
+    ".env": "env",
+    ".gitignore": "ignore",
+    ".dockerignore": "ignore",
+    ".npmignore": "ignore",
+    ".prettierignore": "ignore",
+    ".eslintignore": "ignore",
+    ".editorconfig": "ini",
+    "bun.lock": "lockfile",
+    "bun.lockb": "lockfile",
+    "package-lock.json": "lockfile",
+    "pnpm-lock.yaml": "lockfile",
+    "yarn.lock": "lockfile",
+    "cargo.lock": "lockfile",
+    "poetry.lock": "lockfile",
+    "composer.lock": "lockfile",
+    "gemfile.lock": "lockfile",
+    "go.sum": "lockfile",
+    gemfile: "ruby",
+    rakefile: "ruby",
+    podfile: "ruby"
+  };
 });
 
 // src/core/intelligence/backends/lsp/protocol.ts
@@ -358647,7 +358852,17 @@ var init_forbidden = __esm(() => {
 // src/core/intelligence/repo-map-utils.ts
 import { readdir as readdir2, stat as stat2 } from "fs/promises";
 import { homedir as homedir20 } from "os";
-import { extname as extname2, join as join24, resolve as resolve12 } from "path";
+import { join as join24, resolve as resolve12 } from "path";
+function isIndexablePath(file2) {
+  return detectLanguageFromPath(file2) !== "unknown" || isBareIndexable(file2);
+}
+function isBareIndexable(file2) {
+  const slash = file2.lastIndexOf("/");
+  const base = (slash === -1 ? file2 : file2.slice(slash + 1)).toLowerCase();
+  if (BARE_FILENAME_TO_LANGUAGE[base])
+    return true;
+  return base.startsWith("dockerfile.") || base.startsWith("containerfile.") || base.startsWith("makefile.") || base.startsWith("justfile.");
+}
 function barrelToDir(barrelPath) {
   return barrelPath.replace(BARREL_RE, "");
 }
@@ -358860,8 +359075,7 @@ async function collectFilesViaGit(dir) {
 `)) {
       if (!line)
         continue;
-      const ext = extname2(line).toLowerCase();
-      if (!(ext in INDEXABLE_EXTENSIONS))
+      if (!isIndexablePath(line))
         continue;
       const fullPath = join24(dir, line);
       if (isForbidden(fullPath))
@@ -358888,8 +359102,10 @@ async function collectFilesWalk(dir, depth, counter, out2) {
     for (const entry of await readdir2(dir, { withFileTypes: true })) {
       if (ctx.n >= WALK_FILE_CAP)
         break;
-      if (entry.name.startsWith(".") && entry.name !== ".")
-        continue;
+      if (entry.name.startsWith(".") && entry.name !== ".") {
+        if (!entry.isFile() || !isIndexablePath(entry.name))
+          continue;
+      }
       const fullPath = join24(dir, entry.name);
       if (entry.isDirectory()) {
         if (!IGNORED_DIRS.has(entry.name)) {
@@ -358898,8 +359114,7 @@ async function collectFilesWalk(dir, depth, counter, out2) {
       } else if (entry.isFile()) {
         if (isForbidden(fullPath))
           continue;
-        const ext = extname2(entry.name).toLowerCase();
-        if (ext in INDEXABLE_EXTENSIONS) {
+        if (isIndexablePath(entry.name)) {
           try {
             const s = await stat2(fullPath);
             if (s.size < MAX_FILE_SIZE) {
@@ -358919,84 +359134,35 @@ var INDEXABLE_EXTENSIONS, NON_CODE_LANGUAGES, IMPORT_TRACKABLE_LANGUAGES, BARREL
 var init_repo_map_utils = __esm(() => {
   init_file_tree();
   init_forbidden();
-  INDEXABLE_EXTENSIONS = {
-    ".ts": "typescript",
-    ".tsx": "typescript",
-    ".mts": "typescript",
-    ".cts": "typescript",
-    ".js": "javascript",
-    ".jsx": "javascript",
-    ".mjs": "javascript",
-    ".cjs": "javascript",
-    ".py": "python",
-    ".go": "go",
-    ".rs": "rust",
-    ".java": "java",
-    ".c": "c",
-    ".h": "c",
-    ".cpp": "cpp",
-    ".cc": "cpp",
-    ".cxx": "cpp",
-    ".hpp": "cpp",
-    ".hh": "cpp",
-    ".hxx": "cpp",
-    ".cs": "csharp",
-    ".rb": "ruby",
-    ".php": "php",
-    ".swift": "swift",
-    ".kt": "kotlin",
-    ".kts": "kotlin",
-    ".scala": "scala",
-    ".sc": "scala",
-    ".lua": "lua",
-    ".ex": "elixir",
-    ".exs": "elixir",
-    ".dart": "dart",
-    ".zig": "zig",
-    ".sh": "bash",
-    ".bash": "bash",
-    ".zsh": "bash",
-    ".ml": "ocaml",
-    ".mli": "ocaml",
-    ".m": "objc",
-    ".el": "elisp",
-    ".res": "rescript",
-    ".resi": "rescript",
-    ".sol": "solidity",
-    ".tla": "tlaplus",
-    ".vue": "vue",
-    ".pyw": "python",
-    ".erb": "ruby",
-    ".json": "unknown",
-    ".jsonc": "unknown",
-    ".yaml": "unknown",
-    ".yml": "unknown",
-    ".toml": "unknown",
-    ".xml": "unknown",
-    ".md": "unknown",
-    ".css": "css",
-    ".scss": "css",
-    ".less": "css",
-    ".html": "html",
-    ".htm": "html",
-    ".sql": "unknown",
-    ".graphql": "unknown",
-    ".gql": "unknown",
-    ".proto": "unknown",
-    ".env": "unknown",
-    ".conf": "unknown",
-    ".ini": "unknown",
-    ".cfg": "unknown",
-    ".dockerfile": "unknown"
-  };
+  init_types2();
+  INDEXABLE_EXTENSIONS = EXT_TO_LANGUAGE;
   NON_CODE_LANGUAGES = new Set([
     "unknown",
     "css",
     "html",
     "json",
+    "jsonnet",
     "toml",
     "yaml",
-    "dockerfile"
+    "xml",
+    "markdown",
+    "mdx",
+    "sql",
+    "graphql",
+    "proto",
+    "properties",
+    "ini",
+    "env",
+    "dockerfile",
+    "makefile",
+    "nix",
+    "hcl",
+    "bazel",
+    "just",
+    "svg",
+    "csv",
+    "ignore",
+    "lockfile"
   ]);
   IMPORT_TRACKABLE_LANGUAGES = new Set([
     "typescript",
@@ -359034,9 +359200,9 @@ var init_repo_map_utils = __esm(() => {
 // src/core/intelligence/repo-map.ts
 import { Database as Database2 } from "bun:sqlite";
 import { execSync as execSync6 } from "child_process";
-import { chmodSync as chmodSync3, existsSync as existsSync22, readFileSync as readFileSync16, statSync as statSync3 } from "fs";
+import { chmodSync as chmodSync3, existsSync as existsSync22, readdirSync as readdirSync7, readFileSync as readFileSync16, statSync as statSync3 } from "fs";
 import { stat as statAsync } from "fs/promises";
-import { dirname as dirname8, extname as extname3, join as join25, relative as relative2, resolve as resolve13 } from "path";
+import { dirname as dirname8, extname as extname2, join as join25, relative as relative2, resolve as resolve13 } from "path";
 
 class RepoMap {
   static testFileMatch(alias = "f") {
@@ -359133,6 +359299,7 @@ class RepoMap {
         weight REAL NOT NULL DEFAULT 1.0,
         PRIMARY KEY (source_file_id, target_file_id)
       );
+      CREATE INDEX IF NOT EXISTS idx_edges_target ON edges(target_file_id);
     `);
     this.db.run(`
       CREATE TABLE IF NOT EXISTS refs (
@@ -359363,8 +359530,7 @@ class RepoMap {
         const existing = existingFiles.get(relPath);
         if (existing && existing.mtime_ms === file2.mtimeMs)
           continue;
-        const ext = extname3(file2.path).toLowerCase();
-        const language = INDEXABLE_EXTENSIONS[ext] ?? "unknown";
+        const language = detectLanguageFromPath(file2.path);
         toIndex.push({ absPath: file2.path, relPath, mtime: file2.mtimeMs, language });
       }
       const stale = [...existingFiles.keys()].filter((p) => !currentPaths.has(p));
@@ -359868,7 +360034,7 @@ class RepoMap {
     const candidates = [base];
     if (stripped !== relBase)
       candidates.push(join25(this.cwd, relBase));
-    const ext = extname3(stripped);
+    const ext = extname2(stripped);
     if (!ext) {
       for (const tryExt of Object.keys(INDEXABLE_EXTENSIONS)) {
         candidates.push(base + tryExt);
@@ -360306,15 +360472,18 @@ class RepoMap {
   }
   async computePageRank(personalization) {
     const tick = () => new Promise((r) => setTimeout(r, 1));
-    const files = this.db.query("SELECT id FROM files").all();
+    const files = this.db.query("SELECT id, pagerank, language FROM files").all();
     if (files.length === 0)
       return;
     const n = files.length;
     const idToIdx = new Map;
     const ids = [];
+    const isCode = new Array(n);
     for (const file2 of files) {
-      idToIdx.set(file2.id, ids.length);
+      const idx = ids.length;
+      idToIdx.set(file2.id, idx);
       ids.push(file2.id);
+      isCode[idx] = !NON_CODE_LANGUAGES.has(file2.language);
     }
     const outWeight = new Array(n).fill(0);
     const adj = [];
@@ -360330,34 +360499,51 @@ class RepoMap {
       }
     }
     const pv = new Float64Array(n);
-    const uniform = 1 / n;
+    let codeCount = 0;
+    for (let i2 = 0;i2 < n; i2++)
+      if (isCode[i2])
+        codeCount++;
+    const uniform = codeCount > 0 ? 1 / codeCount : 1 / n;
     if (personalization && personalization.size > 0) {
       let boostSum = 0;
       for (const [fileId, boost] of personalization) {
         const idx = idToIdx.get(fileId);
-        if (idx !== undefined) {
+        if (idx !== undefined && isCode[idx]) {
           pv[idx] = boost;
           boostSum += boost;
         }
       }
       if (boostSum > 0) {
         for (let i2 = 0;i2 < n; i2++) {
-          pv[i2] = 0.7 * uniform + 0.3 * ((pv[i2] ?? 0) / boostSum);
+          pv[i2] = isCode[i2] ? 0.7 * uniform + 0.3 * ((pv[i2] ?? 0) / boostSum) : 0;
         }
       } else {
-        pv.fill(uniform);
+        for (let i2 = 0;i2 < n; i2++)
+          pv[i2] = isCode[i2] ? uniform : 0;
       }
     } else {
-      pv.fill(uniform);
+      for (let i2 = 0;i2 < n; i2++)
+        pv[i2] = isCode[i2] ? uniform : 0;
+    }
+    let priorSum = 0;
+    for (let i2 = 0;i2 < n; i2++)
+      if (isCode[i2])
+        priorSum += files[i2]?.pagerank || 0;
+    let rank = new Float64Array(n);
+    if (priorSum > 0.5 && priorSum < 1.5) {
+      for (let i2 = 0;i2 < n; i2++)
+        rank[i2] = isCode[i2] ? files[i2]?.pagerank ?? uniform : 0;
+    } else {
+      for (let i2 = 0;i2 < n; i2++)
+        rank[i2] = isCode[i2] ? uniform : 0;
     }
-    let rank = new Float64Array(n).fill(1 / n);
     let next = new Float64Array(n);
     for (let iter = 0;iter < PAGERANK_ITERATIONS; iter++) {
       for (let j = 0;j < n; j++)
         next[j] = (1 - PAGERANK_DAMPING) * (pv[j] ?? 0);
       let danglingSum = 0;
       for (let i2 = 0;i2 < n; i2++) {
-        if ((outWeight[i2] ?? 0) === 0)
+        if (isCode[i2] && (outWeight[i2] ?? 0) === 0)
           danglingSum += rank[i2] ?? 0;
       }
       for (let j = 0;j < n; j++) {
@@ -360367,9 +360553,14 @@ class RepoMap {
         const contribution = PAGERANK_DAMPING * (rank[from] ?? 0) * weight / (outWeight[from] ?? 1);
         next[to] = (next[to] ?? 0) + contribution;
       }
+      let delta = 0;
+      for (let i2 = 0;i2 < n; i2++)
+        delta += Math.abs((next[i2] ?? 0) - (rank[i2] ?? 0));
       [rank, next] = [next, rank];
       if (iter % 5 === 4)
         await tick();
+      if (delta < 0.000001)
+        break;
     }
     const update = this.db.prepare("UPDATE files SET pagerank = ? WHERE id = ?");
     const tx = this.db.transaction(() => {
@@ -360382,15 +360573,18 @@ class RepoMap {
     } catch {}
   }
   computePageRankSync(personalization) {
-    const files = this.db.query("SELECT id FROM files").all();
+    const files = this.db.query("SELECT id, pagerank, language FROM files").all();
     if (files.length === 0)
       return;
     const n = files.length;
     const idToIdx = new Map;
     const ids = [];
+    const isCode = new Array(n);
     for (const file2 of files) {
-      idToIdx.set(file2.id, ids.length);
+      const idx = ids.length;
+      idToIdx.set(file2.id, idx);
       ids.push(file2.id);
+      isCode[idx] = !NON_CODE_LANGUAGES.has(file2.language);
     }
     const outWeight = new Array(n).fill(0);
     const adj = [];
@@ -360406,34 +360600,51 @@ class RepoMap {
       }
     }
     const pv = new Float64Array(n);
-    const uniform = 1 / n;
+    let codeCount = 0;
+    for (let i2 = 0;i2 < n; i2++)
+      if (isCode[i2])
+        codeCount++;
+    const uniform = codeCount > 0 ? 1 / codeCount : 1 / n;
     if (personalization && personalization.size > 0) {
       let boostSum = 0;
       for (const [fileId, boost] of personalization) {
         const idx = idToIdx.get(fileId);
-        if (idx !== undefined) {
+        if (idx !== undefined && isCode[idx]) {
           pv[idx] = boost;
           boostSum += boost;
         }
       }
       if (boostSum > 0) {
         for (let i2 = 0;i2 < n; i2++) {
-          pv[i2] = 0.7 * uniform + 0.3 * ((pv[i2] ?? 0) / boostSum);
+          pv[i2] = isCode[i2] ? 0.7 * uniform + 0.3 * ((pv[i2] ?? 0) / boostSum) : 0;
         }
       } else {
-        pv.fill(uniform);
+        for (let i2 = 0;i2 < n; i2++)
+          pv[i2] = isCode[i2] ? uniform : 0;
       }
     } else {
-      pv.fill(uniform);
+      for (let i2 = 0;i2 < n; i2++)
+        pv[i2] = isCode[i2] ? uniform : 0;
+    }
+    let priorSum = 0;
+    for (let i2 = 0;i2 < n; i2++)
+      if (isCode[i2])
+        priorSum += files[i2]?.pagerank || 0;
+    let rank = new Float64Array(n);
+    if (priorSum > 0.5 && priorSum < 1.5) {
+      for (let i2 = 0;i2 < n; i2++)
+        rank[i2] = isCode[i2] ? files[i2]?.pagerank ?? uniform : 0;
+    } else {
+      for (let i2 = 0;i2 < n; i2++)
+        rank[i2] = isCode[i2] ? uniform : 0;
     }
-    let rank = new Float64Array(n).fill(1 / n);
     let next = new Float64Array(n);
     for (let iter = 0;iter < PAGERANK_ITERATIONS; iter++) {
       for (let j = 0;j < n; j++)
         next[j] = (1 - PAGERANK_DAMPING) * (pv[j] ?? 0);
       let danglingSum = 0;
       for (let i2 = 0;i2 < n; i2++) {
-        if ((outWeight[i2] ?? 0) === 0)
+        if (isCode[i2] && (outWeight[i2] ?? 0) === 0)
           danglingSum += rank[i2] ?? 0;
       }
       for (let j = 0;j < n; j++) {
@@ -360443,7 +360654,12 @@ class RepoMap {
         const contribution = PAGERANK_DAMPING * (rank[from] ?? 0) * weight / (outWeight[from] ?? 1);
         next[to] = (next[to] ?? 0) + contribution;
       }
+      let delta = 0;
+      for (let i2 = 0;i2 < n; i2++)
+        delta += Math.abs((next[i2] ?? 0) - (rank[i2] ?? 0));
       [rank, next] = [next, rank];
+      if (delta < 0.000001)
+        break;
     }
     const update = this.db.prepare("UPDATE files SET pagerank = ? WHERE id = ?");
     const tx = this.db.transaction(() => {
@@ -360602,15 +360818,36 @@ class RepoMap {
       "manage.py",
       "src/main/java/Main.java",
       "src/main/kotlin/Main.kt",
+      "src/main/scala/Main.scala",
       "Sources/main.swift",
       "Sources/App.swift",
       "src/main.c",
       "src/main.cpp",
+      "Program.cs",
       "lib/main.dart",
       "lib/application.ex",
       "app.rb",
-      "config.ru"
+      "config.ru",
+      "public/index.php",
+      "artisan",
+      "bin/console",
+      "index.php",
+      "src/main.zig",
+      "build.zig",
+      "app/Main.hs",
+      "src/Main.hs",
+      "Main.hs",
+      "src/Main.elm"
     ];
+    try {
+      const binsDir = join25(this.cwd, "src", "bin");
+      if (existsSync22(binsDir)) {
+        for (const entry of readdirSync7(binsDir)) {
+          if (entry.endsWith(".rs"))
+            commonEntryPoints.push(`src/bin/${entry}`);
+        }
+      }
+    } catch {}
     for (const p of commonEntryPoints) {
       if (existsSync22(join25(this.cwd, p)))
         this.entryPointsCache.push(p);
@@ -360946,7 +361183,7 @@ class RepoMap {
     if (relPath === "package.json" || relPath === "Cargo.toml" || relPath === "go.mod") {
       this.entryPointsCache = null;
     }
-    const ext = extname3(absPath).toLowerCase();
+    const ext = extname2(absPath).toLowerCase();
     const language = INDEXABLE_EXTENSIONS[ext];
     if (!language)
       return;
@@ -361538,10 +361775,14 @@ class RepoMap {
     const blastRadius = this.db.query("SELECT COUNT(DISTINCT source_file_id) AS c FROM edges WHERE target_file_id = ?").get(fileRow.id)?.c ?? 0;
     const symbols = this.db.query(`SELECT s.name, s.kind, s.signature, s.line
          FROM symbols s
+         LEFT JOIN (
+           SELECT callee_symbol_id, COUNT(*) AS c FROM calls
+           WHERE callee_symbol_id IS NOT NULL GROUP BY callee_symbol_id
+         ) cc ON cc.callee_symbol_id = s.id
          WHERE s.file_id = ?
            AND s.is_exported = 1
            AND s.kind IN ('interface','type','class','function','enum','method')
-         ORDER BY s.line
+         ORDER BY COALESCE(cc.c, 0) DESC, s.line ASC
          LIMIT 10`).all(fileRow.id);
     return { blastRadius, symbols };
   }
@@ -361704,7 +361945,7 @@ class RepoMap {
          ORDER BY f.pagerank DESC
          LIMIT ?`).all(limit);
     const trackable = rows.filter((row) => {
-      const ext = extname3(row.path).toLowerCase();
+      const ext = extname2(row.path).toLowerCase();
       const lang = INDEXABLE_EXTENSIONS[ext];
       return lang != null && IMPORT_TRACKABLE_LANGUAGES.has(lang);
     });
@@ -362418,6 +362659,9 @@ class RepoMap {
         this.onError?.(`error awaiting pending flush during close: ${e instanceof Error ? e.message : String(e)}`);
       }
     }
+    try {
+      this.db.run("PRAGMA optimize");
+    } catch {}
     this.db.close();
   }
   metaGet(key) {
@@ -362469,6 +362713,7 @@ var init_repo_map = __esm(() => {
   init_clone_detection();
   init_repo_map_constants();
   init_repo_map_utils();
+  init_types2();
 });
 
 // src/core/intelligence/index.ts
@@ -363142,6 +363387,34 @@ function memoryHintComposite(opts) {
     return "";
   }
 }
+function memoryMarkersForPaths(paths) {
+  const result = new Map;
+  if (!_manager || paths.length === 0)
+    return result;
+  try {
+    const projectDb = _manager.getDbForScope("project");
+    const globalDb = _manager.getDbForScope("global");
+    const project2 = projectDb.topCategoriesByPath(paths);
+    const global2 = globalDb.topCategoriesByPath(paths);
+    const priority = { gotcha: 4, pref: 3, decision: 2, context: 1 };
+    for (const path of paths) {
+      const p = project2.get(path);
+      const g = global2.get(path);
+      if (!p && !g)
+        continue;
+      const count = (p?.count ?? 0) + (g?.count ?? 0);
+      const pinned = (p?.pinned ?? 0) + (g?.pinned ?? 0) > 0;
+      const a = p?.category ? priority[p.category] ?? 0 : 0;
+      const b = g?.category ? priority[g.category] ?? 0 : 0;
+      const category = b > a ? g?.category ?? null : p?.category ?? g?.category ?? null;
+      result.set(path, { category, count, pinned });
+    }
+    return result;
+  } catch (err2) {
+    reportHintError("paths", err2);
+    return result;
+  }
+}
 var _manager = null, GLOBAL_TAB = "__global__", _tabs, _scope, SUMMARY_MAX = 60, COOLDOWN_TURNS = 10, SESSION_BUDGET = 60, SUBAGENT_BUDGET = 10, LOUD_LINES_MAX = 3;
 var init_hints = __esm(() => {
   init_errors();
@@ -363150,6 +363423,10 @@ var init_hints = __esm(() => {
 });
 
 // src/core/tools/file-events.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
+function runWithEditOrigin(origin, fn) {
+  return _editOriginScope.run(origin, fn);
+}
 function onFileEdited(cb) {
   editListeners.add(cb);
   return () => {
@@ -363169,8 +363446,9 @@ function onCacheReset(cb) {
   };
 }
 function emitFileEdited(absPath, content) {
+  const origin = _editOriginScope.getStore() ?? null;
   for (const cb of editListeners)
-    cb(absPath, content);
+    cb(absPath, content, origin);
 }
 function emitFileRead(absPath) {
   for (const cb of readListeners)
@@ -363180,11 +363458,12 @@ function emitCacheReset() {
   for (const cb of cacheResetListeners)
     cb();
 }
-var editListeners, readListeners, cacheResetListeners;
+var editListeners, readListeners, cacheResetListeners, _editOriginScope;
 var init_file_events = __esm(() => {
   editListeners = new Set;
   readListeners = new Set;
   cacheResetListeners = new Set;
+  _editOriginScope = new AsyncLocalStorage2;
 });
 
 // src/core/tools/edit-stack.ts
@@ -383046,7 +383325,7 @@ var init_lib2 = () => {};
 
 // src/core/tools/binary-detect.ts
 import { existsSync as existsSync23, statSync as statSync5 } from "fs";
-import { extname as extname4, resolve as resolve26 } from "path";
+import { extname as extname3, resolve as resolve26 } from "path";
 function binaryHint(ext) {
   if (IMAGE_EXTS.has(ext))
     return " This is an image file. Describe what you need from it or ask the user to describe its contents.";
@@ -383073,7 +383352,7 @@ function checkBinaryFile(filePath) {
       return null;
     if (!isBinaryFileSync(filePath))
       return null;
-    const ext = extname4(filePath).toLowerCase();
+    const ext = extname3(filePath).toLowerCase();
     const sizeStr = stat5.size > 1024 * 1024 ? `${(stat5.size / (1024 * 1024)).toFixed(1)}MB` : `${(stat5.size / 1024).toFixed(0)}KB`;
     return `Cannot read binary file: "${filePath}" (${ext || "no extension"}, ${sizeStr}).${binaryHint(ext)}`;
   } catch {
@@ -383144,7 +383423,7 @@ var init_binary_detect = __esm(() => {
 
 // src/core/tools/read-file.ts
 import { access as access4, stat as statAsync7 } from "fs/promises";
-import { extname as extname5, resolve as resolve27 } from "path";
+import { extname as extname4, resolve as resolve27 } from "path";
 function toRelPath(abs) {
   const cwd2 = process.cwd();
   return abs.startsWith(`${cwd2}/`) ? abs.slice(cwd2.length + 1) : abs;
@@ -383265,7 +383544,7 @@ async function readOnMainThread(filePath, args2) {
     };
   }
   if (await isBinaryFile(filePath)) {
-    const ext = extname5(filePath).toLowerCase();
+    const ext = extname4(filePath).toLowerCase();
     const sizeStr = fileStat.size > 1024 * 1024 ? `${(fileStat.size / (1024 * 1024)).toFixed(1)}MB` : `${(fileStat.size / 1024).toFixed(0)}KB`;
     const hint = binaryHint(ext);
     return {
@@ -383932,7 +384211,7 @@ ${fixed}`);
 
 // src/core/tools/rename-symbol.ts
 import { readFile as readFile17, stat as statAsync9, writeFile as writeFile12 } from "fs/promises";
-import { extname as extname6, resolve as resolve30 } from "path";
+import { extname as extname5, resolve as resolve30 } from "path";
 async function applyEdits2(edits, tabId) {
   for (const edit of edits) {
     const blocked = isForbidden(edit.file);
@@ -383956,7 +384235,7 @@ function getCommentSyntax(filePath) {
       ocamlBlock: false
     };
   }
-  const ext = extname6(filePath).toLowerCase();
+  const ext = extname5(filePath).toLowerCase();
   return {
     hash: HASH_COMMENT_EXTS.has(ext),
     doubleDash: DOUBLE_DASH_EXTS.has(ext),
@@ -384982,7 +385261,7 @@ import {
   writeSync
 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { basename as basename5, extname as extname7, resolve as resolve31 } from "path";
+import { basename as basename5, extname as extname6, resolve as resolve31 } from "path";
 import { inflateSync } from "zlib";
 function _resetKittyVersionCache(override) {
   _kittyVersion = override === undefined ? undefined : override;
@@ -385038,7 +385317,7 @@ function supportsKittyAnimation() {
   return isKittyVersionAtMost(0, 37);
 }
 function isRenderableImage(filePath) {
-  const ext = extname7(filePath).toLowerCase();
+  const ext = extname6(filePath).toLowerCase();
   if (!IMAGE_EXTENSIONS2.has(ext))
     return false;
   try {
@@ -385471,14 +385750,14 @@ var init_tool_progress = __esm(() => {
 import { spawn as spawn12, spawnSync as spawnSync4 } from "child_process";
 import {
   existsSync as existsSync25,
-  readdirSync as readdirSync7,
+  readdirSync as readdirSync8,
   readFileSync as readFileSync18,
   statSync as statSync7,
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync13
 } from "fs";
 import { tmpdir as tmpdir3 } from "os";
-import { basename as basename6, extname as extname8, resolve as resolve32 } from "path";
+import { basename as basename6, extname as extname7, resolve as resolve32 } from "path";
 function safeUnlink2(path) {
   try {
     if (existsSync25(path))
@@ -385567,7 +385846,7 @@ function hasSips() {
 }
 async function resizeImageToTarget(data, name38, targetBytes, signal) {
   const id = `soul-vision-resize-${String(Date.now())}-${String(Math.random()).slice(2, 8)}`;
-  const ext = extname8(name38).toLowerCase() || ".jpg";
+  const ext = extname7(name38).toLowerCase() || ".jpg";
   const srcPath = resolve32(tmpdir3(), `${id}${ext}`);
   const dstPath = resolve32(tmpdir3(), `${id}-resized${ext}`);
   try {
@@ -385773,7 +386052,7 @@ ${INSTALL_FFMPEG}` };
     }
   })();
   const id = `soul-vision-direct-${String(Date.now())}-${String(Math.random()).slice(2, 8)}`;
-  const ext = extname8(urlName).toLowerCase() || ".mp4";
+  const ext = extname7(urlName).toLowerCase() || ".mp4";
   const videoPath = resolve32(tmpdir3(), `${id}${ext}`);
   try {
     progress(toolCallId, "FETCH", `Downloading ${urlName}\u2026`);
@@ -385908,7 +386187,7 @@ async function convertLocalVideo(filePath, displayName, toolCallId, signal) {
     return { error: `Video files require ffmpeg to convert:
 ${INSTALL_FFMPEG}` };
   }
-  const baseName = basename6(displayName, extname8(displayName));
+  const baseName = basename6(displayName, extname7(displayName));
   if (supportsKittyAnimation()) {
     for (let attempt = 0;attempt < 2; attempt++) {
       const gif = await videoToGif(filePath, toolCallId, MAX_GIF_DURATION, signal);
@@ -385927,7 +386206,7 @@ async function ensurePng(data, name38, signal) {
   if (data.length >= 4 && data.subarray(0, 4).equals(PNG_SIGNATURE)) {
     return data;
   }
-  const ext = extname8(name38).toLowerCase() || ".jpg";
+  const ext = extname7(name38).toLowerCase() || ".jpg";
   return convertToPng(data, ext, signal);
 }
 function isGif(data) {
@@ -385966,7 +386245,7 @@ async function extractGifFrames(data, signal) {
       return null;
     const dir = tmpdir3();
     const prefix = `${id}-frame-`;
-    const frameFiles = readdirSync7(dir).filter((f) => f.startsWith(prefix) && f.endsWith(".png")).sort().map((f) => resolve32(dir, f));
+    const frameFiles = readdirSync8(dir).filter((f) => f.startsWith(prefix) && f.endsWith(".png")).sort().map((f) => resolve32(dir, f));
     if (frameFiles.length === 0)
       return null;
     const frames = [];
@@ -385980,7 +386259,7 @@ async function extractGifFrames(data, signal) {
     try {
       const dir = tmpdir3();
       const prefix = `${id}-frame-`;
-      for (const f of readdirSync7(dir)) {
+      for (const f of readdirSync8(dir)) {
         if (f.startsWith(prefix) && f.endsWith(".png")) {
           safeUnlink2(resolve32(dir, f));
         }
@@ -386291,7 +386570,7 @@ var init_show_image = __esm(() => {
 });
 
 // src/core/skills/manager.ts
-import { existsSync as existsSync26, readdirSync as readdirSync8, readFileSync as readFileSync19, realpathSync as realpathSync3, rmSync as rmSync3, statSync as statSync8 } from "fs";
+import { existsSync as existsSync26, readdirSync as readdirSync9, readFileSync as readFileSync19, realpathSync as realpathSync3, rmSync as rmSync3, statSync as statSync8 } from "fs";
 import { homedir as homedir22 } from "os";
 import { dirname as dirname14, join as join30 } from "path";
 async function searchSkills(query2) {
@@ -386372,7 +386651,7 @@ function listInstalledSkills() {
   return [...byName.values()];
 }
 function scanSkillDir(dir, scope, byName, seenPaths) {
-  const entries2 = readdirSync8(dir, { withFileTypes: true });
+  const entries2 = readdirSync9(dir, { withFileTypes: true });
   for (const entry of entries2) {
     if (entry.name.startsWith("."))
       continue;
@@ -386687,7 +386966,7 @@ function execFileAsync(cmd, args2, opts) {
 var init_util3 = () => {};
 
 // src/core/tools/soul-analyze.ts
-import { extname as extname9, relative as relative8 } from "path";
+import { extname as extname8, relative as relative8 } from "path";
 async function identifierFrequency(repoMap, cwd2, name38, limit) {
   if (name38) {
     const symbols = await repoMap.findSymbols(name38);
@@ -386750,7 +387029,7 @@ async function unusedExports(repoMap, cwd2, limit) {
     }
   }
   const canTrackFileImports = (filePath) => {
-    const ext = extname9(filePath).toLowerCase();
+    const ext = extname8(filePath).toLowerCase();
     const lang = INDEXABLE_EXTENSIONS[ext];
     return lang != null && IMPORT_TRACKABLE_LANGUAGES.has(lang);
   };
@@ -391822,14 +392101,25 @@ function buildSubagentExploreTools(opts) {
 }
 function buildEmberExploreTools(opts) {
   const all = buildSubagentExploreTools(opts);
-  const { read, navigate, soul_grep, soul_find, soul_analyze, soul_impact } = all;
+  const {
+    read,
+    navigate,
+    soul_grep,
+    soul_find,
+    soul_analyze,
+    soul_impact,
+    web_search,
+    fetch_page
+  } = all;
   return {
     ...read ? { read } : {},
     ...navigate ? { navigate } : {},
     ...soul_grep ? { soul_grep } : {},
     ...soul_find ? { soul_find } : {},
     ...soul_analyze ? { soul_analyze } : {},
-    ...soul_impact ? { soul_impact } : {}
+    ...soul_impact ? { soul_impact } : {},
+    ...web_search ? { web_search } : {},
+    ...fetch_page ? { fetch_page } : {}
   };
 }
 function buildSubagentCodeTools(opts) {
@@ -402308,7 +402598,11 @@ ${enrichedPrompt}`;
         };
         const parentTabId = models.tabId;
         const parentSurfaced = getSurfacedHintIds(parentTabId);
-        result = await runInSubagentScope(parentSurfaced, () => agent2.generate(generateArgs), parentTabId);
+        result = await runInSubagentScope(parentSurfaced, () => runWithEditOrigin({
+          tabId: parentTabId ?? null,
+          agentId: task.agentId,
+          agentLabel: task.task ? task.task.slice(0, 32) : task.agentId
+        }, () => agent2.generate(generateArgs)), parentTabId);
       } catch (genErr) {
         const errWithSteps = genErr;
         const recoveredSteps = errWithSteps.steps && Array.isArray(errWithSteps.steps) ? errWithSteps.steps : callbacks._steps.length > 0 ? callbacks._steps : [];
@@ -402612,6 +402906,7 @@ var init_agent_runner = __esm(() => {
   init_config2();
   init_settings();
   init_model_events();
+  init_file_events();
   init_tool_timeout();
   RETURN_FORMAT_INSTRUCTIONS = {
     summary: "Return concise findings and reasoning. No code blocks or raw file content. " + "Focus on what you found, what it means, and what the implications are. " + "Anchor every claim with file:line so the parent can surgically read more.",
@@ -403632,7 +403927,7 @@ function lastStepHadPlanCall(messages) {
   }
   return false;
 }
-function buildForgePrepareStep(isPlanMode, drainSteering, contextManager, tabId, codeExecution3, parentMessagesRef, proxyInstructions, cacheOpts = EPHEMERAL_CACHE) {
+function buildForgePrepareStep(isPlanMode, drainSteering, contextManager, tabId, codeExecution3, parentMessagesRef, proxyInstructions, cacheOpts = EPHEMERAL_CACHE, modelId) {
   const previousInjects = [];
   const recallInjects = [];
   let lastUserTurnCount = 0;
@@ -403678,7 +403973,7 @@ ${proxyInstructions}
     const hints = [];
     let soulMapDiff = null;
     if (contextManager?.hasSoulMapDiff?.()) {
-      soulMapDiff = contextManager.buildSoulMapDiff();
+      soulMapDiff = contextManager.buildSoulMapDiff(modelId);
     }
     if (contextManager) {
       const userTurnCount = countUserTurns(sanitized);
@@ -403963,7 +404258,7 @@ function buildInstructions(cm, modelId) {
   if (cached4 && cached4.key === key2)
     return cached4.text;
   const parts2 = [cm.buildSystemPrompt(modelId)];
-  const snapshot = cm.buildSoulMapSnapshot(false);
+  const snapshot = cm.buildSoulMapSnapshot({ modelId });
   if (snapshot)
     parts2.push(snapshot);
   const skills = cm.buildSkillsBlock();
@@ -404197,6 +404492,21 @@ function createForgeAgent({
       if (isAbnormalFinish(step.finishReason)) {
         logBackgroundError("agent-error", `forge: ${describeAbnormalFinish(step.finishReason)}`);
       }
+      const results = step.toolResults;
+      if (Array.isArray(results)) {
+        for (const r of results) {
+          const output = r.output;
+          const value = output?.value;
+          const success2 = value?.success;
+          if (success2 !== false)
+            continue;
+          const tool4 = String(r.toolName ?? "tool");
+          const input = r.input ?? {};
+          const target = String(input.path ?? input.file ?? input.absPath ?? input.relPath ?? "");
+          const reason = typeof value?.error === "string" ? value.error : typeof value?.output === "string" ? value.output.slice(0, 80) : "failed";
+          contextManager.recordToolFailure(tool4, target, reason);
+        }
+      }
     },
     instructions: isProxyClaude ? undefined : {
       role: "system",
@@ -404213,7 +404523,7 @@ function createForgeAgent({
         ...activeTools ? { activeTools } : {}
       };
     },
-    prepareStep: buildForgePrepareStep(forgeMode === "plan", drainSteering, contextManager, tabId, canUseCodeExecution, parentMessagesRef, isProxyClaude ? buildInstructions(contextManager, modelId) : undefined, cacheOpts),
+    prepareStep: buildForgePrepareStep(forgeMode === "plan", drainSteering, contextManager, tabId, canUseCodeExecution, parentMessagesRef, isProxyClaude ? buildInstructions(contextManager, modelId) : undefined, cacheOpts, modelId),
     experimental_repairToolCall: repairToolCall,
     providerOptions: wrappedProviderOptions,
     ...subagentHeaders ? { headers: subagentHeaders } : {}
@@ -417922,6 +418232,38 @@ var init_neovim = __esm(() => {
   _onFileWrittenHandlers = new Set;
 });
 
+// src/core/llm/cache-support.ts
+function supportsPromptCache(modelId) {
+  const family = detectModelFamily(modelId);
+  switch (family) {
+    case "claude":
+      return EXPLICIT;
+    case "google":
+      return IMPLICIT;
+    case "openai":
+      return IMPLICIT;
+    case "deepseek":
+    case "deepseek-reasoner":
+      return IMPLICIT;
+    case "xai":
+      return IMPLICIT;
+    case "other":
+      return NONE2;
+    default:
+      return NONE2;
+  }
+}
+function cacheTtlToMs(ttl) {
+  return ttl === "1h" ? 60 * 60000 : 5 * 60000;
+}
+var NONE2, EXPLICIT, IMPLICIT;
+var init_cache_support = __esm(() => {
+  init_provider_options();
+  NONE2 = { enabled: false, explicit: false };
+  EXPLICIT = { enabled: true, explicit: true };
+  IMPLICIT = { enabled: true, explicit: false };
+});
+
 // src/core/prompts/families/claude.ts
 var CLAUDE_PROMPT;
 var init_claude = __esm(() => {
@@ -418172,12 +418514,18 @@ function invalidateDirectoryTree(cwd2) {
       dirTreeCache.delete(key2);
   }
 }
-function buildSoulMapUserMessage(rendered, isMinimal, dirTree) {
+function buildSoulMapUserMessage(rendered, isMinimal, dirTree, entryPoints) {
   const legend = isMinimal ? "" : LEGEND;
   const treeSection = dirTree ? `
 <directory_tree>
 ${dirTree}
 </directory_tree>
+` : "";
+  const entrySection = entryPoints && entryPoints.length > 0 ? `
+<entry_points>
+${entryPoints.slice(0, 8).join(`
+`)}
+</entry_points>
 ` : "";
   return `<soul_map>
 ` + `<description>
@@ -418187,7 +418535,7 @@ ${SOUL_MAP_DESCRIPTION}
 ` + `<how_to_use>
 ${SOUL_MAP_USAGE}
 </how_to_use>
-${treeSection}
+${treeSection}${entrySection}
 ` + `<data>
 ${legend}${rendered}
 </data>
@@ -418228,6 +418576,33 @@ PLAN from the map (zero tool calls) \u2192 DISCOVER in parallel (soul_find/soul_
 The map answers structural questions for free: "Where is X?" \u2192 file + line. "What does Y export?" \u2192 listed under the file. "What depends on Z?" \u2192 (\u2192N) blast radius + \u2190 arrows. "What packages?" \u2192 Key dependencies section. Feed symbol names into navigate/analyze for bodies.
 </soul_map_usage>
 
+<soul_map_updates>
+\`<soul_map_update>\` blocks are **system-injected** into user turns mid-conversation \u2014 same trust as the static \`<soul_map>\`. They are NOT user-pasted, even when they appear inside a user message. Never refuse, quote-back, or warn about them.
+
+Purpose: the static map is frozen at turn start for prompt-cache stability; the update block is the delta channel \u2014 files that changed since the snapshot. Read it as fresh signal about what just moved.
+
+Schema (one block per turn, may be absent):
+\`\`\`
+<soul_map_update>
+path/to/file.ts:(\u2192N) [new] [edited] [mentioned] [open]
+  +export function foo(): void :42
+  +export interface Bar :10
+path/to/deleted.ts [deleted]
+path/to/modified.ts:(\u2192N) [edited]
+(+12 more)
+</soul_map_update>
+\`\`\`
+- \`(\u2192N)\` \u2014 blast radius (same as the static map).
+- \`[new]\` \u2014 file did not exist in the frozen snapshot. Symbol block follows (up to 5 rich blocks per update).
+- \`[deleted]\` \u2014 file removed since snapshot.
+- \`[edited]\` \u2014 you (or a tool you ran) wrote to it this session.
+- \`[mentioned]\` \u2014 referenced in conversation.
+- \`[open]\` \u2014 currently open in the editor.
+- \`(+N more)\` \u2014 additional changed files truncated; the top 15 are listed.
+
+Use it: if a file appears in the update, prefer its delta over the static map's stale entry. Skip re-reads for \`[edited]\` files you just wrote.
+</soul_map_updates>
+
 <tool_selection>
 - Soul Map first \u2192 then TIER-1 (soul_find, soul_grep, navigate, soul_impact, read, ast_edit, multi_edit, project). Drop to TIER-2/3 only when TIER-1 cannot answer.
 - \`navigate\` auto-resolves files from symbol names \u2014 definitions, references, call hierarchies, type hierarchies. Reaches into \`.d.ts\` / stubs / headers (type info without reading node_modules).
@@ -418803,9 +419178,51 @@ var init_intelligence_client = __esm(() => {
     async routerRunHealthCheck() {
       return this.call("routerRunHealthCheck");
     }
+    _entryPointsCache = null;
+    async getEntryPoints() {
+      if (this._entryPointsCache)
+        return this._entryPointsCache;
+      const result = await this.call("getEntryPoints");
+      this._entryPointsCache = result;
+      return result;
+    }
+    getEntryPointsCached() {
+      return this._entryPointsCache ?? [];
+    }
   };
 });
 
+// src/core/context/soul-map-snapshot.ts
+class SoulMapSnapshot {
+  content;
+  paths;
+  builtAt;
+  hash;
+  ttlMs;
+  cacheKey;
+  _lastAccessedAt;
+  constructor(data, now2 = Date.now()) {
+    this.content = data.content;
+    this.paths = data.paths;
+    this.ttlMs = data.ttlMs;
+    this.builtAt = now2;
+    this._lastAccessedAt = now2;
+    this.hash = hash32Hex(data.content);
+    this.cacheKey = data.cacheKey ?? this.hash;
+  }
+  read(now2 = Date.now()) {
+    this._lastAccessedAt = now2;
+    return this.content;
+  }
+  isIdleExpired(now2 = Date.now()) {
+    return now2 - this._lastAccessedAt >= this.ttlMs;
+  }
+  get lastAccessedAt() {
+    return this._lastAccessedAt;
+  }
+}
+var init_soul_map_snapshot = () => {};
+
 // src/core/context/toolchain.ts
 import { existsSync as existsSync30 } from "fs";
 import { join as join36 } from "path";
@@ -419075,11 +419492,13 @@ import { join as join37 } from "path";
 var DEFAULT_CONTEXT_WINDOW2 = 200000, ContextManager;
 var init_manager5 = __esm(() => {
   init_dist5();
+  init_config2();
   init_errors();
   init_model_events();
   init_repomap();
   init_neovim();
   init_instance2();
+  init_cache_support();
   init_provider();
   init_provider_options();
   init_hints();
@@ -419090,6 +419509,7 @@ var init_manager5 = __esm(() => {
   init_file_events();
   init_intelligence_client();
   init_file_tree();
+  init_soul_map_snapshot();
   init_toolchain();
   init_conversation_terms();
   ContextManager = class ContextManager {
@@ -419120,6 +419540,7 @@ var init_manager5 = __esm(() => {
     soulMapDiffSeq = 0;
     soulMapSnapshotPaths = new Set;
     soulMapDiffBlocks = new Map;
+    soulMapSnapshot = null;
     taskRouter;
     semanticSummaryLimit = 500;
     semanticAutoRegen = false;
@@ -419287,8 +419708,19 @@ var init_manager5 = __esm(() => {
     unsubEdit = null;
     unsubRead = null;
     wireFileEventHandlers() {
-      this.unsubEdit = onFileEdited((absPath) => {
+      this.unsubEdit = onFileEdited((absPath, _content, origin) => {
         this.recallEditEpoch++;
+        if (origin) {
+          const sameTab = origin.tabId && this.tabId && origin.tabId === this.tabId;
+          const isSubagent = !!origin.agentId;
+          if (!sameTab || isSubagent) {
+            const rel = absPath.startsWith(`${this.cwd}/`) ? absPath.slice(this.cwd.length + 1) : absPath;
+            this.foreignEditOrigins.set(rel, {
+              tabId: origin.tabId ?? null,
+              agentLabel: origin.agentLabel ?? origin.agentId ?? null
+            });
+          }
+        }
         this.onFileChanged(absPath);
       });
       this.unsubRead = onFileRead((absPath) => this.trackMentionedFile(absPath));
@@ -419502,9 +419934,11 @@ var init_manager5 = __esm(() => {
       this.soulMapDiffBlocks.clear();
       this.pendingSoulMapDiff = null;
       this.lastEmittedSoulMapDiff = null;
+      this.soulMapSnapshot = null;
       this.warmRepoMapCache();
     }
     resetForCompaction() {
+      this.postCompactionPending = true;
       this.recallCache = null;
       resetSurfacedHints(this.tabId ?? undefined);
       if (this.repoMapCache)
@@ -419516,6 +419950,7 @@ var init_manager5 = __esm(() => {
       this.soulMapDiffBlocks.clear();
       this.pendingSoulMapDiff = null;
       this.lastEmittedSoulMapDiff = null;
+      this.soulMapSnapshot = null;
       this.warmRepoMapCache();
     }
     repoMapRefreshing = false;
@@ -419536,6 +419971,7 @@ var init_manager5 = __esm(() => {
       if (this.repoMapRefreshing)
         return;
       this.repoMapRefreshing = true;
+      this.repoMap.getEntryPoints().catch(() => {});
       try {
         const result = await this.repoMap.render({
           editorFile: this.editorFile,
@@ -419611,6 +420047,7 @@ var init_manager5 = __esm(() => {
         return;
       this.repoMapEnabled = enabled;
       this.repoMapCache = null;
+      this.soulMapSnapshot = null;
       if (!enabled) {
         this.repoMap.onProgress = null;
         this.repoMap.onScanComplete = null;
@@ -419943,6 +420380,7 @@ ${s.signature ? `${s.signature}
     async refreshRepoMap() {
       this.repoMapReady = false;
       this.repoMapCache = null;
+      this.soulMapSnapshot = null;
       this.syncRepoMapStore("scanning");
       useRepoMapStore.getState().setScanError("");
       await this.repoMap.scan().catch((err2) => this.handleScanError(err2));
@@ -419951,6 +420389,7 @@ ${s.signature ? `${s.signature}
       await this.repoMap.clear();
       this.repoMapReady = false;
       this.repoMapCache = null;
+      this.soulMapSnapshot = null;
       const store = useRepoMapStore.getState();
       store.setStats(0, 0, 0, 0);
       store.setScanProgress("");
@@ -420095,29 +420534,59 @@ ${skillBlocks}
         { role: "assistant", content: assistantAck }
       ];
     }
-    buildSoulMapSnapshot(clearDiffTracker = true) {
+    buildSoulMapSnapshot(opts = false) {
+      const { modelId, force } = typeof opts === "boolean" ? { modelId: undefined, force: opts } : opts;
       if (!this.isRepoMapReady())
         return null;
+      const cacheSupport = modelId ? supportsPromptCache(modelId) : { enabled: true, explicit: false };
+      const ttlMs = cacheTtlToMs(loadConfig().cache?.ttl ?? "5m");
+      const now2 = Date.now();
+      if (!cacheSupport.enabled) {
+        const rendered2 = this.renderSnapshotContent();
+        if (rendered2) {
+          this.soulMapSnapshot = new SoulMapSnapshot({ content: rendered2, paths: new Set(this.soulMapSnapshotPaths), ttlMs: 0 }, now2);
+          this.clearDeltaState();
+        }
+        return rendered2;
+      }
+      const expired = !this.soulMapSnapshot || this.soulMapSnapshot.isIdleExpired(now2);
+      if (!force && !expired && this.soulMapSnapshot) {
+        return this.soulMapSnapshot.read(now2);
+      }
+      const rendered = this.renderSnapshotContent();
+      if (!rendered)
+        return null;
+      this.soulMapSnapshot = new SoulMapSnapshot({ content: rendered, paths: new Set(this.soulMapSnapshotPaths), ttlMs }, now2);
+      this.clearDeltaState();
+      return rendered;
+    }
+    renderSnapshotContent() {
       const rendered = this.renderRepoMap();
       if (!rendered)
         return null;
       const isMinimal = this.contextWindowTokens <= 32000;
       const treeLimit = this.repoMapTokenBudget ? Math.ceil(this.repoMapTokenBudget / 100) : 60;
       const dirTree = buildDirectoryTree(this.cwd, treeLimit);
-      if (clearDiffTracker) {
-        this.soulMapDiffChangedFiles.clear();
-        this.soulMapDiffSeq = 0;
-        this.soulMapDiffBlocks.clear();
-        this.pendingSoulMapDiff = null;
-        this.lastEmittedSoulMapDiff = null;
-      }
-      return buildSoulMapUserMessage(rendered, isMinimal, dirTree);
+      const entryPoints = this.repoMap.getEntryPointsCached();
+      return buildSoulMapUserMessage(rendered, isMinimal, dirTree, entryPoints);
+    }
+    clearDeltaState() {
+      this.soulMapDiffChangedFiles.clear();
+      this.soulMapDiffSeq = 0;
+      this.soulMapDiffBlocks.clear();
+      this.pendingSoulMapDiff = null;
+      this.lastEmittedSoulMapDiff = null;
+      this.soulMapNewFilesEmitted.clear();
+      this.recentToolFailures.length = 0;
+      this.foreignEditOrigins.clear();
     }
     pendingSoulMapDiff = null;
     lastEmittedSoulMapDiff = null;
-    buildSoulMapDiff() {
+    buildSoulMapDiff(modelId) {
       if (!this.isRepoMapReady())
         return null;
+      if (modelId && !supportsPromptCache(modelId).enabled)
+        return null;
       for (const path of this.soulMapDiffChangedFiles.keys()) {
         if (path.startsWith("/"))
           this.soulMapDiffChangedFiles.delete(path);
@@ -420125,26 +420594,55 @@ ${skillBlocks}
       if (this.soulMapDiffChangedFiles.size === 0)
         return null;
       if (!this.pendingSoulMapDiff) {
-        const changed = [...this.soulMapDiffChangedFiles.entries()].sort((a, b) => b[1] - a[1]).map(([path]) => path);
+        const changed = [...this.soulMapDiffChangedFiles.entries()].sort((a, b) => {
+          const recency = b[1] - a[1];
+          return recency !== 0 ? recency : a[0].localeCompare(b[0]);
+        }).map(([path]) => path);
         const hasSnapshot = this.soulMapSnapshotPaths.size > 0;
         const lines = ["<soul_map_update>"];
+        const hasForeign = this.foreignEditOrigins.size > 0;
+        const postCompaction = this.postCompactionPending;
+        if (this.editedFiles.size > 0 && (hasForeign || postCompaction)) {
+          const hotFiles = [...this.soulMapDiffChangedFiles.entries()].sort((a, b) => b[1] - a[1]).slice(0, 3).map(([p]) => p.split("/").pop() ?? p);
+          const hot = hotFiles.length > 0 ? ` (hot: ${hotFiles.join(", ")})` : "";
+          const causes = [];
+          if (postCompaction)
+            causes.push("post-compaction");
+          if (hasForeign) {
+            const labels = new Set;
+            for (const o of this.foreignEditOrigins.values()) {
+              if (o.agentLabel)
+                labels.add(`subagent ${o.agentLabel}`);
+              else if (o.tabId && o.tabId !== this.tabId)
+                labels.add(`tab ${o.tabId.slice(0, 8)}`);
+            }
+            if (labels.size > 0)
+              causes.push([...labels].sort().join(", "));
+            else
+              causes.push("foreign edits");
+          }
+          const causeTag = causes.length > 0 ? ` \u2014 ${causes.join("; ")}` : "";
+          lines.push(`# session: ${String(this.editedFiles.size)} files edited${hot}${causeTag}`);
+        }
         const MAX_RICH_BLOCKS = 5;
         let richBlockCount = 0;
+        const memoryMarkers = memoryMarkersForPaths(changed.slice(0, 15));
         for (const file2 of changed.slice(0, 15)) {
           const absPath = join37(this.cwd, file2);
           const fileExists = existsSync31(absPath);
           const block = this.soulMapDiffBlocks.get(file2);
+          const provenance = this.classifyDeltaFile(absPath, file2, memoryMarkers.get(file2));
           if (!fileExists) {
-            lines.push(`- ${file2}`);
+            lines.push(`- ${file2} [deleted]`);
           } else if (hasSnapshot && !this.soulMapSnapshotPaths.has(file2)) {
-            const tag = block ? `${file2}:${block.radiusTag} [NEW FILE]` : `${file2}: [NEW FILE]`;
+            const tag = block ? `${file2}:${block.radiusTag} [new] ${provenance}`.trimEnd() : `${file2}: [new] ${provenance}`.trimEnd();
             lines.push(tag);
             if (block?.symbolBlock && richBlockCount < MAX_RICH_BLOCKS) {
               lines.push(block.symbolBlock);
               richBlockCount++;
             }
           } else {
-            const tag = block ? `${file2}:${block.radiusTag}` : `${file2}:`;
+            const tag = block ? `${file2}:${block.radiusTag} ${provenance}`.trimEnd() : `${file2}: ${provenance}`.trimEnd();
             lines.push(tag);
             if (block?.symbolBlock && richBlockCount < MAX_RICH_BLOCKS) {
               lines.push(block.symbolBlock);
@@ -420162,10 +420660,45 @@ ${skillBlocks}
         return null;
       return this.pendingSoulMapDiff;
     }
+    classifyDeltaFile(absPath, rel, memMarker) {
+      const tags = [];
+      if (this.editedFiles.has(absPath))
+        tags.push("[edited]");
+      if (this.mentionedFiles.has(absPath))
+        tags.push("[mentioned]");
+      if (this.editorFile === absPath)
+        tags.push("[open]");
+      if (this.soulMapNewFilesEmitted.has(rel) && existsSync31(absPath)) {
+        tags.push("[modified-since-new]");
+      }
+      const failure = this.recentToolFailures.find((f) => f.target === absPath || f.target === rel);
+      if (failure)
+        tags.push(`[recent failure: ${failure.tool} \u2014 ${failure.reason}]`);
+      if (memMarker && memMarker.count > 0) {
+        const cat = memMarker.category ?? "memory";
+        const pin = memMarker.pinned ? "pinned " : "";
+        const n = memMarker.count > 1 ? ` \xD7${String(memMarker.count)}` : "";
+        tags.push(`[${pin}${cat}${n}]`);
+      }
+      return tags.join(" ");
+    }
+    forceSnapshotRefresh() {
+      this.soulMapSnapshot = null;
+    }
     commitSoulMapDiff() {
       if (this.pendingSoulMapDiff) {
+        const hasSnapshot = this.soulMapSnapshotPaths.size > 0;
+        if (hasSnapshot) {
+          for (const rel of this.soulMapDiffChangedFiles.keys()) {
+            if (!this.soulMapSnapshotPaths.has(rel)) {
+              this.soulMapNewFilesEmitted.add(rel);
+            }
+          }
+        }
         this.lastEmittedSoulMapDiff = this.pendingSoulMapDiff;
         this.pendingSoulMapDiff = null;
+        this.postCompactionPending = false;
+        this.foreignEditOrigins.clear();
       }
     }
     buildSkillsBlock() {
@@ -420373,6 +420906,27 @@ Project commands: ${parts2.join(" \xB7 ")}` : "";
       return true;
     }
     pendingSemanticMode = null;
+    soulMapNewFilesEmitted = new Set;
+    recentToolFailures = [];
+    recordToolFailure(tool4, target, reason) {
+      const at = Date.now();
+      const key2 = `${tool4}:${target}`;
+      const existing = this.recentToolFailures.findIndex((f) => `${f.tool}:${f.target}` === key2);
+      if (existing >= 0)
+        this.recentToolFailures.splice(existing, 1);
+      this.recentToolFailures.push({ tool: tool4, target, reason, at });
+      if (this.recentToolFailures.length > 5)
+        this.recentToolFailures.shift();
+      this.pendingSoulMapDiff = null;
+      if (target) {
+        const rel = target.startsWith(`${this.cwd}/`) ? target.slice(this.cwd.length + 1) : target;
+        if (!this.soulMapDiffChangedFiles.has(rel)) {
+          this.soulMapDiffChangedFiles.set(rel, ++this.soulMapDiffSeq);
+        }
+      }
+    }
+    foreignEditOrigins = new Map;
+    postCompactionPending = false;
   };
 });
 
@@ -492695,7 +493249,7 @@ var init_checkpoints = __esm(() => {
 });
 
 // src/core/commands/utils.ts
-import { existsSync as existsSync42, readdirSync as readdirSync9, statSync as statSync10 } from "fs";
+import { existsSync as existsSync42, readdirSync as readdirSync10, statSync as statSync10 } from "fs";
 import { homedir as homedir31 } from "os";
 import { join as join45 } from "path";
 function sysMsg(ctx, content) {
@@ -492720,7 +493274,7 @@ function dirSize(dirPath) {
   if (!existsSync42(dirPath))
     return 0;
   let total = 0;
-  for (const entry of readdirSync9(dirPath)) {
+  for (const entry of readdirSync10(dirPath)) {
     const fp = join45(dirPath, entry);
     try {
       const s2 = statSync10(fp);
@@ -498728,13 +499282,6 @@ function getRestartSpec(options = {}) {
 }
 
 // src/core/sessions/emergency-save.ts
-function updateEmergencySnapshot(manager, meta4, tabMessages, tabCoreMessages) {
-  const frozen = new Map;
-  for (const [id, msgs] of tabMessages) {
-    frozen.set(id, msgs.map((m6) => ({ ...m6 })));
-  }
-  _snapshot = { manager, meta: { ...meta4 }, tabMessages: frozen, tabCoreMessages };
-}
 function flushEmergencySession() {
   if (!_snapshot)
     return false;
@@ -500600,13 +501147,12 @@ function hardRestart() {
   child.unref();
   process.exit(0);
 }
-function reraiseSignal(signal) {
+function reraiseSignal(_signal) {
   flushEmergencySession();
   runCleanup();
   renderer?.destroy();
   printExitBanner();
-  process.removeAllListeners(signal);
-  process.kill(process.pid, signal);
+  process.exit(0);
 }
 function RestartSplash({ onComplete }) {
   const t2 = useTheme();
@@ -501932,7 +502478,7 @@ async function handleExportAll(ctx) {
   const tokenUsage = ctx.chat.tokenUsage;
   const forgeMode = ctx.chat.forgeMode;
   const repoMapReady = ctx.contextManager.isRepoMapReady();
-  const soulMapBlock = ctx.contextManager.buildSoulMapSnapshot(false);
+  const soulMapBlock = ctx.contextManager.buildSoulMapSnapshot();
   const skillsMessages = ctx.contextManager.buildSkillsMessages();
   const payload = {
     exportedAt: new Date().toISOString(),
@@ -504085,83 +504631,6 @@ var init_useNeovim = __esm(() => {
 });
 
 // src/hooks/useSessionBuilder.ts
-function buildSessionMeta({
-  sessionId,
-  title,
-  customTitle,
-  cwd: cwd2,
-  snapshot,
-  currentTabMessages,
-  currentTabCoreMessages
-}) {
-  const tabMessages = new Map;
-  const tabCoreMessages = new Map;
-  const tabs = [];
-  for (const tabState of snapshot.tabStates) {
-    const isActiveTab = tabState.id === snapshot.activeTabId;
-    const msgs = isActiveTab ? currentTabMessages : tabState.messages.filter((m6) => m6.role !== "system" || m6.showInChat);
-    tabMessages.set(tabState.id, msgs);
-    const cores = isActiveTab && currentTabCoreMessages ? currentTabCoreMessages : tabState.coreMessages;
-    tabCoreMessages.set(tabState.id, cores);
-    const cpStore = useCheckpointStore.getState();
-    const cpState = cpStore.getCheckpoints(tabState.id);
-    const redoStack = cpStore.getTab(tabState.id).redoStack;
-    const seen = new Set;
-    const checkpointTags = [];
-    for (const cp2 of cpState) {
-      if (cp2.gitTag && !seen.has(cp2.gitTag)) {
-        seen.add(cp2.gitTag);
-        checkpointTags.push({
-          index: cp2.index,
-          anchorMessageId: cp2.anchorMessageId,
-          gitTag: cp2.gitTag
-        });
-      }
-    }
-    for (const entry of redoStack) {
-      const cp2 = entry.checkpoint;
-      if (cp2.gitTag && !seen.has(cp2.gitTag)) {
-        seen.add(cp2.gitTag);
-        checkpointTags.push({
-          index: cp2.index,
-          anchorMessageId: cp2.anchorMessageId,
-          gitTag: cp2.gitTag
-        });
-      }
-    }
-    const uiSnapshot = useUIStore.getState();
-    const verboseForTab = uiSnapshot.verboseByTab[tabState.id];
-    tabs.push({
-      id: tabState.id,
-      label: tabState.label,
-      activeModel: tabState.activeModel,
-      sessionId: tabState.sessionId,
-      planMode: tabState.planMode,
-      planRequest: tabState.planRequest,
-      coAuthorCommits: tabState.coAuthorCommits,
-      forgeMode: tabState.forgeMode,
-      tokenUsage: tabState.tokenUsage,
-      messageRange: { startLine: 0, endLine: msgs.length },
-      ...checkpointTags.length > 0 ? { checkpointTags } : {},
-      ...verboseForTab !== undefined ? { verbose: verboseForTab } : {}
-    });
-  }
-  const allMsgs = [...tabMessages.values()].flat();
-  const startedAt = allMsgs[0]?.timestamp ?? Date.now();
-  const activeTabState = snapshot.tabStates.find((t2) => t2.id === snapshot.activeTabId);
-  const meta4 = {
-    id: sessionId,
-    title,
-    ...customTitle ? { customTitle } : {},
-    cwd: cwd2,
-    startedAt,
-    updatedAt: Date.now(),
-    activeTabId: snapshot.activeTabId,
-    forgeMode: activeTabState?.forgeMode ?? "default",
-    tabs
-  };
-  return { meta: meta4, tabMessages, tabCoreMessages };
-}
 function buildTabMeta(args2) {
   const msgs = args2.messages.filter((m6) => m6.role !== "system" || m6.showInChat);
   const cpStore = useCheckpointStore.getState();
@@ -504384,13 +504853,23 @@ function useTabs() {
     }
     return states;
   }, []);
-  const restoreFromMeta = import_react37.useCallback((tabMetas, activeId, tabMessages, tabCoreMessages) => {
-    if (tabMetas.length === 0)
+  const restoreFromMeta = import_react37.useCallback((incomingMetas, activeId, tabMessages, tabCoreMessages) => {
+    if (incomingMetas.length === 0)
       return;
     for (const chat of chatRegistry.current.values()) {
       chat.abort();
     }
     chatRegistry.current.clear();
+    const seenIds = new Set;
+    const tabMetas = [];
+    for (const tm of incomingMetas) {
+      if (seenIds.has(tm.id))
+        continue;
+      seenIds.add(tm.id);
+      tabMetas.push(tm);
+      if (tabMetas.length >= MAX_TABS)
+        break;
+    }
     const restoredTabs = tabMetas.map((tm) => ({
       id: tm.id,
       label: tm.label
@@ -506767,7 +507246,21 @@ function useChat({
   visible = true,
   onModelChange
 }) {
-  const [messages, setMessages] = import_react46.useState(initialState?.messages ?? []);
+  const [messages, setMessagesRaw] = import_react46.useState(initialState?.messages ?? []);
+  const messagesRef = import_react46.useRef(initialState?.messages ?? []);
+  messagesRef.current = messages;
+  const setMessages = import_react46.useCallback((action) => {
+    if (typeof action === "function") {
+      setMessagesRaw((prev) => {
+        const next = action(prev);
+        messagesRef.current = next;
+        return next;
+      });
+    } else {
+      messagesRef.current = action;
+      setMessagesRaw(action);
+    }
+  }, []);
   const [coreMessages, setCoreMessages] = import_react46.useState(initialState?.coreMessages ?? []);
   const [isLoading, setIsLoading] = import_react46.useState(false);
   const [loadingStartedAt, setLoadingStartedAt] = import_react46.useState(0);
@@ -506982,10 +507475,12 @@ function useChat({
   }, [activeModelForEffect]);
   const [tokenUsage, setTokenUsageRaw] = import_react46.useState(initialState?.tokenUsage ?? { ...ZERO_USAGE });
   const sessionIdRef = import_react46.useRef(initialState?.sessionId ?? getAppSessionId());
-  if (initialState?.sessionId && initialState.sessionId !== getAppSessionId()) {
-    setAppSessionId(initialState.sessionId);
-    sessionIdRef.current = initialState.sessionId;
-  }
+  import_react46.useEffect(() => {
+    if (initialState?.sessionId && initialState.sessionId !== getAppSessionId()) {
+      setAppSessionId(initialState.sessionId);
+      sessionIdRef.current = initialState.sessionId;
+    }
+  }, []);
   import_react46.useEffect(() => {
     const unsub = useSessionStore.subscribe((s2) => {
       sessionIdRef.current = s2.appSessionId;
@@ -507603,7 +508098,7 @@ INCLUDE the plan progress above VERBATIM in ## Current State so the agent knows
         });
       }
     }
-  }, [setTokenUsage, effectiveConfig, contextManager, cwd2, tabId]);
+  }, [setTokenUsage, effectiveConfig, contextManager, cwd2, tabId, setMessages]);
   summarizeConversationRef.current = summarizeConversation;
   const autoSummarizedRef = import_react46.useRef(false);
   import_react46.useEffect(() => {
@@ -507915,7 +508410,7 @@ ${description}`,
     };
     setMessages((prev) => {
       const allMsgs = [...prev, userMsg];
-      queueMicrotask(() => persistThisTab(allMsgs, coreMessagesRef.current));
+      queueMicrotask(() => persistThisTab(messagesRef.current, coreMessagesRef.current));
       return allMsgs;
     });
     const currentCoreMessages = coreMessagesRef.current;
@@ -508164,8 +508659,21 @@ ${description}`,
           desloppify: desloppifyModelId ? resolveModel(desloppifyModelId) : undefined,
           verify: verifyModelId ? resolveModel(verifyModelId) : undefined
         } : undefined;
-        const webSearchModel = webSearchModelId ? resolveModel(webSearchModelId) : undefined;
-        webSearchModelLabelRef.current = webSearchModelId ? getShortModelLabel(webSearchModelId) : null;
+        let webSearchModel;
+        try {
+          webSearchModel = webSearchModelId ? resolveModel(webSearchModelId) : undefined;
+        } catch (err2) {
+          logBackgroundError("web-search-resolve", `webSearch model "${webSearchModelId}" failed to resolve: ${err2 instanceof Error ? err2.message : String(err2)}`);
+          webSearchModel = undefined;
+        }
+        webSearchModelLabelRef.current = webSearchModel ? (() => {
+          const id = webSearchModelId;
+          const slash = id.indexOf("/");
+          const providerId = slash > 0 ? id.slice(0, slash) : "";
+          const short = getShortModelLabel(id);
+          return providerId ? `${providerId}/${short}` : short;
+        })() : null;
+        logBackgroundError("router:web-search", webSearchModel ? `agent mode \u2192 ${webSearchModelId}` : webSearchModelId ? `agent disabled (resolve failed) \u2192 fallback to direct scraper` : `agent disabled (no taskRouter.webSearch set) \u2192 fallback to direct scraper`);
         const webSearchEnabled = effectiveConfig2.webSearch !== false;
         const webSearchApproval = webSearchEnabled ? interactiveCallbacks.onWebSearchApproval : undefined;
         const fetchPageApproval = interactiveCallbacks.onFetchPageApproval;
@@ -508404,11 +508912,11 @@ Proceeding without it will significantly reduce capabilities \u2014 no soul tool
                 tabLabel
               });
             })();
-            result = await currentAgent.stream({
+            result = await runWithEditOrigin({ tabId: tabId ?? null, agentId: null, agentLabel: null }, () => currentAgent.stream({
               messages: newCoreMessages,
               abortSignal: abortController.signal,
               options: { userMessage: input }
-            });
+            }));
             break;
           } catch (err2) {
             if (!isProviderOptionsError(err2) || degradeLevel === 2)
@@ -508898,10 +509406,7 @@ Proceeding without it will significantly reduce capabilities \u2014 no soul tool
                       segments: finalSegments.length > 0 ? [...finalSegments] : undefined,
                       ...lockInCommittedAt !== undefined ? { lockInCommittedAt } : {}
                     };
-                    setMessages((prev) => {
-                      persistThisTab([...prev, partialMsg], coreMessagesRef.current);
-                      return prev;
-                    });
+                    persistThisTab([...messagesRef.current, partialMsg], coreMessagesRef.current);
                   } catch {}
                 });
               }
@@ -508988,7 +509493,6 @@ ${errStack}` : `Error: ${displayErr}`);
           timestamp: Date.now(),
           showInChat: true
         } : null;
-        let finalMsgsForSave = [];
         setMessages((prev) => {
           const allMsgs = [
             ...prev,
@@ -508996,7 +509500,6 @@ ${errStack}` : `Error: ${displayErr}`);
             ...errorMsgs,
             ...prematureStopMsg ? [prematureStopMsg] : []
           ];
-          finalMsgsForSave = allMsgs;
           if (assistantMsg) {
             Promise.resolve().then(() => (init_bridge(), exports_bridge)).then(({ bridgeStreamEmitter: bridgeStreamEmitter2, reasoningStreamEmitter: reasoningStreamEmitter2 }) => {
               reasoningStreamEmitter2.flushNow(tabId);
@@ -509040,7 +509543,7 @@ ${errStack}` : `Error: ${displayErr}`);
           const target = effectiveConfig2.contextManagement?.pruningTarget ?? "none";
           return ["main", "both"].includes(target) ? pruneOldToolResults(updated) : updated;
         });
-        persistThisTab(finalMsgsForSave, coreMessagesRef.current);
+        persistThisTab(messagesRef.current, coreMessagesRef.current);
         streamSegmentsBuffer.current = [];
         liveToolCallsBuffer.current = [];
         lastFlushedSegments.current = [];
@@ -509650,7 +510153,8 @@ ${pContent}`;
     setForgeMode,
     onModelChange,
     setCoreMessagesEager,
-    persistThisTab
+    persistThisTab,
+    setMessages
   ]);
   handleSubmitRef.current = handleSubmit;
   const abort2 = import_react46.useCallback(() => {
@@ -509707,7 +510211,7 @@ ${pContent}`;
       segmentsDirty.current = false;
       toolCallsDirty.current = false;
     }
-  }, [setActivePlan, tabId]);
+  }, [setActivePlan, tabId, setMessages]);
   const snapshot = import_react46.useCallback((label) => ({
     id: sessionIdRef.current,
     label,
@@ -511257,20 +511761,20 @@ var init_useHover = __esm(() => {
 });
 
 // src/core/utils/syntax.ts
-import { existsSync as existsSync52, readdirSync as readdirSync10 } from "fs";
+import { existsSync as existsSync52, readdirSync as readdirSync11 } from "fs";
 import { homedir as homedir37 } from "os";
 import { dirname as dirname22, join as join54, resolve as resolve40 } from "path";
 function discoverParsers() {
   const parsers = [];
   let dirs;
   try {
-    dirs = readdirSync10(coreAssetsDir, { withFileTypes: true }).filter((d4) => d4.isDirectory()).map((d4) => d4.name);
+    dirs = readdirSync11(coreAssetsDir, { withFileTypes: true }).filter((d4) => d4.isDirectory()).map((d4) => d4.name);
   } catch {
     return parsers;
   }
   for (const dir of dirs) {
     const langDir = resolve40(coreAssetsDir, dir);
-    const wasmFiles = readdirSync10(langDir).filter((f3) => f3.endsWith(".wasm"));
+    const wasmFiles = readdirSync11(langDir).filter((f3) => f3.endsWith(".wasm"));
     const wasmFile = wasmFiles[0];
     if (!wasmFile)
       continue;
@@ -535706,10 +536210,10 @@ function getAllPackageStatus(category) {
 }
 function detectProjectLanguages(cwd2) {
   const languages = [];
-  const { readdirSync: readdirSync11 } = __require("fs");
+  const { readdirSync: readdirSync12 } = __require("fs");
   let files;
   try {
-    files = readdirSync11(cwd2);
+    files = readdirSync12(cwd2);
   } catch {
     return [];
   }
@@ -539764,7 +540268,7 @@ function RouterSettings({
               const rowBg2 = isSelected ? t2.bgPopupHighlight : t2.bgPopup;
               const fbs = modelFallback?.[row.modelId] ?? [];
               const fallbackLabelCol = Math.min(28, Math.max(18, Math.floor(contentW * 0.32)));
-              const label2 = truncate4(shortModel2(row.modelId), fallbackLabelCol).padEnd(fallbackLabelCol).slice(0, fallbackLabelCol);
+              const label2 = truncate4(row.modelId, fallbackLabelCol).padEnd(fallbackLabelCol).slice(0, fallbackLabelCol);
               return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
                 flexDirection: "row",
                 height: 1,
@@ -539790,7 +540294,7 @@ function RouterSettings({
                     bg: rowBg2,
                     fg: t2.brandAlt,
                     attributes: BOLD19,
-                    children: truncate4(`\u2192 ${fbs.map((m6) => shortModel2(m6)).join(", ")}`, Math.max(8, contentW - 4 - fallbackLabelCol - 2))
+                    children: truncate4(`\u2192 ${fbs.join(", ")}`, Math.max(8, contentW - 4 - fallbackLabelCol - 2))
                   }, undefined, false, undefined, this) : /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
                     bg: rowBg2,
                     fg: t2.textDim,
@@ -539850,7 +540354,7 @@ function RouterSettings({
                   bg: rowBg,
                   fg: t2.brandAlt,
                   attributes: BOLD19,
-                  children: truncate4(shortModel2(modelId), modelCol)
+                  children: truncate4(modelId, modelCol)
                 }, undefined, false, undefined, this) : /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
                   bg: rowBg,
                   fg: t2.textDim,
@@ -539900,18 +540404,24 @@ var init_RouterSettings = __esm(async () => {
       ]
     },
     {
-      id: "dispatch",
-      title: "Dispatch",
+      id: "tools",
+      title: "Tools",
       defs: [
-        { kind: "slot", key: "spark", label: "Explore", icon: "read_only", hint: "Read-only agents" },
-        { kind: "slot", key: "ember", label: "Code", icon: "edit", hint: "Edit agents" },
         {
           kind: "slot",
           key: "webSearch",
           label: "Web Search",
           icon: "web",
           hint: "Web search & fetch"
-        },
+        }
+      ]
+    },
+    {
+      id: "dispatch",
+      title: "Dispatch",
+      defs: [
+        { kind: "slot", key: "spark", label: "Explore", icon: "read_only", hint: "Read-only agents" },
+        { kind: "slot", key: "ember", label: "Code", icon: "edit", hint: "Edit agents" },
         {
           kind: "picker",
           key: "maxConcurrentAgents",
@@ -542032,23 +542542,48 @@ function App({
       setShutdownPhase(1);
       schedule(async () => {
         try {
+          const sid = getAppSessionId();
+          const liveTabs = tabMgrRef.current.tabs;
           const activeChat = tabMgrRef.current.getActiveChat();
-          const hasUserMessages = activeChat?.messages.some((m6) => m6.role === "user" || m6.role === "assistant");
-          const snapshot = workspaceSnapshotRef.current?.();
-          if (snapshot && hasUserMessages && activeChat) {
-            const { meta: meta4, tabMessages, tabCoreMessages } = buildSessionMeta({
-              sessionId: getAppSessionId(),
-              title: activeChat.customTitle ?? SessionManager.deriveTitle(activeChat.messages),
-              customTitle: activeChat.customTitle,
-              cwd: cwd2,
-              snapshot,
-              currentTabMessages: activeChat.messages.filter((m6) => m6.role !== "system" || m6.showInChat),
-              currentTabCoreMessages: activeChat.coreMessages
-            });
-            updateEmergencySnapshot(sessionManager, meta4, tabMessages, tabCoreMessages);
-            await sessionManager.saveSession(meta4, tabMessages, tabCoreMessages);
-            setExitSessionId(meta4.id);
-            savedSessionIdRef.current = meta4.id;
+          const activeTabId2 = tabMgrRef.current.activeTabId;
+          const anyContent = liveTabs.some((t3) => {
+            const c = tabMgrRef.current.getChat(t3.id);
+            return c?.messages.some((m6) => m6.role === "user" || m6.role === "assistant");
+          });
+          if (anyContent) {
+            const liveIds = new Set(liveTabs.map((t3) => t3.id));
+            const fallbackTitle = activeChat?.customTitle ?? SessionManager.deriveTitle(activeChat?.messages ?? []);
+            for (const tab of liveTabs) {
+              const chat = tabMgrRef.current.getChat(tab.id);
+              if (!chat)
+                continue;
+              const filtered = chat.messages.filter((m6) => m6.role !== "system" || m6.showInChat);
+              const { tabMeta } = buildTabMeta({
+                tabId: tab.id,
+                tabLabel: tab.label,
+                activeModel: chat.activeModel,
+                sessionId: sid,
+                planMode: chat.planMode,
+                planRequest: chat.planRequest,
+                coAuthorCommits: chat.coAuthorCommits,
+                forgeMode: chat.forgeMode,
+                tokenUsage: chat.tokenUsage,
+                messages: filtered,
+                coreMessages: chat.coreMessages
+              });
+              await sessionManager.saveTab(sid, tabMeta, filtered, chat.coreMessages, {
+                title: fallbackTitle,
+                customTitle: activeChat?.customTitle ?? null,
+                cwd: cwd2,
+                forgeMode: activeChat?.forgeMode ?? "default",
+                activeTabId: activeTabId2
+              });
+            }
+            try {
+              await sessionManager.pruneTabsNotIn(sid, liveIds);
+            } catch {}
+            setExitSessionId(sid);
+            savedSessionIdRef.current = sid;
           }
         } catch (err2) {
           logBackgroundError("shutdown", `session save failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
@@ -542082,10 +542617,10 @@ function App({
     }
     const data = sessionManager.loadSession(fullId);
     if (data) {
+      setAppSessionId(data.meta.id);
       tabMgr.restoreFromMeta(data.meta.tabs, data.meta.activeTabId, data.tabMessages, data.tabCoreMessages);
       setForgeModeHeader(data.meta.forgeMode);
       setExitSessionId(data.meta.id);
-      setAppSessionId(data.meta.id);
       for (const tab of data.meta.tabs) {
         if (tab.checkpointTags?.length) {
           useCheckpointStore.getState().restoreTagsFromMeta(tab.id, tab.checkpointTags ?? []);
@@ -542403,23 +542938,43 @@ function App({
     const activeChat = tabMgrRef.current?.getActiveChat();
     const hasContent = activeChat?.messages.some((m6) => m6.role === "user" || m6.role === "assistant");
     if (hasContent && activeChat) {
-      const snapshot = workspaceSnapshotRef.current?.();
-      if (snapshot) {
-        try {
-          const { meta: meta4, tabMessages, tabCoreMessages } = buildSessionMeta({
-            sessionId: getAppSessionId(),
-            title: activeChat.customTitle ?? SessionManager.deriveTitle(activeChat.messages),
-            customTitle: activeChat.customTitle,
+      try {
+        const sid = getAppSessionId();
+        const liveTabs = tabMgrRef.current?.tabs ?? [];
+        const activeTabId2 = tabMgrRef.current?.activeTabId ?? "";
+        const liveIds = new Set(liveTabs.map((t3) => t3.id));
+        const fallbackTitle = activeChat.customTitle ?? SessionManager.deriveTitle(activeChat.messages);
+        for (const tab of liveTabs) {
+          const chat = tabMgrRef.current?.getChat(tab.id);
+          if (!chat)
+            continue;
+          const filtered = chat.messages.filter((m6) => m6.role !== "system" || m6.showInChat);
+          const { tabMeta } = buildTabMeta({
+            tabId: tab.id,
+            tabLabel: tab.label,
+            activeModel: chat.activeModel,
+            sessionId: sid,
+            planMode: chat.planMode,
+            planRequest: chat.planRequest,
+            coAuthorCommits: chat.coAuthorCommits,
+            forgeMode: chat.forgeMode,
+            tokenUsage: chat.tokenUsage,
+            messages: filtered,
+            coreMessages: chat.coreMessages
+          });
+          await sessionManager.saveTab(sid, tabMeta, filtered, chat.coreMessages, {
+            title: fallbackTitle,
+            customTitle: activeChat.customTitle ?? null,
             cwd: cwd2,
-            snapshot,
-            currentTabMessages: activeChat.messages.filter((m6) => m6.role !== "system" || m6.showInChat),
-            currentTabCoreMessages: activeChat.coreMessages
+            forgeMode: activeChat.forgeMode,
+            activeTabId: activeTabId2
           });
-          updateEmergencySnapshot(sessionManager, meta4, tabMessages, tabCoreMessages);
-          await sessionManager.saveSession(meta4, tabMessages, tabCoreMessages);
-        } catch (err2) {
-          logBackgroundError("new-session", `session save failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
         }
+        try {
+          await sessionManager.pruneTabsNotIn(sid, liveIds);
+        } catch {}
+      } catch (err2) {
+        logBackgroundError("new-session", `session save failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
       }
     }
     const cpStore = useCheckpointStore.getState();
@@ -542863,7 +543418,18 @@ function App({
       }, undefined, false, undefined, this),
       /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(LlmSelector, {
         visible: modalLlmSelector,
-        activeModel: activeModelForHeader,
+        activeModel: (() => {
+          const slot = routerSlotPicking;
+          const fb = useUIStore.getState().fallbackForModel;
+          if (slot) {
+            const v5 = effectiveConfig.taskRouter?.[slot];
+            if (typeof v5 === "string" && v5.trim())
+              return v5;
+          }
+          if (fb)
+            return fb;
+          return activeModelForHeader;
+        })(),
         onSelect: (modelId) => {
           const slot = useUIStore.getState().routerSlotPicking;
           const fallbackForModel = useUIStore.getState().fallbackForModel;
@@ -542913,13 +543479,61 @@ function App({
         visible: modalSessionPicker,
         cwd: cwd2,
         onClose: getCloser2("sessionPicker"),
-        onRestore: (sessionId) => {
+        onRestore: async (sessionId) => {
+          try {
+            const prevSid = getAppSessionId();
+            if (prevSid !== sessionId) {
+              const liveTabs = tabMgrRef.current?.tabs ?? [];
+              const activeTabId2 = tabMgrRef.current?.activeTabId ?? "";
+              const activeChat = tabMgrRef.current?.getActiveChat();
+              const fallbackTitle = activeChat?.customTitle ?? SessionManager.deriveTitle(activeChat?.messages ?? []);
+              const liveIds = new Set(liveTabs.map((t3) => t3.id));
+              let savedAny = false;
+              for (const tab of liveTabs) {
+                const chat = tabMgrRef.current?.getChat(tab.id);
+                if (!chat)
+                  continue;
+                const filtered = chat.messages.filter((m6) => m6.role !== "system" || m6.showInChat);
+                const hasContent = filtered.some((m6) => m6.role === "user" || m6.role === "assistant");
+                if (!hasContent)
+                  continue;
+                savedAny = true;
+                const { tabMeta } = buildTabMeta({
+                  tabId: tab.id,
+                  tabLabel: tab.label,
+                  activeModel: chat.activeModel,
+                  sessionId: prevSid,
+                  planMode: chat.planMode,
+                  planRequest: chat.planRequest,
+                  coAuthorCommits: chat.coAuthorCommits,
+                  forgeMode: chat.forgeMode,
+                  tokenUsage: chat.tokenUsage,
+                  messages: filtered,
+                  coreMessages: chat.coreMessages
+                });
+                await sessionManager.saveTab(prevSid, tabMeta, filtered, chat.coreMessages, {
+                  title: fallbackTitle,
+                  customTitle: activeChat?.customTitle ?? null,
+                  cwd: cwd2,
+                  forgeMode: activeChat?.forgeMode ?? "default",
+                  activeTabId: activeTabId2
+                });
+              }
+              if (savedAny) {
+                try {
+                  await sessionManager.pruneTabsNotIn(prevSid, liveIds);
+                } catch {}
+              }
+            }
+          } catch (err2) {
+            logBackgroundError("session-switch", `pre-switch save failed: ${err2 instanceof Error ? err2.message : String(err2)}`);
+          }
           const data = sessionManager.loadSession(sessionId);
           if (data) {
+            setAppSessionId(data.meta.id);
             tabMgr.restoreFromMeta(data.meta.tabs, data.meta.activeTabId, data.tabMessages, data.tabCoreMessages);
             setForgeModeHeader(data.meta.forgeMode);
             setExitSessionId(data.meta.id);
-            setAppSessionId(data.meta.id);
             for (const tab of data.meta.tabs) {
               if (tab.checkpointTags?.length) {
                 useCheckpointStore.getState().restoreTagsFromMeta(tab.id, tab.checkpointTags ?? []);