@cursor/bdk 0.2.24 → 0.2.26

package/dist/internal/discovery/cursor-plugin.js

@@ -3,7 +3,7 @@
  */
 import { readFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join } from "node:path";
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 import { parseYamlFrontmatter } from "../frontmatter.js";
 import { isRecord } from "../is-record.js";
 import { displayPath, errorMessage, isBlank } from "./context.js";
@@ -37,8 +37,8 @@ const manifestSchema = z.object({
     mcpServers: z
         .union([
         z.string(),
-        z.record(z.unknown()),
-        z.array(z.union([z.string(), z.record(z.unknown())])),
+        z.record(z.string(), z.unknown()),
+        z.array(z.union([z.string(), z.record(z.string(), z.unknown())])),
     ])
         .optional()
         .transform((value) => {
@@ -58,16 +58,16 @@ const frontmatterSchema = z.object({
 const mcpServerSchema = z.object({
     type: z.string().optional(),
     url: z.string().optional(),
-    headers: z.record(z.string()).optional(),
+    headers: z.record(z.string(), z.string()).optional(),
     command: z.string().optional(),
     args: z.array(z.string()).optional(),
-    env: z.record(z.string()).optional(),
+    env: z.record(z.string(), z.string()).optional(),
     cwd: z.string().optional(),
     envFile: z.string().optional(),
     /** Cursor's static OAuth client hint. */
-    auth: z.record(z.unknown()).optional(),
+    auth: z.record(z.string(), z.unknown()).optional(),
     /** Claude's spelling of the same hint. */
-    oauth: z.record(z.unknown()).optional(),
+    oauth: z.record(z.string(), z.unknown()).optional(),
     /** Cursor disables unlisted tools; an empty list would disable them all. */
     enabledTools: z.array(z.string()).nonempty().optional(),
 });
@@ -499,7 +499,7 @@ function componentName(plugin, raw, path) {
     });
     return undefined;
 }
-/** `headers: Expected object, received array`; the path names the field. */
+/** `headers: Invalid input: expected record, received array`; the path names the field. */
 function firstIssue(error) {
     const issue = error.issues[0];
     if (issue === undefined) {

package/dist/internal/discovery/extension-overlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension-overlay.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/extension-overlay.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,aAAa,EACd,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,KAAK,gBAAgB,EAA6B,MAAM,cAAc,CAAC;AAgBhF,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,WAAW,CAAC,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;IAC5B,YAAY,EAAE,eAAe,GAAG,qBAAqB,CAAC;IACtD,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,CACP,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,OAAO,KAChB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;CAC7C;AAED,wBAAsB,WAAW,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1D,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAC3B,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9C,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACzC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EACxC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC5C,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAC3C,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACvC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,CA4BtC;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAAG,SAAS,GACvC,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAa1C"}
+{"version":3,"file":"extension-overlay.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/extension-overlay.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EACV,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,aAAa,EACd,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,cAAc,CAAC;AAgB5F,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,WAAW,CAAC,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;IAC5B,YAAY,EAAE,eAAe,GAAG,qBAAqB,CAAC;IACtD,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,CACP,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,OAAO,KAChB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;CAC7C;AAED,wBAAsB,WAAW,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1D,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAC3B,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9C,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACzC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EACxC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC5C,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAC3C,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACvC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,CAwBtC;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAAG,SAAS,GACvC,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAa1C"}

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

@@ -5,7 +5,7 @@
 import { join } from "node:path";
 import { getDefinitionKind } from "../brand.js";
 import { loadChannels } from "./channels.js";
-import { displayPath, errorMessage } from "./context.js";
+import { displayPath, pushModuleLoadDiagnostic } from "./context.js";
 import { findModuleFile, isDirectory, isFile, isModuleFile, moduleStem, sortedEntries, } from "./fs.js";
 import { loadHooks } from "./hooks.js";
 import { loadInstructions } from "./instructions.js";
@@ -96,11 +96,7 @@ export async function overlayInstructionsFragment(ctx, overlayDir) {
             mod = await ctx.importModule(modulePath);
         }
         catch (error) {
-            ctx.diagnostics.push({
-                severity: "error",
-                path: displayPath(ctx, modulePath),
-                message: `Failed to load module: ${errorMessage(error)}`,
-            });
+            pushModuleLoadDiagnostic(ctx, modulePath, error);
             return "keep";
         }
         if (getDefinitionKind(mod.default) === "disabled") {

package/dist/internal/discovery/extensions.js

@@ -329,23 +329,30 @@ function byId(items) {
     return new Map(items.map((item) => [item.id, item]));
 }
 /**
- * Agent-singleton slots: one runtime (`agent.ts`), one storage backend,
- * one OTLP exporter. Playground chips are a Vite glob of the agent tree,
- * not a discovery walk. Nested `extensions/` are not mounted.
+ * Agent-singleton slots: one runtime (`agent.ts`), one storage backend.
+ * Playground chips are a Vite glob of the agent tree, not a discovery walk.
+ * Nested `extensions/` are not mounted.
  */
 async function warnAgentRootOnlySlots(ctx, root) {
     const files = [
-        ["agent.ts", "agent.ts"],
-        ["storage.ts", "storage"],
-        ["otel.ts", "otel"],
+        ["agent.ts", "The agent that mounts this extension owns agent.ts; ignoring."],
+        ["storage.ts", "The agent that mounts this extension owns storage; ignoring."],
+        [
+            "otel.ts",
+            'otel.ts is removed. Delete this file. See "Migrating from serve({ otel })" in docs/guides/opentelemetry.md.',
+        ],
+        [
+            "instrumentation.ts",
+            'instrumentation.ts is not loaded. Delete this file. See "Migrating from serve({ otel })" in docs/guides/opentelemetry.md.',
+        ],
     ];
-    for (const [file, label] of files) {
+    for (const [file, message] of files) {
         const path = join(root, file);
         if (await isFile(path)) {
             ctx.diagnostics.push({
                 severity: "warning",
                 path: displayPath(ctx, path),
-                message: `The agent that mounts this extension owns ${label}; ignoring.`,
+                message,
             });
         }
     }

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

@@ -1,6 +1,6 @@
 /**
  * The `info` / `GET /v1/info` projection of an {@link AgentProject}.
  */
-import { type AgentProject, type AgentProjectInfo } from "../../types.js";
-export declare function projectInfo(project: AgentProject): AgentProjectInfo;
+import { type AgentProject, type ProjectInfo } from "../../types.js";
+export declare function projectInfo(project: AgentProject): ProjectInfo;
 //# sourceMappingURL=info.d.ts.map

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;AAGH,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAqB,MAAM,gBAAgB,CAAC;AAK7F,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;AAGH,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAqB,MAAM,gBAAgB,CAAC;AAMxF,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,WAAW,CAkK9D"}

package/dist/internal/discovery/info.js

@@ -5,6 +5,7 @@ import { resolveArtifactsMax } from "../../artifacts.js";
 import { toPublicCloudInfo } from "../../types.js";
 import { toolInputJsonSchema } from "../json-schema.js";
 import { MCP_ENDPOINT_PATH, mcpEndpointToolNames } from "../mcp-endpoint.js";
+import { DEFAULT_AGENT_ARCHITECTURE } from "./agent-config.js";
 import { connectionTransportLabel } from "./connections.js";
 export function projectInfo(project) {
     const agent = project.agent;
@@ -37,12 +38,14 @@ export function projectInfo(project) {
         },
     ];
     return {
+        schemaVersion: 1,
         name: project.name,
         description: agent.description,
         model: agent.model,
+        architecture: agent.architecture ?? DEFAULT_AGENT_ARCHITECTURE,
         runtime: agent.runtime,
         cloud: agent.cloud === undefined ? undefined : toPublicCloudInfo(agent.cloud),
-        local: agent.local,
+        local: agent.local?.cwd === undefined ? undefined : { cwd: agent.local.cwd },
         hosting: agent.hosting,
         concurrency: agent.concurrency,
         mcp: { path: MCP_ENDPOINT_PATH, tools: mcpEndpointToolNames(project) },
@@ -58,7 +61,7 @@ export function projectInfo(project) {
             name: tool.name,
             description: tool.description,
             execution: tool.execution,
-            needsApproval: tool.needsApproval,
+            needsApproval: typeof tool.definition.needsApproval === "function" ? "dynamic" : tool.needsApproval,
             effect: tool.effect,
             inputSchema: tool.inputSchema,
         })),
@@ -121,6 +124,9 @@ export function projectInfo(project) {
                 if (meta?.bitbucketWebhookEvents !== undefined) {
                     info.bitbucketWebhookEvents = meta.bitbucketWebhookEvents;
                 }
+                if (meta?.pagerdutyWebhookEvents !== undefined) {
+                    info.pagerdutyWebhookEvents = meta.pagerdutyWebhookEvents;
+                }
                 if (meta?.deploymentEventTypes !== undefined) {
                     info.deploymentEventTypes = meta.deploymentEventTypes;
                 }
@@ -155,12 +161,6 @@ export function projectInfo(project) {
                 agentTool: project.artifacts.agentTool === true,
                 max: resolveArtifactsMax(project.artifacts),
             },
-        otel: project.otel === undefined
-            ? undefined
-            : {
-                enabled: true,
-                serviceName: project.otel.serviceName,
-            },
-        diagnostics: project.diagnostics,
+        diagnostics: project.diagnostics.map((diagnostic) => ({ ...diagnostic })),
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/instructions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,qBAAqB,EAA0B,MAAM,gBAAgB,CAAC;AAEpF,OAAO,EAAE,KAAK,gBAAgB,EAAsC,MAAM,cAAc,CAAC;AAGzF,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,qBAAqB,GAAG,SAAS,EACzC,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkD7B"}
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/instructions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,qBAAqB,EAA0B,MAAM,gBAAgB,CAAC;AAEpF,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,cAAc,CAAC;AAGtB,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,qBAAqB,GAAG,SAAS,EACzC,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkD7B"}

package/dist/internal/discovery/instructions.js

@@ -4,7 +4,7 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { getDefinitionKind } from "../brand.js";
-import { displayPath, errorMessage, isBlank } from "./context.js";
+import { displayPath, isBlank, pushModuleLoadDiagnostic, } from "./context.js";
 import { findModuleFile, isDirectory, isFile, isModuleFile, sortedEntries } from "./fs.js";
 export async function loadInstructions(ctx, agentDir, config, isRoot) {
     const parts = [];
@@ -59,11 +59,7 @@ async function loadInstructionsModule(ctx, modulePath) {
         mod = await ctx.importModule(modulePath);
     }
     catch (error) {
-        ctx.diagnostics.push({
-            severity: "error",
-            path: displayPath(ctx, modulePath),
-            message: `Failed to load module: ${errorMessage(error)}`,
-        });
+        pushModuleLoadDiagnostic(ctx, modulePath, error);
         return undefined;
     }
     const value = mod.default;
@@ -75,6 +71,7 @@ async function loadInstructionsModule(ctx, modulePath) {
     }
     ctx.diagnostics.push({
         severity: "error",
+        code: "invalid_definition",
         path: displayPath(ctx, modulePath),
         message: "Instructions modules must default-export a string or defineInstructions({ markdown }).",
     });

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

@@ -0,0 +1,10 @@
+/**
+ * Bake-time OpenTelemetry providers. Installed before `agent.ts` so a
+ * module-scope meter, tracer, or logger binds to a real provider.
+ * `instrumentation.ts` is not loaded.
+ */
+import { type DiscoveryContext } from "./context.js";
+export declare function agentDirHasInstrumentation(agentDir: string): boolean;
+export declare function resetInstrumentationRegistryForTests(): void;
+export declare function loadInstrumentation(ctx: DiscoveryContext, agentDir: string): Promise<boolean>;
+//# sourceMappingURL=instrumentation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/instrumentation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,cAAc,CAAC;AAKlE,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED,wBAAgB,oCAAoC,IAAI,IAAI,CAE3D;AAKD,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAYlB"}

package/dist/internal/discovery/instrumentation.js

@@ -0,0 +1,29 @@
+/**
+ * Bake-time OpenTelemetry providers. Installed before `agent.ts` so a
+ * module-scope meter, tracer, or logger binds to a real provider.
+ * `instrumentation.ts` is not loaded.
+ */
+import { installCustomerOtel } from "../otel/customer.js";
+import { displayPath } from "./context.js";
+import { findModuleFile } from "./fs.js";
+const instrumentedAgentDirs = new Set();
+export function agentDirHasInstrumentation(agentDir) {
+    return instrumentedAgentDirs.has(agentDir);
+}
+export function resetInstrumentationRegistryForTests() {
+    instrumentedAgentDirs.clear();
+}
+const INSTRUMENTATION_FILE = 'instrumentation.ts is not loaded. Delete this file. See "Migrating from serve({ otel })" in docs/guides/opentelemetry.md.';
+export async function loadInstrumentation(ctx, agentDir) {
+    installCustomerOtel();
+    instrumentedAgentDirs.add(agentDir);
+    const path = await findModuleFile(agentDir, "instrumentation");
+    if (path !== undefined) {
+        ctx.diagnostics.push({
+            severity: "error",
+            path: displayPath(ctx, path),
+            message: INSTRUMENTATION_FILE,
+        });
+    }
+    return true;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/modules.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,KAAK,gBAAgB,EAA6B,MAAM,cAAc,CAAC;AAIhF,KAAK,cAAc,GAAG,OAAO,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC,CAAC;AAEvE,4EAA4E;AAC5E,wBAAsB,aAAa,CACjC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GAAG,YAAY,GAC1B,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAwBhD;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,cAAc,GAAG,SAAS,cAAc,EAAE,GACnD,OAAO,CAAC,OAAO,CAAC,CA6BlB;AAED,sFAAsF;AACtF,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAGvD"}
+{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/modules.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,cAAc,CAAC;AAI5F,KAAK,cAAc,GAAG,OAAO,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAAC,CAAC;AAEvE,4EAA4E;AAC5E,wBAAsB,aAAa,CACjC,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GAAG,YAAY,GAC1B,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAwBhD;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,gBAAgB,EACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,cAAc,GAAG,SAAS,cAAc,EAAE,GACnD,OAAO,CAAC,OAAO,CAAC,CA2BlB;AAED,sFAAsF;AACtF,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAGvD"}

package/dist/internal/discovery/modules.js

@@ -3,7 +3,7 @@
  */
 import { join } from "node:path";
 import { getDefinitionKind } from "../brand.js";
-import { displayPath, errorMessage } from "./context.js";
+import { displayPath, pushModuleLoadDiagnostic } from "./context.js";
 import { isDirectory, isModuleFile, moduleStem, sortedEntries } from "./fs.js";
 import { validateName } from "./names.js";
 /** The module files of a slot directory whose filenames are valid names. */
@@ -42,11 +42,7 @@ export async function importDefault(ctx, modulePath, expected) {
         mod = await ctx.importModule(modulePath);
     }
     catch (error) {
-        ctx.diagnostics.push({
-            severity: "error",
-            path: displayPath(ctx, modulePath),
-            message: `Failed to load module: ${errorMessage(error)}`,
-        });
+        pushModuleLoadDiagnostic(ctx, modulePath, error);
         return undefined;
     }
     const kinds = typeof expected === "string" ? [expected] : expected;
@@ -57,12 +53,14 @@ export async function importDefault(ctx, modulePath, expected) {
     const helpers = kinds.map(helperCall).join(" or ");
     const expectedKinds = kinds.join(" or ");
     const article = /^[aeiou]/.test(expectedKinds) ? "an" : "a";
+    const message = kind === undefined
+        ? `Module must default-export ${helpers}.`
+        : `Expected ${article} ${expectedKinds} definition but found "${kind}" (wrong authored slot?).`;
     ctx.diagnostics.push({
         severity: "error",
+        code: "invalid_definition",
         path: displayPath(ctx, modulePath),
-        message: kind === undefined
-            ? `Module must default-export ${helpers}.`
-            : `Expected ${article} ${expectedKinds} definition but found "${kind}" (wrong authored slot?).`,
+        message,
     });
     return undefined;
 }
@@ -87,5 +85,4 @@ const DEFINE_HELPER_NAME = {
     hook: "defineHook",
     storage: "defineStorage",
     artifacts: "defineArtifacts",
-    otel: "defineOtel",
 };

package/dist/internal/discovery/project-public.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Public project load. `serve` reads the compiled project back from the map.
+ */
+import type { AgentProject, Diagnostic, Project } from "../../types.js";
+export interface LoadProjectOptions {
+    /** When true, warnings throw {@link ProjectLoadError} as well as errors. */
+    strict?: boolean;
+}
+export declare class ProjectLoadError extends Error {
+    readonly diagnostics: readonly Diagnostic[];
+    constructor(diagnostics: readonly Diagnostic[]);
+}
+export declare function loadProject(dir: string, options?: LoadProjectOptions): Promise<Project>;
+export declare function createProject(agentProject: AgentProject): Project;
+export declare function unwrapProject(project: Project): AgentProject;
+//# sourceMappingURL=project-public.d.ts.map

package/dist/internal/discovery/project-public.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-public.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/project-public.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAe,MAAM,gBAAgB,CAAC;AAMrF,MAAM,WAAW,kBAAkB;IACjC,4EAA4E;IAC5E,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAUD,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;IAE5C,YAAY,WAAW,EAAE,SAAS,UAAU,EAAE,EAK7C;CACF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQjG;AAED,wBAAgB,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAIjE;AAkBD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CAM5D"}

package/dist/internal/discovery/project-public.js

@@ -0,0 +1,54 @@
+/**
+ * Public project load. `serve` reads the compiled project back from the map.
+ */
+import { projectInfo } from "./info.js";
+import { formatDiagnostics, hasErrorDiagnostics, loadAgentProject } from "./project.js";
+const agentProjects = new WeakMap();
+class ProjectImpl {
+    constructor(info) {
+        this.info = info;
+    }
+}
+export class ProjectLoadError extends Error {
+    constructor(diagnostics) {
+        const copy = diagnostics.map((diagnostic) => ({ ...diagnostic }));
+        super(formatDiagnostics(copy));
+        this.name = "ProjectLoadError";
+        this.diagnostics = copy;
+    }
+}
+export async function loadProject(dir, options = {}) {
+    const loaded = await loadAgentProject(dir);
+    const hasError = hasErrorDiagnostics(loaded);
+    const hasWarning = loaded.diagnostics.some((diagnostic) => diagnostic.severity === "warning");
+    if (hasError || (options.strict === true && hasWarning)) {
+        throw new ProjectLoadError(loaded.diagnostics);
+    }
+    return createProject(loaded);
+}
+export function createProject(agentProject) {
+    const project = new ProjectImpl(deepFreeze(projectInfo(agentProject)));
+    agentProjects.set(project, agentProject);
+    return project;
+}
+function deepFreeze(value) {
+    const copy = structuredClone(value);
+    freezeValue(copy);
+    return copy;
+}
+function freezeValue(value) {
+    if (value === null || typeof value !== "object" || Object.isFrozen(value)) {
+        return;
+    }
+    for (const nested of Object.values(value)) {
+        freezeValue(nested);
+    }
+    Object.freeze(value);
+}
+export function unwrapProject(project) {
+    const agentProject = project instanceof ProjectImpl ? agentProjects.get(project) : undefined;
+    if (agentProject === undefined) {
+        throw new Error("serve() accepts a Project from loadProject");
+    }
+    return agentProject;
+}

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

@@ -48,4 +48,10 @@ export declare function loadAgentProject(dir: string, options?: LoadAgentProject
 /** True when the project has diagnostics that must block serving. */
 export declare function hasErrorDiagnostics(project: AgentProject): boolean;
 export declare function formatDiagnostics(diagnostics: Diagnostic[]): string;
+export declare function formatValidateJson(mounts: ReadonlyArray<{
+    slug: string;
+    project: {
+        diagnostics: readonly Diagnostic[];
+    };
+}>): string;
 //# sourceMappingURL=project.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/project.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAuB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAapF,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,cAAc,CAAC;AAetB;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASrE;AAYD,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CA2BlF;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CA6BzD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAAuB,GAAG;IACjC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACtB,GACL,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAgBzD;AAWD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,YAAY,CAAC,CA6GvB;AA0BD,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/project.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAuB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAcpF,OAAO,EAIL,KAAK,uBAAuB,EAE7B,MAAM,cAAc,CAAC;AAgBtB;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASrE;AAYD,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CA2BlF;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CA6BzD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAAuB,GAAG;IACjC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACtB,GACL,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAgBzD;AAWD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,YAAY,CAAC,CA+HvB;AA0BD,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,aAAa,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE;QAAE,WAAW,EAAE,SAAS,UAAU,EAAE,CAAA;KAAE,CAAA;CAAE,CAAC,GACvF,MAAM,CAeR"}

package/dist/internal/discovery/project.js

@@ -6,15 +6,17 @@ import { registerAuthoredModuleLoaders } from "../authored-loaders.js";
 import { channelArchitectureError, channelArchitectureMigrationWarning, } from "../channel-architecture.js";
 import { applyAgentContinuationDefaults, warnOmittedContinuationDowngrades, } from "../continuation-channel.js";
 import { httpChannel } from "../http-channel-define.js";
+import { otelProvidersReplaced } from "../otel/customer.js";
 import { loadAgent, warnUnknownSlots } from "./agent.js";
 import { loadChannels } from "./channels.js";
-import { defaultImportModule, displayPath, } from "./context.js";
+import { defaultImportModule, displayPath, pushConfigDiagnostic, } from "./context.js";
 import { hasFlatLayoutMarkers, isDirectory, readPackageName, sortedEntries } from "./fs.js";
 import { loadHooks } from "./hooks.js";
+import { loadInstrumentation } from "./instrumentation.js";
 import { NAME_PATTERN, RESERVED_SLUGS } from "./names.js";
 import { loadReminders } from "./reminders.js";
 import { loadSchedules } from "./schedules.js";
-import { appendArtifactTool, loadArtifacts, loadOtel, loadStorage, mergeArtifacts, rejectLegacyResult, } from "./services.js";
+import { appendArtifactTool, loadArtifacts, loadStorage, mergeArtifacts, rejectLegacyOtelModule, rejectLegacyResult, } from "./services.js";
 /**
  * True when `dir` looks like an agent project root: it has a nested `bot/`
  * directory, a compatible `agent/` directory, or flat-layout markers
@@ -158,15 +160,24 @@ export async function loadAgentProject(dir, options = {}) {
         diagnostics,
         importModule: options.importModule ?? defaultImportModule,
     };
+    // Before agent.ts, tools, and channels. A meter created first stays a no-op.
+    await loadInstrumentation(ctx, agentDir);
     const name = (await readPackageName(rootDir)) ?? basename(rootDir);
     const { agent, projectSlots } = await loadAgent(ctx, agentDir, {
         name,
         isRoot: true,
     });
+    if (otelProvidersReplaced()) {
+        ctx.diagnostics.push({
+            severity: "warning",
+            path: displayPath(ctx, join(agentDir, "agent.ts")),
+            message: "A module replaced an OpenTelemetry provider BDK installed. The global API now uses that module's provider. See docs/guides/opentelemetry.md.",
+        });
+    }
     const { channels, httpChannelDefinition } = await loadChannels(ctx, join(agentDir, "channels"));
     for (const channel of projectSlots.channels) {
         if (channel.id === "http" || channels.some((c) => c.id === channel.id)) {
-            ctx.diagnostics.push({
+            pushConfigDiagnostic(ctx, {
                 severity: "error",
                 path: displayPath(ctx, join(agentDir, "extensions")),
                 message: `Extension channel "${channel.id}" collides with an agent channel.`,
@@ -183,7 +194,7 @@ export async function loadAgentProject(dir, options = {}) {
     hooks.push(...projectSlots.hooks);
     const storage = await loadStorage(ctx, agentDir, agent.architecture);
     const artifacts = await mergeProjectArtifacts(ctx, agentDir, projectSlots.artifacts);
-    const otel = await loadOtel(ctx, agentDir);
+    await rejectLegacyOtelModule(ctx, agentDir);
     await rejectLegacyResult(ctx, agentDir);
     await appendArtifactTool(ctx, agentDir, agent, artifacts);
     if (agentDir !== rootDir) {
@@ -194,18 +205,26 @@ export async function loadAgentProject(dir, options = {}) {
         const channelPath = displayPath(ctx, join(agentDir, "channels", `${channel.id}.ts`));
         const architectureError = channelArchitectureError(agent.architecture, channel.definition);
         if (architectureError !== undefined) {
-            ctx.diagnostics.push({ severity: "error", path: channelPath, message: architectureError });
+            pushConfigDiagnostic(ctx, {
+                severity: "error",
+                path: channelPath,
+                message: architectureError,
+            });
         }
         const migrationWarning = channelArchitectureMigrationWarning(agent.architecture, channel.definition);
         if (migrationWarning !== undefined) {
-            ctx.diagnostics.push({ severity: "warning", path: channelPath, message: migrationWarning });
+            pushConfigDiagnostic(ctx, {
+                severity: "warning",
+                path: channelPath,
+                message: migrationWarning,
+            });
         }
     }
     warnOmittedContinuationDowngrades({
         architecture: agent.architecture,
         channels,
         warn: (id, message) => {
-            ctx.diagnostics.push({
+            pushConfigDiagnostic(ctx, {
                 severity: "warning",
                 path: displayPath(ctx, join(agentDir, "channels", `${id}.ts`)),
                 message,
@@ -229,7 +248,6 @@ export async function loadAgentProject(dir, options = {}) {
         hooks,
         storage,
         artifacts,
-        otel,
         diagnostics,
     };
 }
@@ -264,3 +282,17 @@ export function formatDiagnostics(diagnostics) {
     })
         .join("\n");
 }
+export function formatValidateJson(mounts) {
+    const agents = mounts.map(({ slug, project }) => ({
+        slug,
+        diagnostics: project.diagnostics.map((diagnostic) => ({
+            severity: diagnostic.severity,
+            code: diagnostic.code ?? "other",
+            path: diagnostic.path,
+            package: diagnostic.package,
+            message: diagnostic.message,
+        })),
+    }));
+    const ok = !agents.some((agent) => agent.diagnostics.some((diagnostic) => diagnostic.severity === "error"));
+    return `${JSON.stringify({ version: 1, ok, agents })}\n`;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/runtime.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,cAAc,CAAC;AAElE;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,YAAY,GAAG,SAAS,GAChC,YAAY,CAed;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE;IACN,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,IAAI,CA2DN;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,IAAI,CAkCN"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/internal/discovery/runtime.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,KAAK,gBAAgB,EAAqC,MAAM,cAAc,CAAC;AAExF;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,YAAY,GAAG,SAAS,GAChC,YAAY,CAed;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE;IACN,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,IAAI,CA2DN;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,gBAAgB,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE;IACN,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,IAAI,CAkCN"}

package/dist/internal/discovery/runtime.js

@@ -2,7 +2,7 @@
  * Runtime resolution and the limitations each runtime imposes on the authored surface.
  */
 import { join } from "node:path";
-import { displayPath } from "./context.js";
+import { displayPath, pushConfigDiagnostic } from "./context.js";
 /**
  * Validate the authored runtime. An unrecognized value is an error
  * diagnostic and falls back to local — a typo must not silently pick a
@@ -15,7 +15,7 @@ export function resolveRuntime(ctx, agentDir, runtime) {
         runtime === "grokbot") {
         return runtime ?? "local";
     }
-    ctx.diagnostics.push({
+    pushConfigDiagnostic(ctx, {
         severity: "error",
         path: displayPath(ctx, join(agentDir, "agent.ts")),
         message: `runtime must be "local", "cloud", or "grokbot"; got ${JSON.stringify(runtime)}.`,
@@ -31,10 +31,10 @@ export function resolveRuntime(ctx, agentDir, runtime) {
 export function checkGrokBotRuntimeLimitations(ctx, agentDir, counts) {
     const agentPath = displayPath(ctx, join(agentDir, "agent.ts"));
     const error = (path, message) => {
-        ctx.diagnostics.push({ severity: "error", path, message });
+        pushConfigDiagnostic(ctx, { severity: "error", path, message });
     };
     const warn = (path, message) => {
-        ctx.diagnostics.push({ severity: "warning", path, message });
+        pushConfigDiagnostic(ctx, { severity: "warning", path, message });
     };
     if (counts.serverTools > 0) {
         error(displayPath(ctx, join(agentDir, "tools")), 'Server tools (execution: "server", including opted-in builtinTools) are not reachable from grokbot turns yet. Remove them or run the agent on the local runtime.');
@@ -67,28 +67,28 @@ export function checkGrokBotRuntimeLimitations(ctx, agentDir, counts) {
 export function warnCloudRuntimeLimitations(ctx, agentDir, counts) {
     const agentPath = displayPath(ctx, join(agentDir, "agent.ts"));
     if (!counts.hasCloudOptions) {
-        ctx.diagnostics.push({
+        pushConfigDiagnostic(ctx, {
             severity: "warning",
             path: agentPath,
             message: 'runtime: "cloud" usually needs a `cloud` block (e.g. repos / env). Without it the Cursor cloud API may reject create.',
         });
     }
     if (counts.agentTools > 0) {
-        ctx.diagnostics.push({
+        pushConfigDiagnostic(ctx, {
             severity: "warning",
             path: displayPath(ctx, join(agentDir, "tools")),
             message: 'Agent tools (execution: "agent") are described on the first cloud prompt (with script bodies); they are not written into the cloud VM filesystem automatically.',
         });
     }
     if (counts.skills > 0) {
-        ctx.diagnostics.push({
+        pushConfigDiagnostic(ctx, {
             severity: "warning",
             path: displayPath(ctx, join(agentDir, "skills")),
             message: "Authored skills reach cloud agents through native store discovery: hosted deployments write the deployment store's skills/ directory; local serve/run with a personal API key writes agent-serve/<agent>/skills/ on the USER store. Without a reachable store, only skills already in the cloud repo are visible.",
         });
     }
     if (counts.seedFiles > 0) {
-        ctx.diagnostics.push({
+        pushConfigDiagnostic(ctx, {
             severity: "warning",
             path: displayPath(ctx, join(agentDir, "sandbox")),
             message: "sandbox/workspace seed files reach cloud agents through the Agent Store, not the checkout: hosted deployments write the deployment store's workspace/ directory; local serve/run with a personal API key writes agent-serve/<agent>/workspace/ on the USER store. The first cloud prompt names the mounted directory. Without a reachable store, cloud turns do not see them.",

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

@@ -1,13 +1,14 @@
 /**
- * `agent/storage.ts`, `agent/otel.ts`, `agent/artifacts.ts`:
- * host services the agent configures.
+ * `agent/storage.ts` and `agent/artifacts.ts`: host services the agent
+ * configures. `agent/otel.ts` is rejected. OpenTelemetry is `OTEL_*`
+ * variables.
  */
-import type { OtelDefinition } from "../../otel.js";
 import type { StorageDefinition } from "../../storage.js";
 import type { AgentArchitecture, ArtifactsDefinition, ResolvedAgent } from "../../types.js";
 import { type DiscoveryContext } from "./context.js";
 export declare function loadStorage(ctx: DiscoveryContext, agentDir: string, architecture: AgentArchitecture | undefined): Promise<StorageDefinition | undefined>;
-export declare function loadOtel(ctx: DiscoveryContext, agentDir: string): Promise<OtelDefinition | undefined>;
+/** Fail discovery when the retired `otel.ts` module is still present. */
+export declare function rejectLegacyOtelModule(ctx: DiscoveryContext, agentDir: string): Promise<void>;
 export declare function loadArtifacts(ctx: DiscoveryContext, agentDir: string): Promise<ArtifactsDefinition | undefined>;
 /**
  * `defineResult` / `agent/result.ts` is gone. A leftover file is an