@llm4ts/core 2.40.0 → 2.41.0

package/dist/providers/PiConnector.d.ts

@@ -2,6 +2,16 @@ import { type CliConnectorShape } from "../Connector.ts";
 import type { CliConnectorConfig } from "../ConnectorConfig.ts";
 import { LlmChunk } from "../Models.ts";
 import type { ProcessExecutorShape } from "../ProcessExecutor.ts";
+/**
+ * The first pi whose `--tools` allowlist can be kept free of MCP tools: from
+ * 1.0.4 `--tools read` keeps every MCP tool the user configured in
+ * `~/.pi/agent/mcp.json` unless `--no-mcp` (new in that release) drops them,
+ * and MCP tools are built in since 0.99.0. Below this a read-only seat can
+ * reach any MCP write tool, so llm4ts refuses it (ADR 0010, ADR 0035).
+ */
+export declare const piReadOnlyFloor = "1.0.4";
+/** Why this pi cannot hold a read-only seat, or nothing when it can. */
+export declare const piReadOnlyProblem: (versionText: string) => string | undefined;
 export declare const piExtraArgs: (config: CliConnectorConfig) => ReadonlyArray<string>;
 export declare const parsePiStreamLine: (line: string) => ReadonlyArray<LlmChunk>;
 export declare const makePiConnector: (config: CliConnectorConfig, executor: ProcessExecutorShape) => CliConnectorShape;

package/dist/providers/PiConnector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PiConnector.d.ts","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,EAAuC,QAAQ,EAAc,MAAM,cAAc,CAAA;AACxF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAkBjE,eAAO,MAAM,WAAW,GAAI,QAAQ,kBAAkB,KAAG,aAAa,CAAC,MAAM,CAc5E,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,aAAa,CAAC,QAAQ,CA2FtE,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,QAAQ,kBAAkB,EAC1B,UAAU,oBAAoB,KAC7B,iBAgEF,CAAA"}
+{"version":3,"file":"PiConnector.d.ts","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,EAAuC,QAAQ,EAAc,MAAM,cAAc,CAAA;AACxF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAqBjE;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,UAAU,CAAA;AAEtC,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,GAAI,aAAa,MAAM,KAAG,MAAM,GAAG,SAchE,CAAA;AAMD,eAAO,MAAM,WAAW,GAAI,QAAQ,kBAAkB,KAAG,aAAa,CAAC,MAAM,CAwB5E,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,aAAa,CAAC,QAAQ,CAgHtE,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,QAAQ,kBAAkB,EAC1B,UAAU,oBAAoB,KAC7B,iBAwFF,CAAA"}

package/dist/providers/PiConnector.js

@@ -1,9 +1,33 @@
 import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
 import { makeCliConnector } from "../Connector.js";
-import { ProviderError } from "../Errors.js";
+import { InvalidRequestError, ProviderError } from "../Errors.js";
 import { ConnectorCapabilities, ConnectorIds, LlmChunk, TokenUsage } from "../Models.js";
