chat-recall 0.7.3 → 0.7.5

package/dist/mcp.js

@@ -6744,13 +6744,13 @@ async function parseCodexSubagents(sessionPath) {
     if (meta?.type !== "session_meta")
       continue;
     const payload = meta.payload || {};
-    const spawn4 = payload.source?.subagent?.thread_spawn;
-    if (!spawn4)
+    const spawn5 = payload.source?.subagent?.thread_spawn;
+    if (!spawn5)
       continue;
-    if (spawn4.parent_thread_id !== parentId)
+    if (spawn5.parent_thread_id !== parentId)
       continue;
     const id = fileName.replace(/\.jsonl$/i, "");
-    const role = String(spawn4.agent_role || payload.agent_role || "").toLowerCase();
+    const role = String(spawn5.agent_role || payload.agent_role || "").toLowerCase();
     const kind = role.includes("compact") ? "compact" : role.includes("aside") ? "aside" : role.includes("worker") || role.includes("explore") ? "explore" : "other";
     let messages = [];
     try {
@@ -6762,8 +6762,8 @@ async function parseCodexSubagents(sessionPath) {
     subagents.push({
       id,
       kind,
-      agentType: spawn4.agent_role || payload.agent_role,
-      description: spawn4.agent_nickname || payload.agent_nickname,
+      agentType: spawn5.agent_role || payload.agent_role,
+      description: spawn5.agent_nickname || payload.agent_nickname,
       filePath,
       messageCount: messages.length,
       toolUseCount,
@@ -7093,7 +7093,7 @@ async function archiveRawSession(store2, sessionId) {
   return await store2.putRawSession(sessionId, exp.tool, Math.floor(exp.mtime), gz, size);
 }
 function detectForkPredecessor(sessionPath) {
-  const { readFileSync: readFileSync44, readdirSync: readdirSync35 } = requireFs();
+  const { readFileSync: readFileSync44, readdirSync: readdirSync34 } = requireFs();
   const { dirname: dirname21, join: join53, basename: basename24 } = requirePath();
   let text;
   try {
@@ -7123,7 +7123,7 @@ function detectForkPredecessor(sessionPath) {
   const self = basename24(sessionPath);
   let entries;
   try {
-    entries = readdirSync35(dir);
+    entries = readdirSync34(dir);
   } catch {
     return null;
   }
@@ -9921,8 +9921,35 @@ var init_codex2 = __esm({
       configToml() {
         return join15(this.homeDir(), "config.toml");
       }
-      pluginsDir() {
-        return join15(this.homeDir(), ".tmp", "plugins", "plugins");
+      /**
+       * Plugins that are INSTALLED, one folder each:
+       * `plugins/cache/<marketplace>/<plugin>/<version>/`, newest version.
+       *
+       * `.tmp/plugins/plugins/` is Codex's copy of the plugin catalog (62 plugins
+       * and a README on one machine), not what is installed. Reading it reported
+       * every catalog plugin's skills and MCP servers as the user's own, and a
+       * pull then installed them into every tool: build-ios-apps' xcodebuildmcp
+       * reached a Linux PC that never installed the plugin.
+       */
+      installedPluginDirs() {
+        const cache4 = join15(this.homeDir(), "plugins", "cache");
+        const out = [];
+        const dirs = (p) => {
+          try {
+            return readdirSync10(p, { withFileTypes: true }).filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => e.name);
+          } catch {
+            return [];
+          }
+        };
+        for (const market of dirs(cache4)) {
+          for (const plugin of dirs(join15(cache4, market))) {
+            const versions = dirs(join15(cache4, market, plugin)).sort((a, b) => a.localeCompare(b, void 0, { numeric: true }));
+            const newest = versions[versions.length - 1];
+            if (newest)
+              out.push({ name: plugin, dir: join15(cache4, market, plugin, newest) });
+          }
+        }
+        return out;
       }
       /** OpenAI-bundled, read-only system skills (imagegen, skill-creator, …). */
       skillsSystemDir() {
@@ -10170,8 +10197,8 @@ var init_codex2 = __esm({
           } catch {
             continue;
           }
-          const spawn4 = meta?.payload?.source?.subagent?.thread_spawn;
-          if (!spawn4 || spawn4.parent_thread_id !== parentUuid)
+          const spawn5 = meta?.payload?.source?.subagent?.thread_spawn;
+          if (!spawn5 || spawn5.parent_thread_id !== parentUuid)
             continue;
           events.push(...this.parseRollout(path2));
         }
@@ -10364,10 +10391,10 @@ var init_codex2 = __esm({
                 const meta = JSON.parse(first);
                 const payload = meta?.payload || {};
                 projectPath = payload.cwd || "";
-                const spawn4 = payload.source?.subagent?.thread_spawn;
-                if (spawn4 || payload.agent_role || payload.agent_nickname) {
+                const spawn5 = payload.source?.subagent?.thread_spawn;
+                if (spawn5 || payload.agent_role || payload.agent_nickname) {
                   isSubagent = true;
-                  parentId = spawn4?.parent_thread_id || null;
+                  parentId = spawn5?.parent_thread_id || null;
                 }
               }
             } catch {
@@ -17947,14 +17974,11 @@ var init_skills_source = __esm({
         }
         if (!isSourceEnabled("codex", "skills"))
           return;
-        const codexPluginsDir = codexBackend.pluginsDir();
-        if (existsSync37(codexPluginsDir)) {
-          for (const pluginName of readdirSync26(codexPluginsDir)) {
-            const skillsDir = join40(codexPluginsDir, pluginName, "skills");
-            if (!existsSync37(skillsDir))
-              continue;
-            yield* this.fromSkillRoot({ path: skillsDir, tool: "codex" }, pluginName);
-          }
+        for (const { name: pluginName, dir } of codexBackend.installedPluginDirs()) {
+          const skillsDir = join40(dir, "skills");
+          if (!existsSync37(skillsDir))
+            continue;
+          yield* this.fromSkillRoot({ path: skillsDir, tool: "codex" }, pluginName);
         }
       }
       async *fromSkillRoot(root, pluginName) {
@@ -18067,7 +18091,7 @@ var init_skills_source = __esm({
 });
 
 // ../engine/dist/parsers/mcps-source.js
-import { existsSync as existsSync38, readdirSync as readdirSync27, readFileSync as readFileSync29, statSync as statSync35 } from "fs";
+import { existsSync as existsSync38, readFileSync as readFileSync29, statSync as statSync35 } from "fs";
 import { homedir as homedir15 } from "os";
 import { join as join41 } from "path";
 function readJson(path2) {
@@ -18179,16 +18203,13 @@ var init_mcps_source = __esm({
           scope: "user"
         });
         yield* this.fromCodexToml(codexBackend.configToml());
-        const pluginsDir = codexBackend.pluginsDir();
-        if (existsSync38(pluginsDir)) {
-          for (const plugin of readdirSync27(pluginsDir)) {
-            const mcpPath = join41(pluginsDir, plugin, ".mcp.json");
-            yield* this.fromObject(readJson(mcpPath)?.mcpServers, {
-              tool: "codex",
-              filePath: mcpPath,
-              scope: "plugin"
-            });
-          }
+        for (const { dir } of codexBackend.installedPluginDirs()) {
+          const mcpPath = join41(dir, ".mcp.json");
+          yield* this.fromObject(readJson(mcpPath)?.mcpServers, {
+            tool: "codex",
+            filePath: mcpPath,
+            scope: "plugin"
+          });
         }
       }
       async *fromObject(obj, ctx) {
@@ -18226,7 +18247,12 @@ var init_mcps_source = __esm({
               // MCP's url into a shell string, and `alwaysAllow` is truncated to
               // 8 for the preview — rebuilding from either produces a broken or
               // half-permissioned server, silently.
-              spec
+              spec,
+              // Where this registration runs. A server that starts through npx
+              // passes the command check on any machine, so this is what tells a
+              // pull that it came from another platform (see toolkit-pull.ts).
+              platform: process.platform,
+              arch: process.arch
             }
           };
         }
@@ -18388,7 +18414,7 @@ var init_toolkit_format = __esm({
 });
 
 // ../engine/dist/parsers/slash-commands-source.js
-import { existsSync as existsSync39, readdirSync as readdirSync28, readFileSync as readFileSync30, statSync as statSync36 } from "fs";
+import { existsSync as existsSync39, readdirSync as readdirSync27, readFileSync as readFileSync30, statSync as statSync36 } from "fs";
 import { join as join42, basename as basename20 } from "path";
 function rebuildBody2(content) {
   const { text, redacted } = redactInlineSecrets(content);
@@ -18443,7 +18469,7 @@ var init_slash_commands_source = __esm({
           const projectsRoot = claudeBackend.projectsDir();
           if (existsSync39(projectsRoot)) {
             try {
-              for (const entry of readdirSync28(projectsRoot, { withFileTypes: true })) {
+              for (const entry of readdirSync27(projectsRoot, { withFileTypes: true })) {
                 if (!entry.isDirectory() || entry.name.startsWith("."))
                   continue;
                 const projectPath = resolveProjectDirName(entry.name);
@@ -18475,7 +18501,7 @@ var init_slash_commands_source = __esm({
           const ext = root.format === "toml" ? ".toml" : ".md";
           let files;
           try {
-            files = readdirSync28(root.path).filter((f) => f.endsWith(ext));
+            files = readdirSync27(root.path).filter((f) => f.endsWith(ext));
           } catch {
             continue;
           }
@@ -18535,7 +18561,7 @@ var init_slash_commands_source = __esm({
 });
 
 // ../engine/dist/parsers/subagents-source.js
-import { existsSync as existsSync40, readdirSync as readdirSync29, readFileSync as readFileSync31, statSync as statSync37 } from "fs";
+import { existsSync as existsSync40, readdirSync as readdirSync28, readFileSync as readFileSync31, statSync as statSync37 } from "fs";
 import { join as join43, basename as basename21 } from "path";
 function rebuildBody3(content) {
   const { text, redacted } = redactInlineSecrets(content);
@@ -18592,7 +18618,7 @@ var init_subagents_source = __esm({
           const projectsRoot = claudeBackend.projectsDir();
           if (existsSync40(projectsRoot)) {
             try {
-              for (const entry of readdirSync29(projectsRoot, { withFileTypes: true })) {
+              for (const entry of readdirSync28(projectsRoot, { withFileTypes: true })) {
                 if (!entry.isDirectory() || entry.name.startsWith("."))
                   continue;
                 const projectPath = resolveProjectDirName(entry.name);
@@ -18624,7 +18650,7 @@ var init_subagents_source = __esm({
           const ext = root.format === "toml" ? ".toml" : ".md";
           let files;
           try {
-            files = readdirSync29(root.path).filter((f) => f.endsWith(ext));
+            files = readdirSync28(root.path).filter((f) => f.endsWith(ext));
           } catch {
             continue;
           }
@@ -18685,7 +18711,7 @@ var init_subagents_source = __esm({
 });
 
 // ../engine/dist/parsers/hooks-source.js
-import { existsSync as existsSync41, readFileSync as readFileSync32, readdirSync as readdirSync30, statSync as statSync38 } from "fs";
+import { existsSync as existsSync41, readFileSync as readFileSync32, readdirSync as readdirSync29, statSync as statSync38 } from "fs";
 import { join as join44 } from "path";
 function readJson2(path2) {
   if (!existsSync41(path2))
@@ -18712,7 +18738,7 @@ var init_hooks_source = __esm({
         const projectsRoot = claudeBackend.projectsDir();
         if (existsSync41(projectsRoot)) {
           try {
-            for (const entry of readdirSync30(projectsRoot, { withFileTypes: true })) {
+            for (const entry of readdirSync29(projectsRoot, { withFileTypes: true })) {
               if (!entry.isDirectory() || entry.name.startsWith("."))
                 continue;
               const projectPath = resolveProjectDirName(entry.name);
@@ -18808,7 +18834,7 @@ var init_hooks_source = __esm({
 });
 
 // ../engine/dist/parsers/plugins-source.js
-import { existsSync as existsSync42, readFileSync as readFileSync33, readdirSync as readdirSync31, statSync as statSync39 } from "fs";
+import { existsSync as existsSync42, readFileSync as readFileSync33, readdirSync as readdirSync30, statSync as statSync39 } from "fs";
 import { homedir as homedir16 } from "os";
 import { join as join45 } from "path";
 function readJson3(path2) {
@@ -18870,7 +18896,7 @@ var init_plugins_source = __esm({
         if (isSourceEnabled("agy", "extensions") && existsSync42(gemRoot)) {
           let entries;
           try {
-            entries = readdirSync31(gemRoot);
+            entries = readdirSync30(gemRoot);
           } catch {
             entries = [];
           }
@@ -18914,16 +18940,8 @@ var init_plugins_source = __esm({
             };
           }
         }
-        const codexPluginsRoot = codexBackend.pluginsDir();
-        if (isSourceEnabled("codex", "plugins") && existsSync42(codexPluginsRoot)) {
-          let entries;
-          try {
-            entries = readdirSync31(codexPluginsRoot);
-          } catch {
-            entries = [];
-          }
-          for (const name of entries) {
-            const pluginDir = join45(codexPluginsRoot, name);
+        if (isSourceEnabled("codex", "plugins")) {
+          for (const { name, dir: pluginDir } of codexBackend.installedPluginDirs()) {
             let st;
             try {
               st = statSync39(pluginDir);
@@ -19037,7 +19055,8 @@ var init_all_sources = __esm({
 
 // ../engine/dist/core/extractor-version.js
 function extractorVersionForItem(id, sourceType) {
-  return extractorVersionForTool(toolOfId(id)) + (ITEM_SOURCE_BUMP[sourceType] ?? 0);
+  const tool = toolOfId(id);
+  return extractorVersionForTool(tool) + (ITEM_SOURCE_BUMP[sourceType] ?? 0) + (ITEM_TOOL_SOURCE_BUMP[`${tool}:${sourceType}`] ?? 0);
 }
 function toolOfId(id) {
   if (id.startsWith("agy_"))
@@ -19058,17 +19077,21 @@ function extractorVersionForTool(tool) {
 function extractorVersionForId(id) {
   return extractorVersionForTool(toolOfId(id));
 }
-var BASE_EXTRACTOR_VERSION, ITEM_SOURCE_BUMP, TOOL_EXTRACTOR_BUMP, EXTRACTOR_VERSION;
+var BASE_EXTRACTOR_VERSION, ITEM_SOURCE_BUMP, ITEM_TOOL_SOURCE_BUMP, TOOL_EXTRACTOR_BUMP, EXTRACTOR_VERSION;
 var init_extractor_version = __esm({
   "../engine/dist/core/extractor-version.js"() {
     "use strict";
     BASE_EXTRACTOR_VERSION = 2;
     ITEM_SOURCE_BUMP = {
-      mcp: 1,
+      mcp: 2,
       skill: 1,
       agent: 1,
       command: 1
     };
+    ITEM_TOOL_SOURCE_BUMP = {
+      "codex:skill": 1,
+      "codex:plugin": 1
+    };
     TOOL_EXTRACTOR_BUMP = {
       agy: 3,
       claude: 1,
@@ -19177,6 +19200,28 @@ function saveItemVersions(server, versions) {
   writeFileSync7(tmp, JSON.stringify(all));
   renameSync5(tmp, path2);
 }
+function loadInventoryHashes(server) {
+  try {
+    const parsed = JSON.parse(readFileSync34(inventoryPath(), "utf-8"));
+    return { ...(parsed && typeof parsed === "object" ? parsed[server] : null) || {} };
+  } catch {
+    return {};
+  }
+}
+function saveInventoryHashes(server, hashes) {
+  let all = {};
+  try {
+    all = JSON.parse(readFileSync34(inventoryPath(), "utf-8"));
+  } catch {
+  }
+  if (!all || typeof all !== "object") all = {};
+  all[server] = { ...all[server] || {}, ...hashes };
+  const path2 = inventoryPath();
+  mkdirSync10(dirname17(path2), { recursive: true });
+  const tmp = `${path2}.tmp`;
+  writeFileSync7(tmp, JSON.stringify(all));
+  renameSync5(tmp, path2);
+}
 function getSyncedRows(server) {
   const data = load();
   const out = /* @__PURE__ */ new Map();
@@ -19288,7 +19333,7 @@ function syncMode(row, mtime, fileSize, extractorVersion, isAppendOnly) {
   if (row.m >= Math.floor(mtime)) return "skip";
   return "full";
 }
-var ledgerPath, cache3, LEDGER_FLUSH_MS, pendingWrite, flushTimer, itemVersionsPath, itemVersionsCache, unackedCursorAttempts, reconcilePath, reconcileCache;
+var ledgerPath, cache3, LEDGER_FLUSH_MS, pendingWrite, flushTimer, itemVersionsPath, itemVersionsCache, inventoryPath, unackedCursorAttempts, reconcilePath, reconcileCache;
 var init_sync_ledger = __esm({
   "src/sync-ledger.ts"() {
     "use strict";
@@ -19301,6 +19346,7 @@ var init_sync_ledger = __esm({
     flushTimer = null;
     itemVersionsPath = () => join46(getDataDir(), "item-versions.json");
     itemVersionsCache = null;
+    inventoryPath = () => join46(getDataDir(), "toolkit-inventory.json");
     unackedCursorAttempts = 0;
     reconcilePath = () => join46(getDataDir(), "sync-field-reconcile.json");
     reconcileCache = null;
@@ -19449,7 +19495,7 @@ var init_http = __esm({
       CLI_VERSION = JSON.parse(readFileSync36(new URL("../package.json", import.meta.url), "utf-8")).version || CLI_VERSION;
     } catch {
       try {
-        if (true) CLI_VERSION = "0.7.3";
+        if (true) CLI_VERSION = "0.7.5";
       } catch {
       }
     }
@@ -19948,7 +19994,7 @@ var init_telemetry = __esm({
     init_sync_client();
     cliVersion2 = () => {
       try {
-        return true ? "0.7.3" : "dev";
+        return true ? "0.7.5" : "dev";
       } catch {
         return "dev";
       }
@@ -20117,7 +20163,7 @@ __export(auto_update_exports, {
 import { execSync as execSync4, execFileSync as execFileSync3 } from "node:child_process";
 import { readFileSync as readFileSync37, existsSync as existsSync45 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { writeFileSync as writeFileSync9, mkdtempSync as mkdtempSync3, rmSync as rmSync5, readdirSync as readdirSync32, statSync as statSync41, mkdirSync as mkdirSync12 } from "node:fs";
+import { writeFileSync as writeFileSync9, mkdtempSync as mkdtempSync3, rmSync as rmSync5, readdirSync as readdirSync31, statSync as statSync41, mkdirSync as mkdirSync12 } from "node:fs";
 import { join as join48, dirname as dirname19, sep as sep3, posix as pathPosix, win32 as pathWin32 } from "node:path";
 import { tmpdir as tmpdir3, homedir as homedir17 } from "node:os";
 import { createHash as createHash10 } from "node:crypto";
@@ -20154,7 +20200,7 @@ function planAutoUpdate(base, caps, ownVersion2, flag) {
   if (!rel || !rel.version || !rel.sha256) return { update: false, reason: "server advertises no CLI release" };
   if (!isAutoUpdateEnabled(caps.edition, flag)) return { update: false, reason: `auto-update disabled (edition ${caps.edition ?? "?"})` };
   if (compareVersions(rel.version, ownVersion2) <= 0) return { update: false, reason: `already current (own ${ownVersion2} >= server ${rel.version})` };
-  return { update: true, reason: `server ${rel.version} > own ${ownVersion2}`, url: tarballUrl(base), sha256: rel.sha256, from: ownVersion2, to: rel.version };
+  return { update: true, reason: `server ${rel.version} > own ${ownVersion2}`, url: tarballUrl(base, rel.version), fallbackUrl: tarballUrl(base), sha256: rel.sha256, from: ownVersion2, to: rel.version };
 }
 function sweepStaleStaging(root = tmpdir3(), now = Date.now()) {
   const MKDTEMP_SUFFIX = /^cr-update-.{6}$/s;
@@ -20162,7 +20208,7 @@ function sweepStaleStaging(root = tmpdir3(), now = Date.now()) {
   let removed = 0;
   let entries;
   try {
-    entries = readdirSync32(root);
+    entries = readdirSync31(root);
   } catch {
     return 0;
   }
@@ -20172,7 +20218,7 @@ function sweepStaleStaging(root = tmpdir3(), now = Date.now()) {
     try {
       const st = statSync41(dir);
       if (!st.isDirectory() || now - st.mtimeMs < COLD_MS) continue;
-      const inside = readdirSync32(dir);
+      const inside = readdirSync31(dir);
       if (inside.length > 1 || inside.length === 1 && inside[0] !== "chat-recall.tgz") continue;
       rmSync5(dir, { recursive: true, force: true });
       removed++;
@@ -20187,7 +20233,13 @@ async function executeAutoUpdate(plan, deps) {
   try {
     buf = await deps.download(plan.url);
   } catch (e) {
-    return { updated: false, reason: `download failed: ${e instanceof Error ? e.message : e}` };
+    const notFound = e instanceof Error && e.message === "HTTP 404";
+    if (!notFound || !plan.fallbackUrl) return { updated: false, reason: `download failed: ${e instanceof Error ? e.message : e}` };
+    try {
+      buf = await deps.download(plan.fallbackUrl);
+    } catch (e2) {
+      return { updated: false, reason: `download failed: ${e2 instanceof Error ? e2.message : e2}` };
+    }
   }
   const got = createHash10("sha256").update(buf).digest("hex");
   if (got !== plan.sha256) return { updated: false, reason: `checksum mismatch (expected ${plan.sha256.slice(0, 12)}\u2026, got ${got.slice(0, 12)}\u2026) \u2014 NOT installing` };
@@ -20363,7 +20415,7 @@ var init_auto_update = __esm({
   "src/auto-update.ts"() {
     "use strict";
     init_http();
-    tarballUrl = (base) => `${base.replace(/\/+$/, "")}/install/chat-recall.tgz`;
+    tarballUrl = (base, version2) => `${base.replace(/\/+$/, "")}/install/${version2 ? `chat-recall-${version2}.tgz` : "chat-recall.tgz"}`;
     GIVE_UP_AFTER = 3;
     reportedStandingSkip = /* @__PURE__ */ new Set();
   }
@@ -20376,6 +20428,7 @@ __export(sync_client_exports, {
   DERIVED_MAX_BYTES: () => DERIVED_MAX_BYTES,
   FULL_BUILD_MAX_BYTES: () => FULL_BUILD_MAX_BYTES,
   SYNC_CHUNK_BYTES: () => SYNC_CHUNK_BYTES,
+  TOOLKIT_INVENTORY_TYPES: () => TOOLKIT_INVENTORY_TYPES,
   _acceptedUploads: () => _acceptedUploads,
   _fetchTenantSyncConfigForTests: () => _fetchTenantSyncConfigForTests,
   _resetCapsCacheForTests: () => _resetCapsCacheForTests,
@@ -20404,7 +20457,7 @@ __export(sync_client_exports, {
   syncSessions: () => syncSessions
 });
 import { join as join49, dirname as dirname20, basename as basename22 } from "node:path";
-import { readFileSync as readFileSync38, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, mkdtempSync as mkdtempSync4, rmSync as rmSync6, chmodSync as chmodSync6, unlinkSync as unlinkSync3, readdirSync as readdirSync33, statSync as statSync42 } from "node:fs";
+import { readFileSync as readFileSync38, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, mkdtempSync as mkdtempSync4, rmSync as rmSync6, chmodSync as chmodSync6, unlinkSync as unlinkSync3, readdirSync as readdirSync32, statSync as statSync42 } from "node:fs";
 import { tmpdir as tmpdir4, hostname as hostname2 } from "node:os";
 import { createHash as createHash11 } from "node:crypto";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
@@ -20807,7 +20860,7 @@ function reapStaleScanDirs(dir = tmpdir4(), maxAgeMs = 6 * 36e5, now = Date.now(
   let reaped = 0;
   let names;
   try {
-    names = readdirSync33(dir);
+    names = readdirSync32(dir);
   } catch {
     return 0;
   }
@@ -21448,17 +21501,24 @@ async function syncToTargetInScope(cred, opts = {}) {
   const seenTools = /* @__PURE__ */ new Set();
   const seenItemKeys = /* @__PURE__ */ new Map();
   const registry = buildSourceRegistry();
+  const inventory = /* @__PURE__ */ new Map();
+  const inventoryFailed = /* @__PURE__ */ new Set();
   for (const sourceType of registry.getRegisteredTypes()) {
     if (sourceType === "session") continue;
+    if (TOOLKIT_INVENTORY_TYPES.has(sourceType)) inventory.set(sourceType, /* @__PURE__ */ new Set());
     for (const source of registry.getAll(sourceType)) {
       let discovered;
       try {
         discovered = source.discover();
       } catch {
+        inventoryFailed.add(sourceType);
         continue;
       }
       try {
         for await (const item of discovered) {
+          if (inventory.has(item.sourceType) && !excluded(item.projectPath || "") && includedProject(item.projectPath || "")) {
+            inventory.get(item.sourceType).add(item.id);
+          }
           const itemTool = toolOfId(item.id);
           seenTools.add(itemTool);
           const itemKey = `${itemTool}:${item.sourceType}`;
@@ -21516,6 +21576,7 @@ async function syncToTargetInScope(cred, opts = {}) {
           redactions += count.redactions;
         }
       } catch (err) {
+        inventoryFailed.add(sourceType);
         console.error(`[sync] source '${sourceType}' failed mid-walk (its items may be incomplete this run): ${err instanceof Error ? err.message : err}`);
       }
     }
@@ -21542,6 +21603,27 @@ async function syncToTargetInScope(cred, opts = {}) {
   await kgTripleBatch.drain();
   await findingsBatch.drain();
   await drainInflight();
+  {
+    const sentHashes = loadInventoryHashes(base);
+    const entries = [];
+    const hashes = {};
+    for (const [sourceType, ids] of inventory) {
+      if (inventoryFailed.has(sourceType)) continue;
+      const sorted = [...ids].sort();
+      const hash = createHash11("sha256").update(sorted.join("\n")).digest("hex").slice(0, 32);
+      if (sentHashes[sourceType] === hash) continue;
+      entries.push({ source_type: sourceType, ids: sorted });
+      hashes[sourceType] = hash;
+    }
+    if (entries.length > 0) {
+      try {
+        await post({ inventory: entries });
+        saveInventoryHashes(base, hashes);
+      } catch (err) {
+        console.error(`[sync] toolkit inventory not sent (it is retried next sync): ${err instanceof Error ? err.message : err}`);
+      }
+    }
+  }
   if (seenTools.size > 0) {
     try {
       const rec = {};
@@ -21987,7 +22069,7 @@ async function syncIncremental(opts = {}) {
     lock.release();
   }
 }
-var ownVersion, ERROR_CLASS, STANDING_FAILURE, walkProgressForUpload, lastServerPackSpec, credPath, _securityConfigCache, SECURITY_CONFIG_TTL_MS, _syncConfigCache, EMPTY_SYNC_CONFIG, _fetchTenantSyncConfigForTests, SYNC_RULES_REFUSAL, hashPath, acceptedUploads, MAX_DERIVED_ROW_BYTES, isLocalHost, CAPS_TTL_MS, capsOk, advertisedIngestConc, advertisedGzipBody, FULL_BUILD_MAX_BYTES, DERIVED_MAX_BYTES, SYNC_CHUNK_BYTES, BATCH_SCAN_MAX_BYTES;
+var ownVersion, ERROR_CLASS, STANDING_FAILURE, walkProgressForUpload, lastServerPackSpec, credPath, _securityConfigCache, SECURITY_CONFIG_TTL_MS, _syncConfigCache, EMPTY_SYNC_CONFIG, _fetchTenantSyncConfigForTests, SYNC_RULES_REFUSAL, hashPath, acceptedUploads, MAX_DERIVED_ROW_BYTES, isLocalHost, CAPS_TTL_MS, capsOk, advertisedIngestConc, advertisedGzipBody, FULL_BUILD_MAX_BYTES, DERIVED_MAX_BYTES, SYNC_CHUNK_BYTES, TOOLKIT_INVENTORY_TYPES, BATCH_SCAN_MAX_BYTES;
 var init_sync_client = __esm({
   "src/sync-client.ts"() {
     "use strict";
@@ -22032,7 +22114,7 @@ var init_sync_client = __esm({
       ownVersion = JSON.parse(readFileSync38(join49(dir, "../package.json"), "utf-8")).version || ownVersion;
     } catch {
       try {
-        if (true) ownVersion = "0.7.3";
+        if (true) ownVersion = "0.7.5";
       } catch {
       }
     }
@@ -22062,6 +22144,7 @@ var init_sync_client = __esm({
     FULL_BUILD_MAX_BYTES = Math.max(8, parseInt(process.env.CHAT_RECALL_FULL_BUILD_MAX_MB || "24", 10)) * 1024 * 1024;
     DERIVED_MAX_BYTES = Math.max(8, parseInt(process.env.CHAT_RECALL_DERIVED_MAX_MB || "64", 10)) * 1024 * 1024;
     SYNC_CHUNK_BYTES = 8 * 1024 * 1024;
+    TOOLKIT_INVENTORY_TYPES = /* @__PURE__ */ new Set(["skill", "mcp", "command", "agent", "plugin"]);
     BATCH_SCAN_MAX_BYTES = Math.max(1, parseInt(process.env.CHAT_RECALL_BATCHSCAN_MAX_MB || "64", 10)) * 1024 * 1024;
   }
 });
@@ -22246,6 +22329,59 @@ var init_update_notice = __esm({
   }
 });
 
+// src/sync-delegate.ts
+var sync_delegate_exports = {};
+__export(sync_delegate_exports, {
+  installedIsNewer: () => installedIsNewer,
+  runInstalledSync: () => runInstalledSync
+});
+import { spawn as spawn3 } from "node:child_process";
+function installedIsNewer(running, installed) {
+  return !!installed && compareVersions(installed, running) > 0;
+}
+function runInstalledSync(cliPath, timeoutMs = CHILD_TIMEOUT_MS) {
+  return new Promise((resolve3) => {
+    let settled = false;
+    const done = (code) => {
+      if (!settled) {
+        settled = true;
+        resolve3(code);
+      }
+    };
+    let child;
+    try {
+      child = spawn3(process.execPath, [cliPath, "sync"], { env: process.env, stdio: ["ignore", "ignore", "inherit"] });
+    } catch {
+      done(null);
+      return;
+    }
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+      done(null);
+    }, timeoutMs);
+    timer.unref?.();
+    child.on("error", () => {
+      clearTimeout(timer);
+      done(null);
+    });
+    child.on("exit", (code) => {
+      clearTimeout(timer);
+      done(code);
+    });
+  });
+}
+var CHILD_TIMEOUT_MS;
+var init_sync_delegate = __esm({
+  "src/sync-delegate.ts"() {
+    "use strict";
+    init_auto_update();
+    CHILD_TIMEOUT_MS = 20 * 6e4;
+  }
+});
+
 // src/service-installer.ts
 var service_installer_exports = {};
 __export(service_installer_exports, {
@@ -22528,7 +22664,7 @@ __export(install_skills_exports, {
   skillsSourceDir: () => skillsSourceDir,
   uninstallSkills: () => uninstallSkills
 });
-import { readdirSync as readdirSync34, existsSync as existsSync47, mkdirSync as mkdirSync15, rmSync as rmSync8, cpSync, writeFileSync as writeFileSync13, readFileSync as readFileSync42, statSync as statSync43, realpathSync as realpathSync4 } from "fs";
+import { readdirSync as readdirSync33, existsSync as existsSync47, mkdirSync as mkdirSync15, rmSync as rmSync8, cpSync, writeFileSync as writeFileSync13, readFileSync as readFileSync42, statSync as statSync43, realpathSync as realpathSync4 } from "fs";
 import { createHash as createHash12 } from "crypto";
 import { join as join52, basename as basename23 } from "path";
 function skillsSourceDir() {
@@ -22554,7 +22690,7 @@ function skillsFingerprint() {
 }
 function filesUnder(dir, prefix = "") {
   const out = [];
-  for (const e of readdirSync34(dir, { withFileTypes: true })) {
+  for (const e of readdirSync33(dir, { withFileTypes: true })) {
     if (e.name === MARKER) continue;
     const rel = prefix ? `${prefix}/${e.name}` : e.name;
     if (e.isDirectory()) out.push(...filesUnder(join52(dir, e.name), rel));
@@ -22568,7 +22704,7 @@ function skillStamp() {
 function bundledSkillNames() {
   const src = skillsSourceDir();
   if (!existsSync47(src)) return [];
-  return readdirSync34(src, { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync47(join52(src, e.name, "SKILL.md"))).map((e) => e.name).sort();
+  return readdirSync33(src, { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync47(join52(src, e.name, "SKILL.md"))).map((e) => e.name).sort();
 }
 function realPathOrSelf(p) {
   try {
@@ -22658,7 +22794,7 @@ function uninstallSkills() {
       perTarget.push({ id: t.id, label: t.label, removed });
       continue;
     }
-    for (const entry of readdirSync34(t.dir, { withFileTypes: true })) {
+    for (const entry of readdirSync33(t.dir, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
       const dir = join52(t.dir, entry.name);
       if (isManaged(dir) && (names.has(entry.name) || entry.name.startsWith("chat-recall"))) {
@@ -22724,7 +22860,7 @@ var init_install_skills = __esm({
 
 // src/mcp.ts
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { createServer, connect } from "node:net";
 import { unlinkSync as unlinkSync4 } from "node:fs";
 
@@ -28576,7 +28712,7 @@ function startLoginChild(server) {
       reject(new Error("could not locate the CLI entry point"));
       return;
     }
-    const child = spawn3(process.execPath, [cliPath, "init", "--server", server, "--prompt-json", "--yes"], {
+    const child = spawn4(process.execPath, [cliPath, "init", "--server", server, "--prompt-json", "--yes"], {
       env: process.env,
       stdio: ["ignore", "pipe", "pipe"],
       // Outlives this call by design: it polls until the user approves. Detached
@@ -28637,7 +28773,7 @@ function runIndexChild2(force) {
         resolve3(msg);
       }
     };
-    const child = spawn3(process.execPath, args, { env: process.env, stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn4(process.execPath, args, { env: process.env, stdio: ["ignore", "pipe", "pipe"] });
     child.stdout?.on("data", (d) => {
       out += d;
     });
@@ -28669,6 +28805,14 @@ var SYNC_TICK_MS = 3 * 6e4;
 function startBackgroundSync() {
   const tick = async (scope) => {
     try {
+      const { installedVersion: installedVersion2 } = await Promise.resolve().then(() => (init_auto_update(), auto_update_exports));
+      const { installedIsNewer: installedIsNewer2, runInstalledSync: runInstalledSync2 } = await Promise.resolve().then(() => (init_sync_delegate(), sync_delegate_exports));
+      const installed = installedVersion2();
+      if (installedIsNewer2(RELAY_VERSION, installed)) {
+        const code = await runInstalledSync2(fileURLToPath5(new URL("./cli.js", import.meta.url)));
+        if (code !== 0) console.error(`[mcp] sync by the installed CLI ${installed} ended with ${code ?? "no exit code"}`);
+        return;
+      }
       const { syncIncremental: syncIncremental2 } = await Promise.resolve().then(() => (init_sync_client(), sync_client_exports));
       await syncIncremental2({ scope });
     } catch (err) {
@@ -28717,7 +28861,7 @@ function installCrashGuards() {
     reportClientEvent2("mcp_crash", { message: err.stack || err.message });
   });
 }
-var RELAY_VERSION = true ? "0.7.3" : "0.0.0";
+var RELAY_VERSION = true ? "0.7.5" : "0.0.0";
 function daemonIdleSecs() {
   const raw = process.env.CHAT_RECALL_DAEMON_IDLE_SECS;
   if (raw === void 0) return 900;