gsd-pi 2.77.0 → 2.78.0

package/packages/pi-coding-agent/dist/core/extensions/extension-registry.js

@@ -0,0 +1,167 @@
+/**
+ * Extension Registry — manages manifest reading, registry persistence, and enable/disable state.
+ *
+ * Extensions without manifests always load (backwards compatible).
+ * A fresh install has an empty registry — all extensions enabled by default.
+ * The only way an extension stops loading is an explicit `gsd extensions disable <id>`.
+ */
+import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, writeFileSync } from "node:fs";
+import { getAgentDir } from "../../config.js";
+import { dirname, join } from "node:path";
+// ─── Validation ─────────────────────────────────────────────────────────────
+function isRegistry(data) {
+    if (typeof data !== "object" || data === null)
+        return false;
+    const obj = data;
+    return obj.version === 1 && typeof obj.entries === "object" && obj.entries !== null;
+}
+function isManifest(data) {
+    if (typeof data !== "object" || data === null)
+        return false;
+    const obj = data;
+    return (typeof obj.id === "string" &&
+        typeof obj.name === "string" &&
+        typeof obj.version === "string" &&
+        typeof obj.tier === "string");
+}
+// ─── Registry Path ──────────────────────────────────────────────────────────
+export function getRegistryPath() {
+    return join(dirname(getAgentDir()), "extensions", "registry.json");
+}
+// ─── Registry I/O ───────────────────────────────────────────────────────────
+function defaultRegistry() {
+    return { version: 1, entries: {} };
+}
+export function loadRegistry() {
+    const filePath = getRegistryPath();
+    try {
+        if (!existsSync(filePath))
+            return defaultRegistry();
+        const raw = readFileSync(filePath, "utf-8");
+        const parsed = JSON.parse(raw);
+        return isRegistry(parsed) ? parsed : defaultRegistry();
+    }
+    catch {
+        return defaultRegistry();
+    }
+}
+export function saveRegistry(registry) {
+    const filePath = getRegistryPath();
+    try {
+        mkdirSync(dirname(filePath), { recursive: true });
+        const tmp = filePath + ".tmp";
+        writeFileSync(tmp, JSON.stringify(registry, null, 2), "utf-8");
+        renameSync(tmp, filePath);
+    }
+    catch {
+        // Non-fatal — don't let persistence failures break operation
+    }
+}
+// ─── Query ──────────────────────────────────────────────────────────────────
+/** Returns true if the extension is enabled (missing entries default to enabled). */
+export function isExtensionEnabled(registry, id) {
+    const entry = registry.entries[id];
+    if (!entry)
+        return true;
+    return entry.enabled;
+}
+// ─── Mutations ──────────────────────────────────────────────────────────────
+export function enableExtension(registry, id) {
+    const entry = registry.entries[id];
+    if (entry) {
+        entry.enabled = true;
+        delete entry.disabledAt;
+        delete entry.disabledReason;
+    }
+    else {
+        registry.entries[id] = { id, enabled: true, source: "bundled" };
+    }
+}
+/**
+ * Disable an extension. Returns an error string if the extension is core (cannot disable),
+ * or null on success.
+ */
+export function disableExtension(registry, id, manifest, reason) {
+    if (manifest?.tier === "core") {
+        return `Cannot disable "${id}" — it is a core extension.`;
+    }
+    const entry = registry.entries[id];
+    if (entry) {
+        entry.enabled = false;
+        entry.disabledAt = new Date().toISOString();
+        entry.disabledReason = reason;
+    }
+    else {
+        registry.entries[id] = {
+            id,
+            enabled: false,
+            source: "bundled",
+            disabledAt: new Date().toISOString(),
+            disabledReason: reason,
+        };
+    }
+    return null;
+}
+// ─── Manifest Reading ───────────────────────────────────────────────────────
+/** Read extension-manifest.json from a directory. Returns null if missing or invalid. */
+export function readManifest(extensionDir) {
+    const manifestPath = join(extensionDir, "extension-manifest.json");
+    if (!existsSync(manifestPath))
+        return null;
+    try {
+        const raw = JSON.parse(readFileSync(manifestPath, "utf-8"));
+        return isManifest(raw) ? raw : null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Given an entry path (e.g. `.../extensions/browser-tools/index.ts`),
+ * resolve the parent directory and read its manifest.
+ */
+export function readManifestFromEntryPath(entryPath) {
+    const dir = dirname(entryPath);
+    return readManifest(dir);
+}
+// ─── Discovery ──────────────────────────────────────────────────────────────
+/** Scan all subdirectories of extensionsDir for manifests. Returns a Map<id, manifest>. */
+export function discoverAllManifests(extensionsDir) {
+    const manifests = new Map();
+    if (!existsSync(extensionsDir))
+        return manifests;
+    for (const entry of readdirSync(extensionsDir, { withFileTypes: true })) {
+        if (!entry.isDirectory())
+            continue;
+        const manifest = readManifest(join(extensionsDir, entry.name));
+        if (manifest) {
+            manifests.set(manifest.id, manifest);
+        }
+    }
+    return manifests;
+}
+/**
+ * Auto-populate registry entries for newly discovered extensions.
+ * Extensions already in the registry are left untouched.
+ */
+export function ensureRegistryEntries(extensionsDir) {
+    const manifests = discoverAllManifests(extensionsDir);
+    if (manifests.size === 0)
+        return;
+    const registry = loadRegistry();
+    let changed = false;
+    for (const [id, manifest] of manifests) {
+        if (!registry.entries[id]) {
+            registry.entries[id] = {
+                id,
+                enabled: true,
+                source: "bundled",
+            };
+            changed = true;
+        }
+    }
+    if (changed) {
+        saveRegistry(registry);
+    }
+}
+//# sourceMappingURL=extension-registry.js.map

package/packages/pi-coding-agent/dist/core/extensions/extension-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension-registry.js","sourceRoot":"","sources":["../../../src/core/extensions/extension-registry.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Extension Registry — manages manifest reading, registry persistence, and enable/disable state.\n *\n * Extensions without manifests always load (backwards compatible).\n * A fresh install has an empty registry — all extensions enabled by default.\n * The only way an extension stops loading is an explicit `gsd extensions disable <id>`.\n */\n\nimport { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, writeFileSync } from \"node:fs\";\nimport { getAgentDir } from \"../../config.js\";\nimport { dirname, join } from \"node:path\";\n\n// ─── Types ──────────────────────────────────────────────────────────────────\n\nexport interface ExtensionManifest {\n  id: string;\n  name: string;\n  version: string;\n  description: string;\n  tier: \"core\" | \"bundled\" | \"community\";\n  requires: { platform: string };\n  provides?: {\n    tools?: string[];\n    commands?: string[];\n    hooks?: string[];\n    shortcuts?: string[];\n  };\n  dependencies?: {\n    extensions?: string[];\n    runtime?: string[];\n  };\n}\n\nexport interface ExtensionRegistryEntry {\n  id: string;\n  enabled: boolean;\n  source: \"bundled\" | \"user\" | \"project\";\n  disabledAt?: string;\n  disabledReason?: string;\n  version?: string;           // From manifest, used for semver comparison\n  installedFrom?: string;     // Original specifier: npm package name, git URL, or local path\n  installType?: \"npm\" | \"git\" | \"local\";  // Explicit source type\n}\n\nexport interface ExtensionRegistry {\n  version: 1;\n  entries: Record<string, ExtensionRegistryEntry>;\n}\n\n// ─── Validation ─────────────────────────────────────────────────────────────\n\nfunction isRegistry(data: unknown): data is ExtensionRegistry {\n  if (typeof data !== \"object\" || data === null) return false;\n  const obj = data as Record<string, unknown>;\n  return obj.version === 1 && typeof obj.entries === \"object\" && obj.entries !== null;\n}\n\nfunction isManifest(data: unknown): data is ExtensionManifest {\n  if (typeof data !== \"object\" || data === null) return false;\n  const obj = data as Record<string, unknown>;\n  return (\n    typeof obj.id === \"string\" &&\n    typeof obj.name === \"string\" &&\n    typeof obj.version === \"string\" &&\n    typeof obj.tier === \"string\"\n  );\n}\n\n// ─── Registry Path ──────────────────────────────────────────────────────────\n\nexport function getRegistryPath(): string {\n  return join(dirname(getAgentDir()), \"extensions\", \"registry.json\");\n}\n\n// ─── Registry I/O ───────────────────────────────────────────────────────────\n\nfunction defaultRegistry(): ExtensionRegistry {\n  return { version: 1, entries: {} };\n}\n\nexport function loadRegistry(): ExtensionRegistry {\n  const filePath = getRegistryPath();\n  try {\n    if (!existsSync(filePath)) return defaultRegistry();\n    const raw = readFileSync(filePath, \"utf-8\");\n    const parsed = JSON.parse(raw);\n    return isRegistry(parsed) ? parsed : defaultRegistry();\n  } catch {\n    return defaultRegistry();\n  }\n}\n\nexport function saveRegistry(registry: ExtensionRegistry): void {\n  const filePath = getRegistryPath();\n  try {\n    mkdirSync(dirname(filePath), { recursive: true });\n    const tmp = filePath + \".tmp\";\n    writeFileSync(tmp, JSON.stringify(registry, null, 2), \"utf-8\");\n    renameSync(tmp, filePath);\n  } catch {\n    // Non-fatal — don't let persistence failures break operation\n  }\n}\n\n// ─── Query ──────────────────────────────────────────────────────────────────\n\n/** Returns true if the extension is enabled (missing entries default to enabled). */\nexport function isExtensionEnabled(registry: ExtensionRegistry, id: string): boolean {\n  const entry = registry.entries[id];\n  if (!entry) return true;\n  return entry.enabled;\n}\n\n// ─── Mutations ──────────────────────────────────────────────────────────────\n\nexport function enableExtension(registry: ExtensionRegistry, id: string): void {\n  const entry = registry.entries[id];\n  if (entry) {\n    entry.enabled = true;\n    delete entry.disabledAt;\n    delete entry.disabledReason;\n  } else {\n    registry.entries[id] = { id, enabled: true, source: \"bundled\" };\n  }\n}\n\n/**\n * Disable an extension. Returns an error string if the extension is core (cannot disable),\n * or null on success.\n */\nexport function disableExtension(\n  registry: ExtensionRegistry,\n  id: string,\n  manifest: ExtensionManifest | null,\n  reason?: string,\n): string | null {\n  if (manifest?.tier === \"core\") {\n    return `Cannot disable \"${id}\" — it is a core extension.`;\n  }\n  const entry = registry.entries[id];\n  if (entry) {\n    entry.enabled = false;\n    entry.disabledAt = new Date().toISOString();\n    entry.disabledReason = reason;\n  } else {\n    registry.entries[id] = {\n      id,\n      enabled: false,\n      source: \"bundled\",\n      disabledAt: new Date().toISOString(),\n      disabledReason: reason,\n    };\n  }\n  return null;\n}\n\n// ─── Manifest Reading ───────────────────────────────────────────────────────\n\n/** Read extension-manifest.json from a directory. Returns null if missing or invalid. */\nexport function readManifest(extensionDir: string): ExtensionManifest | null {\n  const manifestPath = join(extensionDir, \"extension-manifest.json\");\n  if (!existsSync(manifestPath)) return null;\n  try {\n    const raw = JSON.parse(readFileSync(manifestPath, \"utf-8\"));\n    return isManifest(raw) ? raw : null;\n  } catch {\n    return null;\n  }\n}\n\n/**\n * Given an entry path (e.g. `.../extensions/browser-tools/index.ts`),\n * resolve the parent directory and read its manifest.\n */\nexport function readManifestFromEntryPath(entryPath: string): ExtensionManifest | null {\n  const dir = dirname(entryPath);\n  return readManifest(dir);\n}\n\n// ─── Discovery ──────────────────────────────────────────────────────────────\n\n/** Scan all subdirectories of extensionsDir for manifests. Returns a Map<id, manifest>. */\nexport function discoverAllManifests(extensionsDir: string): Map<string, ExtensionManifest> {\n  const manifests = new Map<string, ExtensionManifest>();\n  if (!existsSync(extensionsDir)) return manifests;\n\n  for (const entry of readdirSync(extensionsDir, { withFileTypes: true })) {\n    if (!entry.isDirectory()) continue;\n    const manifest = readManifest(join(extensionsDir, entry.name));\n    if (manifest) {\n      manifests.set(manifest.id, manifest);\n    }\n  }\n  return manifests;\n}\n\n/**\n * Auto-populate registry entries for newly discovered extensions.\n * Extensions already in the registry are left untouched.\n */\nexport function ensureRegistryEntries(extensionsDir: string): void {\n  const manifests = discoverAllManifests(extensionsDir);\n  if (manifests.size === 0) return;\n\n  const registry = loadRegistry();\n  let changed = false;\n\n  for (const [id, manifest] of manifests) {\n    if (!registry.entries[id]) {\n      registry.entries[id] = {\n        id,\n        enabled: true,\n        source: \"bundled\",\n      };\n      changed = true;\n    }\n  }\n\n  if (changed) {\n    saveRegistry(registry);\n  }\n}\n"]}

