@phreshos/cli 0.1.63 → 0.1.65

package/dist/commands/project.js

@@ -39,11 +39,11 @@ export default function projectCommands(program, coreRange) {
             option("--server-command <command>", "production Server host command"),
             option("--server-worker <path>", "production Server Node Worker entry"),
             option("--server-sandbox <path>", "production Server Sandbox entry"),
-            option("--server-development-command <command>", "development Server command"),
+            option("--server-dev-command <command>", "development Server command"),
             option("--client", "include a Client endpoint"),
             option("--client-location <path>", "production Client directory"),
-            option("--client-development-url <url>", "fixed or external development Client URL"),
-            option("--client-development-start-command <command>", "development Client command"),
+            option("--client-dev-url <url>", "fixed or external development Client URL"),
+            option("--client-dev-command <command>", "development Client command"),
             option("--force", "replace an existing phresh.config.ts")
         ],
         guidance: [
@@ -61,14 +61,14 @@ export default function projectCommands(program, coreRange) {
             serverCommand: options.serverCommand,
             serverWorker: options.serverWorker,
             serverSandbox: options.serverSandbox,
-            serverDevelopmentCommand: options.serverDevelopmentCommand,
+            serverDevCommand: options.serverDevCommand,
             client: options.client === true
                 || options.clientLocation !== undefined
-                || options.clientDevelopmentUrl !== undefined
-                || options.clientDevelopmentStartCommand !== undefined,
+                || options.clientDevUrl !== undefined
+                || options.clientDevCommand !== undefined,
             clientLocation: options.clientLocation,
-            clientDevelopmentUrl: options.clientDevelopmentUrl,
-            clientDevelopmentStartCommand: options.clientDevelopmentStartCommand,
+            clientDevUrl: options.clientDevUrl,
+            clientDevCommand: options.clientDevCommand,
             force: options.force === true
         }, process.cwd(), coreRange);
     });

package/dist/init.js

