@revisium/orchestrator 0.0.0 → 0.1.0-alpha.10

package/dist/worker/git-worktree-manager.js

@@ -1,84 +1,148 @@
+/**
+ * git-worktree-manager.ts — per-RUN git worktree lifecycle (plan 0017).
+ *
+ * DBOS-SEALED: zero @dbos-inc imports. Create/release are registered as memoized DBOS steps in
+ * PipelineService; this module is pure git side effects + deterministic paths.
+ *
+ * Each LIVE run gets ONE isolated worktree at `<dataDir>/worktrees/<runId>`, checked out on the run's
+ * feature branch (the SAME `feat/<taskId>-<slug>` the integrator computes) off a freshly-fetched
+ * `origin/<base>`. The developer (and rework) steps + the integrator all resolve their cwd to it
+ * (see resolveRunCwd), so the user's base checkout is never mutated and concurrent runs on one repo
+ * cannot collide. The durable artifact is the pushed branch; the worktree is execution scratch.
+ *
+ * Replay-safety: `createRunWorktree` is create-IF-ABSENT (a no-op returning the existing path when the
+ * worktree is already valid), so a DBOS replay / crash-recovery re-entry never errors and preserves
+ * in-flight uncommitted developer work. `releaseRunWorktree` is best-effort and no-ops if absent.
+ */
 import { execFileSync } from 'node:child_process';
-import { existsSync, lstatSync, rmSync, symlinkSync } from 'node:fs';
-import { basename, dirname, isAbsolute, join, resolve } from 'node:path';
-function git(args, cwd) {
-    return execFileSync('git', args, { cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] }).trim();
+import { existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync, } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { worktreePathFor, worktreeMarkerFor, isWorktreeDir, } from '../control-plane/resolve-cwd.js';
+import { resolveExecutable } from '../runners/integrator.js';
+const GIT_TIMEOUT_MS = 60_000;
+// Resolve `git` to an ABSOLUTE path once (mirrors the integrator's defaultExecGit): execFileSync is
+// never handed a bare command name resolved against a mutable PATH at spawn time.
+let _gitAbsPath;
+function gitAbsPath() {
+    if (_gitAbsPath === undefined)
+        _gitAbsPath = resolveExecutable('git');
+    return _gitAbsPath;
 }
