@h-rig/product-entrypoint-plugin 0.0.6-alpha.155 → 0.0.6-alpha.157

package/dist/src/plugin.d.ts

@@ -1,3 +1,3 @@
-import { type RigPluginWithRuntime } from "@rig/core/config";
-export declare function createStandardProductEntrypointPlugin(): RigPluginWithRuntime;
-export declare const standardProductEntrypointPlugin: RigPluginWithRuntime;
+import { type RigPlugin } from "@rig/core/config";
+export declare function createStandardProductEntrypointPlugin(): RigPlugin;
+export declare const standardProductEntrypointPlugin: RigPlugin;

package/dist/src/plugin.js

@@ -47,10 +47,8 @@ function createStandardProductEntrypointPlugin() {
     name: "@rig/product-entrypoint-plugin",
     version: "0.1.0",
     contributes: {
-      cliCommands: STANDARD_PRODUCT_COMMANDS.map(standardProductCliCommandMetadata)
+      cliCommands: STANDARD_PRODUCT_COMMANDS.map(createStandardProductCliCommand)
     }
-  }, {
-    cliCommands: STANDARD_PRODUCT_COMMANDS.map(createStandardProductCliCommand)
   });
 }
 var standardProductEntrypointPlugin = createStandardProductEntrypointPlugin();

package/dist/src/product-entrypoint.js

@@ -1,4 +1,6 @@
 // @bun
+var __require = import.meta.require;
+
 // packages/product-entrypoint-plugin/src/product-entrypoint.ts
 import { resolve } from "path";
 import { runCli } from "@oh-my-pi/pi-coding-agent/cli";
@@ -7,7 +9,106 @@ import { resolveCliArgv } from "@oh-my-pi/pi-coding-agent/cli-commands";
 import { prepareAcpTerminalAuthArgs } from "@oh-my-pi/pi-coding-agent/modes/acp/terminal-auth";
 import { runRootCommand } from "@oh-my-pi/pi-coding-agent/main";
 import { createAgentSession } from "@oh-my-pi/pi-coding-agent/sdk";
-import { applyIdentityEnv, identityFilterFromEnv, reconcileRuns } from "@rig/client";
+import { applyIdentityEnv, identityFilterFromEnv } from "@rig/runtime/control-plane/identity-env";
+
+// packages/product-entrypoint-plugin/src/reconcile.ts
+import {
+  CUSTOM_TYPE_FOR,
+  foldRunSessionEntries,
+  isTerminalRunStatus
+} from "@rig/contracts";
+async function loadCollabApi() {
+  return await import("@oh-my-pi/pi-coding-agent/collab/api");
+}
+async function loadSessionManager() {
+  return await import("@oh-my-pi/pi-coding-agent/session/session-manager");
+}
+function projectRunFromEntries(source, runId) {
+  const entries = typeof source === "object" && source !== null && "getEntries" in source ? source.getEntries() : source;
+  return foldRunSessionEntries(entries, runId);
+}
+var ACTIVE_LOCAL_RUN_STATUSES = new Set([
+  "created",
+  "preparing",
+  "running",
+  "validating",
+  "reviewing",
+  "closing-out"
+]);
+function pidExists(pid) {
+  if (!Number.isInteger(pid) || pid <= 0)
+    return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function defaultOpenSession(sessionPath) {
+  const { SessionManager } = await loadSessionManager();
+  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 reconcileRuns(input, deps = {}) {
+  const listProjections = deps.listCollabSessionProjections ?? (await loadCollabApi()).listCollabSessionProjections;
+  const projectRun = deps.projectRunFromSession ?? projectRunFromEntries;
+  const exists = deps.processExists ?? pidExists;
+  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 };
+}
+
+// packages/product-entrypoint-plugin/src/product-entrypoint.ts
 import rigExtension from "@rig/rig-extension";
 import { resolveRigOmpConfigOverlayPath } from "@rig/runtime/control-plane/remote-config";
 function withRigDefaultConfig(projectRoot, argv) {

package/dist/src/reconcile.d.ts

@@ -0,0 +1,35 @@
+import type { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import { type RunJournalProjection, type RunSessionCustomEntry } from "@rig/contracts";
+import type { CollabRegistryFilter, CollabSessionProjection } from "@oh-my-pi/pi-coding-agent/collab/api";
+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 reconcileRuns(input: LazyReconcileInput, deps?: LazyReconcileDeps): Promise<LazyReconcileResult>;
+export declare const runLazyReconcile: typeof reconcileRuns;
+export {};

package/dist/src/reconcile.js

@@ -0,0 +1,104 @@
+// @bun
+var __require = import.meta.require;
+
+// packages/product-entrypoint-plugin/src/reconcile.ts
+import {
+  CUSTOM_TYPE_FOR,
+  foldRunSessionEntries,
+  isTerminalRunStatus
+} from "@rig/contracts";
+async function loadCollabApi() {
+  return await import("@oh-my-pi/pi-coding-agent/collab/api");
+}
+async function loadSessionManager() {
+  return await import("@oh-my-pi/pi-coding-agent/session/session-manager");
+}
+function projectRunFromEntries(source, runId) {
+  const entries = typeof source === "object" && source !== null && "getEntries" in source ? source.getEntries() : source;
+  return foldRunSessionEntries(entries, runId);
+}
+var ACTIVE_LOCAL_RUN_STATUSES = new Set([
+  "created",
+  "preparing",
+  "running",
+  "validating",
+  "reviewing",
+  "closing-out"
+]);
+function pidExists(pid) {
+  if (!Number.isInteger(pid) || pid <= 0)
+    return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function defaultOpenSession(sessionPath) {
+  const { SessionManager } = await loadSessionManager();
+  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 reconcileRuns(input, deps = {}) {
+  const listProjections = deps.listCollabSessionProjections ?? (await loadCollabApi()).listCollabSessionProjections;
+  const projectRun = deps.projectRunFromSession ?? projectRunFromEntries;
+  const exists = deps.processExists ?? pidExists;
+  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 };
+}
+var runLazyReconcile = reconcileRuns;
+export {
+  runLazyReconcile,
+  reconcileRuns
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/product-entrypoint-plugin",
-  "version": "0.0.6-alpha.155",
+  "version": "0.0.6-alpha.157",
   "type": "module",
   "description": "Standard Rig product entrypoint plugin boundary for OMP-backed product commands.",
   "license": "UNLICENSED",
@@ -31,9 +31,8 @@
   },
   "dependencies": {
     "@oh-my-pi/pi-coding-agent": "16.0.4",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.155",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.155",
-    "@rig/rig-extension": "npm:@h-rig/rig-extension@0.0.6-alpha.155",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.155"
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.157",
+    "@rig/rig-extension": "npm:@h-rig/rig-extension@0.0.6-alpha.157",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.157"
   }
 }