@phreshos/cli 0.1.62 → 0.1.64

package/dist/init.js

@@ -61,50 +61,48 @@ export default async function init(options = {}, directory = process.cwd(), core
         const location = options.serverLocation ?? (interactive ? await ask("The system runs the production Server from this project-relative directory.", "Where are the production Server files?", clientSelected ? "dist/server" : "dist") : "");
         if (!location)
             throw new Error("--server-location is required without a terminal");
-        const production = options.serverStartCommand === undefined && options.serverEntryFile === undefined && interactive
+        const production = options.serverCommand === undefined && options.serverWorker === undefined && options.serverSandbox === undefined && interactive
             ? await askExecution(interaction, "production", "node main.js")
-            : execution(options.serverStartCommand, options.serverEntryFile, "production Server");
-        let development = explicitExecution(options.serverDevelopmentStartCommand, options.serverDevelopmentEntryFile, "development Server");
-        if (interactive && development === undefined) {
+            : execution(options.serverCommand, options.serverWorker, options.serverSandbox, "production Server");
+        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 = await askExecution(interaction, "development", 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,
@@ -119,10 +117,10 @@ export default async function init(options = {}, directory = process.cwd(), core
     await ensureProjectDependency("@phreshos/core", coreRange, directory);
     writeFileSync(path, compose(config));
     if (config.server)
-        interaction.detail(config.server.startCommand ? "server" : "server worker", config.server.startCommand ?? config.server.entryFile, `./${config.server.location}`);
+        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) {
@@ -140,14 +138,13 @@ function compose(config) {
         field("buildCommand", config.buildCommand),
         half("server", config.server && {
             location: config.server.location,
-            ...(config.server.startCommand !== undefined
-                ? { startCommand: config.server.startCommand }
-                : { entryFile: config.server.entryFile }),
-            ...config.server.development && { development: config.server.development }
+            [serverExecution(config.server)[0]]: serverExecution(config.server)[1],
+            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) {
@@ -182,35 +176,47 @@ function httpUrl(value) {
         return false;
     }
 }
-function execution(startCommand, entryFile, owner) {
-    const selected = explicitExecution(startCommand, entryFile, owner);
-    if (!selected)
-        throw new Error(`Choose exactly one --server-start-command or --server-entry-file for the ${owner}`);
-    return selected;
-}
-function explicitExecution(startCommand, entryFile, owner) {
-    if (startCommand !== undefined && entryFile !== undefined)
-        throw new Error(`The ${owner} cannot declare both a start command and an entry file`);
-    if (startCommand !== undefined) {
-        if (startCommand.trim().length === 0)
+function execution(command, worker, sandbox, owner) {
+    const selected = [command, worker, sandbox].filter(value => value !== undefined);
+    if (selected.length !== 1)
+        throw new Error(`Choose exactly one --server-command, --server-worker, or --server-sandbox for the ${owner}`);
+    if (command !== undefined) {
+        if (!command.trim())
             throw new Error(`The ${owner} command must not be empty`);
-        return { startCommand };
+        return { command };
     }
-    if (entryFile !== undefined) {
-        if (entryFile.trim().length === 0)
-            throw new Error(`The ${owner} entry file must not be empty`);
-        if (!containedServerEntry(entryFile))
-            throw new Error(`The ${owner} entry file must remain inside its Server directory`);
-        return { entryFile };
+    if (worker !== undefined) {
+        if (!worker.trim())
+            throw new Error(`The ${owner} worker must not be empty`);
+        if (!containedServerEntry(worker))
+            throw new Error(`The ${owner} worker entry must remain inside its Server directory`);
+        return { worker };
     }
+    if (!sandbox?.trim())
+        throw new Error(`The ${owner} sandbox must not be empty`);
+    if (!containedServerEntry(sandbox))
+        throw new Error(`The ${owner} sandbox entry must remain inside its Server directory`);
+    return { sandbox };
 }
 async function askExecution(interaction, mode, suggestedCommand) {
-    const worker = await interaction.yes("A Worker uses fewer resources but shares the System's Node.js process.", `Run the ${mode} Server as a System-owned Worker?`, false);
+    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)
+        return {
+            sandbox: await interaction.ask("This bundled JavaScript module remains inside the Server files.", `What is the ${mode} Server Sandbox entry?`, "main.js")
+        };
+    const worker = await interaction.yes("A Worker uses Node.js host capabilities in an isolated thread.", `Run the ${mode} Server as a Worker?`, false);
     if (worker)
         return {
-            entryFile: await interaction.ask("This JavaScript module remains inside the Server files.", `What is the ${mode} Server entry file?`, mode === "production" ? "main.js" : "source/server/main.js")
+            worker: await interaction.ask("This JavaScript module remains inside the Server files.", `What is the ${mode} Server Worker entry?`, "main.js")
         };
     return {
-        startCommand: await interaction.ask(`This command runs from the ${mode === "production" ? "production Server directory" : "project directory"}.`, `What command starts the ${mode} Server?`, suggestedCommand)
+        command: await interaction.ask("This command runs from the production Server directory.", `What command starts the ${mode} Server?`, suggestedCommand)
     };
 }
+function serverExecution(server) {
+    if (server.command !== undefined)
+        return ["command", server.command];
+    if (server.worker !== undefined)
+        return ["worker", server.worker];
+    return ["sandbox", server.sandbox];
+}

package/dist/launch.js

@@ -8,10 +8,16 @@ export default async function launch(mode, directory = process.cwd(), options =
     heading(`${definition.name ?? definition.identity}${definition.version ? ` ${definition.version}` : ""}`, mode);
     if (mode === "production" && project.config.buildCommand)
         line("build", project.config.buildCommand);
-    if (definition.server)
-        line(definition.server.startCommand ? "server" : "server worker", String(definition.server.startCommand ?? definition.server.entryFile), place(project.directory, definition.server.location));
+    if (definition.server) {
+        const [execution, value] = definition.server.command !== undefined
+            ? ["command", definition.server.command]
+            : definition.server.worker !== undefined
+                ? ["worker", definition.server.worker]
+                : ["sandbox", definition.server.sandbox];
+        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/output/format.js

@@ -0,0 +1,35 @@
+/** Render records as readable field blocks without terminal-table layout work. */
+export function renderList(fields, rows) {
+    return rows.map(row => renderFields(fields, row)).join("\n\n");
+}
+/** Render one value as aligned labels with indented multiline values. */
+export function renderFields(fields, source) {
+    const width = Math.max(...fields.map(field => field.label.length), 0);
+    return fields.map(field => {
+        const value = display(readPath(source, field.path), true);
+        const lines = value.split("\n");
+        const prefix = `${field.label.padEnd(width)}  `;
+        const continuation = " ".repeat(prefix.length);
+        return [prefix + lines[0], ...lines.slice(1).map(line => continuation + line)].join("\n");
+    }).join("\n");
+}
+export function readPath(source, path) {
+    if (!path)
+        return source;
+    return path.split(".").reduce((current, key) => {
+        if (typeof current !== "object" || current === null)
+            return undefined;
+        return current[key];
+    }, source);
+}
+export function display(value, expanded = false) {
+    if (value === null || value === undefined || value === "")
+        return "—";
+    if (typeof value === "boolean")
+        return value ? "yes" : "no";
+    if (typeof value === "string" || typeof value === "number" || typeof value === "bigint")
+        return String(value);
+    if (Array.isArray(value) && !expanded)
+        return value.length ? value.map(item => display(item)).join(", ") : "—";
+    return JSON.stringify(value, null, expanded ? 2 : undefined);
+}

package/dist/output/write.js

@@ -1,11 +1,11 @@
 import { inspect } from "node:util";
 import { assertValue } from "../contract/schema.js";
-import { readPath, renderFields, renderTable } from "./table.js";
+import { readPath, renderFields, renderList } from "./format.js";
 /** Validate command data once, then select its machine or human representation. */
 export function writeData(result, contract, machine) {
     const normalized = result ?? null;
     assertValue(normalized, contract.value);
-    if (machine) {
+    if (machine || contract.presentation.format === "json") {
         console.log(JSON.stringify(normalized));
         return;
     }
@@ -14,10 +14,11 @@ export function writeData(result, contract, machine) {
 }
 function render(value, presentation) {
     switch (presentation.format) {
-        case "table": return renderCollection(value, presentation);
+        case "list": return renderCollection(value, presentation);
         case "fields": return renderFields(presentation.fields, value);
         case "document": return String(readPath(value, presentation.content) ?? "");
         case "value": return inspect(value, { colors: false, depth: null, compact: false });
+        case "json": return JSON.stringify(value);
     }
 }
 function renderCollection(value, presentation) {
@@ -25,7 +26,7 @@ function renderCollection(value, presentation) {
     const rows = Array.isArray(selected) ? selected : [];
     if (rows.length === 0)
         return presentation.empty;
-    const table = renderTable(presentation.columns, rows);
+    const list = renderList(presentation.fields, rows);
     const totalValue = presentation.total ? readPath(value, presentation.total) : rows.length;
     const total = typeof totalValue === "number" ? totalValue : rows.length;
     const noun = total === 1 ? presentation.item : presentation.items;
@@ -35,5 +36,5 @@ function renderCollection(value, presentation) {
     const truncated = presentation.truncated && readPath(value, presentation.truncated) === true
         ? " · more available"
         : "";
-    return `${table}\n${summary}${truncated}`;
+    return `${list}\n\n${summary}${truncated}`;
 }

package/dist/template/package.json

@@ -1,7 +1,7 @@
 {
     "name": "phresh",
     "private": true,
-    "version": "0.1.37",
+    "version": "0.1.40",
     "description": "The official PhreshOS starter Program.",
     "type": "module",
     "scripts": {
@@ -14,15 +14,15 @@
         "starter"
     ],
     "dependencies": {
-        "@phreshos/client": "^0.1.43",
-        "@phreshos/core": "^0.1.49",
-        "@phreshos/react": "^0.1.25",
-        "@phreshos/server": "^0.1.47",
+        "@phreshos/client": "^0.1.46",
+        "@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.62",
+        "@phreshos/cli": "^0.1.64",
         "@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.37",
+    version: "0.1.40",
     icon: "icon.png",
     categories: ["Development"],
     keywords: ["example", "counter", "client", "server"],
@@ -12,17 +12,13 @@ export default defineConfig({
     buildCommand: "vite-node scripts/build.ts",
     server: {
         location: "dist/server",
-        entryFile: "main.js",
-        development: {
-            startCommand: "vite-node server/main.ts"
-        }
+        worker: "main.js",
+        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

@@ -9,8 +9,8 @@ test("build contract", async () => {
   assert.equal(config.name, "Phresh Program")
   assert.equal(config.version, manifest.version)
   assert.equal(config.server?.location, "dist/server")
-  assert.equal(config.server?.entryFile, "main.js")
-  assert.equal(config.server?.development?.startCommand, "vite-node server/main.ts")
+  assert.equal(config.server?.worker, "main.js")
+  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/vite.client.ts

@@ -7,8 +7,7 @@ export default defineConfig({
     plugins: [react()],
     base: process.env.PHRESHOS_CLIENT_BASE ?? "./",
     resolve: {
-        tsconfigPaths: true,
-        dedupe: ["react"]
+        tsconfigPaths: true
     },
     server: {
         port: Number(process.env.PHRESHOS_CLIENT_PORT ?? "5200"),

package/dist/template.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@phreshos/cli",
   "type": "module",
-  "version": "0.1.62",
+  "version": "0.1.64",
   "description": "The Phresh command-line interface for Program projects and system management.",
   "engines": {
     "node": ">=20.10"
@@ -47,13 +47,11 @@
   "packageManager": "bun@1.3.14",
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@phreshos/core": "^0.1.52",
-    "@phreshos/node": "^0.1.25",
+    "@phreshos/core": "^0.1.54",
+    "@phreshos/node": "^0.1.27",
     "adm-zip": "^0.6.0",
-    "cli-table3": "^0.6.5",
     "commander": "^15.0.0",
-    "picocolors": "^1.1.1",
-    "string-width": "^4.2.3"
+    "picocolors": "^1.1.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.8",

package/dist/commands/observation.js

@@ -1,4 +0,0 @@
-/** Wait for one named event while preserving the target's own subscription contract. */
-export async function wait(target, event, timeout) {
-    return target.wait(event, timeout);
-}

package/dist/output/table.js

@@ -1,88 +0,0 @@
-import Table from "cli-table3";
-import stringWidth from "string-width";
-const style = Object.freeze({ head: [], border: [] });
-/** Render a table at its natural width, constraining and wrapping it only when necessary. */
-export function renderTable(fields, rows) {
-    const width = terminalWidth();
-    if (width < minimumTableWidth(fields)) {
-        return rows.map(row => renderFields(fields, row)).join("\n");
-    }
-    const natural = createTable(fields, rows);
-    const rendered = natural.toString();
-    if (rendered.split("\n").every(line => stringWidth(line) <= width))
-        return rendered;
-    return createTable(fields, rows, allocateWidths(width, fields)).toString();
-}
-/** Render one value vertically so field names remain readable on narrow terminals. */
-export function renderFields(fields, source) {
-    const rows = fields.map(field => [field.label, display(readPath(source, field.path), true)]);
-    const width = terminalWidth();
-    const desiredLabelWidth = Math.max(6, ...fields.map(field => stringWidth(field.label) + 2));
-    const labelWidth = Math.min(24, Math.max(6, width - 11), desiredLabelWidth);
-    const valueWidth = Math.max(8, width - labelWidth - 3);
-    const table = new Table({
-        colWidths: [labelWidth, valueWidth],
-        wordWrap: true,
-        wrapOnWordBoundary: false,
-        style
-    });
-    table.push(...rows);
-    return table.toString();
-}
-export function readPath(source, path) {
-    if (!path)
-        return source;
-    return path.split(".").reduce((current, key) => {
-        if (typeof current !== "object" || current === null)
-            return undefined;
-        return current[key];
-    }, source);
-}
-export function display(value, expanded = false) {
-    if (value === null || value === undefined || value === "")
-        return "—";
-    if (typeof value === "boolean")
-        return value ? "yes" : "no";
-    if (typeof value === "string" || typeof value === "number" || typeof value === "bigint")
-        return String(value);
-    if (Array.isArray(value) && !expanded)
-        return value.length ? value.map(item => display(item)).join(", ") : "—";
-    return JSON.stringify(value, null, expanded ? 2 : undefined);
-}
-function createTable(fields, rows, colWidths) {
-    const table = new Table({
-        head: fields.map(field => field.label),
-        ...(colWidths ? { colWidths } : {}),
-        wordWrap: true,
-        wrapOnWordBoundary: false,
-        style
-    });
-    table.push(...rows.map(row => fields.map(field => display(readPath(row, field.path)))));
-    return table;
-}
-function allocateWidths(width, fields) {
-    const minimums = fields.map(field => minimumColumnWidth(field));
-    const available = width - fields.length - 1;
-    const remaining = available - minimums.reduce((total, current) => total + current, 0);
-    const weights = fields.map(field => field.width ?? 1);
-    const totalWeight = weights.reduce((total, current) => total + current, 0);
-    const widths = minimums.map((minimum, index) => minimum + Math.floor(remaining * weights[index] / totalWeight));
-    let remainder = available - widths.reduce((total, current) => total + current, 0);
-    for (let index = 0; remainder > 0; index = (index + 1) % widths.length) {
-        widths[index] = widths[index] + 1;
-        remainder--;
-    }
-    return widths;
-}
-function minimumTableWidth(fields) {
-    return fields.reduce((total, field) => total + minimumColumnWidth(field), fields.length + 1);
-}
-function minimumColumnWidth(field) {
-    return Math.max(6, stringWidth(field.label) + 2);
-}
-function terminalWidth() {
-    const configured = Number(process.env.COLUMNS);
-    if (Number.isFinite(configured) && configured > 0)
-        return Math.floor(configured);
-    return process.stdout.columns ?? 80;
-}