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

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

@@ -187,16 +187,31 @@ function taskViewIntent(argv, command = "", rest = [], raw) {
   const { payload, label } = taskViewPayload(command, rest);
   return intent("tasks", argv, "refresh", payload, label, raw);
 }
-function routeServer(argv, command, raw, checkingLabel) {
-  if (!command || command === "status") {
+function routeServer(argv, command, rest, raw, checkingLabel) {
+  if (!command || command === "status" || command === "list") {
     return intent("server", argv, "refresh", undefined, command ? checkingLabel : "Loading server", raw);
   }
+  if (command === "use") {
+    const alias = firstNonOption(rest);
+    if (alias === "local")
+      return intent("server", argv, "server-use-local", undefined, "Use local server", raw);
+    if (alias)
+      return intent("server", argv, "server-use-remote", { alias }, `Use ${alias}`, raw);
+    return intent("server", argv, "refresh", undefined, "Select a remote alias in Server", raw);
+  }
+  if (command === "add")
+    return intent("server", argv, "server-add-remote", { argv: [...argv] }, "Add remote server", raw);
+  if (command === "repair-link")
+    return intent("server", argv, "remote-link-repair", undefined, "Repair remote link", raw);
   return commandRunIntent(argv, raw);
 }
 function routeGithub(argv, command, rest, raw) {
   if (command === "auth" && (rest[0]?.toLowerCase() ?? "status") === "status" && rest.length <= 1) {
     return intent("server", argv, "refresh", undefined, "Checking GitHub auth", raw);
   }
+  if (command === "auth" && rest[0]?.toLowerCase() === "import-gh" && rest.length <= 1) {
+    return intent("server", argv, "github-auth-import", undefined, "Import GitHub auth", raw);
+  }
   return commandRunIntent(argv, raw);
 }
 function routeDoctor(argv, command, raw) {
@@ -245,11 +260,16 @@ function intentFromArgv(argv) {
     return commandRunIntent(argv);
   }
   if (normalizedGroup === "server")
-    return routeServer(argv, normalizedCommand, undefined, "Checking server");
+    return routeServer(argv, normalizedCommand, rest, undefined, "Checking server");
   if (normalizedGroup === "github")
     return routeGithub(argv, normalizedCommand, rest);
-  if (normalizedGroup === "init")
-    return commandRunIntent(argv);
+  if (normalizedGroup === "init") {
+    if (!normalizedCommand)
+      return intent("init", argv, "refresh", undefined, "Open init");
+    if (rest.includes("--yes") || normalizedCommand === "--yes")
+      return intent("init", argv, "init-start", undefined, "Run init");
+    return intent("init", argv, "refresh", undefined, "Open init");
+  }
   if (normalizedGroup === "doctor")
     return routeDoctor(argv, normalizedCommand);
   if (normalizedGroup === "inbox")
@@ -312,12 +332,17 @@ function intentFromTypeBar(value) {
       return commandRunIntent(parts, value);
     return intent("tasks", parts, "refresh", undefined, "Select a task, then press Enter; or use run next", value);
   }
-  if (first === "init")
-    return commandRunIntent(parts, value);
+  if (first === "init") {
+    if (!second)
+      return intent("init", parts, "refresh", undefined, "Open init", value);
+    if (parts.includes("--yes"))
+      return intent("init", parts, "init-start", undefined, "Run init", value);
+    return intent("init", parts, "refresh", undefined, "Open init", value);
+  }
   if (first === "doctor")
     return routeDoctor(parts, second, value);
   if (first === "server")
-    return routeServer(parts, second, value, "Loading server");
+    return routeServer(parts, second, rest, value, "Loading server");
   if (first === "github")
     return routeGithub(parts, second, rest, value);
   if (first === "inbox")

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

@@ -67,12 +67,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." }
     ],
@@ -80,6 +81,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"
     ],
@@ -976,16 +978,31 @@ function taskViewIntent(argv, command = "", rest = [], raw) {
   const { payload, label } = taskViewPayload(command, rest);
   return intent("tasks", argv, "refresh", payload, label, raw);
 }
-function routeServer(argv, command, raw, checkingLabel) {
-  if (!command || command === "status") {
+function routeServer(argv, command, rest, raw, checkingLabel) {
+  if (!command || command === "status" || command === "list") {
     return intent("server", argv, "refresh", undefined, command ? checkingLabel : "Loading server", raw);
   }
+  if (command === "use") {
+    const alias = firstNonOption(rest);
+    if (alias === "local")
+      return intent("server", argv, "server-use-local", undefined, "Use local server", raw);
+    if (alias)
+      return intent("server", argv, "server-use-remote", { alias }, `Use ${alias}`, raw);
+    return intent("server", argv, "refresh", undefined, "Select a remote alias in Server", raw);
+  }
+  if (command === "add")
+    return intent("server", argv, "server-add-remote", { argv: [...argv] }, "Add remote server", raw);
+  if (command === "repair-link")
+    return intent("server", argv, "remote-link-repair", undefined, "Repair remote link", raw);
   return commandRunIntent(argv, raw);
 }
 function routeGithub(argv, command, rest, raw) {
   if (command === "auth" && (rest[0]?.toLowerCase() ?? "status") === "status" && rest.length <= 1) {
     return intent("server", argv, "refresh", undefined, "Checking GitHub auth", raw);
   }
+  if (command === "auth" && rest[0]?.toLowerCase() === "import-gh" && rest.length <= 1) {
+    return intent("server", argv, "github-auth-import", undefined, "Import GitHub auth", raw);
+  }
   return commandRunIntent(argv, raw);
 }
 function routeDoctor(argv, command, raw) {
@@ -1034,11 +1051,16 @@ function intentFromArgv(argv) {
     return commandRunIntent(argv);
   }
   if (normalizedGroup === "server")
-    return routeServer(argv, normalizedCommand, undefined, "Checking server");
+    return routeServer(argv, normalizedCommand, rest, undefined, "Checking server");
   if (normalizedGroup === "github")
     return routeGithub(argv, normalizedCommand, rest);
-  if (normalizedGroup === "init")
-    return commandRunIntent(argv);
+  if (normalizedGroup === "init") {
+    if (!normalizedCommand)
+      return intent("init", argv, "refresh", undefined, "Open init");
+    if (rest.includes("--yes") || normalizedCommand === "--yes")
+      return intent("init", argv, "init-start", undefined, "Run init");
+    return intent("init", argv, "refresh", undefined, "Open init");
+  }
   if (normalizedGroup === "doctor")
     return routeDoctor(argv, normalizedCommand);
   if (normalizedGroup === "inbox")
@@ -1101,12 +1123,17 @@ function intentFromTypeBar(value) {
       return commandRunIntent(parts, value);
     return intent("tasks", parts, "refresh", undefined, "Select a task, then press Enter; or use run next", value);
   }
-  if (first === "init")
-    return commandRunIntent(parts, value);
+  if (first === "init") {
+    if (!second)
+      return intent("init", parts, "refresh", undefined, "Open init", value);
+    if (parts.includes("--yes"))
+      return intent("init", parts, "init-start", undefined, "Run init", value);
+    return intent("init", parts, "refresh", undefined, "Open init", value);
+  }
   if (first === "doctor")
     return routeDoctor(parts, second, value);
   if (first === "server")
-    return routeServer(parts, second, value, "Loading server");
+    return routeServer(parts, second, rest, value, "Loading server");
   if (first === "github")
     return routeGithub(parts, second, rest, value);
   if (first === "inbox")
@@ -1124,397 +1151,6 @@ function intentFromTypeBar(value) {
   return intentFromArgv(parts);
 }
 
-// packages/cli/src/app-opentui/pi-pty-host.ts
-import { fileURLToPath as fileURLToPath2 } from "url";
-import { basename as basename2 } from "path";
-import { RGBA, StyledText, TextAttributes } from "@opentui/core";
-import { Terminal as XtermTerminal2 } from "@xterm/headless";
-var MIN_COLS2 = 40;
-var MIN_ROWS2 = 12;
-var MAX_ROWS2 = 300;
-var MAX_SNAPSHOT_LINES2 = 360;
-var STYLED_SNAPSHOT_MARGIN = 6;
-var SNAPSHOT_DELAY_MS2 = 120;
-var fallbackChildScriptPath = fileURLToPath2(new URL("./pi-host-child.ts", import.meta.url));
-var activeHost2 = null;
-function clampCols2(cols) {
-  return Math.max(MIN_COLS2, Math.trunc(cols || 100));
-}
-function clampRows2(rows) {
-  return Math.max(MIN_ROWS2, Math.min(MAX_ROWS2, Math.trunc(rows || 35)));
-}
-var XTERM_COLOR_MODE_INDEXED_16 = 16777216;
-var XTERM_COLOR_MODE_INDEXED_256 = 33554432;
-var XTERM_COLOR_MODE_RGB = 50331648;
-function rgbaFromXtermColor(mode, value) {
-  if (mode === 1 || mode === 2 || mode === XTERM_COLOR_MODE_INDEXED_16 || mode === XTERM_COLOR_MODE_INDEXED_256) {
-    return RGBA.fromIndex(value);
-  }
-  if (mode === 3 || mode === XTERM_COLOR_MODE_RGB) {
-    return RGBA.fromInts(value >> 16 & 255, value >> 8 & 255, value & 255);
-  }
-  return;
-}
-function textAttributesFromCell(cell) {
-  let attributes = TextAttributes.NONE;
-  if (cell.isBold())
-    attributes |= TextAttributes.BOLD;
-  if (cell.isDim())
-    attributes |= TextAttributes.DIM;
-  if (cell.isItalic())
-    attributes |= TextAttributes.ITALIC;
-  if (cell.isUnderline())
-    attributes |= TextAttributes.UNDERLINE;
-  if (cell.isBlink())
-    attributes |= TextAttributes.BLINK;
-  if (cell.isInverse())
-    attributes |= TextAttributes.INVERSE;
-  if (cell.isInvisible())
-    attributes |= TextAttributes.HIDDEN;
-  if (cell.isStrikethrough())
-    attributes |= TextAttributes.STRIKETHROUGH;
-  return attributes;
-}
-function sameRgba(a, b) {
-  if (!a && !b)
-    return true;
-  return Boolean(a && b && a.equals(b));
-}
-function sameStyle(a, b) {
-  return sameRgba(a.fg, b.fg) && sameRgba(a.bg, b.bg) && (a.attributes ?? 0) === (b.attributes ?? 0);
-}
-function styleFromCell(cell) {
-  return {
-    fg: rgbaFromXtermColor(cell.getFgColorMode(), cell.getFgColor()),
-    bg: rgbaFromXtermColor(cell.getBgColorMode(), cell.getBgColor()),
-    attributes: textAttributesFromCell(cell)
-  };
-}
-function lineToStyledText(line, cols) {
-  if (!line)
-    return new StyledText([{ __isChunk: true, text: "" }]);
-  const chunks = [];
-  let run = "";
-  let runStyle = null;
-  const flush = () => {
-    if (!run)
-      return;
-    chunks.push({
-      __isChunk: true,
-      text: run,
-      ...runStyle?.fg ? { fg: runStyle.fg } : {},
-      ...runStyle?.bg ? { bg: runStyle.bg } : {},
-      ...(runStyle?.attributes ?? 0) !== 0 ? { attributes: runStyle.attributes } : {}
-    });
-    run = "";
-  };
-  for (let index = 0;index < cols; index += 1) {
-    const cell = line.getCell(index);
-    if (!cell) {
-      if (runStyle !== null)
-        flush();
-      runStyle = null;
-      run += " ";
-      continue;
-    }
-    if (cell.getWidth() === 0)
-      continue;
-    const style = styleFromCell(cell);
-    if (!runStyle || !sameStyle(runStyle, style)) {
-      flush();
-      runStyle = style;
-    }
-    run += cell.getChars() || " ";
-  }
-  flush();
-  return new StyledText(chunks.length > 0 ? chunks : [{ __isChunk: true, text: "" }]);
-}
-function childCommandPrefix2() {
-  const execName = basename2(process.execPath).toLowerCase();
-  const currentEntry = process.argv[1];
-  if (execName === "bun" || execName === "bun.exe") {
-    return currentEntry ? [process.execPath, currentEntry, "__opentui-pi-host"] : [process.execPath, fallbackChildScriptPath];
-  }
-  return [process.execPath, "__opentui-pi-host"];
-}
-function withEnv2(base) {
-  const env = {};
-  for (const [key, value] of Object.entries(base ?? process.env)) {
-    if (key === "RIG_PLAIN" || key === "RIG_CLI_PLAIN_HELP" || key === "NO_COLOR")
-      continue;
-    if (typeof value === "string")
-      env[key] = value;
-  }
-  return {
-    ...env,
-    TERM: "xterm-256color",
-    COLORTERM: "truecolor",
-    FORCE_COLOR: env.FORCE_COLOR ?? "1",
-    RIG_OPENTUI_PI_HOST: "1"
-  };
-}
-function getActivePiHost() {
-  return activeHost2 && !activeHost2.disposed ? activeHost2 : null;
-}
-function stopActivePiHost(reason = "detach") {
-  activeHost2?.dispose(reason);
-  activeHost2 = null;
-}
-
-class PiPtyHost {
-  runId;
-  projectRoot;
-  onSnapshot;
-  onExit;
-  onError;
-  terminal;
-  disposables = [];
-  decoder = new TextDecoder("utf-8");
-  proc = null;
-  pty = null;
-  status = "starting";
-  cols;
-  rows;
-  message = "starting bundled Pi";
-  lastResizeError = null;
-  exitCode;
-  signal;
-  notifyTimer = null;
-  lastStreamKey = "";
-  _disposed = false;
-  constructor(options) {
-    this.runId = options.runId;
-    this.projectRoot = options.projectRoot;
-    this.cols = clampCols2(options.cols);
-    this.rows = clampRows2(options.rows);
-    this.onSnapshot = options.onSnapshot;
-    this.onExit = options.onExit;
-    this.onError = options.onError;
-    this.terminal = new XtermTerminal2({
-      allowProposedApi: true,
-      cols: this.cols,
-      rows: this.rows,
-      scrollback: 1000
-    });
-    this.registerTerminalResponders();
-    this.disposables.push(this.terminal.onWriteParsed(() => {
-      if (this._disposed)
-        return;
-      const snapshot = this.createSnapshot();
-      const key = snapshot.lines.join(`
-`);
-      if (key === this.lastStreamKey)
-        return;
-      this.lastStreamKey = key;
-      this.onSnapshot?.(snapshot);
-    }));
-  }
-  get disposed() {
-    return this._disposed;
-  }
-  get snapshot() {
-    return this.createSnapshot();
-  }
-  async start() {
-    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. Pi host requires Bun.Terminal.");
-    }
-    const spawnOptions = {
-      cwd: this.projectRoot,
-      env: withEnv2(process.env),
-      terminal: {
-        cols: this.cols,
-        rows: this.rows,
-        name: "xterm-256color",
-        data: (_terminal, data) => this.handlePtyData(data)
-      }
-    };
-    const proc = Bun.spawn([
-      ...childCommandPrefix2(),
-      "--run-id",
-      this.runId,
-      "--project-root",
-      this.projectRoot
-    ], spawnOptions);
-    if (!proc.terminal)
-      throw new Error("Bun did not attach a terminal to the bundled Pi child process.");
-    this.proc = proc;
-    this.pty = proc.terminal;
-    this.status = "running";
-    this.message = "bundled Pi running inside this app";
-    this.emitSnapshotSoon(0);
-    proc.exited.then((exitCode) => {
-      if (this._disposed)
-        return;
-      this.status = exitCode === 0 ? "exited" : "failed";
-      this.exitCode = exitCode;
-      this.signal = null;
-      this.message = exitCode === 0 ? "bundled Pi exited" : `bundled Pi exited with code ${exitCode}`;
-      const snapshot = this.createSnapshot();
-      this.onSnapshot?.(snapshot);
-      this.onExit?.(snapshot);
-      if (activeHost2 === this)
-        activeHost2 = null;
-      this.dispose("exit", { kill: false, notify: false });
-    }).catch((error) => {
-      if (this._disposed)
-        return;
-      this.status = "failed";
-      this.message = error instanceof Error ? error.message : String(error);
-      const snapshot = this.createSnapshot();
-      this.onSnapshot?.(snapshot);
-      this.onError?.(error, snapshot);
-      if (activeHost2 === this)
-        activeHost2 = null;
-      this.dispose("error", { kill: false, notify: false });
-    });
-  }
-  write(data) {
-    if (this._disposed || !this.pty)
-      return;
-    try {
-      this.pty.write(data);
-    } catch (error) {
-      this.status = "failed";
-      this.message = error instanceof Error ? error.message : String(error);
-      const snapshot = this.createSnapshot();
-      this.onSnapshot?.(snapshot);
-      this.onError?.(error, snapshot);
-    }
-  }
-  resize(cols, rows) {
-    const nextCols = clampCols2(cols);
-    const nextRows = clampRows2(rows);
-    if (nextCols === this.cols && nextRows === this.rows)
-      return;
-    this.cols = nextCols;
-    this.rows = nextRows;
-    this.terminal.resize(nextCols, nextRows);
-    try {
-      this.pty?.resize(nextCols, nextRows);
-      this.lastResizeError = null;
-    } catch (error) {
-      this.lastResizeError = error instanceof Error ? error.message : String(error);
-    }
-    this.emitSnapshotSoon(0);
-  }
-  detach() {
-    this.dispose("detach");
-    return this.createSnapshot("detached from bundled Pi");
-  }
-  dispose(reason = "dispose", options = {}) {
-    if (this._disposed)
-      return;
-    this._disposed = true;
-    if (this.notifyTimer)
-      clearTimeout(this.notifyTimer);
-    this.notifyTimer = null;
-    for (const disposable of this.disposables.splice(0)) {
-      try {
-        disposable.dispose();
-      } catch {}
-    }
-    if (options.kill !== false) {
-      try {
-        this.proc?.kill("SIGTERM");
-      } catch {}
-    }
-    try {
-      this.pty?.close();
-    } catch {}
-    try {
-      this.terminal.dispose();
-    } catch {}
-    if (activeHost2 === this)
-      activeHost2 = null;
-    if (options.notify) {
-      this.message = reason;
-      this.onSnapshot?.(this.createSnapshot(reason));
-    }
-  }
-  handlePtyData(data) {
-    if (this._disposed)
-      return;
-    const text = this.decoder.decode(data, { stream: true });
-    this.respondToRawTerminalQueries(text);
-    this.terminal.write(data);
-  }
-  emitSnapshotSoon(delayMs = SNAPSHOT_DELAY_MS2) {
-    if (this._disposed || this.notifyTimer)
-      return;
-    this.notifyTimer = setTimeout(() => {
-      this.notifyTimer = null;
-      if (this._disposed)
-        return;
-      this.onSnapshot?.(this.createSnapshot());
-    }, delayMs);
-  }
-  createSnapshot(message = this.message) {
-    const buffer = this.terminal.buffer.active;
-    const end = buffer.length;
-    const start = Math.max(0, end - MAX_SNAPSHOT_LINES2);
-    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));
-      if (row >= styledStart)
-        styledLines[lines.length - 1] = lineToStyledText(line, this.cols);
-    }
-    while (lines.length < this.rows) {
-      lines.push("");
-      styledLines[lines.length - 1] = new StyledText([{ __isChunk: true, text: "" }]);
-    }
-    const resolvedMessage = this.lastResizeError ? `resize degraded: ${this.lastResizeError}` : message;
-    return {
-      runId: this.runId,
-      status: this.status,
-      cols: this.cols,
-      rows: this.rows,
-      lines,
-      styledLines,
-      message: resolvedMessage,
-      ...this.lastResizeError ? { resizeError: this.lastResizeError } : {},
-      ...this.exitCode !== undefined ? { exitCode: this.exitCode } : {},
-      ...this.signal !== undefined ? { signal: this.signal } : {}
-    };
-  }
-  registerTerminalResponders() {
-    this.disposables.push(this.terminal.parser.registerCsiHandler({ final: "c" }, (params) => {
-      if (params.length === 0 || params[0] === 0)
-        this.write("\x1B[?62;22c");
-      return false;
-    }));
-    this.disposables.push(this.terminal.parser.registerCsiHandler({ prefix: ">", final: "c" }, (params) => {
-      if (params.length === 0 || params[0] === 0)
-        this.write("\x1B[>0;0;0c");
-      return false;
-    }));
-    this.disposables.push(this.terminal.parser.registerCsiHandler({ final: "n" }, (params) => {
-      if (params[0] === 5) {
-        this.write("\x1B[0n");
-      } else if (params[0] === 6) {
-        const row = this.terminal.buffer.active.cursorY + 1;
-        const col = this.terminal.buffer.active.cursorX + 1;
-        this.write(`\x1B[${row};${col}R`);
-      }
-      return false;
-    }));
-  }
-  respondToRawTerminalQueries(text) {
-    if (!text)
-      return;
-    const decrqm = /\x1b\[\?(\d+)\$p/g;
-    let match;
-    while ((match = decrqm.exec(text)) !== null) {
-      this.write(`\x1B[?${match[1]};2$y`);
-    }
-  }
-}
-
 // packages/cli/src/app-opentui/keymap.ts
 var autocompleteState;
 function clearTypeBar(context, message) {
@@ -1524,22 +1160,15 @@ function clearTypeBar(context, message) {
   context.emitTypeBarPatch({ value: "", mode: "nav", prompt: undefined, message });
 }
 function handleEmbeddedTerminalKey(context, key) {
-  const state = context.getState();
-  const piHost = getActivePiHost();
-  const commandHost = getActiveCommandHost();
-  const host = state.scene === "handoff" ? piHost : state.scene === "command" ? commandHost : null;
+  if (context.getState().scene !== "command")
+    return false;
+  const host = getActiveCommandHost();
   if (!host)
     return false;
   if (key.ctrl && key.name === "]") {
-    if (state.scene === "handoff") {
-      stopActivePiHost("operator detach");
-      clearTypeBar(context, "detached from Pi");
-      context.runAppAction("Opening runs", () => context.runtime.runIntent({ scene: "fleet", argv: ["runs"], action: { kind: "refresh", label: "Opening runs" } }));
-    } else {
-      stopActiveCommandHost("operator detach");
-      clearTypeBar(context, "closed command");
-      context.runAppAction("Project menu", () => context.runtime.runIntent({ scene: "main", argv: ["main"], action: { kind: "none", label: "Project menu" } }));
-    }
+    stopActiveCommandHost("operator detach");
+    clearTypeBar(context, "closed command");
+    context.runAppAction("Project menu", () => context.runtime.runIntent({ scene: "main", argv: ["main"], action: { kind: "none", label: "Project menu" } }));
     return true;
   }
   const sequence = key.raw || key.sequence;