-function branchName(stepId) {
-    return `run/${stepId}`;
+/** Default git executor — runs the absolute `git` binary in `cwd`. */
+function defaultExecGit(args, cwd) {
+    return execFileSync(gitAbsPath(), args, { encoding: 'utf8', cwd, timeout: GIT_TIMEOUT_MS });
 }
-function stepIdFromWorktreePath(worktreePath) {
-    return basename(worktreePath);
+const INSTALL_TIMEOUT_MS = 300_000;
+/** Default pnpm install executor — runs the absolute `pnpm` binary. Throws if pnpm is unavailable
+ *  (the caller treats a throw as "fall back to the node_modules symlink"). */
+function defaultExecInstall(args, cwd) {
+    execFileSync(resolveExecutable('pnpm'), args, { cwd, timeout: INSTALL_TIMEOUT_MS, stdio: 'ignore' });
 }
-function gitRootFromExistingPath(path) {
-    return git(['rev-parse', '--show-toplevel'], path);
-}
-function gitCommonRootFromExistingPath(path) {
-    const commonDir = git(['rev-parse', '--git-common-dir'], path);
-    const absoluteCommonDir = isAbsolute(commonDir) ? commonDir : resolve(path, commonDir);
-    return dirname(absoluteCommonDir);
+/**
+ * Provision the worktree's dependencies so the developer/tests can build & run.
+ *
+ * Why pnpm gets a real install (not the symlink): pnpm's `node_modules` is a virtual store of symlinks
+ * into `node_modules/.pnpm` wired to the project layout; symlinking the base's `node_modules` into a
+ * worktree at a different path shares a MUTABLE tree across runs (one install/postinstall leaks into
+ * the base and parallel runs). A `pnpm install --frozen-lockfile` in the worktree is cheap (hard-links
+ * from the global content-addressed store, no re-download) and yields a correct, ISOLATED tree from the
+ * committed `pnpm-lock.yaml`. Non-pnpm repos keep the best-effort base-`node_modules` symlink.
+ */
+function provisionDeps(worktreePath, baseRepoCwd, execInstall) {
+    if (existsSync(join(worktreePath, 'pnpm-lock.yaml'))) {
+        try {
+            execInstall(['install', '--frozen-lockfile'], worktreePath);
+            return; // isolated install succeeded — do NOT also symlink
+        }
+        catch {
+            // pnpm unavailable / install failed — fall through to the symlink fallback below
+        }
+    }
+    try {
+        const baseModules = join(baseRepoCwd, 'node_modules');
+        const wtModules = join(worktreePath, 'node_modules');
+        if (existsSync(baseModules) && !existsSync(wtModules)) {
+            symlinkSync(baseModules, wtModules, 'dir');
+        }
+    }
+    catch {
+        // ignore — the developer simply runs without provisioned node_modules
+    }
 }
-function gitRootFromWorktreePath(worktreePath) {
-    if (existsSync(worktreePath)) {
-        return gitCommonRootFromExistingPath(worktreePath);
+/**
+ * Create the run's isolated worktree if absent (idempotent). Returns its path.
+ *
+ * 1. If a valid worktree already exists at the deterministic path → write the live marker and return
+ *    it (replay / recovery: never clobber in-flight developer work).
+ * 2. Else: fetch `origin/<base>`, then `git worktree add -B <branch> <path> origin/<base>` (create-or-
+ *    reset the feature branch and check it out in the new worktree).
+ * 3. Provision deps (provisionDeps): `pnpm install --frozen-lockfile` for a pnpm repo, else a
+ *    best-effort base-`node_modules` symlink — so the developer can build/test in the isolated tree.
+ * 4. Write the `<runId>.live` marker (fail-loud signal for the resolver).
+ */
+export function createRunWorktree(opts) {
+    const { runId, baseRepoCwd, base, branch, dataDir } = opts;
+    const execGit = opts.execGit ?? defaultExecGit;
+    const execInstall = opts.execInstall ?? defaultExecInstall;
+    const worktreePath = worktreePathFor(dataDir, runId);
+    if (isWorktreeDir(worktreePath)) {
+        writeMarker(dataDir, runId);
+        return { worktreePath };
     }
-    const worktreesDir = dirname(worktreePath);
-    if (basename(worktreesDir) !== '.worktrees')
-        return null;
-    const candidate = dirname(worktreesDir);
-    return existsSync(join(candidate, '.git')) ? candidate : null;
+    mkdirSync(dirname(worktreePath), { recursive: true });
+    // Fetch the base so the worktree is cut from fresh origin/<base>.
+    execGit(['fetch', 'origin', base], baseRepoCwd);
+    // -B: create-or-reset <branch> at origin/<base> and check it out in the new linked worktree.
+    execGit(['worktree', 'add', '-B', branch, worktreePath, `origin/${base}`], baseRepoCwd);
+    // Provision dependencies (pnpm install for a pnpm repo, else node_modules symlink) — best-effort.
+    provisionDeps(worktreePath, baseRepoCwd, execInstall);
+    writeMarker(dataDir, runId);
+    return { worktreePath };
 }
-function deleteBranchIfPresent(gitRoot, stepId) {
+/**
+ * Release the run's worktree (best-effort, idempotent). Removes the linked worktree + prunes stale
+ * administrative entries + drops the live marker. No-ops if the worktree is already gone. Called only
+ * at a TERMINAL state — never while parked at a gate (the workflow stays alive across `recv`, so the
+ * lifecycle `finally` does not run during a park).
+ */
+export function releaseRunWorktree(opts) {
+    const { runId, baseRepoCwd, dataDir } = opts;
+    const execGit = opts.execGit ?? defaultExecGit;
+    const worktreePath = worktreePathFor(dataDir, runId);
     try {
-        git(['branch', '-D', branchName(stepId)], gitRoot);
+        if (existsSync(worktreePath)) {
+            execGit(['worktree', 'remove', '--force', worktreePath], baseRepoCwd);
+        }
     }
     catch {
-        // Missing branches are expected after partial cleanup or manual recovery.
+        // ignore — fall through to a best-effort dir removal, then prune the admin entry
     }
-}
-function pruneWorktrees(gitRoot) {
     try {
-        git(['worktree', 'prune'], gitRoot);
+        if (existsSync(worktreePath))
+            rmSync(worktreePath, { recursive: true, force: true });
     }
     catch {
-        console.warn(`Warning: git worktree prune failed in ${gitRoot}`);
+        // ignore
     }
-}
-export class GitWorktreeManager {
-    async create(stepId, baseDir) {
-        const gitRoot = gitRootFromExistingPath(baseDir);
-        const worktreePath = join(gitRoot, '.worktrees', stepId);
-        await this.release(worktreePath);
-        git(['worktree', 'add', '-b', branchName(stepId), worktreePath, 'HEAD'], gitRoot);
-        const sourceNodeModules = join(gitRoot, 'node_modules');
-        const targetNodeModules = join(worktreePath, 'node_modules');
-        if (existsSync(sourceNodeModules)) {
-            if (existsSync(targetNodeModules) || lstatSync(targetNodeModules, { throwIfNoEntry: false }) !== undefined) {
-                rmSync(targetNodeModules, { recursive: true, force: true });
-            }
-            symlinkSync(sourceNodeModules, targetNodeModules, 'dir');
-        }
-        return worktreePath;
+    // Prune AFTER any manual removal so the `.git/worktrees/<id>` admin entry is cleaned in both the
+    // `git worktree remove` path and the manual-rm fallback path.
+    try {
+        execGit(['worktree', 'prune'], baseRepoCwd);
     }
-    async release(worktreePath) {
-        const gitRoot = gitRootFromWorktreePath(worktreePath);
-        if (gitRoot === null)
-            return;
-        if (existsSync(worktreePath)) {
-            try {
-                git(['worktree', 'remove', '--force', worktreePath], gitRoot);
-            }
-            catch {
-                console.warn(`Warning: git worktree remove failed for ${worktreePath}; deleting directory directly`);
-                rmSync(worktreePath, { recursive: true, force: true });
-            }
-        }
-        if (existsSync(worktreePath)) {
-            console.warn(`Warning: worktree path still exists after git removal: ${worktreePath}; deleting directory directly`);
-            rmSync(worktreePath, { recursive: true, force: true });
-        }
-        pruneWorktrees(gitRoot);
-        deleteBranchIfPresent(gitRoot, stepIdFromWorktreePath(worktreePath));
+    catch {
+        // ignore — prune is housekeeping only
+    }
+    try {
+        rmSync(worktreeMarkerFor(dataDir, runId), { force: true });
     }
+    catch {
+        // ignore
+    }
+}
+// The live marker is the signal that makes resolveRunCwd FAIL LOUD on a lost worktree. If it cannot be
+// written we must NOT proceed silently (a later lost worktree would then fall back to the shared base
+// checkout, masking the isolation failure) — throw so the create step fails and the run surfaces it.
+function writeMarker(dataDir, runId) {
+    writeFileSync(worktreeMarkerFor(dataDir, runId), `${runId}\n`, 'utf8');
 }
 //# sourceMappingURL=git-worktree-manager.js.map

package/dist/worker/git-worktree-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-worktree-manager.js","sourceRoot":"","sources":["../../src/worker/git-worktree-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-worktree-manager.js","sourceRoot":"","sources":["../../src/worker/git-worktree-manager.ts"],"names":[],"mappings":"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"}

package/dist/worker/process-executor.js

@@ -29,10 +29,31 @@ export const spawnExecutor = (req) => new Promise((resolve, reject) => {
     let stderr = '';
     let timedOut = false;
     let settled = false;
+    if (child.pid !== undefined)
+        req.onSpawn?.(child.pid);
     child.stdout?.setEncoding('utf8');
     child.stderr?.setEncoding('utf8');
-    child.stdout?.on('data', (chunk) => { stdout += chunk; });
-    child.stderr?.on('data', (chunk) => { stderr += chunk; });
+    // Guard the sink callbacks: a throw here (e.g. a failed artifact write) would otherwise
+    // escape the stream 'data' handler as an uncaughtException and crash the worker. The
+    // in-memory capture above is unaffected, so the result envelope is still collected.
+    child.stdout?.on('data', (chunk) => {
+        stdout += chunk;
+        try {
+            req.onStdoutChunk?.(chunk);
+        }
+        catch (err) {
+            console.warn(`Warning: onStdoutChunk sink failed: ${String(err)}`);
+        }
+    });
+    child.stderr?.on('data', (chunk) => {
+        stderr += chunk;
+        try {
+            req.onStderrChunk?.(chunk);
+        }
+        catch (err) {
+            console.warn(`Warning: onStderrChunk sink failed: ${String(err)}`);
+        }
+    });
     const timer = setTimeout(() => {
         timedOut = true;
         killGroup(child);

package/dist/worker/process-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-executor.js","sourceRoot":"","sources":["../../src/worker/process-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-executor.js","sourceRoot":"","sources":["../../src/worker/process-executor.ts"],"names":[],"mappings":"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"}

package/dist/worker/result-envelope.js

@@ -1,35 +1,68 @@
-// The EXACT contract between the agent and the runner. Two layers:
-//   A. transport envelope — `claude -p --output-format json` stdout (final text + cost/usage)
-//   B. agent result envelope — a sentineled REVO_RESULT block the agent emits inside that final text
-//
-// The instruction below is the SINGLE SOURCE OF TRUTH. The runner (claude-code-runner.ts) appends it
-// to EVERY prompt so the agent is always told how to emit; the parser here keys on the same markers.
-// It lives next to the parser — not in build-context.ts (the stub shares that), not in role prompts.
-export const REVO_RESULT_CONTRACT = `
-You MUST end your reply with a single result block in EXACTLY this form — the markers on their own lines,
-valid JSON between them, and NOTHING after the closing marker:
-
-<<<REVO_RESULT
-{
-  "output": <any JSON — a short human-readable summary or structured result>,
-  "artifacts": <any JSON, optional — e.g. { "planPath": "docs/plans/00xx.md" }; omit if none>,
-  "nextSteps": [
-    { "role": "developer", "kind": "implement", "input": { "from": "<this step>" },
-      "modelProfile"?: "standard", "taskId"?: "<defaults to the current step's task>",
-      "priority"?: 0, "maxAttempts"?: 3, "dependsOn"?: [], "runAfter"?: "" }
-  ],
-  "needsHuman": false,
-  "lesson": null
-}
-REVO_RESULT>>>
-
-If you have no follow-up work, return "nextSteps": []. If you are blocked and need a human, set
-"needsHuman": true and "nextSteps": []. Emit the block exactly once.
+// The only supported agent result channel: the Claude CLI `--json-schema` constrains the final
+// message and returns it as the transport `structured_output` field. The engine routes only on the
+// top-level `verdict` from that structured object; prose output is never parsed for routing.
+export const AGENT_RESULT_SCHEMA = JSON.stringify({
+    type: 'object',
+    additionalProperties: false,
+    properties: {
+        verdict: {
+            type: 'string',
+            minLength: 1,
+            description: 'the single routing token, lowercase, e.g. approved | changes_requested | blocker | clean | dirty',
+        },
+        output: { type: 'string', description: 'a short summary, or the artifact (e.g. the plan) the next step consumes' },
+        artifacts: { description: 'optional JSON artifacts, e.g. { "planPath": "docs/plans/00xx.md" }' },
+        nextSteps: {
+            type: 'array',
+            description: 'optional follow-up work items; use [] when there is no follow-up work',
+            items: { type: 'object' },
+        },
+        needsHuman: { type: 'boolean', description: 'true only if you are blocked and a human must intervene' },
+        lesson: { type: 'string', description: 'optional one-line note for a future attempt' },
+    },
+    required: ['verdict', 'output'],
+});
+/** Short prompt note paired with `--json-schema`; the CLI returns the result as `structured_output`. */
+export const STRUCTURED_RESULT_NOTE = `
+Return your final answer as JSON matching the provided output schema:
+- "verdict": the single routing token for your role (lowercase; e.g. approved | changes_requested | blocker | clean | dirty).
+- "output": a short summary, or — if you produce an artifact for a later step (e.g. an implementation plan) — that artifact.
+- "nextSteps": [] unless you are explicitly creating legacy follow-up steps.
+Set "needsHuman": true only if you are blocked and a human must intervene.
 `;
-// Markers the parser keys on — must stay identical to those embedded in REVO_RESULT_CONTRACT.
-// The marker-sync unit test guards that invariant.
-const OPEN_MARKER = '<<<REVO_RESULT';
-const CLOSE_MARKER = 'REVO_RESULT>>>';
+/** Build the AgentResult from the required structured_output object (the --json-schema path). */
+export function agentResultFromStructured(structured) {
+    if (structured === undefined) {
+        throw new TypeError('agent structured result missing structured_output');
+    }
+    if (structured === null || typeof structured !== 'object' || Array.isArray(structured)) {
+        throw new TypeError('agent structured result must be an object');
+    }
+    const o = structured;
+    if (typeof o.verdict !== 'string' || o.verdict.trim().length === 0) {
+        throw new TypeError('agent structured result missing required top-level verdict');
+    }
+    if (typeof o.output !== 'string') {
+        throw new TypeError('agent structured result missing required string output');
+    }
+    if ('needsHuman' in o && typeof o.needsHuman !== 'boolean') {
+        throw new TypeError('agent structured result needsHuman must be a boolean when present');
+    }
+    if ('lesson' in o && o.lesson !== null && typeof o.lesson !== 'string') {
+        throw new TypeError('agent structured result lesson must be a string when present');
+    }
+    if ('nextSteps' in o && !Array.isArray(o.nextSteps)) {
+        throw new TypeError('agent structured result nextSteps must be an array when present');
+    }
+    return {
+        output: o.output,
+        verdict: o.verdict,
+        artifacts: o.artifacts,
+        nextSteps: Array.isArray(o.nextSteps) ? o.nextSteps : [],
+        needsHuman: o.needsHuman === true,
+        lesson: typeof o.lesson === 'string' ? o.lesson : undefined,
+    };
+}
 function readNumber(value) {
     return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
 }
@@ -40,6 +73,9 @@ function readFinalText(obj) {
         return obj.text;
     return '';
 }
+function readNonEmptyString(value) {
+    return typeof value === 'string' && value.length > 0 ? value : undefined;
+}
 // Layer A. Parse defensively; field names are read only inside this module, so a CLI drift is a
 // one-file change. Throws only when stdout is not parseable JSON.
 export function parseTransportEnvelope(stdout) {
@@ -60,38 +96,60 @@ export function parseTransportEnvelope(stdout) {
     return {
         text: readFinalText(obj),
         isError: Boolean(obj.is_error),
+        permissionDenials: obj.permission_denials,
+        terminalReason: readNonEmptyString(obj.terminal_reason),
+        sessionId: readNonEmptyString(obj.session_id),
         costUsd: readNumber(obj.total_cost_usd) ?? readNumber(obj.cost_usd),
         inputTokens: readNumber(usage?.input_tokens),
         outputTokens: readNumber(usage?.output_tokens),
+        structuredOutput: obj.structured_output,
     };
 }
-// Layer B. Extract the substring between the markers and JSON.parse it. Absent or unparseable →
-// the documented lesson-bearing error (the corrective is the contract the runner re-appends, not this).
-export function extractAgentResult(text) {
-    const start = text.indexOf(OPEN_MARKER);
-    const end = start === -1 ? -1 : text.indexOf(CLOSE_MARKER, start + OPEN_MARKER.length);
-    if (start === -1 || end === -1) {
-        throw new Error('agent did not emit a parseable REVO_RESULT envelope');
-    }
-    const jsonSlice = text.slice(start + OPEN_MARKER.length, end);
-    let parsed;
+/**
+ * Reduce the runner's stdout to the single terminal `result` JSON object, then hand it to
+ * parseTransportEnvelope. Handles BOTH shapes:
+ *   - legacy `--output-format json`     → the whole stdout is one `{...}` object;
+ *   - `--output-format stream-json`     → a JSONL stream (system/assistant/user/… lines) whose LAST
+ *                                          line is `{"type":"result",...}`.
+ * Confirmed by experiment (2026-06-23): under stream-json the terminal result still carries
+ * `structured_output`, `usage`, and `total_cost_usd`, so verdict/cost extraction is unchanged.
+ * Throws when no result object is present (the runner maps that to a lesson-bearing failure).
+ */
+export function extractTerminalResult(stdout) {
+    const trimmed = stdout.trim();
+    if (trimmed === '')
+        throw new Error('claude -p produced no output (no result envelope)');
+    // Legacy single-object form: the whole stdout parses as one object. Accept only a terminal
+    // result (`type` 'result' or absent — the legacy `--output-format json` blob is `type:'result'`);
+    // a lone non-result stream event (e.g. `{"type":"assistant",…}`) must fall through so the JSONL
+    // scan reports the clear "no result event" error rather than failing later on a missing result.
     try {
-        parsed = JSON.parse(jsonSlice);
+        const whole = JSON.parse(trimmed);
+        if (whole !== null && typeof whole === 'object' && !Array.isArray(whole)) {
+            const type = whole.type;
+            if (type === undefined || type === 'result')
+                return trimmed;
+        }
     }
     catch {
-        throw new Error('agent did not emit a parseable REVO_RESULT envelope');
+        // Not a single object → fall through to the JSONL scan.
     }
-    if (parsed === null || typeof parsed !== 'object') {
-        throw new Error('agent did not emit a parseable REVO_RESULT envelope');
+    // stream-json: the terminal result is the LAST line with `"type":"result"`.
+    const lines = trimmed.split(/\r?\n/);
+    for (let i = lines.length - 1; i >= 0; i--) {
+        const line = lines[i].trim();
+        if (line === '')
+            continue;
+        try {
+            const obj = JSON.parse(line);
+            if (obj !== null && typeof obj === 'object' && obj.type === 'result')
+                return line;
+        }
+        catch {
+            // skip a partial/non-JSON line
+        }
     }
-    const obj = parsed;
-    return {
-        output: obj.output,
-        artifacts: obj.artifacts,
-        nextSteps: Array.isArray(obj.nextSteps) ? obj.nextSteps : [],
-        needsHuman: Boolean(obj.needsHuman),
-        lesson: typeof obj.lesson === 'string' ? obj.lesson : undefined,
-    };
+    throw new Error('claude -p stream contained no result event (transport envelope)');
 }
 // Map each raw nextSteps entry to NewStepSpec. Require role/kind/input; default taskId and
 // modelProfile from the current step so the agent never needs to know IDs. Throw a lesson-bearing
@@ -99,17 +157,17 @@ export function extractAgentResult(text) {
 export function normalizeNextSteps(raw, step) {
     return raw.map((entry, i) => {
         if (entry === null || typeof entry !== 'object') {
-            throw new Error(`REVO_RESULT nextSteps[${i}] is not an object`);
+            throw new Error(`agent result nextSteps[${i}] is not an object`);
         }
         const e = entry;
         if (typeof e.role !== 'string' || e.role.length === 0) {
-            throw new Error(`REVO_RESULT nextSteps[${i}] missing required "role"`);
+            throw new Error(`agent result nextSteps[${i}] missing required "role"`);
         }
         if (typeof e.kind !== 'string' || e.kind.length === 0) {
-            throw new Error(`REVO_RESULT nextSteps[${i}] missing required "kind"`);
+            throw new Error(`agent result nextSteps[${i}] missing required "kind"`);
         }
         if (!('input' in e)) {
-            throw new Error(`REVO_RESULT nextSteps[${i}] missing required "input"`);
+            throw new Error(`agent result nextSteps[${i}] missing required "input"`);
         }
         const spec = {
             taskId: typeof e.taskId === 'string' && e.taskId.length > 0 ? e.taskId : step.taskId,

package/dist/worker/result-envelope.js.map

@@ -1 +1 @@
-{"version":3,"file":"result-envelope.js","sourceRoot":"","sources":["../../src/worker/result-envelope.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"result-envelope.js","sourceRoot":"","sources":["../../src/worker/result-envelope.ts"],"names":[],"mappings":"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"}