@f-o-h/cli 0.1.55 → 0.1.57

package/README.md

@@ -101,10 +101,10 @@ scaffold lane:
 FOH_CLI_SPEND_POLICY=no_spend foh setup --org <org-id> --agent-template <template-id> --agent-name "Demo Agent" --phone-mode observe --json
 ```
 
-`--phone-mode observe` checks whether a contact phone already exists without
-buying one. `--phone-mode skip` bypasses the phone step. `--phone-mode purchase`
-is the explicit paid contact path and is fail-closed when
-`FOH_CLI_SPEND_POLICY=no_spend` is set.
+`--phone-mode observe` checks whether a contact phone already exists without
+buying one. `--phone-mode skip` bypasses the phone step. `--phone-mode purchase`
+is the explicit paid contact path and is fail-closed when
+`FOH_CLI_SPEND_POLICY=no_spend` is set.
 
 If managed-number provisioning is blocked by account/provider capacity or empty
 reserve inventory, proof reports `provider_capacity_blocked`; fix capacity or

package/dist/foh.js

@@ -32853,7 +32853,7 @@ var StdioServerTransport = class {
 };
 
 // src/lib/cli-version.ts
-var CLI_VERSION = "0.1.55";
+var CLI_VERSION = "0.1.57";
 
 // src/commands/mcp-serve.ts
 var DEFAULT_TIMEOUT_MS = 12e4;
@@ -39250,6 +39250,8 @@ var CODEX_EXECUTOR_DENIED_ENV_PREFIXES = [
   "OPENAI_",
   "XAI_",
   "ANTHROPIC_",
+  "GOOGLE_",
+  "GEMINI_",
   "WHATSAPP_",
   "TWILIO_",
   "STRIPE_"
@@ -39453,9 +39455,22 @@ function resolveCodexProbeCommand() {
 function resolveCodexExecutionCommand() {
   return resolveCodexProbeCommand();
 }
+function resolveGeminiProbeCommand() {
+  if (process.platform !== "win32") return "gemini";
+  const appData = process.env.APPDATA;
+  if (appData) {
+    const appDataShim = (0, import_path13.join)(appData, "npm", "gemini.cmd");
+    if ((0, import_fs15.existsSync)(appDataShim)) return appDataShim;
+  }
+  return "gemini.cmd";
+}
+function resolveRunnerExecutionCommand(runner) {
+  return runner === "gemini" ? resolveGeminiProbeCommand() : resolveCodexExecutionCommand();
+}
 function validateCodexRunner(options) {
   if (options.skipRunnerProbe) {
     return {
+      runner: "codex",
       binaryChecked: false,
       requiredFlagsChecked: false,
       version: null,
@@ -39515,6 +39530,7 @@ ${yoloHelp.stderr}`;
   }
   if (supportsModernApprovalMode) {
     return {
+      runner: "codex",
       binaryChecked: true,
       requiredFlagsChecked: true,
       version: versionText,
@@ -39530,6 +39546,7 @@ ${yoloHelp.stderr}`;
     };
   }
   return {
+    runner: "codex",
     binaryChecked: true,
     requiredFlagsChecked: true,
     version: versionText,
@@ -39544,6 +39561,77 @@ ${yoloHelp.stderr}`;
     execArgs: ["--full-auto"]
   };
 }
