@get-bb/plugin-sdk 0.4.16 → 0.4.18

package/bundled-types/bb-plugin-sdk-internal-host-policy.d.ts

@@ -9,8 +9,8 @@ import { z } from 'zod';
 
 /**
  * Core `bb` CLI top-level command names (plus commander's built-in help).
- * Plugin CLI commands may not shadow these. Maintained by hand and checked
- * against the real Commander program by
+ * Core commands win these names; plugin scaffolding rejects them. Maintained
+ * by hand and checked against the real Commander program by
  * apps/cli/src/__tests__/plugin-cli-proxy.test.ts.
  *
  * "automation" and "connect" are intentionally absent: builtin plugins own
@@ -583,6 +583,7 @@ interface PluginAiServiceDeclaration {
     readonly kinds: readonly PluginAiServiceKind[];
 }
 
+declare function pluginCliCollisionWarning(pluginId: string, commandName: string): string | null;
 /**
  * Built-in dynamic tool names plugins may not shadow. Maintained by hand —
  * kept in sync with the built-in tools in
@@ -789,5 +790,5 @@ declare function agentToolIconRefusalMessage(toolName: string, problem: string):
  */
 declare function providerWithoutBridgeMessage(providerId: string): string;
 
-export { AGENT_TOOL_NAME_PATTERN, BACKGROUND_NAME_PATTERN, CLI_COMMAND_NAME_PATTERN, KV_VALUE_MAX_BYTES, MENTION_PROVIDER_ID_PATTERN, PLUGIN_AGENT_DYNAMIC_INSTRUCTIONS_MAX_CHARS, PLUGIN_AGENT_SELECTION_MAX_IDS, PLUGIN_AGENT_STATIC_INSTRUCTIONS_MAX_CHARS, PLUGIN_AGENT_STATUS_LABEL_MAX_CHARS, PLUGIN_AGENT_TOOL_PARAMETERS_MAX_BYTES, PLUGIN_HTTP_METHODS, PLUGIN_MENTION_TRIGGER_VALUES, PLUGIN_PROVIDER_BRIDGE_OPTIONS_MAX_BYTES, PLUGIN_PROVIDER_COMPOSER_ACTION_VALUES, PLUGIN_PROVIDER_DISPLAY_NAME_MAX_CHARS, PLUGIN_PROVIDER_PERMISSION_MODE_VALUES, PLUGIN_PROVIDER_REASONING_LEVEL_VALUES, PROVIDER_ID_PATTERN, RESERVED_AGENT_TOOL_NAMES, RESERVED_BB_CLI_COMMANDS, RPC_METHOD_PATTERN, SERVER_DIRECT_AI_SERVICE_IDS, SETTING_KEY_PATTERN, adoptHttpRouteResponse, agentToolIconRefusalMessage, aiServiceAlreadyRegisteredMessage, assertAiServiceRegistrable, assertNoRecursiveJsonSchemaReferences, deriveValidatedProviderOptions, enforcePluginCliOutputLimit, isPluginMentionTrigger, isStandardSchema, isZodSchemaLike, normalizeMentionProviderTriggers, parsePluginAgentToolPresentation, providerAlreadyRegisteredMessage, providerIconRefusalMessage, providerWithoutBridgeMessage, readRpcMethodContract, registerSettingDescriptors, rejectStaleAgentToolFields, summarizeParseIssues, undeclaredIconProblem, validatePluginAiServiceDeclaration, validatePluginProviderDeclaration, validateSettingsUpdate };
+export { AGENT_TOOL_NAME_PATTERN, BACKGROUND_NAME_PATTERN, CLI_COMMAND_NAME_PATTERN, KV_VALUE_MAX_BYTES, MENTION_PROVIDER_ID_PATTERN, PLUGIN_AGENT_DYNAMIC_INSTRUCTIONS_MAX_CHARS, PLUGIN_AGENT_SELECTION_MAX_IDS, PLUGIN_AGENT_STATIC_INSTRUCTIONS_MAX_CHARS, PLUGIN_AGENT_STATUS_LABEL_MAX_CHARS, PLUGIN_AGENT_TOOL_PARAMETERS_MAX_BYTES, PLUGIN_HTTP_METHODS, PLUGIN_MENTION_TRIGGER_VALUES, PLUGIN_PROVIDER_BRIDGE_OPTIONS_MAX_BYTES, PLUGIN_PROVIDER_COMPOSER_ACTION_VALUES, PLUGIN_PROVIDER_DISPLAY_NAME_MAX_CHARS, PLUGIN_PROVIDER_PERMISSION_MODE_VALUES, PLUGIN_PROVIDER_REASONING_LEVEL_VALUES, PROVIDER_ID_PATTERN, RESERVED_AGENT_TOOL_NAMES, RESERVED_BB_CLI_COMMANDS, RPC_METHOD_PATTERN, SERVER_DIRECT_AI_SERVICE_IDS, SETTING_KEY_PATTERN, adoptHttpRouteResponse, agentToolIconRefusalMessage, aiServiceAlreadyRegisteredMessage, assertAiServiceRegistrable, assertNoRecursiveJsonSchemaReferences, deriveValidatedProviderOptions, enforcePluginCliOutputLimit, isPluginMentionTrigger, isStandardSchema, isZodSchemaLike, normalizeMentionProviderTriggers, parsePluginAgentToolPresentation, pluginCliCollisionWarning, providerAlreadyRegisteredMessage, providerIconRefusalMessage, providerWithoutBridgeMessage, readRpcMethodContract, registerSettingDescriptors, rejectStaleAgentToolFields, summarizeParseIssues, undeclaredIconProblem, validatePluginAiServiceDeclaration, validatePluginProviderDeclaration, validateSettingsUpdate };
 export type { AiServiceHostBinding, NormalizedPluginProviderDeclaration };

