@h-rig/cli 0.0.6-alpha.87 → 0.0.6-alpha.89

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

@@ -219,7 +219,7 @@ function selectableDeckRow(deck, item) {
 var DOCTOR_ACTIONS = [
   { detail: "run diagnostics now", item: { id: "run", label: "run", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "run diagnostics" } },
   { detail: "open server controls", item: { id: "server", label: "server", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Open server controls" } }, message: "open server controls" } },
-  { detail: "repair project/server/auth link", item: { id: "repair", label: "repair", intent: { scene: "command", argv: ["init", "--repair"], action: { kind: "command-run", label: "Repair project link" } }, message: "repair project link" } },
+  { detail: "repair project/server/auth link", item: { id: "repair", label: "repair", intent: { scene: "init", argv: ["init", "--repair", "--yes"], action: { kind: "init-start", label: "Repair project link" } }, message: "repair project link natively" } },
   { detail: "open tasks", item: { id: "tasks", label: "tasks", intent: { scene: "tasks", argv: ["tasks"], action: { kind: "refresh", label: "Open tasks" } }, message: "open tasks" } }
 ];
 function checks(state) {

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

@@ -158,6 +158,48 @@ function errorDrone(tick) {
   }));
 }
 
+// packages/cli/src/app-opentui/remote-link.ts
+var REPAIRABLE_REMOTE_LINK_STATUSES = new Set([
+  "auth_required",
+  "project_not_registered",
+  "no_server_checkout",
+  "invalid_root",
+  "needs_prepare",
+  "error"
+]);
+function remoteProjectLinkError(message) {
+  return /no server-host project root link|remote project(?:-root)? link|x-rig-project-root|serverProjectRoot/i.test(message ?? "");
+}
+function serverRecordForRemoteLink(state) {
+  const server = state.data.server;
+  return server && typeof server === "object" && !Array.isArray(server) ? server : null;
+}
+function remoteProjectLinkState(state) {
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (!serverRecord || serverRecord.kind !== "remote")
+    return null;
+  const link = serverRecord.remoteProjectLink;
+  if (link && typeof link === "object" && !Array.isArray(link))
+    return link;
+  const direct = state.data.remoteProjectLink;
+  if (direct && typeof direct === "object" && !Array.isArray(direct))
+    return direct;
+  return null;
+}
+function shouldOfferRemoteLinkRepair(state, message) {
+  const link = remoteProjectLinkState(state);
+  if (link) {
+    if (link.ok === true)
+      return false;
+    const status = link.status ?? "";
+    return REPAIRABLE_REMOTE_LINK_STATUSES.has(status);
+  }
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (serverRecord && serverRecord.kind !== "remote")
+    return false;
+  return remoteProjectLinkError(message ?? state.error?.message);
+}
+
 // packages/cli/src/app-opentui/render/scene.ts
 function line(text, options = {}) {
   return { text, ...options };
@@ -185,13 +227,17 @@ function selectableDeckRow(deck, item) {
 var ERROR_ACTIONS = [
   { detail: "return to dashboard", item: { id: "main", label: "main", intent: { scene: "main", argv: [], action: { kind: "refresh", label: "Back to dashboard" } }, message: "back to dashboard" } },
   { detail: "run diagnostics", item: { id: "doctor", label: "doctor", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "run diagnostics" } },
-  { detail: "open server controls", item: { id: "server", label: "server", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Open server controls" } }, message: "open server controls" } },
-  { detail: "repair project/server/auth link", item: { id: "repair", label: "repair", intent: { scene: "command", argv: ["init", "--repair"], action: { kind: "command-run", label: "Repair project link" } }, message: "repair project link" } }
+  { detail: "open server controls", item: { id: "server", label: "server", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Open server controls" } }, message: "open server controls" } }
 ];
+var ERROR_REPAIR_LINK_ACTION = { detail: "backfill or prepare selected remote project-root link", item: { id: "repair-link", label: "repair link", intent: { scene: "server", argv: ["server", "repair-link"], action: { kind: "remote-link-repair", label: "Repair remote link", payload: { returnScene: "server" } } }, message: "repair remote project link" } };
+function errorActions(state) {
+  return shouldOfferRemoteLinkRepair(state, state.error?.message) ? [...ERROR_ACTIONS, ERROR_REPAIR_LINK_ACTION] : ERROR_ACTIONS;
+}
 function renderErrorScene(state) {
   const message = state.error?.message ?? "Unknown app error";
   const hint = state.error?.hint ?? "Use the actions below to recover.";
-  const selected = Math.max(0, Math.min(3, state.selection.index));
+  const actions = errorActions(state);
+  const selected = Math.max(0, Math.min(actions.length - 1, state.selection.index));
   return makeSceneFrame({
     scene: "error",
     title: "Error",
@@ -209,7 +255,7 @@ function renderErrorScene(state) {
         ...hint ? [line(hint, { fg: RIG_UI.yellow })] : [],
         line("", { fg: RIG_UI.ink3 }),
         line("ACTIONS", { fg: RIG_UI.ink3, bold: true }),
-        ...ERROR_ACTIONS.map(({ detail, item }, index) => selectableDeckRow({ label: item.label, detail, index, active: selected === index }, item))
+        ...actions.map(({ detail, item }, index) => selectableDeckRow({ label: item.label, detail, index, active: selected === index }, item))
       ],
       backgroundColor: RIG_UI.panel,
       backgroundAlpha: 184,

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

@@ -284,6 +284,48 @@ function withSelectable(line2, item) {
   return { ...line2, selectable: item, activateOnClick: true };
 }
 
+// packages/cli/src/app-opentui/remote-link.ts
+var REPAIRABLE_REMOTE_LINK_STATUSES = new Set([
+  "auth_required",
+  "project_not_registered",
+  "no_server_checkout",
+  "invalid_root",
+  "needs_prepare",
+  "error"
+]);
+function remoteProjectLinkError(message) {
+  return /no server-host project root link|remote project(?:-root)? link|x-rig-project-root|serverProjectRoot/i.test(message ?? "");
+}
+function serverRecordForRemoteLink(state) {
+  const server = state.data.server;
+  return server && typeof server === "object" && !Array.isArray(server) ? server : null;
+}
+function remoteProjectLinkState(state) {
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (!serverRecord || serverRecord.kind !== "remote")
+    return null;
+  const link = serverRecord.remoteProjectLink;
+  if (link && typeof link === "object" && !Array.isArray(link))
+    return link;
+  const direct = state.data.remoteProjectLink;
+  if (direct && typeof direct === "object" && !Array.isArray(direct))
+    return direct;
+  return null;
+}
+function shouldOfferRemoteLinkRepair(state, message) {
+  const link = remoteProjectLinkState(state);
+  if (link) {
+    if (link.ok === true)
+      return false;
+    const status = link.status ?? "";
+    return REPAIRABLE_REMOTE_LINK_STATUSES.has(status);
+  }
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (serverRecord && serverRecord.kind !== "remote")
+    return false;
+  return remoteProjectLinkError(message ?? state.error?.message);
+}
+
 // packages/cli/src/app-opentui/fleet-stats.ts
 var ACTIVE_STATUSES = new Set([
   "running",
@@ -2092,13 +2134,18 @@ function overviewBody(state, family, snap, layout) {
 function familyRecoveryRows(state, family, errorMessage) {
   const selected = Math.max(0, state.selection.index);
   const intro = errorMessage ? line(`\u2717 couldn't load ${family || "this family"} \u2014 ${errorMessage}`, { fg: RIG_UI.red, bold: true }) : line(`No data for ${family || "this family"} yet.`, { fg: RIG_UI.ink2 });
-  return [
+  const repairRemote = shouldOfferRemoteLinkRepair(state, errorMessage);
+  const rows = [
     intro,
-    blank(),
-    selectableDeckRow({ label: "retry", detail: `reload ${family || "the family"}`, index: 0, active: selected === 0 }, { id: "family-retry", label: "retry", intent: { scene: "family", argv: [family], action: { kind: "refresh", label: `Reload ${family}`, payload: { family } } }, message: "reload this family" }),
-    selectableDeckRow({ label: "cockpit", detail: "back to the project cockpit", index: 1, active: selected === 1 }, { id: "family-home", label: "cockpit", intent: { scene: "main", argv: [], action: { kind: "refresh", label: "Home" } }, message: "back to the cockpit" }),
-    selectableDeckRow({ label: "doctor", detail: "diagnose project/setup", index: 2, active: selected === 2 }, { id: "family-doctor", label: "doctor", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "diagnose setup" })
+    blank()
   ];
+  let index = 0;
+  if (repairRemote) {
+    rows.push(selectableDeckRow({ label: "repair link", detail: "backfill/prepare selected remote checkout link", index, active: selected === index }, { id: "family-repair-link", label: "repair link", intent: { scene: "server", argv: ["server", "repair-link"], action: { kind: "remote-link-repair", label: "Repair remote link", payload: { returnScene: "family", family } } }, message: "repair remote project link" }));
+    index += 1;
+  }
+  rows.push(selectableDeckRow({ label: "retry", detail: `reload ${family || "the family"}`, index, active: selected === index }, { id: "family-retry", label: "retry", intent: { scene: "family", argv: [family], action: { kind: "refresh", label: `Reload ${family}`, payload: { family } } }, message: "reload this family" }), selectableDeckRow({ label: "cockpit", detail: "back to the project cockpit", index: index + 1, active: selected === index + 1 }, { id: "family-home", label: "cockpit", intent: { scene: "main", argv: [], action: { kind: "refresh", label: "Home" } }, message: "back to the cockpit" }), selectableDeckRow({ label: "doctor", detail: "diagnose project/setup", index: index + 2, active: selected === index + 2 }, { id: "family-doctor", label: "doctor", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "diagnose setup" }));
+  return rows;
 }
 function renderFamilyScene(state, layout) {
   const family = typeof state.data.familyName === "string" ? state.data.familyName : "";
@@ -2107,9 +2154,16 @@ function renderFamilyScene(state, layout) {
   const loading = state.status === "loading" && !snap;
   const errorMessage = state.error?.message ?? lastRefreshError(state) ?? undefined;
   const probeFailed = snap ? snap.state.ran === false && Boolean(state.error) : Boolean(state.error);
+  const selected = Math.max(0, state.selection.index);
   const body = [
     ...loading ? loadingRows(family || "family", state.tick) : snap ? [
-      ...probeFailed && errorMessage ? [...errorBanner(errorMessage), blank()] : [],
+      ...probeFailed && errorMessage ? [
+        ...errorBanner(errorMessage),
+        ...shouldOfferRemoteLinkRepair(state, errorMessage) ? [
+          selectableDeckRow({ label: "repair link", detail: "backfill/prepare selected remote checkout link", index: 0, active: selected === 0 }, { id: "family-repair-link", label: "repair link", intent: { scene: "server", argv: ["server", "repair-link"], action: { kind: "remote-link-repair", label: "Repair remote link", payload: { returnScene: "family", family } } }, message: "repair remote project link" })
+        ] : [],
+        blank()
+      ] : [],
       ...current.subId ? formView(state, family, snap, current).lines : overviewBody(state, family, snap, layout)
     ] : familyRecoveryRows(state, family, errorMessage)
   ];

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

@@ -435,13 +435,55 @@ function statusSegments(stats, width) {
   };
 }
 
+// packages/cli/src/app-opentui/remote-link.ts
+var REPAIRABLE_REMOTE_LINK_STATUSES = new Set([
+  "auth_required",
+  "project_not_registered",
+  "no_server_checkout",
+  "invalid_root",
+  "needs_prepare",
+  "error"
+]);
+function remoteProjectLinkError(message) {
+  return /no server-host project root link|remote project(?:-root)? link|x-rig-project-root|serverProjectRoot/i.test(message ?? "");
+}
+function serverRecordForRemoteLink(state) {
+  const server = state.data.server;
+  return server && typeof server === "object" && !Array.isArray(server) ? server : null;
+}
+function remoteProjectLinkState(state) {
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (!serverRecord || serverRecord.kind !== "remote")
+    return null;
+  const link = serverRecord.remoteProjectLink;
+  if (link && typeof link === "object" && !Array.isArray(link))
+    return link;
+  const direct = state.data.remoteProjectLink;
+  if (direct && typeof direct === "object" && !Array.isArray(direct))
+    return direct;
+  return null;
+}
+function shouldOfferRemoteLinkRepair(state, message) {
+  const link = remoteProjectLinkState(state);
+  if (link) {
+    if (link.ok === true)
+      return false;
+    const status = link.status ?? "";
+    return REPAIRABLE_REMOTE_LINK_STATUSES.has(status);
+  }
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (serverRecord && serverRecord.kind !== "remote")
+    return false;
+  return remoteProjectLinkError(message ?? state.error?.message);
+}
+
 // packages/cli/src/app-opentui/scenes/fleet.ts
-var FLEET_RECOVERY_ITEMS = [
+var BASE_FLEET_RECOVERY_ITEMS = [
   { id: "tasks", label: "tasks", intent: { scene: "tasks", argv: ["tasks"], action: { kind: "refresh", label: "Open tasks" } }, message: "open tasks and dispatch work" },
-  { id: "repair", label: "repair", intent: { scene: "command", argv: ["init", "--repair"], action: { kind: "command-run", label: "Repair project link" } }, message: "repair project/server/auth link" },
   { id: "server", label: "server", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Open server controls" } }, message: "server controls" },
   { id: "doctor", label: "doctor", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "diagnose project" }
 ];
+var FLEET_REPAIR_LINK_ITEM = { id: "repair-link", label: "repair link", intent: { scene: "server", argv: ["server", "repair-link"], action: { kind: "remote-link-repair", label: "Repair remote link", payload: { returnScene: "fleet" } } }, message: "backfill or prepare remote project link" };
 var COL = {
   glyph: 1,
   runId: 8,
@@ -606,33 +648,43 @@ function runRow(width, run, active, optimistic) {
   const item = runSelectableItem(run);
   return item ? withSelectable(row, item) : row;
 }
-var RECOVERY_DECKS = [
+var BASE_RECOVERY_DECKS = [
   { label: "tasks", detail: "open tasks and dispatch work" },
-  { label: "repair", detail: "repair project/server/auth link" },
   { label: "server", detail: "open server controls" },
   { label: "doctor", detail: "diagnose project" }
 ];
-function recoveryRows(selected, reason) {
+function fleetRecoveryItems(state) {
+  if (!shouldOfferRemoteLinkRepair(state))
+    return BASE_FLEET_RECOVERY_ITEMS;
+  return [BASE_FLEET_RECOVERY_ITEMS[0], FLEET_REPAIR_LINK_ITEM, ...BASE_FLEET_RECOVERY_ITEMS.slice(1)];
+}
+function fleetRecoveryDecks(state) {
+  if (!shouldOfferRemoteLinkRepair(state))
+    return BASE_RECOVERY_DECKS;
+  return [BASE_RECOVERY_DECKS[0], { label: "repair link", detail: "backfill/prepare remote project-root link" }, ...BASE_RECOVERY_DECKS.slice(1)];
+}
+function recoveryRows(state, selected, reason) {
+  const items = fleetRecoveryItems(state);
   return [
     ...reason ? [line(reason, { fg: RIG_UI.yellow }), line("", { fg: RIG_UI.ink3 })] : [],
     line("ACTIONS", { fg: RIG_UI.ink3, bold: true }),
-    ...RECOVERY_DECKS.map((deck, index) => selectableDeckRow({ ...deck, index, active: selected === index }, FLEET_RECOVERY_ITEMS[index]))
+    ...fleetRecoveryDecks(state).map((deck, index) => selectableDeckRow({ ...deck, index, active: selected === index }, items[index]))
   ];
 }
-function emptyRows(query, total, selected) {
+function emptyRows(state, query, total, selected) {
   if (!query.trim() && total === 0)
-    return recoveryRows(selected, "No runs yet.");
+    return recoveryRows(state, selected, "No runs yet.");
   if (query.trim() && total > 0) {
     return [
-      ...recoveryRows(selected, `No matching runs for ${JSON.stringify(query)} (${total} total).`)
+      ...recoveryRows(state, selected, `No matching runs for ${JSON.stringify(query)} (${total} total).`)
     ];
   }
-  return recoveryRows(selected, "No runs are visible with this filter.");
+  return recoveryRows(state, selected, "No runs are visible with this filter.");
 }
 function degradedRows(state, selected) {
   if (!state.error)
     return [];
-  return recoveryRows(selected, state.error.message);
+  return recoveryRows(state, selected, state.error.message);
 }
 function renderFleetScene(state, layout) {
   const width = panelWidth(layout);
@@ -642,7 +694,7 @@ function renderFleetScene(state, layout) {
   const runs = sortRuns(filterRunsForSearch(allRuns, query), spec);
   const selectedRun = typeof state.data.selectedRunId === "string" && runs.some((run) => run.runId === state.data.selectedRunId) ? state.data.selectedRunId : runs[0]?.runId;
   const selectedIndex = Math.max(0, runs.findIndex((run) => run.runId === selectedRun));
-  const recoveryIndex = Math.max(0, Math.min(3, state.selection.index));
+  const recoveryIndex = Math.max(0, Math.min(fleetRecoveryItems(state).length - 1, state.selection.index));
   const optimistic = optimisticStatuses(state);
   const updatedAgo = updatedAgoLabel(state);
   const panelTop = 0;
@@ -674,7 +726,7 @@ function renderFleetScene(state, layout) {
       ...runs.map((run, index) => runRow(contentWidth, run, index === selectedIndex, optimistic.get(run.runId)))
     ] : state.error ? degradedRows(state, recoveryIndex) : loading ? loadingRows("runs", state.tick) : [
       ...query.trim() ? [line(searchSummary("runs", query, runs.length, allRuns.length), { fg: RIG_UI.ink4 }), line("", { fg: RIG_UI.ink3 })] : [],
-      ...emptyRows(query, allRuns.length, recoveryIndex)
+      ...emptyRows(state, query, allRuns.length, recoveryIndex)
     ]
   ];
   return makeSceneFrame({

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

@@ -143,12 +143,13 @@ var PRIMARY_GROUPS = [
   {
     name: "server",
     summary: "Choose, inspect, and start the Rig server that owns tasks and runs.",
-    usage: ["rig server <status|list|add|use|start> [options]"],
+    usage: ["rig server <status|list|add|use|repair-link|start> [options]"],
     commands: [
-      { command: "status", description: "Show the selected server for this repo.", primary: true },
+      { command: "status", description: "Show the selected server and remote project-root link for this repo.", primary: true },
       { command: "use local", description: "Switch this repo to the local Rig server.", primary: true },
       { command: "add <alias> <url>", description: "Save a remote Rig server URL.", primary: true },
       { command: "use <alias>", description: "Select a saved remote server alias.", primary: true },
+      { command: "repair-link [--prepare|--backfill-only] [--repo owner/repo]", description: "Backfill or prepare the selected remote's server-host checkout link.", primary: true },
       { command: "list", description: "List saved local/remote server aliases.", primary: true },
       { command: "start [--host <host>] [--port <n>]", description: "Start a local rig-server process." }
     ],
@@ -156,6 +157,7 @@ var PRIMARY_GROUPS = [
       "rig server status",
       "rig server add prod https://where.rig-does.work",
       "rig server use prod",
+      "rig server repair-link --repo owner/repo",
       "rig server use local",
       "rig server start --port 3773"
     ],

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

@@ -79,19 +79,19 @@ function selectableDeckRow(deck, item) {
 }
 
 // packages/cli/src/app-opentui/scenes/init.ts
-var STEP_CONFIG_RUN = { id: "step-config", label: "run setup wizard", intent: { scene: "command", argv: ["init"], action: { kind: "command-run", label: "Run setup wizard" } }, message: "full interactive setup wizard" };
+var STEP_CONFIG_RUN = { id: "step-config", label: "run init", intent: { scene: "init", argv: ["init", "--yes"], action: { kind: "init-start", label: "Run init" } }, message: "initialize without embedded CLI prompts" };
 var STEP_SERVER = { id: "step-server", label: "select server", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Choose server" } }, message: "select local or remote server" };
-var STEP_AUTH = { id: "step-auth", label: "connect GitHub", intent: { scene: "command", argv: ["github", "auth", "import-gh"], action: { kind: "command-run", label: "Connect GitHub" } }, message: "import GitHub auth into the selected server" };
-var STEP_TASKS = { id: "step-tasks", label: "pick a task source", intent: { scene: "command", argv: ["init", "--repair"], action: { kind: "command-run", label: "Configure task source" } }, message: "configure or repair the task source" };
+var STEP_AUTH = { id: "step-auth", label: "connect GitHub", intent: { scene: "server", argv: ["github", "auth", "status"], action: { kind: "refresh", label: "Open GitHub auth" } }, message: "open native server/auth controls" };
+var STEP_TASKS = { id: "step-tasks", label: "repair task source", intent: { scene: "init", argv: ["init", "--repair", "--yes"], action: { kind: "init-start", label: "Repair task source" } }, message: "repair generated task-source config without embedded CLI prompts" };
 var SETUP_STEPS = [
-  { id: "config", label: "Project config", detail: "rig.config + private state", done: (s) => s.configured, cta: "Run setup wizard", item: STEP_CONFIG_RUN },
+  { id: "config", label: "Project config", detail: "rig.config + private state", done: (s) => s.configured, cta: "Run init", item: STEP_CONFIG_RUN },
   { id: "server", label: "Server target", detail: "local or remote, reachable", done: (s) => s.serverReachable, cta: "Choose a server", item: STEP_SERVER },
   { id: "auth", label: "GitHub auth", detail: "signed in on the selected server", done: (s) => s.authSignedIn, cta: "Connect GitHub", item: STEP_AUTH },
   { id: "tasks", label: "Task source", detail: "where work comes from", done: (s) => s.taskSourceReady, cta: "Pick a task source", item: STEP_TASKS }
 ];
 var SECONDARY_ACTIONS = [
-  { label: "repair", detail: "reconfigure generated config and private state", item: { id: "repair", label: "repair", intent: { scene: "command", argv: ["init", "--repair"], action: { kind: "command-run", label: "Reconfigure project" } }, message: "verify or rewrite generated config" } },
-  { label: "demo", detail: "seed an offline demo task source to explore", item: { id: "demo", label: "demo", intent: { scene: "command", argv: ["init", "--demo", "--repair"], action: { kind: "command-run", label: "Seed demo project" } }, message: "offline demo project" } },
+  { label: "repair", detail: "reconfigure generated config and private state", item: { id: "repair", label: "repair", intent: { scene: "init", argv: ["init", "--repair", "--yes"], action: { kind: "init-start", label: "Reconfigure project" } }, message: "verify or rewrite generated config natively" } },
+  { label: "demo", detail: "seed an offline demo task source to explore", item: { id: "demo", label: "demo", intent: { scene: "init", argv: ["init", "--demo", "--repair", "--yes"], action: { kind: "init-start", label: "Seed demo project" } }, message: "offline demo project without embedded CLI prompts" } },
   { label: "doctor", detail: "diagnose what is still missing", item: { id: "doctor", label: "doctor", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "verify setup" } }
 ];
 function record(value) {
@@ -135,11 +135,11 @@ function renderInitScene(state, layout) {
   const allDone = completed === SETUP_STEPS.length;
   const nextStep = SETUP_STEPS.find((step) => !step.done(signals));
   const selected = Math.max(0, state.selection.index);
-  const primary = nextStep ? selectableDeckRow({ label: "next", detail: `${nextStep.cta} \u2014 recommended`, active: selected === 0 }, { ...nextStep.item, id: "init-primary" }) : selectableDeckRow({ label: "verify", detail: "Setup complete \u2014 run doctor to confirm", active: selected === 0 }, { id: "init-primary", label: "verify", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "verify setup end-to-end" });
+  const primary = nextStep ? selectableDeckRow({ label: "next", detail: `${nextStep.cta} \u2014 recommended`, active: selected === 0 }, { ...nextStep.item, id: "init-primary" }) : selectableDeckRow({ label: "verify", detail: "Init complete \u2014 run doctor to confirm", active: selected === 0 }, { id: "init-primary", label: "verify", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "verify setup end-to-end" });
   const secondaryRows = SECONDARY_ACTIONS.map(({ label, detail, item }, index) => selectableDeckRow({ label, detail, active: selected === index + 1 }, item));
   const progress = allDone ? "all set" : `${completed} of ${SETUP_STEPS.length} complete`;
   const panelLines = [
-    line(allDone ? "SETUP \xB7 ready to go" : "SETUP \xB7 let's get you running", { fg: allDone ? RIG_UI.limeDim : RIG_UI.ink, bold: true }),
+    line(allDone ? "INIT \xB7 ready to go" : "INIT \xB7 let's get you running", { fg: allDone ? RIG_UI.limeDim : RIG_UI.ink, bold: true }),
     line(`progress  ${progress}`, { fg: allDone ? RIG_UI.limeDim : RIG_UI.ink2 }),
     blank(),
     line("CHECKLIST", { fg: RIG_UI.ink3, bold: true }),
@@ -151,11 +151,11 @@ function renderInitScene(state, layout) {
     line("OTHER PATHS", { fg: RIG_UI.ink3, bold: true }),
     ...secondaryRows,
     blank(),
-    line("enter/click runs the highlighted action \xB7 esc goes back \xB7 tab switches sections", { fg: RIG_UI.ink4 })
+    line("enter/click runs the highlighted native action \xB7 esc goes back \xB7 tab switches sections", { fg: RIG_UI.ink4 })
   ];
   return makeSceneFrame({
     scene: "init",
-    title: "Setup",
+    title: "Init",
     lines: [],
     panels: [{
       id: "init-setup",
@@ -168,11 +168,11 @@ function renderInitScene(state, layout) {
       opacity: 0.98,
       border: false,
       chrome: "ad-terminal",
-      headerText: "rig setup \xB7 guided onboarding",
+      headerText: "rig init \xB7 guided onboarding",
       paddingX: 5,
       paddingY: 2
     }],
-    footer: { message: allDone ? "setup complete" : "setup in progress" },
+    footer: { message: allDone ? "init complete" : "init in progress" },
     live: !allDone || state.status === "action"
   });
 }

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

@@ -144,7 +144,7 @@ function sparklineString(values, width) {
 
 // packages/cli/src/app-opentui/scenes/main.ts
 var CONFIGURED_MENU = [
-  ["init", "setup, reconfigure, repair project state", { id: "init", label: "init", intent: { scene: "command", argv: ["init"], action: { kind: "command-run", label: "Run init" } }, message: "run setup/reconfigure flow" }],
+  ["init", "guided setup, reconfigure, repair project state", { id: "init", label: "init", intent: { scene: "init", argv: ["init"], action: { kind: "refresh", label: "Open init" } }, message: "open native init flow" }],
   ["server", "local/remote target, auth, linkage", { id: "server", label: "server", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Checking server" } }, message: "check selected server" }],
   ["github", "auth, selected repo, stored token", { id: "github", label: "github", intent: { scene: "server", argv: ["github", "auth", "status"], action: { kind: "refresh", label: "Checking GitHub auth" } }, message: "check GitHub auth" }],
   ["tasks", "browse, filter, dispatch, attach active work", { id: "tasks", label: "tasks", intent: { scene: "tasks", argv: ["tasks"], action: { kind: "refresh", label: "Opening tasks" } }, message: "selected tasks" }],
@@ -163,10 +163,10 @@ var CONFIGURED_MENU = [
   ["help", "all actions, shortcuts, mouse controls", { id: "help", label: "help", intent: { scene: "help", argv: ["help"], action: { kind: "none", label: "Opening help" } }, message: "selected help" }]
 ];
 var ONBOARD_PRIMARY = {
-  id: "onboard-setup",
-  label: "Start guided setup",
-  intent: { scene: "init", argv: ["init"], action: { kind: "refresh", label: "Setup" } },
-  message: "open the guided setup checklist"
+  id: "onboard-init",
+  label: "Start guided init",
+  intent: { scene: "init", argv: ["init"], action: { kind: "refresh", label: "Init" } },
+  message: "open the native init checklist"
 };
 var ONBOARD_SECONDARY = [
   ["server", "select a local or remote target", { id: "server", label: "server", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Checking server" } }, message: "check selected server" }],
@@ -229,7 +229,7 @@ function configuredMenuRows(selectedIndex) {
   }));
 }
 function onboardingRows(selectedIndex) {
-  const primary = selectableDeckRow({ label: "setup", detail: "Start guided setup \u2014 recommended", active: selectedIndex === 0 }, ONBOARD_PRIMARY);
+  const primary = selectableDeckRow({ label: "init", detail: "Start guided init \u2014 recommended", active: selectedIndex === 0 }, ONBOARD_PRIMARY);
   const secondary = ONBOARD_SECONDARY.map(([label, detail, item], index) => ({
     ...deckRow({ label, detail, index: index + 1, active: selectedIndex === index + 1, activateOnClick: true }),
     selectable: item
@@ -293,7 +293,7 @@ function renderMainScene(state, layout) {
     statusLine(state)
   ] : [
     line("WELCOME", { fg: RIG_UI.ink, bold: true }),
-    line("This project isn't set up yet. One guided flow gets you running.", { fg: RIG_UI.ink2 }),
+    line("This project isn't initialized yet. One native init flow gets you running.", { fg: RIG_UI.ink2 }),
     blank(),
     line("GET STARTED", { fg: RIG_UI.ink, bold: true }),
     ...onboardingRows(actionSelected),

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

@@ -215,19 +215,85 @@ function selectableDeckRow(deck, item) {
   return { ...deckRow({ ...deck, activateOnClick: true }), selectable: item };
 }
 
+// packages/cli/src/app-opentui/remote-link.ts
+var REPAIRABLE_REMOTE_LINK_STATUSES = new Set([
+  "auth_required",
+  "project_not_registered",
+  "no_server_checkout",
+  "invalid_root",
+  "needs_prepare",
+  "error"
+]);
+function remoteProjectLinkError(message) {
+  return /no server-host project root link|remote project(?:-root)? link|x-rig-project-root|serverProjectRoot/i.test(message ?? "");
+}
+function serverRecordForRemoteLink(state) {
+  const server = state.data.server;
+  return server && typeof server === "object" && !Array.isArray(server) ? server : null;
+}
+function remoteProjectLinkState(state) {
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (!serverRecord || serverRecord.kind !== "remote")
+    return null;
+  const link = serverRecord.remoteProjectLink;
+  if (link && typeof link === "object" && !Array.isArray(link))
+    return link;
+  const direct = state.data.remoteProjectLink;
+  if (direct && typeof direct === "object" && !Array.isArray(direct))
+    return direct;
+  return null;
+}
+function shouldOfferRemoteLinkRepair(state, message) {
+  const link = remoteProjectLinkState(state);
+  if (link) {
+    if (link.ok === true)
+      return false;
+    const status = link.status ?? "";
+    return REPAIRABLE_REMOTE_LINK_STATUSES.has(status);
+  }
+  const serverRecord = serverRecordForRemoteLink(state);
+  if (serverRecord && serverRecord.kind !== "remote")
+    return false;
+  return remoteProjectLinkError(message ?? state.error?.message);
+}
+
 // packages/cli/src/app-opentui/scenes/server.ts
 var SERVER_ACTIONS = [
   { detail: "probe selected server, project root, and GitHub auth", item: { id: "refresh", label: "refresh", intent: { scene: "server", argv: ["server", "status"], action: { kind: "refresh", label: "Refresh server" } }, message: "refresh selected server" } },
-  { detail: "select local server for this repo", item: { id: "local", label: "use local", intent: { scene: "command", argv: ["server", "use", "local"], action: { kind: "command-run", label: "Use local server" } }, message: "switch this repo to local" } },
-  { detail: "choose/switch to a saved remote server alias", item: { id: "remote", label: "use remote", intent: { scene: "command", argv: ["server", "use"], action: { kind: "command-run", label: "Choose remote server" } }, message: "choose a saved remote alias" } },
-  { detail: "show saved local/remote aliases", item: { id: "list", label: "list servers", intent: { scene: "command", argv: ["server", "list"], action: { kind: "command-run", label: "List saved servers" } }, message: "list saved server aliases" } },
-  { detail: "open server add command workspace", item: { id: "add", label: "add remote", intent: { scene: "command", argv: ["server", "add"], action: { kind: "command-run", label: "Add remote server" } }, message: "open server add workspace" } },
+  { detail: "select local server for this repo", item: { id: "local", label: "use local", intent: { scene: "server", argv: ["server", "use", "local"], action: { kind: "server-use-local", label: "Use local server" } }, message: "switch this repo to local" } },
+  { detail: "type a saved remote alias to select", item: { id: "remote", label: "use remote", prompt: { label: "Use remote alias", scene: "server", argv: ["server", "use"], intentKind: "server-use-remote", payloadBase: {}, payloadKey: "alias" }, message: "choose a saved remote alias" } },
+  { detail: "show saved local/remote aliases in the status panel", item: { id: "list", label: "list servers", intent: { scene: "server", argv: ["server", "list"], action: { kind: "refresh", label: "List servers" } }, message: "list saved server aliases" } },
+  { detail: "add and select a remote: enter <alias> <https-url>", item: { id: "add", label: "add remote", prompt: { label: "Add remote", scene: "server", argv: ["server", "add"], intentKind: "server-add-remote", payloadBase: {}, payloadKey: "remote", appendValueToArgv: true }, message: "add a remote server alias" } },
   { detail: "spawn the local rig-server detached and return here", item: { id: "start", label: "start local", intent: { scene: "server", argv: ["server", "start"], action: { kind: "refresh", payload: { startLocal: true }, label: "Start local server" } }, message: "start local server detached" } },
-  { detail: "import gh token into the selected server namespace", item: { id: "auth", label: "import auth", intent: { scene: "command", argv: ["github", "auth", "import-gh"], action: { kind: "command-run", label: "Import GitHub auth" } }, message: "import gh auth to selected server" } },
+  { detail: "import gh token into the selected server namespace", item: { id: "auth", label: "import auth", intent: { scene: "server", argv: ["github", "auth", "import-gh"], action: { kind: "github-auth-import", label: "Import GitHub auth" } }, message: "import gh auth to selected server" } },
   { detail: "diagnose server/auth/project linkage", item: { id: "doctor", label: "doctor", intent: { scene: "doctor", argv: ["doctor"], action: { kind: "doctor-run", label: "Run doctor" } }, message: "verify server/auth" } },
   { detail: "verify selected server can list task source", item: { id: "tasks", label: "tasks", intent: { scene: "tasks", argv: ["task", "list"], action: { kind: "refresh", label: "Open tasks" } }, message: "verify task source" } },
   { detail: "verify selected server can list recent runs", item: { id: "runs", label: "runs", intent: { scene: "fleet", argv: ["run", "status"], action: { kind: "refresh", label: "Open runs" } }, message: "open recent runs" } }
 ];
+function remoteAliasActions(server) {
+  const aliases = (server?.aliases ?? []).filter((alias) => alias.kind === "remote");
+  return aliases.map((alias) => ({
+    detail: `${alias.selected ? "selected" : "select"} ${alias.baseUrl ?? "remote endpoint"}`,
+    item: {
+      id: `remote-alias:${alias.alias}`,
+      label: alias.selected ? `\u2713 ${alias.alias}` : `use ${alias.alias}`,
+      intent: { scene: "server", argv: ["server", "use", alias.alias], action: { kind: "server-use-remote", label: `Use ${alias.alias}`, payload: { alias: alias.alias } } },
+      message: `select ${alias.alias}`
+    }
+  }));
+}
+function serverActions(state) {
+  const server = serverState(state);
+  const remoteRows = remoteAliasActions(server);
+  let actions = remoteRows.length > 0 ? [...SERVER_ACTIONS.slice(0, 3), ...remoteRows, ...SERVER_ACTIONS.slice(3)] : [...SERVER_ACTIONS];
+  if (!shouldOfferRemoteLinkRepair(state))
+    return actions;
+  const repair = { detail: "backfill or prepare the selected remote checkout/root link", item: { id: "repair-link", label: "repair link", intent: { scene: "server", argv: ["server", "repair-link"], action: { kind: "remote-link-repair", label: "Repair remote link" } }, message: "prepare remote checkout link" } };
+  const doctorIndex = actions.findIndex((entry) => entry.item.id === "doctor");
+  if (doctorIndex < 0)
+    return [...actions, repair];
+  return [...actions.slice(0, doctorIndex), repair, ...actions.slice(doctorIndex)];
+}
 function cleanVisible(value, fallback = "unknown") {
   return value?.trim() || fallback;
 }
@@ -252,31 +318,37 @@ function selectedIndex(state, count) {
 function statusRows(server) {
   const auth = server?.auth;
   const signedIn = auth && (auth.signedIn === true || auth.authenticated === true || auth.status === "authenticated") ? "authenticated" : "auth unknown";
+  const link = server?.remoteProjectLink;
+  const linkText = link ? link.ok ? `ready \xB7 ${link.serverProjectRoot ?? "linked"}` : `${link.status ?? "needs repair"} \xB7 ${link.hint ?? link.message ?? "run repair link"}` : server?.kind === "remote" ? "not checked" : "not required";
+  const selectedLinkSummary = link?.ok ? " \xB7 root link ready" : server?.kind === "remote" && link ? ` \xB7 root link ${link.status ?? "needs repair"}` : "";
   return [
-    line(`selected    ${cleanVisible(server?.label, "not checked")}`, { fg: RIG_UI.ink2 }),
+    line(`selected    ${cleanVisible(server?.label, "not checked")}${selectedLinkSummary}`, { 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 }),
+    line(`root link   ${linkText}`, { fg: link?.ok ? RIG_UI.limeDim : server?.kind === "remote" ? RIG_UI.yellow : RIG_UI.ink4 }),
+    ...server?.aliases && server.aliases.length > 0 ? [line(`aliases     ${server.aliases.map((alias) => `${alias.selected ? "*" : ""}${alias.alias}${alias.kind === "remote" && alias.baseUrl ? `=${alias.baseUrl}` : ""}`).join(", ")}`, { fg: 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, 10);
+  const actions = serverActions(state);
+  const selected = selectedIndex(state, actions.length);
   const loading = state.status === "loading" && !server;
   const errorText = state.error?.message ?? lastRefreshError(state);
   const panelLines = [
     ...errorText ? errorBanner(errorText, "select refresh or doctor below to retry") : [],
     line("server controls", { fg: RIG_UI.ink3 }),
     blank(),
-    line("ACTIONS", { fg: RIG_UI.ink3, bold: true }),
-    ...SERVER_ACTIONS.map(({ detail, item }, index) => selectableDeckRow({ label: item.label, detail, index, active: selected === index }, item)),
-    blank(),
     line("STATUS", { fg: RIG_UI.ink3, bold: true }),
     ...loading ? loadingRows("server status", state.tick) : statusRows(server),
     blank(),
-    line("enter/click runs action \xB7 command rows stay inside OpenTUI PTY", { fg: RIG_UI.ink4 })
+    line("ACTIONS", { fg: RIG_UI.ink3, bold: true }),
+    ...actions.map(({ detail, item }, index) => selectableDeckRow({ label: item.label, detail, index, active: selected === index }, item)),
+    blank(),
+    line("enter/click runs native actions \xB7 add/use remote prompts stay in OpenTUI", { fg: RIG_UI.ink4 })
   ];
   return makeSceneFrame({
     scene: "server",