newmark-agent 0.4.2 → 0.4.4

package/dist/ui/index.html

@@ -3523,8 +3523,6 @@ button.todo-item { background: transparent; }
 .context-inspector-head { display:flex; align-items:flex-start; gap:8px; margin-bottom:10px; }
 .context-inspector-title { flex:1; min-width:0; color:var(--text-bright); font-size:12px; font-weight:700; }
 .context-inspector-subtitle { margin-top:2px; color:var(--text-dim); font-size:9px; }
-.context-inspector-close { width:22px; height:22px; padding:0; border:0; border-radius:var(--radius-sm); background:transparent; color:var(--text-dim); cursor:pointer; }
-.context-inspector-close:hover, .context-inspector-close:focus-visible { color:var(--text-bright); background:var(--control-hover-bg); outline:none; }
 .context-inspector-meter { height:6px; margin:8px 0 10px; overflow:hidden; border-radius:var(--radius-full); background:rgba(168,168,168,.18); }
 .context-inspector-meter-fill { height:100%; border-radius:inherit; background:var(--accent); transition:width var(--duration-normal) var(--ease-out-expo), background var(--duration-fast) var(--ease-out-expo); }
 .context-inspector-grid { display:grid; grid-template-columns:1fr 1fr; gap:7px; }
@@ -6485,6 +6483,8 @@ var NEWMARK_I18N = {
     'model.contextSize': 'Context size',
     'model.vision': 'Vision',
     'model.thinking': 'Thinking',
+    'model.thinkingTierMap': 'Thinking tier map',
+    'model.thinkingTierMapHelp': 'Map native model effort tiers to Newmark tiers. One "native=Newmark" per line (e.g. minimal=low, balanced=medium, deep=high). Leave empty to keep the default mapping (Newmark tier names are sent as-is).',
     'model.description': 'Description',
     'model.optionalDescription': 'Optional description',
     'model.fuzzyInput': 'API key / provider details',
@@ -6847,6 +6847,8 @@ var NEWMARK_I18N = {
     'status.contextCompressed': 'Context compressed',
     'status.contextCompression': 'Context compression',
     'status.contextTokens': 'Context tokens',
+    'status.conversationTokens': 'Conversation tokens',
+    'status.cacheHitRate': 'Cache hit rate',
     'status.contextNearLimit': 'Context near limit',
     'status.contextOverLimit': 'Context over limit',
     'status.contextModeFallback': 'fallback',
@@ -6854,7 +6856,7 @@ var NEWMARK_I18N = {
     'status.messages': 'messages',
     'status.noCompression': 'No compression event in this conversation',
     'status.contextInspector': 'Context management',
-    'status.contextInspectorHint': 'DSH-inspired live budget; visible chat history stays unchanged.',
+    'status.contextInspectorHint': 'Live context budget; visible chat history stays unchanged.',
     'status.activeBuild': 'Active Build',
     'status.longHistory': 'Long history',
     'status.trigger': 'Trigger',
@@ -7187,6 +7189,8 @@ var NEWMARK_I18N = {
     'model.contextSize': '上下文规模',
     'model.vision': '视觉',
     'model.thinking': '思考',
+    'model.thinkingTierMap': '思考强度档位映射',
+    'model.thinkingTierMapHelp': '将模型原生思考强度档位映射到 Newmark 档位。每行一个「原生档位=Newmark档位」（如 minimal=low、balanced=medium、deep=high）。留空表示不变动映射（按 Newmark 档位名原样发送）。',
     'model.description': '描述',
     'model.optionalDescription': '可选描述',
     'model.fuzzyInput': 'API key / 供应商信息',
@@ -7549,6 +7553,8 @@ var NEWMARK_I18N = {
     'status.contextCompressed': '上下文已压缩',
     'status.contextCompression': '上下文压缩',
     'status.contextTokens': '上下文 token',
+    'status.conversationTokens': '全对话 token',
+    'status.cacheHitRate': '缓存命中率',
     'status.contextNearLimit': '上下文接近上限',
     'status.contextOverLimit': '上下文已超限',
     'status.contextModeFallback': 'fallback',
@@ -7556,7 +7562,7 @@ var NEWMARK_I18N = {
     'status.messages': '条消息',
     'status.noCompression': '当前对话暂无压缩事件',
     'status.contextInspector': '上下文管理',
-    'status.contextInspectorHint': '借鉴 DSH 的动态预算；可见对话历史不会被改写。',
+    'status.contextInspectorHint': '实时上下文预算；可见对话历史不会被改写。',
     'status.activeBuild': '当前 Build',
     'status.longHistory': '长期历史',
     'status.trigger': '触发线',
@@ -10174,7 +10180,7 @@ function renderWorkToolGroup(event, eventIndex) {
     var edited = workToolEditedFile(item);
     if (edited) {
       var editKey = 'edit:' + String(item.id || item.toolCallId || itemIndex) + ':' + edited.path;
-      return '<details class="conversation-work-file conversation-work-file-inline" open data-work-detail-key="' + escAttr(editKey) + '"><summary>' +
+      return '<details class="conversation-work-file conversation-work-file-inline" data-work-detail-key="' + escAttr(editKey) + '"><summary>' +
         iconSvg('pencil', 'edited', 'tiny') +
         '<span class="conversation-work-file-name" title="' + escAttr(edited.path) + '">' + esc(currentLang() === 'zh' ? '已编辑 ' : 'Edited ') + esc(edited.name) + '</span>' +
         '<span class="conversation-work-file-stats"><span class="conversation-work-file-add">+' + edited.added + '</span><span class="conversation-work-file-del">-' + edited.deleted + '</span></span>' +
@@ -12075,6 +12081,12 @@ window.renderContextInspector = function() {
   var historyTrigger = contextInspectorValue(c.longHistoryTriggerTokens);
   var activeRetention = contextInspectorValue(c.buildBlockRetentionTokens);
   var historyRetention = contextInspectorValue(c.longHistoryRetentionTokens);
+  var providerTotalTokens = contextInspectorValue(c.providerTotalTokens);
+  var providerInputTokens = contextInspectorValue(c.providerInputTokens);
+  var providerOutputTokens = contextInspectorValue(c.providerOutputTokens);
+  var providerCacheReadTokens = contextInspectorValue(c.providerCacheReadTokens);
+  var providerCacheReadRatio = Math.max(0, Math.min(1, Number(c.providerCacheReadRatio) || 0));
+  var cacheHitPercent = Math.round(providerCacheReadRatio * 1000) / 10;
   var percent = Math.min(100, Math.round((used / max) * 100));
   var fillColor = c.warning === 'over_limit' ? 'var(--nm-state-danger)' : (c.warning === 'near_limit' ? 'var(--nm-state-warning)' : 'var(--accent)');
   var compression = state.contextCompression || null;
@@ -12083,12 +12095,13 @@ window.renderContextInspector = function() {
     : t('status.noCompressionShort');
   var busy = !!state.contextMutationPending;
   var running = typeof isCurrentConversationRunning === 'function' && isCurrentConversationRunning();
-  panel.innerHTML = '<div class="context-inspector-head"><div><div class="context-inspector-title">' + esc(t('status.contextInspector')) + '</div><div class="context-inspector-subtitle">' + esc(t('status.contextInspectorHint')) + '</div></div>' +
-    '<button type="button" class="context-inspector-close" onclick="window.closeContextInspector()" aria-label="' + esc(t('common.close') || 'Close') + '">×</button></div>' +
+  panel.innerHTML = '<div class="context-inspector-head"><div><div class="context-inspector-title">' + esc(t('status.contextInspector')) + '</div><div class="context-inspector-subtitle">' + esc(t('status.contextInspectorHint')) + '</div></div></div>' +
     '<div class="context-inspector-meter"><div class="context-inspector-meter-fill" style="width:' + percent + '%;background:' + fillColor + '"></div></div>' +
     '<div class="context-inspector-grid">' +
       contextInspectorCell(t('status.contextTokens'), used + ' / ' + max) +
+      contextInspectorCell(t('status.conversationTokens'), providerTotalTokens + ' · ' + providerInputTokens + ' in / ' + providerOutputTokens + ' out') +
       contextInspectorCell(t('status.activeBuild'), active + ' / ' + activeTrigger) +
+      contextInspectorCell(t('status.cacheHitRate'), cacheHitPercent + '% · ' + providerCacheReadTokens + ' cached') +
       contextInspectorCell(t('status.longHistory'), history + ' / ' + historyTrigger) +
       contextInspectorCell(t('status.retention'), activeRetention + ' + ' + historyRetention) +
       contextInspectorCell(t('status.hotCache'), contextInspectorValue(c.cacheEntries) + ' entries') +
@@ -12104,6 +12117,17 @@ window.closeContextInspector = function() {
   window.renderContextInspector();
 };
 
+(function() {
+  document.addEventListener('click', function(event) {
+    if (!state.contextInspectorOpen) return;
+    var ring = document.getElementById('context-token-ring');
+    var panel = document.getElementById('context-inspector');
+    if (!ring || !panel) return;
+    if (panel.contains(event.target) || ring.contains(event.target)) return;
+    window.closeContextInspector();
+  });
+})();
+
 window.toggleContextInspector = function() {
   state.contextInspectorOpen = !state.contextInspectorOpen;
   window.hideContextWindowTooltip();
@@ -15329,9 +15353,11 @@ function renderModelSettings() {
         : (normalizedStatus === 'not checked' ? 'model-eval-pending' : 'model-eval-bad');
       var details = '';
       if (typeof modelEntry !== 'string') {
+        var tierMapCount = modelEntry.thinking_tier_map && typeof modelEntry.thinking_tier_map === 'object' ? Object.keys(modelEntry.thinking_tier_map).length : 0;
         details = '<span class="model-eval-line">ctx ' + esc(modelEntry.max_tokens || '') +
           ' | ' + esc(t('model.vision')) + ' ' + (modelEntry.vision ? t('common.on') : t('common.off')) +
           ' | ' + esc(t('model.thinking')) + ' ' + (modelEntry.thinking ? t('common.on') : t('common.off')) +
+          (tierMapCount ? ' | ' + esc(t('model.thinkingTierMap')) + ' ' + tierMapCount : '') +
           ' | ' + esc(t('model.cost')) + ' ' + esc(evaluation ? evaluation.cost_rating : '-') +
           ' | ' + esc(t('model.performanceShort')) + ' ' + esc(modelEntry.capability_rating || '-') +
           ' | ' + esc(t('model.speed')) + ' ' + esc(modelEntry.speed_rating || '-') + '</span>';
@@ -16040,9 +16066,31 @@ window.addModel = function() {
     '<div style="display:flex;gap:10px;margin-bottom:10px;"><label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="new-model-vision"> ' + esc(t('model.vision')) + '</label>' +
     '<label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="new-model-thinking"> ' + esc(t('model.thinking')) + '</label></div>' +
     '<div class="auto-input-group"><label>' + esc(t('model.description')) + '</label><textarea id="new-model-desc" rows="2" placeholder="' + escAttr(t('model.optionalDescription')) + '"></textarea></div>' +
+    '<div class="auto-input-group"><label>' + esc(t('model.thinkingTierMap')) + '</label><textarea id="new-model-tier-map" rows="3" placeholder="minimal=low&#10;balanced=medium&#10;deep=high"></textarea>' +
+    '<div style="margin-top:10px;font-size:11px;color:var(--text-dim);">' + esc(t('model.thinkingTierMapHelp')) + '</div></div>' +
     '<div style="margin-top:10px;"><button class="sec-btn primary" onclick="window.saveNewModel()">' + esc(t('common.save')) + '</button></div>');
 };
 
+window.parseThinkingTierMap = function(text) {
+  var map = {};
+  if (!text) return map;
+  String(text).split('\n').forEach(function(line) {
+    var trimmed = line.trim();
+    if (!trimmed) return;
+    var eq = trimmed.indexOf('=');
+    if (eq <= 0) return;
+    var native = trimmed.slice(0, eq).trim();
+    var newmark = trimmed.slice(eq + 1).trim();
+    if (native && newmark) map[native] = newmark;
+  });
+  return map;
+};
+
+window.serializeThinkingTierMap = function(map) {
+  if (!map || typeof map !== 'object') return '';
+  return Object.keys(map).map(function(k) { return k + '=' + map[k]; }).join('\n');
+};
+
 window.saveNewModel = function() {
   var name = document.getElementById('new-model-name').value;
   var provIdx = parseInt(document.getElementById('new-model-provider').value);
@@ -16050,9 +16098,11 @@ window.saveNewModel = function() {
   var visionEl = document.getElementById('new-model-vision');
   var thinkingEl = document.getElementById('new-model-thinking');
   var descEl = document.getElementById('new-model-desc');
+  var tierMapEl = document.getElementById('new-model-tier-map');
   if (name && !isNaN(provIdx) && state.providers[provIdx]) {
     if (!state.providers[provIdx].models) state.providers[provIdx].models = [];
-    state.providers[provIdx].models.push({
+    var tierMap = window.parseThinkingTierMap(tierMapEl ? tierMapEl.value : '');
+    var entry = {
       name: name,
       display: name,
       description: descEl ? descEl.value : '',
@@ -16069,7 +16119,9 @@ window.saveNewModel = function() {
         xhigh: { description: 'xhigh' },
         max: { description: 'max' }
       }
-    });
+    };
+    if (Object.keys(tierMap).length) entry.thinking_tier_map = tierMap;
+    state.providers[provIdx].models.push(entry);
     api.saveConfig({providers: state.providers});
     window.refreshModelSelect();
   }
@@ -16089,6 +16141,8 @@ window.editModel = function(provIdx, modelIdx) {
     '<div style="display:flex;gap:10px;margin-bottom:10px;"><label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="edit-model-vision"' + (model.vision ? ' checked' : '') + '> ' + esc(t('model.vision')) + '</label>' +
     '<label style="font-size:11px;color:var(--text-dim);"><input type="checkbox" id="edit-model-thinking"' + (model.thinking ? ' checked' : '') + '> ' + esc(t('model.thinking')) + '</label></div>' +
     '<div class="auto-input-group"><label>' + esc(t('model.description')) + '</label><textarea id="edit-model-desc" rows="2">' + esc(model.description || '') + '</textarea></div>' +
+    '<div class="auto-input-group"><label>' + esc(t('model.thinkingTierMap')) + '</label><textarea id="edit-model-tier-map" rows="3">' + esc(window.serializeThinkingTierMap(model.thinking_tier_map)) + '</textarea>' +
+    '<div style="margin-top:10px;font-size:11px;color:var(--text-dim);">' + esc(t('model.thinkingTierMapHelp')) + '</div></div>' +
     '<div style="margin-top:10px;"><button class="sec-btn primary" onclick="window.saveModelEdit(' + provIdx + ',' + modelIdx + ')">' + esc(t('common.save')) + '</button></div>');
 };
 
@@ -16101,11 +16155,13 @@ window.saveModelEdit = function(oldProvIdx, modelIdx) {
   var visionEl = document.getElementById('edit-model-vision');
   var thinkingEl = document.getElementById('edit-model-thinking');
   var descEl = document.getElementById('edit-model-desc');
+  var tierMapEl = document.getElementById('edit-model-tier-map');
   var name = nameEl ? nameEl.value.trim() : '';
   var newProvIdx = provEl ? parseInt(provEl.value) : oldProvIdx;
   if (!name || isNaN(newProvIdx) || !state.providers[newProvIdx]) return;
   var previous = oldProvider.models[modelIdx];
   if (typeof previous === 'string') previous = { name: previous, display: previous };
+  var tierMap = window.parseThinkingTierMap(tierMapEl ? tierMapEl.value : '');
   var updated = Object.assign({}, previous, {
     name: name,
     display: name,
@@ -16114,6 +16170,8 @@ window.saveModelEdit = function(oldProvIdx, modelIdx) {
     vision: !!(visionEl && visionEl.checked),
     thinking: !!(thinkingEl && thinkingEl.checked)
   });
+  if (Object.keys(tierMap).length) updated.thinking_tier_map = tierMap;
+  else delete updated.thinking_tier_map;
   oldProvider.models.splice(modelIdx, 1);
   if (!state.providers[newProvIdx].models) state.providers[newProvIdx].models = [];
   state.providers[newProvIdx].models.push(updated);
@@ -22767,6 +22825,17 @@ function schedulePostStartupUiRendering() {
         var modelResult = await api.setModel(state.model);
         if (modelResult != null) state._syncedModel = state.model;
       }
+      // The context ring/inspector must immediately reflect the newly selected
+      // model's configured context window rather than waiting for the next send.
+      if (api.getState) {
+        var ctxTarget = currentConversationTarget();
+        api.getState(ctxTarget).then(function(s) {
+          if (s && s.contextWindow !== undefined && isActiveConversationTarget(ctxTarget) && isViewingRuntimeConversationBranch(ctxTarget)) {
+            state.contextWindow = s.contextWindow;
+            window.renderContextWindow();
+          }
+        }).catch(function(){});
+      }
     });
   }