@miraland-labs/conduit-bridge 0.16.171 → 0.16.173

package/dist/attempt-worktree.js

@@ -12,6 +12,20 @@ const execFileAsync = promisify(execFile);
 export function attemptWorktreePath(sourceWorkspace, attemptId) {
     return join(sourceWorkspace, ".conduit", "attempts", attemptId);
 }
+export function rehearsalWorktreePath(sourceWorkspace) {
+    return join(sourceWorkspace, ".conduit", "rehearsal");
+}
+export async function createRehearsalWorktree(sourceWorkspace, commit) {
+    await ensureConduitExclude(sourceWorkspace);
+    const path = rehearsalWorktreePath(sourceWorkspace);
+    await removeAttemptWorktree(sourceWorkspace, path);
+    await mkdir(join(sourceWorkspace, ".conduit"), { recursive: true });
+    await execFileAsync("git", ["-C", sourceWorkspace, "worktree", "add", "--detach", path, commit], {
+        timeout: 60_000,
+        maxBuffer: 2_000_000,
+    });
+    return path;
+}
 /**
  * The branch each attempt works on. Named by attempt id, which is globally unique, so concurrent slots
  * (F-07 multi-slot) never collide in the shared ref namespace and a retry never clashes with a prior

package/dist/cli.js

@@ -20,7 +20,8 @@ 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 { discardWorktreeWrites, 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 { BRIDGE_PROTOCOL_VERSION, cachedBridgePreflight, gateRehearsalLockHeld, planGateRehearsals, PREFLIGHT_CACHE_TTL_MS, runGateRehearsal, unavailableWorkspacePreflight } from "./preflight.js";
 import { refreshSourceWorkspace } from "./workspace-refresh.js";
@@ -760,20 +761,21 @@ async function rehearsalCheckouts(workspace, brief, refresh) {
     return checkouts;
 }
 /**
- * Run one on-shift repository's gate once in its checkout, off the loop: a ten-minute gate
- * must not stop the heartbeat, or the computer reads offline while it measures. The workspace was
- * clean when it started, so whatever is written there afterwards is the gate's and is discarded.
+ * Run one on-shift repository's gate in a detached worktree at its HEAD, nested under .conduit/ as
+ * an attempt's is, and remove only that worktree afterwards. Run off the loop: a ten-minute gate
+ * must not stop the heartbeat, or the computer reads offline while it measures.
  */
 function startGateRehearsal(workspace, plan) {
     gateRehearsalRunning = true;
+    const rehearsalPath = rehearsalWorktreePath(workspace);
     console.log(`Rehearsing the gate in ${workspace}: ${plan.commands.join(", ")}`);
-    void runGateRehearsal(workspace, plan)
+    void createRehearsalWorktree(workspace, plan.commit)
+        .then((path) => runGateRehearsal(path, plan))
         .then((rehearsal) => { if (rehearsal === "busy")
         console.log("Gate rehearsal deferred: another runner on this computer is rehearsing"); })
         .catch((error) => console.error(`Gate rehearsal failed: ${redactSecrets(error instanceof Error ? error.message : "unknown error")}`))
         .finally(async () => {
-        if (!await workspaceIsClean(workspace))
-            await discardWorktreeWrites(workspace);
+        await removeAttemptWorktree(workspace, rehearsalPath);
         gateRehearsalRunning = false;
     });
 }

package/dist/execution.js

@@ -2219,11 +2219,11 @@ async function runAttempt(client, config, driver, workspace, brief, taskId, watc
                 landContinuationUsed,
                 landBaseCommit: deliveryBaseCommit,
             });
