vibeman 0.0.3 → 0.0.5

package/dist/runtime/api/types/settings.d.ts

@@ -1,14 +1,18 @@
+type ClaudeModel = 'claude-sonnet-4-20250514' | 'claude-opus-4-1-20250805' | 'claude-3-5-haiku-20241022';
+type CodexModel = 'gpt-5.1-codex-max' | 'gpt-5.1-codex-max-low' | 'gpt-5.1-codex-max-medium' | 'gpt-5.1-codex-max-high' | 'gpt-5.1-codex-max-extra-high' | 'gpt-5.1-codex' | 'gpt-5.1-codex-low' | 'gpt-5.1-codex-medium' | 'gpt-5.1-codex-high' | 'gpt-5.1-codex-extra-high' | 'gpt-5.1-codex-mini' | 'gpt-5.1-codex-mini-low' | 'gpt-5.1-codex-mini-medium' | 'gpt-5.1-codex-mini-high' | 'gpt-5.1-codex-mini-extra-high' | 'gpt-5.2' | 'gpt-5.2-low' | 'gpt-5.2-medium' | 'gpt-5.2-high' | 'gpt-5.2-extra-high' | 'gpt-5.1' | 'gpt-5.1-low' | 'gpt-5.1-medium' | 'gpt-5.1-high' | 'gpt-5.1-extra-high';
+type GeminiModel = 'gemini-3-pro-preview' | 'gemini-3-flash-preview' | 'gemini-2.5-pro' | 'gemini-2.5-flash' | 'gemini-2.5-flash-lite';
+type AllowedModel = ClaudeModel | CodexModel | GeminiModel | 'auto';
 export interface VibemanSettings {
     agents: {
-        defaultProvider: 'claude-code' | 'codex';
+        defaultProvider: 'claude-code' | 'codex' | 'gemini' | 'amp';
         codingAgent: {
-            provider: 'claude-code' | 'codex';
-            model: 'claude-sonnet-4-20250514' | 'claude-opus-4-1-20250805' | 'claude-3-5-haiku-20241022' | 'gpt-5' | 'gpt-5-low' | 'gpt-5-medium' | 'gpt-5-high' | 'gpt-5-codex' | 'gpt-5-codex-low' | 'gpt-5-codex-medium' | 'gpt-5-codex-high';
+            provider: 'claude-code' | 'codex' | 'gemini' | 'amp';
+            model: AllowedModel;
             maxTokens?: number;
         };
         judgeAgent: {
-            provider: 'claude-code' | 'codex';
-            model: 'claude-sonnet-4-20250514' | 'claude-opus-4-1-20250805' | 'claude-3-5-haiku-20241022' | 'gpt-5' | 'gpt-5-low' | 'gpt-5-medium' | 'gpt-5-high' | 'gpt-5-codex' | 'gpt-5-codex-low' | 'gpt-5-codex-medium' | 'gpt-5-codex-high';
+            provider: 'claude-code' | 'codex' | 'gemini' | 'amp';
+            model: AllowedModel;
             maxTokens?: number;
             reviewThresholdScore: number;
         };
@@ -23,9 +27,15 @@ export interface VibemanSettings {
             codex?: {
                 binPath?: string;
             };
+            gemini?: {
+                binPath?: string;
+            };
+            amp?: {
+                binPath?: string;
+            };
         };
         routingPolicy?: {
-            defaultProvider?: 'claude-code' | 'codex';
+            defaultProvider?: 'claude-code' | 'codex' | 'gemini' | 'amp';
             operations?: Partial<Record<'execute_task' | 'quality_checks' | 'ai_codereview' | 'ai_merge' | 'improve_task', {
                 provider: string;
                 model?: string;
@@ -92,3 +102,4 @@ export interface SettingsValidationError {
     expected?: string;
     received?: string;
 }
+export {};

package/dist/runtime/api/vcs/git-service.d.ts

@@ -25,6 +25,7 @@ export declare class GitService {
     private config;
     private projectRoot;
     constructor(projectRoot?: string, config?: GitConfig);
+    getProjectRoot(): string;
     /**
      * Validate Git repository exists and is properly configured
      */
@@ -64,6 +65,14 @@ export declare class GitService {
      * Get Git version information
      */
     getGitVersion(): Promise<VersionResult>;
+    /**
+     * Check whether a path is ignored by git.
+     */
+    isIgnored(relativePath: string): Promise<boolean>;
+    /**
+     * Get the current HEAD commit hash
+     */
+    getHeadCommitHash(short?: boolean): Promise<string>;
     /**
      * List all worktrees in the repository
      */

package/dist/runtime/api/vcs/git-service.js

@@ -7,6 +7,9 @@ export class GitService {
         this.config = config;
         this.git = simpleGit(projectRoot);
     }
+    getProjectRoot() {
+        return this.projectRoot;
+    }
     /**
      * Validate Git repository exists and is properly configured
      */
@@ -145,6 +148,26 @@ export class GitService {
     async getGitVersion() {
         return await this.git.version();
     }
+    /**
+     * Check whether a path is ignored by git.
+     */
+    async isIgnored(relativePath) {
+        try {
+            await this.git.raw(['check-ignore', '-q', relativePath]);
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    /**
+     * Get the current HEAD commit hash
+     */
+    async getHeadCommitHash(short = true) {
+        const args = short ? ['--short', 'HEAD'] : ['HEAD'];
+        const hash = await this.git.revparse(args);
+        return hash.trim();
+    }
     /**
      * List all worktrees in the repository
      */

package/dist/runtime/api/vcs/worktree-service.d.ts

@@ -45,7 +45,7 @@ export declare class WorktreeService extends EventEmitter {
         isConnectedToTask: boolean;
     }>>;
     /**
-     * Unified cleanup: remove branch first, then worktree
+     * Unified cleanup: remove worktree first, then branch
      * For connected worktrees, use taskId; for unconnected, use worktreePath and branchName
      */
     cleanupWorktree(params: {

package/dist/runtime/api/vcs/worktree-service.js

@@ -252,6 +252,11 @@ export class WorktreeService extends EventEmitter {
             entries = [];
         }
         for (const name of entries) {
+            const isIgnored = await this.gitService.isIgnored(name);
+            if (!isIgnored) {
+                log.debug('Skipped non-ignored env file', { name }, 'worktree-service');
+                continue;
+            }
             const sourcePath = path.join(this.projectRoot, name);
             const targetPath = path.join(worktreePath, name);
             try {
@@ -269,8 +274,11 @@ export class WorktreeService extends EventEmitter {
                         }
                     }
                 }
-                catch {
-                    // target missing, proceed
+                catch (error) {
+                    const err = error;
+                    if (err?.code !== 'ENOENT') {
+                        log.debug('Failed to inspect existing worktree env link', { name, error }, 'worktree-service');
+                    }
                 }
                 if (shouldCreate) {
                     // Remove any existing file/dir and create a symlink
@@ -280,8 +288,8 @@ export class WorktreeService extends EventEmitter {
                     log.debug('Symlinked to worktree', { name }, 'worktree-service');
                 }
             }
-            catch {
-                // Ignore missing source or failures
+            catch (error) {
+                log.debug('Failed to symlink env file', { name, error }, 'worktree-service');
             }
         }
     }
@@ -323,7 +331,7 @@ export class WorktreeService extends EventEmitter {
         }
     }
     /**
-     * Unified cleanup: remove branch first, then worktree
+     * Unified cleanup: remove worktree first, then branch
      * For connected worktrees, use taskId; for unconnected, use worktreePath and branchName
      */
     async cleanupWorktree(params) {
@@ -355,7 +363,11 @@ export class WorktreeService extends EventEmitter {
                 actualWorktreePath = worktreePath;
                 actualBranchName = branchName;
             }
-            // Step 1: Try to remove the branch first (if it's not main/master)
+            // Step 1: Remove the worktree
+            await this.gitService.removeWorktree(actualWorktreePath, force);
+            // Step 2: Prune worktrees to ensure git state is clean before branch deletion
+            await this.gitService.pruneWorktrees();
+            // Step 3: Try to remove the branch (if it's not main/master)
             if (actualBranchName !== 'main' && actualBranchName !== 'master') {
                 try {
                     await this.gitService.deleteLocalBranch(actualBranchName, true);
@@ -363,15 +375,13 @@ export class WorktreeService extends EventEmitter {
                 }
                 catch (error) {
                     // Log but continue - branch might not exist or already deleted
-                    log.warn('Could not delete branch, continuing with worktree removal', {
+                    log.warn('Could not delete branch after worktree removal', {
                         branchName: actualBranchName,
                         error: error instanceof Error ? error.message : String(error),
                     }, 'worktree-service');
                 }
             }
-            // Step 2: Remove the worktree
-            await this.gitService.removeWorktree(actualWorktreePath, force);
-            // Step 3: Clean up tracking if it was a connected worktree
+            // Step 4: Clean up tracking if it was a connected worktree
             if (isConnectedToTask && taskId) {
                 this.worktrees.delete(taskId);
                 this.emit('worktreeDeleted', taskId);
@@ -406,6 +416,8 @@ export class WorktreeService extends EventEmitter {
             }
             // Remove worktree using git service
             await this.gitService.removeWorktree(worktree.path, force);
+            // Prune worktrees to ensure git state is clean before branch deletion
+            await this.gitService.pruneWorktrees();
             // Delete local branch if it exists and is not merged
             try {
                 await this.gitService.deleteLocalBranch(worktree.branchName, force);

package/dist/runtime/api/workflows/quality-pipeline.js

@@ -3,7 +3,7 @@ import { stripNextInjectedEnv } from '../utils/stripNextEnv.js';
 import { log } from '../lib/logger.js';
 import { getSettingsService } from '../settings-service.js';
 import { CoreAgentService } from '../agent/core-agent-service.js';
-import { ClaudeCodeAdapter, CodexCliProvider } from '../agent/ai-providers/index.js';
+import { ClaudeCodeAdapter, CodexCliProvider, GeminiCliProvider, } from '../agent/ai-providers/index.js';
 import { getQualityChecksDetectionPrompt } from '../agent/prompt-service.js';
 export class QualityPipeline {
     // Expose configured checks for external orchestration/streaming
@@ -48,6 +48,7 @@ export class QualityPipeline {
             defaultModel: 'claude-sonnet-4-20250514',
         }));
         core.registerProvider('codex', new CodexCliProvider({ defaultWorkingDirectory: cwd }));
+        core.registerProvider('gemini', new GeminiCliProvider({ defaultWorkingDirectory: cwd }));
         const tools = ['Read', 'Grep', 'Glob'];
         const result = await core.execute({
             prompt,

package/dist/runtime/api/workflows/vibing-orchestrator.d.ts

@@ -5,6 +5,9 @@ import { AgentService } from '../agent/agent-service.js';
 import { WorktreeService } from '../vcs/worktree-service.js';
 import { GitService } from '../vcs/git-service.js';
 import type { ResolvedProvider } from '../agent/routing-policy.js';
+import type { WorkflowEvent } from './workflow-schema.js';
+import { computeNextAction } from './workflow-reducer.js';
+import { type ReconcileAction } from './workflow-reconciler.js';
 export declare class VibingOrchestrator extends EventEmitter {
     private taskService;
     private agentService;
@@ -14,7 +17,13 @@ export declare class VibingOrchestrator extends EventEmitter {
     private workflows;
     private qualityPipeline;
     private workflowDB;
+    private taskUpdater;
     private initialized;
+    private activeImprovements;
+    private taskImprovementExecutions;
+    private reconciler;
+    private heartbeatTracker;
+    private idempotencyGuard;
     private computeVisibleTimeline;
     private buildTimeline;
     constructor(taskService: TaskService, agentService: AgentService, worktreeService: WorktreeService, config: VibingConfig, gitService?: GitService | undefined, persistenceDataDir?: string);
@@ -23,7 +32,53 @@ export declare class VibingOrchestrator extends EventEmitter {
      * Call this after construction to load persisted workflows
      */
     initialize(): Promise<void>;
+    /**
+     * Shutdown the orchestrator and cleanup resources
+     */
+    shutdown(): Promise<void>;
+    /**
+     * Get workflow snapshots for reconciler
+     */
+    private getWorkflowSnapshots;
+    /**
+     * Handle stuck workflow detected by reconciler
+     */
+    private handleStuckWorkflow;
+    /**
+     * Record heartbeat for active workflow execution
+     */
+    recordHeartbeat(workflowId: string): void;
+    /**
+     * Check if reconciler is running
+     */
+    isReconcilerRunning(): boolean;
+    /**
+     * Get reconcile history for debugging
+     */
+    getReconcileHistory(): ReconcileAction[];
     private normalizeWorkflow;
+    /**
+     * Convert VibingExecution to WorkflowState for the reducer
+     */
+    private toWorkflowState;
+    /**
+     * Apply WorkflowState changes back to VibingExecution (for backward compatibility)
+     */
+    private applyStateToExecution;
+    /**
+     * Create an EffectContext that binds orchestrator methods
+     */
+    private createEffectContext;
+    /**
+     * Dispatch an event to the workflow state machine (NEW API)
+     * This is the new way to trigger state transitions.
+     * Uses idempotency guard to prevent duplicate event processing.
+     */
+    dispatch(workflowId: string, event: WorkflowEvent): Promise<void>;
+    /**
+     * Get the next recommended action for a workflow (uses new state machine)
+     */
+    getNextAction(workflowId: string): ReturnType<typeof computeNextAction> | null;
     /**
      * Execute a task once (no phase management). Optionally associates with a workflow.
      */
@@ -52,6 +107,16 @@ export declare class VibingOrchestrator extends EventEmitter {
         };
     };
     listAllExecutions(): Promise<any[]>;
+    startTaskImprovement(taskId: string, data: {
+        title: string;
+        type: string;
+        priority: string;
+        content: string;
+    }, options?: {
+        executionId?: string;
+    }): Promise<{
+        readonly executionId: string;
+    }>;
     improveTaskContent(taskId: string, data: {
         title: string;
         type: string;
@@ -68,6 +133,7 @@ export declare class VibingOrchestrator extends EventEmitter {
         executionId: string;
         selectedModel?: string;
     }>;
+    private runTaskImprovementPipeline;
     aiReviewCode(taskId: string, reviewContext?: string, options?: {
         workflowId?: string;
         overrides?: Partial<ResolvedProvider>;
@@ -147,6 +213,10 @@ export declare class VibingOrchestrator extends EventEmitter {
      * Reject workflow and request changes
      */
     rejectWorkflow(workflowId: string, feedback: string): Promise<void>;
+    /**
+     * Helper to close a timeline item by phase
+     */
+    private closeTimelineItem;
     /**
      * Get workflow status
      */
@@ -161,9 +231,18 @@ export declare class VibingOrchestrator extends EventEmitter {
      */
     getLatestWorkflowByTask(taskId: string): VibingExecution | null;
     /**
-     * Transition workflow to new phase
+     * Update UI phase with proper tracking of lastPhase, phaseHistory, and metrics.
+     * This is for UI-only phases that don't correspond to FSM states.
+     */
+    private updateUIPhase;
+    /**
+     * Update task file when workflow becomes ready for review
      */
-    private transitionToPhase;
+    private updateTaskForReviewReadiness;
+    /**
+     * Extract context information for task updates
+     */
+    private extractTaskUpdateContext;
     /**
      * Save workflow to persistence layer
      */
@@ -174,7 +253,7 @@ export declare class VibingOrchestrator extends EventEmitter {
     private executeImplementation;
     /**
      * Public: re-run implementation phase on demand
-     * Forces phase to 'implementing' and executes implementation again.
+     * Uses dispatch(RETRY) to transition FSM and trigger implementation via effect.
      */
     rerunImplementation(workflowId: string, feedback?: string, providerOverride?: {
         provider?: string;
@@ -204,11 +283,14 @@ export declare class VibingOrchestrator extends EventEmitter {
     private performAICodeReview;
     /**
      * Execute AI review as a dedicated phase
+     * Note: 'ai-reviewing' is a UI-only phase for timeline display, not an FSM phase.
+     * FSM remains in 'approved' during AI review.
      */
     private executeAiReviewPhase;
     private executeAwaitingReview;
     /**
      * Execute validation phase with quality checks
+     * Note: FSM has already transitioned to 'validating' via IMPL_SUCCESS event
      */
     private executeValidation;
     /**
@@ -217,9 +299,13 @@ export declare class VibingOrchestrator extends EventEmitter {
     runValidation(workflowId: string): Promise<void>;
     /**
      * Execute merge phase
+     * Note: FSM has already transitioned to 'merging' via APPROVE event
      */
     private executeMerge;
-    private updateCleanupStatus;
+    /**
+     * Verify that a merge actually succeeded by checking git state
+     */
+    private verifyMergeSuccess;
     /**
      * Public: run merge phase on demand
      * This will attempt merge regardless of current phase.
@@ -230,6 +316,7 @@ export declare class VibingOrchestrator extends EventEmitter {
     }): Promise<void>;
     /**
      * Execute cleanup phase: remove worktree/branch and finalize workflow
+     * Note: FSM has already transitioned to 'done' via MERGE_SUCCESS event
      */
     private executeCleanup;
     /**
@@ -302,15 +389,16 @@ export declare class VibingOrchestrator extends EventEmitter {
     updateWorkflowOptions(workflowId: string, config: Partial<VibingConfig>): Promise<void>;
     /**
      * Continue workflow execution from current state
+     * Uses the new state machine to determine the next action
      */
     continueWorkflow(workflowId: string): Promise<void>;
-    private computeNextActionPhase;
     private requireWorkflow;
     private getAIReviewThreshold;
     private assertPhase;
     private createNewWorkflow;
     private maybeRetryImplementation;
     private handlePhaseFailure;
+    private getFailEventForPhase;
     /**
      * Get the agent service instance
      */