@h-rig/cli 0.0.6-alpha.82 → 0.0.6-alpha.84

package/dist/src/app-opentui/state.js

@@ -1,14 +1,23 @@
 // @bun
 // packages/cli/src/app-opentui/intent.ts
 var NAV_SCENES = new Map([
-  ["", "fleet"],
-  ["main", "fleet"],
-  ["home", "fleet"],
+  ["", "main"],
+  ["main", "main"],
+  ["home", "main"],
   ["fleet", "fleet"],
   ["runs", "fleet"],
   ["run", "fleet"],
   ["tasks", "tasks"],
   ["task", "tasks"],
+  ["inbox", "inbox"],
+  ["server", "server"],
+  ["init", "init"],
+  ["doctor", "doctor"],
+  ["pi", "pi"],
+  ["plugin", "plugin"],
+  ["repo", "repo"],
+  ["workspace", "workspace"],
+  ["inspect", "inspect"],
   ["help", "help"]
 ]);
 var TASK_VIEW_COMMANDS = new Set([
@@ -30,8 +39,29 @@ var TASK_VIEW_COMMANDS = new Set([
   "search",
   "q"
 ]);
+var HOLLOW_FAMILIES = new Set([
+  "browser",
+  "stats",
+  "dist",
+  "agent",
+  "queue",
+  "remote",
+  "harness",
+  "git",
+  "setup",
+  "profile",
+  "review",
+  "inspector",
+  "test"
+]);
+function familyIntent(family, argv, raw) {
+  return intent("family", argv, "refresh", { family }, `Opening ${family}`, raw);
+}
+function isHelpCommand(command) {
+  return command === "help" || command === "--help" || command === "-h";
+}
 function isTaskViewCommand(command) {
-  return !command || TASK_VIEW_COMMANDS.has(command) || command.startsWith("-");
+  return !command || TASK_VIEW_COMMANDS.has(command) || command.startsWith("-") && !isHelpCommand(command);
 }
 function intent(scene, argv, kind, payload, label, raw) {
   return {
@@ -45,9 +75,9 @@ function intent(scene, argv, kind, payload, label, raw) {
     }
   };
 }
-function unsupportedPlainCliIntent(argv, raw) {
-  const command = argv.join(" ").trim() || "command";
-  return intent("help", argv, "none", { unsupported: command }, `${command} is on the plain CLI path; exit Rig shell or rerun with RIG_PLAIN=1`, raw);
+function commandRunIntent(argv, raw, reason) {
+  const command = argv.join(" ").trim();
+  return intent("command", argv, "command-run", { argv: [...argv], ...reason ? { reason } : {} }, command ? `Running rig ${command}` : "Running rig", raw);
 }
 function firstValueAfter(args, option) {
   const index = args.indexOf(option);
@@ -56,11 +86,19 @@ function firstValueAfter(args, option) {
 function firstNonOption(args) {
   return args.find((part) => part.trim() && !part.startsWith("-"));
 }
-function explicitTaskIdArg(args) {
-  const taskValue = firstValueAfter(args, "--task");
-  if (taskValue && !taskValue.startsWith("-"))
-    return taskValue;
-  return args.find((part) => part.trim() && part !== "next" && part !== "--next" && part !== "--task" && !part.startsWith("-"));
+function inboxActionIntent(argv, command, rest, raw) {
+  const requestId = firstNonOption(rest);
+  if (command === "approve" || command === "approvals") {
+    return requestId ? intent("inbox", argv, "inbox-approve", { requestId }, `Approving ${requestId}`, raw) : intent("inbox", argv, "refresh", undefined, "Loading approvals", raw);
+  }
+  if (command === "reject") {
+    return requestId ? intent("inbox", argv, "inbox-reject", { requestId }, `Rejecting ${requestId}`, raw) : intent("inbox", argv, "refresh", undefined, "Loading approvals", raw);
+  }
+  if (command === "answer" || command === "inputs" || command === "respond") {
+    const answer = rest.slice(requestId ? 1 : 0).join(" ").trim();
+    return requestId && answer ? intent("inbox", argv, "inbox-answer", { requestId, answer }, `Answering ${requestId}`, raw) : intent("inbox", argv, "refresh", undefined, "Loading inbox", raw);
+  }
+  return intent("inbox", argv, "refresh", undefined, "Loading inbox", raw);
 }
 function taskViewPayload(command, rest) {
   const normalized = command.toLowerCase();
@@ -114,51 +152,87 @@ function taskViewIntent(argv, command = "", rest = [], raw) {
   const { payload, label } = taskViewPayload(command, rest);
   return intent("tasks", argv, "refresh", payload, label, raw);
 }
+function routeServer(argv, command, raw, checkingLabel) {
+  if (!command || command === "status") {
+    return intent("server", argv, "refresh", undefined, command ? checkingLabel : "Loading server", raw);
+  }
+  return commandRunIntent(argv, raw);
+}
+function routeGithub(argv, command, rest, raw) {
+  if (command === "auth" && (rest[0]?.toLowerCase() ?? "status") === "status" && rest.length <= 1) {
+    return intent("server", argv, "refresh", undefined, "Checking GitHub auth", raw);
+  }
+  return commandRunIntent(argv, raw);
+}
+function routeDoctor(argv, command, raw) {
+  return command ? commandRunIntent(argv, raw) : intent("doctor", argv, "doctor-run", undefined, "Running doctor", raw);
+}
+function routeInbox(argv, command, rest, raw) {
+  if (command === "watch")
+    return commandRunIntent(argv, raw);
+  if ((command === "approvals" || command === "inputs") && rest.length > 0)
+    return commandRunIntent(argv, raw);
+  return command && command !== "approvals" && command !== "inputs" ? commandRunIntent(argv, raw) : inboxActionIntent(argv, command, rest, raw);
+}
 function intentFromArgv(argv) {
   const [group = "", command = "", ...rest] = argv;
   const normalizedGroup = group.toLowerCase();
   const normalizedCommand = command.toLowerCase();
   if (!normalizedGroup)
-    return intent("fleet", argv, "refresh", undefined, "Opening runs");
+    return intent("main", argv, "none", undefined, "Project menu");
   if (normalizedGroup === "--help" || normalizedGroup === "-h" || normalizedGroup === "help") {
-    return argv.length === 1 ? intent("help", argv, "none", undefined, "Help") : unsupportedPlainCliIntent(argv);
+    return argv.length === 1 ? intent("help", argv, "none", undefined, "Help") : commandRunIntent(argv);
   }
   if (normalizedGroup === "task") {
-    if (normalizedCommand === "run") {
-      if (rest.includes("--next") || rest.includes("next")) {
-        return intent("tasks", argv, "task-run-next", undefined, "Dispatching next task");
-      }
-      const task = explicitTaskIdArg(rest);
-      if (task)
-        return intent("tasks", argv, "task-run-id", { task }, `Dispatching ${task}`);
-      return intent("tasks", argv, "refresh", undefined, "Select a task, then press Enter; or use run next");
-    }
+    if (normalizedCommand === "run" || normalizedCommand === "ready" || normalizedCommand === "status")
+      return commandRunIntent(argv);
     if (!isTaskViewCommand(normalizedCommand))
-      return unsupportedPlainCliIntent(argv);
+      return commandRunIntent(argv);
     return taskViewIntent(argv, normalizedCommand, rest);
   }
   if (normalizedGroup === "tasks") {
     if (!isTaskViewCommand(normalizedCommand))
-      return unsupportedPlainCliIntent(argv);
+      return commandRunIntent(argv);
     return taskViewIntent(argv, normalizedCommand, rest);
   }
   if (normalizedGroup === "run") {
     if (normalizedCommand === "attach") {
       const runId = firstNonOption(rest);
-      return intent("handoff", argv, "run-attach", { runId }, runId ? `Attaching ${runId}` : "Attaching run");
+      const nativeOnly = Boolean(runId) && rest.filter((part) => part.trim()).length === 1;
+      return nativeOnly ? intent("handoff", argv, "run-attach", { runId }, `Attaching ${runId}`) : commandRunIntent(argv);
     }
-    if (!normalizedCommand)
+    if (!normalizedCommand || normalizedCommand === "list" || normalizedCommand === "status")
       return intent("fleet", argv, "refresh", undefined, "Loading fleet");
-    return unsupportedPlainCliIntent(argv);
+    if (normalizedCommand === "stop") {
+      const runId = firstNonOption(rest);
+      return runId && rest.filter((part) => part.trim()).length === 1 ? intent("fleet", argv, "run-stop", { runId }, "Stopping run") : commandRunIntent(argv);
+    }
+    return commandRunIntent(argv);
   }
+  if (normalizedGroup === "server")
+    return routeServer(argv, normalizedCommand, undefined, "Checking server");
+  if (normalizedGroup === "github")
+    return routeGithub(argv, normalizedCommand, rest);
+  if (normalizedGroup === "init")
+    return commandRunIntent(argv);
+  if (normalizedGroup === "doctor")
+    return routeDoctor(argv, normalizedCommand);
+  if (normalizedGroup === "inbox")
+    return routeInbox(argv, normalizedCommand, rest);
   if (normalizedGroup === "attach") {
-    const runId = firstNonOption([command, ...rest]);
-    return intent("handoff", argv, "run-attach", { runId }, runId ? `Attaching ${runId}` : "Attaching run");
+    const attachArgs = [command, ...rest].filter((part) => part.trim());
+    const runId = firstNonOption(attachArgs);
+    return runId && attachArgs.length === 1 ? intent("handoff", argv, "run-attach", { runId }, `Attaching ${runId}`) : commandRunIntent(argv);
+  }
+  if (HOLLOW_FAMILIES.has(normalizedGroup)) {
+    if (!normalizedCommand || isHelpCommand(normalizedCommand))
+      return familyIntent(normalizedGroup, argv);
+    return commandRunIntent(argv);
   }
   const nav = NAV_SCENES.get(normalizedGroup);
-  if (nav)
+  if (nav && argv.length === 1)
     return intent(nav, argv, "navigate", undefined, `Opening ${nav}`);
-  return unsupportedPlainCliIntent(argv);
+  return commandRunIntent(argv);
 }
 
 // packages/cli/src/app-opentui/state.ts
@@ -184,8 +258,10 @@ function createInitialAppState(options) {
     intent: initialIntent,
     typeBar: {
       value: "",
-      placeholder: "runs \xB7 tasks \xB7 help \xB7 attach <run>"
+      placeholder: "/ search \xB7 : command \xB7 tab next \xB7 ? help",
+      mode: "nav"
     },
+    history: [],
     footer: {
       project: projectName,
       ...options.initialFooter ?? {}
@@ -231,13 +307,15 @@ function reduceAppEvent(state, event) {
         ...event.intent ? { intent: event.intent, actionLabel: event.intent.action.label } : {},
         status: "idle",
         error: undefined,
-        typeBar: { message: undefined }
+        confirm: undefined,
+        typeBar: { message: undefined, value: "", mode: "nav", prompt: undefined }
       };
     case "action.started":
       return {
         status: "action",
         actionLabel: event.label,
         error: undefined,
+        confirm: undefined,
         data: event.optimistic ?? {},
         typeBar: { message: event.label }
       };
@@ -253,6 +331,7 @@ function reduceAppEvent(state, event) {
         status: "success",
         actionLabel: event.label,
         data: event.data ?? {},
+        dataUpdatedAtMs: Date.now(),
         typeBar: { message: `${event.label} complete` }
       };
     case "action.failed":
@@ -260,10 +339,24 @@ function reduceAppEvent(state, event) {
         status: "error",
         actionLabel: event.label,
         error: { message: event.message, hint: event.hint, cause: event.cause },
-        typeBar: { message: event.message, placeholder: event.hint ?? "runs \xB7 tasks \xB7 help" }
+        typeBar: { message: event.message, placeholder: event.hint ?? "runs \xB7 tasks \xB7 help" },
+        data: {
+          optimisticRun: undefined,
+          pendingRunMessage: undefined,
+          inboxOptimistic: undefined,
+          dispatchingRun: undefined,
+          lastRefreshError: event.message
+        }
       };
     case "data.patch":
-      return { data: event.data };
+      return { data: event.data, dataUpdatedAtMs: Date.now() };
+    case "confirm.request":
+      return {
+        confirm: event.confirm,
+        typeBar: { message: `${event.confirm.label} \u2014 enter to confirm \xB7 esc to cancel` }
+      };
+    case "confirm.cancel":
+      return { confirm: undefined, typeBar: { message: "cancelled" } };
     case "footer.patch":
       return { footer: event.footer };
     case "typebar.patch":

package/dist/src/app-opentui/surface-catalog.d.ts

@@ -0,0 +1,20 @@
+import type { AppActionKind, AppIntent, AppSceneId } from "./types";
+export type TuiSurfaceAction = {
+    readonly id: string;
+    readonly family: string;
+    readonly label: string;
+    readonly detail: string;
+    readonly argv: readonly string[];
+    readonly scene: AppSceneId;
+    readonly kind: AppActionKind;
+    readonly primary?: boolean;
+    readonly template?: string;
+    /** This command needs arguments — activating it should collect them inline
+     * and execute, rather than opening `family --help` (#21). */
+    readonly needsArgs?: boolean;
+    /** The command words before the first placeholder, used as the base argv the
+     * inline-collected args are appended to. */
+    readonly promptArgv?: readonly string[];
+};
+export declare function tuiSurfaceActions(): readonly TuiSurfaceAction[];
+export declare function intentForSurfaceAction(action: TuiSurfaceAction): AppIntent;