@h-rig/cli 0.0.6-alpha.9 → 0.0.6-alpha.91

package/dist/src/commands/_json-output.js

@@ -0,0 +1,60 @@
+// @bun
+// packages/cli/src/commands/_json-output.ts
+import { Schema } from "effect";
+import {
+  RigDoctorCheckOutput,
+  RigInboxApprovalsOutput,
+  RigInboxInputsOutput,
+  RigRunListOutput,
+  RigRunShowOutput,
+  RigServerRepairLinkOutput,
+  RigServerStatusOutput,
+  RigServerUseOutput,
+  RigStatsOutput,
+  RigTaskListOutput,
+  RigTaskShowOutput
+} from "@rig/contracts";
+var CLI_OUTPUT_SCHEMAS = {
+  "task list": RigTaskListOutput,
+  "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,
+  "stats show": RigStatsOutput
+};
+function isCommandOutcomeLike(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return false;
+  const record = value;
+  return typeof record.group === "string" && typeof record.command === "string";
+}
+function buildCliJsonEnvelope(outcome, options = {}) {
+  if (!isCommandOutcomeLike(outcome))
+    return null;
+  const commandKey = `${outcome.group} ${outcome.command}`;
+  const schema = CLI_OUTPUT_SCHEMAS[commandKey];
+  if (!schema)
+    return null;
+  const warn = options.warn ?? ((message) => console.error(message));
+  const envelope = { v: 1, command: commandKey, data: outcome.details ?? {} };
+  try {
+    Schema.decodeUnknownSync(schema)(JSON.parse(JSON.stringify(envelope)));
+    return envelope;
+  } catch (error) {
+    warn(`[rig] --json output for "${commandKey}" failed schema validation; printing legacy payload. ` + `(${error instanceof Error ? error.message.split(`
+`)[0] : String(error)})`);
+    return null;
+  }
+}
+function listSchematizedCliCommands() {
+  return Object.keys(CLI_OUTPUT_SCHEMAS).sort();
+}
+export {
+  listSchematizedCliCommands,
+  buildCliJsonEnvelope
+};

package/dist/src/commands/_lazy-reconcile.d.ts

@@ -0,0 +1,34 @@
+import { SessionManager } from "@oh-my-pi/pi-coding-agent";
+import { type CollabRegistryFilter, type CollabSessionProjection } from "@oh-my-pi/pi-coding-agent/collab/api";
+import { type RunJournalProjection, type RunSessionCustomEntry } from "@rig/contracts";
+type SessionWriter = {
+    appendCustomEntry(customType: string, data: unknown): void;
+};
+export type CollabSessionProjectionLike = Pick<CollabSessionProjection, "collab" | "customEntries" | "source"> & {
+    readonly runId?: string;
+    readonly session: Pick<CollabSessionProjection["session"], "path" | "id">;
+};
+export type ProjectRunProjection = Pick<RunJournalProjection, "status">;
+export type ProjectRunFromSession = (source: Pick<SessionManager, "getEntries"> | ReadonlyArray<RunSessionCustomEntry> | readonly unknown[], runId: string) => ProjectRunProjection;
+export type LazyReconcileFlippedRun = {
+    readonly runId: string;
+    readonly sessionPath: string;
+    readonly reason: "lazy-reconcile:dead-pid";
+};
+export type LazyReconcileResult = {
+    readonly flipped: readonly LazyReconcileFlippedRun[];
+    readonly resumable: readonly LazyReconcileFlippedRun[];
+};
+type LazyReconcileDeps = {
+    readonly listCollabSessionProjections?: (filter: CollabRegistryFilter) => Promise<readonly CollabSessionProjectionLike[]>;
+    readonly projectRunFromSession?: ProjectRunFromSession;
+    readonly processExists?: (pid: number) => boolean;
+    readonly openSession?: (sessionPath: string) => Promise<SessionWriter>;
+    readonly nowIso?: () => string;
+};
+export type LazyReconcileInput = {
+    readonly workspaceRoot: string;
+    readonly identityFilter: CollabRegistryFilter;
+};
+export declare function runLazyReconcile(input: LazyReconcileInput, deps?: LazyReconcileDeps): Promise<LazyReconcileResult>;
+export {};

