@moor-sh/cli 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moor-sh/cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Command-line interface for moor - manage your moor server's projects, logs, env vars, and container lifecycle.",
   "license": "MIT",
   "repository": {
@@ -17,16 +17,19 @@
   ],
   "type": "module",
   "bin": {
-    "moor": "src/index.ts"
+    "moor": "bin/moor.js"
   },
   "files": [
-    "src/"
+    "bin/",
+    "dist/"
   ],
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "dev": "bun run src/index.ts",
-    "build": "bun build src/index.ts --compile --outfile moor"
+    "build": "bun build src/index.ts --compile --outfile moor",
+    "build:package": "bun build src/index.ts --target bun --outfile dist/index.js",
+    "prepack": "bun run build:package"
   }
 }

package/src/client.ts

@@ -1,106 +0,0 @@
-function getConfig(): { baseUrl: string; apiKey: string } {
-  const baseUrl = process.env.MOOR_URL;
-  const apiKey = process.env.MOOR_API_KEY;
-  if (!baseUrl) {
-    console.error("Error: MOOR_URL is not set");
-    process.exit(1);
-  }
-  if (!apiKey) {
-    console.error("Error: MOOR_API_KEY is not set");
-    process.exit(1);
-  }
-  return { baseUrl: baseUrl.replace(/\/$/, ""), apiKey };
-}
-
-function headers(apiKey: string, json = false): Record<string, string> {
-  const h: Record<string, string> = { Authorization: `Bearer ${apiKey}` };
-  if (json) h["Content-Type"] = "application/json";
-  return h;
-}
-
-export async function apiGet(path: string): Promise<Response> {
-  const { baseUrl, apiKey } = getConfig();
-  return fetch(`${baseUrl}${path}`, { headers: headers(apiKey) });
-}
-
-export async function apiPost(path: string, body?: unknown): Promise<Response> {
-  const { baseUrl, apiKey } = getConfig();
-  return fetch(`${baseUrl}${path}`, {
-    method: "POST",
-    headers: headers(apiKey, body !== undefined),
-    body: body !== undefined ? JSON.stringify(body) : undefined,
-  });
-}
-
-export async function apiPut(path: string, body: unknown): Promise<Response> {
-  const { baseUrl, apiKey } = getConfig();
-  return fetch(`${baseUrl}${path}`, {
-    method: "PUT",
-    headers: headers(apiKey, true),
-    body: JSON.stringify(body),
-  });
-}
-
-type Project = {
-  id: number;
-  name: string;
-  status: string;
-  container_id: string | null;
-  image_tag: string | null;
-  domain: string | null;
-  docker_image: string | null;
-  github_url: string | null;
-};
-
-export async function resolveProject(nameOrId: string): Promise<Project> {
-  const res = await apiGet("/api/projects");
-  if (!res.ok) {
-    console.error(`Failed to list projects: ${res.status}`);
-    process.exit(1);
-  }
-  const projects = (await res.json()) as Project[];
-  const match = projects.find((p) => p.name === nameOrId || String(p.id) === nameOrId);
-  if (!match) {
-    console.error(`Project "${nameOrId}" not found`);
-    process.exit(1);
-  }
-  return match;
-}
-
-export async function streamSSE(
-  res: Response,
-  handlers: {
-    onLog?: (text: string) => void;
-    onError?: (text: string) => void;
-    onDone?: (text: string) => void;
-  },
-): Promise<void> {
-  const reader = res.body?.getReader();
-  if (!reader) throw new Error("No response body");
-
-  const decoder = new TextDecoder();
-  let buffer = "";
-  let currentEvent = "";
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-
-    const lines = buffer.split("\n");
-    buffer = lines.pop() || "";
-
-    for (const line of lines) {
-      if (line.startsWith("event: ")) {
-        currentEvent = line.slice(7).trim();
-      } else if (line.startsWith("data: ")) {
-        const data = JSON.parse(line.slice(6));
-        if (currentEvent === "log") handlers.onLog?.(data);
-        else if (currentEvent === "error") handlers.onError?.(data);
-        else if (currentEvent === "done") handlers.onDone?.(data);
-        currentEvent = "";
-      }
-      // Ignore keepalive comments starting with ":"
-    }
-  }
-}

