@shepai/cli 1.138.0-pr445.9f2c136 → 1.139.0-pr446.9a4d670

package/dist/packages/core/src/infrastructure/services/deployment/deployment.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/deployment/deployment.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,KAAK,EAAmC,MAAM,oBAAoB,CAAC;AAK5E,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAK3C,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,QAAQ,EACT,MAAM,qEAAqE,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAiCzD,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,eAAe,EAAE,OAAO,eAAe,CAAC;IACxC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC;IAC7D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACnC;AA0CD,qBAAa,iBAAkB,YAAW,kBAAkB;IAC1D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsC;IAClE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAwB;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,EAAE,CAAkC;gBAEhC,IAAI,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAIrD;;OAEG;IACH,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI;IAIxC;;;;;;;;;;;;OAYG;IACH,UAAU,IAAI,IAAI;IAgFlB;;;OAGG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,SAAe,GAAG,IAAI;IA0G5E;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IA4CpD;;OAEG;IACG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0D3C;;OAEG;IACH,OAAO,IAAI,IAAI;IAef;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,GAAG,IAAI;IAM5C;;OAEG;IACH,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,IAAI;IAI1D;;OAEG;IACH,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,IAAI;IAM3D,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,MAAM;IAed,OAAO,CAAC,WAAW;IAQnB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;YA4Dd,aAAa;IAW3B,OAAO,CAAC,WAAW;IAUnB;;;;OAIG;YACW,kBAAkB;IAsChC;;;OAGG;IACH,OAAO,CAAC,SAAS;CAwBlB"}
+{"version":3,"file":"deployment.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/deployment/deployment.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,KAAK,EAAmC,MAAM,oBAAoB,CAAC;AAK5E,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAK3C,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,QAAQ,EACT,MAAM,qEAAqE,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAiCzD,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,eAAe,EAAE,OAAO,eAAe,CAAC;IACxC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC;IAC7D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACnC;AA0CD,qBAAa,iBAAkB,YAAW,kBAAkB;IAC1D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsC;IAClE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAwB;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,EAAE,CAAkC;gBAEhC,IAAI,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAIrD;;OAEG;IACH,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI;IAIxC;;;;;;;;;;;;OAYG;IACH,UAAU,IAAI,IAAI;IAqFlB;;;OAGG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,SAAe,GAAG,IAAI;IA6H5E;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IA4CpD;;OAEG;IACG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0D3C;;OAEG;IACH,OAAO,IAAI,IAAI;IAef;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,GAAG,IAAI;IAM5C;;OAEG;IACH,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,IAAI;IAI1D;;OAEG;IACH,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,GAAG,IAAI;IAM3D,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,MAAM;IAed,OAAO,CAAC,WAAW;IAQnB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;YA4Dd,aAAa;IAW3B,OAAO,CAAC,WAAW;IAUnB;;;;OAIG;YACW,kBAAkB;IAsChC;;;OAGG;IACH,OAAO,CAAC,SAAS;CAwBlB"}

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

