pi-oracle 0.1.12 → 0.2.1

package/extensions/oracle/lib/queue.ts

@@ -0,0 +1,193 @@
+import { existsSync } from "node:fs";
+import { loadOracleConfig } from "./config.js";
+import { withLock } from "./locks.js";
+import { appendCleanupWarnings, createJob, hasDurableWorkerHandoff, isTerminalOracleJob, listOracleJobDirs, readJob, spawnWorker, terminateWorkerPid, updateJob, withJobPhase, type OracleJob } from "./jobs.js";
+import {
+  cleanupRuntimeArtifacts,
+  releaseRuntimeLease,
+  tryAcquireConversationLease,
+  tryAcquireRuntimeLease,
+  type OracleConversationLeaseMetadata,
+  type OracleRuntimeLeaseMetadata,
+} from "./runtime.js";
+
+export interface OracleQueuePosition {
+  position: number;
+  depth: number;
+}
+
+export interface PromoteQueuedJobsOptions {
+  workerPath: string;
+  source: string;
+  spawnWorkerFn?: typeof spawnWorker;
+  loadConfigFn?: typeof loadOracleConfig;
+}
+
+function isQueuedJob(job: OracleJob | undefined): job is OracleJob {
+  return Boolean(job && job.status === "queued");
+}
+
+export function compareQueuedJobs(left: OracleJob, right: OracleJob): number {
+  const leftKey = left.queuedAt ?? left.createdAt;
+  const rightKey = right.queuedAt ?? right.createdAt;
+  return leftKey.localeCompare(rightKey) || left.createdAt.localeCompare(right.createdAt) || left.id.localeCompare(right.id);
+}
+
+export function listQueuedJobs(): OracleJob[] {
+  return listOracleJobDirs()
+    .map((jobDir) => readJob(jobDir))
+    .filter(isQueuedJob)
+    .sort(compareQueuedJobs);
+}
+
+export function getQueuePosition(jobId: string): OracleQueuePosition | undefined {
+  const queuedJobs = listQueuedJobs();
+  const index = queuedJobs.findIndex((job) => job.id === jobId);
+  if (index === -1) return undefined;
+  return {
+    position: index + 1,
+    depth: queuedJobs.length,
+  };
+}
+
+function runtimeLeaseMetadata(job: OracleJob, createdAt: string): OracleRuntimeLeaseMetadata {
+  return {
+    jobId: job.id,
+    runtimeId: job.runtimeId,
+    runtimeSessionName: job.runtimeSessionName,
+    runtimeProfileDir: job.runtimeProfileDir,
+    projectId: job.projectId,
+    sessionId: job.sessionId,
+    createdAt,
+  };
+}
+
+function conversationLeaseMetadata(job: OracleJob, createdAt: string): OracleConversationLeaseMetadata | undefined {
+  if (!job.conversationId) return undefined;
+  return {
+    jobId: job.id,
+    conversationId: job.conversationId,
+    projectId: job.projectId,
+    sessionId: job.sessionId,
+    createdAt,
+  };
+}
+
+async function failQueuedPromotion(job: OracleJob, message: string, at: string): Promise<void> {
+  await updateJob(job.id, (current) => ({
+    ...current,
+    ...withJobPhase("failed", {
+      status: "failed",
+      completedAt: at,
+      heartbeatAt: at,
+      notifyClaimedAt: undefined,
+      notifyClaimedBy: undefined,
+      error: message,
+    }, at),
+  })).catch(() => undefined);
+}
+
+export async function promoteQueuedJobsWithinAdmissionLock(options: PromoteQueuedJobsOptions): Promise<{ promotedJobIds: string[] }> {
+  const spawnWorkerFn = options.spawnWorkerFn ?? spawnWorker;
+  const loadConfigFn = options.loadConfigFn ?? loadOracleConfig;
+  const promotedJobIds: string[] = [];
+
+  for (const queuedJob of listQueuedJobs()) {
+    const now = new Date().toISOString();
+    let runtimeLeaseAcquired = false;
+    let conversationLeaseAcquired = false;
+    let workerSpawned = false;
+    let spawnedWorker: Awaited<ReturnType<typeof spawnWorker>> | undefined;
+
+    try {
+      const current = readJob(queuedJob.id);
+      if (!isQueuedJob(current)) continue;
+      if (!existsSync(current.archivePath)) {
+        await failQueuedPromotion(current, `Queued oracle archive is missing: ${current.archivePath}`, now);
+        continue;
+      }
+
+      const config = current.config ?? loadConfigFn(current.cwd);
+      const runtimeAttempt = await tryAcquireRuntimeLease(config, runtimeLeaseMetadata(current, now));
+      if (!runtimeAttempt.acquired) break;
+      runtimeLeaseAcquired = true;
+
+      const conversationMetadata = conversationLeaseMetadata(current, now);
+      if (conversationMetadata) {
+        const conversationAttempt = await tryAcquireConversationLease(conversationMetadata);
+        if (!conversationAttempt.acquired) {
+          await releaseRuntimeLease(current.runtimeId).catch(() => undefined);
+          runtimeLeaseAcquired = false;
+          continue;
+        }
+        conversationLeaseAcquired = true;
+      }
+
+      await updateJob(current.id, (latest) => {
+        if (latest.status !== "queued") {
+          throw new Error(`Queued job ${latest.id} changed state during promotion (${latest.status})`);
+        }
+        return {
+          ...latest,
+          config,
+          ...withJobPhase("submitted", {
+            status: "submitted",
+            submittedAt: latest.submittedAt || now,
+          }, now),
+        };
+      });
+
+      spawnedWorker = await spawnWorkerFn(options.workerPath, current.id);
+      workerSpawned = true;
+      const worker = spawnedWorker;
+      await updateJob(current.id, (latest) => ({
+        ...latest,
+        workerPid: worker.pid,
+        workerNonce: worker.nonce,
+        workerStartedAt: worker.startedAt,
+      }));
+      promotedJobIds.push(current.id);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      const latest = readJob(queuedJob.id);
+      if (workerSpawned && latest && hasDurableWorkerHandoff(latest)) {
+        promotedJobIds.push(queuedJob.id);
+        continue;
+      }
+      if (spawnedWorker) {
+        await terminateWorkerPid(spawnedWorker.pid, spawnedWorker.startedAt).catch(() => undefined);
+      }
+      if (latest && !isTerminalOracleJob(latest)) {
+        await failQueuedPromotion(latest, message, now);
+      }
+      const cleanupReport = await cleanupRuntimeArtifacts({
+        runtimeId: runtimeLeaseAcquired ? queuedJob.runtimeId : undefined,
+        runtimeProfileDir: runtimeLeaseAcquired ? queuedJob.runtimeProfileDir : undefined,
+        runtimeSessionName: workerSpawned ? queuedJob.runtimeSessionName : undefined,
+        conversationId: conversationLeaseAcquired ? queuedJob.conversationId : undefined,
+      }).catch(() => ({ attempted: [], warnings: [] }));
+      if (cleanupReport.warnings.length > 0) {
+        await appendCleanupWarnings(queuedJob.id, cleanupReport.warnings, now).catch(() => undefined);
+      }
+    }
+  }
+
+  return { promotedJobIds };
+}
+
+export async function promoteQueuedJobs(options: PromoteQueuedJobsOptions): Promise<{ promotedJobIds: string[] }> {
+  return withLock("admission", "global", { processPid: process.pid, source: options.source }, async () => {
+    return promoteQueuedJobsWithinAdmissionLock(options);
+  });
+}
+
+export async function createQueuedJob(
+  id: string,
+  input: Parameters<typeof createJob>[1],
+  cwd: string,
+  originSessionFile: string | undefined,
+  config: Parameters<typeof createJob>[4],
+  runtime: Parameters<typeof createJob>[5],
+): Promise<OracleJob> {
+  return createJob(id, input, cwd, originSessionFile, config, runtime, { initialState: "queued" });
+}

