@higherdev/cli 0.10.0 → 0.11.0

package/README.md

@@ -56,9 +56,12 @@ workspace-map config shapes are migrated automatically when they are read.
 
 `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
-`--runner-user USER` overrides it.
+`--runner-user USER` overrides it. On a terminal, missing name or repo flags start a guided wizard. If
+the repository is missing, approve private creation interactively, use `--create` to force it, or
+`--no-create` to fail. Fully flagged calls remain non-interactive for scripts and Mel.
 
 Inside the TUI, use `/board`, `/inbox`, `/ticket`, `/queue`, `/cancel`, `/epic new`,
-`/epics`, `/plan`, `/decide`, `/agents add`, `/agents rm`, `/settings`, `/workspace`, `/feed`,
+`/epics`, `/plan`, `/decide`, `/agents add`, `/agents rm`, `/settings`, `/workspace`,
+`/workspace new`, `/workspace set`, `/workspace rotate-key`, `/feed`,
 `/orchestrator`, `/refresh`, `/help`, or `/exit`. The display refreshes from
 the HDX API every five seconds.

package/dist/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import { realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { answerDecision, cancelTicket, createAgent, createEpic, createTicket, createWorkspace, deleteAgent, getStatus, listAgents, listEpics, listTicketEvents, listTickets, listWorkspaces, postMessage, queueTicket, rotateWorkspaceApiKey, setPaused, showTicket, updateAgent, updateCaps, updateWorkspace, } from "./api.js";
+import { answerDecision, cancelTicket, createAgent, createEpic, createTicket, deleteAgent, getStatus, listAgents, listEpics, listTicketEvents, listTickets, listWorkspaces, postMessage, queueTicket, setPaused, showTicket, updateAgent, updateCaps, } from "./api.js";
 import { initHost, parseHostFlags } from "./host.js";
-import { loadConfig, writeHdConfig } from "./config.js";
+import { loadConfig } from "./config.js";
 import { epicProgressRows, readEpicSpec } from "./epics.js";
 import { banner, c, statusChip, table, truncate, usage } from "./out.js";
 import { launchArchitect } from "./plan.js";
-import { HDX_RUNNER_GH_USER, preflightWorkspace } from "./workspace-preflight.js";
+import { WORKSPACE_USAGE, workspaceNew, workspaceRotateKey, workspaceSet } from "./workspace-commands.js";
 function fail(message) {
     console.error(message);
     process.exit(1);
@@ -241,71 +241,27 @@ async function cmdWorkspace(argv, deps = {}) {
         ])));
         return;
     }
-    const workspaceUsage = "usage: hd workspace ls | new ... | set [flags] | rotate-key";
     if (action === "rotate-key") {
-        const config = loadConfig();
-        const { api_key } = await rotateWorkspaceApiKey(config);
-        writeHdConfig({ ...config, api_key });
-        console.log(`api key: ${api_key}`);
+        if (rest.length)
+            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.");
         return;
     }
     if (action === "set") {
-        const { rest: args, opts, bools } = flags(rest);
-        if (args.length || bools.size)
-            fail(workspaceUsage);
-        const fields = {};
-        for (const [flag, field] of [["name", "name"], ["repo", "repo"], ["branch", "default_branch"], ["host", "default_host"]]) {
-            if (opts[flag])
-                fields[field] = opts[flag];
-        }
-        if (opts["auto-merge"]) {
-            if (!["on", "off"].includes(opts["auto-merge"]))
-                fail("--auto-merge must be on or off");
-            fields.auto_merge = opts["auto-merge"] === "on";
-        }
-        if (opts["max-turns"]) {
-            const maxTurns = {};
-            for (const entry of opts["max-turns"].split(",")) {
-                const [kind, raw, ...extra] = entry.split("=");
-                const value = Number(raw);
-                if (extra.length || !["build", "followup", "review", "orchestrate"].includes(kind)
-                    || !Number.isInteger(value) || value < 1) {
-                    fail("--max-turns must be KIND=N[,KIND=N...] for build, followup, review, or orchestrate");
-                }
-                maxTurns[kind] = value;
-            }
-            fields.max_turns = maxTurns;
-        }
-        if (opts["max-attempts"]) {
-            const value = Number(opts["max-attempts"]);
-            if (!Number.isInteger(value) || value < 1)
-                fail("--max-attempts must be an integer >= 1");
-            fields.max_attempts = value;
-        }
-        if (!Object.keys(fields).length)
-            fail(workspaceUsage);
-        const { workspace } = await updateWorkspace(fields);
+        const workspace = await workspaceSet(rest);
         console.log(`${workspace.slug}  ${workspace.name}  ${workspace.repo}`);
         return;
     }
     if (action !== "new")
-        fail(workspaceUsage);
-    const { opts, bools } = flags(rest);
-    if (!opts.name || !opts.repo) {
-        fail(workspaceUsage);
-    }
-    const preflight = await (deps.preflightWorkspace ?? preflightWorkspace)({ name: opts.name, repo: opts.repo,
-        branch: opts.branch, noBootstrap: bools.has("no-bootstrap"),
-        runnerUser: opts["runner-user"] ?? HDX_RUNNER_GH_USER });
-    if (preflight.invitationPending)
-        console.log(`invitation pending for ${opts["runner-user"] ?? HDX_RUNNER_GH_USER}`);
-    const result = await createWorkspace({ name: opts.name, repo: opts.repo, slug: opts.slug,
-        default_branch: preflight.branch, default_host: opts.host ?? "box" });
-    console.log(`workspace: ${result.workspace.slug}`);
-    writeHdConfig({ url: result.url, api_key: result.api_key, slug: result.workspace.slug });
+        fail(WORKSPACE_USAGE);
+    const result = await workspaceNew(rest, deps);
+    if (result.invitationPending)
+        console.log(`invitation pending for ${result.runnerUser}`);
+    console.log(`workspace: ${result.slug}`);
     console.log("saved and switched; configure another machine with:");
-    console.log(`hd init --url ${result.url} --api-key ${result.api_key} --slug ${result.workspace.slug}`);
+    console.log(result.initCommand);
 }
 function selectAgent(agents, target, provider) {
     const exact = agents.find((agent) => agent.id === target);

package/dist/tui/App.js

@@ -1,8 +1,10 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Static, Text, useApp, useInput, useStdout } from "ink";
+import { loadConfig } from "../config.js";
 import { epicProgressRows } from "../epics.js";
 import { launchArchitect } from "../plan.js";
+import { workspaceNew, workspaceRotateKey, workspaceSet } from "../workspace-commands.js";
 import { Banner } from "./Banner.js";
 import { Bubble } from "./Bubble.js";
 import { Cockpit, StreamPanel, boardTicketIds, nextCursor } from "./Dashboard.js";
@@ -165,10 +167,10 @@ export function App({ initial }) {
             setBusy(false);
         }
     }, [settings, config, refresh]);
-    const changeWorkspace = useCallback(async (slug) => {
+    const changeWorkspace = useCallback(async (slug, source = config) => {
         setBusy(true);
         try {
-            const snapshot = await switchWorkspace(slug, config);
+            const snapshot = await switchWorkspace(slug, source);
             loads.current.switchTo(snapshot.workspace.id);
             setConfig(snapshot.config);
             setWorkspace(snapshot.workspace);
@@ -188,7 +190,7 @@ export function App({ initial }) {
         finally {
             setBusy(false);
         }
-    }, [say]);
+    }, [config, say]);
     const askOrchestrator = useCallback(async (text) => {
         setBusy(true);
         const id = nextId();
@@ -298,6 +300,35 @@ export function App({ initial }) {
                     }
                 }
                 return;
+            case "workspace-command":
+                setBusy(true);
+                try {
+                    if (action.command === "new") {
+                        let created;
+                        await suspendTerminal(async () => { created = await workspaceNew(action.args); });
+                        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}`);
+                    }
+                    else if (action.command === "set") {
+                        const updated = await workspaceSet(action.args);
+                        say("system", `Updated ${updated.slug}: ${updated.name} (${updated.repo}).`);
+                        await refresh();
+                    }
+                    else {
+                        const rotated = await workspaceRotateKey();
+                        setConfig(loadConfig());
+                        say("system", `API key: ${rotated.apiKey}\nSaved locally. Update Mel's hd init configuration on the box.`);
+                    }
+                }
+                catch (error) {
+                    setNotice(error instanceof Error ? error.message : String(error));
+                }
+                finally {
+                    setBusy(false);
+                }
+                return;
             case "ticket":
                 setTicketKey(action.key);
                 setView("ticket");

