@llm4ts/runner 2.2.1 → 2.3.0

package/dist/Doctor.d.ts

@@ -22,5 +22,18 @@ export interface PrerequisiteReport {
  * environment is reported as a caveat rather than a failure.
  */
 export declare const geminiPrerequisites: (environment: Readonly<Record<string, string | undefined>>) => PrerequisiteReport;
-export declare const makeDoctorProgram: (registry?: ConnectorRegistryShape, environment?: Readonly<Record<string, string | undefined>>) => Effect.Effect<string>;
+export declare const defaultGeminiBridgePort = "8731";
+/**
+ * `~/.pi/agent/models.json` (ADR 0016). Read for reporting only — this file
+ * belongs to `pi`, outside llm4ts's package graph, and llm4ts never writes
+ * it. Missing is not an error here: the file simply doesn't exist yet.
+ */
+export declare const defaultReadPiModelsJson: () => string | undefined;
+/**
+ * Whether pi's custom-provider config points at this machine's Gemini ACP
+ * bridge — detect-and-report only, never auto-fixed (ADR 0016). `undefined`
+ * means the check doesn't apply: nothing asked for the bridge.
+ */
+export declare const geminiBridgePrerequisites: (environment: Readonly<Record<string, string | undefined>>, modelsJson: string | undefined) => PrerequisiteReport | undefined;
+export declare const makeDoctorProgram: (registry?: ConnectorRegistryShape, environment?: Readonly<Record<string, string | undefined>>, readPiModelsJson?: () => string | undefined) => Effect.Effect<string>;
 //# sourceMappingURL=Doctor.d.ts.map

package/dist/Doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Doctor.d.ts","sourceRoot":"","sources":["../src/Doctor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAuB5E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACvB;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,mBAAmB,GAC9B,aAAa,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,KACxD,kBA0BF,CAAA;AAwBD,eAAO,MAAM,iBAAiB,GAC5B,WAAU,sBAA8D,EACxE,cAAa,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,KACtE,MAAM,CAAC,MAAM,CAAC,MAAM,CAwCnB,CAAA"}
+{"version":3,"file":"Doctor.d.ts","sourceRoot":"","sources":["../src/Doctor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAuB5E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACvB;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,mBAAmB,GAC9B,aAAa,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,KACxD,kBA0BF,CAAA;AAwBD,eAAO,MAAM,uBAAuB,SAAS,CAAA;AAE7C;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,QAAO,MAAM,GAAG,SAMnD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GACpC,aAAa,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,EACzD,YAAY,MAAM,GAAG,SAAS,KAC7B,kBAAkB,GAAG,SAyBvB,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,WAAU,sBAA8D,EACxE,cAAa,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,EACvE,mBAAkB,MAAM,MAAM,GAAG,SAAmC,KACnE,MAAM,CAAC,MAAM,CAAC,MAAM,CAiDnB,CAAA"}

package/dist/Doctor.js

@@ -1,3 +1,6 @@
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
 import * as Effect from "effect/Effect";
 import { ConnectorIds } from "@llm4ts/core/Models";
 import { nodeFlowRunnerDependencies } from "./FlowRunner.js";
@@ -76,7 +79,51 @@ const wrap = (text, width, indent) => {
     return out;
 };
 const selectedCoder = (environment) => environment.LLM4TS_CODER ?? "claude (default)";
-export const makeDoctorProgram = (registry = nodeFlowRunnerDependencies().registry, environment = process.env) => Effect.map(registry.healthCheckAll, (statuses) => {
+export const defaultGeminiBridgePort = "8731";
+/**
+ * `~/.pi/agent/models.json` (ADR 0016). Read for reporting only — this file
+ * belongs to `pi`, outside llm4ts's package graph, and llm4ts never writes
+ * it. Missing is not an error here: the file simply doesn't exist yet.
+ */
+export const defaultReadPiModelsJson = () => {
+    try {
+        return readFileSync(join(homedir(), ".pi", "agent", "models.json"), "utf8");
+    }
+    catch {
+        return undefined;
+    }
+};
+/**
+ * Whether pi's custom-provider config points at this machine's Gemini ACP
+ * bridge — detect-and-report only, never auto-fixed (ADR 0016). `undefined`
+ * means the check doesn't apply: nothing asked for the bridge.
+ */
+export const geminiBridgePrerequisites = (environment, modelsJson) => {
+    if (!truthy(environment.LLM4TS_GEMINI_BRIDGE)) {
+        return undefined;
+    }
+    const port = isSet(environment.LLM4TS_GEMINI_BRIDGE_PORT)
+        ? environment.LLM4TS_GEMINI_BRIDGE_PORT.trim()
+        : defaultGeminiBridgePort;
+    const needle = `127.0.0.1:${port}`;
+    const hint = `add a custom provider to ~/.pi/agent/models.json with baseUrl ` +
+        `"http://${needle}" so pi draws inference from the gemini-cli bridge instead ` +
+        `of a model API key (ADR 0016) — llm4ts never writes this file for you.`;
+    if (modelsJson === undefined) {
+        return { satisfied: false, summary: "~/.pi/agent/models.json not found", hint };
+    }
+    return modelsJson.includes(needle)
+        ? {
+            satisfied: true,
+            summary: `a provider in ~/.pi/agent/models.json points at ${needle}`
+        }
+        : {
+            satisfied: false,
+            summary: `no provider in ~/.pi/agent/models.json points at ${needle}`,
+            hint
+        };
+};
+export const makeDoctorProgram = (registry = nodeFlowRunnerDependencies().registry, environment = process.env, readPiModelsJson = defaultReadPiModelsJson) => Effect.map(registry.healthCheckAll, (statuses) => {
     const lines = [];
     lines.push("llm4ts doctor");
     lines.push("");
@@ -97,13 +144,22 @@ export const makeDoctorProgram = (registry = nodeFlowRunnerDependencies().regist
     const coder = selectedCoder(environment);
     const geminiRelevant = coder.startsWith("gemini") ||
         Array.from(statuses.keys()).some((id) => id.value === ConnectorIds.GeminiCli.value || id.value === ConnectorIds.GeminiApi.value);
-    if (geminiRelevant) {
-        const gemini = geminiPrerequisites(environment);
+    const bridge = geminiBridgePrerequisites(environment, readPiModelsJson());
+    if (geminiRelevant || bridge !== undefined) {
         lines.push("");
         lines.push("prerequisites:");
-        lines.push(`  ${gemini.satisfied ? "✔" : "?"} gemini: ${gemini.summary}`);
-        if (gemini.hint !== undefined) {
-            lines.push(...wrap(gemini.hint, 78, "      "));
+        if (geminiRelevant) {
+            const gemini = geminiPrerequisites(environment);
+            lines.push(`  ${gemini.satisfied ? "✔" : "?"} gemini: ${gemini.summary}`);
+            if (gemini.hint !== undefined) {
+                lines.push(...wrap(gemini.hint, 78, "      "));
+            }
+        }
+        if (bridge !== undefined) {
+            lines.push(`  ${bridge.satisfied ? "✔" : "?"} pi-gemini-bridge: ${bridge.summary}`);
+            if (bridge.hint !== undefined) {
+                lines.push(...wrap(bridge.hint, 78, "      "));
+            }
         }
     }
     lines.push("");

package/dist/Doctor.js.map

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

package/dist/NodeGeminiAcpBridge.d.ts

@@ -0,0 +1,73 @@
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Ref from "effect/Ref";
+import type * as Scope from "effect/Scope";
+import { InvalidRequestError, ProviderError, type LlmError } from "@llm4ts/core/Errors";
+import type { ProcessExecutorShape } from "@llm4ts/core/ProcessExecutor";
+import { type GeminiAcpSessionShape } from "@llm4ts/core/providers/GeminiAcpSession";
+import { type JsonRecord, type JsonValue } from "@llm4ts/core/providers/CliSupport";
+import { type McpTool } from "@llm4ts/flow/McpServer";
+/**
+ * Speaks the Anthropic Messages API on `/v1/messages` (what `pi`'s
+ * `~/.pi/agent/models.json` custom-provider entry points at) and MCP over
+ * HTTP on `/mcp` (what an ACP `session/new` registers with gemini). See
+ * ADR 0016 for why: pi's tool loop — not gemini's — executes every tool
+ * call, so a tool call gemini makes through the registered MCP tools pauses
+ * here until pi's *next* `/v1/messages` request supplies the result.
+ *
+ * One active ACP session per bridge instance (ADR 0016's simplifying
+ * assumption): correlation needs no session-id routing, just one pending
+ * tool call and one "what happens next" slot at a time.
+ */
+interface AnthropicToolDef {
+    readonly name: string;
+    readonly description: string;
+    readonly inputSchema: JsonRecord;
+}
+interface ToolResultPayload {
+    readonly content: string;
+    readonly isError: boolean;
+}
+interface PendingToolCall {
+    readonly id: string;
+    readonly name: string;
+    readonly resultDeferred: Deferred.Deferred<ToolResultPayload, LlmError>;
+}
+export type TurnOutcome = {
+    readonly _tag: "Text";
+    readonly text: string;
+} | {
+    readonly _tag: "ToolUse";
+    readonly id: string;
+    readonly name: string;
+    readonly input: JsonValue;
+};
+export interface BridgeState {
+    readonly session: GeminiAcpSessionShape;
+    readonly cwd: string;
+    readonly mcpServerUrl: string;
+    readonly sessionId: Ref.Ref<Option.Option<string>>;
+    readonly tools: Ref.Ref<ReadonlyArray<AnthropicToolDef>>;
+    readonly pendingToolCall: Ref.Ref<Option.Option<PendingToolCall>>;
+    readonly turnOutcome: Ref.Ref<Option.Option<Deferred.Deferred<TurnOutcome, LlmError>>>;
+    readonly nextToolCallId: Ref.Ref<number>;
+    readonly forkBackground: <A>(effect: Effect.Effect<A, LlmError>) => Effect.Effect<void>;
+}
+export declare const makeBridgeState: (session: GeminiAcpSessionShape, cwd: string, mcpServerUrl: string, forkBackground: <A>(effect: Effect.Effect<A, LlmError>) => Effect.Effect<void>) => Effect.Effect<BridgeState, never, never>;
+export declare const anthropicToolToMcpTool: (state: BridgeState, def: AnthropicToolDef) => McpTool;
+export declare const handleMessagesRequest: (state: BridgeState, body: import("effect/Schema").Json) => Effect.Effect<Readonly<Record<string, import("effect/Schema").Json>>, InvalidRequestError | ProviderError | import("@llm4ts/core/Errors").UsageLimitError | import("@llm4ts/core/Errors").AuthenticationError | import("@llm4ts/core/Errors").ParseError | import("@llm4ts/core/Errors").ToolError | import("@llm4ts/core/Errors").ConfigError | import("@llm4ts/core/Errors").RateLimitError | import("@llm4ts/core/Errors").TimeoutError | import("@llm4ts/core/Errors").TurnLimitError, never>;
+export interface GeminiAcpBridgeConfig {
+    readonly port: number;
+    readonly cwd: string;
+    readonly model?: string;
+    readonly executor: ProcessExecutorShape;
+    readonly envVars?: Readonly<Record<string, string>>;
+}
+export interface RunningGeminiAcpBridge {
+    readonly port: number;
+    readonly baseUrl: string;
+}
+export declare const runGeminiAcpBridge: (config: GeminiAcpBridgeConfig) => Effect.Effect<RunningGeminiAcpBridge, InvalidRequestError | ProviderError | import("@llm4ts/core/Errors").UsageLimitError | import("@llm4ts/core/Errors").AuthenticationError | import("@llm4ts/core/Errors").ParseError | import("@llm4ts/core/Errors").ToolError | import("@llm4ts/core/Errors").ConfigError | import("@llm4ts/core/Errors").RateLimitError | import("@llm4ts/core/Errors").TimeoutError | import("@llm4ts/core/Errors").TurnLimitError, Scope.Scope>;
+export {};
+//# sourceMappingURL=NodeGeminiAcpBridge.d.ts.map

package/dist/NodeGeminiAcpBridge.d.ts.map

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

package/dist/NodeGeminiAcpBridge.js

@@ -0,0 +1,231 @@
+import { createServer } from "node:http";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Ref from "effect/Ref";
+import { InvalidRequestError, ProviderError } from "@llm4ts/core/Errors";
+import { geminiAcpArgv, openGeminiAcpSession } from "@llm4ts/core/providers/GeminiAcpSession";
+import { isJsonRecord, jsonArray, jsonBooleanField, jsonField, jsonStringField } from "@llm4ts/core/providers/CliSupport";
+import { FlowLlmError } from "@llm4ts/flow/FlowError";
+import { handleMcpRequest } from "@llm4ts/flow/McpServer";
+export const makeBridgeState = Effect.fn("@llm4ts/runner/NodeGeminiAcpBridge.makeBridgeState")(function* (session, cwd, mcpServerUrl, forkBackground) {
+    return {
+        session,
+        cwd,
+        mcpServerUrl,
+        sessionId: yield* Ref.make(Option.none()),
+        tools: yield* Ref.make([]),
+        pendingToolCall: yield* Ref.make(Option.none()),
+        turnOutcome: yield* Ref.make(Option.none()),
+        nextToolCallId: yield* Ref.make(0),
+        forkBackground
+    };
+});
+const resolveTurnOutcomeSuccess = (state, outcome) => Effect.gen(function* () {
+    const current = yield* Ref.get(state.turnOutcome);
+    if (Option.isSome(current)) {
+        yield* Deferred.succeed(current.value, outcome);
+    }
+});
+const resolveTurnOutcomeFailure = (state, error) => Effect.gen(function* () {
+    const current = yield* Ref.get(state.turnOutcome);
+    if (Option.isSome(current)) {
+        yield* Deferred.fail(current.value, error);
+    }
+});
+export const anthropicToolToMcpTool = (state, def) => ({
+    name: def.name,
+    description: def.description,
+    inputSchema: def.inputSchema,
+    call: (arguments_) => Effect.gen(function* () {
+        const id = yield* Ref.updateAndGet(state.nextToolCallId, (current) => current + 1);
+        const toolCallId = `toolu_${id}`;
+        const resultDeferred = yield* Deferred.make();
+        yield* Ref.set(state.pendingToolCall, Option.some({ id: toolCallId, name: def.name, resultDeferred }));
+        yield* resolveTurnOutcomeSuccess(state, {
+            _tag: "ToolUse",
+            id: toolCallId,
+            name: def.name,
+            input: arguments_
+        });
+        const outcome = yield* Deferred.await(resultDeferred);
+        if (outcome.isError) {
+            return yield* ProviderError.make({ message: outcome.content });
+        }
+        return outcome.content;
+    }).pipe(Effect.mapError((error) => FlowLlmError.from(error)))
+});
+const parseToolDefs = (body) => jsonArray(jsonField(body, "tools")).flatMap((tool) => {
+    const name = jsonStringField(tool, "name");
+    if (name === undefined) {
+        return [];
+    }
+    const inputSchema = jsonField(tool, "input_schema");
+    return [
+        {
+            name,
+            description: jsonStringField(tool, "description") ?? "",
+            inputSchema: inputSchema !== undefined && isJsonRecord(inputSchema) ? inputSchema : {}
+        }
+    ];
+});
+const lastMessage = (body) => {
+    const messages = jsonArray(jsonField(body, "messages"));
+    return messages[messages.length - 1];
+};
+const contentBlocksText = (value) => typeof value === "string"
+    ? value
+    : jsonArray(value)
+        .map((block) => jsonStringField(block, "text") ?? "")
+        .join("\n");
+const toolResultInLastMessage = (body) => {
+    const message = lastMessage(body);
+    if (jsonStringField(message, "role") !== "user") {
+        return undefined;
+    }
+    for (const block of jsonArray(jsonField(message, "content"))) {
+        if (jsonStringField(block, "type") !== "tool_result") {
+            continue;
+        }
+        const id = jsonStringField(block, "tool_use_id");
+        if (id === undefined) {
+            continue;
+        }
+        return {
+            id,
+            content: contentBlocksText(jsonField(block, "content")),
+            isError: jsonBooleanField(block, "is_error") === true
+        };
+    }
+    return undefined;
+};
+const userTextInLastMessage = (body) => contentBlocksText(jsonField(lastMessage(body), "content"));
+const anthropicResponse = (model, outcome) => ({
+    id: `msg_${Date.now()}`,
+    type: "message",
+    role: "assistant",
+    model,
+    content: outcome._tag === "Text"
+        ? [{ type: "text", text: outcome.text }]
+        : [{ type: "tool_use", id: outcome.id, name: outcome.name, input: outcome.input }],
+    stop_reason: outcome._tag === "Text" ? "end_turn" : "tool_use",
+    // ACP does not currently surface per-request token counts to this bridge;
+    // zero, not omitted, since the Anthropic Messages response shape requires
+    // the field. Real usage accounting for this path is future work.
+    usage: { input_tokens: 0, output_tokens: 0 }
+});
+export const handleMessagesRequest = Effect.fn("@llm4ts/runner/NodeGeminiAcpBridge.handleMessagesRequest")(function* (state, body) {
+    const continuation = toolResultInLastMessage(body);
+    let pendingToResolve;
+    if (continuation !== undefined) {
+        const pending = yield* Ref.get(state.pendingToolCall);
+        if (Option.isNone(pending) || pending.value.id !== continuation.id) {
+            return yield* InvalidRequestError.make({
+                message: `no pending tool call matches tool_result id ${continuation.id}`
+            });
+        }
+        yield* Ref.set(state.pendingToolCall, Option.none());
+        pendingToResolve = pending.value;
+    }
+    // Registered before anything that could resolve it (a resumed tool call
+    // unblocking gemini's still-in-flight prompt, or — the first turn — the
+    // forked prompt() call itself) can run: both can complete fast enough to
+    // race an outcome slot only opened afterward, silently dropping it
+    // forever with nothing left awaiting it.
+    const outcomeDeferred = yield* Deferred.make();
+    yield* Ref.set(state.turnOutcome, Option.some(outcomeDeferred));
+    if (pendingToResolve !== undefined) {
+        yield* Deferred.succeed(pendingToResolve.resultDeferred, {
+            content: continuation?.content ?? "",
+            isError: continuation?.isError ?? false
+        });
+    }
+    else {
+        yield* Ref.set(state.tools, parseToolDefs(body));
+        const existing = yield* Ref.get(state.sessionId);
+        const sessionId = existing._tag === "Some"
+            ? existing.value
+            : yield* Effect.tap(state.session.newSession(state.cwd, state.mcpServerUrl), (id) => Ref.set(state.sessionId, Option.some(id)));
+        const text = userTextInLastMessage(body);
+        yield* state.forkBackground(state.session.prompt(sessionId, text).pipe(Effect.matchEffect({
+            onSuccess: (result) => resolveTurnOutcomeSuccess(state, { _tag: "Text", text: result.text }),
+            onFailure: (error) => resolveTurnOutcomeFailure(state, error)
+        })));
+    }
+    const outcome = yield* Deferred.await(outcomeDeferred);
+    yield* Ref.set(state.turnOutcome, Option.none());
+    return anthropicResponse(jsonStringField(body, "model") ?? "gemini", outcome);
+});
+const readBody = (request) => Effect.callback((resume) => {
+    const chunks = [];
+    request.on("data", (chunk) => chunks.push(chunk));
+    request.on("end", () => resume(Effect.succeed(Buffer.concat(chunks).toString("utf8"))));
+    request.on("error", (error) => resume(ProviderError.make({ message: "failed to read request body", cause: error })));
+});
+const parseJson = (raw) => JSON.parse(raw);
+const parseJsonBody = (raw) => Effect.try({
+    try: () => parseJson(raw),
+    catch: () => InvalidRequestError.make({ message: "request body is not valid JSON" })
+});
+const writeJson = (response, status, body) => {
+    const text = JSON.stringify(body);
+    response.writeHead(status, { "Content-Type": "application/json" });
+    response.end(text);
+};
+const errorStatus = (error) => error._tag === "InvalidRequestError" ? 400 : error._tag === "AuthenticationError" ? 401 : 502;
+const bindError = (port, cause) => ProviderError.make({
+    message: `Gemini ACP bridge could not bind 127.0.0.1:${port} — another llm4ts run may already ` +
+        "own it (concurrent runs against one bridge are unsupported; see ADR 0016)",
+    cause
+});
+const acquireServer = (port, listener) => Effect.acquireRelease(Effect.callback((resume) => {
+    const server = createServer(listener);
+    const onError = (cause) => resume(Effect.fail(bindError(port, cause)));
+    server.once("error", onError);
+    server.listen(port, "127.0.0.1", () => {
+        server.off("error", onError);
+        resume(Effect.succeed(server));
+    });
+}), (server) => Effect.callback((resume) => {
+    if (!server.listening) {
+        resume(Effect.void);
+        return;
+    }
+    server.close(() => resume(Effect.void));
+}));
+export const runGeminiAcpBridge = Effect.fn("@llm4ts/runner/NodeGeminiAcpBridge.run")(function* (config) {
+    const mcpServerUrl = `http://127.0.0.1:${config.port}/mcp`;
+    const session = yield* openGeminiAcpSession(config.executor, geminiAcpArgv(config.model), config.cwd, config.envVars ?? {});
+    const forkBackground = (effect) => Effect.sync(() => {
+        Effect.runFork(effect);
+    });
+    const state = yield* makeBridgeState(session, config.cwd, mcpServerUrl, forkBackground);
+    const requestListener = (request, response) => {
+        const path = request.url ?? "/";
+        if (request.method !== "POST" || (path !== "/v1/messages" && path !== "/mcp")) {
+            writeJson(response, 404, { error: { message: "not found" } });
+            return;
+        }
+        const handled = Effect.gen(function* () {
+            const raw = yield* readBody(request);
+            const body = yield* parseJsonBody(raw);
+            if (path === "/mcp") {
+                const tools = yield* Ref.get(state.tools);
+                const mcpTools = tools.map((tool) => anthropicToolToMcpTool(state, tool));
+                const reply = yield* handleMcpRequest(body, mcpTools);
+                return { status: 200, body: reply ?? {} };
+            }
+            const reply = yield* handleMessagesRequest(state, body);
+            return { status: 200, body: reply };
+        }).pipe(Effect.catch((error) => Effect.succeed({
+            status: errorStatus(error),
+            body: { error: { message: error.message } }
+        })));
+        Effect.runPromise(handled).then(({ status, body }) => writeJson(response, status, body), (defect) => writeJson(response, 500, { error: { message: String(defect) } }));
+    };
+    const server = yield* acquireServer(config.port, requestListener);
+    const address = server.address();
+    const port = address !== null && typeof address !== "string" ? address.port : config.port;
+    return { port, baseUrl: `http://127.0.0.1:${port}` };
+});
+//# sourceMappingURL=NodeGeminiAcpBridge.js.map

package/dist/NodeGeminiAcpBridge.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llm4ts/runner",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Node runner, CLI, terminal, and MCP composition for llm4ts",
   "license": "MIT",
   "type": "module",
@@ -22,6 +22,7 @@
     "./FlowRunner": "./dist/FlowRunner.js",
     "./Kits": "./dist/Kits.js",
     "./McpStdio": "./dist/McpStdio.js",
+    "./NodeGeminiAcpBridge": "./dist/NodeGeminiAcpBridge.js",
     "./NodeHttpClient": "./dist/NodeHttpClient.js",
     "./NodeGeminiCliExecutor": "./dist/NodeGeminiCliExecutor.js",
     "./NodePlainFileStore": "./dist/NodePlainFileStore.js",
@@ -59,8 +60,8 @@
     "typescript"
   ],
   "dependencies": {
-    "@llm4ts/core": "2.2.1",
-    "@llm4ts/flow": "2.2.1"
+    "@llm4ts/core": "2.3.0",
+    "@llm4ts/flow": "2.3.0"
   },
   "peerDependencies": {
     "effect": "4.0.0-rc.115"

package/src/Doctor.ts

@@ -1,3 +1,6 @@
+import { readFileSync } from "node:fs"
+import { homedir } from "node:os"
+import { join } from "node:path"
 import * as Effect from "effect/Effect"
 import type { HealthStatus } from "@llm4ts/core/Models"
 import { ConnectorIds } from "@llm4ts/core/Models"
@@ -98,9 +101,60 @@ const wrap = (text: string, width: number, indent: string): ReadonlyArray<string
 const selectedCoder = (environment: Readonly<Record<string, string | undefined>>): string =>
   environment.LLM4TS_CODER ?? "claude (default)"
 
+export const defaultGeminiBridgePort = "8731"
+
+/**
+ * `~/.pi/agent/models.json` (ADR 0016). Read for reporting only — this file
+ * belongs to `pi`, outside llm4ts's package graph, and llm4ts never writes
+ * it. Missing is not an error here: the file simply doesn't exist yet.
+ */
+export const defaultReadPiModelsJson = (): string | undefined => {
+  try {
+    return readFileSync(join(homedir(), ".pi", "agent", "models.json"), "utf8")
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Whether pi's custom-provider config points at this machine's Gemini ACP
+ * bridge — detect-and-report only, never auto-fixed (ADR 0016). `undefined`
+ * means the check doesn't apply: nothing asked for the bridge.
+ */
+export const geminiBridgePrerequisites = (
+  environment: Readonly<Record<string, string | undefined>>,
+  modelsJson: string | undefined
+): PrerequisiteReport | undefined => {
+  if (!truthy(environment.LLM4TS_GEMINI_BRIDGE)) {
+    return undefined
+  }
+  const port = isSet(environment.LLM4TS_GEMINI_BRIDGE_PORT)
+    ? environment.LLM4TS_GEMINI_BRIDGE_PORT.trim()
+    : defaultGeminiBridgePort
+  const needle = `127.0.0.1:${port}`
+  const hint =
+    `add a custom provider to ~/.pi/agent/models.json with baseUrl ` +
+    `"http://${needle}" so pi draws inference from the gemini-cli bridge instead ` +
+    `of a model API key (ADR 0016) — llm4ts never writes this file for you.`
+  if (modelsJson === undefined) {
+    return { satisfied: false, summary: "~/.pi/agent/models.json not found", hint }
+  }
+  return modelsJson.includes(needle)
+    ? {
+        satisfied: true,
+        summary: `a provider in ~/.pi/agent/models.json points at ${needle}`
+      }
+    : {
+        satisfied: false,
+        summary: `no provider in ~/.pi/agent/models.json points at ${needle}`,
+        hint
+      }
+}
+
 export const makeDoctorProgram = (
   registry: ConnectorRegistryShape = nodeFlowRunnerDependencies().registry,
-  environment: Readonly<Record<string, string | undefined>> = process.env
+  environment: Readonly<Record<string, string | undefined>> = process.env,
+  readPiModelsJson: () => string | undefined = defaultReadPiModelsJson
 ): Effect.Effect<string> =>
   Effect.map(registry.healthCheckAll, (statuses) => {
     const lines: Array<string> = []
@@ -128,13 +182,22 @@ export const makeDoctorProgram = (
         (id) =>
           id.value === ConnectorIds.GeminiCli.value || id.value === ConnectorIds.GeminiApi.value
       )
-    if (geminiRelevant) {
-      const gemini = geminiPrerequisites(environment)
+    const bridge = geminiBridgePrerequisites(environment, readPiModelsJson())
+    if (geminiRelevant || bridge !== undefined) {
       lines.push("")
       lines.push("prerequisites:")
-      lines.push(`  ${gemini.satisfied ? "✔" : "?"} gemini: ${gemini.summary}`)
-      if (gemini.hint !== undefined) {
-        lines.push(...wrap(gemini.hint, 78, "      "))
+      if (geminiRelevant) {
+        const gemini = geminiPrerequisites(environment)
+        lines.push(`  ${gemini.satisfied ? "✔" : "?"} gemini: ${gemini.summary}`)
+        if (gemini.hint !== undefined) {
+          lines.push(...wrap(gemini.hint, 78, "      "))
+        }
+      }
+      if (bridge !== undefined) {
+        lines.push(`  ${bridge.satisfied ? "✔" : "?"} pi-gemini-bridge: ${bridge.summary}`)
+        if (bridge.hint !== undefined) {
+          lines.push(...wrap(bridge.hint, 78, "      "))
+        }
       }
     }
 

package/src/NodeGeminiAcpBridge.ts

@@ -0,0 +1,395 @@
+import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http"
+import * as Deferred from "effect/Deferred"
+import * as Effect from "effect/Effect"
+import * as Option from "effect/Option"
+import * as Ref from "effect/Ref"
+import type * as Scope from "effect/Scope"
+import { InvalidRequestError, ProviderError, type LlmError } from "@llm4ts/core/Errors"
+import type { ProcessExecutorShape } from "@llm4ts/core/ProcessExecutor"
+import {
+  geminiAcpArgv,
+  openGeminiAcpSession,
+  type GeminiAcpSessionShape
+} from "@llm4ts/core/providers/GeminiAcpSession"
+import {
+  isJsonRecord,
+  jsonArray,
+  jsonBooleanField,
+  jsonField,
+  jsonStringField,
+  type JsonRecord,
+  type JsonValue
+} from "@llm4ts/core/providers/CliSupport"
+import { FlowLlmError } from "@llm4ts/flow/FlowError"
+import { handleMcpRequest, type McpTool } from "@llm4ts/flow/McpServer"
+
+/**
+ * Speaks the Anthropic Messages API on `/v1/messages` (what `pi`'s
+ * `~/.pi/agent/models.json` custom-provider entry points at) and MCP over
+ * HTTP on `/mcp` (what an ACP `session/new` registers with gemini). See
+ * ADR 0016 for why: pi's tool loop — not gemini's — executes every tool
+ * call, so a tool call gemini makes through the registered MCP tools pauses
+ * here until pi's *next* `/v1/messages` request supplies the result.
+ *
+ * One active ACP session per bridge instance (ADR 0016's simplifying
+ * assumption): correlation needs no session-id routing, just one pending
+ * tool call and one "what happens next" slot at a time.
+ */
+
+interface AnthropicToolDef {
+  readonly name: string
+  readonly description: string
+  readonly inputSchema: JsonRecord
+}
+
+interface ToolResultPayload {
+  readonly content: string
+  readonly isError: boolean
+}
+
+interface PendingToolCall {
+  readonly id: string
+  readonly name: string
+  readonly resultDeferred: Deferred.Deferred<ToolResultPayload, LlmError>
+}
+
+export type TurnOutcome =
+  | { readonly _tag: "Text"; readonly text: string }
+  | {
+      readonly _tag: "ToolUse"
+      readonly id: string
+      readonly name: string
+      readonly input: JsonValue
+    }
+
+export interface BridgeState {
+  readonly session: GeminiAcpSessionShape
+  readonly cwd: string
+  readonly mcpServerUrl: string
+  readonly sessionId: Ref.Ref<Option.Option<string>>
+  readonly tools: Ref.Ref<ReadonlyArray<AnthropicToolDef>>
+  readonly pendingToolCall: Ref.Ref<Option.Option<PendingToolCall>>
+  readonly turnOutcome: Ref.Ref<Option.Option<Deferred.Deferred<TurnOutcome, LlmError>>>
+  readonly nextToolCallId: Ref.Ref<number>
+  readonly forkBackground: <A>(effect: Effect.Effect<A, LlmError>) => Effect.Effect<void>
+}
+
+export const makeBridgeState = Effect.fn("@llm4ts/runner/NodeGeminiAcpBridge.makeBridgeState")(
+  function* (
+    session: GeminiAcpSessionShape,
+    cwd: string,
+    mcpServerUrl: string,
+    forkBackground: <A>(effect: Effect.Effect<A, LlmError>) => Effect.Effect<void>
+  ): Effect.fn.Return<BridgeState> {
+    return {
+      session,
+      cwd,
+      mcpServerUrl,
+      sessionId: yield* Ref.make<Option.Option<string>>(Option.none()),
+      tools: yield* Ref.make<ReadonlyArray<AnthropicToolDef>>([]),
+      pendingToolCall: yield* Ref.make<Option.Option<PendingToolCall>>(Option.none()),
+      turnOutcome: yield* Ref.make<Option.Option<Deferred.Deferred<TurnOutcome, LlmError>>>(
+        Option.none()
+      ),
+      nextToolCallId: yield* Ref.make(0),
+      forkBackground
+    }
+  }
+)
+
+const resolveTurnOutcomeSuccess = (state: BridgeState, outcome: TurnOutcome): Effect.Effect<void> =>
+  Effect.gen(function* () {
+    const current = yield* Ref.get(state.turnOutcome)
+    if (Option.isSome(current)) {
+      yield* Deferred.succeed(current.value, outcome)
+    }
+  })
+
+const resolveTurnOutcomeFailure = (state: BridgeState, error: LlmError): Effect.Effect<void> =>
+  Effect.gen(function* () {
+    const current = yield* Ref.get(state.turnOutcome)
+    if (Option.isSome(current)) {
+      yield* Deferred.fail(current.value, error)
+    }
+  })
+
+export const anthropicToolToMcpTool = (state: BridgeState, def: AnthropicToolDef): McpTool => ({
+  name: def.name,
+  description: def.description,
+  inputSchema: def.inputSchema,
+  call: (arguments_) =>
+    Effect.gen(function* () {
+      const id = yield* Ref.updateAndGet(state.nextToolCallId, (current) => current + 1)
+      const toolCallId = `toolu_${id}`
+      const resultDeferred = yield* Deferred.make<ToolResultPayload, LlmError>()
+      yield* Ref.set(
+        state.pendingToolCall,
+        Option.some({ id: toolCallId, name: def.name, resultDeferred })
+      )
+      yield* resolveTurnOutcomeSuccess(state, {
+        _tag: "ToolUse",
+        id: toolCallId,
+        name: def.name,
+        input: arguments_
+      })
+      const outcome = yield* Deferred.await(resultDeferred)
+      if (outcome.isError) {
+        return yield* ProviderError.make({ message: outcome.content })
+      }
+      return outcome.content
+    }).pipe(Effect.mapError((error) => FlowLlmError.from(error)))
+})
+
+const parseToolDefs = (body: JsonValue): ReadonlyArray<AnthropicToolDef> =>
+  jsonArray(jsonField(body, "tools")).flatMap((tool) => {
+    const name = jsonStringField(tool, "name")
+    if (name === undefined) {
+      return []
+    }
+    const inputSchema = jsonField(tool, "input_schema")
+    return [
+      {
+        name,
+        description: jsonStringField(tool, "description") ?? "",
+        inputSchema: inputSchema !== undefined && isJsonRecord(inputSchema) ? inputSchema : {}
+      }
+    ]
+  })
+
+const lastMessage = (body: JsonValue): JsonValue | undefined => {
+  const messages = jsonArray(jsonField(body, "messages"))
+  return messages[messages.length - 1]
+}
+
+const contentBlocksText = (value: JsonValue | undefined): string =>
+  typeof value === "string"
+    ? value
+    : jsonArray(value)
+        .map((block) => jsonStringField(block, "text") ?? "")
+        .join("\n")
+
+const toolResultInLastMessage = (
+  body: JsonValue
+): { readonly id: string; readonly content: string; readonly isError: boolean } | undefined => {
+  const message = lastMessage(body)
+  if (jsonStringField(message, "role") !== "user") {
+    return undefined
+  }
+  for (const block of jsonArray(jsonField(message, "content"))) {
+    if (jsonStringField(block, "type") !== "tool_result") {
+      continue
+    }
+    const id = jsonStringField(block, "tool_use_id")
+    if (id === undefined) {
+      continue
+    }
+    return {
+      id,
+      content: contentBlocksText(jsonField(block, "content")),
+      isError: jsonBooleanField(block, "is_error") === true
+    }
+  }
+  return undefined
+}
+
+const userTextInLastMessage = (body: JsonValue): string =>
+  contentBlocksText(jsonField(lastMessage(body), "content"))
+
+const anthropicResponse = (model: string, outcome: TurnOutcome): JsonRecord => ({
+  id: `msg_${Date.now()}`,
+  type: "message",
+  role: "assistant",
+  model,
+  content:
+    outcome._tag === "Text"
+      ? [{ type: "text", text: outcome.text }]
+      : [{ type: "tool_use", id: outcome.id, name: outcome.name, input: outcome.input }],
+  stop_reason: outcome._tag === "Text" ? "end_turn" : "tool_use",
+  // ACP does not currently surface per-request token counts to this bridge;
+  // zero, not omitted, since the Anthropic Messages response shape requires
+  // the field. Real usage accounting for this path is future work.
+  usage: { input_tokens: 0, output_tokens: 0 }
+})
+
+export const handleMessagesRequest = Effect.fn(
+  "@llm4ts/runner/NodeGeminiAcpBridge.handleMessagesRequest"
+)(function* (state: BridgeState, body: JsonValue): Effect.fn.Return<JsonRecord, LlmError> {
+  const continuation = toolResultInLastMessage(body)
+  let pendingToResolve: PendingToolCall | undefined
+  if (continuation !== undefined) {
+    const pending = yield* Ref.get(state.pendingToolCall)
+    if (Option.isNone(pending) || pending.value.id !== continuation.id) {
+      return yield* InvalidRequestError.make({
+        message: `no pending tool call matches tool_result id ${continuation.id}`
+      })
+    }
+    yield* Ref.set(state.pendingToolCall, Option.none())
+    pendingToResolve = pending.value
+  }
+
+  // Registered before anything that could resolve it (a resumed tool call
+  // unblocking gemini's still-in-flight prompt, or — the first turn — the
+  // forked prompt() call itself) can run: both can complete fast enough to
+  // race an outcome slot only opened afterward, silently dropping it
+  // forever with nothing left awaiting it.
+  const outcomeDeferred = yield* Deferred.make<TurnOutcome, LlmError>()
+  yield* Ref.set(state.turnOutcome, Option.some(outcomeDeferred))
+
+  if (pendingToResolve !== undefined) {
+    yield* Deferred.succeed(pendingToResolve.resultDeferred, {
+      content: continuation?.content ?? "",
+      isError: continuation?.isError ?? false
+    })
+  } else {
+    yield* Ref.set(state.tools, parseToolDefs(body))
+    const existing = yield* Ref.get(state.sessionId)
+    const sessionId =
+      existing._tag === "Some"
+        ? existing.value
+        : yield* Effect.tap(state.session.newSession(state.cwd, state.mcpServerUrl), (id) =>
+            Ref.set(state.sessionId, Option.some(id))
+          )
+    const text = userTextInLastMessage(body)
+    yield* state.forkBackground(
+      state.session.prompt(sessionId, text).pipe(
+        Effect.matchEffect({
+          onSuccess: (result) =>
+            resolveTurnOutcomeSuccess(state, { _tag: "Text", text: result.text }),
+          onFailure: (error) => resolveTurnOutcomeFailure(state, error)
+        })
+      )
+    )
+  }
+
+  const outcome = yield* Deferred.await(outcomeDeferred)
+  yield* Ref.set(state.turnOutcome, Option.none())
+
+  return anthropicResponse(jsonStringField(body, "model") ?? "gemini", outcome)
+})
+
+const readBody = (request: IncomingMessage): Effect.Effect<string, ProviderError> =>
+  Effect.callback((resume) => {
+    const chunks: Array<Buffer> = []
+    request.on("data", (chunk: Buffer) => chunks.push(chunk))
+    request.on("end", () => resume(Effect.succeed(Buffer.concat(chunks).toString("utf8"))))
+    request.on("error", (error) =>
+      resume(ProviderError.make({ message: "failed to read request body", cause: error }))
+    )
+  })
+
+const parseJson = (raw: string): JsonValue => JSON.parse(raw)
+
+const parseJsonBody = (raw: string): Effect.Effect<JsonValue, InvalidRequestError> =>
+  Effect.try({
+    try: () => parseJson(raw),
+    catch: () => InvalidRequestError.make({ message: "request body is not valid JSON" })
+  })
+
+const writeJson = (response: ServerResponse, status: number, body: JsonValue): void => {
+  const text = JSON.stringify(body)
+  response.writeHead(status, { "Content-Type": "application/json" })
+  response.end(text)
+}
+
+const errorStatus = (error: LlmError | InvalidRequestError): number =>
+  error._tag === "InvalidRequestError" ? 400 : error._tag === "AuthenticationError" ? 401 : 502
+
+export interface GeminiAcpBridgeConfig {
+  readonly port: number
+  readonly cwd: string
+  readonly model?: string
+  readonly executor: ProcessExecutorShape
+  readonly envVars?: Readonly<Record<string, string>>
+}
+
+export interface RunningGeminiAcpBridge {
+  readonly port: number
+  readonly baseUrl: string
+}
+
+const bindError = (port: number, cause: unknown): ProviderError =>
+  ProviderError.make({
+    message:
+      `Gemini ACP bridge could not bind 127.0.0.1:${port} — another llm4ts run may already ` +
+      "own it (concurrent runs against one bridge are unsupported; see ADR 0016)",
+    cause
+  })
+
+const acquireServer = (
+  port: number,
+  listener: (request: IncomingMessage, response: ServerResponse) => void
+): Effect.Effect<Server, ProviderError, Scope.Scope> =>
+  Effect.acquireRelease(
+    Effect.callback<Server, ProviderError>((resume) => {
+      const server = createServer(listener)
+      const onError = (cause: Error): void => resume(Effect.fail(bindError(port, cause)))
+      server.once("error", onError)
+      server.listen(port, "127.0.0.1", () => {
+        server.off("error", onError)
+        resume(Effect.succeed(server))
+      })
+    }),
+    (server) =>
+      Effect.callback<void>((resume) => {
+        if (!server.listening) {
+          resume(Effect.void)
+          return
+        }
+        server.close(() => resume(Effect.void))
+      })
+  )
+
+export const runGeminiAcpBridge = Effect.fn("@llm4ts/runner/NodeGeminiAcpBridge.run")(function* (
+  config: GeminiAcpBridgeConfig
+): Effect.fn.Return<RunningGeminiAcpBridge, LlmError, Scope.Scope> {
+  const mcpServerUrl = `http://127.0.0.1:${config.port}/mcp`
+  const session = yield* openGeminiAcpSession(
+    config.executor,
+    geminiAcpArgv(config.model),
+    config.cwd,
+    config.envVars ?? {}
+  )
+  const forkBackground = <A>(effect: Effect.Effect<A, LlmError>): Effect.Effect<void> =>
+    Effect.sync(() => {
+      Effect.runFork(effect)
+    })
+  const state = yield* makeBridgeState(session, config.cwd, mcpServerUrl, forkBackground)
+
+  const requestListener = (request: IncomingMessage, response: ServerResponse): void => {
+    const path = request.url ?? "/"
+    if (request.method !== "POST" || (path !== "/v1/messages" && path !== "/mcp")) {
+      writeJson(response, 404, { error: { message: "not found" } })
+      return
+    }
+
+    const handled = Effect.gen(function* () {
+      const raw = yield* readBody(request)
+      const body = yield* parseJsonBody(raw)
+      if (path === "/mcp") {
+        const tools = yield* Ref.get(state.tools)
+        const mcpTools = tools.map((tool) => anthropicToolToMcpTool(state, tool))
+        const reply = yield* handleMcpRequest(body, mcpTools)
+        return { status: 200, body: reply ?? {} }
+      }
+      const reply = yield* handleMessagesRequest(state, body)
+      return { status: 200, body: reply }
+    }).pipe(
+      Effect.catch((error) =>
+        Effect.succeed({
+          status: errorStatus(error),
+          body: { error: { message: error.message } }
+        })
+      )
+    )
+
+    Effect.runPromise(handled).then(
+      ({ status, body }: { status: number; body: JsonValue }) => writeJson(response, status, body),
+      (defect: unknown) => writeJson(response, 500, { error: { message: String(defect) } })
+    )
+  }
+
+  const server = yield* acquireServer(config.port, requestListener)
+  const address = server.address()
+  const port = address !== null && typeof address !== "string" ? address.port : config.port
+  return { port, baseUrl: `http://127.0.0.1:${port}` }
+})