@cursor/july 0.1.102 → 0.1.103

package/dist/internal/discovery/extension-overlay.js

@@ -0,0 +1,191 @@
+/**
+ * Directory-mount overlays: a same-named file replaces, disable() removes.
+ * Slot loaders do the walk; this file only applies replace/disable.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { join } from "node:path";
+import { getDefinitionKind } from "../brand.js";
+import { loadABs } from "./ab.js";
+import { loadChannels } from "./channels.js";
+import { displayPath, errorMessage } from "./context.js";
+import { findModuleFile, isDirectory, isFile, isModuleFile, moduleStem, sortedEntries, } from "./fs.js";
+import { loadHooks } from "./hooks.js";
+import { loadInstructions } from "./instructions.js";
+import { importDefault } from "./modules.js";
+import { loadSchedules } from "./schedules.js";
+import { loadSkills } from "./skills.js";
+import { loadSubagents } from "./subagent.js";
+export function overlaySlot(ctx, site, contributed, entries, slot) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (const { name, path } of entries) {
+            const definition = yield importDefault(ctx, path, [
+                slot.kind,
+                slot.disabledKind,
+                "disabled",
+            ]);
+            if (definition === undefined) {
+                continue;
+            }
+            const kind = getDefinitionKind(definition);
+            if (kind === slot.disabledKind || kind === "disabled") {
+                contributed.delete(name);
+                if (!slot.declared.has(name)) {
+                    unknownContribution(ctx, path, slot.disableHelper, name, site.ns);
+                }
+                continue;
+            }
+            const item = yield slot.compile(ctx, path, name, definition);
+            if (item !== undefined) {
+                contributed.set(name, item);
+            }
+        }
+    });
+}
+export function overlaySkills(ctx, site, contributed, dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield overlayNamed(ctx, site, contributed, dir, "disableSkill", (onDisable) => loadSkills(ctx, dir, onDisable));
+    });
+}
+export function overlayHooks(ctx, site, contributed, dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield overlayNamed(ctx, site, contributed, dir, "disableHook", (onDisable) => loadHooks(ctx, dir, onDisable));
+    });
+}
+export function overlaySchedules(ctx, site, contributed, dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield overlayNamed(ctx, site, contributed, dir, "disableSchedule", (onDisable) => loadSchedules(ctx, dir, onDisable));
+    });
+}
+export function overlayChannels(ctx, site, contributed, dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!(yield isDirectory(dir))) {
+            return;
+        }
+        const declared = new Set(contributed.keys());
+        const { channels } = yield loadChannels(ctx, dir, "extension", (id, path) => {
+            contributed.delete(id);
+            if (!declared.has(id)) {
+                unknownContribution(ctx, path, "disableChannel", id, site.ns);
+            }
+        });
+        for (const channel of channels) {
+            contributed.set(channel.id, channel);
+        }
+    });
+}
+export function overlaySubagents(ctx, site, contributed, dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!(yield isDirectory(dir))) {
+            return;
+        }
+        const declared = new Set(contributed.keys());
+        for (const child of yield loadSubagents(ctx, dir)) {
+            contributed.set(child.name, child);
+        }
+        for (const entry of yield sortedEntries(dir)) {
+            const path = join(dir, entry.name);
+            if (!entry.isFile() || !isModuleFile(entry.name)) {
+                continue;
+            }
+            const name = moduleStem(entry.name);
+            const definition = yield importDefault(ctx, path, ["disabled"]);
+            if (definition === undefined) {
+                continue;
+            }
+            contributed.delete(name);
+            if (!declared.has(name)) {
+                unknownContribution(ctx, path, "disableSubagent", name, site.ns);
+            }
+        }
+    });
+}
+export function overlayInstructionsFragment(ctx, overlayDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const markdownPath = join(overlayDir, "instructions.md");
+        const modulePath = yield findModuleFile(overlayDir, "instructions");
+        const instructionsDir = join(overlayDir, "instructions");
+        if (!(yield isFile(markdownPath)) &&
+            modulePath === undefined &&
+            !(yield isDirectory(instructionsDir))) {
+            return "keep";
+        }
+        if (modulePath !== undefined) {
+            let mod;
+            try {
+                mod = yield ctx.importModule(modulePath);
+            }
+            catch (error) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, modulePath),
+                    message: `Failed to load module: ${errorMessage(error)}`,
+                });
+                return "keep";
+            }
+            if (getDefinitionKind(mod.default) === "disabled") {
+                return undefined;
+            }
+        }
+        return loadInstructions(ctx, overlayDir, undefined, false);
+    });
+}
+export function overlayAbs(ctx, site, contributed, overlayDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const loaded = yield loadABs(ctx, overlayDir, (source, path) => {
+            if (!contributed.delete(source)) {
+                unknownContribution(ctx, path, "disableAB", source, site.ns);
+            }
+        });
+        for (const experiment of loaded) {
+            contributed.set((_a = experiment.source) !== null && _a !== void 0 ? _a : experiment.name, experiment);
+        }
+    });
+}
+export function overlayArtifacts(ctx, overlayDir, current) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const path = yield findModuleFile(overlayDir, "artifacts");
+        if (path === undefined) {
+            return current;
+        }
+        const definition = yield importDefault(ctx, path, ["artifacts", "disabled"]);
+        if (definition === undefined) {
+            return current;
+        }
+        if (getDefinitionKind(definition) === "disabled") {
+            return undefined;
+        }
+        return definition;
+    });
+}
+function overlayNamed(ctx, site, contributed, dir, helper, load) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!(yield isDirectory(dir))) {
+            return;
+        }
+        const declared = new Set(contributed.keys());
+        for (const item of yield load((name, path) => {
+            contributed.delete(name);
+            if (!declared.has(name)) {
+                unknownContribution(ctx, path, helper, name, site.ns);
+            }
+        })) {
+            contributed.set(item.name, item);
+        }
+    });
+}
+function unknownContribution(ctx, path, helper, name, ns) {
+    ctx.diagnostics.push({
+        severity: "error",
+        path: displayPath(ctx, path),
+        message: `${helper}() targets "${name}", which extension "${ns}" does not contribute.`,
+    });
+}

package/dist/internal/discovery/extensions.d.ts

@@ -1,14 +1,23 @@
 /**
- * `agent/extensions/<ns>.ts` | `agent/extensions/<ns>/extension.ts`: agent-shaped trees and Cursor plugins mounted under a namespace.
+ * `agent/extensions/<ns>.ts` | `agent/extensions/<ns>/extension.ts`:
+ * agent-shaped trees and Cursor plugins mounted under a namespace.
  */
