mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-02 13:39:41 +02:00
Aamer Akhter
fef903df98
A CLI installed by nvm, Homebrew or a user-level npm prefix lives on a PATH that only a login shell sets up. Codeman running under systemd or launchd does not get that PATH — launchd hands a job `/usr/bin:/bin:/usr/sbin:/sbin` — so every resolver reported the CLI as unavailable on installs where it is plainly there and works from a terminal. Each of the six resolvers had its own hand-rolled copy of the same PATH walk, so the fix is factored into one shared `createCliExecutableResolver()` with an explicit lookup order: the server process PATH, then common install directories in order, then an interactive login shell as the last resort. Only the last step spawns anything, and only when the cheap lookups have already missed. Also adds `formatCliNotFoundMessage()`, so a failure explains where it looked instead of just asserting the CLI is missing. Its diagnostics are bounded and control characters are flattened, so a not-found message cannot dump arbitrary environment data. Success is cached and failure is retried, so installing a CLI while the server is running is picked up without a restart. Net -103 lines across the six resolvers. Behaviour is unchanged wherever the CLI was already on the process PATH: that remains the first thing checked. Tests: 20 cases in test/cli-executable-resolver.test.ts covering the precedence order, login-shell-only resolution, the caching rule, unsafe-name rejection, and the bounded diagnostics.
47 lines
1.5 KiB
TypeScript
47 lines
1.5 KiB
TypeScript
/**
|
|
* @fileoverview Resolve the Gemini CLI binary across common install paths.
|
|
*
|
|
* Mirrors codex-cli-resolver.ts and opencode-cli-resolver.ts. Finds the
|
|
* `gemini` binary and provides an augmented PATH directory for tmux sessions.
|
|
*
|
|
* @module utils/gemini-cli-resolver
|
|
*/
|
|
|
|
import { join } from 'node:path';
|
|
import { homedir } from 'node:os';
|
|
import { createCliExecutableResolver, formatCliNotFoundMessage } from './cli-executable-resolver.js';
|
|
|
|
/** Common directories where the Gemini CLI binary may be installed */
|
|
const GEMINI_SEARCH_DIRS = [
|
|
join(homedir(), '.gemini', 'bin'),
|
|
join(homedir(), '.local', 'bin'),
|
|
'/usr/local/bin',
|
|
join(homedir(), '.bun', 'bin'),
|
|
join(homedir(), '.npm-global', 'bin'),
|
|
join(homedir(), 'bin'),
|
|
];
|
|
|
|
const geminiResolver = createCliExecutableResolver({ binary: 'gemini', searchDirs: GEMINI_SEARCH_DIRS });
|
|
const GEMINI_NOT_FOUND = 'Gemini CLI not found. Install with: npm install -g @google/gemini-cli';
|
|
|
|
/**
|
|
* Finds the directory containing the `gemini` binary.
|
|
* Checks `which gemini` first, then falls back to common install locations.
|
|
*
|
|
* @returns Directory path, or null if not found
|
|
*/
|
|
export function resolveGeminiDir(): string | null {
|
|
return geminiResolver.resolve()?.directory ?? null;
|
|
}
|
|
|
|
/**
|
|
* Check if Gemini CLI is available on the system.
|
|
*/
|
|
export function isGeminiAvailable(): boolean {
|
|
return resolveGeminiDir() !== null;
|
|
}
|
|
|
|
export function getGeminiNotFoundMessage(): string {
|
|
return formatCliNotFoundMessage(GEMINI_NOT_FOUND, geminiResolver.diagnostics());
|
|
}
|