pi-oracle 0.7.16 → 0.7.18

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 ## Unreleased
 
+## 0.7.18 - 2026-07-14
+
+### Changed
+- refreshed the local Pi/pi-ai development lock, sanity contracts, safe-loader version check, and compatibility guidance for Pi 0.80.7
+- updated the local Pi and pi-ai development baseline to 0.80.6
+- switched provider and mode tool schemas to Pi's Google-compatible `StringEnum` helper
+
+### Fixed
+- made the sanity harness independent of the caller's browser profile layout and installed `agent-browser` sessions
+
+## 0.7.17 - 2026-07-01
+
+### Changed
+- clarified oracle prompt/docs validation around provider upload ceilings, Node release-gate requirements, and follow-up dispatch rules
+- centralized provider normalization, project-trust probing, oracle jobs-dir defaults, and timestamp parsing in narrow source-of-truth modules
+
+### Fixed
+- made sanity-runner mode and real-smoke timeout validation fail through tested behavior paths instead of brittle source-string contracts
+- removed duplicate worker/auth helper logic for snapshot parsing, URL normalization, conversation ids, and login-probe normalization
+
+### Validation
+- ran the full `npm run verify:oracle` local gate before release
+
 ## 0.7.16 - 2026-06-24
 
 ### Changed

package/README.md

@@ -2,7 +2,7 @@
 
 `pi-oracle` lets a `pi` agent send hard, long-running work to ChatGPT.com or Grok through the web app, with repo archives, background execution, saved results, and a best-effort wake-up back into `pi` when the answer is ready.
 
-> Status: experimental public beta. Current local validation baseline is pi `0.80.2`; the platform-smoke harness covers macOS, Linux, and Windows native with Chromium-family browsers. Pi `0.80.2+` is the suggested tested floor for project-trust-aware package/runtime validation, but pi-bundled runtime packages remain optional wildcard peers so npm peer ranges do not block users from trying newer pi releases. Normal oracle jobs run in an isolated browser profile, not your active browser window.
+> Status: experimental public beta. Current local validation baseline is pi `0.80.7`; the platform-smoke harness covers macOS, Linux, and Windows native with Chromium-family browsers. Pi `0.80.7+` is the suggested tested floor for project-trust-aware package/runtime validation, but pi-bundled runtime packages remain optional wildcard peers so npm peer ranges do not block users from trying newer pi releases. Normal oracle jobs run in an isolated browser profile, not your active browser window.
 
 ## What a successful run looks like
 
@@ -78,8 +78,8 @@ To update the package later, use `pi update --extensions`, `pi update --all`, or
 You need:
 
 - macOS, Linux, or Windows native
-- Node.js 22 or newer
-- Suggested tested floor: `pi` 0.80.2 or newer; older pi versions are not blocked by package metadata but are outside the current validation baseline
+- Node.js 22.19.0 or newer for package install/use; platform smoke/release validation currently expects Node 24+ per `platform-smoke.config.mjs`
+- Suggested tested floor: `pi` 0.80.7 or newer; older pi versions are not blocked by package metadata but are outside the current validation baseline
 - Google Chrome/Chromium or another Chromium-family browser
 - ChatGPT or Grok already signed in to the configured local browser profile for the provider you plan to use
 - `agent-browser` and `tar` available on the machine; `zstd` is also required when submitting ChatGPT `.tar.zst` archives
@@ -391,7 +391,8 @@ Use the narrowest validation workflow that proves the change:
 | Situation | Command(s) |
 | --- | --- |
 | Everyday local iteration | `npm run verify:oracle` |
-| Platform-sensitive changes | `npm run smoke:platform:doctor`, then a focused `node scripts/platform-smoke.mjs run --target <target> --suite <suite>` |
+| Platform-focused syntax/invariant sanity | `npm run check:platform-smoke`, `npm run sanity:oracle:platform` |
+| Platform-sensitive runtime changes | `npm run smoke:platform:doctor`, then a focused `node scripts/platform-smoke.mjs run --target <target> --suite <suite>` |
 | Platform matrix proof | `npm run smoke:platform:all` |
 | ChatGPT preset release proof | `npm run release:proof:chatgpt-presets` |
 | Publish/release gate | `npm run release:check` |

package/docs/ORACLE_DESIGN.md

@@ -7,7 +7,7 @@ Companion doc:
 - `docs/ORACLE_RECOVERY_DRILL.md` — safe expired-auth recovery validation drill
 
 Compatibility target:
-- `pi` 0.80.2+ is the suggested tested floor for current project-trust-aware package/runtime validation
+- `pi` 0.80.7+ is the suggested tested floor for current project-trust-aware package/runtime validation
 - package metadata keeps pi runtime packages as optional wildcard peers, so this suggested floor is not enforced as a hard npm install requirement
 - current extension lifecycle only; no backward-compatibility shims for removed `session_switch` / `session_fork` events
 
@@ -115,7 +115,7 @@ It instructs the agent to:
 2. stop right away if preflight reports the session or local oracle setup is not ready
 3. understand whether the request is explicitly narrow or genuinely broad
 4. if auth is missing, stale, or the worker explicitly said to rerun `/oracle-auth`, stop and tell the user to run `/oracle-auth` rather than launching auth automatically
-5. gather enough repo context to submit well and bias toward context-rich archives when they fit within the provider ceiling: 250 MB for ChatGPT and 200 MiB for Grok
+5. gather enough repo context to submit well and bias toward context-rich archives when they fit within the provider ceiling: 250 MiB for ChatGPT and 200 MiB for Grok
 6. if the request is narrow, start from the directly relevant area but still include nearby tests, docs, config, and adjacent modules when they may improve answer quality
 7. if the request is broad/repo-wide, gather broader context and usually archive `.`
 8. if `oracle_submit` fails before dispatch with an `archive_too_large` / upload-limit error, treat that as retryable: use the reported size summary plus any auto-pruned paths to cut scope and retry automatically with a smaller archive
@@ -639,6 +639,10 @@ Remaining non-blocking hardening work:
 - keep hardening model-selection verification against future ChatGPT UI variation
 
 Recent proof points:
+- Pi 0.80.7 local gate: `npm run verify:oracle` passed on 2026-07-14, including syntax/bundle checks, both typechecks, the isolated sanity harness, and `npm pack --dry-run`
+- Pi 0.80.7 safe loader smokes: `.artifacts/real-smoke/run-1784068526377-67yb2l` passed source loading, and `.artifacts/real-smoke/run-1784068527234-t2a5xm` passed packed-install loading through the real Pi CLI; both executed `/oracle-status` without creating an external oracle job or requiring provider credentials
+- Pi 0.80.6 local gate: `npm run verify:oracle` passed three consecutive runs on 2026-07-11; each run completed syntax/bundle checks, both typechecks, the isolated sanity harness, and `npm pack --dry-run` without an `ENOTEMPTY` cleanup failure
+- Pi 0.80.6 safe loader smokes: `.artifacts/real-smoke/run-1783810473367-cn72at` passed source loading, and `.artifacts/real-smoke/run-1783810475290-hj0pfs` passed packed-install loading through the real Pi CLI; both recorded `pi --version` as 0.80.6 and executed `/oracle-status` without creating an external oracle job or requiring provider credentials
 - Pi 0.80.2 local gate: `npm run verify:oracle` passed on 2026-06-24 after the JSON command output, prompt-manifest, schema, and lazy Chrome-probe audit fixes
 - Pi 0.80.2 isolated extension smokes: `.artifacts/real-smoke/run-1782321054924-jnq0x3` passed source proof, and `.artifacts/real-smoke/run-1782321056224-yuq5a2` passed packed-install proof
 - Pi 0.80.2 JSON command smoke: `pi --no-extensions -e ./extensions/oracle/index.ts --mode json --no-session --no-approve "/oracle-status"` emitted displayed `oracle-command-output` JSON events
@@ -658,6 +662,6 @@ Recent proof points:
 - expired-auth drill post-repair success: `fa26a2a7-0057-4a21-b3e0-71c1d020facf`
 - successful multi-artifact completion: `b6b3599c-6b91-4315-adfa-8a83aa5eda9b`
 - repo-owned sanity harness: `npm run sanity:oracle`
