@shepai/cli 1.108.1 → 1.109.0

package/dist/packages/core/src/application/use-cases/upgrade/upgrade-cli.use-case.d.ts

@@ -11,6 +11,7 @@
  *   4. Return result with old/new version info
  */
 import type { IVersionService } from '../../ports/output/services/version-service.interface.js';
+import type { IDaemonService } from '../../ports/output/services/daemon-service.interface.js';
 export interface UpgradeResult {
     status: 'up-to-date' | 'upgraded' | 'error';
     currentVersion: string;
@@ -19,9 +20,16 @@ export interface UpgradeResult {
 }
 export declare class UpgradeCliUseCase {
     private readonly versionService;
-    constructor(versionService: IVersionService);
+    private readonly daemonService;
+    constructor(versionService: IVersionService, daemonService: IDaemonService);
     execute(onOutput?: (data: string) => void): Promise<UpgradeResult>;
     private getLatestVersion;
+    /**
+     * Schedule a daemon self-restart after upgrade.
+     * Reads the current daemon port, spawns a new daemon process with the
+     * upgraded code, then exits the current process after a brief delay.
+     */
+    scheduleDaemonRestart(): Promise<void>;
     private runNpmInstall;
 }
 //# sourceMappingURL=upgrade-cli.use-case.d.ts.map

package/dist/packages/core/src/application/use-cases/upgrade/upgrade-cli.use-case.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-cli.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/upgrade/upgrade-cli.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAC;AAEhG,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,GAAG,UAAU,GAAG,OAAO,CAAC;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAID,qBACa,iBAAiB;IAG1B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAd,cAAc,EAAE,eAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IAkCxE,OAAO,CAAC,gBAAgB;IA6CxB,OAAO,CAAC,aAAa;CAuBtB"}
+{"version":3,"file":"upgrade-cli.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/upgrade/upgrade-cli.use-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0DAA0D,CAAC;AAChG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AAE9F,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,YAAY,GAAG,UAAU,GAAG,OAAO,CAAC;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAOD,qBACa,iBAAiB;IAG1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,cAAc,EAAE,eAAe,EAE/B,aAAa,EAAE,cAAc;IAG1C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IAkCxE,OAAO,CAAC,gBAAgB;IA6CxB;;;;OAIG;IACG,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B5C,OAAO,CAAC,aAAa;CAuBtB"}

package/dist/packages/core/src/application/use-cases/upgrade/upgrade-cli.use-case.js

@@ -25,10 +25,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 import { injectable, inject } from 'tsyringe';
 import { spawn } from 'node:child_process';
 const VERSION_CHECK_TIMEOUT_MS = 10_000;
+/** Delay (ms) before the current process exits to allow the SSE response to flush. */
+const SELF_RESTART_DELAY_MS = 1_000;
 let UpgradeCliUseCase = class UpgradeCliUseCase {
     versionService;
-    constructor(versionService) {
+    daemonService;
+    constructor(versionService, daemonService) {
         this.versionService = versionService;
+        this.daemonService = daemonService;
     }
     async execute(onOutput) {
         const { version: currentVersion } = this.versionService.getVersion();
@@ -100,6 +104,30 @@ let UpgradeCliUseCase = class UpgradeCliUseCase {
             });
         });
     }