package/src/commands/env.ts

@@ -1,97 +0,0 @@
-import { apiGet, apiPost, apiPut, resolveProject } from "../client";
-
-type EnvVar = { key: string; value: string };
-
-export async function envCommand(args: string[]) {
-  const subcommand = args[0];
-
-  if (subcommand === "list") return envList(args.slice(1));
-  if (subcommand === "set") return envSet(args.slice(1));
-
-  console.error("Usage: moor env <list|set> <project> [K=V ...]");
-  process.exit(1);
-}
-
-async function envList(args: string[]) {
-  const projectName = args[0];
-  if (!projectName) {
-    console.error("Usage: moor env list <project>");
-    process.exit(1);
-  }
-
-  const project = await resolveProject(projectName);
-  const res = await apiGet(`/api/projects/${project.id}/envs`);
-  if (!res.ok) {
-    console.error(`Failed: ${await res.text()}`);
-    process.exit(1);
-  }
-
-  const vars = (await res.json()) as EnvVar[];
-  if (vars.length === 0) {
-    console.log("No environment variables set.");
-    return;
-  }
-  for (const v of vars) {
-    console.log(`${v.key}=${v.value}`);
-  }
-}
-
-async function envSet(args: string[]) {
-  const projectName = args[0];
-  const pairs = args.slice(1);
-
-  if (!projectName || pairs.length === 0) {
-    console.error("Usage: moor env set <project> KEY=VALUE [KEY=VALUE ...]");
-    process.exit(1);
-  }
-
-  // Parse K=V pairs
-  const newVars: EnvVar[] = [];
-  for (const pair of pairs) {
-    const eq = pair.indexOf("=");
-    if (eq === -1) {
-      console.error(`Invalid format: "${pair}" (expected KEY=VALUE)`);
-      process.exit(1);
-    }
-    newVars.push({ key: pair.slice(0, eq), value: pair.slice(eq + 1) });
-  }
-
-  const project = await resolveProject(projectName);
-
-  // Fetch existing env vars and merge
-  const existingRes = await apiGet(`/api/projects/${project.id}/envs`);
-  if (!existingRes.ok) {
-    console.error(`Failed to get env vars: ${await existingRes.text()}`);
-    process.exit(1);
-  }
-  const existing = (await existingRes.json()) as EnvVar[];
-
-  // Merge: new values overwrite existing keys
-  const merged = new Map(existing.map((v) => [v.key, v.value]));
-  for (const v of newVars) {
-    merged.set(v.key, v.value);
-  }
-  const allVars = Array.from(merged, ([key, value]) => ({ key, value }));
-
-  const setRes = await apiPut(`/api/projects/${project.id}/envs`, allVars);
-  if (!setRes.ok) {
-    console.error(`Failed to set env vars: ${await setRes.text()}`);
-    process.exit(1);
-  }
-
-  for (const v of newVars) {
-    console.log(`Set ${v.key}`);
-  }
-
-  // Restart if container is running
-  if (project.status === "running") {
-    console.log(`Restarting ${project.name}...`);
-    await apiPost(`/api/projects/${project.id}/stop`);
-    const startRes = await apiPost(`/api/projects/${project.id}/start`);
-    if (!startRes.ok) {
-      console.error(`Warning: failed to restart: ${await startRes.text()}`);
-      process.exit(1);
-    }
-    console.log(`${project.name} restarted.`);
-  }
-}

package/src/commands/exec.ts

@@ -1,29 +0,0 @@
-import { apiPost, resolveProject } from "../client";
-
-export async function execCommand(args: string[]) {
-  const projectName = args[0];
-  const command = args.slice(1).join(" ");
-
-  if (!projectName || !command) {
-    console.error("Usage: moor exec <project> <command>");
-    process.exit(1);
-  }
-
-  const project = await resolveProject(projectName);
-  const res = await apiPost(`/api/projects/${project.id}/exec`, { command });
-
-  if (!res.ok) {
-    console.error(`Failed: ${await res.text()}`);
-    process.exit(1);
-  }
-
-  const result = (await res.json()) as {
-    exitCode: number;
-    stdout: string;
-    stderr: string;
-  };
-
-  if (result.stdout) process.stdout.write(result.stdout);
-  if (result.stderr) process.stderr.write(result.stderr);
-  process.exit(result.exitCode);
-}

