rivet-design 0.14.9 → 0.14.10

package/dist/agent-variants/WorkerExecutorService.d.ts

@@ -1,8 +1,27 @@
 import { spawn } from 'child_process';
 import { type WorkerEffortLevel } from '../hosts/workerDefaults';
 import { type HostVariantWorkItemSnapshot } from './contracts';
+import { type PreflightSpawn, type WorkerInvocationAdapter, type WorkerRuntimeDecision } from './workerRuntime';
+import type { RunnerVendor } from '../cli/runnerSelection';
+import type { WorkItemInitiator } from '../types/change-request-types';
 /** Lease owner marking work the executor runs — hosts must not implement it. */
 export declare const EXECUTOR_LEASE_OWNER = "rivet-executor";
+/**
+ * The awaited lease-owner decision for one request: which owner to lease work
+ * to, the preflighted runtime to pass into `run()` when the executor owns it,
+ * and a one-line summary for run feedback / server.log (`workers: codex` /
+ * `workers: host path (claude: probe exited 1: …)`). The runtime choice must
+ * never be a surprise, and vendors never switch after leasing.
+ */
+export type WorkerLeaseChoice = {
+    leaseOwner: typeof EXECUTOR_LEASE_OWNER | 'rivet-host-agent';
+    runtime?: WorkerInvocationAdapter;
+    summary: string;
+};
+export declare const chooseWorkerLeaseOwner: (executor: WorkerExecutorService | undefined, args?: {
+    initiator?: WorkItemInitiator;
+    signal?: AbortSignal;
+}) => Promise<WorkerLeaseChoice>;
 /**
  * The executor is the DEFAULT execution path for variant workers: leaner,
  * cheaper, and deterministic vs host-agent subagents (see PR #948 evidence).
@@ -68,6 +87,8 @@ export type WorkerSpawn = (args: {
     args: string[];
     cwd: string;
     prompt: string;
+    /** Vendor-shaped environment (e.g. claude strips nested-session markers). */
+    env?: NodeJS.ProcessEnv;
 }) => ReturnType<typeof spawn>;
 export type WorkerExecutorOptions = {
     orchestrator: ExecutorOrchestrator;
@@ -86,6 +107,14 @@ export type WorkerExecutorOptions = {
     timeoutMs?: number;
     maxConcurrent?: number;
     spawnWorker?: WorkerSpawn;
+    /** Lazily-read user config hooks for vendor resolution (see
+     *  WorkerRuntimeResolver): `workerVendor`, `workerVendorFallback`,
+     *  `workerModels.<vendor>` from ~/.rivet/config.json. */
+    configuredWorkerVendor?: () => string | undefined;
+    workerVendorFallbackEnabled?: () => boolean;
+    configuredWorkerModelFor?: (vendor: RunnerVendor) => string | undefined;
+    preflightTimeoutMs?: number;
+    spawnProbe?: PreflightSpawn;
 };
 /**
  * M0 worker executor: runs artifact-backed implementation work items as
@@ -113,11 +142,29 @@ export declare class WorkerExecutorService {
     private readonly spawnWorker;
     private active;
     private readonly waiters;
+    /** Per-request vendor resolution + preflight (multi-vendor workers). */
+    private readonly resolver;
+    /** Claude adapter over the legacy workerCommand — what runs when a caller
+     *  invokes `run()` without a resolved runtime (tests, legacy paths). */
+    private readonly defaultAdapter;
+    private readonly configuredWorkerModelFor?;
     constructor(options: WorkerExecutorOptions);
     /**
-     * True when the worker runtime binary is invocable. Checked once —
-     * callers use this to fall back to the host-agent path BEFORE leasing,
-     * so an executor-less machine behaves exactly as before the flag.
+     * Resolve + preflight the worker runtime for one request. Awaited by the
+     * generation services BEFORE they choose a lease owner: `executor` means
+     * lease to `rivet-executor` and pass `decision.adapter` into `run()`;
+     * `host` means lease to the host agent (the pre-executor degraded mode)
+     * and surface `decision.diagnostics`. Vendors never switch after leasing.
+     */
+    resolveRuntime(args?: {
+        initiator?: WorkItemInitiator;
+        signal?: AbortSignal;
+    }): Promise<WorkerRuntimeDecision>;
+    /**
+     * True when the legacy claude worker binary is on PATH and answers
+     * `--version`. Superseded by {@link resolveRuntime} for lease-owner
+     * decisions — a `--version` probe passes on a binary whose auth is dead
+     * (the July 2026 Bedrock incident). Kept for cheap diagnostics only.
      */
     isRuntimeAvailable(): boolean;
     /** Kill every in-flight worker for a session (cancel/teardown). */
@@ -134,17 +181,25 @@ export declare class WorkerExecutorService {
             id: string;
             attempt: number;
         }>;
-    }): Promise<void>;
+    }, runtime?: WorkerInvocationAdapter): Promise<void>;
     /** reportComplete that can never strand a lease: a throw on a succeeded
      *  report (e.g. invalid artifact) is converted into a failed report so the
      *  item reaches a terminal state either way. */
     private reportSafely;
