@miraland-labs/conduit-bridge 0.16.160 → 0.16.161

package/dist/ensure-land-commit.js

@@ -40,19 +40,19 @@ export async function ensureLandCommit(input) {
     const listPending = input.listUncommittedPaths ?? ((workspace) => uncommittedPaths(workspace));
     const commitPaths = input.commitPaths ?? commitScopedPaths;
     const ahead = await countAhead(input.workspace, base);
-    if (ahead !== null && ahead > 0) {
-        return { kind: "already_landed", headCommit: await readHead(input.workspace) };
-    }
     const pending = filterPathsInScope(await listPending(input.workspace), input.spec.change_scope ?? []);
-    if (!pending.length) {
-        throw new AgentNoLandCommitError(base);
+    if (pending.length) {
+        await commitPaths(input.workspace, pending);
+        const afterAhead = await countAhead(input.workspace, base);
+        if (afterAhead === 0) {
+            throw new AgentNoLandCommitError(base);
+        }
+        return { kind: "committed", headCommit: await readHead(input.workspace), paths: pending };
     }
-    await commitPaths(input.workspace, pending);
-    const afterAhead = await countAhead(input.workspace, base);
-    if (afterAhead === 0) {
-        throw new AgentNoLandCommitError(base);
+    if (ahead !== null && ahead > 0) {
+        return { kind: "already_landed", headCommit: await readHead(input.workspace) };
     }
-    return { kind: "committed", headCommit: await readHead(input.workspace), paths: pending };
+    throw new AgentNoLandCommitError(base);
 }
 async function currentBranch(workspace) {
     const { stdout } = await execFileAsync("git", ["-C", workspace, "branch", "--show-current"], {

package/dist/investigation.js

@@ -11,6 +11,7 @@ import { boundedTail, runBoundedVerificationCommand } from "./ensure-test-eviden
 import { createAttemptWorktree, removeAttemptWorktree } from "./attempt-worktree.js";
 import { buildWorkspaceBrief, ensureCommitAvailable, normalizeRepositoryUrl } from "./brief.js";
 import { headCommitOrNull } from "./git.js";
+import { ConduitRequestError } from "./client.js";
 import { learnDriverFuel, resolveAssignmentModel, changedPathsSince, runDeliveryVerificationGates, discardWorktreeWrites } from "./execution.js";
 import { DRIVERS, execute, extractAgentReportJsonText, parseJsonObjectCandidate } from "./driver.js";
 import { pickDriverForClaim, resolveDriverFuel, supportsReadOnlyDiagnosis } from "./drivers.js";
@@ -773,13 +774,24 @@ export async function executeNextInvestigation(client, config, workspace, brief,
     const fingerprintBefore = await workspaceFingerprint(workspace);
     let attemptWorkspace = null;
     const runId = investigationRunId(assignment.id);
-    // Renew inside the lease for as long as the driver runs; a renewal the control plane refuses
-    // means the run is already over for it, and the settle below reports that honestly.
+    // Renew inside the lease for as long as the driver runs. A terminal refusal (`invalid_lease`)
+    // means the control plane already took the run back — abort the driver and do not settle.
+    const runAbort = new AbortController();
+    let leaseTakenBack = false;
     const renewTimer = setInterval(() => {
         void client.request(`/runner/v1/investigations/${assignment.id}/renew`, {
             method: "POST",
             body: JSON.stringify({ lease_token: leaseToken }),
-        }).catch((error) => console.error(`Investigation ${assignment.id} lease renewal failed: ${redactSecrets(error instanceof Error ? error.message : "unknown")}`));
+        }).catch((error) => {
+            if (error instanceof ConduitRequestError && error.code === "invalid_lease") {
+                leaseTakenBack = true;
+                clearInterval(renewTimer);
+                runAbort.abort();
+                console.error(`Investigation ${assignment.id} stopped: lease is no longer valid`);
+                return;
+            }
+            console.error(`Investigation ${assignment.id} lease renewal failed: ${redactSecrets(error instanceof Error ? error.message : "unknown")}`);
+        });
     }, options.renewIntervalMs ?? INVESTIGATION_RENEW_INTERVAL_MS);
     renewTimer.unref?.();
     let heartbeatRunning = false;
@@ -853,7 +865,10 @@ export async function executeNextInvestigation(client, config, workspace, brief,
             fuel,
             timeoutMs: Math.min(timeoutMs ?? assignment.budget.max_duration_ms, assignment.budget.max_duration_ms),
             maxTurns: config.maxTurns,
+            signal: runAbort.signal,
         });
+        if (leaseTakenBack || runAbort.signal.aborted)
+            return true;
         await learnDriverFuel(config, driver.name, investigationFuel, result);
         if (result.status === "failed") {
             const message = result.error ?? "Investigation run failed";
@@ -927,6 +942,9 @@ export async function executeNextInvestigation(client, config, workspace, brief,
         console.log(`Investigation ${assignment.id} settled with a bounded brief.`);
     }
     catch (error) {
+        if (leaseTakenBack || runAbort.signal.aborted) {
+            return true;
+        }
         const message = error instanceof Error ? error.message : "investigation_failed";
         await settle(client, assignment.id, {
             lease_token: leaseToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miraland-labs/conduit-bridge",
-  "version": "0.16.160",
+  "version": "0.16.161",
   "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": {