The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
Fix Gemini headless invocation stalls (#8368)
Sergio Sánchez Zavala323b6220cc5b
diff --git a/packages/adapters/gemini-local/src/index.ts b/packages/adapters/gemini-local/src/index.tsindex 626266b050..d1b584ff23 100644--- a/packages/adapters/gemini-local/src/index.ts+++ b/packages/adapters/gemini-local/src/index.ts@@ -60,7 +60,8 @@ Operational fields:- graceSec (number, optional): SIGTERM grace period in secondsNotes:-- Runs use positional prompt arguments, not stdin.+- Runs use --prompt for non-interactive execution, not stdin.+- The adapter sets a headless-safe terminal/browser environment for Gemini CLI child processes so unattended runs do not wait on browser auth or 256-color terminal prompts.- Sessions resume with --resume when stored session cwd matches the current cwd.- Paperclip auto-injects local skills into \`~/.gemini/skills/\` via symlinks, so the CLI can discover both credentials and skills in their natural location.- Authentication can use GEMINI_API_KEY / GOOGLE_API_KEY or local Gemini CLI login.diff --git a/packages/adapters/gemini-local/src/server/execute.remote.test.ts b/packages/adapters/gemini-local/src/server/execute.remote.test.tsindex e050427bf5..0fcbcfffd7 100644--- a/packages/adapters/gemini-local/src/server/execute.remote.test.ts+++ b/packages/adapters/gemini-local/src/server/execute.remote.test.ts@@ -126,7 +126,10 @@ describe("gemini remote execution", () => {},config: {command: "gemini",- env: { GEMINI_API_KEY: "test-key" },+ env: {+ GEMINI_API_KEY: "test-key",+ NO_COLOR: "1",+ },},context: {paperclipWorkspace: {@@ -218,6 +221,10 @@ describe("gemini remote execution", () => {expect(call?.[3].env.PAPERCLIP_API_URL).toBe("http://127.0.0.1:4310");expect(call?.[3].env.PAPERCLIP_API_BRIDGE_MODE).toBe("queue_v1");expect(call?.[3].env.GEMINI_CLI_TRUST_WORKSPACE).toBe("true");+ expect(call?.[3].env.TERM).toBe("xterm-256color");+ expect(call?.[3].env.COLORTERM).toBe("truecolor");+ expect(call?.[3].env.NO_BROWSER).toBe("1");+ expect(call?.[3].env).not.toHaveProperty("NO_COLOR");expect(call?.[3].remoteExecution?.remoteCwd).toBe(managedRemoteWorkspace);expect(startAdapterExecutionTargetPaperclipBridge).toHaveBeenCalledTimes(1);expect(restoreWorkspaceFromSshExecution).toHaveBeenCalledTimes(1);diff --git a/packages/adapters/gemini-local/src/server/execute.ts b/packages/adapters/gemini-local/src/server/execute.tsindex 5431eca5e7..0a3c0da600 100644--- a/packages/adapters/gemini-local/src/server/execute.ts+++ b/packages/adapters/gemini-local/src/server/execute.ts@@ -71,6 +71,28 @@ function resolveGeminiBillingType(env: Record<string, string>): "api" | "subscri: "subscription";}+function buildGeminiHeadlessEnv(env: Record<string, string>): Record<string, string> {+ const next = { ...env };+ const term = env.TERM?.trim().toLowerCase();+ if (!term || term === "dumb" || term === "vt100") {+ next.TERM = "xterm-256color";+ }+ if (!next.COLORTERM?.trim()) {+ next.COLORTERM = "truecolor";+ }+ next.NO_BROWSER = "1";+ delete next.NO_COLOR;+ return next;+}++function buildGeminiRuntimeEnv(env: Record<string, string>): Record<string, string> {+ return Object.fromEntries(+ Object.entries(ensurePathInEnv({ ...process.env, ...buildGeminiHeadlessEnv(env) })).filter(+ (entry): entry is [string, string] => typeof entry[1] === "string",+ ),+ );+}+function renderPaperclipEnvNote(env: Record<string, string>): string {const paperclipKeys = Object.keys(env).filter((key) => key.startsWith("PAPERCLIP_"))@@ -269,17 +291,8 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (!hasExplicitApiKey && authToken) {env.PAPERCLIP_API_KEY = authToken;}- const effectiveEnv = Object.fromEntries(- Object.entries({ ...process.env, ...env }).filter(- (entry): entry is [string, string] => typeof entry[1] === "string",- ),- );- const billingType = resolveGeminiBillingType(effectiveEnv);- const runtimeEnv = Object.fromEntries(- Object.entries(ensurePathInEnv(effectiveEnv)).filter(- (entry): entry is [string, string] => typeof entry[1] === "string",- ),- );+ const runtimeEnv = buildGeminiRuntimeEnv(env);+ const billingType = resolveGeminiBillingType(runtimeEnv);const timeoutSec = resolveAdapterExecutionTargetTimeoutSec(executionTarget,asNumber(config.timeoutSec, 0),@@ -301,12 +314,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExectimeoutSec,});const resolvedCommand = await resolveAdapterExecutionTargetCommandForLogs(command, executionTarget, cwd, runtimeEnv);- let loggedEnv = buildInvocationEnvForLogs(env, {- runtimeEnv,- includeRuntimeKeys: ["HOME"],- resolvedCommand,- });-const extraArgs = (() => {const fromExtraArgs = asStringArray(config.extraArgs);if (fromExtraArgs.length > 0) return fromExtraArgs;@@ -434,11 +441,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec});if (paperclipBridge) {Object.assign(env, paperclipBridge.env);- loggedEnv = buildInvocationEnvForLogs(env, {- runtimeEnv: ensurePathInEnv({ ...process.env, ...env }),- includeRuntimeKeys: ["HOME"],- resolvedCommand,- });}}@@ -484,6 +486,7 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst commandNotes = (() => {const notes: string[] = ["Prompt is passed to Gemini via --prompt for non-interactive execution."];notes.push("Added --approval-mode yolo for unattended execution.");+ notes.push("Set headless terminal/browser env so Gemini fails fast instead of opening interactive auth or color prompts.");if (executionTargetIsRemote) {notes.push("Set GEMINI_CLI_TRUST_WORKSPACE=true for remote headless execution.");}@@ -557,6 +560,13 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst runAttempt = async (resumeSessionId: string | null) => {const args = buildArgs(resumeSessionId);+ const invocationEnv = buildGeminiHeadlessEnv(env);+ const invocationRuntimeEnv = buildGeminiRuntimeEnv(env);+ const loggedEnv = buildInvocationEnvForLogs(invocationEnv, {+ runtimeEnv: invocationRuntimeEnv,+ includeRuntimeKeys: ["HOME"],+ resolvedCommand,+ });if (onMeta) {await onMeta({adapterType: "gemini_local",@@ -575,7 +585,7 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst proc = await runAdapterExecutionTargetProcess(runId, runtimeExecutionTarget, command, args, {cwd,- env,+ env: invocationEnv,timeoutSec,graceSec,onSpawn,diff --git a/packages/adapters/gemini-local/src/server/parse.test.ts b/packages/adapters/gemini-local/src/server/parse.test.tsindex cd2bd55756..fd4cea1e82 100644--- a/packages/adapters/gemini-local/src/server/parse.test.ts+++ b/packages/adapters/gemini-local/src/server/parse.test.ts@@ -1,5 +1,6 @@import { describe, expect, it } from "vitest";import {+ detectGeminiAuthRequired,isGeminiTransientNetworkError,isGeminiSessionUnrecoverableError,parseGeminiJsonl,@@ -134,6 +135,17 @@ describe("parseGeminiJsonl", () => {const result = parseGeminiJsonl(stdout);expect(result.errorMessage).toBe("boom");});++ it("classifies non-interactive manual authorization failures as auth required", () => {+ const result = detectGeminiAuthRequired({+ parsed: null,+ stdout: "",+ stderr:+ "Error authenticating: FatalAuthenticationError: Manual authorization is required but the current session is non-interactive.",+ });++ expect(result.requiresAuth).toBe(true);+ });});describe("isGeminiSessionUnrecoverableError", () => {diff --git a/packages/adapters/gemini-local/src/server/parse.ts b/packages/adapters/gemini-local/src/server/parse.tsindex 93686b619f..008f6522d0 100644--- a/packages/adapters/gemini-local/src/server/parse.ts+++ b/packages/adapters/gemini-local/src/server/parse.ts@@ -263,7 +263,7 @@ export function describeGeminiFailure(parsed: Record<string, unknown>): string |return parts.length > 1 ? parts.join(": ") : null;}-const GEMINI_AUTH_REQUIRED_RE = /(?:not\s+authenticated|please\s+authenticate|api[_ ]?key\s+(?:required|missing|invalid)|authentication\s+required|unauthorized|invalid\s+credentials|not\s+logged\s+in|login\s+required|run\s+`?gemini\s+auth(?:\s+login)?`?\s+first)/i;+const GEMINI_AUTH_REQUIRED_RE = /(?:not\s+authenticated|please\s+authenticate|api[_ ]?key\s+(?:required|missing|invalid)|authentication\s+required|manual\s+authorization\s+is\s+required|unauthorized|invalid\s+credentials|not\s+logged\s+in|login\s+required|run\s+`?gemini\s+auth(?:\s+login)?`?\s+first)/i;const GEMINI_QUOTA_EXHAUSTED_RE =/(?:resource_exhausted|quota|rate[-\s]?limit|too many requests|\b429\b|billing details)/i;