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

package/dist/src/app-opentui/adapters/init.js

@@ -193,17 +193,21 @@ function setGitHubBearerTokenForCurrentProcess(token, projectRoot) {
   const scopedKey = resolve2(projectRoot ?? process.cwd());
   scopedGitHubBearerTokens.set(scopedKey, cleanToken(token ?? undefined));
 }
-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))
@@ -214,15 +218,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);
@@ -233,7 +247,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,
@@ -262,7 +276,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)
@@ -279,10 +296,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;
 }
@@ -342,15 +372,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
     });
@@ -379,11 +428,26 @@ ${failure.contextLine}`, 1, { hint: failure.hint });
   return payload;
 }
 async function postGitHubTokenViaServer(context, token, options = {}) {
-  const payload = await requestServerJson(context, "/api/github/auth/token", {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify({ token, selectedRepo: options.selectedRepo, projectRoot: options.projectRoot })
-  });
+  const server = await ensureServerForCli(context.projectRoot);
+  const requestUrl = new URL(`${server.baseUrl}/api/github/auth/token`);
+  reportServerPhase("POST /api/github/auth/token\u2026");
+  let response;
+  try {
+    response = await fetch(requestUrl, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ token, selectedRepo: options.selectedRepo, projectRoot: options.projectRoot ?? server.serverProjectRoot ?? undefined })
+    });
+  } catch (error) {
+    const failure = await buildServerFailureContext(context.projectRoot, server);
+    throw new CliError(`Rig server auth bootstrap failed: ${error instanceof Error ? error.message : String(error)}
+${failure.contextLine}`, 1, { hint: failure.hint });
+  }
+  const payload = await response.json().catch(() => null);
+  if (!response.ok) {
+    const detail = payload && typeof payload === "object" && !Array.isArray(payload) ? String(payload.error ?? JSON.stringify(payload)) : `HTTP ${response.status}`;
+    throw new CliError(`Rig server auth bootstrap failed (${response.status}): ${detail}`, 1, { hint: "Re-run `rig github auth import-gh`, or check the selected server with `rig server status`." });
+  }
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
 }
 async function prepareRemoteCheckoutViaServer(context, input) {
@@ -2203,20 +2267,11 @@ import { existsSync as existsSync6 } from "fs";
 import { resolve as resolve7 } from "path";
 
 // packages/cli/src/app-opentui/adapters/common.ts
-function adapterContextFromRuntime(runtime, renderer) {
-  return {
-    projectRoot: runtime.getState().projectRoot,
-    renderer,
-    ensureRuntime: () => runtime.getRunnerContext(),
-    emit: (event) => runtime.emit(event),
-    getState: () => runtime.getState()
-  };
-}
 function projectRootOf(ctx) {
   const root = ctx.rig?.projectRoot ?? ctx.projectRoot ?? ctx.getState().projectRoot;
   if (typeof root === "string" && root.trim())
     return root;
-  throw new Error("Rig app adapter requires a projectRoot.");
+  throw new Error("App adapter requires a projectRoot.");
 }
 async function runtimeOf(ctx) {
   if (ctx.rig && "runId" in ctx.rig && ctx.ensureRuntime === undefined) {
@@ -2224,7 +2279,7 @@ async function runtimeOf(ctx) {
   }
   if (ctx.ensureRuntime)
     return ctx.ensureRuntime();
-  throw new Error("Rig app adapter requires ensureRuntime() before this action can run.");
+  throw new Error("App adapter requires ensureRuntime() before this action can run.");
 }
 function normalizeAppError(error) {
   const message = error instanceof Error ? error.message : String(error);
@@ -2285,22 +2340,6 @@ async function captureConsole(fn) {
 }
 
 // packages/cli/src/app-opentui/adapters/init.ts
-function createInitAdapter() {
-  return {
-    id: "init",
-    async handleIntent(runtime, intent) {
-      if (intent.scene !== "init" && intent.action.kind !== "init-start")
-        return false;
-      const ctx = adapterContextFromRuntime(runtime);
-      if (intent.action.kind === "init-start" && intent.argv.includes("--yes")) {
-        await runInitYes(ctx, ["--yes"]);
-        return true;
-      }
-      await loadInitFacts(ctx);
-      return true;
-    }
-  };
-}
 function readInitFacts(ctx) {
   const projectRoot = projectRootOf(ctx);
   const configNames = ["rig.config.ts", "rig.config.mts", "rig.config.json"];
@@ -2326,7 +2365,7 @@ async function loadInitFacts(ctx) {
   }
 }
 async function runInitYes(ctx, args = ["--yes"]) {
-  const label = "Initializing Rig project";
+  const label = "Initializing project";
   emitStarted(ctx, label, { init: { status: "writing-config" } });
   try {
     const runtime = await runtimeOf(ctx);
@@ -2352,6 +2391,5 @@ export {
   runInitYes,
   readInitFacts,
   loadInitFacts,
-  createInitAdapter,
   buildInitTypeBarSuggestions
 };

package/dist/src/app-opentui/adapters/inspect.d.ts

@@ -0,0 +1,52 @@
+import { type AppAdapterContext } from "./common";
+export type InspectView = "logs" | "timeline" | "artifacts" | "artifact" | "diff" | "failures" | "graph" | "audit";
+export declare const INSPECT_VIEWS: readonly InspectView[];
+export type AppInspectArtifact = {
+    readonly name: string;
+    readonly path: string;
+    readonly sizeBytes: number;
+    readonly isDir: boolean;
+};
+export type AppInspectRunOption = {
+    readonly runId: string;
+    readonly status: string;
+    readonly title: string;
+    readonly taskId?: string;
+    readonly updatedAt?: string;
+};
+export type AppInspectSnapshot = {
+    readonly runId: string;
+    readonly taskId?: string;
+    readonly status: string;
+    readonly title: string;
+    readonly logs: readonly Record<string, unknown>[];
+    readonly timeline: readonly Record<string, unknown>[];
+    /** Unified diff text for the run's working changes (git diff), or "". */
+    readonly diff: string;
+    /** Log/timeline entries whose status reads as a failure, for the failures tab. */
+    readonly failures: readonly Record<string, unknown>[];
+    /** Artifact files for the run's task (resolveTaskArtifactDirs), for the artifacts tab. */
+    readonly artifacts: readonly AppInspectArtifact[];
+    /** Contents of the currently-selected artifact file, for the artifact tab. */
+    readonly artifactView?: {
+        readonly name: string;
+        readonly contents: string;
+        readonly truncated: boolean;
+        readonly sizeBytes: number;
+    };
+    /** Task graph (`br list --pretty`) text, for the graph tab. */
+    readonly graph: string;
+    readonly graphError?: string;
+    /** Last audit.jsonl entries, for the audit tab. */
+    readonly audit: readonly Record<string, unknown>[];
+    readonly refreshedAt: number;
+    readonly diffError?: string;
+    readonly artifactsError?: string;
+};
+/** The run PICKER data: recent runs the operator can pick to inspect in-place,
+ * patched into state.data.inspectRuns. Sourced from the same server run list the
+ * runs scene uses — but rendered as inspect targets, never bouncing scenes. */
+export declare function loadInspectRuns(ctx: AppAdapterContext, options?: {
+    readonly limit?: number;
+}): Promise<readonly AppInspectRunOption[]>;
+export declare function loadInspect(ctx: AppAdapterContext, runId: string): Promise<AppInspectSnapshot>;