+    /**
+     * Schedule a daemon self-restart after upgrade.
+     * Reads the current daemon port, spawns a new daemon process with the
+     * upgraded code, then exits the current process after a brief delay.
+     */
+    async scheduleDaemonRestart() {
+        const state = await this.daemonService.read();
+        const port = state?.port;
+        // Delete daemon.json so the new process can write a fresh one
+        await this.daemonService.delete();
+        // Spawn new daemon process using the upgraded CLI binary.
+        // Use process.argv[1] which points to the shep CLI entry point —
+        // after npm install this resolves to the upgraded version on disk.
+        const child = spawn(process.execPath, [...process.execArgv, process.argv[1], '_serve', ...(port ? ['--port', String(port)] : [])], {
+            detached: true,
+            stdio: 'ignore',
+            windowsHide: true,
+        });
+        child.unref();
+        // Give the response stream time to flush, then exit the current process
+        setTimeout(() => {
+            process.exit(0);
+        }, SELF_RESTART_DELAY_MS);
+    }
     runNpmInstall(onOutput) {
         return new Promise((resolve, reject) => {
             const child = spawn('npm', ['i', '-g', '@shepai/cli@latest'], {
@@ -123,6 +151,7 @@ let UpgradeCliUseCase = class UpgradeCliUseCase {
 UpgradeCliUseCase = __decorate([
     injectable(),
     __param(0, inject('IVersionService')),
-    __metadata("design:paramtypes", [Object])
+    __param(1, inject('IDaemonService')),
+    __metadata("design:paramtypes", [Object, Object])
 ], UpgradeCliUseCase);
 export { UpgradeCliUseCase };

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAggB3C;;;GAGG;AACH,eAAO,MAAM,qBAAqB,QAA4C,CAAC;AAE/E;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B9E"}
+{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/persistence/sqlite/migrations.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AA4gB3C;;;GAGG;AACH,eAAO,MAAM,qBAAqB,QAA4C,CAAC;AAE/E;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4B9E"}

package/dist/packages/core/src/infrastructure/persistence/sqlite/migrations.js

@@ -499,6 +499,18 @@ WHERE repository_path NOT IN (SELECT path FROM repositories WHERE path IS NOT NU
         // Migration 032: Change envDeploy feature flag default to enabled (1).
         sql: `UPDATE settings SET feature_flag_env_deploy = 1 WHERE feature_flag_env_deploy = 0;`,
     },
+    {
+        version: 33,
+        sql: `
+-- Migration 033: Create pr_sync_lock table for cross-process poll coordination
+CREATE TABLE IF NOT EXISTS pr_sync_lock (
+  id INTEGER PRIMARY KEY CHECK (id = 1),
+  locked_by TEXT NOT NULL,
+  locked_at INTEGER NOT NULL,
+  expires_at INTEGER NOT NULL
+);
+`,
+    },
 ];
 /**
  * The latest schema version (highest migration version number).

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

@@ -13,6 +13,7 @@ import type { IFeatureRepository } from '../../../application/ports/output/repos
 import type { IAgentRunRepository } from '../../../application/ports/output/agents/agent-run-repository.interface.js';
 import type { IGitPrService } from '../../../application/ports/output/services/git-pr-service.interface.js';
 import type { INotificationService } from '../../../application/ports/output/services/notification-service.interface.js';
+import type Database from 'better-sqlite3';
 export declare class PrSyncWatcherService {
     private readonly featureRepo;
     private readonly agentRunRepo;
@@ -21,12 +22,22 @@ export declare class PrSyncWatcherService {
     private readonly pollIntervalMs;
     private readonly trackedFeatures;
     private readonly skippedRepos;
+    private readonly rateLimitedUntil;
+    private readonly db;
+    private readonly processId;
     private intervalId;
-    constructor(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number);
+    private pollCycle;
+    constructor(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number, db?: Database.Database | null);
     isRunning(): boolean;
     start(): void;
     stop(): void;
+    /** Attempt to acquire the cross-process poll lock. Returns true if acquired. */
+    private tryAcquireLock;
+    /** Check if a feature should be polled this cycle based on its unchanged cycles count. */
+    private shouldPollFeature;
     private poll;
+    private isRateLimited;
+    private handleRateLimitError;
     private processRepository;
     private processFeature;
     /** Mark associated agent run as completed so the UI reflects "done" state. */
@@ -39,7 +50,7 @@ export declare class PrSyncWatcherService {
  *
  * @throws Error if the watcher is already initialized
  */
-export declare function initializePrSyncWatcher(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number): void;
+export declare function initializePrSyncWatcher(featureRepo: IFeatureRepository, agentRunRepo: IAgentRunRepository, gitPrService: IGitPrService, notificationService: INotificationService, pollIntervalMs?: number, db?: Database.Database | null): void;
 /**
  * Get the PR sync watcher singleton.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"pr-sync-watcher.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAWH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gFAAgF,CAAC;AACzH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4EAA4E,CAAC;AACtH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAK5G,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8EAA8E,CAAC;AAkBzH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqC;IACrE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,UAAU,CAA+C;gBAG/D,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,GAAE,MAAiC;IASnD,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAcb,IAAI,IAAI,IAAI;YASE,IAAI;YAuCJ,iBAAiB;YA6CjB,cAAc;IAyK5B,8EAA8E;YAChE,gBAAgB;IAW9B,OAAO,CAAC,gBAAgB;CAoBzB;AAMD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CAYN;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,oBAAoB,CAQvD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAKzC"}
+{"version":3,"file":"pr-sync-watcher.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAWH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gFAAgF,CAAC;AACzH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4EAA4E,CAAC;AACtH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wEAAwE,CAAC;AAK5G,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8EAA8E,CAAC;AACzH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAqB3C,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuB;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqC;IACrE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAC9D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA2B;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,SAAS,CAAK;gBAGpB,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,GAAE,MAAiC,EACjD,EAAE,GAAE,QAAQ,CAAC,QAAQ,GAAG,IAAW;IAWrC,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAcb,IAAI,IAAI,IAAI;IASZ,gFAAgF;IAChF,OAAO,CAAC,cAAc;IAiBtB,0FAA0F;IAC1F,OAAO,CAAC,iBAAiB;YAUX,IAAI;IA6ClB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,oBAAoB;YAYd,iBAAiB;YA+CjB,cAAc;IAoL5B,8EAA8E;YAChE,gBAAgB;IAW9B,OAAO,CAAC,gBAAgB;CAoBzB;AAMD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,kBAAkB,EAC/B,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,aAAa,EAC3B,mBAAmB,EAAE,oBAAoB,EACzC,cAAc,CAAC,EAAE,MAAM,EACvB,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI,GAC5B,IAAI,CAaN;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,oBAAoB,CAQvD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAKzC"}

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

@@ -11,6 +11,8 @@
  */
 import { SdlcLifecycle, PrStatus, CiStatus, AgentRunStatus, NotificationEventType, NotificationSeverity, } from '../../../domain/generated/output.js';
 const DEFAULT_POLL_INTERVAL_MS = 30_000;
+const LOCK_TTL_MS = 60_000;
+const RATE_LIMIT_BACKOFF_MS = 5 * 60_000;
 const TAG = '[PrSyncWatcher]';
 const CI_STATUS_MAP = {
     success: CiStatus.Success,
@@ -25,13 +27,19 @@ export class PrSyncWatcherService {
     pollIntervalMs;
     trackedFeatures = new Map();
     skippedRepos = new Set();
+    rateLimitedUntil = new Map();
+    db;
+    processId;
     intervalId = null;
-    constructor(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS) {
+    pollCycle = 0;
+    constructor(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS, db = null) {
         this.featureRepo = featureRepo;
         this.agentRunRepo = agentRunRepo;
         this.gitPrService = gitPrService;
         this.notificationService = notificationService;
         this.pollIntervalMs = pollIntervalMs;
+        this.db = db;
+        this.processId = `${process.pid}-${Date.now()}`;
     }
     isRunning() {
         return this.intervalId !== null;
@@ -55,8 +63,40 @@ export class PrSyncWatcherService {
             console.log(`${TAG} Stopped`);
         }
     }
+    /** Attempt to acquire the cross-process poll lock. Returns true if acquired. */
+    tryAcquireLock() {
+        if (!this.db)
+            return true; // no DB → single-process mode, always proceed
+        const now = Date.now();
+        const expiresAt = now + LOCK_TTL_MS;
+        const stmt = this.db.prepare(`
+      INSERT OR REPLACE INTO pr_sync_lock (id, locked_by, locked_at, expires_at)
+      SELECT 1, ?, ?, ?
+      WHERE NOT EXISTS (
+        SELECT 1 FROM pr_sync_lock WHERE id = 1 AND locked_by != ? AND expires_at > ?
+      )
+    `);
+        const result = stmt.run(this.processId, now, expiresAt, this.processId, now);
+        return result.changes > 0;
+    }
+    /** Check if a feature should be polled this cycle based on its unchanged cycles count. */
+    shouldPollFeature(featureId) {
+        const tracked = this.trackedFeatures.get(featureId);
+        if (!tracked)
+            return true; // new feature, always poll
+        const uc = tracked.unchangedCycles;
+        if (uc <= 2)
+            return true; // poll every cycle
+        if (uc <= 5)
+            return this.pollCycle % 2 === 0; // poll every 2nd cycle
+        return this.pollCycle % 4 === 0; // poll every 4th cycle
+    }
     async poll() {
         try {
+            if (!this.tryAcquireLock()) {
+                return; // another process holds the lock — skip this cycle
+            }
+            this.pollCycle++;
             const allFeatures = await this.featureRepo.list({ lifecycle: SdlcLifecycle.Review });
             // Include features with a valid repositoryPath (with or without PR data)
             const features = allFeatures.filter((f) => f.repositoryPath);
@@ -89,9 +129,32 @@ export class PrSyncWatcherService {
             console.warn(`${TAG} Poll failed: ${msg}`);
         }
     }
+    isRateLimited(repoPath) {
+        const until = this.rateLimitedUntil.get(repoPath);
+        if (until === undefined)
+            return false;
+        if (Date.now() >= until) {
+            this.rateLimitedUntil.delete(repoPath);
+            // eslint-disable-next-line no-console
+            console.log(`${TAG} Rate limit backoff expired for ${repoPath}`);
+            return false;
+        }
+        return true;
+    }
+    handleRateLimitError(repoPath, error) {
+        const msg = error.message;
+        if (msg.includes('API rate limit exceeded') || msg.includes('rate limit')) {
+            const backoffUntil = Date.now() + RATE_LIMIT_BACKOFF_MS;
+            this.rateLimitedUntil.set(repoPath, backoffUntil);
+            // eslint-disable-next-line no-console
+            console.warn(`${TAG} Rate limited for ${repoPath}, backing off until ${new Date(backoffUntil).toISOString()}`);
+        }
+    }
     async processRepository(repoPath, features) {
         if (this.skippedRepos.has(repoPath))
             return;
+        if (this.isRateLimited(repoPath))
+            return;
         // Skip repos without a git remote — gh pr list will always fail
         try {
             if (!(await this.gitPrService.hasRemote(repoPath))) {
@@ -110,6 +173,8 @@ export class PrSyncWatcherService {
         }
         catch (error) {
             const msg = error instanceof Error ? error.message : String(error);
+            if (error instanceof Error)
+                this.handleRateLimitError(repoPath, error);
             // eslint-disable-next-line no-console
             console.warn(`${TAG} listPrStatuses failed for ${repoPath}: ${msg}`);
             return;
@@ -153,10 +218,15 @@ export class PrSyncWatcherService {
                 ciStatus: undefined,
                 mergeable: undefined,
                 featureName: feature.name,
+                unchangedCycles: 0,
             });
             await this.featureRepo.update(feature);
             return;
         }
+        // Check exponential backoff — skip features that haven't changed recently
+        if (!this.shouldPollFeature(feature.id)) {
+            return;
+        }
         const pr = feature.pr;
         const prStatusInfo = statusByNumber.get(pr.number);
         let needsUpdate = false;
@@ -169,6 +239,7 @@ export class PrSyncWatcherService {
                 ciStatus: pr.ciStatus,
                 mergeable: pr.mergeable,
                 featureName: feature.name,
+                unchangedCycles: 0,
             });
         }
         const tracked = this.trackedFeatures.get(feature.id);
@@ -223,12 +294,18 @@ export class PrSyncWatcherService {
         }
         catch (error) {
             const msg = error instanceof Error ? error.message : String(error);
+            if (error instanceof Error)
+                this.handleRateLimitError(feature.repositoryPath, error);
             // eslint-disable-next-line no-console
             console.warn(`${TAG} getCiStatus failed for "${feature.name}": ${msg}`);
         }
         if (needsUpdate) {
+            tracked.unchangedCycles = 0;
             await this.featureRepo.update(feature);
         }
+        else {
+            tracked.unchangedCycles++;
+        }
     }
     /** Mark associated agent run as completed so the UI reflects "done" state. */
     async completeAgentRun(feature) {
@@ -264,11 +341,11 @@ let watcherInstance = null;
  *
  * @throws Error if the watcher is already initialized
  */
-export function initializePrSyncWatcher(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs) {
+export function initializePrSyncWatcher(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs, db) {
     if (watcherInstance !== null) {
         throw new Error('PR sync watcher already initialized. Cannot re-initialize.');
     }
-    watcherInstance = new PrSyncWatcherService(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs);
+    watcherInstance = new PrSyncWatcherService(featureRepo, agentRunRepo, gitPrService, notificationService, pollIntervalMs, db ?? null);
 }
 /**
  * Get the PR sync watcher singleton.

package/dist/src/presentation/cli/commands/ui.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.command.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/cli/commands/ui.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AA+B1D;;GAEG;AACH,wBAAgB,eAAe,IAAI,OAAO,CAkFzC"}
+{"version":3,"file":"ui.command.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/cli/commands/ui.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAgC1D;;GAEG;AACH,wBAAgB,eAAe,IAAI,OAAO,CA0FzC"}

package/dist/src/presentation/cli/commands/ui.command.js

@@ -21,6 +21,7 @@ import { setVersionEnvVars } from '../../../../packages/core/src/infrastructure/
 import { resolveWebDir } from '../../../../packages/core/src/infrastructure/services/web-server.service.js';
 import { initializeNotificationWatcher, getNotificationWatcher, } from '../../../../packages/core/src/infrastructure/services/notifications/notification-watcher.service.js';
 import { initializePrSyncWatcher, getPrSyncWatcher, } from '../../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.js';
+import { getExistingConnection } from '../../../../packages/core/src/infrastructure/persistence/sqlite/connection.js';
 import { BrowserOpenerService } from '../../../../packages/core/src/infrastructure/services/browser-opener.service.js';
 import { colors, fmt, messages } from '../ui/index.js';
 function parsePort(value) {
@@ -66,7 +67,8 @@ Examples:
             getNotificationWatcher().start();
             // Start PR sync watcher to detect PR/CI status transitions on GitHub
             const gitPrService = container.resolve('IGitPrService');
-            initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService);
+            const db = getExistingConnection();
+            initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService, undefined, db);
             getPrSyncWatcher().start();
             const url = `http://localhost:${port}`;
             messages.success(`Server ready at ${fmt.code(url)}`);

package/dist/src/presentation/web/app/actions/get-feature-drawer-data.d.ts

@@ -3,6 +3,9 @@ import type { FeatureNodeData } from '../../components/common/feature-node/index
  * Fetches full FeatureNodeData for a given feature ID.
  * Used by the drawer for targeted data syncing without triggering
  * a full router.refresh() / server component re-render.
+ *
+ * CI status and mergeable status are read from the DB (already updated
+ * by PrSyncWatcherService) instead of making duplicate GitHub API calls.
  */
 export declare function getFeatureDrawerData(featureId: string): Promise<FeatureNodeData | null>;
 //# sourceMappingURL=get-feature-drawer-data.d.ts.map

package/dist/src/presentation/web/app/actions/get-feature-drawer-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-feature-drawer-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-feature-drawer-data.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAQxE;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAsD7F"}
+{"version":3,"file":"get-feature-drawer-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-feature-drawer-data.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAgC7F"}

package/dist/src/presentation/web/app/actions/get-feature-drawer-data.js

@@ -1,16 +1,13 @@
 'use server';
 import { resolve } from '../../lib/server-container.js';
-import { CiStatus } from '../../../../../packages/core/src/domain/generated/output.js';
 import { buildFeatureNodeData } from '../build-feature-node-data.js';
-const CI_STATUS_MAP = {
-    success: CiStatus.Success,
-    failure: CiStatus.Failure,
-    pending: CiStatus.Pending,
-};
 /**
  * Fetches full FeatureNodeData for a given feature ID.
  * Used by the drawer for targeted data syncing without triggering
  * a full router.refresh() / server component re-render.
+ *
+ * CI status and mergeable status are read from the DB (already updated
+ * by PrSyncWatcherService) instead of making duplicate GitHub API calls.
  */
 export async function getFeatureDrawerData(featureId) {
     try {
@@ -23,37 +20,15 @@ export async function getFeatureDrawerData(featureId) {
         if (!feature)
             return null;
         const run = feature.agentRunId ? await agentRunRepo.findById(feature.agentRunId) : null;
-        const [repo, baseBranch, artifact, remoteUrl, liveMergeable, liveCiResult] = await Promise.all([
+        // CI status and mergeable status are read from the feature record (updated by
+        // PrSyncWatcherService every 30s) — no duplicate GitHub API calls needed.
+        // Only getDefaultBranch and getRemoteUrl are kept as they are local git operations.
+        const [repo, baseBranch, artifact, remoteUrl] = await Promise.all([
             repoRepo.findByPath(feature.repositoryPath).catch(() => null),
             gitPrService.getDefaultBranch(feature.repositoryPath).catch(() => 'main'),
             getArtifact.execute(featureId).catch(() => null),
             gitPrService.getRemoteUrl(feature.repositoryPath).catch(() => null),
-            feature.pr?.number
-                ? gitPrService
-                    .getMergeableStatus(feature.repositoryPath, feature.pr.number)
-                    .catch(() => undefined)
-                : Promise.resolve(undefined),
-            feature.branch
-                ? gitPrService.getCiStatus(feature.repositoryPath, feature.branch).catch(() => undefined)
-                : Promise.resolve(undefined),
         ]);
-        // Merge live PR status into feature data
-        if (feature.pr) {
-            const liveCiStatus = liveCiResult
-                ? (CI_STATUS_MAP[liveCiResult.status] ?? CiStatus.Pending)
-                : undefined;
-            const updates = {};
-            if (liveMergeable !== undefined)
-                updates.mergeable = liveMergeable;
-            if (liveCiStatus !== undefined)
-                updates.ciStatus = liveCiStatus;
-            if (Object.keys(updates).length > 0) {
-                feature.pr = { ...feature.pr, ...updates };
-                featureRepo.update(feature).catch(() => {
-                    /* best-effort persist */
-                });
-            }
-        }
         return buildFeatureNodeData(feature, run, {
             repositoryName: repo?.name,
             baseBranch,

package/dist/src/presentation/web/app/api/cli-upgrade/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/app/api/cli-upgrade/route.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,wBAAsB,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CA+B9C"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/app/api/cli-upgrade/route.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,wBAAsB,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CA4C9C"}

package/dist/src/presentation/web/app/api/cli-upgrade/route.js

@@ -11,13 +11,26 @@ export async function POST() {
                     controller.enqueue(encoder.encode(`data: ${chunk.replace(/\n/g, '\ndata: ')}\n\n`));
                 });
                 controller.enqueue(encoder.encode(`event: done\ndata: ${JSON.stringify(result)}\n\n`));
+                // If the upgrade succeeded, schedule a daemon self-restart so the
+                // new version is loaded automatically — no manual restart needed.
+                if (result.status === 'upgraded') {
+                    controller.enqueue(encoder.encode(`event: restarting\ndata: restarting\n\n`));
+                    controller.close();
+                    await useCase.scheduleDaemonRestart();
+                    return;
+                }
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : 'Upgrade failed';
                 controller.enqueue(encoder.encode(`event: done\ndata: ${JSON.stringify({ status: 'error', currentVersion: '', latestVersion: null, errorMessage: message })}\n\n`));
             }
             finally {
-                controller.close();
+                try {
+                    controller.close();
+                }
+                catch {
+                    // Already closed (e.g. after restart path)
+                }
             }
         },
     });

package/dist/src/presentation/web/components/common/version-badge/version-badge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-badge.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/version-badge/version-badge.tsx"],"names":[],"mappings":"AAMA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,MAAM,EACN,UAAU,EACV,KAAa,EACb,WAA2B,EAC3B,WAAW,EACX,YAAY,GACb,EAAE,iBAAiB,2CA2EnB"}
+{"version":3,"file":"version-badge.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/version-badge/version-badge.tsx"],"names":[],"mappings":"AAMA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,MAAM,EACN,UAAU,EACV,KAAa,EACb,WAA2B,EAC3B,WAAW,EACX,YAAY,GACb,EAAE,iBAAiB,2CAyFnB"}

package/dist/src/presentation/web/components/common/version-badge/version-badge.js

@@ -10,9 +10,14 @@ export function VersionBadge({ version, branch, commitHash, isDev = false, packa
     // In dev mode show "1.92.2-dev", in production show "v1.92.2"
     const displayVersion = isDev ? `${version}-dev` : `v${version}`;
     const isUpgrading = upgradeStatus === 'upgrading';
+    const isRestarting = upgradeStatus === 'restarting';
     const didUpgrade = upgradeStatus === 'upgraded';
     const upgradeError = upgradeStatus === 'error';
-    return (_jsx(TooltipProvider, { delayDuration: 200, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("span", { className: "text-muted-foreground/80 hover:text-muted-foreground relative cursor-default text-[11px] leading-tight transition-colors", "data-testid": "version-label", children: [displayVersion, updateAvailable && !didUpgrade ? (_jsx("span", { className: "absolute -top-0.5 -right-1.5 size-1.5 rounded-full bg-emerald-400", "data-testid": "update-dot" })) : null] }) }), _jsxs(TooltipContent, { side: "right", className: "max-w-[280px] space-y-1 p-3 text-left", children: [_jsx("div", { className: "mb-1.5 text-xs font-semibold", children: packageName }), description ? (_jsx("div", { className: "text-[10px] leading-snug opacity-70", children: description })) : null, _jsxs("div", { className: "border-t border-white/10 pt-1.5", children: [_jsx(Row, { label: "Version", value: displayVersion }), isDev && branch ? _jsx(Row, { label: "Branch", value: branch }) : null, isDev && shortHash ? _jsx(Row, { label: "Commit", value: shortHash, mono: true }) : null, isDev && instancePath ? _jsx(Row, { label: "Path", value: instancePath, mono: true }) : null, latest ? (_jsx(Row, { label: "Latest", value: `v${latest}`, highlight: updateAvailable })) : null] }), didUpgrade ? (_jsx("div", { className: "border-t border-white/10 pt-1.5", children: _jsx("span", { className: "text-[10px] font-medium text-emerald-400", "data-testid": "upgrade-success", children: "Upgraded successfully \u2014 restart to apply" }) })) : upgradeError ? (_jsx("div", { className: "border-t border-white/10 pt-1.5", children: _jsx("span", { className: "text-[10px] font-medium text-red-400", "data-testid": "upgrade-error", children: "Upgrade failed" }) })) : updateAvailable ? (_jsx("div", { className: "border-t border-white/10 pt-1.5", children: _jsx("button", { type: "button", onClick: startUpgrade, disabled: isUpgrading, className: "inline-flex items-center gap-1 text-[10px] font-medium text-emerald-400 transition-colors hover:text-emerald-300 disabled:opacity-50", "data-testid": "upgrade-button", children: isUpgrading ? 'Upgrading...' : `Upgrade to v${latest}` }) })) : null] })] }) }));
+    return (_jsx(TooltipProvider, { delayDuration: 200, children: _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsxs("span", { className: "text-muted-foreground/80 hover:text-muted-foreground relative cursor-default text-[11px] leading-tight transition-colors", "data-testid": "version-label", children: [displayVersion, updateAvailable && !didUpgrade && !isRestarting ? (_jsx("span", { className: "absolute -top-0.5 -right-1.5 size-1.5 rounded-full bg-emerald-400", "data-testid": "update-dot" })) : null] }) }), _jsxs(TooltipContent, { side: "right", className: "max-w-[280px] space-y-1 p-3 text-left", children: [_jsx("div", { className: "mb-1.5 text-xs font-semibold", children: packageName }), description ? (_jsx("div", { className: "text-[10px] leading-snug opacity-70", children: description })) : null, _jsxs("div", { className: "border-t border-white/10 pt-1.5", children: [_jsx(Row, { label: "Version", value: displayVersion }), isDev && branch ? _jsx(Row, { label: "Branch", value: branch }) : null, isDev && shortHash ? _jsx(Row, { label: "Commit", value: shortHash, mono: true }) : null, isDev && instancePath ? _jsx(Row, { label: "Path", value: instancePath, mono: true }) : null, latest ? (_jsx(Row, { label: "Latest", value: `v${latest}`, highlight: updateAvailable })) : null] }), isRestarting ? (_jsx("div", { className: "border-t border-white/10 pt-1.5", children: _jsx("span", { className: "text-[10px] font-medium text-emerald-400", "data-testid": "upgrade-restarting", children: "Restarting..." }) })) : didUpgrade ? (_jsx("div", { className: "border-t border-white/10 pt-1.5", children: _jsx("span", { className: "text-[10px] font-medium text-emerald-400", "data-testid": "upgrade-success", children: "Upgraded successfully" }) })) : upgradeError ? (_jsx("div", { className: "border-t border-white/10 pt-1.5", children: _jsx("span", { className: "text-[10px] font-medium text-red-400", "data-testid": "upgrade-error", children: "Upgrade failed" }) })) : updateAvailable ? (_jsx("div", { className: "border-t border-white/10 pt-1.5", children: _jsx("button", { type: "button", onClick: startUpgrade, disabled: isUpgrading || isRestarting, className: "inline-flex items-center gap-1 text-[10px] font-medium text-emerald-400 transition-colors hover:text-emerald-300 disabled:opacity-50", "data-testid": "upgrade-button", children: isUpgrading
+                                    ? 'Upgrading...'
+                                    : isRestarting
+                                        ? 'Restarting...'
+                                        : `Upgrade to v${latest}` }) })) : null] })] }) }));
 }
 function Row({ label, value, highlight, mono, }) {
     return (_jsxs("div", { className: "flex items-center justify-between gap-4 text-[10px]", children: [_jsx("span", { className: "opacity-60", children: label }), _jsx("span", { className: [

package/dist/src/presentation/web/components/common/version-badge/version-badge.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-badge.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/version-badge/version-badge.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAa,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwD/C,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,YAAY,CAOnC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAE3C,mFAAmF;AACnF,eAAO,MAAM,UAAU,EAAE,KAOxB,CAAC;AAEF,wFAAwF;AACxF,eAAO,MAAM,WAAW,EAAE,KAWzB,CAAC;AAEF,mEAAmE;AACnE,eAAO,MAAM,UAAU,EAAE,KAWxB,CAAC;AAEF,yCAAyC;AACzC,eAAO,MAAM,OAAO,EAAE,KAKrB,CAAC;AAEF,sFAAsF;AACtF,eAAO,MAAM,eAAe,EAAE,KAO7B,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,kBAAkB,EAAE,KAWhC,CAAC;AAEF,kEAAkE;AAClE,eAAO,MAAM,UAAU,EAAE,KAOxB,CAAC"}
+{"version":3,"file":"version-badge.stories.d.ts","sourceRoot":"","sources":["../../../../../../../src/presentation/web/components/common/version-badge/version-badge.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAa,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AA+D/C,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,YAAY,CAOnC,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAE3C,mFAAmF;AACnF,eAAO,MAAM,UAAU,EAAE,KAOxB,CAAC;AAEF,wFAAwF;AACxF,eAAO,MAAM,WAAW,EAAE,KAWzB,CAAC;AAEF,mEAAmE;AACnE,eAAO,MAAM,UAAU,EAAE,KAWxB,CAAC;AAEF,yCAAyC;AACzC,eAAO,MAAM,OAAO,EAAE,KAKrB,CAAC;AAEF,sFAAsF;AACtF,eAAO,MAAM,eAAe,EAAE,KAO7B,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,kBAAkB,EAAE,KAWhC,CAAC;AAEF,kEAAkE;AAClE,eAAO,MAAM,UAAU,EAAE,KAOxB,CAAC"}

package/dist/src/presentation/web/components/common/version-badge/version-badge.stories.js

@@ -22,6 +22,7 @@ function withNpmVersion(latest) {
                         controller.enqueue(encoder.encode(`data: Upgrading to v${latest}...\n\n`));
                         setTimeout(() => {
                             controller.enqueue(encoder.encode(`event: done\ndata: ${JSON.stringify({ status: 'upgraded', currentVersion: '1.90.0', latestVersion: latest })}\n\n`));
+                            controller.enqueue(encoder.encode(`event: restarting\ndata: restarting\n\n`));
                             controller.close();
                         }, 1000);
                     },
@@ -31,6 +32,12 @@ function withNpmVersion(latest) {
                     headers: { 'Content-Type': 'text/event-stream' },
                 });
             }
+            if (url.includes('/api/version')) {
+                return new Response(JSON.stringify({ version: latest }), {
+                    status: 200,
+                    headers: { 'Content-Type': 'application/json' },
+                });
+            }
             return originalFetch(input, init);
         });
         return _jsx(Story, {});

package/dist/src/presentation/web/dev-server.js

@@ -19,6 +19,7 @@ import { InitializeSettingsUseCase } from '../../../packages/core/src/applicatio
 import { initializeSettings } from '../../../packages/core/src/infrastructure/services/settings.service.js';
 import { initializeNotificationWatcher, getNotificationWatcher, } from '../../../packages/core/src/infrastructure/services/notifications/notification-watcher.service.js';
 import { initializePrSyncWatcher, getPrSyncWatcher, } from '../../../packages/core/src/infrastructure/services/pr-sync/pr-sync-watcher.service.js';
+import { getExistingConnection } from '../../../packages/core/src/infrastructure/persistence/sqlite/connection.js';
 const DEFAULT_PORT = 3000;
 async function isPortAvailable(port) {
     return new Promise((resolve) => {
@@ -64,7 +65,8 @@ async function main() {
         getNotificationWatcher().start();
         // Start PR sync watcher to detect PR/CI status transitions on GitHub
         const gitPrService = container.resolve('IGitPrService');
-        initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService);
+        const db = getExistingConnection();
+        initializePrSyncWatcher(featureRepo, runRepo, gitPrService, notificationService, undefined, db);
         getPrSyncWatcher().start();
     }
     catch (error) {

package/dist/src/presentation/web/hooks/use-cli-upgrade.d.ts

@@ -1,4 +1,4 @@
-export type UpgradeStatus = 'idle' | 'upgrading' | 'upgraded' | 'up-to-date' | 'error';
+export type UpgradeStatus = 'idle' | 'upgrading' | 'restarting' | 'upgraded' | 'up-to-date' | 'error';
 export interface CliUpgradeState {
     status: UpgradeStatus;
     output: string;

package/dist/src/presentation/web/hooks/use-cli-upgrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-cli-upgrade.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/hooks/use-cli-upgrade.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC;AAEvF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B;AAED,wBAAgB,aAAa,IAAI,eAAe,GAAG,iBAAiB,CA6EnE"}
+{"version":3,"file":"use-cli-upgrade.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/hooks/use-cli-upgrade.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,aAAa,GACrB,MAAM,GACN,WAAW,GACX,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,OAAO,CAAC;AAOZ,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B;AA4BD,wBAAgB,aAAa,IAAI,eAAe,GAAG,iBAAiB,CAuFnE"}

package/dist/src/presentation/web/hooks/use-cli-upgrade.js

@@ -1,16 +1,46 @@
 'use client';
 import { useCallback, useRef, useState } from 'react';
+/** How often to poll the server during restart (ms). */
+const RESTART_POLL_MS = 500;
+/** Maximum time to wait for the server to come back after restart (ms). */
+const RESTART_TIMEOUT_MS = 30_000;
+/**
+ * Poll the server until it responds, then reload the page.
+ */
+function waitForServerAndReload(timeoutMs, pollMs) {
+    const deadline = Date.now() + timeoutMs;
+    const poll = () => {
+        if (Date.now() > deadline)
+            return;
+        fetch('/api/version', { method: 'GET', cache: 'no-store' })
+            .then((res) => {
+            if (res.ok) {
+                window.location.reload();
+            }
+            else {
+                setTimeout(poll, pollMs);
+            }
+        })
+            .catch(() => {
+            setTimeout(poll, pollMs);
+        });
+    };
+    // Brief initial delay to let the old server shut down
+    setTimeout(poll, pollMs);
+}
 export function useCliUpgrade() {
     const [status, setStatus] = useState('idle');
     const [output, setOutput] = useState('');
     const [errorMessage, setErrorMessage] = useState();
     const abortRef = useRef(null);
+    const restartingRef = useRef(false);
     const startUpgrade = useCallback(() => {
-        if (status === 'upgrading')
+        if (status === 'upgrading' || status === 'restarting')
             return;
         setStatus('upgrading');
         setOutput('');
         setErrorMessage(undefined);
+        restartingRef.current = false;
         const controller = new AbortController();
         abortRef.current = controller;
         fetch('/api/cli-upgrade', { method: 'POST', signal: controller.signal })
@@ -31,6 +61,12 @@ export function useCliUpgrade() {
                 const lines = buffer.split('\n');
                 buffer = lines.pop() ?? '';
                 for (const line of lines) {
+                    if (line.startsWith('event: restarting')) {
+                        restartingRef.current = true;
+                        setStatus('restarting');
+                        waitForServerAndReload(RESTART_TIMEOUT_MS, RESTART_POLL_MS);
+                        continue;
+                    }
                     if (line.startsWith('event: done')) {
                         // Next data line contains the final result
                         continue;
@@ -60,6 +96,9 @@ export function useCliUpgrade() {
             }
         })
             .catch((err) => {
+            // If we're in restarting state, the connection dropping is expected
+            if (restartingRef.current)
+                return;
             if (err instanceof DOMException && err.name === 'AbortError')
                 return;
             setStatus('error');