-import type { DiscoveredConnection, DiscoveredExtension, DiscoveredSkill, DiscoveredTool, ResolvedAgent } from "../../types.js";
+import type { ArtifactsDefinition, DiscoveredAB, DiscoveredChannel, DiscoveredConnection, DiscoveredExtension, DiscoveredHook, DiscoveredSchedule, DiscoveredSkill, DiscoveredTool, ResolvedAgent, SeedFile } from "../../types.js";
 import { type DiscoveryContext } from "./context.js";
 /** The agent's authored slot lists that mounted extensions append to. */
 export interface ExtensionContributions {
     tools: DiscoveredTool[];
     skills: DiscoveredSkill[];
     connections: DiscoveredConnection[];
+    hostConnections: DiscoveredConnection[];
     subagents: ResolvedAgent[];
+    hooks: DiscoveredHook[];
+    channels: DiscoveredChannel[];
+    schedules: DiscoveredSchedule[];
+    instructionParts: string[];
+    seedFiles: SeedFile[];
+    abs: DiscoveredAB[];
+    artifacts: ArtifactsDefinition | undefined;
 }
 /**
  * Mount every extension under `agent/extensions/` and append what it

package/dist/internal/discovery/extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/extensions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAEV,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,cAAc,EAEd,aAAa,EAEd,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,cAAc,CAAC;AAgBlE,yEAAyE;AACzE,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,WAAW,EAAE,oBAAoB,EAAE,CAAC;IACpC,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,mBAAmB,EAAE,CAAC,CA4BhC"}
+{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/extensions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EACV,mBAAmB,EAEnB,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,cAAc,EAEd,aAAa,EACb,QAAQ,EAET,MAAM,gBAAgB,CAAC;AAUxB,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,cAAc,CAAC;AAgClE,yEAAyE;AACzE,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,WAAW,EAAE,oBAAoB,EAAE,CAAC;IACpC,eAAe,EAAE,oBAAoB,EAAE,CAAC;IACxC,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,GAAG,EAAE,YAAY,EAAE,CAAC;IACpB,SAAS,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC5C;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,mBAAmB,EAAE,CAAC,CA4BhC"}

package/dist/internal/discovery/extensions.js

@@ -1,5 +1,6 @@
 /**
- * `agent/extensions/<ns>.ts` | `agent/extensions/<ns>/extension.ts`: agent-shaped trees and Cursor plugins mounted under a namespace.
+ * `agent/extensions/<ns>.ts` | `agent/extensions/<ns>/extension.ts`:
+ * agent-shaped trees and Cursor plugins mounted under a namespace.
  */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -11,15 +12,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { join, resolve } from "node:path";
