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

package/dist/src/app-opentui/scenes/server.js

@@ -44,42 +44,93 @@ function line(text, options = {}) {
 function blank() {
   return { text: "" };
 }
-function center(text, fg = RIG_UI.ink2, bold = false) {
-  return { text, fg, bold, align: "center" };
+function deckRow(input) {
+  const prefix = input.active ? "\u25B8" : " ";
+  const label = input.label.toUpperCase().padEnd(10);
+  return line(`${prefix} ${label} ${input.detail}`, {
+    fg: input.active ? RIG_UI.lime : RIG_UI.ink2,
+    bold: input.active,
+    selectableIndex: input.index,
+    activateOnClick: input.activateOnClick
+  });
 }
 function makeSceneFrame(input) {
   return input;
 }
 
 // packages/cli/src/app-opentui/scenes/server.ts
+function cleanVisible(value, fallback = "unknown") {
+  return value?.trim() || fallback;
+}
+function targetLabel(server) {
+  if (!server)
+    return "not checked";
+  return server.kind === "remote" ? "remote endpoint" : server.kind === "local" ? "local endpoint" : cleanVisible(server.baseUrl);
+}
 function serverState(state) {
   const server = state.data.server;
   return server && typeof server === "object" && !Array.isArray(server) ? server : null;
 }
-function renderServerScene(state) {
-  const server = serverState(state);
+function panelWidth(layout) {
+  return layout?.centerWidth ?? 118;
+}
+function panelHeight(layout) {
+  return Math.max(18, layout?.centerHeight ?? 34);
+}
+function selectedIndex(state, count) {
+  return Math.max(0, Math.min(count - 1, state.selection.index));
+}
+function statusRows(server) {
   const auth = server?.auth;
   const signedIn = auth && (auth.signedIn === true || auth.authenticated === true || auth.status === "authenticated") ? "authenticated" : "auth unknown";
+  return [
+    line(`selected    ${cleanVisible(server?.label, "not checked")}`, { fg: RIG_UI.ink2 }),
+    line(`target      ${targetLabel(server)}`, { fg: RIG_UI.ink3 }),
+    line(`mode        ${server?.kind ?? "local or remote"}`, { fg: RIG_UI.ink3 }),
+    line(`health      ${server ? server.reachable ? "reachable" : "unreachable" : "check pending"}`, { fg: server?.reachable ? RIG_UI.limeDim : server ? RIG_UI.red : RIG_UI.yellow }),
+    line(`github      ${signedIn}`, { fg: signedIn === "authenticated" ? RIG_UI.limeDim : RIG_UI.ink4 }),
+    ...server?.error ? [line(`attention   ${server.error}`, { fg: RIG_UI.yellow })] : []
+  ];
+}
+function renderServerScene(state, layout) {
+  const server = serverState(state);
+  const selected = selectedIndex(state, 6);
+  const panelLines = [
+    line("server controls", { fg: RIG_UI.ink3 }),
+    blank(),
+    line("ACTIONS", { fg: RIG_UI.ink3, bold: true }),
+    deckRow({ label: "refresh", detail: "probe selected server and GitHub auth", index: 0, active: selected === 0, activateOnClick: true }),
+    deckRow({ label: "local", detail: "select local server for this repo", index: 1, active: selected === 1, activateOnClick: true }),
+    deckRow({ label: "remote", detail: "choose from saved remote servers", index: 2, active: selected === 2, activateOnClick: true }),
+    deckRow({ label: "list", detail: "show saved server aliases", index: 3, active: selected === 3, activateOnClick: true }),
+    deckRow({ label: "auth", detail: "import GitHub auth to selected server", index: 4, active: selected === 4, activateOnClick: true }),
+    deckRow({ label: "doctor", detail: "diagnose server/auth/project linkage", index: 5, active: selected === 5, activateOnClick: true }),
+    blank(),
+    line("STATUS", { fg: RIG_UI.ink3, bold: true }),
+    ...statusRows(server),
+    blank(),
+    line("enter/click runs action \xB7 esc returns home", { fg: RIG_UI.ink4 })
+  ];
   return makeSceneFrame({
     scene: "server",
     title: "Server",
-    lines: [
-      center("server", RIG_UI.ink, true),
-      center(server?.label ?? "loading connection", RIG_UI.ink3),
-      blank(),
-      ...server ? [
-        line(`selected   ${server.label}`, { fg: RIG_UI.ink2, align: "center" }),
-        line(`target     ${server.baseUrl ?? "unknown"}`, { fg: RIG_UI.ink3, align: "center" }),
-        line(`mode       ${server.kind ?? "unknown"}`, { fg: RIG_UI.ink3, align: "center" }),
-        line(`health     ${server.reachable ? "reachable" : "unreachable"}`, { fg: server.reachable ? RIG_UI.limeDim : RIG_UI.red, align: "center" }),
-        line(`latency    ${server.latencyMs ?? "\u2014"}ms`, { fg: RIG_UI.cyan, align: "center" }),
-        line(`github     ${signedIn}`, { fg: RIG_UI.ink4, align: "center" }),
-        blank(),
-        line(server.error ? `attention  ${server.error}` : "ready", { fg: server.error ? RIG_UI.yellow : RIG_UI.ink4, align: "center" })
-      ] : [line("loading server status", { fg: RIG_UI.ink3, align: "center" })]
-    ],
+    lines: [],
+    panels: [{
+      id: "server-actions",
+      top: 0,
+      width: panelWidth(layout),
+      height: panelHeight(layout),
+      lines: panelLines,
+      backgroundColor: RIG_UI.panel,
+      backgroundAlpha: 184,
+      opacity: 0.98,
+      border: false,
+      chrome: "ad-terminal",
+      headerText: "rig server \xB7 select / repair / auth",
+      paddingX: 5,
+      paddingY: 2
+    }],
     footer: { server: server?.label, message: server?.latencyMs !== undefined ? `${server.latencyMs}ms` : undefined },
-    typeBarPlaceholder: "server \xB7 doctor \xB7 tasks \xB7 runs",
     live: state.status === "action" || !server
   });
 }

package/dist/src/app-opentui/scenes/tasks.js

@@ -67,6 +67,16 @@ function statusColor(status) {
 function line(text, options = {}) {
   return { text, ...options };
 }
+function deckRow(input) {
+  const prefix = input.active ? "\u25B8" : " ";
+  const label = input.label.toUpperCase().padEnd(10);
+  return line(`${prefix} ${label} ${input.detail}`, {
+    fg: input.active ? RIG_UI.lime : RIG_UI.ink2,
+    bold: input.active,
+    selectableIndex: input.index,
+    activateOnClick: input.activateOnClick
+  });
+}
 function makeSceneFrame(input) {
   return input;
 }
@@ -148,35 +158,41 @@ function taskRow(width, task, index, active) {
   const priority = task.priority === undefined ? "prio --" : `prio ${String(task.priority).slice(0, 3).padStart(2)}`;
   const marker = active ? "\u258C" : " ";
   const prefix = `${marker} ${id} ${status} ${priority.padEnd(8)} `;
+  const activeRun = task.activeRun;
+  const activeSuffix = activeRun ? ` \xB7 attach ${activeRun.runId.slice(0, 8)}${activeRun.status ? ` ${activeRun.status}` : ""}` : "";
   const titleWidth = Math.max(12, width - prefix.length - 2);
-  return line(`${prefix}${clip(task.title, titleWidth)}`, {
+  return line(`${prefix}${clip(`${task.title}${activeSuffix}`, titleWidth)}`, {
     fg: active ? RIG_UI.ink : statusColor(task.status),
     bold: active,
-    selectableIndex: index
+    selectableIndex: index,
+    activateOnClick: true
   });
 }
-function emptyRows(query, total) {
+function recoveryRows(selected, reason) {
+  return [
+    ...reason ? [line(reason, { fg: RIG_UI.yellow }), line("", { fg: RIG_UI.ink3 })] : [],
+    line("ACTIONS", { fg: RIG_UI.ink3, bold: true }),
+    deckRow({ label: "refresh", detail: "reload task source", index: 0, active: selected === 0, activateOnClick: true }),
+    deckRow({ label: "next", detail: "dispatch next runnable task", index: 1, active: selected === 1, activateOnClick: true }),
+    deckRow({ label: "repair", detail: "repair project/task source link", index: 2, active: selected === 2, activateOnClick: true }),
+    deckRow({ label: "server", detail: "open server controls", index: 3, active: selected === 3, activateOnClick: true }),
+    deckRow({ label: "doctor", detail: "diagnose task source", index: 4, active: selected === 4, activateOnClick: true })
+  ];
+}
+function emptyRows(query, total, selected) {
+  if (!query.trim() && total === 0)
+    return recoveryRows(selected, "No tasks loaded.");
   if (query.trim() && total > 0) {
     return [
-      line("No matching tasks.", { fg: RIG_UI.ink2, bold: true }),
-      line(`search ${JSON.stringify(query)} returned 0/${total}`, { fg: RIG_UI.ink3 }),
-      line("escape clears search", { fg: RIG_UI.ink4 })
+      ...recoveryRows(selected, `No matching tasks for ${JSON.stringify(query)} (${total} total).`)
     ];
   }
-  return [
-    line("No tasks loaded.", { fg: RIG_UI.ink2, bold: true }),
-    line("Check the task source or switch filters from Help.", { fg: RIG_UI.ink3 }),
-    line("tab switches screens", { fg: RIG_UI.ink4 })
-  ];
+  return recoveryRows(selected, "No tasks are visible with this filter.");
 }
-function degradedRows(state) {
+function degradedRows(state, selected) {
   if (!state.error)
     return [];
-  return [
-    line(`status: ${state.error.message}`, { fg: RIG_UI.red, bold: true }),
-    ...state.error.hint ? [line(state.error.hint, { fg: RIG_UI.yellow })] : [],
-    line("", { fg: RIG_UI.ink3 })
-  ];
+  return recoveryRows(selected, state.error.message);
 }
 function renderTasksScene(state, layout) {
   const width = panelWidth(layout);
@@ -186,6 +202,7 @@ function renderTasksScene(state, layout) {
   const tasks = filterTasksForSearch(allTasks, query);
   const selected = typeof state.data.selectedTaskId === "string" && tasks.some((task) => task.id === state.data.selectedTaskId) ? state.data.selectedTaskId : tasks[0]?.id;
   const selectedIndex = Math.max(0, tasks.findIndex((task) => task.id === selected));
+  const recoveryIndex = Math.max(0, Math.min(4, state.selection.index));
   const dispatch = state.data.dispatchingRun;
   const dispatchLine = dispatch && typeof dispatch === "object" && !Array.isArray(dispatch) ? ` \xB7 ${dispatch.runId ?? "new"} ${dispatch.status ?? "dispatching"}` : "";
   const panelTop = 0;
@@ -193,16 +210,21 @@ function renderTasksScene(state, layout) {
   const panelLines = [
     line("TASK        STATUS       PRIORITY  TITLE", { fg: RIG_UI.ink3, bold: true }),
     line("", { fg: RIG_UI.ink3 }),
-    ...degradedRows(state),
-    ...query.trim() ? [line(searchSummary("tasks", query, tasks.length, allTasks.length), { fg: RIG_UI.ink4 }), line("", { fg: RIG_UI.ink3 })] : [],
-    ...tasks.length > 0 ? tasks.map((task, index) => taskRow(contentWidth, task, index, index === selectedIndex)) : emptyRows(query, allTasks.length)
+    ...tasks.length > 0 ? [
+      ...degradedRows(state, recoveryIndex),
+      ...query.trim() ? [line(searchSummary("tasks", query, tasks.length, allTasks.length), { fg: RIG_UI.ink4 }), line("", { fg: RIG_UI.ink3 })] : [],
+      ...tasks.map((task, index) => taskRow(contentWidth, task, index, index === selectedIndex))
+    ] : state.error ? degradedRows(state, recoveryIndex) : [
+      ...query.trim() ? [line(searchSummary("tasks", query, tasks.length, allTasks.length), { fg: RIG_UI.ink4 }), line("", { fg: RIG_UI.ink3 })] : [],
+      ...emptyRows(query, allTasks.length, recoveryIndex)
+    ]
   ];
   return makeSceneFrame({
     scene: "tasks",
     title: "Tasks",
     lines: [
       line("", { fg: RIG_UI.ink4 }),
-      line(query.trim() ? `   rig tasks --search ${JSON.stringify(query)}` : `   rig tasks \xB7 ${taskViewLabel(view)}${dispatchLine}`, { fg: RIG_UI.ink3 })
+      line(query.trim() ? `   tasks --search ${JSON.stringify(query)}` : `   tasks \xB7 ${taskViewLabel(view)}${dispatchLine}`, { fg: RIG_UI.ink3 })
     ],
     panels: [{
       id: "tasks-list",
@@ -215,7 +237,7 @@ function renderTasksScene(state, layout) {
       opacity: 1,
       border: false,
       chrome: "ad-terminal",
-      headerText: query.trim() ? `rig tasks --search ${JSON.stringify(query)}` : `rig tasks \xB7 ${taskViewLabel(view)}${dispatchLine}`,
+      headerText: query.trim() ? `tasks --search ${JSON.stringify(query)}` : `tasks \xB7 ${taskViewLabel(view)}${dispatchLine}`,
       headerHeight: 3,
       paddingX: layout?.compact ? 2 : 3,
       paddingY: 1

package/dist/src/app-opentui/state.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,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();
@@ -119,22 +137,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,20 +156,49 @@ 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);
 }
 
 // packages/cli/src/app-opentui/state.ts

package/dist/src/app-opentui/terminal-capabilities.d.ts

@@ -0,0 +1,7 @@
+import { type ImageProtocol } from "@earendil-works/pi-tui";
+export type RigTerminalCapabilities = {
+    readonly imageProtocol: ImageProtocol;
+    readonly supportsKittyImages: boolean;
+    readonly visualMode: "kitty-images" | "framebuffer-fallback";
+};
+export declare function getRigTerminalCapabilities(): RigTerminalCapabilities;

package/dist/src/app-opentui/terminal-capabilities.js

@@ -0,0 +1,15 @@
+// @bun
+// packages/cli/src/app-opentui/terminal-capabilities.ts
+import { getCapabilities } from "@earendil-works/pi-tui";
+function getRigTerminalCapabilities() {
+  const imageProtocol = getCapabilities().images;
+  const supportsKittyImages = imageProtocol === "kitty";
+  return {
+    imageProtocol,
+    supportsKittyImages,
+    visualMode: supportsKittyImages ? "kitty-images" : "framebuffer-fallback"
+  };
+}
+export {
+  getRigTerminalCapabilities
+};

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

@@ -1,8 +1,8 @@
 import type { StyledText } from "@opentui/core";
 import type { RunnerContext } from "../runner";
 import type { StageLayout } from "./layout";
-export type AppSceneId = "main" | "fleet" | "tasks" | "inbox" | "server" | "init" | "doctor" | "run-detail" | "handoff" | "help" | "error";
-export type AppActionKind = "none" | "refresh" | "navigate" | "task-run-next" | "task-run-id" | "run-stop" | "run-attach" | "run-steer" | "inbox-approve" | "inbox-reject" | "inbox-answer" | "init-start" | "doctor-run";
+export type AppSceneId = "main" | "fleet" | "tasks" | "inbox" | "server" | "init" | "doctor" | "command" | "run-detail" | "handoff" | "help" | "error";
+export type AppActionKind = "none" | "refresh" | "navigate" | "task-run-next" | "task-run-id" | "run-stop" | "run-attach" | "run-steer" | "inbox-approve" | "inbox-reject" | "inbox-answer" | "init-start" | "command-run" | "doctor-run";
 export type AppIntent = {
     readonly scene: AppSceneId;
     readonly argv: readonly string[];
@@ -36,6 +36,13 @@ export type AppSelectionState = {
     readonly index: number;
     readonly count: number;
 };
+export type AppSelectableItem = {
+    readonly id: string;
+    readonly label: string;
+    readonly data?: Record<string, unknown>;
+    readonly intent?: AppIntent;
+    readonly message?: string;
+};
 export type AppState = {
     readonly projectRoot: string;
     readonly scene: AppSceneId;
@@ -112,6 +119,7 @@ export type AppSceneLine = {
     readonly text: string;
     readonly styledText?: StyledText;
     readonly fg?: string;
+    readonly bg?: string;
     readonly bold?: boolean;
     readonly dim?: boolean;
     readonly align?: "left" | "center" | "right";

package/dist/src/commands/_doctor-checks.js

@@ -134,17 +134,21 @@ function cleanToken(value) {
   const trimmed = value?.trim();
   return trimmed ? trimmed : null;
 }
-function readPrivateRemoteSessionToken(projectRoot) {
+function readRemoteAuthState(projectRoot) {
   const path = resolve2(projectRoot, ".rig", "state", "github-auth.json");
   if (!existsSync2(path))
     return null;
   try {
     const parsed = JSON.parse(readFileSync2(path, "utf8"));
-    return cleanToken(typeof parsed.apiSessionToken === "string" ? parsed.apiSessionToken : typeof parsed.sessionToken === "string" ? parsed.sessionToken : undefined);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
   } catch {
     return null;
   }
 }
+function readPrivateRemoteSessionToken(projectRoot) {
+  const parsed = readRemoteAuthState(projectRoot);
+  return parsed ? cleanToken(typeof parsed.apiSessionToken === "string" ? parsed.apiSessionToken : typeof parsed.sessionToken === "string" ? parsed.sessionToken : undefined) : null;
+}
 function readGitHubBearerTokenForRemote(projectRoot) {
   const scopedKey = resolve2(projectRoot);
   if (scopedGitHubBearerTokens.has(scopedKey))
@@ -155,15 +159,25 @@ function readGitHubBearerTokenForRemote(projectRoot) {
   return cleanToken(process.env.RIG_SERVER_AUTH_TOKEN) ?? cleanToken(process.env.RIG_REMOTE_AUTH_TOKEN);
 }
 function readStoredGitHubAuthToken(projectRoot) {
-  const path = resolve2(projectRoot, ".rig", "state", "github-auth.json");
-  if (!existsSync2(path))
+  const parsed = readRemoteAuthState(projectRoot);
+  return parsed ? cleanToken(typeof parsed.token === "string" ? parsed.token : undefined) : null;
+}
+function inferRemoteServerProjectRootFromAuthState(projectRoot) {
+  const repo = readRepoConnection(projectRoot);
+  const slug = repo?.project?.trim();
+  if (!slug || !/^[^/]+\/[^/]+$/.test(slug))
     return null;
-  try {
-    const parsed = JSON.parse(readFileSync2(path, "utf8"));
-    return cleanToken(typeof parsed.token === "string" ? parsed.token : undefined);
-  } catch {
+  const auth = readRemoteAuthState(projectRoot);
+  const authUpdatedAt = typeof auth?.updatedAt === "string" ? Date.parse(auth.updatedAt) : Number.NaN;
+  const repoLinkedAt = typeof repo?.linkedAt === "string" ? Date.parse(repo.linkedAt) : Number.NaN;
+  if (Number.isFinite(authUpdatedAt) && Number.isFinite(repoLinkedAt) && authUpdatedAt + 1000 < repoLinkedAt)
     return null;
-  }
+  const checkoutBaseDir = typeof auth?.checkoutBaseDir === "string" && auth.checkoutBaseDir.trim() ? auth.checkoutBaseDir.trim() : null;
+  if (!checkoutBaseDir)
+    return null;
+  const inferred = `${checkoutBaseDir.replace(/\/+$/, "")}/${slug}`;
+  writeRepoServerProjectRoot(projectRoot, inferred);
+  return inferred;
 }
 function readLocalConnectionFallbackToken(projectRoot) {
   return readGitHubBearerTokenForRemote(projectRoot) ?? cleanToken(process.env.RIG_GITHUB_TOKEN) ?? readStoredGitHubAuthToken(projectRoot);
@@ -174,7 +188,7 @@ async function ensureServerForCli(projectRoot) {
     if (selected?.connection.kind === "remote") {
       reportServerPhase(`Connecting to ${selected.alias}\u2026`);
       const authToken = readGitHubBearerTokenForRemote(projectRoot);
-      const serverProjectRoot = selected.serverProjectRoot ?? await backfillRemoteServerProjectRoot(projectRoot, selected.connection.baseUrl, authToken);
+      const serverProjectRoot = selected.serverProjectRoot ?? inferRemoteServerProjectRootFromAuthState(projectRoot) ?? await backfillRemoteServerProjectRoot(projectRoot, selected.connection.baseUrl, authToken);
       return {
         baseUrl: selected.connection.baseUrl,
         authToken,
@@ -203,7 +217,10 @@ async function backfillRemoteServerProjectRoot(projectRoot, baseUrl, authToken)
   if (!slug)
     return null;
   try {
-    const response = await fetch(`${baseUrl}/api/projects/${encodeURIComponent(slug)}`, {
+    const url = new URL(`${baseUrl}/api/projects/${encodeURIComponent(slug)}`);
+    if (authToken && queryAuthFallbackEnabled())
+      url.searchParams.set("rt", authToken);
+    const response = await fetch(url, {
       headers: mergeHeaders(undefined, authToken)
     });
     if (!response.ok)
@@ -220,10 +237,23 @@ async function backfillRemoteServerProjectRoot(projectRoot, baseUrl, authToken)
     return null;
   }
 }
+function mergeCookie(existing, name, value) {
+  const encoded = `${name}=${encodeURIComponent(value)}`;
+  if (!existing?.trim())
+    return encoded;
+  const parts = existing.split(";").map((part) => part.trim()).filter((part) => part && !part.startsWith(`${name}=`));
+  return [...parts, encoded].join("; ");
+}
+function queryAuthFallbackEnabled(env = process.env) {
+  return env.RIG_ENABLE_QUERY_AUTH_FALLBACK === "1" || env.RIG_QUERY_AUTH_FALLBACK === "1";
+}
 function mergeHeaders(headers, authToken) {
   const merged = new Headers(headers);
   if (authToken) {
-    merged.set("authorization", `Bearer ${authToken}`);
+    const bearer = `Bearer ${authToken}`;
+    merged.set("authorization", bearer);
+    merged.set("x-auth", bearer);
+    merged.set("cookie", mergeCookie(merged.get("cookie"), "rig_auth", authToken));
   }
   return merged;
 }
@@ -284,15 +314,34 @@ async function buildServerFailureContext(projectRoot, server) {
     hint: "Check the selected server with `rig server status`, or switch with `rig server use <alias|local>`."
   };
 }
+function isLoopbackRemoteBaseUrl(baseUrl) {
+  try {
+    const host = new URL(baseUrl).hostname.toLowerCase();
+    return host === "localhost" || host === "127.0.0.1" || host === "::1" || host === "[::1]";
+  } catch {
+    return false;
+  }
+}
+function canUseRemoteWithoutProjectRoot(pathname) {
+  return pathname === "/health" || pathname === "/api/health" || pathname === "/api/server/status" || pathname === "/api/server/project-root" || pathname.startsWith("/api/github/auth/") || pathname === "/api/projects" || pathname.startsWith("/api/projects/");
+}
 async function requestServerJson(context, pathname, init = {}) {
   const server = await ensureServerForCli(context.projectRoot);
+  const requestUrl = new URL(`${server.baseUrl}${pathname}`);
+  if (server.connectionKind === "remote" && !server.serverProjectRoot && !canUseRemoteWithoutProjectRoot(requestUrl.pathname) && (server.authToken || !isLoopbackRemoteBaseUrl(server.baseUrl))) {
+    const repo = readRepoConnection(context.projectRoot);
+    throw new CliError(`Remote server is selected for ${repo?.project ?? "this repo"}, but this checkout has no server-host project root link.`, 1, { hint: "Run `rig init --repair` or `rig init --yes --repo owner/repo --server remote` to repair the remote project link before task/run commands." });
+  }
   const headers = mergeHeaders(init.headers, server.authToken);
   if (server.serverProjectRoot)
     headers.set("x-rig-project-root", server.serverProjectRoot);
+  if (server.connectionKind === "remote" && server.authToken && queryAuthFallbackEnabled()) {
+    requestUrl.searchParams.set("rt", server.authToken);
+  }
   reportServerPhase(`${(init.method ?? "GET").toUpperCase()} ${pathname.split("?")[0]}\u2026`);
   let response;
   try {
-    response = await fetch(`${server.baseUrl}${pathname}`, {
+    response = await fetch(requestUrl, {
       ...init,
       headers
     });