@wascartech/devbot 2.2.0 → 2.3.0

package/dist/work-item-branch-store.js

@@ -9,7 +9,8 @@ export function initWorkItemBranchTable() {
     CREATE TABLE IF NOT EXISTS work_item_branch (
       work_item_id INTEGER PRIMARY KEY,
       branch       TEXT    NOT NULL,
-      created_at   INTEGER NOT NULL
+      created_at   INTEGER NOT NULL,
+      adopted      INTEGER NOT NULL DEFAULT 0
     )
   `);
 }
@@ -17,11 +18,11 @@ export function initWorkItemBranchTable() {
 // mention does not overwrite the stored name; runner.ts surfaces the ignore to
 // the user. The row is the single source of truth for the work branch across
 // every subsequent run.
-export function setWorkBranchIfUnset(workItemId, branch) {
+export function setWorkBranchIfUnset(workItemId, branch, adopted = false) {
     db.prepare(`
-    INSERT OR IGNORE INTO work_item_branch (work_item_id, branch, created_at)
-    VALUES (?, ?, ?)
-  `).run(workItemId, branch, Math.floor(Date.now() / 1000));
+    INSERT OR IGNORE INTO work_item_branch (work_item_id, branch, created_at, adopted)
+    VALUES (?, ?, ?, ?)
+  `).run(workItemId, branch, Math.floor(Date.now() / 1000), adopted ? 1 : 0);
 }
 export function getWorkBranch(workItemId) {
     const row = db
@@ -29,6 +30,14 @@ export function getWorkBranch(workItemId) {
         .get(workItemId);
     return row ? row.branch : null;
 }
+// Whether the stored branch was adopted from the remote rather than created by
+// DevBot. Adopted branches are fast-forward only: their history is shared.
+export function isWorkBranchAdopted(workItemId) {
+    const row = db
+        .prepare("SELECT adopted FROM work_item_branch WHERE work_item_id = ?")
+        .get(workItemId);
+    return row?.adopted === 1;
+}
 // Test-only: no production path clears a work-item's branch name. /reset and
 // close deliberately keep it (see migration 0018).
 export function deleteWorkBranch(workItemId) {

package/dist/work-item-branch-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-item-branch-store.js","sourceRoot":"","sources":["../src/work-item-branch-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,yEAAyE;AACzE,6EAA6E;AAC7E,6EAA6E;AAC7E,+EAA+E;AAC/E,yEAAyE;AACzE,MAAM,UAAU,uBAAuB;IACrC,EAAE,CAAC,IAAI,CAAC;;;;;;GAMP,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAC/E,+EAA+E;AAC/E,6EAA6E;AAC7E,wBAAwB;AACxB,MAAM,UAAU,oBAAoB,CAAC,UAAkB,EAAE,MAAc;IACrE,EAAE,CAAC,OAAO,CAAC;;;GAGV,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,UAAkB;IAC9C,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,4DAA4D,CAAC;SACrE,GAAG,CAAC,UAAU,CAAmC,CAAC;IACrD,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AACjC,CAAC;AAED,6EAA6E;AAC7E,mDAAmD;AACnD,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,EAAE,CAAC,OAAO,CAAC,qDAAqD,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACpF,CAAC"}
+{"version":3,"file":"work-item-branch-store.js","sourceRoot":"","sources":["../src/work-item-branch-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,yEAAyE;AACzE,6EAA6E;AAC7E,6EAA6E;AAC7E,+EAA+E;AAC/E,yEAAyE;AACzE,MAAM,UAAU,uBAAuB;IACrC,EAAE,CAAC,IAAI,CAAC;;;;;;;GAOP,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAC/E,+EAA+E;AAC/E,6EAA6E;AAC7E,wBAAwB;AACxB,MAAM,UAAU,oBAAoB,CAAC,UAAkB,EAAE,MAAc,EAAE,OAAO,GAAG,KAAK;IACtF,EAAE,CAAC,OAAO,CAAC;;;GAGV,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,UAAkB;IAC9C,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,4DAA4D,CAAC;SACrE,GAAG,CAAC,UAAU,CAAmC,CAAC;IACrD,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AACjC,CAAC;AAED,+EAA+E;AAC/E,2EAA2E;AAC3E,MAAM,UAAU,mBAAmB,CAAC,UAAkB;IACpD,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,6DAA6D,CAAC;SACtE,GAAG,CAAC,UAAU,CAAoC,CAAC;IACtD,OAAO,GAAG,EAAE,OAAO,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,6EAA6E;AAC7E,mDAAmD;AACnD,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,EAAE,CAAC,OAAO,CAAC,qDAAqD,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACpF,CAAC"}

package/migrations/0033_work_item_branch_adopted.sql

@@ -0,0 +1,6 @@
+-- Adopted-branch flag for /branch (work item #117).
+--
+-- A branch that already existed and was adopted keeps its shared history: it is
+-- fast-forward only, never force-pushed or rebased. 0 means DevBot created the
+-- branch (the historical behavior).
+ALTER TABLE work_item_branch ADD COLUMN adopted INTEGER NOT NULL DEFAULT 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wascartech/devbot",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "private": false,
   "type": "module",
   "author": "Adrien Jussak <adrien.jussak@wascar.tech>",
@@ -109,6 +109,7 @@
     "test:platform-parity": "node --experimental-sqlite --test --import tsx scripts/check-platform-parity.ts",
     "test:forgejo-access-gate": "node --experimental-sqlite --test --import tsx scripts/check-forgejo-access-gate.ts",
     "test:ci-adapter": "node --experimental-sqlite --test --import tsx scripts/check-ci-adapter.ts",
+    "test:ci-lint-guard": "node --experimental-sqlite --test --import tsx scripts/check-ci-lint-guard.ts",
     "test:ci-fail-report": "node --experimental-sqlite --test --import tsx scripts/check-ci-fail-report.ts",
     "test:mcp-ci-tools": "node --experimental-sqlite --test --import tsx scripts/check-mcp-ci-tools.ts",
     "test:gitlab-webhooks": "node --experimental-sqlite --test --import tsx scripts/check-gitlab-webhooks.ts",
@@ -121,6 +122,7 @@
     "test:podman-volume": "node --experimental-sqlite --test --import tsx scripts/check-podman-volume.ts",
     "test:podman-run": "node --experimental-sqlite --test --import tsx scripts/check-podman-run.ts",
     "test:nested-podman": "node --experimental-sqlite --test --import tsx scripts/check-nested-podman.ts",
+    "test:nested-podman-wiring": "node --experimental-sqlite --test --import tsx scripts/check-nested-podman-wiring.ts",
     "test:shell-sandbox": "node --experimental-sqlite --test --import tsx scripts/check-shell-sandbox.ts",
     "test:plan-agent": "node --experimental-sqlite --test --import tsx scripts/check-plan-agent.ts",
     "test:stats": "node --experimental-sqlite --test --import tsx scripts/check-stats.ts",