@@ -99,6 +99,12 @@ export class DeploymentService {
     recoverAll() {
         if (!this.db)
             return;
+        // Child dev servers spawned by DeploymentService share the same global DB.
+        // Skip recovery to avoid killing processes owned by the parent instance.
+        if (process.env.SHEP_SKIP_RECOVERY) {
+            log.info('SHEP_SKIP_RECOVERY set — skipping dev server recovery');
+            return;
+        }
         let rows;
         try {
             const stmt = this.db.prepare('SELECT * FROM dev_servers');
@@ -137,20 +143,16 @@ export class DeploymentService {
                 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(`Dev server "${row.target_id}" (pid=${row.pid}) is dead — will re-spawn`);
+                // Strategy 2: Process alive but stuck in Booting — leave it running.
+                // We can't re-attach stdout so we can't detect when it becomes Ready,
+                // but killing it would be destructive (another process on the same
+                // shared DB may have just spawned it). The user can restart manually.
+                log.info(`Orphan "${row.target_id}" (pid=${row.pid}) stuck in ${row.state} — leaving alive (cannot re-attach)`);
+                this.dbDelete(row.target_id);
+                continue;
             }
-            // Strategy 2 & 3: Re-spawn if target directory still has a package.json
+            // Strategy 3: Dead process — re-spawn if target directory still exists
+            log.info(`Dev server "${row.target_id}" (pid=${row.pid}) is dead — will re-spawn`);
             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}"`);
@@ -215,6 +217,9 @@ export class DeploymentService {
             // stdout/stderr — we don't need it because taskkill /F /T handles tree kill.
             ...(IS_WINDOWS ? { windowsHide: true } : { detached: true }),
             stdio: ['ignore', 'pipe', 'pipe'],
+            // Prevent child shep instances (e.g. worktree dev servers) from running
+            // recoverAll() on the shared ~/.shep/data DB and killing our processes.
+            env: { ...process.env, SHEP_SKIP_RECOVERY: '1' },
         });
         if (!child.pid) {
             log.error('spawn() returned no PID — process failed to start');
@@ -234,7 +239,10 @@ export class DeploymentService {
             logs: new LogRingBuffer(),
         };
         this.deployments.set(targetId, entry);
-        this.dbUpsert(entry);
+        // NOTE: Do NOT write to DB during Booting. The spawned process may be
+        // another shep instance sharing ~/.shep/data — its recoverAll() would
+        // find this Booting entry, see its own PID as alive, and SIGKILL itself.
+        // We persist to DB only when the state transitions to Ready (URL detected).
         // Attach stdout/stderr listeners for port detection
         this.attachOutputListener(entry, 'stdout');
         this.attachOutputListener(entry, 'stderr');
@@ -245,12 +253,25 @@ export class DeploymentService {
             this.deployments.delete(targetId);
             this.dbDelete(targetId);
         });
-        // Clean up on process exit
-        child.on('exit', (code, signal) => {
+        // Use 'close' instead of 'exit' — 'close' fires after stdio streams are
+        // fully consumed, so entry.logs will contain all captured output.
+        child.on('close', (code, signal) => {
             const wasBooting = entry.state === DeploymentState.Booting;
-            log.info(`Process exited for "${targetId}" (pid=${entry.pid}) — code=${code}, signal=${signal}, wasBooting=${wasBooting}`);
+            log.info(`Process closed for "${targetId}" (pid=${entry.pid}) — code=${code}, signal=${signal}, wasBooting=${wasBooting}`);
             if (wasBooting) {
-                log.warn('Process exited while still in Booting state — dev server likely crashed on startup. Check stderr output above.');
+                log.warn(`Process exited while still in Booting state — dev server likely crashed on startup (code=${code}, signal=${signal}).`);
+                const allLogs = entry.logs.getAll();
+                const stdoutLines = allLogs.filter((l) => l.stream === 'stdout');
+                const stderrLines = allLogs.filter((l) => l.stream === 'stderr');
+                if (stdoutLines.length > 0) {
+                    log.warn(`[${targetId}] stdout:\n${stdoutLines.map((l) => l.line).join('\n')}`);
+                }
+                if (stderrLines.length > 0) {
+                    log.warn(`[${targetId}] stderr:\n${stderrLines.map((l) => l.line).join('\n')}`);
+                }
+                if (allLogs.length === 0) {
+                    log.warn(`[${targetId}] No output captured from the process.`);
+                }
             }
             this.deployments.delete(targetId);
             this.dbDelete(targetId);
@@ -485,7 +506,7 @@ 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);
+                        this.dbUpsert(entry);
                     }
                 }
             }
@@ -500,7 +521,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);
+                        this.dbUpsert(entry);
                     }
                 }
                 entry[bufferKey] = '';

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

@@ -1 +1 @@
-{"version":3,"file":"deploy-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/deploy-feature.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAIvE,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,eAAe,CAAA;CAAE,CAAC,CAwCxE"}
+{"version":3,"file":"deploy-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/deploy-feature.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAKvE,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,eAAe,CAAA;CAAE,CAAC,CAgDxE"}

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

@@ -4,6 +4,7 @@ import { resolve } from '../../lib/server-container.js';
 import { createDeploymentLogger } from '../../../../../packages/core/src/infrastructure/services/deployment/deployment-logger.js';
 import { computeWorktreePath } from '../../../../../packages/core/src/infrastructure/services/ide-launchers/compute-worktree-path.js';
 import { DeploymentState } from '../../../../../packages/core/src/domain/generated/output.js';