+function validateGeminiRunner(options) {
+  const execArgs = [
+    "--approval-mode",
+    "yolo",
+    "--sandbox",
+    "--output-format",
+    "stream-json",
+    "--prompt",
+    "Execute the FOH external-agent prompt supplied on stdin."
+  ];
+  if (options.skipRunnerProbe) {
+    return {
+      runner: "gemini",
+      binaryChecked: false,
+      requiredFlagsChecked: false,
+      version: null,
+      rootHelpChecked: false,
+      execHelpChecked: false,
+      supportsModernApprovalMode: false,
+      supportsLegacyFullAuto: false,
+      supportsYoloAlias: null,
+      yoloPolicy: "not_checked",
+      supportsGeminiHeadless: true,
+      automationMode: "gemini-yolo",
+      globalArgs: [],
+      execArgs
+    };
+  }
+  const probe = options.runnerProbe ?? defaultRunnerProbe;
+  const probeCommand = resolveGeminiProbeCommand();
+  const version2 = probe(probeCommand, ["--version"]);
+  if (version2.error || version2.status !== 0) {
+    throw new ExternalAgentExecutorError("external_agent_runner_binary_missing", "Gemini runner probe failed: `gemini --version` did not exit 0.");
+  }
+  const versionText = `${version2.stdout}
+${version2.stderr}`.trim() || null;
+  const help = probe(probeCommand, ["--help"]);
+  if (help.error || help.status !== 0) {
+    throw new ExternalAgentExecutorError("external_agent_runner_help_unavailable", "Gemini runner probe failed: `gemini --help` did not exit 0.");
+  }
+  const helpText = `${help.stdout}
+${help.stderr}`;
+  const requiredFlags = ["--prompt", "--approval-mode", "--sandbox", "--output-format"];
+  const missing = requiredFlags.filter((flag) => !helpText.includes(flag));
+  if (missing.length > 0) {
+    throw new ExternalAgentExecutorError(
+      "external_agent_runner_required_flags_missing",
+      `Gemini runner is missing required headless flag(s): ${missing.join(", ")}`
+    );
+  }
+  return {
+    runner: "gemini",
+    binaryChecked: true,
+    requiredFlagsChecked: true,
+    version: versionText,
+    rootHelpChecked: true,
+    execHelpChecked: true,
+    supportsModernApprovalMode: false,
+    supportsLegacyFullAuto: false,
+    supportsYoloAlias: helpText.includes("--yolo"),
+    yoloPolicy: helpText.includes("--yolo") ? "observed_not_canonical" : "unsupported",
+    supportsGeminiHeadless: true,
+    automationMode: "gemini-yolo",
+    globalArgs: [],
+    execArgs
+  };
+}
+function validateRunner(options, runner) {
+  if (runner === "gemini") return validateGeminiRunner(options);
+  return validateCodexRunner(options);
+}
 function normalizeCodexSandboxBackend(value) {
   const normalized = (value || "default").trim().toLowerCase();
   if (normalized === "default" || normalized === "legacy-landlock") return normalized;
@@ -39591,12 +39679,12 @@ function promptVersionFromPath(promptPath) {
 }
 function createExternalAgentExecutorPlan(options) {
   const runner = String(options.runner || "codex");
-  if (runner !== "codex") {
+  if (runner !== "codex" && runner !== "gemini") {
     throw new ExternalAgentExecutorError("unsupported_external_agent_runner", `Unsupported runner: ${runner}`);
   }
   const batchPath = (0, import_path13.resolve)(options.batchPath);
   const batch = readBatch(batchPath);
-  const runnerProbe = validateCodexRunner(options);
+  const runnerProbe = validateRunner(options, runner);
   const codexSandboxBackend = normalizeCodexSandboxBackend(options.codexSandboxBackend);
   const codexSandboxMode = normalizeCodexSandboxMode(options.codexSandboxMode);
   const codexNetworkAccess = options.codexNetworkAccess === true;
@@ -39635,12 +39723,16 @@ function createExternalAgentExecutorPlan(options) {
       promptVersion: promptVersionFromPath(promptPath)
     });
     const promptVersion = String(env[EXTERNAL_AGENT_PROMPT_VERSION_ENV] || "unknown");
-    const jsonlPath = (0, import_path13.join)(runDir, "codex-exec.jsonl");
-    const lastMessagePath = (0, import_path13.join)(runDir, "codex-last-message.md");
-    const stderrPath = (0, import_path13.join)(runDir, "codex-stderr.txt");
+    const outputStem = runner === "gemini" ? "gemini" : "codex";
+    const jsonlPath = (0, import_path13.join)(runDir, `${outputStem}-exec.jsonl`);
+    const lastMessagePath = (0, import_path13.join)(runDir, `${outputStem}-last-message.md`);
+    const stderrPath = (0, import_path13.join)(runDir, `${outputStem}-stderr.txt`);
     const runPath = (0, import_path13.join)(runDir, "run.json");
     const artifactSafetyPath = (0, import_path13.join)(runDir, "artifact-safety.json");
-    const args = [
+    const args = runner === "gemini" ? [
+      ...runnerProbe.globalArgs,
+      ...runnerProbe.execArgs
+    ] : [
       ...runnerProbe.globalArgs,
       "exec",
       ...codexConfigArgs({ backend: codexSandboxBackend, networkAccess: codexNetworkAccess }),
@@ -39665,7 +39757,7 @@ function createExternalAgentExecutorPlan(options) {
       run_dir: runDir,
       prompt_path: promptPath,
       workspace_dir: workspaceDir,
-      command: "codex",
+      command: runner,
       args,
       env_keys: Object.keys(env).sort(),
       outputs: {
@@ -39695,6 +39787,7 @@ function createExternalAgentExecutorPlan(options) {
       denied_env_names: [...CODEX_EXECUTOR_DENIED_ENV_NAMES],
       runner_probe: {
         binary_checked: runnerProbe.binaryChecked,
+        runner: runnerProbe.runner,
         required_flags_checked: runnerProbe.requiredFlagsChecked,
         version: runnerProbe.version,
         root_help_checked: runnerProbe.rootHelpChecked,
@@ -39704,9 +39797,11 @@ function createExternalAgentExecutorPlan(options) {
         supports_yolo_alias: runnerProbe.supportsYoloAlias,
         selected_automation_mode: runnerProbe.automationMode,
         canonical_command_policy: "explicit-flags",
-        yolo_policy: runnerProbe.yoloPolicy
+        yolo_policy: runnerProbe.yoloPolicy,
+        ...runnerProbe.runner === "gemini" ? { supports_gemini_headless: runnerProbe.supportsGeminiHeadless } : {}
       },
-      codex_automation_mode: runnerProbe.automationMode,
+      runner_automation_mode: runnerProbe.automationMode,
+      codex_automation_mode: runner === "codex" ? runnerProbe.automationMode : null,
       codex_sandbox_mode: codexSandboxMode,
       codex_sandbox_backend: codexSandboxBackend,
       codex_network_access: codexNetworkAccess
@@ -39769,7 +39864,7 @@ function relativeArtifactName(path2) {
   return (0, import_path13.basename)(path2);
 }
 function classifyRun(input) {
-  if (input.timedOut) return { status: "hold", reasonCode: "codex_runner_timeout" };
+  if (input.timedOut) return { status: "hold", reasonCode: `${input.run.command}_runner_timeout` };
   if (!input.artifactSafetyOk) return { status: "fail", reasonCode: "external_agent_artifact_safety_blocked" };
   const completedCommands = readCommandRecords(input.run.run_dir).filter((record2) => record2.phase === "completed");
   const observedVersions = completedCommands.map((record2) => String(record2.cli_version || "").trim()).filter((version2) => /^\d+\.\d+\.\d+$/.test(version2));
@@ -39854,7 +39949,7 @@ ${stderr}`;
   if (/browser|approve|approval|login|auth|sign in/i.test(combined) && !proofArtifactPasses(input.run.run_dir)) {
     return { status: "hold", reasonCode: "auth_browser_approval_required" };
   }
-  if (input.exitCode !== 0) return { status: "hold", reasonCode: "codex_runner_nonzero_exit" };
+  if (input.exitCode !== 0) return { status: "hold", reasonCode: `${input.run.command}_runner_nonzero_exit` };
   if (proofArtifactPasses(input.run.run_dir)) return { status: "pass", reasonCode: null };
   return { status: "hold", reasonCode: "external_agent_proof_artifact_missing" };
 }
@@ -39868,7 +39963,7 @@ function buildExecutedRunArtifact(input) {
     failure_reason_code: input.reasonCode,
     model_provider: input.run.model_provider,
     model_name: input.run.model_name,
-    agent_shell: "codex-exec",
+    agent_shell: `${input.run.command}-exec`,
     workspace_type: "clean-no-repo-programmatic",
     prompt_version: input.run.prompt_version,
     prompt_path: "prompt.txt",
@@ -39918,11 +40013,13 @@ function buildExecutedRunArtifact(input) {
       improvement_packet: input.status === "pass" ? null : "improvement-packet.json",
       agent_metadata: agentMetadata.path,
       notes: (0, import_fs15.existsSync)((0, import_path13.join)(input.run.run_dir, "notes.md")) ? "notes.md" : null,
-      codex_last_message: relativeArtifactName(input.run.outputs.last_message),
-      codex_stderr: relativeArtifactName(input.run.outputs.stderr),
+      runner_last_message: relativeArtifactName(input.run.outputs.last_message),
+      runner_stderr: relativeArtifactName(input.run.outputs.stderr),
+      codex_last_message: input.run.command === "codex" ? relativeArtifactName(input.run.outputs.last_message) : null,
+      codex_stderr: input.run.command === "codex" ? relativeArtifactName(input.run.outputs.stderr) : null,
       artifact_safety: relativeArtifactName(input.run.outputs.artifact_safety)
     },
-    summary: input.status === "pass" ? "Controlled Codex external-agent run produced passing proof evidence." : `Controlled Codex external-agent run ended as ${input.status} with reason ${input.reasonCode}.`,
+    summary: input.status === "pass" ? `Controlled ${input.run.command} external-agent run produced passing proof evidence.` : `Controlled ${input.run.command} external-agent run ended as ${input.status} with reason ${input.reasonCode}.`,
     next_commands: input.status === "pass" ? [externalAgentSummaryCommand((0, import_path13.dirname)(input.run.run_dir))] : [
       "foh eval external-agent scan-artifacts --run-dir <run_dir> --private-repo-root <private_repo_root> --write-redacted --json",
       "foh bug improve --from external-agent-run --file <run_dir>/run.json --out <run_dir>/improvement-packet.json --json",
@@ -39930,7 +40027,7 @@ function buildExecutedRunArtifact(input) {
     ]
   };
 }
-function spawnCodex(input) {
+function spawnRunner(input) {
   return new Promise((resolveRun) => {
     const started = Date.now();
     const commandInvocation = buildCommandInvocation(input.command, input.args);
@@ -39979,15 +40076,18 @@ function spawnCodex(input) {
 }
 function buildCommandInvocation(command, args) {
   if (process.platform === "win32" && command.toLowerCase().endsWith(".cmd")) {
-    const codexEntrypoint = (0, import_path13.join)((0, import_path13.dirname)(command), "node_modules", "@openai", "codex", "bin", "codex.js");
+    const binDir = (0, import_path13.dirname)(command);
+    const codexEntrypoint = (0, import_path13.join)(binDir, "node_modules", "@openai", "codex", "bin", "codex.js");
     if ((0, import_fs15.existsSync)(codexEntrypoint)) return { command: process.execPath, args: [codexEntrypoint, ...args] };
+    const geminiEntrypoint = (0, import_path13.join)(binDir, "node_modules", "@google", "gemini-cli", "bundle", "gemini.js");
+    if ((0, import_fs15.existsSync)(geminiEntrypoint)) return { command: process.execPath, args: ["--no-warnings=DEP0040", geminiEntrypoint, ...args] };
   }
   return { command, args };
 }
 async function executeExternalAgentExecutorPlan(plan, options = {}) {
   const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const results = [];
-  const runnerCommand = options.runnerCommand || resolveCodexExecutionCommand();
+  const runnerCommand = options.runnerCommand || resolveRunnerExecutionCommand(plan.runner);
   const authPreflight = options.env ? await runExternalAgentEvalAuthPreflight(options.env) : null;
   if (authPreflight && !authPreflight.ok) {
     const endedAt2 = (/* @__PURE__ */ new Date()).toISOString();
@@ -40037,7 +40137,7 @@ async function executeExternalAgentExecutorPlan(plan, options = {}) {
       runDir: commandCaptureDir,
       promptVersion: run.prompt_version
     });
-    const spawned = await spawnCodex({
+    const spawned = await spawnRunner({
       command: runnerCommand,
       args: run.args,
       cwd: run.workspace_dir,
@@ -40153,6 +40253,33 @@ function externalAgentSummaryCommand2(root) {
     quoteArg(reportPath)
   ].join(" ");
 }
+function executorRecoveryCommands(reasonCode, runner) {
+  const normalizedRunner = String(runner || "codex").trim().toLowerCase();
+  if (reasonCode === "external_agent_runner_binary_missing") {
+    if (normalizedRunner === "gemini") {
+      return [
+        "gemini --version",
+        "gemini --help",
+        "Install and authenticate Gemini CLI on the isolated eval host, then rerun the same `foh eval external-agent execute --runner gemini --dry-run --json` command."
+      ];
+    }
+    return [
+      "codex --version",
+      "codex exec --help",
+      "Run `codex login` on the isolated eval host if the binary is installed but not usable, then rerun the dry-run executor plan."
+    ];
+  }
+  if (reasonCode === "external_agent_runner_required_flags_missing" || reasonCode === "external_agent_runner_help_unavailable") {
+    return [
+      `${normalizedRunner} --version`,
+      `${normalizedRunner} --help`,
+      "Upgrade or reinstall the runner CLI on the isolated eval host, then rerun the dry-run executor plan."
+    ];
+  }
+  return [
+    "Fix the executor plan input or workspace path and rerun with --dry-run."
+  ];
+}
 function parseModelSpec(raw) {
   const [provider, ...nameParts] = String(raw || "").split("/");
   const name = nameParts.join("/");
@@ -40536,9 +40663,7 @@ Exit the shell to finalize run.json.
           status: "blocked",
           reasonCode: error2.reasonCode,
           summary: error2.message,
-          nextCommands: [
-            "Fix the executor plan input or workspace path and rerun with --dry-run."
-          ]
+          nextCommands: executorRecoveryCommands(error2.reasonCode, String(opts.runner || "codex"))
         }), { json: Boolean(opts.json) });
         process.exitCode = 1;
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@f-o-h/cli",
-  "version": "0.1.55",
+  "version": "0.1.57",
   "description": "FOH CLI - AI-operator provisioning tool for Front Of House",
   "license": "UNLICENSED",
   "bin": {