@phreshos/cli 0.1.29 → 0.1.31

package/README.md

@@ -40,17 +40,6 @@ namespaces. System execution and native lifecycle remain isolated under
 
 ## System lifecycle
 
-Run a System project or prepared release directly while selecting an independent
-absolute state home:
-
-```bash
-PHRESHOS_HOME=/absolute/state phresh system .
-```
-
-When `PHRESHOS_HOME` is omitted here, the CLI passes `~/.phreshos`. Running the
-System project itself without the CLI instead defaults to that project's
-`storage/` directory.
-
 ```bash
 phresh system install
 phresh system uninstall

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { Command, Option } from "commander";
-import metadata from "../package.json" with { type: "json" };
+import { createRequire } from "node:module";
 import { PromptCancelled, ReportedFailure } from "./prompts.js";
 import create from "./create.js";
 import install from "./install.js";
@@ -12,6 +12,7 @@ import systemCommands from "./system/command.js";
 import controlCommands from "./control-command.js";
 import describeCommands from "./describe-command.js";
 import { commandContract } from "./command-contract.js";
+const metadata = createRequire(import.meta.url)("../package.json");
 const { version } = metadata;
 const coreRange = metadata.dependencies["@phreshos/core"];
 const runOptionPrefix = "--run-option-";

package/dist/project.js

@@ -1,27 +1,17 @@
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
 import { isRelativeValue, layers } from "@phreshos/core";
 import { existsSync } from "node:fs";
 import { isAbsolute, normalize, resolve, sep } from "node:path";
-import { pathToFileURL } from "node:url";
+import { createJiti } from "jiti";
 export const configFile = "phresh.config.ts";
 export async function readConfig(directory = process.cwd()) {
     const path = resolve(directory, configFile);
     if (!existsSync(path))
         throw new Error(`There is no ${configFile} here — run: phresh init`);
-    // The supported Node runtime reads erasable TypeScript directly. Keeping
-    // this file typed gives an author editor assistance without another config
-    // format or a build step.
-    const loaded = await import(__rewriteRelativeImportExtension(pathToFileURL(path).href)).catch(function (error) {
+    // Program declarations remain typed authoring files independently of the
+    // Node version that happens to execute the CLI.
+    const config = await createJiti(import.meta.url).import(path, { default: true }).catch(function (error) {
         throw new Error(`${configFile} could not be read (${error.message})`);
     });
-    const config = loaded.default;
     if (!config)
         throw new Error(`${configFile} must export its config as the default export`);
     coherent(config);

package/dist/system/command.js

@@ -1,23 +1,15 @@
 import SystemLifecycle from "./lifecycle.js";
 import prompts, { ReportedFailure } from "../prompts.js";
 import { accent, caution, dim, negative, positive } from "../style.js";
-import runSystem from "./run.js";
 import { commandContract } from "../command-contract.js";
 /** Attach the System lifecycle without mixing it with Program commands. */
 export default function systemCommands(program, provided) {
     let lifecycle = provided;
     const current = () => lifecycle ?? (lifecycle = new SystemLifecycle());
     const system = commandContract(program.command("system")
-        .description("run, install, and manage the PhreshOS System")
-        .argument("[source]", "System project or prepared release to run directly")
-        .action(async function (source) {
-        if (!source)
-            return system.help();
-        await runSystem(source);
-    }), {
+        .description("install and manage the PhreshOS System"), {
         guidance: [
-            "A source argument runs that System directly; it is resolved independently from PHRESHOS_HOME.",
-            "Without a source argument, choose one native lifecycle operation.",
+            "Choose one native System lifecycle operation.",
             "Running-System Programs, Processes, Endpoints, and Windows are top-level capabilities, not System subcommands."
         ]
     });

package/dist/system/service/macos.js

@@ -8,12 +8,14 @@ const defaultLabel = "com.phreshos.system";
 export default class MacOSSystemService {
     run;
     label;
+    environment;
     plist;
     domain;
     target;
-    constructor(userHome, run = execute, label = defaultLabel, uid = process.getuid?.()) {
+    constructor(userHome, run = execute, label = defaultLabel, uid = process.getuid?.(), environment = process.env) {
         this.run = run;
         this.label = label;
+        this.environment = environment;
         if (uid === undefined)
             throw new Error("The current macOS user could not be identified");
         this.plist = join(userHome, "Library", "LaunchAgents", `${this.label}.plist`);
@@ -40,7 +42,7 @@ export default class MacOSSystemService {
         await mkdir(dirname(definition.output), { recursive: true });
         const temporary = `${this.plist}.${randomUUID()}.tmp`;
         try {
-            await writeFile(temporary, plist(this.label, definition), { mode: 0o600 });
+            await writeFile(temporary, plist(this.label, definition, this.environment), { mode: 0o600 });
             await rename(temporary, this.plist);
         }
         finally {
@@ -84,7 +86,8 @@ export default class MacOSSystemService {
             throw new Error(result.stderr.trim() || result.stdout.trim() || `${command} exited with code ${result.code}`);
     }
 }
-function plist(label, definition) {
+function plist(label, definition, environment) {
+    const path = environmentPath(environment);
     return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -99,6 +102,12 @@ ${definition.arguments.map(argument => `        <string>${xml(argument)}</string
     </array>
     <key>WorkingDirectory</key>
     <string>${xml(definition.directory)}</string>
