@miraland-labs/conduit-bridge 0.14.7 → 0.14.9

package/dist/driver.js

@@ -15,7 +15,7 @@ function deliveryLanguageRule(language) {
     return null;
 }
 export const evidenceKinds = ["change", "test", "preview", "research", "documentation"];
-export const agentReportTemplate = '{"outcome": "one-paragraph summary", "changes": ["path — what changed"], "verification": ["command — result"], "acceptance_results": [{"criterion": "exact criterion text", "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": ["exact criterion text supported by this evidence"]}], "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": "exact criterion text", "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": ["exact criterion text supported by this evidence"]}], "assumptions": [], "risks": [], "limitations": [], "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

package/dist/execution.js

@@ -7,8 +7,11 @@ import { DRIVERS, agentReportTemplate, buildAssignmentPrompt, evidenceKinds, ext
 import { assertClassFloor } from "./execution-class.js";
 import { pickDriverForClaim, resolveDriverFuel, supportsReadOnlyDiagnosis } from "./drivers.js";
 import { attemptWorktreePath, createAttemptWorktree, proveResumeWorktree, quarantineAttemptWorktree, removeAttemptWorktree, } from "./attempt-worktree.js";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
 import { buildWorkspaceBrief, ensureCommitAvailable, normalizeRepositoryUrl, resolveAttemptStartCommit } from "./brief.js";
 import { ensureDeliveryPullRequest } from "./ensure-pull-request.js";
+const execFileAsync = promisify(execFile);
 import { captureVerificationFailure, ensureTestEvidence } from "./ensure-test-evidence.js";
 /** Keep a Mac awake only while an assignment is active; display sleep remains allowed. */
 export function startIdleSleepGuard(options = {}) {
@@ -969,7 +972,12 @@ async function runClaimedAssignment(client, config, driver, workspace, brief, ta
                 grants,
                 verificationCommands: attemptBrief?.verification ?? [],
             });
-            validateDeliveryReport(report, spec, grants);
+            // Ask git what changed before trusting what the report says changed.
+            const startCommit = executionContract.requested_base_commit && executionContract.claimed_head
+                ? await resolveAttemptStartCommit(workspace, executionContract.requested_base_commit, executionContract.claimed_head)
+                : null;
+            const actualPaths = startCommit ? await changedPathsSince(attemptWorkspace, startCommit) : null;
+            validateDeliveryReport(report, spec, grants, actualPaths ?? undefined);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : "Agent delivery report was invalid";
@@ -1198,13 +1206,13 @@ async function prepareDelivery(client, attemptId, taskId, report) {
         },
     };
 }
