@miraland-labs/conduit-bridge 0.16.194 → 0.16.196

package/dist/cli.js

@@ -20,7 +20,7 @@ import { BOOTSTRAP_RESULTS, buildSovereignExecutionFacts, workspaceIsClean } fro
 import { ensureCheckout } from "./checkout.js";
 import { buildOnShiftIntentProof, managedWorkspacePath, maybeApplyOnShiftIntent } from "./on-shift-apply.js";
 import { expandOpsValue, loadOpsEnv, OPS_VERBS, runOps } from "./ops.js";
-import { assignmentsPending, pumpExecutionSlots, renewLeases } from "./execution.js";
+import { pumpExecutionSlots, renewLeases } from "./execution.js";
 import { createRehearsalWorktree, rehearsalWorktreePath, removeAttemptWorktree } from "./attempt-worktree.js";
 import { applyRunnerToolPath, installRunnerService, uninstallRunnerService } from "./service.js";
 import { attemptsActiveOnComputer, BRIDGE_PROTOCOL_VERSION, cachedBridgePreflight, gateRehearsalLockHeld, planGateRehearsals, PREFLIGHT_CACHE_TTL_MS, runGateRehearsal, unavailableWorkspacePreflight } from "./preflight.js";
@@ -667,24 +667,21 @@ async function runner() {
                 await heartbeat(client, config, workspace, currentBrief, preflight, intentProof, bootstrapResult);
             }
             await renewLeases(client, config);
