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

package/dist/src/commands/_run-driver-helpers.js

@@ -1,52 +1,11 @@
 // @bun
 // packages/cli/src/commands/_run-driver-helpers.ts
-import { readFileSync } from "fs";
-import { resolve as resolve3 } from "path";
-
-// packages/cli/src/runner.ts
-import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError as RuntimeCliError } from "@rig/runtime/control-plane/errors";
-import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
-import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
-
-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/_run-driver-helpers.ts
-import {
-  appendRunJournalEvent,
-  appendRunLogEntry,
-  appendRunTimelineEntry,
-  patchAuthorityRunRecord,
-  readAuthorityRun as readAuthorityRun2,
-  resolveAuthorityRunDir,
-  setAuthorityRunStatus,
-  writeJsonFile
-} from "@rig/runtime/control-plane/authority-files";
-import { taskLookup } from "@rig/runtime/control-plane/native/task-ops";
-import { readPriorPrProgressPromptSection } from "@rig/runtime/control-plane/prompt-context";
-import { buildProviderTaskRunInstructionLines } from "@rig/runtime/control-plane/provider/runtime-instructions";
-import { loadRigTaskRunSkillBody } from "@rig/runtime/control-plane/provider/rig-task-run-skill";
-
-// packages/cli/src/commands/_authority-runs.ts
-import { existsSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { resolve as resolve2 } from "path";
-import {
-  readAuthorityRun,
-  readJsonlFile,
-  writeAuthorityRunRecord
-} from "@rig/runtime/control-plane/authority-files";
 
 // 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);
 }
@@ -54,199 +13,108 @@ function resolveControlPlaneTaskConfigPath(projectRoot) {
   return resolve(resolveControlPlaneMonorepoRoot(projectRoot), ".rig", "task-config.json");
 }
 
-// packages/cli/src/commands/_authority-runs.ts
+// packages/cli/src/commands/_run-driver-helpers.ts
 function readLatestBeadRecord(projectRoot, taskId) {
   const issuesPath = resolve2(resolveControlPlaneMonorepoRoot(projectRoot), ".beads", "issues.jsonl");
   if (!existsSync(issuesPath)) {
     return null;
   }
   let latest = null;
-  for (const issue of readJsonlFile(issuesPath)) {
-    if (!issue || typeof issue !== "object") {
+  for (const line of readFileSync(issuesPath, "utf8").split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed)
       continue;
-    }
-    const record = issue;
-    if (record.id === taskId) {
-      latest = record;
-    }
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+        continue;
+      const record = parsed;
+      if (record.id === taskId)
+        latest = record;
+    } catch {}
   }
   return latest;
 }
