omnius 1.0.473 → 1.0.475

package/dist/index.js

@@ -559107,7 +559107,7 @@ var init_boundary_verifier = __esm({
   "packages/execution/dist/boundary-verifier.js"() {
     "use strict";
     HEADER_EXT = /\.(h|hh|hpp|hxx|d\.ts)$/i;
-    CONTRACT_HINT = /(^|\/)(types|interfaces?|contract|schema|protocol|api|pal)\b/i;
+    CONTRACT_HINT = /(^|\/)(types?|interfaces?|contracts?|schemas?|protocols?|api|dto|models?)\b/i;
   }
 });
 
@@ -575946,7 +575946,7 @@ function resolveFocusSupervisorMode(configured, envValue = process.env["OMNIUS_F
     return "strict";
   return "auto";
 }
-function violatesDirective(directive, input) {
+function violatesDirective(directive, input, cwd4) {
   if (input.toolName === "task_complete") {
     const completionStatus = normalizeCompletionStatus(input.completionStatus ?? input.args?.["status"] ?? input.args?.["completion_status"] ?? input.args?.["completionStatus"]);
     const summaryText = typeof input.args?.["summary"] === "string" ? input.args["summary"] : "";
@@ -575962,7 +575962,7 @@ function violatesDirective(directive, input) {
   }
   if (input.toolName === "ask_user")
     return false;
-  const family = actionFamily(input.toolName, input.args);
+  const family = actionFamily(input.toolName, input.args, cwd4);
   if (directive.requiredNextAction !== "update_todos" && directiveExplicitlyForbidsCall(directive, input, family)) {
     return true;
   }
@@ -576095,7 +576095,41 @@ function actionReasonSummary(actionReason) {
   ].filter(Boolean);
   return parts.length > 0 ? `Action reason observed: ${parts.join("; ").slice(0, 700)}` : "";
 }
-function actionFamily(toolName, args) {
+function normalizeShellForFamily(command, cwd4) {
+  let s2 = String(command || "").replace(/\\\r?\n/g, " ").replace(/\s+/g, " ").trim();
+  if (cwd4 && cwd4.length > 1) {
+    const abs = cwd4.replace(/\/+$/, "");
+    s2 = s2.split(abs + "/").join("");
+    s2 = s2.split(abs).join(".");
+  }
+  s2 = s2.replace(/\s*(?:\d*>&\d+|&>\s*\/dev\/null|\d*>\s*\/dev\/null)/g, "");
+  let prev;
+  do {
+    prev = s2;
+    s2 = s2.replace(/\s*\|\s*(?:tail|head|less|cat|more)\b[^|]*$/i, "");
+  } while (s2 !== prev);
+  return s2.replace(/\s+/g, " ").trim();
+}
+function failureProgressSignal(text2) {
+  const s2 = String(text2 || "");
+  if (!s2.trim())
+    return void 0;
+  let explicit;
+  for (const m2 of s2.matchAll(/(\d+)\s+(?:errors?|failures?|failed|problems?)\b/gi)) {
+    const n2 = Number(m2[1]);
+    if (Number.isFinite(n2))
+      explicit = Math.max(explicit ?? 0, n2);
+  }
+  if (explicit != null)
+    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))
+      lines++;
+  }
+  return lines > 0 ? lines : void 0;
+}
+function actionFamily(toolName, args, cwd4) {
   if (isEditTool(toolName)) {
     const path13 = primaryPath(args);
     const target2 = editTargetDescriptor(toolName, args);
@@ -576103,14 +576137,14 @@ function actionFamily(toolName, args) {
   }
   if (toolName === "shell") {
     const command = args?.["command"] ?? args?.["cmd"] ?? "";
-    return `${toolName}:${compactTarget(String(command ?? "") || "no-command", 120)}`;
+    return `${toolName}:${compactTarget(normalizeShellForFamily(String(command ?? ""), cwd4) || "no-command", 120)}`;
   }
   const target = primaryPath(args) ?? "";
   return `${toolName}:${compactTarget(String(target ?? "")) || "no-target"}`;
 }
-function failureFamilyKey(toolName, args, error, output) {
+function failureFamilyKey(toolName, args, error, output, cwd4) {
   const errorClass = failureErrorClass(error || output || "");
-  return `${actionFamily(toolName, args)}:${errorClass}`;
+  return `${actionFamily(toolName, args, cwd4)}:${errorClass}`;
 }
 function cleanFailureSample(text2) {
   return String(text2 || "").replace(/\s+/g, " ").trim().slice(0, 180);
@@ -576245,6 +576279,10 @@ var init_focusSupervisor = __esm({
       convergenceBreaker = null;
       /** WO-3: set when a mutation lands, consumed by the next observed failure. */
       sawMutationSinceFailure = false;
+      /** WO-9: run cwd for shell family path-form canonicalization. */
+      familyCwd = void 0;
+      /** WO-9b: within-session repeat count per coarse action-identity family. */
+      convergenceFamilyCounts = /* @__PURE__ */ new Map();
       ignoredDirectiveStreak = 0;
       lastIgnoredDirectiveTurn = null;
       availableTools = null;
@@ -576254,6 +576292,7 @@ var init_focusSupervisor = __esm({
         this.repeatGateMax = Math.max(0, Math.floor(options2.repeatGateMax ?? 3));
         this.availableTools = options2.availableTools ? new Set(Array.from(options2.availableTools)) : null;
         this.convergenceBreaker = options2.convergenceBreaker ?? null;
+        this.familyCwd = options2.cwd;
       }
       get enabled() {
         return this.mode !== "off";
@@ -576314,9 +576353,9 @@ var init_focusSupervisor = __esm({
             this.ignoredDirectiveStreak = 0;
           }
         }
-        const family = actionFamily(input.toolName, input.args);
+        const family = actionFamily(input.toolName, input.args, this.familyCwd);
         const prior = this.directive;
-        if (prior && violatesDirective(prior, input)) {
+        if (prior && violatesDirective(prior, input, this.familyCwd)) {
           if (prior.state === "warn") {
             this.lastDecision = "warn_not_enforced";
             this.lastReason = prior.reason;
@@ -576484,6 +576523,11 @@ var init_focusSupervisor = __esm({
           return;
         }
         if (input.toolName === "shell" && input.success) {
+          if (this.convergenceBreaker) {
+            const fam = actionFamily(input.toolName, input.args, this.familyCwd);
+            this.convergenceBreaker.resolve(fam);
+            this.convergenceFamilyCounts.delete(fam);
+          }
           if (this.directive?.requiredNextAction === "run_verification") {
             this.clearSatisfiedDirective("verification ran successfully", input.turn);
           } else if (input.isReadLike && this.directive?.requiredNextAction === "read_authoritative_target") {
@@ -576495,7 +576539,7 @@ var init_focusSupervisor = __esm({
         }
         if (input.success)
           return;
-        const family = failureFamilyKey(input.toolName, input.args, input.error, input.output);
+        const family = failureFamilyKey(input.toolName, input.args, input.error, input.output, this.familyCwd);
         const existing = this.failureFamilies.get(family);
         const next = {
           count: (existing?.count ?? 0) + 1,
@@ -576507,10 +576551,10 @@ var init_focusSupervisor = __esm({
         if (next.count >= 2) {
           const ambiguousEditFailure = isEditTool(input.toolName) && next.errorClass === "stale_ambiguous_target";
           const staleEditFailure = isEditTool(input.toolName) && next.errorClass.startsWith("stale_");
-          const forbidden = staleEditFailure ? ambiguousEditFailure ? [actionFamily(input.toolName, input.args)] : uniqueLimited([
-            actionFamily(input.toolName, input.args),
+          const forbidden = staleEditFailure ? ambiguousEditFailure ? [actionFamily(input.toolName, input.args, this.familyCwd)] : uniqueLimited([
+            actionFamily(input.toolName, input.args, this.familyCwd),
             input.toolName
-          ]) : input.toolName === "shell" ? [actionFamily(input.toolName, input.args)] : [actionFamily(input.toolName, input.args)];
+          ]) : input.toolName === "shell" ? [actionFamily(input.toolName, input.args, this.familyCwd)] : [actionFamily(input.toolName, input.args, this.familyCwd)];
           const requiredNextAction = ambiguousEditFailure ? "disambiguate_edit_match" : staleEditFailure ? "read_authoritative_target" : input.toolName === "shell" ? "use_cached_evidence" : this.resolveRequiredNextAction("update_todos");
           this.setDirective({
             turn: input.turn,
@@ -576529,17 +576573,24 @@ var init_focusSupervisor = __esm({
             state: shellFailure ? "cached_evidence" : "warn",
             reason: `first ${input.toolName} failure (${next.errorClass}): ${next.sample}`,
             requiredNextAction,
-            forbiddenActionFamilies: shellFailure ? [actionFamily(input.toolName, input.args)] : [actionFamily(input.toolName, input.args)]
+            forbiddenActionFamilies: shellFailure ? [actionFamily(input.toolName, input.args, this.familyCwd)] : [actionFamily(input.toolName, input.args, this.familyCwd)]
           });
         }
         if (this.convergenceBreaker) {
+          const convergenceFamily = actionFamily(input.toolName, input.args, this.familyCwd);
+          const convCount = (this.convergenceFamilyCounts.get(convergenceFamily) ?? 0) + 1;
+          this.convergenceFamilyCounts.set(convergenceFamily, convCount);
           const verdict = this.convergenceBreaker.observe({
-            family,
-            sessionCount: next.count,
+            family: convergenceFamily,
+            sessionCount: convCount,
             turn: input.turn,
             sample: next.sample,
             errorClass: next.errorClass,
-            mutatedSinceLast: this.sawMutationSinceFailure
+            mutatedSinceLast: this.sawMutationSinceFailure,
+            // Root fix: progress = the action's error count dropped, not that an
+            // edit happened. Extract the signal from the action's own output so a
+            // futile edit loop (rebuilding with the same error count) escalates.
+            failureSignal: failureProgressSignal(input.output || input.error)
           });
           this.sawMutationSinceFailure = false;
           if (verdict.tier === "abandon") {
@@ -576550,7 +576601,7 @@ var init_focusSupervisor = __esm({
               state: "forced_replan",
               reason: verdict.reason,
               requiredNextAction: this.resolveRequiredNextAction("run_verification"),
-              forbiddenActionFamilies: [actionFamily(input.toolName, input.args)]
+              forbiddenActionFamilies: [actionFamily(input.toolName, input.args, this.familyCwd)]
             });
           }
         }
@@ -576702,6 +576753,8 @@ var init_convergence_breaker = __esm({
       baseline = /* @__PURE__ */ new Map();
       /** Progress decay accumulated this session (one per productive mutation). */
       decay = /* @__PURE__ */ new Map();
+      /** Last verification signal (error count) seen per family, for delta-based progress. */
+      lastSignal = /* @__PURE__ */ new Map();
       constructor(options2 = {}) {
         this.warnRound = Math.max(1, options2.warnRound ?? DEFAULTS.warnRound);
         this.stallRound = Math.max(this.warnRound + 1, options2.stallRound ?? DEFAULTS.stallRound);
@@ -576721,7 +576774,15 @@ var init_convergence_breaker = __esm({
         }
         const base3 = this.baseline.get(obs.family) ?? 0;
         let dec = this.decay.get(obs.family) ?? 0;
-        if (obs.mutatedSinceLast) {
+        let madeProgress;
+        if (obs.failureSignal != null) {
+          const prev = this.lastSignal.get(obs.family);
+          madeProgress = prev != null && obs.failureSignal < prev;
+          this.lastSignal.set(obs.family, obs.failureSignal);
+        } else {
+          madeProgress = Boolean(obs.mutatedSinceLast);
+        }
+        if (madeProgress) {
           dec += 1;
           this.decay.set(obs.family, dec);
         }
@@ -576743,6 +576804,7 @@ var init_convergence_breaker = __esm({
         this.live.delete(family);
         this.baseline.delete(family);
         this.decay.delete(family);
+        this.lastSignal.delete(family);
         this.store.save({ family, rounds: 0, updatedAtMs: Date.now() });
       }
       snapshot() {
@@ -587163,7 +587225,10 @@ Respond with your assessment, then take action.`;
           // WO-3: convergence circuit-breaker escalates a non-converging
           // failure family past forced_replan to a terminal report, with
           // cross-session carry persisted under .omnius/convergence-ledger.json.
-          convergenceBreaker: this._longHaul?.convergenceBreaker ?? null
+          convergenceBreaker: this._longHaul?.convergenceBreaker ?? null,
+          // WO-9: run cwd so shell family keys canonicalize absolute↔relative
+          // path form and command variants collapse into one family.
+          cwd: this.authoritativeWorkingDirectory()
         });
         if (!this._workingDirectory) {
           this._workingDirectory = _pathResolve(process.cwd());

package/npm-shrinkwrap.json

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

package/package.json

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