@agentclientprotocol/claude-agent-acp 0.75.2-preview.1 → 0.75.2-preview.2

package/dist/air-extension.d.ts

@@ -1,6 +1,7 @@
 export declare const AIR_NATIVE_SUBAGENT_SESSIONS_CAPABILITY = "nativeSubagentSessions";
 export declare const AIR_ASYNC_TASKS_CAPABILITY = "asyncTasks";
 export declare const AIR_SESSION_FAILURE_CAPABILITY = "sessionFailure";
+export declare const AIR_RECOMMENDED_CONFIG_VALUE_CAPABILITY = "recommendedValue";
 /** The capability list this side advertises, as its own `_meta` object. */
 export declare function airCapabilityMeta(...capabilities: string[]): Record<string, unknown>;
 /**

package/dist/air-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"air-extension.d.ts","sourceRoot":"","sources":["../src/air-extension.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uCAAuC,2BAA2B,CAAC;AAChF,eAAO,MAAM,0BAA0B,eAAe,CAAC;AACvD,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAQ/D,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAAC,GAAG,YAAY,EAAE,MAAM,EAAE,2BAE1D;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAChD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAY9F"}
+{"version":3,"file":"air-extension.d.ts","sourceRoot":"","sources":["../src/air-extension.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uCAAuC,2BAA2B,CAAC;AAChF,eAAO,MAAM,0BAA0B,eAAe,CAAC;AACvD,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAC/D,eAAO,MAAM,uCAAuC,qBAAqB,CAAC;AAQ1E,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAAC,GAAG,YAAY,EAAE,MAAM,EAAE,2BAE1D;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAChD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAY9F"}

package/dist/air-extension.js

@@ -1,6 +1,7 @@
 export const AIR_NATIVE_SUBAGENT_SESSIONS_CAPABILITY = "nativeSubagentSessions";
 export const AIR_ASYNC_TASKS_CAPABILITY = "asyncTasks";
 export const AIR_SESSION_FAILURE_CAPABILITY = "sessionFailure";
+export const AIR_RECOMMENDED_CONFIG_VALUE_CAPABILITY = "recommendedValue";
 const JETBRAINS_META_KEY = "jetbrains";
 const AIR_META_KEY = "air";
 const AIR_EXTENSION_VERSION_KEY = "version";

package/dist/clear-context-coordinator.d.ts

@@ -31,6 +31,7 @@ export type ClearContextSession<Turn extends ClearContextTurn = ClearContextTurn
     configOptions: SessionConfigOption[];
     currentAgent: string;
     fastModeEnabled: boolean;
+    effortPinnedLevel?: string;
     activeTurn?: Turn | null;
     turnQueue?: Turn[];
     pendingExitPlanContextReset?: ClearContextReset;

package/dist/clear-context-coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clear-context-coordinator.d.ts","sourceRoot":"","sources":["../src/clear-context-coordinator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clear-context-coordinator.d.ts","sourceRoot":"","sources":["../src/clear-context-coordinator.ts"],"names":[],"mappings":"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"}

package/dist/clear-context-coordinator.js

@@ -1,7 +1,6 @@
-import { DEFAULT_AGENT_ID, DEFAULT_MODEL_ID, EFFORT_CONFIG_ID } from "./session-config-ids.js";
+import { DEFAULT_AGENT_ID, DEFAULT_MODEL_ID } from "./session-config-ids.js";
 function restartParams(session) {
     const originalParams = session.creationParams ?? { cwd: session.cwd, mcpServers: [] };
-    const currentEffort = session.configOptions.find((option) => option.id === EFFORT_CONFIG_ID)?.currentValue;
     const originalMeta = originalParams._meta;
     const originalOptions = originalMeta?.claudeCode?.options;
     const unmanagedOptions = { ...(originalOptions ?? {}) };
@@ -20,8 +19,8 @@ function restartParams(session) {
                         ? { model: session.models.currentModelId }
                         : {}),
                     ...(session.currentAgent !== DEFAULT_AGENT_ID ? { agent: session.currentAgent } : {}),
-                    ...(typeof currentEffort === "string" && currentEffort !== "default"
-                        ? { effort: currentEffort }
+                    ...(session.effortPinnedLevel !== undefined
+                        ? { effort: session.effortPinnedLevel }
                         : {}),
                 },
             },

package/dist/session-effort.d.ts

@@ -0,0 +1,14 @@
+import type { SessionConfigOption } from "@agentclientprotocol/sdk";
+import type { EffortLevel, ModelInfo, Settings } from "@anthropic-ai/claude-agent-sdk";
+export { EFFORT_CONFIG_ID } from "./session-config-ids.js";
+export declare function toSdkEffortLevel(value: string | undefined): EffortLevel | null;
+/** Resolve the effort the CLI will use: per-model settings first, then the
+ *  legacy top-level effort setting. Model settings are keyed by canonical
+ *  model name, so try the resolved SDK model before picker and raw IDs. */
+export declare function settingsEffortForModel(settings: Settings, modelInfo: ModelInfo | undefined, modelId?: string): string | undefined;
+/** Programmatic query settings have higher priority than file-backed settings,
+ * matching the SDK. Keep unrelated per-model entries from lower tiers while
+ * replacing entries supplied at the programmatic tier. */
+export declare function mergeEffortSettings(base: Settings, override: Settings | undefined): Settings;
+export declare function buildEffortConfigOption(modelInfos: ModelInfo[], currentModelId: string, currentEffortLevel: string | undefined, useRecommendedValue: boolean): SessionConfigOption | undefined;
+//# sourceMappingURL=session-effort.d.ts.map