-import { getDefinitionKind } from "../brand.js";
-import { compileConnection } from "./connections.js";
+import { buildIdentityPreamble, withIdentityPreamble } from "../workspace.js";
+import { loadABs } from "./ab.js";
+import { loadChannels } from "./channels.js";
+import { compileConnection, compileHostConnection, loadConnections, loadHostConnections, } from "./connections.js";
 import { displayPath } from "./context.js";
 import { readCursorPlugin } from "./cursor-plugin.js";
+import { overlayAbs, overlayArtifacts, overlayChannels, overlayHooks, overlayInstructionsFragment, overlaySchedules, overlaySkills, overlaySlot, overlaySubagents, } from "./extension-overlay.js";
 import { findModuleFile, isDirectory, isFile, isModuleFile, moduleStem, sortedEntries, } from "./fs.js";
-import { helperCall, importDefault, moduleEntries } from "./modules.js";
+import { loadHooks } from "./hooks.js";
+import { loadInstructions } from "./instructions.js";
+import { importDefault, moduleEntries } from "./modules.js";
 import { validateName } from "./names.js";
+import { loadSchedules } from "./schedules.js";
+import { loadSeedFiles } from "./seed-files.js";
+import { loadArtifacts, mergeArtifacts } from "./services.js";
 import { loadSkills } from "./skills.js";
-import { subagent } from "./subagent.js";
+import { loadSubagents, subagent } from "./subagent.js";
 import { compileTool, loadTools } from "./tools.js";
 /**
  * Mount every extension under `agent/extensions/` and append what it
@@ -81,21 +90,33 @@ function resolveMountSite(ctx, path, entry) {
             : undefined;
     });
 }
+function emptyDiscovered(ns, description) {
+    return {
+        name: ns,
+        description,
+        tools: [],
+        skills: [],
+        connections: [],
+        hostConnections: [],
+        subagents: [],
+        hooks: [],
+        channels: [],
+        schedules: [],
+        instructions: false,
+        seedFiles: [],
+        abs: [],
+        artifactKinds: [],
+    };
+}
 /**
  * Read the extension's tree, lay the mount's overlay on top (a same-named
- * file replaces, `disableTool()` removes), then namespace what is left.
+ * file replaces, `disable()` / `disableTool()` removes), then namespace
+ * what is left.
  */
 function mountExtension(ctx, site, mount, into) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const mounted = {
-            name: site.ns,
-            description: mount.extension.description,
-            tools: [],
-            skills: [],
-            connections: [],
-            subagents: [],
-        };
+        var _a, _b;
+        const mounted = emptyDiscovered(site.ns, mount.extension.description);
         const root = resolve(ctx.rootDir, mount.extension.root);
         if (!(yield isDirectory(root))) {
             const hint = "layout" in mount.extension
@@ -108,12 +129,7 @@ function mountExtension(ctx, site, mount, into) {
             });
             return mounted;
         }