package/src/commands/history.test.ts

@@ -1,37 +0,0 @@
-// #133: regression test for the history arg parser. The original took the
-// first non-flag token as the project, so `--hours 1 fipe-pg` silently used
-// the hours value ("1") as the project. Parsing must be order-independent.
-
-import { describe, expect, test } from "bun:test";
-import { parseHistoryArgs } from "./history";
-
-describe("parseHistoryArgs", () => {
-  test("project then flag", () => {
-    expect(parseHistoryArgs(["fipe-pg", "--hours", "1"])).toEqual({ project: "fipe-pg", hours: 1 });
-  });
-
-  test("flag then project (regression: was mis-parsed as project '1')", () => {
-    expect(parseHistoryArgs(["--hours", "1", "fipe-pg"])).toEqual({ project: "fipe-pg", hours: 1 });
-  });
-
-  test("--hours=N form", () => {
-    expect(parseHistoryArgs(["--hours=6", "fipe-pg"])).toEqual({ project: "fipe-pg", hours: 6 });
-  });
-
-  test("default hours is 24 when omitted", () => {
-    expect(parseHistoryArgs(["fipe-pg"])).toEqual({ project: "fipe-pg", hours: 24 });
-  });
-
-  test("missing project → error, no project", () => {
-    const r = parseHistoryArgs(["--hours", "1"]);
-    expect(r.project).toBeUndefined();
-    expect(r.error).toBeTruthy();
-  });
-
-  test("invalid hours → error", () => {
-    expect(parseHistoryArgs(["fipe-pg", "--hours", "0"]).error).toBeTruthy();
-    expect(parseHistoryArgs(["fipe-pg", "--hours", "-3"]).error).toBeTruthy();
-    expect(parseHistoryArgs(["fipe-pg", "--hours", "abc"]).error).toBeTruthy();
-    expect(parseHistoryArgs(["fipe-pg", "--hours"]).error).toBeTruthy(); // no value
-  });
-});

package/src/commands/history.ts

