@higherdev/cli 0.12.0 → 0.12.1

package/README.md

@@ -8,15 +8,10 @@ Operator controls for HDX workspaces, tickets, agents, and runner hosts.
 npm install --global @higherdev/cli
 ```
 
-Create `~/.config/hd/config.json` with an existing workspace API key:
+Configure this client with an existing workspace API key:
 
-```json
-{
-  "url": "https://hdx-higher-ops.vercel.app",
-  "api_key": "hdx_...",
-  "current": "workspace",
-  "repos": {}
-}
+```sh
+hd login --url https://hdx-higher-ops.vercel.app --api-key hdx_... --slug workspace
 ```
 
 One workspace key reaches every workspace. Previous single-workspace and
@@ -54,8 +49,13 @@ workspace-map config shapes are migrated automatically when they are read.
 | `hd decide ID --answer TEXT` | Answer a decision |
 | `hd on` / `hd off` | Turn the workspace on or off |
 | `hd pause` / `hd resume` | Pause or resume the workspace |
-| `hd init [options]` | Configure this host and runner service |
-| `hd upgrade [options]` | Refresh this host configuration |
+| `hd login --url URL --api-key KEY [--slug S]` | Configure only this operator client |
+| `hd init --host HOST [--checkout DIR] [options]` | Configure this host and runner service |
+| `hd upgrade --host HOST [--checkout DIR] [options]` | Refresh this host configuration |
+
+`hd init` uses `~/hdx` as its checkout by default. Pass `--checkout DIR` when the runner source is
+elsewhere. If the runner environment or service unit already exists, inspect the paths it prints and
+pass `--force` only when replacing that host configuration is intentional.
 
 `hd workspace new` uses the operator's authenticated `gh`, defaults to the repository's real default
 branch, bootstraps an empty repository unless `--no-bootstrap` is set, and invites `mel-ilotus` unless

package/dist/host.js

@@ -1,16 +1,11 @@
 import { execFile } from "node:child_process";
