fix(acp): offer models from the harness credential file

The model selector used its own credential checks and always read the default OAuth file, so under `codework acp --home <dir>` it could hide a provider the agent can call. It now uses ModelCatalog.available. Adds an E2E test for the selector's providers and for the settings model block setting a new session's model and thinking level. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
sanchitrk · Sep 30, 2026 · Sep 24, 2026 · Sep 25, 2026 · Sep 26, 2026 · Sep 26, 2026
commit 2d11b1a596a9219095c4e6d0f9617725f32c7bca
diff --git a/packages/codework/src/acp/config.ts b/packages/codework/src/acp/config.ts
@@ -1,7 +1,5 @@
 import type * as Acp from "@codeworksh/acp/schema-v1";
 import { Model } from "@codeworksh/aikit";
-import { JsonGitHubCopilotAuthStorage } from "@codeworksh/aikit/oauth/github/copilot";
-import { JsonOpenAICodexAuthStorage } from "@codeworksh/aikit/oauth/openai/codex";
 import { ModelCatalog } from "@codeworksh/harness/effect";
 import { Effect, Option } from "effect";
 
@@ -34,47 +32,16 @@ export const parseModel = (value: string): Option.Option<{ readonly provider: st
 	return Option.some({ provider: value.slice(0, slash), id: value.slice(slash + 1) });
 };
 