package/dist/session-effort.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-effort.d.ts","sourceRoot":"","sources":["../src/session-effort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAIvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAK3D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,IAAI,CAE9E;AASD;;2EAE2E;AAC3E,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAgBpB;AAED;;0DAE0D;AAC1D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAkB5F;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,GAAG,SAAS,CA2CjC"}

package/dist/session-effort.js

@@ -0,0 +1,93 @@
+import { AIR_RECOMMENDED_CONFIG_VALUE_CAPABILITY, withAirMeta } from "./air-extension.js";
+import { EFFORT_CONFIG_ID } from "./session-config-ids.js";
+export { EFFORT_CONFIG_ID } from "./session-config-ids.js";
+// The SDK drops `undefined` during JSON transport and only clears a flag-layer
+// setting when it receives an explicit `null`. Map both an absent picker and
+// the legacy "default" row to null so a previously applied effort is cleared.
+export function toSdkEffortLevel(value) {
+    return value === undefined || value === "default" ? null : value;
+}
+function canonicalizeModelSettingsKey(value) {
+    return value
+        .trim()
+        .toLowerCase()
+        .replace(/-(\d+m)$/i, "[$1]");
+}
+/** Resolve the effort the CLI will use: per-model settings first, then the
+ *  legacy top-level effort setting. Model settings are keyed by canonical
+ *  model name, so try the resolved SDK model before picker and raw IDs. */
+export function settingsEffortForModel(settings, modelInfo, modelId) {
+    const modelSettings = settings.modelSettings;
+    if (modelSettings) {
+        for (const key of [modelInfo?.resolvedModel, modelInfo?.value, modelId]) {
+            if (key === undefined)
+                continue;
+            const exact = modelSettings[key]?.effortLevel;
+            if (typeof exact === "string")
+                return exact;
+            const canonicalKey = canonicalizeModelSettingsKey(key);
+            const matchingEntry = Object.entries(modelSettings).find(([candidate]) => canonicalizeModelSettingsKey(candidate) === canonicalKey);
+            const perModel = matchingEntry?.[1]?.effortLevel;
+            if (typeof perModel === "string")
+                return perModel;
+        }
+    }
+    return settings.effortLevel;
+}
+/** Programmatic query settings have higher priority than file-backed settings,
+ * matching the SDK. Keep unrelated per-model entries from lower tiers while
+ * replacing entries supplied at the programmatic tier. */
+export function mergeEffortSettings(base, override) {
+    if (!override)
+        return base;
+    const overriddenModelKeys = new Set(Object.keys(override.modelSettings ?? {}).map(canonicalizeModelSettingsKey));
+    const unshadowedBaseModelSettings = Object.fromEntries(Object.entries(base.modelSettings ?? {}).filter(([key]) => !overriddenModelKeys.has(canonicalizeModelSettingsKey(key))));
+    return {
+        ...base,
+        ...override,
+        modelSettings: base.modelSettings || override.modelSettings
+            ? { ...unshadowedBaseModelSettings, ...override.modelSettings }
+            : undefined,
+    };
+}
+export function buildEffortConfigOption(modelInfos, currentModelId, currentEffortLevel, useRecommendedValue) {
+    const currentModelInfo = modelInfos.find((model) => model.value === currentModelId);
+    const supportedLevels = currentModelInfo?.supportsEffort
+        ? (currentModelInfo.supportedEffortLevels ?? [])
+        : [];
+    if (supportedLevels.length === 0)
+        return undefined;
+    const recommendedEffort = supportedLevels.includes("medium")
+        ? "medium"
+        : supportedLevels[0];
+    const options = [
+        ...(useRecommendedValue ? [] : [{ value: "default", name: "Default" }]),
+        ...supportedLevels.map((level) => ({
+            value: level,
+            name: level
+                .split(/[_-]/)
+                .map((part) => (part ? part.charAt(0).toUpperCase() + part.slice(1) : part))
+                .join(" "),
+        })),
+    ];
+    const includes = (level) => (!useRecommendedValue && level === "default") || supportedLevels.includes(level);
+    const currentValue = currentEffortLevel && includes(currentEffortLevel)
+        ? currentEffortLevel
+        : useRecommendedValue
+            ? recommendedEffort
+            : "default";
+    return {
+        id: EFFORT_CONFIG_ID,
+        name: "Effort",
+        description: "Available effort levels for this model",
+        category: "thought_level",
+        type: "select",
+        currentValue,
+        options,
+        ...(useRecommendedValue
+            ? {
+                _meta: withAirMeta(undefined, AIR_RECOMMENDED_CONFIG_VALUE_CAPABILITY, recommendedEffort),
+            }
+            : {}),
+    };
+}

