@miraland-labs/conduit-bridge 0.16.190 → 0.16.191
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/execution.js +16 -1
- package/package.json +1 -1
package/dist/execution.js
CHANGED
|
@@ -1246,7 +1246,7 @@ async function runAttempt(client, config, driver, workspace, brief, taskId, watc
|
|
|
1246
1246
|
priorHeadCommit: executionContract.prior_head_commit,
|
|
1247
1247
|
resumeFromAttemptId: executionContract.resume_from_attempt_id,
|
|
1248
1248
|
});
|
|
1249
|
-
|
|
1249
|
+
let deliveryBaseCommit = await resolveDeliveryBaseCommit({
|
|
1250
1250
|
worktree: attemptWorkspace,
|
|
1251
1251
|
sourceWorkspace: workspace,
|
|
1252
1252
|
reworkOrResume,
|
|
@@ -2002,6 +2002,21 @@ async function runAttempt(client, config, driver, workspace, brief, taskId, watc
|
|
|
2002
2002
|
retainAttemptWorktree = await failAttemptFromDriverResult(result);
|
|
2003
2003
|
return;
|
|
2004
2004
|
}
|
|
2005
|
+
// The agent may have rebased or merged the default branch during its turn (CR25 rework,
|
|
2006
|
+
// 2026-10-24: the base fixed at attempt start counted the default branch's own commits as the
|
|
2007
|
+
// agent's writes). Measure a rework from where the tree stands now.
|
|
2008
|
+
if (reworkOrResume) {
|
|
2009
|
+
deliveryBaseCommit = await resolveDeliveryBaseCommit({
|
|
2010
|
+
worktree: attemptWorkspace,
|
|
2011
|
+
sourceWorkspace: workspace,
|
|
2012
|
+
reworkOrResume,
|
|
2013
|
+
worktreeStart,
|
|
2014
|
+
taskId,
|
|
2015
|
+
deliveryBaseCommit: executionContract.delivery_base_commit,
|
|
2016
|
+
requestedBaseCommit: executionContract.requested_base_commit,
|
|
2017
|
+
repositoryBaseCommit: spec.repository?.base_commit,
|
|
2018
|
+
});
|
|
2019
|
+
}
|
|
2005
2020
|
watchdog.phase("land");
|
|
2006
2021
|
if (requiresLandCommit({ grants, spec })) {
|
|
2007
2022
|
try {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miraland-labs/conduit-bridge",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.191",
|
|
4
4
|
"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",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|