-const loggedIn = (provider: string, token: () => Promise<{ readonly access?: string } | undefined>) =>
-	Effect.tryPromise(token).pipe(
-		Effect.map((stored) => (stored?.access ? [provider] : [])),
-		Effect.orElseSucceed(() => []),
-	);
-
-const oauthProviders = Effect.map(
-	Effect.all(
-		[
-			loggedIn("openai-codex", () => new JsonOpenAICodexAuthStorage({}).get()),
-			loggedIn("github-copilot", () => new JsonGitHubCopilotAuthStorage({}).get()),
-		],
-		{ concurrency: "unbounded" },
-	),
-	(providers) => providers.flat(),
-);
-
-/**
- * Providers with credentials: an API key in the environment or an OAuth login.
- * A harness "usable models" query replaces this (COD-83).
- */
-const usableProviders = (catalog: Model.BuiltInModels) =>
-	Effect.map(oauthProviders, (oauth) => {
-		const withKeys = Object.entries(catalog).flatMap(([provider, models]) => {
-			const env = Object.values(models ?? {})[0]?.provider.env ?? [];
-			// oxlint-disable-next-line effecttsgo/process-env
-			return env.some((name) => Boolean(process.env[name])) ? [provider] : [];
-		});
-		return new Set([...withKeys, ...oauth]);
-	});
-
 /** The `model` and `thought_level` selectors for a session's current selection. */
 export const options = Effect.fn("ACP.config.options")(function* (selection: Selection) {
 	const catalog = yield* ModelCatalog.models.pipe(Effect.orElseSucceed((): Model.BuiltInModels => ({})));
-	const providers = yield* usableProviders(catalog);
-	providers.add(selection.provider);
+	// Providers the harness has credentials for; the current model stays selectable even if not.
+	const providers = yield* ModelCatalog.available().pipe(Effect.orElseSucceed(() => []));
 
 	const current = `${selection.provider}/${selection.id}`;
-	const models = [...providers].flatMap((provider) =>
-		Object.entries(catalog[provider] ?? {}).map(([id, info]) => ({
-			value: `${provider}/${id}`,
+	const models = providers.flatMap((provider) =>
+		Object.entries(provider.models).map(([id, info]) => ({
+			value: `${provider.id}/${id}`,
 			name: `${info.provider.name}: ${info.name}`,
 		})),
 	);

diff --git a/packages/codework/test/__artifacts__/acp.models.json b/packages/codework/test/__artifacts__/acp.models.json
@@ -0,0 +1,19 @@
+{
+	"project": {
+		"current": "openrouter/anthropic/claude-haiku-4.5",
+		"providers": [
+			"github-copilot",
+			"openrouter"
+		],
+		"thinking": "low"
+	},
+	"withoutProjectSettings": {
+		"current": "openai/gpt-5.6-luna",
+		"providers": [
+			"github-copilot",
+			"openai",
+			"openrouter"
+		],
+		"thinking": "high"
+	}
+}
diff --git a/packages/codework/test/acp.test.ts b/packages/codework/test/acp.test.ts
@@ -4,7 +4,7 @@ import type * as AcpError from "@codeworksh/acp/errors";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { Effect, Exit, Fiber, Queue, type Scope } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -19,6 +19,27 @@ type Client = AcpClient.AcpClient["Service"];
 type Update = Parameters<Parameters<Client["handleSessionUpdate"]>[0]>[0]["update"];
 
 const temps: string[] = [];
+/** An environment with `undefined` entries removed, so an override can unset a variable. */
+const environment = (env: Record<string, string | undefined>): Record<string, string> =>
+	Object.fromEntries(Object.entries(env).flatMap(([name, value]) => (value === undefined ? [] : [[name, value]])));
+
+/**
+ * Every API key variable the catalog names, unset. A case that asserts which providers have
+ * credentials starts from this, so the developer's own keys can't change the answer.
+ */
+const withoutProviderKeys = (): Record<string, undefined> => {
+	const catalog: Record<string, Record<string, { provider: { env?: string[]; key?: string } }>> = JSON.parse(
+		readFileSync(models, "utf8"),
+	);
+	const names = Object.values(catalog).flatMap((entries) =>
+		Object.values(entries).flatMap(({ provider }) => [
+			...(provider.env ?? []),
+			...(provider.key ? [provider.key] : []),
+		]),
+	);
+	return Object.fromEntries(names.map((name) => [name, undefined]));
+};
+
 const workspace = () => {
 	const home = mkdtempSync(join(tmpdir(), "codework-acp-"));
 	temps.push(home);
@@ -35,14 +56,14 @@ const workspace = () => {
 const withAgent = <A, E>(
 	home: string,
 	body: (acp: Client, updates: Queue.Queue<Update>) => Effect.Effect<A, E>,
-	env: Record<string, string> = {},
+	env: Record<string, string | undefined> = {},
 ) =>
 	Effect.gen(function* () {
 		const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 		const handle = yield* spawner.spawn(
 			ChildProcess.make(process.execPath, ["--conditions=development", cli, "--home", home, "acp"], {
 				cwd: home,
-				env: { ...process.env, HOME: home, CODEWORK_MODELS_FILE: models, ...env },
+				env: environment({ ...process.env, HOME: home, CODEWORK_MODELS_FILE: models, ...env }),
 			}),
 		);
 		return yield* Effect.gen(function* () {
@@ -145,6 +166,56 @@ describe("codework acp", () => {
 		);
 	});
 
+	it("offers the models its credentials reach, and starts from the project's model", () => {
+		const { home, project } = workspace();
+		// A Copilot login in the home's own credential file: `--home` must be where it is looked for.
+		mkdirSync(join(home, "aikit"));
+		writeFileSync(
+			join(home, "aikit", "auth.json"),
+			artifact({ "github-copilot": { access: "test-access", refresh: "test-refresh", expires: 4_102_444_800_000 } }),
+		);
+		// The project's settings pick the model and thinking level every new session starts with.
+		mkdirSync(join(project, ".codework"));
+		writeFileSync(
+			join(project, ".codework", "settings.jsonc"),
+			artifact({ model: { provider: "openrouter", id: "anthropic/claude-haiku-4.5", thinkingLevel: "low" } }),
+		);
+		const elsewhere = join(home, "elsewhere");
+		mkdirSync(elsewhere);
+		return run(
+			withAgent(
+				home,
+				(acp) =>
+					Effect.gen(function* () {
+						const selector = (
+							options: ReadonlyArray<{ id: string; currentValue: unknown; options?: unknown }>,
+						) => {
+							const model = options.find((option) => option.id === "model");
+							const values = (model?.options ?? []) as ReadonlyArray<{ value: string }>;
+							return {
+								current: model?.currentValue,
+								providers: [...new Set(values.map((option) => option.value.split("/")[0] ?? ""))].sort((a, b) =>
+									a.localeCompare(b),
+								),
+								thinking: options.find((option) => option.id === "thought_level")?.currentValue,
+							};
+						};
+						const inProject = yield* acp.agent.createSession({ cwd: project, mcpServers: [] });
+						const outside = yield* acp.agent.createSession({ cwd: elsewhere, mcpServers: [] });
+						yield* Effect.promise(() =>
+							expect(
+								artifact({
+									project: selector(inProject.configOptions ?? []),
+									withoutProjectSettings: selector(outside.configOptions ?? []),
+								}),
+							).toMatchFileSnapshot("./__artifacts__/acp.models.json"),
+						);
+					}),
+				{ ...withoutProviderKeys(), OPENROUTER_API_KEY: "sk-or-test" },
+			),
+		);
+	});
+
 	it.skipIf(!process.env.OPENROUTER_API_KEY)(
 		"streams, runs tools, cancels, fails and replays turns against OpenRouter",
 		() => {