@shepai/cli 1.130.0 → 1.130.1-pr396.844e95f

package/dist/packages/core/src/infrastructure/services/deployment/deployment.service.js

@@ -9,18 +9,20 @@
  * On startup, call `recoverAll()` to reconcile the DB with actual
  * process state (clean up dead PIDs, re-adopt live ones).
  */
-import { spawn } from 'node:child_process';
+import { spawn, execFileSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import net from 'node:net';
 import { EventEmitter } from 'node:events';
-// NOTE: We intentionally do NOT use tree-kill here. tree-kill traverses
-// /proc to find child processes which can accidentally kill parent processes
-// (including the Shep web UI). Instead, we use process.kill(-pid) to send
-// signals to the process GROUP (since we spawn with detached: true, the
-// child gets its own process group via setsid()).
+// On Unix we use process.kill(-pid) to send signals to the process GROUP
+// (detached: true puts the child in its own group via setsid()).
+// On Windows, negative PIDs are not supported — use taskkill /T for tree kill.
 import { DeploymentState } from '../../../domain/generated/output.js';
 import { detectDevScript } from './detect-dev-script.js';
 import { createDeploymentLogger } from './deployment-logger.js';
 import { parsePort } from './parse-port.js';
 import { LogRingBuffer } from './log-ring-buffer.js';
+import { IS_WINDOWS } from '../../platform.js';
 const log = createDeploymentLogger('[DeploymentService]');
 const POLL_INTERVAL_MS = 200;
 const MAX_WAIT_MS = 5000;
@@ -28,6 +30,20 @@ const defaultDeps = {
     spawn,
     detectDevScript,
     kill: (pid, signal) => {
+        if (IS_WINDOWS) {
+            // On Windows, negative PIDs are not supported. Use taskkill /T to
+            // kill the entire process tree (shell + child dev server).
+            try {
+                execFileSync('taskkill', ['/F', '/T', '/PID', String(pid)], {
+                    stdio: 'ignore',
+                    windowsHide: true,
+                });
+            }
+            catch {
+                // Process already dead
+            }
+            return;
+        }
         try {
             // Kill the entire process group (negative PID) — safe because
             // detached: true puts the child in its own group via setsid().
@@ -69,7 +85,16 @@ export class DeploymentService {
     }
     /**
      * Recover dev servers from the database on startup.
-     * Validates each PID is still alive; removes dead rows.
+     *
+     * Three recovery strategies based on process state:
+     * 1. Alive + Ready (has URL) → re-adopt, then validate URL asynchronously
+     * 2. Alive + Booting (no URL) → kill orphan and re-spawn (can't re-attach stdout)
+     * 3. Dead → re-spawn if target directory still exists
+     *
+     * After sync recovery, fires off async URL health checks for re-adopted
+     * processes. Zombies (alive but not serving) are killed and re-spawned.
+     *
+     * All re-spawns are wrapped in try/catch so one failure doesn't block others.
      */
     recoverAll() {
         if (!this.db)
@@ -89,7 +114,10 @@ export class DeploymentService {
         }
         log.info(`Recovering ${rows.length} dev server(s) from database`);
         for (const row of rows) {
-            if (this.deps.isAlive(row.pid)) {
+            const alive = this.deps.isAlive(row.pid);
+            const hasUrl = row.state === DeploymentState.Ready && row.url;
+            if (alive && hasUrl) {
+                // Strategy 1: Process alive and Ready — re-adopt, then validate URL async
                 log.info(`Recovered "${row.target_id}" (pid=${row.pid}, state=${row.state}, url=${row.url})`);
                 const entry = {
                     pid: row.pid,
@@ -104,10 +132,36 @@ export class DeploymentService {
                     logs: new LogRingBuffer(),
                 };
                 this.deployments.set(row.target_id, entry);
+                // Fire-and-forget: validate URL is actually responding, kill zombie if not
+                this.validateAndRespawn(entry);
+                continue;
+            }
+            if (alive) {
+                // Strategy 2: Process alive but stuck in Booting — can't re-attach stdout
+                // Kill the orphan so we can re-spawn with proper listeners
+                log.info(`Orphan "${row.target_id}" (pid=${row.pid}) stuck in ${row.state} — killing to re-spawn`);
+                try {
+                    this.deps.kill(row.pid, 'SIGKILL');
+                }
+                catch {
+                    // already dead
+                }
             }
             else {
-                log.info(`Stale dev server "${row.target_id}" (pid=${row.pid}) — removing from DB`);
-                this.dbDelete(row.target_id);
+                log.info(`Dev server "${row.target_id}" (pid=${row.pid}) is dead — will re-spawn`);
+            }
+            // Strategy 2 & 3: Re-spawn if target directory still has a package.json
+            this.dbDelete(row.target_id);
+            if (!existsSync(join(row.target_path, 'package.json'))) {
+                log.warn(`Skipping re-spawn for "${row.target_id}" — no package.json at "${row.target_path}"`);
+                continue;
+            }
+            try {
+                log.info(`Re-spawning dev server for "${row.target_id}" at "${row.target_path}"`);
+                this.start(row.target_id, row.target_path, row.target_type);
+            }
+            catch (err) {
+                log.error(`Failed to re-spawn "${row.target_id}": ${err}`);
             }
         }
     }
@@ -132,13 +186,34 @@ export class DeploymentService {
             throw new Error(detection.error);
         }
         // Build spawn args based on package manager
-        const { packageManager, scriptName, command } = detection;
+        const { packageManager, scriptName, command, needsInstall } = detection;
         const args = packageManager === 'npm' ? ['run', scriptName] : [scriptName];
+        // Install dependencies if node_modules is missing (e.g. fresh worktree)
+        if (needsInstall) {
+            log.info(`node_modules missing in "${targetPath}" — running ${packageManager} install`);
+            try {
+                execFileSync(packageManager, ['install'], {
+                    cwd: targetPath,
+                    shell: true,
+                    stdio: 'ignore',
+                    ...(IS_WINDOWS ? { windowsHide: true } : {}),
+                });
+                log.info('Dependencies installed successfully');
+            }
+            catch (err) {
+                log.error(`Dependency install failed: ${err}`);
+                throw new Error(`Failed to install dependencies: ${err}`);
+            }
+        }
         log.info(`Spawning dev server: command="${command}", packageManager="${packageManager}", scriptName="${scriptName}", cwd="${targetPath}"`);
         const child = this.deps.spawn(packageManager, args, {
             shell: true,
             cwd: targetPath,
-            detached: true,
+            // On Unix, detached: true creates a process group via setsid() so we can
+            // kill the entire tree with process.kill(-pid). On Windows this flag causes
+            // CREATE_NEW_CONSOLE which opens a visible terminal window and disconnects
+            // stdout/stderr — we don't need it because taskkill /F /T handles tree kill.
+            ...(IS_WINDOWS ? { windowsHide: true } : { detached: true }),
             stdio: ['ignore', 'pipe', 'pipe'],
         });
         if (!child.pid) {
@@ -452,4 +527,69 @@ export class DeploymentService {
             });
         });
     }
+    /**
+     * Async health check for a recovered entry. Probes the URL port via TCP.
+     * If the port is not responding (zombie process), kills and re-spawns.
+     * Fire-and-forget — errors are logged, never thrown.
+     */
+    async validateAndRespawn(entry) {
+        if (!entry.url)
+            return;
+        const responding = await this.probePort(entry.url);
+        if (responding) {
+            log.info(`[${entry.targetId}] URL health check passed — "${entry.url}" is responding`);
+            return;
+        }
+        log.warn(`[${entry.targetId}] URL health check FAILED — "${entry.url}" not responding, killing zombie (pid=${entry.pid})`);
+        // Kill the zombie
+        try {
+            this.deps.kill(entry.pid, 'SIGKILL');
+        }
+        catch {
+            // already dead
+        }
+        this.deployments.delete(entry.targetId);
+        this.dbDelete(entry.targetId);
+        // Re-spawn if target still exists
+        if (!existsSync(join(entry.targetPath, 'package.json'))) {
+            log.warn(`Skipping re-spawn for "${entry.targetId}" — no package.json at "${entry.targetPath}"`);
+            return;
+        }
+        try {
+            log.info(`Re-spawning dev server for "${entry.targetId}" at "${entry.targetPath}"`);
+            this.start(entry.targetId, entry.targetPath, entry.targetType);
+        }
+        catch (err) {
+            log.error(`Failed to re-spawn "${entry.targetId}": ${err}`);
+        }
+    }
+    /**
+     * TCP connect probe to check if a URL's port is accepting connections.
+     * Returns true if the port responds within 2 seconds, false otherwise.
+     */
+    probePort(url) {
+        return new Promise((resolve) => {
+            try {
+                const parsed = new URL(url);
+                const port = parseInt(parsed.port || (parsed.protocol === 'https:' ? '443' : '80'), 10);
+                const socket = net.createConnection({ host: parsed.hostname, port });
+                const timeout = setTimeout(() => {
+                    socket.destroy();
+                    resolve(false);
+                }, 2000);
+                socket.on('connect', () => {
+                    clearTimeout(timeout);
+                    socket.destroy();
+                    resolve(true);
+                });
+                socket.on('error', () => {
+                    clearTimeout(timeout);
+                    resolve(false);
+                });
+            }
+            catch {
+                resolve(false);
+            }
+        });
+    }
 }

package/dist/packages/core/src/infrastructure/services/deployment/detect-dev-script.d.ts

@@ -10,6 +10,7 @@ export interface DetectDevScriptSuccess {
     packageManager: string;
     scriptName: string;
     command: string;
+    needsInstall: boolean;
 }
 export interface DetectDevScriptError {
     success: false;

package/dist/packages/core/src/infrastructure/services/deployment/detect-dev-script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-dev-script.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/deployment/detect-dev-script.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,IAAI,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,GAAG,oBAAoB,CAAC;AAIlF;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,qBAAqB,CAuCtE"}
+{"version":3,"file":"detect-dev-script.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/deployment/detect-dev-script.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,IAAI,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,GAAG,oBAAoB,CAAC;AAIlF;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,qBAAqB,CAwCtE"}

package/dist/packages/core/src/infrastructure/services/deployment/detect-dev-script.js

@@ -50,8 +50,9 @@ export function detectDevScript(dirPath) {
     const packageManager = detectPackageManager(dirPath);
     // Build the command — pnpm/yarn use `<pm> <script>`, npm uses `npm run <script>`
     const command = packageManager === 'npm' ? `npm run ${scriptName}` : `${packageManager} ${scriptName}`;
-    log.info(`detected — packageManager="${packageManager}", scriptName="${scriptName}", command="${command}"`);
-    return { success: true, packageManager, scriptName, command };
+    const needsInstall = !existsSync(join(dirPath, 'node_modules'));
+    log.info(`detected — packageManager="${packageManager}", scriptName="${scriptName}", command="${command}", needsInstall=${needsInstall}`);
+    return { success: true, packageManager, scriptName, command, needsInstall };
 }
 /**
  * Detect the package manager by checking for lockfile presence.

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts

@@ -45,5 +45,11 @@ export declare class GitPrService implements IGitPrService {
     private parseGhError;
     private parsePrNumberFromUrl;
     private parseDiffStat;
+    syncMain(cwd: string, baseBranch: string): Promise<void>;
+    rebaseOnMain(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
+    getConflictedFiles(cwd: string): Promise<string[]>;
+    stageFiles(cwd: string, files: string[]): Promise<void>;
+    rebaseContinue(cwd: string): Promise<void>;
+    rebaseAbort(cwd: string): Promise<void>;
 }
 //# sourceMappingURL=git-pr.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.js

@@ -609,6 +609,14 @@ let GitPrService = class GitPrService {
     parseGitError(error) {
         const message = error instanceof Error ? error.message : String(error);
         const cause = error instanceof Error ? error : undefined;
+        // Rebase-specific: detect "CONFLICT" during rebase operations
+        if (message.includes('CONFLICT') && message.includes('rebase')) {
+            return new GitPrError(message, GitPrErrorCode.REBASE_CONFLICT, cause);
+        }
+        // Sync-specific: non-fast-forward or diverged branch
+        if (message.includes('non-fast-forward') || message.includes('diverged')) {
+            return new GitPrError(message, GitPrErrorCode.SYNC_FAILED, cause);
+        }
         if (message.includes('rejected') || message.includes('conflict')) {
             return new GitPrError(message, GitPrErrorCode.MERGE_CONFLICT, cause);
         }
@@ -649,6 +657,132 @@ let GitPrService = class GitPrService {
             commitCount,
         };
     }
+    // --- Rebase & Sync operations ---
+    async syncMain(cwd, baseBranch) {
+        try {
+            // Detect current branch
+            const { stdout } = await this.execFile('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd });
+            const currentBranch = stdout.trim();
+            if (currentBranch === baseBranch) {
+                // On the base branch — use git pull --ff-only
+                await this.execFile('git', ['pull', '--ff-only', 'origin', baseBranch], { cwd });
+            }
+            else {
+                // On a different branch — fetch the remote ref only (updates origin/<baseBranch>).
+                // We intentionally do NOT update the local <baseBranch> ref because it may be
+                // checked out in another worktree, which causes git to refuse the update with:
+                //   "fatal: refusing to fetch into branch 'refs/heads/main' checked out at ..."
+                await this.execFile('git', ['fetch', 'origin', baseBranch], { cwd });
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            if (message.includes('non-fast-forward') ||
+                message.includes('Not possible to fast-forward') ||
+                message.includes('diverged')) {
+                throw new GitPrError(`Cannot fast-forward '${baseBranch}': local branch has diverged from remote. ` +
+                    `Resolve the divergence manually with 'git checkout ${baseBranch} && git reset --hard origin/${baseBranch}' ` +
+                    `if you want to discard local changes on ${baseBranch}.`, GitPrErrorCode.SYNC_FAILED, cause);
+            }
+            throw new GitPrError(`Failed to sync '${baseBranch}' with remote: ${message}`, GitPrErrorCode.GIT_ERROR, cause);
+        }
+    }
+    async rebaseOnMain(cwd, featureBranch, baseBranch) {
+        // Check for dirty worktree before starting
+        const dirty = await this.hasUncommittedChanges(cwd);
+        if (dirty) {
+            throw new GitPrError(`Cannot rebase: working directory has uncommitted changes. ` +
+                `Please commit or stash your changes before rebasing.`, GitPrErrorCode.GIT_ERROR);
+        }
+        // Checkout the feature branch
+        try {
+            await this.execFile('git', ['checkout', featureBranch], { cwd });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            if (message.includes('did not match') ||
+                message.includes('not a commit') ||
+                message.includes('pathspec')) {
+                throw new GitPrError(`Branch '${featureBranch}' not found.`, GitPrErrorCode.BRANCH_NOT_FOUND, cause);
+            }
+            throw new GitPrError(`Failed to checkout '${featureBranch}': ${message}`, GitPrErrorCode.GIT_ERROR, cause);
+        }
+        // Rebase onto origin/<baseBranch> (the remote-tracking ref).
+        // We use origin/<baseBranch> rather than the local <baseBranch> because:
+        // 1. syncMain fetches origin/<baseBranch> — it's always up-to-date
+        // 2. The local <baseBranch> may be checked out in another worktree and stale
+        const rebaseTarget = `origin/${baseBranch}`;
+        try {
+            await this.execFile('git', ['rebase', rebaseTarget], { cwd });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            // Detect rebase conflict from git stderr/exit code
+            if (message.includes('CONFLICT') || message.includes('could not apply')) {
+                // Get the list of conflicted files to include in the error message
+                let conflictedFiles = [];
+                try {
+                    conflictedFiles = await this.getConflictedFiles(cwd);
+                }
+                catch {
+                    // Failed to get conflicted files — still report the conflict
+                }
+                const fileList = conflictedFiles.length > 0 ? ` Conflicted files: ${conflictedFiles.join(', ')}` : '';
+                throw new GitPrError(`Rebase of '${featureBranch}' onto '${baseBranch}' encountered conflicts.${fileList}`, GitPrErrorCode.REBASE_CONFLICT, cause);
+            }
+            throw new GitPrError(`Rebase of '${featureBranch}' onto '${baseBranch}' failed: ${message}`, GitPrErrorCode.GIT_ERROR, cause);
+        }
+    }
+    async getConflictedFiles(cwd) {
+        try {
+            const { stdout } = await this.execFile('git', ['diff', '--name-only', '--diff-filter=U'], {
+                cwd,
+            });
+            return stdout
+                .trim()
+                .split('\n')
+                .filter((f) => f.length > 0)
+                .map((f) => f.replace(/\\/g, '/'));
+        }
+        catch (error) {
+            throw this.parseGitError(error);
+        }
+    }
+    async stageFiles(cwd, files) {
+        try {
+            await this.execFile('git', ['add', ...files], { cwd });
+        }
+        catch (error) {
+            throw this.parseGitError(error);
+        }
+    }
+    async rebaseContinue(cwd) {
+        try {
+            await this.execFile('git', ['rebase', '--continue'], {
+                cwd,
+                env: { ...process.env, GIT_EDITOR: 'true' },
+            });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const cause = error instanceof Error ? error : undefined;
+            if (message.includes('CONFLICT') || message.includes('could not apply')) {
+                throw new GitPrError(`Rebase continue encountered new conflicts: ${message}`, GitPrErrorCode.REBASE_CONFLICT, cause);
+            }
+            throw this.parseGitError(error);
+        }
+    }
+    async rebaseAbort(cwd) {
+        try {
+            await this.execFile('git', ['rebase', '--abort'], { cwd });
+        }
+        catch (error) {
+            throw this.parseGitError(error);
+        }
+    }
 };
 GitPrService = __decorate([
     injectable(),

package/dist/src/presentation/web/app/(dashboard)/get-graph-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-graph-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/(dashboard)/get-graph-data.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAI1C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAwFD,MAAM,MAAM,aAAa,GACrB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GACtC;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC;AA6B7B,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CA6DxF"}
+{"version":3,"file":"get-graph-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/(dashboard)/get-graph-data.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAI1C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAiFD,MAAM,MAAM,aAAa,GACrB;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GACtC;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC;AA6B7B,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CA6DxF"}

package/dist/src/presentation/web/app/(dashboard)/get-graph-data.js

@@ -31,13 +31,7 @@ async function refreshRepoGitInfo(repo) {
             gitInfoCache.set(repo.path, { kind: 'not-a-repo', checkedAt: Date.now() });
             return;
         }
-        const cached = gitInfoCache.get(repo.path);
-        if (cached?.kind === 'repo' && cached.sha === headSha) {
-            // HEAD unchanged — just bump checkedAt
-            cached.checkedAt = Date.now();
-            return;
-        }
-        // HEAD changed — fetch branch + subject & author in parallel
+        // Fetch branch + subject & author in parallel
         const [currentBranch, logLine] = await Promise.all([
             gitCommand(repo.path, ['symbolic-ref', '--short', 'HEAD']),
             gitCommand(repo.path, ['log', '-1', `--format=%s${FIELD_SEP}%an`]),
@@ -45,7 +39,8 @@ async function refreshRepoGitInfo(repo) {
         if (!currentBranch)
             return;
         const [commitMessage, committer] = (logLine ?? '').split(FIELD_SEP);
-        // Behind count
+        // Behind count — always compute, even when on the default branch,
+        // because local main can be behind origin/main.
         let behindCount = null;
         const defaultBranchRef = await gitCommand(repo.path, [
             'symbolic-ref',
@@ -53,7 +48,8 @@ async function refreshRepoGitInfo(repo) {
             'refs/remotes/origin/HEAD',
         ]);
         const defaultBranch = defaultBranchRef?.replace('origin/', '') ?? null;
-        if (defaultBranch && currentBranch !== defaultBranch) {
+        if (defaultBranch) {
+            // Compare current branch (or default branch itself) against origin
             const behind = await gitCommand(repo.path, [
                 'rev-list',
                 '--count',
@@ -63,9 +59,6 @@ async function refreshRepoGitInfo(repo) {
             if (isNaN(behindCount))
                 behindCount = null;
         }
-        else {
-            behindCount = 0;
-        }
         gitInfoCache.set(repo.path, {
             kind: 'repo',
             sha: headSha,

package/dist/src/presentation/web/app/actions/check-agent-auth.js

@@ -21,7 +21,7 @@ const AGENT_TOOL_MAP = {
 };
 const AGENT_BINARY_MAP = {
     'claude-code': 'claude',
-    cursor: 'agent',
+    cursor: 'cursor-agent',
     'gemini-cli': 'gemini',
 };
 /**

package/dist/src/presentation/web/app/actions/rebase-feature.d.ts

@@ -0,0 +1,5 @@
+export declare function rebaseFeature(featureId: string): Promise<{
+    success: boolean;
+    error?: string;
+}>;
+//# sourceMappingURL=rebase-feature.d.ts.map

package/dist/src/presentation/web/app/actions/rebase-feature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/rebase-feature.ts"],"names":[],"mappings":"AAKA,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C"}

package/dist/src/presentation/web/app/actions/rebase-feature.js

@@ -0,0 +1,16 @@
+'use server';
+import { resolve } from '../../lib/server-container.js';
+export async function rebaseFeature(featureId) {
+    if (!featureId?.trim()) {
+        return { success: false, error: 'Feature id is required' };
+    }
+    try {
+        const useCase = resolve('RebaseFeatureOnMainUseCase');
+        await useCase.execute(featureId);
+        return { success: true };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Failed to rebase feature';
+        return { success: false, error: message };
+    }
+}

package/dist/src/presentation/web/app/actions/sync-repository.d.ts

@@ -0,0 +1,5 @@
+export declare function syncRepository(repositoryId: string): Promise<{
+    success: boolean;
+    error?: string;
+}>;
+//# sourceMappingURL=sync-repository.d.ts.map

package/dist/src/presentation/web/app/actions/sync-repository.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-repository.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/sync-repository.ts"],"names":[],"mappings":"AAKA,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C"}

package/dist/src/presentation/web/app/actions/sync-repository.js

@@ -0,0 +1,16 @@
+'use server';
+import { resolve } from '../../lib/server-container.js';
+export async function syncRepository(repositoryId) {
+    if (!repositoryId?.trim()) {
+        return { success: false, error: 'Repository id is required' };
+    }
+    try {
+        const useCase = resolve('SyncRepositoryMainUseCase');
+        await useCase.execute(repositoryId);
+        return { success: true };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Failed to sync repository';
+        return { success: false, error: message };
+    }
+}

package/dist/src/presentation/web/components/common/control-center-drawer/feature-drawer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/feature-drawer-client.tsx"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAI/D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,wBAAwB,2CA8lB1F"}
+{"version":3,"file":"feature-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/feature-drawer-client.tsx"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAI/D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,wBAAwB,2CAkmB1F"}

package/dist/src/presentation/web/components/common/control-center-drawer/feature-drawer-client.js

@@ -319,6 +319,7 @@ export function FeatureDrawerClient({ view: initialView, urlTab }) {
     // ── Hooks (always called unconditionally per Rules of Hooks) ──────────
     const featureActionsInput = featureNode?.repositoryPath && featureNode?.branch
         ? {
+            featureId: featureNode.featureId,
             repositoryPath: featureNode.repositoryPath,
             branch: featureNode.branch,
             specPath: featureNode.specPath,
@@ -362,7 +363,7 @@ export function FeatureDrawerClient({ view: initialView, urlTab }) {
             ...(featureNode.state === 'error' && { onRetry: handleRetry }),
             ...(featureNode.state === 'pending' && { onStart: handleStart }),
         };
-        body = (_jsx(FeatureDrawerTabs, { featureNode: enrichedNode, featureId: featureNode.featureId, initialTab: view.initialTab, urlTab: urlTab, sseEvents: events, prdData: prdData, prdSelections: prdSelections, onPrdSelect: (qId, oId) => setPrdSelections((prev) => ({ ...prev, [qId]: oId })), onPrdApprove: handlePrdApprove, onPrdReject: handlePrdReject, isPrdLoading: isLoadingPrd, techData: techData, onTechApprove: handleTechApprove, onTechReject: handleTechReject, isTechLoading: isLoadingTech, productData: isLoadingTechProduct ? null : techProductData, mergeData: mergeData, onMergeApprove: handleMergeApprove, onMergeReject: handleMergeReject, isMergeLoading: isLoadingMerge, isRejecting: isRejecting, chatInput: chatInput, onChatInputChange: setChatInput }));
+        body = (_jsx(FeatureDrawerTabs, { featureNode: enrichedNode, featureId: featureNode.featureId, initialTab: view.initialTab, urlTab: urlTab, sseEvents: events, prdData: prdData, prdSelections: prdSelections, onPrdSelect: (qId, oId) => setPrdSelections((prev) => ({ ...prev, [qId]: oId })), onPrdApprove: handlePrdApprove, onPrdReject: handlePrdReject, isPrdLoading: isLoadingPrd, techData: techData, onTechApprove: handleTechApprove, onTechReject: handleTechReject, isTechLoading: isLoadingTech, productData: isLoadingTechProduct ? null : techProductData, mergeData: mergeData, onMergeApprove: handleMergeApprove, onMergeReject: handleMergeReject, isMergeLoading: isLoadingMerge, onRebaseOnMain: featureFlags.gitRebaseSync ? featureActions.rebaseOnMain : undefined, rebaseLoading: featureActions.rebaseLoading, rebaseError: featureActions.rebaseError, isRejecting: isRejecting, chatInput: chatInput, onChatInputChange: setChatInput }));
     }
     return (_jsx(BaseDrawer, { open: isOpen, onClose: attemptClose, size: "md", modal: false, header: header, "data-testid": view.type === 'feature' ? 'feature-drawer' : 'repository-drawer', children: body }));
 }

package/dist/src/presentation/web/components/common/control-center-drawer/repository-drawer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repository-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/repository-drawer-client.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE,2BAA2B,2CAmF3E"}
+{"version":3,"file":"repository-drawer-client.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/control-center-drawer/repository-drawer-client.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,wBAAgB,sBAAsB,CAAC,EAAE,IAAI,EAAE,EAAE,2BAA2B,2CA2G3E"}

package/dist/src/presentation/web/components/common/control-center-drawer/repository-drawer-client.js

@@ -1,8 +1,8 @@
 'use client';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback } from 'react';
 import { useRouter, usePathname } from 'next/navigation';
-import { Code2, Terminal, FolderOpen } from 'lucide-react';
+import { Code2, Terminal, FolderOpen, RefreshCw } from 'lucide-react';
 import { BaseDrawer } from '../../common/base-drawer/index.js';
 import { ActionButton } from '../../common/action-button/index.js';
 import { DrawerTitle, DrawerDescription } from '../../ui/drawer.js';
@@ -14,7 +14,7 @@ export function RepositoryDrawerClient({ data }) {
     const router = useRouter();
     const pathname = usePathname();
     const isOpen = pathname.startsWith('/repository/');
-    const repoActions = useRepositoryActions(data.repositoryPath ? { repositoryPath: data.repositoryPath } : null);
+    const repoActions = useRepositoryActions(data.repositoryPath ? { repositoryId: data.id, repositoryPath: data.repositoryPath } : null);
     const onClose = useCallback(() => {
         router.push('/');
     }, [router]);
@@ -26,5 +26,5 @@ export function RepositoryDrawerClient({ data }) {
         }
         : undefined;
     const header = (_jsxs("div", { "data-testid": "repository-drawer-header", children: [_jsx(DrawerTitle, { children: data.name }), data.repositoryPath ? (_jsx(DrawerDescription, { className: "truncate font-mono text-xs", children: data.repositoryPath })) : null] }));
-    return (_jsx(BaseDrawer, { open: isOpen, onClose: onClose, size: "md", modal: false, header: header, deployTarget: featureFlags.envDeploy ? repoDeployTarget : undefined, "data-testid": "repository-drawer", children: data.repositoryPath ? (_jsxs("div", { className: "flex-1 overflow-y-auto", children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "OPEN WITH" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Open in IDE", onClick: repoActions.openInIde, loading: repoActions.ideLoading, error: !!repoActions.ideError, icon: Code2, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open in Shell", onClick: repoActions.openInShell, loading: repoActions.shellLoading, error: !!repoActions.shellError, icon: Terminal, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open Folder", onClick: repoActions.openFolder, loading: repoActions.folderLoading, error: !!repoActions.folderError, icon: FolderOpen, variant: "outline", size: "sm" })] })] })] })) : null }));
+    return (_jsx(BaseDrawer, { open: isOpen, onClose: onClose, size: "md", modal: false, header: header, deployTarget: featureFlags.envDeploy ? repoDeployTarget : undefined, "data-testid": "repository-drawer", children: data.repositoryPath ? (_jsxs("div", { className: "flex-1 overflow-y-auto", children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "OPEN WITH" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Open in IDE", onClick: repoActions.openInIde, loading: repoActions.ideLoading, error: !!repoActions.ideError, icon: Code2, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open in Shell", onClick: repoActions.openInShell, loading: repoActions.shellLoading, error: !!repoActions.shellError, icon: Terminal, variant: "outline", size: "sm" }), _jsx(ActionButton, { label: "Open Folder", onClick: repoActions.openFolder, loading: repoActions.folderLoading, error: !!repoActions.folderError, icon: FolderOpen, variant: "outline", size: "sm" })] })] }), data.id && featureFlags.gitRebaseSync ? (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "flex flex-col gap-3 p-4", children: [_jsx("div", { className: "text-muted-foreground text-xs font-semibold tracking-wider", children: "GIT OPERATIONS" }), _jsxs("div", { className: "flex flex-col gap-2", children: [_jsx(ActionButton, { label: "Sync Main", onClick: repoActions.syncMain, loading: repoActions.syncLoading, error: !!repoActions.syncError, icon: RefreshCw, variant: "outline", size: "sm" }), repoActions.syncError ? (_jsx("p", { className: "text-destructive text-xs", children: repoActions.syncError })) : null] })] })] })) : null] })) : null }));
 }

package/dist/src/presentation/web/components/common/feature-drawer/use-feature-actions.d.ts

@@ -1,4 +1,5 @@
 export interface FeatureActionsInput {
+    featureId: string;
     repositoryPath: string;
     branch: string;
     specPath?: string;
@@ -7,12 +8,15 @@ export interface FeatureActionsState {
     openInIde: () => Promise<void>;
     openInShell: () => Promise<void>;
     openSpecsFolder: () => Promise<void>;
+    rebaseOnMain: () => Promise<void>;
     ideLoading: boolean;
     shellLoading: boolean;
     specsLoading: boolean;
+    rebaseLoading: boolean;
     ideError: string | null;
     shellError: string | null;
     specsError: string | null;
+    rebaseError: string | null;
 }
 export declare function useFeatureActions(input: FeatureActionsInput | null): FeatureActionsState;
 //# sourceMappingURL=use-feature-actions.d.ts.map

package/dist/src/presentation/web/components/common/feature-drawer/use-feature-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-feature-actions.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer/use-feature-actions.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,GAAG,mBAAmB,CA8GxF"}
+{"version":3,"file":"use-feature-actions.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/feature-drawer/use-feature-actions.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,GAAG,mBAAmB,CA6IxF"}