-- real installed-extension smoke source of truth: `scripts/oracle-real-smoke.mjs`; required release proof runs packed-install mode (`npm run smoke:real:packed`) and executes installed-package `oracle_submit` deterministically, with optional slower model-agent debugging via `PI_ORACLE_REAL_TEST_MODEL_AGENT=1`; source mode (`npm run smoke:real:source`) is inner-loop/debug only
+- real installed-extension smoke source of truth: `scripts/oracle-real-smoke.mjs`; required release proof runs packed-install mode (`npm run smoke:real:packed`), asserts Pi 0.80.7, and executes `/oracle-status` through Pi's installed-package loader without provider credentials or an external oracle job; optional slower model-agent submission debugging remains behind `PI_ORACLE_REAL_TEST_MODEL_AGENT=1`; source mode (`npm run smoke:real:source`) is inner-loop/debug only
 - macOS, Ubuntu, and Windows native package/build/runtime smoke source of truth: `docs/platform-smoke.md`; use `npm run verify:oracle` for everyday local iteration, `npm run smoke:platform:doctor` plus a focused target/suite run for platform-sensitive changes, `npm run smoke:platform:all` for doctor-first platform matrix evidence, and `npm run release:check` for the full local-plus-platform release gate
 - release gate: `npm run release:check`, also used by `prepublishOnly`, combines static verification, fresh loaded-extension ChatGPT preset proof via `npm run release:proof:chatgpt-presets`, and all required Crabbox platform smokes

package/docs/ORACLE_RECOVERY_DRILL.md

@@ -43,7 +43,7 @@ mkdir -p "$SEED"
 chmod 700 "$SEED"
 ```
 
-This simulates a seed profile with no usable ChatGPT session.
+This simulates a seed profile with no usable provider session.
 
 ## Validation steps
 
@@ -72,7 +72,7 @@ Run:
 ```
 
 Expected result:
-- ChatGPT cookies are re-synced into the seed profile
+- provider cookies are re-synced into the seed profile
 - no real Chrome profile is mutated
 - command reports success
 

package/extensions/oracle/index.ts

@@ -11,6 +11,7 @@ import { loadOracleConfig } from "./lib/config.js";
 import { registerOracleCommands } from "./lib/commands.js";
 import { getSessionFile, pruneTerminalOracleJobs, reconcileStaleOracleJobs } from "./lib/jobs.js";
 import { isLockTimeoutError, withGlobalReconcileLock } from "./lib/locks.js";
+import { isOracleProjectTrusted } from "./lib/trust.js";
 import { refreshOracleStatus, setOracleReadiness, startPoller, stopPoller } from "./lib/poller.js";
 import { promoteQueuedJobs } from "./lib/queue.js";
 import { assertOracleSubmitPrerequisites, hasPersistedSessionFile } from "./lib/runtime.js";
@@ -29,10 +30,6 @@ function oracleReadinessFromError(error: unknown): "auth_needed" | "config_error
   return /auth seed profile/i.test(message) ? "auth_needed" : "config_error";
 }
 
-function isProjectTrusted(ctx: ExtensionContext): boolean {
-  return (ctx as { isProjectTrusted?: () => boolean }).isProjectTrusted?.() ?? true;
-}
-
 function expandOraclePromptTemplate(source: string, args: string): string {
   return source.replaceAll("$@", args).replaceAll("$ARGUMENTS", args);
 }
@@ -94,7 +91,7 @@ export default function oracleExtension(pi: ExtensionAPI) {
         return;
       }
 
-      const config = loadOracleConfig(ctx.cwd, { projectConfigTrusted: isProjectTrusted(ctx) });
+      const config = loadOracleConfig(ctx.cwd, { projectConfigTrusted: isOracleProjectTrusted(ctx) });
       setOracleReadiness(ctx, "loaded");
       void assertOracleSubmitPrerequisites(config)
         .then(() => setOracleReadiness(ctx, "ready"))

package/extensions/oracle/lib/commands.ts

@@ -8,7 +8,8 @@ import { readFile } from "node:fs/promises";
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { formatOracleCancelOutcome, formatOracleJobSummary } from "../shared/job-observability-helpers.mjs";
 import { runOracleAuthBootstrap } from "./auth.js";
