@agentclientprotocol/claude-agent-acp 0.90.1-preview.9 → 0.91.1-preview.1

package/dist/session-model.js

@@ -1,4 +1,5 @@
 import { AIR_RECOMMENDED_CONFIG_VALUE_CAPABILITY, withAirMeta } from "./air-extension.js";
+import { bedrockRegionPrefix } from "./gateway-models.js";
 export const MODEL_CONFIG_ID = "model";
 const MODEL_CONTEXT_HINT_PATTERN = /\[(\d+m)\]$/i;
 const CONTEXT_HINT_SUFFIX_PATTERN = /-(\d+m)$/i;
@@ -218,9 +219,10 @@ function resolveSettingsModel(models, settingsModel, logger) {
     return resolveModelPreference(models, settingsModel);
 }
 const MODEL_FAMILY_ALIASES = new Set(["opus", "sonnet", "haiku", "fable"]);
-/** A model id without the spellings `deniedModels` ignores: provider
- *  prefixes, dates, version suffixes, `-fast` and context hints. */
-function normalizeDeniedModelId(value) {
+/** A model id without the spellings that name the same model: provider
+ *  prefixes, dates, version suffixes, `-fast` and context hints. `deniedModels`
+ *  and gateway listings both match on it. */
+function normalizeModelId(value) {
     let id = stripContextHints(value.trim().toLowerCase());
     const providerPrefix = id.lastIndexOf("anthropic.");
     if (providerPrefix !== -1)
@@ -239,11 +241,11 @@ function normalizeDeniedModelId(value) {
  * the enforcer; this only keeps the picker from offering a refused row.
  */
 export function isDeniedModel(modelId, deniedModels) {
-    const id = normalizeDeniedModelId(modelId);
+    const id = normalizeModelId(modelId);
     if (!id)
         return false;
     return deniedModels.some((entry) => {
-        const denied = normalizeDeniedModelId(entry);
+        const denied = normalizeModelId(entry);
         if (!denied)
             return false;
         if (MODEL_FAMILY_ALIASES.has(denied))
@@ -324,6 +326,46 @@ export function applyAvailableModelsAllowlist(sdkModels, allowlist, settingsMode
     }
     return result;
 }
+/**
+ * Keep the SDK models the `providers/set` gateway listed (`listGatewayModels`,
+ * `listBedrockModels`). A row matches when its `resolvedModel` (or
+ * its `value` when the SDK gives none) names a listed model in any spelling:
+ * `claude-sonnet-5[1m]` matches a listed `claude-sonnet-5-20260101`, and
+ * `eu.anthropic.claude-sonnet-5` matches a listed `eu.anthropic.claude-sonnet-5-v1:0`.
+ *
+ * With a Bedrock `regionPrefix`, a row resolved to another cross-region prefix
+ * (`us.anthropic.claude-sonnet-5` under `eu`) is dropped even when the same
+ * model is listed under `eu`: the CLI would call it in the other region.
+ *
+ * A row the SDK gives no `resolvedModel` names its model only by an alias, so
+ * it is checked as far as the alias allows: `default` is kept, and a family
+ * alias such as `opus` is kept when the gateway lists a model of that family.
+ *
+ * When no row matches by its model (a `default` row kept only for lacking a
+ * `resolvedModel` does not count), the gateway serves none of the SDK's
+ * models, and nothing is left: the session offers no model.
+ */
+export function narrowToGatewayModels(models, listedModelIds, regionPrefix) {
+    const listed = new Set(listedModelIds.map(normalizeModelId).filter(Boolean));
+    const narrowed = models.filter((model) => {
+        const modelId = model.resolvedModel ?? model.value;
+        const prefix = bedrockRegionPrefix(modelId);
+        if (regionPrefix !== undefined && prefix !== undefined && prefix !== regionPrefix) {
+            return false;
+        }
+        const id = normalizeModelId(modelId);
+        if (listed.has(id))
+            return true;
+        if (model.resolvedModel !== undefined)
+            return false;
+        if (model.value === "default")
+            return true;
+        return MODEL_FAMILY_ALIASES.has(id) && [...listed].some((entry) => entry.includes(`-${id}`));
+    });
+    return narrowed.some((model) => listed.has(normalizeModelId(model.resolvedModel ?? model.value)))
+        ? narrowed
+        : [];
+}
 /** Whether a rejected `setModel` was vetoed by a user-configured
  *  PreModelSwitch hook. The CLI's rejection message is the stable,
  *  distinguishable marker ("Model switch blocked by a PreModelSwitch hook:
@@ -332,7 +374,16 @@ export function applyAvailableModelsAllowlist(sdkModels, allowlist, settingsMode
 function isPreModelSwitchHookBlock(error) {
     return error instanceof Error && error.message.includes("blocked by a PreModelSwitch hook");
 }
-export async function getAvailableModels(query, models, sdkModels, settingsManager, logger, isResumedSession, sessionId, resumedModelHint) {
+export async function getAvailableModels(query, models, sdkModels, settingsManager, logger, isResumedSession, sessionId, resumedModelHint, narrowedByGateway = false) {
+    // A gateway that lists none of the SDK's models leaves none to offer
+    // (`narrowToGatewayModels`). The session stays on the model the SDK runs,
+    // and the gateway refuses its requests.
+    if (models.length === 0) {
+        return {
+            availableModels: [],
+            currentModelId: (isResumedSession && resumedModelHint) || sdkModels[0]?.value || "default",
+        };
+    }
     const settings = settingsManager.getSettings();
     let currentModel = models[0];
     let resolvedFromInput;
@@ -377,8 +428,31 @@ export async function getAvailableModels(query, models, sdkModels, settingsManag
     //      be re-asserted to keep the reported model truthful.
     // Anything else (fuzzy match, allowlist-synthesized value, alias) gets a
     // setModel call so we don't drift from the user's intended pin.
+    // Case (a) does not hold when `narrowToGatewayModels` left the SDK on a
+    // model the gateway does not list: the dropped `default` row of a fresh or
+    // transcript-less session, or a resumed transcript model outside the list.
+    // Such a session switches to models[0].
     const sdkSawSameValue = sdkModels.some((m) => m.value === currentModel.value);
-    const skipSetModel = resolvedFromInput === undefined ||
+    const sdkDefault = sdkModels.find((m) => m.value === "default");
+    const sdkDefaultDropped = sdkDefault !== undefined && !models.some((m) => m.value === "default");
+    let switchToListed = false;
+    if (resolvedFromInput === undefined) {
+        if (!isResumedSession || !resumedModelHint) {
+            switchToListed = sdkDefaultDropped;
+        }
+        else if (narrowedByGateway &&
+            (!models.some((m) => m.value === currentModel.value) ||
+                // A loose match can map the transcript's model onto a listed row of
+                // another version, which the CLI does not resume on.
+                (currentModel.resolvedModel !== undefined &&
+                    normalizeModelId(currentModel.resolvedModel) !== normalizeModelId(resumedModelHint)))) {
+            currentModel = models[0];
+            switchToListed = true;
+        }
+    }
+    // When the switch fails, the SDK stays on the model it ran before it.
+    const modelBeforeSwitch = () => switchToListed && sdkDefault !== undefined ? sdkDefault : models[0];
+    const skipSetModel = (resolvedFromInput === undefined && !switchToListed) ||
         (!isResumedSession && currentModel.value === resolvedFromInput && sdkSawSameValue);
     if (!skipSetModel) {
         const setModelStartedAt = performance.now();
@@ -407,14 +481,18 @@ export async function getAvailableModels(query, models, sdkModels, settingsManag
             // live model back on this path: getContextUsage isn't serviced on a
             // fresh session until the first prompt turn (issues #886/#880).
             if (!isResumedSession) {
-                if (!isPreModelSwitchHookBlock(error))
+                // A switch onto a listed model is advisory too: the session stays on
+                // the model the SDK runs and reports it.
+                if (!switchToListed && !isPreModelSwitchHookBlock(error))
                     throw error;
-                logger.error(`Model pin "${currentModel.value}" was vetoed by a PreModelSwitch hook; staying on the default model:`, error);
-                currentModel = models[0];
+                logger.error(`Model switch to "${currentModel.value}" failed or was vetoed by a PreModelSwitch hook; staying on the default model:`, error);
+                currentModel = modelBeforeSwitch();
             }
             else {
                 logger.error(`Failed to re-assert model "${currentModel.value}" on resume:`, error);
-                currentModel = resumedModelHint ? matchResumedModel(models, resumedModelHint) : models[0];
+                currentModel = resumedModelHint
+                    ? matchResumedModel(models, resumedModelHint)
+                    : modelBeforeSwitch();
             }
         }
     }

package/dist/turn-events.d.ts

@@ -53,7 +53,11 @@ export interface TurnEvents {
  * the cycle reports nothing more, and the turn reports from there.
  */
 export interface ForegroundEvents {
-    /** The work started, or works again after it waited for the user. */
+    /**
+     * The work started, or works again after it waited for the user. Not after
+     * a wait that a cancel ended: Claude Code's interrupt withdrew the last
+     * request, so the work is being stopped, and {@link ended} follows at once.
+     */
     running(): void;
     /**
      * The work waits for the user: a permission request or a question is open in

package/dist/turn-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-events.d.ts","sourceRoot":"","sources":["../src/turn-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAClC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,gBAAgB;IAC/B,qEAAqE;IACrE,OAAO,IAAI,IAAI,CAAC;IAChB;;;;OAIG;IACH,YAAY,IAAI,IAAI,CAAC;IACrB,sBAAsB;IACtB,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED,6DAA6D;AAC7D,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,mBAAmB,GAAG,SAAS,GAAG,WAAW,CAAC;AAEnG,wBAAwB;AACxB,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,4DAA4D;IAC5D,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"turn-events.d.ts","sourceRoot":"","sources":["../src/turn-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAClC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,OAAO,IAAI,IAAI,CAAC;IAChB;;;;OAIG;IACH,YAAY,IAAI,IAAI,CAAC;IACrB,sBAAsB;IACtB,KAAK,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAClC;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED,6DAA6D;AAC7D,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,YAAY,GAAG,mBAAmB,GAAG,SAAS,GAAG,WAAW,CAAC;AAEnG,wBAAwB;AACxB,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,4DAA4D;IAC5D,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC"}

package/dist/v2/prompt.d.ts

@@ -28,7 +28,8 @@ export declare function v2Prompt(agent: ClaudeAcpAgent, params: v2.PromptRequest
  *
  * - Started: `running`. For a prompt's turn, right after its `user_message`.
  * - Waiting on a permission request or a question: `requires_action`, and
- *   `running` once none is open.
+ *   `running` once none is open, unless a cancel withdrew the last one: the
+ *   work is being stopped then, and its `idle` follows.
  * - Ended: `idle` with the stop reason, usage, and `_meta` of the work.
  * - Failed: `idle` with the `error` stop reason and the JSON-RPC error that v1
  *   answers the prompt with, so a client can show its message and handle its

package/dist/v2/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/v2/prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAuC,MAAM,mBAAmB,CAAC;AAE/F;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,EAAE,CAAC,aAAa,EACxB,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,GACvC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,CAiC5B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,GAAG,gBAAgB,CAoBvF;AAgCD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,CAAC,aAAa,GAAG,aAAa,CAEvF"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/v2/prompt.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAIL,KAAK,aAAa,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAuC,MAAM,mBAAmB,CAAC;AAE/F;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,EAAE,CAAC,aAAa,EACxB,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,GACvC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,CAiC5B;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,KAAK,IAAI,GAAG,gBAAgB,CAoBvF;AAgCD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,CAAC,aAAa,GAAG,aAAa,CAEvF"}

package/dist/v2/prompt.js

@@ -57,7 +57,8 @@ export function v2Prompt(agent, params, send) {
  *
  * - Started: `running`. For a prompt's turn, right after its `user_message`.
  * - Waiting on a permission request or a question: `requires_action`, and
- *   `running` once none is open.
+ *   `running` once none is open, unless a cancel withdrew the last one: the
+ *   work is being stopped then, and its `idle` follows.
  * - Ended: `idle` with the stop reason, usage, and `_meta` of the work.
  * - Failed: `idle` with the `error` stop reason and the JSON-RPC error that v1
  *   answers the prompt with, so a client can show its message and handle its

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.90.1-preview.9",
+  "version": "0.91.1-preview.1",
   "description": "An ACP-compatible coding agent powered by the Claude Agent SDK (TypeScript)",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
@@ -66,12 +66,12 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.8.0",
-    "@anthropic-ai/claude-agent-sdk": "0.3.296",
+    "@anthropic-ai/claude-agent-sdk": "0.3.300",
     "diff": "9.0.0",
     "zod": "4.6.7"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.133.0",
+    "@anthropic-ai/sdk": "0.134.0",
     "@eslint/js": "10.0.1",
     "@tsconfig/node22": "22.0.6",
     "@types/node": "26.6.5",