-        // The connection overlay is read first so the tree can leave overlaid
-        // servers uncompiled: a plugin server you replace or drop needs no values.
-        const connectionOverlay = site.overlayDir === undefined
-            ? []
-            : yield moduleEntries(ctx, join(site.overlayDir, "mcp-connections"), "connection");
-        const tree = yield readExtensionTree(ctx, site, mount, root, new Set(connectionOverlay.map((entry) => entry.name)));
+        const tree = yield readExtensionTree(ctx, site, mount, root);
         if (tree === undefined) {
             return mounted;
         }
@@ -121,20 +137,55 @@ function mountExtension(ctx, site, mount, into) {
         const tools = byName(tree.tools);
         const skills = byName(tree.skills);
         const connections = byName(tree.connections);
+        const hostConnections = byName(tree.hostConnections);
+        const hooks = byName(tree.hooks);
+        const channels = byId(tree.channels);
+        const schedules = byName(tree.schedules);
+        const subagents = byName(tree.subagents);
+        for (const agent of tree.agents) {
+            subagents.set(agent.name, subagent(agent.name, agent));
+        }
+        const seedFiles = new Map(tree.seedFiles.map((seed) => [seed.relativePath, seed]));
+        const abs = byAbSource(tree.abs);
+        let artifacts = tree.artifacts;
+        let instructions = tree.instructions;
         if (site.overlayDir !== undefined) {
+            const connectionOverlay = yield moduleEntries(ctx, join(site.overlayDir, "mcp-connections"), "connection");
             yield overlaySlot(ctx, site, tools, yield moduleEntries(ctx, join(site.overlayDir, "tools"), "tool"), {
                 kind: "tool",
+                disabledKind: "disabled-tool",
+                disableHelper: "disableTool",
                 declared: new Set(tools.keys()),
                 compile: (ctx, path, name, definition) => compileTool(ctx, path, name, definition),
             });
             yield overlaySlot(ctx, site, connections, connectionOverlay, {
                 kind: "connection",
+                disabledKind: "disabled-connection",
+                disableHelper: "disableConnection",
                 declared: new Set([...connections.keys(), ...tree.overlaidServers]),
                 compile: (ctx, path, name, definition) => compileConnection(ctx, path, name, definition, "model"),
             });
-            for (const skill of yield loadSkills(ctx, join(site.overlayDir, "skills"))) {
-                skills.set(skill.name, skill);
+            yield overlaySlot(ctx, site, hostConnections, yield moduleEntries(ctx, join(site.overlayDir, "host-connections"), "connection"), {
+                kind: "connection",
+                disabledKind: "disabled-connection",
+                disableHelper: "disableConnection",
+                declared: new Set(hostConnections.keys()),
+                compile: (ctx, path, name, definition) => compileHostConnection(ctx, path, name, definition),
+            });
+            yield overlaySkills(ctx, site, skills, join(site.overlayDir, "skills"));
+            yield overlayHooks(ctx, site, hooks, join(site.overlayDir, "hooks"));
+            yield overlayChannels(ctx, site, channels, join(site.overlayDir, "channels"));
+            yield overlaySchedules(ctx, site, schedules, join(site.overlayDir, "schedules"));
+            yield overlaySubagents(ctx, site, subagents, join(site.overlayDir, "subagents"));
+            const overlayInstructions = yield overlayInstructionsFragment(ctx, site.overlayDir);
+            if (overlayInstructions !== "keep") {
+                instructions = overlayInstructions;
+            }
+            for (const seed of yield loadSeedFiles(ctx, site.overlayDir)) {
+                seedFiles.set(seed.relativePath, seed);
             }
+            yield overlayAbs(ctx, site, abs, site.overlayDir);
+            artifacts = yield overlayArtifacts(ctx, site.overlayDir, artifacts);
         }
         for (const [name, tool] of tools) {
             const composed = `${site.ns}__${name}`;
@@ -146,91 +197,177 @@ function mountExtension(ctx, site, mount, into) {
             into.skills.push(Object.assign(Object.assign({}, skill), { name: composed, extension: site.ns }));
             mounted.skills.push(composed);
         }
+        const modelNames = new Set();
         for (const [name, connection] of connections) {
             const composed = `${site.ns}__${name}`;
+            modelNames.add(composed);
             into.connections.push(Object.assign(Object.assign({}, connection), { name: composed }));
             mounted.connections.push(composed);
         }
-        for (const agent of tree.agents) {
-            const composed = `${site.ns}__${agent.name}`;
-            into.subagents.push(subagent(composed, agent));
+        for (const [name, connection] of hostConnections) {
+            const composed = `${site.ns}__${name}`;
+            if (modelNames.has(composed)) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, join(root, "host-connections", `${name}.ts`)),
+                    message: `Host connection "${composed}" collides with MCP connection "${composed}". Rename one of them.`,
+                });
+                continue;
+            }
+            into.hostConnections.push(Object.assign(Object.assign({}, connection), { name: composed }));
+            mounted.hostConnections.push(composed);
+        }
+        for (const [name, child] of subagents) {
+            const composed = `${site.ns}__${name}`;
+            into.subagents.push(namespaceSubagent(composed, child));
             mounted.subagents.push(composed);
         }