@@ -1,117 +0,0 @@
-import { apiGet, resolveProject } from "../client";
-
-type HistoryResponse = {
-  from_ms: number;
-  to_ms: number;
-  events: Array<{ occurred_at_ms: number; source: string; action: string }>;
-  summary: {
-    sample_count: number;
-    running_sample_count: number;
-    cpu_percent_avg: number | null;
-    cpu_percent_max: number | null;
-    mem_bytes_max: number | null;
-    net_rx_bytes_total: number;
-    net_tx_bytes_total: number;
-    event_counts: Record<string, number>;
-    has_gap: boolean;
-  };
-};
-
-function formatBytes(bytes: number): string {
-  if (!Number.isFinite(bytes) || bytes <= 0) return "0 B";
-  const units = ["B", "KB", "MB", "GB", "TB"];
-  const i = Math.min(units.length - 1, Math.floor(Math.log(bytes) / Math.log(1024)));
-  const val = bytes / 1024 ** i;
-  return `${val.toFixed(val < 10 ? 1 : 0)} ${units[i]}`;
-}
-
-// Parse `<project> [--hours N]` in any order. Critically, `--hours`'s value is
-// consumed as the flag's argument, not mistaken for the project — so both
-// `history p --hours 1` and `history --hours 1 p` resolve `p` (the old
-// first-non-flag-token approach silently took the hours value as the project).
-// Also accepts `--hours=N`. Pure + exported for tests.
-export function parseHistoryArgs(args: string[]): {
-  project?: string;
-  hours: number;
-  error?: string;
-} {
-  let project: string | undefined;
-  let hours = 24;
-  for (let i = 0; i < args.length; i++) {
-    const a = args[i];
-    if (a === "--hours") {
-      const n = Number(args[++i]); // consume the next token as the value
-      if (!Number.isFinite(n) || n <= 0)
-        return { hours, error: "--hours must be a positive number" };
-      hours = n;
-    } else if (a.startsWith("--hours=")) {
-      const n = Number(a.slice("--hours=".length));
-      if (!Number.isFinite(n) || n <= 0)
-        return { hours, error: "--hours must be a positive number" };
-      hours = n;
-    } else if (!a.startsWith("-") && project === undefined) {
-      project = a;
-    }
-    // other flags / extra positionals are ignored
-  }
-  if (!project) return { hours, error: "missing project" };
-  return { project, hours };
-}
-
-// Stored resource history + lifecycle events for one project (not live — use
-// `moor stats` for the host snapshot). Mirrors the moor_project_history MCP
-// tool: a window summary plus recent events.
-export async function historyCommand(args: string[]) {
-  const parsed = parseHistoryArgs(args);
-  if (parsed.error || !parsed.project) {
-    console.error(
-      parsed.error && parsed.error !== "missing project"
-        ? parsed.error
-        : "Usage: moor history <project> [--hours N]",
-    );
-    process.exit(1);
-  }
-
-  const project = await resolveProject(parsed.project);
-  const to = Date.now();
-  const from = to - parsed.hours * 3_600_000;
-  const res = await apiGet(`/api/projects/${project.id}/stats/history?from=${from}&to=${to}`);
-  if (!res.ok) {
-    console.error(`Failed to get history: ${res.status} ${await res.text()}`);
-    process.exit(1);
-  }
-
-  const h = (await res.json()) as HistoryResponse;
-  const s = h.summary;
-  const windowH = Math.round(((h.to_ms - h.from_ms) / 3_600_000) * 10) / 10;
-
-  console.log(`${project.name} — history over ~${windowH}h`);
-  if (s.has_gap) {
-    console.log("  \x1b[33m⚠ event gap recorded: events may be incomplete\x1b[0m");
-  }
-  console.log(`  Samples:   ${s.sample_count} total, ${s.running_sample_count} running`);
-  console.log(
-    `  CPU:       avg ${s.cpu_percent_avg ?? "n/a"}% / max ${s.cpu_percent_max ?? "n/a"}%`,
-  );
-  console.log(
-    `  Memory:    max ${s.mem_bytes_max !== null ? formatBytes(s.mem_bytes_max) : "n/a"}`,
-  );
-  console.log(
-    `  Network:   in ${formatBytes(s.net_rx_bytes_total)} / out ${formatBytes(s.net_tx_bytes_total)}`,
-  );
-  const counts = Object.entries(s.event_counts);
-  if (counts.length > 0) {
-    console.log(`  Events:    ${counts.map(([a, n]) => `${a} ${n}`).join(", ")}`);
-  }
-
-  const recent = h.events.slice(-10);
-  if (recent.length > 0) {
-    console.log("\nRecent events:");
-    for (const e of recent) {
-      console.log(`  ${new Date(e.occurred_at_ms).toISOString()}  ${e.action}  (${e.source})`);
-    }
-  }
-  if (s.sample_count === 0 && h.events.length === 0) {
-    console.log("  (no stored history in this window)");
-  }
-}

package/src/commands/logs.ts

@@ -1,62 +0,0 @@
-import { apiGet, resolveProject } from "../client";
-
-export async function logsCommand(args: string[]) {
-  let follow = false;
-  let tail = 100;
-  let projectName: string | undefined;
-
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "-f" || args[i] === "--follow") {
-      follow = true;
-    } else if (args[i] === "-n" || args[i] === "--lines") {
-      tail = Number(args[++i]);
-    } else if (!projectName) {
-      projectName = args[i];
-    }
-  }
-
-  if (!projectName) {
-    console.error("Usage: moor logs <project> [-f] [-n <lines>]");
-    process.exit(1);
-  }
-
-  const project = await resolveProject(projectName);
-
-  // Initial fetch with tail
-  const res = await apiGet(`/api/projects/${project.id}/logs?tail=${tail}`);
-  if (!res.ok) {
-    console.error(`Failed to get logs: ${res.status}`);
-    process.exit(1);
-  }
-
-  const data = (await res.json()) as { logs: string; lastTimestamp: number };
-  if (data.logs) process.stdout.write(data.logs);
-
-  if (!follow) return;
-
-  // Poll for new logs
-  let since = data.lastTimestamp;
-  const poll = async () => {
-    try {
-      const res = await apiGet(`/api/projects/${project.id}/logs?since=${since}`);
-      if (!res.ok) return;
-      const data = (await res.json()) as { logs: string; lastTimestamp: number };
-      if (data.logs?.trim()) {
-        process.stdout.write(data.logs);
-        since = data.lastTimestamp;
-      }
-    } catch {
-      // Connection error, keep polling
-    }
-  };
-
-  const interval = setInterval(poll, 2000);
-
-  process.on("SIGINT", () => {
-    clearInterval(interval);
-    process.exit(0);
-  });
-
-  // Keep the process alive
-  await new Promise(() => {});
-}