-import type { OracleProvider } from "./config.js";
+import { normalizeOracleProviderAlias, type OracleProvider } from "./config.js";
+import { isOracleProjectTrusted } from "./trust.js";
 import {
   cancelOracleJob,
   getJobDir,
@@ -27,11 +28,6 @@ import { refreshOracleStatus } from "./poller.js";
 import { isLockTimeoutError, withGlobalReconcileLock } from "./locks.js";
 import { getProjectId } from "./runtime.js";
 
-export interface OracleCommandPromptTemplates {
-  oracle?: string;
-  oracleFollowup?: string;
-}
-
 async function summarizeJob(jobId: string, options?: { responsePreview?: boolean }): Promise<string> {
   const job = readJob(jobId);
   if (!job) return `Oracle job ${jobId} not found.`;
@@ -72,17 +68,13 @@ function readScopedJob(jobId: string, cwd: string) {
 }
 
 function parseOracleAuthProvider(args: string): OracleProvider | undefined {
-  const value = args.trim().toLowerCase();
+  const value = args.trim();
   if (!value) return undefined;
-  if (value === "chatgpt" || value === "chat-gpt" || value === "openai") return "chatgpt";
-  if (value === "grok" || value === "xai" || value === "x.ai") return "grok";
+  const provider = normalizeOracleProviderAlias(value);
+  if (provider) return provider;
   throw new Error("Usage: /oracle-auth [chatgpt|grok]");
 }
 
-function isProjectTrusted(ctx: ExtensionCommandContext): boolean {
-  return (ctx as { isProjectTrusted?: () => boolean }).isProjectTrusted?.() ?? true;
-}
-
 function emitCommandOutput(pi: ExtensionAPI, ctx: ExtensionCommandContext, message: string, level: "info" | "warning" | "error" = "info"): void {
   if (ctx.mode === "print") {
     process.stdout.write(`${message}\n`);
@@ -100,7 +92,7 @@ function emitCommandOutput(pi: ExtensionAPI, ctx: ExtensionCommandContext, messa
   });
 }
 
-export function registerOracleCommands(pi: ExtensionAPI, authWorkerPath: string, workerPath: string, _promptTemplates: OracleCommandPromptTemplates = {}): void {
+export function registerOracleCommands(pi: ExtensionAPI, authWorkerPath: string, workerPath: string): void {
   pi.registerCommand("oracle-auth", {
     description: "Sync ChatGPT or Grok cookies from the configured local browser profile into the provider auth seed profile",
     handler: async (args, ctx) => {
@@ -108,7 +100,7 @@ export function registerOracleCommands(pi: ExtensionAPI, authWorkerPath: string,
         const provider = parseOracleAuthProvider(args);
         const providerLabel = provider === "grok" ? "Grok" : provider === "chatgpt" ? "ChatGPT" : "configured provider";
         emitCommandOutput(pi, ctx, `Syncing ${providerLabel} cookies from the configured local browser profile into the oracle auth seed profile…`, "info");
-        const result = await runOracleAuthBootstrap(authWorkerPath, ctx.cwd, provider, { projectConfigTrusted: isProjectTrusted(ctx) });
+        const result = await runOracleAuthBootstrap(authWorkerPath, ctx.cwd, provider, { projectConfigTrusted: isOracleProjectTrusted(ctx) });
         emitCommandOutput(pi, ctx, result, "info");
       } catch (error) {
         emitCommandOutput(pi, ctx, error instanceof Error ? error.message : String(error), "warning");

package/extensions/oracle/lib/config.ts

@@ -22,6 +22,21 @@ import { getProjectId } from "./runtime.js";
 export const ORACLE_PROVIDERS = ["chatgpt", "grok"] as const;
 export type OracleProvider = (typeof ORACLE_PROVIDERS)[number];
 
+export function normalizeOracleProviderAlias(value: string): OracleProvider | undefined {
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "chatgpt" || normalized === "chat-gpt" || normalized === "openai") return "chatgpt";
+  if (normalized === "grok" || normalized === "xai" || normalized === "x.ai") return "grok";
+  return undefined;
+}
+
+export function normalizeOracleProvider(value: unknown, fallback: OracleProvider, toolName = "oracle_submit"): OracleProvider {
+  if (value === undefined) return fallback;
+  if (typeof value !== "string") throw new Error(`${toolName} provider must be a string`);
+  const provider = normalizeOracleProviderAlias(value);
+  if (provider) return provider;
+  throw new Error(`Unknown ${toolName} provider: ${value}. Use chatgpt or grok.`);
+}
+
 export { resolveOracleArchiveFormat, resolveOracleProviderArchivePlan } from "./provider-capabilities.js";
 export type { OracleArchiveFormat, OracleProviderArchivePlan } from "./provider-capabilities.js";
 

package/extensions/oracle/lib/jobs.ts

@@ -30,6 +30,8 @@ import type { OracleJobLifecycleEvent as SharedOracleJobLifecycleEvent, OracleJo
 import { hasDurableWorkerHandoff as sharedHasDurableWorkerHandoff } from "../shared/job-coordination-helpers.mjs";
 import { isTrackedProcessAlive, readProcessStartedAt, spawnDetachedNodeProcess, terminateTrackedProcess } from "../shared/process-helpers.mjs";
 import type { OracleConfig, OracleResolvedSelection } from "./config.js";
+import { getOracleJobsDir } from "../shared/state-path-helpers.mjs";
+import { parseTimestamp } from "../shared/time-helpers.mjs";
 import { resolveOracleProviderArchivePlan } from "./provider-capabilities.js";
 import { withJobLock, withLock } from "./locks.js";
 import { cleanupRuntimeArtifacts, getProjectId, getSessionId, parseConversationId, requirePersistedSessionFile, type OracleCleanupReport } from "./runtime.js";
@@ -50,9 +52,8 @@ const ORACLE_JOB_DIR_RM_MAX_RETRIES = 5;
 const ORACLE_JOB_DIR_RM_RETRY_DELAY_MS = 50;
 const ORACLE_COMPLETE_JOB_RETENTION_MS = 14 * 24 * 60 * 60 * 1000;
 const ORACLE_FAILED_JOB_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
-export const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
-export const ORACLE_JOBS_DIR_ENV = "PI_ORACLE_JOBS_DIR";
-const ORACLE_JOBS_DIR = process.env[ORACLE_JOBS_DIR_ENV]?.trim() || DEFAULT_ORACLE_JOBS_DIR;
+export { DEFAULT_ORACLE_JOBS_DIR, ORACLE_JOBS_DIR_ENV, getOracleJobsDir } from "../shared/state-path-helpers.mjs";
+const ORACLE_JOBS_DIR = getOracleJobsDir();
 
 export function isActiveOracleJob(job: Pick<OracleJob, "status">): boolean {
   return ACTIVE_ORACLE_JOB_STATUSES.includes(job.status);
@@ -217,10 +218,6 @@ export function getSessionFile(ctx: ExtensionContext): string | undefined {
   return hasSessionFileAccessor(ctx.sessionManager) ? ctx.sessionManager.getSessionFile() : undefined;
 }
 
-export function getOracleJobsDir(): string {
-  return ORACLE_JOBS_DIR;
-}
-
 export function getJobDir(id: string): string {
   return join(ORACLE_JOBS_DIR, `oracle-${id}`);
 }
@@ -297,12 +294,6 @@ export async function clearCleanupPending(jobId: string, at = new Date().toISOSt
   }
 }
 
-function parseTimestamp(value: string | undefined): number | undefined {
-  if (!value) return undefined;
-  const parsed = Date.parse(value);
-  return Number.isFinite(parsed) ? parsed : undefined;
-}
-
 function notificationClaimIsOwnedBy(job: Pick<OracleJob, "notifyClaimedAt" | "notifyClaimedBy">, claimedBy: string, now = Date.now()): boolean {
   if (job.notifyClaimedBy !== claimedBy) return false;
   const claimedAtMs = parseTimestamp(job.notifyClaimedAt);

package/extensions/oracle/lib/locks.ts

@@ -100,14 +100,6 @@ export async function withGlobalReconcileLock<T>(
   return withLock("reconcile", "global", metadata, fn, { timeoutMs: options?.timeoutMs ?? 30_000 });
 }
 
-export async function withGlobalScanLock<T>(
-  metadata: unknown,
-  fn: () => Promise<T>,
-  options?: { timeoutMs?: number },
-): Promise<T> {
-  return withLock("scan", "global", metadata, fn, { timeoutMs: options?.timeoutMs ?? 5_000 });
-}
-
 export async function withJobLock<T>(jobId: string, metadata: unknown, fn: () => Promise<T>): Promise<T> {
   return withLock("job", jobId, metadata, fn, { timeoutMs: 10_000 });
 }

package/extensions/oracle/lib/poller.ts

@@ -7,6 +7,7 @@ import { existsSync } from "node:fs";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { buildOracleStatusText, buildOracleWakeupNotificationContent, type OracleReadinessStatus } from "../shared/job-observability-helpers.mjs";
 import { isProcessAlive, readProcessStartedAt } from "../shared/process-helpers.mjs";
+import { parseTimestamp } from "../shared/time-helpers.mjs";
 import { isLockTimeoutError, listLeaseMetadata, releaseLease, withGlobalReconcileLock, writeLeaseMetadata } from "./locks.js";
 import {
   getJobDir,
@@ -90,12 +91,6 @@ function jobMatchesContext(job: { projectId: string; sessionId: string }, sessio
   return job.projectId === projectId && job.sessionId === sessionId;
 }
 
-function parseTimestamp(value: string | undefined): number | undefined {
-  if (!value) return undefined;
-  const parsed = Date.parse(value);
-  return Number.isFinite(parsed) ? parsed : undefined;
-}
-
 function getWakeupTargetLeaseKey(sessionKey: string, processPid = process.pid, processStartedAt = readProcessStartedAt(process.pid) || "unknown"): string {
   return `${sessionKey}::${processPid}::${processStartedAt}`;
 }

package/extensions/oracle/lib/queue.ts

@@ -14,7 +14,7 @@ import {
 import { transitionOracleJobPhase } from "../shared/job-lifecycle-helpers.mjs";
 import { loadOracleConfig } from "./config.js";
 import { withLock } from "./locks.js";
-import { appendCleanupWarnings, createJob, isTerminalOracleJob, listOracleJobDirs, readJob, spawnWorker, terminateWorkerPid, updateJob, type OracleJob } from "./jobs.js";
+import { appendCleanupWarnings, isTerminalOracleJob, listOracleJobDirs, readJob, spawnWorker, terminateWorkerPid, updateJob, type OracleJob } from "./jobs.js";
 import { cleanupRuntimeArtifacts, releaseRuntimeLease, tryAcquireConversationLease, tryAcquireRuntimeLease } from "./runtime.js";
 
 export interface OracleQueuePosition {
@@ -144,14 +144,3 @@ export async function promoteQueuedJobs(options: PromoteQueuedJobsOptions): Prom
     return promoteQueuedJobsWithinAdmissionLock(options);
   }, { timeoutMs: options.lockTimeoutMs });
 }
-
-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

@@ -13,12 +13,11 @@ import { assertNotKnownBrowserUserDataPath, sweetCookieSafeStoragePasswordScrubb
 import { jobBlocksAdmission } from "../shared/job-coordination-helpers.mjs";
 import { isTrackedProcessAlive } from "../shared/process-helpers.mjs";
 import type { OracleConfig, OracleProvider } from "./config.js";
+import { getOracleJobsDir } from "../shared/state-path-helpers.mjs";
 import { resolveOracleProviderArchivePlan } from "./provider-capabilities.js";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withAuthLock } from "./locks.js";
 
 const SEED_GENERATION_FILE = ".oracle-seed-generation";
-const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
-const ORACLE_JOBS_DIR = process.env.PI_ORACLE_JOBS_DIR?.trim() || DEFAULT_ORACLE_JOBS_DIR;
 const AGENT_BROWSER_BIN = [process.env.AGENT_BROWSER_PATH, "/opt/homebrew/bin/agent-browser", "/usr/local/bin/agent-browser"].find(
   (candidate) => typeof candidate === "string" && candidate && existsSync(candidate),
 ) || "agent-browser";
@@ -338,7 +337,7 @@ export async function assertOracleSubmitPrerequisites(config: OracleConfig, prov
     await assertRequiredLocalDependencyReady(dependency.name, dependency.command);
   }
   await assertWritableDirectory(config.browser.runtimeProfilesDir, "runtime profiles");
-  await assertWritableDirectory(ORACLE_JOBS_DIR, "jobs");
+  await assertWritableDirectory(getOracleJobsDir(), "jobs");
 }
 
 export function getSeedGeneration(config: OracleConfig): string | undefined {
@@ -359,7 +358,7 @@ export async function writeSeedGeneration(config: OracleConfig, value = new Date
 }
 
 function activeJobExists(jobId: string): boolean {
-  const path = join(ORACLE_JOBS_DIR, `oracle-${jobId}`, "job.json");
+  const path = join(getOracleJobsDir(), `oracle-${jobId}`, "job.json");
   if (!existsSync(path)) return false;
   try {
     const job = JSON.parse(readFileSync(path, "utf8")) as {

package/extensions/oracle/lib/tools.ts

@@ -9,6 +9,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { createArchive, type ArchiveCreationResult, type ArchiveSizeBreakdownRow } from "./archive.js";
 import { runOracleAuthBootstrap } from "./auth.js";
+import { StringEnum } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Type, type Static } from "typebox";
 import { formatOracleCancelOutcome, formatOracleJobSummary, formatOracleSubmitResponse } from "../shared/job-observability-helpers.mjs";
@@ -17,6 +18,7 @@ import { isLockTimeoutError, withGlobalReconcileLock, withLock } from "./locks.j
 import {
   coerceOracleSubmitPresetId,
   loadOracleConfig,
+  normalizeOracleProvider,
   GROK_MODES,
   ORACLE_PROVIDERS,
   ORACLE_SUBMIT_PRESET_IDS,
@@ -49,6 +51,7 @@ import {
   updateJob,
   type OracleJob,
 } from "./jobs.js";
+import { isOracleProjectTrusted } from "./trust.js";
 import { getQueuePosition, promoteQueuedJobs, promoteQueuedJobsWithinAdmissionLock } from "./queue.js";
 import { resolveOracleProviderArchivePlan } from "./provider-capabilities.js";
 import { refreshOracleStatus } from "./poller.js";
@@ -66,13 +69,11 @@ import {
 } from "./runtime.js";
 
 const ORACLE_PROVIDER_PARAM_DESCRIPTION = `Oracle web provider. Omit to use the configured default provider. Supported providers: ${ORACLE_PROVIDERS.join(", ")}.`;
-const ORACLE_PROVIDER_PARAM = Type.Optional(Type.String({
+const ORACLE_PROVIDER_PARAM = Type.Optional(StringEnum(ORACLE_PROVIDERS, {
   description: ORACLE_PROVIDER_PARAM_DESCRIPTION,
-  enum: [...ORACLE_PROVIDERS],
 }));
-const ORACLE_GROK_MODE_PARAM = Type.Optional(Type.String({
+const ORACLE_GROK_MODE_PARAM = Type.Optional(StringEnum(GROK_MODES, {
   description: "Provider mode. For Grok, only heavy is currently supported. Omit to use the configured default mode.",
-  enum: [...GROK_MODES],
 }));
 
 const ORACLE_SUBMIT_PARAMS = Type.Object({
@@ -126,15 +127,6 @@ const ORACLE_CANCEL_PARAMS = Type.Object({
 
 const MAX_QUEUED_JOBS_PER_ACTIVE_RUNTIME = 1;
 const MAX_QUEUED_ARCHIVE_BYTES_PER_ACTIVE_RUNTIME = resolveOracleProviderArchivePlan("chatgpt").maxArchiveBytes;
-function normalizeOracleProvider(value: unknown, fallback: OracleProvider, toolName = "oracle_submit"): OracleProvider {
-  if (value === undefined) return fallback;
-  if (typeof value !== "string") throw new Error(`${toolName} provider must be a string`);
-  const normalized = value.trim().toLowerCase();
-  if (normalized === "chatgpt" || normalized === "chat-gpt" || normalized === "openai") return "chatgpt";
-  if (normalized === "grok" || normalized === "xai" || normalized === "x.ai") return "grok";
-  throw new Error(`Unknown ${toolName} provider: ${value}. Use chatgpt or grok.`);
-}
-
 function prepareOracleProviderAliases<T>(args: unknown, toolName: string): T {
   const record = asRecord(args);
   if (!record) return args as T;
@@ -712,10 +704,6 @@ function formatOraclePreflightResponse(details: OraclePreflightDetails): string
   ].filter(Boolean).join("\n");
 }
 
-function isProjectTrusted(ctx: ExtensionContext): boolean {
-  return (ctx as { isProjectTrusted?: () => boolean }).isProjectTrusted?.() ?? true;
-}
-
 async function runOraclePreflight(ctx: ExtensionContext, params: { provider?: unknown; followUpJobId?: unknown; chatGptConversationId?: unknown } = {}): Promise<OraclePreflightDetails> {
   const sessionFile = getSessionFile(ctx);
   if (!hasPersistedSessionFile(sessionFile)) {
@@ -743,7 +731,7 @@ async function runOraclePreflight(ctx: ExtensionContext, params: { provider?: un
     if (chatGptConversationId !== undefined && typeof chatGptConversationId !== "string") {
       throw new Error("oracle_preflight chatGptConversationId must be a string");
     }
-    const baseConfig = loadOracleConfig(ctx.cwd, { projectConfigTrusted: isProjectTrusted(ctx) });
+    const baseConfig = loadOracleConfig(ctx.cwd, { projectConfigTrusted: isOracleProjectTrusted(ctx) });
     const target = resolveConversationTarget({ followUpJobId, chatGptConversationId, cwd: ctx.cwd, config: baseConfig });
     provider = normalizeOracleProvider(params.provider, target.provider ?? baseConfig.defaults.provider, "oracle_preflight");
     if (target.provider && provider !== target.provider) {
@@ -835,9 +823,9 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string, authWo
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       try {
         const projectCwd = getProjectId(ctx.cwd);
-        const baseConfig = loadOracleConfig(projectCwd, { projectConfigTrustCwd: ctx.cwd, projectConfigTrusted: isProjectTrusted(ctx) });
+        const baseConfig = loadOracleConfig(projectCwd, { projectConfigTrustCwd: ctx.cwd, projectConfigTrusted: isOracleProjectTrusted(ctx) });
         const provider = normalizeOracleProvider(params.provider, baseConfig.defaults.provider, "oracle_auth");
-        const message = await runOracleAuthBootstrap(authWorkerPath, projectCwd, provider, { projectConfigTrustCwd: ctx.cwd, projectConfigTrusted: isProjectTrusted(ctx) });
+        const message = await runOracleAuthBootstrap(authWorkerPath, projectCwd, provider, { projectConfigTrustCwd: ctx.cwd, projectConfigTrusted: isOracleProjectTrusted(ctx) });
         return {
           content: [{ type: "text" as const, text: message }],
           details: {
@@ -874,7 +862,7 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string, authWo
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       try {
         const projectCwd = getProjectId(ctx.cwd);
-        const baseConfig = loadOracleConfig(projectCwd, { projectConfigTrustCwd: ctx.cwd, projectConfigTrusted: isProjectTrusted(ctx) });
+        const baseConfig = loadOracleConfig(projectCwd, { projectConfigTrustCwd: ctx.cwd, projectConfigTrusted: isOracleProjectTrusted(ctx) });
         const originSessionFile = requirePersistedSessionFile(getSessionFile(ctx), "submit oracle jobs");
         const projectId = getProjectId(projectCwd);
         const sessionId = getSessionId(originSessionFile, projectId);

package/extensions/oracle/lib/trust.ts

@@ -0,0 +1,5 @@
+// Purpose: Keep pi project-trust probing behind one typed extension-side helper.
+
+export function isOracleProjectTrusted(ctx: { isProjectTrusted?: () => boolean }): boolean {
+  return ctx.isProjectTrusted?.() ?? true;
+}

package/extensions/oracle/shared/job-observability-helpers.mjs

@@ -5,6 +5,7 @@
 // Invariants/Assumptions: Job summaries read from durable job state, and lifecycle event trails are bounded and already normalized by shared lifecycle helpers.
 
 import { getLatestOracleJobLifecycleEvent, getLatestOracleTerminalLifecycleEvent } from "./job-lifecycle-helpers.mjs";
+import { parseTimestamp } from "./time-helpers.mjs";
 
 /** @typedef {import("./job-observability-helpers.d.mts").OracleJobSummaryLike} OracleJobSummaryLike */
 /** @typedef {import("./job-observability-helpers.d.mts").OracleJobSummaryOptions} OracleJobSummaryOptions */
@@ -68,16 +69,6 @@ const ACTIVE_SUMMARY_STATUSES = new Set(["preparing", "submitted", "waiting"]);
 const DEFAULT_ORACLE_HEARTBEAT_STALE_MS = 3 * 60 * 1000;
 const DEFAULT_ACTIVE_JOB_POLL_HINT_SECONDS = 15;
 
-/**
- * @param {string | undefined} value
- * @returns {number | undefined}
- */
-function parseTimestamp(value) {
-  if (!value) return undefined;
-  const ms = Date.parse(value);
-  return Number.isNaN(ms) ? undefined : ms;
-}
-
 /**
  * @param {number} elapsedMs
  * @returns {string}

package/extensions/oracle/shared/state-path-helpers.d.mts

@@ -0,0 +1,3 @@
+export declare const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
+export declare const ORACLE_JOBS_DIR_ENV = "PI_ORACLE_JOBS_DIR";
+export declare function getOracleJobsDir(env?: Record<string, string | undefined>): string;

package/extensions/oracle/shared/state-path-helpers.mjs

@@ -0,0 +1,9 @@
+// Purpose: Share oracle state path defaults across extension and detached workers.
+// Scope: Path/env defaults only; no filesystem mutation.
+
+export const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
+export const ORACLE_JOBS_DIR_ENV = "PI_ORACLE_JOBS_DIR";
+
+export function getOracleJobsDir(env = process.env) {
+  return env[ORACLE_JOBS_DIR_ENV]?.trim() || DEFAULT_ORACLE_JOBS_DIR;
+}

package/extensions/oracle/shared/time-helpers.d.mts

@@ -0,0 +1 @@
+export declare function parseTimestamp(value: string | undefined): number | undefined;

package/extensions/oracle/shared/time-helpers.mjs

@@ -0,0 +1,7 @@
+// Purpose: Tiny shared time parsing helper for job timestamps.
+
+export function parseTimestamp(value) {
+  if (!value) return undefined;
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : undefined;
+}

package/extensions/oracle/worker/auth-bootstrap.mjs

@@ -16,7 +16,9 @@ import {
 } from "../shared/browser-profile-helpers.mjs";
 import { ensureAccountCookie, filterImportableAuthCookies } from "./auth-cookie-policy.mjs";
 import { getCookiesFromConfiguredChromiumSource } from "./chromium-cookie-source.mjs";
+import { parseSnapshotEntries } from "./artifact-heuristics.mjs";
 import { buildAllowedChatGptOrigins } from "./chatgpt-ui-helpers.mjs";
+import { stripUrlQueryAndHash } from "./chatgpt-flow-helpers.mjs";
 import { buildAccountChooserCandidateLabels, classifyChatAuthPage, normalizeLoginProbeResult } from "./auth-flow-helpers.mjs";
 
 const rawConfig = process.argv[2];
@@ -429,27 +431,6 @@ async function pageText() {
   return stdout || "";
 }
 
-function parseSnapshotEntries(snapshot) {
-  return snapshot
-    .split("\n")
-    .map((line) => {
-      const refMatch = line.match(/\bref=(e\d+)\b/);
-      if (!refMatch) return undefined;
-      const kindMatch = line.match(/^\s*-\s*([^\s]+)/);
-      const quotedMatch = line.match(/"([^"]*)"/);
-      const valueMatch = line.match(/:\s*(.+)$/);
-      return {
-        line,
-        ref: `@${refMatch[1]}`,
-        kind: kindMatch ? kindMatch[1] : undefined,
-        label: quotedMatch ? quotedMatch[1] : undefined,
-        value: valueMatch ? valueMatch[1].trim() : undefined,
-        disabled: /\bdisabled\b/.test(line),
-      };
-    })
-    .filter(Boolean);
-}
-
 function findEntry(snapshot, predicate) {
   return parseSnapshotEntries(snapshot).find(predicate);
 }
@@ -466,17 +447,6 @@ async function clickRef(ref, logLabel = `click ${ref}`) {
   await targetCommand("click", ref, { logLabel });
 }
 
-function stripQuery(url) {
-  try {
-    const parsed = new URL(url);
-    parsed.hash = "";
-    parsed.search = "";
-    return parsed.toString();
-  } catch {
-    return url;
-  }
-}
-
 function preferredProvider() {
   return config?.defaults?.provider === "grok" ? "grok" : "chatgpt";
 }
@@ -491,7 +461,7 @@ function providerName() {
 
 function cookieOrigins() {
   const providerOrigins = preferredProvider() === "grok" ? GROK_COOKIE_ORIGINS : CHATGPT_COOKIE_ORIGINS;
-  return Array.from(new Set([stripQuery(providerChatUrl()), ...providerOrigins]));
+  return Array.from(new Set([stripUrlQueryAndHash(providerChatUrl()), ...providerOrigins]));
 }
 
 function cookieSource() {

package/extensions/oracle/worker/run-job.mjs

@@ -19,6 +19,7 @@ import {
 } from "../shared/job-coordination-helpers.mjs";
 import { applyOracleJobCleanupWarnings, clearOracleJobCleanupState, transitionOracleJobPhase } from "../shared/job-lifecycle-helpers.mjs";
 import { spawnDetachedNodeProcess, terminateTrackedProcess } from "../shared/process-helpers.mjs";
+import { getOracleJobsDir } from "../shared/state-path-helpers.mjs";
 import { extractArtifactLabels, FILE_LABEL_PATTERN_SOURCE, GENERIC_ARTIFACT_LABELS, parseSnapshotEntries, partitionStructuralArtifactCandidates } from "./artifact-heuristics.mjs";
 import {
   buildAllowedChatGptOrigins,
@@ -39,7 +40,8 @@ import {
   autoSwitchToThinkingSelectionVisible,
   stripChatGptResponseChrome,
 } from "./chatgpt-ui-helpers.mjs";
-import { assistantSnapshotSlice, nextStableValueState, providerSendAccepted, resolveStableConversationUrlCandidate, stripUrlQueryAndHash } from "./chatgpt-flow-helpers.mjs";
+import { assistantSnapshotSlice, conversationIdFromUrl, nextStableValueState, providerSendAccepted, resolveStableConversationUrlCandidate, stripUrlQueryAndHash } from "./chatgpt-flow-helpers.mjs";
+import { normalizeLoginProbeResult } from "./auth-flow-helpers.mjs";
 import { assertNotKnownBrowserUserDataPath, scrubSweetCookieSafeStoragePasswordEnv, sweetCookieSafeStoragePasswordScrubbedEnv } from "../shared/browser-profile-helpers.mjs";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withLock } from "./state-locks.mjs";
 
@@ -49,9 +51,7 @@ if (!jobId) {
   process.exit(1);
 }
 
-const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
-const ORACLE_JOBS_DIR = process.env.PI_ORACLE_JOBS_DIR?.trim() || DEFAULT_ORACLE_JOBS_DIR;
-const jobDir = join(ORACLE_JOBS_DIR, `oracle-${jobId}`);
+const jobDir = join(getOracleJobsDir(), `oracle-${jobId}`);
 const jobPath = `${jobDir}/job.json`;
 const CHATGPT_LABELS = {
   composer: "Chat with ChatGPT",
@@ -294,17 +294,6 @@ async function cpSupportsApfsClone() {
   return cpSupportsApfsCloneFlag;
 }
 
-function parseConversationId(chatUrl) {
-  if (!chatUrl) return undefined;
-  try {
-    const parsed = new URL(chatUrl);
-    const match = parsed.pathname.match(/\/(?:c|chat)\/([^/?#]+)/i);
-    return match?.[1];
-  } catch {
-    return undefined;
-  }
-}
-
 async function removeChromiumProcessSingletonArtifacts(profileDir) {
   await Promise.all([
     rm(join(profileDir, "SingletonLock"), { force: true }),
@@ -763,21 +752,7 @@ async function evalPage(job, script) {
 }
 
 async function loginProbe(job) {
-  const result = await evalPage(job, buildLoginProbeScript(5_000));
-  if (!result || typeof result !== "object") {
-    return { ok: false, status: 0, error: "invalid-probe-result" };
-  }
-  return {
-    ok: result.ok === true,
-    status: typeof result.status === "number" ? result.status : 0,
-    pageUrl: typeof result.pageUrl === "string" ? result.pageUrl : undefined,
-    domLoginCta: result.domLoginCta === true,
-    onAuthPage: result.onAuthPage === true,
-    error: typeof result.error === "string" ? result.error : undefined,
-    bodyKeys: Array.isArray(result.bodyKeys) ? result.bodyKeys : [],
-    bodyHasId: result.bodyHasId === true,
-    bodyHasEmail: result.bodyHasEmail === true,
-  };
+  return normalizeLoginProbeResult(await evalPage(job, buildLoginProbeScript(5_000)));
 }
 
 async function currentUrl(job) {
@@ -785,10 +760,6 @@ async function currentUrl(job) {
   return stdout;
 }
 
-function stripQuery(url) {
-  return stripUrlQueryAndHash(url);
-}
-
 async function snapshotText(job) {
   const { stdout } = await agentBrowser(job, "snapshot", "-i");
   return stdout;
@@ -1829,7 +1800,7 @@ async function waitForStableChatUrl(job, previousChatUrl) {
     await sleep(1000);
   }
 
-  return previousChatUrl || stripQuery(await currentUrl(job));
+  return previousChatUrl || stripUrlQueryAndHash(await currentUrl(job));
 }
 
 async function waitForChatCompletion(job, baselineAssistantCount) {
@@ -2198,7 +2169,7 @@ async function waitForStableArtifactCandidates(job, responseIndex, responseText
 }
 
 async function reopenConversationForArtifacts(job, responseIndex, responseText, reason) {
-  const targetUrl = job.chatUrl || stripQuery(await currentUrl(job));
+  const targetUrl = job.chatUrl || stripUrlQueryAndHash(await currentUrl(job));
   await log(`Reopening conversation before artifact capture (${reason}): ${targetUrl}`);
   await agentBrowser(job, "open", targetUrl);
   await agentBrowser(job, "wait", "1500");
@@ -2397,9 +2368,9 @@ async function run() {
     await sleep(POST_SEND_SETTLE_MS);
 
     const observedChatUrl = isGrokJob(currentJob)
-      ? stripQuery(await currentUrl(currentJob))
+      ? stripUrlQueryAndHash(await currentUrl(currentJob))
       : await waitForStableChatUrl(currentJob, currentJob.chatUrl);
-    const observedConversationId = parseConversationId(observedChatUrl) || currentJob.conversationId;
+    const observedConversationId = conversationIdFromUrl(observedChatUrl) || currentJob.conversationId;
     const awaitingResponsePatch = {
       heartbeatAt: new Date().toISOString(),
       ...(observedConversationId ? { chatUrl: observedChatUrl, conversationId: observedConversationId } : {}),
@@ -2414,7 +2385,7 @@ async function run() {
     const completion = await waitForChatCompletion(currentJob, baselineAssistantCount);
     if (isGrokJob(currentJob) && !currentJob.conversationId) {
       const stableGrokChatUrl = await waitForStableChatUrl(currentJob, undefined);
-      const stableGrokConversationId = parseConversationId(stableGrokChatUrl);
+      const stableGrokConversationId = conversationIdFromUrl(stableGrokChatUrl);
       if (!stableGrokConversationId) {
         throw new Error(`Grok response completed but the conversation URL did not stabilize; current URL: ${stableGrokChatUrl || "(unknown)"}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.7.16",
+  "version": "0.7.18",
   "description": "ChatGPT and Grok web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",
@@ -48,7 +48,7 @@
     ]
   },
   "scripts": {
-    "check:oracle-extension": "node --check extensions/oracle/shared/browser-profile-helpers.mjs && node --check extensions/oracle/shared/process-helpers.mjs && node --check extensions/oracle/shared/state-coordination-helpers.mjs && node --check extensions/oracle/shared/job-coordination-helpers.mjs && node --check extensions/oracle/shared/job-lifecycle-helpers.mjs && node --check extensions/oracle/shared/job-observability-helpers.mjs && node --check extensions/oracle/worker/run-job.mjs && node --check extensions/oracle/worker/state-locks.mjs && node --check extensions/oracle/worker/artifact-heuristics.mjs && node --check extensions/oracle/worker/chatgpt-ui-helpers.mjs && node --check extensions/oracle/worker/chatgpt-flow-helpers.mjs && node --check extensions/oracle/worker/auth-flow-helpers.mjs && node --check extensions/oracle/worker/auth-cookie-policy.mjs && node --check extensions/oracle/worker/chromium-cookie-source.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@earendil-works/pi-coding-agent --external:typebox --outfile=/tmp/pi-oracle-extension-check.js",
+    "check:oracle-extension": "node --check extensions/oracle/shared/browser-profile-helpers.mjs && node --check extensions/oracle/shared/process-helpers.mjs && node --check extensions/oracle/shared/state-path-helpers.mjs && node --check extensions/oracle/shared/time-helpers.mjs && node --check extensions/oracle/shared/state-coordination-helpers.mjs && node --check extensions/oracle/shared/job-coordination-helpers.mjs && node --check extensions/oracle/shared/job-lifecycle-helpers.mjs && node --check extensions/oracle/shared/job-observability-helpers.mjs && node --check extensions/oracle/worker/run-job.mjs && node --check extensions/oracle/worker/state-locks.mjs && node --check extensions/oracle/worker/artifact-heuristics.mjs && node --check extensions/oracle/worker/chatgpt-ui-helpers.mjs && node --check extensions/oracle/worker/chatgpt-flow-helpers.mjs && node --check extensions/oracle/worker/auth-flow-helpers.mjs && node --check extensions/oracle/worker/auth-cookie-policy.mjs && node --check extensions/oracle/worker/chromium-cookie-source.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent --external:typebox --outfile=/tmp/pi-oracle-extension-check.js",
     "typecheck": "tsc --noEmit -p tsconfig.json",
     "typecheck:worker-helpers": "tsc --noEmit -p tsconfig.worker-helpers.json",
     "sanity:oracle": "node scripts/oracle-sanity-runner.mjs",
@@ -66,7 +66,7 @@
     "smoke:real": "npm run smoke:real:packed",
     "smoke:real:doctor": "node scripts/oracle-real-smoke.mjs doctor",
     "release:check": "npm run verify:oracle && npm run release:proof:chatgpt-presets && npm run smoke:platform:all",
-    "check:oracle-real-smoke": "node --check scripts/oracle-real-smoke.mjs",
+    "check:oracle-real-smoke": "node --check scripts/oracle-real-smoke.mjs && node --check scripts/oracle-sanity-runner.mjs",
     "check:oracle-release-proof": "node --check scripts/oracle-chatgpt-preset-proof.mjs",
     "release:proof:chatgpt-presets": "node scripts/oracle-chatgpt-preset-proof.mjs check",
     "smoke:real:packed": "node scripts/oracle-real-smoke.mjs run --mode packed",
@@ -78,6 +78,7 @@
     "@steipete/sweet-cookie": "^0.3.0"
   },
   "peerDependencies": {
+    "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "typebox": "*"
   },
@@ -86,8 +87,8 @@
     "protobufjs": "7.6.1"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.80.2",
-    "@earendil-works/pi-coding-agent": "^0.80.2",
+    "@earendil-works/pi-ai": "^0.80.7",
+    "@earendil-works/pi-coding-agent": "^0.80.7",
     "@types/node": "^22.19.19",
     "esbuild": "^0.28.0",
     "tsx": "^4.22.3",
@@ -104,6 +105,9 @@
   ],
   "packageManager": "npm@11.16.0",
   "peerDependenciesMeta": {
+    "@earendil-works/pi-ai": {
+      "optional": true
+    },
     "@earendil-works/pi-coding-agent": {
       "optional": true
     },

package/prompts/oracle-followup.md

@@ -6,6 +6,12 @@ You are preparing an `/oracle-followup` job.
 
 Do not answer the user's request directly yet.
 
+Hard requirements:
+- Do not plan instead of submitting. The point of `/oracle-followup` is dispatch.
+- Do not claim preflight, auth, archive prep, or submission happened unless the matching tool call actually happened in this turn.
+- If a required tool call is unavailable or fails, stop and report that exact blocker instead of fabricating progress.
+- After a successful or queued `oracle_submit`, your final answer must be only a terse dispatch summary with the job id and response path. Do not ask questions, offer to watch/poll/read, list next steps, or continue working.
+
 Required workflow:
 1. Parse the user request as `<job-id> <follow-up request>`.
 2. If the request does not include both a prior oracle job id and a follow-up request, stop and report: `Usage: /oracle-followup <job-id> <request>. Find the job id in the earlier oracle response or via /oracle-status.`
@@ -14,7 +20,7 @@ Required workflow:
 5. If `oracle_preflight` reports `ready: false`, stop before any expensive prep. Do not read files, search the codebase, prepare archive inputs, or call `oracle_auth` automatically. Report the blocking issue plus the suggested next step.
 6. Treat the parsed job id as `followUpJobId` for `oracle_submit`.
 7. Understand whether the follow-up request is explicitly narrow or genuinely broad.
-8. Gather enough repo context to choose archive inputs and write a strong oracle prompt. Bias toward context-rich submissions when they fit within the provider archive ceiling: 250 MB for ChatGPT, 200 MiB for Grok.
+8. Gather enough repo context to choose archive inputs and write a strong oracle prompt. Bias toward context-rich submissions when they fit within the provider archive ceiling: 250 MiB for ChatGPT, 200 MiB for Grok.
 9. If the follow-up request is explicit and narrow, start from the directly relevant area but still include nearby files, tests, docs, configs, and adjacent modules when they may improve answer quality. Keep the archive tightly minimal only when the user explicitly asks for that, privacy/sensitivity requires it, or size pressure forces it.
 10. If the follow-up request is broad, architectural, release-oriented, or otherwise repo-wide, gather broader context and usually archive `.`.
 11. Choose archive inputs for the follow-up oracle job.
@@ -35,7 +41,7 @@ Rules:
 - If the immediately preceding oracle run for this follow-up failed because ChatGPT/Grok login is required, the worker said to rerun `/oracle-auth`, or stale auth clearly blocked execution, stop and tell the user to run `/oracle-auth` (or `/oracle-auth grok` for Grok). Do not call `oracle_auth` automatically from `/oracle-followup`.
 - This prompt exists so normal users can continue the same provider thread without manually constructing `followUpJobId` tool calls.
 - Always include an archive. Do not submit without context files.
-- By default, prefer context-rich archives up to the provider ceiling because more relevant context is usually better than less. The ceiling is 250 MB for ChatGPT and 200 MiB for Grok. For broad or unclear follow-up requests, include the whole repository by passing `.`. Default archive exclusions apply automatically, including common bulky outputs and obvious credentials/private data like `.env` files, key material, credential dotfiles, local database files, and nested `secrets/` directories anywhere in the repo.
+- By default, prefer context-rich archives up to the provider ceiling because more relevant context is usually better than less. The ceiling is 250 MiB for ChatGPT and 200 MiB for Grok. For broad or unclear follow-up requests, include the whole repository by passing `.`. Default archive exclusions apply automatically, including common bulky outputs and obvious credentials/private data like `.env` files, key material, credential dotfiles, local database files, and nested `secrets/` directories anywhere in the repo.
 - Only limit file selection if the user explicitly requests a tight archive, if privacy/sensitivity requires it, or if the archive would otherwise exceed the size limit after exclusions/pruning.
 - For targeted follow-ups, still include directly related surrounding files, tests, docs, configs, and adjacent modules when they may improve answer quality. Do not default to a one-file archive just because the user mentioned one file, one function, or one stack trace.
 - Do not keep exploring once you already have enough context to submit well.

package/prompts/oracle.md

@@ -17,7 +17,7 @@ Required workflow:
 1. Call `oracle_preflight` immediately. If the user says to use Grok, pass `provider: "grok"` to `oracle_preflight`. If the user says to use ChatGPT, pass `provider: "chatgpt"`. If the user says to use ChatGPT Instant, pass `provider: "chatgpt"` and later call `oracle_submit` with `preset: "instant"`. If the user explicitly provides an existing ChatGPT conversation id or `https://chatgpt.com/c/...` URL, pass it as `chatGptConversationId` to `oracle_preflight` and force `provider: "chatgpt"`. Omit `chatGptConversationId` unless the user explicitly asks to continue an existing browser-created ChatGPT thread.
 2. If `oracle_preflight` reports `ready: false`, stop before any expensive prep. Do not read files, search the codebase, prepare archive inputs, or call `oracle_auth` automatically. Report the blocking issue plus the suggested next step.
 3. Understand the request and decide whether it is explicitly narrow or genuinely broad.
-4. Gather enough repo context to choose archive inputs and write a strong oracle prompt. Bias toward context-rich submissions when they fit within the provider archive ceiling: 250 MB for ChatGPT, 200 MiB for Grok.
+4. Gather enough repo context to choose archive inputs and write a strong oracle prompt. Bias toward context-rich submissions when they fit within the provider archive ceiling: 250 MiB for ChatGPT, 200 MiB for Grok.
 5. If the user scope is explicit and narrow, start from the directly relevant area but still include nearby files, tests, docs, configs, and adjacent modules when they may improve answer quality. Keep the archive tightly minimal only when the user explicitly asks for that, privacy/sensitivity requires it, or size pressure forces it.
 6. If the request is broad, architectural, release-oriented, or otherwise repo-wide, gather broader context and usually archive `.`.
 7. Choose archive inputs for the oracle job.
@@ -40,7 +40,7 @@ Rules:
 - Use `oracle_preflight` before any expensive `/oracle` preparation so missing persisted-session or local auth/config blockers fail fast.
 - If ChatGPT/Grok login is required, the worker said to rerun `/oracle-auth`, or stale auth clearly blocked execution, stop and tell the user to run `/oracle-auth` (or `/oracle-auth grok` for Grok). Do not call `oracle_auth` automatically from `/oracle`.
 - Always include an archive. Do not submit without context files.
-- By default, prefer context-rich archives up to the provider ceiling because more relevant context is usually better than less. The ceiling is 250 MB for ChatGPT and 200 MiB for Grok. For broad or unclear requests, include the whole repository by passing `.`. Default archive exclusions apply automatically, including common bulky outputs and obvious credentials/private data like `.env` files, key material, credential dotfiles, local database files, and nested `secrets/` directories anywhere in the repo.
+- By default, prefer context-rich archives up to the provider ceiling because more relevant context is usually better than less. The ceiling is 250 MiB for ChatGPT and 200 MiB for Grok. For broad or unclear requests, include the whole repository by passing `.`. Default archive exclusions apply automatically, including common bulky outputs and obvious credentials/private data like `.env` files, key material, credential dotfiles, local database files, and nested `secrets/` directories anywhere in the repo.
 - Only limit file selection if the user explicitly requests a tight archive, if privacy/sensitivity requires it, or if the archive would otherwise exceed the size limit after exclusions/pruning.
 - For targeted asks, still include directly related surrounding files, tests, docs, configs, and adjacent modules when they may improve answer quality. Do not default to a one-file archive just because the user mentioned one file, one function, or one stack trace.
 - Do not keep exploring once you already have enough context to submit well.

package/scripts/oracle-real-smoke.mjs

@@ -5,17 +5,13 @@
 import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
 import { mkdtempSync } from "node:fs";
-import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
-
-const require = createRequire(import.meta.url);
-const tsxCli = require.resolve("tsx/cli");
 
 const DEFAULT_PROVIDER = "zai";
 const DEFAULT_MODEL = "glm-5.2";
 const DEFAULT_TIMEOUT_MS = 180_000;
+const EXPECTED_PI_VERSION = "0.80.7";
 const PACKAGE_NAME = "pi-oracle";
 
 function usage() {
@@ -31,7 +27,7 @@ Environment:
   PI_ORACLE_REAL_TEST_TIMEOUT_MS per-agent timeout in ms (default: ${DEFAULT_TIMEOUT_MS})
   PI_ORACLE_REAL_TEST_ARTIFACT_ROOT artifact root (default: .artifacts/real-smoke)
   PI_ORACLE_REAL_TEST_KEEP_TMP   keep temporary fixture directory when set to 1/true/yes
-  PI_ORACLE_REAL_TEST_MODEL_AGENT run oracle_submit through a model-agent turn instead of direct installed-tool execution (off by default)
+  PI_ORACLE_REAL_TEST_MODEL_AGENT run oracle_submit through a credentialed model-agent turn instead of the safe loader command (off by default)
   PI_ORACLE_REAL_TEST_NEGATIVE_SYMLINK run optional second-agent symlink rejection check (off by default; covered by sanity:oracle)
 `);
 }
@@ -61,6 +57,12 @@ function truthy(value) {
   return ["1", "true", "yes", "on"].includes(String(value ?? "").toLowerCase());
 }
 
+function positiveTimeoutMs(value, label) {
+  const timeoutMs = Number(value ?? DEFAULT_TIMEOUT_MS);
+  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) throw new Error(`${label} must be a finite positive millisecond value`);
+  return timeoutMs;
+}
+
 function commandExists(command, args = ["--version"]) {
   return new Promise((resolvePromise) => {
     const child = spawn(command, args, { stdio: "ignore", shell: process.platform === "win32" });
@@ -130,7 +132,7 @@ async function doctor() {
 }
 
 function runCommand(command, args, options) {
-  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const timeoutMs = positiveTimeoutMs(options.timeoutMs, "command timeout");
   return new Promise((resolvePromise) => {
     const child = spawn(command, args, {
       cwd: options.cwd,
@@ -293,39 +295,14 @@ function hasCreatedJobArchive(jobsDir) {
   return Boolean(jobDir && archivePath && existsSync(archivePath));
 }
 
-async function runDirectOracleSubmit({ prepared, agentDir, sessionDir, jobsDir, outDir, timeoutMs }) {
+async function runPiLoaderStatus({ prepared, agentDir, sessionDir, jobsDir, outDir, timeoutMs }) {
   mkdirSync(outDir, { recursive: true });
-  const sessionFile = join(sessionDir, "real-smoke-session.jsonl");
-  const fakeWorkerPath = join(outDir, "fake-worker.mjs");
-  const scriptPath = join(outDir, "direct-submit.mjs");
-  const packageRoot = prepared.mode === "packed" ? join(prepared.cwd, "node_modules", PACKAGE_NAME) : process.cwd();
-  const toolsUrl = pathToFileURL(join(packageRoot, "extensions", "oracle", "lib", "tools.ts")).href;
   mkdirSync(sessionDir, { recursive: true });
-  writeFileSync(sessionFile, "");
-  writeFileSync(fakeWorkerPath, "process.exit(0);\n");
-  writeFileSync(scriptPath, `
-import { registerOracleTools } from ${JSON.stringify(toolsUrl)};
-const tools = new Map();
-const pi = {
-  on() { return undefined; },
-  registerTool(tool) { tools.set(tool.name, tool); },
-};
-registerOracleTools(pi, ${JSON.stringify(fakeWorkerPath)});
-const submit = tools.get("oracle_submit");
-if (!submit) throw new Error("oracle_submit was not registered by the installed package");
-const ctx = {
-  cwd: process.cwd(),
-  sessionManager: { getSessionFile() { return ${JSON.stringify(sessionFile)}; } },
-};
-const result = await submit.execute("real-smoke", {
-  prompt: "Real smoke archive test. Reply OK if this reaches the provider.",
-  files: ["."],
-  preset: "instant",
-}, new AbortController().signal, () => undefined, ctx);
-console.log(JSON.stringify(result, null, 2));
-`);
-  writeFileSync(join(outDir, "command.json"), `${JSON.stringify({ command: process.execPath, args: [tsxCli, scriptPath], cwd: prepared.cwd, mode: prepared.mode, extensionPath: prepared.extensionPath }, null, 2)}\n`);
-  const result = await runCommand(process.execPath, [tsxCli, scriptPath], {
+  const args = ["--mode", "json", "--no-session", prepared.mode === "packed" ? "--approve" : "--no-approve", "--session-dir", sessionDir];
+  if (prepared.mode === "source") args.push("--no-extensions", "-e", prepared.extensionPath);
+  args.push("/oracle-status");
+  writeFileSync(join(outDir, "command.json"), `${JSON.stringify({ command: piCommand(), args, cwd: prepared.cwd, mode: prepared.mode, extensionPath: prepared.extensionPath }, null, 2)}\n`);
+  const result = await runCommand(piCommand(), args, {
     cwd: prepared.cwd,
     env: {
       ...process.env,
@@ -335,9 +312,9 @@ console.log(JSON.stringify(result, null, 2));
     },
     timeoutMs,
   });
-  writeRunResult(outDir, "direct-submit", result);
-  if (result.timedOut) throw new Error(`direct oracle_submit timed out after ${timeoutMs}ms`);
-  if (result.code !== 0) throw new Error(`direct oracle_submit exited ${result.code}; see ${join(outDir, "direct-submit.stderr.txt")}`);
+  writeRunResult(outDir, "pi-loader", result);
+  if (result.timedOut) throw new Error(`Pi loader smoke timed out after ${timeoutMs}ms`);
+  if (result.code !== 0) throw new Error(`Pi loader smoke exited ${result.code}; see ${join(outDir, "pi-loader.stderr.txt")}`);
   return result;
 }
 
@@ -375,14 +352,16 @@ async function runPiAgent({ prepared, agentDir, sessionDir, jobsDir, prompt, out
 async function run(mode = "packed") {
   const provider = env("PI_ORACLE_REAL_TEST_PROVIDER") ?? DEFAULT_PROVIDER;
   const model = env("PI_ORACLE_REAL_TEST_MODEL") ?? DEFAULT_MODEL;
-  const timeoutMs = Number(env("PI_ORACLE_REAL_TEST_TIMEOUT_MS") ?? DEFAULT_TIMEOUT_MS);
+  const timeoutMs = positiveTimeoutMs(env("PI_ORACLE_REAL_TEST_TIMEOUT_MS"), "PI_ORACLE_REAL_TEST_TIMEOUT_MS");
   const artifactRoot = resolve(env("PI_ORACLE_REAL_TEST_ARTIFACT_ROOT") ?? ".artifacts/real-smoke");
   const runId = `run-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   const runDir = join(artifactRoot, runId);
-  const tmpRoot = mkdtempSync(join(tmpdir(), "pi-oracle-real-smoke-"));
   const assertions = [];
 
   mkdirSync(runDir, { recursive: true });
+  const piVersion = await mustRun(runDir, "pi-version", piCommand(), ["--version"], { cwd: process.cwd(), env: process.env, timeoutMs: 30_000 });
+  if (piVersion.stdout.trim() !== EXPECTED_PI_VERSION) throw new Error(`real smoke requires Pi ${EXPECTED_PI_VERSION}; found ${piVersion.stdout.trim() || "unknown"}`);
+  const tmpRoot = mkdtempSync(join(tmpdir(), "pi-oracle-real-smoke-"));
   const prepared = mode === "packed"
     ? await preparePackedProject({ runDir, provider, model, timeoutMs })
     : prepareSourceProject({ provider, model });
@@ -405,7 +384,8 @@ async function run(mode = "packed") {
     mkdirSync(sessions1, { recursive: true });
     mkdirSync(jobs1, { recursive: true });
 
-    const submitResult = truthy(env("PI_ORACLE_REAL_TEST_MODEL_AGENT"))
+    const modelAgent = truthy(env("PI_ORACLE_REAL_TEST_MODEL_AGENT"));
+    const submitResult = modelAgent
       ? await runPiAgent({
         prepared,
         agentDir: agent1,
@@ -417,7 +397,7 @@ async function run(mode = "packed") {
         stopAfterJobArchive: true,
         prompt: 'Call oracle_submit directly with prompt "Real smoke archive test. Reply OK if this reaches the provider." files ["."] and preset "instant". Do not use bash, read, edit, write, or any tool except oracle_submit.',
       })
-      : await runDirectOracleSubmit({
+      : await runPiLoaderStatus({
         prepared,
         agentDir: agent1,
         sessionDir: sessions1,
@@ -427,16 +407,21 @@ async function run(mode = "packed") {
       });
 
     const jobDir1 = latestJobDir(jobs1);
-    const archivePath = parseJobArchivePath(jobDir1);
-    writeFileSync(join(test1, "job-dir.txt"), `${jobDir1 ?? ""}\n`);
-    writeFileSync(join(test1, "archive-path.txt"), `${archivePath ?? ""}\n`);
-    assert("whole-repo-job-created", Boolean(jobDir1), `whole-repo submit did not create an oracle job; stdout=${submitResult.stdout.slice(-1000)} stderr=${submitResult.stderr.slice(-1000)}`);
-    assert("whole-repo-archive-created", Boolean(archivePath && existsSync(archivePath)), `whole-repo submit did not create a readable archive; jobDir=${jobDir1 ?? "<none>"} stdout=${submitResult.stdout.slice(-1000)} stderr=${submitResult.stderr.slice(-1000)}`);
-    const entries = await tarList(archivePath);
-    writeFileSync(join(test1, "archive-list.txt"), `${entries.join("\n")}\n`);
-    assert("archive-includes-readme", entryExists(entries, "README.md"), "archive should include README.md");
-    for (const excluded of [".pi", ".oracle-context", ".scratchpad.md", ".artifacts", ".crabbox", ".debug"]) {
-      assert(`archive-excludes-${excluded.replace(/[^a-z0-9]+/gi, "-")}`, !entryExists(entries, excluded), `archive should exclude ${excluded}`);
+    if (modelAgent) {
+      const archivePath = parseJobArchivePath(jobDir1);
+      writeFileSync(join(test1, "job-dir.txt"), `${jobDir1 ?? ""}\n`);
+      writeFileSync(join(test1, "archive-path.txt"), `${archivePath ?? ""}\n`);
+      assert("whole-repo-job-created", Boolean(jobDir1), `whole-repo submit did not create an oracle job; stdout=${submitResult.stdout.slice(-1000)} stderr=${submitResult.stderr.slice(-1000)}`);
+      assert("whole-repo-archive-created", Boolean(archivePath && existsSync(archivePath)), `whole-repo submit did not create a readable archive; jobDir=${jobDir1 ?? "<none>"} stdout=${submitResult.stdout.slice(-1000)} stderr=${submitResult.stderr.slice(-1000)}`);
+      const entries = await tarList(archivePath);
+      writeFileSync(join(test1, "archive-list.txt"), `${entries.join("\n")}\n`);
+      assert("archive-includes-readme", entryExists(entries, "README.md"), "archive should include README.md");
+      for (const excluded of [".pi", ".oracle-context", ".scratchpad.md", ".artifacts", ".crabbox", ".debug"]) {
+        assert(`archive-excludes-${excluded.replace(/[^a-z0-9]+/gi, "-")}`, !entryExists(entries, excluded), `archive should exclude ${excluded}`);
+      }
+    } else {
+      assert("pi-loader-command-output", submitResult.stdout.includes('"customType":"oracle-command-output"'), "Pi loader smoke should execute the oracle command through the loaded extension");
+      assert("pi-loader-no-external-job", !jobDir1, "safe Pi loader smoke should not create an oracle job");
     }
     if (prepared.mode === "packed") {
       assert("packed-mode-no-source-extension", !readFileSync(join(test1, "command.json"), "utf8").includes("extensions/oracle/index.ts"), "packed real smoke must not use source extension path");

package/scripts/platform-smoke/invariants.mjs

@@ -101,7 +101,8 @@ function testCanonicalWorkflowConfig() {
 
 function testRealSmokeExpensiveAgentPathsAreOptIn() {
   const source = readFileSync(new URL("../oracle-real-smoke.mjs", import.meta.url), "utf8");
-  assert.match(source, /runDirectOracleSubmit/, "default real smoke should use deterministic installed-tool execution");
+  assert.match(source, /runPiLoaderStatus/, "default real smoke should execute a deterministic command through Pi's extension loader");
+  assert.doesNotMatch(source, /tsx\/cli|runDirectOracleSubmit/, "default real smoke must not bypass Pi's loader through checkout tsx");
   assert.match(source, /PI_ORACLE_REAL_TEST_MODEL_AGENT/, "real smoke should expose the optional model-agent toggle");
   const targetsSource = readFileSync(new URL("./targets.mjs", import.meta.url), "utf8");
   assert.match(targetsSource, /PI_ORACLE_REAL_TEST_MODEL_AGENT/, "platform real-extension command should forward the optional model-agent toggle");