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

package/dist/src/launcher.js

@@ -13,9 +13,7 @@ import {
   RigInboxInputsOutput,
   RigRunListOutput,
   RigRunShowOutput,
-  RigServerRepairLinkOutput,
   RigServerStatusOutput,
-  RigServerUseOutput,
   RigStatsOutput,
   RigTaskListOutput,
   RigTaskShowOutput
@@ -25,9 +23,7 @@ var CLI_OUTPUT_SCHEMAS = {
   "task show": RigTaskShowOutput,
   "run list": RigRunListOutput,
   "run show": RigRunShowOutput,
-  "server use": RigServerUseOutput,
   "server status": RigServerStatusOutput,
-  "server repair-link": RigServerRepairLinkOutput,
   "inbox approvals": RigInboxApprovalsOutput,
   "inbox inputs": RigInboxInputsOutput,
   "doctor check": RigDoctorCheckOutput,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.89",
+  "version": "0.0.6-alpha.90",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -26,18 +26,14 @@
   "dependencies": {
     "@earendil-works/pi-coding-agent": "0.79.0",
     "@earendil-works/pi-tui": "^0.79.0",
-    "@opentui/core": "^0.4.1",
-    "@opentui/react": "0.4.1",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.89",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.89",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.89",
-    "@rig/pi-rig": "npm:@h-rig/pi-rig@0.0.6-alpha.89",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.89",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.89",
-    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.89",
-    "@xterm/headless": "^6.0.0",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.90",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.90",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.90",
+    "@rig/pi-rig": "npm:@h-rig/pi-rig@0.0.6-alpha.90",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.90",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.90",
+    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.90",
     "effect": "4.0.0-beta.78",
-    "picocolors": "^1.1.1",
-    "react": "^19.2.0"
+    "picocolors": "^1.1.1"
   }
 }

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

@@ -1,2 +0,0 @@
-import type { AppAdapterContext } from "./common";
-export declare function runCommandInAppPty(ctx: AppAdapterContext, argv: readonly string[]): Promise<void>;

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

@@ -1,329 +0,0 @@
-// @bun
-// packages/cli/src/app-opentui/adapters/common.ts
-function projectRootOf(ctx) {
-  const root = ctx.rig?.projectRoot ?? ctx.projectRoot ?? ctx.getState().projectRoot;
-  if (typeof root === "string" && root.trim())
-    return root;
-  throw new Error("App adapter requires a projectRoot.");
-}
-function normalizeAppError(error) {
-  const message = error instanceof Error ? error.message : String(error);
-  const rawHint = error instanceof Error ? error.hint : undefined;
-  return {
-    message,
-    ...typeof rawHint === "string" && rawHint.trim() ? { hint: rawHint.trim() } : {}
-  };
-}
-function emitStarted(ctx, label, optimistic) {
-  ctx.emit({ type: "action.started", label, ...optimistic ? { optimistic } : {} });
-}
-function emitCompleted(ctx, label, data) {
-  ctx.emit({ type: "action.completed", label, ...data ? { data } : {} });
-}
-function emitFailed(ctx, label, error, data) {
-  if (data)
-    patchData(ctx, data);
-  const normalized = normalizeAppError(error);
-  ctx.emit({
-    type: "action.failed",
-    label,
-    message: normalized.message,
-    ...normalized.hint ? { hint: normalized.hint } : {},
-    cause: error
-  });
-}
-function patchData(ctx, data) {
-  ctx.emit({ type: "data.patch", data });
-}
-function patchFooter(ctx, footer) {
-  ctx.emit({ type: "footer.patch", footer });
-}
-
-// packages/cli/src/app-opentui/command-pty-host.ts
-import { basename } from "path";
-import { fileURLToPath } from "url";
-import { Terminal as XtermTerminal } from "@xterm/headless";
-var MIN_COLS = 40;
-var MIN_ROWS = 10;
-var MAX_ROWS = 300;
-var MAX_SNAPSHOT_LINES = 420;
-var SNAPSHOT_DELAY_MS = 80;
-var fallbackCliScriptPath = fileURLToPath(new URL("../../bin/rig.ts", import.meta.url));
-var activeHost = null;
-function clampCols(cols) {
-  return Math.max(MIN_COLS, Math.trunc(cols || 120));
-}
-function clampRows(rows) {
-  return Math.max(MIN_ROWS, Math.min(MAX_ROWS, Math.trunc(rows || 36)));
-}
-function childCommandPrefix() {
-  const execName = basename(process.execPath).toLowerCase();
-  const currentEntry = process.argv[1];
-  if (execName === "bun" || execName === "bun.exe") {
-    return currentEntry ? [process.execPath, currentEntry] : [process.execPath, fallbackCliScriptPath];
-  }
-  return [process.execPath];
-}
-function withEnv(base) {
-  const env = {};
-  for (const [key, value] of Object.entries(base ?? process.env)) {
-    if (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_PLAIN: "1",
-    RIG_OPENTUI_COMMAND_HOST: "1",
-    RIG_CLI_PLAIN_HELP: env.RIG_CLI_PLAIN_HELP ?? "1"
-  };
-}
-function commandLabel(argv, fallback) {
-  const command = argv.join(" ").trim();
-  return fallback?.trim() || (command ? `rig ${command}` : "rig");
-}
-async function startCommandPtyHost(options) {
-  activeHost?.dispose("replace");
-  const host = new CommandPtyHost(options);
-  activeHost = host;
-  await host.start();
-  return host;
-}
-
-class CommandPtyHost {
-  argv;
-  projectRoot;
-  label;
-  env;
-  onSnapshot;
-  onExit;
-  onError;
-  terminal;
-  decoder = new TextDecoder("utf-8");
-  proc = null;
-  pty = null;
-  status = "starting";
-  cols;
-  rows;
-  message = "starting command";
-  exitCode;
-  signal;
-  notifyTimer = null;
-  _disposed = false;
-  constructor(options) {
-    this.argv = [...options.argv];
-    this.projectRoot = options.projectRoot;
-    this.label = commandLabel(options.argv, options.label);
-    this.env = options.env;
-    this.cols = clampCols(options.cols);
-    this.rows = clampRows(options.rows);
-    this.onSnapshot = options.onSnapshot;
-    this.onExit = options.onExit;
-    this.onError = options.onError;
-    this.terminal = new XtermTerminal({ allowProposedApi: true, cols: this.cols, rows: this.rows, scrollback: 2000 });
-  }
-  get disposed() {
-    return this._disposed;
-  }
-  get snapshot() {
-    return this.createSnapshot();
-  }
-  async start() {
-    if (this._disposed)
-      throw new Error("Command PTY host is disposed.");
-    if (typeof Bun.Terminal !== "function") {
-      throw new Error("Bun native PTY is unavailable in this runtime. Command host requires Bun.Terminal.");
-    }
-    const spawnOptions = {
-      cwd: this.projectRoot,
-      env: withEnv(this.env),
-      terminal: {
-        cols: this.cols,
-        rows: this.rows,
-        name: "xterm-256color",
-        data: (_terminal, data) => this.handlePtyData(data)
-      }
-    };
-    const proc = Bun.spawn([...childCommandPrefix(), ...this.argv], spawnOptions);
-    if (!proc.terminal)
-      throw new Error("Bun did not attach a terminal to the command child process.");
-    this.proc = proc;
-    this.pty = proc.terminal;
-    this.status = "running";
-    this.message = "running";
-    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 ? "completed" : `exited with code ${exitCode}`;
-      const snapshot = this.createSnapshot();
-      this.onSnapshot?.(snapshot);
-      this.onExit?.(snapshot);
-      if (activeHost === this)
-        activeHost = 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 (activeHost === this)
-        activeHost = 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 = clampCols(cols);
-    const nextRows = clampRows(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);
-    } catch {}
-    this.emitSnapshotSoon(0);
-  }
-  dispose(reason = "dispose", options = {}) {
-    if (this._disposed)
-      return;
-    this._disposed = true;
-    if (this.notifyTimer)
-      clearTimeout(this.notifyTimer);
-    this.notifyTimer = null;
-    if (options.kill !== false) {
-      try {
-        this.proc?.kill("SIGTERM");
-      } catch {}
-    }
-    try {
-      this.pty?.close();
-    } catch {}
-    try {
-      this.terminal.dispose();
-    } catch {}
-    if (activeHost === this)
-      activeHost = null;
-    if (options.notify) {
-      this.message = reason;
-      this.onSnapshot?.(this.createSnapshot(reason));
-    }
-  }
-  handlePtyData(data) {
-    if (this._disposed)
-      return;
-    this.decoder.decode(data, { stream: true });
-    this.terminal.write(data, () => this.emitSnapshotSoon());
-  }
-  emitSnapshotSoon(delayMs = SNAPSHOT_DELAY_MS) {
-    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_LINES);
-    const lines = [];
-    for (let row = start;row < end; row += 1) {
-      const line = buffer.getLine(row);
-      lines.push((line?.translateToString(false) ?? "").slice(0, this.cols));
-    }
-    while (lines.length < this.rows)
-      lines.push("");
-    return {
-      command: this.argv,
-      label: this.label,
-      status: this.status,
-      cols: this.cols,
-      rows: this.rows,
-      lines,
-      message,
-      ...this.exitCode !== undefined ? { exitCode: this.exitCode } : {},
-      ...this.signal !== undefined ? { signal: this.signal } : {}
-    };
-  }
-}
-
-// packages/cli/src/app-opentui/adapters/command.ts
-function commandLabel2(argv) {
-  const command = argv.join(" ").trim();
-  return command ? `rig ${command}` : "rig";
-}
-async function runCommandInAppPty(ctx, argv) {
-  const label = commandLabel2(argv);
-  emitStarted(ctx, label, { command: { label, argv, status: "starting" } });
-  patchData(ctx, {
-    command: { label, argv, status: "starting" },
-    commandTerminal: {
-      command: argv,
-      label,
-      status: "starting",
-      cols: 120,
-      rows: 32,
-      lines: [],
-      message: "starting"
-    }
-  });
-  patchFooter(ctx, { message: label });
-  try {
-    const host = await startCommandPtyHost({
-      argv,
-      projectRoot: projectRootOf(ctx),
-      cols: 120,
-      rows: 32,
-      label,
-      onSnapshot(snapshot) {
-        patchData(ctx, { commandTerminal: snapshot, command: { label, argv, status: snapshot.status, message: snapshot.message } });
-        patchFooter(ctx, { message: `${label} \xB7 ${snapshot.message ?? snapshot.status}` });
-      },
-      onExit(snapshot) {
-        patchData(ctx, { commandTerminal: snapshot, command: { label, argv, status: snapshot.status, message: snapshot.message } });
-        if (snapshot.status === "exited")
-          emitCompleted(ctx, label, { exitCode: snapshot.exitCode ?? 0 });
-        else
-          emitFailed(ctx, label, new Error(snapshot.message ?? "Command failed"), { commandTerminal: snapshot });
-      },
-      onError(error, snapshot) {
-        patchData(ctx, { commandTerminal: snapshot, command: { label, argv, status: "failed", message: snapshot.message } });
-        emitFailed(ctx, label, error, { commandTerminal: snapshot });
-      }
-    });
-    patchData(ctx, { commandTerminal: host.snapshot });
-  } catch (error) {
-    emitFailed(ctx, label, error);
-    throw error;
-  }
-}
-export {
-  runCommandInAppPty
-};

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

