@h-rig/cli 0.0.6-alpha.81 → 0.0.6-alpha.83

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

@@ -1,14 +1,18 @@
 // @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"],
   ["help", "help"]
 ]);
 var TASK_VIEW_COMMANDS = new Set([
@@ -30,8 +34,11 @@ var TASK_VIEW_COMMANDS = new Set([
   "search",
   "q"
 ]);
+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 +52,12 @@ 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 unsupportedPlainCliIntent(argv, raw, reason) {
+  return commandRunIntent(argv, raw, reason);
 }
 function firstValueAfter(args, option) {
   const index = args.indexOf(option);
@@ -56,11 +66,54 @@ 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 parseSimpleTaskRunArgs(args) {
+  let next = false;
+  let task;
+  let detach = false;
+  for (let index = 0;index < args.length; index += 1) {
+    const arg = args[index];
+    if (arg === "next" || arg === "--next") {
+      next = true;
+      continue;
+    }
+    if (arg === "--detach") {
+      detach = true;
+      continue;
+    }
+    if (arg === "--task") {
+      const value = args[index + 1];
+      if (!value || value.startsWith("-"))
+        return { ok: false, reason: "task run --task needs an id" };
+      if (task)
+        return { ok: false, reason: "task run received more than one task id" };
+      task = value;
+      index += 1;
+      continue;
+    }
+    if (arg.startsWith("-")) {
+      return { ok: false, reason: `task run option ${arg} is not implemented in the shell` };
+    }
+    if (task)
+      return { ok: false, reason: "task run received more than one task id" };
+    task = arg;
+  }
+  if (next && task)
+    return { ok: false, reason: "task run cannot combine next with a task id" };
+  return { ok: true, next, ...task ? { task } : {}, detach };
 }
 function taskViewPayload(command, rest) {
   const normalized = command.toLowerCase();
@@ -119,22 +172,15 @@ function intentFromArgv(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);
   }
   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") {
@@ -145,54 +191,114 @@ function intentFromArgv(argv) {
   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") {
+    if (!normalizedCommand || normalizedCommand === "status")
+      return intent("server", argv, "refresh", undefined, normalizedCommand ? "Checking server" : "Loading server");
+    return unsupportedPlainCliIntent(argv, undefined, `server ${normalizedCommand} is not executed in the shell; exit and run it in plain mode.`);
+  }
+  if (normalizedGroup === "github") {
+    if (normalizedCommand === "auth" && (rest[0]?.toLowerCase() ?? "status") === "status" && rest.length <= 1) {
+      return intent("server", argv, "refresh", undefined, "Checking GitHub auth");
+    }
+    return unsupportedPlainCliIntent(argv, undefined, "github auth mutations are not executed in the shell; exit and run them in plain mode.");
+  }
+  if (normalizedGroup === "init")
+    return commandRunIntent(argv);
+  if (normalizedGroup === "doctor") {
+    return normalizedCommand ? commandRunIntent(argv) : intent("doctor", argv, "doctor-run", undefined, "Running doctor");
+  }
+  if (normalizedGroup === "inbox") {
+    if (normalizedCommand === "watch")
+      return commandRunIntent(argv);
+    if ((normalizedCommand === "approvals" || normalizedCommand === "inputs") && rest.length > 0)
+      return commandRunIntent(argv);
+    return normalizedCommand && normalizedCommand !== "approvals" && normalizedCommand !== "inputs" ? commandRunIntent(argv) : inboxActionIntent(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);
   }
   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);
 }
 function intentFromTypeBar(value) {
   const raw = value.trim();
   if (!raw)
-    return intent("fleet", [], "refresh", undefined, "Opening runs", value);
+    return intent("main", [], "none", undefined, "Project menu", value);
   const parts = raw.split(/\s+/).filter(Boolean);
   const [first = "", second = "", ...rest] = parts;
   const firstScene = NAV_SCENES.get(first.toLowerCase());
   if (first === "tasks" || first === "task") {
-    if (second === "run") {
-      const task = explicitTaskIdArg(rest);
-      if (rest.includes("--next") || task === "next")
-        return intent("tasks", parts, "task-run-next", undefined, "Dispatching next task", value);
-      if (task)
-        return intent("tasks", parts, "task-run-id", { task }, `Dispatching ${task}`, value);
-      return intent("tasks", parts, "refresh", undefined, "Select a task, then press Enter; or use run next", value);
-    }
+    if (second === "run" || first === "task" && (second === "ready" || second === "status"))
+      return commandRunIntent(parts, value);
     if (!isTaskViewCommand(second.toLowerCase()))
-      return unsupportedPlainCliIntent(parts, value);
+      return commandRunIntent(parts, value);
     return taskViewIntent(parts, second, rest, value);
   }
   if (first === "run") {
-    if (second === "next" || second === "--next")
-      return intent("tasks", parts, "task-run-next", undefined, "Dispatching next task", value);
-    if (second === "--task") {
-      const task = explicitTaskIdArg([second, ...rest]);
-      if (task)
-        return intent("tasks", parts, "task-run-id", { task }, `Dispatching ${task}`, value);
+    if (second === "attach") {
+      const runId = firstNonOption(rest);
+      return runId && rest.filter((part) => part.trim()).length === 1 ? intent("handoff", parts, "run-attach", { runId }, "Attaching run", value) : commandRunIntent(parts, value);
+    }
+    if (second === "stop") {
+      const runId = firstNonOption(rest);
+      return runId && rest.filter((part) => part.trim()).length === 1 ? intent("fleet", parts, "run-stop", { runId }, "Stopping run", value) : commandRunIntent(parts, value);
+    }
+    if (second === "next" || second === "--next" || second === "--task") {
+      const parsed = parseSimpleTaskRunArgs([second, ...rest]);
+      if (!parsed.ok)
+        return unsupportedPlainCliIntent(parts, value, parsed.reason);
+      const payload = parsed.detach ? { detach: true } : undefined;
+      if (parsed.next)
+        return intent("tasks", parts, "task-run-next", payload, parsed.detach ? "Dispatching next task detached" : "Dispatching next task", value);
+      if (parsed.task)
+        return intent("tasks", parts, "task-run-id", { ...payload ?? {}, task: parsed.task }, parsed.detach ? `Dispatching ${parsed.task} detached` : `Dispatching ${parsed.task}`, value);
       return intent("tasks", parts, "refresh", undefined, "Select a task, then press Enter; or use run next", value);
     }
-    if (second && !second.startsWith("-"))
+    if (second && !second.startsWith("-")) {
+      if (rest.length > 0)
+        return unsupportedPlainCliIntent(parts, value, "run <task> options are not implemented in the shell; use task run in plain mode for advanced flags.");
       return intent("tasks", parts, "task-run-id", { task: second }, `Dispatching ${second}`, value);
+    }
+    if (second?.startsWith("-"))
+      return unsupportedPlainCliIntent(parts, value, `run option ${second} is not implemented in the shell`);
     return intent("tasks", parts, "refresh", undefined, "Select a task, then press Enter; or use run next", value);
   }
+  if (first === "init")
+    return commandRunIntent(parts, value);
+  if (first === "doctor")
+    return second ? commandRunIntent(parts, value) : intent("doctor", parts, "doctor-run", undefined, "Running doctor", value);
+  if (first === "server") {
+    if (!second || second === "status")
+      return intent("server", parts, "refresh", undefined, "Loading server", value);
+    return commandRunIntent(parts, value);
+  }
+  if (first === "github") {
+    if (second === "auth" && (rest[0]?.toLowerCase() ?? "status") === "status" && rest.length <= 1)
+      return intent("server", parts, "refresh", undefined, "Checking GitHub auth", value);
+    return commandRunIntent(parts, value);
+  }
+  if (first === "inbox") {
+    if (second === "watch")
+      return commandRunIntent(parts, value);
+    if ((second === "approvals" || second === "inputs") && rest.length > 0)
+      return commandRunIntent(parts, value);
+    return second && second !== "approvals" && second !== "inputs" ? commandRunIntent(parts, value) : inboxActionIntent(parts, second, rest, value);
+  }
   if (firstScene && parts.length === 1) {
     return intent(firstScene, parts, "navigate", undefined, `Opening ${firstScene}`, value);
   }
@@ -201,7 +307,7 @@ function intentFromTypeBar(value) {
   if (first === "attach") {
     if (!second)
       return intent("handoff", parts, "navigate", undefined, "Select a run to attach", value);
-    return intent("handoff", parts, "run-attach", { runId: second }, `Attaching ${second}`, value);
+    return parts.length === 2 ? intent("handoff", parts, "run-attach", { runId: second }, `Attaching ${second}`, value) : commandRunIntent(parts, value);
   }
   return intentFromArgv(parts);
 }

package/dist/src/app-opentui/keymap.d.ts

@@ -0,0 +1,20 @@
+import type { CliRenderer, KeyEvent } from "@opentui/core";
+import type { TypeBarRenderables } from "./render/type-bar";
+import type { AppIntent, AppRuntime, AppSceneId, AppSelectableItem, AppState } from "./types";
+export type AppKeymapContext = {
+    readonly renderer: () => CliRenderer | null;
+    readonly runtime: AppRuntime;
+    readonly getState: () => AppState;
+    readonly getTypeBar: () => TypeBarRenderables | null;
+    readonly getRenderedSelectableItems: () => readonly AppSelectableItem[];
+    readonly emitTypeBarPatch: (patch: {
+        readonly value?: string;
+        readonly message?: string | undefined;
+    }) => void;
+    readonly runAppAction: (label: string, action: () => Promise<unknown>) => void;
+    readonly primaryNavIntent: (scene: AppSceneId) => AppIntent;
+    readonly nextPrimaryScene: (scene: AppSceneId, delta: number) => AppSceneId;
+    readonly moveSelection: (delta: number, renderedItems?: readonly AppSelectableItem[]) => boolean;
+    readonly activateSelection: (renderedItems?: readonly AppSelectableItem[]) => Promise<boolean>;
+};
+export declare function handleAppKeyPress(context: AppKeymapContext, key: KeyEvent): void;