package/bundled-types/bb-plugin-sdk-provider-bridge-acp.d.ts

@@ -467,6 +467,12 @@ interface AcpClassifiedToolCall {
     item: DeltaItemShape;
     presentation: DeltaPresentation;
 }
+interface AcpCommandResult {
+    /** The process exit code the agent reported; absent when it reported none. */
+    exitCode?: number;
+    /** The command's output text; absent when the agent reported none. */
+    output?: string;
+}
 
 /**
  * Per-agent dialects: the vendor side channels of an ACP agent.
@@ -525,6 +531,17 @@ interface AcpDialect {
      * the shared classifier in charge — which is the normal answer.
      */
     classifyToolCall?(event: AcpToolCallUpdateEvent): AcpClassifiedToolCall | undefined;
+    /**
+     * A command result carried in the agent's non-standard rawOutput shape.
+     * Returning `undefined` leaves the shared ACP result parser in charge.
+     */
+    commandResult?(event: AcpToolCallUpdateEvent): AcpCommandResult | undefined;
+    /**
+     * A command event with the agent's non-standard result fields normalized
+     * into the shared ACP result shapes. The hook runs only after the call has
+     * classified as a command; existing shared result fields must win.
+     */
+    normalizeCommandEvent?(event: AcpToolCallUpdateEvent): AcpToolCallUpdateEvent;
     /**
      * A vendor JSON-RPC request the agent sends to the client. A dialect that
      * answers one returns the JSON-RPC result to reply with (`{}` is a valid

package/bundled-types/bb-plugin-sdk.d.ts

@@ -7865,6 +7865,7 @@ declare const pluginCatalogSearchResultSchema: z$1.ZodObject<{
     iconUrl: z$1.ZodNullable<z$1.ZodString>;
     incompatibleReason: z$1.ZodNullable<z$1.ZodString>;
     installed: z$1.ZodBoolean;
+    installs: z$1.ZodDefault<z$1.ZodNullable<z$1.ZodNumber>>;
     marketplace: z$1.ZodString;
     marketplaceDisplayName: z$1.ZodString;
     official: z$1.ZodBoolean;
@@ -10233,6 +10234,15 @@ declare const sendMessageRequestSchema: z$1.ZodObject<{
     }>>;
 }, z$1.core.$strip>;
 type SendMessageRequest = z$1.infer<typeof sendMessageRequestSchema>;
+declare const sendMessageResponseSchema: z$1.ZodObject<{
+    delivery: z$1.ZodEnum<{
+        deferred: "deferred";
+        queued: "queued";
+        sent: "sent";
+    }>;
+    ok: z$1.ZodLiteral<true>;
+}, z$1.core.$strip>;
+type SendMessageResponse = z$1.infer<typeof sendMessageResponseSchema>;
 declare const editMessageRequestSchema: z$1.ZodObject<{
     executionInputSources: z$1.ZodOptional<z$1.ZodObject<{
         model: z$1.ZodOptional<z$1.ZodEnum<{
@@ -15194,9 +15204,7 @@ type ThreadPaneActionResult = ThreadPaneActionResponse;
 type ThreadDeleteResult = {
     ok: true;
 };
-type ThreadSendResult = {
-    ok: true;
-};
+type ThreadSendResult = SendMessageResponse;
 type ThreadEditMessageResult = EditMessageResponse;
 type ThreadStopResult = {
     ok: true;
@@ -15851,8 +15859,9 @@ interface PluginCliExecutionResult {
     error?: PluginCliOutputLimitError;
 }
 interface PluginCliRegistration {
-    /** Top-level command name (`bb <name> …`): lowercase [a-z0-9-]+, and not
-     * a core bb command (see RESERVED_BB_CLI_COMMANDS in the server). */
+    /** Preferred top-level command name (`bb <name> …`): lowercase [a-z0-9-]+.
+     * A core collision logs an activation warning and remains available through
+     * `bb plugin run <plugin-id>`. */
     name: string;
     summary: string;
     /** Subcommand metadata rendered in help and the plugin-commands skill
@@ -15864,7 +15873,7 @@ interface PluginCli {
     /**
      * Register this plugin's `bb` subcommand. One registration per factory
      * execution; a repeated call is rejected. Core bb commands always win
-     * name collisions; reserved names are rejected at registration.
+     * name collisions; the plugin is warned and remains explicitly callable by id.
      */
     register(registration: PluginCliRegistration): void;
 }

package/dist/internal/host-policy.js