@@ -1,56 +0,0 @@
-import type { RunnerContext } from "../../runner";
-import type { AppEvent, AppIntent, AppRuntime, AppSceneId } from "../types";
-export type AppStateLike = {
-    readonly projectRoot?: string;
-    readonly scene?: AppSceneId;
-    readonly status?: string;
-    readonly tick?: number;
-    readonly argv?: readonly string[];
-    readonly data?: Record<string, unknown>;
-    readonly footer?: Record<string, unknown>;
-    readonly [key: string]: unknown;
-};
-export type AppAdapterEvent = AppEvent;
-export type AppRendererHandoff = {
-    readonly suspend?: () => void | Promise<void>;
-    readonly resume?: () => void | Promise<void>;
-    readonly destroy?: () => void | Promise<void>;
-};
-export type AppAdapterContext = {
-    readonly projectRoot?: string;
-    readonly rig?: Pick<RunnerContext, "projectRoot" | "runId" | "outputMode">;
-    readonly renderer?: AppRendererHandoff;
-    readonly ensureRuntime?: () => Promise<RunnerContext>;
-    emit(event: AppAdapterEvent): void;
-    getState(): AppStateLike;
-};
-export declare function adapterContextFromRuntime(runtime: AppRuntime, renderer?: AppRendererHandoff): AppAdapterContext;
-export type NormalizedAppError = {
-    readonly message: string;
-    readonly hint?: string;
-};
-export type CapturedConsole = {
-    readonly result: unknown;
-    readonly output: readonly string[];
-};
-export declare function projectRootOf(ctx: AppAdapterContext): string;
-export declare function runtimeOf(ctx: AppAdapterContext): Promise<RunnerContext>;
-export declare function normalizeAppError(error: unknown): NormalizedAppError;
-export declare function emitStarted(ctx: AppAdapterContext, label: string, optimistic?: Record<string, unknown>): void;
-export declare function emitProgress(ctx: AppAdapterContext, label: string, detail?: string, data?: Record<string, unknown>): void;
-export declare function emitCompleted(ctx: AppAdapterContext, label: string, data?: Record<string, unknown>): void;
-export declare function emitFailed(ctx: AppAdapterContext, label: string, error: unknown, data?: Record<string, unknown>): void;
-export declare function patchData(ctx: AppAdapterContext, data: Record<string, unknown>): void;
-export declare function patchFooter(ctx: AppAdapterContext, footer: Record<string, unknown>): void;
-export declare function captureConsole<T>(fn: () => Promise<T> | T): Promise<{
-    result: T;
-    output: readonly string[];
-}>;
-export declare function releaseRendererForExternalTui(ctx: AppAdapterContext): Promise<void>;
-/** Re-take the terminal after an external TUI (native Pi) exits — resumes the
- * suspended OpenTUI renderer so the shell repaints and input flows again. */
-export declare function resumeRendererAfterExternalTui(ctx: AppAdapterContext): Promise<void>;
-export declare function arrayFromPayload(value: unknown): Record<string, unknown>[];
-export declare function stringField(record: Record<string, unknown>, keys: readonly string[], fallback?: string): string;
-export declare function compactRecord(record: Record<string, unknown>, keys: readonly string[]): Record<string, unknown>;
-export declare function payloadString(intent: AppIntent, key: string): string | undefined;

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