-            if ("kind" in landed) {
+            if (landed.kind === "failed") {
                 failedLandResult = landed.result;
             }
             else {
-                report = landed;
+                report = landed.report;
                 // Mechanical land path: the agent only pushes; Bridge pushes again if needed and the control
                 // plane opens the change request with the organization's forge connection.
                 report = await ensureDeliveryPullRequest({
@@ -2499,7 +2499,7 @@ async function runLandContinuationTurn(input) {
 }
 async function finalizeRepositoryLand(input) {
     if (!requiresLandCommit({ grants: input.grants, spec: input.spec }))
-        return input.report;
+        return { kind: "landed", report: input.report };
     const applyLand = async (report) => {
         const land = await ensureLandCommit({
             workspace: input.workspace,
@@ -2520,7 +2520,7 @@ async function finalizeRepositoryLand(input) {
         return report;
     };
     try {
-        return await applyLand(input.report);
+        return { kind: "landed", report: await applyLand(input.report) };
     }
     catch (error) {
         if (!(error instanceof AgentNoLandCommitError))
@@ -2559,7 +2559,7 @@ async function finalizeRepositoryLand(input) {
     catch {
         // Land may have succeeded even when the continuation envelope is malformed — git is authoritative.
     }
-    return applyLand(report);
+    return { kind: "landed", report: await applyLand(report) };
 }
 function buildDeliveryRepairPrompt(issues, previousReply, acceptance, options = {}) {
     const replyTail = redactSecrets(previousReply.slice(-8_000));
@@ -3310,6 +3310,7 @@ export async function flushTerminal(client, taskId) {
             const { failure, signal: _signal, delivery_packet: _packet, repair_brief: _brief, ...rest } = active.terminal.body;
             const refusal = `Terminal report rejected by the Control Plane: ${error.message}\n${JSON.stringify(error.details ?? null)}`;
             const cause = failure && typeof failure === "object" ? failure : null;
+            console.error(`Assignment ${taskId}: the Control Plane refused the ${active.terminal.action} report for attempt ${active.attemptId}: ${redactSecrets(refusal)}`);
             await client.updateAttempt(taskId, {
                 terminal: {
                     action: "fail",
@@ -3327,7 +3328,7 @@ export async function flushTerminal(client, taskId) {
                                 next_action: boundedSentence(cause.next_action),
                                 diagnostic_detail: boundedDetail(`${refusal}\n${typeof cause.diagnostic_detail === "string" ? cause.diagnostic_detail : ""}`),
                             }
-                            : bridgeCause("bridge_finalize_failed", refusal),
+                            : bridgeCause("terminal_report_refused", refusal),
                         idempotency_key: rejectedKey,
                     },
                 },

package/dist/failure-signal.js

@@ -129,6 +129,7 @@ export const BRIDGE_CAUSES = {
     verification_failed_after_run: { class: "transient", disposition: "retry", responsible_party: "conduit", message: "The agent run failed its own verification before delivery.", next_action: "Conduit will diagnose the retained failed run and brief the next authoring attempt." },
     bridge_finalize_failed: { class: "platform", disposition: "stop", responsible_party: "conduit", message: "Bridge stopped while finishing the delivery report.", next_action: "Inspect Bridge logs for the finalize fault. Fix Bridge or open a revision if the plan is wrong, then Retry." },
     work_package_invalid: { class: "platform", disposition: "stop", responsible_party: "conduit", message: "Bridge refused this work package: this Bridge release does not know its shape.", next_action: "Update Bridge and Conduit to the same release, then Retry. The work package itself needs no change from you." },
+    terminal_report_refused: { class: "platform", disposition: "stop", responsible_party: "conduit", message: "Conduit refused Bridge's report for this run: this Bridge release and Conduit disagree on the report shape.", next_action: "Update Bridge and Conduit to the same release, then Retry. The work itself needs no change from you." },
     bridge_preflight_missing: { class: "environment", disposition: "hold", responsible_party: "computer_operator", message: "This computer has not reported Bridge readiness.", next_action: "Run Bridge Doctor and reinstall or restart the background service, then recheck readiness." },
     bridge_preflight_stale: { class: "environment", disposition: "hold", responsible_party: "computer_operator", message: "This computer's Bridge readiness report is stale.", next_action: "Wake or restart the Bridge and wait for a fresh heartbeat, then recheck readiness." },
     hosted_computer: { class: "environment", disposition: "hold", responsible_party: "conduit", message: "This hosted computer is Conduit's responsibility.", next_action: "Conduit fixes the hosted computer; Recheck runs the work package again." },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miraland-labs/conduit-bridge",
-  "version": "0.16.171",
+  "version": "0.16.173",
   "description": "Conduit Bridge CLI \u2014 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": {