@llm4ts/core 3.2.6 → 3.4.0

package/dist/providers/PiConnector.js

@@ -2,8 +2,9 @@ import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
 import { makeCliConnector } from "../Connector.js";
 import { InvalidRequestError, ProviderError } from "../Errors.js";
-import { ConnectorCapabilities, ConnectorIds, LlmChunk, TokenUsage } from "../Models.js";
+import { ConnectorCapabilities, ConnectorIds, LlmChunk, TokenUsage, cliExecutable } from "../Models.js";
 import { atLeastVersion, effortWord, cumulativeUsage, failClassifiedCliError, jsonBooleanField, jsonField, jsonIntField, jsonStringField, optionalModelArgs, parseJsonLine, parseJsonOutput, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk, versionTriple, statusChunk } from "./CliSupport.js";
+const executable = cliExecutable("Pi");
 /**
  * `pi auth check --model <model> --no-refresh --json` says whether pi holds
  * credentials for the provider that model resolves to:
@@ -189,7 +190,7 @@ export const makePiConnector = (config, executor) => {
     let floorChecked = !config.readOnly;
     const checkFloorOnce = Effect.suspend(() => floorChecked
         ? Effect.void
-        : Effect.flatMap(executor.run(["pi", "--version"], cwd, config.envVars), (result) => {
+        : Effect.flatMap(executor.run([executable, "--version"], cwd, config.envVars), (result) => {
             const problem = piReadOnlyProblem([...result.stdout, ...result.stderr].join("\n"));
             return problem === undefined
                 ? Effect.sync(() => {
@@ -199,7 +200,7 @@ export const makePiConnector = (config, executor) => {
         }));
     const complete = Effect.fn("@llm4ts/core/providers/PiConnector.complete")(function* (prompt) {
         yield* checkFloorOnce;
-        const result = yield* executor.runWithStdin(["pi", "-p", ...extraArgs], cwd, config.envVars, prompt);
+        const result = yield* executor.runWithStdin([executable, "-p", ...extraArgs], cwd, config.envVars, prompt);
         if (result.exitCode !== 0) {
             // pi explains a refusal on stderr (a usage error, a missing model, an
             // auth failure); stdout is empty then, so both streams are reported.
@@ -212,7 +213,7 @@ export const makePiConnector = (config, executor) => {
         }
         return result.stdout.join("\n");
     });
-    const completeStream = (prompt) => Stream.fromEffect(checkFloorOnce).pipe(Stream.drain, Stream.concat(executor.runStreamingWithStdin(["pi", "-p", "--mode", "json", ...extraArgs], cwd, config.envVars, prompt)), Stream.flatMap((line) => Stream.fromIterable(parsePiStreamLine(line))), 
+    const completeStream = (prompt) => Stream.fromEffect(checkFloorOnce).pipe(Stream.drain, Stream.concat(executor.runStreamingWithStdin([executable, "-p", "--mode", "json", ...extraArgs], cwd, config.envVars, prompt)), Stream.flatMap((line) => Stream.fromIterable(parsePiStreamLine(line))), 
     // pi reports usage per assistant message; a turn is all of them.
     cumulativeUsage, Stream.mapEffect((chunk) => {
         const message = chunk.metadata.piError;
@@ -236,13 +237,13 @@ export const makePiConnector = (config, executor) => {
         }),
         // `--` ends the options (pi >= 0.84.3): a prompt starting with a dash
         // is a prompt, not a flag. Stdin paths need no separator.
-        buildArgv: (prompt, _context) => ["pi", "-p", ...extraArgs, "--", prompt],
-        buildInteractiveArgv: (_context) => ["pi", ...extraArgs],
+        buildArgv: (prompt, _context) => [executable, "-p", ...extraArgs, "--", prompt],
+        buildInteractiveArgv: (_context) => [executable, ...extraArgs],
         complete,
         completeStream,
         versionProbe: {
             executor,
-            binary: "pi",
+            binary: executable,
             cwd,
             ...(config.model === undefined ? {} : { authProbe: piAuthProbe(config.model) })
         }

package/dist/providers/PiConnector.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llm4ts/core",
-  "version": "3.2.6",
+  "version": "3.4.0",
   "description": "Effect-native LLM contracts, providers, evaluation, and observability",
   "license": "MIT",
   "type": "module",

package/src/ConnectorConfig.ts

@@ -1,7 +1,16 @@
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Schema from "effect/Schema"
-import { ConnectorId, ConnectorIds, Effort, LlmConfig, type LlmProvider } from "./Models.ts"
+import {
+  ConnectorId,
+  ConnectorIds,
+  Effort,
+  LlmConfig,
+  connectorRow,
+  type CliConnectorName,
+  type ConnectorName,
+  type LlmProvider
+} from "./Models.ts"
 
 export class DockerSandbox extends Schema.TaggedClass<DockerSandbox>()("Docker", {
   image: Schema.String,
@@ -107,23 +116,15 @@ export class CliConnectorConfig extends Schema.TaggedClass<CliConnectorConfig>()
 export const ConnectorConfig = Schema.Union([ApiConnectorConfig, CliConnectorConfig])
 export type ConnectorConfig = typeof ConnectorConfig.Type
 
+/** The config class the connector named `K` takes, by its kind in `connectorTable`. */
+export type ConnectorConfigOf<K extends ConnectorName> = K extends CliConnectorName
+  ? CliConnectorConfig
+  : ApiConnectorConfig
+
+// An id that names no API connector reads as OpenAI, the wire most servers speak.
 const providerForConnector = (connectorId: ConnectorId): LlmProvider => {
-  switch (connectorId.value) {
-    case "anthropic":
-      return "Anthropic"
-    case "gemini-api":
-      return "GeminiApi"
-    case "lm-studio":
-      return "LmStudio"
-    case "ollama":
-      return "Ollama"
-    case "mlx-lm":
-      return "MlxLm"
-    case "mock":
-      return "Mock"
-    default:
-      return "OpenAI"
-  }
+  const row = connectorRow(connectorId)
+  return row?.kind === "Api" ? (row.provider ?? "OpenAI") : "OpenAI"
 }
 
 export const toLlmConfig = (config: ApiConnectorConfig): LlmConfig =>

