omnius 1.0.520 → 1.0.522

package/dist/index.js

@@ -566866,6 +566866,9 @@ var init_ollama_pool = __esm({
           return this.buildSlot(pick, resolvedAgentId);
         }
         if (placementMode === "constrained") {
+          if (optsWithAgent.queuePolicy === "skip") {
+            throw new Error("No GPU slot immediately available. All slots occupied.");
+          }
           return this.acquireQueued(optsWithAgent, resolvedAgentId);
         }
         const spawned = placementMode === "elastic" ? await this.maybeSpawnInstance(optsWithAgent.model) : null;
@@ -566875,6 +566878,9 @@ var init_ollama_pool = __esm({
             this.recordAffinity(resolvedAgentId, spawned.state.id);
           return this.buildSlot(spawned, resolvedAgentId);
         }
+        if (optsWithAgent.queuePolicy === "skip") {
+          throw new Error("No GPU slot immediately available. All slots occupied.");
+        }
         return this.acquireQueued(optsWithAgent, resolvedAgentId);
       }
       /** Synchronous routing decision; returns the instance or null if every one is saturated. */
@@ -566936,7 +566942,8 @@ var init_ollama_pool = __esm({
             return this.buildSlot(pick, agentId);
           }
           await new Promise((resolve79, reject) => {
-            const timer = setTimeout(() => reject(new Error("No GPU slot available after 30s. All slots occupied.")), 3e4);
+            const timeoutMs = Number.isFinite(opts.queueTimeoutMs) && (opts.queueTimeoutMs ?? 0) > 0 ? Math.floor(opts.queueTimeoutMs) : 3e4;
+            const timer = setTimeout(() => reject(new Error(`No GPU slot available after ${(timeoutMs / 1e3).toFixed(0)}s. All slots occupied.`)), timeoutMs);
             this.slotWaiters.push(() => {
               clearTimeout(timer);
               resolve79();
@@ -598799,8 +598806,14 @@ ${marker}` : marker);
           return { args, patchedCount: 0 };
         }
         if (toolName === "file_edit") {
-          if (this._normalizeExpectedHashValue(this._rawExpectedHashValue(args))) {
-            return { args, patchedCount: 0 };
+          const currentHash = this._normalizeExpectedHashValue(this._rawExpectedHashValue(args));
+          if (currentHash) {
+            const path16 = this.extractPrimaryToolPath(args);
+            const fresh2 = path16 ? this._freshReadHashForEditPath(path16) : null;
+            if (!fresh2 || fresh2.hash === currentHash) {
+              return { args, patchedCount: 0 };
+            }
+            return { args: { ...args, expected_hash: fresh2.hash }, patchedCount: 1 };
           }
           const path15 = this.extractPrimaryToolPath(args);
           const fresh = path15 ? this._freshReadHashForEditPath(path15) : null;
@@ -598826,11 +598839,15 @@ ${marker}` : marker);
           if (!edit || typeof edit !== "object" || Array.isArray(edit))
             return edit;
           const rec = edit;
-          if (this._normalizeExpectedHashValue(this._rawExpectedHashValue(rec))) {
-            return rec;
-          }
           const path15 = typeof rec["path"] === "string" ? rec["path"] : typeof rec["file"] === "string" ? rec["file"] : "";
           const fresh = path15 ? this._freshReadHashForEditPath(path15) : null;
+          const currentHash = this._normalizeExpectedHashValue(this._rawExpectedHashValue(rec));
+          if (currentHash) {
+            if (!fresh || fresh.hash === currentHash)
+              return rec;
+            patchedCount++;
+            return { ...rec, expected_hash: fresh.hash };
+          }
           if (!fresh)
             return rec;
           patchedCount++;
@@ -599060,6 +599077,40 @@ ${marker}` : marker);
         return changed ? next : args;
       }
       _normalizeToolArgsForExecution(toolName, args) {
+        if (toolName === "todo_write") {
+          if (args["todos"] !== void 0)
+            return args;
+          const content = String(args["content"] ?? "").trim();
+          if (!content)
+            return args;
+          const action = String(args["action"] ?? "").trim().toLowerCase();
+          const rawStatus = String(args["status"] ?? "").trim();
+          const status = ["pending", "in_progress", "completed", "blocked"].includes(rawStatus) ? rawStatus : action === "complete" || action === "completed" || action === "done" ? "completed" : action === "block" || action === "blocked" ? "blocked" : "in_progress";
+          const todo = { content, status };
+          if (typeof args["id"] === "string" && args["id"].trim()) {
+            todo["id"] = args["id"].trim();
+          }
+          if (typeof args["parentId"] === "string" && args["parentId"].trim()) {
+            todo["parentId"] = args["parentId"].trim();
+          }
+          const artifact = args["file"] ?? args["path"];
+          if (typeof artifact === "string" && artifact.trim()) {
+            todo["declaredArtifacts"] = [artifact.trim()];
+          }
+          if (typeof args["verifyCommand"] === "string" && args["verifyCommand"].trim()) {
+            todo["verifyCommand"] = args["verifyCommand"].trim();
+          }
+          if (typeof args["blocker"] === "string" && args["blocker"].trim()) {
+            todo["blocker"] = args["blocker"].trim();
+          }
+          const next2 = { todos: [todo] };
+          if (typeof args["session_id"] === "string" && args["session_id"].trim()) {
+            next2["session_id"] = args["session_id"].trim();
+          } else if (typeof args["sessionId"] === "string" && args["sessionId"].trim()) {
+            next2["session_id"] = args["sessionId"].trim();
+          }
+          return next2;
+        }
         if (toolName === "working_notes") {
           let next2 = args;
           const copy2 = () => {
@@ -599218,7 +599269,7 @@ ${marker}` : marker);
         return [
           "[EDIT FRESHNESS CONTRACT]",
           "Exact replacement edits must be built from verified current file content, not remembered text.",
-          "Before file_edit or batch_edit can run, each target must carry expected_hash from file_read. If the runner has fresh read evidence, it will attach that hash automatically; otherwise the edit tool verifies the provided hash against disk before mutating.",
+          "Before file_edit or batch_edit can run, each target must carry expected_hash from file_read. If the runner has fresh read evidence, it will attach or refresh that hash automatically; otherwise the edit tool verifies the provided hash against disk before mutating.",
           "For multiple edits to the same file, use one batch_edit against the same expected_hash so all replacements validate atomically before the file changes.",
           "",
           ...problems.map((problem) => `- ${problem}`),
@@ -603790,7 +603841,9 @@ ${description}`
           body["num_ctx"] = reqNumCtx;
         }
         let poolSlot = shouldUseOllamaPoolForBaseUrl(this.baseUrl) ? await getOllamaPool({ baseInstanceUrl: this.baseUrl }).acquire({
-          model: this.model
+          model: this.model,
+          queuePolicy: request.poolQueuePolicy,
+          queueTimeoutMs: request.poolQueueTimeoutMs
         }) : null;
         let requestBaseUrl = poolSlot?.baseUrl ?? this.baseUrl;
         let poolSuccess = false;
@@ -604185,7 +604238,9 @@ ${description}`
           body["num_ctx"] = reqNumCtx;
         }
         let poolSlot = shouldUseOllamaPoolForBaseUrl(this.baseUrl) ? await getOllamaPool({ baseInstanceUrl: this.baseUrl }).acquire({
-          model: this.model
+          model: this.model,
+          queuePolicy: request.poolQueuePolicy,
+          queueTimeoutMs: request.poolQueueTimeoutMs
         }) : null;
         let requestBaseUrl = poolSlot?.baseUrl ?? this.baseUrl;
         let poolSuccess = false;
@@ -686381,13 +686436,70 @@ var init_emotion_engine = __esm({
         this.state.arousal = BASELINE_AROUSAL + (this.state.arousal - BASELINE_AROUSAL) * decayFactor;
         this.state.updatedAt = Date.now();
       }
+      emotionModelInferencePolicy() {
+        const raw = process.env["OMNIUS_EMOTION_MODEL_INFERENCE"] ?? process.env["OMNIUS_EMOTION_LLM"] ?? this.config.modelInference ?? "auto";
+        const value2 = String(raw).trim().toLowerCase();
+        if (["0", "false", "off", "no", "disabled"].includes(value2)) {
+          return "off";
+        }
+        if (["1", "true", "on", "yes", "enabled"].includes(value2)) {
+          return "on";
+        }
+        return "auto";
+      }
+      async admitInternalInference() {
+        const policy = this.emotionModelInferencePolicy();
+        if (policy === "off") {
+          return { allowed: false, reason: "emotion_model_inference_disabled" };
+        }
+        if (policy === "on") return { allowed: true };
+        if (!shouldUseOllamaPoolForBaseUrl(this.config.backendUrl)) {
+          return { allowed: true };
+        }
+        try {
+          const status = await getOllamaPool({
+            baseInstanceUrl: this.config.backendUrl
+          }).status();
+          const gpuCount = status.hardware.gpus.length;
+          if (status.placement.mode === "constrained") {
+            return {
+              allowed: false,
+              reason: `local_ollama_constrained_placement:${gpuCount}gpu`
+            };
+          }
+          const hasImmediateSlot = status.instances.some((inst) => {
+            const maxParallel = Math.max(1, inst.maxParallel);
+            return inst.inflight < maxParallel;
+          });
+          if (!hasImmediateSlot) {
+            return {
+              allowed: false,
+              reason: "local_ollama_no_immediate_background_slot"
+            };
+          }
+        } catch (err) {
+          const detail = err instanceof Error ? err.message : String(err);
+          return {
+            allowed: false,
+            reason: `local_ollama_pool_status_unavailable:${detail.slice(0, 160)}`
+          };
+        }
+        return { allowed: true };
+      }
       async runDirectInternalInference(opts) {
-        const backend = new OllamaAgenticBackend(
-          this.config.backendUrl,
-          this.config.model,
-          this.config.apiKey,
-          false
-        );
+        const cwd4 = resolve68(process.cwd());
+        const startedAt2 = Date.now();
+        const admission = await this.admitInternalInference();
+        if (!admission.allowed) {
+          this.recordInternalDecision({
+            stage: opts.stage,
+            status: "skipped",
+            elapsedMs: Date.now() - startedAt2,
+            skipReason: admission.reason,
+            promptChars: opts.system.length + opts.user.length
+          });
+          return null;
+        }
         const request = {
           messages: [
             { role: "system", content: opts.system },
@@ -686398,10 +686510,10 @@ var init_emotion_engine = __esm({
           maxTokens: opts.maxTokens,
           timeoutMs: opts.timeoutMs,
           think: false,
-          disableEmptyContentRecovery: true
+          disableEmptyContentRecovery: true,
+          poolQueuePolicy: "skip",
+          poolQueueTimeoutMs: 1
         };
-        const cwd4 = resolve68(process.cwd());
-        const startedAt2 = Date.now();
         recordContextWindowDump({
           source: "emotionEngine",
           stage: opts.stage,
@@ -686416,6 +686528,12 @@ var init_emotion_engine = __esm({
           request
         });
         try {
+          const backend = new OllamaAgenticBackend(
+            this.config.backendUrl,
+            this.config.model,
+            this.config.apiKey,
+            false
+          );
           const result = await backend.chatCompletion(request);
           const output = String(
             result.choices?.[0]?.message?.content ?? ""
@@ -686478,6 +686596,12 @@ var init_emotion_engine = __esm({
             timeoutMs: 1e4,
             note: "best-effort emotion label refresh"
           });
+          if (output === null) {
+            this.lastLabelUpdate = Date.now();
+            this.lastLabelValence = this.state.valence;
+            this.lastLabelArousal = this.state.arousal;
+            return;
+          }
           const match = output.match(new RegExp("^(\\p{Emoji_Presentation}|\\p{Emoji}\\uFE0F?)\\s+(\\S+)", "u"));
           if (match) {
             this.state.emoji = match[1];
@@ -686552,6 +686676,7 @@ var init_emotion_engine = __esm({
             timeoutMs: 2e4,
             note: "best-effort Telegram admin outreach gate"
           });
+          if (output === null) return;
           const message2 = this.normalizeReflectionDecision(output);
           if (message2) outreach(message2);
         } catch {

package/npm-shrinkwrap.json

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

package/package.json

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