@isomorph.ai/cli 0.4.0-rc.1 → 0.4.0

package/dist/packages/harbour-cli/src/cli.js

@@ -11,7 +11,7 @@ import { appRoot, requestResourceName } from "./kit.js";
 import { initKit } from "./starter.js";
 import { agentPaths, agentSetup } from "./agent-setup.js";
 import { detachDev, startDev } from "./dev.js";
-import { ensureSdk, LocalRuntime, readDevLock, releaseDevLock, runCommand } from "./local-runtime.js";
+import { endProcess, ensureSdk, LocalRuntime, readDevLock, releaseDevLock, runCommand } from "./local-runtime.js";
 import { CHECKS_FAILED_HINT, checksFailedMessage, runChecks } from "./check.js";
 import { assertDeployReady, companySystemsLine, GovernanceClient, groupGrants, IDENTITY_WORDS, integrationsCatalog, integrationsStatus, renderGrantGroup, renderIntegrationsCatalog, requestIntegrations } from "./integrations.js";
 import { runJob } from "./jobs.js";
@@ -144,12 +144,14 @@ else {
             else if (command === "stop") {
                 const runtime = new LocalRuntime(target);
                 const lock = await readDevLock(target);
-                if (lock && lock.pid !== process.pid) {
-                    try {
-                        process.kill(lock.pid, "SIGTERM");
-                    }
-                    catch { /* already gone */ }
-                }
+                // The dev process first (its own shutdown ends what it can), then the
+                // children it recorded, then Postgres by its controller: after a
+                // terminated dev on Windows, or `dev --detach`, nothing else ends them.
+                if (lock && lock.pid !== process.pid)
+                    await endProcess(lock.pid);
+                for (const pid of Object.values(lock?.children ?? {}))
+                    if (pid && pid !== process.pid)
+                        await endProcess(pid);
                 const stopped = await runtime.stop();
                 await releaseDevLock(target);
                 emit(summaryEnvelope({ project: runtime.project, stopped: stopped.stopped, volumesRetained: true }));

package/dist/packages/harbour-cli/src/dev.js

@@ -5,7 +5,7 @@ import { join } from "node:path";
 import { createForwarder } from "./forwarder.js";
 import { readKitLock } from "./kit.js";
 import { GovernanceClient, ensureLinkedApp, fileDeclaredRequests, IDENTITY_WORDS, renderGrantGroup } from "./integrations.js";
-import { acquireDevLock, allocatePorts, ensureSdk, LocalRuntime, nodePackageCommand, pidAlive, readDevLock, releaseDevLock, runCommand } from "./local-runtime.js";
+import { acquireDevLock, allocatePorts, ensureSdk, LocalRuntime, nodePackageCommand, pidAlive, readDevLock, recordDevChildren, releaseDevLock, runCommand } from "./local-runtime.js";
 import { kitPaths } from "./kit.js";
 import { CliError, safeError } from "./output.js";
 /**
@@ -76,6 +76,7 @@ export async function startDev(root, options) {
         const npm = nodePackageCommand("npm", ["run", "dev"]);
         vite = spawn(npm.command, npm.args, { cwd: root, env: { ...env, ISOMORPH_LOCAL_ORIGIN: origin, ISOMORPH_VITE_PORT: String(ports.vite) }, stdio: ["ignore", "inherit", "inherit"] });
         vite.on("error", () => options.output("Vite could not be started; is npm installed and `npm install` done?"));
+        await recordDevChildren(root, { ...(vite.pid ? { vite: vite.pid } : {}), ...(runtime.gatewayPid ? { gateway: runtime.gatewayPid } : {}) });
         const company = options.company;
         let warnedAuth = false;
         let lockAppId = (await readKitLock(root))?.appId || undefined;

package/dist/packages/harbour-cli/src/local-runtime.js

@@ -133,6 +133,28 @@ export async function readDevLock(root) {
     }
 }
 export async function releaseDevLock(root) { await rm(kitPaths(root).devLock, { force: true }); }
+/** Records the child processes of a running dev session in its lock (see `DevLock.children`). */
+export async function recordDevChildren(root, children) {
+    const lock = await readDevLock(root);
+    if (!lock)
+        return;
+    await writeFile(kitPaths(root).devLock, JSON.stringify({ ...lock, children: { ...lock.children, ...children } }));
+}
+/**
+ * Ends a process this CLI started from another process: SIGTERM where a signal
+ * reaches a shutdown handler, `taskkill /t` on Windows where it does not and
+ * the process tree (npm → vite → esbuild) would otherwise survive.
+ */
+export async function endProcess(pid, platform = process.platform) {
+    if (platform === "win32") {
+        await runWindowsController("taskkill", ["/pid", String(pid), "/f", "/t"]);
+        return;
+    }
+    try {
+        process.kill(pid, "SIGTERM");
+    }
+    catch { /* already gone */ }
+}
 /** The running dev origin for this app, if its lock holder is alive. */
 export async function runningOrigin(root, isAlive = pidAlive) {
     const lock = await readDevLock(root);
@@ -162,6 +184,8 @@ export class LocalRuntime {
         this.run = run;
         this.project = project;
     }
+    /** The App Gateway process this runtime started, for the dev lock. */
+    get gatewayPid() { return this.gateway?.pid; }
     async writeFiles(bundle, ports) {
         const paths = kitPaths(this.root);
         await mkdir(paths.state, { recursive: true });
@@ -270,11 +294,22 @@ export class LocalRuntime {
         this.gateway?.kill("SIGTERM");
         for (const child of this.gates.values())
             child.kill("SIGTERM");
+        const dataDir = join(kitPaths(this.root).state, "postgres");
         if (this.windowsPgCtl) {
-            await runWindowsController(this.windowsPgCtl, ["stop", "-w", "-D", join(kitPaths(this.root).state, "postgres"), "-m", "fast"]);
+            await runWindowsController(this.windowsPgCtl, ["stop", "-w", "-D", dataDir, "-m", "fast"]);
+        }
+        else if (this.postgres) {
+            await this.postgres.stop().catch(() => undefined);
         }
-        else {
-            await this.postgres?.stop().catch(() => undefined);
+        else if (await exists(join(dataDir, "postmaster.pid"))) {
+            // A fresh process (`isomorph stop` after `dev --detach`, or after a
+            // terminated dev on Windows) owns no Postgres handle: the bundled
+            // controller stops the server the data directory says is running.
+            try {
+                const { pg_ctl } = await hydrateEmbeddedPostgres(this.run);
+                await this.run(pg_ctl, ["stop", "-w", "-D", dataDir, "-m", "fast"], { quiet: true });
+            }
+            catch { /* no controller for this platform: nothing more to stop */ }
         }
         return true;
     }

package/dist/packages/harbour-cli/src/version.js

@@ -1 +1 @@
-export const CLI_VERSION = "0.4.0-rc.1";
+export const CLI_VERSION = "0.4.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isomorph.ai/cli",
-  "version": "0.4.0-rc.1",
+  "version": "0.4.0",
   "description": "Isomorph development kit CLI",
   "type": "module",
   "bin": {