open-agents-ai 0.187.528 → 0.187.529

package/dist/index.js

@@ -526701,6 +526701,123 @@ Pick the SMALLEST concrete deliverable from the spec — typically the project e
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
       }
+      /**
+       * DECOMP-2 PRE-dispatch enforcement check. Returns a synthetic block-message
+       * string when the gate should reject this dispatch; null to proceed normally.
+       *
+       * Caller logic differs between main-loop and brute-force dispatchers:
+       *   - Main loop returns the block as a synthetic { tc, output } result.
+       *   - Brute-force emits tool_result + pushes tool message + `continue`.
+       * Both invoke this method to compute the decision.
+       *
+       * Conditions for blocking:
+       *   - `_decomp2GateActive` is true (set by `_trackDecomp2` when threshold crossed)
+       *   - tool is one of the 4 creative-edit tools
+       *   - the path is NOT in `_decomp2MainContextFiles` (i.e. it's a NEW file)
+       *   - kill-switch `OA_DISABLE_DECOMP2` is not set
+       *
+       * Already-touched paths pass through (current-module finishing work allowed).
+       * sub_agent / web_search / task_complete pass through (not creative-edit tools).
+       */
+      _maybeDecomp2Block(tc, turn) {
+        if (!this._decomp2GateActive)
+          return null;
+        if (process.env["OA_DISABLE_DECOMP2"] === "1")
+          return null;
+        const _editTools = /* @__PURE__ */ new Set(["file_write", "file_edit", "batch_edit", "file_patch"]);
+        if (!_editTools.has(tc.name))
+          return null;
+        const _editPath = tc.arguments?.["path"] ?? "";
+        if (!_editPath || this._decomp2MainContextFiles.has(_editPath))
+          return null;
+        const _filesList = [...this._decomp2MainContextFiles].slice(0, 8).map((p2) => `  • ${p2}`).join("\n");
+        const _moreFiles = this._decomp2MainContextFiles.size > 8 ? `
+  ... +${this._decomp2MainContextFiles.size - 8} more` : "";
+        const decomp2Msg = [
+          `[BLOCKED — DECOMP-2 main-context exhaustion]`,
+          ``,
+          `You have already edited ${this._decomp2MainContextFiles.size} distinct files in main context without invoking sub_agent. Continuing to edit ANOTHER new file ('${_editPath}') will keep your context window saturated and trigger compaction thrashing.`,
+          ``,
+          `Files you've already edited (will accept further edits to these):`,
+          _filesList,
+          _moreFiles,
+          ``,
+          `For the next module, you MUST use sub_agent. Workflow:`,
+          `  1. Pick a pending todo (the orchestrator pre-populated module todos via DECOMP-1).`,
+          `  2. Call sub_agent({`,
+          `       subagent_type: "general",`,
+          `       prompt: "Implement <module-path> per spec",`,
+          `       relevantFiles: [{path: "<module-path>", content: "" /* or existing content */}],`,
+          `       constraints: ["Stay within <module-path>; integration verification happens later"],`,
+          `     })`,
+          `  3. After sub_agent returns, mark the todo completed.`,
+          ``,
+          `Why this matters: spreading edits across N files in main context burns ~N × file_size tokens. sub_agent gives the next module a focused context window.`,
+          ``,
+          `If you have ALREADY edited '${_editPath}' (this is a continuation), the orchestrator's set must have missed it — call file_read to verify, then re-edit. Otherwise, dispatch sub_agent now.`
+        ].join("\n");
+        this.emit({
+          type: "status",
+          content: `DECOMP-2 NEW-FILE BLOCK — rejected ${tc.name}('${_editPath}') at turn ${turn}; gate stays active until sub_agent is invoked`,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        });
+        this._tagSyntheticFailure({
+          mode: "step_repetition",
+          rationale: `DECOMP-2 new-file block on '${tc.name}'(${_editPath}) — agent has spread edits across ${this._decomp2MainContextFiles.size} files without sub_agent`
+        });
+        return decomp2Msg;
+      }
+      /**
+       * DECOMP-2 post-dispatch tracking. Refactored from inline so both the
+       * main turn loop AND the brute-force re-engagement inner loop record
+       * edits / sub_agent calls and check the gate-activation threshold.
+       * Without this method on both paths, batch532 measured 14 distinct
+       * files edited but DECOMP-2 never activated — because the main loop
+       * exited via blocked task_complete and all subsequent edits flowed
+       * through the brute-force dispatch which had no tracking.
+       *
+       * Side effects when fired:
+       *   - On successful creative edit: adds path to `_decomp2MainContextFiles`,
+       *     possibly activates `_decomp2GateActive` (emits status).
+       *   - On sub_agent / priority_delegate / background_run: increments
+       *     counter, clears gate (emits status).
+       *
+       * Pure post-dispatch: caller invokes AFTER the tool result is in hand,
+       * regardless of which loop the dispatch happened in.
+       */
+      _trackDecomp2(tc, result, turn) {
+        if (process.env["OA_DISABLE_DECOMP2"] === "1")
+          return;
+        if (result && result.success !== false) {
+          const _editTools = /* @__PURE__ */ new Set(["file_write", "file_edit", "batch_edit", "file_patch"]);
+          if (_editTools.has(tc.name)) {
+            const _editPath = tc.arguments?.["path"] ?? "";
+            if (_editPath && typeof _editPath === "string") {
+              this._decomp2MainContextFiles.add(_editPath);
+              const DECOMP2_FILE_SPREAD_THRESHOLD = 5;
+              if (!this._decomp2GateActive && this._decomp2MainContextFiles.size >= DECOMP2_FILE_SPREAD_THRESHOLD && this._decomp2SubAgentCalls === 0) {
+                this._decomp2GateActive = true;
+                this.emit({
+                  type: "status",
+                  content: `DECOMP-2 NEW-FILE GATE ACTIVATED — ${this._decomp2MainContextFiles.size} distinct files edited in main context, 0 sub_agent calls; further edits to NEW files will be blocked until sub_agent is invoked`,
+                  timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                });
+              }
+            }
+          }
+        }
+        if (tc.name === "sub_agent" || tc.name === "priority_delegate" || tc.name === "background_run") {
+          this._decomp2SubAgentCalls++;
+          if (this._decomp2GateActive) {
+            this._decomp2GateActive = false;
+            this.emit({
+              type: "status",
+              content: `DECOMP-2 GATE CLEARED — '${tc.name}' satisfied delegation directive at turn ${turn}`,
+              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+            });
+          }
+        }
+      }
       readSessionTodos() {
         try {
           const sid = process.env["OA_SESSION_ID"] || this._sessionId || "default";
@@ -530669,69 +530786,19 @@ ${memoryLines.join("\n")}`
                 });
                 return { tc, output: reg61BlockMsg };
               }
-              if (this._decomp2GateActive && process.env["OA_DISABLE_DECOMP2"] !== "1") {
-                const DECOMP2_EDIT_TOOLS = /* @__PURE__ */ new Set([
-                  "file_write",
-                  "file_edit",
-                  "batch_edit",
-                  "file_patch"
-                ]);
-                if (DECOMP2_EDIT_TOOLS.has(tc.name)) {
-                  const _editPath = tc.arguments?.["path"] ?? "";
-                  const _isNewFile = _editPath && !this._decomp2MainContextFiles.has(_editPath);
-                  if (_isNewFile) {
-                    this.emit({
-                      type: "tool_call",
-                      toolName: tc.name,
-                      toolArgs: tc.arguments,
-                      turn,
-                      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                    });
-                    const _filesList = [...this._decomp2MainContextFiles].slice(0, 8).map((p2) => `  • ${p2}`).join("\n");
-                    const _moreFiles = this._decomp2MainContextFiles.size > 8 ? `
-  ... +${this._decomp2MainContextFiles.size - 8} more` : "";
-                    const decomp2Msg = [
-                      `[BLOCKED — DECOMP-2 main-context exhaustion]`,
-                      ``,
-                      `You have already edited ${this._decomp2MainContextFiles.size} distinct files in main context without invoking sub_agent. Continuing to edit ANOTHER new file ('${_editPath}') will keep your context window saturated and trigger compaction thrashing.`,
-                      ``,
-                      `Files you've already edited (will accept further edits to these):`,
-                      _filesList,
-                      _moreFiles,
-                      ``,
-                      `For the next module, you MUST use sub_agent. Workflow:`,
-                      `  1. Pick a pending todo (the orchestrator pre-populated module todos via DECOMP-1).`,
-                      `  2. Call sub_agent({`,
-                      `       subagent_type: "general",`,
-                      `       prompt: "Implement <module-path> per spec",`,
-                      `       relevantFiles: [{path: "<module-path>", content: "" /* or existing content */}],`,
-                      `       constraints: ["Stay within <module-path>; integration verification happens later"],`,
-                      `     })`,
-                      `  3. After sub_agent returns, mark the todo completed.`,
-                      ``,
-                      `Why this matters: spreading edits across N files in main context burns ~N × file_size tokens. sub_agent gives the next module a focused context window.`,
-                      ``,
-                      `If you have ALREADY edited '${_editPath}' (this is a continuation), the orchestrator's set must have missed it — call file_read to verify, then re-edit. Otherwise, dispatch sub_agent now.`
-                    ].join("\n");
-                    this.emit({
-                      type: "tool_result",
-                      toolName: tc.name,
-                      success: false,
-                      content: decomp2Msg.slice(0, 120),
-                      turn,
-                      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                    });
-                    this.emit({
-                      type: "status",
-                      content: `DECOMP-2 NEW-FILE BLOCK — rejected ${tc.name}('${_editPath}') at turn ${turn}; gate stays active until sub_agent is invoked`,
-                      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                    });
-                    this._tagSyntheticFailure({
-                      mode: "step_repetition",
-                      rationale: `DECOMP-2 new-file block on '${tc.name}'(${_editPath}) — agent has spread edits across ${this._decomp2MainContextFiles.size} files without sub_agent`
-                    });
-                    return { tc, output: decomp2Msg };
-                  }
+              {
+                const _decomp2Block = this._maybeDecomp2Block(tc, turn);
+                if (_decomp2Block) {
+                  this.emit({ type: "tool_call", toolName: tc.name, toolArgs: tc.arguments, turn, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+                  this.emit({
+                    type: "tool_result",
+                    toolName: tc.name,
+                    success: false,
+                    content: _decomp2Block.slice(0, 120),
+                    turn,
+                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                  });
+                  return { tc, output: _decomp2Block };
                 }
               }
               const PROGRESS_GATE_BYPASS_TOOLS = /* @__PURE__ */ new Set([
@@ -531841,32 +531908,9 @@ Respond with EXACTLY this structure before your next tool call:
                   if (this._fileWriteTimestamps.length > 200) {
                     this._fileWriteTimestamps.shift();
                   }
-                  const _editPath = tc.arguments?.["path"] ?? "";
-                  if (_editPath && typeof _editPath === "string") {
-                    this._decomp2MainContextFiles.add(_editPath);
-                    const DECOMP2_FILE_SPREAD_THRESHOLD = 5;
-                    if (!this._decomp2GateActive && this._decomp2MainContextFiles.size >= DECOMP2_FILE_SPREAD_THRESHOLD && this._decomp2SubAgentCalls === 0 && process.env["OA_DISABLE_DECOMP2"] !== "1") {
-                      this._decomp2GateActive = true;
-                      this.emit({
-                        type: "status",
-                        content: `DECOMP-2 NEW-FILE GATE ACTIVATED — ${this._decomp2MainContextFiles.size} distinct files edited in main context, 0 sub_agent calls; further edits to NEW files will be blocked until sub_agent is invoked`,
-                        timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                      });
-                    }
-                  }
-                }
-              }
-              if (tc.name === "sub_agent" || tc.name === "priority_delegate" || tc.name === "background_run") {
-                this._decomp2SubAgentCalls++;
-                if (this._decomp2GateActive) {
-                  this._decomp2GateActive = false;
-                  this.emit({
-                    type: "status",
-                    content: `DECOMP-2 GATE CLEARED — '${tc.name}' satisfied delegation directive at turn ${turn}`,
-                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                  });
                 }
               }
+              this._trackDecomp2(tc, result, turn);
               if (result && result.success === false) {
                 this._runErrorCount++;
                 const errMsg = result.error || "";
@@ -532782,6 +532826,12 @@ Integrate this guidance into your current approach. Continue working on the task
                   }
                 }
                 this.emit({ type: "tool_call", toolName: tc.name, toolArgs: tc.arguments, turn, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+                const _decomp2BFBlock = this._maybeDecomp2Block(tc, turn);
+                if (_decomp2BFBlock) {
+                  this.emit({ type: "tool_result", toolName: tc.name, content: _decomp2BFBlock.slice(0, 200), success: false, turn, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+                  messages2.push(this.buildToolMessage(_decomp2BFBlock, tc.id));
+                  continue;
+                }
                 const tool = this.tools.get(tc.name);
                 let result;
                 if (!tool) {
@@ -532830,6 +532880,7 @@ Full content available via: repl_exec(code="data = retrieve('${handleId}')")  or
                   output = modelContent2;
                 }
                 this.emit({ type: "tool_result", toolName: tc.name, content: output.slice(0, 200), success: result.success, turn, timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+                this._trackDecomp2(tc, result, turn);
                 const enoentTools2 = /* @__PURE__ */ new Set(["file_read", "list_directory", "find_files"]);
                 if (!result.success && enoentTools2.has(tc.name) && /ENOENT|no such file|does not exist|not found/i.test(result.error ?? result.output)) {
                   this._consecutiveEnoent++;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.528",
+  "version": "0.187.529",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "open-agents-ai",
-      "version": "0.187.528",
+      "version": "0.187.529",
       "hasInstallScript": true,
       "license": "CC-BY-NC-4.0",
       "dependencies": {
@@ -1138,9 +1138,9 @@
       }
     },
     "node_modules/@libp2p/webrtc": {
-      "version": "6.0.20",
-      "resolved": "https://registry.npmjs.org/@libp2p/webrtc/-/webrtc-6.0.20.tgz",
-      "integrity": "sha512-hdSgAgXaL0+dbOTNbf5+OQdZHGNQQGVHlursquM3HHsKtkIOVWEWre2Wo8UhAT/LcLtZDVkcx+xsBQmF6ASPyQ==",
+      "version": "6.0.21",
+      "resolved": "https://registry.npmjs.org/@libp2p/webrtc/-/webrtc-6.0.21.tgz",
+      "integrity": "sha512-q7Qiqs/vrdECNRmOfLuYvcH7gLOk94vO8tHpkaIDJv2OxRLDcwAGqQ51K0932shU4DozDJ6203HdWaRJs3MMzg==",
       "license": "Apache-2.0 OR MIT",
       "dependencies": {
         "@chainsafe/is-ip": "^2.1.0",
@@ -1163,7 +1163,7 @@
         "it-stream-types": "^2.0.2",
         "main-event": "^1.0.1",
         "multiformats": "^13.4.0",
-        "node-datachannel": "^0.29.0",
+        "node-datachannel": "^0.32.3",
         "p-defer": "^4.0.1",
         "p-event": "^7.0.0",
         "p-timeout": "^7.0.0",
@@ -3179,9 +3179,9 @@
       }
     },
     "node_modules/fast-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
-      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.1.tgz",
+      "integrity": "sha512-h2r7rcm6Ee/J8o0LD5djLuFVcfbZxhvho4vvsbeV0aMvXjUgqv4YpxpkEx0d68l6+IleVfLAdVEfhR7QNMkGHQ==",
       "funding": [
         {
           "type": "github",
@@ -4558,9 +4558,9 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.3.5.tgz",
-      "integrity": "sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.3.6.tgz",
+      "integrity": "sha512-Gf/KoL3C/MlI7Bt0PGI9I+TeTC/I6r/csU58N4BSNc4lppLBeKsOdFYkK+dX0ABDUMJNfCHTyPpzwwO21Awd3A==",
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": "20 || >=22"
@@ -4949,9 +4949,9 @@
       "optional": true
     },
     "node_modules/node-datachannel": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/node-datachannel/-/node-datachannel-0.29.0.tgz",
-      "integrity": "sha512-aCRJA5uZRqxMvQAl2QtOnCkodF1qJa1dCUVaXW9D7rku2p6F7PWe5OuRLcIgOYe+e2ZyJu0LefIQ95TtCn6xxA==",
+      "version": "0.32.3",
+      "resolved": "https://registry.npmjs.org/node-datachannel/-/node-datachannel-0.32.3.tgz",
+      "integrity": "sha512-Aok1ZhLsll472lRefgWYuWJ0070jh0ecHravTdRyZEmoESumebMEQV8Y+poBwSW2ZbEwAokAOGsK5Cu8pDDT2g==",
       "hasInstallScript": true,
       "license": "MPL 2.0",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.187.528",
+  "version": "0.187.529",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",