-import { effortWord, cumulativeUsage, failClassifiedCliError, jsonBooleanField, jsonField, jsonIntField, jsonStringField, optionalModelArgs, parseJsonLine, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk } from "./CliSupport.js";
+import { atLeastVersion, effortWord, cumulativeUsage, failClassifiedCliError, jsonBooleanField, jsonField, jsonIntField, jsonStringField, optionalModelArgs, parseJsonLine, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk, versionTriple, statusChunk } from "./CliSupport.js";
+/**
+ * The first pi whose `--tools` allowlist can be kept free of MCP tools: from
+ * 1.0.4 `--tools read` keeps every MCP tool the user configured in
+ * `~/.pi/agent/mcp.json` unless `--no-mcp` (new in that release) drops them,
+ * and MCP tools are built in since 0.99.0. Below this a read-only seat can
+ * reach any MCP write tool, so llm4ts refuses it (ADR 0010, ADR 0035).
+ */
+export const piReadOnlyFloor = "1.0.4";
+/** Why this pi cannot hold a read-only seat, or nothing when it can. */
+export const piReadOnlyProblem = (versionText) => {
+    const version = versionTriple(versionText);
+    const floor = versionTriple(piReadOnlyFloor) ?? [];
+    if (version === undefined) {
+        return (`could not read the pi version from '${versionText.trim()}'; a read-only seat needs ` +
+            `pi >= ${piReadOnlyFloor}, whose --no-mcp keeps MCP tools out of the read allowlist`);
+    }
+    return atLeastVersion(version, floor)
+        ? undefined
+        : `pi ${version.join(".")} cannot enforce a read-only seat: --tools read keeps MCP tools ` +
+            `until --no-mcp arrived in ${piReadOnlyFloor}; upgrade pi, or give the judge and ` +
+            "reviewer seats to another harness";
+};
+/** The provider half of pi's `provider/model[:thinking]` model id. */
+const providerOf = (model) => model === undefined ? undefined : model.split("/", 1)[0];
 export const piExtraArgs = (config) => [
     ...optionalModelArgs(config.model),
     // `noTools` takes precedence over `readOnly`: `--no-tools` disables tool
@@ -11,12 +35,22 @@ export const piExtraArgs = (config) => [
     // offers a read tool the model can invoke — fine for an interactive
     // session, unsafe for a one-shot complete() call with no tool-loop
     // continuation (see the field's doc comment on CliConnectorConfig).
-    ...(config.noTools ? ["--no-tools"] : config.readOnly ? ["--tools", "read"] : []),
+    // `--no-tools` also drops MCP tools; `--tools read` keeps them (pi >= 1.0.4),
+    // so a read-only seat adds `--no-mcp` (ADR 0035).
+    ...(config.noTools ? ["--no-tools"] : config.readOnly ? ["--tools", "read", "--no-mcp"] : []),
     // `--thinking` is pi's effort flag (off, minimal, low, medium, high, xhigh).
     ...(config.effort === undefined ? [] : ["--thinking", effortWord(config.effort, "xhigh")]),
     // Isolation is partial (ADR 0029): project extensions and skills stay
     // out; pi still reads AGENTS.md from the working directory and its parents.
-    ...(config.isolated ? ["--no-extensions", "--no-skills"] : []),
+    // `--no-extensions` also drops the built-in llama.cpp provider (pi >=
+    // 0.99.0), so a local model on it is re-enabled by name.
+    ...(config.isolated
+        ? [
+            "--no-extensions",
+            "--no-skills",
+            ...(providerOf(config.model) === "llama.cpp" ? ["-e", "builtin:llama.cpp"] : [])
+        ]
+        : []),
     ...sortedFlagArgs(config.flags)
 ];
 export const parsePiStreamLine = (line) => {
@@ -32,23 +66,35 @@ export const parsePiStreamLine = (line) => {
                 : undefined;
             return delta === undefined || delta.length === 0 ? [] : [LlmChunk.make({ delta })];
         }
-        case "tool_execution_start":
+        // A call nested in another (codemode) names its parent (ADR 0033).
+        case "tool_execution_start": {
+            const parent = jsonStringField(json, "parentToolCallId");
             return [
-                toolEventChunk(jsonStringField(json, "toolName") ?? "", jsonField(json, "args"), jsonStringField(json, "toolCallId"))
+                toolEventChunk(jsonStringField(json, "toolName") ?? "", jsonField(json, "args"), jsonStringField(json, "toolCallId"), parent === undefined ? {} : { parent })
             ];
-        case "tool_execution_end":
+        }
+        case "tool_execution_end": {
+            const parent = jsonStringField(json, "parentToolCallId");
+            const durationMs = jsonIntField(json, "durationMs");
             return [
                 toolResultChunk(jsonStringField(json, "toolCallId"), {
                     failed: jsonField(json, "isError") === true,
+                    ...(parent === undefined ? {} : { parent }),
+                    ...(durationMs === undefined ? {} : { durationMs }),
                     ...(() => {
                         const output = toolResultText(jsonField(jsonField(json, "result"), "content"));
                         return output === undefined ? {} : { output };
                     })()
                 })
             ];
+        }
         case "message_end":
         case "agent_end": {
             const message = jsonField(json, "message");
+            // An aborted turn (a signal, a steer) is not a reply either.
+            if (jsonStringField(message, "stopReason") === "aborted") {
+                return [LlmChunk.make({ delta: "", metadata: { piError: "pi aborted the turn" } })];
+            }
             // pi reports a provider refusal (a usage limit, an auth failure) as an
             // assistant message that stopped with an error and exits 0; without
             // this it reads as an empty, successful reply.
@@ -78,6 +124,10 @@ export const parsePiStreamLine = (line) => {
                 }))
             ];
         }