package/extensions/oracle/lib/runtime.ts

@@ -31,6 +31,17 @@ export interface OracleConversationLeaseMetadata {
   createdAt: string;
 }
 
+export interface OracleRuntimeLeaseAttempt {
+  acquired: boolean;
+  liveLeases: OracleRuntimeLeaseMetadata[];
+  blocker?: OracleRuntimeLeaseMetadata;
+}
+
+export interface OracleConversationLeaseAttempt {
+  acquired: boolean;
+  blocker?: OracleConversationLeaseMetadata;
+}
+
 export function getProjectId(cwd: string): string {
   try {
     return realpathSync(cwd);
@@ -39,8 +50,19 @@ export function getProjectId(cwd: string): string {
   }
 }
 
-export function getSessionId(originSessionFile: string | undefined, projectId: string): string {
-  return originSessionFile || `ephemeral:${projectId}`;
+export function hasPersistedSessionFile(originSessionFile: string | undefined): originSessionFile is string {
+  return Boolean(originSessionFile);
+}
+
+export function requirePersistedSessionFile(originSessionFile: string | undefined, action = "use oracle"): string {
+  if (!originSessionFile) {
+    throw new Error(`Oracle requires a persisted pi session to ${action}. Start or save a real session before using oracle.`);
+  }
+  return originSessionFile;
+}
+
+export function getSessionId(originSessionFile: string | undefined, _projectId: string): string {
+  return requirePersistedSessionFile(originSessionFile, "derive oracle session identity");
 }
 
 export function parseConversationId(chatUrl: string | undefined): string | undefined {
@@ -88,14 +110,14 @@ function activeJobExists(jobId: string): boolean {
   const path = join(ORACLE_JOBS_DIR, `oracle-${jobId}`, "job.json");
   if (!existsSync(path)) return false;
   try {
-    const job = JSON.parse(readFileSync(path, "utf8")) as { status?: string };
-    return ["preparing", "submitted", "waiting"].includes(job.status || "");
+    const job = JSON.parse(readFileSync(path, "utf8")) as { status?: string; cleanupWarnings?: unknown; cleanupPending?: unknown };
+    return ["preparing", "submitted", "waiting"].includes(job.status || "") || job.cleanupPending === true || (Array.isArray(job.cleanupWarnings) && job.cleanupWarnings.length > 0);
   } catch {
     return false;
   }
 }
 
-export async function acquireRuntimeLease(config: OracleConfig, metadata: OracleRuntimeLeaseMetadata): Promise<void> {
+async function collectLiveRuntimeLeases(): Promise<OracleRuntimeLeaseMetadata[]> {
   const existing = listLeaseMetadata<OracleRuntimeLeaseMetadata>("runtime");
   const liveLeases: OracleRuntimeLeaseMetadata[] = [];
   for (const lease of existing) {
@@ -105,14 +127,33 @@ export async function acquireRuntimeLease(config: OracleConfig, metadata: Oracle
     }
     liveLeases.push(lease);
   }
+  return liveLeases;
+}
+
+export async function tryAcquireRuntimeLease(config: OracleConfig, metadata: OracleRuntimeLeaseMetadata): Promise<OracleRuntimeLeaseAttempt> {
+  const liveLeases = await collectLiveRuntimeLeases();
   if (liveLeases.length >= config.browser.maxConcurrentJobs) {
-    const blocker = liveLeases[0];
-    throw new Error(
-      `Oracle is busy (${liveLeases.length}/${config.browser.maxConcurrentJobs} active). ` +
-        `Blocking job ${blocker?.jobId ?? "unknown"} in project ${blocker?.projectId ?? "unknown"}.`,
-    );
+    return {
+      acquired: false,
+      liveLeases,
+      blocker: liveLeases[0],
+    };
   }
   await createLease("runtime", metadata.runtimeId, metadata);
+  return {
+    acquired: true,
+    liveLeases,
+  };
+}
+
+export async function acquireRuntimeLease(config: OracleConfig, metadata: OracleRuntimeLeaseMetadata): Promise<void> {
+  const attempt = await tryAcquireRuntimeLease(config, metadata);
+  if (attempt.acquired) return;
+  const blocker = attempt.blocker;
+  throw new Error(
+    `Oracle is busy (${attempt.liveLeases.length}/${config.browser.maxConcurrentJobs} active). ` +
+      `Blocking job ${blocker?.jobId ?? "unknown"} in project ${blocker?.projectId ?? "unknown"}.`,
+  );
 }
 
 export async function releaseRuntimeLease(runtimeId: string | undefined): Promise<void> {
@@ -120,19 +161,29 @@ export async function releaseRuntimeLease(runtimeId: string | undefined): Promis
   await releaseLease("runtime", runtimeId);
 }
 
-export async function acquireConversationLease(metadata: OracleConversationLeaseMetadata): Promise<void> {
+export async function tryAcquireConversationLease(metadata: OracleConversationLeaseMetadata): Promise<OracleConversationLeaseAttempt> {
   const existing = await readLeaseMetadata<OracleConversationLeaseMetadata>("conversation", metadata.conversationId);
+  if (existing?.jobId === metadata.jobId) {
+    return { acquired: true };
+  }
   if (existing && existing.jobId !== metadata.jobId) {
     if (!activeJobExists(existing.jobId)) {
       await releaseLease("conversation", metadata.conversationId).catch(() => undefined);
     } else {
-      throw new Error(
-        `Oracle conversation ${metadata.conversationId} is already in use by job ${existing.jobId}. ` +
-          `Concurrent follow-ups to the same ChatGPT thread are not allowed.`,
-      );
+      return { acquired: false, blocker: existing };
     }
   }
   await createLease("conversation", metadata.conversationId, metadata);
+  return { acquired: true };
+}
+
+export async function acquireConversationLease(metadata: OracleConversationLeaseMetadata): Promise<void> {
+  const attempt = await tryAcquireConversationLease(metadata);
+  if (attempt.acquired) return;
+  throw new Error(
+    `Oracle conversation ${metadata.conversationId} is already in use by job ${attempt.blocker?.jobId ?? "unknown"}. ` +
+      `Concurrent follow-ups to the same ChatGPT thread are not allowed.`,
+  );
 }
 
 export async function releaseConversationLease(conversationId: string | undefined): Promise<void> {
@@ -180,7 +231,7 @@ export async function cloneSeedProfileToRuntime(config: OracleConfig, runtimePro
 const AGENT_BROWSER_CLOSE_TIMEOUT_MS = 10_000;
 
 export interface OracleCleanupReport {
-  attempted: Array<"browser" | "runtimeProfileDir" | "conversationLease" | "runtimeLease">;
+  attempted: Array<"browser" | "runtimeProfileDir" | "conversationLease" | "runtimeLease" | "queuedArchive">;
   warnings: string[];
 }
 
@@ -235,6 +286,9 @@ export async function cleanupRuntimeArtifacts(runtime: {
       report.warnings.push(`Failed to remove runtime profile ${runtime.runtimeProfileDir}: ${error.message}`);
     });
   }
+  if (report.warnings.length > 0) {
+    return report;
+  }
   if (runtime.conversationId) {
     report.attempted.push("conversationLease");
   }