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

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

@@ -1,4 +1,3 @@
-import type { AppAdapter } from "../types";
 import { type AppAdapterContext } from "./common";
 export type AppRunRecord = {
     readonly runId: string;
@@ -12,5 +11,4 @@ export declare function normalizeRunRecord(record: Record<string, unknown>): App
 export declare function refreshFleet(ctx: AppAdapterContext, options?: {
     readonly limit?: number;
 }): Promise<AppRunRecord[]>;
-export declare function createFleetAdapter(): AppAdapter;
 export declare function stopFleetRun(ctx: AppAdapterContext, runId: string): Promise<Record<string, unknown>>;

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

@@ -192,17 +192,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))
@@ -213,15 +217,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);
@@ -232,7 +246,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,
@@ -261,7 +275,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)
@@ -288,10 +305,23 @@ function appendTaskFilterParams(url, filters) {
   if (filters.limit !== undefined)
     url.searchParams.set("limit", String(filters.limit));
 }
+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;
 }
@@ -351,15 +381,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
     });
@@ -421,11 +470,26 @@ async function getGitHubAuthStatusViaServer(context) {
   return payload && typeof payload === "object" && !Array.isArray(payload) ? 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) {
@@ -703,20 +767,11 @@ var init__server_client = __esm(() => {
 });
 
 // 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.");
 }
 function normalizeAppError(error) {
   const message = error instanceof Error ? error.message : String(error);
@@ -772,10 +827,6 @@ function compactRecord(record, keys) {
   }
   return out;
 }
-function payloadString(intent, key) {
-  const value = intent.action.payload?.[key];
-  return typeof value === "string" && value.trim() ? value.trim() : undefined;
-}
 
 // packages/cli/src/app-opentui/adapters/fleet.ts
 function normalizeRunRecord(record) {
@@ -800,7 +851,7 @@ async function refreshFleet(ctx, options = {}) {
   try {
     const { listRunsViaServer: listRunsViaServer2, resolveServerConnectionLabel: resolveServerConnectionLabel2 } = await Promise.resolve().then(() => (init__server_client(), exports__server_client));
     const projectRoot = projectRootOf(ctx);
-    emitProgress(ctx, label, "contacting selected Rig server");
+    emitProgress(ctx, label, "contacting selected server");
     const [runs, serverLabel] = await Promise.all([
       listRunsViaServer2({ projectRoot }, { limit: options.limit ?? 50 }),
       resolveServerConnectionLabel2(projectRoot)
@@ -809,7 +860,7 @@ async function refreshFleet(ctx, options = {}) {
       const entry = normalizeRunRecord(run);
       return entry ? [entry] : [];
     });
-    patchData(ctx, { fleet: { runs: normalized, refreshedAt: new Date().toISOString() } });
+    patchData(ctx, { fleet: { runs: normalized, refreshedAt: new Date().toISOString() }, lastRefreshError: undefined });
     patchFooter(ctx, { server: serverLabel, runs: String(normalized.length) });
     emitCompleted(ctx, label, { count: normalized.length });
     return normalized;
@@ -818,29 +869,6 @@ async function refreshFleet(ctx, options = {}) {
     throw error;
   }
 }
-function createFleetAdapter() {
-  return {
-    id: "fleet",
-    async handleIntent(runtime, intent) {
-      if (intent.scene !== "fleet" && intent.action.kind !== "run-stop")
-        return false;
-      const ctx = adapterContextFromRuntime(runtime);
-      if (intent.action.kind === "run-stop") {
-        const runId = payloadString(intent, "runId");
-        if (runId)
-          await stopFleetRun(ctx, runId);
-        else
-          await refreshFleet(ctx, { limit: 50 });
-        return true;
-      }
-      if (intent.action.kind === "refresh" || intent.action.kind === "navigate") {
-        await refreshFleet(ctx, { limit: 50 });
-        return true;
-      }
-      return false;
-    }
-  };
-}
 async function stopFleetRun(ctx, runId) {
   const cleanRunId = runId.trim();
   const label = `Stopping ${cleanRunId.slice(0, 8)}`;
@@ -859,7 +887,10 @@ async function stopFleetRun(ctx, runId) {
     const { stopRunViaServer: stopRunViaServer2 } = await Promise.resolve().then(() => (init__server_client(), exports__server_client));
     const result = await stopRunViaServer2({ projectRoot: projectRootOf(ctx) }, cleanRunId);
     emitCompleted(ctx, label, { runId: cleanRunId, result: compactRecord(result, ["ok", "runId", "status", "stopped"]) });
-    await refreshFleet(ctx, { limit: 50 }).catch(() => []);
+    await refreshFleet(ctx, { limit: 50 }).catch((error) => {
+      patchData(ctx, { lastRefreshError: normalizeAppError(error).message });
+      return [];
+    });
     return result;
   } catch (error) {
     emitFailed(ctx, label, error, { runId: cleanRunId, revert: { status: "unknown" } });
@@ -869,6 +900,5 @@ async function stopFleetRun(ctx, runId) {
 export {
   stopFleetRun,
   refreshFleet,
-  normalizeRunRecord,
-  createFleetAdapter
+  normalizeRunRecord
 };

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

@@ -1,7 +1,11 @@
-import type { AppAdapter } from "../types";
 import { type AppAdapterContext } from "./common";
-export declare function createInboxAdapter(): AppAdapter;
 export type AppInboxKind = "approvals" | "inputs";
+/** One key/value fact extracted from the request payload (tool, command, an
+ * argument) so the operator sees WHAT they are approving, not just a glyph. */
+export type AppInboxDetail = {
+    readonly label: string;
+    readonly value: string;
+};
 export type AppInboxRecord = {
     readonly kind: AppInboxKind;
     readonly runId: string;
@@ -9,6 +13,12 @@ export type AppInboxRecord = {
     readonly taskId?: string;
     readonly status: string;
     readonly title: string;
+    /** Structured facts (tool name, command, args, prompt) pulled from the
+     * request payload — rendered under the title before the action rows. */
+    readonly details: readonly AppInboxDetail[];
+    /** A unified diff / multi-line preview from the payload, if present, so a
+     * blocking edit/patch is reviewed in full rather than approved blind. */
+    readonly diff?: string;
     readonly raw: Record<string, unknown>;
 };
 export declare function normalizeInboxRecord(kind: AppInboxKind, record: Record<string, unknown>): AppInboxRecord | null;

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

@@ -455,17 +455,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))
@@ -476,15 +480,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);
@@ -495,7 +509,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,
@@ -524,7 +538,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)
@@ -551,10 +568,23 @@ function appendTaskFilterParams(url, filters) {
   if (filters.limit !== undefined)
     url.searchParams.set("limit", String(filters.limit));
 }
+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;
 }
@@ -614,15 +644,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
     });