package/src/Models.ts

@@ -1,5 +1,6 @@
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
+import * as Record from "effect/Record"
 import * as Schema from "effect/Schema"
 
 export const LlmProvider = Schema.Literals([
@@ -19,119 +20,263 @@ export class ConnectorId extends Schema.Class<ConnectorId>("ConnectorId")({
   value: Schema.String
 }) {}
 
-export const ConnectorIds = Object.freeze({
-  OpenAI: new ConnectorId({ value: "openai" }),
-  Anthropic: new ConnectorId({ value: "anthropic" }),
-  GeminiApi: new ConnectorId({ value: "gemini-api" }),
-  LmStudio: new ConnectorId({ value: "lm-studio" }),
-  Ollama: new ConnectorId({ value: "ollama" }),
-  MlxLm: new ConnectorId({ value: "mlx-lm" }),
-  ClaudeCli: new ConnectorId({ value: "claude-cli" }),
-  GeminiCli: new ConnectorId({ value: "gemini-cli" }),
-  OpenCode: new ConnectorId({ value: "opencode" }),
-  Codex: new ConnectorId({ value: "codex" }),
-  Copilot: new ConnectorId({ value: "copilot" }),
-  Pi: new ConnectorId({ value: "pi" }),
-  AntigravityCli: new ConnectorId({ value: "antigravity-cli" }),
-  Grok: new ConnectorId({ value: "grok" }),
-  Cursor: new ConnectorId({ value: "cursor" }),
-  Mock: new ConnectorId({ value: "mock" })
-})
-
-export const apiConnectorIds: ReadonlyArray<ConnectorId> = Object.freeze([
-  ConnectorIds.OpenAI,
-  ConnectorIds.Anthropic,
-  ConnectorIds.GeminiApi,
-  ConnectorIds.LmStudio,
-  ConnectorIds.Ollama,
-  ConnectorIds.MlxLm
-])
+export const ConnectorKind = Schema.Literals(["Api", "Cli"])
+export type ConnectorKind = typeof ConnectorKind.Type
 
-export const cliConnectorIds: ReadonlyArray<ConnectorId> = Object.freeze([
-  ConnectorIds.ClaudeCli,
-  ConnectorIds.GeminiCli,
-  ConnectorIds.OpenCode,
-  ConnectorIds.Codex,
-  ConnectorIds.Copilot,
-  ConnectorIds.Pi,
-  ConnectorIds.AntigravityCli,
-  ConnectorIds.Grok,
-  ConnectorIds.Cursor
-])
+interface ConnectorIdentity {
+  readonly id: string
+  /** The `LlmConfig` provider it serves. Such a row sits under the provider's own name. */
+  readonly provider?: LlmProvider
+  readonly baseUrl?: string
+  /**
+   * What an operator may write for it: a coder name on a CLI row
+   * (`LLM4TS_CODER`, `LLM4TS_REASONER`), a provider name on an API row
+   * (`LLM4TS_PROVIDER`). The first is the one help and menus show. Empty
+   * means it is not offered under any name.
+   */
+  readonly names: ReadonlyArray<string>
+}
+
+export interface ApiConnectorRow extends ConnectorIdentity {
+  readonly kind: "Api"
+  /** Environment variables that may hold its key; the first one set wins. */
+  readonly credentialVariables: ReadonlyArray<string>
+  /** Answers without a backend, so it is no part of `apiConnectorIds`. */
+  readonly simulated?: true
+}
+
+export interface CliConnectorRow extends ConnectorIdentity {
+  readonly kind: "Cli"
+  /** The program it spawns, and the one looked for on `PATH`. */
+  readonly executable: string
+}
+
+export type ConnectorRow = ApiConnectorRow | CliConnectorRow
+
+/**
+ * Every connector's identity, one row each. The id lists, the provider
+ * mappings and the names an operator may write are all read from here; the
+ * factories (`providers/ConnectorFactories.ts`) and the runner's presets are
+ * records keyed by these names, so a row without either does not compile.
+ */
+export const connectorTable = {
+  OpenAI: {
+    id: "openai",
+    kind: "Api",
+    provider: "OpenAI",
+    baseUrl: "https://api.openai.com/v1",
+    credentialVariables: ["OPENAI_API_KEY"],
+    names: ["openai"]
+  },
+  Anthropic: {
+    id: "anthropic",
+    kind: "Api",
+    provider: "Anthropic",
+    baseUrl: "https://api.anthropic.com",
+    credentialVariables: ["ANTHROPIC_API_KEY"],
+    names: ["anthropic"]
+  },
+  GeminiApi: {
+    id: "gemini-api",
+    kind: "Api",
+    provider: "GeminiApi",
+    baseUrl: "https://generativelanguage.googleapis.com",
+    credentialVariables: ["GEMINI_API_KEY", "GOOGLE_API_KEY"],
+    names: ["gemini", "gemini-api"]
+  },
+  LmStudio: {
+    id: "lm-studio",
+    kind: "Api",
+    provider: "LmStudio",
+    baseUrl: "http://localhost:1234/v1",
+    credentialVariables: [],
+    names: ["lm-studio", "lmstudio"]
+  },
+  Ollama: {
+    id: "ollama",
+    kind: "Api",
+    provider: "Ollama",
+    baseUrl: "http://localhost:11434",
+    credentialVariables: [],
+    names: ["ollama"]
+  },
+  MlxLm: {
+    id: "mlx-lm",
+    kind: "Api",
+    provider: "MlxLm",
+    baseUrl: "http://localhost:8080",
+    credentialVariables: [],
+    names: ["mlx-lm", "mlxlm", "mlx"]
+  },
+  ClaudeCli: {
+    id: "claude-cli",
+    kind: "Cli",
+    executable: "claude",
+    names: ["claude", "claude-cli"]
+  },
+  GeminiCli: {
+    id: "gemini-cli",
+    kind: "Cli",
+    provider: "GeminiCli",
+    executable: "gemini",
+    names: ["gemini", "gemini-cli"]
+  },
+  OpenCode: {
+    id: "opencode",
+    kind: "Cli",
+    provider: "OpenCode",
+    baseUrl: "http://localhost:4096",
+    executable: "opencode",
+    names: ["opencode"]
+  },
+  Codex: { id: "codex", kind: "Cli", executable: "codex", names: ["codex"] },
+  Copilot: { id: "copilot", kind: "Cli", executable: "gh", names: [] },
+  Pi: { id: "pi", kind: "Cli", executable: "pi", names: ["pi"] },
+  AntigravityCli: {
+    id: "antigravity-cli",
+    kind: "Cli",
+    executable: "agy",
+    names: ["agy", "antigravity", "antigravity-cli"]
+  },
+  Grok: { id: "grok", kind: "Cli", executable: "grok", names: ["grok"] },
+  Cursor: { id: "cursor", kind: "Cli", executable: "cursor-agent", names: ["cursor"] },
+  Mock: {
+    id: "mock",
+    kind: "Api",
+    provider: "Mock",
+    credentialVariables: [],
+    simulated: true,
+    names: ["mock"]
+  }
+} as const satisfies Readonly<Record<string, ConnectorRow>>
+
+export type ConnectorName = keyof typeof connectorTable
+type RowOf<K extends ConnectorName> = (typeof connectorTable)[K]
+
+export type CliConnectorName = {
+  [K in ConnectorName]: RowOf<K>["kind"] extends "Cli" ? K : never
+}[ConnectorName]
+export type ApiConnectorName = Exclude<ConnectorName, CliConnectorName>
+
+/** Every name `LLM4TS_CODER` and `LLM4TS_REASONER` read. */
+export type CoderName = RowOf<CliConnectorName>["names"][number]
+/** Every name `LLM4TS_PROVIDER` and `LLM4TS_JUDGMENT_PROVIDER` read. */
+export type ApiProviderName = RowOf<ApiConnectorName>["names"][number]
+
+type OfferedCoder = {
+  [K in CliConnectorName]: RowOf<K>["names"] extends readonly [] ? never : K
+}[CliConnectorName]
+
+const rows: Readonly<Record<ConnectorName, ConnectorRow>> = connectorTable
+const providerRows: { readonly [P in LlmProvider]: ConnectorRow & { readonly provider: P } } =
+  connectorTable
+const names = Record.keys(connectorTable)
+
+export const isCliConnectorName = (name: ConnectorName): name is CliConnectorName =>
+  rows[name].kind === "Cli"
+
+export const ConnectorIds: Readonly<Record<ConnectorName, ConnectorId>> = Object.freeze(
+  Record.map(connectorTable, (row) => new ConnectorId({ value: row.id }))
+)
+
+const idsWhere = (keep: (row: ConnectorRow) => boolean): ReadonlyArray<ConnectorId> =>
+  Object.freeze(names.filter((name) => keep(rows[name])).map((name) => ConnectorIds[name]))
+
+export const apiConnectorIds: ReadonlyArray<ConnectorId> = idsWhere(
+  (row) => row.kind === "Api" && row.simulated !== true
+)
+
+export const cliConnectorIds: ReadonlyArray<ConnectorId> = idsWhere((row) => row.kind === "Cli")
 
 export const connectorIds: ReadonlyArray<ConnectorId> = Object.freeze([
   ...apiConnectorIds,
   ...cliConnectorIds,
-  ConnectorIds.Mock
+  ...idsWhere((row) => row.kind === "Api" && row.simulated === true)
 ])
 
-export const defaultBaseUrl = (provider: LlmProvider): string | undefined => {
-  switch (provider) {
-    case "GeminiCli":
-    case "Mock":
-      return undefined
-    case "GeminiApi":
-      return "https://generativelanguage.googleapis.com"
-    case "OpenAI":
-      return "https://api.openai.com/v1"
-    case "Anthropic":
-      return "https://api.anthropic.com"
-    case "LmStudio":
-      return "http://localhost:1234/v1"
-    case "Ollama":
-      return "http://localhost:11434"
-    case "MlxLm":
-      return "http://localhost:8080"
-    case "OpenCode":
-      return "http://localhost:4096"
-  }
-}
+const rowsById = new Map<string, ConnectorRow>(names.map((name) => [rows[name].id, rows[name]]))
 
-const connectorProviderTable: Readonly<Record<string, LlmProvider>> = {
-  openai: "OpenAI",
-  anthropic: "Anthropic",
-  "gemini-api": "GeminiApi",
-  "lm-studio": "LmStudio",
-  ollama: "Ollama",
-  "mlx-lm": "MlxLm",
-  opencode: "OpenCode",
-  "gemini-cli": "GeminiCli",
-  mock: "Mock"
-}
+export const connectorRow = (id: ConnectorId): ConnectorRow | undefined => rowsById.get(id.value)
+
+export const defaultBaseUrl = (provider: LlmProvider): string | undefined =>
+  providerRows[provider].baseUrl
 
 export const connectorProvider = (id: ConnectorId): LlmProvider | undefined =>
-  connectorProviderTable[id.value]
+  connectorRow(id)?.provider
 
-export const connectorDefaultBaseUrl = (id: ConnectorId): string | undefined => {
-  const provider = connectorProvider(id)
-  return provider === undefined ? undefined : defaultBaseUrl(provider)
-}
+export const connectorDefaultBaseUrl = (id: ConnectorId): string | undefined =>
+  connectorRow(id)?.baseUrl
 
-export const providerConnectorId = (provider: LlmProvider): ConnectorId => {
-  switch (provider) {
-    case "GeminiCli":
-      return ConnectorIds.GeminiCli
-    case "GeminiApi":
-      return ConnectorIds.GeminiApi
-    case "OpenAI":
-      return ConnectorIds.OpenAI
-    case "Anthropic":
-      return ConnectorIds.Anthropic
-    case "LmStudio":
-      return ConnectorIds.LmStudio
-    case "Ollama":
-      return ConnectorIds.Ollama
-    case "MlxLm":
-      return ConnectorIds.MlxLm
-    case "OpenCode":
-      return ConnectorIds.OpenCode
-    case "Mock":
-      return ConnectorIds.Mock
-  }
-}
+export const providerConnectorId = (provider: LlmProvider): ConnectorId => ConnectorIds[provider]
 
-export const ConnectorKind = Schema.Literals(["Api", "Cli"])
-export type ConnectorKind = typeof ConnectorKind.Type
+const namedConnectors = <K extends ConnectorName>(keys: ReadonlyArray<K>): ReadonlyMap<string, K> =>
+  new Map(keys.flatMap((key) => rows[key].names.map((name) => [name, key] as const)))
+
+const cliNames = names.filter(isCliConnectorName)
+const apiNames = names.filter((name) => !isCliConnectorName(name))
+const coderConnectors = namedConnectors(cliNames)
+const apiProviderConnectors = namedConnectors(apiNames)
+
+/** The CLI connector a coder name stands for; the name as written, lower case. */
+export const coderConnector = (name: string): CliConnectorName | undefined =>
+  coderConnectors.get(name)
+
+/** The API connector a provider name stands for; the name as written, lower case. */
+export const apiProviderConnector = (name: string): ApiConnectorName | undefined =>
+  apiProviderConnectors.get(name)
+
+export const coderNames: ReadonlyArray<CoderName> = cliNames.flatMap(
+  (name) => connectorTable[name].names
+)
+
+export const apiProviderNames: ReadonlyArray<ApiProviderName> = apiNames.flatMap(
+  (name) => connectorTable[name].names
+)
+
+/** Every variable an API connector reads its key from. Names only, never a value. */
+export const credentialVariables: ReadonlyArray<string> = apiNames.flatMap(
+  (name) => connectorTable[name].credentialVariables
+)
+
+export const cliExecutable = <K extends CliConnectorName>(name: K): RowOf<K>["executable"] =>
+  connectorTable[name].executable
+
+const inOrder =
+  <All extends string>() =>
+  <const L extends ReadonlyArray<All>>(
+    list: L,
+    ..._missing: [Exclude<All, L[number]>] extends [never] ? [] : [missing: Exclude<All, L[number]>]
+  ): L =>
+    list
+
+/** The coding agents help and menus offer, in the order they show them. */
+export const offeredCoders = inOrder<OfferedCoder>()([
+  "ClaudeCli",
+  "Codex",
+  "GeminiCli",
+  "Pi",
+  "AntigravityCli",
+  "Grok",
+  "Cursor",
+  "OpenCode"
+])
+
+/** The API providers help and errors offer, in the order they show them. */
+export const offeredApiProviders = inOrder<ApiConnectorName>()([
+  "Mock",
+  "OpenAI",
+  "Anthropic",
+  "GeminiApi",
+  "LmStudio",
+  "Ollama",
+  "MlxLm"
+])
+
+export const offeredCoderNames = offeredCoders.map((name) => connectorTable[name].names[0])
+
+export const offeredApiProviderNames = offeredApiProviders.map(
+  (name) => connectorTable[name].names[0]
+)
 
 export const MessageRole = Schema.Literals(["System", "User", "Assistant", "Tool"])
 export type MessageRole = typeof MessageRole.Type

package/src/eval/Eval.ts

@@ -1,7 +1,6 @@
 import * as Effect from "effect/Effect"
 import * as Schema from "effect/Schema"
 import type { LlmError } from "../Errors.ts"
-import type { Evaluator } from "./Evaluator.ts"
 
 export class Dimension extends Schema.Class<Dimension>("Dimension")({
   name: Schema.String,
@@ -87,6 +86,10 @@ export class RepeatedEval extends Schema.Class<RepeatedEval>("RepeatedEval")({
 const median = (sorted: ReadonlyArray<number>): number =>
   sorted.length === 0 ? 0 : (sorted[Math.floor((sorted.length - 1) / 2)] ?? 0)
 
+export interface Evaluator<in In> {
+  readonly evaluate: (input: In) => Effect.Effect<EvalResult, LlmError>
+}
+
 export const repeat = Effect.fn("@llm4ts/core/eval/Eval.repeat")(function* <In>(
   evaluator: Evaluator<In>,
   input: In,

package/src/eval/Evaluator.ts

@@ -1,10 +1,7 @@
 import * as Effect from "effect/Effect"
-import type { LlmError } from "../Errors.ts"
-import { EvalResult } from "./Eval.ts"
+import { EvalResult, type Evaluator } from "./Eval.ts"
 
-export interface Evaluator<in In> {
-  readonly evaluate: (input: In) => Effect.Effect<EvalResult, LlmError>
-}
+export type { Evaluator }
 
 export const makeEvaluator = <In>(evaluate: Evaluator<In>["evaluate"]): Evaluator<In> => ({
   evaluate

package/src/providers/AntigravityConnector.ts

@@ -2,10 +2,18 @@ import * as Effect from "effect/Effect"
 import * as Stream from "effect/Stream"
 import { makeCliConnector, type CliConnectorShape } from "../Connector.ts"
 import type { CliConnectorConfig } from "../ConnectorConfig.ts"
-import { ConnectorCapabilities, ConnectorIds, HealthStatus, LlmChunk } from "../Models.ts"
+import {
+  ConnectorCapabilities,
+  ConnectorIds,
+  HealthStatus,
+  LlmChunk,
+  cliExecutable
+} from "../Models.ts"
 import type { ProcessExecutorShape } from "../ProcessExecutor.ts"
 import { failClassifiedCliError, optionalModelArgs, sortedFlagArgs } from "./CliSupport.ts"
 
+const executable = cliExecutable("AntigravityCli")
+
 // `agy --version` proves the install, not the login: the CLI offers no offline
 // login check, so the auth status stays Unknown rather than claiming a session.
 const healthy = HealthStatus.make({
@@ -33,14 +41,14 @@ export const antigravityExtraArgs = (config: CliConnectorConfig): ReadonlyArray<
 export const buildAntigravityArgv = (
   config: CliConnectorConfig,
   prompt: string
-): ReadonlyArray<string> => ["agy", ...antigravityExtraArgs(config), "--print", prompt]
+): ReadonlyArray<string> => [executable, ...antigravityExtraArgs(config), "--print", prompt]
 
 export const makeAntigravityConnector = (
   config: CliConnectorConfig,
   executor: ProcessExecutorShape
 ): CliConnectorShape => {
   const cwd = config.workingDir ?? "."
-  const healthCheck = executor.run(["agy", "--version"], cwd, {}).pipe(
+  const healthCheck = executor.run([executable, "--version"], cwd, {}).pipe(
     Effect.map((result) => (result.exitCode === 0 ? healthy : unhealthy)),
     Effect.catch(() => Effect.succeed(unhealthy))
   )
@@ -75,7 +83,7 @@ export const makeAntigravityConnector = (
     // therefore cost summaries and budgets) cannot include it.
     capabilities: ConnectorCapabilities.make({ interactiveSessions: true, usageReporting: false }),
     buildArgv: (prompt, _context) => buildAntigravityArgv(config, prompt),
-    buildInteractiveArgv: (_context) => ["agy", ...antigravityExtraArgs(config)],
+    buildInteractiveArgv: (_context) => [executable, ...antigravityExtraArgs(config)],
     complete,
     completeStream,
     healthCheck

package/src/providers/ClaudeAgentSession.ts

@@ -16,7 +16,7 @@ import {
   type SessionEvent
 } from "../AgentSession.ts"
 import { ProviderError, type LlmError } from "../Errors.ts"
-import { TokenUsage } from "../Models.ts"
+import { TokenUsage, cliExecutable } from "../Models.ts"
 import type { ProcessExecutorShape } from "../ProcessExecutor.ts"
 import {
   jsonArray,
@@ -30,11 +30,13 @@ import {
   type JsonValue
 } from "./CliSupport.ts"
 
+const executable = cliExecutable("ClaudeCli")
+
 export const claudeSessionArgv = (
   model: string | undefined,
   extraFlags: ReadonlyArray<string>
 ): ReadonlyArray<string> => [
-  "claude",
+  executable,
   "--print",
   "--input-format",
   "stream-json",