package/src/commands/mcp.ts

@@ -1,136 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-
-type Client = "claude" | "codex";
-
-const CLIENT_ALIASES: Record<string, Client> = {
-  claude: "claude",
-  "claude-code": "claude",
-  codex: "codex",
-};
-
-const DEFAULT_URL = "http://127.0.0.1:8080";
-const PLACEHOLDER_KEY = "<your-api-key>";
-
-/** Parse cwd's .env conservatively. Skips blank/comment lines, strips one
- *  matching pair of surrounding quotes, does not interpolate or expand. */
-function parseDotEnv(path: string): Record<string, string> {
-  if (!existsSync(path)) return {};
-  const content = readFileSync(path, "utf8");
-  const env: Record<string, string> = {};
-  for (const rawLine of content.split("\n")) {
-    const line = rawLine.trim();
-    if (!line || line.startsWith("#")) continue;
-    const eq = line.indexOf("=");
-    if (eq === -1) continue;
-    const key = line.slice(0, eq).trim();
-    let value = line.slice(eq + 1).trim();
-    if (
-      value.length >= 2 &&
-      ((value.startsWith('"') && value.endsWith('"')) ||
-        (value.startsWith("'") && value.endsWith("'")))
-    ) {
-      value = value.slice(1, -1);
-    }
-    env[key] = value;
-  }
-  return env;
-}
-
-function resolveApiKey(flagValue: string | undefined): string {
-  if (flagValue) return flagValue;
-  if (process.env.MOOR_API_KEY) return process.env.MOOR_API_KEY;
-  const dotenv = parseDotEnv(join(process.cwd(), ".env"));
-  if (dotenv.MOOR_API_KEY) return dotenv.MOOR_API_KEY;
-  return PLACEHOLDER_KEY;
-}
-
-function configFor(client: Client, url: string, apiKey: string): string {
-  if (client === "claude") {
-    return JSON.stringify(
-      {
-        mcpServers: {
-          moor: {
-            command: "bunx",
-            args: ["@moor-sh/mcp"],
-            env: { MOOR_URL: url, MOOR_API_KEY: apiKey },
-          },
-        },
-      },
-      null,
-      2,
-    );
-  }
-  // codex TOML. TOML basic-string escape rules (" and \) are a subset of
-  // JSON's, so JSON.stringify produces a valid quoted TOML string for any
-  // value - including URLs/keys that contain quotes or backslashes.
-  return [
-    "[mcp_servers.moor]",
-    'command = "bunx"',
-    'args = ["@moor-sh/mcp"]',
-    "",
-    "[mcp_servers.moor.env]",
-    `MOOR_URL = ${JSON.stringify(url)}`,
-    `MOOR_API_KEY = ${JSON.stringify(apiKey)}`,
-  ].join("\n");
-}
-
-function parseFlags(args: string[]): { client?: string; url?: string; apiKey?: string } {
-  const flags: { client?: string; url?: string; apiKey?: string } = {};
-  for (let i = 0; i < args.length; i++) {
-    const a = args[i];
-    if (a === "--client" && i + 1 < args.length) flags.client = args[++i];
-    else if (a === "--url" && i + 1 < args.length) flags.url = args[++i];
-    else if (a === "--api-key" && i + 1 < args.length) flags.apiKey = args[++i];
-  }
-  return flags;
-}
-
-function printHelp() {
-  console.log(`moor mcp config - Generate MCP client config snippet for moor
-
-Usage: moor mcp config --client <name> [--url <url>] [--api-key <key>]
-
-Required:
-  --client <name>     One of: claude, claude-code, codex
-
-Optional:
-  --url <url>         moor URL the MCP server should reach (default: ${DEFAULT_URL})
-  --api-key <key>     bearer token. Falls back to MOOR_API_KEY env, then
-                      cwd's .env, then a placeholder.
-
-Output is printed to stdout for you to paste into your client's config file:
-  Claude Code:  ~/.claude.json
-  Codex:        ~/.codex/config.toml`);
-}
-
-export function mcpCommand(args: string[]) {
-  const subcommand = args[0];
-
-  if (subcommand === "--help" || subcommand === "-h" || subcommand === "help" || !subcommand) {
-    printHelp();
-    return;
-  }
-
-  if (subcommand !== "config") {
-    console.error(`Unknown mcp subcommand: ${subcommand}\n`);
-    printHelp();
-    process.exit(1);
-  }
-
-  const flags = parseFlags(args.slice(1));
-  if (!flags.client) {
-    console.error("moor mcp config requires --client <claude|claude-code|codex>\n");
-    printHelp();
-    process.exit(1);
-  }
-  const client = CLIENT_ALIASES[flags.client];
-  if (!client) {
-    console.error(`Unknown client: ${flags.client}. Expected one of: claude, claude-code, codex`);
-    process.exit(1);
-  }
-
-  const url = flags.url || DEFAULT_URL;
-  const apiKey = resolveApiKey(flags.apiKey);
-  console.log(configFor(client, url, apiKey));
-}

