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

package/dist/src/app-opentui/launch-routing.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Interactive CLI is app-shell first.
+ *
+ * Native scenes handle the common surfaces (project menu, runs, tasks, inbox,
+ * server, init, doctor, Pi attach). Every other interactive command still
+ * enters OpenTUI and is executed inside an embedded plain-CLI PTY, preserving
+ * the exact existing options/actions/wizards without pretending unsupported
+ * commands were handled by a read-only scene. Machine/internal paths stay plain.
+ */
+export declare function isOpenTuiAppCommand(argv: readonly string[], env?: NodeJS.ProcessEnv): boolean;
+export declare function shouldLaunchTtyApp(input: {
+    readonly argv: readonly string[];
+    readonly stdoutIsTty?: boolean;
+    readonly stdinIsTty?: boolean;
+    readonly env?: NodeJS.ProcessEnv;
+}): boolean;

package/dist/src/app-opentui/launch-routing.js

@@ -0,0 +1,55 @@
+// @bun
+// packages/cli/src/app-opentui/launch-routing.ts
+var GLOBAL_OPTIONS_WITH_VALUE = new Set(["--project", "--policy-mode", "--run-id"]);
+var GLOBAL_FLAGS = new Set(["--dry-run"]);
+function envTruthy(value) {
+  if (!value)
+    return false;
+  const normalized = value.trim().toLowerCase();
+  return normalized !== "0" && normalized !== "false" && normalized !== "no";
+}
+function stripGlobalAppOptions(argv) {
+  const rest = [];
+  for (let index = 0;index < argv.length; index += 1) {
+    const arg = argv[index];
+    if (GLOBAL_FLAGS.has(arg))
+      continue;
+    if (GLOBAL_OPTIONS_WITH_VALUE.has(arg)) {
+      index += 1;
+      continue;
+    }
+    rest.push(arg);
+  }
+  return rest;
+}
+function isOpenTuiAppCommand(argv, env = process.env) {
+  const commandArgv = stripGlobalAppOptions(argv);
+  const [group = "", command = ""] = commandArgv;
+  const normalizedGroup = group.toLowerCase();
+  const normalizedCommand = command.toLowerCase();
+  if (!normalizedGroup)
+    return true;
+  if (normalizedGroup === "__opentui-pi-host" || normalizedGroup === "__rig-server")
+    return false;
+  if (normalizedGroup === "server" && normalizedCommand === "task-run")
+    return false;
+  if (normalizedGroup === "server" && normalizedCommand === "start" && env.RIG_SERVER_INTERNAL_EXEC === "1")
+    return false;
+  return true;
+}
+function shouldLaunchTtyApp(input) {
+  const env = input.env ?? process.env;
+  if (input.argv.includes("--json"))
+    return false;
+  if (env.RIG_CLI_PLAIN_HELP === "1" || env.RIG_PLAIN === "1")
+    return false;
+  if (envTruthy(env.CI))
+    return false;
+  if (!isOpenTuiAppCommand(input.argv, env))
+    return false;
+  return Boolean(input.stdoutIsTty && input.stdinIsTty);
+}
+export {
+  shouldLaunchTtyApp,
+  isOpenTuiAppCommand
+};

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

@@ -7,10 +7,10 @@ function computeStageLayout(width, height) {
   const horizontalGutter = compact ? 1 : 2;
   const centerWidth = Math.max(36, safeWidth - horizontalGutter * 2);
   const centerLeft = horizontalGutter;
-  const typeBarTop = Math.max(0, safeHeight - 3);
   const footerTop = Math.max(0, safeHeight - 1);
+  const typeBarTop = footerTop;
   const centerTop = compact ? 1 : Math.max(1, Math.floor(safeHeight * 0.055));
-  const centerHeight = Math.max(8, typeBarTop - centerTop - 1);
+  const centerHeight = Math.max(8, footerTop - centerTop);
   return { width: safeWidth, height: safeHeight, centerWidth, centerLeft, centerTop, centerHeight, typeBarTop, footerTop, compact };
 }
 function visibleWidth(text) {

package/dist/src/app-opentui/pi-host-child.js

@@ -143,17 +143,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))
@@ -164,15 +168,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);
@@ -183,7 +197,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,
@@ -212,7 +226,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)
@@ -229,10 +246,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;
 }
@@ -293,15 +323,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
     });
