@cydm/happy-elves 0.1.0-beta.6 → 0.1.0-beta.61

package/README.md

@@ -11,5 +11,7 @@ happy-elves account create --relay https://relay.happyelves.ai --device-name "CL
 ## Self-host relay
 
 ```bash
+HAPPY_ELVES_ENV=production \
+HAPPY_ELVES_ALLOWED_ORIGINS=https://your-controller.example \
 happy-elves relay serve --host 0.0.0.0 --port 8787 --json
 ```

package/apps/cli/dist/commands/account.js

@@ -27,6 +27,7 @@ export async function handleAccount({ domain, action, flags }) {
             accountId: paired.accountId,
             configPath,
             relayUrl,
+            deviceId,
             controllerToken: paired.controllerToken,
             accountSecret,
             pairingCode: paired.pairingCode,
@@ -48,4 +49,3 @@ export async function handleAccount({ domain, action, flags }) {
     }
     return false;
 }
-//# sourceMappingURL=account.js.map

package/apps/cli/dist/commands/app.js

@@ -1,19 +1,20 @@
+import fs from "node:fs";
+import path from "node:path";
 import { handleAccount } from "./account.js";
-import { handleCancel } from "./cancel.js";
 import { handleCollect } from "./collect.js";
 import { handleConfig } from "./config.js";
 import { handleDaemon } from "./daemon.js";
+import { handleGateway } from "./gateway.js";
 import { handleLoop } from "./loop.js";
 import { handleMachine } from "./machine.js";
+import { handleOrchestrator } from "./orchestrator.js";
 import { handleRelay } from "./relay.js";
 import { handleRemote } from "./remote.js";
-import { handleResult } from "./result.js";
-import { handleRun } from "./run.js";
 import { handleSession } from "./session.js";
+import { handleSkill } from "./skill.js";
 import { handleToken } from "./token.js";