-    /** Model/effort tier for one work item.
+    /** Worker tier for one work item, per vendor.
+     *
+     *  Claude keeps the full legacy precedence: explicit ops overrides
+     *  (constructor options / RIVET_EXECUTOR_* env) > the user's
+     *  `workerModels.claude` config > the run's user-selected fidelity > lane
+     *  defaults; reference-backed creates keep their own override lane because
+     *  reference fidelity is the deliverable there.
      *
-     *  Precedence: explicit ops overrides (constructor options / RIVET_EXECUTOR_*
-     *  env) > the run's user-selected fidelity ({@link FIDELITY_WORKER_TIERS})
-     *  > lane defaults. Reference-backed creates keep their own override lane
-     *  because reference fidelity is the deliverable there. */
+     *  Codex/cursor read the executor tier registry (fidelity → reasoning
+     *  effort for codex; deliberately fidelity-invariant for cursor), with the
+     *  user's `workerModels.<vendor>` config and the blunt
+     *  RIVET_EXECUTOR_MODEL env override applying to the active vendor. Their
+     *  reference-create lane pins the high tier until benchmarked (mid-tier
+     *  workers regressed reference-backed creates — see workerDefaults). */
     private workerTierFor;
     private runOne;
     private spawnAndWait;

package/dist/agent-variants/WorkerExecutorService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerExecutorService.d.ts","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkerExecutorService.d.ts","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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"}

package/dist/agent-variants/WorkerExecutorService.js

@@ -1,14 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkerExecutorService = exports.modelFailureReason = exports.isModelAvailabilityFailure = exports.isWorkerExecutorEnabled = exports.EXECUTOR_LEASE_OWNER = void 0;
+exports.WorkerExecutorService = exports.modelFailureReason = exports.isModelAvailabilityFailure = exports.isWorkerExecutorEnabled = exports.chooseWorkerLeaseOwner = exports.EXECUTOR_LEASE_OWNER = void 0;
 const child_process_1 = require("child_process");
 const logger_1 = require("../utils/logger");
 const workItemBriefing_1 = require("./workItemBriefing");
 const workerDefaults_1 = require("../hosts/workerDefaults");
 const contracts_1 = require("./contracts");
+const workerRuntime_1 = require("./workerRuntime");
 const log = (0, logger_1.createLogger)('WorkerExecutor');
 /** Lease owner marking work the executor runs — hosts must not implement it. */
 exports.EXECUTOR_LEASE_OWNER = 'rivet-executor';
