omnius 1.0.481 → 1.0.483

package/dist/index.js

@@ -559128,10 +559128,55 @@ function parseCompilerDiagnostics(text2, language = "unknown") {
   const out = [];
   if (!text2)
     return out;
-  for (const raw of text2.split(/\r?\n/)) {
+  const allLines = text2.split(/\r?\n/);
+  let pyFile;
+  let pyLine;
+  for (let i2 = 0; i2 < allLines.length; i2++) {
+    const trimmed = allLines[i2].trim();
+    const tbMatch = trimmed.match(/^File\s+"([^"]+)",\s*line\s+(\d+)/);
+    if (tbMatch) {
+      pyFile = tbMatch[1];
+      pyLine = Number(tbMatch[2]);
+    }
+    const excMatch = trimmed.match(/^(\w+(?:\.\w+)*Error):\s*(.*)/);
+    if (excMatch && pyFile && !out.some((d2) => d2.file === pyFile && d2.line === pyLine && d2.message === (excMatch[2] ?? excMatch[0]))) {
+      const kind = /^(?:ModuleNotFound|Import)\w*Error$/.test(excMatch[1]) ? "import_error" : "type_error";
+      out.push({
+        file: pyFile,
+        line: pyLine,
+        kind,
+        symbol: excMatch[1],
+        message: excMatch[2] ?? excMatch[0]
+      });
+    }
+  }
+  for (const raw of allLines) {
     const line = raw.trim();
-    if (!line || !/error/i.test(line))
+    if (!line)
+      continue;
+    const pytestMatch = line.match(/^FAILED\s+(.+?)(?:::(\w+))?(?:\s+-\s+(.+))?$/);
+    if (pytestMatch) {
+      out.push({
+        file: pytestMatch[1],
+        kind: "test_failure",
+        symbol: pytestMatch[2],
+        message: pytestMatch[3] ?? line
+      });
+      continue;
+    }
+    if (!/error|FAILED|unrecognized|Traceback|Warning|warning/i.test(line))
       continue;
+    if (/unrecognized\s+(element|attribute)/i.test(line) || /not\s+allowed\s+here/i.test(line)) {
+      const fileMatch = line.match(/^(.+?):/);
+      const lnMatch = line.match(/:(\d+):/);
+      out.push({
+        file: fileMatch?.[1] ?? "unknown.xml",
+        line: lnMatch ? Number(lnMatch[1]) : void 0,
+        kind: "schema_error",
+        message: line
+      });
+      continue;
+    }
     const loc = line.match(/^(.+?):(\d+):(?:\d+:)?\s*(?:fatal\s+)?error:\s*(.*)$/i);
     const file = loc?.[1];
     const lineNo = loc ? Number(loc[2]) : void 0;
@@ -576236,7 +576281,7 @@ function failureProgressSignal(text2) {
   if (!s2.trim())
     return void 0;
   let explicit;
-  for (const m2 of s2.matchAll(/(\d+)\s+(?:errors?|failures?|failed|problems?)\b/gi)) {
+  for (const m2 of s2.matchAll(/(\d+)\s+(?:errors?|failures?|failed|problems?|warnings?)\b/gi)) {
     const n2 = Number(m2[1]);
     if (Number.isFinite(n2))
       explicit = Math.max(explicit ?? 0, n2);
@@ -576245,7 +576290,11 @@ function failureProgressSignal(text2) {
     return explicit;
   let lines = 0;
   for (const line of s2.split(/\r?\n/)) {
-    if (/\b(errors?|fail(?:ed|ure|ures|s)?)\b/i.test(line))
+    if (/\b(errors?|fail(?:ed|ure|ures|s)?|warnings?|unrecognized)\b/i.test(line))
+      lines++;
+    else if (/\b\w+Error\b/.test(line))
+      lines++;
+    else if (/\bTraceback\b/i.test(line))
       lines++;
   }
   return lines > 0 ? lines : void 0;
@@ -576745,7 +576794,9 @@ var init_focusSupervisor = __esm({
               state: "forced_replan",
               reason: verdict.reason,
               requiredNextAction: this.resolveRequiredNextAction("run_verification"),
-              forbiddenActionFamilies: [actionFamily(input.toolName, input.args, this.familyCwd)]
+              forbiddenActionFamilies: [
+                actionFamily(input.toolName, input.args, this.familyCwd)
+              ]
             });
           }
         }
@@ -577354,7 +577405,7 @@ function languageOf(p2) {
     return "typescript";
   return "unknown";
 }
-var JsonConvergenceStore, EDIT_TOOLS, LongHaulComponents, FIELD_STOPWORDS;
+var JsonConvergenceStore, EDIT_TOOLS, LOCKED_CONTRACT_FILE, LongHaulComponents, FIELD_STOPWORDS;
 var init_longhaul_integration = __esm({
   "packages/orchestrator/dist/longhaul-integration.js"() {
     "use strict";
@@ -577406,6 +577457,7 @@ var init_longhaul_integration = __esm({
       }
     };
     EDIT_TOOLS = /* @__PURE__ */ new Set(["file_edit", "file_patch", "batch_edit"]);
+    LOCKED_CONTRACT_FILE = "locked-contract.json";
     LongHaulComponents = class {
       convergenceBreaker;
       adaptiveEdit;
@@ -577420,7 +577472,10 @@ var init_longhaul_integration = __esm({
       locked = /* @__PURE__ */ new Map();
       /** WO-11: provenance — which file each locked symbol was declared in. */
       lockedSource = /* @__PURE__ */ new Map();
+      /** Persisted contract output path (relative to stateDir). */
+      lockedContractPath;
       constructor(options2) {
+        this.lockedContractPath = path7.join(options2.stateDir, LOCKED_CONTRACT_FILE);
         this.convergenceBreaker = new ConvergenceBreaker({
           ...options2.convergence,
           // Persist the cliff across sessions only when persistence is enabled;
@@ -577492,6 +577547,7 @@ var init_longhaul_integration = __esm({
               this.lockedSource.set(s2.name, input.path);
             }
           }
+          this.persistLockedContract();
           return this.locked.size;
         } catch {
           return this.locked.size;
@@ -577501,6 +577557,22 @@ var init_longhaul_integration = __esm({
       lockedContract() {
         return { symbols: [...this.locked.values()] };
       }
+      /**
+       * Persist the locked contract to `.omnius/locked-contract.json` so sub-agent
+       * fixers can read it as their canonical type reference. Fault-tolerant —
+       * never throws; on error the in-memory contract remains available for
+       * orchestrator-side gates.
+       */
+      persistLockedContract() {
+        try {
+          const contract = this.lockedContract();
+          if (contract.symbols.length === 0)
+            return;
+          fs6.mkdirSync(path7.dirname(this.lockedContractPath), { recursive: true });
+          fs6.writeFileSync(this.lockedContractPath, JSON.stringify(contract, null, 2));
+        } catch {
+        }
+      }
       /** WO-11: map of locked symbol name → declaring file (for per-symbol units). */
       symbolSources() {
         return new Map(this.lockedSource);
@@ -577585,11 +577657,12 @@ var init_longhaul_integration = __esm({
           const symbol3 = top.symbol ? ` symbol \`${top.symbol}\`` : "";
           const kind = top.kind.replace(/_/g, " ");
           const contractHint = top.symbol && this.lockedSource.has(top.symbol) ? ` The locked contract for \`${top.symbol}\` lives in ${this.lockedSource.get(top.symbol)} — match it exactly.` : "";
+          const persistHint = this.locked.size > 0 ? ` The canonical locked contract is at .omnius/${LOCKED_CONTRACT_FILE} — read it before editing and match its type names exactly.` : "";
           return `[DELEGATE — build is feedback, not the task] The build reported a stable diagnostic set. Do NOT re-run the build and do NOT keep editing in this context. Delegate ONE isolated fix to a seeded sub-agent, then re-run the build to test:
   sub_agent({
     subagent_type: "fixer",
     description: "fix ${top.symbol ?? file}",
-    prompt: "In ${file}, resolve the ${kind}${symbol3}. Read ONLY ${file} (and the file that declares${symbol3 || " the offending symbol"}). Make the minimal edit to satisfy the contract. Do not touch unrelated files. Report a one-line outcome.${contractHint}"
+    prompt: "In ${file}, resolve the ${kind}${symbol3}. Read ONLY ${file} (and the file that declares${symbol3 || " the offending symbol"}). Make the minimal edit to satisfy the contract. Do not touch unrelated files. Report a one-line outcome.${contractHint}${persistHint}"
   })
 The sub-agent works in its own small context; when it folds back, run the build once to verify the diagnostic count dropped, then delegate the next one. This is fan-out/converge — keep THIS context on trajectory, not on the raw fix.`;
         } catch {
@@ -577606,16 +577679,29 @@ The sub-agent works in its own small context; when it folds back, run the build
       buildDelegationCall(output) {
         try {
           const diags = parseCompilerDiagnostics(String(output || ""));
-          const structural = diags.filter((d2) => d2.kind === "signature_mismatch" || d2.kind === "duplicate_definition" || d2.kind === "unknown_member" || d2.kind === "unknown_symbol" || d2.kind === "type_error");
+          const structural = diags.filter((d2) => d2.kind === "signature_mismatch" || d2.kind === "duplicate_definition" || d2.kind === "unknown_member" || d2.kind === "unknown_symbol" || d2.kind === "type_error" || d2.kind === "test_failure" || d2.kind === "import_error" || d2.kind === "schema_error");
           const top = structural.find((d2) => d2.file && d2.symbol) ?? structural.find((d2) => d2.file) ?? diags.find((d2) => d2.file) ?? structural[0] ?? diags[0];
-          if (!top || !top.file)
+          if (!top)
+            return null;
+          let file = top.file;
+          if (!file && top.symbol && this.lockedSource.has(top.symbol)) {
+            file = this.lockedSource.get(top.symbol);
+          }
+          if (!file)
             return null;
-          const file = top.file;
+          if (top.kind === "test_failure") {
+            file = file.replace(/::.*$/, "");
+          }
+          const cleanFile = file;
           const symbol3 = top.symbol;
           const kind = top.kind.replace(/_/g, " ");
           const declSrc = symbol3 ? this.lockedSource.get(symbol3) : void 0;
-          const focusFiles = [file, ...declSrc && declSrc !== file ? [declSrc] : []];
-          const prompt = `In ${file}, resolve the ${kind}${symbol3 ? ` for \`${symbol3}\`` : ""}. Read ONLY ${focusFiles.join(" and ")}. Make the minimal edit to satisfy the contract. Build once to verify the error is gone. Report a one-line outcome.` + (declSrc ? ` The contract for \`${symbol3}\` lives in ${declSrc} — match it exactly.` : "");
+          const focusFiles = [
+            file,
+            ...declSrc && declSrc !== file ? [declSrc] : []
+          ];
+          const lockedRef = this.locked.size > 0 ? ` Also read .omnius/${LOCKED_CONTRACT_FILE} for the canonical type contract and match it exactly.` : "";
+          const prompt = `In ${file}, resolve the ${kind}${symbol3 ? ` for \`${symbol3}\`` : ""}. Read ONLY ${focusFiles.join(" and ")}. Make the minimal edit to satisfy the contract. Build once to verify the error is gone. Report a one-line outcome.` + (declSrc ? ` The contract for \`${symbol3}\` lives in ${declSrc} — match it exactly.` : "") + lockedRef;
           return {
             description: `fix ${symbol3 ?? file}`,
             prompt,
@@ -577661,7 +577747,10 @@ The sub-agent works in its own small context; when it folds back, run the build
         try {
           return decideCompaction(input);
         } catch {
-          return { compact: input.pressureRatio >= 0.85, reason: "fallback threshold" };
+          return {
+            compact: input.pressureRatio >= 0.85,
+            reason: "fallback threshold"
+          };
         }
       }
       /** WO-5: validate a compaction preserved pinned invariants (Slipstream). */
@@ -579722,7 +579811,7 @@ RECOVERY: cd to the directory containing '${file}', run a plain install with no
 
 // packages/orchestrator/dist/agenticRunner.js
 import { existsSync as _fsExistsSync, readFileSync as _fsReadFileSync, writeFileSync as _fsWriteFileSync, appendFileSync as _fsAppendFileSync, unlinkSync as _fsUnlinkSync, mkdirSync as _fsMkdirSync, statSync as _fsStatSync, readdirSync as _fsReaddirSync } from "node:fs";
-import { execFile as _execFile, spawn as _spawn } from "node:child_process";
+import { execFile as _execFile, execSync as _execSync, spawn as _spawn } from "node:child_process";
 import { createHash as _createHash } from "node:crypto";
 import { join as _pathJoin, relative as _pathRelative, resolve as _pathResolve } from "node:path";
 import { tmpdir as _osTmpdir } from "node:os";
@@ -580575,9 +580664,7 @@ var init_agenticRunner = __esm({
       "web_fetch",
       "tool_search"
     ]);
-    STATE_UPDATE_ACTION_REASON_SYNTHESIS_TOOLS = /* @__PURE__ */ new Set([
-      "todo_write"
-    ]);
+    STATE_UPDATE_ACTION_REASON_SYNTHESIS_TOOLS = /* @__PURE__ */ new Set(["todo_write"]);
     TOOL_ACTION_REASON_SCHEMA = {
       type: "object",
       description: "Compact public action contract for this exact tool call. Do not include hidden chain-of-thought; use concise task-state facts.",
@@ -580604,13 +580691,7 @@ var init_agenticRunner = __esm({
           description: "Classify the action scope. Use targeted_patch for constrained edits; full_file_rewrite only for deliberate whole-file replacement."
         }
       },
-      required: [
-        "task_anchor",
-        "intent",
-        "evidence",
-        "expected_result",
-        "scope"
-      ]
+      required: ["task_anchor", "intent", "evidence", "expected_result", "scope"]
     };
     SYSTEM_PROMPT = loadPrompt("agentic/system-large.md");
     SYSTEM_PROMPT_MEDIUM = loadPrompt("agentic/system-medium.md");
@@ -581116,6 +581197,10 @@ var init_agenticRunner = __esm({
       _decompModules = [];
       /** Auto-delegation: last failing build/verify output, for parsing the top unit. */
       _lastBuildOutput = null;
+      /** Convergence gate: pre-fold error count for verifying fixer progress. */
+      _preFoldErrorCount = null;
+      /** Convergence gate: the fixer description being gated (for status messages). */
+      _preFoldFixerDescription = null;
       /** Auto-delegation: directive ids we've already auto-delegated for (once each). */
       _autoDelegatedDirectiveIds = /* @__PURE__ */ new Set();
       _focusTerminalLedgerRecorded = false;
@@ -591662,6 +591747,18 @@ ${cachedResult}`,
                         } catch {
                         }
                       }
+                      if ((tc.name === "sub_agent" || tc.name === "agent") && this._preFoldErrorCount === null && (tc.arguments?.subagent_type === "fixer" || finalArgs?.subagent_type === "fixer") && this._lastBuildOutput !== null) {
+                        this._preFoldErrorCount = failureProgressSignal(this._lastBuildOutput) ?? null;
+                        this._preFoldFixerDescription = tc.arguments?.description || finalArgs?.description || "voluntary fixer";
+                        try {
+                          _execSync('git stash push -m "pre-fixer" --include-untracked', {
+                            cwd: this.authoritativeWorkingDirectory(),
+                            stdio: "pipe",
+                            timeout: 1e4
+                          });
+                        } catch {
+                        }
+                      }
                       try {
                         if (typeof tool.executeStream === "function") {
                           const gen = tool.executeStream(finalArgs);
@@ -593085,6 +593182,65 @@ Evidence: ${evidencePreview}`.slice(0, 500);
                   timestamp: (/* @__PURE__ */ new Date()).toISOString()
                 });
               }
+              if ((tc.name === "sub_agent" || tc.name === "agent") && result.success && this._preFoldErrorCount != null && this._preFoldFixerDescription) {
+                const desc = this._preFoldFixerDescription;
+                const preCount = this._preFoldErrorCount;
+                const foldOutput = String(result.output ?? result.error ?? "");
+                const postSignal = failureProgressSignal(foldOutput);
+                const cwd4 = this.authoritativeWorkingDirectory();
+                let accepted = false;
+                if (postSignal == null) {
+                  accepted = /\b(?:verified|clean|passed|succeeded|0\s*error)\b/i.test(foldOutput);
+                } else {
+                  accepted = postSignal < preCount;
+                }
+                if (accepted) {
+                  try {
+                    _execSync("git stash drop", {
+                      cwd: cwd4,
+                      stdio: "pipe",
+                      timeout: 5e3
+                    });
+                  } catch {
+                  }
+                  this.emit({
+                    type: "status",
+                    content: `[CONVERGE-ACCEPT] fixer for "${desc}" — errors ${preCount}→${postSignal != null ? postSignal : "0"}, changes kept`,
+                    turn,
+                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                  });
+                } else {
+                  try {
+                    _execSync("git checkout -- .", {
+                      cwd: cwd4,
+                      stdio: "pipe",
+                      timeout: 1e4
+                    });
+                    _execSync("git clean -fd", {
+                      cwd: cwd4,
+                      stdio: "pipe",
+                      timeout: 1e4
+                    });
+                  } catch {
+                  }
+                  try {
+                    _execSync("git stash pop", {
+                      cwd: cwd4,
+                      stdio: "pipe",
+                      timeout: 1e4
+                    });
+                  } catch {
+                  }
+                  this.emit({
+                    type: "status",
+                    content: `[CONVERGE-REJECT] fixer for "${desc}" — errors ${preCount}→${postSignal != null ? postSignal : "?"}, rolled back`,
+                    turn,
+                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                  });
+                }
+                this._preFoldErrorCount = null;
+                this._preFoldFixerDescription = null;
+              }
               try {
                 const lh = this._longHaul;
                 if (lh) {
@@ -593112,7 +593268,10 @@ ${rec.guidance}` : rec.guidance;
 
 ${dir}` : dir;
                     }
-                    lh.maybeLockContract({ path: editPath, content: writtenContent });
+                    lh.maybeLockContract({
+                      path: editPath,
+                      content: writtenContent
+                    });
                     const specDir = lh.specGateGuidance({
                       path: editPath,
                       content: writtenContent
@@ -596918,6 +597077,16 @@ Actions: (1) list_directory on the parent directory to see what's there, (2) Che
         const call = this._longHaul.buildDelegationCall(this._lastBuildOutput);
         if (!call)
           return false;
+        this._preFoldErrorCount = failureProgressSignal(this._lastBuildOutput) ?? null;
+        this._preFoldFixerDescription = call.description;
+        try {
+          _execSync('git stash push -m "pre-fixer" --include-untracked', {
+            cwd: this.authoritativeWorkingDirectory(),
+            stdio: "pipe",
+            timeout: 1e4
+          });
+        } catch {
+        }
         this._autoDelegatedDirectiveIds.add(directive.id);
         const parentTok = estimateMessagesTokens2(messages2);
         this.emit({
@@ -607675,7 +607844,7 @@ var init_subagent_prompt = __esm({
           "If the fix requires touching more than 2 files, STOP and report that the",
           "unit is larger than one fixer — the orchestrator will re-decompose it."
         ],
-        foldFormat: 'task_complete(summary="<file>: <what you changed> — build <verified|still failing on: X>")',
+        foldFormat: 'task_complete(summary="<file>: <what you changed> — build <verified|still failing on: X> — contract <matched|diverged on: Y>")',
         mutates: true
       },
       explore: {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.481",
+  "version": "1.0.483",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.481",
+      "version": "1.0.483",
       "bundleDependencies": [
         "image-to-ascii"
       ],

package/package.json

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