-import { handleWait } from "./wait.js";
-import { handleWorkspace } from "./workspace.js";
-import { handleCliError, parseCliFlags, startBootstrap, topLevelDoctor, topLevelStatus, usage, usageText } from "./lib/index.js";
+import { handleTurn } from "./turn.js";
+import { commandUsage, commandUsageText, handleCliError, parseCliFlags, skillText, startBootstrap, topLevelDoctor, topLevelStatus, usage, usageText } from "./lib/index.js";
 export { handleCliError };
 const domainHandlers = [
     handleAccount,
@@ -24,23 +25,36 @@ const domainHandlers = [
     handleDaemon,
     handleRelay,
     handleMachine,
-    handleWorkspace,
+    handleGateway,
+    handleOrchestrator,
     handleSession,
-    handleRun,
-    handleResult,
-    handleWait,
+    handleSkill,
+    handleTurn,
     handleCollect,
-    handleCancel,
 ];
 export async function main() {
-    const argv = process.argv.slice(2);
+    const rawArgv = process.argv.slice(2);
+    const argv = rawArgv[0] === "--" ? rawArgv.slice(1) : rawArgv;
     const [domain] = argv;
     if (!domain)
         usage();
+    if (domain === "--skill") {
+        console.log(skillText());
+        return;
+    }
     if (domain === "--help" || domain === "-h" || domain === "help") {
         console.log(usageText());
         return;
     }
+    if (domain === "--version" || domain === "-v" || domain === "version") {
+        console.log(cliVersion());
+        return;
+    }
+    const topLevelHelpRequested = argv[1] === "help" || argv.slice(1).some((arg) => arg === "--help" || arg === "-h");
+    if (topLevelHelpRequested && commandUsageText(domain)) {
+        console.log(commandUsageText(domain));
+        return;
+    }
     if (domain === "start") {
         const { flags } = parseCliFlags(argv.slice(1));
         await startBootstrap(flags);
@@ -56,8 +70,16 @@ export async function main() {
         await topLevelStatus(flags);
         return;
     }
-    const [, action, ...rest] = argv;
+    const action = argv[1];
+    const rest = argv.slice(2);
+    if ((!action || action.startsWith("-")) && commandUsageText(domain)) {
+        commandUsage(domain);
+    }
     const { positional, flags } = parseCliFlags(rest);
+    if (action === "--help" || action === "-h" || action === "help" || flags.help === true || flags.h === true) {
+        console.log(commandUsageText(domain) ?? usageText());
+        return;
+    }
     const input = { domain, action, positional, flags };
     for (const handle of domainHandlers) {
         if (await handle(input))
@@ -65,4 +87,20 @@ export async function main() {
     }
     usage();
 }
-//# sourceMappingURL=app.js.map
+function cliVersion() {
+    for (const candidate of [
+        path.resolve(import.meta.dirname, "..", "..", "..", "..", "package.json"),
+        path.resolve(import.meta.dirname, "..", "..", "..", "package.json"),
+        path.resolve(import.meta.dirname, "..", "..", "package.json"),
+    ]) {
+        try {
+            const parsed = JSON.parse(fs.readFileSync(candidate, "utf8"));
+            if (typeof parsed.version === "string" && parsed.version.trim())
+                return parsed.version.trim();
+        }
+        catch {
+            // Try the next packaged/source layout.
+        }
+    }
+    return "0.1.0";
+}

package/apps/cli/dist/commands/collect.js

@@ -1,4 +1,4 @@
-import { CliError, ControllerClient, ok, parseEventCursor, printConciseEvents, readConfig, requirePositional, wantsJson, wantsVerbose } from "./lib/index.js";
+import { CliError, ControllerClient, conciseEvents, ok, parseEventCursor, printConciseEvents, readConfig, requirePositional, wantsJson, wantsVerbose } from "./lib/index.js";
 export async function handleCollect({ domain, action, flags }) {
     if (domain !== "collect")
         return false;
@@ -14,7 +14,13 @@ export async function handleCollect({ domain, action, flags }) {
     const lastEventId = events.at(-1)?.id;
     const nextSince = lastEventId === undefined ? (since ?? null) : `cursor_${lastEventId}`;
     if (wantsJson(flags) || wantsVerbose(flags)) {
-        ok("session.collect", { sessionId, cursor: nextSince, nextSince, events }, { sessionId });
+        ok("session.collect", {
+            sessionId,
+            debugOnly: true,
+            cursor: nextSince,
+            nextSince,
+            ...(wantsVerbose(flags) ? { events } : { events: conciseEvents(events) }),
+        }, { sessionId });
     }
     else {
         printConciseEvents(events);
@@ -22,4 +28,3 @@ export async function handleCollect({ domain, action, flags }) {
     }
     return true;
 }
-//# sourceMappingURL=collect.js.map

package/apps/cli/dist/commands/command.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=command.js.map

package/apps/cli/dist/commands/config.js

@@ -1,4 +1,4 @@
-import { configPath, ok, readConfig, redactedControllerConfig, requireRelayUrl, requireString, writeConfig } from "./lib/index.js";
+import { configPath, ok, readConfig, redactedControllerConfig, redactedRelayUrl, requireRelayUrl, requireString, wantsJson, writeConfig } from "./lib/index.js";
 export async function handleConfig({ domain, action, flags }) {
     if (domain === "config" && action === "init") {
         const config = {
@@ -7,11 +7,19 @@ export async function handleConfig({ domain, action, flags }) {
             accountSecret: requireString(flags, "secret"),
         };
         await writeConfig(config);
-        ok("config.init", { path: configPath, relayUrl: config.relayUrl });
+        ok("config.init", { path: configPath, relayUrl: redactedRelayUrl(config.relayUrl) });
         return true;
     }
     if (domain === "config" && action === "show") {
         const config = await readConfig(flags);
+        if (!wantsJson(flags)) {
+            const redacted = redactedControllerConfig(config);
+            console.log(`Config: ${configPath}`);
+            console.log(`Relay: ${redacted.relayUrl}`);
+            console.log(`Controller token: ${redacted.hasControllerToken ? "configured" : "missing"}`);
+            console.log(`Account secret: ${redacted.hasAccountSecret ? "configured" : "missing"}`);
+            return true;
+        }
         ok("config.show", {
             path: configPath,
             config: redactedControllerConfig(config),
@@ -20,4 +28,3 @@ export async function handleConfig({ domain, action, flags }) {
     }
     return false;
 }
-//# sourceMappingURL=config.js.map

package/apps/cli/dist/commands/daemon.js

@@ -1,6 +1,6 @@
 import os from "node:os";
 import path from "node:path";
-import { CliError, ControllerClient, configDir, configPath, daemonPidPath, deriveOrchestration, idleSessionStatuses, localDaemonStatus, ok, parsePairingClaimResponse, randomId, readConfig, readDaemonConfig, readLocalAuditLog, readRelayJson, redactedDaemonConfig, requirePositional, requireRelayUrl, requireString, showMachine, spawnDaemonStart, stopLocalDaemon, throwRelayHttpError, writeDaemonConfig } from "./lib/index.js";
+import { CliError, compactText, ControllerClient, configDir, configPath, daemonPidPath, deriveOrchestration, idleSessionStatuses, localDaemonStatus, ok, parsePairingClaimResponse, randomId, readConfig, readDaemonConfig, readLocalAuditLog, readRelayJson, redactedDaemonConfig, requirePositional, requireRelayUrl, requireString, showMachine, spawnDaemonStart, stopLocalDaemon, throwRelayHttpError, wantsJson, writeDaemonConfig } from "./lib/index.js";
 export async function handleDaemon({ domain, action, flags }) {
     if (domain === "daemon" && action === "pair") {
         const relayUrl = requireRelayUrl(flags);
@@ -51,14 +51,32 @@ export async function handleDaemon({ domain, action, flags }) {
                 checks.push({ name: "relay", ok: false, message: error instanceof Error ? error.message : String(error) });
             }
         }
-        ok("daemon.doctor", { ok: checks.every((check) => check.ok), checks });
+        const data = { ok: checks.every((check) => check.ok), checks };
+        if (!wantsJson(flags)) {
+            console.log(`Daemon doctor: ${data.ok ? "ok" : "issues found"}`);
+            for (const check of checks) {
+                console.log(`${check.ok ? "ok" : "fail"} ${check.name}: ${check.message}`);
+            }
+            return true;
+        }
+        ok("daemon.doctor", data);
         return true;
     }
     if (domain === "daemon" && action === "config") {
         const daemonConfig = await readDaemonConfig();
+        const redacted = redactedDaemonConfig(daemonConfig);
+        if (!wantsJson(flags)) {
+            console.log(`Config: ${path.join(configDir, "daemon.json")}`);
+            console.log(`Relay: ${redacted.relayUrl}`);
+            console.log(`Account: ${redacted.accountId}`);
+            console.log(`Machine: ${redacted.machineName} (${redacted.machineId})`);
+            console.log(`Machine token: ${redacted.hasMachineToken ? "configured" : "missing"}`);
+            console.log(`Account secret: ${redacted.hasAccountSecret ? "configured" : "missing"}`);
+            return true;
+        }
         ok("daemon.config", {
             path: path.join(configDir, "daemon.json"),
-            config: redactedDaemonConfig(daemonConfig),
+            config: redacted,
         });
         return true;
     }
@@ -67,9 +85,29 @@ export async function handleDaemon({ domain, action, flags }) {
         if (!Number.isInteger(tail) || tail <= 0) {
             throw new CliError(`Invalid --tail: ${flags.tail}`, "INVALID_ARGUMENT");
         }
+        const entries = await readLocalAuditLog(tail);
+        if (!wantsJson(flags)) {
+            if (entries.length === 0) {
+                console.log("No daemon audit log entries.");
+                return true;
+            }
+            for (const entry of entries) {
+                const record = entry;
+                const createdAt = typeof record.createdAt === "string" ? record.createdAt : "-";
+                const action = typeof record.action === "string" ? record.action : "unknown";
+                const actor = typeof record.actor === "string" ? record.actor : "unknown";
+                const sessionId = typeof record.sessionId === "string" ? record.sessionId : undefined;
+                const summary = typeof record.summary === "string" ? record.summary : JSON.stringify(record);
+                console.log(`${createdAt}  ${action}  ${actor}`);
+                if (sessionId)
+                    console.log(`  session: ${sessionId}`);
+                console.log(`  ${compactText(summary, 160)}`);
+            }
+            return true;
+        }
         ok("daemon.logs", {
             path: path.join(configDir, "audit.jsonl"),
-            entries: await readLocalAuditLog(tail),
+            entries,
         });
         return true;
     }
@@ -98,7 +136,13 @@ export async function handleDaemon({ domain, action, flags }) {
         return true;
     }
     if (domain === "daemon" && action === "status" && flags.local === true) {
-        ok("daemon.status", { local: await localDaemonStatus() });
+        const local = await localDaemonStatus();
+        if (!wantsJson(flags)) {
+            console.log(local.running ? `Daemon: running${local.pid ? ` pid ${local.pid}` : ""}` : "Daemon: stopped");
+            console.log(`Pid file: ${local.pidPath}`);
+            return true;
+        }
+        ok("daemon.status", { local });
         return true;
     }
     if (domain === "daemon" && action === "status") {
@@ -125,7 +169,7 @@ export async function handleDaemon({ domain, action, flags }) {
             updatedAt: session.updatedAt,
             capabilities: session.capabilities,
         })));
-        ok("daemon.status", {
+        const data = {
             configPath,
             local,
             relayUrl: config.relayUrl,
@@ -155,9 +199,20 @@ export async function handleDaemon({ domain, action, flags }) {
                 completedSessionCount: projectedSessions.filter((session) => session.orchestration.completed).length,
                 needsUserSessionCount: projectedSessions.filter((session) => session.orchestration.needsUser).length,
             },
-        }, machineFilter ? { machineId: machineFilter } : {});
+        };
+        if (!wantsJson(flags)) {
+            console.log(`Relay: ${data.relayUrl} ${data.relayReachable ? "ok" : "unreachable"}`);
+            console.log(data.local.running ? `Local daemon: running${data.local.pid ? ` pid ${data.local.pid}` : ""}` : "Local daemon: stopped");
+            console.log(`Machines: ${data.summary.onlineMachineCount}/${data.summary.machineCount} online`);
+            console.log(`Sessions: ${data.summary.sessionCount} total, ${data.summary.runningSessionCount} running, ${data.summary.needsUserSessionCount} needs user`);
+            for (const machine of data.machines) {
+                console.log(`- ${machine.name} (${machine.machineId}) ${machine.online ? "online" : "offline"}`);
+                console.log(`  cwd: ${machine.defaultCwd ?? "-"}`);
+            }
+            return true;
+        }
+        ok("daemon.status", data, machineFilter ? { machineId: machineFilter } : {});
         return true;
     }
     return false;
 }
-//# sourceMappingURL=daemon.js.map

package/apps/cli/dist/commands/gateway.d.ts

@@ -0,0 +1,2 @@
+import type { CommandInput } from "./command.js";
+export declare function handleGateway({ domain, action, positional, flags }: CommandInput): Promise<boolean>;