-            // Dispatched work outranks a rehearsal already running, and so does an attempt on this
-            // computer (this runner or another). Stop it with nothing recorded, release the lock, and
-            // claim on this same cycle. The rehearsal stays due.
-            if (gateRehearsalRunning && (attemptsActiveOnComputer() || await assignmentsPending(client))) {
+            // Only an active attempt interrupts a rehearsal. Waiting work takes the next cycle.
+            if (gateRehearsalRunning && attemptsActiveOnComputer()) {
                 gateRehearsalAbort?.abort();
                 await gateRehearsalDone;
             }
-            // Another runner on this computer rehearsing its gate, or any runner with an attempt in
-            // flight: claim as usual, rehearse on a later cycle. An assignment already waiting is
-            // claimed below; this cycle does not start a rehearsal.
+            // Another runner with an attempt in flight takes precedence over a new rehearsal.
             if (workspace && onlineDriverIds(config).length && !gateRehearsalRunning && rehearsalPlan?.due
                 && running.size === 0 && Object.keys(config.activeAttempts).length === 0 && !gateRehearsalLockHeld()
-                && !attemptsActiveOnComputer()
-                && !await assignmentsPending(client)) {
+                && !attemptsActiveOnComputer()) {
+                console.log(`Claim deferred for gate rehearsal in ${rehearsalPlan.due.workspace}`);
                 startGateRehearsal(rehearsalPlan.due.workspace, rehearsalPlan.due.plan);
             }
-            // No claim while the gate rehearses: the rehearsal measures the gate alone, never beside an attempt.
-            if (workspace && onlineDriverIds(config).length && !gateRehearsalRunning) {
+            // Idle computers rehearse before claiming. Active attempts keep their execution slots pumping.
+            if (workspace && onlineDriverIds(config).length && !gateRehearsalRunning
+                && (!rehearsalPlan?.due || running.size > 0 || Object.keys(config.activeAttempts).length > 0 || attemptsActiveOnComputer())) {
                 // Read the workspace again, then publish it. The last brief stands if the read fails.
                 const publishWorkspaceState = async (options = {}) => {
                     // Not while an investigation runs: its observation-only check compares the source checkout
@@ -740,7 +737,7 @@ async function runner() {
         await new Promise((resolveSleep) => setTimeout(resolveSleep, intervalMs));
     }
 }
-/** True while the gate rehearsal runs in the background. A dispatched assignment aborts it, then this cycle claims. */
+/** True while the gate rehearsal runs in the background. Waiting assignments do not interrupt it. */
 let gateRehearsalRunning = false;
 let gateRehearsalAbort = null;
 let gateRehearsalDone = Promise.resolve();
@@ -809,7 +806,7 @@ function startGateRehearsal(workspace, plan) {
         else if (rehearsal === null && attemptsActiveOnComputer())
             console.log("Gate rehearsal stopped: an attempt is in flight on this computer");
         else if (abort.signal.aborted)
-            console.log("Gate rehearsal stopped: an assignment is waiting");
+            console.log("Gate rehearsal stopped: an attempt is in flight on this computer");
     })
         .catch((error) => console.error(`Gate rehearsal failed: ${redactSecrets(error instanceof Error ? error.message : "unknown error")}`))
         .finally(async () => {

package/dist/driver.js

@@ -45,7 +45,7 @@ function deliveryLanguageRule(language) {
     return null;
 }
 export const evidenceKinds = ["change", "test", "preview", "research", "documentation"];
-export const agentReportTemplate = '{"outcome": "one-paragraph summary", "changes": ["path from the repository root — what changed"], "verification": ["command — result"], "acceptance_results": [{"criterion": "criterion key, for example c1", "status": "met|not_met|unknown", "unverified_reason": "omit unless status is unknown", "unverified_detail": "one sentence naming what was missing; omit unless status is unknown"}], "evidence": [{"kind": "change|test|preview|research|documentation", "name": "concise evidence name", "uri": "external URL if one exists", "digest": "optional digest", "details": ["observable result"], "acceptance_criteria": ["criterion keys this evidence supports, for example c1"]}], "assumptions": [], "risks": [], "limitations": [], "head_commit": "full sha of your final commit, omit if none"}';
+export const agentReportTemplate = '{"outcome": "one-paragraph summary", "changes": ["path from the repository root — what changed"], "verification": ["command — result"], "acceptance_results": [{"criterion": "criterion key, for example c1", "status": "met|not_met|unknown", "unverified_reason": "omit unless status is unknown", "unverified_detail": "one sentence naming what was missing; omit unless status is unknown"}], "evidence": [{"kind": "change|test|preview|research|documentation", "name": "concise evidence name", "uri": "external URL if one exists", "digest": "optional digest", "details": ["observable result"], "acceptance_criteria": ["criterion keys this evidence supports, for example c1"]}], "assumptions": [], "risks": [], "limitations": [], "commit_message": "commit message for scoped changes, omit if none", "head_commit": "full sha of your final commit, omit if none"}';
 /**
  * Resolve an operator's ordered tier candidates against the live model list.
  * Picks the first safe candidate the CLI currently offers; without a live list
@@ -457,6 +457,7 @@ function quoteCriterion(value) {
 }
 const reportStringList = z.array(z.string().trim().min(1).max(4_000)).max(100);
 export const agentReportSchema = z.object({
+    commit_message: z.string().optional(),
     outcome: z.string().trim().min(1).max(20_000),
     changes: reportStringList,
     verification: reportStringList,
@@ -474,6 +475,7 @@ export const agentReportSchema = z.object({
 }).strict();
 /** Strict generation requires every key; explicit null carries an optional field's absence. */
 export const agentReportOutputSchema = agentReportSchema.extend({
+    commit_message: z.string().nullable().transform((value) => value ?? undefined),
     acceptance_results: z.array(agentReportSchema.shape.acceptance_results.element.extend({
         unverified_reason: z.enum(UNVERIFIED_REASONS).nullable().transform((value) => value ?? undefined),
         unverified_detail: z.string().trim().min(1).max(500).nullable().transform((value) => value ?? undefined),
@@ -485,11 +487,35 @@ export const agentReportOutputSchema = agentReportSchema.extend({
     head_commit: z.string().regex(/^[0-9a-f]{7,64}$/i).nullable().transform((value) => value ?? undefined),
     pull_request_url: z.string().url().max(4_000).nullable().transform((value) => value ?? undefined),
 });
+/** Read only the typed land message before the full delivery report is validated. */
+export function landCommitMessage(text, structuredOutput) {
+    const message = (raw) => {
+        const parsed = z.object({ commit_message: z.string().nullish() }).safeParse(raw);
+        return parsed.success ? parsed.data.commit_message?.trim() || undefined : undefined;
+    };
+    try {
+        const native = message(structuredOutput);
+        if (native)
+            return native;
+    }
+    catch {
+        // Malformed native output must not prevent the land continuation.
+    }
+    try {
+        return message(JSON.parse(extractAgentReportJsonText(text)));
+    }
+    catch {
+        return undefined;
+    }
+}
 /** Parse the agent's final fenced JSON block or its native structured output into a bounded report. */
 export function parseAgentReport(text, acceptance, structuredOutput) {
+    // Reports from older Bridge schemas omit this optional field.
+    const nativeReport = structuredOutput && typeof structuredOutput === "object" && !Array.isArray(structuredOutput)
+        ? { commit_message: null, ...structuredOutput } : structuredOutput;
     const data = structuredOutput === undefined
         ? parseReplyObject("report_invalid", agentReportSchema, text)
-        : parseReplyObject("report_invalid", agentReportOutputSchema, text, structuredOutput);
+        : parseReplyObject("report_invalid", agentReportOutputSchema, text, nativeReport);
     // Map every criterion reference — in the results and in the evidence — back to the approved text
     // before anything else reads it. Downstream (the packet, the reviewer, Today) sees text only; the
     // key is transport. An unknown key is refused here, because a key the agent invented cannot be

package/dist/ensure-land-commit.js

@@ -42,12 +42,13 @@ export async function ensureLandCommit(input) {
     const ahead = await countAhead(input.workspace, base);
     const pending = filterPathsInScope(await listPending(input.workspace), input.spec.change_scope ?? []);
     if (pending.length) {
-        await commitPaths(input.workspace, pending);
+        const message = redactSecrets(input.commitMessage ?? "").trim();
+        await commitPaths(input.workspace, pending, message || "Conduit: land scoped agent changes");
         const afterAhead = await countAhead(input.workspace, base);
         if (afterAhead === 0) {
             throw new AgentNoLandCommitError(base);
         }
-        return { kind: "committed", headCommit: await readHead(input.workspace), paths: pending };
+        return { kind: "committed", headCommit: await readHead(input.workspace), paths: pending, usedAgentMessage: !!message };
     }
     if (ahead !== null && ahead > 0) {
         return { kind: "already_landed", headCommit: await readHead(input.workspace) };

package/dist/execution.js

@@ -9,7 +9,7 @@ import { AttemptStalledError, createAttemptWatchdog, withTimeout } from "./attem
 import { workPackageSchema } from "./work-package-schema.js";
 import { ConduitRequestError, reportAssignmentPollShapeMismatch } from "./client.js";
 import { saveDriverOutcome, saveDriverQuota, tierCandidates } from "./config.js";
-import { DRIVERS, acceptanceCriteriaLines, acceptanceReportSkeleton, agentReportTemplate, buildAssignmentPrompt, evidenceKinds, fuelEndpoint, normalizeEvidenceDigest, parseAgentReport, parseReplyObject, pickModelCandidate, ReplyInvalid, isSafeModelName, driverExecutable, requireStampedExecutionClass, stopTrackedProcessGroups, tierForRisk } from "./driver.js";
+import { DRIVERS, acceptanceCriteriaLines, acceptanceReportSkeleton, agentReportTemplate, buildAssignmentPrompt, evidenceKinds, fuelEndpoint, landCommitMessage, normalizeEvidenceDigest, parseAgentReport, parseReplyObject, pickModelCandidate, ReplyInvalid, isSafeModelName, driverExecutable, requireStampedExecutionClass, stopTrackedProcessGroups, tierForRisk } from "./driver.js";
 import { assertClassFloor } from "./execution-class.js";
 import { pickDriverForClaim, recordDriverQuota, resolveDriverFuel, resolveDriverFuelProvenance, supportsReadOnlyDiagnosis, clearDriverOutcome, recordDriverTimeout } from "./drivers.js";
 import { attemptWorktreePath, createAttemptWorktree, proveResumeWorktree, removeAttemptWorktree, sweepStaleAttemptWorktrees, } from "./attempt-worktree.js";
@@ -2046,14 +2046,17 @@ async function runAttempt(client, config, driver, workspace, brief, taskId, watc
                 repositoryBaseCommit: spec.repository?.base_commit,
             });
         }
+        let reportText = result.resultText ?? "";
+        let reportStructuredOutput = result.structuredOutput;
         watchdog.phase("land");
         if (requiresLandCommit({ grants, spec })) {
             try {
-                const land = await ensureLandCommit({ workspace: attemptWorkspace, spec, grants, baseCommit: deliveryBaseCommit });
+                const land = await ensureLandCommit({ workspace: attemptWorkspace, spec, grants, baseCommit: deliveryBaseCommit,
+                    commitMessage: landCommitMessage(reportText, reportStructuredOutput) });
                 if (land.kind === "committed") {
                     await client.attemptRequest(taskId, "progress", {
                         phase: "preparing_delivery",
-                        message: `Bridge committed scoped agent changes that were left uncommitted (${land.paths.join(", ")}).`,
+                        message: `Bridge committed scoped agent changes that were left uncommitted (${land.paths.join(", ")}) with ${land.usedAgentMessage ? "the agent's message" : "the default message"}`,
                         idempotency_key: `bridge:progress:${active.attemptId}:land-commit`,
                     });
                 }
@@ -2064,8 +2067,6 @@ async function runAttempt(client, config, driver, workspace, brief, taskId, watc
             }
         }
         let agentSessionId = result.sessionId ?? undefined;
-        let reportText = result.resultText ?? "";
-        let reportStructuredOutput = result.structuredOutput;
         let landContinuationUsed = false;
         const continueLand = (reason, idempotencyKey) => runLandContinuationTurn({
             config, client, taskId, attemptId: active.attemptId, workspace: attemptWorkspace,
@@ -2638,11 +2639,12 @@ async function finalizeRepositoryLand(input) {
             spec: input.spec,
             grants: input.grants,
             baseCommit: input.landBaseCommit,
+            commitMessage: report.commit_message,
         });
         if (land.kind === "committed") {
             await input.client.attemptRequest(input.taskId, "progress", {
                 phase: "preparing_delivery",
-                message: `Bridge committed scoped agent changes that were left uncommitted (${land.paths.join(", ")}).`,
+                message: `Bridge committed scoped agent changes that were left uncommitted (${land.paths.join(", ")}) with ${land.usedAgentMessage ? "the agent's message" : "the default message"}`,
                 idempotency_key: `bridge:progress:${input.attemptId}:land-commit`,
             });
         }

package/dist/preflight.js

@@ -611,6 +611,8 @@ async function rehearseGate(workspace, plan, options) {
         const seconds = Math.round(elapsed / 1_000);
         if (result.code !== 0 || result.timedOut === true || elapsed <= VERIFICATION_TIMEOUT_MS) {
             commands.push({ command, seconds, exit_code: result.code, timed_out: result.timedOut === true });
+            if (result.code !== 0 || result.timedOut === true)
+                break;
             continue;
         }
         // The pass fit only the rehearsal's limit: it was a warm-up. Measure once more, in a fresh

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miraland-labs/conduit-bridge",
-  "version": "0.16.194",
+  "version": "0.16.196",
   "description": "Conduit Bridge CLI — join, connect, disconnect, multi-driver lanes, and run Claude Code / Codex / Cursor / OpenCode / Pi / Kiro / Antigravity / Grok Build agents for a Conduit organization",
   "type": "module",
   "bin": {

package/schemas/delivery-report.schema.json

@@ -2,6 +2,9 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
+    "commit_message": {
+      "type": ["string", "null"]
+    },
     "outcome": {
       "type": "string"
     },
@@ -131,6 +134,7 @@
     }
   },
   "required": [
+    "commit_message",
     "outcome",
     "changes",
     "verification",