package/packages/pi-coding-agent/dist/core/extensions/loader.d.ts

@@ -23,6 +23,11 @@ export declare function containsTypeScriptSyntax(source: string): boolean;
  * creates a fresh instance.  This prevents memory leaks in long-running daemon
  * processes (every loaded module stays cached forever) and ensures stale modules
  * are not returned when extension source changes on disk.
+ *
+ * #3616: resetting the singleton alone is insufficient — jiti stores compiled
+ * modules in Node's global require.cache when `moduleCache: true`, which is
+ * shared across singletons. We also evict cached entries for every extension
+ * path we've previously loaded so the next import recompiles from disk.
  */
 export declare function resetExtensionLoaderCache(): void;
 /**
@@ -32,8 +37,9 @@ export declare function loadExtensionFromFactory(factory: ExtensionFactory, cwd:
 /**
  * Load extensions from paths.
  *
- * Extensions are loaded in parallel to reduce wall-clock time (~30-50% faster
- * than sequential loading for I/O-bound jiti compilation).
+ * Paths are expected to be topologically sorted by caller (see sortExtensionPaths).
+ * Factories are awaited sequentially so a dependency's factory fully initializes
+ * (registers tools, commands, hooks on `pi`) before any dependent's factory runs.
  */
 export declare function loadExtensions(paths: string[], cwd: string, eventBus?: EventBus): Promise<LoadExtensionsResult>;
 /**

package/packages/pi-coding-agent/dist/core/extensions/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA+BH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAEhG,OAAO,KAAK,EACX,SAAS,EAET,gBAAgB,EAEhB,gBAAgB,EAChB,oBAAoB,EAKpB,MAAM,YAAY,CAAC;AAsTpB,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAI/G;AA6BD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAuCzD;AAkMD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAeD;;;;;GAKG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAwKD;;GAEG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,GACxB,OAAO,CAAC,SAAS,CAAC,CAKpB;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAyBrH;AAmHD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CAoD/B"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA+BH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAIhG,OAAO,KAAK,EACX,SAAS,EAET,gBAAgB,EAEhB,gBAAgB,EAChB,oBAAoB,EAKpB,MAAM,YAAY,CAAC;AAsTpB,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAI/G;AA6BD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAuCzD;AAkMD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAsBD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CA+ChD;AAyKD;;GAEG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,GACxB,OAAO,CAAC,SAAS,CAAC,CAKpB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAsBrH;AAmHD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CAiE/B"}

package/packages/pi-coding-agent/dist/core/extensions/loader.js

@@ -36,6 +36,8 @@ import { execCommand } from "../exec.js";
 import { getUntrustedExtensionPaths } from "./project-trust.js";
 export { isProjectTrusted, trustProject, getUntrustedExtensionPaths } from "./project-trust.js";
 import { registerToolCompatibility } from "../tools/tool-compatibility-registry.js";
+import { mergeExtensionEntryPaths } from "./extension-discovery.js";
+import { sortExtensionPaths } from "./extension-sort.js";
 /**
  * Statically imported modules for Bun binary virtualModules.
  * Maps specifier -> module object for subpaths that must be available in compiled binaries.
@@ -548,14 +550,74 @@ export function containsTypeScriptSyntax(source) {
  * are compiled once and reused across all extensions.
  */
 let _extensionLoaderJiti = null;