@@ -684,11 +733,26 @@ async function getGitHubAuthStatusViaServer(context) {
   return payload && typeof payload === "object" && !Array.isArray(payload) ? 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) {
@@ -1245,20 +1309,11 @@ var init_inbox = __esm(() => {
 });
 
 // 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.");
 }
 function normalizeAppError(error) {
   const message = error instanceof Error ? error.message : String(error);
@@ -1305,56 +1360,52 @@ function stringField(record, keys, fallback = "") {
   }
   return fallback;
 }
-function payloadString(intent, key) {
-  const value = intent.action.payload?.[key];
-  return typeof value === "string" && value.trim() ? value.trim() : undefined;
-}
 
 // packages/cli/src/app-opentui/adapters/inbox.ts
-function createInboxAdapter() {
-  return {
-    id: "inbox",
-    async handleIntent(runtime, intent) {
-      if (intent.scene !== "inbox" && !intent.action.kind.startsWith("inbox-"))
-        return false;
-      const ctx = adapterContextFromRuntime(runtime);
-      if (intent.action.kind === "inbox-approve" || intent.action.kind === "inbox-reject") {
-        const requestId = payloadString(intent, "requestId");
-        let match = requestId ? findInboxRecord(ctx, "approvals", requestId) : null;
-        if (requestId && !match)
-          match = findInRecords((await refreshInbox(ctx)).approvals, requestId);
-        if (requestId && match) {
-          await resolveApproval(ctx, { runId: match.runId, requestId: match.requestId, decision: intent.action.kind === "inbox-approve" ? "approve" : "reject" });
-          return true;
-        }
-      }
-      if (intent.action.kind === "inbox-answer") {
-        const requestId = payloadString(intent, "requestId");
-        let match = requestId ? findInboxRecord(ctx, "inputs", requestId) : null;
-        if (requestId && !match)
-          match = findInRecords((await refreshInbox(ctx)).inputs, requestId);
-        const answer = payloadString(intent, "answer");
-        if (requestId && match && answer) {
-          await answerInputRequest(ctx, { runId: match.runId, requestId: match.requestId, answers: { answer } });
-          return true;
-        }
-      }
-      await refreshInbox(ctx);
-      return true;
-    }
-  };
+function asObject(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-function findInRecords(records, requestId) {
-  return records.find((record) => record.requestId === requestId || record.requestId.startsWith(requestId)) ?? null;
+function payloadOf(nested) {
+  return asObject(nested.payload) ?? nested;
 }
-function findInboxRecord(ctx, kind, requestId) {
-  const inbox = ctx.getState().data?.inbox;
-  if (!inbox || typeof inbox !== "object" || Array.isArray(inbox))
+function formatArgs(value) {
+  if (value === undefined || value === null)
     return null;
-  const records = inbox[kind];
-  if (!Array.isArray(records))
+  if (typeof value === "string")
+    return value.trim() ? value.trim().replace(/\s+/g, " ").slice(0, 200) : null;
+  if (typeof value === "number" || typeof value === "boolean")
+    return String(value);
+  try {
+    const json = JSON.stringify(value);
+    return json && json !== "{}" && json !== "[]" ? json.slice(0, 200) : null;
+  } catch {
     return null;
-  return findInRecords(records, requestId);
+  }
+}
+function extractInboxFacts(kind, nested) {
+  const payload = payloadOf(nested);
+  const details = [];
+  const tool = stringField(payload, ["toolName", "tool", "name", "action", "actionId"]) || stringField(nested, ["toolName", "tool", "requestKind", "actionId"]);
+  if (tool)
+    details.push({ label: "tool", value: tool });
+  const command = stringField(payload, ["command", "cmd", "commandLine", "commandString", "shell", "script"]);
+  if (command)
+    details.push({ label: "command", value: command.replace(/\s+/g, " ").slice(0, 200) });
+  const argsValue = payload.args ?? payload.arguments ?? payload.input ?? payload.params ?? payload.parameters;
+  const args = formatArgs(argsValue);
+  if (args)
+    details.push({ label: "args", value: args });
+  const path = stringField(payload, ["path", "file", "filePath", "target"]);
+  if (path)
+    details.push({ label: "path", value: path });
+  const prompt = stringField(payload, ["prompt", "message", "reason", "question", "description"]) || stringField(nested, ["prompt", "message", "reason"]);
+  if (prompt)
+    details.push({ label: kind === "inputs" ? "prompt" : "reason", value: prompt.replace(/\s+/g, " ").slice(0, 240) });
+  const diffRaw = stringField(payload, ["diff", "patch", "preview", "content"]);
+  const diff = diffRaw && diffRaw.includes(`
+`) ? diffRaw : diffRaw || undefined;
+  const title = tool && command ? `${tool} \xB7 ${command.replace(/\s+/g, " ").slice(0, 80)}` : command || tool || stringField(nested, ["title"]) || prompt || (kind === "approvals" ? "approval request" : "input request");
+  return { title, details, ...diff ? { diff } : {} };
 }
 function normalizeInboxRecord(kind, record) {
   const runId = stringField(record, ["runId"]);
@@ -1362,14 +1413,17 @@ function normalizeInboxRecord(kind, record) {
   if (!runId || !requestId)
     return null;
   const taskId = stringField(record, ["taskId"]);
-  const nested = record.record && typeof record.record === "object" && !Array.isArray(record.record) ? record.record : {};
+  const nested = asObject(record.record) ?? {};
+  const facts = extractInboxFacts(kind, nested);
   return {
     kind,
     runId,
     requestId,
     status: stringField(record, ["status"], "pending"),
-    title: stringField(nested, ["title", "prompt", "message", "toolName"], kind === "approvals" ? "approval request" : "input request"),
+    title: facts.title,
+    details: facts.details,
     raw: record,
+    ...facts.diff ? { diff: facts.diff } : {},
     ...taskId ? { taskId } : {}
   };
 }
@@ -1392,7 +1446,7 @@ async function refreshInbox(ctx, filters = {}) {
       const normalized = normalizeInboxRecord("inputs", entry);
       return normalized ? [normalized] : [];
     });
-    patchData(ctx, { inbox: { approvals, inputs, refreshedAt: new Date().toISOString() } });
+    patchData(ctx, { inbox: { approvals, inputs, refreshedAt: new Date().toISOString() }, lastRefreshError: undefined });
     patchFooter(ctx, { inbox: `${approvals.length + inputs.length} pending` });
     emitCompleted(ctx, label, { approvals: approvals.length, inputs: inputs.length });
     return { approvals, inputs };
@@ -1416,7 +1470,10 @@ async function resolveApproval(ctx, input) {
     });
     const record = result && typeof result === "object" && !Array.isArray(result) ? result : { ok: true };
     emitCompleted(ctx, label, { runId: input.runId, requestId: input.requestId, decision: input.decision, result: record });
-    await refreshInbox(ctx).catch(() => ({ approvals: [], inputs: [] }));
+    await refreshInbox(ctx).catch((error) => {
+      patchData(ctx, { lastRefreshError: normalizeAppError(error).message });
+      return { approvals: [], inputs: [] };
+    });
     return record;
   } catch (error) {
     emitFailed(ctx, label, error, { runId: input.runId, requestId: input.requestId, revert: { status: "pending" } });
@@ -1438,7 +1495,10 @@ async function answerInputRequest(ctx, input) {
     });
     const record = result && typeof result === "object" && !Array.isArray(result) ? result : { ok: true };
     emitCompleted(ctx, label, { runId: input.runId, requestId: input.requestId, result: record });
-    await refreshInbox(ctx).catch(() => ({ approvals: [], inputs: [] }));
+    await refreshInbox(ctx).catch((error) => {
+      patchData(ctx, { lastRefreshError: normalizeAppError(error).message });
+      return { approvals: [], inputs: [] };
+    });
     return record;
   } catch (error) {
     emitFailed(ctx, label, error, { runId: input.runId, requestId: input.requestId, revert: { status: "pending" } });
@@ -1449,6 +1509,5 @@ export {
   resolveApproval,
   refreshInbox,
   normalizeInboxRecord,
-  createInboxAdapter,
   answerInputRequest
 };

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

@@ -1,6 +1,4 @@
-import type { AppAdapter } from "../types";
 import { type AppAdapterContext } from "./common";
-export declare function createInitAdapter(): AppAdapter;
 export type InitFactState = {
     readonly hasConfig: boolean;
     readonly configPath?: string;