@miraland-labs/conduit-bridge 0.16.127 → 0.16.130

package/dist/driver.js

@@ -696,7 +696,7 @@ export function claudeUsage(message) {
  */
 export const CLAUDE_CODE_KNOWN_MODELS = [
     "fable", "opus", "sonnet", "haiku",
-    "claude-fable-5-1", "claude-opus-5", "claude-sonnet-5", "claude-haiku-4-5",
+    "claude-fable-5-1", "claude-opus-5-5", "claude-opus-5", "claude-sonnet-5", "claude-haiku-4-5",
 ];
 export const claudeCodeDriver = {
     name: "claude-code",
@@ -960,7 +960,8 @@ export function cursorRunArgs(input) {
     args.push(...modelArgs(cursorDriver, input.model));
     if (input.resumeSessionId)
         args.push("--resume", input.resumeSessionId);
-    args.push(input.prompt);
+    // The prompt goes on stdin, as it does for codex: Linux caps one argument at 128 KiB
+    // (MAX_ARG_STRLEN) and an assignment contract exceeds that, which spawned `E2BIG`.
     return args;
 }
 /** Parse `agent --list-models` output: one "id - Label" line per model. */
@@ -999,7 +1000,9 @@ export const cursorDriver = {
         vendor: "cursor",
         // Cursor's own first-party families only. `--list-models` also lists other vendors' models
         // Cursor proxies at a much higher price (the "Other Models" allowance) — those are not owned.
-        owns: (id) => id.startsWith("cursor-grok-") || id.startsWith("composer-"),
+        // Grok 4.7 dropped the `cursor-` prefix (`grok-4.7-high`, 2026-09-26) but Cursor still lists it
+        // under "Cursor Models", beside Grok 4.6 and Composer.
+        owns: (id) => id.startsWith("cursor-grok-") || id.startsWith("grok-") || id.startsWith("composer-"),
     },
     async run(input) {
         const fuelSource = input.fuelSource === "local" ? "local" : "conduit";
@@ -1047,7 +1050,7 @@ export const cursorDriver = {
             capabilities: input.capabilities ?? [],
             diagnosis: input.workRole === "diagnose",
         });
-        const configured = await withCursorPermissions(input.workspace, { allow: projected.allow, deny: projected.deny }, () => execute(executable, cursorRunArgs({ ...input, trustWorkspace, executionClass, force: projected.force }), input.workspace, agentTurnTimeoutMs(input), undefined, "local", undefined, input.signal));
+        const configured = await withCursorPermissions(input.workspace, { allow: projected.allow, deny: projected.deny }, () => execute(executable, cursorRunArgs({ ...input, trustWorkspace, executionClass, force: projected.force }), input.workspace, agentTurnTimeoutMs(input), undefined, "local", input.prompt, input.signal));
         const { code, stdout, stderr } = configured;
         const parsed = parseCursorOutput(stdout);
         // Cursor prints no token or cost figure, so the run reports the one fact it can prove: it ran.

package/dist/ensure-test-evidence.js

@@ -101,7 +101,7 @@ export function verificationCommandsMentioned(text, offered = []) {
     const source = text.slice(0, 20_000);
     const verbatim = [...new Set(offered.map((command) => command.trim()))]
         .filter((command) => isBoundedVerificationCommand(command) && textNamesCommand(source, command));
-    const pattern = /(?:^|[\s("'`])((?:npm run [A-Za-z0-9][A-Za-z0-9._:-]*|pnpm [A-Za-z0-9][A-Za-z0-9._:-]*|yarn [A-Za-z0-9][A-Za-z0-9._:-]*|cargo (?:test|check)|go test(?: \.\/\.\.\.)?|make [A-Za-z0-9][A-Za-z0-9._-]*|python3? -m [A-Za-z0-9_][\w.]*(?: [\w./=:-]*[./=-][\w./=:-]*)*|pytest(?: [\w./=-]*[./=-][\w./=-]*)?|python3? [\w./-]+\.py(?: [\w./=:-]*[./=-][\w./=:-]*)*|(?:\.\/gradlew|gradle|\.\/mvnw|mvn) test|Rscript tests\/testthat\.R|Rscript -e testthat::test_local\(\)))(?=$|[\s"'`),.;:])/g;
+    const pattern = /(?:^|[\s("'`])((?:npm run [A-Za-z0-9][A-Za-z0-9._:-]*|pnpm [A-Za-z0-9][A-Za-z0-9._:-]*|yarn [A-Za-z0-9][A-Za-z0-9._:-]*|cargo (?:test|check|clippy)|go test(?: \.\/\.\.\.)?|make [A-Za-z0-9][A-Za-z0-9._-]*|python3? -m [A-Za-z0-9_][\w.]*(?: [\w./=:-]*[./=-][\w./=:-]*)*|pytest(?: [\w./=-]*[./=-][\w./=-]*)?|python3? [\w./-]+\.py(?: [\w./=:-]*[./=-][\w./=:-]*)*|(?:\.\/gradlew|gradle|\.\/mvnw|mvn) test|Rscript tests\/testthat\.R|Rscript -e testthat::test_local\(\)))(?=$|[\s"'`),.;:])/g;
     const mentions = [...new Set([...source.matchAll(pattern)].map((match) => match[1]))]
         .filter((mention) => isBoundedVerificationCommand(mention)
         && !verbatim.some((command) => command === mention || command.startsWith(`${mention} `)));

package/dist/execution-class.js

@@ -13,7 +13,10 @@ export function isBoundedVerificationCommand(command) {
     // A `*` is a legal character in a Python argument (`-p test_*.py` is how a repository spells its
     // own gate). Bridge starts a gate with execFile and no shell, so the star stays literal and no
     // expansion can happen. Refusing it only dropped the declaration, with no reason given.
-    return /^(npm run [A-Za-z0-9][A-Za-z0-9._:-]*|pnpm [A-Za-z0-9][A-Za-z0-9._:-]*|yarn [A-Za-z0-9][A-Za-z0-9._:-]*|cargo (test|check)|go test(?: \.\/\.\.\.)?|make [A-Za-z0-9][A-Za-z0-9._-]*|python3? -m [A-Za-z0-9_][\w.]*(?: [\w./=:*-]+)*|pytest(?: [\w./=*-]+)?|python3? [\w./-]+\.py(?: [\w./=:-]+)*|(?:\.\/gradlew|gradle|\.\/mvnw|mvn) test|Rscript tests\/testthat\.R|Rscript -e testthat::test_local\(\))$/.test(command);
+    // Cargo takes flags the same way: acme-sim registered `cargo clippy --all-targets -- -D warnings`
+    // on 2026-09-25, the rule admitted only a bare `cargo test|check`, and five deliveries shipped
+    // clippy failures because the gate was dropped before any attempt could run it.
+    return /^(npm run [A-Za-z0-9][A-Za-z0-9._:-]*|pnpm [A-Za-z0-9][A-Za-z0-9._:-]*|yarn [A-Za-z0-9][A-Za-z0-9._:-]*|cargo (test|check|clippy)(?: [\w./=:-]+)*|go test(?: \.\/\.\.\.)?|make [A-Za-z0-9][A-Za-z0-9._-]*|python3? -m [A-Za-z0-9_][\w.]*(?: [\w./=:*-]+)*|pytest(?: [\w./=*-]+)?|python3? [\w./-]+\.py(?: [\w./=:-]+)*|(?:\.\/gradlew|gradle|\.\/mvnw|mvn) test|Rscript tests\/testthat\.R|Rscript -e testthat::test_local\(\))$/.test(command);
 }
 /** Shell commands each grant authorizes — mapped per driver so they cannot drift. */
 export const branchCreateCommands = [

package/dist/execution.js

@@ -1180,7 +1180,11 @@ async function runAttempt(client, config, driver, workspace, brief, taskId, watc
     // diffing from the requested base would report commits that predate the agent as its work.
     // T138: a rework carries the first revision's resolved start, because its worktree starts at the
     // previous delivery's head. That lets a prose-only rework witness the original pack while still
-    // including any new rework changes. Older contracts fall back to the T136 rule.
+    // including any new rework changes. A conflict rework is different: it is pinned to the live base
+    // tip and starts fresh there, so the control plane sends no carried base and the requested base --
+    // the pinned tip -- is the delivery base. Diffing from the first revision's start would report
+    // every commit the base gained in between as the agent's own work. Older contracts fall back to
+    // the T136 rule.
     const rework = task.delivery_state === "changes_requested" || Boolean(executionContract.prior_head_commit);
     const deliveryBaseCommit = executionContract.delivery_base_commit
         ?? (rework

package/dist/on-shift-apply.js

@@ -8,6 +8,7 @@ import { expandOpsValue } from "./ops.js";
 import { ensureCheckout } from "./checkout.js";
 import { bootstrapManagedWorkspace } from "./workspace-bootstrap.js";
 import { managedWorkspacePath } from "./managed-workspace-path.js";
+import { refreshSourceWorkspace } from "./workspace-refresh.js";
 export { managedWorkspacePath } from "./managed-workspace-path.js";
 function pathsEqual(left, right) {
     return resolve(expandOpsValue(left)) === resolve(expandOpsValue(right));
@@ -32,6 +33,21 @@ export async function switchManagedWorkspace(managedRoot, repositoryUrl, deps =
     if (result === "cloned") {
         console.log(`Cloned ${repositoryUrl} into ${target}`);
         (deps.bootstrapWorkspace ?? bootstrapManagedWorkspace)(target);
+        return target;
+    }
+    // The runner's own refresh follows only the workspace it was started on. A managed checkout it
+    // switches into was never refreshed: acme-sim stayed shallow at a five-day-old main on
+    // 2026-09-25 while every claim read it. Follow origin here, before the claim reads the checkout.
+    // A dirty or diverged checkout is not moved; the attempt worktree refuses a dirty source.
+    const refresh = await refreshSourceWorkspace(target).catch(() => null);
+    if (refresh?.state === "fast_forwarded") {
+        console.log(`Managed workspace ${target} fast-forwarded to origin/${refresh.branch}.`);
+    }
+    else if (refresh?.state === "diverged") {
+        console.error(`Managed workspace ${target} cannot fast-forward: ${refresh.local_commits} local-only commit(s) on ${refresh.branch}. Park or push them.`);
+    }
+    else if (refresh?.state !== "up_to_date") {
+        console.error(`Managed workspace ${target} could not follow origin (dirty tree, detached HEAD, or fetch failed).`);
     }
     return target;
 }

package/package.json

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