Wire Desktop Extensions through agentlock install

Author: RonCodes88

cli/src/commands/install.ts

@@ -36,6 +36,8 @@ import {
   checkSafeTarget,
   executeFileOps,
   executeUninstallOps,
+  listExtensionBundleManifests,
+  listJsonFiles,
   readExistingFiles,
 } from "../util/install-fs.ts";
 import { claudeDesktopConfigPath } from "../detect/claude-desktop.ts";
@@ -351,6 +353,11 @@ export async function runInstall(argv: string[] = []): Promise<void> {
         uninstallPaths.push(resolve(join(dir, "settings.json")));
       } else if (id === "claude-desktop") {
         uninstallPaths.push(resolve(join(dir, "claude_desktop_config.json")));
+        // Bundle manifests live one dir over and are the actual launch
+        // source for Desktop Extensions — the daemon needs each to
+        // unwind the wrap on uninstall.
+        const bundlesDir = resolve(join(dir, "Claude Extensions"));
+        uninstallPaths.push(...(await listExtensionBundleManifests(bundlesDir)));
       } else if (id === "codex" || id === "cursor") {
         uninstallPaths.push(resolve(join(dir, "hooks.json")));
       } else if (id === "gemini") {
@@ -411,13 +418,31 @@ export async function runInstall(argv: string[] = []): Promise<void> {
   const geminiSettings = resolve(
     join(hostConfigDirs["gemini"], "settings.json"),
   );
+  // Per-extension bundle manifests are THE launch source for Desktop
+  // Extensions installed via Settings → Extensions UI — claudeDesktopPlan
+  // wraps each one in place using the schema-blessed _meta.agentlock
+  // slot (MCPB v0.3+). The Claude Extensions Settings sidecar JSONs
+  // tell us which extensions are isEnabled so disabled ones get
+  // unwound rather than re-wrapped.
+  const claudeDesktopBundlesDir = resolve(
+    join(hostConfigDirs["claude-desktop"], "Claude Extensions"),
+  );
+  const claudeDesktopExtSettingsDir = resolve(
+    join(hostConfigDirs["claude-desktop"], "Claude Extensions Settings"),
+  );
+  const bundleManifests = await listExtensionBundleManifests(
+    claudeDesktopBundlesDir,
+  );
+  const extSettingsFiles = await listJsonFiles(claudeDesktopExtSettingsDir);
   const existingFiles = await readExistingFiles([
     claudeSettings,
     claudeDesktopConfig,
     codexHooks,
     codexConfig,
     cursorHooks,
     geminiSettings,
+    ...bundleManifests,
+    ...extSettingsFiles,
   ]);
 
   // Write the status-line script alongside the binary wrapper. Daemon

cli/src/util/install-fs.ts

@@ -55,6 +55,56 @@ export function checkSafeTarget(
   );
 }
 
+// listJsonFiles returns the absolute path of every *.json file
+// directly under `dir`. Returns an empty array if `dir` doesn't exist
+// or isn't a directory — matches readExistingFiles's "missing is
+// fine" posture so callers can chain them safely.
+export async function listJsonFiles(dir: string): Promise<string[]> {
+  let entries: import("node:fs").Dirent[];
+  try {
+    entries = await fs.readdir(dir, { withFileTypes: true });
+  } catch (err: unknown) {
+    const code = (err as { code?: string }).code;
+    if (code === "ENOENT" || code === "ENOTDIR") return [];
+    throw err;
+  }
+  const out: string[] = [];
+  for (const e of entries) {
+    if (!e.isFile()) continue;
+    if (!e.name.endsWith(".json")) continue;
+    out.push(resolve(dir, e.name));
+  }
+  return out;
+}
+
+// listExtensionBundleManifests scans the "Claude Extensions" dir for
+// each <ext-id>/manifest.json — the on-disk bundle manifest Claude
+// Desktop launches from. Returns absolute paths. Missing dir is fine.
+export async function listExtensionBundleManifests(
+  bundlesDir: string,
+): Promise<string[]> {
+  let entries: import("node:fs").Dirent[];
+  try {
+    entries = await fs.readdir(bundlesDir, { withFileTypes: true });
+  } catch (err: unknown) {
+    const code = (err as { code?: string }).code;
+    if (code === "ENOENT" || code === "ENOTDIR") return [];
+    throw err;
+  }
+  const out: string[] = [];
+  for (const e of entries) {
+    if (!e.isDirectory()) continue;
+    const manifestPath = resolve(bundlesDir, e.name, "manifest.json");
+    try {
+      const stat = await fs.stat(manifestPath);
+      if (stat.isFile()) out.push(manifestPath);
+    } catch {
+      // No manifest.json in this bundle dir — skip silently.
+    }
+  }
+  return out;
+}
+
 // readExistingFiles loads utf8 contents for each absolute path that
 // exists; silently skips ENOENT so the caller can pass a list of
 // "maybe present" paths and the daemon merges against whatever it