@agentuity/cli 2.0.10 → 2.0.12

package/dist/cmd/dev/dev-lock.js

@@ -31,36 +31,62 @@ function pidExists(pid) {
     }
 }
 /**
- * Kill a process by PID with SIGTERM, then SIGKILL if still alive
+ * Send a signal to a process group (negative PID) with fallback to direct PID.
+ * Returns true if the signal was sent successfully.
  */
-async function killPid(pid, logger) {
-    if (!pidExists(pid))
-        return;
+function killProcessTree(pid, signal, logger) {
+    // Safety: never send signals to PID 0 (own process group), PID 1 (init/systemd),
+    // or other dangerously low PIDs. process.kill(-1) would signal every process
+    // the user owns, which would crash the entire desktop session.
+    if (pid <= 1) {
+        logger.debug('Refusing to kill dangerous pid %d, skipping process tree kill', pid);
+        return false;
+    }
+    // Try process group kill first (kills all children too)
     try {
-        process.kill(pid, 'SIGTERM');
-        logger.debug('Sent SIGTERM to pid %d', pid);
+        process.kill(-pid, signal);
+        logger.debug('Sent %s to process group -%d', signal, pid);
+        return true;
     }
     catch (err) {
         const error = err;
-        if (error.code === 'ESRCH')
-            return;
-        logger.debug('Error sending SIGTERM to pid %d: %s', pid, error.message);
+        if (error.code !== 'ESRCH') {
+            logger.debug('Process group kill failed for pid %d (%s), falling back to direct', pid, error.code);
+        }
     }
-    // Give it a moment to exit gracefully
-    await new Promise((r) => setTimeout(r, 500));
-    if (!pidExists(pid))
-        return;
-    // Force kill
+    // Fall back to direct PID kill
     try {
-        process.kill(pid, 'SIGKILL');
-        logger.debug('Sent SIGKILL to pid %d', pid);
+        process.kill(pid, signal);
+        logger.debug('Sent %s to pid %d (direct)', signal, pid);
+        return true;
     }
     catch (err) {
         const error = err;
         if (error.code !== 'ESRCH') {
-            logger.debug('Error sending SIGKILL to pid %d: %s', pid, error.message);
+            logger.debug('Direct kill failed for pid %d: %s', pid, error.code);
         }
+        return false;
     }
+}
+/**
+ * Kill a process by PID with SIGTERM, then SIGKILL if still alive.
+ * Targets the entire process tree to prevent orphaned child processes.
+ */
+async function killPid(pid, logger) {
+    if (!pidExists(pid))
+        return;
+    // Send SIGTERM to process tree
+    const sent = killProcessTree(pid, 'SIGTERM', logger);
+    if (!sent)
+        return;
+    // Give it a moment to exit gracefully
+    await new Promise((r) => setTimeout(r, 500));
+    // Always attempt SIGKILL on the process tree even if the leader has exited.
+    // On Unix, process groups persist after the leader exits and signaling via
+    // negative PGID still reaches remaining members. killProcessTree() handles
+    // ESRCH gracefully if the group no longer exists.
+    // Force kill the entire process tree
+    killProcessTree(pid, 'SIGKILL', logger);
     // Wait for process to fully terminate
     await new Promise((r) => setTimeout(r, 100));
 }

package/dist/cmd/dev/dev-lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-lock.js","sourceRoot":"","sources":["../../../src/cmd/dev/dev-lock.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AAyCzC,SAAS,WAAW,CAAC,OAAe;IACnC,OAAO,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,gBAAgB,CAAC,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,GAAW;IAC7B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACrD,IAAI,CAAC;QACJ,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,GAA4B,CAAC;QAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACpE,+CAA+C;QAC/C,OAAO,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;IAC/B,CAAC;AACF,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,MAAkB;IACrD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;QAAE,OAAO;IAE5B,IAAI,CAAC;QACJ,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,GAA4B,CAAC;QAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QACnC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,sCAAsC;IACtC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;QAAE,OAAO;IAE5B,aAAa;IACb,IAAI,CAAC;QACJ,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,GAA4B,CAAC;QAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACzE,CAAC;IACF,CAAC;IAED,sCAAsC;IACtC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,QAAQ,CAAC,QAAgB,EAAE,MAAkB;IAC3D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC;YAAE,OAAO,MAAuB,CAAC;IACpE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,UAAU,CAAC,QAAgB,EAAE,MAAkB;IAC7D,IAAI,CAAC;QACJ,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,GAA4B,CAAC;QAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACpE,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,GAAG,EAAE;YACzD,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC;SAChC,CAAC,CAAC;QACH,qCAAqC;QACrC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC;IACb,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACvB,+DAA+D;QAC/D,2DAA2D;QAC3D,MAAM,KAAK,GAAG,GAA4C,CAAC;QAC3D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC;QAC/B,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YACtD,OAAO,KAAK,CAAC;QACd,CAAC;QACD,gFAAgF;QAChF,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,gBAAgB,CAC9B,OAAe,EACf,IAAmB,EACnB,MAAkB;IAElB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,CAAC,KAAK,CACX,wDAAwD,EACxD,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,CACf,CAAC;IAEF,uDAAuD;IACvD,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;QACzC,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC;YAC1E,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,sBAAsB;IACtB,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,mCAAmC;IACnC,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,4BAA4B;IAC5B,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,2BAA2B,CACzC,OAAe,EACf,KAAa,EACb,MAAkB;IAElB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEtE,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE9C,qDAAqD;IACrD,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;QACzB,YAAY,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,KAAK,CACX,qFAAqF,EACrF,QAAQ,CAAC,OAAO,EAChB,SAAS,EACT,YAAY,EACZ,KAAK,CACL,CAAC;IAEF,MAAM,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,WAAW,CACzB,OAAe,EACf,IAAY,EACZ,MAAkB;IAElB,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,MAAM,KAAK,GAAkB;QAC5B,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,OAAO;QACpB,OAAO,EAAE,OAAO,CAAC,GAAG;QACpB,UAAU,EAAE,UAAU,EAAE;QACxB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;QACpB,QAAQ,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;QAC5B,KAAK,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACpF,CAAC,CAAC;IAEF,MAAM,SAAS,EAAE,CAAC;IAClB,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAE9F,MAAM,OAAO,GAAmB;QAC/B,KAAK;QAEL,KAAK,CAAC,aAAa,CAAC,KAAK;YACxB,IAAI,CAAC,KAAK,CAAC,GAAG;gBAAE,OAAO;YACvB,mBAAmB;YACnB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC;gBAAE,OAAO;YAC5D,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,SAAS,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnF,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,KAAK;YACtB,KAAK,CAAC,KAAK,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC;YAC3C,MAAM,SAAS,EAAE,CAAC;QACnB,CAAC;QAED,KAAK,CAAC,OAAO;YACZ,MAAM,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;KACD,CAAC;IAEF,OAAO,OAAO,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,OAAe,EACf,IAAY,EACZ,MAAkB;IAElB,MAAM,2BAA2B,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACzD,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAe,EAAE,MAAkB;IACxE,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,QAAQ,EAAE,CAAC;QACd,MAAM,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,OAAe;IAC9C,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,IAAI,CAAC;QACJ,UAAU,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACR,2CAA2C;IAC5C,CAAC;AACF,CAAC"}
+{"version":3,"file":"dev-lock.js","sourceRoot":"","sources":["../../../src/cmd/dev/dev-lock.ts"],"names":[],"mappings":"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"}

package/dist/cmd/dev/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/index.ts"],"names":[],"mappings":"AAuHA,eAAO,MAAM,OAAO,mCAo+BlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/index.ts"],"names":[],"mappings":"AA6JA,eAAO,MAAM,OAAO,mCAijClB,CAAC"}

package/dist/cmd/dev/index.js

@@ -27,23 +27,27 @@ const MAX_PORT = 65535;
 /**
  * Kill any lingering gravity processes from previous dev sessions.
  * This is a defensive measure to clean up orphaned processes.
+ *
+ * When a projectId is provided, only kills gravity processes for that specific
+ * project. Otherwise falls back to killing all gravity processes (used during
+ * startup before project info is available).
  */
-async function killLingeringGravityProcesses(logger) {
+async function killLingeringGravityProcesses(logger, projectId) {
     // Only attempt on Unix-like systems (macOS, Linux)
     if (process.platform === 'win32') {
         return;
     }
     try {
-        // Use pkill to kill gravity processes owned by current user
-        // The -f flag matches against full command line
-        // We specifically match the gravity binary name to avoid killing unrelated processes
-        const result = Bun.spawnSync(['pkill', '-f', 'gravity.*--endpoint-id'], {
+        // Scope the pkill pattern to the specific project when possible,
+        // avoiding killing gravity processes from other dev sessions.
+        const pattern = projectId ? `gravity.*--project-id.*${projectId}` : 'gravity.*--endpoint-id';
+        const result = Bun.spawnSync(['pkill', '-f', pattern], {
             stdout: 'ignore',
             stderr: 'ignore',
         });
         // Exit code 0 = processes killed, 1 = no matching processes, other = error
         if (result.exitCode === 0) {
-            logger.debug('Killed lingering gravity processes from previous session');
+            logger.debug('Killed lingering gravity processes%s from previous session', projectId ? ` (project ${projectId})` : '');
             // Brief pause to let processes fully terminate
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
@@ -57,19 +61,44 @@ async function killLingeringGravityProcesses(logger) {
 }
 /**
  * Kill the Bun backend subprocess if one is running.
+ *
+ * @param forceKill - If true, sends SIGKILL instead of SIGTERM. Used in
+ *   process.on('exit') handlers where there's no time for graceful shutdown.
+ *   Also kills the entire process tree to prevent orphaned child processes.
  */
-function killBunSubprocess(logger) {
+function killBunSubprocess(logger, forceKill = false) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const globalAny = globalThis;
     const bunSubprocess = globalAny.__AGENTUITY_BUN_SUBPROCESS__;
     if (!bunSubprocess)
         return;
-    try {
-        bunSubprocess.kill('SIGTERM');
-        logger.debug('Bun subprocess killed');
+    const signal = forceKill ? 'SIGKILL' : 'SIGTERM';
+    const pid = bunSubprocess.pid;
+    // Kill the entire process tree if we have a PID (guard against dangerous PIDs)
+    if (pid && pid > 1) {
+        try {
+            process.kill(-pid, signal);
+            logger.debug('Sent %s to Bun subprocess process group -%d', signal, pid);
+        }
+        catch {
+            // Process group kill failed, fall back to direct kill
+            try {
+                bunSubprocess.kill(signal);
+                logger.debug('Sent %s to Bun subprocess pid %d (direct)', signal, pid);
+            }
+            catch (err) {
+                logger.debug('Error killing Bun subprocess: %s', err);
+            }
+        }
     }
-    catch (err) {
-        logger.debug('Error killing Bun subprocess: %s', err);
+    else {
+        try {
+            bunSubprocess.kill(signal);
+            logger.debug('Bun subprocess killed with %s', signal);
+        }
+        catch (err) {
+            logger.debug('Error killing Bun subprocess: %s', err);
+        }
     }
     globalAny.__AGENTUITY_BUN_SUBPROCESS__ = undefined;
 }
@@ -277,9 +306,9 @@ export const command = createCommand({
         // Prepare dev lock: cleans up stale processes from previous sessions
         // and creates a new lockfile for this session
         const devLock = await prepareDevLock(rootDir, opts.port, logger);
-        // Kill any lingering gravity processes from previous dev sessions
-        // This is a fallback for cases where the lockfile was corrupted
-        await killLingeringGravityProcesses(logger);
+        // Kill any lingering gravity processes from previous dev sessions.
+        // Scoped to this project to avoid killing gravity from other dev sessions.
+        await killLingeringGravityProcesses(logger, project?.projectId);
         // Check and upgrade @agentuity/* dependencies if needed
         const upgradeResult = await checkAndUpgradeDependencies(rootDir, logger);
         if (upgradeResult.failed.length > 0) {
@@ -451,91 +480,41 @@ export const command = createCommand({
                     originalConsoleError(...args);
                 };
             }
-            // Start Vite dev server on an internal port.
-            // The user-facing port is handled by the front-door TCP proxy (ws-proxy)
-            // which routes WS upgrades to Bun and everything else to Vite.
+            // --- State for long-running processes ---
+            // Declared early so signal handlers can reference them before
+            // servers are started.
             let viteServer = null;
-            let vitePort;
-            // Initialize process manager to track all servers/processes
-            const procManager = initProcessManager(logger);
-            try {
-                logger.debug('Starting Vite dev server (internal port %d)...', viteInternalPort);
-                const viteResult = await startViteAssetServer({
-                    rootDir,
-                    logger,
-                    workbenchPath: workbench.config?.route,
-                    port: viteInternalPort,
-                    backendPort: bunBackendPort,
-                    routePaths,
-                    liveHostname: devmode?.hostname,
-                });
-                viteServer = viteResult.server;
-                vitePort = viteResult.port;
-                // Register Vite server with process manager
-                procManager.registerServer({
-                    id: 'vite',
-                    server: viteServer,
-                    description: 'Vite dev server (frontend assets)',
-                    port: vitePort,
-                });
-                // Update dev lock with actual Vite port
-                await devLock.updatePorts({ vite: vitePort });
-                logger.debug(`Vite dev server running on port ${vitePort} (internal, proxying backend on port ${bunBackendPort})`);
-            }
-            catch (error) {
-                tui.error(`Failed to start Vite dev server: ${error}`);
-                await procManager.cleanup('vite startup failure');
-                await devLock.release();
-                originalExit(1);
-                return;
-            }
-            // Start the front-door TCP proxy on the user-facing port.
-            // Routes WebSocket upgrades (for /api/*, /_agentuity/*) directly to Bun
-            // and everything else (HTTP, HMR WebSocket) to Vite.
-            // This works around Bun's broken node:http upgrade socket implementation.
             let frontDoorServer = null;
-            try {
-                const { startWsProxy } = await import('../build/vite/ws-proxy');
-                frontDoorServer = await startWsProxy({
-                    port: opts.port,
-                    vitePort,
-                    backendPort: bunBackendPort,
-                    routePaths,
-                    logger,
-                });
-                // Register front-door proxy with process manager
-                procManager.registerServer({
-                    id: 'front-door-proxy',
-                    server: {
-                        close: () => {
-                            frontDoorServer?.close();
-                        },
-                    },
-                    description: 'Front-door TCP proxy (WS routing)',
-                    port: opts.port,
-                });
-                logger.debug(`Front-door proxy on port ${opts.port} (Vite:${vitePort}, Bun:${bunBackendPort})`);
-            }
-            catch (error) {
-                tui.error(`Failed to start front-door proxy: ${error}`);
-                await procManager.cleanup('front-door proxy startup failure');
-                await devLock.release();
-                originalExit(1);
-                return;
-            }
-            // --- State for long-running processes ---
             let gravityProcess = null;
             let gravityHeartbeatInterval = null;
             let stdinListenerRegistered = false;
             let stdinDataHandler = null;
             let shutdownRequested = false;
+            // Initialize process manager to track all servers/processes
+            const procManager = initProcessManager(logger);
+            // Resolve the actual Vite port BEFORE starting Bun so that env vars
+            // like AGENTUITY_BASE_URL contain the correct port. The runtime's
+            // CORS trusted-origins are built once at startup, so a late update
+            // would leave the backend with stale origins.
+            const { findAvailablePort } = await import('../build/vite/vite-asset-server');
+            const vitePort = await findAvailablePort(viteInternalPort, '127.0.0.1');
+            if (vitePort !== viteInternalPort) {
+                logger.info(`Port ${viteInternalPort} is in use, using port ${vitePort} for Vite dev server`);
+            }
+            // Separate guard flags:
+            // - cleanupStarted: prevents double-entry into cleanup()
+            // - shutdownRequested: breaks the main wait loop (set inside cleanup
+            //   AFTER the cleanupStarted guard passes, so the loop resolves only
+            //   once cleanup has actually started running)
+            let cleanupStarted = false;
             /**
              * Centralized cleanup function for all resources.
              * Uses the process manager for tracked servers/processes.
              */
             const cleanup = async (exitAfter = false, exitCode = 0, silent = false) => {
-                if (shutdownRequested)
+                if (cleanupStarted)
                     return;
+                cleanupStarted = true;
                 shutdownRequested = true;
                 if (!silent) {
                     tui.info('Shutting down...');
@@ -549,7 +528,7 @@ export const command = createCommand({
                 await procManager.cleanup('shutdown');
                 // Additional cleanup for non-tracked resources
                 await devLock.release();
-                await killLingeringGravityProcesses(logger);
+                await killLingeringGravityProcesses(logger, project?.projectId);
                 if (exitAfter) {
                     if (stdinListenerRegistered && process.stdin.isTTY) {
                         try {
@@ -576,7 +555,6 @@ export const command = createCommand({
                 exitingFromSignal = true;
                 if (reason)
                     logger.debug('DevMode terminating (%d): %s', code, reason);
-                shutdownRequested = true;
                 cleanup(true, code).catch(() => originalExit(1));
             };
             process.on('SIGINT', () => safeExit(0, 'SIGINT'));
@@ -590,23 +568,15 @@ export const command = createCommand({
                 logger.warn('Unhandled promise rejection: %s', reason instanceof Error ? (reason.stack ?? reason.message) : String(reason));
             });
             process.on('exit', () => {
-                if (gravityProcess?.exitCode === null) {
-                    try {
-                        gravityProcess.kill('SIGKILL');
-                    }
-                    catch {
-                        // Ignore
-                    }
-                }
-                if (viteServer) {
-                    try {
-                        viteServer.close();
-                    }
-                    catch {
-                        // Ignore
-                    }
-                }
-                killBunSubprocess(logger);
+                // Last-resort synchronous cleanup. Only runs aggressive SIGKILL
+                // if the async cleanup() hasn't already handled everything.
+                // This prevents the race where both cleanup paths try to kill
+                // the same processes.
+                procManager.forceKillAllSync();
+                // SIGKILL the Bun subprocess tree as a final safety net.
+                // forceKill=true ensures we use SIGKILL (no time for graceful
+                // shutdown in an exit handler) and target the process group.
+                killBunSubprocess(logger, true);
                 releaseLockSync(rootDir);
             });
             // ================================================================
@@ -723,6 +693,10 @@ export const command = createCommand({
             // Note: AGENTUITY_SDK_KEY, NODE_ENV, AGENTUITY_ENV, and
             // AGENTUITY_TRANSPORT_URL are already set in Step 0b (before
             // agent discovery) to support gateway env patching.
+            //
+            // vitePort is pre-resolved (via findAvailablePort) before Bun
+            // starts, so env vars like AGENTUITY_BASE_URL are correct when
+            // the runtime builds its CORS trusted-origin set.
             process.env.AGENTUITY_SDK_DEV_MODE = 'true';
             process.env.AGENTUITY_RUNTIME = 'yes';
             process.env.AGENTUITY_PROJECT_DIR = rootDir;
@@ -767,20 +741,20 @@ export const command = createCommand({
                     inspect: opts.inspect,
                     inspectWait: opts.inspectWait,
                     inspectBrk: opts.inspectBrk,
+                    // Register the subprocess BEFORE the readiness wait so a SIGINT
+                    // during startup can clean it up via procManager. Without this,
+                    // the only safety net is the synchronous process.on('exit')
+                    // handler, which is fragile and runs too late on some signals.
+                    onSpawn: (proc) => {
+                        procManager.registerProcess({
+                            id: 'bun-backend',
+                            process: proc,
+                            description: 'Bun backend server (--hot)',
+                            port: bunBackendPort,
+                            critical: true,
+                        });
+                    },
                 });
-                // Register Bun subprocess with process manager
-                // The subprocess is stored in globalThis.__AGENTUITY_BUN_SUBPROCESS__
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const bunSubprocess = globalThis.__AGENTUITY_BUN_SUBPROCESS__;
-                if (bunSubprocess) {
-                    procManager.registerProcess({
-                        id: 'bun-backend',
-                        process: bunSubprocess,
-                        description: 'Bun backend server (--hot)',
-                        port: bunBackendPort,
-                        critical: true,
-                    });
-                }
             }
             catch (error) {
                 tui.error(`Failed to start Bun backend server: ${error}`);
@@ -788,7 +762,100 @@ export const command = createCommand({
                 return;
             }
             // ================================================================
-            // Step 4: Start gravity tunnel (if public URL enabled)
+            // Step 4: Start Vite asset server (frontend + API proxy)
+            // ================================================================
+            // Vite starts AFTER the Bun backend so that its proxy is ready
+            // to forward API requests immediately — no ECONNREFUSED race.
+            try {
+                logger.debug('Starting Vite dev server (internal port %d)...', viteInternalPort);
+                const viteResult = await startViteAssetServer({
+                    rootDir,
+                    logger,
+                    workbenchPath: workbench.config?.route,
+                    port: vitePort,
+                    backendPort: bunBackendPort,
+                    routePaths,
+                    liveHostname: devmode?.hostname,
+                });
+                viteServer = viteResult.server;
+                // Verify Vite used the port we pre-resolved (should always match
+                // since strictPort:true is set and we already confirmed availability).
+                if (viteResult.port !== vitePort) {
+                    logger.warn(`Vite started on port ${viteResult.port} instead of expected ${vitePort} — env vars may be incorrect`);
+                }
+                // Register Vite server with process manager.
+                // We wrap close() to first force-drop keep-alive HTTP/HMR sockets via
+                // httpServer.closeAllConnections() (Node 18.2+). Without this, idle
+                // keep-alive connections keep the listener bound until they time out,
+                // which leaves the Vite port reserved for several seconds after the
+                // CLI exits. We also extend the close timeout (Vite's chokidar +
+                // HMR teardown can exceed 1s under load).
+                const viteForCleanup = viteServer;
+                procManager.registerServer({
+                    id: 'vite',
+                    server: {
+                        close: async () => {
+                            try {
+                                const http = viteForCleanup.httpServer;
+                                http?.closeIdleConnections?.();
+                                http?.closeAllConnections?.();
+                            }
+                            catch {
+                                // Best effort — these methods are runtime-dependent.
+                            }
+                            await viteForCleanup.close();
+                        },
+                    },
+                    description: 'Vite dev server (frontend assets)',
+                    port: vitePort,
+                    closeTimeoutMs: 3000,
+                });
+                // Update dev lock with actual Vite port
+                await devLock.updatePorts({ vite: vitePort });
+                logger.debug(`Vite dev server running on port ${vitePort} (internal, proxying backend on port ${bunBackendPort})`);
+            }
+            catch (error) {
+                tui.error(`Failed to start Vite dev server: ${error}`);
+                await cleanup(true, 1, true);
+                return;
+            }
+            // ================================================================
+            // Step 5: Start front-door TCP proxy (user-facing port)
+            // ================================================================
+            // Routes WebSocket upgrades (for /api/*, /_agentuity/*) directly to Bun
+            // and everything else (HTTP, HMR WebSocket) to Vite.
+            // This works around Bun's broken node:http upgrade socket implementation.
+            try {
+                const { startWsProxy } = await import('../build/vite/ws-proxy');
+                frontDoorServer = await startWsProxy({
+                    port: opts.port,
+                    vitePort,
+                    backendPort: bunBackendPort,
+                    routePaths,
+                    logger,
+                });
+                // Register front-door proxy with process manager. Use closeAll()
+                // (returns a Promise) so cleanup actually waits for the listener
+                // to release the user-facing port instead of fire-and-forgetting.
+                // closeAll() also destroys live piped sockets (HMR WS, backend WS)
+                // so the listener doesn't sit waiting for clients to disconnect.
+                procManager.registerServer({
+                    id: 'front-door-proxy',
+                    server: {
+                        close: () => frontDoorServer?.closeAll() ?? Promise.resolve(),
+                    },
+                    description: 'Front-door TCP proxy (WS routing)',
+                    port: opts.port,
+                });
+                logger.debug(`Front-door proxy on port ${opts.port} (Vite:${vitePort}, Bun:${bunBackendPort})`);
+            }
+            catch (error) {
+                tui.error(`Failed to start front-door proxy: ${error}`);
+                await cleanup(true, 1, true);
+                return;
+            }
+            // ================================================================
+            // Step 6: Start gravity tunnel (if public URL enabled)
             // ================================================================
             if (gravityBin && gravityURL && devmode && project) {
                 const privateKeyPEM = devmode.privateKey ?? savedPrivateKey;
@@ -797,13 +864,20 @@ export const command = createCommand({
                     await cleanup(true, 1, true);
                     return;
                 }
+                // Gravity must target the user-facing front-door proxy port.
+                // The front-door proxy (ws-proxy) is the only server that correctly
+                // routes public WebSocket upgrades to /api/* through to the Bun backend.
+                // We read the actual bound port from the front-door server to avoid any
+                // mismatch with opts.port (e.g. if the port was overridden or shifted).
+                const frontDoorPort = frontDoorServer?.address()?.port ??
+                    opts.port;
                 try {
                     gravityProcess = Bun.spawn([
                         gravityBin,
                         '--endpoint-id',
                         devmode.id,
                         '--port',
-                        vitePort.toString(),
+                        frontDoorPort.toString(),
                         '--url',
                         gravityURL,
                         '--log-level',
@@ -819,8 +893,21 @@ export const command = createCommand({
                         cwd: rootDir,
                         stdout: 'pipe',
                         stderr: 'pipe',
-                        detached: false,
+                        // Make the child a process-group leader so process.kill(-pid, signal)
+                        // from procManager.killProcessTree() actually reaches the whole tree
+                        // (otherwise it fails with EPERM and falls back to a direct PID kill
+                        // that leaves any grandchildren running). We intentionally do NOT call
+                        // .unref() — we still want the parent to track the child's lifecycle
+                        // and drive cleanup on Ctrl-C / shutdown.
+                        detached: true,
+                        // Pass a clean env without PORT to prevent the inherited
+                        // PORT (set to bunBackendPort) from leaking into gravity.
+                        env: {
+                            ...process.env,
+                            PORT: undefined,
+                        },
                     });
+                    logger.debug('Gravity tunnel targeting front-door proxy on port %d', frontDoorPort);
                     const gravityPid = gravityProcess.pid;
                     if (gravityPid) {
                         await devLock.registerChild({
@@ -893,7 +980,7 @@ export const command = createCommand({
                 }
             }
             // ================================================================
-            // Step 5: Keyboard shortcuts + wait for shutdown
+            // Step 7: Keyboard shortcuts + wait for shutdown
             // ================================================================
             if (interactive && process.stdin.isTTY && process.stdout.isTTY) {
                 stdinListenerRegistered = true;
@@ -913,7 +1000,6 @@ export const command = createCommand({
                             process.stdin.removeListener('data', stdinDataHandler);
                             stdinDataHandler = null;
                         }
-                        shutdownRequested = true;
                         cleanup(true, 0).catch(() => originalExit(1));
                         return;
                     }
@@ -952,7 +1038,7 @@ export const command = createCommand({
         finally {
             /* brute force clean up */
             await devLock.release();
-            await killLingeringGravityProcesses(logger);
+            await killLingeringGravityProcesses(logger, project?.projectId);
             releaseLockSync(rootDir);
         }
     },