@@ -711,6 +760,7 @@ async function attachRunBundledPiFrontend(context, input) {
   let detached = false;
   try {
     await runPiMain([
+      "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
@@ -751,9 +801,9 @@ function parseArgs(argv) {
   const runId = takeOption(argv, "--run-id")?.trim();
   const projectRoot = takeOption(argv, "--project-root")?.trim();
   if (!runId)
-    throw new Error("Missing --run-id for Rig Pi host child.");
+    throw new Error("Missing --run-id for Pi host child.");
   if (!projectRoot)
-    throw new Error("Missing --project-root for Rig Pi host child.");
+    throw new Error("Missing --project-root for Pi host child.");
   return { runId, projectRoot };
 }
 async function runOpenTuiPiHostChild(argv = process.argv.slice(2)) {
@@ -767,7 +817,7 @@ if (import.meta.main) {
   } catch (error) {
     const message = error instanceof Error ? error.stack || error.message : String(error);
     process.stderr.write(`
-Rig Pi host failed:
+Pi host failed:
 ${message}
 `);
     process.exit(1);

package/dist/src/app-opentui/pi-pty-host.d.ts

@@ -1,5 +1,14 @@
 import { StyledText } from "@opentui/core";
 export type PiPtyHostStatus = "starting" | "running" | "exited" | "failed";
+/**
+ * Temporary embedded-Pi presentation contract.
+ *
+ * The worker/remote Pi daemon still owns tools, skills, cwd, model, session and
+ * context. This local host only mirrors a PTY/xterm viewport into selectable
+ * OpenTUI text. Keep this snapshot path explicit until Rig grows a dedicated
+ * PTY/xterm viewport renderable or deliberately suspends OpenTUI for direct Pi
+ * terminal ownership.
+ */
 export type PiPtyHostSnapshot = {
     readonly runId: string;
     readonly status: PiPtyHostStatus;

package/dist/src/app-opentui/pi-pty-host.js

@@ -7,7 +7,9 @@ import { Terminal as XtermTerminal } from "@xterm/headless";
 var MIN_COLS = 40;
 var MIN_ROWS = 12;
 var MAX_ROWS = 300;
-var MAX_SNAPSHOT_LINES = 1200;
+var MAX_SNAPSHOT_LINES = 360;
+var STYLED_SNAPSHOT_MARGIN = 6;
+var SNAPSHOT_DELAY_MS = 120;
 var fallbackChildScriptPath = fileURLToPath(new URL("./pi-host-child.ts", import.meta.url));
 var activeHost = null;
 function clampCols(cols) {
@@ -105,17 +107,15 @@ function lineToStyledText(line, cols) {
 function childCommandPrefix() {
   const execName = basename(process.execPath).toLowerCase();
   const currentEntry = process.argv[1];
-  if ((execName === "bun" || execName === "bun.exe") && currentEntry) {
-    return [process.execPath, currentEntry, "__opentui-pi-host"];
+  if (execName === "bun" || execName === "bun.exe") {
+    return currentEntry ? [process.execPath, currentEntry, "__opentui-pi-host"] : [process.execPath, fallbackChildScriptPath];
   }
-  if (currentEntry)
-    return [process.execPath, "__opentui-pi-host"];
-  return [process.execPath, fallbackChildScriptPath];
+  return [process.execPath, "__opentui-pi-host"];
 }
 function withEnv(base) {
   const env = {};
   for (const [key, value] of Object.entries(base ?? process.env)) {
-    if (key === "RIG_PLAIN" || key === "RIG_CLI_PLAIN_HELP")
+    if (key === "RIG_PLAIN" || key === "RIG_CLI_PLAIN_HELP" || key === "NO_COLOR")
       continue;
     if (typeof value === "string")
       env[key] = value;
@@ -174,7 +174,7 @@ class PiPtyHost {
       allowProposedApi: true,
       cols: this.cols,
       rows: this.rows,
-      scrollback: 5000
+      scrollback: 1000
     });
     this.registerTerminalResponders();
   }
@@ -188,7 +188,7 @@ class PiPtyHost {
     if (this._disposed)
       throw new Error("Pi PTY host is disposed.");
     if (typeof Bun.Terminal !== "function") {
-      throw new Error("Bun native PTY is unavailable in this runtime. Rig OpenTUI Pi host requires Bun.Terminal.");
+      throw new Error("Bun native PTY is unavailable in this runtime. Pi host requires Bun.Terminal.");
     }
     const spawnOptions = {
       cwd: this.projectRoot,
@@ -212,7 +212,7 @@ class PiPtyHost {
     this.proc = proc;
     this.pty = proc.terminal;
     this.status = "running";
-    this.message = "bundled Pi running inside Rig";
+    this.message = "bundled Pi running inside this app";
     this.emitSnapshotSoon(0);
     proc.exited.then((exitCode) => {
       if (this._disposed)
@@ -307,7 +307,7 @@ class PiPtyHost {
     this.respondToRawTerminalQueries(text);
     this.terminal.write(data, () => this.emitSnapshotSoon());
   }
-  emitSnapshotSoon(delayMs = 16) {
+  emitSnapshotSoon(delayMs = SNAPSHOT_DELAY_MS) {
     if (this._disposed || this.notifyTimer)
       return;
     this.notifyTimer = setTimeout(() => {
@@ -321,16 +321,18 @@ class PiPtyHost {
     const buffer = this.terminal.buffer.active;
     const end = buffer.length;
     const start = Math.max(0, end - MAX_SNAPSHOT_LINES);
+    const styledStart = Math.max(start, end - this.rows - STYLED_SNAPSHOT_MARGIN);
     const lines = [];
     const styledLines = [];
     for (let row = start;row < end; row += 1) {
       const line = buffer.getLine(row);
       lines.push((line?.translateToString(false) ?? "").slice(0, this.cols));
-      styledLines.push(lineToStyledText(line, this.cols));
+      if (row >= styledStart)
+        styledLines[lines.length - 1] = lineToStyledText(line, this.cols);
     }
     while (lines.length < this.rows) {
       lines.push("");
-      styledLines.push(new StyledText([{ __isChunk: true, text: "" }]));
+      styledLines[lines.length - 1] = new StyledText([{ __isChunk: true, text: "" }]);
     }
     return {
       runId: this.runId,