+import { isSameShepInstance } from '../../lib/is-same-shep-instance.js';
 const log = createDeploymentLogger('[deployFeature]');
 export async function deployFeature(featureId) {
     log.info(`called — featureId="${featureId}"`);
@@ -25,6 +26,13 @@ export async function deployFeature(featureId) {
             log.warn(`worktree path does not exist on disk: "${worktreePath}"`);
             return { success: false, error: `Worktree path does not exist: ${worktreePath}` };
         }
+        if (isSameShepInstance(feature.repositoryPath)) {
+            log.warn('rejected — feature belongs to the running shep instance');
+            return {
+                success: false,
+                error: 'Cannot start a dev server for features of the repository Shep is running from',
+            };
+        }
         log.info('worktree path exists, calling deploymentService.start()');
         const deploymentService = resolve('IDeploymentService');
         deploymentService.start(featureId, worktreePath, 'feature');

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

@@ -1 +1 @@
-{"version":3,"file":"deploy-repository.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/deploy-repository.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAIvE,wBAAsB,gBAAgB,CACpC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,eAAe,CAAA;CAAE,CAAC,CAyBxE"}
+{"version":3,"file":"deploy-repository.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/deploy-repository.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAKvE,wBAAsB,gBAAgB,CACpC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,eAAe,CAAA;CAAE,CAAC,CAiCxE"}

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

@@ -4,6 +4,7 @@ import { isAbsolute } from 'node:path';
 import { resolve } from '../../lib/server-container.js';
 import { createDeploymentLogger } from '../../../../../packages/core/src/infrastructure/services/deployment/deployment-logger.js';
 import { DeploymentState } from '../../../../../packages/core/src/domain/generated/output.js';
+import { isSameShepInstance } from '../../lib/is-same-shep-instance.js';
 const log = createDeploymentLogger('[deployRepository]');
 export async function deployRepository(repositoryPath) {
     log.info(`called — repositoryPath="${repositoryPath}"`);
@@ -16,6 +17,13 @@ export async function deployRepository(repositoryPath) {
             log.warn(`directory does not exist: "${repositoryPath}"`);
             return { success: false, error: `Directory does not exist: ${repositoryPath}` };
         }
+        if (isSameShepInstance(repositoryPath)) {
+            log.warn('rejected — target is the running shep instance');
+            return {
+                success: false,
+                error: 'Cannot start a dev server for the repository Shep is running from',
+            };
+        }
         log.info('directory exists, calling deploymentService.start()');
         const deploymentService = resolve('IDeploymentService');
         deploymentService.start(repositoryPath, repositoryPath, 'repository');

package/dist/src/presentation/web/lib/is-same-shep-instance.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Check if a target path is the same directory (or a worktree of) the
+ * currently running shep instance. Starting a dev server there would spawn
+ * another shep instance that conflicts with the shared ~/.shep/data DB.
+ */
+export declare function isSameShepInstance(targetPath: string): boolean;
+//# sourceMappingURL=is-same-shep-instance.d.ts.map

package/dist/src/presentation/web/lib/is-same-shep-instance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-same-shep-instance.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/lib/is-same-shep-instance.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAU9D"}

package/dist/src/presentation/web/lib/is-same-shep-instance.js

@@ -0,0 +1,18 @@
+import { realpathSync } from 'node:fs';
+import { resolve } from 'node:path';
+/**
+ * Check if a target path is the same directory (or a worktree of) the
+ * currently running shep instance. Starting a dev server there would spawn
+ * another shep instance that conflicts with the shared ~/.shep/data DB.
+ */
+export function isSameShepInstance(targetPath) {
+    const instancePath = process.env.NEXT_PUBLIC_SHEP_INSTANCE_PATH ?? process.cwd();
+    try {
+        const normalizedTarget = realpathSync(resolve(targetPath)).replace(/\\/g, '/');
+        const normalizedInstance = realpathSync(resolve(instancePath)).replace(/\\/g, '/');
+        return normalizedTarget === normalizedInstance;
+    }
+    catch {
+        return false;
+    }
+}