@shepai/cli 1.124.0-pr396.2dd2ae6 → 1.124.0-pr402.06ada70

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

@@ -2,13 +2,20 @@
  * Deployment Service
  *
  * Infrastructure service that manages local dev server deployments.
- * Holds an in-memory Map of active deployments keyed by targetId.
- * Handles process spawning, stdout-based port detection, and graceful
- * shutdown (SIGTERM → poll → SIGKILL).
+ * Holds an in-memory Map of active deployments keyed by targetId AND
+ * persists deployment records to the `dev_servers` SQLite table so that
+ * running dev servers survive page reloads and server restarts.
+ *
+ * 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 { EventEmitter } from 'node:events';
-import treeKill from 'tree-kill';
+// 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()).
 import { DeploymentState } from '../../../domain/generated/output.js';
 import { detectDevScript } from './detect-dev-script.js';
 import { createDeploymentLogger } from './deployment-logger.js';
@@ -20,7 +27,22 @@ const MAX_WAIT_MS = 5000;
 const defaultDeps = {
     spawn,
     detectDevScript,
-    kill: (pid, signal) => treeKill(pid, signal),
+    kill: (pid, signal) => {
+        try {
+            // Kill the entire process group (negative PID) — safe because
+            // detached: true puts the child in its own group via setsid().
+            process.kill(-pid, signal);
+        }
+        catch {
+            // Fallback: kill just the process itself
+            try {
+                process.kill(pid, signal);
+            }
+            catch {
+                // Process already dead
+            }
+        }
+    },
     isAlive: (pid) => {
         try {
             process.kill(pid, 0);
@@ -35,14 +57,65 @@ export class DeploymentService {
     deployments = new Map();
     deps;
     emitter = new EventEmitter();
+    db = null;
     constructor(deps = {}) {
         this.deps = { ...defaultDeps, ...deps };
     }
+    /**
+     * Inject the database connection. Called from DI container after DB is ready.
+     */
+    setDatabase(db) {
+        this.db = db;
+    }
+    /**
+     * Recover dev servers from the database on startup.
+     * Validates each PID is still alive; removes dead rows.
+     */
+    recoverAll() {
+        if (!this.db)
+            return;
+        let rows;
+        try {
+            const stmt = this.db.prepare('SELECT * FROM dev_servers');
+            rows = stmt.all() ?? [];
+        }
+        catch {
+            log.info('dev_servers table not ready — skipping recovery');
+            return;
+        }
+        if (!rows || rows.length === 0) {
+            log.info('No dev servers to recover from database');
+            return;
+        }
+        log.info(`Recovering ${rows.length} dev server(s) from database`);
+        for (const row of rows) {
+            if (this.deps.isAlive(row.pid)) {
+                log.info(`Recovered "${row.target_id}" (pid=${row.pid}, state=${row.state}, url=${row.url})`);
+                const entry = {
+                    pid: row.pid,
+                    child: null, // orphan — we don't have the ChildProcess handle
+                    state: row.state,
+                    url: row.url,
+                    targetId: row.target_id,
+                    targetPath: row.target_path,
+                    targetType: row.target_type,
+                    stdoutBuffer: '',
+                    stderrBuffer: '',
+                    logs: new LogRingBuffer(),
+                };
+                this.deployments.set(row.target_id, entry);
+            }
+            else {
+                log.info(`Stale dev server "${row.target_id}" (pid=${row.pid}) — removing from DB`);
+                this.dbDelete(row.target_id);
+            }
+        }
+    }
     /**
      * Start a deployment for the given target.
      * If a deployment already exists for this target, it is stopped first.
      */
-    start(targetId, targetPath) {
+    start(targetId, targetPath, targetType = 'repository') {
         log.info(`start() called — targetId="${targetId}", targetPath="${targetPath}"`);
         // Stop any existing deployment for this target
         const existing = this.deployments.get(targetId);
@@ -50,6 +123,7 @@ export class DeploymentService {
             log.info(`Stopping existing deployment for "${targetId}" (pid=${existing.pid})`);
             this.killProcess(existing);
             this.deployments.delete(targetId);
+            this.dbDelete(targetId);
         }
         // Detect the dev script
         const detection = this.deps.detectDevScript(targetPath);
@@ -78,11 +152,14 @@ export class DeploymentService {
             state: DeploymentState.Booting,
             url: null,
             targetId,
+            targetPath,
+            targetType,
             stdoutBuffer: '',
             stderrBuffer: '',
             logs: new LogRingBuffer(),
         };
         this.deployments.set(targetId, entry);
+        this.dbUpsert(entry);
         // Attach stdout/stderr listeners for port detection
         this.attachOutputListener(entry, 'stdout');
         this.attachOutputListener(entry, 'stderr');
@@ -91,6 +168,7 @@ export class DeploymentService {
             log.error(`Child process error for "${targetId}" (pid=${entry.pid}): ${err.message}`);
             entry.state = DeploymentState.Stopped;
             this.deployments.delete(targetId);
+            this.dbDelete(targetId);
         });
         // Clean up on process exit
         child.on('exit', (code, signal) => {
@@ -100,20 +178,52 @@ export class DeploymentService {
                 log.warn('Process exited while still in Booting state — dev server likely crashed on startup. Check stderr output above.');
             }
             this.deployments.delete(targetId);
+            this.dbDelete(targetId);
         });
     }
     /**
      * Get the current deployment status for a target.
-     * Returns null if no deployment exists for this target.
+     * Checks in-memory Map first, then falls back to DB for recovered deployments.
+     * Validates PID liveness — cleans up if dead.
      */
     getStatus(targetId) {
         const entry = this.deployments.get(targetId);
-        if (!entry) {
-            log.debug(`getStatus("${targetId}") — no deployment found`);
-            return null;
+        if (entry) {
+            // Validate the process is still alive (handles orphan crashes)
+            if (!this.deps.isAlive(entry.pid)) {
+                log.info(`getStatus("${targetId}") — pid=${entry.pid} is dead, cleaning up`);
+                this.deployments.delete(targetId);
+                this.dbDelete(targetId);
+                return null;
+            }
+            log.debug(`getStatus("${targetId}") — state=${entry.state}, url=${entry.url}, pid=${entry.pid}`);
+            return { state: entry.state, url: entry.url };
         }
-        log.debug(`getStatus("${targetId}") — state=${entry.state}, url=${entry.url}, pid=${entry.pid}`);
-        return { state: entry.state, url: entry.url };
+        // Check DB for entries not yet in memory (e.g., after hook re-mount)
+        const row = this.dbFind(targetId);
+        if (row) {
+            if (this.deps.isAlive(row.pid)) {
+                // Re-adopt into memory
+                const recovered = {
+                    pid: row.pid,
+                    child: null,
+                    state: row.state,
+                    url: row.url,
+                    targetId: row.target_id,
+                    targetPath: row.target_path,
+                    targetType: row.target_type,
+                    stdoutBuffer: '',
+                    stderrBuffer: '',
+                    logs: new LogRingBuffer(),
+                };
+                this.deployments.set(targetId, recovered);
+                return { state: recovered.state, url: recovered.url };
+            }
+            // Dead — clean up
+            this.dbDelete(targetId);
+        }
+        log.debug(`getStatus("${targetId}") — no deployment found`);
+        return null;
     }
     /**
      * Stop a deployment gracefully: SIGTERM → poll → SIGKILL.
@@ -121,7 +231,19 @@ export class DeploymentService {
     async stop(targetId) {
         const entry = this.deployments.get(targetId);
         if (!entry) {
-            log.info(`stop("${targetId}") — no deployment found, nothing to stop`);
+            // Check DB in case it's a recovered orphan
+            const row = this.dbFind(targetId);
+            if (row && this.deps.isAlive(row.pid)) {
+                log.info(`stop("${targetId}") — killing orphan process (pid=${row.pid})`);
+                try {
+                    this.deps.kill(row.pid, 'SIGKILL');
+                }
+                catch {
+                    // already dead
+                }
+            }
+            this.dbDelete(targetId);
+            log.info(`stop("${targetId}") — no in-memory deployment found, cleaned DB`);
             return;
         }
         log.info(`stop("${targetId}") — sending SIGTERM to process tree (pid=${entry.pid})`);
@@ -133,13 +255,13 @@ export class DeploymentService {
         catch {
             log.info(`stop("${targetId}") — process already dead on SIGTERM`);
             this.deployments.delete(targetId);
+            this.dbDelete(targetId);
             return;
         }
         // Wait for the process to exit
         const died = await this.pollUntilDead(entry.pid, MAX_WAIT_MS, POLL_INTERVAL_MS);
         if (!died) {
             log.warn(`stop("${targetId}") — process did not exit after ${MAX_WAIT_MS}ms, escalating to SIGKILL`);
-            // Escalate to SIGKILL
             try {
                 this.deps.kill(entry.pid, 'SIGKILL');
             }
@@ -150,8 +272,13 @@ export class DeploymentService {
         else {
             log.info(`stop("${targetId}") — process exited gracefully`);
         }
-        // Wait for the exit event to clean up the map
-        await this.waitForExit(entry.child);
+        // Wait for the exit event to clean up the map (only if we have a ChildProcess handle)
+        if (entry.child) {
+            await this.waitForExit(entry.child);
+        }
+        // Ensure cleanup
+        this.deployments.delete(targetId);
+        this.dbDelete(targetId);
     }
     /**
      * Force-stop all tracked deployments immediately (for daemon shutdown).
@@ -161,6 +288,15 @@ export class DeploymentService {
             entry.logs.clear();
             this.killProcess(entry);
         }
+        // Also clean DB
+        if (this.db) {
+            try {
+                this.db.prepare('DELETE FROM dev_servers').run();
+            }
+            catch {
+                // table might not exist yet
+            }
+        }
     }
     /**
      * Get the accumulated log buffer for a deployment.
@@ -183,9 +319,54 @@ export class DeploymentService {
     off(event, handler) {
         this.emitter.off(event, handler);
     }
-    /**
-     * Send SIGKILL to a process tree.
-     */
+    // ─── Database helpers ───────────────────────────────────────────────
+    dbUpsert(entry) {
+        if (!this.db)
+            return;
+        try {
+            this.db
+                .prepare(`INSERT OR REPLACE INTO dev_servers
+         (target_id, target_type, pid, state, url, target_path, started_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?)`)
+                .run(entry.targetId, entry.targetType, entry.pid, entry.state, entry.url, entry.targetPath, Date.now());
+        }
+        catch (err) {
+            log.warn(`dbUpsert failed for "${entry.targetId}": ${err}`);
+        }
+    }
+    dbUpdateState(targetId, state, url) {
+        if (!this.db)
+            return;
+        try {
+            this.db
+                .prepare('UPDATE dev_servers SET state = ?, url = ? WHERE target_id = ?')
+                .run(state, url, targetId);
+        }
+        catch (err) {
+            log.warn(`dbUpdateState failed for "${targetId}": ${err}`);
+        }
+    }
+    dbDelete(targetId) {
+        if (!this.db)
+            return;
+        try {
+            this.db.prepare('DELETE FROM dev_servers WHERE target_id = ?').run(targetId);
+        }
+        catch (err) {
+            log.warn(`dbDelete failed for "${targetId}": ${err}`);
+        }
+    }
+    dbFind(targetId) {
+        if (!this.db)
+            return null;
+        try {
+            return (this.db.prepare('SELECT * FROM dev_servers WHERE target_id = ?').get(targetId) ?? null);
+        }
+        catch {
+            return null;
+        }
+    }
+    // ─── Process helpers ────────────────────────────────────────────────
     killProcess(entry) {
         try {
             this.deps.kill(entry.pid, 'SIGKILL');
@@ -200,24 +381,20 @@ export class DeploymentService {
      */
     attachOutputListener(entry, stream) {
         const bufferKey = stream === 'stdout' ? 'stdoutBuffer' : 'stderrBuffer';
-        const childStream = entry.child[stream];
+        const childStream = entry.child?.[stream];
         if (!childStream) {
             log.warn(`[${entry.targetId}] No ${stream} stream available — cannot attach listener`);
             return;
         }
         childStream.on('data', (chunk) => {
             const text = chunk.toString();
-            // Append chunk to buffer
             entry[bufferKey] += text;
-            // Process complete lines
             const lines = entry[bufferKey].split('\n');
-            // Keep the last element (incomplete line) in the buffer
             entry[bufferKey] = lines.pop() ?? '';
             for (const line of lines) {
                 if (!line.trim())
                     continue;
                 log.debug(`[${entry.targetId}] ${stream}: ${line}`);
-                // Accumulate in log buffer and emit event
                 const logEntry = {
                     targetId: entry.targetId,
                     stream,
@@ -233,12 +410,12 @@ export class DeploymentService {
                         log.info(`[${entry.targetId}] Port detected — url="${url}" (from ${stream})`);
                         entry.state = DeploymentState.Ready;
                         entry.url = url;
+                        this.dbUpdateState(entry.targetId, entry.state, entry.url);
                     }
                 }
             }
         });
         childStream.on('end', () => {
-            // Flush remaining buffer content
             const remaining = entry[bufferKey].trim();
             if (remaining) {
                 log.debug(`[${entry.targetId}] ${stream} (flush): ${remaining}`);
@@ -248,6 +425,7 @@ export class DeploymentService {
                         log.info(`[${entry.targetId}] Port detected in flushed buffer — url="${url}"`);
                         entry.state = DeploymentState.Ready;
                         entry.url = url;
+                        this.dbUpdateState(entry.targetId, entry.state, entry.url);
                     }
                 }
                 entry[bufferKey] = '';
@@ -255,9 +433,6 @@ export class DeploymentService {
             log.debug(`[${entry.targetId}] ${stream} stream ended`);
         });
     }
-    /**
-     * Poll until a process is dead or timeout expires.
-     */
     async pollUntilDead(pid, maxMs, intervalMs) {
         const deadline = Date.now() + maxMs;
         while (Date.now() < deadline) {
@@ -268,9 +443,6 @@ export class DeploymentService {
         }
         return false;
     }
-    /**
-     * Wait for a child process to emit 'exit', with a short timeout.
-     */
     waitForExit(child) {
         return new Promise((resolve) => {
             const timeout = setTimeout(() => resolve(), 1000);

package/dist/packages/core/src/infrastructure/services/deployment/parse-port.d.ts

@@ -5,11 +5,5 @@
  * dev server stdout/stderr output. Handles common patterns from Next.js,
  * Vite, Express, and generic servers.
  */
-/**
- * Parse a line of stdout/stderr output for a localhost URL or port.
- *
- * @param line - A single line of process output
- * @returns The detected URL string, or null if no URL/port was found
- */
 export declare function parsePort(line: string): string | null;
 //# sourceMappingURL=parse-port.d.ts.map

package/dist/packages/core/src/infrastructure/services/deployment/parse-port.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-port.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/deployment/parse-port.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAkCH;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAarD"}
+{"version":3,"file":"parse-port.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/deployment/parse-port.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AA4CH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAgBrD"}

package/dist/packages/core/src/infrastructure/services/deployment/parse-port.js

@@ -38,12 +38,17 @@ const PORT_PATTERNS = [
  * @param line - A single line of process output
  * @returns The detected URL string, or null if no URL/port was found
  */
+// Strip ANSI escape codes (colors, cursor movement, etc.)
+// eslint-disable-next-line no-control-regex
+const ANSI_REGEX = /\x1b\[[0-9;]*[a-zA-Z]/g;
 export function parsePort(line) {
     if (!line?.trim()) {
         return null;
     }
+    // Strip ANSI escape codes before matching — dev servers often emit colored output
+    const clean = line.replace(ANSI_REGEX, '');
     for (const { regex, extract } of PORT_PATTERNS) {
-        const match = line.match(regex);
+        const match = clean.match(regex);
         if (match) {
             return extract(match);
         }

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

@@ -45,11 +45,5 @@ 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":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAC5G,OAAO,KAAK,EACV,cAAc,EAGd,WAAW,EACX,QAAQ,EACR,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,wEAAwE,CAAC;AAUhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,qBACa,YAAa,YAAW,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBjD,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgF9C,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAuClE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAE,aAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;YA6BjF,eAAe;IASvB,gBAAgB,CACpB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,SAAS,UAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;IA4EV,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAsBjE,OAAO,CACX,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,cAAc,CAAC;IAiEpB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhF,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAevE,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAaxE,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,aAAa;IAmFf,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAoCpD,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAc/E,WAAW,CACf,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,OAAO,CAAC;IA6CnB;;;OAGG;YACW,UAAU;IAmBlB,cAAc,CAClB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,WAAW,SAAS,GACnB,OAAO,CAAC,MAAM,CAAC;IAWlB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,aAAa;CAiBtB"}

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

@@ -308,15 +308,19 @@ let GitPrService = class GitPrService {
         }
     }
     async watchCi(cwd, branch, timeoutMs, intervalSeconds) {
+        // Resolve the latest run for the branch BEFORE the try/catch so the
+        // runUrl is available in both success and failure return paths.
+        let runUrl;
         try {
             // gh run watch requires a run ID — it does not support --branch.
             // First, resolve the latest run ID for the branch via gh run list.
-            const { stdout: listOut } = await this.execFile('gh', ['run', 'list', '--branch', branch, '--json', 'databaseId', '--limit', '1'], { cwd });
+            const { stdout: listOut } = await this.execFile('gh', ['run', 'list', '--branch', branch, '--json', 'databaseId,url', '--limit', '1'], { cwd });
             const runs = JSON.parse(listOut);
             if (runs.length === 0 || !runs[0].databaseId) {
                 return { status: 'pending' };
             }
             const runId = String(runs[0].databaseId);
+            runUrl = runs[0].url;
             const interval = intervalSeconds ?? 30;
             const args = [
                 'run',
@@ -335,6 +339,7 @@ let GitPrService = class GitPrService {
             // If we reach here (no exception), CI passed — no need for fragile stdout parsing.
             return {
                 status: 'success',
+                runUrl,
                 logExcerpt: stdout.trim(),
             };
         }
@@ -356,7 +361,7 @@ let GitPrService = class GitPrService {
                 // Build a useful log excerpt from stdout/stderr if available
                 const errObj = error;
                 const parts = [errObj.stdout, errObj.stderr, message].filter(Boolean);
-                return { status: 'failure', logExcerpt: parts.join('\n').trim() };
+                return { status: 'failure', runUrl, logExcerpt: parts.join('\n').trim() };
             }
             throw new GitPrError(message, GitPrErrorCode.GIT_ERROR, cause);
         }
@@ -612,14 +617,6 @@ 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);
         }
@@ -660,123 +657,6 @@ 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 — use git fetch to update the base branch ref without switching
-                await this.execFile('git', ['fetch', 'origin', `${baseBranch}:${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('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 the base branch
-        try {
-            await this.execFile('git', ['rebase', baseBranch], { 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/actions/deploy-feature.js

@@ -27,7 +27,7 @@ export async function deployFeature(featureId) {
         }
         log.info('worktree path exists, calling deploymentService.start()');
         const deploymentService = resolve('IDeploymentService');
-        deploymentService.start(featureId, worktreePath);
+        deploymentService.start(featureId, worktreePath, 'feature');
         log.info('start() returned successfully — state=Booting');
         return { success: true, state: DeploymentState.Booting };
     }

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

@@ -18,7 +18,7 @@ export async function deployRepository(repositoryPath) {
         }
         log.info('directory exists, calling deploymentService.start()');
         const deploymentService = resolve('IDeploymentService');
-        deploymentService.start(repositoryPath, repositoryPath);
+        deploymentService.start(repositoryPath, repositoryPath, 'repository');
         log.info('start() returned successfully — state=Booting');
         return { success: true, state: DeploymentState.Booting };
     }

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,2CAykB1F"}
+{"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,2CAqkB1F"}