package/dist/src/commands/_lazy-reconcile.js

@@ -0,0 +1,102 @@
+// @bun
+var __require = import.meta.require;
+
+// packages/cli/src/commands/_lazy-reconcile.ts
+import { SessionManager } from "@oh-my-pi/pi-coding-agent";
+import {
+  listCollabSessionProjections as ompListCollabSessionProjections
+} from "@oh-my-pi/pi-coding-agent/collab/api";
+import {
+  CUSTOM_TYPE_FOR,
+  isTerminalRunStatus
+} from "@rig/contracts";
+var ACTIVE_LOCAL_RUN_STATUSES = new Set([
+  "created",
+  "preparing",
+  "running",
+  "validating",
+  "reviewing",
+  "closing-out"
+]);
+function processExists(pid) {
+  if (!Number.isInteger(pid) || pid <= 0)
+    return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function defaultProjectRunFromSession(source, runId) {
+  const mod = await import("@rig/runtime/control-plane/run-session-projection");
+  const candidate = Reflect.get(mod, "projectRunFromSession");
+  if (typeof candidate !== "function") {
+    throw new Error("@rig/runtime/control-plane/run-session-projection does not export projectRunFromSession yet; inject projectRunFromSession until RunState lands it.");
+  }
+  return candidate(source, runId);
+}
+async function defaultOpenSession(sessionPath) {
+  return await SessionManager.open(sessionPath, undefined, undefined, { suppressBreadcrumb: true });
+}
+function projectionRunId(item) {
+  if (item.runId?.trim())
+    return item.runId.trim();
+  if (item.collab?.sessionId?.trim())
+    return item.collab.sessionId.trim();
+  if (item.session.id?.trim())
+    return item.session.id.trim();
+  return null;
+}
+function isLocallyDiscovered(item) {
+  return item.source === "session-list";
+}
+function isActiveStatus(status) {
+  if (status === null)
+    return false;
+  return !isTerminalRunStatus(status);
+}
+function shouldFlip(item, status, exists) {
+  if (!isActiveStatus(status))
+    return false;
+  if (item.collab?.stale === true)
+    return true;
+  const pid = item.collab?.pid;
+  return isLocallyDiscovered(item) && pid !== undefined && ACTIVE_LOCAL_RUN_STATUSES.has(status) && !exists(pid);
+}
+function failedStatusData(status, at) {
+  return {
+    type: "status-changed",
+    from: status,
+    to: "failed",
+    reason: "lazy-reconcile:dead-pid",
+    actor: { kind: "agent" },
+    at
+  };
+}
+async function runLazyReconcile(input, deps = {}) {
+  const listProjections = deps.listCollabSessionProjections ?? ompListCollabSessionProjections;
+  const projectRun = deps.projectRunFromSession ?? defaultProjectRunFromSession;
+  const exists = deps.processExists ?? processExists;
+  const openSession = deps.openSession ?? defaultOpenSession;
+  const nowIso = deps.nowIso ?? (() => new Date().toISOString());
+  const projections = await listProjections(input.identityFilter);
+  const flipped = [];
+  for (const item of projections) {
+    const runId = projectionRunId(item);
+    const sessionPath = item.session.path || item.collab?.sessionPath || "";
+    if (!runId || !sessionPath)
+      continue;
+    const projection = await projectRun(item.customEntries, runId);
+    const status = projection.status;
+    if (status === null || !shouldFlip(item, status, exists))
+      continue;
+    const session = await openSession(sessionPath);
+    session.appendCustomEntry(CUSTOM_TYPE_FOR["status-changed"], failedStatusData(status, nowIso()));
+    flipped.push({ runId, sessionPath, reason: "lazy-reconcile:dead-pid" });
+  }
+  return { flipped, resumable: flipped };
+}
+export {
+  runLazyReconcile
+};

package/dist/src/commands/_parsers.d.ts

@@ -0,0 +1,15 @@
+import type { TaskSourceConfig } from "@rig/contracts";
+import type { RigPluginWithRuntime } from "@rig/core";
+export declare function parsePositiveInt(value: string | undefined, option: string, fallback: number): number;
+export declare function parseOptionalPositiveInt(value: string | undefined, option: string): number | undefined;
+export declare function parseRequiredPositiveInt(value: string | undefined, option: string): number;
+export declare function parseAction(value: string | undefined): "validate" | "verify" | "pipeline";
+export declare function parseIsolationMode(value: string | undefined, allowOff: true): "off" | "worktree";
+export declare function parseIsolationMode(value: string | undefined, allowOff: false): "worktree";
+export declare function parseInstallScope(value: string | undefined): "user" | "system";
+export declare function resolveInstallDir(scope: "user" | "system", explicitPath: string | undefined): string;
+export type CliRigConfig = {
+    plugins?: readonly RigPluginWithRuntime[];
+    taskSource?: TaskSourceConfig;
+};
+export declare function loadRigConfigOrNull(projectRoot: string): Promise<CliRigConfig | null>;

package/dist/src/commands/_parsers.js

@@ -7,12 +7,19 @@ import { resolve } from "path";
 
 // packages/cli/src/runner.ts
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError } from "@rig/runtime/control-plane/errors";
+import { CliError as RuntimeCliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
-import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
-import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
+
+class CliError extends RuntimeCliError {
+  hint;
+  constructor(message, exitCode = 1, options = {}) {
+    super(message, exitCode);
+    if (options.hint?.trim()) {
+      this.hint = options.hint.trim();
+    }
+  }
+}
 
 // packages/cli/src/commands/_parsers.ts
 function parsePositiveInt(value, option, fallback) {
@@ -21,7 +28,7 @@ function parsePositiveInt(value, option, fallback) {
   }
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
+    throw new CliError(`Invalid ${option} value: ${value}`, 1, { hint: `Pass a positive integer, e.g. \`${option} 10\`.` });
   }
   return parsed;
 }
