humanish 0.106.1 → 0.108.0

package/dist/routes/computer-use/single-bundle.d.ts

@@ -3,8 +3,7 @@ import type { SubjectPhaseEvent } from "../../subject/steps.js";
 import type { DesktopBrowserEvidence } from "../../substrates/e2b/desktop-browser.js";
 import type { ActorPersonaRef } from "../../actors/contract.js";
 import type { CuaLoopResult } from "../../actors/computer-use/loop.js";
-import { type RunLabProvenance } from "../../run/status.js";
-import { type RunBundle, type RunFeedbackCandidate, type RunProviderResource } from "../../run/bundle.js";
+import { type BundleRun, type RunBundle, type RunFeedbackCandidate, type RunProviderResource } from "../../run/bundle.js";
 import { type RunDesktopGeometry, type RunStream } from "../../run/streams.js";
 import { type Verdict } from "../../run/judge.js";
 import { type DesktopUsage } from "../../run/cost-summary.js";
@@ -17,8 +16,8 @@ export declare function buildSingleParticipantBundle(args: {
     /** The run's verdict, from the judge. */
     verdict: Verdict;
     realEmail?: boolean;
-    /** Lab provenance for the bundle's own `lab` field (#455). */
-    lab?: RunLabProvenance;
+    /** The run this bundle belongs to; the bundle head reads its id, mode, start and lab. */
+    run: BundleRun;
     actorId: string;
     appUrl: string;
     /** The participant's plan id, saved as the stream's laneId ("lane-01" when absent). */
@@ -26,7 +25,6 @@ export declare function buildSingleParticipantBundle(args: {
     actorType?: string;
     surface?: string;
     caseGroup?: string;
-    createdAt: string;
     dryRun: boolean;
     labId: string;
     labTitle?: string;
@@ -44,7 +42,6 @@ export declare function buildSingleParticipantBundle(args: {
     /** Device-preset touch metadata echoed on the measured stream viewport (a prompt signal on
      *  this route, never a rendered claim); the measured width/height/DPR stay authoritative. */
     isMobile?: boolean;
-    runId: string;
     screenshots: string[];
     /** Relative run-dir path of the digest-only comms-thread evidence artifact (humanish.comms-thread.v1),
      *  when a comms lab captured mail; registered as a "log" stream artifact. */
@@ -52,17 +49,17 @@ export declare function buildSingleParticipantBundle(args: {
     /**
      * Capture-time screenshot policy ("blurred" when policies.redactScreenshots, else "raw").
      * When a session ran, its trace's `redaction.screenshots` is the evidence-of-record and
-     * wins; this fallback keeps labels honest for frames written before a mid-session failure
-     * (no trace exists to testify then). Defaults to "raw" — the engine default.
+     * wins; this fallback labels the frames written before a mid-session failure
+     * (no trace exists to testify then). Defaults to "raw", the engine default.
      */
     captureRedaction?: "raw" | "blurred";
     session?: CuaLoopResult;
     sessionError?: string;
     /**
-     * The lane's own credibility read of a goal_satisfied session (#476). The actor's status is
-     * evidence of what it CLAIMED; whether the harness counts the claim is decided by the lane
+     * The route's own credibility read of a goal_satisfied session. The actor's status is
+     * evidence of what it claimed; whether the harness counts the claim is decided by the route
      * (zero engagement, a final message that describes a blocker). The review has to say the same
-     * thing the lane's exit code says, or the durable bundle reports a participant reaching the
+     * thing the participant's exit code says, or the durable bundle reports a participant reaching the
      * goal on a run the harness refused to count.
      */
     credibility?: {
@@ -75,12 +72,12 @@ export declare function buildSingleParticipantBundle(args: {
      * + digests only, never values or command text), including the subject's state story. */
     subjectProvenance?: CuaSubjectProvenanceArg;
     /**
-     * Entry kind for the non-clone subject.declared event (invariant 5 — declare what the subject
-     * WAS). "local-app": an already-running LOCAL dev server driven in-process, un-pinnable —
-     * declared honestly as caller-provisioned/unpinned with no E2B. Absent: a plain app-url entry.
+     * Entry kind for the non-clone subject.declared event, which declares what the subject
+     * was. "local-app": an already-running local dev server driven in-process, un-pinnable, and
+     * declared as caller-provisioned/unpinned with no E2B. Absent: a plain app-url entry.
      */
     entryKind?: "local-app";
-    /** The custom E2B desktop template (image) this lane launched on, when configured (provenance). */
+    /** The custom E2B desktop template (image) this participant launched on, when configured (provenance). */
     desktopTemplate?: string;
     /** The configured browser choice and the command that opened, when explicitly configured. */
     desktopBrowser?: DesktopBrowserEvidence;
@@ -90,7 +87,7 @@ export declare function buildSingleParticipantBundle(args: {
     /** Completed subject-phase records (clone/upload/extract/install/build/ready/state groups)
      *  to fold into bundle.events, so run.json carries real phase timing after the fact. */
     phaseEvents?: SubjectPhaseEvent[];
-    /** Host-side E2B desktop billed span for this lane, in minutes (from ParticipantRunOutcome
+    /** Host-side E2B desktop billed span for this participant, in minutes (from ParticipantRunOutcome
      *  desktopDurationMs). Absent when no sandbox ran (in-process/dry-run) → no desktop cost line. */
     desktopMinutes?: number;
     desktopUsage?: DesktopUsage;

package/dist/routes/computer-use/single-bundle.js

@@ -1,6 +1,5 @@
 import { participantAssignment } from "../../lab/participant-assignment.js";
 import { redactText } from "../../evidence/redaction.js";
-import {} from "../../run/status.js";
 import { REVIEW_SCHEMA, bundleArtifacts, bundleHead, } from "../../run/bundle.js";
 import {} from "../../run/streams.js";
 import { aggregateTaskFunnels, tallyParticipantOutcomes, withCuaReviewProvenance, } from "../../run/outcomes.js";
@@ -25,7 +24,7 @@ function browserPlace(args) {
             return "in a hosted desktop browser";
     }
 }
-/** Run-level cost ESTIMATE (advisory; omitted when nothing was priced and no sandbox ran). */
+/** Run-level cost estimate (advisory; omitted when nothing was priced and no sandbox ran). */
 function runCost(args) {
     return buildRunCostSummary({
         participants: args.session
@@ -53,15 +52,15 @@ function participantView(args, publicAppUrl) {
         ? "Live computer-use session is running; stream auth URL is available only through the attached Observer server."
         : (args.session?.reason ??
             args.sessionError ??
-            "Contract bundle only: dry-run produced the evidence shape without launching a desktop or spending provider tokens.");
+            "Dry run: the evidence shape was written without launching a desktop or spending provider tokens.");
     const lastScreenshot = args.screenshots[args.screenshots.length - 1];
     const desktopGeometry = args.desktopRoute === false
         ? undefined
         : (args.desktopGeometry ?? {
             screen: { requested: { width: args.resolution[0], height: args.resolution[1] } },
         });
-    // Honest labels (invariant 6: claims match mechanism): every screenshot label names the
-    // run's ACTUAL mode. The session trace is the evidence-of-record; the capture policy covers
+    // Claims match mechanism: every screenshot label names the
+    // run's actual mode. The session trace is the evidence-of-record; the capture policy covers
     // frames written before a mid-session failure produced a trace.
     const traceScreenshotMode = args.session?.trace.redaction.screenshots;
     const screenshotMode = traceScreenshotMode === "raw" || traceScreenshotMode === "blurred"
@@ -93,9 +92,9 @@ function singleSimulation(args, view) {
                 ? `Computer-use actor (${args.actorId}) is driving the subject app ${browserPlace(args)}.`
                 : args.sessionError !== undefined
                     ? `Computer-use lab failed before a terminal session verdict: ${args.sessionError}`
-                    : `Contract participant for the computer-use actor (${args.actorId}) against ${publicAppUrl}.`,
-        startedAt: args.createdAt,
-        updatedAt: args.createdAt,
+                    : `Computer-use actor (${args.actorId}) against ${publicAppUrl}; no session ran.`,
+        startedAt: args.run.createdAt,
+        updatedAt: args.run.createdAt,
     });
 }
 function singleStream(args, view) {
@@ -108,13 +107,13 @@ function singleStream(args, view) {
         ...(args.surface === undefined ? {} : { surface: args.surface }),
         ...(args.caseGroup === undefined ? {} : { caseGroup: args.caseGroup }),
         kind: "browser",
-        label: `CUA browser — ${args.labId}`,
+        label: `${args.participantId ?? "lane-01"} · browser`,
         status,
         transport: "snapshot",
-        updatedAt: args.createdAt,
+        updatedAt: args.run.createdAt,
         embed: lastScreenshot
-            ? { kind: "screenshot", url: lastScreenshot, title: `CUA desktop (${screenshotMode})` }
-            : { kind: "placeholder", title: "CUA desktop" },
+            ? { kind: "screenshot", url: lastScreenshot, title: `Desktop (${screenshotMode})` }
+            : { kind: "placeholder", title: "Desktop" },
         ...(desktopGeometry?.viewport === undefined
             ? {}
             : {
@@ -162,7 +161,7 @@ function singleEvents(args, view) {
     const events = [
         {
             id: "event-000-created",
-            at: args.createdAt,
+            at: args.run.createdAt,
             level: "info",
             type: "cua-lab.run.created",
             message: `Created computer-use lab run for ${args.labId} (actor ${args.actorId}).`,
@@ -170,24 +169,24 @@ function singleEvents(args, view) {
         args.subjectProvenance
             ? participantEvent(SINGLE, {
                 id: "event-001-subject",
-                at: args.createdAt,
+                at: args.run.createdAt,
                 level: "info",
                 type: "cua-lab.subject.provenance",
-                // HONEST WORDING: claim "cloned/packed and served" only when it actually happened.
+                // Claim "cloned/packed and served" only when it actually happened.
                 message: `${subjectProvenanceMessage(args.subjectProvenance, publicAppUrl, args.dryRun, args.session !== undefined)} (subject env names: ${args.subjectProvenance.envNames.length > 0 ? args.subjectProvenance.envNames.join(", ") : "none"}; values never persisted); state: ${describeSubjectState(args.subjectProvenance.state, args.dryRun)}.`,
             })
             : participantEvent(SINGLE, {
                 id: "event-001-subject",
-                at: args.createdAt,
+                at: args.run.createdAt,
                 level: "info",
                 type: "cua-lab.subject.declared",
-                // Invariant 5: declare what the subject WAS, including the ABSENCE of a pin. A
-                // local-app / in-process subject is an already-running LOCAL dev server the caller
-                // provisioned; it cannot be commit-pinned, so its provenance is honestly UNPINNED and
+                // Declare what the subject was, including the absence of a pin. A
+                // local-app / in-process subject is an already-running local dev server the caller
+                // provisioned; it cannot be commit-pinned, so its provenance is unpinned and
                 // no E2B desktop was created. A plain app-url entry runs inside the desktop sandbox, or,
                 // on the local VM, reaches the host's loopback from the VM's browser.
                 message: args.entryKind === "local-app"
-                    ? `Subject app declared at ${publicAppUrl} (already-running LOCAL dev server driven in-process; NO clone, NO E2B desktop). Provenance: caller-provisioned and UNPINNED — a running dev server cannot be commit-pinned.`
+                    ? `Subject app declared at ${publicAppUrl}: a running local dev server driven in this process, with no clone and no E2B desktop. Provenance: provided by the caller and unpinned, because a running dev server has no commit to pin.`
                     : runnerSubstrate(args) === "local-desktop"
                         ? `Subject app declared at ${publicAppUrl} (the host's loopback, opened from a browser on a local VM).`
                         : `Subject app declared at ${publicAppUrl} (loopback inside the desktop sandbox).`,
@@ -195,7 +194,7 @@ function singleEvents(args, view) {
         args.session
             ? participantEvent(SINGLE, {
                 id: "event-002-session",
-                at: args.createdAt,
+                at: args.run.createdAt,
                 level: args.session.status === "passed" ? "info" : "warn",
                 type: `cua-lab.session.${args.session.completionReason}`,
                 message: `${args.session.status}: ${args.session.reason}`,
@@ -203,7 +202,7 @@ function singleEvents(args, view) {
             : args.inProgress === true
                 ? participantEvent(SINGLE, {
                     id: "event-002-running",
-                    at: args.createdAt,
+                    at: args.run.createdAt,
                     level: "info",
                     type: "cua-lab.session.running",
                     message: "Live computer-use session is running; terminal evidence has not been written yet.",
@@ -211,22 +210,22 @@ function singleEvents(args, view) {
                 : args.sessionError !== undefined
                     ? participantEvent(SINGLE, {
                         id: "event-002-session",
-                        at: args.createdAt,
+                        at: args.run.createdAt,
                         level: "error",
                         type: "cua-lab.session.error",
                         message: args.sessionError,
                     })
                     : participantEvent(SINGLE, {
                         id: "event-002-contract",
-                        at: args.createdAt,
+                        at: args.run.createdAt,
                         level: "info",
                         type: "cua-lab.contract.ready",
-                        message: "Dry-run contract bundle ready; switch scenario.mode to live for a real desktop session.",
+                        message: "Dry-run bundle ready; switch scenario.mode to live for a real desktop session.",
                     }),
     ];
     const record = (event) => events.push(participantEvent(SINGLE, event));
     // Persisted phase trail (real boot timing, not just a coarse provenance sentence): one
-    // RunEvent per COMPLETED phase boundary (started events never persist here; they carry no
+    // RunEvent per completed phase boundary (started events never persist here; they carry no
     // durationMs). ok:false phases warn rather than error, since the failing phase's own thrown
     // error already becomes the terminal cua-lab.session.error event above.
     let phaseEventSeq = 3;
@@ -242,7 +241,7 @@ function singleEvents(args, view) {
     for (const warning of desktopGeometry?.warnings ?? []) {
         record({
             id: `event-${String(phaseEventSeq++).padStart(3, "0")}-geometry-warning`,
-            at: args.createdAt,
+            at: args.run.createdAt,
             level: "warn",
             type: "cua-lab.geometry.warning",
             message: warning,
@@ -252,17 +251,15 @@ function singleEvents(args, view) {
 }
 function singleReview(args, view, stream) {
     const { reason } = view;
-    // A funnel with a denominator of one is still the funnel — and its absence stays honest: no
+    // A funnel with a denominator of one is still the funnel, and its absence stays recorded: no
     // declared protocol (or a dry run) means no `tasks` field, never an empty one.
-    const singleStudyTasks = args.inProgress !== true && args.session?.trace.taskFunnel !== undefined
+    const singleRunTasks = args.inProgress !== true && args.session?.trace.taskFunnel !== undefined
         ? aggregateTaskFunnels([args.session.trace.taskFunnel])
         : undefined;
-    // What happened to the participant, as the LANE judged it — the same rule the fan-out roll-up
-    // applies (participantStatusForOutcome). Before #476 this read the actor's own status, so a
-    // run the lane refused as "not a credible pass" was written up as verdict pass, 1/1 reached
-    // the goal, and every projection of the bundle (Observer tally, `runs`, the status index)
-    // repeated it. Found on a real drawDB run whose participant wrote "Blocked after partial
-    // completion".
+    // What happened to the participant, as the route judged it: the same rule the fan-out roll-up
+    // applies (participantStatus in src/run/judge.ts). Reading the actor's own status instead would write up
+    // a run the route refused as "not a credible pass" as verdict pass, 1/1 reached the goal, and
+    // every projection of the bundle (Observer tally, `runs`, the status index) would repeat it.
     const participantStatus = args.session === undefined
         ? undefined
         : participantStatusFor(args.session.status, args.credibility);
@@ -274,20 +271,20 @@ function singleReview(args, view, stream) {
     const review = withCuaReviewProvenance({
         schema: REVIEW_SCHEMA,
         verdict: args.verdict,
-        // One lane is still a study with a denominator of one, and saying so keeps a single-lane
-        // result from being read as though it generalized.
+        // One participant is still a study with a denominator of one, and saying so keeps a
+        // single-participant result from being read as though it generalized.
         ...(participantStatus !== undefined && args.inProgress !== true
             ? {
                 participants: tallyParticipantOutcomes([participantStatus], [args.credibility?.reportedFriction === true]),
             }
             : {}),
-        ...(singleStudyTasks === undefined ? {} : { tasks: singleStudyTasks }),
+        ...(singleRunTasks === undefined ? {} : { tasks: singleRunTasks }),
         summary: credibilityNote === undefined ? reason : `${credibilityNote} ${reason}`,
         gaps: args.session || args.sessionError !== undefined
             ? []
             : args.inProgress === true
                 ? ["Live desktop session is still running."]
-                : ["Live desktop session not yet run (dry-run contract only)."],
+                : ["Live desktop session not yet run (dry run only)."],
     }, [stream]);
     return review;
 }
@@ -305,33 +302,29 @@ export function buildSingleParticipantBundle(args) {
     const events = singleEvents(args, view);
     const review = singleReview(args, view, stream);
     return {
-        ...bundleHead({
+        ...bundleHead(args.run, {
             ...(args.realEmail && !args.dryRun
                 ? { publication: { restrictions: ["real-communications"] } }
                 : {}),
-            runId: args.runId,
-            mode: args.dryRun ? "dry-run" : "live",
             participants: 1,
-            createdAt: args.createdAt,
-            ...(args.lab === undefined ? {} : { lab: args.lab }),
             source: args.source,
         }),
         persona: {
             id: args.persona.id,
             name: `Computer-use operator (${args.persona.id})`,
-            source: `lab:${args.labId}`,
+            source: `study:${args.labId}`,
             sourceDigest: args.persona.promptDigest,
         },
         scenario: {
             id: `cua-${args.labId}`,
             title: args.labTitle ?? `Computer-use lab: ${args.labId}`,
             goal: redactText(args.mission),
-            source: `lab:${args.labId}`,
+            source: `study:${args.labId}`,
             sourceDigest: args.persona.promptDigest,
         },
         lifecycle: [
             {
-                at: args.createdAt,
+                at: args.run.createdAt,
                 event: "cua-lab.run.created",
                 message: `Created computer-use lab run with one participant in a desktop browser (actor ${args.actorId}).`,
             },
@@ -342,7 +335,7 @@ export function buildSingleParticipantBundle(args) {
         redaction: {
             status: "passed",
             notes: traceScreenshotMode === "raw"
-                ? "Typed text recorded as length only and reasoning/messages pass through text redaction. Screenshots are FULL-FIDELITY (raw), retained for local use — NOT redacted for publishing; set policies.redactScreenshots: true to blur a share-as-is bundle."
+                ? "Typed text is recorded as its length only, and reasoning and messages pass through text redaction. Screenshots are unblurred and kept for local use; they are not redacted for publishing. Set policies.redactScreenshots: true to blur screenshots in a bundle you plan to share."
                 : traceScreenshotMode === "blurred"
                     ? "Typed text recorded as length only and reasoning/messages pass through text redaction. Screenshots are blurred at capture (policies.redactScreenshots: true) for a share-as-is bundle."
                     : args.screenshots.length > 0
@@ -351,12 +344,12 @@ export function buildSingleParticipantBundle(args) {
         },
         artifacts: bundleArtifacts(),
         review,
-        // What the participant reported, when it reported anything (#392). Dry-run and in-progress
-        // bundles carry none — there is no participant yet to quote.
+        // What the participant reported, when it reported anything. Dry-run and in-progress
+        // bundles carry none: there is no participant yet to quote.
         feedbackCandidates: args.dryRun || args.inProgress === true
             ? []
             : participantFeedbackCandidates({
-                runId: args.runId,
+                runId: args.run.runId,
                 scenarioId: `cua-${args.labId}`,
                 adapterId: args.labId,
                 goal: redactText(args.mission),
@@ -383,8 +376,8 @@ export function buildSingleParticipantBundle(args) {
         ...(args.providerResources === undefined || args.providerResources.length === 0
             ? {}
             : { providerResources: args.providerResources }),
-        // Structured subject provenance (invariant 5): code pin + state story. Uniform and
-        // honest on app-url bundles too — the caller minted the URL, its state is the caller's.
+        // Structured subject provenance: code pin + state story. Uniform, and
+        // stated on app-url bundles too: the caller minted the URL, its state is the caller's.
         // CuaSubjectProvenanceArg's two variants (clone, local-tree) are already RunSubjectProvenance-
         // shaped, so no reconstruction is needed beyond the app-url fallback.
         subject: args.subjectProvenance ?? { source: "app-url", state: { provenance: "undeclared" } },

package/dist/routes/computer-use/subject-projection.d.ts

@@ -2,16 +2,14 @@ import type { ComputerUsePlan } from "../../lab/plan-types.js";
 import type { LabSubjectState } from "../../lab/types.js";
 import { type RunSubjectProvenance, type RunSubjectStateStepRecord } from "../../run/bundle.js";
 import { type LocalTreeArchive } from "../../subject/local-tree-archive.js";
-import { type CuaSubjectRoute } from "./plan.js";
 import { type DesktopParticipantRun, type CuaSubjectProjection, type CuaSubjectProvenanceArg, type ParticipantRunOutcome } from "./types.js";
 /**
- * Each lane's subject projection. A lane's outcome adds the subject commit it resolved and the
+ * Each participant's subject projection. A participant's outcome adds the subject commit it resolved and the
  * state steps it executed; without outcomes (dry run, or a run still in progress) the declared
  * state is projected as not yet run.
  */
 export declare function projectParticipantSubjects(args: {
     plan: ComputerUsePlan;
-    subjectRoute: CuaSubjectRoute;
     publicRepo?: string;
     localTreeArchive?: LocalTreeArchive;
     runs: readonly DesktopParticipantRun[];
@@ -20,7 +18,7 @@ export declare function projectParticipantSubjects(args: {
 }): CuaSubjectProjection[];
 /**
  * Resolve the bundle's state marker from the declaration and what actually ran.
- * Precedence: external declared → "unpinned" (seed records, if any, stay attached — a
+ * Precedence: external declared → "unpinned" (seed records, if any, stay attached; a
  * migrated external DB is still unpinned overall); else seed declared → "seeded" only when
  * every declared step executed ok on a live run, otherwise "declared-not-run" (dry-run
  * contract bundles and failed live provisioning); no declaration → "undeclared".
@@ -35,10 +33,10 @@ export declare function resolveSubjectState(args: {
  *  default branch that builder already handles). */
 export declare function subjectProvenanceArg(subject: CuaSubjectProjection, publicRepo: string | undefined, subjectEnvNames: string[]): CuaSubjectProvenanceArg | undefined;
 /**
- * The run-level subject for the top level and the bundle. Local-tree lanes all pack from the same
- * once-per-run archive, so every lane already carries the identical archiveSha256/commit/dirty and
- * the first lane's projection is the aggregate. Clone lanes each resolve their own commit; the
- * aggregate carries it only when every lane agrees, and warns when they diverge.
+ * The run-level subject for the top level and the bundle. Local-tree participants all pack from the
+ * same once-per-run archive, so every participant already carries the identical archiveSha256/commit/dirty and
+ * the first participant's projection is the aggregate. Clone participants each resolve their own
+ * commit; the aggregate carries it only when every participant agrees, and warns when they diverge.
  */
 export declare function aggregateCuaSubject(args: {
     subjects: readonly CuaSubjectProjection[];

package/dist/routes/computer-use/subject-projection.js

@@ -1,32 +1,33 @@
-// Each lane's subject projection and the subject-state marker, from the declared subject and what
-// the lanes ran; the run-level subject aggregated from them; and the provenance argument the
+// Each participant's subject projection and the subject-state marker, from the declared subject
+// and what the participants ran; the run-level subject aggregated from them; and the provenance argument the
 // bundle builders take.
 import { commandDigestOf } from "../../subject/state.js";
 import { cuaDeclaredState } from "./plan.js";
 import {} from "../../run/bundle.js";
 import {} from "../../subject/local-tree-archive.js";
-import {} from "./plan.js";
-import {} from "./types.js";
+import { participantSubjectEnv, } from "./types.js";
 /**
- * Each lane's subject projection. A lane's outcome adds the subject commit it resolved and the
+ * Each participant's subject projection. A participant's outcome adds the subject commit it resolved and the
  * state steps it executed; without outcomes (dry run, or a run still in progress) the declared
  * state is projected as not yet run.
  */
 export function projectParticipantSubjects(args) {
-    const { subjectRoute, publicRepo, localTreeArchive } = args;
+    const { publicRepo, localTreeArchive } = args;
+    const { subject } = args.plan.runner;
+    const subjectEnvNames = [...participantSubjectEnv(subject)];
+    // Only a provisioned subject declares state; cuaDeclaredState is undefined for the others.
     const declaredState = cuaDeclaredState(args.plan);
     return args.runs.map((_spec, index) => {
         const outcome = args.outcomes?.[index];
         const subjectState = resolveSubjectState({
-            declared: subjectRoute.provisionedRoute ? declaredState : undefined,
+            declared: declaredState,
             dryRun: args.dryRun,
             executed: outcome?.stateStepRecords ?? [],
         });
         return participantSubjectProjection({
-            cloneRoute: subjectRoute.cloneRoute,
-            localTreeRoute: subjectRoute.localTreeRoute,
+            kind: subject.kind,
             ...(publicRepo === undefined ? {} : { publicRepo }),
-            subjectEnvNames: subjectRoute.subjectEnvNames,
+            subjectEnvNames,
             ...(outcome?.subjectCommit === undefined ? {} : { subjectCommit: outcome.subjectCommit }),
             ...(localTreeArchive === undefined ? {} : { localTreeArchive }),
             subjectState,
@@ -35,7 +36,7 @@ export function projectParticipantSubjects(args) {
 }
 /**
  * Resolve the bundle's state marker from the declaration and what actually ran.
- * Precedence: external declared → "unpinned" (seed records, if any, stay attached — a
+ * Precedence: external declared → "unpinned" (seed records, if any, stay attached; a
  * migrated external DB is still unpinned overall); else seed declared → "seeded" only when
  * every declared step executed ok on a live run, otherwise "declared-not-run" (dry-run
  * contract bundles and failed live provisioning); no declaration → "undeclared".
@@ -47,8 +48,8 @@ export function resolveSubjectState(args) {
     }
     const declaredSeed = declared.seed ?? [];
     const external = declared.external ?? [];
-    // Dry-run: nothing executes (no sandbox) — record the DECLARED recipe: name, phase, and
-    // command digest only, with NO execution fields.
+    // Dry-run: nothing executes (no sandbox), so record the declared recipe: name, phase, and
+    // command digest only, with no execution fields.
     const seed = args.dryRun
         ? declaredSeed.map((step) => ({
             name: step.name,
@@ -73,12 +74,12 @@ export function resolveSubjectState(args) {
         ...(external.length > 0 ? { externalEnvNames: external } : {}),
     };
 }
-/** Build the per-lane subject projection (invariant 5). Local-tree lanes all share ONE
- *  host-packed archive, so every lane's projection carries the identical archiveSha256/
- *  commit/dirty (no per-lane divergence is possible, unlike the clone route's per-lane
+/** Build the per-participant subject projection. Local-tree participants all share
+ *  one host-packed archive, so every participant's projection carries the identical archiveSha256/
+ *  commit/dirty (no divergence is possible, unlike the clone route's per-participant
  *  in-sandbox commit). */
 function participantSubjectProjection(args) {
-    if (args.cloneRoute && args.publicRepo) {
+    if (args.kind === "clone" && args.publicRepo) {
         return {
             source: "clone",
             repo: args.publicRepo,
@@ -87,7 +88,7 @@ function participantSubjectProjection(args) {
             state: args.subjectState,
         };
     }
-    if (args.localTreeRoute) {
+    if (args.kind === "local-tree") {
         const archive = args.localTreeArchive;
         return {
             source: "local-tree",
@@ -127,10 +128,10 @@ export function subjectProvenanceArg(subject, publicRepo, subjectEnvNames) {
     return undefined;
 }
 /**
- * The run-level subject for the top level and the bundle. Local-tree lanes all pack from the same
- * once-per-run archive, so every lane already carries the identical archiveSha256/commit/dirty and
- * the first lane's projection is the aggregate. Clone lanes each resolve their own commit; the
- * aggregate carries it only when every lane agrees, and warns when they diverge.
+ * The run-level subject for the top level and the bundle. Local-tree participants all pack from the
+ * same once-per-run archive, so every participant already carries the identical archiveSha256/commit/dirty and
+ * the first participant's projection is the aggregate. Clone participants each resolve their own
+ * commit; the aggregate carries it only when every participant agrees, and warns when they diverge.
  */
 export function aggregateCuaSubject(args) {
     const { subjects, outcomes, participantCount, dryRun } = args;
@@ -143,7 +144,7 @@ export function aggregateCuaSubject(args) {
     const unanimous = !dryRun && commits.length === participantCount && new Set(commits).size === 1;
     const warnings = !dryRun && participantCount > 1 && new Set(commits).size > 1
         ? [
-            "Fan-out participants resolved DIVERGENT subject commits, so the top-level subject.commit is omitted; see each participant's provenance in result.lanes for its pinned commit.",
+            "Participants resolved different subject commits, so the top-level subject.commit is omitted; each participant's provenance in result.lanes has its pinned commit.",
         ]
         : [];
     return {