@fourier-labs/harbour 0.1.38 → 0.1.40

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

@@ -186,7 +186,7 @@ The person you are working with may not be a developer. They say what they want
 
 ## Getting ready (do this yourself, once per machine and folder)
 
-1. CLI, before \`harbour init\` or anything else: compare the installed CLI with the current release and upgrade it whenever it is behind — a CLI that merely runs is not good enough, only a current one is. \`harbour agent-setup\` prints both versions and says plainly when the installed one is missing or older (its \`--json\` result carries \`cli.upgradeRequired\` and \`cli.remediation\`); without that output, compare \`harbour --version\` with \`npx -y @fourier-labs/harbour --version\` yourself. If either says the installed one is missing or older, run \`npm i -g @fourier-labs/harbour\` and confirm \`harbour --version\` now matches, then continue. Every later command runs the *installed* CLI, so a stale one builds an app that passes every local check and is then refused by the deployment pipeline (\`kit_bundle_incompatible\`) minutes later, with nothing in the app to fix. The kit needs Node 22+ on a supported Mac; it installs and runs its local database, files and gateway without Docker.
+1. CLI, before \`harbour init\` or anything else: compare the installed CLI with the current release and upgrade it whenever it is behind — a CLI that merely runs is not good enough, only a current one is. \`harbour agent-setup\` prints both versions and says plainly when the installed one is missing or older (its \`--json\` result carries \`cli.upgradeRequired\` and \`cli.remediation\`); without that output, compare \`harbour --version\` with \`npx -y @fourier-labs/harbour --version\` yourself. If either says the installed one is missing or older, run \`npm i -g @fourier-labs/harbour\` and confirm \`harbour --version\` now matches, then continue. Every later command runs the *installed* CLI, so a stale one builds an app that passes every local check and is then refused by the deployment pipeline (\`kit_bundle_incompatible\`) minutes later, with nothing in the app to fix. The kit needs Node 22+ on macOS Apple silicon, Linux x64 or Windows x64; it installs and runs its local database, files and gateway without Docker.
 2. Folder: if the current folder has no \`.harbour/\` directory, run \`harbour init --app-root .\` — an empty folder gets a small starter app, an existing Vite + React app gets the kit files added and nothing overwritten. Then read the "Harbour development kit" block in CLAUDE.md / AGENTS.md; it holds the per-app rules.
 3. Sign-in, needed only for company systems and shipping: run \`harbour login\`. It opens the browser and the person finishes the sign-in there — the one step they do themselves; tell them so in one line. If login says the company is not connected yet, ask them for the Harbour link their IT/admin gave them and run \`harbour connect <link>\` first.
 

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

@@ -4,7 +4,7 @@ import { readAppSchema } from "./app-schema.js";
 import { describeRetainedChecks, syncRetainedChecks } from "./retained-checks.js";
 import { CliError } from "./output.js";
 import { DEPENDENT_READ_OPERATIONS, READ_OPERATIONS, kitPaths, readDeclaration, readKitLock, resourceNames, sourceDigest } from "./kit.js";
-import { LocalRuntime, allocatePorts, ensureSdk, freePort, readDevLock, runCommand, runningOrigin } from "./local-runtime.js";
+import { LocalRuntime, allocatePorts, ensureSdk, freePort, nodePackageCommand, readDevLock, runCommand, runningOrigin } from "./local-runtime.js";
 import { CLI_VERSION } from "./version.js";
 /** The name the gate reports operation coverage under — the pipeline's rule for it. */
 export const FLOW_CHECK = "flow.check-failed";
@@ -24,9 +24,11 @@ export async function runChecks(root, options) {
     const previous = await readReport(root);
     if (previous && previous.sourceDigest !== (await sourceDigest(root)).digest)
         output("Source changed since the last report; the previous report is no longer valid.");
-    const typecheck = await run("npx", ["tsc", "--noEmit"], { cwd: root, quiet: true });
+    const npx = nodePackageCommand("npx", ["tsc", "--noEmit"]);
+    const typecheck = await run(npx.command, npx.args, { cwd: root, quiet: true });
     record({ name: "typecheck", status: typecheck.code === 0 ? "pass" : "fail", ...(typecheck.code === 0 ? {} : { detail: lastLines(typecheck.stdout || typecheck.stderr) }) });
-    const build = await run("npm", ["run", "build"], { cwd: root, quiet: true });
+    const npm = nodePackageCommand("npm", ["run", "build"]);
+    const build = await run(npm.command, npm.args, { cwd: root, quiet: true });
     record({ name: "build", status: build.code === 0 ? "pass" : "fail", ...(build.code === 0 ? {} : { detail: lastLines(build.stderr || build.stdout) }) });
     // The journeys run here with the app's own node and SDK: the SDK the bundle
     // pins, installed now if node_modules holds an older copy.

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

@@ -2,7 +2,7 @@ import { spawn } from "node:child_process";
 import { createForwarder } from "./forwarder.js";
 import { readKitLock } from "./kit.js";
 import { GovernanceClient, ensureLinkedApp } from "./integrations.js";
-import { acquireDevLock, allocatePorts, ensureSdk, LocalRuntime, releaseDevLock, runCommand } from "./local-runtime.js";
+import { acquireDevLock, allocatePorts, ensureSdk, LocalRuntime, nodePackageCommand, releaseDevLock, runCommand } from "./local-runtime.js";
 import { CliError } from "./output.js";
 /**
  * Starts the kit-managed Postgres and App Gateway, applies migrations, then
@@ -45,7 +45,8 @@ export async function startDev(root, options) {
         if (watched > 0)
             options.output(`Installed the Harbour realtime outbox for ${watched} table(s) (harbour.realtime change events).`);
         const origin = `http://127.0.0.1:${ports.origin}`;