+        for (const [name, hook] of hooks) {
+            const composed = `${site.ns}__${name}`;
+            into.hooks.push(Object.assign(Object.assign({}, hook), { name: composed }));
+            mounted.hooks.push(composed);
+        }
+        for (const [id, channel] of channels) {
+            const composed = `${site.ns}__${id}`;
+            into.channels.push(Object.assign(Object.assign({}, channel), { id: composed }));
+            mounted.channels.push(composed);
+        }
+        for (const [name, schedule] of schedules) {
+            const composed = `${site.ns}__${name}`;
+            into.schedules.push(Object.assign(Object.assign({}, schedule), { name: composed }));
+            mounted.schedules.push(composed);
+        }
+        if (instructions !== undefined && instructions !== "") {
+            into.instructionParts.push(instructions);
+            mounted.instructions = true;
+        }
+        for (const seed of seedFiles.values()) {
+            if (into.seedFiles.some((existing) => existing.relativePath === seed.relativePath)) {
+                ctx.diagnostics.push({
+                    severity: "warning",
+                    path: displayPath(ctx, seed.sourcePath),
+                    message: `Extension seed "${seed.relativePath}" collides with an existing workspace seed; keeping the first.`,
+                });
+                continue;
+            }
+            into.seedFiles.push(seed);
+            mounted.seedFiles.push(seed.relativePath);
+        }
+        for (const experiment of abs.values()) {
+            const composed = `${site.ns}__${experiment.name}`;
+            into.abs.push({
+                name: composed,
+                definition: experiment.definition,
+            });
+            mounted.abs.push(composed);
+        }
+        if (artifacts !== undefined) {
+            const kinds = {};
+            for (const [kind, config] of Object.entries((_b = artifacts.kinds) !== null && _b !== void 0 ? _b : {})) {
+                const composed = `${site.ns}__${kind}`;
+                kinds[composed] = config;
+                mounted.artifactKinds.push(composed);
+            }
+            into.artifacts = mergeArtifacts(into.artifacts, Object.assign(Object.assign({}, artifacts), { kinds }));
+        }
         return mounted;
     });
 }
