mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-03-23 12:03:07 +00:00
Feature: worktree view customization and stability fixes (#805)
* Changes from feature/worktree-view-customization * Feature: Git sync, set-tracking, and push divergence handling (#796) * Add quick-add feature with improved workflows (#802) * Changes from feature/quick-add * feat: Clarify system prompt and improve error handling across services. Address PR Feedback * feat: Improve PR description parsing and refactor event handling * feat: Add context options to pipeline orchestrator initialization * fix: Deduplicate React and handle CJS interop for use-sync-external-store Resolve "Cannot read properties of null (reading 'useState')" errors by deduplicating React/react-dom and ensuring use-sync-external-store is bundled together with React to prevent CJS packages from resolving to different React instances. * Changes from feature/worktree-view-customization * refactor: Remove unused worktree swap and highlight props * refactor: Consolidate feature completion logic and improve thinking level defaults * feat: Increase max turn limit to 10000 - Update DEFAULT_MAX_TURNS from 1000 to 10000 in settings-helpers.ts and agent-executor.ts - Update MAX_ALLOWED_TURNS from 2000 to 10000 in settings-helpers.ts - Update UI clamping logic from 2000 to 10000 in app-store.ts - Update fallback values from 1000 to 10000 in use-settings-sync.ts - Update default value from 1000 to 10000 in DEFAULT_GLOBAL_SETTINGS - Update documentation to reflect new range: 1-10000 Allows agents to perform up to 10000 turns for complex feature execution. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com> * feat: Add model resolution, improve session handling, and enhance UI stability * refactor: Remove unused sync and tracking branch props from worktree components * feat: Add PR number update functionality to worktrees. Address pr feedback * feat: Optimize Gemini CLI startup and add tool result tracking * refactor: Improve error handling and simplify worktree task cleanup --------- Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
gsxdsm
@@ -24,7 +24,7 @@ import type {
|
||||
import { validateBareModelId } from '@automaker/types';
|
||||
import { GEMINI_MODEL_MAP, type GeminiAuthStatus } from '@automaker/types';
|
||||
import { createLogger, isAbortError } from '@automaker/utils';
|
||||
import { spawnJSONLProcess } from '@automaker/platform';
|
||||
import { spawnJSONLProcess, type SubprocessOptions } from '@automaker/platform';
|
||||
import { normalizeTodos } from './tool-normalization.js';
|
||||
|
||||
// Create logger for this module
|
||||
@@ -263,6 +263,14 @@ export class GeminiProvider extends CliProvider {
|
||||
// Use explicit approval-mode for clearer semantics
|
||||
cliArgs.push('--approval-mode', 'yolo');
|
||||
|
||||
// Force headless (non-interactive) mode with --prompt flag.
|
||||
// The actual prompt content is passed via stdin (see buildSubprocessOptions()),
|
||||
// but we MUST include -p to trigger headless mode. Without it, Gemini CLI
|
||||
// starts in interactive mode which adds significant startup overhead
|
||||
// (interactive REPL setup, extra context loading, etc.).
|
||||
// Per Gemini CLI docs: stdin content is "appended to" the -p value.
|
||||
cliArgs.push('--prompt', '');
|
||||
|
||||
// Explicitly include the working directory in allowed workspace directories
|
||||
// This ensures Gemini CLI allows file operations in the project directory,
|
||||
// even if it has a different workspace cached from a previous session
|
||||
@@ -279,9 +287,6 @@ export class GeminiProvider extends CliProvider {
|
||||
// Thinking capabilities are determined by the model selection (e.g., gemini-2.5-pro).
|
||||
// The model handles thinking internally based on the task complexity.
|
||||
|
||||
// The prompt will be passed as the last positional argument
|
||||
// We'll append it in executeQuery after extracting the text
|
||||
|
||||
return cliArgs;
|
||||
}
|
||||
|
||||
@@ -413,6 +418,32 @@ export class GeminiProvider extends CliProvider {
|
||||
// CliProvider Overrides
|
||||
// ==========================================================================
|
||||
|
||||
/**
|
||||
* Build subprocess options with stdin data for prompt and speed-optimized env vars.
|
||||
*
|
||||
* Passes the prompt via stdin instead of --prompt CLI arg to:
|
||||
* - Avoid shell argument size limits with large prompts (system prompt + context)
|
||||
* - Avoid shell escaping issues with special characters in prompts
|
||||
* - Match the pattern used by Cursor, OpenCode, and Codex providers
|
||||
*
|
||||
* Also injects environment variables to reduce Gemini CLI startup overhead:
|
||||
* - GEMINI_TELEMETRY_ENABLED=false: Disables OpenTelemetry collection
|
||||
*/
|
||||
protected buildSubprocessOptions(options: ExecuteOptions, cliArgs: string[]): SubprocessOptions {
|
||||
const subprocessOptions = super.buildSubprocessOptions(options, cliArgs);
|
||||
|
||||
// Pass prompt via stdin to avoid shell interpretation of special characters
|
||||
// and shell argument size limits with large system prompts + context files
|
||||
subprocessOptions.stdinData = this.extractPromptText(options);
|
||||
|
||||
// Disable telemetry to reduce startup overhead
|
||||
if (subprocessOptions.env) {
|
||||
subprocessOptions.env['GEMINI_TELEMETRY_ENABLED'] = 'false';
|
||||
}
|
||||
|
||||
return subprocessOptions;
|
||||
}
|
||||
|
||||
/**
|
||||
* Override error mapping for Gemini-specific error codes
|
||||
*/
|
||||
@@ -522,14 +553,21 @@ export class GeminiProvider extends CliProvider {
|
||||
);
|
||||
}
|
||||
|
||||
// Extract prompt text to pass as positional argument
|
||||
const promptText = this.extractPromptText(options);
|
||||
// Ensure .geminiignore exists in the working directory to prevent Gemini CLI
|
||||
// from scanning .git and node_modules directories during startup. This reduces
|
||||
// startup time significantly (reported: 35s → 11s) by skipping large directories
|
||||
// that Gemini CLI would otherwise traverse for context discovery.
|
||||
await this.ensureGeminiIgnore(options.cwd || process.cwd());
|
||||
|
||||
// Build CLI args and append the prompt as the last positional argument
|
||||
const cliArgs = this.buildCliArgs(options);
|
||||
cliArgs.push(promptText); // Gemini CLI uses positional args for the prompt
|
||||
// Embed system prompt into the user prompt so Gemini CLI receives
|
||||
// project context (CLAUDE.md, CODE_QUALITY.md, etc.) that would
|
||||
// otherwise be silently dropped since Gemini CLI has no --system-prompt flag.
|
||||
const effectiveOptions = this.embedSystemPromptIntoPrompt(options);
|
||||
|
||||
const subprocessOptions = this.buildSubprocessOptions(options, cliArgs);
|
||||
// Build CLI args for headless execution.
|
||||
const cliArgs = this.buildCliArgs(effectiveOptions);
|
||||
|
||||
const subprocessOptions = this.buildSubprocessOptions(effectiveOptions, cliArgs);
|
||||
|
||||
let sessionId: string | undefined;
|
||||
|
||||
@@ -582,6 +620,49 @@ export class GeminiProvider extends CliProvider {
|
||||
// Gemini-Specific Methods
|
||||
// ==========================================================================
|
||||
|
||||
/**
|
||||
* Ensure a .geminiignore file exists in the working directory.
|
||||
*
|
||||
* Gemini CLI scans the working directory for context discovery during startup.
|
||||
* Excluding .git and node_modules dramatically reduces startup time by preventing
|
||||
* traversal of large directories (reported improvement: 35s → 11s).
|
||||
*
|
||||
* Only creates the file if it doesn't already exist to avoid overwriting user config.
|
||||
*/
|
||||
private async ensureGeminiIgnore(cwd: string): Promise<void> {
|
||||
const ignorePath = path.join(cwd, '.geminiignore');
|
||||
const content = [
|
||||
'# Auto-generated by Automaker to speed up Gemini CLI startup',
|
||||
'# Prevents Gemini CLI from scanning large directories during context discovery',
|
||||
'.git',
|
||||
'node_modules',
|
||||
'dist',
|
||||
'build',
|
||||
'.next',
|
||||
'.nuxt',
|
||||
'coverage',
|
||||
'.automaker',
|
||||
'.worktrees',
|
||||
'.vscode',
|
||||
'.idea',
|
||||
'*.lock',
|
||||
'',
|
||||
].join('\n');
|
||||
try {
|
||||
// Use 'wx' flag for atomic creation - fails if file exists (EEXIST)
|
||||
await fs.writeFile(ignorePath, content, { encoding: 'utf-8', flag: 'wx' });
|
||||
logger.debug(`Created .geminiignore at ${ignorePath}`);
|
||||
} catch (writeError) {
|
||||
// EEXIST means file already exists - that's fine, preserve user's file
|
||||
if ((writeError as NodeJS.ErrnoException).code === 'EEXIST') {
|
||||
logger.debug(`.geminiignore already exists at ${ignorePath}, preserving existing file`);
|
||||
return;
|
||||
}
|
||||
// Non-fatal: startup will just be slower without the ignore file
|
||||
logger.debug(`Failed to create .geminiignore: ${writeError}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a GeminiError with details
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user