-export function validateDeliveryReport(report, spec, grants = []) {
+export function validateDeliveryReport(report, spec, grants = [], actualPaths) {
     // Research findings live in the report. Do not demand a published pack URL for work_role=research
     // even when a planner mis-labeled the package as deliverable=artifact.
     const artifactDelivery = spec.deliverable === "artifact" && spec.work_role !== "research";
     // Artifact packs are not git landings — do not demand head_commit when the planner put
     // `.conduit/artifacts/**` in change_scope as a write hint (path-4 canary incident).
-    validateChangeScope(report, spec.change_scope ?? [], { requireHeadCommit: !artifactDelivery });
+    validateChangeScope(report, spec.change_scope ?? [], { requireHeadCommit: !artifactDelivery, actualPaths });
     if (artifactDelivery) {
         const published = report.evidence.some((item) => {
             if (!["preview", "research", "documentation"].includes(item.kind))
@@ -1271,6 +1279,45 @@ function referenceKind(kind) {
         return "document";
     return "other";
 }
+/**
+ * What this attempt actually changed, according to git rather than to the agent's prose.
+ *
+ * The scope check used to compare approved paths against strings the agent wrote about itself, so a
+ * run that edited an approved file and named it "tools.ts" failed the contract and spent an attempt
+ * on a path format. Git knows the truth, and Bridge holds the worktree: this is both stricter (a
+ * change cannot be omitted from the report to escape the check) and more forgiving (how the agent
+ * phrases a path stops mattering).
+ *
+ * Null when git cannot answer — an unknown must not fail a delivery, so the caller falls back to the
+ * report exactly as before.
+ */
+export async function changedPathsSince(worktree, startCommit) {
+    const run = async (args) => {
+        try {
+            const { stdout } = await execFileAsync("git", ["-C", worktree, ...args], { timeout: 30_000, maxBuffer: 8_000_000 });
+            return stdout;
+        }
+        catch {
+            return null;
+        }
+    };
+    const committed = await run(["diff", "--name-only", `${startCommit}..HEAD`]);
+    if (committed === null)
+        return null;
+    const paths = new Set(committed.split("\n").map((line) => line.trim()).filter(Boolean));
+    // Work the agent left uncommitted still lands in the delivery for lands=false packages.
+    const pending = await run(["status", "--porcelain"]);
+    for (const line of (pending ?? "").split("\n")) {
+        const entry = line.slice(3).trim();
+        if (!entry)
+            continue;
+        // A rename reports "old -> new"; the new path is the one that exists.
+        const path = entry.includes(" -> ") ? entry.slice(entry.lastIndexOf(" -> ") + 4).trim() : entry;
+        if (path)
+            paths.add(path.replace(/^"|"$/g, ""));
+    }
+    return [...paths];
+}
 export function validateChangeScope(report, changeScope, options = {}) {
     if (!changeScope.length)
         return;
@@ -1278,13 +1325,36 @@ export function validateChangeScope(report, changeScope, options = {}) {
     if (requireHeadCommit && !report.head_commit) {
         throw new Error("Repository changes require a delivered head commit");
     }
-    if (!report.changes.length)
+    // Git's answer when we have it; the agent's description only when we do not.
+    const paths = options.actualPaths
+        ?? report.changes.map((change) => change.split(/\s+[—-]\s+/, 1)[0].trim().replaceAll("\\", "/"));
+    if (!paths.length)
         return;
-    const paths = report.changes.map((change) => change.split(/\s+[—-]\s+/, 1)[0].trim().replaceAll("\\", "/"));
-    const outside = paths.filter((path) => !path || path.startsWith("/") || path.split("/").includes("..") || !changeScope.some((scope) => pathMatchesScope(path, scope)));
+    const outside = paths.filter((path) => {
+        if (!path || path.startsWith("/") || path.split("/").includes(".."))
+            return true;
+        if (changeScope.some((scope) => pathMatchesScope(path, scope)))
+            return false;
+        return !namesOneScopedFile(path, changeScope);
+    });
     if (outside.length)
         throw new Error(`Agent reported changes outside the approved scope: ${outside.join(", ")}`);
 }
+/**
+ * Did the agent name an approved file the short way?
+ *
+ * A run that edited src/lib/tools.ts and reported "tools.ts" did the approved work and described it
+ * loosely. Rejecting that spends the attempt, fails the contract, and puts a decision in front of
+ * the owner over a path format — and the rerun reports it the same way. Accept the shorthand only
+ * when it can mean exactly one approved file: with two candidates we genuinely cannot tell which was
+ * touched, so it stays a violation.
+ */
+function namesOneScopedFile(path, changeScope) {
+    const candidates = changeScope
+        .map((scope) => scope.replaceAll("\\", "/").replace(/^\.\//, "").replace(/\/$/, ""))
+        .filter((scope) => !scope.includes("*") && scope.endsWith(`/${path}`));
+    return candidates.length === 1;
+}
 function pathMatchesScope(path, scope) {
     const normalized = scope.replaceAll("\\", "/").replace(/^\.\//, "").replace(/\/$/, "");
     if (normalized.endsWith("/**")) {

package/package.json

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