+        // A provider retry and a context compaction pause the turn: the lane
+        // says so instead of looking stuck (ADR 0033).
+        case "auto_retry_start":
+            return [statusChunk("retrying", "start", jsonStringField(json, "errorMessage"))];
         case "auto_retry_end":
             return jsonBooleanField(json, "success") === false
                 ? [
@@ -88,7 +138,11 @@ export const parsePiStreamLine = (line) => {
                         }
                     })
                 ]
-                : [];
+                : [statusChunk("retrying", "end")];
+        case "compaction_start":
+            return [statusChunk("compacting", "start")];
+        case "compaction_end":
+            return [statusChunk("compacting", "end")];
         case "extension_error":
             return [
                 LlmChunk.make({
@@ -105,7 +159,22 @@ export const parsePiStreamLine = (line) => {
 export const makePiConnector = (config, executor) => {
     const cwd = config.workingDir ?? ".";
     const extraArgs = piExtraArgs(config);
+    // A read-only seat is only taken on a pi whose read allowlist can exclude
+    // MCP tools (`piReadOnlyFloor`): the version answer decides before the
+    // first turn, once per connector; a failed probe is retried on the next.
+    let floorChecked = !config.readOnly;
+    const checkFloorOnce = Effect.suspend(() => floorChecked
+        ? Effect.void
+        : Effect.flatMap(executor.run(["pi", "--version"], cwd, config.envVars), (result) => {
+            const problem = piReadOnlyProblem([...result.stdout, ...result.stderr].join("\n"));
+            return problem === undefined
+                ? Effect.sync(() => {
+                    floorChecked = true;
+                })
+                : Effect.fail(InvalidRequestError.make({ message: problem }));
+        }));
     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);
         if (result.exitCode !== 0) {
             // pi explains a refusal on stderr (a usage error, a missing model, an
@@ -119,9 +188,7 @@ export const makePiConnector = (config, executor) => {
         }
         return result.stdout.join("\n");
     });
-    const completeStream = (prompt) => executor
-        .runStreamingWithStdin(["pi", "-p", "--mode", "json", ...extraArgs], cwd, config.envVars, prompt)
-        .pipe(Stream.flatMap((line) => Stream.fromIterable(parsePiStreamLine(line))), 
+    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))), 
     // pi reports usage per assistant message; a turn is all of them.
     cumulativeUsage, Stream.mapEffect((chunk) => {
         const message = chunk.metadata.piError;
@@ -135,13 +202,17 @@ export const makePiConnector = (config, executor) => {
         // `--tools read` is pi's documented comma-separated ALLOWLIST of tool
         // names: only `read` is enabled, so bash/edit/write are absent — a real
         // capability removal, the same mechanism class as claude's `--tools`.
+        // `--no-mcp` keeps MCP tools out of it, and `checkFloorOnce` refuses a
+        // read-only seat on a pi without that flag, so the grade holds.
         capabilities: ConnectorCapabilities.make({
             interactiveSessions: true,
             readOnlyEnforcement: "enforced",
             effort: "mapped",
             isolatedHeadless: "partial"
         }),
-        buildArgv: (prompt, _context) => ["pi", "-p", ...extraArgs, prompt],
+        // `--` 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],
         complete,
         completeStream,

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": "2.40.0",
+  "version": "2.41.0",
   "description": "Effect-native LLM contracts, providers, tools, evaluation, and observability",
   "license": "MIT",
   "type": "module",

package/src/providers/ClaudeCliConnector.ts

@@ -31,7 +31,8 @@ import {
   toolResultText,
   usageEventChunk,
   type JsonValue,
-  effortWord
+  effortWord,
+  jsonObjectEntries
 } from "./CliSupport.ts"
 
 /**
@@ -93,6 +94,9 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
     return []
   }
 
+  // A sub-agent's lines carry the id of the Agent call that spawned it (ADR 0033).
+  const parentId = jsonStringField(json, "parent_tool_use_id")
+  const parent = parentId === undefined || parentId.length === 0 ? {} : { parent: parentId }
   switch (jsonStringField(json, "type")) {
     case "assistant":
       return jsonArray(jsonField(jsonField(json, "message"), "content")).flatMap(
@@ -107,7 +111,8 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
                 toolEventChunk(
                   jsonStringField(block, "name") ?? "",
                   jsonField(block, "input"),
-                  jsonStringField(block, "id")
+                  jsonStringField(block, "id"),
+                  parent
                 )
               ]
             default:
@@ -123,6 +128,7 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
             ? [
                 toolResultChunk(jsonStringField(block, "tool_use_id"), {
                   failed: jsonField(block, "is_error") === true,
+                  ...parent,
                   ...outputOf(jsonField(block, "content"))
                 })
               ]
@@ -133,21 +139,38 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
       if (usage === undefined) {
         return []
       }
-      const prompt = jsonIntField(usage, "input_tokens") ?? 0
-      const completion = jsonIntField(usage, "output_tokens") ?? 0
-      const cached = jsonIntField(usage, "cache_read_input_tokens")
       // The CLI reports its own exact cost on the result event; carry it so
       // trackers prefer it over pricing-table estimates. modelUsage's key is
-      // a model-name fallback for when no init line was observed.
+      // a model-name fallback for when no init line was observed, and its
+      // per-model counts include the sub-agents' turns, which `usage` leaves
+      // out (ADR 0033): sum them when they are there.
       const costUsd = jsonNumberField(json, "total_cost_usd")
-      const modelUsage = jsonField(json, "modelUsage")
-      const modelNames =
-        modelUsage !== undefined &&
-        modelUsage !== null &&
-        typeof modelUsage === "object" &&
-        !Array.isArray(modelUsage)
-          ? Object.keys(modelUsage)
-          : []
+      const modelNames = jsonObjectEntries(jsonField(json, "modelUsage")).map(([name]) => name)
+      // Only entries that count tokens can replace `usage`; a key-only
+      // modelUsage (older CLIs, fixtures) still names the model.
+      const perModel = jsonObjectEntries(jsonField(json, "modelUsage")).filter(
+        ([, entry]) =>
+          jsonIntField(entry, "inputTokens") !== undefined ||
+          jsonIntField(entry, "outputTokens") !== undefined
+      )
+      const summed = perModel.reduce(
+        (sum, [, entry]) => ({
+          prompt: sum.prompt + (jsonIntField(entry, "inputTokens") ?? 0),
+          completion: sum.completion + (jsonIntField(entry, "outputTokens") ?? 0),
+          cached: sum.cached + (jsonIntField(entry, "cacheReadInputTokens") ?? 0)
+        }),
+        { prompt: 0, completion: 0, cached: 0 }
+      )
+      const prompt =
+        perModel.length === 0 ? (jsonIntField(usage, "input_tokens") ?? 0) : summed.prompt
+      const completion =
+        perModel.length === 0 ? (jsonIntField(usage, "output_tokens") ?? 0) : summed.completion
+      const cached =
+        perModel.length === 0
+          ? jsonIntField(usage, "cache_read_input_tokens")
+          : summed.cached === 0
+            ? undefined
+            : summed.cached
       return [
         usageEventChunk(
           modelNames.length === 1 ? modelNames[0] : undefined,

package/src/providers/CliSupport.ts

@@ -75,14 +75,25 @@ export const optionalModelArgs = (model: string | undefined): ReadonlyArray<stri
 export const effortWord = (effort: Effort, top: "max" | "xhigh" = "max"): string =>
   effort === "max" ? top : effort
 
-export const toolEventChunk = (name: string, input: JsonValue | undefined, id?: string): LlmChunk =>
+export const toolEventChunk = (
+  name: string,
+  input: JsonValue | undefined,
+  id?: string,
+  options: {
+    /** The tool call this one runs inside, when a harness delegated it to a sub-agent (ADR 0033). */
+    readonly parent?: string
+  } = {}
+): LlmChunk =>
   LlmChunk.make({
     delta: "",
     metadata: {
       event: "tool_use",
       tool_name: name,
       tool_input: input === undefined ? "{}" : jsonText(input),
-      ...(id === undefined || id.length === 0 ? {} : { tool_id: id })
+      ...(id === undefined || id.length === 0 ? {} : { tool_id: id }),
+      ...(options.parent === undefined || options.parent.length === 0
+        ? {}
+        : { parent: options.parent })
     }
   })
 
@@ -117,6 +128,10 @@ export const toolResultChunk = (
     readonly input?: JsonValue
     /** What the tool returned, for an opt-in transcript; never in the trace. */
     readonly output?: string
+    /** The tool call this one ran inside (ADR 0033). */
+    readonly parent?: string
+    /** How long the harness says the tool ran, when it reports that itself. */
+    readonly durationMs?: number
   } = {}
 ): LlmChunk =>
   LlmChunk.make({
@@ -125,6 +140,12 @@ export const toolResultChunk = (
       event: "tool_result",
       ...(id === undefined || id.length === 0 ? {} : { tool_id: id }),
       ...(options.failed === true ? { tool_failed: "true" } : {}),
+      ...(options.parent === undefined || options.parent.length === 0
+        ? {}
+        : { parent: options.parent }),
+      ...(options.durationMs === undefined || !Number.isFinite(options.durationMs)
+        ? {}
+        : { tool_duration_ms: String(Math.max(0, Math.round(options.durationMs))) }),
       ...(options.tool === undefined ? {} : { tool_name: options.tool }),
       ...(options.input === undefined ? {} : { tool_input: jsonText(options.input) }),
       ...(options.output === undefined ? {} : { tool_content: options.output })
@@ -221,3 +242,43 @@ export const failClassifiedCliError = Effect.fn(
       message: `${fallbackPrefix}: ${raw}`
     })
 })
+
+/** The first `x.y.z` in a CLI's `--version` answer, if it holds one. */
+export const versionTriple = (text: string): ReadonlyArray<number> | undefined => {
+  const match = /(\d+)\.(\d+)\.(\d+)/.exec(text)
+  return match === null ? undefined : match.slice(1, 4).map(Number)
+}
+
+/** Whether `version` is `floor` or newer, component by component. */
+export const atLeastVersion = (
+  version: ReadonlyArray<number>,
+  floor: ReadonlyArray<number>
+): boolean => {
+  for (let index = 0; index < floor.length; index += 1) {
+    const have = version[index] ?? 0
+    const want = floor[index] ?? 0
+    if (have !== want) {
+      return have > want
+    }
+  }
+  return true
+}
+
+/**
+ * A harness pausing a turn on its own account — a provider retry, a context
+ * compaction — so the lane can say so instead of looking stuck (ADR 0033).
+ */
+export const statusChunk = (
+  status: "retrying" | "compacting",
+  phase: "start" | "end",
+  detail?: string
+): LlmChunk =>
+  LlmChunk.make({
+    delta: "",
+    metadata: {
+      event: "status",
+      status,
+      phase,
+      ...(detail === undefined || detail.length === 0 ? {} : { status_detail: detail })
+    }
+  })

package/src/providers/CodexConnector.ts

@@ -97,15 +97,31 @@ export const parseCodexStreamLine = (line: string): ReadonlyArray<LlmChunk> => {
   switch (jsonStringField(json, "type")) {
     case "item.started": {
       const item = jsonField(json, "item")
-      return jsonStringField(item, "type") === "command_execution"
-        ? [
+      switch (jsonStringField(item, "type")) {
+        case "command_execution":
+          return [
             toolEventChunk(
               "Bash",
               { command: jsonStringField(item, "command") ?? "" },
               jsonStringField(item, "id")
             )
           ]
-        : []
+        // A sub-agent call (spawn_agent, wait, send_input, close_agent): the
+        // delegation shows as a tool, its threads as the arguments (ADR 0033).
+        case "collab_tool_call":
+          return [
+            toolEventChunk(
+              jsonStringField(item, "tool") ?? "collab",
+              {
+                prompt: jsonStringField(item, "prompt") ?? "",
+                receivers: jsonField(item, "receiver_thread_ids") ?? []
+              },
+              jsonStringField(item, "id")
+            )
+          ]
+        default:
+          return []
+      }
     }
     case "item.completed": {
       const item = jsonField(json, "item")
@@ -129,6 +145,13 @@ export const parseCodexStreamLine = (line: string): ReadonlyArray<LlmChunk> => {
             })
           ]
         }
+        case "collab_tool_call":
+          return [
+            toolResultChunk(jsonStringField(item, "id"), {
+              failed: jsonStringField(item, "status") === "failed",
+              tool: jsonStringField(item, "tool") ?? "collab"
+            })
+          ]
         default:
           return []
       }

package/src/providers/GeminiCliProvider.ts

@@ -27,6 +27,7 @@ import {
 import { collect } from "../Streaming.ts"
 import { jsonCandidates, parseFromText, withSchemaHint } from "../StructuredOutput.ts"
 import {
+  atLeastVersion,
   failClassifiedCliError,
   isLoopDetectedMessage,
   jsonField,
@@ -36,6 +37,7 @@ import {
   jsonStringField,
   jsonText,
   parseJsonLine,
+  versionTriple,
   type JsonValue
 } from "./CliSupport.ts"
 
@@ -271,25 +273,9 @@ export const geminiProcessEnv = (
  */
 export const geminiReadOnlyFloor = "0.37.0"
 
-const versionTriple = (text: string): ReadonlyArray<number> | undefined => {
-  const match = /(\d+)\.(\d+)\.(\d+)/.exec(text)
-  return match === null ? undefined : match.slice(1, 4).map(Number)
-}
-
 /** The `x.y.z` in a `gemini --version` answer, if it holds one. */
 export const geminiVersionOf = (text: string): string | undefined => versionTriple(text)?.join(".")
 
-const atLeast = (version: ReadonlyArray<number>, floor: ReadonlyArray<number>): boolean => {
-  for (let index = 0; index < floor.length; index += 1) {
-    const have = version[index] ?? 0
-    const want = floor[index] ?? 0
-    if (have !== want) {
-      return have > want
-    }
-  }
-  return true
-}
-
 /** Why this CLI cannot hold a read-only seat, or nothing when it can. */
 export const geminiReadOnlyProblem = (versionText: string): string | undefined => {
   const version = versionTriple(versionText)
@@ -300,7 +286,7 @@ export const geminiReadOnlyProblem = (versionText: string): string | undefined =
       `needs gemini >= ${geminiReadOnlyFloor}, whose plan mode is enforced by its policy engine`
     )
   }
-  return atLeast(version, floor)
+  return atLeastVersion(version, floor)
     ? undefined
     : `Gemini CLI ${version.join(".")} cannot enforce a read-only seat: plan mode is a policy ` +
         `only from ${geminiReadOnlyFloor}; upgrade gemini, or give the judge and reviewer ` +