@@ -64,49 +64,45 @@ export default async function init(options = {}, directory = process.cwd(), core
         const production = options.serverCommand === undefined && options.serverWorker === undefined && options.serverSandbox === undefined && interactive
             ? await askExecution(interaction, "production", "node main.js")
             : execution(options.serverCommand, options.serverWorker, options.serverSandbox, "production Server");
-        let development = developmentExecution(options.serverDevelopmentCommand, "development Server");
-        if (interactive && development === undefined) {
+        let devCommand = options.serverDevCommand;
+        if (interactive && devCommand === undefined) {
             const suggested = manifest.scripts?.dev && projectScript(directory, manifest.packageManager, "dev");
             if (await yes("Development mode can run the Server directly from the project source.", "Run the Server from source during development?", Boolean(suggested && !clientSelected))) {
-                development = {
-                    command: await ask("This command runs from the project directory with access to development tooling.", "What command starts the development Server?", suggested || undefined)
-                };
+                devCommand = await ask("This command runs from the project directory with access to development tooling.", "What command starts the development Server?", suggested || undefined);
             }
         }
-        server = { location, ...production, ...development && { development } };
+        if (devCommand !== undefined && !devCommand.trim())
+            throw new Error("The development Server command must not be empty");
+        server = { location, ...production, ...devCommand !== undefined && { devCommand } };
     }
     let client;
     if (clientSelected) {
         const location = options.clientLocation ?? (interactive ? await ask("The system serves the production Client from this project-relative directory.", "Where are the production Client files?", serverSelected ? "dist/client" : "dist") : "");
         if (!location)
             throw new Error("--client-location is required without a terminal");
-        let developmentUrl = options.clientDevelopmentUrl;
-        let developmentStartCommand = options.clientDevelopmentStartCommand;
-        if (interactive && developmentUrl === undefined && developmentStartCommand === undefined) {
+        let devUrl = options.clientDevUrl;
+        let devCommand = options.clientDevCommand;
+        if (interactive && devUrl === undefined && devCommand === undefined) {
             const suggested = manifest.scripts?.dev && projectScript(directory, manifest.packageManager, "dev");
             if (await yes("A development server can provide live updates instead of built Client files.", "Use a Client development server?", Boolean(suggested))) {
                 if (await yes("The Project can own the development server and stop it when the session ends.", "Should phresh dev start the Client server?", Boolean(suggested))) {
-                    developmentStartCommand = await ask("This command remains attached to the phresh dev session.", "What command starts the Client development server?", suggested || undefined);
+                    devCommand = await ask("This command remains attached to the phresh dev session.", "What command starts the Client development server?", suggested || undefined);
                 }
                 else
-                    developmentUrl = await ask("The System routes the Program asset path to this HTTP or HTTPS address during phresh dev.", "What URL serves the external development Client?", "http://localhost:5173/");
+                    devUrl = await ask("The System routes the Program asset path to this HTTP or HTTPS address during phresh dev.", "What URL serves the external development Client?", "http://localhost:5173/");
             }
         }
-        if (developmentUrl !== undefined && developmentUrl.trim().length === 0)
+        if (devUrl !== undefined && devUrl.trim().length === 0)
             throw new Error("A client development URL must not be empty");
-        if (developmentUrl !== undefined && !httpUrl(developmentUrl))
+        if (devUrl !== undefined && !httpUrl(devUrl))
             throw new Error("A client development URL must use HTTP or HTTPS");
-        if (developmentStartCommand !== undefined && developmentStartCommand.trim().length === 0)
+        if (devCommand !== undefined && devCommand.trim().length === 0)
             throw new Error("A client development command must not be empty");
-        let development;
-        if (developmentStartCommand !== undefined)
-            development = {
-                startCommand: developmentStartCommand,
-                ...developmentUrl !== undefined && { url: developmentUrl }
-            };
-        else if (developmentUrl !== undefined)
-            development = { url: developmentUrl };
-        client = { location, ...development && { development } };
+        client = {
+            location,
+            ...devCommand !== undefined && { devCommand },
+            ...devUrl !== undefined && { devUrl }
+        };
     }
     const described = {
         identity: manifest.name,
@@ -124,7 +120,7 @@ export default async function init(options = {}, directory = process.cwd(), core
         interaction.detail(`server ${serverExecution(config.server)[0]}`, serverExecution(config.server)[1], `./${config.server.location}`);
     if (config.client)
         interaction.detail("client", `./${config.client.location}`);
-    const next = [config.server?.development || config.client?.development ? "phresh dev" : null, "phresh start", "phresh install"].filter(Boolean);
+    const next = [config.server?.devCommand || config.client?.devCommand || config.client?.devUrl ? "phresh dev" : null, "phresh start", "phresh install"].filter(Boolean);
     interaction.message();
     interaction.message(`${dim("Next:")} ${next.join(`  ${dim("or")}  `)}`);
     if (config.client) {
@@ -143,11 +139,12 @@ function compose(config) {
         half("server", config.server && {
             location: config.server.location,
             [serverExecution(config.server)[0]]: serverExecution(config.server)[1],
-            ...config.server.development && { development: config.server.development }
+            devCommand: config.server.devCommand
         }),
         half("client", config.client && {
             location: config.client.location,
-            ...config.client.development && { development: config.client.development }
+            devCommand: config.client.devCommand,
+            devUrl: config.client.devUrl
         })
     ];
     return [
@@ -166,11 +163,8 @@ function half(name, values) {
     if (!values)
         return "";
     const inside = Object.entries(values).map(function ([key, value]) {
-        if (typeof value === "string")
-            return `        ${key}: ${JSON.stringify(value)}`;
-        const nested = Object.entries(value).map(([nestedKey, nestedValue]) => `            ${nestedKey}: ${JSON.stringify(nestedValue)}`);
-        return `        ${key}: {\n${nested.join(",\n")}\n        }`;
-    });
+        return value === undefined ? null : `        ${key}: ${JSON.stringify(value)}`;
+    }).filter(Boolean);
     return `    ${name}: {\n${inside.join(",\n")}\n    }`;
 }
 function httpUrl(value) {
@@ -204,13 +198,6 @@ function execution(command, worker, sandbox, owner) {
         throw new Error(`The ${owner} sandbox entry must remain inside its Server directory`);
     return { sandbox };
 }
-function developmentExecution(command, owner) {
-    if (command === undefined)
-        return undefined;
-    if (!command.trim())
-        throw new Error(`The ${owner} command must not be empty`);
-    return { command };
-}
 async function askExecution(interaction, mode, suggestedCommand) {
     const sandbox = await interaction.yes("A Sandbox provides only JavaScript and the permission-constrained System API.", `Run the ${mode} Server in a Sandbox?`, false);
     if (sandbox)

package/dist/launch.js

@@ -17,7 +17,7 @@ export default async function launch(mode, directory = process.cwd(), options =
         line(`server ${execution}`, value, place(project.directory, definition.server.location));
     }
     if (definition.client)
-        line("client", project.config.client?.development?.startCommand ?? place(project.directory, definition.client.location));
+        line("client", project.config.client?.devCommand ?? place(project.directory, definition.client.location));
     line("storage", place(project.directory, String(definition.storage)));
     if (Object.keys(options).length)
         line("options", Object.entries(options).map(([name, value]) => `${name}=${value}`).join("  "));

package/dist/system/gateway-readiness.js

@@ -30,3 +30,12 @@ export async function waitForGateway(path, running, timeout = 15_000) {
     }
     throw new Error(`The PhreshOS System did not become ready within ${Math.ceil(timeout / 1000)} seconds`);
 }
+export async function waitForGatewayClose(path, timeout = 15_000) {
+    const until = Date.now() + timeout;
+    while (Date.now() < until) {
+        if (!await gatewayReady(path))
+            return;
+        await new Promise(resolve => setTimeout(resolve, 100));
+    }
+    throw new Error(`The PhreshOS System gateway did not close within ${Math.ceil(timeout / 1000)} seconds`);
+}

package/dist/system/lifecycle.js

@@ -1,6 +1,6 @@
 import SystemInstallation from "./installation.js";
 import { downloadSystemRelease, resolveSystemRelease } from "./release.js";
-import { gatewayReady, waitForGateway } from "./gateway-readiness.js";
+import { gatewayReady, waitForGateway, waitForGatewayClose } from "./gateway-readiness.js";
 import systemPaths from "./paths.js";
 import systemService from "./service/index.js";
 import nodeExecutable from "./node.js";
@@ -21,6 +21,7 @@ export default class SystemLifecycle {
             downloadRelease: dependencies?.downloadRelease ?? downloadSystemRelease,
             ready: dependencies?.ready ?? gatewayReady,
             wait: dependencies?.wait ?? waitForGateway,
+            waitForStop: dependencies?.waitForStop ?? waitForGatewayClose,
             provisionSetup: dependencies?.provisionSetup ?? provisionSetup
         };
     }
@@ -45,7 +46,7 @@ export default class SystemLifecycle {
             await activation.commit();
         }
         catch (error) {
-            await service.stop().catch(() => undefined);
+            await this.stopService().catch(() => undefined);
             await activation.rollback();
             return await this.restoredFailure(error, previous, previousService);
         }
@@ -69,7 +70,7 @@ export default class SystemLifecycle {
         const { installation, service } = this.dependencies;
         const state = await service.inspect();
         if (state.running)
-            await service.stop();
+            await this.stopService();
         if (state.enabled)
             await service.disable();
         if (state.registered)
@@ -92,7 +93,7 @@ export default class SystemLifecycle {
     }
     async stopExclusive() {
         await this.requireInstalledService();
-        await this.dependencies.service.stop();
+        await this.stopService();
         return await this.status();
     }
     async enable() {
@@ -148,10 +149,10 @@ export default class SystemLifecycle {
         }
     }
     async activate(prepared, previous, state, purge) {
-        const { installation, service } = this.dependencies;
+        const { installation } = this.dependencies;
         try {
             if (state.running)
-                await service.stop();
+                await this.stopService();
             if (purge)
                 await installation.purgeStorage();
             return await installation.activate(prepared, previous);
@@ -205,6 +206,11 @@ export default class SystemLifecycle {
             throw error;
         }
     }
+    async stopService() {
+        const { installation, service } = this.dependencies;
+        await service.stop();
+        await this.dependencies.waitForStop(installation.paths.gateway);
+    }
 }
 async function provisionSetup() {
     await installProgram({ name: "setup", announce: false });

package/dist/template/package.json

@@ -1,7 +1,7 @@
 {
     "name": "phresh",
     "private": true,
-    "version": "0.1.39",
+    "version": "0.1.40",
     "description": "The official PhreshOS starter Program.",
     "type": "module",
     "scripts": {
@@ -15,14 +15,14 @@
     ],
     "dependencies": {
         "@phreshos/client": "^0.1.46",
-        "@phreshos/core": "^0.1.53",
+        "@phreshos/core": "^0.1.54",
         "@phreshos/react": "^0.1.28",
         "@phreshos/server": "^0.1.50",
         "react": "^19.2.8",
         "react-dom": "^19.2.8"
     },
     "devDependencies": {
-        "@phreshos/cli": "^0.1.63",
+        "@phreshos/cli": "^0.1.65",
         "@types/node": "^26.4.0",
         "@types/react": "^19.2.18",
         "@types/react-dom": "^19.2.5",

package/dist/template/phresh.config.ts

@@ -4,7 +4,7 @@ export default defineConfig({
     identity: "phresh",
     name: "Phresh Program",
     description: "A minimal counter with direct Client and Server endpoints.",
-    version: "0.1.39",
+    version: "0.1.40",
     icon: "icon.png",
     categories: ["Development"],
     keywords: ["example", "counter", "client", "server"],
@@ -13,16 +13,12 @@ export default defineConfig({
     server: {
         location: "dist/server",
         worker: "main.js",
-        development: {
-            command: "vite-node server/main.ts"
-        }
+        devCommand: "vite-node server/main.ts"
     },
     client: {
         location: "dist/client",
         title: "Phresh Program",
         size: { width: 600, height: 500 },
-        development: {
-            startCommand: "vite --config vite.client.ts"
-        }
+        devCommand: "vite --config vite.client.ts"
     }
 })

package/dist/template/tests/build.test.ts

@@ -10,7 +10,7 @@ test("build contract", async () => {
   assert.equal(config.version, manifest.version)
   assert.equal(config.server?.location, "dist/server")
   assert.equal(config.server?.worker, "main.js")
-  assert.equal(config.server?.development?.command, "vite-node server/main.ts")
+  assert.equal(config.server?.devCommand, "vite-node server/main.ts")
   assert.equal(config.client?.location, "dist/client")
   assert.deepEqual(config.client?.size, { width: 600, height: 500 })
 

package/dist/template.json

@@ -1,6 +1,6 @@
 {
     "repository": "PhreshOS/phresh-program",
-    "version": "0.1.39",
-    "sha256": "faf95c8b089928f9dca8ef0a0ff8063a54d0f90b602b4f237d009860ea884c23",
+    "version": "0.1.40",
+    "sha256": "7f2bb99438c7224e543147519a75d76a1db04313ff6ec6b024bb7532feb6a017",
     "development": true
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@phreshos/cli",
   "type": "module",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "description": "The Phresh command-line interface for Program projects and system management.",
   "engines": {
     "node": ">=20.10"
@@ -47,8 +47,8 @@
   "packageManager": "bun@1.3.14",
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@phreshos/core": "^0.1.53",
-    "@phreshos/node": "^0.1.26",
+    "@phreshos/core": "^0.1.54",
+    "@phreshos/node": "^0.1.27",
     "adm-zip": "^0.6.0",
     "commander": "^15.0.0",
     "picocolors": "^1.1.1"