package/dist/session-model.d.ts

@@ -0,0 +1,41 @@
+import type { SessionConfigOption } from "@agentclientprotocol/sdk";
+import type { ModelInfo, Query, Settings } from "@anthropic-ai/claude-agent-sdk";
+export declare const MODEL_CONFIG_ID = "model";
+export type SessionModelState = {
+    availableModels: Array<{
+        modelId: string;
+        name: string;
+        description?: string;
+    }>;
+    currentModelId: string;
+};
+type ModelLogger = {
+    log: (...args: unknown[]) => void;
+    error: (...args: unknown[]) => void;
+};
+type ModelSettingsSource = {
+    getSettings(): Settings;
+};
+export declare function resolveModelPreference(models: ModelInfo[], preference: string): ModelInfo | null;
+export declare function matchResumedModel(models: ModelInfo[], liveModel: string): ModelInfo;
+export declare function buildModelConfigOption(models: SessionModelState, modelInfos: ModelInfo[], useRecommendedValue: boolean): SessionConfigOption;
+/**
+ * Restrict the SDK's model list to the user's `availableModels` allowlist
+ * (already merged-and-deduped across settings sources by `SettingsManager`).
+ * The user's exact entries become the model IDs surfaced via configOptions
+ * and passed to `setModel`, which prevents Claude Code from silently
+ * substituting a date-pinned variant (e.g. `haiku` →
+ * `claude-haiku-4-5-20251001`) that the user may not have access to.
+ *
+ * Display info and capability flags are copied from the closest SDK match so
+ * the UI still renders sensible names and effort levels.
+ *
+ * Semantics from https://code.claude.com/docs/en/model-config#restrict-model-selection:
+ * - `undefined` is handled by the caller (no allowlist applied).
+ * - The Default option is unaffected by `availableModels` — it always remains
+ *   available, even when the allowlist is `[]`.
+ */
+export declare function applyAvailableModelsAllowlist(sdkModels: ModelInfo[], allowlist: string[], settingsModelOverrides?: Record<string, string>): ModelInfo[];
+export declare function getAvailableModels(query: Query, models: ModelInfo[], sdkModels: ModelInfo[], settingsManager: ModelSettingsSource, logger: ModelLogger, isResumedSession: boolean, sessionId: string, resumedModelHint?: string): Promise<SessionModelState>;
+export {};
+//# sourceMappingURL=session-model.d.ts.map