+${path === undefined ? "" : `    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PATH</key>
+        <string>${xml(path)}</string>
+    </dict>
+`}
     <key>RunAtLoad</key>
     <true/>
     <key>KeepAlive</key>
@@ -116,6 +125,10 @@ ${definition.arguments.map(argument => `        <string>${xml(argument)}</string
 </plist>
 `;
 }
+function environmentPath(environment) {
+    const key = Object.keys(environment).find(name => name.toLowerCase() === "path");
+    return key === undefined ? undefined : environment[key];
+}
 function xml(value) {
     return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
 }

package/dist/template/package.json

@@ -1,7 +1,7 @@
 {
     "name": "phresh",
     "private": true,
-    "version": "0.1.17",
+    "version": "0.1.18",
     "description": "The official PhreshOS starter Program.",
     "type": "module",
     "scripts": {
@@ -15,14 +15,14 @@
     ],
     "dependencies": {
         "@phreshos/client": "^0.1.22",
-        "@phreshos/core": "^0.1.19",
+        "@phreshos/core": "^0.1.20",
         "@phreshos/react": "^0.1.10",
-        "@phreshos/server": "^0.1.20",
+        "@phreshos/server": "^0.1.21",
         "react": "^19.2.8",
         "react-dom": "^19.2.8"
     },
     "devDependencies": {
-        "@phreshos/cli": "^0.1.29",
+        "@phreshos/cli": "^0.1.31",
         "@types/node": "^26.2.0",
         "@types/react": "^19.2.18",
         "@types/react-dom": "^19.2.4",

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.17",
+    version: "0.1.18",
     icon: "icon.png",
     categories: ["Development"],
     keywords: ["example", "counter", "client", "server"],
@@ -12,7 +12,7 @@ export default defineConfig({
     buildCommand: "vite-node scripts/build.ts",
     server: {
         location: "dist/server",
-        startCommand: "node main.js",
+        entryFile: "main.js",
         development: {
             startCommand: "vite-node source/server/main.ts"
         }
@@ -23,7 +23,7 @@ export default defineConfig({
         size: { width: 600, height: 500 },
         development: {
             url: "http://localhost:5200/",
-            startCommand: "vite dev --config vite.client.ts"
+            startCommand: "vite --config vite.client.ts"
         }
     }
 })

package/dist/template.json

@@ -1,6 +1,6 @@
 {
     "repository": "PhreshOS/phresh-program",
-    "version": "0.1.17",
-    "sha256": "139145e4ecd735ee7d3465e4ae9c8cf813071fa0c891fee516e8db021e336872",
+    "version": "0.1.18",
+    "sha256": "f612d9c2c55beac0dc618057a68fad177e40564e596047011173e0a5226b65d6",
     "development": true
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@phreshos/cli",
     "type": "module",
-    "version": "0.1.29",
+    "version": "0.1.31",
     "description": "The Phresh command-line interface for Program projects and system management.",
     "engines": {
         "node": ">=20.10"
@@ -52,6 +52,7 @@
         "@phreshos/core": "^0.1.20",
         "adm-zip": "^0.6.0",
         "commander": "^15.0.0",
+        "jiti": "^2.7.0",
         "picocolors": "^1.1.1"
     },
     "devDependencies": {

package/dist/system/run.js

@@ -1,37 +0,0 @@
-import phreshosHome from "../home.js";
-import { existsSync, statSync } from "node:fs";
-import { readFile } from "node:fs/promises";
-import { join, resolve } from "node:path";
-import { spawn } from "node:child_process";
-/** Run one System source directly with an explicit absolute state home. */
-export default async function runSystem(source, environment = process.env) {
-    const directory = resolve(source);
-    if (!existsSync(directory) || !statSync(directory).isDirectory())
-        throw new Error(`The System source does not exist: ${directory}`);
-    const entry = join(directory, "server", "main.js");
-    const command = existsSync(entry)
-        ? { file: process.execPath, args: [entry] }
-        : await projectCommand(directory);
-    const child = spawn(command.file, command.args, {
-        cwd: directory,
-        env: { ...environment, PHRESHOS_HOME: phreshosHome(environment) },
-        stdio: "inherit"
-    });
-    const result = await new Promise((resolve, reject) => {
-        child.once("error", reject);
-        child.once("exit", (code, signal) => resolve({ code, signal }));
-    });
-    if (result.signal)
-        throw new Error(`The System stopped on ${result.signal}`);
-    if (result.code !== 0)
-        throw new Error(`The System exited with code ${result.code ?? 1}`);
-}
-async function projectCommand(directory) {
-    const path = join(directory, "package.json");
-    if (!existsSync(path))
-        throw new Error(`The System source has neither server/main.js nor package.json: ${directory}`);
-    const manifest = JSON.parse(await readFile(path, "utf8"));
-    if (typeof manifest.scripts?.start !== "string")
-        throw new Error(`The System source has no start command: ${directory}`);
-    return { file: process.execPath, args: ["--run", "start"] };
-}