@phreshos/cli 0.1.32 → 0.1.33

package/README.md

@@ -11,8 +11,8 @@ their contracts and integrations are verified.
 
 `@phreshos/cli` is not intended to be used independently of that architecture.
 Its Program commands use `@phreshos/node`, whose `Project` model owns local
-project behavior and whose `system` value exposes the same Core contract used
-inside Server Programs. Runtime operations require a compatible System.
+project behavior and whose `System.connect()` provides the same Core contract
+used inside Server Programs. Runtime operations require a compatible System.
 
 ```bash
 phresh create app # create a complete new Program

package/dist/control-client.js

@@ -1,13 +1,44 @@
-import { Gateway } from "@phreshos/node";
+import { gatewayAddress, resolveHome } from "@phreshos/node";
+import { connect } from "node:net";
 /** Owner-local client for the authoritative running-System contract. */
 export default class LocalSystemControl {
     async execute(request, signal) {
-        const gateway = await Gateway.open();
-        try {
-            return await gateway.execute(request, signal);
-        }
-        finally {
-            await gateway.close();
-        }
+        const address = gatewayAddress(resolveHome());
+        return await new Promise((resolve, reject) => {
+            const socket = connect(address);
+            let buffer = "";
+            let settled = false;
+            const finish = (work) => {
+                if (settled)
+                    return;
+                settled = true;
+                signal?.removeEventListener("abort", cancel);
+                socket.destroy();
+                work();
+            };
+            const cancel = () => finish(() => reject(signal?.reason instanceof Error ? signal.reason : new Error("The request was cancelled")));
+            signal?.addEventListener("abort", cancel, { once: true });
+            socket.on("connect", () => socket.write(`${JSON.stringify({ target: "system", request })}\n`));
+            socket.on("data", chunk => {
+                buffer += String(chunk);
+                const boundary = buffer.indexOf("\n");
+                if (boundary < 0)
+                    return;
+                try {
+                    const outcome = JSON.parse(buffer.slice(0, boundary));
+                    if (outcome.success)
+                        finish(() => resolve(outcome.result));
+                    else
+                        finish(() => reject(new Error(outcome.error)));
+                }
+                catch {
+                    finish(() => reject(new Error("The System returned an invalid response")));
+                }
+            });
+            socket.on("error", () => finish(() => reject(new Error(`No System is listening at ${address} — start PhreshOS first`))));
+            socket.on("close", () => finish(() => reject(new Error("The System closed the request without an answer"))));
+            if (signal?.aborted)
+                cancel();
+        });
     }
 }

package/dist/launch.js

@@ -1,7 +1,7 @@
-import { Gateway, Project } from "@phreshos/node";
+import { Project } from "@phreshos/node";
 import { relative } from "node:path";
 import { dim, heading, line } from "./style.js";
-/** Run the current project attached to the System and present its event stream. */
+/** Run the current project through one connected System. */
 export default async function launch(mode, directory = process.cwd(), options = {}) {
     const project = await Project.open(directory);
     const program = project.description(mode);
@@ -16,7 +16,7 @@ export default async function launch(mode, directory = process.cwd(), options =
     if (Object.keys(options).length)
         line("options", Object.entries(options).map(([name, value]) => `${name}=${value}`).join("  "));
     console.log("");
-    const gateway = await Gateway.open();
+    const system = await (await import("@phreshos/node")).System.connect();
     const controller = new AbortController();
     let interrupted = false;
     let ended = null;
@@ -29,11 +29,11 @@ export default async function launch(mode, directory = process.cwd(), options =
     for (const signal of ["SIGINT", "SIGTERM"])
         process.on(signal, stop);
     try {
-        const events = mode === "development"
-            ? gateway.dev(project, { options, signal: controller.signal })
-            : gateway.start(project, { options, signal: controller.signal });
-        for await (const event of events)
-            ended = present(event) ?? ended;
+        const result = mode === "development"
+            ? await project.dev(system, { options, signal: controller.signal })
+            : await project.start(system, { options, signal: controller.signal });
+        console.log(`\n  ${dim("ran as")} ${result.process.identity}`);
+        ended = { code: result.exit.code, signal: result.exit.signal };
     }
     catch (error) {
         if (!interrupted)
@@ -42,7 +42,7 @@ export default async function launch(mode, directory = process.cwd(), options =
     finally {
         for (const signal of ["SIGINT", "SIGTERM"])
             process.off(signal, stop);
-        await gateway.close();
+        await system.disconnect();
     }
     if (interrupted)
         process.exit(130);
@@ -51,20 +51,6 @@ export default async function launch(mode, directory = process.cwd(), options =
     console.log(`\n  ${dim(ended.signal ? `ended on ${ended.signal}` : `ended with ${ended.code ?? 0}`)}\n`);
     process.exit(ended.signal ? 128 : ended.code ?? 0);
 }
-function present(event) {
-    if (event.event === "started")
-        console.log(`  ${dim("running as")} ${String(event.process)}\n`);
-    else if (event.event === "waiting")
-        line("waiting for", String(event.url));
-    else if (event.event === "output")
-        (event.stream === "err" ? process.stderr : process.stdout).write(String(event.text));
-    else if (event.event === "exited")
-        return {
-            code: typeof event.code === "number" ? event.code : null,
-            signal: typeof event.signal === "string" ? event.signal : null
-        };
-    return null;
-}
 function place(directory, location) {
     return /^https?:\/\//i.test(location) ? location : `./${relative(directory, location)}`;
 }

package/dist/program-installation.js

@@ -1,58 +1,53 @@
-import { Gateway } from "@phreshos/node";
+import { Project } from "@phreshos/node";
 import writeProgramCommandOutput from "./program-command-output.js";
 /** Install one prepared Program and await every explicitly requested outcome. */
 export default async function installProgram(program, options = {}) {
-    let installedValue;
-    let replaced = false;
+    const system = await (await import("@phreshos/node")).System.connect();
+    const identity = program instanceof Project ? program.config.identity : program.identity;
+    const current = await system.program.find(identity);
+    const replaced = await current?.installed() ?? false;
+    let installed = null;
     let startupEnabled = false;
-    let processValue;
-    const gateway = await Gateway.open();
+    let process = null;
+    let installationFinished = false;
     try {
-        for await (const event of gateway.install(program, options)) {
-            if (event.event === "output")
-                writeProgramCommandOutput(event);
-            else if (event.event === "installed") {
-                installedValue = event.program;
-                replaced = event.replaced === true;
+        if (program instanceof Project)
+            installed = await program.install(system);
+        else {
+            installed = await system.forceCreateProgram(program);
+            for await (const chunk of installed.install())
+                writeProgramCommandOutput(chunk);
+        }
+        installationFinished = true;
+        if (options.startup) {
+            await installed.startup.enable();
+            startupEnabled = true;
+        }
+        if (options.run)
+            process = (await installed.process.create()).identity;
+    }
+    catch (error) {
+        if (installed && !installationFinished) {
+            try {
+                await installed.forget();
             }
-            else if (event.event === "startupEnabled")
-                startupEnabled = true;
-            else if (event.event === "running")
-                processValue = event.process;
+            catch { /* Preserve the installation failure. */ }
         }
+        throw error;
     }
     finally {
-        await gateway.close();
+        await system.disconnect();
     }
-    if (installedValue === undefined)
+    if (!installed)
         throw new Error("The System ended Program installation without confirming it");
-    const installed = installedProgram(installedValue);
     if (options.startup && !startupEnabled)
         throw new Error("The System installed the Program without confirming startup");
-    const process = processValue === undefined ? null : processIdentity(processValue);
     if (options.run && !process)
         throw new Error("The System installed the Program without confirming that it is running");
     return {
-        program: installed,
+        program: { identity: installed.identity, name: installed.name, version: installed.version },
         replaced,
         startupEnabled,
         process
     };
 }
-function processIdentity(value) {
-    if (typeof value !== "string" || !value)
-        throw new Error("The System returned an invalid Process identity");
-    return value;
-}
-function installedProgram(value) {
-    if (!record(value)
-        || typeof value.identity !== "string"
-        || typeof value.name !== "string"
-        || value.version !== null && typeof value.version !== "string") {
-        throw new Error("The System returned an invalid installed Program");
-    }
-    return { identity: value.identity, name: value.name, version: value.version };
-}
-function record(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}

package/dist/program-release.js

@@ -85,6 +85,7 @@ async function readProgram(directory, release) {
         throw new Error("A published Program package cannot choose its installed storage");
     return {
         ...value,
+        storage: join(directory, "storage"),
         ...pathField(value, directory, "icon", "icon.png"),
         ...pathField(value, directory, "agent", "agent.md"),
         ...half(value, directory, "server"),

package/dist/project.js

@@ -3,7 +3,7 @@ import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { isAbsolute, normalize, resolve, sep } from "node:path";
 export const configFile = "phresh.config.ts";
-/** Read the current Project through the reusable Gateway project model. */
+/** Read the current Project through the reusable Node project model. */
 export async function readConfig(directory = process.cwd()) {
     return (await Project.open(directory)).config;
 }

package/dist/template/package.json

@@ -22,7 +22,7 @@
         "react-dom": "^19.2.8"
     },
     "devDependencies": {
-        "@phreshos/cli": "^0.1.32",
+        "@phreshos/cli": "^0.1.33",
         "@types/node": "^26.2.0",
         "@types/react": "^19.2.18",
         "@types/react-dom": "^19.2.4",

package/dist/uninstall.js

@@ -1,26 +1,24 @@
 import { readConfig } from "./project.js";
 import { dim, heading } from "./style.js";
-import { Gateway } from "@phreshos/node";
 import writeProgramCommandOutput from "./program-command-output.js";
 /** Uninstall an installed Program by name or by the current project's identity. */
 export default async function uninstall(options = {}) {
     const identity = options.name ?? (await readConfig(options.directory ?? process.cwd())).identity;
     if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(identity))
         throw new Error(`The Program name "${identity}" is invalid`);
-    const gateway = await Gateway.open();
+    const system = await (await import("@phreshos/node")).System.connect();
     try {
-        for await (const event of gateway.uninstall(identity, { everything: options.everything === true })) {
-            if (event.event === "output")
-                return writeProgramCommandOutput(event);
-            if (event.event !== "uninstalled")
-                return;
-            heading(identity, "uninstalled");
-            console.log(options.everything
-                ? `  ${dim("Its processes, installed files, stored data, and runtime record were removed.")}\n`
-                : `  ${dim("Its installed files were removed. Processes, stored data, and runtime state were kept.")}\n`);
-        }
+        const program = await system.program.find(identity);
+        if (!program)
+            throw new Error("The System does not know this Program");
+        for await (const chunk of program.uninstall(options.everything === true))
+            writeProgramCommandOutput(chunk);
+        heading(identity, "uninstalled");
+        console.log(options.everything
+            ? `  ${dim("Its processes, installed files, stored data, and runtime record were removed.")}\n`
+            : `  ${dim("Its installed files were removed. Processes, stored data, and runtime state were kept.")}\n`);
     }
     finally {
-        await gateway.close();
+        await system.disconnect();
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@phreshos/cli",
     "type": "module",
-    "version": "0.1.32",
+    "version": "0.1.33",
     "description": "The Phresh command-line interface for Program projects and system management.",
     "engines": {
         "node": ">=20.10"
@@ -49,8 +49,8 @@
     "packageManager": "bun@1.3.14",
     "dependencies": {
         "@clack/prompts": "^1.7.0",
-        "@phreshos/core": "^0.1.21",
-        "@phreshos/node": "^0.1.0",
+        "@phreshos/core": "^0.1.22",
+        "@phreshos/node": "^0.1.1",
         "adm-zip": "^0.6.0",
         "commander": "^15.0.0",
         "jiti": "^2.7.0",