@@ -31,17 +38,17 @@ function parseOptionalPositiveInt(value, option) {
   }
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
+    throw new CliError(`Invalid ${option} value: ${value}`, 1, { hint: `Pass a positive integer, e.g. \`${option} 10\`.` });
   }
   return parsed;
 }
 function parseRequiredPositiveInt(value, option) {
   if (!value) {
-    throw new CliError2(`Missing value for ${option}.`);
+    throw new CliError(`Missing value for ${option}.`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} 10\`.` });
   }
   const parsed = Number.parseInt(value, 10);
   if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new CliError2(`Invalid ${option} value: ${value}`);
+    throw new CliError(`Invalid ${option} value: ${value}`, 1, { hint: `Pass a positive integer, e.g. \`${option} 10\`.` });
   }
   return parsed;
 }
@@ -55,7 +62,7 @@ function parseAction(value) {
   if (value === "pipeline") {
     return "pipeline";
   }
-  throw new CliError2(`Invalid --action value: ${value}. Use validate, verify, or pipeline.`);
+  throw new CliError(`Invalid --action value: ${value}. Use validate, verify, or pipeline.`);
 }
 function parseIsolationMode(value, allowOff) {
   if (!value) {
@@ -67,7 +74,7 @@ function parseIsolationMode(value, allowOff) {
   if (allowOff && value === "off") {
     return value;
   }
-  throw new CliError2(`Invalid isolation mode: ${value}. Use ${allowOff ? "off|" : ""}worktree.`);
+  throw new CliError(`Invalid isolation mode: ${value}. Use ${allowOff ? "off|" : ""}worktree.`);
 }
 function parseInstallScope(value) {
   if (!value || value === "user") {
@@ -76,7 +83,7 @@ function parseInstallScope(value) {
   if (value === "system") {
     return "system";
   }
-  throw new CliError2(`Invalid --scope value: ${value}. Use user|system.`);
+  throw new CliError(`Invalid --scope value: ${value}. Use user|system.`);
 }
 function resolveInstallDir(scope, explicitPath) {
   if (explicitPath) {

package/dist/src/commands/_paths.d.ts

@@ -0,0 +1,11 @@
+export declare function resolveControlPlaneMonorepoRoot(projectRoot: string): string;
+export declare function resolveControlPlaneTaskConfigPath(projectRoot: string): string;
+export declare function resolveControlPlaneHostStateRoot(projectRoot: string): string;
+export declare function resolveControlPlaneHostStateDir(projectRoot: string): string;
+export declare function resolveControlPlaneHostLogsDir(projectRoot: string): string;
+export declare function resolveControlPlaneHostBinDir(projectRoot: string): string;
+export declare function resolveControlPlaneHostDistDir(projectRoot: string): string;
+export declare function resolveControlPlaneMonorepoStateRoot(projectRoot: string): string;
+export declare function resolveControlPlaneMonorepoRuntimeDir(projectRoot: string): string;
+export declare function resolveControlPlaneArtifactsDir(projectRoot: string): string;
+export declare function resolveControlPlaneDefinitionRoot(projectRoot: string): string;

package/dist/src/commands/_paths.js

@@ -1,7 +1,7 @@
 // @bun
 // packages/cli/src/commands/_paths.ts
 import { resolve } from "path";
-import { resolveMonorepoRoot } from "@rig/runtime/control-plane/native/utils";
+import { resolveMonorepoRoot } from "@rig/runtime/layout";
 function resolveControlPlaneMonorepoRoot(projectRoot) {
   return resolveMonorepoRoot(projectRoot);
 }

package/dist/src/commands/_pi-frontend.d.ts

@@ -0,0 +1,35 @@
+import type { RunnerContext } from "../runner";
+type AttachResult = {
+    readonly run: Record<string, unknown>;
+    readonly logs: Record<string, unknown>[];
+    readonly timeline: Record<string, unknown>[];
+    readonly timelineCursor: string | null;
+    readonly steered: boolean;
+    readonly rendered: string;
+    readonly detached?: boolean;
+};
+export declare function resolveOperatorDroneCwd(runId: string, homeDir?: string): string;
+/**
+ * Compose the operator-session environment used by the legacy interactive
+ * attach shim. Exported for tests that pin the env contract.
+ */
+export declare function buildOperatorPiEnv(input: {
+    readonly runId: string;
+    readonly serverUrl: string;
+    readonly authToken?: string | null;
+    readonly serverProjectRoot?: string | null;
+    readonly sessionDir: string;
+}): Record<string, string>;
+export declare function shouldRequireOperatorTranscript(status: unknown): boolean;
+export declare function missingOperatorTranscriptMessage(runId: string, status: unknown): string;
+/**
+ * Run `body` in-process while RETURNING (instead of terminating) when it calls
+ * `process.exit`. Exported for unit tests that pin the guard semantics.
+ */
+export declare function runWithProcessExitGuard(body: () => Promise<unknown>): Promise<number>;
+export declare function attachRunBundledPiFrontend(context: Pick<RunnerContext, "projectRoot" | "outputMode">, input: {
+    readonly runId: string;
+    readonly steered?: boolean;
+    readonly returnOnQuit?: boolean;
+}): Promise<AttachResult>;
+export {};

package/dist/src/commands/_pi-frontend.js

@@ -0,0 +1,64 @@
+// @bun
+// packages/cli/src/commands/_pi-frontend.ts
+import { homedir } from "os";
+import { join } from "path";
+import { assertPathInsideRoot, assertSafeRunId, safePathSegment } from "@rig/shared/safe-identifiers";
+var TERMINAL_RUN_STATUSES = { completed: true, failed: true, stopped: true, cancelled: true, canceled: true, closed: true, merged: true, needs_attention: true, "needs-attention": true };
+function resolveOperatorDroneCwd(runId, homeDir = homedir()) {
+  const safeRunId = assertSafeRunId(runId);
+  const dronesRoot = join(homeDir, ".rig", "drones");
+  return assertPathInsideRoot(dronesRoot, join(dronesRoot, safePathSegment(String(safeRunId).slice(0, 8), { fallback: "run", maxLength: 32 })), "operator drone cwd");
+}
+function buildOperatorPiEnv(input) {
+  return {
+    PI_CODING_AGENT_SESSION_DIR: input.sessionDir,
+    PI_SKIP_VERSION_CHECK: "1",
+    PI_HIDDEN_COMMANDS: "import,fork,clone,tree,new,resume,trust",
+    RIG_PI_OPERATOR_SESSION: "1",
+    RIG_RUN_ID: input.runId,
+    RIG_SERVER_URL: input.serverUrl,
+    ...input.authToken ? { RIG_AUTH_TOKEN: input.authToken } : {},
+    ...input.serverProjectRoot ? { RIG_PROJECT_ROOT: input.serverProjectRoot } : {}
+  };
+}
+function shouldRequireOperatorTranscript(status) {
+  return typeof status === "string" && TERMINAL_RUN_STATUSES[status.trim().toLowerCase()] === true;
+}
+function missingOperatorTranscriptMessage(runId, status) {
+  const shortRun = runId.trim().slice(0, 8) || "unknown";
+  const statusText = typeof status === "string" && status.trim() ? status.trim() : "terminal";
+  return `Run ${shortRun} is ${statusText}, but no worker Pi session transcript is recorded for this run. It likely failed before Pi started or predates full-session capture. Use \`rig run show ${runId}\` and \`rig run logs ${runId}\` for the lifecycle details.`;
+}
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve) => {
+    signalQuit = resolve;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+async function attachRunBundledPiFrontend(context, input) {
+  input.steered;
+  input.returnOnQuit;
+  throw new Error(`Interactive Pi attach for run ${input.runId} was removed in the OMP-collab cutover. Run bare \`rig\` and use the OMP cockpit run detail for the live session; legacy automation can request a non-interactive text snapshot with --once or --json.`);
+}
+export {
+  shouldRequireOperatorTranscript,
+  runWithProcessExitGuard,
+  resolveOperatorDroneCwd,
+  missingOperatorTranscriptMessage,
+  buildOperatorPiEnv,
+  attachRunBundledPiFrontend
+};

package/dist/src/commands/_pi-install.d.ts

@@ -0,0 +1,42 @@
+export type PiInstallCheck = {
+    readonly ok: boolean;
+    readonly label: string;
+    readonly detail?: string;
+    readonly hint?: string;
+};
+export type CommandRunner = (command: string[], options?: {
+    cwd?: string;
+}) => Promise<{
+    exitCode: number;
+    stdout: string;
+    stderr: string;
+}>;
+export type PiRigInstallStatus = {
+    readonly pi: PiInstallCheck;
+    readonly piRig: PiInstallCheck;
+    readonly extensionPath: string;
+};
+export declare function resolvePiRigExtensionPath(homeDir: string): string;
+export declare function resolvePiRigPackageSource(projectRoot: string, exists?: (path: string) => boolean): string;
+export declare function checkPiRigInstall(input?: {
+    readonly homeDir?: string;
+    readonly commandRunner?: CommandRunner;
+    readonly exists?: (path: string) => boolean;
+}): Promise<PiRigInstallStatus>;
+export declare function ensurePiRigInstalled(input: {
+    readonly projectRoot: string;
+    readonly homeDir?: string;
+    readonly commandRunner?: CommandRunner;
+}): Promise<PiRigInstallStatus & {
+    installedPath: string;
+}>;
+export declare function ensureRemotePiRigInstalled(input: {
+    readonly requestJson: (pathname: string, init?: RequestInit) => Promise<unknown>;
+}): Promise<PiRigInstallStatus & {
+    readonly remote: true;
+}>;
+export declare function buildPiSetupChecks(input?: {
+    readonly homeDir?: string;
+    readonly commandRunner?: CommandRunner;
+    readonly exists?: (path: string) => boolean;
+}): Promise<PiInstallCheck[]>;

package/dist/src/commands/_pi-install.js

@@ -1,12 +1,9 @@
 // @bun
 // packages/cli/src/commands/_pi-install.ts
-import { existsSync, readFileSync, rmSync } from "fs";
+import { existsSync } from "fs";
 import { homedir } from "os";
 import { resolve } from "path";
-var PI_RIG_PACKAGE_NAME = "@rig/pi-rig";
-var LEGACY_PI_RIG_MARKER = `// Managed by Rig. Source package: @rig/pi-rig.
-export { default } from '@rig/pi-rig';
-`;
+var PI_RIG_PACKAGE_NAME = "@h-rig/pi-rig";
 async function defaultCommandRunner(command, options = {}) {
   const proc = Bun.spawn(command, { cwd: options.cwd, stdout: "pipe", stderr: "pipe" });
   const [stdout, stderr, exitCode] = await Promise.all([
@@ -55,7 +52,13 @@ async function ensurePiBinaryAvailable(input) {
     }
     return { ok: true, detail: (current.stdout || current.stderr).trim() || undefined };
   }
-  const installCommand = process.env.RIG_PI_INSTALL_COMMAND?.trim() || "bunx @earendil-works/pi@latest install";
+  const installCommand = process.env.RIG_PI_INSTALL_COMMAND?.trim();
+  if (!installCommand) {
+    return {
+      ok: false,
+      error: `${(current.stderr || current.stdout).trim() || "pi --version failed"}. Set RIG_PI_INSTALL_COMMAND to a supported installer or install Pi manually.`
+    };
+  }
   const parts = splitInstallCommand(installCommand);
   if (parts.length === 0) {
     return { ok: false, error: (current.stderr || current.stdout).trim() || "pi --version failed" };
@@ -72,18 +75,6 @@ async function ensurePiBinaryAvailable(input) {
     ...next.exitCode === 0 ? {} : { error: (next.stderr || next.stdout).trim() || "pi --version failed after install" }
   };
 }
-function removeManagedLegacyPiRigBridge(homeDir, exists = existsSync) {
-  const extensionPath = resolvePiRigExtensionPath(homeDir);
-  const indexPath = resolve(extensionPath, "index.ts");
-  if (!exists(indexPath))
-    return;
-  try {
-    const content = readFileSync(indexPath, "utf8");
-    if (content === LEGACY_PI_RIG_MARKER || content.includes("Managed by Rig. Source package: @rig/pi-rig")) {
-      rmSync(extensionPath, { recursive: true, force: true });
-    }
-  } catch {}
-}
 async function checkPiRigInstall(input = {}) {
   const home = resolvePiHomeDir(input.homeDir);
   const extensionPath = resolvePiRigExtensionPath(home);
@@ -94,48 +85,40 @@ async function checkPiRigInstall(input = {}) {
       piRig: { ok: true, label: "pi-rig global extension", detail: extensionPath }
     };
   }
-  const exists = input.exists ?? existsSync;
   const runner = input.commandRunner ?? defaultCommandRunner;
   const piResult = await safeRun(runner, ["pi", "--version"]);
   const piListResult = piResult.exitCode === 0 ? await safeRun(runner, ["pi", "list"]) : { exitCode: 1, stdout: "", stderr: "" };
-  const listedPiRig = piListResult.exitCode === 0 && piListContainsPiRig(`${piListResult.stdout}
+  const hasPiRig = piListResult.exitCode === 0 && piListContainsPiRig(`${piListResult.stdout}
 ${piListResult.stderr}`);
-  const legacyBridge = exists(resolve(extensionPath, "index.ts"));
-  const hasPiRig = listedPiRig;
+  const hasLegacyBridgeScaffold = !hasPiRig && (input.exists ?? existsSync)(extensionPath);
   return {
     extensionPath,
     pi: {
       ok: piResult.exitCode === 0,
       label: "pi",
       detail: (piResult.stdout || piResult.stderr).trim() || undefined,
-      hint: piResult.exitCode === 0 ? undefined : "Install Pi or run `rig init --yes` to install/update the Pi runtime."
+      hint: piResult.exitCode === 0 ? undefined : "Install Pi/OMP manually or set RIG_PI_INSTALL_COMMAND before verifying with bare `rig` / Cockpit \u2192 Doctor."
     },
     piRig: {
       ok: hasPiRig,
       label: "pi-rig global extension",
-      detail: hasPiRig ? piListResult.stdout.trim() || PI_RIG_PACKAGE_NAME : legacyBridge ? `${extensionPath} (legacy bridge; reinstall required)` : undefined,
-      hint: hasPiRig ? undefined : "Run `rig init --yes` to install/enable the global pi-rig package with `pi install`."
+      detail: hasPiRig ? piListResult.stdout.trim() || PI_RIG_PACKAGE_NAME : hasLegacyBridgeScaffold ? `legacy bridge scaffold at ${extensionPath}` : undefined,
+      hint: hasPiRig ? undefined : `Install the Rig OMP extension with \`pi install ${PI_RIG_PACKAGE_NAME}\`, then verify with bare \`rig\` / Cockpit \u2192 Doctor.`
     }
   };
 }
 async function ensurePiRigInstalled(input) {
   const home = resolvePiHomeDir(input.homeDir);
   if (process.env.RIG_TEST_FAKE_PI_INSTALL === "1") {
-    const status2 = await checkPiRigInstall({ homeDir: home, commandRunner: input.commandRunner });
-    return { ...status2, installedPath: status2.extensionPath };
+    const status = await checkPiRigInstall({ homeDir: home, commandRunner: input.commandRunner });
+    return { ...status, installedPath: status.extensionPath };
   }
   const runner = input.commandRunner ?? defaultCommandRunner;
   const piAvailable = await ensurePiBinaryAvailable({ runner, projectRoot: input.projectRoot });
-  const status = piAvailable.ok ? await checkPiRigInstall({ homeDir: home, commandRunner: runner }) : {
-    extensionPath: resolvePiRigExtensionPath(home),
-    pi: { ok: false, label: "pi", detail: piAvailable.error, hint: "Install/update Pi with RIG_PI_INSTALL_COMMAND or install Pi manually." },
-    piRig: { ok: false, label: "pi-rig global extension", hint: "Pi is required before pi-rig can be installed." }
-  };
   if (!piAvailable.ok) {
     throw new Error(`Pi install/update failed: ${piAvailable.error ?? "pi unavailable"}`);
   }
   const packageSource = resolvePiRigPackageSource(input.projectRoot);
-  removeManagedLegacyPiRigBridge(home);
   const install = await runner(["pi", "install", packageSource], { cwd: input.projectRoot });
   if (install.exitCode !== 0) {
     throw new Error(`pi-rig install failed: ${(install.stderr || install.stdout).trim() || `exit ${install.exitCode}`}`);
@@ -147,7 +130,7 @@ async function ensureRemotePiRigInstalled(input) {
   const payload = await input.requestJson("/api/pi-rig/install", {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ package: "@rig/pi-rig", scope: "global" })
+    body: JSON.stringify({ package: PI_RIG_PACKAGE_NAME, scope: "global" })
   });
   const record = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
   const piOk = record.piOk === true || record.ok === true;
@@ -160,13 +143,13 @@ async function ensureRemotePiRigInstalled(input) {
       ok: piOk,
       label: "pi",
       detail: typeof record.piVersion === "string" ? record.piVersion : undefined,
-      hint: piOk ? undefined : "Install/update Pi on the selected remote Rig server."
+      hint: piOk ? undefined : "Install/update Pi on the selected remote control host, then verify with bare `rig` / Cockpit \u2192 Doctor."
     },
     piRig: {
       ok: piRigOk,
       label: "pi-rig global extension",
       detail: extensionPath,
-      hint: piRigOk ? undefined : "Install/enable pi-rig on the selected remote Rig server."
+      hint: piRigOk ? undefined : `Install/enable the Rig OMP extension (${PI_RIG_PACKAGE_NAME}) on the selected remote control host, then verify with bare \`rig\` / Cockpit \u2192 Doctor.`
     }
   };
 }

package/dist/src/commands/_policy.d.ts

@@ -0,0 +1,8 @@
+import { type RunnerContext } from "../runner";
+export type PolicyMode = "off" | "observe" | "enforce";
+export declare function resolveEffectivePolicyMode(context: RunnerContext): PolicyMode;
+export declare function appendControlledBashAudit(context: RunnerContext, mode: PolicyMode, command: string, args: string[], matchedRuleIds: string[], action?: "warn" | "blocked"): void;
+export declare function enforceNativeCommandPolicy(context: RunnerContext, args: string[], options: {
+    commandPrefix: string;
+    writeAuditLog: boolean;
+}): Promise<void>;