+const chooseWorkerLeaseOwner = async (executor, args) => {
+    if (!executor) {
+        return { leaseOwner: 'rivet-host-agent', summary: 'host path' };
+    }
+    const decision = await executor.resolveRuntime(args);
+    if (decision.mode === 'executor') {
+        return {
+            leaseOwner: exports.EXECUTOR_LEASE_OWNER,
+            runtime: decision.adapter,
+            summary: `${decision.adapter.vendor} (${decision.source})`,
+        };
+    }
+    const reasons = decision.diagnostics
+        .map((d) => `${d.vendor}: ${d.reason.slice(0, 200)}`)
+        .join('; ');
+    return {
+        leaseOwner: 'rivet-host-agent',
+        summary: `host path${reasons ? ` (${reasons})` : ' (no worker runtime installed)'}`,
+    };
+};
+exports.chooseWorkerLeaseOwner = chooseWorkerLeaseOwner;
 /**
  * The executor is the DEFAULT execution path for variant workers: leaner,
  * cheaper, and deterministic vs host-agent subagents (see PR #948 evidence).
@@ -63,67 +85,33 @@ const modelFailureReason = (message, apiErrorStatus) => {
         : 'model_unavailable';
 };
 exports.modelFailureReason = modelFailureReason;
-/** Error/result text from the headless CLI's stdout JSON. With
- *  `--output-format json` the CLI reports API and model failures in the
- *  stdout result object (`is_error` + `result` text), not on stderr — the
- *  failure message must include it or the model-fallback rung never sees
- *  model-availability errors. */
-const parseWorkerResultError = (stdout) => {
-    try {
-        const trimmed = stdout.trim();
-        const start = trimmed.indexOf('{');
-        if (start === -1)
-            return {};
-        const parsed = JSON.parse(trimmed.slice(start));
-        const parts = [parsed.subtype, parsed.result, parsed.error]
-            .filter((value) => typeof value === 'string')
-            .join(': ');
-        return {
-            ...(parts.length > 0 ? { text: parts } : {}),
-            ...(typeof parsed.api_error_status === 'number'
-                ? { apiErrorStatus: parsed.api_error_status }
-                : {}),
-        };
-    }
-    catch {
-        return {};
-    }
-};
 /** API statuses that mean the MODEL (not the work) was rejected: auth,
  *  permission, unknown model, rate limit. Structured and non-brittle —
  *  preferred over text matching whenever the CLI reports one. */
 const MODEL_AVAILABILITY_STATUSES = new Set([401, 403, 404, 429]);