-function readExtensionTree(ctx, site, mount, root, overlaidServers) {
+function readExtensionTree(ctx, site, mount, root) {
     return __awaiter(this, void 0, void 0, function* () {
         if ("layout" in mount.extension) {
-            const plugin = yield readCursorPlugin(ctx, root, site.mountPath, mount.extension.variables, overlaidServers);
-            return plugin === undefined ? undefined : Object.assign(Object.assign({}, plugin), { tools: [] });
+            const connectionOverlay = site.overlayDir === undefined
+                ? []
+                : yield moduleEntries(ctx, join(site.overlayDir, "mcp-connections"), "connection");
+            const plugin = yield readCursorPlugin(ctx, root, site.mountPath, mount.extension.variables, new Set(connectionOverlay.map((entry) => entry.name)));
+            if (plugin === undefined) {
+                return undefined;
+            }
+            return Object.assign(Object.assign({}, plugin), { tools: [], hostConnections: [], subagents: [], hooks: [], channels: [], schedules: [], seedFiles: [], abs: [] });
         }
-        yield warnUnsupportedExtensionSlots(ctx, root);
+        return readNativeTree(ctx, root);
+    });
+}
+function readNativeTree(ctx, root) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield warnAgentRootOnlySlots(ctx, root);
+        const connections = yield loadConnections(ctx, join(root, "mcp-connections"));
         return {
             tools: yield loadTools(ctx, join(root, "tools")),
             skills: yield loadSkills(ctx, join(root, "skills")),
-            connections: [],
+            connections,
+            hostConnections: yield loadHostConnections(ctx, root, connections),
             overlaidServers: [],
             agents: [],
+            subagents: yield loadSubagents(ctx, join(root, "subagents")),
+            hooks: yield loadHooks(ctx, join(root, "hooks")),
+            channels: (yield loadChannels(ctx, join(root, "channels"), "extension"))
+                .channels,
+            schedules: yield loadSchedules(ctx, join(root, "schedules")),
+            instructions: yield loadInstructions(ctx, root, undefined, false),
+            seedFiles: yield loadSeedFiles(ctx, root),
+            abs: yield loadABs(ctx, root),
+            artifacts: yield loadArtifacts(ctx, root),
         };
     });
 }
+function namespaceSubagent(composed, child) {
+    const oldPreamble = buildIdentityPreamble(child.name);
+    let body = child.instructions;
+    if (body !== undefined &&
+        oldPreamble !== "" &&
+        body.startsWith(oldPreamble)) {
+        body = body.slice(oldPreamble.length).replace(/^\n+/, "");
+    }
+    return Object.assign(Object.assign({}, child), { name: composed, instructions: withIdentityPreamble(composed, body) });
+}
 function byName(items) {
     return new Map(items.map((item) => [item.name, item]));
 }
+function byAbSource(items) {
+    return new Map(items.map((item) => { var _a; return [(_a = item.source) !== null && _a !== void 0 ? _a : item.name, item]; }));
+}
+function byId(items) {
+    return new Map(items.map((item) => [item.id, item]));
+}
 /**
- * Lay a directory mount's slot over the extension's contributions: a
- * same-named file replaces, a disable marker removes, a new name adds.
+ * Agent-singleton slots: one runtime (`agent.ts`), one storage backend,
+ * one OTLP exporter, one A/B platform config. Playground chips are a
+ * Vite glob of the agent tree, not a discovery walk. Nested
+ * `extensions/` are not mounted.
  */
