nolo-cli 0.1.22 → 0.1.26

package/index.ts

@@ -1,54 +1,37 @@
 #!/usr/bin/env bun
-
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-import { renderHelpText, resolveCommand } from "./commandRegistry";
-import { runLoginCommand, runLogoutCommand, runWhoamiCommand } from "./authCommands";
+
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
 import {
-  runAgentBindCurrentCommand,
-  runAgentReadCommand,
-  runAgentRuntimeDoctorCommand,
-  runAgentSmokeCurrentCommand,
-  runDoctorRuntimeCommand,
-} from "./agentRuntimeCommands";
-import { runAgentRunCommand } from "./agentRunCommand";
-import { runAgentPullCommand } from "./agentPullCommand";
+  createCliRuntimeContext,
+  looksLikeDaemonShortcut,
+  renderHelpText,
+  resolveCommand,
+  runResolvedCommand,
+} from "./commandRegistry";
 import { buildEnvFromProfile, loadProfileConfig } from "./client/profileConfig";
 import { resolveTuiLaunchMode } from "./runtimeModeArgs";
-import {
-  runMachineConnectCommand,
-  runMachineStatusCommand,
-} from "./machineCommands";
-import { runTaskRunCommand } from "./taskRunCommand";
-import { runTableQueryCommand } from "./tableCommands";
-import { startTuiWorkspace } from "./tui/readlineWorkspace";
-import {
-  buildCliDoctorText,
-  buildCliVersionText,
-  readPackageInfo,
-  runSelfUpdate,
-} from "./updateCommands";
-import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
-
-const CLI_DIR = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = join(CLI_DIR, "..", "..");
-const SCRIPT_DIR = join(ROOT_DIR, "scripts");
-const packageInfo = readPackageInfo();
-
-async function runScript(script: string, forwardedArgs: string[], env: NodeJS.ProcessEnv) {
-  const scriptPath = join(SCRIPT_DIR, script);
-  const proc = Bun.spawn({
-    cmd: [process.execPath, scriptPath, ...forwardedArgs],
-    stdin: "inherit",
-    stdout: "inherit",
-    stderr: "inherit",
-    env,
-  });
-  const exitCode = await proc.exited;
-  process.exit(exitCode);
-}
-
+import { startTuiWorkspace } from "./tui/readlineWorkspace";
+import { readPackageInfo } from "./updateCommands";
+
+const CLI_DIR = dirname(fileURLToPath(import.meta.url));
+const ROOT_DIR = join(CLI_DIR, "..", "..");
+const SCRIPT_DIR = join(ROOT_DIR, "scripts");
+const packageInfo = readPackageInfo();
+
+async function runScript(script: string, forwardedArgs: string[], env: NodeJS.ProcessEnv) {
+  const scriptPath = join(SCRIPT_DIR, script);
+  const proc = Bun.spawn({
+    cmd: [process.execPath, scriptPath, ...forwardedArgs],
+    stdin: "inherit",
+    stdout: "inherit",
+    stderr: "inherit",
+    env,
+  });
+  return proc.exited;
+}
+
 const args = process.argv.slice(2);
 const profileEnv = buildEnvFromProfile(loadProfileConfig());
 const explicitServerUrl = process.env.NOLO_SERVER || process.env.NOLO_SERVER_URL || process.env.BASE_URL;
@@ -58,35 +41,23 @@ const runtimeEnv = {
   ...(explicitServerUrl ? { NOLO_SERVER: explicitServerUrl, BASE_URL: explicitServerUrl } : {}),
   NOLO_CLI_VERSION: packageInfo.version,
 };