package/dist/tui/Help.js

@@ -16,7 +16,7 @@ export const COMMANDS = [
     { name: "/decide", args: "2 | text", help: "answer the decision on screen" },
     { name: "/agents", args: "[add ... | rm ROLE|ID]", help: "view or manage agents" },
     { name: "/settings", help: "change provider caps and agent settings" },
-    { name: "/workspace", args: "[slug]", help: "switch workspace, or list the ones you can reach" },
+    { name: "/workspace", args: "[slug | new | set | rotate-key]", help: "list, switch, create, or configure" },
     { name: "/feed", help: "what just happened" },
     { name: "/orchestrator", help: "talk to the agent that gets work in flight finished" },
     { name: "/refresh", help: "reload the board now" },

package/dist/tui/parse.js

@@ -37,6 +37,10 @@ export function parseLine(raw) {
             return { kind: "help" };
         case "workspace":
         case "ws": {
+            const command = rest[0]?.toLowerCase();
+            if (command && ["new", "set", "rotate-key"].includes(command)) {
+                return { kind: "workspace-command", command: command, args: rest.slice(1) };
+            }
             return { kind: "workspace", slug: argument || null };
         }
         case "ticket":

package/dist/workspace-commands.js

@@ -0,0 +1,170 @@
+import { createInterface } from "node:readline/promises";
+import { createWorkspace, rotateWorkspaceApiKey, updateWorkspace } from "./api.js";
+import { loadConfig, writeHdConfig } from "./config.js";
+import { defaultGh, HDX_RUNNER_GH_USER, preflightWorkspace } from "./workspace-preflight.js";
+export const WORKSPACE_USAGE = "usage: hd workspace ls | new --name NAME --repo OWNER/NAME [--create|--no-create] [flags] | set [flags] | rotate-key";
+function flags(argv) {
+    const opts = {};
+    const bools = new Set();
+    const rest = [];
+    for (let i = 0; i < argv.length; i += 1) {
+        const arg = argv[i];
+        if (!arg.startsWith("--")) {
+            rest.push(arg);
+            continue;
+        }
+        const next = argv[i + 1];
+        if (next && !next.startsWith("-")) {
+            opts[arg.slice(2)] = next;
+            i += 1;
+        }
+        else
+            bools.add(arg.slice(2));
+    }
+    return { opts, bools, rest };
+}
+export function workspaceSlug(name) {
+    return name.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "workspace";
+}
+function yes(answer) {
+    return !["n", "no"].includes(answer.trim().toLowerCase());
+}
+function message(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+async function repoState(repo, gh) {
+    try {
+        const value = JSON.parse(await gh(["repo", "view", repo, "--json", "defaultBranchRef"]));
+        return { found: true, branch: value.defaultBranchRef?.name };
+    }
+    catch (error) {
+        if (/404|not found|could not resolve/i.test(message(error)))
+            return { found: false };
+        throw error;
+    }
+}
+function lazyPrompt(deps) {
+    let readline;
+    const ask = deps.prompt ?? (async (question) => {
+        readline ??= createInterface({ input: process.stdin, output: process.stdout });
+        return readline.question(question);
+    });
+    return { ask, close: () => readline?.close() };
+}
+async function askDefault(ask, label, fallback = "") {
+    const answer = (await ask(`${label}${fallback ? ` [${fallback}]` : ""}: `)).trim();
+    return answer || fallback;
+}
+export async function workspaceNew(argv, deps = {}) {
+    const { opts, bools, rest } = flags(argv);
+    if (rest.length || (bools.has("create") && bools.has("no-create")))
+        throw new Error(WORKSPACE_USAGE);
+    const interactive = deps.isTTY ?? Boolean(process.stdin.isTTY && process.stdout.isTTY);
+    const guided = !opts.name || !opts.repo;
+    if (guided && !interactive)
+        throw new Error(WORKSPACE_USAGE);
+    const gh = deps.gh ?? defaultGh;
+    const prompt = lazyPrompt(deps);
+    try {
+        let name = opts.name ?? "";
+        let repo = opts.repo ?? "";
+        let branch = opts.branch;
+        let host = opts.host ?? "box";
+        if (guided || interactive || bools.has("create") || bools.has("no-create")) {
+            try {
+                await gh(["--version"]);
+            }
+            catch {
+                throw new Error("GitHub CLI is unavailable. Install it if needed, then run `gh auth login`.");
+            }
+        }
+        if (guided) {
+            name = await askDefault(prompt.ask, "Name", name);
+            if (!name)
+                throw new Error("Name is required.");
+            let defaultRepo = repo;
+            if (!defaultRepo) {
+                const owner = (await gh(["api", "user", "--jq", ".login"])).trim();
+                defaultRepo = `${owner}/${workspaceSlug(name)}`;
+            }
+            repo = await askDefault(prompt.ask, "Repo", defaultRepo);
+            if (!repo)
+                throw new Error("Repo is required.");
+        }
+        let state;
+        if (guided || interactive || bools.has("create") || bools.has("no-create"))
+            state = await repoState(repo, gh);
+        if (state && !state.found) {
+            if (bools.has("no-create"))
+                throw new Error(`GitHub repository ${repo} does not exist and --no-create was set.`);
+            const create = bools.has("create") || (interactive && yes(await prompt.ask(`Create ${repo} as a private GitHub repo? [Y/n] `)));
+            if (!create)
+                throw new Error(`GitHub repository ${repo} was not created.`);
+            await gh(["repo", "create", repo, "--private"]);
+            state = { found: true, branch: "main" };
+        }
+        if (guided) {
+            branch = await askDefault(prompt.ask, "Branch", branch ?? state?.branch ?? "main");
+            host = await askDefault(prompt.ask, "Host", host);
+            const summary = `${name} | ${repo} | ${branch} | host ${host}`;
+            if (!yes(await prompt.ask(`Create ${summary}. Proceed? [Y/n] `)))
+                throw new Error("Workspace creation cancelled.");
+        }
+        const preflight = await (deps.preflightWorkspace ?? preflightWorkspace)({
+            name, repo, branch, noBootstrap: bools.has("no-bootstrap"),
+            runnerUser: opts["runner-user"] ?? HDX_RUNNER_GH_USER,
+        }, gh);
+        const result = await createWorkspace({ name, repo, slug: opts.slug,
+            default_branch: preflight.branch, default_host: host });
+        writeHdConfig({ url: result.url, api_key: result.api_key, slug: result.workspace.slug });
+        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}` };
+    }
+    finally {
+        prompt.close();
+    }
+}
+export async function workspaceSet(argv) {
+    const { opts, bools, rest } = flags(argv);
+    if (rest.length || bools.size)
+        throw new Error(WORKSPACE_USAGE);
+    const fields = {};
+    for (const [flag, field] of [["name", "name"], ["repo", "repo"], ["branch", "default_branch"], ["host", "default_host"]]) {
+        if (opts[flag])
+            fields[field] = opts[flag];
+    }
+    if (opts["auto-merge"]) {
+        if (!["on", "off"].includes(opts["auto-merge"]))
+            throw new Error("--auto-merge must be on or off");
+        fields.auto_merge = opts["auto-merge"] === "on";
+    }
+    if (opts["max-turns"]) {
+        const turns = {};
+        for (const entry of opts["max-turns"].split(",")) {
+            const [kind, raw, ...extra] = entry.split("=");
+            const value = Number(raw);
+            if (extra.length || !["build", "followup", "review", "orchestrate"].includes(kind)
+                || !Number.isInteger(value) || value < 1)
+                throw new Error("--max-turns must be KIND=N[,KIND=N...]");
+            turns[kind] = value;
+        }
+        fields.max_turns = turns;
+    }
+    if (opts["max-attempts"]) {
+        const value = Number(opts["max-attempts"]);
+        if (!Number.isInteger(value) || value < 1)
+            throw new Error("--max-attempts must be an integer >= 1");
+        fields.max_attempts = value;
+    }
+    if (!Object.keys(fields).length)
+        throw new Error(WORKSPACE_USAGE);
+    return (await updateWorkspace(fields)).workspace;
+}
+export async function workspaceRotateKey() {
+    const config = loadConfig();
+    const { api_key } = await rotateWorkspaceApiKey(config);
+    writeHdConfig({ ...config, api_key });
+    return { apiKey: api_key, slug: config.slug };
+}

package/dist/workspace-preflight.js

@@ -19,7 +19,7 @@ function errorMessage(error) {
     const value = error;
     return value.stderr?.trim() || value.message || String(error);
 }
-async function defaultGh(args) {
+export async function defaultGh(args) {
     try {
         return (await exec("gh", args, { encoding: "utf8", maxBuffer: 1024 * 1024 })).stdout;
     }

package/package.json

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