Fix Claude adapter upgrade regressions

Author: charlesvien

apps/code/forge.config.ts

@@ -282,7 +282,7 @@ const config: ForgeConfig = {
         copyNativeDependency(watcherPkg, buildPath);
       } else if (process.platform === "linux") {
         const watcherPkg =
-          process.arch === "arm64"
+          targetArch === "arm64"
             ? "@parcel/watcher-linux-arm64-glibc"
             : "@parcel/watcher-linux-x64-glibc";
         copyNativeDependency(watcherPkg, buildPath);

apps/code/vite.main.config.mts

@@ -21,8 +21,10 @@ import { defineConfig, loadEnv, type Plugin } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 // @ts-expect-error - plain ESM helper shared with packages/agent/tsup.config.ts
 import {
+  CLAUDE_CLI_SUPPORT_DIRS,
+  CLAUDE_CLI_SUPPORT_FILES,
   claudeBinName,
-  nativeBinaryCandidates as sdkNativeBinaryCandidates,
+  claudeExecutableCandidates as sdkClaudeExecutableCandidates,
   targetArch,
   targetPlatform,
 } from "../../packages/agent/build/native-binary.mjs";
@@ -145,6 +147,24 @@ function signClaudeBinary(destPath: string): void {
   }
 }
 
+function copyClaudeSupportAssets(sourcePath: string, destDir: string): void {
+  const sourceDir = dirname(sourcePath);
+
+  for (const file of CLAUDE_CLI_SUPPORT_FILES) {
+    const source = join(sourceDir, file);
+    if (existsSync(source)) {
+      copyFileSync(source, join(destDir, file));
+    }
+  }
+
+  for (const dir of CLAUDE_CLI_SUPPORT_DIRS) {
+    const source = join(sourceDir, dir);
+    if (existsSync(source)) {
+      cpSync(source, join(destDir, dir), { recursive: true });
+    }
+  }
+}
+
 function copyClaudeExecutable(): Plugin {
   return {
     name: "copy-claude-executable",
@@ -170,8 +190,8 @@ function copyClaudeExecutable(): Plugin {
           binName,
         ),
         join(__dirname, "../../packages/agent/dist/claude-cli", binName),
-        ...sdkNativeBinaryCandidates(join(__dirname, "node_modules")),
-        ...sdkNativeBinaryCandidates(join(__dirname, "../../node_modules")),
+        ...sdkClaudeExecutableCandidates(join(__dirname, "node_modules")),
+        ...sdkClaudeExecutableCandidates(join(__dirname, "../../node_modules")),
       ];
 
       const source = packageCandidates.find((p: string) => existsSync(p));
@@ -187,6 +207,7 @@ function copyClaudeExecutable(): Plugin {
       if (targetPlatform() !== "win32") {
         execSync(`chmod +x "${destBinary}"`);
       }
+      copyClaudeSupportAssets(source, destDir);
       verifyBinaryArch(destBinary);
       signClaudeBinary(destBinary);
       claudeCliCopied = true;

packages/agent/build/native-binary.mjs

@@ -27,6 +27,15 @@ export function claudeBinName(platform = targetPlatform()) {
   return platform === "win32" ? "claude.exe" : "claude";
 }
 
+export const CLAUDE_CLI_SUPPORT_FILES = [
+  "package.json",
+  "manifest.json",
+  "manifest.zst.json",
+  "yoga.wasm",
+];
+
+export const CLAUDE_CLI_SUPPORT_DIRS = ["vendor"];
+
 /**
  * Detect whether the *current* Node was built against musl libc (not glibc).
  * Only meaningful when targetPlatform() === "linux" and we're running on
@@ -58,3 +67,20 @@ export function nativeBinaryCandidates(rootNodeModules) {
     join(rootNodeModules, `@anthropic-ai/claude-agent-sdk-${slug}`, binary),
   );
 }
+
+/**
+ * SDK 0.3.x is in the middle of transitioning from a monolithic `cli.js`
+ * package layout to platform-specific native executables. Keep the legacy
+ * entrypoint as a fallback until the optional native packages are universally
+ * available across our build environments.
+ */
+export function legacyCliCandidates(rootNodeModules) {
+  return [join(rootNodeModules, "@anthropic-ai/claude-agent-sdk", "cli.js")];
+}
+
+export function claudeExecutableCandidates(rootNodeModules) {
+  return [
+    ...nativeBinaryCandidates(rootNodeModules),
+    ...legacyCliCandidates(rootNodeModules),
+  ];
+}

packages/agent/src/adapters/claude/claude-agent.ts

@@ -100,6 +100,10 @@ import {
 import { canUseTool } from "./permissions/permission-handlers";
 import { getAvailableSlashCommands } from "./session/commands";
 import { parseMcpServers } from "./session/mcp-config";
+import {
+  applyAvailableModelsAllowlist,
+  resolveInitialModelId,
+} from "./session/model-config";
 import {
   DEFAULT_MODEL,
   getEffortOptions,
@@ -184,45 +188,6 @@ function shouldEmitRawMessage(
   );
 }
 
-/**
- * Restrict gateway model options to the user's `availableModels` allowlist
- * from settings.json. Unknown allowlist entries (e.g. retired model IDs like
- * `claude-opus-4-5` left in stale settings) are dropped: passing them through
- * would make setModel reject the resolved id and break session init. If every
- * entry is unknown we fall back to the gateway list as a safety net.
- */
-function applyAvailableModelsAllowlist(
-  modelOptions: {
-    currentModelId: string;
-    options: SessionConfigSelectOption[];
-  },
-  allowlist: string[],
-): { currentModelId: string; options: SessionConfigSelectOption[] } {
-  const filtered: SessionConfigSelectOption[] = [];
-  const seen = new Set<string>();
-
-  for (const entry of allowlist) {
-    const trimmed = entry.trim();
-    if (!trimmed || seen.has(trimmed)) continue;
-
-    const match = modelOptions.options.find((o) => o.value === trimmed);
-    if (match) {
-      filtered.push(match);
-      seen.add(trimmed);
-    }
-  }
-
-  if (filtered.length === 0) return modelOptions;
-
-  const currentModelId = filtered.some(
-    (o) => o.value === modelOptions.currentModelId,
-  )
-    ? modelOptions.currentModelId
-    : filtered[0].value;
-
-  return { currentModelId, options: filtered };
-}
-
 export interface ClaudeAcpAgentOptions {
   onProcessSpawned?: (info: ProcessSpawnedInfo) => void;
   onProcessExited?: (pid: number) => void;
@@ -1587,10 +1552,10 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
       }
     }
 
-    const settingsModel = settingsManager.getSettings().model;
-    const metaModel = meta?.model;
-    const resolvedModelId =
-      settingsModel || metaModel || modelOptions.currentModelId;
+    const resolvedModelId = resolveInitialModelId(modelOptions, [
+      settingsManager.getSettings().model,
+      meta?.model,
+    ]);
     session.modelId = resolvedModelId;
     session.lastContextWindowSize =
       this.getContextWindowForModel(resolvedModelId);

packages/agent/src/adapters/claude/session/model-config.test.ts

@@ -0,0 +1,60 @@
+import { describe, expect, it } from "vitest";
+import {
+  applyAvailableModelsAllowlist,
+  resolveInitialModelId,
+} from "./model-config";
+
+const rawModelOptions = {
+  currentModelId: "claude-opus-4-8",
+  options: [
+    { value: "claude-opus-4-8", name: "Claude Opus 4.8" },
+    { value: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
+  ],
+};
+
+describe("applyAvailableModelsAllowlist", () => {
+  it("falls back to the unfiltered gateway list when every allowlisted model is unknown", () => {
+    expect(
+      applyAvailableModelsAllowlist(rawModelOptions, ["claude-opus-4-5"]),
+    ).toEqual(rawModelOptions);
+  });
+
+  it("switches the current model when the previous one is filtered out", () => {
+    expect(
+      applyAvailableModelsAllowlist(rawModelOptions, ["claude-sonnet-4-6"]),
+    ).toEqual({
+      currentModelId: "claude-sonnet-4-6",
+      options: [{ value: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }],
+    });
+  });
+});
+
+describe("resolveInitialModelId", () => {
+  it("keeps a preferred model when it survives filtering", () => {
+    const filteredModelOptions = applyAvailableModelsAllowlist(
+      rawModelOptions,
+      ["claude-opus-4-8", "claude-sonnet-4-6"],
+    );
+
+    expect(
+      resolveInitialModelId(filteredModelOptions, [
+        "claude-opus-4-8",
+        "claude-sonnet-4-6",
+      ]),
+    ).toBe("claude-opus-4-8");
+  });
+
+  it("falls back to the filtered current model when the preferred one is disallowed", () => {
+    const filteredModelOptions = applyAvailableModelsAllowlist(
+      rawModelOptions,
+      ["claude-sonnet-4-6"],
+    );
+
+    expect(
+      resolveInitialModelId(filteredModelOptions, [
+        "claude-opus-4-8",
+        "claude-sonnet-4-6",
+      ]),
+    ).toBe("claude-sonnet-4-6");
+  });
+});

packages/agent/src/adapters/claude/session/model-config.ts

@@ -0,0 +1,56 @@
+import type { SessionConfigSelectOption } from "@agentclientprotocol/sdk";
+
+export interface ModelConfigOptions {
+  currentModelId: string;
+  options: SessionConfigSelectOption[];
+}
+
+/**
+ * Restrict gateway model options to the user's `availableModels` allowlist
+ * from settings.json. Unknown allowlist entries are dropped; if every entry
+ * is unknown we fall back to the gateway list as a safety net.
+ */
+export function applyAvailableModelsAllowlist(
+  modelOptions: ModelConfigOptions,
+  allowlist: string[],
+): ModelConfigOptions {
+  const filtered: SessionConfigSelectOption[] = [];
+  const seen = new Set<string>();
+
+  for (const entry of allowlist) {
+    const trimmed = entry.trim();
+    if (!trimmed || seen.has(trimmed)) continue;
+
+    const match = modelOptions.options.find((o) => o.value === trimmed);
+    if (match) {
+      filtered.push(match);
+      seen.add(trimmed);
+    }
+  }
+
+  if (filtered.length === 0) return modelOptions;
+
+  const currentModelId = filtered.some(
+    (o) => o.value === modelOptions.currentModelId,
+  )
+    ? modelOptions.currentModelId
+    : filtered[0].value;
+
+  return { currentModelId, options: filtered };
+}
+
+export function resolveInitialModelId(
+  modelOptions: ModelConfigOptions,
+  preferredModelIds: Array<string | undefined>,
+): string {
+  const allowedModelIds = new Set(modelOptions.options.map((opt) => opt.value));
+
+  for (const candidate of preferredModelIds) {
+    const trimmed = candidate?.trim();
+    if (trimmed && allowedModelIds.has(trimmed)) {
+      return trimmed;
+    }
+  }
+
+  return modelOptions.currentModelId;
+}

packages/agent/src/adapters/claude/session/settings.test.ts

@@ -4,7 +4,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { resolveMainRepoPath } from "./repo-path";
-import { SettingsManager } from "./settings";
+import { mergeAvailableModels, SettingsManager } from "./settings";
 
 function runGit(cwd: string, args: string[]): void {
   execFileSync("git", args, { cwd, stdio: ["ignore", "ignore", "pipe"] });
@@ -286,3 +286,25 @@ describe("availableModels merge", () => {
     expect(manager.getSettings().availableModels).toBeUndefined();
   });
 });
+
+describe("mergeAvailableModels", () => {
+  it("merges and dedupes non-enterprise layers", () => {
+    expect(
+      mergeAvailableModels(
+        ["model-a", "model-b"],
+        ["model-b", "model-c"],
+        "project",
+      ),
+    ).toEqual(["model-a", "model-b", "model-c"]);
+  });
+
+  it("lets enterprise settings replace lower-precedence allowlists", () => {
+    expect(
+      mergeAvailableModels(
+        ["model-a", "model-b"],
+        ["managed-a", "managed-a"],
+        "enterprise",
+      ),
+    ).toEqual(["managed-a"]);
+  });
+});