@wopr-network/defcon 1.14.0 → 1.15.0

package/dist/src/engine/engine.js

@@ -8,6 +8,8 @@ import { buildInvocation } from "./invocation-builder.js";
 import { executeOnEnter } from "./on-enter.js";
 import { executeOnExit } from "./on-exit.js";
 import { findTransition, isTerminal } from "./state-machine.js";
+const MERGE_BLOCKED_THRESHOLD = 3;
+const MERGE_BLOCKED_STUCK_MESSAGE = "PR blocked in merge queue 3+ times — likely branch protection or queue contention issue";
 export class Engine {
     entityRepo;
     flowRepo;
@@ -93,10 +95,31 @@ export class Engine {
             return { gated: true, ...routing, terminal: false };
         }
         // Gate passed or redirected — determine the actual destination.
-        const toState = routing.kind === "redirect" ? routing.toState : transition.toState;
+        let toState = routing.kind === "redirect" ? routing.toState : transition.toState;
         const trigger = routing.kind === "redirect" ? routing.trigger : signal;
         const spawnFlow = routing.kind === "redirect" ? null : transition.spawnFlow;
         const { gatesPassed } = routing;
+        // 4a. Merge-blocked loop detection: if the watcher sends "blocked" from
+        // "merging", increment a counter. After MERGE_BLOCKED_THRESHOLD cycles,
+        // override the destination to "stuck" to break the loop.
+        if (signal === "blocked" && entity.state === "merging") {
+            const prevCount = (typeof entity.artifacts?.merge_blocked_count === "number" ? entity.artifacts.merge_blocked_count : 0);
+            const newCount = prevCount + 1;
+            await this.entityRepo.updateArtifacts(entityId, { merge_blocked_count: newCount });
+            if (newCount >= MERGE_BLOCKED_THRESHOLD) {
+                const stuckState = flow.states.find((s) => s.name === "stuck");
+                if (stuckState) {
+                    toState = "stuck";
+                    await this.entityRepo.updateArtifacts(entityId, {
+                        merge_blocked_message: MERGE_BLOCKED_STUCK_MESSAGE,
+                    });
+                    this.logger.warn(`[engine] Entity ${entityId} merge-blocked ${newCount} times, transitioning to stuck`);
+                }
+                else {
+                    this.logger.warn(`merge_blocked_count >= threshold but no stuck state in flow ${flow.name} — entity ${entityId} will continue looping`);
+                }
+            }
+        }
         // 4b. Execute onExit hook on the DEPARTING state (before transition)
         const departingStateDef = flow.states.find((s) => s.name === entity.state);
         if (departingStateDef?.onExit) {

package/dist/src/engine/invocation-builder.js

@@ -46,7 +46,7 @@ export async function buildInvocation(state, entity, adapters, flow, logger = co
     let systemPrompt = "";
     let userContent = "";
     if (state.promptTemplate) {
-        const template = getHandlebars().compile(state.promptTemplate);
+        const template = getHandlebars().compile(state.promptTemplate, { noEscape: true });
         prompt = template(context);
         systemPrompt = `${INJECTION_WARNING}\n\n${prompt}`;
         userContent = `<external-data>\n${JSON.stringify(entityDataForContext(entity), null, 2)}\n</external-data>`;

package/dist/src/execution/cli.js

@@ -474,9 +474,11 @@ program
     sqlite.close();
 });
 // ─── provision-worktree ───
+// TODO(WOP-2014): Remove this subcommand once nuke containers are deployed and stable.
+// Nuke workers provision their own workspace inside the container, making this unnecessary.
 program
     .command("provision-worktree")
-    .description("Provision a git worktree and branch for an issue")
+    .description("[DEPRECATED] Provision a git worktree and branch for an issue (superseded by nuke containers)")
     .argument("<repo>", "GitHub repo (e.g. wopr-network/defcon)")
     .argument("<issue-key>", "Issue key (e.g. WOP-392)")
     .option("--base-path <path>", "Worktree base directory", join(homedir(), "worktrees"))

package/dist/src/execution/provision-worktree.js

@@ -1,3 +1,8 @@
+/**
+ * @deprecated provision-worktree is superseded by nuke containerized workers (WOP-2014).
+ * Nuke containers provision their own workspace inside the container.
+ * TODO: remove this file once nuke is deployed and stable.
+ */
 import { execFileSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/defcon",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "type": "module",
   "packageManager": "pnpm@9.15.4",
   "engines": {