-
-function readOption(args: string[], flag: string) {
-  const index = args.indexOf(flag);
-  return index >= 0 ? args[index + 1] : undefined;
-}
-
-function buildDaemonEnv(args: string[]) {
-  const serverUrl = readOption(args, "--server-url") || readOption(args, "--server");
-  const apiKey = readOption(args, "--api-key") || readOption(args, "--token");
-  return {
-    ...runtimeEnv,
-    ...(serverUrl ? { NOLO_SERVER: serverUrl } : {}),
-    ...(apiKey ? { AUTH_TOKEN: apiKey } : {}),
-  };
-}
-
-function looksLikeDaemonShortcut(args: string[]) {
-  return args.includes("--server-url") || args.includes("--api-key");
-}
-
-if (args.length === 0) {
-  if (process.stdin.isTTY) {
-    await startTuiWorkspace({ scriptDir: SCRIPT_DIR, env: runtimeEnv });
-  } else {
-    console.log(renderHelpText());
-  }
-  process.exit(0);
-}
-
+
+const runtimeContext = createCliRuntimeContext({
+  env: runtimeEnv,
+  scriptDir: SCRIPT_DIR,
+  entrypointPath: fileURLToPath(import.meta.url),
+  packageInfo,
+});
+
+if (args.length === 0) {
+  if (process.stdin.isTTY) {
+    await startTuiWorkspace({ scriptDir: SCRIPT_DIR, env: runtimeEnv });
+  } else {
+    console.log(renderHelpText());
+  }
+  process.exit(0);
+}
+
 const tuiLaunchMode = resolveTuiLaunchMode(args);
 if (tuiLaunchMode.shouldStartTui) {
   await startTuiWorkspace({
@@ -95,125 +66,17 @@ if (tuiLaunchMode.shouldStartTui) {
   });
   process.exit(0);
 }
-
-if (args[0] === "login") {
-  process.exit(await runLoginCommand(args.slice(1)));
-}
-
-if (args[0] === "whoami") {
-  process.exit(runWhoamiCommand());
-}
-
-if (args[0] === "logout") {
-  process.exit(runLogoutCommand());
-}
-
-if (args[0] === "connect") {
-  process.exit(await runMachineConnectCommand(args.slice(1), {
-    env: runtimeEnv,
-    cliEntrypointPath: fileURLToPath(import.meta.url),
-  }));
-}
-
-if (args[0] === "task-run") {
-  process.exit(await runTaskRunCommand(args.slice(1), { env: runtimeEnv }));
-}
-
-if (args[0] === "table" && args[1] === "query") {
-  process.exit(await runTableQueryCommand(args.slice(2), { env: runtimeEnv }));
-}
-
-if (args[0] === "daemon" || looksLikeDaemonShortcut(args)) {
-  const daemonArgs = args[0] === "daemon" ? args.slice(1) : args;
-  process.exit(await runMachineConnectCommand(["--ws"], {
-    env: buildDaemonEnv(daemonArgs),
-    cliEntrypointPath: fileURLToPath(import.meta.url),
-  }));
-}
-
-if (args[0] === "machine" && args[1] === "status") {
-  process.exit(await runMachineStatusCommand(args.slice(2), { env: runtimeEnv }));
-}
-
-if (args[0] === "agent" && args[1] === "bind-current") {
-  process.exit(await runAgentBindCurrentCommand(args.slice(2), { env: runtimeEnv }));
-}
-
-if (args[0] === "agent" && args[1] === "smoke-current") {
-  process.exit(await runAgentSmokeCurrentCommand(args.slice(2), { env: runtimeEnv }));
-}
-
-if (args[0] === "agent" && args[1] === "run") {
-  process.exit(await runAgentRunCommand(args.slice(2), {
-    env: runtimeEnv,
-    scriptDir: SCRIPT_DIR,
-  }));
-}
-
-if (args[0] === "agent" && args[1] === "chat") {
-  process.exit(await runAgentRunCommand(args.slice(2), {
-    env: runtimeEnv,
-    scriptDir: SCRIPT_DIR,
-  }));
-}
-
-if (args[0] === "chat") {
-  process.exit(await runAgentRunCommand(args.slice(1), {
-    env: runtimeEnv,
-    scriptDir: SCRIPT_DIR,
-  }));
-}
-
-if (args[0] === "agent" && args[1] === "pull") {
-  process.exit(await runAgentPullCommand(args.slice(2), { env: runtimeEnv }));
-}
-
-if (args[0] === "agent" && args[1] === "read") {
-  process.exit(await runAgentReadCommand(args.slice(2), { env: runtimeEnv }));
-}
-
-if (args[0] === "agent" && args[1] === "runtime-doctor") {
-  process.exit(await runAgentRuntimeDoctorCommand(args.slice(2), { env: runtimeEnv }));
-}
-
-if (args[0] === "doctor" && args[1] === "runtime") {
-  process.exit(await runDoctorRuntimeCommand(args.slice(2), { env: runtimeEnv }));
-}
 
-if (args[0] === "--version" || args[0] === "-v" || args[0] === "version") {
-  console.log(buildCliVersionText(packageInfo));
-  process.exit(0);
-}
-
-if (args[0] === "doctor") {
-  console.log(
-    buildCliDoctorText({
-      packageName: packageInfo.name,
-      version: packageInfo.version,
-      entrypoint: fileURLToPath(import.meta.url),
-      serverUrl: runtimeEnv.NOLO_SERVER || runtimeEnv.BASE_URL || DEFAULT_NOLO_SERVER_URL,
-      profileName: runtimeEnv.NOLO_PROFILE || "local",
-    })
-  );
-  process.exit(0);
-}
-
-if (args[0] === "update") {
-  process.exit(await runSelfUpdate());
-}
-
-if (args[0] === "--help" || args[0] === "-h") {
-  console.log(renderHelpText());
-  process.exit(0);
-}
-
-const command = resolveCommand(args);
+const commandArgs = looksLikeDaemonShortcut(args) ? ["daemon", ...args] : args;
+const command = resolveCommand(commandArgs);
 if (!command) {
   console.error(`Unknown command: ${args.join(" ")}`);
   console.error("");
   console.log(renderHelpText());
-  process.exit(1);
+  process.exit(1);
 }
 
-const forwardedArgs = [...(command.fixedArgs ?? []), ...args.slice(command.path.length)];
-await runScript(command.script, forwardedArgs, runtimeEnv);
+const exitCode = await runResolvedCommand(command, commandArgs, runtimeContext, {
+  runScript,
+});
+process.exit(exitCode);

package/internalCommandEntries.ts

@@ -0,0 +1,12 @@
+import { getAgentInternalCommandEntries } from "./agentInternalCommandEntries";
+import type { CommandEntry } from "./cliCommandTypes";
+import { getSystemInternalCommandEntries } from "./systemInternalCommandEntries";
+import { getWorkflowInternalCommandEntries } from "./workflowInternalCommandEntries";
+
+export function getInternalCommandEntries(renderHelpText: () => string): CommandEntry[] {
+  return [
+    ...getAgentInternalCommandEntries(),
+    ...getWorkflowInternalCommandEntries(),
+    ...getSystemInternalCommandEntries(renderHelpText),
+  ];
+}