omnius 1.0.482 → 1.0.484

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;
@@ -576387,13 +576436,14 @@ function uniqueLimited(values) {
     return uniqueValues;
   return uniqueValues.slice(-MAX_FORBIDDEN_FAMILIES);
 }
-var directiveCounter, TERMINAL_INCOMPLETE_IGNORE_THRESHOLD, MAX_FORBIDDEN_FAMILIES, FocusSupervisor;
+var directiveCounter, TERMINAL_INCOMPLETE_IGNORE_THRESHOLD, MAX_FORBIDDEN_FAMILIES, REPEATED_FAMILY_VIOLATION_LIMIT, FocusSupervisor;
 var init_focusSupervisor = __esm({
   "packages/orchestrator/dist/focusSupervisor.js"() {
     "use strict";
     directiveCounter = 0;
     TERMINAL_INCOMPLETE_IGNORE_THRESHOLD = 8;
     MAX_FORBIDDEN_FAMILIES = 12;
+    REPEATED_FAMILY_VIOLATION_LIMIT = 3;
     FocusSupervisor = class {
       mode;
       modelTier;
@@ -576413,6 +576463,7 @@ var init_focusSupervisor = __esm({
       convergenceFamilyCounts = /* @__PURE__ */ new Map();
       ignoredDirectiveStreak = 0;
       lastIgnoredDirectiveTurn = null;
+      repeatedViolationCounts = /* @__PURE__ */ new Map();
       availableTools = null;
       constructor(options2 = {}) {
         this.mode = options2.mode ?? "auto";
@@ -576509,6 +576560,28 @@ var init_focusSupervisor = __esm({
           prior.ignoredCount++;
           this.ignoredDirectiveStreak++;
           this.lastIgnoredDirectiveTurn = input.turn;
+          const familyViolationKey = `${prior.id}|${family}`;
+          const familyViolationCount = (this.repeatedViolationCounts.get(familyViolationKey) ?? 0) + 1;
+          this.repeatedViolationCounts.set(familyViolationKey, familyViolationCount);
+          if (prior.requiredNextAction !== "creative_pivot_or_research" && familyViolationCount >= REPEATED_FAMILY_VIOLATION_LIMIT) {
+            const directive = this.setDirective({
+              turn: input.turn,
+              state: "forced_replan",
+              reason: `model repeatedly retried the same blocked action family (${family}) ${familyViolationCount} times for directive ${prior.id}`,
+              requiredNextAction: "creative_pivot_or_research",
+              forbiddenActionFamilies: uniqueLimited([
+                ...prior.forbiddenActionFamilies,
+                family
+              ])
+            });
+            return this.block(directive, [
+              "[FOCUS SUPERVISOR BLOCK: LOOP CONTROL]",
+              `Directive ${prior.id} was repeatedly ignored with ${family}.`,
+              `Required next action: ${directive.requiredNextAction}.`,
+              actionReasonSummary(input.actionReason),
+              "Stop trying this action-family repeatedly. Pivot to a materially different approach or web_search the blocker, then continue."
+            ].filter(Boolean).join("\n"), false);
+          }
           if (prior.requiredNextAction === "read_authoritative_target" && input.cachedResult && (input.duplicateHitCount ?? 0) >= Math.max(1, this.repeatGateMax - 1)) {
             const deadlockDirective = this.setDirective({
               turn: input.turn,
@@ -576745,7 +576818,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)
+              ]
             });
           }
         }
@@ -576821,6 +576896,9 @@ var init_focusSupervisor = __esm({
           createdTurn: input.turn,
           ignoredCount: 0
         };
+        if (!stable) {
+          this.repeatedViolationCounts.clear();
+        }
         this.directive = directive;
         this.state = directive.state;
         this.lastReason = directive.reason;
@@ -576837,6 +576915,7 @@ var init_focusSupervisor = __esm({
         this.state = "observe";
         this.ignoredDirectiveStreak = 0;
         this.lastIgnoredDirectiveTurn = null;
+        this.repeatedViolationCounts.clear();
       }
       pass() {
         return {
@@ -577628,11 +577707,20 @@ 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;
-          const file = top.file;
+          let file = top.file;
+          if (!file && top.symbol && this.lockedSource.has(top.symbol)) {
+            file = this.lockedSource.get(top.symbol);
+          }
+          if (!file)
+            return null;
+          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;
@@ -591687,6 +591775,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);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.482",
+  "version": "1.0.484",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.482",
+      "version": "1.0.484",
       "bundleDependencies": [
         "image-to-ascii"
       ],
@@ -4096,9 +4096,9 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.27",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.27.tgz",
-      "integrity": "sha512-1yrb/+w6HWQJrUCLkJ2IF5jNIPvvFkblV5RNOYl6bV+OA6p9GLcMpHFFGTosSvHvcAUibuUukRqhlYI4z32C7Q==",
+      "version": "4.12.28",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.28.tgz",
+      "integrity": "sha512-YwUvVpSF7m1yOblFPrU3Hbo8XhPheBoiyfGuII6z19LnOr6JpDnyyp7LFNrfV56wS8tpvtBFGRISHN02pDdLOA==",
       "license": "MIT",
       "engines": {
         "node": ">=16.9.0"

package/package.json

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