package/dist/session-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-model.d.ts","sourceRoot":"","sources":["../src/session-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAGjF,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChF,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC,CAAC;AACF,KAAK,mBAAmB,GAAG;IAAE,WAAW,IAAI,QAAQ,CAAA;CAAE,CAAC;AAmGvD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CA2ChG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAyBnF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,SAAS,EAAE,EACvB,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAsDrB;AAkBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,EAAE,EACtB,SAAS,EAAE,MAAM,EAAE,EACnB,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9C,SAAS,EAAE,CAsDb;AAWD,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,SAAS,EAAE,EACnB,SAAS,EAAE,SAAS,EAAE,EACtB,eAAe,EAAE,mBAAmB,EACpC,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA6G5B"}

package/dist/session-model.js

@@ -0,0 +1,395 @@
+import { AIR_RECOMMENDED_CONFIG_VALUE_CAPABILITY, withAirMeta } from "./air-extension.js";
+export const MODEL_CONFIG_ID = "model";
+const MODEL_CONTEXT_HINT_PATTERN = /\[(\d+m)\]$/i;
+const CONTEXT_HINT_SUFFIX_PATTERN = /-(\d+m)$/i;
+const MODEL_FAMILY_VERSION_PATTERN = /\b(\d+)(?:[-.](\d+))?\b/;
+const VERSIONABLE_MODEL_DISPLAY_PATTERN = /^(?:Claude\s+)?([a-z][a-z0-9-]*)(?:\s+\d+(?:\.\d+)?)?(?:\s+\(\d+[mk]\s+context\))?$/i;
+const DISPLAY_CONTEXT_SUFFIX_PATTERN = /\s+\((\d+[mk])\s+context\)$/i;
+function stripContextHints(value) {
+    return value.replace(/\[\d+m\]/gi, "").replace(CONTEXT_HINT_SUFFIX_PATTERN, "");
+}
+function canonicalizeModelId(value) {
+    return value.trim().toLowerCase().replace(CONTEXT_HINT_SUFFIX_PATTERN, "[$1]");
+}
+function contextHintOf(value) {
+    return canonicalizeModelId(value).match(MODEL_CONTEXT_HINT_PATTERN)?.[1] ?? null;
+}
+function extractModelFamilyVersion(value) {
+    const match = stripContextHints(value).match(MODEL_FAMILY_VERSION_PATTERN);
+    if (!match)
+        return null;
+    return match[2] ? `${match[1]}.${match[2]}` : match[1];
+}
+function modelVersionsCompatible(preference, candidate) {
+    const preferred = extractModelFamilyVersion(preference);
+    if (!preferred)
+        return true;
+    const candidateVersion = extractModelFamilyVersion(candidate.value) ??
+        extractModelFamilyVersion(candidate.displayName) ??
+        extractModelFamilyVersion(candidate.description);
+    return candidateVersion ? preferred === candidateVersion : true;
+}
+function displayModelVersion(model, family) {
+    const familyVersion = new RegExp(`\\b${family}[-\\s]+(\\d+)(?:[-.](\\d+))?`, "i");
+    // The display name is the value we are deciding whether to rewrite, so it
+    // cannot validate its own normalization. Require independent SDK metadata.
+    for (const source of [model.resolvedModel, model.description, model.value]) {
+        const match = source?.match(familyVersion);
+        if (match)
+            return match[2] ? `${match[1]}.${match[2]}` : match[1];
+    }
+    return undefined;
+}
+/** Add concrete versions when a terse SDK label names the same family as the
+ * underlying model metadata. Multi-word/custom labels remain untouched.
+ * Context size remains in the option description; if normalization would
+ * collide, callers fall back to the original labels. */
+function versionedModelDisplayName(model) {
+    const versionable = model.displayName.match(VERSIONABLE_MODEL_DISPLAY_PATTERN);
+    if (!versionable)
+        return model.displayName;
+    const version = displayModelVersion(model, versionable[1]);
+    if (!version)
+        return model.displayName;
+    const contextSuffix = model.displayName.match(DISPLAY_CONTEXT_SUFFIX_PATTERN);
+    const descriptionKeepsContext = contextSuffix !== null &&
+        new RegExp(`\\b${contextSuffix[1]}\\s+context\\b`, "i").test(model.description);
+    const withoutContext = model.displayName.replace(DISPLAY_CONTEXT_SUFFIX_PATTERN, "");
+    if (/\b\d+(?:\.\d+)?\b/.test(withoutContext)) {
+        return descriptionKeepsContext ? withoutContext : model.displayName;
+    }
+    if (descriptionKeepsContext || contextSuffix === null)
+        return `${withoutContext} ${version}`;
+    // Keep the suffix in its original spelling and insert the version before it.
+    return `${withoutContext} ${version}${contextSuffix[0]}`;
+}
+function tokenizeModelPreference(model) {
+    const lower = model.trim().toLowerCase();
+    const contextHint = lower.match(MODEL_CONTEXT_HINT_PATTERN)?.[1]?.toLowerCase();
+    const tokens = lower
+        .replace(MODEL_CONTEXT_HINT_PATTERN, " $1 ")
+        .split(/[^a-z0-9]+/)
+        .filter(Boolean)
+        .map((token) => {
+        if (token === "opusplan")
+            return "opus";
+        if (token === "best" || token === "default")
+            return "";
+        return token;
+    })
+        .filter((token) => token && token !== "claude")
+        .filter((token) => /[a-z]/.test(token) || token.endsWith("m"));
+    return { tokens, contextHint };
+}
+function scoreModelMatch(model, tokens, contextHint) {
+    const haystack = `${model.value} ${model.displayName}`.toLowerCase();
+    let score = 0;
+    let nonHintMatched = false;
+    for (const token of tokens) {
+        if (!haystack.includes(token))
+            continue;
+        if (token !== contextHint)
+            nonHintMatched = true;
+        score += token === contextHint ? 3 : 1;
+    }
+    return contextHint && !nonHintMatched ? 0 : score;
+}
+export function resolveModelPreference(models, preference) {
+    const trimmed = preference.trim();
+    if (!trimmed)
+        return null;
+    const lower = trimmed.toLowerCase();
+    const canonicalPreference = canonicalizeModelId(trimmed);
+    const directMatch = models.find((model) => model.value === trimmed ||
+        canonicalizeModelId(model.value) === canonicalPreference ||
+        model.displayName.toLowerCase() === lower);
+    if (directMatch)
+        return directMatch;
+    const matchesResolved = (model) => model.resolvedModel != null && canonicalizeModelId(model.resolvedModel) === canonicalPreference;
+    const resolvedMatch = models.find((model) => model.value !== "default" && matchesResolved(model)) ??
+        models.find(matchesResolved);
+    if (resolvedMatch)
+        return resolvedMatch;
+    const preferenceHint = contextHintOf(trimmed);
+    const includesMatch = models.find((model) => {
+        if (!modelVersionsCompatible(trimmed, model))
+            return false;
+        if (contextHintOf(model.value) !== preferenceHint)
+            return false;
+        const value = model.value.toLowerCase();
+        const display = model.displayName.toLowerCase();
+        return value.includes(lower) || display.includes(lower) || lower.includes(value);
+    });
+    if (includesMatch)
+        return includesMatch;
+    const { tokens, contextHint } = tokenizeModelPreference(trimmed);
+    if (tokens.length === 0)
+        return null;
+    let bestMatch = null;
+    let bestScore = 0;
+    for (const model of models) {
+        if (!modelVersionsCompatible(trimmed, model))
+            continue;
+        const score = scoreModelMatch(model, tokens, contextHint);
+        if (score > 0 && (!bestMatch || score > bestScore)) {
+            bestMatch = model;
+            bestScore = score;
+        }
+    }
+    return bestMatch;
+}
+export function matchResumedModel(models, liveModel) {
+    const live = canonicalizeModelId(liveModel);
+    const defaultEntry = models.find((model) => model.value === "default");
+    const defaultResolved = defaultEntry?.resolvedModel
+        ? canonicalizeModelId(defaultEntry.resolvedModel)
+        : undefined;
+    if (defaultEntry && defaultResolved === live)
+        return defaultEntry;
+    const exactMatch = models.find((model) => model.resolvedModel && canonicalizeModelId(model.resolvedModel) === live);
+    if (exactMatch)
+        return exactMatch;
+    if (defaultEntry &&
+        defaultResolved &&
+        stripContextHints(defaultResolved) === stripContextHints(live)) {
+        return defaultEntry;
+    }
+    return (resolveModelPreference(models, liveModel) ?? {
+        value: liveModel,
+        displayName: liveModel,
+        description: "",
+    });
+}
+export function buildModelConfigOption(models, modelInfos, useRecommendedValue) {
+    const defaultInfo = modelInfos.find((model) => model.value === "default");
+    const selectableIds = new Set(models.availableModels.map((model) => model.modelId));
+    const concreteInfos = modelInfos.filter((model) => model.value !== "default" && selectableIds.has(model.value));
+    // Recommendations describe the running default, so fuzzy family matching
+    // must never substitute a different generation or context window.
+    const defaultResolved = defaultInfo?.resolvedModel;
+    const recommended = defaultResolved
+        ? (concreteInfos.find((model) => canonicalizeModelId(model.resolvedModel ?? model.value) ===
+            canonicalizeModelId(defaultResolved)) ?? null)
+        : null;
+    const concreteRecommendation = useRecommendedValue && recommended !== null;
+    const available = concreteRecommendation
+        ? models.availableModels.filter((model) => model.modelId !== "default")
+        : models.availableModels;
+    return {
+        id: MODEL_CONFIG_ID,
+        name: "Model",
+        description: "AI model to use",
+        category: "model",
+        type: "select",
+        currentValue: concreteRecommendation && models.currentModelId === "default"
+            ? recommended.value
+            : models.currentModelId,
+        ...(concreteRecommendation
+            ? {
+                _meta: withAirMeta(undefined, AIR_RECOMMENDED_CONFIG_VALUE_CAPABILITY, recommended.value),
+            }
+            : {}),
+        options: available.map((model) => {
+            if (model.modelId === "default" && defaultInfo?.resolvedModel) {
+                const named = modelInfos.find((info) => info.value !== "default" && info.resolvedModel === defaultInfo.resolvedModel);
+                return {
+                    value: model.modelId,
+                    name: model.name,
+                    description: named?.displayName ?? defaultInfo.resolvedModel,
+                };
+            }
+            return {
+                value: model.modelId,
+                name: model.name,
+                description: model.description ?? undefined,
+            };
+        }),
+    };
+}
+function resolveSettingsModel(models, settingsModel, logger) {
+    if (settingsModel === undefined) {
+        return null;
+    }
+    if (typeof settingsModel !== "string") {
+        const typeLabel = settingsModel === null ? "null" : typeof settingsModel;
+        logger.error(`Ignoring model from settings: expected a string, got ${typeLabel}.`);
+        return null;
+    }
+    return resolveModelPreference(models, settingsModel);
+}
+/**
+ * Restrict the SDK's model list to the user's `availableModels` allowlist
+ * (already merged-and-deduped across settings sources by `SettingsManager`).
+ * The user's exact entries become the model IDs surfaced via configOptions
+ * and passed to `setModel`, which prevents Claude Code from silently
+ * substituting a date-pinned variant (e.g. `haiku` →
+ * `claude-haiku-4-5-20251001`) that the user may not have access to.
+ *
+ * Display info and capability flags are copied from the closest SDK match so
+ * the UI still renders sensible names and effort levels.
+ *
+ * Semantics from https://code.claude.com/docs/en/model-config#restrict-model-selection:
+ * - `undefined` is handled by the caller (no allowlist applied).
+ * - The Default option is unaffected by `availableModels` — it always remains
+ *   available, even when the allowlist is `[]`.
+ */
+export function applyAvailableModelsAllowlist(sdkModels, allowlist, settingsModelOverrides) {
+    // Default is always preserved per the docs. Synthesize one if the SDK
+    // didn't surface it so downstream code (e.g. `getAvailableModels` picking
+    // `models[0]` as a fallback) still has something to work with.
+    const defaultModel = sdkModels.find((m) => m.value === "default") ?? {
+        value: "default",
+        displayName: "Default",
+        description: "",
+    };
+    const result = [defaultModel];
+    const seen = new Set([defaultModel.value]);
+    const sdkModelsWithoutDefault = sdkModels.filter((m) => m.value !== "default");
+    // Bedrock/Vertex deployments enforce short aliases (e.g. "claude-opus-4-6")
+    // in availableModels but require provider-specific IDs at the API. We still
+    // resolve `sdkMatch` against the alias (`trimmed`) — that's what the
+    // matching heuristics above are built for, and override targets (ARNs,
+    // opaque provider IDs) often won't textually resemble anything in
+    // `sdkModelsWithoutDefault`. Only the entry's surfaced `value` becomes the
+    // override target, so it's what `setModel` ends up passing to the API.
+    for (const entry of allowlist) {
+        const trimmed = entry.trim();
+        if (!trimmed || seen.has(trimmed))
+            continue;
+        const overridden = settingsModelOverrides?.[trimmed];
+        const effective = overridden ?? trimmed;
+        if (seen.has(effective))
+            continue;
+        const sdkMatch = resolveModelPreference(sdkModelsWithoutDefault, trimmed);
+        if (sdkMatch) {
+            result.push({ ...sdkMatch, value: effective });
+        }
+        else {
+            result.push({ value: effective, displayName: trimmed, description: "" });
+        }
+        seen.add(effective);
+    }
+    // The custom model option (ANTHROPIC_CUSTOM_MODEL_OPTION) is exempt from the
+    // allowlist, the same way Default is. Per the model-config docs it adds an
+    // entry "without replacing the built-in aliases" and "appears at the bottom of
+    // the /model picker", so we append it last and skip the allowlist filter; this
+    // keeps a slim alias allowlist from hiding the custom model row.
+    // https://code.claude.com/docs/en/model-config#add-a-custom-model-option
+    const customModelOption = process.env.ANTHROPIC_CUSTOM_MODEL_OPTION?.trim();
+    if (customModelOption && !seen.has(customModelOption)) {
+        const customModel = sdkModels.find((m) => m.value === customModelOption);
+        if (customModel) {
+            result.push(customModel);
+            seen.add(customModel.value);
+        }
+    }
+    return result;
+}
+/** 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:
+ *  <reason>"); a format change makes this stop matching and the failure
+ *  falls back to the ordinary fail-loud path, no worse than before. */
+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) {
+    const settings = settingsManager.getSettings();
+    let currentModel = models[0];
+    let resolvedFromInput;
+    // Model priority (highest to lowest):
+    // 1. ANTHROPIC_MODEL environment variable
+    // 2. settings.model (user configuration)
+    // 3. the resumed session's live model (resumed sessions only)
+    // 4. models[0] (default first model)
+    if (process.env.ANTHROPIC_MODEL) {
+        const match = resolveModelPreference(models, process.env.ANTHROPIC_MODEL);
+        if (match) {
+            currentModel = match;
+            resolvedFromInput = process.env.ANTHROPIC_MODEL;
+        }
+    }
+    else if (typeof settings.model === "string") {
+        const match = resolveSettingsModel(models, settings.model, logger);
+        if (match) {
+            currentModel = match;
+            resolvedFromInput = settings.model;
+        }
+    }
+    // A resumed session restores the model from its last real assistant
+    // transcript record. Use that same local record instead of getContextUsage:
+    // the latter is a control request to the live CLI process and can add tens
+    // of seconds to session/load before its first turn. No `setModel` here: the
+    // SDK is already running this model, and pushing a picker alias back (e.g.
+    // "opus[1m]") could change the live model rather than describe it.
+    if (resolvedFromInput === undefined && isResumedSession) {
+        currentModel = resumedModelHint ? matchResumedModel(models, resumedModelHint) : currentModel;
+    }
+    // Skip the setModel round-trip when we can prove the SDK has already landed
+    // on the same model. Two cases qualify:
+    //  (a) No override applied — currentModel is the SDK's own default (or, on
+    //      resume, the live model read back from the SDK above); nothing to sync.
+    //  (b) The resolver returned the user's input verbatim AND that value exists
+    //      in the SDK's original model list — meaning no fuzzy match or
+    //      allowlist rewrite was involved, and the SDK (which reads the same
+    //      ANTHROPIC_MODEL / settings.json) will have arrived at the same entry.
+    //      This only holds for fresh sessions: a resumed session lands on the
+    //      transcript's model regardless of env/settings, so the override must
+    //      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.
+    const sdkSawSameValue = sdkModels.some((m) => m.value === currentModel.value);
+    const skipSetModel = resolvedFromInput === undefined ||
+        (!isResumedSession && currentModel.value === resolvedFromInput && sdkSawSameValue);
+    if (!skipSetModel) {
+        const setModelStartedAt = performance.now();
+        try {
+            await query.setModel(currentModel.value);
+            logger.log(`[session/models] sessionId=${sessionId} phase=set-model durationMs=${Math.round(performance.now() - setModelStartedAt)} model=${currentModel.value} outcome=success`);
+        }
+        catch (error) {
+            logger.log(`[session/models] sessionId=${sessionId} phase=set-model durationMs=${Math.round(performance.now() - setModelStartedAt)} model=${currentModel.value} outcome=error`);
+            // On a fresh session the pin is a defining option — fail loudly. A
+            // resumed session already runs fine on the transcript's model, so
+            // failing the whole session/load over the re-assert would be worse
+            // than loading with the pin unapplied (mirrors the setPermissionMode
+            // containment in createSession). The SDK then stayed on the
+            // transcript's model, so read that back rather than reporting the
+            // pin the session isn't running.
+            //
+            // One fresh-session failure is advisory, not defining: a
+            // user-configured PreModelSwitch hook can veto the pin (CLI 2.1.251+;
+            // 'deny', or 'ask' — which headless sessions refuse), and the SDK
+            // rejects setModel with "Model switch blocked by a PreModelSwitch
+            // hook: …". Terminal Claude Code never lets a hook veto its startup
+            // model (the spawn model isn't a switch), so failing session/new here
+            // would make the same hook config fatal only over ACP. The session
+            // stays on the SDK's own default — report that. We can't read the
+            // 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))
+                    throw error;
+                logger.error(`Model pin "${currentModel.value}" was vetoed by a PreModelSwitch hook; staying on the default model:`, error);
+                currentModel = models[0];
+            }
+            else {
+                logger.error(`Failed to re-assert model "${currentModel.value}" on resume:`, error);
+                currentModel = resumedModelHint ? matchResumedModel(models, resumedModelHint) : models[0];
+            }
+        }
+    }
+    const displayNames = models.map(versionedModelDisplayName);
+    const displayNameCounts = new Map();
+    for (const name of displayNames) {
+        displayNameCounts.set(name, (displayNameCounts.get(name) ?? 0) + 1);
+    }
+    return {
+        availableModels: models.map((model, index) => ({
+            modelId: model.value,
+            name: displayNameCounts.get(displayNames[index]) === 1 ? displayNames[index] : model.displayName,
+            description: model.description,
+        })),
+        currentModelId: currentModel.value,
+    };
+}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.75.2-preview.1",
+  "version": "0.75.2-preview.2",
   "description": "An ACP-compatible coding agent powered by the Claude Agent SDK (TypeScript)",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",