package/src/commands/rebuild.ts

@@ -1,40 +0,0 @@
-import { apiPost, resolveProject, streamSSE } from "../client";
-
-export async function rebuildCommand(args: string[]) {
-  let noCache = false;
-  let projectName: string | undefined;
-
-  for (const arg of args) {
-    if (arg === "--no-cache") noCache = true;
-    else if (!projectName) projectName = arg;
-  }
-
-  if (!projectName) {
-    console.error("Usage: moor rebuild <project> [--no-cache]");
-    process.exit(1);
-  }
-
-  const project = await resolveProject(projectName);
-  const query = noCache ? "?nocache=true" : "";
-
-  console.log(`Rebuilding ${project.name}...`);
-  const res = await apiPost(`/api/projects/${project.id}/run${query}`);
-
-  if (!res.ok && res.headers.get("content-type")?.includes("text/event-stream") === false) {
-    const body = await res.text();
-    console.error(`Failed: ${body}`);
-    process.exit(1);
-  }
-
-  let failed = false;
-  await streamSSE(res, {
-    onLog: (text) => process.stdout.write(text),
-    onError: (text) => {
-      process.stderr.write(`Error: ${text}\n`);
-      failed = true;
-    },
-    onDone: (text) => console.log(text),
-  });
-
-  process.exit(failed ? 1 : 0);
-}

package/src/commands/restart.ts

@@ -1,27 +0,0 @@
-import { apiPost, resolveProject } from "../client";
-
-export async function restartCommand(args: string[]) {
-  const projectName = args[0];
-  if (!projectName) {
-    console.error("Usage: moor restart <project>");
-    process.exit(1);
-  }
-
-  const project = await resolveProject(projectName);
-
-  console.log(`Stopping ${project.name}...`);
-  const stopRes = await apiPost(`/api/projects/${project.id}/stop`);
-  if (!stopRes.ok) {
-    console.error(`Failed to stop: ${await stopRes.text()}`);
-    process.exit(1);
-  }
-
-  console.log(`Starting ${project.name}...`);
-  const startRes = await apiPost(`/api/projects/${project.id}/start`);
-  if (!startRes.ok) {
-    console.error(`Failed to start: ${await startRes.text()}`);
-    process.exit(1);
-  }
-
-  console.log(`${project.name} restarted.`);
-}