+// Tracks every extension-module path that jiti has compiled through the shared
+// singleton so resetExtensionLoaderCache() can also evict Node's global
+// require.cache entries for those modules. jiti stores compiled modules under
+// `nativeRequire.cache[filename]` when `moduleCache: true`, so a new singleton
+// still returns the stale cached module on re-import without this eviction.
+const _loadedExtensionPaths = new Set();
+const _extensionRequire = createRequire(import.meta.url);
 /**
  * Reset the shared jiti singleton so the next call to getExtensionLoaderJiti()
  * creates a fresh instance.  This prevents memory leaks in long-running daemon
  * processes (every loaded module stays cached forever) and ensures stale modules
  * are not returned when extension source changes on disk.
+ *
+ * #3616: resetting the singleton alone is insufficient — jiti stores compiled
+ * modules in Node's global require.cache when `moduleCache: true`, which is
+ * shared across singletons. We also evict cached entries for every extension
+ * path we've previously loaded so the next import recompiles from disk.
  */
 export function resetExtensionLoaderCache() {
     _extensionLoaderJiti = null;
+    // Build a set of exact cache keys we expect (raw path, resolved path,
+    // realpath) AND a set of (basename, containing-directory) pairs so we
+    // can also catch entries that jiti/Node wrote under a canonicalized
+    // form (Windows drive-letter case, separator swap, UNC prefix, symlink
+    // resolution). require.cache is shared across all createRequire
+    // instances for CJS, so iterating any instance's cache covers jiti's
+    // internal `nativeRequire.cache` writes.
+    const exact = new Set();
+    const signatures = new Set();
+    const makeSignature = (p) => {
+        const normalized = p.replace(/\\/g, "/").toLowerCase();
+        const slash = normalized.lastIndexOf("/");
+        const base = slash >= 0 ? normalized.slice(slash + 1) : normalized;
+        // Use the trailing two path segments as the signature — unique
+        // enough to avoid collisions in typical filesystems while tolerating
+        // drive-letter / separator variations that differ in the prefix.
+        const parent = slash >= 0 ? normalized.slice(0, slash) : "";
+        const parentSlash = parent.lastIndexOf("/");
+        const parentSeg = parentSlash >= 0 ? parent.slice(parentSlash + 1) : parent;
+        return `${parentSeg}/${base}`;
+    };
+    for (const raw of _loadedExtensionPaths) {
+        exact.add(raw);
+        try {
+            exact.add(_extensionRequire.resolve(raw));
+        }
+        catch {
+            // unresolvable — fall through; signature scan may still hit it
+        }
+        try {
+            exact.add(fs.realpathSync(raw));
+        }
+        catch {
+            // file may have been deleted already; ignore
+        }
+        signatures.add(makeSignature(raw));
+    }
+    for (const key of Object.keys(_extensionRequire.cache)) {
+        if (exact.has(key) || signatures.has(makeSignature(key))) {
+            try {
+                delete _extensionRequire.cache[key];
+            }
+            catch {
+                // require.cache is best-effort; ignore failures (e.g. frozen cache).
+            }
+        }
+    }
+    _loadedExtensionPaths.clear();
 }
 function getExtensionLoaderJiti() {
     if (!_extensionLoaderJiti) {
@@ -587,6 +649,7 @@ async function loadExtensionModule(extensionPath) {
     }
     const jiti = getExtensionLoaderJiti();
     const module = await jiti.import(extensionPath, { default: true });
+    _loadedExtensionPaths.add(extensionPath);
     const factory = module;
     return typeof factory !== "function" ? undefined : factory;
 }
@@ -721,19 +784,19 @@ export async function loadExtensionFromFactory(factory, cwd, eventBus, runtime,
 /**
  * Load extensions from paths.
  *
- * Extensions are loaded in parallel to reduce wall-clock time (~30-50% faster
- * than sequential loading for I/O-bound jiti compilation).
+ * Paths are expected to be topologically sorted by caller (see sortExtensionPaths).
+ * Factories are awaited sequentially so a dependency's factory fully initializes
+ * (registers tools, commands, hooks on `pi`) before any dependent's factory runs.
  */
 export async function loadExtensions(paths, cwd, eventBus) {
     const resolvedEventBus = eventBus ?? createEventBus();
     const runtime = createExtensionRuntime();
-    const results = await Promise.all(paths.map((extPath) => loadExtension(extPath, cwd, resolvedEventBus, runtime)));
     const extensions = [];
     const errors = [];
-    for (let i = 0; i < results.length; i++) {
-        const { extension, error } = results[i];
+    for (const extPath of paths) {
+        const { extension, error } = await loadExtension(extPath, cwd, resolvedEventBus, runtime);
         if (error) {
-            errors.push({ path: paths[i], error });
+            errors.push({ path: extPath, error });
         }
         else if (extension) {
             extensions.push(extension);
@@ -742,6 +805,7 @@ export async function loadExtensions(paths, cwd, eventBus) {
     return {
         extensions,
         errors,
+        warnings: [],
         runtime,
     };
 }
@@ -875,7 +939,12 @@ export async function discoverAndLoadExtensions(configuredPaths, cwd, agentDir =
     }
     // 2. Global extensions: agentDir/extensions/
     const globalExtDir = path.join(agentDir, "extensions");
-    addPaths(discoverExtensionsInDir(globalExtDir));
+    // 2b. Installed extensions: ~/.gsd/extensions/ merged with bundled (D-14, D-15)
+    // Discovery handles ID-based merge — loader stays dumb.
+    const installedExtDir = path.join(path.dirname(agentDir), "extensions");
+    const globalPaths = discoverExtensionsInDir(globalExtDir);
+    const mergedPaths = mergeExtensionEntryPaths(globalPaths, installedExtDir);
+    addPaths(mergedPaths);
     // 3. Explicitly configured paths
     for (const p of configuredPaths) {
         const resolved = resolvePath(p, cwd);
@@ -892,6 +961,14 @@ export async function discoverAndLoadExtensions(configuredPaths, cwd, agentDir =
         }
         addPaths([resolved]);
     }
-    return loadExtensions(allPaths, cwd, eventBus);
+    // Topological sort: ensure declared dependencies load first (D-06, D-07)
+    const { sortedPaths, warnings: sortWarnings } = sortExtensionPaths(allPaths);
+    // Emit warnings to stderr immediately — loader runs before ctx.ui is ready (D-08)
+    for (const w of sortWarnings) {
+        process.stderr.write(`[gsd] ${w.message}\n`);
+    }
+    const result = await loadExtensions(sortedPaths, cwd, eventBus);
+    result.warnings.push(...sortWarnings);
+    return result;
 }
 //# sourceMappingURL=loader.js.map