-
-// packages/cli/src/commands/_run-driver-helpers.ts
-function patchAuthorityRun(projectRoot, runId, patch) {
-  const next = patchAuthorityRunRecord(projectRoot, runId, patch);
-  if (!next) {
-    throw new CliError(`Run not found: ${runId}`, 2, { hint: "Run `rig run list` to see recorded runs." });
-  }
-  return next;
-}
-function setRunStatusOrFail(projectRoot, runId, to, options = {}) {
-  const next = setAuthorityRunStatus(projectRoot, runId, to, {
-    ...options,
-    actor: { kind: "agent" }
-  });
-  if (!next) {
-    throw new CliError(`Run not found: ${runId}`, 2, { hint: "Run `rig run list` to see recorded runs." });
-  }
-  return next;
-}
-function touchAuthorityRun(projectRoot, runId) {
-  const current = readAuthorityRun2(projectRoot, runId);
-  if (!current) {
-    return;
+function firstPromptString(...values) {
+  for (const value of values) {
+    if (typeof value === "string" && value.trim())
+      return value.trim();
   }
-  writeJsonFile(resolve3(resolveAuthorityRunDir(projectRoot, runId), "run.json"), {
-    ...current,
-    updatedAt: new Date().toISOString()
-  });
-}
-function appendRunTimeline(projectRoot, runId, value) {
-  appendRunTimelineEntry(projectRoot, runId, value);
-  touchAuthorityRun(projectRoot, runId);
-}
-function appendRunLog(projectRoot, runId, value) {
-  appendRunLogEntry(projectRoot, runId, value);
-  touchAuthorityRun(projectRoot, runId);
-}
-function appendRunAction(projectRoot, runId, value) {
-  appendRunTimelineEntry(projectRoot, runId, {
-    id: value.id,
-    type: "action",
-    actionType: value.actionType,
-    title: value.title,
-    detail: value.detail ?? null,
-    state: value.state,
-    createdAt: value.startedAt,
-    completedAt: value.completedAt ?? null,
-    payload: value.payload ?? {}
-  });
+  return null;
 }
-function startRunAction(projectRoot, runId, input) {
-  const startedAt = new Date().toISOString();
-  appendRunAction(projectRoot, runId, {
-    id: input.actionId,
-    actionType: input.actionType,
-    title: input.title,
-    detail: input.detail,
-    state: "running",
-    startedAt,
-    payload: input.payload
-  });
-  emitServerRunEvent({ type: "timeline", runId });
-  return {
-    startedAt,
-    complete: (detail, payload) => {
-      appendRunAction(projectRoot, runId, {
-        id: input.actionId,
-        actionType: input.actionType,
-        title: input.title,
-        detail: detail ?? input.detail ?? null,
-        state: "completed",
-        startedAt,
-        completedAt: new Date().toISOString(),
-        payload: payload ?? input.payload
-      });
-      emitServerRunEvent({ type: "timeline", runId });
-    },
-    fail: (detail, payload) => {
-      appendRunAction(projectRoot, runId, {
-        id: input.actionId,
-        actionType: input.actionType,
-        title: input.title,
-        detail,
-        state: "failed",
-        startedAt,
-        completedAt: new Date().toISOString(),
-        payload: payload ?? input.payload
-      });
-      emitServerRunEvent({ type: "timeline", runId });
-    }
-  };
+function uniqueStrings(values) {
+  return Array.from(new Set(values.map((value) => value.trim()).filter(Boolean)));
 }
-var runEventSinkProjectRoot = null;
-function configureRunEventSink(projectRoot) {
-  runEventSinkProjectRoot = projectRoot;
+function renderSourceTaskContract(task, validation) {
+  if (!task)
+    return validation.length > 0 ? [`Validation: ${validation.join(", ")}`] : [];
+  const lines = [`id: ${task.id}`];
+  if (task.sourceIssueId)
+    lines.push(`source issue: ${task.sourceIssueId}`);
+  if (task.status)
+    lines.push(`status: ${task.status}`);
+  if (task.issueType)
+    lines.push(`issue type: ${task.issueType}`);
+  if (task.role)
+    lines.push(`role: ${task.role}`);
+  if (validation.length > 0)
+    lines.push(`validation: ${validation.join(", ")}`);
+  return lines;
 }
-var lastDoorbellRangAt = 0;
-function ringServerRunDoorbell(runId) {
-  const serverUrl = process.env.RIG_SERVER_URL?.trim();
-  if (!serverUrl)
-    return;
-  const now = Date.now();
-  if (now - lastDoorbellRangAt < 250)
-    return;
-  lastDoorbellRangAt = now;
-  const token = process.env.RIG_AUTH_TOKEN || process.env.RIG_GITHUB_TOKEN || "";
-  fetch(`${serverUrl.replace(/\/+$/, "")}/api/runs/doorbell`, {
-    method: "POST",
-    headers: {
-      "content-type": "application/json",
-      authorization: `Bearer ${token}`
-    },
-    body: JSON.stringify({ runId }),
-    signal: AbortSignal.timeout(1000)
-  }).catch(() => {});
+function renderSourceScopeValidation(task, validation) {
+  if (task || validation.length === 0)
+    return "";
+  return `Validation:
+- ${validation.join(`
+- `)}`;
+}
+function readTaskScopeText(projectRoot, taskId) {
+  try {
+    const parsed = JSON.parse(readFileSync(resolveControlPlaneTaskConfigPath(projectRoot), "utf8"));
+    const entry = parsed[taskId] ?? {};
+    const scope = Array.isArray(entry.scope) ? entry.scope.filter((item) => typeof item === "string") : [];
+    const validation = Array.isArray(entry.validation) ? entry.validation.filter((item) => typeof item === "string") : [];
+    const lines = [];
+    if (scope.length > 0)
+      lines.push(`Scope:
+- ${scope.join(`
+- `)}`);
+    if (validation.length > 0)
+      lines.push(`Validation:
+- ${validation.join(`
+- `)}`);
+    return lines.join(`
+
+`);
+  } catch {
+    return "";
+  }
 }
-function emitServerRunEvent(event) {
-  console.log(`__RIG_RUN_EVENT__${JSON.stringify({ ...event, at: new Date().toISOString() })}`);
-  if (runEventSinkProjectRoot) {
-    try {
-      if (event.type === "status" || event.type === "completed" || event.type === "failed") {
-        appendRunJournalEvent(runEventSinkProjectRoot, event.runId, {
-          type: "timeline-entry",
-          payload: { kind: "driver-event", ...event }
-        });
-      }
-    } catch {}
-    ringServerRunDoorbell(event.runId);
+function providerInstructionLines(runtimeAdapter) {
+  if (runtimeAdapter === "pi") {
+    return ["Keep file writes inside the scoped task workspace and use the bridged Pi tooling for shell and follow-up prompts."];
+  }
+  if (runtimeAdapter === "codex") {
+    return ["Keep file writes inside the scoped task workspace and prefer compact terminal output."];
   }
+  return ["Keep file writes inside the scoped task workspace and stay within the provided tool surface."];
 }
 function buildRunPrompt(input) {
   const initialPrompt = input.initialPrompt?.trim() || null;
   if (!input.taskId) {
-    return initialPrompt ?? input.fallbackTitle?.trim() ?? "Continue the requested Rig run and complete the work.";
+    return initialPrompt ?? input.fallbackTitle?.trim() ?? "Continue the requested run and complete the work.";
   }
-  const issues = (() => {
-    try {
-      return taskLookup(input.projectRoot, input.taskId);
-    } catch {
-      return "";
-    }
-  })();
-  const scopeText = (() => {
-    try {
-      const parsed = JSON.parse(readFileSync(resolveControlPlaneTaskConfigPath(input.projectRoot), "utf8"));
-      const entry = parsed[input.taskId] ?? {};
-      const scope = Array.isArray(entry.scope) ? entry.scope.filter((item) => typeof item === "string") : [];
-      const validation = Array.isArray(entry.validation) ? entry.validation.filter((item) => typeof item === "string") : [];
-      const lines = [];
-      if (scope.length > 0)
-        lines.push(`Scope:
-- ${scope.join(`
-- `)}`);
-      if (validation.length > 0)
-        lines.push(`Validation:
-- ${validation.join(`
-- `)}`);
-      return lines.join(`
-
-`);
-    } catch {
-      return "";
-    }
-  })();
   const bead = readLatestBeadRecord(input.projectRoot, input.taskId);
   const sourceTask = input.sourceTask ?? null;
   const sourceDescription = firstPromptString(sourceTask?.description, sourceTask?.body);
   const sourceAcceptance = firstPromptString(sourceTask?.acceptanceCriteria, sourceTask?.acceptance_criteria);
   const sourceValidation = uniqueStrings([...sourceTask?.validation ?? [], ...sourceTask?.validators ?? []]);
-  const title = (bead && typeof bead === "object" && typeof bead.title === "string" ? bead.title : null) ?? firstPromptString(sourceTask?.title) ?? input.fallbackTitle ?? issues ?? input.taskId;
-  const description = (bead && typeof bead === "object" && typeof bead.description === "string" ? bead.description : null) ?? sourceDescription ?? input.fallbackDescription ?? "";
-  const acceptance = bead && typeof bead === "object" && typeof bead.acceptance_criteria === "string" ? bead.acceptance_criteria : sourceAcceptance ?? input.fallbackAcceptanceCriteria ?? "";
+  const title = (bead && typeof bead.title === "string" ? bead.title : null) ?? firstPromptString(sourceTask?.title) ?? input.fallbackTitle ?? input.taskId;
+  const description = (bead && typeof bead.description === "string" ? bead.description : null) ?? sourceDescription ?? input.fallbackDescription ?? "";
+  const acceptance = (bead && typeof bead.acceptance_criteria === "string" ? bead.acceptance_criteria : null) ?? sourceAcceptance ?? input.fallbackAcceptanceCriteria ?? "";
+  const scopeText = readTaskScopeText(input.projectRoot, input.taskId);
   const sourceContractLines = renderSourceTaskContract(sourceTask, sourceValidation);
-  const providerLines = buildProviderTaskRunInstructionLines(input.runtimeAdapter);
-  const skillBody = loadRigTaskRunSkillBody();
+  const providerLines = providerInstructionLines(input.runtimeAdapter);
   return [
     `You are working on task ${input.taskId}: ${title}.`,
     description ? `Description:
@@ -257,86 +125,14 @@ ${acceptance}` : null,
 ${sourceContractLines.join(`
 `)}` : null,
     scopeText || renderSourceScopeValidation(sourceTask, sourceValidation) || null,
-    readPriorPrProgressPromptSection(input.projectRoot, input.taskId),
     initialPrompt ? `Additional operator guidance:
 ${initialPrompt}` : null,
     providerLines.length > 0 ? `Provider-specific runtime tooling:
-${providerLines.join(" ")}` : null,
-    skillBody || null
+${providerLines.join(" ")}` : null
   ].filter((value) => Boolean(value)).join(`
 
-`);
-}
-function firstPromptString(...values) {
-  for (const value of values) {
-    const trimmed = typeof value === "string" ? value.trim() : "";
-    if (trimmed.length > 0) {
-      return trimmed;
-    }
-  }
-  return null;
-}
-function uniqueStrings(values) {
-  return Array.from(new Set(values.map((value) => value.trim()).filter(Boolean)));
-}
-function renderSourceTaskContract(task, validation) {
-  if (!task) {
-    return [];
-  }
-  const lines = [];
-  const sourceIssueId = firstPromptString(task.sourceIssueId);
-  if (sourceIssueId)
-    lines.push(`Source issue: ${sourceIssueId}`);
-  const status = firstPromptString(task.status);
-  if (status)
-    lines.push(`Source status: ${status}`);
-  const issueType = firstPromptString(task.issueType);
-  if (issueType)
-    lines.push(`Issue type: ${issueType}`);
-  const role = firstPromptString(task.role);
-  if (role)
-    lines.push(`Role: ${role}`);
-  const externalRef = firstPromptString(task.externalRef);
-  if (externalRef)
-    lines.push(`External ref: ${externalRef}`);
-  const labels = uniqueStrings(task.labels ?? []);
-  if (labels.length > 0)
-    lines.push(`Labels:
-- ${labels.join(`
-- `)}`);
-  if (validation.length > 0)
-    lines.push(`Validators:
-- ${validation.join(`
-- `)}`);
-  return lines;
-}
-function renderSourceScopeValidation(task, validation) {
-  if (!task) {
-    return "";
-  }
-  const lines = [];
-  const scope = uniqueStrings(task.scope ?? []);
-  if (scope.length > 0)
-    lines.push(`Scope:
-- ${scope.join(`
-- `)}`);
-  if (validation.length > 0)
-    lines.push(`Validation:
-- ${validation.join(`
-- `)}`);
-  return lines.join(`
-
 `);
 }
 export {
-  touchAuthorityRun,
-  startRunAction,
-  setRunStatusOrFail,
-  patchAuthorityRun,
-  emitServerRunEvent,
-  configureRunEventSink,
-  buildRunPrompt,
-  appendRunTimeline,
-  appendRunLog,
-  appendRunAction
+  buildRunPrompt
 };

package/dist/src/commands/_run-projection.d.ts

@@ -0,0 +1,50 @@
+import { type RunJournalProjection, type RunSessionCustomEntry } from "@rig/contracts";
+import type { CollabRegistryFilter } from "@oh-my-pi/pi-coding-agent/collab/api";
+/** A run as seen by the operator CLI: live-presence facts joined with the folded journal. */
+export interface RunProjectionRecord {
+    readonly runId: string;
+    readonly taskId: string | null;
+    readonly title: string;
+    /** RunStatus from the folded journal, or a liveness-derived fallback. */
+    readonly status: string;
+    readonly source: "local" | "remote";
+    /** True when the run is currently discoverable (registry heartbeat or local host). */
+    readonly live: boolean;
+    readonly stale: boolean;
+    readonly startedAt: string | null;
+    readonly updatedAt: string | null;
+    readonly completedAt: string | null;
+    readonly joinLink: string | null;
+    readonly webLink: string | null;
+    readonly relayUrl: string | null;
+    readonly sessionPath: string | null;
+    readonly prUrl: string | null;
+    readonly worktreePath: string | null;
+    readonly pendingApprovals: number;
+    readonly pendingInputs: number;
+    readonly steeringCount: number;
+    readonly stallCount: number;
+    readonly errorSummary?: string | null;
+    /** The full folded journal (empty projection when no journal was readable). */
+    readonly projection: RunJournalProjection;
+}
+/** What an attach/steer caller needs to reach a live run over collab. */
+export interface RunJoinTarget {
+    readonly runId: string;
+    readonly taskId: string | null;
+    readonly joinLink: string;
+    readonly cwd: string | null;
+    readonly stale: boolean;
+}
+/** Parse an OMP session JSONL into the custom-entry shape `foldRunSessionEntries` expects. */
+export declare function readSessionRunEntries(sessionPath: string | null): RunSessionCustomEntry[];
+/**
+ * List every discoverable run: live collab (relay-registry + local hosts) merged
+ * with finished/local runs recovered from on-disk agent-runtime session journals.
+ * Live entries win on runId collisions (they carry join links + current presence).
+ */
+export declare function listRunProjections(projectRoot: string, filter?: CollabRegistryFilter): Promise<RunProjectionRecord[]>;
+/** Resolve a single run by id (or unambiguous prefix). */
+export declare function getRunProjection(projectRoot: string, runId: string, filter?: CollabRegistryFilter): Promise<RunProjectionRecord | null>;
+/** Resolve the live join target for attach/steer; null when the run is not currently joinable. */
+export declare function resolveRunJoinTarget(projectRoot: string, runId: string, filter?: CollabRegistryFilter): Promise<RunJoinTarget | null>;