-import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
-import { homedir, hostname } from "node:os";
+import { access, chmod, mkdir, readFile, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
-import { writeHdConfig } from "./config.js";
 const execFileAsync = promisify(execFile);
 export const LAUNCHD_LABEL = "io.higherops.hdx-runner";
 export const SYSTEMD_UNIT = "hdx-runner.service";
-export function repoRootFrom(fileUrl = import.meta.url) {
-    return path.resolve(path.dirname(fileURLToPath(fileUrl)), "../../..");
-}
 export function parseEnvFile(text) {
     const out = {};
     for (const line of text.split(/\r?\n/)) {
@@ -88,6 +83,10 @@ export function parseHostFlags(argv) {
         };
         if (arg === "--host")
             flags.host = next();
+        else if (arg === "--checkout")
+            flags.checkout = next();
+        else if (arg === "--force")
+            flags.force = true;
         else if (arg === "--env-out")
             flags.envFile = next();
         else if (arg === "--worktree-root")
@@ -96,12 +95,6 @@ export function parseHostFlags(argv) {
             flags.installLaunchd = true;
         else if (arg === "--install-systemd")
             flags.installSystemd = true;
-        else if (arg === "--url")
-            flags.url = next();
-        else if (arg === "--api-key")
-            flags.apiKey = next();
-        else if (arg === "--slug")
-            flags.slug = next();
         else if (arg === "--plist-out")
             flags.plistOut = next();
         else if (arg === "--unit-out")
@@ -111,14 +104,47 @@ export function parseHostFlags(argv) {
     }
     return flags;
 }
+async function exists(file) {
+    try {
+        await access(file);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function expandHome(value, home) {
+    if (value === "~")
+        return home;
+    if (value.startsWith("~/"))
+        return path.join(home, value.slice(2));
+    return value;
+}
 export async function initHost(flags, env = process.env) {
     const home = homedir();
-    const host = flags.host || env.RUNNER_HOST || hostname().replace(/\..*$/, "").toLowerCase();
     const envFile = flags.envFile || path.join(home, ".config/hdx/runner.env");
     const worktreeRoot = flags.worktreeRoot || env.WORKTREE_ROOT || path.join(home, "hdx-worktrees");
-    const repo = repoRootFrom();
+    const repo = path.resolve(expandHome(flags.checkout ?? path.join(home, "hdx"), home));
     const runnerPath = path.join(repo, "apps/runner/src/index.ts");
     const nodePath = process.execPath;
+    const plistPath = flags.plistOut || path.join(home, "Library/LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+    const unitPath = flags.unitOut || path.join(home, ".config/systemd/user", SYSTEMD_UNIT);
+    const targets = [envFile];
+    if (process.platform === "darwin" || flags.plistOut || flags.installLaunchd)
+        targets.push(plistPath);
+    if (process.platform === "linux" || flags.unitOut || flags.installSystemd)
+        targets.push(unitPath);
+    const existingTargets = (await Promise.all(targets.map(async (target) => ({ target, exists: await exists(target) })))).filter((entry) => entry.exists).map((entry) => entry.target);
+    if (existingTargets.length && !flags.force) {
+        throw new Error([
+            "hd init refused to overwrite existing runner files:",
+            ...existingTargets.map((target) => `  ${target}`),
+            "Re-run with --force to overwrite them.",
+        ].join("\n"));
+    }
+    if (!flags.host)
+        throw new Error("hd init requires --host HOST.");
+    const host = flags.host;
     let existing = {};
     try {
         existing = parseEnvFile(await readFile(envFile, "utf8"));
@@ -137,13 +163,9 @@ export async function initHost(flags, env = process.env) {
     await mkdir(path.dirname(envFile), { recursive: true });
     await writeFile(envFile, formatEnvFile(merged), { encoding: "utf8", mode: 0o600 });
     await chmod(envFile, 0o600);
-    if (flags.url && flags.apiKey && flags.slug) {
-        writeHdConfig({ url: flags.url.replace(/\/$/, ""), api_key: flags.apiKey, slug: flags.slug });
-    }
     const lines = [`hd init host=${host}`, `env: ${envFile}`];
     const workDir = repo;
     if (process.platform === "darwin" || flags.plistOut || flags.installLaunchd) {
-        const plistPath = flags.plistOut || path.join(home, "Library/LaunchAgents", `${LAUNCHD_LABEL}.plist`);
         const logPath = path.join(home, "Library/Logs/hdx-runner.log");
         await mkdir(path.dirname(plistPath), { recursive: true });
         await writeFile(plistPath, launchdPlist({ nodePath, runnerPath, envFile, logPath, workDir }), "utf8");
@@ -163,7 +185,6 @@ export async function initHost(flags, env = process.env) {
         lines.push(`launchd plist: ${plistPath}${loaded ? " (loaded)" : ""}`);
     }
     if (process.platform === "linux" || flags.unitOut || flags.installSystemd) {
-        const unitPath = flags.unitOut || path.join(home, ".config/systemd/user", SYSTEMD_UNIT);
         await mkdir(path.dirname(unitPath), { recursive: true });
         await writeFile(unitPath, systemdUnit({ nodePath, runnerPath, envFile, workDir }), "utf8");
         let loaded = false;

package/dist/index.js

@@ -3,6 +3,7 @@ import { realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 import { approveEpic, answerDecision, cancelTicket, createAgent, createEpic, createTicket, deleteAgent, deleteEpic, getStatus, listAgents, listEpics, listTicketEvents, listTickets, listWorkspaces, postMessage, queueTicket, setPaused, showTicket, updateAgent, updateCaps, } from "./api.js";
 import { initHost, parseHostFlags } from "./host.js";
+import { login, parseLoginFlags } from "./login.js";
 import { loadConfig } from "./config.js";
 import { epicProgressRows, readEpicSpec } from "./epics.js";
 import { banner, c, statusChip, table, truncate, usage } from "./out.js";
@@ -256,7 +257,7 @@ async function cmdWorkspace(argv, deps = {}) {
             fail(WORKSPACE_USAGE);
         const result = await workspaceRotateKey();
         console.log(`api key: ${result.apiKey}`);
-        console.log("saved locally; update Mel's hd init configuration on the box.");
+        console.log("saved locally; run hd login with the new key on other machines.");
         return;
     }
     if (action === "set") {
@@ -271,7 +272,7 @@ async function cmdWorkspace(argv, deps = {}) {
         console.log(`invitation pending for ${result.runnerUser}`);
     console.log(`workspace: ${result.slug}`);
     console.log("saved and switched; configure another machine with:");
-    console.log(result.initCommand);
+    console.log(result.loginCommand);
 }
 function selectAgent(agents, target, provider) {
     const exact = agents.find((agent) => agent.id === target);
@@ -414,6 +415,13 @@ export async function main(argv = process.argv.slice(2), deps = {}) {
             console.log(cmd === "on" ? "on" : "resumed");
             return;
         }
+        if (cmd === "login") {
+            const config = login(parseLoginFlags(rest));
+            console.log(`logged in to ${config.slug}`);
+            const { launchApp } = await import("./tui/launch.js");
+            await launchApp(config.slug);
+            return;
+        }
         if (cmd === "init" || cmd === "upgrade") {
             const report = await initHost(parseHostFlags(rest));
             console.log(report);

package/dist/login.js

@@ -0,0 +1,41 @@
+import { loadStoredConfig, writeHdConfig } from "./config.js";
+export function parseLoginFlags(argv) {
+    const flags = {};
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        const next = () => {
+            const value = argv[i + 1];
+            if (!value || value.startsWith("--"))
+                throw new Error(`Missing value for ${arg}`);
+            i += 1;
+            return value;
+        };
+        if (arg === "--url")
+            flags.url = next();
+        else if (arg === "--api-key")
+            flags.apiKey = next();
+        else if (arg === "--slug")
+            flags.slug = next();
+        else
+            throw new Error(`Unknown option: ${arg}`);
+    }
+    return flags;
+}
+/** Configure the operator client without touching runner host files. */
+export function login(flags, path) {
+    if (!flags.url || !flags.apiKey) {
+        throw new Error("usage: hd login --url URL --api-key KEY [--slug S]");
+    }
+    let current = "workspace";
+    try {
+        current = loadStoredConfig(path).current;
+    }
+    catch { }
+    const config = {
+        url: flags.url,
+        api_key: flags.apiKey,
+        slug: flags.slug ?? current,
+    };
+    writeHdConfig(config, path);
+    return config;
+}

package/dist/out.js

@@ -74,6 +74,8 @@ export function usage() {
         `  ${c.blue("hd msg KEY TEXT")}                   message a builder`,
         `  ${c.blue("hd decide [ID --answer TEXT]")}      decisions`,
         `  ${c.blue("hd on | hd off")}                    workspace switch`,
-        `  ${c.blue("hd init | hd upgrade")}              host setup`,
+        `  ${c.blue("hd login --url URL --api-key KEY")}  client setup`,
+        `  ${c.blue("hd init --host HOST [options]")}     host setup`,
+        `  ${c.blue("hd upgrade --host HOST [options]")}  refresh host setup`,
     ].join("\n");
 }

package/dist/tui/App.js

@@ -312,7 +312,7 @@ export function App({ initial }) {
                         if (!created)
                             throw new Error("Workspace wizard did not finish.");
                         await changeWorkspace(created.slug, loadConfig());
-                        say("system", `Created ${created.slug}. Configure the box with: ${created.initCommand}`);
+                        say("system", `Created ${created.slug}. Configure another machine with: ${created.loginCommand}`);
                     }
                     else if (action.command === "set") {
                         const updated = await workspaceSet(action.args);
@@ -322,7 +322,7 @@ export function App({ initial }) {
                     else {
                         const rotated = await workspaceRotateKey();
                         setConfig(loadConfig());
-                        say("system", `API key: ${rotated.apiKey}\nSaved locally. Update Mel's hd init configuration on the box.`);
+                        say("system", `API key: ${rotated.apiKey}\nSaved locally. Run hd login with the new key on other machines.`);
                     }
                 }
                 catch (error) {

package/dist/workspace-commands.js

@@ -115,7 +115,7 @@ export async function workspaceNew(argv, deps = {}) {
         return { slug: result.workspace.slug, repo: result.workspace.repo,
             invitationPending: preflight.invitationPending,
             runnerUser: opts["runner-user"] ?? HDX_RUNNER_GH_USER,
-            initCommand: `hd init --url ${result.url} --api-key ${result.api_key} --slug ${result.workspace.slug}` };
+            loginCommand: `hd login --url ${result.url} --api-key ${result.api_key} --slug ${result.workspace.slug}` };
     }
 }
 export async function workspaceSet(argv) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@higherdev/cli",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "type": "module",
   "bin": {
     "hd": "dist/index.js"