-function overlaySlot(ctx, site, contributed, entries, slot) {
+function warnAgentRootOnlySlots(ctx, root) {
     return __awaiter(this, void 0, void 0, function* () {
-        const disabledKind = `disabled-${slot.kind}`;
-        for (const { name, path } of entries) {
-            const definition = yield importDefault(ctx, path, [
-                slot.kind,
-                disabledKind,
-            ]);
-            if (definition === undefined) {
-                continue;
-            }
-            if (getDefinitionKind(definition) === disabledKind) {
-                contributed.delete(name);
-                if (!slot.declared.has(name)) {
-                    ctx.diagnostics.push({
-                        severity: "error",
-                        path: displayPath(ctx, path),
-                        message: `${helperCall(disabledKind)} targets "${name}", which extension "${site.ns}" does not contribute.`,
-                    });
-                }
-                continue;
-            }
-            const item = yield slot.compile(ctx, path, name, definition);
-            if (item !== undefined) {
-                contributed.set(name, item);
+        const files = [
+            ["agent.ts", "agent.ts"],
+            ["storage.ts", "storage"],
+            ["otel.ts", "otel"],
+            ["ab.config.ts", "A/B config"],
+        ];
+        for (const [file, label] of files) {
+            const path = join(root, file);
+            if (yield isFile(path)) {
+                ctx.diagnostics.push({
+                    severity: "warning",
+                    path: displayPath(ctx, path),
+                    message: `The agent that mounts this extension owns ${label}; ignoring.`,
+                });
             }
         }
-    });
-}
-/** Slots an agent has that an extension tree may not contribute (yet). */
-function warnUnsupportedExtensionSlots(ctx, root) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const unsupported = [
-            ["instructions.md", "instructions"],
-            ["connections", "connections"],
-            ["mcp-connections", "MCP connections"],
-            ["hooks", "hooks"],
-            ["subagents", "subagents"],
-            ["channels", "channels"],
-            ["schedules", "schedules"],
-            ["extensions", "nested extensions"],
+        const dirs = [
+            [
+                "playground",
+                "Playground chips are a Vite glob of the agent tree, not an extension slot; ignoring.",
+            ],
+            ["extensions", "Nested extensions are not mounted; ignoring."],
         ];
-        for (const [slot, label] of unsupported) {
+        for (const [slot, message] of dirs) {
             const path = join(root, slot);
-            if ((yield isDirectory(path)) || (yield isFile(path))) {
+            if (yield isDirectory(path)) {
                 ctx.diagnostics.push({
                     severity: "warning",
                     path: displayPath(ctx, path),
-                    message: `Extension ${label} are not supported yet; only tools/ and skills/ are mounted. Ignoring.`,
+                    message,
                 });
             }
         }

package/dist/internal/discovery/hooks.d.ts

@@ -3,5 +3,5 @@
  */
 import type { DiscoveredHook } from "../../types.js";
 import { type DiscoveryContext } from "./context.js";
-export declare function loadHooks(ctx: DiscoveryContext, hooksDir: string): Promise<DiscoveredHook[]>;
+export declare function loadHooks(ctx: DiscoveryContext, hooksDir: string, onDisable?: (name: string, path: string) => void): Promise<DiscoveredHook[]>;
 //# sourceMappingURL=hooks.d.ts.map

package/dist/internal/discovery/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/hooks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,cAAc,CAAC;AAIlE,wBAAsB,SAAS,CAC7B,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CA+B3B"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/hooks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,cAAc,CAAC;AAIlE,wBAAsB,SAAS,CAC7B,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAC/C,OAAO,CAAC,cAAc,EAAE,CAAC,CA+C3B"}

package/dist/internal/discovery/hooks.js

@@ -11,10 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { basename, extname, relative } from "node:path";
+import { getDefinitionKind } from "../brand.js";
 import { displayPath } from "./context.js";
 import { isDirectory, isModuleFile, toPosix, walkFiles } from "./fs.js";
 import { importDefault } from "./modules.js";
-export function loadHooks(ctx, hooksDir) {
+export function loadHooks(ctx, hooksDir, onDisable) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!(yield isDirectory(hooksDir))) {
             return [];
@@ -26,10 +27,22 @@ export function loadHooks(ctx, hooksDir) {
             }
             const rel = toPosix(relative(hooksDir, filePath));
             const name = rel.slice(0, -extname(rel).length);
-            const definition = yield importDefault(ctx, filePath, "hook");
+            if (name.includes("__")) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, filePath),
+                    message: `Hook name "${name}" may not contain "__"; it is reserved for extension contributions (\`<ns>__<name>\`).`,
+                });
+                continue;
+            }
+            const definition = yield importDefault(ctx, filePath, onDisable === undefined ? "hook" : ["hook", "disabled"]);
             if (definition === undefined) {
                 continue;
             }
+            if (getDefinitionKind(definition) === "disabled") {
+                onDisable === null || onDisable === void 0 ? void 0 : onDisable(name, filePath);
+                continue;
+            }
             const hook = definition;
             if (typeof hook.events !== "object" ||
                 hook.events === null ||

package/dist/internal/discovery/info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/info.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAEtB,MAAM,gBAAgB,CAAC;AAKxB,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CAmKnE"}
+{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/info.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAEtB,MAAM,gBAAgB,CAAC;AAKxB,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CA0KnE"}