@@ -1,153 +0,0 @@
-// @bun
-// 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("App adapter requires a projectRoot.");
-}
-async function runtimeOf(ctx) {
-  if (ctx.rig && "runId" in ctx.rig && ctx.ensureRuntime === undefined) {
-    return ctx.rig;
-  }
-  if (ctx.ensureRuntime)
-    return ctx.ensureRuntime();
-  throw new Error("App adapter requires ensureRuntime() before this action can run.");
-}
-function normalizeAppError(error) {
-  const message = error instanceof Error ? error.message : String(error);
-  const rawHint = error instanceof Error ? error.hint : undefined;
-  return {
-    message,
-    ...typeof rawHint === "string" && rawHint.trim() ? { hint: rawHint.trim() } : {}
-  };
-}
-function emitStarted(ctx, label, optimistic) {
-  ctx.emit({ type: "action.started", label, ...optimistic ? { optimistic } : {} });
-}
-function emitProgress(ctx, label, detail, data) {
-  ctx.emit({ type: "action.progress", label, ...detail ? { detail } : {}, ...data ? { data } : {} });
-}
-function emitCompleted(ctx, label, data) {
-  ctx.emit({ type: "action.completed", label, ...data ? { data } : {} });
-}
-function emitFailed(ctx, label, error, data) {
-  if (data)
-    patchData(ctx, data);
-  const normalized = normalizeAppError(error);
-  ctx.emit({
-    type: "action.failed",
-    label,
-    message: normalized.message,
-    ...normalized.hint ? { hint: normalized.hint } : {},
-    cause: error
-  });
-}
-function patchData(ctx, data) {
-  ctx.emit({ type: "data.patch", data });
-}
-function patchFooter(ctx, footer) {
-  ctx.emit({ type: "footer.patch", footer });
-}
-async function captureConsole(fn) {
-  const output = [];
-  const original = {
-    log: console.log,
-    info: console.info,
-    warn: console.warn,
-    error: console.error
-  };
-  const capture = (...parts) => {
-    output.push(parts.map((part) => typeof part === "string" ? part : JSON.stringify(part)).join(" "));
-  };
-  console.log = capture;
-  console.info = capture;
-  console.warn = capture;
-  console.error = capture;
-  try {
-    const result = await fn();
-    return { result, output };
-  } finally {
-    console.log = original.log;
-    console.info = original.info;
-    console.warn = original.warn;
-    console.error = original.error;
-  }
-}
-async function releaseRendererForExternalTui(ctx) {
-  const renderer = ctx.renderer;
-  if (!renderer)
-    return;
-  if (renderer.suspend) {
-    await renderer.suspend();
-    return;
-  }
-  if (renderer.destroy) {
-    await renderer.destroy();
-  }
-}
-async function resumeRendererAfterExternalTui(ctx) {
-  await ctx.renderer?.resume?.();
-}
-function arrayFromPayload(value) {
-  if (Array.isArray(value)) {
-    return value.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry)));
-  }
-  if (value && typeof value === "object" && !Array.isArray(value)) {
-    const entries = value.entries;
-    if (Array.isArray(entries))
-      return arrayFromPayload(entries);
-  }
-  return [];
-}
-function stringField(record, keys, fallback = "") {
-  for (const key of keys) {
-    const value = record[key];
-    if (typeof value === "string" && value.trim())
-      return value.trim();
-    if (typeof value === "number" && Number.isFinite(value))
-      return String(value);
-  }
-  return fallback;
-}
-function compactRecord(record, keys) {
-  const out = {};
-  for (const key of keys) {
-    const value = record[key];
-    if (value !== undefined && value !== null && value !== "")
-      out[key] = value;
-  }
-  return out;
-}
-function payloadString(intent, key) {
-  const value = intent.action.payload?.[key];
-  return typeof value === "string" && value.trim() ? value.trim() : undefined;
-}
-export {
-  stringField,
-  runtimeOf,
-  resumeRendererAfterExternalTui,
-  releaseRendererForExternalTui,
-  projectRootOf,
-  payloadString,
-  patchFooter,
-  patchData,
-  normalizeAppError,
-  emitStarted,
-  emitProgress,
-  emitFailed,
-  emitCompleted,
-  compactRecord,
-  captureConsole,
-  arrayFromPayload,
-  adapterContextFromRuntime
-};

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

@@ -1,9 +0,0 @@
-import { type AppAdapterContext } from "./common";
-export type AppDoctorCheck = {
-    readonly id: string;
-    readonly label: string;
-    readonly status: "pass" | "warn" | "fail";
-    readonly detail?: string;
-    readonly remediation?: string;
-};
-export declare function runDoctorChecksForApp(ctx: AppAdapterContext): Promise<AppDoctorCheck[]>;