@get-bb/plugin-sdk 0.4.17 → 0.4.20

package/dist/provider-bridge-acp.js

@@ -6802,1162 +6802,1190 @@ function resolveAcpPermissionDecision(args) {
 
 // ../provider-bridge-acp/src/session-params.ts
 import path4 from "node:path";
-function sanitizeAcpSkillDescription(description) {
-  const sanitized = description.replace(/[\r\n]+/gu, " ").replace(/\s+/gu, " ").replace(/[<>]/gu, "").trim();
-  return sanitized.length > 0 ? sanitized : "(description unavailable)";
-}
-function buildAcpSkillsInstructions(skillRoots) {
-  if (!skillRoots || skillRoots.length === 0) {
-    return void 0;
+
+// ../provider-bridge-acp/src/bridge/model-catalog.ts
+var ACP_NATIVE_REASONING_EFFORTS = [
+  {
+    reasoningEffort: "medium",
+    description: "Reasoning effort is managed by the connected ACP agent."
   }
-  const skillLines = skillRoots.flatMap((skillRoot) => {
-    return skillRoot.skills.map((skill) => {
-      const skillFilePath = path4.join(
-        skillRoot.skillDirectoryRootPath,
-        skill.name,
-        "SKILL.md"
-      );
-      return `- ${skill.name}: ${sanitizeAcpSkillDescription(skill.description)} (SKILL.md: ${skillFilePath})`;
-    });
-  });
-  if (skillLines.length === 0) {
-    return void 0;
+];
+var MODEL_LINE_PATTERN = /^(\S+) - (.+)$/;
+var BARE_PROVIDER_MODEL_LINE_PATTERN = /^\S+\/\S+$/;
+var BULLETED_MODEL_LINE_PATTERN = /^[*-]\s+(\S+)(?:\s+\([^)]*\))?$/u;
+var EFFORT_TOKENS = [
+  ["extra-high", "xhigh"],
+  ["medium", "medium"],
+  ["xhigh", "xhigh"],
+  ["high", "high"],
+  ["low", "low"],
+  ["max", "max"],
+  ["none", "none"]
+];
+var FAST_TAIL = "-fast";
+var THINKING_TOKEN = "thinking";
+function parseAgentModelLines(stdout) {
+  const models = [];
+  for (const line of stdout.split("\n")) {
+    const trimmed = line.trim();
+    const match = MODEL_LINE_PATTERN.exec(trimmed);
+    if (!match) {
+      const bulletMatch = BULLETED_MODEL_LINE_PATTERN.exec(trimmed);
+      if (bulletMatch) {
+        const [, id2] = bulletMatch;
+        models.push({ id: id2, displayName: id2 });
+        continue;
+      }
+      if (BARE_PROVIDER_MODEL_LINE_PATTERN.test(trimmed)) {
+        models.push({ id: trimmed, displayName: trimmed });
+      }
+      continue;
+    }
+    const [, id, displayName] = match;
+    models.push({ id, displayName });
   }
-  return [
-    "bb skills are reusable instruction folders. When the current task matches a listed skill description, read that skill's SKILL.md at the absolute path before proceeding; you may read supporting files in the same skill directory that SKILL.md references. If a listed path does not exist, the list is stale and should be ignored.",
-    "",
-    "Available bb skills:",
-    ...skillLines
-  ].join("\n");
+  return models;
 }
-function buildAcpSessionInstructions(options) {
-  const baseInstructions = options.instructions?.trim();
-  const skillsInstructions = buildAcpSkillsInstructions(options.skillRoots);
-  const instructions = [baseInstructions, skillsInstructions].filter(
-    (value) => value !== void 0 && value.length > 0
+function findAcpModelConfigOption(configOptions) {
+  const options = configOptions ?? [];
+  return options.find((option) => option.category === "model") ?? options.find((option) => option.id === "model");
+}
+function findAcpThoughtLevelConfigOption(configOptions) {
+  return (configOptions ?? []).find(
+    (option) => option.category === "thought_level"
   );
-  return instructions.length > 0 ? instructions.join("\n\n") : void 0;
 }
-function launchEnvVars(launchSpec) {
-  return Object.keys(launchSpec.env).length > 0 ? { envVars: launchSpec.env } : {};
+var ACP_NATIVE_REASONING_LEVEL_BY_VALUE = {
+  none: "none",
+  minimal: "low",
+  low: "low",
+  medium: "medium",
+  high: "high",
+  xhigh: "xhigh",
+  ultracode: "ultracode",
+  max: "max",
+  ultra: "ultra"
+};
+var ACP_NATIVE_REASONING_VALUE_CANDIDATES_BY_LEVEL = {
+  none: ["none"],
+  low: ["low", "minimal"],
+  medium: ["medium"],
+  high: ["high"],
+  xhigh: ["xhigh"],
+  ultracode: ["ultracode", "xhigh"],
+  max: ["max", "xhigh"],
+  ultra: ["ultra", "max"]
+};
+function acpNativeValueToReasoningLevel(value) {
+  return value === void 0 ? void 0 : ACP_NATIVE_REASONING_LEVEL_BY_VALUE[value];
 }
-function buildAcpModelListCommand(launchSpec) {
-  if (!launchSpec.modelCli || launchSpec.modelCli.listArgs.length === 0) {
+function acpNativeReasoningLevelToValue(level, thoughtLevelOption) {
+  const candidateValues = ACP_NATIVE_REASONING_VALUE_CANDIDATES_BY_LEVEL[level];
+  if (candidateValues === void 0) {
     return void 0;
   }
-  return {
-    command: launchSpec.command,
-    args: [...launchSpec.modelCli.listArgs],
-    ...launchSpec.cwd !== void 0 ? { cwd: launchSpec.cwd } : {},
-    ...launchEnvVars(launchSpec)
-  };
+  const values = new Set(
+    (thoughtLevelOption.options ?? []).map((o) => o.value)
+  );
+  return candidateValues.find((value) => values.has(value));
 }
-function buildAcpModelDiscoveryAgentCommand(launchSpec) {
-  if (buildAcpModelListCommand(launchSpec) !== void 0) {
-    return void 0;
+function buildAcpNativeReasoningSupport(thoughtLevelOption) {
+  const options = thoughtLevelOption?.options ?? [];
+  const seen = /* @__PURE__ */ new Set();
+  const matchedValueByLevel = /* @__PURE__ */ new Map();
+  const supportedReasoningEfforts = [];
+  for (const option of options) {
+    const level = acpNativeValueToReasoningLevel(option.value);
+    if (level === void 0) {
+      continue;
+    }
+    if (seen.has(level)) {
+      const previousValue = matchedValueByLevel.get(level);
+      if (previousValue !== level && option.value === level) {
+        const effort = supportedReasoningEfforts.find(
+          (candidate) => candidate.reasoningEffort === level
+        );
+        if (effort) {
+          effort.description = option.name ?? option.value;
+        }
+        matchedValueByLevel.set(level, option.value);
+      }
+      continue;
+    }
+    seen.add(level);
+    matchedValueByLevel.set(level, option.value);
+    supportedReasoningEfforts.push({
+      reasoningEffort: level,
+      description: option.name ?? option.value
+    });
   }
-  return {
-    command: launchSpec.command,
-    args: [...launchSpec.args],
-    ...launchSpec.cwd !== void 0 ? { cwd: launchSpec.cwd } : {},
-    ...launchEnvVars(launchSpec)
-  };
-}
-function buildAcpModelListParams(launchSpec) {
-  if (launchSpec === null) {
-    return { primaryModels: [] };
+  supportedReasoningEfforts.sort(
+    (a, b) => reasoningLevelValues.indexOf(a.reasoningEffort) - reasoningLevelValues.indexOf(b.reasoningEffort)
+  );
+  if (supportedReasoningEfforts.length === 0) {
+    return {
+      // An omitted option preserves the legacy agent-managed fallback. A
+      // declared option is authoritative, even when bb cannot map its values.
+      supportedReasoningEfforts: thoughtLevelOption === void 0 ? ACP_NATIVE_REASONING_EFFORTS : [],
+      defaultReasoningEffort: "medium"
+    };
   }
-  const listCommand = buildAcpModelListCommand(launchSpec);
-  const agent = buildAcpModelDiscoveryAgentCommand(launchSpec);
+  const currentLevel = acpNativeValueToReasoningLevel(
+    thoughtLevelOption?.currentValue
+  );
+  const supportedLevels = supportedReasoningEfforts.map(
+    (effort) => effort.reasoningEffort
+  );
   return {
-    ...listCommand !== void 0 ? { listCommand } : {},
-    ...agent !== void 0 ? { agent } : {},
-    primaryModels: [...launchSpec.modelCli?.primaryModels ?? []],
-    ...launchSpec.reasoningCli !== void 0 ? { reasoningCli: launchSpec.reasoningCli } : {},
-    ...launchSpec.nativeReasoning !== void 0 ? { nativeReasoning: launchSpec.nativeReasoning } : {}
+    supportedReasoningEfforts,
+    defaultReasoningEffort: currentLevel !== void 0 && supportedLevels.includes(currentLevel) ? currentLevel : supportedReasoningEfforts[0].reasoningEffort
   };
 }
-function buildAcpModelSelectionParam(launchSpec, options) {
-  const model = options.model;
-  const listCommand = buildAcpModelListCommand(launchSpec);
-  if (!model || model === ACP_DEFAULT_MODEL_ID) {
-    return {};
+function buildModelCatalogFromConfigOptions(modelOption, reasoningByModel) {
+  const options = modelOption?.options ?? [];
+  if (options.length === 0) {
+    return [];
   }
-  if (!listCommand || !launchSpec.modelCli?.selectFlag) {
+  const currentValue = modelOption?.currentValue;
+  const models = options.map((option, index) => {
+    const isDefault = currentValue !== void 0 ? option.value === currentValue : index === 0;
+    const reasoning = reasoningByModel?.get(option.value) ?? {
+      supportedReasoningEfforts: ACP_NATIVE_REASONING_EFFORTS,
+      defaultReasoningEffort: "medium"
+    };
     return {
-      modelSelection: {
-        modelId: model,
-        ...options.reasoningLevel !== void 0 ? { reasoningLevel: options.reasoningLevel } : {}
-      }
+      id: option.value,
+      model: option.value,
+      displayName: option.name ?? option.value,
+      description: "",
+      supportedReasoningEfforts: reasoning.supportedReasoningEfforts,
+      defaultReasoningEffort: reasoning.defaultReasoningEffort,
+      isDefault
     };
-  }
-  return {
-    modelSelection: {
-      listCommand,
-      selectFlag: launchSpec.modelCli.selectFlag,
-      model,
-      ...options.reasoningLevel !== void 0 ? { reasoningLevel: options.reasoningLevel } : {},
-      // Only "fast" changes resolution; "default" is the catalog's normal id.
-      ...options.serviceTier === "fast" ? { serviceTier: options.serviceTier } : {}
-    }
-  };
+  });
+  return models.some((model) => model.isDefault) ? models : models.map(
+    (model, index) => index === 0 ? { ...model, isDefault: true } : model
+  );
 }
-function buildAcpSessionParams(args) {
-  const { options, launchSpec } = args;
-  const instructions = buildAcpSessionInstructions(options);
-  const cwd = launchSpec.cwd ?? args.cwd;
-  const envVars = {
-    ...launchSpec.env,
-    ...options.envVars ?? {}
-  };
-  if (options.permissionMode === "auto") {
-    throw new Error(
-      `Provider "${args.providerLabel}" does not support permission mode "auto".`
-    );
+function buildModelCatalogFromSessionModels(sessionModels) {
+  const availableModels = sessionModels?.availableModels ?? [];
+  if (availableModels.length === 0) {
+    return [];
   }
-  return {
-    threadId: args.threadId,
-    cwd,
-    agent: {
-      command: launchSpec.command,
-      args: [...launchSpec.args]
-    },
-    ...args.dialectId === void 0 ? {} : { dialectId: args.dialectId },
-    ...buildAcpModelSelectionParam(launchSpec, options),
-    ...launchSpec.reasoningCli !== void 0 ? { reasoningCli: launchSpec.reasoningCli } : {},
-    ...launchSpec.nativeReasoning !== void 0 ? { nativeReasoning: launchSpec.nativeReasoning } : {},
-    ...launchSpec.permissionCli !== void 0 ? { permissionCli: launchSpec.permissionCli } : {},
-    ...launchSpec.reasoningCli !== void 0 && options.reasoningLevel !== void 0 ? { launchReasoningLevel: options.reasoningLevel } : {},
-    permissionMode: options.permissionMode,
-    workspaceWriteRoots: [cwd, ...args.additionalWorkspaceWriteRoots],
-    ...Object.keys(envVars).length > 0 ? { envVars } : {},
-    ...instructions ? { instructions } : {},
-    ...args.dynamicTools && args.dynamicTools.length > 0 ? { dynamicTools: args.dynamicTools } : {}
-  };
-}
-
-// ../provider-bridge-acp/src/bridge/agent-connection.ts
-import { spawn } from "node:child_process";
-import { createInterface } from "node:readline";
-var STDERR_TAIL_MAX_CHUNKS = 40;
-var CLOSED_STDIN_ERROR_CODES = /* @__PURE__ */ new Set(["EPIPE", "ERR_STREAM_DESTROYED"]);
-var AcpAgentExitedError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "AcpAgentExitedError";
-  }
-};
-var AcpAgentResponseError = class extends Error {
-  code;
-  constructor(message, code) {
-    super(message);
-    this.name = "AcpAgentResponseError";
-    this.code = code;
-  }
-};
-function isClosedAgentStdinError(error) {
-  return "code" in error && typeof error.code === "string" && CLOSED_STDIN_ERROR_CODES.has(error.code);
-}
-function formatAgentError(error) {
-  const message = error.message ?? `ACP agent returned error code ${error.code ?? "unknown"}`;
-  const details = formatAgentErrorData(error.data);
-  return details === void 0 ? message : `${message}: ${details}`;
+  const currentModelId = sessionModels?.currentModelId;
+  const models = availableModels.map((model, index) => {
+    const isDefault = currentModelId !== void 0 ? model.modelId === currentModelId : index === 0;
+    return {
+      id: model.modelId,
+      model: model.modelId,
+      displayName: model.name ?? model.modelId,
+      description: model.description ?? "",
+      supportedReasoningEfforts: ACP_NATIVE_REASONING_EFFORTS,
+      defaultReasoningEffort: "medium",
+      isDefault
+    };
+  });
+  return models.some((model) => model.isDefault) ? models : models.map(
+    (model, index) => index === 0 ? { ...model, isDefault: true } : model
+  );
 }
-function formatAgentErrorData(data) {
-  if (data === void 0 || data === null) {
-    return void 0;
-  }
-  if (typeof data === "string") {
-    return data.trim() === "" ? void 0 : data;
+function splitVariant(id) {
+  let rest = id;
+  let fast = false;
+  if (rest.endsWith(FAST_TAIL)) {
+    fast = true;
+    rest = rest.slice(0, -FAST_TAIL.length);
   }
-  if (typeof data === "object" && "details" in data && typeof data.details === "string" && data.details.trim() !== "") {
-    return data.details;
+  let thinking = false;
+  if (rest.endsWith(`-${THINKING_TOKEN}`)) {
+    thinking = true;
+    rest = rest.slice(0, -(THINKING_TOKEN.length + 1));
+  } else if (rest.includes(`-${THINKING_TOKEN}-`)) {
+    thinking = true;
+    rest = rest.replace(`-${THINKING_TOKEN}-`, "-");
   }
-  try {
-    return JSON.stringify(data);
-  } catch {
-    return void 0;
+  for (const [token, effort] of EFFORT_TOKENS) {
+    if (rest.endsWith(`-${token}`)) {
+      return {
+        familyKey: rest.slice(0, -(token.length + 1)),
+        effort,
+        effortToken: token,
+        fast,
+        thinking
+      };
+    }
   }
+  return {
+    familyKey: rest,
+    effort: "medium",
+    effortToken: void 0,
+    fast,
+    thinking
+  };
 }
-function parseAgentLine(line) {
-  const trimmed = line.trim();
-  if (!trimmed) {
-    return null;
+function agentModelFamilyId(id) {
+  return splitVariant(id).familyKey;
+}
+var EFFORT_DISPLAY_WORDS = {
+  "extra-high": "Extra High",
+  medium: "Medium",
+  xhigh: "Extra High",
+  high: "High",
+  low: "Low",
+  max: "Max",
+  ultra: "Ultra",
+  none: "None"
+};
+function familyDisplayName(displayName, effortToken) {
+  const word = effortToken ? EFFORT_DISPLAY_WORDS[effortToken] : void 0;
+  if (!word) {
+    return cleanDisplayName(displayName);
   }
-  let parsed;
-  try {
-    parsed = JSON.parse(trimmed);
-  } catch {
-    return null;
+  return cleanDisplayName(
+    displayName.replace(new RegExp(`(^|\\s)${word}(?=\\s|$)`), "$1")
+  );
+}
+function cleanDisplayName(name) {
+  return name.replace(/\s*\((?:NO ZDR|default|current)\)/gi, "").replace(/(^|\s)(?:1M|Thinking)(?=\s|$)/g, "$1").replace(/\s{2,}/g, " ").trim();
+}
+function buildAgentModelCatalog(rawModels) {
+  const families = /* @__PURE__ */ new Map();
+  for (const raw of rawModels) {
+    const { familyKey, effort, effortToken, fast, thinking } = splitVariant(
+      raw.id
+    );
+    const members = families.get(familyKey) ?? [];
+    members.push({ ...raw, effort, effortToken, fast, thinking });
+    families.set(familyKey, members);
   }
-  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+  if (families.size === 0) {
     return null;
   }
-  return parsed;
-}
-function createAcpAgentConnection(options) {
-  const child = spawn(options.command, options.args, {
-    cwd: options.cwd,
-    env: options.env,
-    stdio: ["pipe", "pipe", "pipe"]
-  });
-  experimental_recordProviderChildIo(child, {
-    threadId: options.recordThreadId
-  });
-  const pending = /* @__PURE__ */ new Map();
-  const stderrChunks = [];
-  let nextRequestId = 1;
-  let exited = false;
-  function rejectAllPending(error) {
-    for (const [, request] of pending) {
-      request.reject(error);
-    }
-    pending.clear();
-  }
-  function closeForAgentStdin(error) {
-    if (exited) {
-      return;
+  const models = [];
+  const variantsByFamilyId = /* @__PURE__ */ new Map();
+  const defaultEffortByFamilyId = /* @__PURE__ */ new Map();
+  for (const members of families.values()) {
+    const hasThinking = members.some((m) => m.thinking);
+    const leveled = members.map((member) => ({
+      member,
+      level: member.thinking ? member.effort : hasThinking ? "none" : member.effort
+    }));
+    const byLevel = /* @__PURE__ */ new Map();
+    const repEffortByCell = /* @__PURE__ */ new Map();
+    for (const { member, level } of leveled) {
+      const slot = member.fast ? "fast" : "normal";
+      const tier = byLevel.get(level) ?? {};
+      const cellKey = `${level}:${slot}`;
+      const upgradesNoneRep = level === "none" && member.effort === "medium" && repEffortByCell.get(cellKey) !== "medium";
+      if (tier[slot] === void 0 || upgradesNoneRep) {
+        tier[slot] = member.id;
+        repEffortByCell.set(cellKey, member.effort);
+        byLevel.set(level, tier);
+      }
     }
-    exited = true;
-    const code = "code" in error && typeof error.code === "string" ? ` (${error.code})` : "";
-    const detail = `stdin closed${code}: ${error.message}`;
-    rejectAllPending(
-      new AcpAgentExitedError(`ACP agent "${options.command}" ${detail}`)
+    const nonFast = leveled.filter((entry) => !entry.member.fast);
+    const pool = nonFast.length > 0 ? nonFast : leveled;
+    const defaultEntry = pool.find((entry) => entry.level === "medium") ?? pool.find((entry) => entry.level !== "none") ?? pool[0];
+    const defaultVariant = defaultEntry.member;
+    const levelsInLadderOrder = [...byLevel.keys()].sort(
+      (a, b) => reasoningLevelValues.indexOf(a) - reasoningLevelValues.indexOf(b)
     );
-    child.kill("SIGKILL");
-    const stderrTail = [...stderrChunks, detail].join("\n");
-    options.onExit({ code: null, signal: null, stderrTail });
-  }
-  function writeLine(message) {
-    const stdin = child.stdin;
-    if (!stdin || stdin.destroyed || !stdin.writable) {
-      closeForAgentStdin(new Error("stdin is not writable"));
-      return;
+    const nameByLevel = /* @__PURE__ */ new Map();
+    for (const { member, level } of leveled) {
+      if (!nameByLevel.has(level)) {
+        nameByLevel.set(level, member.displayName);
+      }
     }
-    stdin.write(JSON.stringify(message) + "\n");
+    models.push({
+      id: defaultVariant.id,
+      model: defaultVariant.id,
+      displayName: familyDisplayName(
+        defaultVariant.displayName,
+        defaultVariant.effortToken
+      ),
+      description: "",
+      supportedReasoningEfforts: levelsInLadderOrder.map((level) => ({
+        reasoningEffort: level,
+        description: nameByLevel.get(level) ?? ""
+      })),
+      defaultReasoningEffort: defaultEntry.level,
+      // The agent lists its default model first.
+      isDefault: models.length === 0
+    });
+    variantsByFamilyId.set(defaultVariant.id, byLevel);
+    defaultEffortByFamilyId.set(defaultVariant.id, defaultEntry.level);
   }
-  child.stdin?.on("error", (error) => {
-    if (!isClosedAgentStdinError(error)) {
-      throw error;
+  return {
+    models,
+    resolveVariant({ model, reasoningLevel, serviceTier }) {
+      const byLevel = variantsByFamilyId.get(model);
+      if (!byLevel) {
+        return void 0;
+      }
+      const level = reasoningLevel ?? defaultEffortByFamilyId.get(model);
+      const tier = level === void 0 ? void 0 : byLevel.get(level);
+      if (!tier) {
+        return void 0;
+      }
+      if (serviceTier === "fast" && tier.fast !== void 0) {
+        return tier.fast;
+      }
+      return tier.normal ?? tier.fast;
     }
-    closeForAgentStdin(error);
+  };
+}
+function splitPrimaryModels(catalogModels, primaryModels) {
+  const primaryIds = new Set(primaryModels);
+  const modelsById = new Map(catalogModels.map((model) => [model.id, model]));
+  const models = primaryModels.flatMap((id) => {
+    const model = modelsById.get(id);
+    return model ? [model] : [];
   });
-  if (child.stdout) {
-    const stdoutLines = createInterface({
-      input: child.stdout,
-      terminal: false
-    });
-    stdoutLines.on("line", (line) => {
-      const message = parseAgentLine(line);
-      if (!message) {
-        return;
-      }
-      const id = message.id;
-      if ((typeof id === "string" || typeof id === "number") && message.method === void 0) {
-        const numericId = typeof id === "number" ? id : Number(id);
-        const request = pending.get(numericId);
-        if (!request) {
-          return;
-        }
-        pending.delete(numericId);
-        if (message.error) {
-          request.reject(
-            new AcpAgentResponseError(
-              formatAgentError(message.error),
-              message.error.code
-            )
-          );
-        } else {
-          request.resolve(message.result);
-        }
-        return;
-      }
-      if (typeof message.method !== "string") {
-        return;
-      }
-      if (typeof id === "string" || typeof id === "number") {
-        let settled = false;
-        options.onRequest(message.method, message.params, {
-          result(value) {
-            if (settled) return;
-            settled = true;
-            writeLine({ jsonrpc: "2.0", id, result: value ?? null });
-          },
-          error(code, errorMessage) {
-            if (settled) return;
-            settled = true;
-            writeLine({
-              jsonrpc: "2.0",
-              id,
-              error: { code, message: errorMessage }
-            });
-          }
-        });
-        return;
-      }
-      options.onNotification(message.method, message.params);
-    });
-  }
-  if (child.stderr) {
-    const stderrLines = createInterface({
-      input: child.stderr,
-      terminal: false
-    });
-    stderrLines.on("line", (line) => {
-      stderrChunks.push(line);
-      if (stderrChunks.length > STDERR_TAIL_MAX_CHUNKS) {
-        stderrChunks.shift();
-      }
-    });
+  if (models.length === 0) {
+    return { models: [...catalogModels], selectedOnlyModels: [] };
   }
-  child.on("error", (error) => {
-    if (exited) {
-      return;
-    }
-    exited = true;
-    rejectAllPending(
-      new AcpAgentExitedError(
-        `Failed to launch ACP agent "${options.command}": ${error.message}`
-      )
-    );
-    options.onExit({ code: null, signal: null, stderrTail: error.message });
-  });
-  child.on("exit", (code, signal) => {
-    if (exited) {
-      return;
-    }
-    exited = true;
-    const stderrTail = stderrChunks.join("\n");
-    rejectAllPending(
-      new AcpAgentExitedError(
-        `ACP agent "${options.command}" exited (code ${code ?? "null"}, signal ${signal ?? "null"})${stderrTail ? `: ${stderrTail}` : ""}`
+  const selectedOnlyModels = catalogModels.filter(
+    (model) => !primaryIds.has(model.id)
+  );
+  if (models.some((model) => model.isDefault)) {
+    return {
+      models,
+      selectedOnlyModels: selectedOnlyModels.map(
+        (model) => model.isDefault ? { ...model, isDefault: false } : model
       )
-    );
-    options.onExit({ code, signal, stderrTail });
-  });
+    };
+  }
   return {
-    get exited() {
-      return exited;
-    },
-    request({ method, params, resultSchema }) {
-      if (exited) {
-        return Promise.reject(
-          new AcpAgentExitedError(
-            `ACP agent "${options.command}" is not running`
-          )
-        );
-      }
-      const id = nextRequestId;
-      nextRequestId += 1;
-      return new Promise((resolve4, reject) => {
-        pending.set(id, {
-          resolve: (value) => {
-            const parsed = resultSchema.safeParse(value);
-            if (parsed.success) {
-              resolve4(parsed.data);
-            } else {
-              reject(
-                new Error(
-                  `ACP agent returned an unexpected ${method} result: ${parsed.error.message}`
-                )
-              );
-            }
-          },
-          reject
-        });
-        writeLine({ jsonrpc: "2.0", id, method, params });
-      });
-    },
-    notify(method, params) {
-      if (exited) {
-        return;
-      }
-      writeLine({ jsonrpc: "2.0", method, params });
-    },
-    kill() {
-      if (exited) {
-        return;
-      }
-      child.kill("SIGTERM");
-    }
+    models: models.map(
+      (model, index) => index === 0 ? { ...model, isDefault: true } : model
+    ),
+    selectedOnlyModels: selectedOnlyModels.map(
+      (model) => model.isDefault ? { ...model, isDefault: false } : model
+    )
   };
 }
 
-// ../provider-bridge-acp/src/bridge/cursor-mcp-approval.ts
-import { execFile as execFile3 } from "node:child_process";
-import { createHash, randomBytes } from "node:crypto";
-import { mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { basename as basename2, dirname, join as join2, resolve as resolve2 } from "node:path";
-
-// ../provider-bridge-acp/src/bridge/tool-proxy-mcp.ts
-import { createConnection } from "node:net";
-import { createInterface as createInterface2 } from "node:readline";
-import { z as z38 } from "zod";
-var ACP_BRIDGE_MCP_SERVER_NAME = "bb-bridge";
-var ENV_HOST = "BB_ACP_DYNAMIC_TOOL_HOST";
-var ENV_PORT = "BB_ACP_DYNAMIC_TOOL_PORT";
-var ENV_TOKEN = "BB_ACP_DYNAMIC_TOOL_TOKEN";
-var ENV_THREAD_ID = "BB_ACP_DYNAMIC_TOOL_THREAD_ID";
-var ENV_TOOLS = "BB_ACP_DYNAMIC_TOOLS";
-var ENV_PROGRESS_INTERVAL_MS = "BB_ACP_DYNAMIC_TOOL_PROGRESS_INTERVAL_MS";
-var bridgeToolCallResponseSchema = z38.union([
-  z38.object({
-    ok: z38.literal(true),
-    content: z38.string(),
-    contentBlocks: z38.array(
-      z38.discriminatedUnion("type", [
-        z38.object({ type: z38.literal("text"), text: z38.string() }),
-        z38.object({
-          type: z38.literal("image"),
-          data: z38.string(),
-          mimeType: z38.string()
-        })
-      ])
-    ).optional(),
-    // The initialized response and older text-only responses omit images.
-    // Parsing them as an empty list keeps the re-executed packaged artifact
-    // compatible with that legacy socket shape.
-    images: z38.array(z38.object({ data: z38.string(), mimeType: z38.string() })).default([]),
-    isError: z38.boolean().optional()
-  }),
-  z38.object({ ok: z38.literal(false), error: z38.string() })
-]);
-var nextMcpToolCallId = 0;
-var TOOL_CALL_PROGRESS_INTERVAL_MS = 15e3;
-function buildAcpMcpServerConfig(args) {
-  return {
-    name: ACP_BRIDGE_MCP_SERVER_NAME,
-    command: args.command,
-    args: args.bridgeArgs,
-    env: [
-      ...args.runtimeEnv,
-      { name: ENV_HOST, value: args.host },
-      { name: ENV_PORT, value: String(args.port) },
-      { name: ENV_TOKEN, value: args.token },
-      { name: ENV_THREAD_ID, value: args.threadId },
-      { name: ENV_TOOLS, value: JSON.stringify(args.dynamicTools) }
-    ]
-  };
+// ../provider-bridge-acp/src/session-params.ts
+function sanitizeAcpSkillDescription(description) {
+  const sanitized = description.replace(/[\r\n]+/gu, " ").replace(/\s+/gu, " ").replace(/[<>]/gu, "").trim();
+  return sanitized.length > 0 ? sanitized : "(description unavailable)";
 }
-function readEnvironment() {
-  const port = Number(process.env[ENV_PORT]);
-  if (!Number.isInteger(port) || port <= 0) {
-    throw new Error(`${ENV_PORT} must be a positive integer`);
+function buildAcpSkillsInstructions(skillRoots) {
+  if (!skillRoots || skillRoots.length === 0) {
+    return void 0;
   }
-  const host = process.env[ENV_HOST];
-  const token = process.env[ENV_TOKEN];
-  const threadId = process.env[ENV_THREAD_ID];
-  const toolsJson = process.env[ENV_TOOLS];
-  if (!host || !token || !threadId || !toolsJson) {
-    throw new Error("Missing ACP dynamic tool MCP server environment");
+  const skillLines = skillRoots.flatMap((skillRoot) => {
+    return skillRoot.skills.map((skill) => {
+      const skillFilePath = path4.join(
+        skillRoot.skillDirectoryRootPath,
+        skill.name,
+        "SKILL.md"
+      );
+      return `- ${skill.name}: ${sanitizeAcpSkillDescription(skill.description)} (SKILL.md: ${skillFilePath})`;
+    });
+  });
+  if (skillLines.length === 0) {
+    return void 0;
   }
-  const parsedTools = JSON.parse(toolsJson);
-  const tools = dynamicToolSchema.array().parse(parsedTools);
-  const rawProgressInterval = process.env[ENV_PROGRESS_INTERVAL_MS];
-  const progressIntervalMs = rawProgressInterval !== void 0 && Number(rawProgressInterval) > 0 ? Number(rawProgressInterval) : void 0;
-  return {
-    host,
-    port,
-    progressIntervalMs,
-    threadId,
-    token,
-    tools
-  };
+  return [
+    "bb skills are reusable instruction folders. When the current task matches a listed skill description, read that skill's SKILL.md at the absolute path before proceeding; you may read supporting files in the same skill directory that SKILL.md references. If a listed path does not exist, the list is stale and should be ignored.",
+    "",
+    "Available bb skills:",
+    ...skillLines
+  ].join("\n");
 }
-function writeJson(message) {
-  process.stdout.write(`${JSON.stringify(message)}
-`);
+function buildAcpSessionInstructions(options) {
+  const baseInstructions = options.instructions?.trim();
+  const skillsInstructions = buildAcpSkillsInstructions(options.skillRoots);
+  const instructions = [baseInstructions, skillsInstructions].filter(
+    (value) => value !== void 0 && value.length > 0
+  );
+  return instructions.length > 0 ? instructions.join("\n\n") : void 0;
 }
-function writeResult(id, result) {
-  writeJson({ jsonrpc: "2.0", id, result });
-}
-function writeError(id, code, message) {
-  writeJson({ jsonrpc: "2.0", id, error: { code, message } });
-}
-function mcpToolCallId(toolName) {
-  nextMcpToolCallId += 1;
-  return `acp-mcp-${toolName}-${Date.now()}-${nextMcpToolCallId}`;
+function launchEnvVars(launchSpec) {
+  return Object.keys(launchSpec.env).length > 0 ? { envVars: launchSpec.env } : {};
 }
-function callBridge(env, request) {
-  return new Promise((resolve4, reject) => {
-    const socket = createConnection({ host: env.host, port: env.port });
-    let buffer = "";
-    socket.setEncoding("utf8");
-    socket.on("connect", () => {
-      const payload = {
-        ...request,
-        threadId: env.threadId,
-        token: env.token
-      };
-      socket.write(`${JSON.stringify(payload)}
-`);
-    });
-    socket.on("data", (chunk) => {
-      buffer += chunk;
-      const newlineIndex = buffer.indexOf("\n");
-      if (newlineIndex === -1) {
-        return;
-      }
-      const line = buffer.slice(0, newlineIndex);
-      socket.end();
-      try {
-        resolve4(bridgeToolCallResponseSchema.parse(JSON.parse(line)));
-      } catch (error) {
-        reject(error);
-      }
-    });
-    socket.on("error", reject);
-    socket.on("end", () => {
-      if (!buffer.includes("\n")) {
-        reject(new Error("ACP dynamic tool bridge closed without a response"));
-      }
-    });
-  });
+function buildAcpModelListCommand(launchSpec) {
+  if (!launchSpec.modelCli || launchSpec.modelCli.listArgs.length === 0) {
+    return void 0;
+  }
+  return {
+    command: launchSpec.command,
+    args: [...launchSpec.modelCli.listArgs],
+    ...launchSpec.cwd !== void 0 ? { cwd: launchSpec.cwd } : {},
+    ...launchEnvVars(launchSpec)
+  };
 }
-function objectParams(params) {
-  return params && typeof params === "object" && !Array.isArray(params) ? params : {};
+function buildAcpModelDiscoveryAgentCommand(launchSpec) {
+  if (buildAcpModelListCommand(launchSpec) !== void 0) {
+    return void 0;
+  }
+  return {
+    command: launchSpec.command,
+    args: [...launchSpec.args],
+    ...launchSpec.cwd !== void 0 ? { cwd: launchSpec.cwd } : {},
+    ...launchEnvVars(launchSpec)
+  };
 }
-function readProgressToken(params) {
-  const meta = objectParams(objectParams(params)._meta).progressToken;
-  return typeof meta === "string" || typeof meta === "number" ? meta : null;
+function buildAcpModelListParams(launchSpec, options) {
+  const primaryModels = [
+    ...options.primaryModels ?? launchSpec?.modelCli?.primaryModels ?? []
+  ];
+  const reasoningProbePriorityModelIds = [
+    ...options.reasoningProbePriorityModelIds
+  ];
+  if (launchSpec === null) {
+    return {
+      primaryModels,
+      reasoningProbePriorityModelIds,
+      parameterizedModelPicker: options.parameterizedModelPicker
+    };
+  }
+  const listCommand = buildAcpModelListCommand(launchSpec);
+  const agent = buildAcpModelDiscoveryAgentCommand(launchSpec);
+  return {
+    ...listCommand !== void 0 ? { listCommand } : {},
+    ...agent !== void 0 ? { agent } : {},
+    primaryModels,
+    reasoningProbePriorityModelIds,
+    parameterizedModelPicker: options.parameterizedModelPicker,
+    ...launchSpec.reasoningCli !== void 0 ? { reasoningCli: launchSpec.reasoningCli } : {},
+    ...launchSpec.nativeReasoning !== void 0 ? { nativeReasoning: launchSpec.nativeReasoning } : {}
+  };
 }
-function startProgressHeartbeat(args) {
-  let progress = 0;
-  const timer = setInterval(() => {
-    progress += 1;
-    writeJson({
-      jsonrpc: "2.0",
-      method: "notifications/progress",
-      params: { progressToken: args.progressToken, progress }
-    });
-  }, args.intervalMs ?? TOOL_CALL_PROGRESS_INTERVAL_MS);
-  return () => clearInterval(timer);
+function cursorParameterizedModelId(model) {
+  const familyId = model === "auto" ? "default" : agentModelFamilyId(model);
+  return familyId.startsWith("cursor-") ? familyId.slice("cursor-".length) : familyId;
 }
-async function handleRequest(env, message) {
-  if (message.id === void 0 || message.method === void 0) {
-    return;
+function buildAcpModelSelectionParam(launchSpec, options, parameterizedModelPicker, dialectId) {
+  const model = options.model;
+  const listCommand = buildAcpModelListCommand(launchSpec);
+  if (!model || model === ACP_DEFAULT_MODEL_ID) {
+    return {};
   }
-  switch (message.method) {
-    case "initialize":
-      writeResult(message.id, {
-        protocolVersion: typeof objectParams(message.params).protocolVersion === "string" ? objectParams(message.params).protocolVersion : "2024-11-05",
-        capabilities: { tools: {} },
-        serverInfo: { name: ACP_BRIDGE_MCP_SERVER_NAME, version: "1.0.0" }
-      });
-      void callBridge(env, {
-        kind: "initialized",
-        toolCount: env.tools.length
-      }).catch((error) => {
-        process.stderr.write(
-          `bb-bridge MCP: failed to report initialize: ${error instanceof Error ? error.message : String(error)}
-`
-        );
-      });
-      return;
-    case "tools/list":
-      writeResult(message.id, {
-        tools: env.tools.map((tool) => ({
-          name: tool.name,
-          description: tool.description,
-          inputSchema: tool.inputSchema
-        }))
-      });
-      return;
-    case "tools/call": {
-      const params = objectParams(message.params);
-      const name = typeof params.name === "string" ? params.name : "";
-      const tool = env.tools.find((candidate) => candidate.name === name);
-      if (!tool) {
-        writeError(message.id, -32602, `Unknown tool: ${name}`);
-        return;
-      }
-      const rawArguments = params.arguments;
-      const toolArguments = rawArguments && typeof rawArguments === "object" && !Array.isArray(rawArguments) ? rawArguments : {};
-      const progressToken = readProgressToken(message.params);
-      const stopHeartbeat = progressToken === null ? () => {
-      } : startProgressHeartbeat({
-        intervalMs: env.progressIntervalMs,
-        progressToken
-      });
-      try {
-        const result = await callBridge(env, {
-          kind: "toolCall",
-          arguments: toolArguments,
-          callId: mcpToolCallId(tool.name),
-          tool: tool.name
-        });
-        stopHeartbeat();
-        if (!result.ok) {
-          writeResult(message.id, {
-            content: [{ type: "text", text: result.error }],
-            isError: true
-          });
-          return;
-        }
-        writeResult(message.id, {
-          content: buildBridgeToolCallContent(result),
-          ...result.isError ? { isError: true } : {}
-        });
-      } catch (error) {
-        stopHeartbeat();
-        writeResult(message.id, {
-          content: [
-            {
-              type: "text",
-              text: error instanceof Error ? error.message : String(error)
-            }
-          ],
-          isError: true
-        });
+  if (parameterizedModelPicker || !listCommand || !launchSpec.modelCli?.selectFlag) {
+    return {
+      modelSelection: {
+        modelId: parameterizedModelPicker && dialectId === "cursor" ? cursorParameterizedModelId(model) : model,
+        ...options.reasoningLevel !== void 0 ? { reasoningLevel: options.reasoningLevel } : {},
+        ...parameterizedModelPicker && options.serviceTier !== void 0 ? { serviceTier: options.serviceTier } : {}
       }
-      return;
-    }
-    default:
-      writeError(
-        message.id,
-        -32601,
-        `Unsupported MCP method: ${message.method}`
-      );
+    };
   }
-}
-function runAcpDynamicToolMcpServer() {
-  const env = readEnvironment();
-  const rl = createInterface2({ input: process.stdin, terminal: false });
-  rl.on("line", (line) => {
-    const trimmed = line.trim();
-    if (!trimmed) {
-      return;
-    }
-    let message;
-    try {
-      message = JSON.parse(trimmed);
-    } catch {
-      return;
+  return {
+    modelSelection: {
+      listCommand,
+      selectFlag: launchSpec.modelCli.selectFlag,
+      model,
+      ...options.reasoningLevel !== void 0 ? { reasoningLevel: options.reasoningLevel } : {},
+      // Only "fast" changes launch resolution; "default" is the normal id.
+      ...options.serviceTier === "fast" ? { serviceTier: options.serviceTier } : {}
     }
-    void handleRequest(env, message);
-  });
-}
-
-// ../provider-bridge-acp/src/bridge/cursor-mcp-approval.ts
-var CURSOR_MCP_APPROVAL_FILE = "mcp-approvals.json";
-var CURSOR_APPROVAL_LOCK_STALE_MS = 3e4;
-var CURSOR_APPROVAL_LOCK_TIMEOUT_MS = 5e3;
-function errorCode(error) {
-  return error instanceof Error && "code" in error ? error.code : void 0;
-}
-function cursorAgentCommand(command) {
-  return basename2(command).toLowerCase().replace(/\.(?:bat|cmd|exe)$/u, "") === "cursor-agent";
-}
-function cursorProjectSlug(projectRoot) {
-  return projectRoot.replace(/[^a-zA-Z0-9]/gu, "-").replace(/-+/gu, "-").replace(/^-+|-+$/gu, "");
+  };
 }
-function cursorDataDirectory(env) {
-  const configured = env.CURSOR_DATA_DIR?.trim();
-  if (configured) {
-    return configured;
+function buildAcpSessionParams(args) {
+  const { options, launchSpec } = args;
+  const instructions = buildAcpSessionInstructions(options);
+  const cwd = launchSpec.cwd ?? args.cwd;
+  const envVars = {
+    ...launchSpec.env,
+    ...options.envVars ?? {}
+  };
+  if (options.permissionMode === "auto") {
+    throw new Error(
+      `Provider "${args.providerLabel}" does not support permission mode "auto".`
+    );
   }
-  const home = env.HOME?.trim() || env.USERPROFILE?.trim() || homedir();
-  return join2(home, ".cursor");
-}
-function cursorMcpServerConfig(config) {
   return {
-    command: config.command,
-    args: config.args,
-    env: Object.fromEntries(config.env.map(({ name, value }) => [name, value]))
-  };
-}
-function buildCursorMcpApprovalIdentifier(args) {
-  const fingerprint = createHash("sha256").update(
-    JSON.stringify({
-      path: args.projectRoot,
-      server: cursorMcpServerConfig(args.config)
-    })
-  ).digest("hex").slice(0, 16);
-  return `${args.config.name}-${fingerprint}`;
-}
-async function resolveCursorProjectRoot(args) {
-  return new Promise((resolveRoot) => {
-    execFile3(
-      "git",
-      ["rev-parse", "--show-toplevel"],
-      { cwd: args.cwd, env: args.env, windowsHide: true },
-      (error, stdout) => {
-        const root = stdout.trim();
-        resolveRoot(error === null && root !== "" ? root : resolve2(args.cwd));
-      }
-    );
-  });
+    threadId: args.threadId,
+    cwd,
+    agent: {
+      command: launchSpec.command,
+      args: [...launchSpec.args]
+    },
+    ...args.dialectId === void 0 ? {} : { dialectId: args.dialectId },
+    ...buildAcpModelSelectionParam(
+      launchSpec,
+      options,
+      args.parameterizedModelPicker,
+      args.dialectId
+    ),
+    parameterizedModelPicker: args.parameterizedModelPicker,
+    ...launchSpec.reasoningCli !== void 0 ? { reasoningCli: launchSpec.reasoningCli } : {},
+    ...launchSpec.nativeReasoning !== void 0 ? { nativeReasoning: launchSpec.nativeReasoning } : {},
+    ...launchSpec.permissionCli !== void 0 ? { permissionCli: launchSpec.permissionCli } : {},
+    ...launchSpec.reasoningCli !== void 0 && options.reasoningLevel !== void 0 ? { launchReasoningLevel: options.reasoningLevel } : {},
+    permissionMode: options.permissionMode,
+    workspaceWriteRoots: [cwd, ...args.additionalWorkspaceWriteRoots],
+    ...Object.keys(envVars).length > 0 ? { envVars } : {},
+    ...instructions ? { instructions } : {},
+    ...args.dynamicTools && args.dynamicTools.length > 0 ? { dynamicTools: args.dynamicTools } : {}
+  };
 }
-async function readApprovals(path5) {
-  let text;
-  try {
-    text = await readFile(path5, "utf8");
-  } catch (error) {
-    if (errorCode(error) === "ENOENT") {
-      return [];
-    }
-    throw error;
+
+// ../provider-bridge-acp/src/bridge/agent-connection.ts
+import { spawn } from "node:child_process";
+import { createInterface } from "node:readline";
+var STDERR_TAIL_MAX_CHUNKS = 40;
+var CLOSED_STDIN_ERROR_CODES = /* @__PURE__ */ new Set(["EPIPE", "ERR_STREAM_DESTROYED"]);
+var AcpAgentExitedError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "AcpAgentExitedError";
   }
-  const value = JSON.parse(text);
-  if (!Array.isArray(value) || !value.every((item) => typeof item === "string")) {
-    throw new Error(`Cursor MCP approval file is not a string array: ${path5}`);
+};
+var AcpAgentResponseError = class extends Error {
+  code;
+  constructor(message, code) {
+    super(message);
+    this.name = "AcpAgentResponseError";
+    this.code = code;
   }
-  return value;
+};
+function isClosedAgentStdinError(error) {
+  return "code" in error && typeof error.code === "string" && CLOSED_STDIN_ERROR_CODES.has(error.code);
 }
-async function writeApprovals(path5, approvals) {
-  await mkdir(dirname(path5), { recursive: true });
-  const tempPath = `${path5}.bb-${process.pid}-${randomBytes(6).toString("hex")}.tmp`;
+function formatAgentError(error) {
+  const message = error.message ?? `ACP agent returned error code ${error.code ?? "unknown"}`;
+  const details = formatAgentErrorData(error.data);
+  return details === void 0 ? message : `${message}: ${details}`;
+}
+function formatAgentErrorData(data) {
+  if (data === void 0 || data === null) {
+    return void 0;
+  }
+  if (typeof data === "string") {
+    return data.trim() === "" ? void 0 : data;
+  }
+  if (typeof data === "object" && "details" in data && typeof data.details === "string" && data.details.trim() !== "") {
+    return data.details;
+  }
   try {
-    await writeFile(tempPath, `${JSON.stringify(approvals, null, 2)}
-`, {
-      encoding: "utf8",
-      mode: 384
-    });
-    await rename(tempPath, path5);
-  } catch (error) {
-    await rm(tempPath, { force: true });
-    throw error;
+    return JSON.stringify(data);
+  } catch {
+    return void 0;
   }
 }
-async function acquireApprovalLock(path5) {
-  const lockPath = `${path5}.bb-lock`;
-  const deadline = Date.now() + CURSOR_APPROVAL_LOCK_TIMEOUT_MS;
-  await mkdir(dirname(path5), { recursive: true });
-  for (; ; ) {
-    try {
-      await mkdir(lockPath, { mode: 448 });
-      return () => rm(lockPath, { recursive: true, force: true });
-    } catch (error) {
-      if (errorCode(error) !== "EEXIST") {
-        throw error;
-      }
-    }
-    try {
-      const lockStat = await stat(lockPath);
-      if (Date.now() - lockStat.mtimeMs > CURSOR_APPROVAL_LOCK_STALE_MS) {
-        await rm(lockPath, { recursive: true, force: true });
-        continue;
-      }
-    } catch (error) {
-      if (errorCode(error) === "ENOENT") {
-        continue;
-      }
-      throw error;
-    }
-    if (Date.now() >= deadline) {
-      throw new Error(`Timed out updating Cursor MCP approvals: ${path5}`);
-    }
-    await new Promise((resolveDelay) => setTimeout(resolveDelay, 25));
+function parseAgentLine(line) {
+  const trimmed = line.trim();
+  if (!trimmed) {
+    return null;
   }
-}
-async function mutateApprovals(path5, mutate) {
-  const releaseLock = await acquireApprovalLock(path5);
+  let parsed;
   try {
-    const approvals = await readApprovals(path5);
-    const nextApprovals = mutate(approvals);
-    if (approvals.length !== nextApprovals.length || approvals.some((approval, index) => approval !== nextApprovals[index])) {
-      await writeApprovals(path5, nextApprovals);
-    }
-  } finally {
-    await releaseLock();
+    parsed = JSON.parse(trimmed);
+  } catch {
+    return null;
   }
-}
-async function approveCursorSessionMcpServer(args) {
-  if (!cursorAgentCommand(args.agentCommand) || args.config.name !== ACP_BRIDGE_MCP_SERVER_NAME) {
-    return void 0;
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    return null;
   }
-  const projectRoot = await resolveCursorProjectRoot({
-    cwd: args.cwd,
-    env: args.env
+  return parsed;
+}
+function createAcpAgentConnection(options) {
+  const child = spawn(options.command, options.args, {
+    cwd: options.cwd,
+    env: options.env,
+    stdio: ["pipe", "pipe", "pipe"]
   });
-  const path5 = join2(
-    cursorDataDirectory(args.env),
-    "projects",
-    cursorProjectSlug(projectRoot),
-    CURSOR_MCP_APPROVAL_FILE
-  );
-  const approval = buildCursorMcpApprovalIdentifier({
-    config: args.config,
-    projectRoot
+  experimental_recordProviderChildIo(child, {
+    threadId: options.recordThreadId
   });
-  let installedByBb = false;
-  await mutateApprovals(path5, (approvals) => {
-    if (approvals.includes(approval)) {
-      return approvals;
+  const pending = /* @__PURE__ */ new Map();
+  const stderrChunks = [];
+  let nextRequestId = 1;
+  let exited = false;
+  function rejectAllPending(error) {
+    for (const [, request] of pending) {
+      request.reject(error);
     }
-    installedByBb = true;
-    return [...approvals, approval];
-  });
-  return { approval, installedByBb, path: path5 };
-}
-async function revokeCursorSessionMcpServer(approval) {
-  if (!approval.installedByBb) {
-    return;
+    pending.clear();
   }
-  await mutateApprovals(
-    approval.path,
-    (approvals) => approvals.filter((candidate) => candidate !== approval.approval)
-  );
-}
-
-// ../provider-bridge-acp/src/bridge/model-catalog.ts
-var ACP_NATIVE_REASONING_EFFORTS = [
-  {
-    reasoningEffort: "medium",
-    description: "Reasoning effort is managed by the connected ACP agent."
+  function closeForAgentStdin(error) {
+    if (exited) {
+      return;
+    }
+    exited = true;
+    const code = "code" in error && typeof error.code === "string" ? ` (${error.code})` : "";
+    const detail = `stdin closed${code}: ${error.message}`;
+    rejectAllPending(
+      new AcpAgentExitedError(`ACP agent "${options.command}" ${detail}`)
+    );
+    child.kill("SIGKILL");
+    const stderrTail = [...stderrChunks, detail].join("\n");
+    options.onExit({ code: null, signal: null, stderrTail });
   }
-];
-var MODEL_LINE_PATTERN = /^(\S+) - (.+)$/;
-var BARE_PROVIDER_MODEL_LINE_PATTERN = /^\S+\/\S+$/;
-var BULLETED_MODEL_LINE_PATTERN = /^[*-]\s+(\S+)(?:\s+\([^)]*\))?$/u;
-var EFFORT_TOKENS = [
-  ["extra-high", "xhigh"],
-  ["medium", "medium"],
-  ["xhigh", "xhigh"],
-  ["high", "high"],
-  ["low", "low"],
-  ["max", "max"],
-  ["none", "none"]
-];
-var FAST_TAIL = "-fast";
-var THINKING_TOKEN = "thinking";
-function parseAgentModelLines(stdout) {
-  const models = [];
-  for (const line of stdout.split("\n")) {
-    const trimmed = line.trim();
-    const match = MODEL_LINE_PATTERN.exec(trimmed);
-    if (!match) {
-      const bulletMatch = BULLETED_MODEL_LINE_PATTERN.exec(trimmed);
-      if (bulletMatch) {
-        const [, id2] = bulletMatch;
-        models.push({ id: id2, displayName: id2 });
-        continue;
-      }
-      if (BARE_PROVIDER_MODEL_LINE_PATTERN.test(trimmed)) {
-        models.push({ id: trimmed, displayName: trimmed });
-      }
-      continue;
+  function writeLine(message) {
+    const stdin = child.stdin;
+    if (!stdin || stdin.destroyed || !stdin.writable) {
+      closeForAgentStdin(new Error("stdin is not writable"));
+      return;
     }
-    const [, id, displayName] = match;
-    models.push({ id, displayName });
+    stdin.write(JSON.stringify(message) + "\n");
   }
-  return models;
-}
-function findAcpModelConfigOption(configOptions) {
-  const options = configOptions ?? [];
-  return options.find((option) => option.category === "model") ?? options.find((option) => option.id === "model");
-}
-function findAcpThoughtLevelConfigOption(configOptions) {
-  return (configOptions ?? []).find(
-    (option) => option.category === "thought_level"
-  );
-}
-var ACP_NATIVE_REASONING_LEVEL_BY_VALUE = {
-  none: "none",
-  minimal: "low",
-  low: "low",
-  medium: "medium",
-  high: "high",
-  xhigh: "xhigh",
-  ultracode: "ultracode",
-  max: "max",
-  ultra: "ultra"
-};
-var ACP_NATIVE_REASONING_VALUE_CANDIDATES_BY_LEVEL = {
-  none: ["none"],
-  low: ["low", "minimal"],
-  medium: ["medium"],
-  high: ["high"],
-  xhigh: ["xhigh"],
-  ultracode: ["ultracode", "xhigh"],
-  max: ["max", "xhigh"],
-  ultra: ["ultra", "max"]
-};
-function acpNativeValueToReasoningLevel(value) {
-  return value === void 0 ? void 0 : ACP_NATIVE_REASONING_LEVEL_BY_VALUE[value];
-}
-function acpNativeReasoningLevelToValue(level, thoughtLevelOption) {
-  const candidateValues = ACP_NATIVE_REASONING_VALUE_CANDIDATES_BY_LEVEL[level];
-  if (candidateValues === void 0) {
-    return void 0;
-  }
-  const values = new Set(
-    (thoughtLevelOption.options ?? []).map((o) => o.value)
-  );
-  return candidateValues.find((value) => values.has(value));
-}
-function buildAcpNativeReasoningSupport(thoughtLevelOption) {
-  const options = thoughtLevelOption?.options ?? [];
-  const seen = /* @__PURE__ */ new Set();
-  const matchedValueByLevel = /* @__PURE__ */ new Map();
-  const supportedReasoningEfforts = [];
-  for (const option of options) {
-    const level = acpNativeValueToReasoningLevel(option.value);
-    if (level === void 0) {
-      continue;
+  child.stdin?.on("error", (error) => {
+    if (!isClosedAgentStdinError(error)) {
+      throw error;
     }
-    if (seen.has(level)) {
-      const previousValue = matchedValueByLevel.get(level);
-      if (previousValue !== level && option.value === level) {
-        const effort = supportedReasoningEfforts.find(
-          (candidate) => candidate.reasoningEffort === level
-        );
-        if (effort) {
-          effort.description = option.name ?? option.value;
+    closeForAgentStdin(error);
+  });
+  if (child.stdout) {
+    const stdoutLines = createInterface({
+      input: child.stdout,
+      terminal: false
+    });
+    stdoutLines.on("line", (line) => {
+      const message = parseAgentLine(line);
+      if (!message) {
+        return;
+      }
+      const id = message.id;
+      if ((typeof id === "string" || typeof id === "number") && message.method === void 0) {
+        const numericId = typeof id === "number" ? id : Number(id);
+        const request = pending.get(numericId);
+        if (!request) {
+          return;
         }
-        matchedValueByLevel.set(level, option.value);
+        pending.delete(numericId);
+        if (message.error) {
+          request.reject(
+            new AcpAgentResponseError(
+              formatAgentError(message.error),
+              message.error.code
+            )
+          );
+        } else {
+          request.resolve(message.result);
+        }
+        return;
       }
-      continue;
-    }
-    seen.add(level);
-    matchedValueByLevel.set(level, option.value);
-    supportedReasoningEfforts.push({
-      reasoningEffort: level,
-      description: option.name ?? option.value
+      if (typeof message.method !== "string") {
+        return;
+      }
+      if (typeof id === "string" || typeof id === "number") {
+        let settled = false;
+        options.onRequest(message.method, message.params, {
+          result(value) {
+            if (settled) return;
+            settled = true;
+            writeLine({ jsonrpc: "2.0", id, result: value ?? null });
+          },
+          error(code, errorMessage) {
+            if (settled) return;
+            settled = true;
+            writeLine({
+              jsonrpc: "2.0",
+              id,
+              error: { code, message: errorMessage }
+            });
+          }
+        });
+        return;
+      }
+      options.onNotification(message.method, message.params);
     });
   }
-  supportedReasoningEfforts.sort(
-    (a, b) => reasoningLevelValues.indexOf(a.reasoningEffort) - reasoningLevelValues.indexOf(b.reasoningEffort)
-  );
-  if (supportedReasoningEfforts.length === 0) {
-    return {
-      // An omitted option preserves the legacy agent-managed fallback. A
-      // declared option is authoritative, even when bb cannot map its values.
-      supportedReasoningEfforts: thoughtLevelOption === void 0 ? ACP_NATIVE_REASONING_EFFORTS : [],
-      defaultReasoningEffort: "medium"
-    };
-  }
-  const currentLevel = acpNativeValueToReasoningLevel(
-    thoughtLevelOption?.currentValue
-  );
-  const supportedLevels = supportedReasoningEfforts.map(
-    (effort) => effort.reasoningEffort
-  );
-  return {
-    supportedReasoningEfforts,
-    defaultReasoningEffort: currentLevel !== void 0 && supportedLevels.includes(currentLevel) ? currentLevel : supportedReasoningEfforts[0].reasoningEffort
-  };
-}
-function buildModelCatalogFromConfigOptions(modelOption, reasoningByModel) {
-  const options = modelOption?.options ?? [];
-  if (options.length === 0) {
-    return [];
-  }
-  const currentValue = modelOption?.currentValue;
-  const models = options.map((option, index) => {
-    const isDefault = currentValue !== void 0 ? option.value === currentValue : index === 0;
-    const reasoning = reasoningByModel?.get(option.value) ?? {
-      supportedReasoningEfforts: ACP_NATIVE_REASONING_EFFORTS,
-      defaultReasoningEffort: "medium"
-    };
-    return {
-      id: option.value,
-      model: option.value,
-      displayName: option.name ?? option.value,
-      description: "",
-      supportedReasoningEfforts: reasoning.supportedReasoningEfforts,
-      defaultReasoningEffort: reasoning.defaultReasoningEffort,
-      isDefault
-    };
-  });
-  return models.some((model) => model.isDefault) ? models : models.map(
-    (model, index) => index === 0 ? { ...model, isDefault: true } : model
-  );
-}
-function buildModelCatalogFromSessionModels(sessionModels) {
-  const availableModels = sessionModels?.availableModels ?? [];
-  if (availableModels.length === 0) {
-    return [];
+  if (child.stderr) {
+    const stderrLines = createInterface({
+      input: child.stderr,
+      terminal: false
+    });
+    stderrLines.on("line", (line) => {
+      stderrChunks.push(line);
+      if (stderrChunks.length > STDERR_TAIL_MAX_CHUNKS) {
+        stderrChunks.shift();
+      }
+    });
   }
-  const currentModelId = sessionModels?.currentModelId;
-  const models = availableModels.map((model, index) => {
-    const isDefault = currentModelId !== void 0 ? model.modelId === currentModelId : index === 0;
-    return {
-      id: model.modelId,
-      model: model.modelId,
-      displayName: model.name ?? model.modelId,
-      description: model.description ?? "",
-      supportedReasoningEfforts: ACP_NATIVE_REASONING_EFFORTS,
-      defaultReasoningEffort: "medium",
-      isDefault
-    };
+  child.on("error", (error) => {
+    if (exited) {
+      return;
+    }
+    exited = true;
+    rejectAllPending(
+      new AcpAgentExitedError(
+        `Failed to launch ACP agent "${options.command}": ${error.message}`
+      )
+    );
+    options.onExit({ code: null, signal: null, stderrTail: error.message });
   });
-  return models.some((model) => model.isDefault) ? models : models.map(
-    (model, index) => index === 0 ? { ...model, isDefault: true } : model
-  );
-}
-function splitVariant(id) {
-  let rest = id;
-  let fast = false;
-  if (rest.endsWith(FAST_TAIL)) {
-    fast = true;
-    rest = rest.slice(0, -FAST_TAIL.length);
-  }
-  let thinking = false;
-  if (rest.endsWith(`-${THINKING_TOKEN}`)) {
-    thinking = true;
-    rest = rest.slice(0, -(THINKING_TOKEN.length + 1));
-  } else if (rest.includes(`-${THINKING_TOKEN}-`)) {
-    thinking = true;
-    rest = rest.replace(`-${THINKING_TOKEN}-`, "-");
-  }
-  for (const [token, effort] of EFFORT_TOKENS) {
-    if (rest.endsWith(`-${token}`)) {
-      return {
-        familyKey: rest.slice(0, -(token.length + 1)),
-        effort,
-        effortToken: token,
-        fast,
-        thinking
-      };
+  child.on("exit", (code, signal) => {
+    if (exited) {
+      return;
     }
-  }
+    exited = true;
+    const stderrTail = stderrChunks.join("\n");
+    rejectAllPending(
+      new AcpAgentExitedError(
+        `ACP agent "${options.command}" exited (code ${code ?? "null"}, signal ${signal ?? "null"})${stderrTail ? `: ${stderrTail}` : ""}`
+      )
+    );
+    options.onExit({ code, signal, stderrTail });
+  });
   return {
-    familyKey: rest,
-    effort: "medium",
-    effortToken: void 0,
-    fast,
-    thinking
-  };
-}
-var EFFORT_DISPLAY_WORDS = {
-  "extra-high": "Extra High",
-  medium: "Medium",
-  xhigh: "Extra High",
-  high: "High",
-  low: "Low",
-  max: "Max",
-  ultra: "Ultra",
-  none: "None"
-};
-function familyDisplayName(displayName, effortToken) {
-  const word = effortToken ? EFFORT_DISPLAY_WORDS[effortToken] : void 0;
-  if (!word) {
-    return cleanDisplayName(displayName);
+    get exited() {
+      return exited;
+    },
+    request({ method, params, resultSchema }) {
+      if (exited) {
+        return Promise.reject(
+          new AcpAgentExitedError(
+            `ACP agent "${options.command}" is not running`
+          )
+        );
+      }
+      const id = nextRequestId;
+      nextRequestId += 1;
+      return new Promise((resolve4, reject) => {
+        pending.set(id, {
+          resolve: (value) => {
+            const parsed = resultSchema.safeParse(value);
+            if (parsed.success) {
+              resolve4(parsed.data);
+            } else {
+              reject(
+                new Error(
+                  `ACP agent returned an unexpected ${method} result: ${parsed.error.message}`
+                )
+              );
+            }
+          },
+          reject
+        });
+        writeLine({ jsonrpc: "2.0", id, method, params });
+      });
+    },
+    notify(method, params) {
+      if (exited) {
+        return;
+      }
+      writeLine({ jsonrpc: "2.0", method, params });
+    },
+    kill() {
+      if (exited) {
+        return;
+      }
+      child.kill("SIGTERM");
+    }
+  };
+}
+
+// ../provider-bridge-acp/src/bridge/cursor-mcp-approval.ts
+import { execFile as execFile3 } from "node:child_process";
+import { createHash, randomBytes } from "node:crypto";
+import { mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { basename as basename2, dirname, join as join2, resolve as resolve2 } from "node:path";
+
+// ../provider-bridge-acp/src/bridge/tool-proxy-mcp.ts
+import { createConnection } from "node:net";
+import { createInterface as createInterface2 } from "node:readline";
+import { z as z38 } from "zod";
+var ACP_BRIDGE_MCP_SERVER_NAME = "bb-bridge";
+var ENV_HOST = "BB_ACP_DYNAMIC_TOOL_HOST";
+var ENV_PORT = "BB_ACP_DYNAMIC_TOOL_PORT";
+var ENV_TOKEN = "BB_ACP_DYNAMIC_TOOL_TOKEN";
+var ENV_THREAD_ID = "BB_ACP_DYNAMIC_TOOL_THREAD_ID";
+var ENV_TOOLS = "BB_ACP_DYNAMIC_TOOLS";
+var ENV_PROGRESS_INTERVAL_MS = "BB_ACP_DYNAMIC_TOOL_PROGRESS_INTERVAL_MS";
+var bridgeToolCallResponseSchema = z38.union([
+  z38.object({
+    ok: z38.literal(true),
+    content: z38.string(),
+    contentBlocks: z38.array(
+      z38.discriminatedUnion("type", [
+        z38.object({ type: z38.literal("text"), text: z38.string() }),
+        z38.object({
+          type: z38.literal("image"),
+          data: z38.string(),
+          mimeType: z38.string()
+        })
+      ])
+    ).optional(),
+    // The initialized response and older text-only responses omit images.
+    // Parsing them as an empty list keeps the re-executed packaged artifact
+    // compatible with that legacy socket shape.
+    images: z38.array(z38.object({ data: z38.string(), mimeType: z38.string() })).default([]),
+    isError: z38.boolean().optional()
+  }),
+  z38.object({ ok: z38.literal(false), error: z38.string() })
+]);
+var nextMcpToolCallId = 0;
+var TOOL_CALL_PROGRESS_INTERVAL_MS = 15e3;
+function buildAcpMcpServerConfig(args) {
+  return {
+    name: ACP_BRIDGE_MCP_SERVER_NAME,
+    command: args.command,
+    args: args.bridgeArgs,
+    env: [
+      ...args.runtimeEnv,
+      { name: ENV_HOST, value: args.host },
+      { name: ENV_PORT, value: String(args.port) },
+      { name: ENV_TOKEN, value: args.token },
+      { name: ENV_THREAD_ID, value: args.threadId },
+      { name: ENV_TOOLS, value: JSON.stringify(args.dynamicTools) }
+    ]
+  };
+}
+function readEnvironment() {
+  const port = Number(process.env[ENV_PORT]);
+  if (!Number.isInteger(port) || port <= 0) {
+    throw new Error(`${ENV_PORT} must be a positive integer`);
   }
-  return cleanDisplayName(
-    displayName.replace(new RegExp(`(^|\\s)${word}(?=\\s|$)`), "$1")
-  );
+  const host = process.env[ENV_HOST];
+  const token = process.env[ENV_TOKEN];
+  const threadId = process.env[ENV_THREAD_ID];
+  const toolsJson = process.env[ENV_TOOLS];
+  if (!host || !token || !threadId || !toolsJson) {
+    throw new Error("Missing ACP dynamic tool MCP server environment");
+  }
+  const parsedTools = JSON.parse(toolsJson);
+  const tools = dynamicToolSchema.array().parse(parsedTools);
+  const rawProgressInterval = process.env[ENV_PROGRESS_INTERVAL_MS];
+  const progressIntervalMs = rawProgressInterval !== void 0 && Number(rawProgressInterval) > 0 ? Number(rawProgressInterval) : void 0;
+  return {
+    host,
+    port,
+    progressIntervalMs,
+    threadId,
+    token,
+    tools
+  };
 }
-function cleanDisplayName(name) {
-  return name.replace(/\s*\((?:NO ZDR|default|current)\)/gi, "").replace(/(^|\s)(?:1M|Thinking)(?=\s|$)/g, "$1").replace(/\s{2,}/g, " ").trim();
+function writeJson(message) {
+  process.stdout.write(`${JSON.stringify(message)}
+`);
 }
-function buildAgentModelCatalog(rawModels) {
-  const families = /* @__PURE__ */ new Map();
-  for (const raw of rawModels) {
-    const { familyKey, effort, effortToken, fast, thinking } = splitVariant(
-      raw.id
-    );
-    const members = families.get(familyKey) ?? [];
-    members.push({ ...raw, effort, effortToken, fast, thinking });
-    families.set(familyKey, members);
+function writeResult(id, result) {
+  writeJson({ jsonrpc: "2.0", id, result });
+}
+function writeError(id, code, message) {
+  writeJson({ jsonrpc: "2.0", id, error: { code, message } });
+}
+function mcpToolCallId(toolName) {
+  nextMcpToolCallId += 1;
+  return `acp-mcp-${toolName}-${Date.now()}-${nextMcpToolCallId}`;
+}
+function callBridge(env, request) {
+  return new Promise((resolve4, reject) => {
+    const socket = createConnection({ host: env.host, port: env.port });
+    let buffer = "";
+    socket.setEncoding("utf8");
+    socket.on("connect", () => {
+      const payload = {
+        ...request,
+        threadId: env.threadId,
+        token: env.token
+      };
+      socket.write(`${JSON.stringify(payload)}
+`);
+    });
+    socket.on("data", (chunk) => {
+      buffer += chunk;
+      const newlineIndex = buffer.indexOf("\n");
+      if (newlineIndex === -1) {
+        return;
+      }
+      const line = buffer.slice(0, newlineIndex);
+      socket.end();
+      try {
+        resolve4(bridgeToolCallResponseSchema.parse(JSON.parse(line)));
+      } catch (error) {
+        reject(error);
+      }
+    });
+    socket.on("error", reject);
+    socket.on("end", () => {
+      if (!buffer.includes("\n")) {
+        reject(new Error("ACP dynamic tool bridge closed without a response"));
+      }
+    });
+  });
+}
+function objectParams(params) {
+  return params && typeof params === "object" && !Array.isArray(params) ? params : {};
+}
+function readProgressToken(params) {
+  const meta = objectParams(objectParams(params)._meta).progressToken;
+  return typeof meta === "string" || typeof meta === "number" ? meta : null;
+}
+function startProgressHeartbeat(args) {
+  let progress = 0;
+  const timer = setInterval(() => {
+    progress += 1;
+    writeJson({
+      jsonrpc: "2.0",
+      method: "notifications/progress",
+      params: { progressToken: args.progressToken, progress }
+    });
+  }, args.intervalMs ?? TOOL_CALL_PROGRESS_INTERVAL_MS);
+  return () => clearInterval(timer);
+}
+async function handleRequest(env, message) {
+  if (message.id === void 0 || message.method === void 0) {
+    return;
   }
-  if (families.size === 0) {
-    return null;
+  switch (message.method) {
+    case "initialize":
+      writeResult(message.id, {
+        protocolVersion: typeof objectParams(message.params).protocolVersion === "string" ? objectParams(message.params).protocolVersion : "2024-11-05",
+        capabilities: { tools: {} },
+        serverInfo: { name: ACP_BRIDGE_MCP_SERVER_NAME, version: "1.0.0" }
+      });
+      void callBridge(env, {
+        kind: "initialized",
+        toolCount: env.tools.length
+      }).catch((error) => {
+        process.stderr.write(
+          `bb-bridge MCP: failed to report initialize: ${error instanceof Error ? error.message : String(error)}
+`
+        );
+      });
+      return;
+    case "tools/list":
+      writeResult(message.id, {
+        tools: env.tools.map((tool) => ({
+          name: tool.name,
+          description: tool.description,
+          inputSchema: tool.inputSchema
+        }))
+      });
+      return;
+    case "tools/call": {
+      const params = objectParams(message.params);
+      const name = typeof params.name === "string" ? params.name : "";
+      const tool = env.tools.find((candidate) => candidate.name === name);
+      if (!tool) {
+        writeError(message.id, -32602, `Unknown tool: ${name}`);
+        return;
+      }
+      const rawArguments = params.arguments;
+      const toolArguments = rawArguments && typeof rawArguments === "object" && !Array.isArray(rawArguments) ? rawArguments : {};
+      const progressToken = readProgressToken(message.params);
+      const stopHeartbeat = progressToken === null ? () => {
+      } : startProgressHeartbeat({
+        intervalMs: env.progressIntervalMs,
+        progressToken
+      });
+      try {
+        const result = await callBridge(env, {
+          kind: "toolCall",
+          arguments: toolArguments,
+          callId: mcpToolCallId(tool.name),
+          tool: tool.name
+        });
+        stopHeartbeat();
+        if (!result.ok) {
+          writeResult(message.id, {
+            content: [{ type: "text", text: result.error }],
+            isError: true
+          });
+          return;
+        }
+        writeResult(message.id, {
+          content: buildBridgeToolCallContent(result),
+          ...result.isError ? { isError: true } : {}
+        });
+      } catch (error) {
+        stopHeartbeat();
+        writeResult(message.id, {
+          content: [
+            {
+              type: "text",
+              text: error instanceof Error ? error.message : String(error)
+            }
+          ],
+          isError: true
+        });
+      }
+      return;
+    }
+    default:
+      writeError(
+        message.id,
+        -32601,
+        `Unsupported MCP method: ${message.method}`
+      );
   }
-  const models = [];
-  const variantsByFamilyId = /* @__PURE__ */ new Map();
-  const defaultEffortByFamilyId = /* @__PURE__ */ new Map();
-  for (const members of families.values()) {
-    const hasThinking = members.some((m) => m.thinking);
-    const leveled = members.map((member) => ({
-      member,
-      level: member.thinking ? member.effort : hasThinking ? "none" : member.effort
-    }));
-    const byLevel = /* @__PURE__ */ new Map();
-    const repEffortByCell = /* @__PURE__ */ new Map();
-    for (const { member, level } of leveled) {
-      const slot = member.fast ? "fast" : "normal";
-      const tier = byLevel.get(level) ?? {};
-      const cellKey = `${level}:${slot}`;
-      const upgradesNoneRep = level === "none" && member.effort === "medium" && repEffortByCell.get(cellKey) !== "medium";
-      if (tier[slot] === void 0 || upgradesNoneRep) {
-        tier[slot] = member.id;
-        repEffortByCell.set(cellKey, member.effort);
-        byLevel.set(level, tier);
+}
+function runAcpDynamicToolMcpServer() {
+  const env = readEnvironment();
+  const rl = createInterface2({ input: process.stdin, terminal: false });
+  rl.on("line", (line) => {
+    const trimmed = line.trim();
+    if (!trimmed) {
+      return;
+    }
+    let message;
+    try {
+      message = JSON.parse(trimmed);
+    } catch {
+      return;
+    }
+    void handleRequest(env, message);
+  });
+}
+
+// ../provider-bridge-acp/src/bridge/cursor-mcp-approval.ts
+var CURSOR_MCP_APPROVAL_FILE = "mcp-approvals.json";
+var CURSOR_APPROVAL_LOCK_STALE_MS = 3e4;
+var CURSOR_APPROVAL_LOCK_TIMEOUT_MS = 5e3;
+function errorCode(error) {
+  return error instanceof Error && "code" in error ? error.code : void 0;
+}
+function cursorAgentCommand(command) {
+  return basename2(command).toLowerCase().replace(/\.(?:bat|cmd|exe)$/u, "") === "cursor-agent";
+}
+function cursorProjectSlug(projectRoot) {
+  return projectRoot.replace(/[^a-zA-Z0-9]/gu, "-").replace(/-+/gu, "-").replace(/^-+|-+$/gu, "");
+}
+function cursorDataDirectory(env) {
+  const configured = env.CURSOR_DATA_DIR?.trim();
+  if (configured) {
+    return configured;
+  }
+  const home = env.HOME?.trim() || env.USERPROFILE?.trim() || homedir();
+  return join2(home, ".cursor");
+}
+function cursorMcpServerConfig(config) {
+  return {
+    command: config.command,
+    args: config.args,
+    env: Object.fromEntries(config.env.map(({ name, value }) => [name, value]))
+  };
+}
+function buildCursorMcpApprovalIdentifier(args) {
+  const fingerprint = createHash("sha256").update(
+    JSON.stringify({
+      path: args.projectRoot,
+      server: cursorMcpServerConfig(args.config)
+    })
+  ).digest("hex").slice(0, 16);
+  return `${args.config.name}-${fingerprint}`;
+}
+async function resolveCursorProjectRoot(args) {
+  return new Promise((resolveRoot) => {
+    execFile3(
+      "git",
+      ["rev-parse", "--show-toplevel"],
+      { cwd: args.cwd, env: args.env, windowsHide: true },
+      (error, stdout) => {
+        const root = stdout.trim();
+        resolveRoot(error === null && root !== "" ? root : resolve2(args.cwd));
       }
-    }
-    const nonFast = leveled.filter((entry) => !entry.member.fast);
-    const pool = nonFast.length > 0 ? nonFast : leveled;
-    const defaultEntry = pool.find((entry) => entry.level === "medium") ?? pool.find((entry) => entry.level !== "none") ?? pool[0];
-    const defaultVariant = defaultEntry.member;
-    const levelsInLadderOrder = [...byLevel.keys()].sort(
-      (a, b) => reasoningLevelValues.indexOf(a) - reasoningLevelValues.indexOf(b)
     );
-    const nameByLevel = /* @__PURE__ */ new Map();
-    for (const { member, level } of leveled) {
-      if (!nameByLevel.has(level)) {
-        nameByLevel.set(level, member.displayName);
-      }
+  });
+}
+async function readApprovals(path5) {
+  let text;
+  try {
+    text = await readFile(path5, "utf8");
+  } catch (error) {
+    if (errorCode(error) === "ENOENT") {
+      return [];
     }
-    models.push({
-      id: defaultVariant.id,
-      model: defaultVariant.id,
-      displayName: familyDisplayName(
-        defaultVariant.displayName,
-        defaultVariant.effortToken
-      ),
-      description: "",
-      supportedReasoningEfforts: levelsInLadderOrder.map((level) => ({
-        reasoningEffort: level,
-        description: nameByLevel.get(level) ?? ""
-      })),
-      defaultReasoningEffort: defaultEntry.level,
-      // The agent lists its default model first.
-      isDefault: models.length === 0
+    throw error;
+  }
+  const value = JSON.parse(text);
+  if (!Array.isArray(value) || !value.every((item) => typeof item === "string")) {
+    throw new Error(`Cursor MCP approval file is not a string array: ${path5}`);
+  }
+  return value;
+}
+async function writeApprovals(path5, approvals) {
+  await mkdir(dirname(path5), { recursive: true });
+  const tempPath = `${path5}.bb-${process.pid}-${randomBytes(6).toString("hex")}.tmp`;
+  try {
+    await writeFile(tempPath, `${JSON.stringify(approvals, null, 2)}
+`, {
+      encoding: "utf8",
+      mode: 384
     });
-    variantsByFamilyId.set(defaultVariant.id, byLevel);
-    defaultEffortByFamilyId.set(defaultVariant.id, defaultEntry.level);
+    await rename(tempPath, path5);
+  } catch (error) {
+    await rm(tempPath, { force: true });
+    throw error;
   }
-  return {
-    models,
-    resolveVariant({ model, reasoningLevel, serviceTier }) {
-      const byLevel = variantsByFamilyId.get(model);
-      if (!byLevel) {
-        return void 0;
+}
+async function acquireApprovalLock(path5) {
+  const lockPath = `${path5}.bb-lock`;
+  const deadline = Date.now() + CURSOR_APPROVAL_LOCK_TIMEOUT_MS;
+  await mkdir(dirname(path5), { recursive: true });
+  for (; ; ) {
+    try {
+      await mkdir(lockPath, { mode: 448 });
+      return () => rm(lockPath, { recursive: true, force: true });
+    } catch (error) {
+      if (errorCode(error) !== "EEXIST") {
+        throw error;
       }
-      const level = reasoningLevel ?? defaultEffortByFamilyId.get(model);
-      const tier = level === void 0 ? void 0 : byLevel.get(level);
-      if (!tier) {
-        return void 0;
+    }
+    try {
+      const lockStat = await stat(lockPath);
+      if (Date.now() - lockStat.mtimeMs > CURSOR_APPROVAL_LOCK_STALE_MS) {
+        await rm(lockPath, { recursive: true, force: true });
+        continue;
       }
-      if (serviceTier === "fast" && tier.fast !== void 0) {
-        return tier.fast;
+    } catch (error) {
+      if (errorCode(error) === "ENOENT") {
+        continue;
       }
-      return tier.normal ?? tier.fast;
+      throw error;
     }
-  };
+    if (Date.now() >= deadline) {
+      throw new Error(`Timed out updating Cursor MCP approvals: ${path5}`);
+    }
+    await new Promise((resolveDelay) => setTimeout(resolveDelay, 25));
+  }
 }
-function splitPrimaryModels(catalogModels, primaryModels) {
-  const primaryIds = new Set(primaryModels);
-  const modelsById = new Map(catalogModels.map((model) => [model.id, model]));
-  const models = primaryModels.flatMap((id) => {
-    const model = modelsById.get(id);
-    return model ? [model] : [];
-  });
-  if (models.length === 0) {
-    return { models: [...catalogModels], selectedOnlyModels: [] };
+async function mutateApprovals(path5, mutate) {
+  const releaseLock = await acquireApprovalLock(path5);
+  try {
+    const approvals = await readApprovals(path5);
+    const nextApprovals = mutate(approvals);
+    if (approvals.length !== nextApprovals.length || approvals.some((approval, index) => approval !== nextApprovals[index])) {
+      await writeApprovals(path5, nextApprovals);
+    }
+  } finally {
+    await releaseLock();
   }
-  const selectedOnlyModels = catalogModels.filter(
-    (model) => !primaryIds.has(model.id)
+}
+async function approveCursorSessionMcpServer(args) {
+  if (!cursorAgentCommand(args.agentCommand) || args.config.name !== ACP_BRIDGE_MCP_SERVER_NAME) {
+    return void 0;
+  }
+  const projectRoot = await resolveCursorProjectRoot({
+    cwd: args.cwd,
+    env: args.env
+  });
+  const path5 = join2(
+    cursorDataDirectory(args.env),
+    "projects",
+    cursorProjectSlug(projectRoot),
+    CURSOR_MCP_APPROVAL_FILE
   );
-  if (models.some((model) => model.isDefault)) {
-    return {
-      models,
-      selectedOnlyModels: selectedOnlyModels.map(
-        (model) => model.isDefault ? { ...model, isDefault: false } : model
-      )
-    };
+  const approval = buildCursorMcpApprovalIdentifier({
+    config: args.config,
+    projectRoot
+  });
+  let installedByBb = false;
+  await mutateApprovals(path5, (approvals) => {
+    if (approvals.includes(approval)) {
+      return approvals;
+    }
+    installedByBb = true;
+    return [...approvals, approval];
+  });
+  return { approval, installedByBb, path: path5 };
+}
+async function revokeCursorSessionMcpServer(approval) {
+  if (!approval.installedByBb) {
+    return;
   }
-  return {
-    models: models.map(
-      (model, index) => index === 0 ? { ...model, isDefault: true } : model
-    ),
-    selectedOnlyModels: selectedOnlyModels.map(
-      (model) => model.isDefault ? { ...model, isDefault: false } : model
-    )
-  };
+  await mutateApprovals(
+    approval.path,
+    (approvals) => approvals.filter((candidate) => candidate !== approval.approval)
+  );
 }
 
 // ../provider-bridge-acp/src/bridge/bridge.ts
@@ -8315,6 +8343,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(
@@ -8364,8 +8399,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;
   }
@@ -8406,10 +8445,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
         });
@@ -8447,7 +8483,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 = {
@@ -8475,6 +8512,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) => {
@@ -8486,7 +8540,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: {
@@ -8646,6 +8700,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;
@@ -8676,6 +8736,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;
@@ -9041,10 +9123,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
     });
@@ -9514,15 +9596,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, {
@@ -9554,8 +9643,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 ?? [];
 }
@@ -9597,14 +9702,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(
@@ -9683,6 +9793,9 @@ async function handleRequest2(request) {
         );
         return;
       }
+      const modelPicker = decodeAcpModelPickerOptions(
+        params.options.providerOptions
+      );
       const sessionParams = buildAcpSessionParams({
         additionalWorkspaceWriteRoots: decodeAdditionalWorkspaceWriteRoots(
           params.options.providerOptions
@@ -9694,6 +9807,7 @@ async function handleRequest2(request) {
           ...params.options,
           skillRoots: configuredSkillRoots ?? void 0
         },
+        parameterizedModelPicker: modelPicker.parameterizedModelPicker,
         launchSpec,
         providerLabel: launchSpec.displayName,
         threadId: params.threadId