-        vite = spawn("npm", ["run", "dev"], { cwd: root, env: { ...env, HARBOUR_LOCAL_ORIGIN: origin, HARBOUR_VITE_PORT: String(ports.vite) }, stdio: ["ignore", "inherit", "inherit"] });
+        const npm = nodePackageCommand("npm", ["run", "dev"]);
+        vite = spawn(npm.command, npm.args, { cwd: root, env: { ...env, HARBOUR_LOCAL_ORIGIN: origin, HARBOUR_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?"));
         const company = options.company;
         let warnedAuth = false;

package/dist/packages/harbour-cli/src/kit-bundle.manifest.js

@@ -1,6 +1,6 @@
 export const PUBLISHED_KIT_BUNDLE = {
     "schema": "harbour.kit-bundle/1.0",
-    "kitVersion": "0.1.38",
+    "kitVersion": "0.1.40",
     "sdk": {
         "package": "@harbour/app-sdk",
         "version": "1.1.1",
@@ -8,13 +8,21 @@ export const PUBLISHED_KIT_BUNDLE = {
         "url": "https://public.ecr.aws/v2/y6t4p3i8/harbour-kit-bundle/blobs/sha256:f499af191dd5a42a41e314cf93b0c7d957e0e1987cbdfc96e7c53eee06d86d25"
     },
     "images": {
-        "appGateway": "public.ecr.aws/y6t4p3i8/harbour-app-gateway@sha256:c082203ecbed88005b9cd0b6de5f0b7953f077f80038d7905016439ef04f4251",
-        "sessionFixture": "public.ecr.aws/y6t4p3i8/harbour-session-fixture@sha256:9396c6fd1231981a146c9ad37424f4ba91d9092e2ae0f18d8e2921bbd302a194"
+        "appGateway": "public.ecr.aws/y6t4p3i8/harbour-app-gateway@sha256:abaed52c0de3469bc64a21f7c542b206333fc6185d3624b5e045568dae877c27",
+        "sessionFixture": "public.ecr.aws/y6t4p3i8/harbour-session-fixture@sha256:8efcd7ce5ce78c047a2c526d3de76e00cae01ecb55eab5f060a74a33b8650e9a"
     },
     "nativeRuntime": {
         "darwinArm64": {
-            "url": "https://public.ecr.aws/v2/y6t4p3i8/harbour-kit-bundle/blobs/sha256:36222559ea1d6543c93e13dee30b433fe9f6c661ef3cce081a68182fc24e8b33",
-            "sha256": "36222559ea1d6543c93e13dee30b433fe9f6c661ef3cce081a68182fc24e8b33"
+            "url": "https://public.ecr.aws/v2/y6t4p3i8/harbour-kit-bundle/blobs/sha256:5f40b4de50ce81abcb5ee22aa8a984b46d5a5fc719f0eee035ae6bfb3dbf47cd",
+            "sha256": "5f40b4de50ce81abcb5ee22aa8a984b46d5a5fc719f0eee035ae6bfb3dbf47cd"
+        },
+        "linuxX64": {
+            "url": "https://public.ecr.aws/v2/y6t4p3i8/harbour-kit-bundle/blobs/sha256:163a54cdab03f193499a35dc4821e10ae9a40c80aeec9c12005b2959f50cc01b",
+            "sha256": "163a54cdab03f193499a35dc4821e10ae9a40c80aeec9c12005b2959f50cc01b"
+        },
+        "windowsX64": {
+            "url": "https://public.ecr.aws/v2/y6t4p3i8/harbour-kit-bundle/blobs/sha256:1c26d2066be2e673cba0c335fee8b1057fa314ed85325e406903f3e6f9e18351",
+            "sha256": "1c26d2066be2e673cba0c335fee8b1057fa314ed85325e406903f3e6f9e18351"
         }
     },
     "brief": {

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

@@ -2,11 +2,16 @@ import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
 import { copyFile, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { createServer } from "node:net";
-import { dirname, join, relative } from "node:path";
+import { dirname, join, relative, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
 import EmbeddedPostgres from "embedded-postgres";
 import { kitPaths, projectName } from "./kit.js";
 import { CliError } from "./output.js";
+export function nodePackageCommand(tool, args, platform = process.platform, execPath = process.execPath) {
+    if (platform !== "win32")
+        return { command: tool, args };
+    return { command: execPath, args: [win32.join(win32.dirname(execPath), "node_modules", "npm", "bin", `${tool}-cli.js`), ...args] };
+}
 export const runCommand = (command, args, options = {}) => new Promise(resolve => {
     const child = spawn(command, args, { cwd: options.cwd, env: { ...process.env, ...options.env }, stdio: [options.stdin === undefined ? "ignore" : "pipe", "pipe", "pipe"] });
     let stdout = "";
@@ -20,6 +25,11 @@ export const runCommand = (command, args, options = {}) => new Promise(resolve =
         child.stdin?.end(options.stdin);
     }
 });
+const runWindowsController = (command, args) => new Promise(resolve => {
+    const child = spawn(command, args, { stdio: "ignore", windowsHide: true });
+    child.on("error", () => resolve(127));
+    child.on("close", code => resolve(code ?? 1));
+});
 export const LOCAL = {
     tenant: "local-tenant",
     app: "local-app",
@@ -139,6 +149,7 @@ export class LocalRuntime {
     run;
     project;
     postgres;
+    windowsPgCtl;
     gateway;
     gates = new Map();
     gateOutput = new Map();
@@ -195,17 +206,41 @@ export class LocalRuntime {
      * person can apply, never as a generic "could not start".
      */
     async up(output) {
-        void output;
         if (!this.ports)
             throw new CliError("LOCAL_RUNTIME_FAILED", "The local runtime was not prepared.");
         const paths = kitPaths(this.root);
-        await hydrateEmbeddedPostgres(this.run);
-        this.postgres = new EmbeddedPostgres({ databaseDir: join(paths.state, "postgres"), port: this.ports.postgres, user: LOCAL.dbUser, password: LOCAL.dbPassword, persistent: true, onLog: () => undefined, onError: () => undefined });
-        if (!(await readdir(join(paths.state, "postgres")).catch(() => [])).length)
-            await this.postgres.initialise();
-        await this.postgres.start();
-        await this.postgres.createDatabase(LOCAL.database).catch(error => { if (!String(error).includes("already exists"))
-            throw error; });
+        const postgresBinaries = await hydrateEmbeddedPostgres(this.run);
+        const postgresMessages = [];
+        this.postgres = new EmbeddedPostgres({ databaseDir: join(paths.state, "postgres"), port: this.ports.postgres, user: LOCAL.dbUser, password: LOCAL.dbPassword, persistent: true, onLog: message => postgresMessages.push(String(message).trim()), onError: error => postgresMessages.push(String(error)) });
+        try {
+            if (!(await readdir(join(paths.state, "postgres")).catch(() => [])).length)
+                await this.postgres.initialise();
+            output?.("Local database files are ready.");
+            if (process.platform === "win32") {
+                this.windowsPgCtl = postgresBinaries.pg_ctl;
+                const started = await runWindowsController(this.windowsPgCtl, ["start", "-w", "-D", join(paths.state, "postgres"), "-l", join(paths.state, "postgres.log"), "-o", `-p ${this.ports.postgres}`]);
+                if (started !== 0)
+                    throw new Error(`pg_ctl could not start Postgres (exit ${started})`);
+            }
+            else {
+                await this.postgres.start();
+            }
+            output?.("Local database is running.");
+        }
+        catch (error) {
+            const detail = postgresMessages.filter(Boolean).slice(-3).join(" ") || (error instanceof Error ? error.message : String(error));
+            throw new CliError("LOCAL_RUNTIME_FAILED", `Local Postgres could not start${detail ? `: ${detail}` : "."}`);
+        }
+        const root = this.postgres.getPgClient("postgres", "127.0.0.1");
+        try {
+            await root.connect();
+            await root.query(`CREATE DATABASE ${LOCAL.database}`).catch(error => { if (!String(error).includes("already exists"))
+                throw error; });
+        }
+        finally {
+            await root.end().catch(() => undefined);
+        }
+        output?.("Local app database is ready.");
         const admin = this.postgres.getPgClient(LOCAL.database, "127.0.0.1");
         await admin.connect();
         await admin.query(`DO $$ BEGIN IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${LOCAL.gatewayRole}') THEN CREATE ROLE ${LOCAL.gatewayRole} LOGIN PASSWORD '${LOCAL.dbPassword}'; END IF; END $$;`);
@@ -232,7 +267,12 @@ export class LocalRuntime {
         this.gateway?.kill("SIGTERM");
         for (const child of this.gates.values())
             child.kill("SIGTERM");
-        await this.postgres?.stop().catch(() => undefined);
+        if (this.windowsPgCtl) {
+            await runWindowsController(this.windowsPgCtl, ["stop", "-w", "-D", join(kitPaths(this.root).state, "postgres"), "-m", "fast"]);
+        }
+        else {
+            await this.postgres?.stop().catch(() => undefined);
+        }
         return true;
     }
     /** Removes this project's containers and named volumes only. */
@@ -343,7 +383,7 @@ export class LocalRuntime {
     }
 }
 async function hydrateEmbeddedPostgres(run) {
-    const packageName = `@embedded-postgres/${process.platform}-${process.arch}`;
+    const packageName = embeddedPostgresPackage(process.platform, process.arch);
     let entry;
     try {
         entry = fileURLToPath(import.meta.resolve(packageName));
@@ -356,13 +396,20 @@ async function hydrateEmbeddedPostgres(run) {
     const result = await run(process.execPath, [script], { cwd: packageRoot, quiet: true });
     if (result.code !== 0)
         throw new CliError("KIT_RUNTIME_UNAVAILABLE", "The bundled Postgres files could not be prepared.");
+    const binaries = await import(packageName);
+    if (!binaries.pg_ctl)
+        throw new CliError("KIT_RUNTIME_UNAVAILABLE", "The bundled Postgres controller is missing.");
+    return { pg_ctl: binaries.pg_ctl };
+}
+export function embeddedPostgresPackage(platform, arch) {
+    return `@embedded-postgres/${platform === "win32" ? "windows" : platform}-${arch}`;
 }
 async function ensureNativeGateway(root, bundle) {
-    const runtime = process.platform === "darwin" && process.arch === "arm64" ? bundle.nativeRuntime?.darwinArm64 : undefined;
+    const runtime = nativeGatewayArtifact(bundle, process.platform, process.arch);
     if (!runtime)
         throw new CliError("KIT_RUNTIME_UNAVAILABLE", `This kit bundle has no native Harbour runtime for ${process.platform}-${process.arch}.`);
     const directory = join(kitPaths(root).local, "runtime");
-    const target = join(directory, `harbour-app-gateway-${runtime.sha256.slice(0, 12)}`);
+    const target = join(directory, `harbour-app-gateway-${runtime.sha256.slice(0, 12)}${process.platform === "win32" ? ".exe" : ""}`);
     if (!(await exists(target))) {
         const bytes = await downloadSdk(runtime.url);
         const digest = createHash("sha256").update(bytes).digest("hex");
@@ -373,6 +420,15 @@ async function ensureNativeGateway(root, bundle) {
     }
     return target;
 }
+export function nativeGatewayArtifact(bundle, platform, arch) {
+    if (platform === "darwin" && arch === "arm64")
+        return bundle.nativeRuntime?.darwinArm64;
+    if (platform === "linux" && arch === "x64")
+        return bundle.nativeRuntime?.linuxX64;
+    if (platform === "win32" && arch === "x64")
+        return bundle.nativeRuntime?.windowsX64;
+    return undefined;
+}
 /** The three names the pipeline's retained-check runner exports for the signed identities, from a session env. */
 export function identityEnvironment(session) {
     return {
@@ -426,7 +482,8 @@ export async function ensureSdk(root, bundle, env, run, output, fetchImpl = fetc
     else if (installed && (await readFile(join(root, "package.json"), "utf8").catch(() => "")).includes(relative(root, staged)))
         return "present";
     output(`Installing ${bundle.sdk.package} from the kit bundle.`);
-    const result = await run("npm", ["install", "--no-audit", "--no-fund", relative(root, staged)], { cwd: root, quiet: true });
+    const npm = nodePackageCommand("npm", ["install", "--no-audit", "--no-fund", relative(root, staged)]);
+    const result = await run(npm.command, npm.args, { cwd: root, quiet: true });
     if (result.code !== 0)
         throw new CliError("SDK_INSTALL_FAILED", `npm could not install the kit SDK tarball: ${result.stderr.trim().split("\n").at(-1) ?? "npm error"}`);
     return "installed";

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

@@ -1 +1 @@
-export const CLI_VERSION = "0.1.38";
+export const CLI_VERSION = "0.1.40";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fourier-labs/harbour",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "description": "Harbour productionisation helper",
   "type": "module",
   "bin": {
@@ -37,7 +37,7 @@
   "harbour": {
     "kitBundle": {
       "repository": "public.ecr.aws/y6t4p3i8/harbour-kit-bundle",
-      "version": "0.1.38"
+      "version": "0.1.40"
     }
   }
 }