-/** Parse the final result object the headless CLI prints on stdout. Returns
- *  undefined on any shape surprise — usage capture must never fail a run. */
-const parseWorkerUsage = (stdout) => {
-    try {
-        const trimmed = stdout.trim();
-        const start = trimmed.indexOf('{');
-        if (start === -1)
-            return undefined;
-        const parsed = JSON.parse(trimmed.slice(start));
-        const usage = parsed.usage;
-        if (!usage && typeof parsed.total_cost_usd !== 'number')
-            return undefined;
-        const sum = (...values) => values.reduce((total, value) => total + (typeof value === 'number' ? value : 0), 0);
-        return {
-            ...(usage
-                ? {
-                    tokensIn: sum(usage.input_tokens, usage.cache_read_input_tokens, usage.cache_creation_input_tokens),
-                    tokensOut: sum(usage.output_tokens),
-                }
-                : {}),
-            ...(typeof parsed.total_cost_usd === 'number'
-                ? { costUsd: parsed.total_cost_usd }
-                : {}),
-        };
-    }
-    catch {
-        return undefined;
-    }
+/** Display label for a tier's model — codex/cursor tiers may omit the model
+ *  (the user's own CLI default applies). */
+const tierModelLabel = (tier) => ('model' in tier && tier.model) || `${tier.vendor}-default`;
+const tierEffortLabel = (tier) => {
+    if (tier.vendor === 'claude')
+        return tier.effort;
+    if (tier.vendor === 'codex')
+        return tier.reasoningEffort;
+    return null;
 };
-const defaultSpawn = ({ command, args, cwd }) => (0, child_process_1.spawn)(command, args, {
+/** A failure of the RUNTIME rather than the work: binary missing, CLI too
+ *  old for a flag we pass, auth rejected. These invalidate the cached
+ *  preflight so the next run re-probes instead of repeating the failure. */
+const isRuntimeShapedFailure = (message, apiErrorStatus) => {
+    if (apiErrorStatus === 401 || apiErrorStatus === 403)
+        return true;
+    if (!message)
+        return false;
+    return /ENOENT|EACCES|unknown option|unexpected argument|command not found|credential|authentication|unauthorized|logged? ?in/i.test(message);
+};
+const defaultSpawn = ({ command, args, cwd, env }) => (0, child_process_1.spawn)(command, args, {
     cwd,
+    ...(env ? { env } : {}),
     stdio: ['pipe', 'pipe', 'pipe'],
     // Own process group so a timeout/cancel kills the whole worker tree.
     detached: process.platform !== 'win32',
@@ -162,6 +150,12 @@ class WorkerExecutorService {
     spawnWorker;
     active = 0;
     waiters = [];
+    /** Per-request vendor resolution + preflight (multi-vendor workers). */
+    resolver;
+    /** Claude adapter over the legacy workerCommand — what runs when a caller
+     *  invokes `run()` without a resolved runtime (tests, legacy paths). */
+    defaultAdapter;
+    configuredWorkerModelFor;
     constructor(options) {
         this.orchestrator = options.orchestrator;
         this.telemetry = options.telemetry;
@@ -202,11 +196,43 @@ class WorkerExecutorService {
                 Number(process.env.RIVET_EXECUTOR_TIMEOUT_MS ?? DEFAULT_TIMEOUT_MS);
         this.maxConcurrent = options.maxConcurrent ?? DEFAULT_MAX_CONCURRENT;
         this.spawnWorker = options.spawnWorker ?? defaultSpawn;
+        this.defaultAdapter = (0, workerRuntime_1.makeClaudeAdapter)(this.workerCommand);
+        this.configuredWorkerModelFor = options.configuredWorkerModelFor;
+        const resolverOptions = {
+            configuredVendor: options.configuredWorkerVendor,
+            crossVendorFallback: options.workerVendorFallbackEnabled,
+            configuredModelFor: options.configuredWorkerModelFor,
+            // Preflight mirror of runOne's fallback-model rung: an account that
+            // lacks the default claude worker model must stay on the executor
+            // (probed healthy on the fallback model), not degrade to host path.
+            probeModelFallback: {
+                fallbackModel: () => this.fallbackModel,
+                isModelAvailabilityFailure: ({ message, apiErrorStatus, model }) => MODEL_AVAILABILITY_STATUSES.has(apiErrorStatus ?? -1) ||
+                    (0, exports.isModelAvailabilityFailure)(message, model),
+            },
+            telemetry: this.telemetry,
+            ...(options.preflightTimeoutMs !== undefined
+                ? { probeTimeoutMs: options.preflightTimeoutMs }
+                : {}),
+            ...(options.spawnProbe ? { spawnProbe: options.spawnProbe } : {}),
+        };
+        this.resolver = new workerRuntime_1.WorkerRuntimeResolver(resolverOptions);
     }
     /**
-     * True when the worker runtime binary is invocable. Checked once —
-     * callers use this to fall back to the host-agent path BEFORE leasing,
-     * so an executor-less machine behaves exactly as before the flag.
+     * Resolve + preflight the worker runtime for one request. Awaited by the
+     * generation services BEFORE they choose a lease owner: `executor` means
+     * lease to `rivet-executor` and pass `decision.adapter` into `run()`;
+     * `host` means lease to the host agent (the pre-executor degraded mode)
+     * and surface `decision.diagnostics`. Vendors never switch after leasing.
+     */
+    async resolveRuntime(args) {
+        return this.resolver.resolve(args);
+    }
+    /**
+     * True when the legacy claude worker binary is on PATH and answers
+     * `--version`. Superseded by {@link resolveRuntime} for lease-owner
+     * decisions — a `--version` probe passes on a binary whose auth is dead
+     * (the July 2026 Bedrock incident). Kept for cheap diagnostics only.
      */
     isRuntimeAvailable() {
         if (this.runtimeAvailable === undefined) {
@@ -237,7 +263,8 @@ class WorkerExecutorService {
      * thrown errors on the intake path. Pass the caller's lease so ids that
      * never appear in the session snapshot can still be terminal-failed.
      */
-    async run(sessionId, workItemIds, lease) {
+    async run(sessionId, workItemIds, lease, runtime) {
+        const adapter = runtime ?? this.defaultAdapter;
         const claimed = new Set(workItemIds);
         const claimedItems = this.orchestrator
             .getHostWork(sessionId)
@@ -252,7 +279,7 @@ class WorkerExecutorService {
         // them on the caller's lease rather than stranding until lease expiry.
         const unseen = workItemIds.filter((workItemId) => !claimedItems.some((item) => item.workId === workItemId));
         await Promise.all([
-            ...runnable.map((item) => this.runOne(sessionId, item, { retried: false })),
+            ...runnable.map((item) => this.runOne(sessionId, item, { retried: false }, adapter)),
             ...stranded.map((item) => this.reportSafely(sessionId, {
                 workItemId: item.workId,
                 leaseId: item.leaseId,
@@ -311,49 +338,84 @@ class WorkerExecutorService {
             }
         }
     }
-    /** Model/effort tier for one work item.
+    /** Worker tier for one work item, per vendor.
      *
-     *  Precedence: explicit ops overrides (constructor options / RIVET_EXECUTOR_*
-     *  env) > the run's user-selected fidelity ({@link FIDELITY_WORKER_TIERS})
-     *  > lane defaults. Reference-backed creates keep their own override lane
-     *  because reference fidelity is the deliverable there. */
-    workerTierFor(item) {
+     *  Claude keeps the full legacy precedence: explicit ops overrides
+     *  (constructor options / RIVET_EXECUTOR_* env) > the user's
+     *  `workerModels.claude` config > the run's user-selected fidelity > lane
+     *  defaults; reference-backed creates keep their own override lane because
+     *  reference fidelity is the deliverable there.
+     *
+     *  Codex/cursor read the executor tier registry (fidelity → reasoning
+     *  effort for codex; deliberately fidelity-invariant for cursor), with the
+     *  user's `workerModels.<vendor>` config and the blunt
+     *  RIVET_EXECUTOR_MODEL env override applying to the active vendor. Their
+     *  reference-create lane pins the high tier until benchmarked (mid-tier
+     *  workers regressed reference-backed creates — see workerDefaults). */
+    workerTierFor(item, vendor) {
         const referenceBacked = Boolean(item.contextFiles?.length || item.contextBundlePath);
         const isReferenceCreate = item.mode === 'create' && referenceBacked;
+        if (vendor !== 'claude') {
+            // Unset fidelity means the server default, same as the claude lane —
+            // only reference-backed creates pin the high tier (mid-tier workers
+            // regressed those; see workerDefaults).
+            const fidelity = isReferenceCreate
+                ? 'high'
+                : (0, contracts_1.isWorkerFidelity)(item.fidelity)
+                    ? item.fidelity
+                    : workerDefaults_1.DEFAULT_WORKER_FIDELITY;
+            const base = workerRuntime_1.EXECUTOR_FIDELITY_TIERS[vendor][fidelity];
+            const model = process.env.RIVET_EXECUTOR_MODEL ??
+                this.configuredWorkerModelFor?.(vendor);
+            return model ? { ...base, model } : base;
+        }
+        const configured = this.configuredWorkerModelFor?.('claude');
         const overridden = isReferenceCreate
             ? this.referenceCreateTierOverridden
             : this.workerTierOverridden;
         if (!overridden && (0, contracts_1.isWorkerFidelity)(item.fidelity)) {
-            return workerDefaults_1.FIDELITY_WORKER_TIERS[item.fidelity];
+            const base = workerRuntime_1.EXECUTOR_FIDELITY_TIERS.claude[item.fidelity];
+            return configured ? { ...base, model: configured } : base;
         }
         if (isReferenceCreate) {
             return {
-                model: this.referenceCreateModel,
+                vendor: 'claude',
+                model: this.referenceCreateTierOverridden || !configured
+                    ? this.referenceCreateModel
+                    : configured,
                 effort: this.referenceCreateEffort,
             };
         }
-        return { model: this.workerModel, effort: this.workerEffort };
+        return {
+            vendor: 'claude',
+            model: this.workerTierOverridden || !configured
+                ? this.workerModel
+                : configured,
+            effort: this.workerEffort,
+        };
     }
-    async runOne(sessionId, item, state) {
+    async runOne(sessionId, item, state, adapter) {
         await this.acquire();
         const startedAt = Date.now();
-        const tier = this.workerTierFor(item);
+        const tier = this.workerTierFor(item, adapter.vendor);
         this.telemetry?.track('agent_variants.executor_worker_started', {
             source: 'mcp',
             sessionId,
             workItemId: item.workId,
-            model: tier.model,
-            effort: tier.effort,
+            vendor: adapter.vendor,
+            model: tierModelLabel(tier),
+            effort: tierEffortLabel(tier),
             fidelity: item.fidelity ?? null,
             attempt: item.attempt,
         });
         let outcome;
-        let ranModel = tier.model;
+        let ranModel = tierModelLabel(tier);
         try {
-            outcome = await this.spawnAndWait(sessionId, item);
-            // Model-unavailable rung: an account without access to the default
-            // worker model (or a model-scoped rate limit) must degrade to a
-            // lesser worker, never to a failed variant. One retry, fallback
+            outcome = await this.spawnAndWait(sessionId, item, adapter, tier);
+            // Model-unavailable rung (claude only — the one vendor reporting
+            // structured api_error_status): an account without access to the
+            // default worker model (or a model-scoped rate limit) must degrade to
+            // a lesser worker, never to a failed variant. One retry, fallback
             // model, same effort. Gated on the failure message implicating the
             // model so ordinary worker failures are not silently downgraded.
             // Workspace-pristine proxy: workers always emit output tokens before
@@ -363,6 +425,8 @@ class WorkerExecutorService {
             // vary/refine treat existing files as source and would corrupt.
             const workspacePristine = (outcome.usage?.tokensOut ?? 0) === 0;
             if (outcome.status === 'failed' &&
+                adapter.supportsModelFallback &&
+                tier.vendor === 'claude' &&
                 tier.model !== this.fallbackModel &&
                 workspacePristine &&
                 (MODEL_AVAILABILITY_STATUSES.has(outcome.apiErrorStatus ?? -1) ||
@@ -376,7 +440,8 @@ class WorkerExecutorService {
                     reason: (0, exports.modelFailureReason)(outcome.message, outcome.apiErrorStatus),
                 });
                 ranModel = this.fallbackModel;
-                outcome = await this.spawnAndWait(sessionId, item, {
+                outcome = await this.spawnAndWait(sessionId, item, adapter, {
+                    vendor: 'claude',
                     model: this.fallbackModel,
                     effort: tier.effort,
                 });
@@ -406,11 +471,17 @@ class WorkerExecutorService {
             // debugging must not require telemetry forensics or asking the user
             // to reconstruct what the worker's stderr said.
             log.error(`worker failed (workItem ${item.workId}, attempt ${item.attempt}, ` +
-                `model ${ranModel}` +
+                `vendor ${adapter.vendor}, model ${ranModel}` +
                 (outcome.apiErrorStatus !== undefined
                     ? `, apiStatus ${outcome.apiErrorStatus}`
                     : '') +
                 `): ${outcome.message ?? 'no failure detail captured'}`);
+            // Runtime-shaped failures (binary missing, unknown CLI flag, auth
+            // rejection) invalidate the cached-healthy preflight so the NEXT run
+            // re-probes instead of leasing more items to a dead runtime.
+            if (isRuntimeShapedFailure(outcome.message, outcome.apiErrorStatus)) {
+                this.resolver.markUnhealthy(adapter.vendor, outcome.message ?? 'worker failed');
+            }
         }
         const result = await this.reportSafely(sessionId, {
             workItemId: item.workId,
@@ -461,7 +532,7 @@ class WorkerExecutorService {
                     .filter(isExecutableImplementationItem)
                     .find((candidate) => candidate.workId === item.workId);
                 if (renewed) {
-                    await this.runOne(sessionId, renewed, { retried: true });
+                    await this.runOne(sessionId, renewed, { retried: true }, adapter);
                     return;
                 }
                 // Renewed lease exists but the item is not visible/executable —
@@ -508,31 +579,22 @@ class WorkerExecutorService {
             }
         }
     }
-    spawnAndWait(sessionId, item, tierOverride) {
-        const tier = tierOverride ?? this.workerTierFor(item);
+    spawnAndWait(sessionId, item, adapter, tier) {
         const prompt = (0, workItemBriefing_1.renderWorkItemBriefing)(item, { completion: 'executor' });
+        // The adapter owns the vendor CLI's arg grammar. Prompt delivery differs
+        // per vendor: stdin for claude/codex, argv for cursor-agent (its print
+        // mode does not read the prompt from stdin).
+        const args = adapter.buildArgs(tier);
+        if (adapter.promptDelivery === 'argv')
+            args.push(prompt);
         const child = this.spawnWorker({
-            command: this.workerCommand,
-            args: [
-                '--print',
-                '--output-format',
-                'json',
-                '--model',
-                tier.model,
-                '--effort',
-                tier.effort,
-                '--dangerously-skip-permissions',
-                '--allowed-tools',
-                'Read,Write,Edit,Bash,Glob,Grep',
-                // Workers of one session differ only by cwd/briefing; moving the
-                // per-machine sections out of the system prompt lets the N parallel
-                // workers (and QA-requeue retries) share one prompt-cache prefix.
-                '--exclude-dynamic-system-prompt-sections',
-            ],
+            command: adapter.binary,
+            args,
             cwd: item.workspace.kind === 'git_worktree'
                 ? item.workspace.projectPath
                 : item.workspace.rootPath,
             prompt,
+            env: adapter.spawnEnv(),
         });
         if (child.pid) {
             const children = this.childrenBySession.get(sessionId) ?? new Set();
@@ -540,7 +602,9 @@ class WorkerExecutorService {
             this.childrenBySession.set(sessionId, children);
             child.on('close', () => children.delete(child.pid));
         }
-        child.stdin?.write(prompt);
+        if (adapter.promptDelivery === 'stdin') {
+            child.stdin?.write(prompt);
+        }
         child.stdin?.end();
         let stderrTail = '';
         child.stderr?.on('data', (chunk) => {
@@ -566,8 +630,7 @@ class WorkerExecutorService {
             });
             child.on('close', (code) => {
                 clearTimeout(timer);
-                const usage = parseWorkerUsage(stdoutTail);
-                const { text: resultText, apiErrorStatus } = parseWorkerResultError(stdoutTail);
+                const { usage, resultText, apiErrorStatus } = adapter.parseResult(stdoutTail);
                 resolve(code === 0
                     ? { status: 'succeeded', ...(usage ? { usage } : {}) }
                     : {