newmark-agent 0.6.4 → 0.6.8

package/dist/tui/src/adapters/core-runtime-adapter.js

@@ -213,7 +213,10 @@ function createCoreRuntimeAdapter(options = {}) {
     status: agent.status,
     connected: true,
     runtimeRoot: root,
-    remoteTouchEnabled: agent.config.getBool('remote', 'touch_enabled')
+    remoteTouchEnabled: agent.config.getBool('remote', 'touch_enabled'),
+    autoSwitchEnabled: agent.config.autoSwitchEnabled(),
+    autoSwitchScope: agent.config.autoSwitchScope(),
+    jevDecisionModel: agent.jevDecisionModelState()
   });
 
   const snapshotFor = (requested = currentTarget()) => {
@@ -257,6 +260,7 @@ function createCoreRuntimeAdapter(options = {}) {
   };
 
   const applyConfig = (config) => {
+    let refused = null;
     for (const [key, value] of Object.entries(config || {})) {
       switch (key) {
         case "theme": agent.config.set("ui", "dark_mode", value); break;
@@ -268,10 +272,18 @@ function createCoreRuntimeAdapter(options = {}) {
         case "dialogStyle": agent.config.set("ui", "dialog_style", value); break;
         case "nativeTools": agent.config.set("tools", "enabled", value); break;
         case "providers": agent.updateProviders(mergeProviderConfig(agent.config.providers(), value)); break;
+        case "jevDecisionModel": {
+          // The Agent owns the Auto/decision-model contract: while Auto is off
+          // it refuses every edit, so the TUI cannot unlock a model change.
+          const result = agent.updateJevDecisionModel(value || {});
+          if (!result.ok) refused = { ok: false, reason: result.reason, state: result.state };
+          break;
+        }
         default: agent.config.set("ui", key, value);
       }
     }
     agent.config.save();
+    if (refused) return refused;
     return { ok: true };
   };
 

package/dist/tui/src/i18n.js

@@ -73,12 +73,13 @@ const ZH = Object.freeze({
   "Type a message · Shift+Enter newline · Enter send": "输入消息 · Shift+Enter 换行 · Enter 发送",
   "Select a conversation · Enter to edit": "选择对话 · Enter 编辑",
 
-  // Settings categories
+// Settings categories
   "General": "通用",
   "Personalization": "个性化",
   "Runtime": "运行时",
   "Providers": "服务商",
   "Models": "模型",
+  "JEV Auto routing": "JEV 自动路由",
   "Archive": "归档",
   "Updates": "更新",
 
@@ -103,6 +104,16 @@ const ZH = Object.freeze({
   "Retention": "保留期",
   "Include Memory Lab": "包含记忆实验室",
   "Export format": "导出格式",
+  "Current-model decision": "当前模型决策",
+  "Decision source": "决策来源",
+  "Current eligible model": "当前符合条件的模型",
+  "Thinking mode": "思考模式",
+  "Off": "关闭",
+  "Output format": "输出格式",
+  "Strict JSON Schema": "严格 JSON Schema",
+  "Decision timeout": "决策超时",
+  "Deterministic fallback": "确定性回退",
+  "Auto routing": "自动路由",
   "Update channel": "更新通道",
   "Automatic checks": "自动检查",
   "Automatic download": "自动下载",

package/dist/tui/src/render.js

@@ -987,7 +987,7 @@ function settingsView(state, width, p) {
         const style = state.focusRegion === "content" && state.contentColumn === 1 && i === state.selected ? `${p.selected}` : "";
         if (style) state.contentFocusLine = 4 + i * 2;
         return [
-          `${style} ${p.bold}${pad(row.label, 27)}${p.reset} ${p.cyan}${displaySettingValue(row.value)}${p.reset}${row.extension ? ` ${p.amber}TUI EXTENSION${p.reset}` : ""}`,
+          `${style} ${p.bold}${pad(row.label, 27)}${p.reset} ${p.cyan}${displaySettingValue(row.value)}${p.reset}${row.locked ? ` ${p.amber}LOCKED${p.reset}` : ""}${row.extension ? ` ${p.amber}TUI EXTENSION${p.reset}` : ""}`,
           `   ${p.muted}${settingDescription(state.settingsTab, row.key)}${p.reset}`
         ];
       }),
@@ -1030,7 +1030,13 @@ function settingDescription(tab, key) {
     channel: "Stable or prerelease update stream.",
     autoCheck: "Check for updates during application startup.",
     autoDownload: "Download only after a successful simulated check.",
-    source: "GitHub release or local package source."
+    source: "GitHub release or local package source.",
+    enabled: "Enable or disable model-backed Auto decisions; disabled means Auto keeps the current model.",
+    decisionModel: "Use the current eligible conversation model, or the configured default on the first Auto route.",
+    thinkingMode: "JEV requests the provider's no-thinking mode.",
+    outputFormat: "JEV uses native strict JSON Schema output and validates the returned object before routing.",
+    timeoutMs: "Hard budget for one current-model Auto decision; a timeout stops Auto routing without selecting another model.",
+    autoSwitch: "Auto routing master switch; while it is off current-model decision settings are locked and no model changes."
   };
   return descriptions[key] || `${tab} setting`;
 }
@@ -1077,6 +1083,7 @@ function settingsActionHint(tab) {
   if (tab === "general") return "Enter opens Guide/Next list for Input mode · O open config · R refresh";
   if (tab === "archive") return "L list archive inventory";
   if (tab === "updates") return "U check version and GitHub update";
+  if (tab === "jev") return "Enter changes current-model decision settings · thinking off · strict JSON Schema · failures stop routing";
   return "Enter cycles or toggles the selected setting";
 }
 

package/dist/tui/src/settings-schema.js

@@ -6,6 +6,7 @@ const SETTINGS_CATEGORIES = Object.freeze([
   { id: "runtime", icon: "[R]", label: "Runtime", source: "agent.* / terminal.*" },
   { id: "providers", icon: "[V]", label: "Providers", source: "models.providers" },
   { id: "models", icon: "[M]", label: "Models", source: "models.providers[].models" },
+  { id: "jev", icon: "[J]", label: "Auto decision policy", source: "current eligible conversation model + models.jev_* policy" },
   { id: "tools", icon: "[T]", label: "Tools", source: "tools.enabled" },
   { id: "archive", icon: "[A]", label: "Archive", source: "archive API / archive.*" },
   { id: "updates", icon: "[U]", label: "Updates", source: "update API / updates.*" }
@@ -15,6 +16,8 @@ const FONT_CHOICES = Object.freeze(["Terminal default", "Cascadia Mono", "JetBra
 const FONT_COLOR_CHOICES = Object.freeze(["#E6EAF2", "#B7E4FF", "#C7F9CC", "#FFD6A5", "#F8B4D9"]);
 const BACKGROUND_COLOR_CHOICES = Object.freeze(["#0A0A1A", "#111827", "#172554", "#1F2937", "#F0F2F8"]);
 
+const JEV_TIMEOUT_PRESETS = Object.freeze([500, 1000, 2000, 3000, 5000, 10000]);
+
 function settingsRows(state, tab = state.settingsTab) {
   const s = state.settings;
   if (tab === "general") return [
@@ -40,6 +43,21 @@ function settingsRows(state, tab = state.settingsTab) {
     { key: "terminalTimeout", label: "Terminal timeout cap", value: s.runtime.terminalTimeout, choices: [0, 30000, 60000, 120000], save: ["setting", "terminal", "interrupt_timeout_ms"] },
     { key: "defaultShell", label: "Default shell", value: s.runtime.defaultShell, choices: ["PowerShell", "Command Prompt", "WSL Bash"], save: ["setting", "terminal", "default_shell"] }
   ];
+  if (tab === "jev") {
+    const jev = s.jev || {};
+    // Auto off locks current-model decision settings: the rows stay visible so the user can see
+    // why, but Enter refuses every change (see setSelectedRow in state.js).
+    const locked = jev.locked === true || jev.autoEnabled === false;
+    const lockedValue = locked ? "Locked (Auto off)" : undefined;
+    return [
+      { key: "enabled", label: "Current-model decision", value: lockedValue || (jev.enabled === false ? "Off" : "On"), choices: [], action: "jev-toggle-enabled", locked },
+      { key: "decisionModel", label: "Decision source", value: "Current eligible model", choices: [], action: "jev-report-current-model", locked: true },
+      { key: "thinkingMode", label: "Thinking mode", value: "Off", choices: [], action: "jev-report-current-model", locked: true },
+      { key: "outputFormat", label: "Output format", value: "Strict JSON Schema", choices: [], action: "jev-report-current-model", locked: true },
+      { key: "timeoutMs", label: "Decision timeout", value: lockedValue || `${Number(jev.timeoutMs) || 3000} ms`, choices: [], action: "jev-cycle-timeout", locked },
+      { key: "autoSwitch", label: "Auto routing", value: jev.autoEnabled === false ? "Off" : "On", choices: [], action: "jev-report-auto" }
+    ];
+  }
   if (tab === "archive") return [
     { key: "autoArchive", label: "Automatic archive", value: s.archive.autoArchive, choices: [true, false], save: ["setting", "archive", "automatic"] },
     { key: "retentionDays", label: "Retention", value: s.archive.retentionDays, choices: [30, 90, 180, 365], save: ["setting", "archive", "retention_days"] },
@@ -67,6 +85,7 @@ module.exports = {
   BACKGROUND_COLOR_CHOICES,
   FONT_CHOICES,
   FONT_COLOR_CHOICES,
+  JEV_TIMEOUT_PRESETS,
   SETTINGS_CATEGORIES,
   displaySettingValue,
   settingsRows

package/dist/tui/src/state.js

@@ -3,7 +3,11 @@
 const data = require("./data");
 const { createMockNewmarkAdapter } = require("./adapters/mock-newmark-adapter");
 const { targetKey, validateSnapshot } = require("./adapters/newmark-contract");
-const { SETTINGS_CATEGORIES, settingsRows } = require("./settings-schema");
+const {
+  JEV_TIMEOUT_PRESETS,
+  SETTINGS_CATEGORIES,
+  settingsRows
+} = require("./settings-schema");
 const INTELLIGENCE_TIERS = Object.freeze(["low", "medium", "high", "xhigh", "max", "ultra"]);
 const HEX_COLOR_PATTERN = /^#[0-9a-f]{6}$/i;
 const THEME_APPEARANCE_DEFAULTS = Object.freeze({
@@ -93,6 +97,17 @@ function applySnapshot(state, snapshot) {
   if (state.runningConversationKeys) {
     state.busy = state.runningConversationKeys.has(targetKey(valid.target));
   }
+  // Current-model decision settings + Auto master switch drive the locked state of the JEV
+  // settings rows, so they must follow every authoritative snapshot.
+  if (valid.jevDecisionModel && state.settings) {
+    state.jevDecisionModel = valid.jevDecisionModel;
+    state.settings.jev = {
+      autoEnabled: valid.jevDecisionModel.autoEnabled !== false,
+      locked: valid.jevDecisionModel.locked === true || valid.jevDecisionModel.autoEnabled === false,
+      enabled: valid.jevDecisionModel.enabled !== false,
+      timeoutMs: Number(valid.jevDecisionModel.timeoutMs || 3000)
+    };
+  }
   return state;
 }
 
@@ -280,6 +295,12 @@ function createState(options = {}) {
         autoCheck: true,
         autoDownload: false,
         source: "GitHub"
+      },
+      jev: {
+        autoEnabled: snapshot.autoSwitchEnabled !== false,
+        locked: snapshot.autoSwitchEnabled === false,
+        enabled: snapshot.jevDecisionModel ? snapshot.jevDecisionModel.enabled !== false : true,
+        timeoutMs: Number(snapshot.jevDecisionModel?.timeoutMs || 3000)
       }
     }
   };
@@ -1072,6 +1093,9 @@ function toggleSelected(state) {
     }
     const row = settingsRows(state)[state.selected];
     if (!row) return;
+    if (typeof row.action === "string" && row.action.startsWith("jev-")) {
+      return applyJevDecisionRow(state, row);
+    }
     if (row.action === "pair-mobile") {
       state.overlay = "pair";
       state.pairingQrLines = ["Loading pairing QR…"];
@@ -1112,6 +1136,50 @@ function toggleSelected(state) {
   }
 }
 
+/**
+ * Current-model JEV settings rows.
+ *
+ * The Agent is authoritative: while Auto is off it refuses every edit, so the
+ * TUI reports the lock instead of pretending a change happened. The decision
+ * source is always the current eligible conversation model.
+ */
+function applyJevDecisionRow(state, row) {
+  const jev = state.jevDecisionModel && typeof state.jevDecisionModel === "object" ? state.jevDecisionModel : {};
+  if (row.action === "jev-report-auto") {
+    state.notice = jev.autoEnabled === false
+      ? "Auto routing is off: current-model decision settings are locked and no model may change."
+      : "Auto routing is on: JEV uses the current eligible conversation model with thinking off and strict JSON Schema output.";
+    return true;
+  }
+  if (row.action === "jev-report-current-model") {
+    state.notice = "JEV sends a strict JSON Schema decision request to the current eligible conversation model with thinking disabled.";
+    return true;
+  }
+  if (jev.locked === true || jev.autoEnabled === false) {
+    state.notice = "Auto is off: current-model decision settings are locked. Turn Auto on first — no model may change while Auto is off.";
+    return true;
+  }
+  const patch = {};
+  if (row.action === "jev-toggle-enabled") patch.enabled = jev.enabled === false;
+  if (row.action === "jev-cycle-timeout") {
+    const index = JEV_TIMEOUT_PRESETS.indexOf(Number(jev.timeoutMs));
+    patch.timeoutMs = JEV_TIMEOUT_PRESETS[(index + 1 + JEV_TIMEOUT_PRESETS.length) % JEV_TIMEOUT_PRESETS.length];
+  }
+  if (!Object.keys(patch).length) return true;
+  const result = state.adapter.saveConfig({ jevDecisionModel: patch });
+  if (result && typeof result.then === "function") throw new TypeError("TUI settings adapter must be synchronous");
+  if (!result || result.ok === false) {
+    state.notice = result && result.reason === "auto_disabled"
+      ? "Auto is off: current-model decision settings are locked and no model may change."
+      : "The current-model decision settings were not changed.";
+    if (result && result.state) state.jevDecisionModel = result.state;
+    return true;
+  }
+  state.jevDecisionModel = result.state || jev;
+  state.notice = `JEV current-model settings updated · ${state.adapterKind === "mock" ? "mock" : "persisted"}`;
+  return true;
+}
+
 function selectedSettingChoiceRow(state) {
   if (state.overlay !== "settings-choice" || !state.settingChoiceKey) return null;
   return settingsRows(state, state.settingChoiceTab)