@cortexkit/pi-magic-context 0.16.2 → 0.17.0

package/dist/subagent-entry.js

@@ -15043,14 +15043,334 @@ var init_embedding = __esm(() => {
   SWEEP_MAX_WALL_CLOCK_MS = 10 * 60 * 1000;
 });
 
+// ../../node_modules/.bun/nanotar@0.3.0/node_modules/nanotar/dist/index.mjs
+function parseTar(data, opts) {
+  const buffer2 = data.buffer || data;
+  const files = [];
+  let offset = 0;
+  let nextExtendedHeader;
+  let globalExtendedHeader;
+  while (offset < buffer2.byteLength - 512) {
+    let name = _readString(buffer2, offset, 100);
+    if (name.length === 0) {
+      break;
+    }
+    if (nextExtendedHeader) {
+      const longName = nextExtendedHeader.path || nextExtendedHeader.linkpath;
+      if (longName) {
+        name = longName;
+      }
+    }
+    const mode = _readString(buffer2, offset + 100, 8).trim();
+    const uid = Number.parseInt(_readString(buffer2, offset + 108, 8));
+    const gid = Number.parseInt(_readString(buffer2, offset + 116, 8));
+    const size = _readNumber(buffer2, offset + 124, 12);
+    const seek = 512 + 512 * Math.trunc(size / 512) + (size % 512 ? 512 : 0);
+    const mtime = _readNumber(buffer2, offset + 136, 12);
+    const _type = _readString(buffer2, offset + 156, 1) || "0";
+    const type = tarItemTypeMap[_type] || _type;
+    switch (type) {
+      case "extendedHeader":
+      case "globalExtendedHeader": {
+        const headers = _parseExtendedHeaders(new Uint8Array(buffer2, offset + 512, size));
+        if (type === "extendedHeader") {
+          nextExtendedHeader = headers;
+        } else {
+          nextExtendedHeader = undefined;
+          globalExtendedHeader = {
+            ...globalExtendedHeader,
+            ...headers
+          };
+        }
+        offset += seek;
+        continue;
+      }
+      case "gnuLongFileName":
+      case "gnuOldLongFileName":
+      case "gnuLongLinkName": {
+        nextExtendedHeader = { path: _readString(buffer2, offset + 512, size) };
+        offset += seek;
+        continue;
+      }
+    }
+    const user = _readString(buffer2, offset + 265, 32);
+    const group = _readString(buffer2, offset + 297, 32);
+    name = _sanitizePath(name);
+    const meta3 = {
+      name,
+      type,
+      size,
+      attrs: {
+        ...globalExtendedHeader,
+        ...nextExtendedHeader,
+        mode,
+        uid,
+        gid,
+        mtime,
+        user,
+        group
+      }
+    };
+    nextExtendedHeader = undefined;
+    if (opts?.filter && !opts.filter(meta3)) {
+      offset += seek;
+      continue;
+    }
+    if (opts?.metaOnly) {
+      files.push(meta3);
+      offset += seek;
+      continue;
+    }
+    const data2 = size === 0 ? undefined : new Uint8Array(buffer2, offset + 512, size);
+    files.push({
+      ...meta3,
+      data: data2,
+      get text() {
+        return new TextDecoder().decode(this.data);
+      }
+    });
+    offset += seek;
+  }
+  return files;
+}
+async function parseTarGzip(data, opts = {}) {
+  const stream = new ReadableStream({
+    start(controller) {
+      controller.enqueue(new Uint8Array(data));
+      controller.close();
+    }
+  }).pipeThrough(new DecompressionStream(opts.compression ?? "gzip"));
+  const decompressedData = await new Response(stream).arrayBuffer();
+  return parseTar(decompressedData, opts);
+}
+function _sanitizePath(path3) {
+  let normalized = path3.replace(/\\/g, "/");
+  normalized = normalized.replace(/^[a-zA-Z]:\//, "");
+  normalized = normalized.replace(/^\/+/, "");
+  const hasLeadingDotSlash = normalized.startsWith("./");
+  const parts = normalized.split("/");
+  const resolved = [];
+  for (const part of parts) {
+    if (part === "..") {
+      resolved.pop();
+    } else if (part !== "." && part !== "") {
+      resolved.push(part);
+    }
+  }
+  let result = resolved.join("/");
+  if (hasLeadingDotSlash && !result.startsWith("./")) {
+    result = "./" + result;
+  }
+  if (path3.endsWith("/") && !result.endsWith("/")) {
+    result += "/";
+  }
+  return result;
+}
+function _readString(buffer2, offset, size) {
+  const view = new Uint8Array(buffer2, offset, size);
+  const i = view.indexOf(0);
+  const td = new TextDecoder;
+  return td.decode(i === -1 ? view : view.slice(0, i));
+}
+function _readNumber(buffer2, offset, size) {
+  const view = new Uint8Array(buffer2, offset, size);
+  let str = "";
+  for (let i = 0;i < size; i++) {
+    str += String.fromCodePoint(view[i]);
+  }
+  return Number.parseInt(str, 8);
+}
+function _parseExtendedHeaders(data) {
+  const dataStr = new TextDecoder().decode(data);
+  const headers = {};
+  for (const line of dataStr.split(`
+`)) {
+    const s = line.split(" ")[1]?.split("=");
+    if (s) {
+      headers[s[0]] = s[1];
+    }
+  }
+  return headers;
+}
+var tarItemTypeMap;
+var init_dist = __esm(() => {
+  tarItemTypeMap = {
+    "0": "file",
+    "1": "hardLink",
+    "2": "symbolicLink",
+    "3": "characterDevice",
+    "4": "blockDevice",
+    "5": "directory",
+    "6": "fifo",
+    "7": "contiguousFile",
+    g: "globalExtendedHeader",
+    x: "extendedHeader",
+    D: "gnuDirectory",
+    I: "gnuInodeMetadata",
+    K: "gnuLongLinkName",
+    L: "gnuLongFileName",
+    N: "gnuOldLongFileName",
+    M: "gnuMultiVolume",
+    S: "gnuSparseFile",
+    E: "gnuExtendedSparse",
+    A: "solarisAcl",
+    V: "solarisVolumeLabel",
+    X: "solarisOldExtendedHeader"
+  };
+});
+
+// ../plugin/src/shared/native-binding.ts
+var exports_native_binding = {};
+__export(exports_native_binding, {
+  resolveBetterSqliteNativeBinding: () => resolveBetterSqliteNativeBinding
+});
+import { existsSync, mkdirSync as mkdirSync2, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import * as path3 from "node:path";
+function logInfo(message) {
+  log(`${PREFIX} ${message}`);
+}
+function logWarn(message) {
+  log(`${PREFIX} WARN ${message}`);
+}
+function probeAbi(binaryPath) {
+  const expected = process.versions.modules;
+  try {
+    const sandbox = { exports: {} };
+    process.dlopen(sandbox, binaryPath);
+    return { ok: true };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const pair = message.match(/NODE_MODULE_VERSION (\d+).*NODE_MODULE_VERSION (\d+)/s);
+    if (pair?.[1] && pair[2]) {
+      return { ok: false, expected: pair[2], actual: pair[1] };
+    }
+    const single = message.match(/NODE_MODULE_VERSION[ =:]+(\d+)/);
+    if (single?.[1]) {
+      return { ok: false, expected, actual: single[1] };
+    }
+    logWarn(`could not parse ABI from dlopen error: ${message}`);
+    return { ok: false, expected, actual: null };
+  }
+}
+function resolveBetterSqlite3OnDisk(requireFn) {
+  try {
+    const pkgJsonPath = requireFn.resolve("better-sqlite3/package.json");
+    const pkgDir = path3.dirname(pkgJsonPath);
+    const pkgJson = requireFn(pkgJsonPath);
+    const binaryPath = path3.join(pkgDir, "build", "Release", "better_sqlite3.node");
+    return { binaryPath, pkgVersion: pkgJson.version };
+  } catch (err) {
+    logWarn(`could not resolve better-sqlite3 in node_modules: ${err instanceof Error ? err.message : String(err)}`);
+    return null;
+  }
+}
+function getCachedBinaryPath(pkgVersion, abi) {
+  return path3.join(getCacheDir(), "cortexkit", "native-bindings", "better-sqlite3", `v${pkgVersion}`, `electron-v${abi}-${process.platform}-${process.arch}`, "better_sqlite3.node");
+}
+async function downloadElectronPrebuild(pkgVersion, abi) {
+  const filename = `better-sqlite3-v${pkgVersion}-electron-v${abi}-${process.platform}-${process.arch}.tar.gz`;
+  const url2 = `https://github.com/WiseLibs/better-sqlite3/releases/download/v${pkgVersion}/${filename}`;
+  logInfo(`downloading ${url2}`);
+  const response = await fetch(url2, {
+    redirect: "follow",
+    headers: { "User-Agent": "magic-context-plugin/native-binding" }
+  });
+  if (!response.ok) {
+    throw new Error(`failed to download Electron prebuild (HTTP ${response.status} ${response.statusText}) from ${url2}`);
+  }
+  const tarballBytes = new Uint8Array(await response.arrayBuffer());
+  logInfo(`downloaded ${(tarballBytes.length / 1024).toFixed(1)} KB; extracting`);
+  const files = await parseTarGzip(tarballBytes);
+  const nodeFile = files.find((f) => f.name.endsWith("better_sqlite3.node"));
+  if (!nodeFile?.data) {
+    const names = files.map((f) => f.name).join(", ");
+    throw new Error(`Electron prebuild tarball did not contain better_sqlite3.node; got: [${names}]`);
+  }
+  return nodeFile.data instanceof Uint8Array ? nodeFile.data : new Uint8Array(nodeFile.data);
+}
+async function resolveBetterSqliteNativeBinding() {
+  if (!process.versions.electron) {
+    return null;
+  }
+  if (inFlight) {
+    return inFlight;
+  }
+  const promise2 = (async () => {
+    const expected = process.versions.modules;
+    logInfo(`Electron detected (v${process.versions.electron}, NODE_MODULE_VERSION ${expected}); verifying better-sqlite3 binding`);
+    const requireFn = createRequire(import.meta.url);
+    const resolved = resolveBetterSqlite3OnDisk(requireFn);
+    if (!resolved) {
+      return null;
+    }
+    const { binaryPath: diskPath, pkgVersion } = resolved;
+    if (existsSync(diskPath)) {
+      const diskProbe = probeAbi(diskPath);
+      if (diskProbe.ok) {
+        logInfo(`on-disk binary already matches Electron ABI v${expected}; using default bindings() lookup`);
+        return null;
+      }
+      logInfo(`on-disk binary ABI ${diskProbe.actual ?? "unknown"} != required ${expected}; will use Electron prebuild`);
+    } else {
+      logWarn(`expected better-sqlite3 binary not found at ${diskPath}; will fetch Electron prebuild anyway`);
+    }
+    const cachedPath = getCachedBinaryPath(pkgVersion, expected);
+    if (existsSync(cachedPath)) {
+      const cachedProbe = probeAbi(cachedPath);
+      if (cachedProbe.ok) {
+        logInfo(`using cached Electron prebuild at ${cachedPath}`);
+        return cachedPath;
+      }
+      logWarn(`cached binary at ${cachedPath} has wrong ABI (${cachedProbe.actual ?? "unknown"} != ${expected}); refetching`);
+    }
+    mkdirSync2(path3.dirname(cachedPath), { recursive: true });
+    const nodeFileBytes = await downloadElectronPrebuild(pkgVersion, expected);
+    writeFileSync(cachedPath, nodeFileBytes);
+    logInfo(`cached Electron prebuild at ${cachedPath} (${(nodeFileBytes.length / 1024).toFixed(1)} KB)`);
+    const finalProbe = probeAbi(cachedPath);
+    if (!finalProbe.ok) {
+      throw new Error(`downloaded Electron prebuild has wrong ABI (${finalProbe.actual ?? "unknown"} != ${expected}); refusing to use`);
+    }
+    return cachedPath;
+  })();
+  inFlight = promise2;
+  try {
+    return await promise2;
+  } finally {
+    if (inFlight === promise2) {
+      inFlight = null;
+    }
+  }
+}
+var PREFIX = "[native-binding]", inFlight = null;
+var init_native_binding = __esm(() => {
+  init_dist();
+  init_data_path();
+  init_logger();
+});
+
 // ../plugin/src/shared/sqlite.ts
-var isBun, bunSpec, betterSpec, sqliteModule, DatabaseImpl, Database;
+var isBun, bunSpec, betterSpec, electronNativeBinding, sqliteModule, RawDatabaseImpl, DatabaseImpl, Database;
 var init_sqlite = __esm(async () => {
   isBun = typeof process !== "undefined" && typeof process.versions?.bun === "string";
   bunSpec = "bun:" + "sqlite";
   betterSpec = "better-" + "sqlite3";
+  electronNativeBinding = isBun ? null : await (async () => {
+    const mod = await Promise.resolve().then(() => (init_native_binding(), exports_native_binding));
+    return mod.resolveBetterSqliteNativeBinding();
+  })();
   sqliteModule = isBun ? await import(bunSpec) : await import(betterSpec);
-  DatabaseImpl = isBun ? sqliteModule.Database : sqliteModule.default;
+  RawDatabaseImpl = isBun ? sqliteModule.Database : sqliteModule.default;
+  DatabaseImpl = electronNativeBinding == null ? RawDatabaseImpl : class DatabaseWithElectronBinding extends RawDatabaseImpl {
+    constructor(filename, options) {
+      const fallback = electronNativeBinding;
+      super(filename, {
+        ...options,
+        nativeBinding: options?.nativeBinding ?? fallback
+      });
+    }
+  };
   Database = DatabaseImpl;
 });
 
@@ -15159,12 +15479,12 @@ var require_esprima = __commonJS((exports, module) => {
         }
         exports2.parseScript = parseScript;
         function tokenize(code, options, delegate) {
-          var tokenizer = new tokenizer_1.Tokenizer(code, options);
+          var tokenizer2 = new tokenizer_1.Tokenizer(code, options);
           var tokens;
           tokens = [];
           try {
             while (true) {
-              var token = tokenizer.getNextToken();
+              var token = tokenizer2.getNextToken();
               if (!token) {
                 break;
               }
@@ -15174,10 +15494,10 @@ var require_esprima = __commonJS((exports, module) => {
               tokens.push(token);
             }
           } catch (e) {
-            tokenizer.errorHandler.tolerate(e);
+            tokenizer2.errorHandler.tolerate(e);
           }
-          if (tokenizer.errorHandler.tolerant) {
-            tokens.errors = tokenizer.errors();
+          if (tokenizer2.errorHandler.tolerant) {
+            tokens.errors = tokenizer2.errors();
           }
           return tokens;
         }
@@ -15752,13 +16072,13 @@ var require_esprima = __commonJS((exports, module) => {
           };
           JSXParser2.prototype.parseJSXNameValueAttribute = function() {
             var node = this.createJSXNode();
-            var name = this.parseJSXAttributeName();
+            var name2 = this.parseJSXAttributeName();
             var value = null;
             if (this.matchJSX("=")) {
               this.expectJSX("=");
               value = this.parseJSXAttributeValue();
             }
-            return this.finalize(node, new JSXNode.JSXAttribute(name, value));
+            return this.finalize(node, new JSXNode.JSXAttribute(name2, value));
           };
           JSXParser2.prototype.parseJSXSpreadAttribute = function() {
             var node = this.createJSXNode();
@@ -15780,14 +16100,14 @@ var require_esprima = __commonJS((exports, module) => {
           JSXParser2.prototype.parseJSXOpeningElement = function() {
             var node = this.createJSXNode();
             this.expectJSX("<");
-            var name = this.parseJSXElementName();
+            var name2 = this.parseJSXElementName();
             var attributes = this.parseJSXAttributes();
             var selfClosing = this.matchJSX("/");
             if (selfClosing) {
               this.expectJSX("/");
             }
             this.expectJSX(">");
-            return this.finalize(node, new JSXNode.JSXOpeningElement(name, selfClosing, attributes));
+            return this.finalize(node, new JSXNode.JSXOpeningElement(name2, selfClosing, attributes));
           };
           JSXParser2.prototype.parseJSXBoundaryElement = function() {
             var node = this.createJSXNode();
@@ -15798,14 +16118,14 @@ var require_esprima = __commonJS((exports, module) => {
               this.expectJSX(">");
               return this.finalize(node, new JSXNode.JSXClosingElement(name_3));
             }
-            var name = this.parseJSXElementName();
+            var name2 = this.parseJSXElementName();
             var attributes = this.parseJSXAttributes();
             var selfClosing = this.matchJSX("/");
             if (selfClosing) {
               this.expectJSX("/");
             }
             this.expectJSX(">");
-            return this.finalize(node, new JSXNode.JSXOpeningElement(name, selfClosing, attributes));
+            return this.finalize(node, new JSXNode.JSXOpeningElement(name2, selfClosing, attributes));
           };
           JSXParser2.prototype.parseJSXEmptyExpression = function() {
             var node = this.createJSXChildNode();
@@ -15948,9 +16268,9 @@ var require_esprima = __commonJS((exports, module) => {
         Object.defineProperty(exports2, "__esModule", { value: true });
         var jsx_syntax_1 = __webpack_require__(6);
         var JSXClosingElement = function() {
-          function JSXClosingElement2(name) {
+          function JSXClosingElement2(name2) {
             this.type = jsx_syntax_1.JSXSyntax.JSXClosingElement;
-            this.name = name;
+            this.name = name2;
           }
           return JSXClosingElement2;
         }();
@@ -15981,9 +16301,9 @@ var require_esprima = __commonJS((exports, module) => {
         }();
         exports2.JSXExpressionContainer = JSXExpressionContainer;
         var JSXIdentifier = function() {
-          function JSXIdentifier2(name) {
+          function JSXIdentifier2(name2) {
             this.type = jsx_syntax_1.JSXSyntax.JSXIdentifier;
-            this.name = name;
+            this.name = name2;
           }
           return JSXIdentifier2;
         }();
@@ -15998,27 +16318,27 @@ var require_esprima = __commonJS((exports, module) => {
         }();
         exports2.JSXMemberExpression = JSXMemberExpression;
         var JSXAttribute = function() {
-          function JSXAttribute2(name, value) {
+          function JSXAttribute2(name2, value) {
             this.type = jsx_syntax_1.JSXSyntax.JSXAttribute;
-            this.name = name;
+            this.name = name2;
             this.value = value;
           }
           return JSXAttribute2;
         }();
         exports2.JSXAttribute = JSXAttribute;
         var JSXNamespacedName = function() {
-          function JSXNamespacedName2(namespace, name) {
+          function JSXNamespacedName2(namespace, name2) {
             this.type = jsx_syntax_1.JSXSyntax.JSXNamespacedName;
             this.namespace = namespace;
-            this.name = name;
+            this.name = name2;
           }
           return JSXNamespacedName2;
         }();
         exports2.JSXNamespacedName = JSXNamespacedName;
         var JSXOpeningElement = function() {
-          function JSXOpeningElement2(name, selfClosing, attributes) {
+          function JSXOpeningElement2(name2, selfClosing, attributes) {
             this.type = jsx_syntax_1.JSXSyntax.JSXOpeningElement;
-            this.name = name;
+            this.name = name2;
             this.selfClosing = selfClosing;
             this.attributes = attributes;
           }
@@ -16392,9 +16712,9 @@ var require_esprima = __commonJS((exports, module) => {
         }();
         exports2.FunctionExpression = FunctionExpression;
         var Identifier = function() {
-          function Identifier2(name) {
+          function Identifier2(name2) {
             this.type = syntax_1.Syntax.Identifier;
-            this.name = name;
+            this.name = name2;
           }
           return Identifier2;
         }();
@@ -18900,10 +19220,10 @@ var require_esprima = __commonJS((exports, module) => {
             this.context.inFunctionBody = previousInFunctionBody;
             return this.finalize(node, new Node.BlockStatement(body));
           };
-          Parser2.prototype.validateParam = function(options, param, name) {
-            var key = "$" + name;
+          Parser2.prototype.validateParam = function(options, param, name2) {
+            var key = "$" + name2;
             if (this.context.strict) {
-              if (this.scanner.isRestrictedWord(name)) {
+              if (this.scanner.isRestrictedWord(name2)) {
                 options.stricted = param;
                 options.message = messages_1.Messages.StrictParamName;
               }
@@ -18912,10 +19232,10 @@ var require_esprima = __commonJS((exports, module) => {
                 options.message = messages_1.Messages.StrictParamDupe;
               }
             } else if (!options.firstRestricted) {
-              if (this.scanner.isRestrictedWord(name)) {
+              if (this.scanner.isRestrictedWord(name2)) {
                 options.firstRestricted = param;
                 options.message = messages_1.Messages.StrictParamName;
-              } else if (this.scanner.isStrictModeReservedWord(name)) {
+              } else if (this.scanner.isStrictModeReservedWord(name2)) {
                 options.firstRestricted = param;
                 options.message = messages_1.Messages.StrictReservedWord;
               } else if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
@@ -21123,8 +21443,8 @@ var require_esprima = __commonJS((exports, module) => {
           };
           return Reader2;
         }();
-        var Tokenizer = function() {
-          function Tokenizer2(code, config2) {
+        var Tokenizer2 = function() {
+          function Tokenizer3(code, config2) {
             this.errorHandler = new error_handler_1.ErrorHandler;
             this.errorHandler.tolerant = config2 ? typeof config2.tolerant === "boolean" && config2.tolerant : false;
             this.scanner = new scanner_1.Scanner(code, this.errorHandler);
@@ -21134,10 +21454,10 @@ var require_esprima = __commonJS((exports, module) => {
             this.buffer = [];
             this.reader = new Reader;
           }
-          Tokenizer2.prototype.errors = function() {
+          Tokenizer3.prototype.errors = function() {
             return this.errorHandler.errors;
           };
-          Tokenizer2.prototype.getNextToken = function() {
+          Tokenizer3.prototype.getNextToken = function() {
             if (this.buffer.length === 0) {
               var comments = this.scanner.scanComments();
               if (this.scanner.trackComment) {
@@ -21195,9 +21515,9 @@ var require_esprima = __commonJS((exports, module) => {
             }
             return this.buffer.shift();
           };
-          return Tokenizer2;
+          return Tokenizer3;
         }();
-        exports2.Tokenizer = Tokenizer;
+        exports2.Tokenizer = Tokenizer2;
       }
     ]);
   });
@@ -22422,7 +22742,7 @@ var require_parse = __commonJS((exports, module) => {
     set_comments_host(obj);
     set_prop(UNDEFINED, true);
     let started = false;
-    let name;
+    let name2;
     parse_comments();
     while (!is(CURLY_BRACKET_CLOSE)) {
       if (started) {
@@ -22437,15 +22757,15 @@ var require_parse = __commonJS((exports, module) => {
       }
       started = true;
       expect("String");
-      name = JSON.parse(current.value);
-      set_prop(name);
+      name2 = JSON.parse(current.value);
+      set_prop(name2);
       assign_comments(PREFIX_BEFORE);
       next();
       parse_comments(PREFIX_AFTER_PROP);
       expect(COLON);
       next();
       parse_comments(PREFIX_AFTER_COLON);
-      obj[name] = transform2(name, walk());
+      obj[name2] = transform2(name2, walk());
       parse_comments();
     }
     if (started) {
@@ -22670,10 +22990,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join5 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
+  var join7 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join5(comment, inside, gap);
+    return join7(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -22695,13 +23015,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join5(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join7(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += stringify(i, value, deeper_gap) || STR_NULL;
       inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
       after_comma = process_comments(value, AFTER(i), deeper_gap);
     }
-    inside += join5(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join7(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return BRACKET_OPEN + join_content(inside, value, gap) + BRACKET_CLOSE;
   };
   var object_stringify = (value, gap) => {
@@ -22722,13 +23042,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join5(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join7(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += quote(key) + process_comments(value, AFTER_PROP(key), deeper_gap) + COLON + process_comments(value, AFTER_COLON(key), deeper_gap) + SPACE + sv + process_comments(value, AFTER_VALUE(key), deeper_gap);
       after_comma = process_comments(value, AFTER(key), deeper_gap);
     };
     keys.forEach(iteratee);
-    inside += join5(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join7(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
   };
   function stringify(key, holder, gap) {
@@ -22829,9 +23149,9 @@ __export(exports_read_session_db, {
   findLastAssistantModelFromOpenCodeDb: () => findLastAssistantModelFromOpenCodeDb,
   closeReadOnlySessionDb: () => closeReadOnlySessionDb
 });
-import { join as join6 } from "node:path";
+import { join as join8 } from "node:path";
 function getOpenCodeDbPath() {
-  return join6(getDataDir(), "opencode", "opencode.db");
+  return join8(getDataDir(), "opencode", "opencode.db");
 }
 function closeCachedReadOnlyDb() {
   if (!cachedReadOnlyDb) {
@@ -22890,7 +23210,8 @@ function findLastAssistantModelFromOpenCodeDb(sessionId) {
   try {
     return withReadOnlySessionDb((db) => {
       const row = db.prepare(`SELECT json_extract(data, '$.providerID') as providerID,
-                            json_extract(data, '$.modelID') as modelID
+                            json_extract(data, '$.modelID') as modelID,
+                            json_extract(data, '$.agent') as agent
                      FROM message
                      WHERE session_id = ?
                        AND json_extract(data, '$.role') = 'assistant'
@@ -22901,7 +23222,12 @@ function findLastAssistantModelFromOpenCodeDb(sessionId) {
       if (!row || typeof row.providerID !== "string" || typeof row.modelID !== "string") {
         return null;
       }
-      return { providerID: row.providerID, modelID: row.modelID };
+      const agent = typeof row.agent === "string" && row.agent.length > 0 ? row.agent : undefined;
+      return {
+        providerID: row.providerID,
+        modelID: row.modelID,
+        ...agent ? { agent } : {}
+      };
     });
   } catch (error48) {
     log("[magic-context] failed to recover live model from OpenCode DB:", error48);
@@ -22920,8 +23246,8 @@ init_embedding();
 
 // ../plugin/src/features/magic-context/storage-db.ts
 init_data_path();
-import { copyFileSync, cpSync, existsSync, mkdirSync as mkdirSync2 } from "node:fs";
-import { join as join4 } from "node:path";
+import { copyFileSync, cpSync, existsSync as existsSync3, mkdirSync as mkdirSync3 } from "node:fs";
+import { join as join6 } from "node:path";
 
 // ../plugin/src/shared/error-message.ts
 function getErrorMessage(error48) {
@@ -23206,6 +23532,58 @@ var MIGRATIONS = [
         db.exec("ALTER TABLE notes ADD COLUMN harness TEXT NOT NULL DEFAULT 'opencode'");
       }
     }
+  },
+  {
+    version: 8,
+    description: "Add partial indexes on tags(session_id, tag_number) for active and dropped",
+    up: (db) => {
+      db.exec(`
+                CREATE INDEX IF NOT EXISTS idx_tags_active_session_tag_number
+                ON tags(session_id, tag_number)
+                WHERE status = 'active';
+
+                CREATE INDEX IF NOT EXISTS idx_tags_dropped_session_tag_number
+                ON tags(session_id, tag_number)
+                WHERE status = 'dropped';
+            `);
+      db.exec("ANALYZE tags;");
+    }
+  },
+  {
+    version: 9,
+    description: "Persist tool_definition_measurements across plugin restarts",
+    up: (db) => {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS tool_definition_measurements (
+                    provider_id TEXT NOT NULL,
+                    model_id TEXT NOT NULL,
+                    agent_name TEXT NOT NULL,
+                    tool_id TEXT NOT NULL,
+                    token_count INTEGER NOT NULL,
+                    recorded_at INTEGER NOT NULL,
+                    PRIMARY KEY (provider_id, model_id, agent_name, tool_id)
+                );
+            `);
+    }
+  },
+  {
+    version: 10,
+    description: "Add tool_owner_message_id column to tags + composite identity indexes",
+    up: (db) => {
+      const cols = db.prepare("PRAGMA table_info(tags)").all();
+      if (!cols.some((c) => c.name === "tool_owner_message_id")) {
+        db.exec("ALTER TABLE tags ADD COLUMN tool_owner_message_id TEXT DEFAULT NULL");
+      }
+      db.exec(`
+                CREATE UNIQUE INDEX IF NOT EXISTS idx_tags_tool_composite
+                ON tags(session_id, message_id, tool_owner_message_id)
+                WHERE type = 'tool' AND tool_owner_message_id IS NOT NULL;
+
+                CREATE INDEX IF NOT EXISTS idx_tags_tool_null_owner
+                ON tags(session_id, message_id)
+                WHERE type = 'tool' AND tool_owner_message_id IS NULL;
+            `);
+    }
   }
 ];
 function ensureMigrationsTable(db) {
@@ -23221,22 +23599,51 @@ function getCurrentVersion(db) {
   const row = db.prepare("SELECT MAX(version) as version FROM schema_migrations").get();
   return row?.version ?? 0;
 }
+function isSiblingMigrationConflict(error48, version2) {
+  if (!(error48 instanceof Error))
+    return false;
+  const code = error48.code;
+  if (code !== "SQLITE_CONSTRAINT_PRIMARYKEY" && code !== "SQLITE_CONSTRAINT_UNIQUE") {
+    return false;
+  }
+  const msg = error48.message;
+  if (!msg.includes("schema_migrations"))
+    return false;
+  if (!msg.toLowerCase().includes("version"))
+    return false;
+  return true;
+}
 function runMigrations(db) {
   ensureMigrationsTable(db);
-  const currentVersion = getCurrentVersion(db);
-  const pendingMigrations = MIGRATIONS.filter((m) => m.version > currentVersion);
+  let currentVersion = getCurrentVersion(db);
+  let pendingMigrations = MIGRATIONS.filter((m) => m.version > currentVersion);
   if (pendingMigrations.length === 0) {
     return;
   }
   log(`[migrations] current schema version: ${currentVersion}, applying ${pendingMigrations.length} migration(s)`);
-  for (const migration of pendingMigrations) {
+  let migrationIndex = 0;
+  while (migrationIndex < pendingMigrations.length) {
+    const migration = pendingMigrations[migrationIndex];
     try {
       db.transaction(() => {
         migration.up(db);
         db.prepare("INSERT INTO schema_migrations (version, description, applied_at) VALUES (?, ?, ?)").run(migration.version, migration.description, Date.now());
       })();
       log(`[migrations] applied v${migration.version}: ${migration.description}`);
+      migrationIndex += 1;
     } catch (error48) {
+      if (isSiblingMigrationConflict(error48, migration.version)) {
+        log(`[migrations] v${migration.version} already applied by sibling instance — resuming with re-read version`);
+        const reReadVersion = getCurrentVersion(db);
+        if (reReadVersion <= currentVersion) {
+          log(`[migrations] FAILED v${migration.version}: sibling-conflict shape but version not advanced (${reReadVersion} <= ${currentVersion}) — failing closed`);
+          throw new Error(`Migration v${migration.version} failed: sibling conflict reported but version did not advance. Database may need manual repair.`);
+        }
+        currentVersion = reReadVersion;
+        pendingMigrations = MIGRATIONS.filter((m) => m.version > currentVersion);
+        migrationIndex = 0;
+        continue;
+      }
       log(`[migrations] FAILED v${migration.version}: ${migration.description} — ${error48 instanceof Error ? error48.message : String(error48)}`);
       throw new Error(`Migration v${migration.version} failed: ${error48 instanceof Error ? error48.message : String(error48)}. Database may need manual repair.`);
     }
@@ -23244,655 +23651,6 @@ function runMigrations(db) {
   log(`[migrations] schema version now: ${MIGRATIONS[MIGRATIONS.length - 1].version}`);
 }
 
-// ../plugin/src/features/magic-context/storage-db.ts
-var databases = new Map;
-var persistenceByDatabase = new WeakMap;
-var persistenceErrorByDatabase = new WeakMap;
-function resolveDatabasePath() {
-  const dbDir = getMagicContextStorageDir();
-  return { dbDir, dbPath: join4(dbDir, "context.db") };
-}
-function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
-  if (existsSync(targetDbPath))
-    return;
-  const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
-  const legacyDbPath = join4(legacyDir, "context.db");
-  if (!existsSync(legacyDbPath))
-    return;
-  log(`[magic-context] migrating legacy plugin storage: ${legacyDir} -> ${targetDbDir} (legacy left in place as backup)`);
-  mkdirSync2(targetDbDir, { recursive: true });
-  for (const suffix of ["", "-wal", "-shm"]) {
-    const src = `${legacyDbPath}${suffix}`;
-    const dst = join4(targetDbDir, `context.db${suffix}`);
-    if (existsSync(src)) {
-      try {
-        copyFileSync(src, dst);
-      } catch (error48) {
-        log(`[magic-context] failed to copy ${src}:`, getErrorMessage(error48));
-      }
-    }
-  }
-  const legacyModelsDir = join4(legacyDir, "models");
-  const targetModelsDir = join4(targetDbDir, "models");
-  if (existsSync(legacyModelsDir) && !existsSync(targetModelsDir)) {
-    try {
-      cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
-    } catch (error48) {
-      log("[magic-context] failed to copy embedding model cache:", getErrorMessage(error48));
-    }
-  }
-}
-function initializeDatabase(db) {
-  db.exec("PRAGMA journal_mode=WAL");
-  db.exec("PRAGMA busy_timeout=5000");
-  db.exec("PRAGMA foreign_keys=ON");
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS tags (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT,
-      message_id TEXT,
-      type TEXT,
-      status TEXT DEFAULT 'active',
-      byte_size INTEGER,
-      tag_number INTEGER,
-      harness TEXT NOT NULL DEFAULT 'opencode',
-      UNIQUE(session_id, tag_number)
-    );
-
-    CREATE TABLE IF NOT EXISTS pending_ops (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT,
-      tag_id INTEGER,
-      operation TEXT,
-      queued_at INTEGER,
-      harness TEXT NOT NULL DEFAULT 'opencode'
-    );
-
-    CREATE TABLE IF NOT EXISTS source_contents (
-      tag_id INTEGER,
-      session_id TEXT,
-      content TEXT,
-      created_at INTEGER,
-      harness TEXT NOT NULL DEFAULT 'opencode',
-      PRIMARY KEY(session_id, tag_id)
-    );
-
-    CREATE TABLE IF NOT EXISTS compartments (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      sequence INTEGER NOT NULL,
-      start_message INTEGER NOT NULL,
-      end_message INTEGER NOT NULL,
-      start_message_id TEXT DEFAULT '',
-      end_message_id TEXT DEFAULT '',
-      title TEXT NOT NULL,
-      content TEXT NOT NULL,
-      created_at INTEGER NOT NULL,
-      harness TEXT NOT NULL DEFAULT 'opencode',
-      UNIQUE(session_id, sequence)
-    );
-    CREATE INDEX IF NOT EXISTS idx_compartments_session ON compartments(session_id);
-
-    CREATE TABLE IF NOT EXISTS compression_depth (
-      session_id TEXT NOT NULL,
-      message_ordinal INTEGER NOT NULL,
-      depth INTEGER NOT NULL DEFAULT 0,
-      harness TEXT NOT NULL DEFAULT 'opencode',
-      PRIMARY KEY(session_id, message_ordinal)
-    );
-    CREATE INDEX IF NOT EXISTS idx_compression_depth_session ON compression_depth(session_id);
-
-    CREATE TABLE IF NOT EXISTS session_facts (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      category TEXT NOT NULL,
-      content TEXT NOT NULL,
-      created_at INTEGER NOT NULL,
-      updated_at INTEGER NOT NULL,
-      harness TEXT NOT NULL DEFAULT 'opencode'
-    );
-
-    -- session_notes and smart_notes were merged into the unified notes table
-    -- by migration v1 (see features/magic-context/migrations.ts). The old tables
-    -- are never recreated; fresh DBs create only notes, upgraded DBs have
-    -- their old tables migrated and dropped by the migration runner.
-
-    CREATE TABLE IF NOT EXISTS memories (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      project_path TEXT NOT NULL,
-      category TEXT NOT NULL,
-      content TEXT NOT NULL,
-      normalized_hash TEXT NOT NULL,
-      source_session_id TEXT,
-      source_type TEXT DEFAULT 'historian',
-      seen_count INTEGER DEFAULT 1,
-      retrieval_count INTEGER DEFAULT 0,
-      first_seen_at INTEGER NOT NULL,
-      created_at INTEGER NOT NULL,
-      updated_at INTEGER NOT NULL,
-      last_seen_at INTEGER NOT NULL,
-      last_retrieved_at INTEGER,
-      status TEXT DEFAULT 'active',
-      expires_at INTEGER,
-      verification_status TEXT DEFAULT 'unverified',
-      verified_at INTEGER,
-      superseded_by_memory_id INTEGER,
-      merged_from TEXT,
-      metadata_json TEXT,
-      UNIQUE(project_path, category, normalized_hash)
-    );
-
-    CREATE TABLE IF NOT EXISTS memory_embeddings (
-      memory_id INTEGER PRIMARY KEY REFERENCES memories(id) ON DELETE CASCADE,
-      embedding BLOB NOT NULL,
-      model_id TEXT
-    );
-
-    CREATE TABLE IF NOT EXISTS dream_state (
-      key TEXT PRIMARY KEY,
-      value TEXT NOT NULL
-    );
-
-    CREATE TABLE IF NOT EXISTS dream_queue (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      project_path TEXT NOT NULL,
-      reason TEXT NOT NULL,
-      enqueued_at INTEGER NOT NULL,
-      started_at INTEGER,
-      retry_count INTEGER DEFAULT 0
-    );
-    CREATE INDEX IF NOT EXISTS idx_dream_queue_project ON dream_queue(project_path);
-CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, enqueued_at);
-
-    CREATE TABLE IF NOT EXISTS dream_runs (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      project_path TEXT NOT NULL,
-      started_at INTEGER NOT NULL,
-      finished_at INTEGER NOT NULL,
-      holder_id TEXT NOT NULL,
-      tasks_json TEXT NOT NULL,
-      tasks_succeeded INTEGER NOT NULL DEFAULT 0,
-      tasks_failed INTEGER NOT NULL DEFAULT 0,
-      smart_notes_surfaced INTEGER NOT NULL DEFAULT 0,
-      smart_notes_pending INTEGER NOT NULL DEFAULT 0,
-      memory_changes_json TEXT
-    );
-    CREATE INDEX IF NOT EXISTS idx_dream_runs_project ON dream_runs(project_path, finished_at DESC);
-
-    -- (smart_notes: see note above; merged into unified notes table by migration v1)
-
-    CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
-      content,
-      category,
-      content='memories',
-      content_rowid='id',
-      tokenize='porter unicode61'
-    );
-
-    CREATE VIRTUAL TABLE IF NOT EXISTS message_history_fts USING fts5(
-      session_id UNINDEXED,
-      message_ordinal UNINDEXED,
-      message_id UNINDEXED,
-      role,
-      content,
-      tokenize='porter unicode61'
-    );
-
-    CREATE TABLE IF NOT EXISTS message_history_index (
-      session_id TEXT PRIMARY KEY,
-      last_indexed_ordinal INTEGER NOT NULL DEFAULT 0,
-      updated_at INTEGER NOT NULL,
-      harness TEXT NOT NULL DEFAULT 'opencode'
-    );
-
-    CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
-      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
-    END;
-
-    CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
-      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
-    END;
-
-    CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
-      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
-      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
-    END;
-
-    CREATE TABLE IF NOT EXISTS session_meta (
-      session_id TEXT PRIMARY KEY,
-      harness TEXT NOT NULL DEFAULT 'opencode',
-      last_response_time INTEGER,
-      cache_ttl TEXT,
-      counter INTEGER DEFAULT 0,
-      last_nudge_tokens INTEGER DEFAULT 0,
-      last_nudge_band TEXT DEFAULT '',
-      last_transform_error TEXT DEFAULT '',
-      nudge_anchor_message_id TEXT DEFAULT '',
-      nudge_anchor_text TEXT DEFAULT '',
-      sticky_turn_reminder_text TEXT DEFAULT '',
-      sticky_turn_reminder_message_id TEXT DEFAULT '',
-      note_nudge_trigger_pending INTEGER DEFAULT 0,
-      note_nudge_trigger_message_id TEXT DEFAULT '',
-      note_nudge_sticky_text TEXT DEFAULT '',
-      note_nudge_sticky_message_id TEXT DEFAULT '',
-      is_subagent INTEGER DEFAULT 0,
-      last_context_percentage REAL DEFAULT 0,
-      last_input_tokens INTEGER DEFAULT 0,
-      times_execute_threshold_reached INTEGER DEFAULT 0,
-      compartment_in_progress INTEGER DEFAULT 0,
-      historian_failure_count INTEGER DEFAULT 0,
-      historian_last_error TEXT DEFAULT NULL,
-      historian_last_failure_at INTEGER DEFAULT NULL,
-      system_prompt_hash TEXT DEFAULT '',
-      memory_block_cache TEXT DEFAULT '',
-      memory_block_count INTEGER DEFAULT 0,
-      memory_block_ids TEXT DEFAULT ''
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
-    CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
-    CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
-    CREATE INDEX IF NOT EXISTS idx_pending_ops_session_tag_id ON pending_ops(session_id, tag_id);
-    CREATE INDEX IF NOT EXISTS idx_source_contents_session ON source_contents(session_id);
-    
-    CREATE TABLE IF NOT EXISTS recomp_compartments (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      sequence INTEGER NOT NULL,
-      start_message INTEGER NOT NULL,
-      end_message INTEGER NOT NULL,
-      start_message_id TEXT DEFAULT '',
-      end_message_id TEXT DEFAULT '',
-      title TEXT NOT NULL,
-      content TEXT NOT NULL,
-      pass_number INTEGER NOT NULL,
-      created_at INTEGER NOT NULL,
-      harness TEXT NOT NULL DEFAULT 'opencode',
-      UNIQUE(session_id, sequence)
-    );
-
-    CREATE TABLE IF NOT EXISTS recomp_facts (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      session_id TEXT NOT NULL,
-      category TEXT NOT NULL,
-      content TEXT NOT NULL,
-      pass_number INTEGER NOT NULL,
-      created_at INTEGER NOT NULL,
-      harness TEXT NOT NULL DEFAULT 'opencode'
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_session_facts_session ON session_facts(session_id);
-    CREATE INDEX IF NOT EXISTS idx_recomp_compartments_session ON recomp_compartments(session_id);
-    CREATE INDEX IF NOT EXISTS idx_recomp_facts_session ON recomp_facts(session_id);
-    CREATE INDEX IF NOT EXISTS idx_memories_project_status_category ON memories(project_path, status, category);
-    CREATE INDEX IF NOT EXISTS idx_memories_project_status_expires ON memories(project_path, status, expires_at);
-    CREATE INDEX IF NOT EXISTS idx_memories_project_category_hash ON memories(project_path, category, normalized_hash);
-    CREATE INDEX IF NOT EXISTS idx_message_history_index_updated_at ON message_history_index(updated_at);
-  `);
-  ensureColumn(db, "session_meta", "last_nudge_band", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "nudge_anchor_text", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "sticky_turn_reminder_text", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "sticky_turn_reminder_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "note_nudge_trigger_pending", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "note_nudge_trigger_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "note_nudge_sticky_text", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "note_nudge_sticky_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "note_last_read_at", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "times_execute_threshold_reached", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "compartment_in_progress", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "historian_failure_count", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "historian_last_error", "TEXT DEFAULT NULL");
-  ensureColumn(db, "session_meta", "historian_last_failure_at", "INTEGER DEFAULT NULL");
-  ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
-  ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
-  ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
-  ensureColumn(db, "session_meta", "memory_block_cache", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "memory_block_count", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "memory_block_ids", "TEXT DEFAULT ''");
-  ensureColumn(db, "dream_queue", "retry_count", "INTEGER DEFAULT 0");
-  ensureColumn(db, "tags", "reasoning_byte_size", "INTEGER DEFAULT 0");
-  ensureColumn(db, "tags", "drop_mode", "TEXT DEFAULT 'full'");
-  ensureColumn(db, "tags", "tool_name", "TEXT");
-  ensureColumn(db, "tags", "input_byte_size", "INTEGER DEFAULT 0");
-  ensureColumn(db, "tags", "caveman_depth", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "system_prompt_tokens", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "compaction_marker_state", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "key_files", "TEXT DEFAULT ''");
-  ensureColumn(db, "session_meta", "conversation_tokens", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "tool_call_tokens", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "recomp_partial_range_start", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "recomp_partial_range_end", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
-  ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
-  ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "source_contents", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "compartments", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "compression_depth", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "session_facts", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "session_meta", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "recomp_compartments", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "recomp_facts", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-  ensureColumn(db, "message_history_index", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
-}
-function healAllNullColumns(db) {
-  healNullTextColumns(db);
-  healNullIntegerColumns(db);
-  healMissingMemoryBlockIds(db);
-}
-function healMissingMemoryBlockIds(db) {
-  try {
-    db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE memory_block_cache != '' AND (memory_block_ids IS NULL OR memory_block_ids = '') AND memory_block_count > 0").run();
-  } catch {}
-}
-function healNullTextColumns(db) {
-  const columns = [
-    ["cache_ttl", ""],
-    ["last_nudge_band", ""],
-    ["last_transform_error", ""],
-    ["nudge_anchor_message_id", ""],
-    ["nudge_anchor_text", ""],
-    ["sticky_turn_reminder_text", ""],
-    ["sticky_turn_reminder_message_id", ""],
-    ["note_nudge_trigger_message_id", ""],
-    ["note_nudge_sticky_text", ""],
-    ["note_nudge_sticky_message_id", ""],
-    ["system_prompt_hash", ""],
-    ["stripped_placeholder_ids", ""],
-    ["memory_block_cache", ""],
-    ["memory_block_ids", ""],
-    ["compaction_marker_state", ""],
-    ["key_files", ""]
-  ];
-  for (const [column, fallback] of columns) {
-    try {
-      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
-    } catch (_error) {}
-  }
-}
-function healNullIntegerColumns(db) {
-  const columns = [
-    ["times_execute_threshold_reached", 0],
-    ["compartment_in_progress", 0],
-    ["historian_failure_count", 0],
-    ["cleared_reasoning_through_tag", 0],
-    ["memory_block_count", 0],
-    ["system_prompt_tokens", 0],
-    ["conversation_tokens", 0],
-    ["tool_call_tokens", 0],
-    ["note_nudge_trigger_pending", 0]
-  ];
-  for (const [column, fallback] of columns) {
-    try {
-      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
-    } catch (_error) {}
-  }
-}
-function ensureColumn(db, table, column, definition) {
-  if (!/^[a-z_]+$/.test(table) || !/^[a-z_]+$/.test(column) || !/^[A-Z0-9_'(),\s]+$/i.test(definition)) {
-    throw new Error(`Unsafe schema identifier: ${table}.${column} ${definition}`);
-  }
-  const rows = db.prepare(`PRAGMA table_info(${table})`).all();
-  if (rows.some((row) => row.name === column)) {
-    return;
-  }
-  db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
-}
-function openDatabase() {
-  const { dbDir, dbPath } = resolveDatabasePath();
-  const existing = databases.get(dbPath);
-  if (existing) {
-    if (!persistenceByDatabase.has(existing)) {
-      persistenceByDatabase.set(existing, true);
-    }
-    return existing;
-  }
-  try {
-    migrateLegacyStorageIfNeeded(dbPath, dbDir);
-    mkdirSync2(dbDir, { recursive: true });
-    const db = new Database(dbPath);
-    initializeDatabase(db);
-    runMigrations(db);
-    databases.set(dbPath, db);
-    persistenceByDatabase.set(db, true);
-    persistenceErrorByDatabase.delete(db);
-    return db;
-  } catch (error48) {
-    const detail = getErrorMessage(error48);
-    log(`[magic-context] storage fatal: failed to open ${dbPath}: ${detail}`);
-    throw new Error(`[magic-context] storage unavailable: ${detail}. Magic Context is disabled for this run; check log for details.`);
-  }
-}
-
-// ../plugin/src/shared/harness.ts
-var currentHarness = "opencode";
-var harnessLocked = false;
-function setHarness(value) {
-  if (harnessLocked && currentHarness !== value) {
-    throw new Error(`Magic Context: harness already locked to "${currentHarness}"; cannot change to "${value}"`);
-  }
-  currentHarness = value;
-  harnessLocked = true;
-}
-function getHarness() {
-  return currentHarness;
-}
-
-// src/subagent-entry.ts
-init_logger();
-
-// src/config/index.ts
-init_magic_context();
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
-import { join as join5 } from "node:path";
-
-// ../plugin/src/config/variable.ts
-import { existsSync as existsSync2, readFileSync } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { dirname, isAbsolute, resolve } from "node:path";
-var ENV_PATTERN = /\{env:([^}]+)\}/g;
-var FILE_PATTERN = /\{file:([^}]+)\}/g;
-function substituteConfigVariables(input) {
-  const warnings = [];
-  let text = input.text;
-  text = text.replace(ENV_PATTERN, (_, rawName) => {
-    const varName = rawName.trim();
-    const value = varName ? process.env[varName] : undefined;
-    if (value === undefined || value === "") {
-      warnings.push(`Environment variable ${varName} is not set (referenced via {env:${varName}}); using empty string`);
-      return "";
-    }
-    return value;
-  });
-  const fileMatches = Array.from(text.matchAll(FILE_PATTERN));
-  if (fileMatches.length === 0) {
-    return { text, warnings };
-  }
-  const configDir = input.configPath ? dirname(input.configPath) : process.cwd();
-  let output = "";
-  let cursor = 0;
-  for (const match of fileMatches) {
-    const token = match[0];
-    const rawPath = match[1] ?? "";
-    const index = match.index ?? 0;
-    output += text.slice(cursor, index);
-    cursor = index + token.length;
-    const lineStart = text.lastIndexOf(`
-`, index - 1) + 1;
-    const prefix = text.slice(lineStart, index).trimStart();
-    if (prefix.startsWith("//")) {
-      output += token;
-      continue;
-    }
-    let filePath = rawPath.trim();
-    if (filePath.startsWith("~/")) {
-      filePath = resolve(homedir2(), filePath.slice(2));
-    } else if (!isAbsolute(filePath)) {
-      filePath = resolve(configDir, filePath);
-    }
-    if (!existsSync2(filePath)) {
-      warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
-      continue;
-    }
-    let contents;
-    try {
-      contents = readFileSync(filePath, "utf-8").trim();
-    } catch (error48) {
-      const message = error48 instanceof Error ? error48.message : String(error48);
-      warnings.push(`Failed to read file for ${token} (${filePath}): ${message}; using empty string`);
-      continue;
-    }
-    output += JSON.stringify(contents).slice(1, -1);
-  }
-  output += text.slice(cursor);
-  return { text: output, warnings };
-}
-
-// src/config/index.ts
-var import_comment_json = __toESM(require_src2(), 1);
-var CONFIG_FILE_NAME = "magic-context";
-function getProjectConfigPaths(cwd) {
-  const basePath = join5(cwd, ".pi", CONFIG_FILE_NAME);
-  return [`${basePath}.jsonc`, `${basePath}.json`];
-}
-function getUserConfigPaths() {
-  const home = process.env.HOME ?? homedir3();
-  const basePath = join5(home, ".pi", "agent", CONFIG_FILE_NAME);
-  return [`${basePath}.jsonc`, `${basePath}.json`];
-}
-function resolveFirstExisting(paths) {
-  return paths.find((path3) => existsSync3(path3));
-}
-function loadConfigFile(path3, scope) {
-  try {
-    const rawText = readFileSync2(path3, "utf-8");
-    const substituted = substituteConfigVariables({
-      text: rawText,
-      configPath: path3
-    });
-    return {
-      path: path3,
-      scope,
-      config: import_comment_json.parse(substituted.text),
-      warnings: substituted.warnings.map((warning) => `${path3}: ${warning}`)
-    };
-  } catch (error48) {
-    const message = error48 instanceof Error ? error48.message : String(error48);
-    return {
-      path: path3,
-      scope,
-      config: {},
-      warnings: [
-        `${path3}: failed to load config: ${message}; using defaults for this file.`
-      ]
-    };
-  }
-}
-function redactConfigValue(value) {
-  if (value === undefined)
-    return "<missing>";
-  if (value === null)
-    return "null";
-  if (typeof value === "string") {
-    return `string, ${value.length} char${value.length === 1 ? "" : "s"}`;
-  }
-  if (typeof value === "number")
-    return `number ${value}`;
-  if (typeof value === "boolean")
-    return `boolean ${value}`;
-  if (Array.isArray(value))
-    return `array, ${value.length} item${value.length === 1 ? "" : "s"}`;
-  if (typeof value === "object") {
-    const keys = Object.keys(value);
-    return `object with keys [${keys.join(", ")}]`;
-  }
-  return typeof value;
-}
-function isPlainObject2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function mergeRawConfigs(base, override) {
-  const merged = { ...base };
-  for (const [key, overrideValue] of Object.entries(override)) {
-    const baseValue = merged[key];
-    merged[key] = isPlainObject2(baseValue) && isPlainObject2(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
-  }
-  return merged;
-}
-function parsePiConfig(rawConfig) {
-  const parsed = MagicContextConfigSchema.safeParse(rawConfig);
-  if (parsed.success) {
-    return { config: parsed.data, warnings: [] };
-  }
-  const defaults = MagicContextConfigSchema.parse({});
-  const errorPaths = new Set;
-  for (const issue2 of parsed.error.issues) {
-    const topKey = issue2.path[0];
-    if (topKey !== undefined) {
-      errorPaths.add(String(topKey));
-    }
-  }
-  const patched = { ...rawConfig };
-  const warnings = [];
-  for (const key of errorPaths) {
-    const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
-    delete patched[key];
-    if (isAgentConfig) {
-      warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
-      continue;
-    }
-    const defaultValue = defaults[key];
-    warnings.push(`"${key}": invalid value (${redactConfigValue(rawConfig[key])}), using default ${JSON.stringify(defaultValue)}.`);
-  }
-  const retryParsed = MagicContextConfigSchema.safeParse(patched);
-  if (retryParsed.success) {
-    return { config: retryParsed.data, warnings };
-  }
-  warnings.push("Config recovery failed, using all defaults.");
-  return { config: defaults, warnings };
-}
-function loadPiConfig(opts = {}) {
-  const cwd = opts.cwd ?? process.cwd();
-  const loadedFiles = [];
-  const warnings = [];
-  const projectPath = resolveFirstExisting(getProjectConfigPaths(cwd));
-  if (projectPath) {
-    const loaded = loadConfigFile(projectPath, "project");
-    if (loaded)
-      loadedFiles.push(loaded);
-  }
-  const userPath = resolveFirstExisting(getUserConfigPaths());
-  if (userPath) {
-    const loaded = loadConfigFile(userPath, "user");
-    if (loaded)
-      loadedFiles.push(loaded);
-  }
-  let rawConfig = {};
-  const mergeFiles = [...loadedFiles].sort((a, b) => {
-    if (a.scope === b.scope)
-      return 0;
-    return a.scope === "user" ? -1 : 1;
-  });
-  for (const loaded of mergeFiles) {
-    const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
-    warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
-    rawConfig = mergeRawConfigs(rawConfig, loaded.config);
-  }
-  const parsed = parsePiConfig(rawConfig);
-  warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
-  return {
-    config: parsed.config,
-    warnings,
-    loadedFromPaths: loadedFiles.map((loaded) => loaded.path)
-  };
-}
-
 // ../plugin/src/shared/internal-initiator-marker.ts
 var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
 
@@ -23905,9 +23663,6 @@ function removeSystemReminders(text) {
   return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
 }
 
-// ../plugin/src/hooks/magic-context/read-session-chunk.ts
-await init_read_session_db();
-
 // ../../node_modules/.bun/ai-tokenizer@1.0.6/node_modules/ai-tokenizer/dist/index.js
 function _typeof(o) {
   "@babel/helpers - typeof";
@@ -156488,6 +156243,939 @@ function mergeCommitHashes(existing, next) {
   return merged;
 }
 
+// ../plugin/src/features/magic-context/tool-definition-tokens.ts
+var measurements = new Map;
+var persistenceDb = null;
+function keyFor(providerID, modelID, agentName) {
+  const agent = agentName && agentName.length > 0 ? agentName : "default";
+  return `${providerID}/${modelID}/${agent}`;
+}
+function setDatabase(db) {
+  persistenceDb = db;
+}
+function loadToolDefinitionMeasurements(db) {
+  let rows = [];
+  try {
+    rows = db.prepare("SELECT provider_id, model_id, agent_name, tool_id, token_count FROM tool_definition_measurements").all();
+  } catch {
+    return;
+  }
+  for (const row of rows) {
+    const key = keyFor(row.provider_id, row.model_id, row.agent_name);
+    let inner = measurements.get(key);
+    if (!inner) {
+      inner = new Map;
+      measurements.set(key, inner);
+    }
+    inner.set(row.tool_id, row.token_count);
+  }
+}
+
+// ../plugin/src/features/magic-context/tool-owner-backfill.ts
+init_data_path();
+init_logger();
+import { existsSync as existsSync2 } from "node:fs";
+import { join as join5 } from "node:path";
+var LEASE_DURATION_MS = 5 * 60 * 1000;
+var LEASE_RENEWAL_MS = 60 * 1000;
+function resolveOpencodeDbPath() {
+  return join5(getDataDir(), "opencode", "opencode.db");
+}
+function ensureBackfillStateTable(db) {
+  db.exec(`
+        CREATE TABLE IF NOT EXISTS tool_owner_backfill_state (
+            session_id TEXT PRIMARY KEY,
+            status TEXT NOT NULL CHECK (status IN ('pending', 'running', 'completed', 'skipped')),
+            started_at INTEGER,
+            lease_expires_at INTEGER,
+            completed_at INTEGER,
+            last_error TEXT
+        );
+        CREATE INDEX IF NOT EXISTS idx_tool_owner_backfill_state_status
+        ON tool_owner_backfill_state(status);
+    `);
+}
+function runToolOwnerBackfill(db) {
+  const startedAt = performance.now();
+  ensureBackfillStateTable(db);
+  const result = {
+    sessionsProcessed: 0,
+    sessionsSkippedNoOcDb: 0,
+    sessionsSkippedNoMatches: 0,
+    sessionsCompleted: 0,
+    sessionsBlockedByLease: 0,
+    sessionsErrored: 0,
+    rowsUpdated: 0,
+    rowsLeftNull: 0,
+    durationMs: 0
+  };
+  if (!isToolOwnerBackfillNeeded(db)) {
+    result.durationMs = performance.now() - startedAt;
+    return result;
+  }
+  const opencodeDbPath = resolveOpencodeDbPath();
+  if (!existsSync2(opencodeDbPath)) {
+    log(`[backfill] OpenCode DB not found at ${opencodeDbPath} — marking all unbackfilled sessions as skipped. Lazy adoption (defense-in-depth) handles legacy rows at runtime.`);
+    markAllUnbackfilledSessionsSkipped(db);
+    result.sessionsSkippedNoOcDb = countSessionsByStatus(db, "skipped");
+    result.durationMs = performance.now() - startedAt;
+    return result;
+  }
+  db.exec(`ATTACH '${opencodeDbPath}' AS oc_backfill`);
+  try {
+    backfillToolOwnersInChunks(db, result);
+  } finally {
+    try {
+      db.exec("DETACH DATABASE oc_backfill");
+    } catch (error48) {
+      log(`[backfill] failed to detach oc_backfill database: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    }
+  }
+  result.durationMs = performance.now() - startedAt;
+  log(`[backfill] sessions=${result.sessionsProcessed} completed=${result.sessionsCompleted} skipped_no_oc=${result.sessionsSkippedNoOcDb} skipped_no_matches=${result.sessionsSkippedNoMatches} blocked_by_lease=${result.sessionsBlockedByLease} errored=${result.sessionsErrored} rows_updated=${result.rowsUpdated} rows_left_null=${result.rowsLeftNull} duration_ms=${Math.round(result.durationMs)}`);
+  return result;
+}
+function isToolOwnerBackfillNeeded(db) {
+  ensureBackfillStateTable(db);
+  const row = db.prepare(`SELECT 1 AS hit
+             FROM tags
+             WHERE type = 'tool' AND tool_owner_message_id IS NULL
+               AND NOT EXISTS (
+                   SELECT 1 FROM tool_owner_backfill_state s
+                   WHERE s.session_id = tags.session_id
+                     AND s.status IN ('completed', 'skipped')
+               )
+             LIMIT 1`).get();
+  return row !== null && row !== undefined;
+}
+function markAllUnbackfilledSessionsSkipped(db) {
+  const now = Date.now();
+  db.prepare(`INSERT INTO tool_owner_backfill_state(session_id, status, started_at, completed_at, last_error)
+         SELECT DISTINCT session_id, 'skipped', NULL, ?, NULL
+         FROM tags
+         WHERE type = 'tool' AND tool_owner_message_id IS NULL
+         ON CONFLICT(session_id) DO UPDATE SET
+             status = 'skipped',
+             completed_at = excluded.completed_at,
+             last_error = NULL
+         WHERE tool_owner_backfill_state.status NOT IN ('completed', 'running')`).run(now);
+}
+function countSessionsByStatus(db, status) {
+  const row = db.prepare("SELECT COUNT(*) AS c FROM tool_owner_backfill_state WHERE status = ?").get(status);
+  return row.c;
+}
+function acquireSessionLease(db, sessionId, now) {
+  const expiresAt = now + LEASE_DURATION_MS;
+  const result = db.prepare(`INSERT INTO tool_owner_backfill_state(session_id, status, started_at, lease_expires_at)
+             VALUES (?, 'running', ?, ?)
+             ON CONFLICT(session_id) DO UPDATE SET
+                 status = 'running',
+                 started_at = excluded.started_at,
+                 lease_expires_at = excluded.lease_expires_at,
+                 last_error = NULL
+             WHERE tool_owner_backfill_state.status IN ('pending', 'skipped')
+                OR (tool_owner_backfill_state.status = 'running'
+                    AND tool_owner_backfill_state.lease_expires_at < ?)`).run(sessionId, now, expiresAt, now);
+  return (result.changes ?? 0) === 1;
+}
+function renewSessionLease(db, sessionId, now) {
+  const expiresAt = now + LEASE_DURATION_MS;
+  db.prepare(`UPDATE tool_owner_backfill_state
+         SET lease_expires_at = ?
+         WHERE session_id = ? AND status = 'running'`).run(expiresAt, sessionId);
+}
+function markSessionCompleted(db, sessionId, now) {
+  db.prepare(`UPDATE tool_owner_backfill_state
+         SET status = 'completed', completed_at = ?, lease_expires_at = NULL, last_error = NULL
+         WHERE session_id = ?`).run(now, sessionId);
+}
+function markSessionSkipped(db, sessionId, now, reason) {
+  db.prepare(`INSERT INTO tool_owner_backfill_state(session_id, status, completed_at, last_error)
+         VALUES (?, 'skipped', ?, ?)
+         ON CONFLICT(session_id) DO UPDATE SET
+             status = 'skipped',
+             completed_at = excluded.completed_at,
+             last_error = excluded.last_error,
+             lease_expires_at = NULL`).run(sessionId, now, reason);
+}
+function markSessionErrored(db, sessionId, error48) {
+  const message = error48 instanceof Error ? error48.message : String(error48);
+  db.prepare(`UPDATE tool_owner_backfill_state
+         SET last_error = ?, lease_expires_at = NULL
+         WHERE session_id = ?`).run(message, sessionId);
+}
+function getSessionsNeedingBackfill(db) {
+  const rows = db.prepare(`SELECT DISTINCT t.session_id
+             FROM tags t
+             LEFT JOIN tool_owner_backfill_state s ON s.session_id = t.session_id
+             WHERE t.type = 'tool' AND t.tool_owner_message_id IS NULL
+               AND (s.status IS NULL OR s.status NOT IN ('completed', 'skipped'))
+             ORDER BY t.session_id ASC`).all();
+  return rows.map((r) => r.session_id);
+}
+function buildSessionOwnerMap(db, sessionId) {
+  const rows = db.prepare(`SELECT
+                COALESCE(
+                    CASE WHEN json_extract(p.data, '$.type') = 'tool_use'
+                        THEN json_extract(p.data, '$.id')
+                    END,
+                    json_extract(p.data, '$.callID')
+                ) AS callid,
+                m.id AS owner_id,
+                m.time_created AS owner_t_created,
+                p.id AS part_id,
+                p.time_created AS part_t_created
+             FROM oc_backfill.message m
+             INNER JOIN oc_backfill.part p ON p.message_id = m.id
+             WHERE m.session_id = ?
+               AND json_extract(m.data, '$.role') = 'assistant'
+               AND (
+                   (json_extract(p.data, '$.type') IN ('tool', 'tool-invocation')
+                       AND json_extract(p.data, '$.callID') IS NOT NULL)
+                   OR (json_extract(p.data, '$.type') = 'tool_use'
+                       AND json_extract(p.data, '$.id') IS NOT NULL)
+               )
+             ORDER BY
+                 m.time_created ASC,
+                 m.id ASC,
+                 p.time_created ASC,
+                 p.id ASC`).all(sessionId);
+  const oldestByCallId = new Map;
+  for (const r of rows) {
+    if (typeof r.callid !== "string" || r.callid.length === 0)
+      continue;
+    if (!oldestByCallId.has(r.callid)) {
+      oldestByCallId.set(r.callid, r.owner_id);
+    }
+  }
+  return oldestByCallId;
+}
+function applyOwnersForSession(db, sessionId, ownersByCallId) {
+  if (ownersByCallId.size === 0) {
+    const leftNull = db.prepare(`SELECT COUNT(*) AS c FROM tags
+                     WHERE session_id = ? AND type = 'tool'
+                       AND tool_owner_message_id IS NULL`).get(sessionId).c;
+    return { rowsUpdated: 0, rowsLeftNull: leftNull };
+  }
+  const findOrphanStmt = db.prepare(`SELECT id FROM tags
+         WHERE session_id = ? AND message_id = ? AND type = 'tool'
+           AND tool_owner_message_id IS NULL
+         ORDER BY tag_number ASC
+         LIMIT 1`);
+  const updateRowStmt = db.prepare(`UPDATE tags
+         SET tool_owner_message_id = ?
+         WHERE id = ? AND tool_owner_message_id IS NULL`);
+  let rowsUpdated = 0;
+  db.transaction(() => {
+    for (const [callId, ownerId] of ownersByCallId) {
+      const orphan = findOrphanStmt.get(sessionId, callId);
+      if (!orphan)
+        continue;
+      const result = updateRowStmt.run(ownerId, orphan.id);
+      rowsUpdated += result.changes ?? 0;
+    }
+  })();
+  const rowsLeftNull = db.prepare(`SELECT COUNT(*) AS c FROM tags
+                 WHERE session_id = ? AND type = 'tool'
+                   AND tool_owner_message_id IS NULL`).get(sessionId).c;
+  return { rowsUpdated, rowsLeftNull };
+}
+function backfillToolOwnersInChunks(db, result) {
+  const sessionIds = getSessionsNeedingBackfill(db);
+  let lastRenewedAt = Date.now();
+  for (const sessionId of sessionIds) {
+    const now = Date.now();
+    result.sessionsProcessed += 1;
+    const acquired = acquireSessionLease(db, sessionId, now);
+    if (!acquired) {
+      result.sessionsBlockedByLease += 1;
+      continue;
+    }
+    try {
+      const owners = buildSessionOwnerMap(db, sessionId);
+      const { rowsUpdated, rowsLeftNull } = applyOwnersForSession(db, sessionId, owners);
+      result.rowsUpdated += rowsUpdated;
+      result.rowsLeftNull += rowsLeftNull;
+      if (owners.size === 0) {
+        markSessionSkipped(db, sessionId, Date.now(), "no_oc_matches");
+        result.sessionsSkippedNoMatches += 1;
+      } else {
+        markSessionCompleted(db, sessionId, Date.now());
+        result.sessionsCompleted += 1;
+      }
+    } catch (error48) {
+      log(`[backfill] session=${sessionId} errored: ${error48 instanceof Error ? error48.message : String(error48)}`);
+      markSessionErrored(db, sessionId, error48);
+      result.sessionsErrored += 1;
+    }
+    const sinceRenew = Date.now() - lastRenewedAt;
+    if (sinceRenew > LEASE_RENEWAL_MS) {
+      renewSessionLease(db, sessionId, Date.now());
+      lastRenewedAt = Date.now();
+    }
+  }
+}
+
+// ../plugin/src/features/magic-context/storage-db.ts
+var databases = new Map;
+var persistenceByDatabase = new WeakMap;
+var persistenceErrorByDatabase = new WeakMap;
+function resolveDatabasePath() {
+  const dbDir = getMagicContextStorageDir();
+  return { dbDir, dbPath: join6(dbDir, "context.db") };
+}
+function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
+  if (existsSync3(targetDbPath))
+    return;
+  const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
+  const legacyDbPath = join6(legacyDir, "context.db");
+  if (!existsSync3(legacyDbPath))
+    return;
+  log(`[magic-context] migrating legacy plugin storage: ${legacyDir} -> ${targetDbDir} (legacy left in place as backup)`);
+  mkdirSync3(targetDbDir, { recursive: true });
+  for (const suffix of ["", "-wal", "-shm"]) {
+    const src = `${legacyDbPath}${suffix}`;
+    const dst = join6(targetDbDir, `context.db${suffix}`);
+    if (existsSync3(src)) {
+      try {
+        copyFileSync(src, dst);
+      } catch (error48) {
+        log(`[magic-context] failed to copy ${src}:`, getErrorMessage(error48));
+      }
+    }
+  }
+  const legacyModelsDir = join6(legacyDir, "models");
+  const targetModelsDir = join6(targetDbDir, "models");
+  if (existsSync3(legacyModelsDir) && !existsSync3(targetModelsDir)) {
+    try {
+      cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
+    } catch (error48) {
+      log("[magic-context] failed to copy embedding model cache:", getErrorMessage(error48));
+    }
+  }
+}
+function initializeDatabase(db) {
+  db.exec("PRAGMA journal_mode=WAL");
+  db.exec("PRAGMA busy_timeout=5000");
+  db.exec("PRAGMA foreign_keys=ON");
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS tags (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT,
+      message_id TEXT,
+      type TEXT,
+      status TEXT DEFAULT 'active',
+      byte_size INTEGER,
+      tag_number INTEGER,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      UNIQUE(session_id, tag_number)
+    );
+
+    CREATE TABLE IF NOT EXISTS pending_ops (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT,
+      tag_id INTEGER,
+      operation TEXT,
+      queued_at INTEGER,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+
+    CREATE TABLE IF NOT EXISTS source_contents (
+      tag_id INTEGER,
+      session_id TEXT,
+      content TEXT,
+      created_at INTEGER,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      PRIMARY KEY(session_id, tag_id)
+    );
+
+    CREATE TABLE IF NOT EXISTS compartments (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      sequence INTEGER NOT NULL,
+      start_message INTEGER NOT NULL,
+      end_message INTEGER NOT NULL,
+      start_message_id TEXT DEFAULT '',
+      end_message_id TEXT DEFAULT '',
+      title TEXT NOT NULL,
+      content TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      UNIQUE(session_id, sequence)
+    );
+    CREATE INDEX IF NOT EXISTS idx_compartments_session ON compartments(session_id);
+
+    CREATE TABLE IF NOT EXISTS compression_depth (
+      session_id TEXT NOT NULL,
+      message_ordinal INTEGER NOT NULL,
+      depth INTEGER NOT NULL DEFAULT 0,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      PRIMARY KEY(session_id, message_ordinal)
+    );
+    CREATE INDEX IF NOT EXISTS idx_compression_depth_session ON compression_depth(session_id);
+
+    CREATE TABLE IF NOT EXISTS session_facts (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+
+    -- session_notes and smart_notes were merged into the unified notes table
+    -- by migration v1 (see features/magic-context/migrations.ts). The old tables
+    -- are never recreated; fresh DBs create only notes, upgraded DBs have
+    -- their old tables migrated and dropped by the migration runner.
+
+    CREATE TABLE IF NOT EXISTS memories (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      normalized_hash TEXT NOT NULL,
+      source_session_id TEXT,
+      source_type TEXT DEFAULT 'historian',
+      seen_count INTEGER DEFAULT 1,
+      retrieval_count INTEGER DEFAULT 0,
+      first_seen_at INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      last_seen_at INTEGER NOT NULL,
+      last_retrieved_at INTEGER,
+      status TEXT DEFAULT 'active',
+      expires_at INTEGER,
+      verification_status TEXT DEFAULT 'unverified',
+      verified_at INTEGER,
+      superseded_by_memory_id INTEGER,
+      merged_from TEXT,
+      metadata_json TEXT,
+      UNIQUE(project_path, category, normalized_hash)
+    );
+
+    CREATE TABLE IF NOT EXISTS memory_embeddings (
+      memory_id INTEGER PRIMARY KEY REFERENCES memories(id) ON DELETE CASCADE,
+      embedding BLOB NOT NULL,
+      model_id TEXT
+    );
+
+    CREATE TABLE IF NOT EXISTS dream_state (
+      key TEXT PRIMARY KEY,
+      value TEXT NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS dream_queue (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      reason TEXT NOT NULL,
+      enqueued_at INTEGER NOT NULL,
+      started_at INTEGER,
+      retry_count INTEGER DEFAULT 0
+    );
+    CREATE INDEX IF NOT EXISTS idx_dream_queue_project ON dream_queue(project_path);
+CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, enqueued_at);
+
+    CREATE TABLE IF NOT EXISTS dream_runs (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      project_path TEXT NOT NULL,
+      started_at INTEGER NOT NULL,
+      finished_at INTEGER NOT NULL,
+      holder_id TEXT NOT NULL,
+      tasks_json TEXT NOT NULL,
+      tasks_succeeded INTEGER NOT NULL DEFAULT 0,
+      tasks_failed INTEGER NOT NULL DEFAULT 0,
+      smart_notes_surfaced INTEGER NOT NULL DEFAULT 0,
+      smart_notes_pending INTEGER NOT NULL DEFAULT 0,
+      memory_changes_json TEXT
+    );
+    CREATE INDEX IF NOT EXISTS idx_dream_runs_project ON dream_runs(project_path, finished_at DESC);
+
+    -- (smart_notes: see note above; merged into unified notes table by migration v1)
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
+      content,
+      category,
+      content='memories',
+      content_rowid='id',
+      tokenize='porter unicode61'
+    );
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS message_history_fts USING fts5(
+      session_id UNINDEXED,
+      message_ordinal UNINDEXED,
+      message_id UNINDEXED,
+      role,
+      content,
+      tokenize='porter unicode61'
+    );
+
+    CREATE TABLE IF NOT EXISTS message_history_index (
+      session_id TEXT PRIMARY KEY,
+      last_indexed_ordinal INTEGER NOT NULL DEFAULT 0,
+      updated_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+
+    CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
+      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, content, category) VALUES ('delete', old.id, old.content, old.category);
+      INSERT INTO memories_fts(rowid, content, category) VALUES (new.id, new.content, new.category);
+    END;
+
+    CREATE TABLE IF NOT EXISTS session_meta (
+      session_id TEXT PRIMARY KEY,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      last_response_time INTEGER,
+      cache_ttl TEXT,
+      counter INTEGER DEFAULT 0,
+      last_nudge_tokens INTEGER DEFAULT 0,
+      last_nudge_band TEXT DEFAULT '',
+      last_transform_error TEXT DEFAULT '',
+      nudge_anchor_message_id TEXT DEFAULT '',
+      nudge_anchor_text TEXT DEFAULT '',
+      sticky_turn_reminder_text TEXT DEFAULT '',
+      sticky_turn_reminder_message_id TEXT DEFAULT '',
+      note_nudge_trigger_pending INTEGER DEFAULT 0,
+      note_nudge_trigger_message_id TEXT DEFAULT '',
+      note_nudge_sticky_text TEXT DEFAULT '',
+      note_nudge_sticky_message_id TEXT DEFAULT '',
+      is_subagent INTEGER DEFAULT 0,
+      last_context_percentage REAL DEFAULT 0,
+      last_input_tokens INTEGER DEFAULT 0,
+      times_execute_threshold_reached INTEGER DEFAULT 0,
+      compartment_in_progress INTEGER DEFAULT 0,
+      historian_failure_count INTEGER DEFAULT 0,
+      historian_last_error TEXT DEFAULT NULL,
+      historian_last_failure_at INTEGER DEFAULT NULL,
+      system_prompt_hash TEXT DEFAULT '',
+      memory_block_cache TEXT DEFAULT '',
+      memory_block_count INTEGER DEFAULT 0,
+      memory_block_ids TEXT DEFAULT ''
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
+    CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
+    CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
+    CREATE INDEX IF NOT EXISTS idx_pending_ops_session_tag_id ON pending_ops(session_id, tag_id);
+    CREATE INDEX IF NOT EXISTS idx_source_contents_session ON source_contents(session_id);
+    
+    CREATE TABLE IF NOT EXISTS recomp_compartments (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      sequence INTEGER NOT NULL,
+      start_message INTEGER NOT NULL,
+      end_message INTEGER NOT NULL,
+      start_message_id TEXT DEFAULT '',
+      end_message_id TEXT DEFAULT '',
+      title TEXT NOT NULL,
+      content TEXT NOT NULL,
+      pass_number INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode',
+      UNIQUE(session_id, sequence)
+    );
+
+    CREATE TABLE IF NOT EXISTS recomp_facts (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      category TEXT NOT NULL,
+      content TEXT NOT NULL,
+      pass_number INTEGER NOT NULL,
+      created_at INTEGER NOT NULL,
+      harness TEXT NOT NULL DEFAULT 'opencode'
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_session_facts_session ON session_facts(session_id);
+    CREATE INDEX IF NOT EXISTS idx_recomp_compartments_session ON recomp_compartments(session_id);
+    CREATE INDEX IF NOT EXISTS idx_recomp_facts_session ON recomp_facts(session_id);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_status_category ON memories(project_path, status, category);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_status_expires ON memories(project_path, status, expires_at);
+    CREATE INDEX IF NOT EXISTS idx_memories_project_category_hash ON memories(project_path, category, normalized_hash);
+    CREATE INDEX IF NOT EXISTS idx_message_history_index_updated_at ON message_history_index(updated_at);
+  `);
+  ensureColumn(db, "session_meta", "last_nudge_band", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "nudge_anchor_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "sticky_turn_reminder_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "sticky_turn_reminder_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_trigger_pending", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "note_nudge_trigger_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_sticky_text", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_nudge_sticky_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "note_last_read_at", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "times_execute_threshold_reached", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "compartment_in_progress", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "historian_failure_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "historian_last_error", "TEXT DEFAULT NULL");
+  ensureColumn(db, "session_meta", "historian_last_failure_at", "INTEGER DEFAULT NULL");
+  ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
+  ensureColumn(db, "session_meta", "memory_block_cache", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "memory_block_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "memory_block_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "dream_queue", "retry_count", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "reasoning_byte_size", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "drop_mode", "TEXT DEFAULT 'full'");
+  ensureColumn(db, "tags", "tool_name", "TEXT");
+  ensureColumn(db, "tags", "input_byte_size", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "caveman_depth", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "tool_owner_message_id", "TEXT DEFAULT NULL");
+  ensureColumn(db, "session_meta", "system_prompt_tokens", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "compaction_marker_state", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "key_files", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "conversation_tokens", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "tool_call_tokens", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "recomp_partial_range_start", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "recomp_partial_range_end", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
+  ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "source_contents", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "compartments", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "compression_depth", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "session_facts", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "session_meta", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "recomp_compartments", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "recomp_facts", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+  ensureColumn(db, "message_history_index", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
+}
+function healAllNullColumns(db) {
+  healNullTextColumns(db);
+  healNullIntegerColumns(db);
+  healMissingMemoryBlockIds(db);
+}
+function healMissingMemoryBlockIds(db) {
+  try {
+    db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE memory_block_cache != '' AND (memory_block_ids IS NULL OR memory_block_ids = '') AND memory_block_count > 0").run();
+  } catch {}
+}
+function healNullTextColumns(db) {
+  const columns = [
+    ["cache_ttl", ""],
+    ["last_nudge_band", ""],
+    ["last_transform_error", ""],
+    ["nudge_anchor_message_id", ""],
+    ["nudge_anchor_text", ""],
+    ["sticky_turn_reminder_text", ""],
+    ["sticky_turn_reminder_message_id", ""],
+    ["note_nudge_trigger_message_id", ""],
+    ["note_nudge_sticky_text", ""],
+    ["note_nudge_sticky_message_id", ""],
+    ["system_prompt_hash", ""],
+    ["stripped_placeholder_ids", ""],
+    ["memory_block_cache", ""],
+    ["memory_block_ids", ""],
+    ["compaction_marker_state", ""],
+    ["key_files", ""]
+  ];
+  for (const [column, fallback] of columns) {
+    try {
+      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
+    } catch (_error) {}
+  }
+}
+function healNullIntegerColumns(db) {
+  const columns = [
+    ["times_execute_threshold_reached", 0],
+    ["compartment_in_progress", 0],
+    ["historian_failure_count", 0],
+    ["cleared_reasoning_through_tag", 0],
+    ["memory_block_count", 0],
+    ["system_prompt_tokens", 0],
+    ["conversation_tokens", 0],
+    ["tool_call_tokens", 0],
+    ["note_nudge_trigger_pending", 0]
+  ];
+  for (const [column, fallback] of columns) {
+    try {
+      db.prepare(`UPDATE session_meta SET ${column} = ? WHERE ${column} IS NULL`).run(fallback);
+    } catch (_error) {}
+  }
+}
+function ensureColumn(db, table, column, definition) {
+  if (!/^[a-z_]+$/.test(table) || !/^[a-z_]+$/.test(column) || !/^[A-Z0-9_'(),\s]+$/i.test(definition)) {
+    throw new Error(`Unsafe schema identifier: ${table}.${column} ${definition}`);
+  }
+  const rows = db.prepare(`PRAGMA table_info(${table})`).all();
+  if (rows.some((row) => row.name === column)) {
+    return;
+  }
+  db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
+}
+function openDatabase() {
+  const { dbDir, dbPath } = resolveDatabasePath();
+  const existing = databases.get(dbPath);
+  if (existing) {
+    if (!persistenceByDatabase.has(existing)) {
+      persistenceByDatabase.set(existing, true);
+    }
+    return existing;
+  }
+  try {
+    migrateLegacyStorageIfNeeded(dbPath, dbDir);
+    mkdirSync3(dbDir, { recursive: true });
+    const db = new Database(dbPath);
+    initializeDatabase(db);
+    runMigrations(db);
+    try {
+      runToolOwnerBackfill(db);
+    } catch (error48) {
+      log(`[magic-context] tool-owner backfill failed (continuing with lazy adoption fallback): ${getErrorMessage(error48)}`);
+    }
+    setDatabase(db);
+    loadToolDefinitionMeasurements(db);
+    databases.set(dbPath, db);
+    persistenceByDatabase.set(db, true);
+    persistenceErrorByDatabase.delete(db);
+    return db;
+  } catch (error48) {
+    const detail = getErrorMessage(error48);
+    log(`[magic-context] storage fatal: failed to open ${dbPath}: ${detail}`);
+    throw new Error(`[magic-context] storage unavailable: ${detail}. Magic Context is disabled for this run; check log for details.`);
+  }
+}
+
+// ../plugin/src/shared/harness.ts
+var currentHarness = "opencode";
+var harnessLocked = false;
+function setHarness(value) {
+  if (harnessLocked && currentHarness !== value) {
+    throw new Error(`Magic Context: harness already locked to "${currentHarness}"; cannot change to "${value}"`);
+  }
+  currentHarness = value;
+  harnessLocked = true;
+}
+function getHarness() {
+  return currentHarness;
+}
+
+// src/subagent-entry.ts
+init_logger();
+
+// src/config/index.ts
+init_magic_context();
+import { existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { join as join7 } from "node:path";
+
+// ../plugin/src/config/variable.ts
+import { existsSync as existsSync4, readFileSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { dirname as dirname2, isAbsolute, resolve } from "node:path";
+var ENV_PATTERN = /\{env:([^}]+)\}/g;
+var FILE_PATTERN = /\{file:([^}]+)\}/g;
+function substituteConfigVariables(input) {
+  const warnings = [];
+  let text = input.text;
+  text = text.replace(ENV_PATTERN, (_, rawName) => {
+    const varName = rawName.trim();
+    const value = varName ? process.env[varName] : undefined;
+    if (value === undefined || value === "") {
+      warnings.push(`Environment variable ${varName} is not set (referenced via {env:${varName}}); using empty string`);
+      return "";
+    }
+    return value;
+  });
+  const fileMatches = Array.from(text.matchAll(FILE_PATTERN));
+  if (fileMatches.length === 0) {
+    return { text, warnings };
+  }
+  const configDir = input.configPath ? dirname2(input.configPath) : process.cwd();
+  let output = "";
+  let cursor = 0;
+  for (const match of fileMatches) {
+    const token = match[0];
+    const rawPath = match[1] ?? "";
+    const index = match.index ?? 0;
+    output += text.slice(cursor, index);
+    cursor = index + token.length;
+    const lineStart = text.lastIndexOf(`
+`, index - 1) + 1;
+    const prefix = text.slice(lineStart, index).trimStart();
+    if (prefix.startsWith("//")) {
+      output += token;
+      continue;
+    }
+    let filePath = rawPath.trim();
+    if (filePath.startsWith("~/")) {
+      filePath = resolve(homedir2(), filePath.slice(2));
+    } else if (!isAbsolute(filePath)) {
+      filePath = resolve(configDir, filePath);
+    }
+    if (!existsSync4(filePath)) {
+      warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
+      continue;
+    }
+    let contents;
+    try {
+      contents = readFileSync(filePath, "utf-8").trim();
+    } catch (error48) {
+      const message = error48 instanceof Error ? error48.message : String(error48);
+      warnings.push(`Failed to read file for ${token} (${filePath}): ${message}; using empty string`);
+      continue;
+    }
+    output += JSON.stringify(contents).slice(1, -1);
+  }
+  output += text.slice(cursor);
+  return { text: output, warnings };
+}
+
+// src/config/index.ts
+var import_comment_json = __toESM(require_src2(), 1);
+var CONFIG_FILE_NAME = "magic-context";
+function getProjectConfigPaths(cwd) {
+  const basePath = join7(cwd, ".pi", CONFIG_FILE_NAME);
+  return [`${basePath}.jsonc`, `${basePath}.json`];
+}
+function getUserConfigPaths() {
+  const home = process.env.HOME ?? homedir3();
+  const basePath = join7(home, ".pi", "agent", CONFIG_FILE_NAME);
+  return [`${basePath}.jsonc`, `${basePath}.json`];
+}
+function resolveFirstExisting(paths) {
+  return paths.find((path4) => existsSync5(path4));
+}
+function loadConfigFile(path4, scope) {
+  try {
+    const rawText = readFileSync2(path4, "utf-8");
+    const substituted = substituteConfigVariables({
+      text: rawText,
+      configPath: path4
+    });
+    return {
+      path: path4,
+      scope,
+      config: import_comment_json.parse(substituted.text),
+      warnings: substituted.warnings.map((warning) => `${path4}: ${warning}`)
+    };
+  } catch (error48) {
+    const message = error48 instanceof Error ? error48.message : String(error48);
+    return {
+      path: path4,
+      scope,
+      config: {},
+      warnings: [
+        `${path4}: failed to load config: ${message}; using defaults for this file.`
+      ]
+    };
+  }
+}
+function redactConfigValue(value) {
+  if (value === undefined)
+    return "<missing>";
+  if (value === null)
+    return "null";
+  if (typeof value === "string") {
+    return `string, ${value.length} char${value.length === 1 ? "" : "s"}`;
+  }
+  if (typeof value === "number")
+    return `number ${value}`;
+  if (typeof value === "boolean")
+    return `boolean ${value}`;
+  if (Array.isArray(value))
+    return `array, ${value.length} item${value.length === 1 ? "" : "s"}`;
+  if (typeof value === "object") {
+    const keys = Object.keys(value);
+    return `object with keys [${keys.join(", ")}]`;
+  }
+  return typeof value;
+}
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function mergeRawConfigs(base, override) {
+  const merged = { ...base };
+  for (const [key, overrideValue] of Object.entries(override)) {
+    const baseValue = merged[key];
+    merged[key] = isPlainObject2(baseValue) && isPlainObject2(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+  }
+  return merged;
+}
+function parsePiConfig(rawConfig) {
+  const parsed = MagicContextConfigSchema.safeParse(rawConfig);
+  if (parsed.success) {
+    return { config: parsed.data, warnings: [] };
+  }
+  const defaults = MagicContextConfigSchema.parse({});
+  const errorPaths = new Set;
+  for (const issue2 of parsed.error.issues) {
+    const topKey = issue2.path[0];
+    if (topKey !== undefined) {
+      errorPaths.add(String(topKey));
+    }
+  }
+  const patched = { ...rawConfig };
+  const warnings = [];
+  for (const key of errorPaths) {
+    const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
+    delete patched[key];
+    if (isAgentConfig) {
+      warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
+      continue;
+    }
+    const defaultValue = defaults[key];
+    warnings.push(`"${key}": invalid value (${redactConfigValue(rawConfig[key])}), using default ${JSON.stringify(defaultValue)}.`);
+  }
+  const retryParsed = MagicContextConfigSchema.safeParse(patched);
+  if (retryParsed.success) {
+    return { config: retryParsed.data, warnings };
+  }
+  warnings.push("Config recovery failed, using all defaults.");
+  return { config: defaults, warnings };
+}
+function loadPiConfig(opts = {}) {
+  const cwd = opts.cwd ?? process.cwd();
+  const loadedFiles = [];
+  const warnings = [];
+  const projectPath = resolveFirstExisting(getProjectConfigPaths(cwd));
+  if (projectPath) {
+    const loaded = loadConfigFile(projectPath, "project");
+    if (loaded)
+      loadedFiles.push(loaded);
+  }
+  const userPath = resolveFirstExisting(getUserConfigPaths());
+  if (userPath) {
+    const loaded = loadConfigFile(userPath, "user");
+    if (loaded)
+      loadedFiles.push(loaded);
+  }
+  let rawConfig = {};
+  const mergeFiles = [...loadedFiles].sort((a, b) => {
+    if (a.scope === b.scope)
+      return 0;
+    return a.scope === "user" ? -1 : 1;
+  });
+  for (const loaded of mergeFiles) {
+    const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
+    warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
+    rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+  }
+  const parsed = parsePiConfig(rawConfig);
+  warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
+  return {
+    config: parsed.config,
+    warnings,
+    loadedFromPaths: loadedFiles.map((loaded) => loaded.path)
+  };
+}
+
+// ../plugin/src/hooks/magic-context/read-session-chunk.ts
+await init_read_session_db();
+
 // ../plugin/src/hooks/magic-context/read-session-raw.ts
 function isRawMessageRow(row) {
   if (row === null || typeof row !== "object")
@@ -156570,21 +157258,85 @@ function isTextPart(part) {
   const p = part;
   return p.type === "text" && typeof p.text === "string";
 }
-function isToolPartWithOutput(part) {
+function isFilePart(part) {
   if (part === null || typeof part !== "object")
     return false;
   const p = part;
-  if (p.type !== "tool" || typeof p.callID !== "string")
+  return p.type === "file" && typeof p.url === "string";
+}
+
+// ../plugin/src/shared/record-type-guard.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// ../plugin/src/hooks/magic-context/tool-drop-target.ts
+var IGNORE_PART_TYPES = new Set([
+  "thinking",
+  "reasoning",
+  "redacted_thinking",
+  "meta",
+  "step-start",
+  "step-finish"
+]);
+function isToolCallId(value) {
+  return typeof value === "string" && value.length > 0;
+}
+function hasMeaningfulPart(part) {
+  if (!isRecord(part))
+    return false;
+  const type = part.type;
+  if (type === "text") {
+    return typeof part.text === "string" && part.text.trim().length > 0;
+  }
+  if (typeof type !== "string")
     return false;
-  if (p.state === null || typeof p.state !== "object")
+  if (IGNORE_PART_TYPES.has(type))
     return false;
-  return typeof p.state.output === "string";
+  return true;
 }
-function isFilePart(part) {
-  if (part === null || typeof part !== "object")
-    return false;
-  const p = part;
-  return p.type === "file" && typeof p.url === "string";
+function extractToolCallObservation(part) {
+  if (!isRecord(part))
+    return null;
+  if (part.type === "tool" && isToolCallId(part.callID)) {
+    return { callId: part.callID, kind: "result" };
+  }
+  if (part.type === "tool-invocation" && isToolCallId(part.callID)) {
+    return { callId: part.callID, kind: "invocation" };
+  }
+  if (part.type === "tool_use" && isToolCallId(part.id)) {
+    return { callId: part.id, kind: "invocation" };
+  }
+  if (part.type === "tool_result" && isToolCallId(part.tool_use_id)) {
+    return { callId: part.tool_use_id, kind: "result" };
+  }
+  return null;
+}
+class ToolMutationBatch {
+  partsToRemove = new Set;
+  affectedMessages = new Set;
+  messages;
+  constructor(messages) {
+    this.messages = messages;
+  }
+  markForRemoval(occurrence) {
+    this.partsToRemove.add(occurrence.part);
+    this.affectedMessages.add(occurrence.message);
+  }
+  finalize() {
+    if (this.partsToRemove.size === 0)
+      return;
+    for (const message of this.affectedMessages) {
+      message.parts = message.parts.filter((p) => !this.partsToRemove.has(p));
+    }
+    for (let i = this.messages.length - 1;i >= 0; i -= 1) {
+      if (!this.messages[i].parts.some(hasMeaningfulPart)) {
+        this.messages.splice(i, 1);
+      }
+    }
+    this.partsToRemove.clear();
+    this.affectedMessages.clear();
+  }
 }
 
 // ../plugin/src/hooks/magic-context/read-session-chunk.ts
@@ -156651,23 +157403,47 @@ function getRawSessionMessageCount(sessionId) {
 }
 function getRawSessionTagKeysThrough(sessionId, upToMessageIndex) {
   const messages = readRawSessionMessages(sessionId);
-  const keys = [];
+  const messageFileKeys = new Set;
+  const toolObservations = new Map;
+  const unpairedInvocations = new Map;
   for (const message of messages) {
     if (message.ordinal > upToMessageIndex)
       break;
     for (const [partIndex, part] of message.parts.entries()) {
       if (isTextPart(part)) {
-        keys.push(`${message.id}:p${partIndex}`);
+        messageFileKeys.add(`${message.id}:p${partIndex}`);
+        continue;
       }
       if (isFilePart(part)) {
-        keys.push(`${message.id}:file${partIndex}`);
+        messageFileKeys.add(`${message.id}:file${partIndex}`);
+        continue;
       }
-      if (isToolPartWithOutput(part)) {
-        keys.push(part.callID);
+      const obs = extractToolCallObservation(part);
+      if (!obs)
+        continue;
+      let ownerMsgId;
+      if (obs.kind === "invocation") {
+        ownerMsgId = message.id;
+        const queue = unpairedInvocations.get(obs.callId) ?? [];
+        queue.push(message.id);
+        unpairedInvocations.set(obs.callId, queue);
+      } else {
+        const queue = unpairedInvocations.get(obs.callId);
+        if (queue && queue.length > 0) {
+          const popped = queue.shift();
+          if (queue.length === 0)
+            unpairedInvocations.delete(obs.callId);
+          ownerMsgId = popped ?? message.id;
+        } else {
+          ownerMsgId = message.id;
+        }
       }
+      const owners = toolObservations.get(obs.callId) ?? new Set;
+      owners.add(ownerMsgId);
+      toolObservations.set(obs.callId, owners);
     }
   }
-  return keys;
+  return { messageFileKeys, toolObservations };
 }
 var PROTECTED_TAIL_USER_TURNS = 5;
 function getProtectedTailStartOrdinal(sessionId) {
@@ -161456,7 +162232,7 @@ init_normalize_hash();
 // ../plugin/src/features/magic-context/memory/project-identity.ts
 import { execSync } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
-import path3 from "node:path";
+import path4 from "node:path";
 var GIT_TIMEOUT_MS = 5000;
 var resolvedCache = new Map;
 function getRootCommitHash(directory) {
@@ -161475,12 +162251,12 @@ function getRootCommitHash(directory) {
   }
 }
 function directoryFallback(directory) {
-  const canonical = path3.resolve(directory);
+  const canonical = path4.resolve(directory);
   const hash2 = createHash2("md5").update(canonical).digest("hex").slice(0, 12);
   return `dir:${hash2}`;
 }
 function resolveProjectIdentity(directory) {
-  const resolved = path3.resolve(directory);
+  const resolved = path4.resolve(directory);
   const cached2 = resolvedCache.get(resolved);
   if (cached2 !== undefined) {
     return cached2;
@@ -162304,6 +163080,7 @@ var upsertIndexStatements = new WeakMap;
 var deleteFtsStatements = new WeakMap;
 var deleteIndexStatements = new WeakMap;
 var countIndexedMessageStatements = new WeakMap;
+var indexedMessageIdStatements = new WeakMap;
 function normalizeIndexText(text) {
   return text.replace(/\s+/g, " ").trim();
 }
@@ -162347,10 +163124,34 @@ function getDeleteIndexStatement(db) {
   }
   return stmt;
 }
+function getCountIndexedMessageStatement(db) {
+  let stmt = countIndexedMessageStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT COUNT(*) AS count FROM message_history_fts WHERE session_id = ? AND message_id = ?");
+    countIndexedMessageStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getIndexedMessageIdStatement(db) {
+  let stmt = indexedMessageIdStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT message_id AS messageId FROM message_history_fts WHERE session_id = ?");
+    indexedMessageIdStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getLastIndexedOrdinal(db, sessionId) {
   const row = getLastIndexedStatement(db).get(sessionId);
   return typeof row?.last_indexed_ordinal === "number" ? row.last_indexed_ordinal : 0;
 }
+function isMessageAlreadyIndexed(db, sessionId, messageId) {
+  const row = getCountIndexedMessageStatement(db).get(sessionId, messageId);
+  return (typeof row?.count === "number" ? row.count : 0) > 0;
+}
+function advanceIndexWatermark(db, sessionId, ordinal, now) {
+  const current = getLastIndexedOrdinal(db, sessionId);
+  getUpsertIndexStatement(db).run(sessionId, Math.max(current, ordinal), now, getHarness());
+}
 function clearIndexedMessages(db, sessionId) {
   db.transaction(() => {
     getDeleteFtsStatement(db).run(sessionId);
@@ -162370,34 +163171,51 @@ function getIndexableContent(role, parts) {
   }
   return "";
 }
-function ensureMessagesIndexed(db, sessionId, readMessages) {
-  const messages = readMessages(sessionId);
-  if (messages.length === 0) {
-    db.transaction(() => clearIndexedMessages(db, sessionId))();
-    return;
+function indexSingleMessageInTransaction(db, sessionId, message, now) {
+  if (message.role !== "user" && message.role !== "assistant") {
+    advanceIndexWatermark(db, sessionId, message.ordinal, now);
+    return false;
   }
-  let lastIndexedOrdinal = getLastIndexedOrdinal(db, sessionId);
-  if (lastIndexedOrdinal > messages.length) {
-    db.transaction(() => clearIndexedMessages(db, sessionId))();
-    lastIndexedOrdinal = 0;
+  const content = getIndexableContent(message.role, message.parts);
+  if (content.length === 0) {
+    advanceIndexWatermark(db, sessionId, message.ordinal, now);
+    return false;
   }
-  if (lastIndexedOrdinal >= messages.length) {
-    return;
+  if (isMessageAlreadyIndexed(db, sessionId, message.id)) {
+    advanceIndexWatermark(db, sessionId, message.ordinal, now);
+    return false;
   }
-  const messagesToInsert = messages.filter((message) => message.ordinal > lastIndexedOrdinal).filter((message) => message.role === "user" || message.role === "assistant").map((message) => ({
-    ordinal: message.ordinal,
-    id: message.id,
-    role: message.role,
-    content: getIndexableContent(message.role, message.parts)
-  })).filter((message) => message.content.length > 0);
+  getInsertMessageStatement(db).run(sessionId, message.ordinal, message.id, message.role, content);
+  advanceIndexWatermark(db, sessionId, message.ordinal, now);
+  return true;
+}
+function indexSingleMessage(db, sessionId, message) {
+  return db.transaction(() => indexSingleMessageInTransaction(db, sessionId, message, Date.now()))();
+}
+function indexMessagesAfterOrdinal(db, sessionId, messages, lastIndexedOrdinal, finalWatermark = messages.length) {
   const now = Date.now();
+  let inserted = 0;
   db.transaction(() => {
+    const existingMessageIds = new Set(getIndexedMessageIdStatement(db).all(sessionId).map((row) => row.messageId).filter((messageId) => typeof messageId === "string"));
     const insertMessage = getInsertMessageStatement(db);
-    for (const message of messagesToInsert) {
-      insertMessage.run(sessionId, message.ordinal, message.id, message.role, message.content);
+    for (const message of messages) {
+      if (message.ordinal <= lastIndexedOrdinal) {
+        continue;
+      }
+      if (message.role !== "user" && message.role !== "assistant") {
+        continue;
+      }
+      const content = getIndexableContent(message.role, message.parts);
+      if (content.length === 0 || existingMessageIds.has(message.id)) {
+        continue;
+      }
+      insertMessage.run(sessionId, message.ordinal, message.id, message.role, content);
+      existingMessageIds.add(message.id);
+      inserted++;
     }
-    getUpsertIndexStatement(db).run(sessionId, messages.length, now, getHarness());
+    getUpsertIndexStatement(db).run(sessionId, finalWatermark, now, getHarness());
   })();
+  return inserted;
 }
 // ../plugin/src/features/magic-context/storage-meta-persisted.ts
 init_logger();
@@ -162996,7 +163814,7 @@ var getTagNumberByMessageIdStatements = new WeakMap;
 function getInsertTagStatement(db) {
   let stmt = insertTagStatements.get(db);
   if (!stmt) {
-    stmt = db.prepare("INSERT INTO tags (session_id, message_id, type, byte_size, reasoning_byte_size, tag_number, tool_name, input_byte_size, harness) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    stmt = db.prepare("INSERT INTO tags (session_id, message_id, type, byte_size, reasoning_byte_size, tag_number, tool_name, input_byte_size, harness, tool_owner_message_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     insertTagStatements.set(db, stmt);
   }
   return stmt;
@@ -163077,7 +163895,8 @@ function toTagEntry(row) {
     byteSize: row.byte_size,
     reasoningByteSize: row.reasoning_byte_size ?? 0,
     sessionId: row.session_id,
-    cavemanDepth: typeof row.caveman_depth === "number" && Number.isFinite(row.caveman_depth) ? row.caveman_depth : 0
+    cavemanDepth: typeof row.caveman_depth === "number" && Number.isFinite(row.caveman_depth) ? row.caveman_depth : 0,
+    toolOwnerMessageId: typeof row.tool_owner_message_id === "string" ? row.tool_owner_message_id : null
   };
 }
 function isTagNumberRow(row) {
@@ -163092,8 +163911,8 @@ function isMaxTagNumberRow(row) {
   const r = row;
   return typeof r.max_tag_number === "number";
 }
-function insertTag(db, sessionId, messageId, type, byteSize2, tagNumber, reasoningByteSize = 0, toolName = null, inputByteSize = 0) {
-  getInsertTagStatement(db).run(sessionId, messageId, type, byteSize2, reasoningByteSize, tagNumber, toolName, inputByteSize, getHarness());
+function insertTag(db, sessionId, messageId, type, byteSize2, tagNumber, reasoningByteSize = 0, toolName = null, inputByteSize = 0, toolOwnerMessageId = null) {
+  getInsertTagStatement(db).run(sessionId, messageId, type, byteSize2, reasoningByteSize, tagNumber, toolName, inputByteSize, getHarness(), toolOwnerMessageId);
   return tagNumber;
 }
 function updateTagStatus(db, sessionId, tagId, status) {
@@ -163105,6 +163924,7 @@ function updateTagDropMode(db, sessionId, tagNumber, dropMode) {
 function updateCavemanDepth(db, sessionId, tagNumber, depth) {
   db.prepare("UPDATE tags SET caveman_depth = ? WHERE session_id = ? AND tag_number = ?").run(depth, sessionId, tagNumber);
 }
+var getOwnerScopedToolTagNumbersStatements = new WeakMap;
 function getMaxTagNumberBySession(db, sessionId) {
   const row = getMaxTagNumberBySessionStatement(db).get(sessionId);
   return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
@@ -163113,17 +163933,103 @@ function getTagNumberByMessageId(db, sessionId, messageId) {
   const row = getTagNumberByMessageIdStatement(db).get(sessionId, messageId);
   return isTagNumberRow(row) ? row.tag_number : null;
 }
+var TAG_SELECT_COLUMNS = "id, message_id, type, status, drop_mode, tool_name, input_byte_size, byte_size, reasoning_byte_size, session_id, tag_number, caveman_depth, tool_owner_message_id";
 function getTagsBySession(db, sessionId) {
-  const rows = db.prepare("SELECT id, message_id, type, status, drop_mode, tool_name, input_byte_size, byte_size, reasoning_byte_size, session_id, tag_number, caveman_depth FROM tags WHERE session_id = ? ORDER BY tag_number ASC, id ASC").all(sessionId).filter(isTagRow);
+  const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? ORDER BY tag_number ASC, id ASC`).all(sessionId).filter(isTagRow);
+  return rows.map(toTagEntry);
+}
+var getActiveTagsBySessionStatements = new WeakMap;
+var getMaxDroppedTagNumberStatements = new WeakMap;
+function getActiveTagsBySessionStatement(db) {
+  let stmt = getActiveTagsBySessionStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND status = 'active' ORDER BY tag_number ASC, id ASC`);
+    getActiveTagsBySessionStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getActiveTagsBySession(db, sessionId) {
+  const rows = getActiveTagsBySessionStatement(db).all(sessionId).filter(isTagRow);
+  return rows.map(toTagEntry);
+}
+function getTagsByNumbers(db, sessionId, tagNumbers) {
+  if (tagNumbers.length === 0)
+    return [];
+  if (tagNumbers.length > 900) {
+    const all = [];
+    for (let i = 0;i < tagNumbers.length; i += 900) {
+      all.push(...getTagsByNumbers(db, sessionId, tagNumbers.slice(i, i + 900)));
+    }
+    return all;
+  }
+  const placeholders = tagNumbers.map(() => "?").join(",");
+  const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number IN (${placeholders}) ORDER BY tag_number ASC, id ASC`).all(sessionId, ...tagNumbers).filter(isTagRow);
   return rows.map(toTagEntry);
 }
 function getTopNBySize(db, sessionId, n) {
   if (n <= 0) {
     return [];
   }
-  const rows = db.prepare("SELECT id, message_id, type, status, drop_mode, tool_name, input_byte_size, byte_size, reasoning_byte_size, session_id, tag_number, caveman_depth FROM tags WHERE session_id = ? AND status = 'active' ORDER BY byte_size DESC, tag_number ASC LIMIT ?").all(sessionId, n).filter(isTagRow);
+  const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND status = 'active' ORDER BY byte_size DESC, tag_number ASC LIMIT ?`).all(sessionId, n).filter(isTagRow);
   return rows.map(toTagEntry);
 }
+var getToolTagNumberByOwnerStatements = new WeakMap;
+var getNullOwnerToolTagStatements = new WeakMap;
+var adoptNullOwnerToolTagStatements = new WeakMap;
+var deleteToolTagsByOwnerStatements = new WeakMap;
+function getGetToolTagNumberByOwnerStatement(db) {
+  let stmt = getToolTagNumberByOwnerStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT tag_number FROM tags
+             WHERE session_id = ? AND message_id = ?
+               AND type = 'tool' AND tool_owner_message_id = ?
+             LIMIT 1`);
+    getToolTagNumberByOwnerStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getToolTagNumberByOwner(db, sessionId, callId, ownerMsgId) {
+  const row = getGetToolTagNumberByOwnerStatement(db).get(sessionId, callId, ownerMsgId);
+  return isTagNumberRow(row) ? row.tag_number : null;
+}
+function isNullOwnerToolTagRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.id === "number" && typeof r.tag_number === "number";
+}
+function getGetNullOwnerToolTagStatement(db) {
+  let stmt = getNullOwnerToolTagStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT id, tag_number FROM tags
+             WHERE session_id = ? AND message_id = ?
+               AND type = 'tool' AND tool_owner_message_id IS NULL
+             ORDER BY tag_number ASC
+             LIMIT 1`);
+    getNullOwnerToolTagStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getNullOwnerToolTag(db, sessionId, callId) {
+  const row = getGetNullOwnerToolTagStatement(db).get(sessionId, callId);
+  if (!isNullOwnerToolTagRow(row))
+    return null;
+  return { id: row.id, tagNumber: row.tag_number };
+}
+function getAdoptNullOwnerToolTagStatement(db) {
+  let stmt = adoptNullOwnerToolTagStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`UPDATE tags
+             SET tool_owner_message_id = ?
+             WHERE id = ? AND tool_owner_message_id IS NULL`);
+    adoptNullOwnerToolTagStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function adoptNullOwnerToolTag(db, rowId, ownerMsgId) {
+  const result = getAdoptNullOwnerToolTagStatement(db).run(ownerMsgId, rowId);
+  return (result.changes ?? 0) === 1;
+}
 // src/tools/ctx-note.ts
 var FILTER_VALUES = [
   "active",
@@ -164040,11 +164946,7 @@ function getMessageOrdinal(value) {
 }
 async function getSemanticScores(args) {
   const semanticScores = new Map;
-  if (!args.embeddingEnabled || !args.isEmbeddingRuntimeEnabled() || args.memories.length === 0) {
-    return semanticScores;
-  }
-  const queryEmbedding = await args.embedQuery(args.query, args.signal);
-  if (!queryEmbedding) {
+  if (!args.queryEmbedding || args.memories.length === 0) {
     return semanticScores;
   }
   const cachedEmbeddings = getProjectEmbeddings(args.db, args.projectPath);
@@ -164058,7 +164960,7 @@ async function getSemanticScores(args) {
     if (!memoryEmbedding) {
       continue;
     }
-    semanticScores.set(memory2.id, normalizeCosineScore(cosineSimilarity(queryEmbedding, memoryEmbedding)));
+    semanticScores.set(memory2.id, normalizeCosineScore(cosineSimilarity(args.queryEmbedding, memoryEmbedding)));
   }
   return semanticScores;
 }
@@ -164154,12 +165056,8 @@ async function searchMemories(args) {
   const semanticScores = await getSemanticScores({
     db: args.db,
     projectPath: args.projectPath,
-    query: args.query,
     memories: semanticCandidates,
-    embeddingEnabled: args.embeddingEnabled,
-    embedQuery: args.embedQuery,
-    isEmbeddingRuntimeEnabled: args.isEmbeddingRuntimeEnabled,
-    signal: args.signal
+    queryEmbedding: args.queryEmbedding
   });
   return mergeMemoryResults({
     memories,
@@ -164175,7 +165073,6 @@ function linearDecayScore(rank, total) {
   return Math.max(0, 1 - rank / total);
 }
 function searchMessages(args) {
-  ensureMessagesIndexed(args.db, args.sessionId, args.readMessages);
   const sanitizedQuery = sanitizeFtsQuery(args.query.trim());
   if (sanitizedQuery.length === 0) {
     return [];
@@ -164246,20 +165143,12 @@ function toGitCommitResult(hit) {
     matchType: hit.matchType
   };
 }
-async function searchGitCommitsAsync(args) {
+function searchGitCommits(args) {
   if (args.limit <= 0)
     return [];
-  let queryEmbedding = null;
-  if (args.embeddingEnabled && args.isEmbeddingRuntimeEnabled()) {
-    try {
-      queryEmbedding = await args.embedQuery(args.query, args.signal);
-    } catch (error48) {
-      log(`[search] git commit query embedding failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
-    }
-  }
   const hits = searchGitCommitsSync(args.db, args.projectPath, args.query, {
     limit: args.limit,
-    queryEmbedding
+    queryEmbedding: args.queryEmbedding
   });
   return hits.map(toGitCommitResult);
 }
@@ -164290,37 +165179,37 @@ async function unifiedSearch(db, sessionId, projectPath, query, options3 = {}) {
   const runMemory = activeSources.has("memory") && (options3.memoryEnabled ?? true);
   const runMessages = activeSources.has("message");
   const runGitCommits = activeSources.has("git_commit") && gitCommitsEnabled;
-  const [memoryResults, messageResults, gitCommitResults] = await Promise.all([
+  const needsEmbedding = (runMemory || runGitCommits) && embeddingEnabled && isEmbeddingRuntimeEnabled();
+  const queryEmbeddingPromise = needsEmbedding ? embedQuery(trimmedQuery, options3.signal).catch((error48) => {
+    log(`[search] query embedding failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    return null;
+  }) : Promise.resolve(null);
+  await Promise.resolve();
+  const messageResults = runMessages ? searchMessages({
+    db,
+    sessionId,
+    query: trimmedQuery,
+    limit: tierLimit,
+    maxOrdinal: options3.maxMessageOrdinal
+  }) : [];
+  const queryEmbedding = await queryEmbeddingPromise;
+  const [memoryResults, gitCommitResults] = await Promise.all([
     runMemory ? searchMemories({
       db,
       projectPath,
       query: trimmedQuery,
       limit: tierLimit,
       memoryEnabled: true,
-      embeddingEnabled,
-      embedQuery,
-      isEmbeddingRuntimeEnabled,
-      visibleMemoryIds: options3.visibleMemoryIds,
-      signal: options3.signal
+      queryEmbedding,
+      visibleMemoryIds: options3.visibleMemoryIds
     }) : Promise.resolve([]),
-    runMessages ? Promise.resolve(searchMessages({
-      db,
-      sessionId,
-      query: trimmedQuery,
-      limit: tierLimit,
-      readMessages: options3.readMessages ?? readRawSessionMessages,
-      maxOrdinal: options3.maxMessageOrdinal
-    })) : Promise.resolve([]),
-    runGitCommits ? searchGitCommitsAsync({
+    runGitCommits ? Promise.resolve(searchGitCommits({
       db,
       projectPath,
       query: trimmedQuery,
       limit: tierLimit,
-      embeddingEnabled,
-      embedQuery,
-      isEmbeddingRuntimeEnabled,
-      signal: options3.signal
-    }) : Promise.resolve([])
+      queryEmbedding
+    })) : Promise.resolve([])
   ]);
   const results = [...memoryResults, ...messageResults, ...gitCommitResults].sort(compareUnifiedResults).slice(0, limit);
   const countRetrievals = options3.countRetrievals ?? true;