@@ -24,16 +24,23 @@ function parseNamespacedGlyph(glyph) {
 // ../domain/src/plugin-cli.ts
 var RESERVED_BB_CLI_COMMANDS = [
   "environment",
+  "file",
   "guide",
   "help",
+  "machine",
   "manager",
+  "marketplace",
   "plugin",
   "project",
   "provider",
+  "settings",
   "skill",
   "status",
+  "terminal",
   "theme",
-  "thread"
+  "thread",
+  "updates",
+  "voice"
 ];
 
 // ../domain/src/provider-fork.ts
@@ -252,6 +259,10 @@ var providerNativeRootSetSchema = z2.object({
 var PLUGIN_CLI_OUTPUT_MAX_BYTES = 1024 * 1024;
 
 // src/internal/host-policy.ts
+function pluginCliCollisionWarning(pluginId, commandName) {
+  if (!RESERVED_BB_CLI_COMMANDS.includes(commandName)) return null;
+  return `CLI command "${commandName}" collides with core command "bb ${commandName}"; core keeps the short form. Use "bb plugin run ${pluginId}" to invoke this plugin.`;
+}
 var RESERVED_AGENT_TOOL_NAMES = [
   "update_environment_directory"
 ];
@@ -1646,6 +1657,7 @@ export {
   isZodSchemaLike,
   normalizeMentionProviderTriggers,
   parsePluginAgentToolPresentation,
+  pluginCliCollisionWarning,
   providerAlreadyRegisteredMessage,
   providerIconRefusalMessage,
   providerWithoutBridgeMessage,

package/dist/provider-bridge-acp.js

@@ -3116,7 +3116,7 @@ var deltaItemShapeSchema = z24.discriminatedUnion("type", [
   }),
   z24.object({
     type: z24.literal("fileChange"),
-    /** Empty only on bare close-without-open fallbacks (path unknown). */
+    /** Empty while a path is not yet known, including bare close fallbacks. */
     changes: z24.array(deltaFileChangeSchema)
   }),
   /**
@@ -5235,13 +5235,126 @@ var CURSOR_ACP_DIALECT = {
   handleClientRequest: cursorHandleClientRequest,
   maintenance: CURSOR_ACP_MAINTENANCE
 };
+var ompBashRawInputSchema = z35.object({
+  command: z35.string(),
+  async: z35.boolean().optional()
+}).passthrough();
+var ompBashRawOutputSchema = z35.object({
+  content: z35.array(
+    z35.object({
+      type: z35.literal("text"),
+      text: z35.string()
+    }).passthrough()
+  ),
+  details: z35.object({
+    exitCode: z35.number().int().optional(),
+    wallTimeMs: z35.number().nonnegative().optional(),
+    timedOut: z35.boolean().optional(),
+    signal: z35.unknown().optional(),
+    async: z35.unknown().optional()
+  }).passthrough(),
+  // If an OMP version emits generic ACP result fields, the shared parser
+  // owns those exit/output/timeout/signal semantics.
+  exitCode: z35.number().int().nullable().optional(),
+  exit_code: z35.number().int().nullable().optional(),
+  stdout: z35.string().optional(),
+  stderr: z35.string().optional(),
+  output_for_prompt: z35.string().optional(),
+  signal: z35.string().nullable().optional(),
+  timed_out: z35.boolean().optional()
+}).passthrough();
+function stripOmpTrailingNotice(text, notice) {
+  const suffix = `
+
+${notice}`;
+  return text.endsWith(suffix) ? text.slice(0, -suffix.length) : text;
+}
+function ompCommandResult(event) {
+  if (event.kind !== "execute") {
+    return void 0;
+  }
+  const parsedInput = ompBashRawInputSchema.safeParse(event.rawInput);
+  const parsedOutput = ompBashRawOutputSchema.safeParse(event.rawOutput);
+  if (!parsedInput.success || parsedInput.data.command.trim().length === 0 || !parsedOutput.success) {
+    return void 0;
+  }
+  const rawOutput = parsedOutput.data;
+  const details = rawOutput.details;
+  const hasGenericCommandResult = rawOutput.exitCode !== void 0 || rawOutput.exit_code !== void 0 || rawOutput.stdout !== void 0 || rawOutput.stderr !== void 0 || rawOutput.output_for_prompt !== void 0 || rawOutput.signal !== void 0 && rawOutput.signal !== null || rawOutput.timed_out === true;
+  if (parsedInput.data.async === true || details.async !== void 0 || hasGenericCommandResult) {
+    return void 0;
+  }
+  if (details.exitCode === void 0 && details.wallTimeMs === void 0) {
+    return void 0;
+  }
+  let output = rawOutput.content.map((block) => block.text).join("\n");
+  if (details.exitCode !== void 0) {
+    output = stripOmpTrailingNotice(
+      output,
+      `Command exited with code ${String(details.exitCode)}`
+    );
+  }
+  if (details.wallTimeMs !== void 0) {
+    output = stripOmpTrailingNotice(
+      output,
+      `Wall time: ${(details.wallTimeMs / 1e3).toFixed(2)} seconds`
+    );
+  }
+  const isCompletedForegroundBash = event.status === "completed" && details.timedOut !== true && (details.signal === void 0 || details.signal === null);
+  const exitCode = details.exitCode ?? (isCompletedForegroundBash ? 0 : void 0);
+  return {
+    ...exitCode === void 0 ? {} : { exitCode },
+    ...output.length === 0 ? {} : { output }
+  };
+}
+var OMP_ACP_DIALECT = {
+  id: "omp",
+  commandResult: ompCommandResult
+};
+var openCodeCommandRawOutputSchema = z35.object({
+  output: z35.unknown().optional(),
+  metadata: z35.object({
+    exit: z35.number().int().nullable().optional(),
+    output: z35.string().optional()
+  }).passthrough().optional()
+}).passthrough();
+function normalizeOpenCodeCommandEvent(event) {
+  const parsed = openCodeCommandRawOutputSchema.safeParse(event.rawOutput);
+  if (!parsed.success) {
+    return event;
+  }
+  const rawOutput = parsed.data;
+  const output = typeof rawOutput.output === "string" ? rawOutput.output : rawOutput.metadata?.output;
+  const hasSharedOutput = rawOutput["stdout"] !== void 0 || rawOutput["stderr"] !== void 0 || rawOutput["output_for_prompt"] !== void 0;
+  const hasSharedExitCode = rawOutput["exitCode"] !== void 0 || rawOutput["exit_code"] !== void 0;
+  const exitCode = rawOutput.metadata?.exit ?? void 0;
+  if ((output === void 0 || hasSharedOutput) && (exitCode === void 0 || hasSharedExitCode)) {
+    return event;
+  }
+  return {
+    ...event,
+    rawOutput: {
+      ...rawOutput,
+      ...output === void 0 || hasSharedOutput ? {} : { stdout: output },
+      ...exitCode === void 0 || hasSharedExitCode ? {} : { exitCode }
+    }
+  };
+}
+var OPENCODE_ACP_DIALECT = {
+  id: "opencode",
+  normalizeCommandEvent: normalizeOpenCodeCommandEvent
+};
 var DIALECTS_BY_ID = /* @__PURE__ */ new Map([
   [CURSOR_ACP_DIALECT.id, CURSOR_ACP_DIALECT],
-  [GROK_ACP_DIALECT.id, GROK_ACP_DIALECT]
+  [GROK_ACP_DIALECT.id, GROK_ACP_DIALECT],
+  [OMP_ACP_DIALECT.id, OMP_ACP_DIALECT],
+  [OPENCODE_ACP_DIALECT.id, OPENCODE_ACP_DIALECT]
 ]);
 var DIALECT_IDS_BY_COMMAND = {
   "cursor-agent": CURSOR_ACP_DIALECT.id,
-  grok: GROK_ACP_DIALECT.id
+  grok: GROK_ACP_DIALECT.id,
+  omp: OMP_ACP_DIALECT.id,
+  opencode: OPENCODE_ACP_DIALECT.id
 };
 function resolveAcpDialect(launch) {
   if (launch.dialectId !== void 0) {
@@ -5317,9 +5430,6 @@ function classifyAcpToolCall(event, options) {
     }
   }
   const paths = extractAcpToolCallPaths(event, options);
-  if (paths.length === 0) {
-    return { kind: "generic" };
-  }
   const hasDiff = (event.content ?? []).some((entry) => entry.type === "diff");
   if (hasDiff || event.kind === "edit") {
     return { kind: "file_change", changeKind: "update", paths };
@@ -5553,7 +5663,10 @@ function urlFromTitle(title) {
 function looksLikePath(token) {
   return token.startsWith("/") || token.startsWith("~") || token.startsWith(".");
 }
-function fileChangeVerb(changes) {
+function fileChangeVerb(changes, fallback) {
+  if (changes.length === 0) {
+    return fallback;
+  }
   if (changes.every((change) => change.kind === "add")) {
     return "add";
   }
@@ -5582,11 +5695,11 @@ function buildAcpFileChanges(event, operation, options) {
   const [path5] = operation.paths;
   return path5 === void 0 ? [] : [{ path: path5, kind: operation.changeKind }];
 }
-function fileChangeItem(changes) {
+function fileChangeItem(changes, fallbackVerb) {
   return {
     item: { type: "fileChange", changes },
     presentation: fileChangePresentation({
-      verb: fileChangeVerb(changes),
+      verb: fileChangeVerb(changes, fallbackVerb),
       paths: changes.map((change) => change.path)
     })
   };
@@ -5697,9 +5810,7 @@ function classifyAcpToolCall2(event, injected, options) {
   }
   if (operation.kind === "file_change") {
     const changes = buildAcpFileChanges(event, operation, options);
-    if (changes.length > 0) {
-      return fileChangeItem(changes);
-    }
+    return fileChangeItem(changes, operation.changeKind);
   }
   const title = toOptionalString(event.title);
   switch (event.kind) {
@@ -5920,6 +6031,73 @@ function createAcpDeltaTranslator(options = {}) {
     }
     return classifyAcpToolCall2(event, injected, pathOptions);
   }
+  function withClientFileWrites(event, writes) {
+    if (writes.length === 0) {
+      return event;
+    }
+    const paths = new Set(
+      writes.map((write) => resolveAcpToolCallPath(write.path, pathOptions))
+    );
+    return {
+      ...event,
+      content: [
+        ...(event.content ?? []).filter(
+          (entry) => entry.type !== "diff" || !paths.has(resolveAcpToolCallPath(entry.path, pathOptions))
+        ),
+        ...writes
+      ]
+    };
+  }
+  function mergeFsWriteIntoOpenToolCall(context, write) {
+    const writePath = resolveAcpToolCallPath(write.path, pathOptions);
+    const fileChangeCalls = threadCallEntries(context).flatMap(
+      ([key, open]) => {
+        if (open.openedType !== "fileChange") {
+          return [];
+        }
+        const classified = classifyCall(context, open.event);
+        return classified.item.type === "fileChange" ? [
+          {
+            key,
+            open,
+            paths: classified.item.changes.map((change) => change.path)
+          }
+        ] : [];
+      }
+    );
+    const exactMatches = fileChangeCalls.filter(
+      ({ paths }) => paths.includes(writePath)
+    );
+    const pathPendingMatches = fileChangeCalls.filter(
+      ({ paths }) => paths.length === 0
+    );
+    const matching = exactMatches.length === 1 ? exactMatches[0] : exactMatches.length === 0 && pathPendingMatches.length === 1 ? pathPendingMatches[0] : void 0;
+    if (matching === void 0) {
+      return false;
+    }
+    const previous = matching.open.clientFileWrites?.find(
+      (entry) => resolveAcpToolCallPath(entry.path, pathOptions) === writePath
+    );
+    const oldText = previous === void 0 ? write.oldText : previous.oldText;
+    const diff = {
+      type: "diff",
+      path: write.path,
+      ...oldText === void 0 ? {} : { oldText },
+      newText: write.content
+    };
+    const clientFileWrites = [
+      ...(matching.open.clientFileWrites ?? []).filter(
+        (entry) => resolveAcpToolCallPath(entry.path, pathOptions) !== writePath
+      ),
+      diff
+    ];
+    mergedToolCalls.set(matching.key, {
+      ...matching.open,
+      clientFileWrites,
+      event: withClientFileWrites(matching.open.event, clientFileWrites)
+    });
+    return true;
+  }
   function toRawEvent(rawEvent) {
     const parsed = providerRawEventSchema.safeParse(rawEvent);
     if (parsed.success) {
@@ -6036,7 +6214,8 @@ function createAcpDeltaTranslator(options = {}) {
     };
   }
   function commandCloseFields(event, status) {
-    const result = extractAcpCommandResult(event);
+    const normalizedEvent = dialect.normalizeCommandEvent?.(event) ?? event;
+    const result = dialect.commandResult?.(normalizedEvent) ?? extractAcpCommandResult(normalizedEvent);
     const exitCode = result.exitCode ?? (status === "failed" ? 1 : void 0);
     return {
       ...result.output === void 0 ? {} : { aggregatedOutput: result.output, resultText: result.output },
@@ -6155,7 +6334,10 @@ function createAcpDeltaTranslator(options = {}) {
         const event = withDialectIdentity(parsed.data);
         const key = callKey(context, event.toolCallId);
         const open = mergedToolCalls.get(key);
-        const merged = mergeAcpToolCallEvents(open?.event, event);
+        const merged = withClientFileWrites(
+          mergeAcpToolCallEvents(open?.event, event),
+          open?.clientFileWrites ?? []
+        );
         if (isTerminalAcpStatus(merged.status)) {
           mergedToolCalls.delete(key);
           return [
@@ -6174,10 +6356,12 @@ function createAcpDeltaTranslator(options = {}) {
           event: merged,
           openedType: open?.openedType ?? mergedType,
           ...open?.permissionTitle === void 0 ? {} : { permissionTitle: open.permissionTitle },
-          ...open?.delegation === void 0 ? {} : { delegation: open.delegation }
+          ...open?.delegation === void 0 ? {} : { delegation: open.delegation },
+          ...open?.clientFileWrites === void 0 ? {} : { clientFileWrites: open.clientFileWrites }
         });
         if (event.status === "in_progress" && mergedType === "command" && open?.openedType === "command") {
-          const streamed = extractAcpStreamedCommandOutput(event);
+          const normalizedEvent = dialect.normalizeCommandEvent?.(event) ?? event;
+          const streamed = extractAcpStreamedCommandOutput(normalizedEvent);
           return streamed === void 0 ? suppressedUnhandled(rawEvent) : [
             {
               kind: "command.outputSnapshot",
@@ -6354,6 +6538,9 @@ function createAcpDeltaTranslator(options = {}) {
         if (!params.success) {
           return [];
         }
+        if (mergeFsWriteIntoOpenToolCall(context, params.data)) {
+          return [];
+        }
         const rawEvent = {
           jsonrpc: "2.0",
           method: ACP_FS_WRITE_METHOD,
@@ -6676,31 +6863,44 @@ function buildAcpModelDiscoveryAgentCommand(launchSpec) {
     ...launchEnvVars(launchSpec)
   };
 }
-function buildAcpModelListParams(launchSpec) {
+function buildAcpModelListParams(launchSpec, options) {
+  const primaryModels = [
+    ...options.primaryModels ?? launchSpec?.modelCli?.primaryModels ?? []
+  ];
+  const reasoningProbePriorityModelIds = [
+    ...options.reasoningProbePriorityModelIds
+  ];
   if (launchSpec === null) {
-    return { primaryModels: [] };
+    return {
+      primaryModels,
+      reasoningProbePriorityModelIds,
+      parameterizedModelPicker: options.parameterizedModelPicker
+    };
   }
   const listCommand = buildAcpModelListCommand(launchSpec);
   const agent = buildAcpModelDiscoveryAgentCommand(launchSpec);
   return {
     ...listCommand !== void 0 ? { listCommand } : {},
     ...agent !== void 0 ? { agent } : {},
-    primaryModels: [...launchSpec.modelCli?.primaryModels ?? []],
+    primaryModels,
+    reasoningProbePriorityModelIds,
+    parameterizedModelPicker: options.parameterizedModelPicker,
     ...launchSpec.reasoningCli !== void 0 ? { reasoningCli: launchSpec.reasoningCli } : {},
     ...launchSpec.nativeReasoning !== void 0 ? { nativeReasoning: launchSpec.nativeReasoning } : {}
   };
 }
-function buildAcpModelSelectionParam(launchSpec, options) {
+function buildAcpModelSelectionParam(launchSpec, options, parameterizedModelPicker) {
   const model = options.model;
   const listCommand = buildAcpModelListCommand(launchSpec);
   if (!model || model === ACP_DEFAULT_MODEL_ID) {
     return {};
   }
-  if (!listCommand || !launchSpec.modelCli?.selectFlag) {
+  if (parameterizedModelPicker || !listCommand || !launchSpec.modelCli?.selectFlag) {
     return {
       modelSelection: {
         modelId: model,
-        ...options.reasoningLevel !== void 0 ? { reasoningLevel: options.reasoningLevel } : {}
+        ...options.reasoningLevel !== void 0 ? { reasoningLevel: options.reasoningLevel } : {},
+        ...parameterizedModelPicker && options.serviceTier !== void 0 ? { serviceTier: options.serviceTier } : {}
       }
     };
   }
@@ -6710,7 +6910,7 @@ function buildAcpModelSelectionParam(launchSpec, options) {
       selectFlag: launchSpec.modelCli.selectFlag,
       model,
       ...options.reasoningLevel !== void 0 ? { reasoningLevel: options.reasoningLevel } : {},
-      // Only "fast" changes resolution; "default" is the catalog's normal id.
+      // Only "fast" changes launch resolution; "default" is the normal id.
       ...options.serviceTier === "fast" ? { serviceTier: options.serviceTier } : {}
     }
   };
@@ -6736,7 +6936,12 @@ function buildAcpSessionParams(args) {
       args: [...launchSpec.args]
     },
     ...args.dialectId === void 0 ? {} : { dialectId: args.dialectId },
-    ...buildAcpModelSelectionParam(launchSpec, options),
+    ...buildAcpModelSelectionParam(
+      launchSpec,
+      options,
+      args.parameterizedModelPicker
+    ),
+    parameterizedModelPicker: args.parameterizedModelPicker,
     ...launchSpec.reasoningCli !== void 0 ? { reasoningCli: launchSpec.reasoningCli } : {},
     ...launchSpec.nativeReasoning !== void 0 ? { nativeReasoning: launchSpec.nativeReasoning } : {},
     ...launchSpec.permissionCli !== void 0 ? { permissionCli: launchSpec.permissionCli } : {},
@@ -8128,6 +8333,13 @@ async function authenticateAcpAgent(args) {
     );
   }
 }
+function acpClientCapabilities(parameterizedModelPicker, fsAccess = false) {
+  return {
+    fs: { readTextFile: fsAccess, writeTextFile: fsAccess },
+    terminal: false,
+    ...parameterizedModelPicker === true ? { _meta: { parameterizedModelPicker: true } } : {}
+  };
+}
 async function loadAgentModelCatalog(listCommand) {
   const stdout = await new Promise((resolveExec, rejectExec) => {
     execFile4(
@@ -8177,8 +8389,12 @@ async function loadAgentModelCatalog(listCommand) {
   cachedModelCatalog = { key, catalog };
   return catalog;
 }
-async function loadSessionDiscoveredModels(agent) {
-  const key = JSON.stringify(agent);
+async function loadSessionDiscoveredModels(agent, reasoningProbePriorityModelIds, parameterizedModelPicker) {
+  const key = JSON.stringify({
+    agent,
+    reasoningProbePriorityModelIds,
+    parameterizedModelPicker
+  });
   if (cachedSessionDiscoveredModels?.key === key && Date.now() - cachedSessionDiscoveredModels.fetchedAt < SESSION_MODEL_DISCOVERY_TTL_MS) {
     return cachedSessionDiscoveredModels.models;
   }
@@ -8219,10 +8435,7 @@ async function loadSessionDiscoveredModels(agent) {
           params: {
             protocolVersion: ACP_PROTOCOL_VERSION,
             clientInfo: { name: "bb", version: "1.0.0" },
-            clientCapabilities: {
-              fs: { readTextFile: false, writeTextFile: false },
-              terminal: false
-            }
+            clientCapabilities: acpClientCapabilities(parameterizedModelPicker)
           },
           resultSchema: acpInitializeResultSchema
         });
@@ -8260,7 +8473,8 @@ async function loadSessionDiscoveredModels(agent) {
     const reasoningByModel = await discoverAcpNativeReasoningByModel({
       connection,
       sessionId: newSession.sessionId,
-      modelOption
+      modelOption,
+      reasoningProbePriorityModelIds
     });
     const models = reasoningByModel === null ? configOptionModels : buildModelCatalogFromConfigOptions(modelOption, reasoningByModel);
     cachedSessionDiscoveredModels = {
@@ -8288,6 +8502,23 @@ async function discoverAcpNativeReasoningByModel(args) {
     return null;
   }
   const modelOption = args.modelOption;
+  const modelByValue = new Map(
+    modelOptions.map((model) => [model.value, model])
+  );
+  const modelsToProbe = [];
+  const addedModels = /* @__PURE__ */ new Set();
+  for (const value of args.reasoningProbePriorityModelIds) {
+    const model = modelByValue.get(value);
+    if (model && !addedModels.has(model.value)) {
+      modelsToProbe.push(model);
+      addedModels.add(model.value);
+    }
+  }
+  for (const model of modelOptions) {
+    if (!addedModels.has(model.value)) {
+      modelsToProbe.push(model);
+    }
+  }
   const supportByModel = /* @__PURE__ */ new Map();
   let timeout;
   const timeoutReached = new Promise((resolve4) => {
@@ -8299,7 +8530,7 @@ async function discoverAcpNativeReasoningByModel(args) {
   try {
     return await Promise.race([
       (async () => {
-        for (const model of modelOptions) {
+        for (const model of modelsToProbe) {
           const configState = await args.connection.request({
             method: "session/set_config_option",
             params: {
@@ -8459,6 +8690,12 @@ async function selectAcpNativeModel(args) {
     modelSelection: selection,
     nativeReasoning: args.nativeReasoning
   });
+  await selectAcpNativeServiceTier({
+    connection: args.connection,
+    sessionId: args.sessionId,
+    configOptions,
+    modelSelection: selection
+  });
 }
 async function selectAcpNativeReasoning(args) {
   const reasoningLevel = args.modelSelection.reasoningLevel;
@@ -8489,6 +8726,28 @@ async function selectAcpNativeReasoning(args) {
   } catch {
   }
 }
+async function selectAcpNativeServiceTier(args) {
+  const serviceTier = args.modelSelection.serviceTier;
+  if (serviceTier === void 0) {
+    return;
+  }
+  const fastOption = (args.configOptions ?? []).find(
+    (option) => option.id === "fast" && option.type === "select"
+  );
+  const value = serviceTier === "fast" ? "true" : "false";
+  if (!fastOption?.options?.some((option) => option.value === value)) {
+    return;
+  }
+  await args.connection.request({
+    method: "session/set_config_option",
+    params: {
+      sessionId: args.sessionId,
+      configId: fastOption.id,
+      value
+    },
+    resultSchema: acpConfigStateResultSchema
+  });
+}
 function buildPromptContentBlocks(session, input) {
   const blocks = [];
   const instructions = session.pendingInstructions;
@@ -8854,10 +9113,10 @@ async function startAgentSession(request) {
       params: {
         protocolVersion: ACP_PROTOCOL_VERSION,
         clientInfo: { name: "bb", version: "1.0.0" },
-        clientCapabilities: {
-          fs: { readTextFile: true, writeTextFile: true },
-          terminal: false
-        }
+        clientCapabilities: acpClientCapabilities(
+          params.parameterizedModelPicker,
+          true
+        )
       },
       resultSchema: acpInitializeResultSchema
     });
@@ -9327,15 +9586,22 @@ async function handleModelList(id, params) {
     );
     return;
   }
-  const sessionDiscoveredModels = params.listCommand === void 0 && params.agent ? await loadSessionDiscoveredModels(params.agent) : null;
+  const sessionDiscoveredModels = params.listCommand === void 0 && params.agent ? await loadSessionDiscoveredModels(
+    params.agent,
+    params.reasoningProbePriorityModelIds,
+    params.parameterizedModelPicker
+  ) : null;
   if (sessionDiscoveredModels) {
-    sendResult(id, {
-      models: applyConfiguredReasoningToModels(sessionDiscoveredModels, {
-        reasoningCli: params.reasoningCli,
-        nativeReasoning: params.nativeReasoning
-      }),
-      selectedOnlyModels: []
-    });
+    sendResult(
+      id,
+      splitPrimaryModels(
+        applyConfiguredReasoningToModels(sessionDiscoveredModels, {
+          reasoningCli: params.reasoningCli,
+          nativeReasoning: params.nativeReasoning
+        }),
+        params.primaryModels
+      )
+    );
     return;
   }
   sendResult(id, {
@@ -9367,8 +9633,24 @@ var acpProviderOptionsSchema = z39.object({
    * the provider, so a third-party registration of a known agent gets the
    * same reporting fidelity a first-party one does.
    */
-  acpDialect: z39.string().min(1).optional()
+  acpDialect: z39.string().min(1).optional(),
+  /** Enables an agent's separate model configuration options. */
+  parameterizedModelPicker: z39.boolean().optional(),
+  /** Bare model ids shown before the collapsed "More models" pool. */
+  primaryModels: z39.array(z39.string().min(1)).optional(),
+  /** Model ids to probe first during bounded native discovery. */
+  reasoningProbePriorityModelIds: z39.array(z39.string().min(1)).optional()
 }).passthrough();
+function decodeAcpModelPickerOptions(providerOptions) {
+  const parsed = acpProviderOptionsSchema.parse(providerOptions ?? {});
+  return {
+    parameterizedModelPicker: parsed.parameterizedModelPicker === true,
+    ...parsed.primaryModels === void 0 ? {} : { primaryModels: [...parsed.primaryModels] },
+    reasoningProbePriorityModelIds: [
+      ...parsed.reasoningProbePriorityModelIds ?? []
+    ]
+  };
+}
 function decodeAdditionalWorkspaceWriteRoots(providerOptions) {
   return acpProviderOptionsSchema.parse(providerOptions ?? {}).additionalWorkspaceWriteRoots ?? [];
 }
@@ -9410,14 +9692,19 @@ async function handleRequest2(request) {
       };
       sendResult(request.id, result);
       return;
-    case "model/list":
+    case "model/list": {
+      const modelPicker = decodeAcpModelPickerOptions(
+        request.params.providerOptions
+      );
       await handleModelList(
         request.id,
         buildAcpModelListParams(
-          decodeLaunchSpec(request.params.providerOptions)
+          decodeLaunchSpec(request.params.providerOptions),
+          modelPicker
         )
       );
       return;
+    }
     case "provider/health": {
       const launchSpec = decodeLaunchSpec(request.params.providerOptions);
       sendResult(
@@ -9496,6 +9783,9 @@ async function handleRequest2(request) {
         );
         return;
       }
+      const modelPicker = decodeAcpModelPickerOptions(
+        params.options.providerOptions
+      );
       const sessionParams = buildAcpSessionParams({
         additionalWorkspaceWriteRoots: decodeAdditionalWorkspaceWriteRoots(
           params.options.providerOptions
@@ -9507,6 +9797,7 @@ async function handleRequest2(request) {
           ...params.options,
           skillRoots: configuredSkillRoots ?? void 0
         },
+        parameterizedModelPicker: modelPicker.parameterizedModelPicker,
         launchSpec,
         providerLabel: launchSpec.displayName,
         threadId: params.threadId

package/dist/provider-bridge-testing.js

@@ -2246,7 +2246,7 @@ var deltaItemShapeSchema = z14.discriminatedUnion("type", [
   }),
   z14.object({
     type: z14.literal("fileChange"),
-    /** Empty only on bare close-without-open fallbacks (path unknown). */
+    /** Empty while a path is not yet known, including bare close fallbacks. */
     changes: z14.array(deltaFileChangeSchema)
   }),
   /**

package/dist/provider-bridge.js

@@ -4693,7 +4693,7 @@ var deltaItemShapeSchema = z30.discriminatedUnion("type", [
   }),
   z30.object({
     type: z30.literal("fileChange"),
-    /** Empty only on bare close-without-open fallbacks (path unknown). */
+    /** Empty while a path is not yet known, including bare close fallbacks. */
     changes: z30.array(deltaFileChangeSchema)
   }),
   /**

package/dist/testing/index.js

@@ -37,16 +37,23 @@ function parseNamespacedGlyph(glyph) {
 // ../domain/src/plugin-cli.ts
 var RESERVED_BB_CLI_COMMANDS = [
   "environment",
+  "file",
   "guide",
   "help",
+  "machine",
   "manager",
+  "marketplace",
   "plugin",
   "project",
   "provider",
+  "settings",
   "skill",
   "status",
+  "terminal",
   "theme",
-  "thread"
+  "thread",
+  "updates",
+  "voice"
 ];
 
 // ../domain/src/provider-fork.ts
@@ -265,6 +272,10 @@ var providerNativeRootSetSchema = z2.object({
 var PLUGIN_CLI_OUTPUT_MAX_BYTES = 1024 * 1024;
 
 // src/internal/host-policy.ts
+function pluginCliCollisionWarning(pluginId, commandName) {
+  if (!RESERVED_BB_CLI_COMMANDS.includes(commandName)) return null;
+  return `CLI command "${commandName}" collides with core command "bb ${commandName}"; core keeps the short form. Use "bb plugin run ${pluginId}" to invoke this plugin.`;
+}
 var RESERVED_AGENT_TOOL_NAMES = [
   "update_environment_directory"
 ];
@@ -2265,11 +2276,6 @@ function createFakePluginHostInternal(options, sharedState) {
           `invalid cli command name ${JSON.stringify(name)} \u2014 use lowercase letters, digits, and "-"`
         );
       }
-      if (RESERVED_BB_CLI_COMMANDS.includes(name)) {
-        throw new Error(
-          `cli command name "${name}" is reserved by the bb CLI \u2014 pick another name`
-        );
-      }
       if (typeof registration.summary !== "string" || registration.summary.trim().length === 0) {
         throw new Error(`cli command "${name}" must provide a summary`);
       }
@@ -2300,6 +2306,8 @@ function createFakePluginHostInternal(options, sharedState) {
         commands: validatedCommands,
         run: registration.run.bind(registration)
       };
+      const warning = pluginCliCollisionWarning(pluginId, name);
+      if (warning) emitLog("warn", warning);
     }
   };
   const agentTools = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@get-bb/plugin-sdk",
-  "version": "0.4.16",
+  "version": "0.4.18",
   "homepage": "https://github.com/get-bb/bb#readme",
   "bugs": {
     "url": "https://github.com/get-bb/bb/issues"