newmark-agent 0.4.0 → 0.4.3

package/dist/ui/index.html

@@ -10,6 +10,9 @@ try {
   if (startupQuery.get('startupPrewarm') === '1' && Number(startupQuery.get('startupAttempt') || 0) > 0) {
     document.documentElement.classList.add('startup-prewarm');
   }
+  if (sessionStorage.getItem('newmark-config-reloading') === '1') {
+    document.documentElement.classList.add('config-reloading');
+  }
 } catch {}
 </script>
 <style>
@@ -279,6 +282,7 @@ html, body {
 }
 
 .startup-prewarm #startup-cover { display: flex; }
+.config-reloading #startup-cover { display: flex; }
 
 .startup-cover-shell {
   width: min(520px, calc(100vw - 48px));
@@ -1059,6 +1063,19 @@ button.left-ws-item {
 .conv-archive-btn:hover,
 .conv-rename-btn:hover { background: rgba(255,255,255,0.1); color: var(--text-bright); }
 
+.conv-archive-btn.archiving { cursor: default; border-color: var(--accent); }
+.conv-archive-spinner {
+  width: 11px;
+  height: 11px;
+  border: 2px solid var(--border);
+  border-top-color: var(--accent);
+  border-radius: 50%;
+  animation: conv-archive-spin 0.7s linear infinite;
+}
+@keyframes conv-archive-spin {
+  to { transform: rotate(360deg); }
+}
+
 .conv-item.dragging { opacity: 0.58; }
 .conv-item.drag-over { border-color: var(--accent); background: rgba(91,120,255,0.14); }
 .conv-rename-input {
@@ -2432,9 +2449,9 @@ button.left-ws-item {
 .conversation-work-event.error { color: #ff8888; }
 .conversation-work-event-content { min-width: 0; white-space: pre-wrap; word-break: break-word; }
 .conversation-work-event.narrative { display: block; color: var(--text); font-size: 13px; line-height: 1.65; padding: 3px 1px 7px; }
-.conversation-work-event.activity-summary { font-size: 12px; font-weight: 600; padding: 2px 0; }
+.conversation-work-event.activity-summary { font-size: 11px; font-weight: 400; color: var(--text-dim); padding: 2px 0; }
 .conversation-work-activity { margin: 0; padding: 0; }
-.conversation-work-activity > summary { display: grid; grid-template-columns: 17px minmax(0,1fr) 10px; gap: 8px; align-items: center; min-height: 28px; cursor: pointer; list-style: none; color: var(--text); font-size: 12px; font-weight: 600; }
+.conversation-work-activity > summary { display: grid; grid-template-columns: 17px minmax(0,1fr) 10px; gap: 8px; align-items: center; min-height: 28px; cursor: pointer; list-style: none; color: var(--text-dim); font-size: 11px; font-weight: 400; }
 .conversation-work-activity > summary::-webkit-details-marker { display: none; }
 .conversation-work-activity > summary .nm-icon { color: var(--text-dim); }
 .conversation-work-activity-chevron { width: 7px; height: 7px; border-right: 1px solid var(--text-dim); border-bottom: 1px solid var(--text-dim); transform: rotate(-45deg); transition: transform 140ms ease; }
@@ -3137,15 +3154,19 @@ button.todo-item { background: transparent; }
   font: 9px var(--font-mono);
 }
 
-.conv-branch-comm-badge {
-  flex: 0 0 auto;
-  padding: 2px 5px;
-  border-radius: 999px;
-  background: color-mix(in srgb, var(--accent) 16%, transparent);
+.conv-branch-comm-icon {
+  width: 20px;
+  height: 20px;
+  border-radius: var(--radius-sm);
+  border: 1px solid var(--border);
+  background: transparent;
   color: var(--accent);
-  font: 9px var(--font-mono);
-  white-space: nowrap;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
 }
+.conv-branch-comm-icon .nm-icon { width: 11px; height: 11px; }
 
 .conv-runtime-badge.running { color: var(--accent2); }
 .conv-runtime-badge.stopping,
@@ -3502,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; }
@@ -5009,6 +5028,32 @@ html.newmark-memory-overview-viewer body {
 .auto-input-group select:focus,
 .auto-input-group textarea:focus { border-color: var(--accent); }
 
+.auto-input-group.checkbox-row {
+  display: flex;
+  padding: 9px 11px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-md);
+  background: var(--glass-bg-1);
+}
+.auto-input-group.checkbox-row label {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin: 0;
+  cursor: pointer;
+  font-size: 12px;
+  color: var(--text);
+}
+.auto-input-group.checkbox-row input[type="checkbox"] {
+  width: 15px;
+  height: 15px;
+  flex-shrink: 0;
+  accent-color: var(--accent);
+  cursor: pointer;
+  margin: 0;
+  padding: 0;
+}
+
 .auto-conditions {
   display: flex;
   gap: 8px;
@@ -5328,6 +5373,11 @@ html.newmark-memory-overview-viewer body {
     <symbol id="folder" viewBox="0 0 24 24">
       <path d="M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z" />
     </symbol>
+    <symbol id="git-branch" viewBox="0 0 24 24">
+      <path d="M15 6a9 9 0 0 0-9 9V3" />
+      <circle cx="18" cy="6" r="3" />
+      <circle cx="6" cy="18" r="3" />
+    </symbol>
     <symbol id="globe" viewBox="0 0 24 24">
       <circle cx="12" cy="12" r="10" />
       <path d="M12 2a14.5 14.5 0 0 0 0 20 14.5 14.5 0 0 0 0-20" />
@@ -6433,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',
@@ -6489,6 +6541,7 @@ var NEWMARK_I18N = {
     'model.yes': 'yes',
     'model.notChecked': 'not checked',
     'archive.current': 'Archive current chat',
+    'archive.archiving': 'Archiving...',
     'archive.empty': 'No archives yet.',
     'archive.loading': 'Loading workspace archives...',
     'archive.unavailable': 'Archive list unavailable',
@@ -6794,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',
@@ -6801,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',
@@ -7134,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 / 供应商信息',
@@ -7190,6 +7247,7 @@ var NEWMARK_I18N = {
     'model.yes': '是',
     'model.notChecked': '未校验',
     'archive.current': '归档当前对话',
+    'archive.archiving': '归档中...',
     'archive.empty': '暂无归档。',
     'archive.loading': '正在加载工作区归档...',
     'archive.unavailable': '归档列表不可用',
@@ -7495,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',
@@ -7502,7 +7562,7 @@ var NEWMARK_I18N = {
     'status.messages': '条消息',
     'status.noCompression': '当前对话暂无压缩事件',
     'status.contextInspector': '上下文管理',
-    'status.contextInspectorHint': '借鉴 DSH 的动态预算；可见对话历史不会被改写。',
+    'status.contextInspectorHint': '实时上下文预算；可见对话历史不会被改写。',
     'status.activeBuild': '当前 Build',
     'status.longHistory': '长期历史',
     'status.trigger': '触发线',
@@ -10120,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>' +
@@ -12021,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;
@@ -12029,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') +
@@ -12050,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();
@@ -15275,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>';
@@ -15545,8 +15625,8 @@ window.refreshGlobalConfigFile = function() {
   if (!api.reloadGlobalConfig) return;
   api.reloadGlobalConfig().then(function(result) {
     if (result && result.error) throw new Error(result.error);
-    showUiNotice(t('settings.configReloaded'), 'success', 'global-config-refresh');
-    setTimeout(function() { window.location.reload(); }, 180);
+    try { sessionStorage.setItem('newmark-config-reloading', '1'); } catch (_) {}
+    window.location.reload();
   }).catch(function(error) {
     showUiNotice(error && error.message ? error.message : String(error), 'error', 'global-config-refresh');
   });
@@ -15986,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);
@@ -15996,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 : '',
@@ -16015,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();
   }
@@ -16035,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>');
 };
 
@@ -16047,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,
@@ -16060,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);
@@ -16223,7 +16335,13 @@ window.validateAllModels = function() {
     return state.modelValidationResults;
   }).catch(function(err) {
     document.body.classList.remove('model-evaluating');
-    window.openSubWin(t('model.validationTitle'), '<div style="color:#ff7777;font-size:12px;">' + esc(t('model.validationFailed')) + ': ' + esc(err.message) + '</div>');
+    var failedHtml = '<div style="color:#ff7777;font-size:12px;">' + esc(t('model.validationFailed')) + ': ' + esc(err.message) + '</div>';
+    var body = document.getElementById('sub-win-body');
+    if (body && document.getElementById('model-validation-progress') && els['sub-win-overlay'].classList.contains('open')) {
+      body.innerHTML = failedHtml;
+    } else {
+      addMsg('assistant', redactSensitiveText('[Error] ' + t('model.validationFailed') + ': ' + err.message), 'error', '');
+    }
     return [];
   }).finally(function() {
     window.stopModelValidationProgressPolling();
@@ -16239,16 +16357,45 @@ window.renderModelValidationProgress = function(progress) {
   var completedModels = Math.max(0, Number(progress.completedModels || 0));
   var totalModels = Math.max(0, Number(progress.totalModels || 0));
   var current = [String(progress.currentModel || ''), String(progress.currentCheck || '')].filter(Boolean).join(' · ');
-  return '<div class="provider-card marquee-border">' +
-    '<div style="display:flex;justify-content:space-between;gap:10px;"><span>' + esc(t('model.validating')) + '</span><strong>' + esc(String(percent)) + '%</strong></div>' +
-    '<div role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="' + esc(String(percent)) + '" style="height:7px;margin-top:10px;border-radius:999px;background:var(--surface-strong);overflow:hidden;"><div style="height:100%;width:' + esc(String(percent)) + '%;background:var(--accent);transition:width .18s ease;"></div></div>' +
-    '<div style="margin-top:8px;color:var(--text-dim);font-size:11px;display:flex;justify-content:space-between;gap:8px;"><span>' + esc(String(completedChecks)) + '/' + esc(String(totalChecks)) + ' ' + esc(t('model.validationChecks')) + '</span><span>' + esc(String(completedModels)) + '/' + esc(String(totalModels)) + ' ' + esc(t('model.validationModels')) + '</span></div>' +
-    (current ? '<div style="margin-top:6px;color:var(--text-dim);font-size:11px;overflow-wrap:anywhere;">' + esc(t('model.validationCurrent')) + ': ' + esc(current) + '</div>' : '') +
+  return '<div class="provider-card marquee-border" id="model-validation-progress">' +
+    '<div style="display:flex;justify-content:space-between;gap:10px;"><span>' + esc(t('model.validating')) + '</span><strong id="mv-percent">' + esc(String(percent)) + '%</strong></div>' +
+    '<div id="mv-progressbar" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="' + esc(String(percent)) + '" style="height:7px;margin-top:10px;border-radius:999px;background:var(--surface-strong);overflow:hidden;"><div id="mv-bar" style="height:100%;width:' + esc(String(percent)) + '%;background:var(--accent);transition:width .18s ease;"></div></div>' +
+    '<div style="margin-top:8px;color:var(--text-dim);font-size:11px;display:flex;justify-content:space-between;gap:8px;"><span id="mv-checks">' + esc(String(completedChecks)) + '/' + esc(String(totalChecks)) + ' ' + esc(t('model.validationChecks')) + '</span><span id="mv-models">' + esc(String(completedModels)) + '/' + esc(String(totalModels)) + ' ' + esc(t('model.validationModels')) + '</span></div>' +
+    '<div id="mv-current" style="margin-top:6px;color:var(--text-dim);font-size:11px;overflow-wrap:anywhere;' + (current ? '' : 'display:none;') + '">' + esc(t('model.validationCurrent')) + ': ' + esc(current) + '</div>' +
     '</div><div style="margin-top:6px;color:var(--text-dim);font-size:11px;">' + esc(t('model.validationBackgroundNote')) + '</div>';
 };
 
+window.updateModelValidationProgress = function(progress) {
+  progress = progress || {};
+  var body = document.getElementById('sub-win-body');
+  if (!body) return;
+  var percent = Math.max(0, Math.min(100, Number(progress.percent || 0)));
+  var completedChecks = Math.max(0, Number(progress.completedChecks || 0));
+  var totalChecks = Math.max(0, Number(progress.totalChecks || 0));
+  var completedModels = Math.max(0, Number(progress.completedModels || 0));
+  var totalModels = Math.max(0, Number(progress.totalModels || 0));
+  var current = [String(progress.currentModel || ''), String(progress.currentCheck || '')].filter(Boolean).join(' · ');
+  var percentEl = document.getElementById('mv-percent');
+  if (!percentEl) return;
+  percentEl.textContent = String(percent) + '%';
+  var barEl = document.getElementById('mv-bar');
+  if (barEl) barEl.style.width = String(percent) + '%';
+  var progressbarEl = document.getElementById('mv-progressbar');
+  if (progressbarEl) progressbarEl.setAttribute('aria-valuenow', String(percent));
+  var checksEl = document.getElementById('mv-checks');
+  if (checksEl) checksEl.textContent = String(completedChecks) + '/' + String(totalChecks) + ' ' + t('model.validationChecks');
+  var modelsEl = document.getElementById('mv-models');
+  if (modelsEl) modelsEl.textContent = String(completedModels) + '/' + String(totalModels) + ' ' + t('model.validationModels');
+  var currentEl = document.getElementById('mv-current');
+  if (currentEl) {
+    currentEl.textContent = t('model.validationCurrent') + ': ' + current;
+    currentEl.style.display = current ? '' : 'none';
+  }
+};
+
 window.showModelValidationProgress = function(progress) {
   document.body.classList.add('model-evaluating');
+  if (document.getElementById('model-validation-progress')) return;
   window.openSubWin(t('model.validationTitle'), window.renderModelValidationProgress(progress));
 };
 
@@ -16264,7 +16411,7 @@ window.startModelValidationProgressPolling = function() {
     Promise.resolve(api.modelValidationStatus()).then(function(progress) {
       if (!state.modelValidationPromise) return;
       var body = document.getElementById('sub-win-body');
-      if (body && els['sub-win-overlay'].classList.contains('open')) body.innerHTML = window.renderModelValidationProgress(progress);
+      if (body && els['sub-win-overlay'].classList.contains('open')) window.updateModelValidationProgress(progress);
       state.modelValidationProgressTimer = setTimeout(poll, 150);
     }).catch(function() {
       if (state.modelValidationPromise) state.modelValidationProgressTimer = setTimeout(poll, 300);
@@ -16291,7 +16438,21 @@ window.showModelEvaluationResults = function(results) {
     }
   }
   html += '</div>';
-  window.openSubWin(t('model.validationTitle'), html);
+  var body = document.getElementById('sub-win-body');
+  if (body && document.getElementById('model-validation-progress') && els['sub-win-overlay'].classList.contains('open')) {
+    // The progress window is still visible: replace it in place so closing
+    // the results restores whatever window was open before validation.
+    body.innerHTML = html;
+    return;
+  }
+  // The user closed the progress window or opened another window while
+  // validation was running. Do not hijack the current window; summarize in chat.
+  var okCount = 0;
+  for (var j = 0; j < (results || []).length; j++) {
+    var status = String((results[j] && results[j].status) || '');
+    if (status === 'verified' || status === 'degraded' || status === 'available') okCount++;
+  }
+  addMsg('assistant', '[System] ' + t('model.validationTitle') + ': ' + okCount + '/' + (results || []).length + ' ' + t('model.validationModels'), okCount === (results || []).length ? 'success' : 'warning', '');
 };
 renderArchiveSettings = function() {
   if (api.listArchives && !state._allArchiveSettingsLoading) {
@@ -18895,11 +19056,15 @@ function renderConversations() {
     if (runtimeState && ['running', 'stopping', 'force_restarting'].indexOf(String(runtimeState.status || '')) >= 0) div.classList.add('marquee-border');
     var runtimeBadge = runtimeState && runtimeState.status && runtimeState.status !== 'idle'
       ? '<span class="conv-runtime-badge ' + escAttr(String(runtimeState.status)) + '">' + esc(String(runtimeState.status)) + '</span>' : '';
-    var branchCommBadge = conv.branchCommunication
-      ? '<span class="conv-branch-comm-badge" title="' + escAttr(t('conversation.branchCommunicationBadge')) + '">' + esc(t('conversation.branchCommunicationBadge')) + '</span>' : '';
-    div.innerHTML = '<span class="conv-summary" title="' + escAttr(String(conv.id || '')) + '">' + esc(displaySummary) + (conv.messageCount ? ' (' + esc(String(conv.messageCount)) + ')' : '') + '</span>' + branchCommBadge + runtimeBadge +
+    var branchCommIcon = conv.branchCommunication
+      ? '<span class="conv-branch-comm-icon" title="' + escAttr(t('conversation.branchCommunicationBadge')) + '" aria-label="' + escAttr(t('conversation.branchCommunicationBadge')) + '">' + iconSvg('git-branch', t('conversation.branchCommunicationBadge')) + '</span>' : '';
+    var archivePendingKey = currentWorkspaceKey() + '::' + String(conv.id);
+    var archiveBtn = state.conversationArchivePending[archivePendingKey]
+      ? '<button class="conv-archive-btn archiving" title="' + escAttr(t('archive.archiving')) + '" disabled><span class="conv-archive-spinner"></span></button>'
+      : '<button class="conv-archive-btn" onclick="event.stopPropagation();window.archiveConv(this.closest(&quot;.conv-item&quot;).getAttribute(&quot;data-conversation-id&quot;))" title="' + escAttr(t('conversation.archive')) + '">' + iconOnly('archive', t('conversation.archive')) + '</button>';
+    div.innerHTML = '<span class="conv-summary" title="' + escAttr(String(conv.id || '')) + '">' + esc(displaySummary) + (conv.messageCount ? ' (' + esc(String(conv.messageCount)) + ')' : '') + '</span>' + branchCommIcon + runtimeBadge +
       '<button class="conv-rename-btn" onclick="event.stopPropagation();window.editConversationName(' + i + ')" title="' + escAttr(t('conversation.rename')) + '">' + iconOnly('pencil', t('conversation.rename')) + '</button>' +
-      '<button class="conv-archive-btn" onclick="event.stopPropagation();window.archiveConv(this.closest(&quot;.conv-item&quot;).getAttribute(&quot;data-conversation-id&quot;))" title="' + escAttr(t('conversation.archive')) + '">' + iconOnly('archive', t('conversation.archive')) + '</button>' +
+      archiveBtn +
       '<button class="conv-pin-btn' + (conv.pinned ? ' active' : '') + '" onclick="event.stopPropagation();window.toggleConversationPinned(' + i + ')" title="' + escAttr(conv.pinned ? t('conversation.unpin') : t('conversation.pin')) + '">' + iconOnly('pin', conv.pinned ? t('conversation.unpin') : t('conversation.pin')) + '</button>';
     div.onclick = function(idx) { return function() { window.switchConversation(idx); }; }(i);
     div.addEventListener('keydown', window.handleConversationKey);
@@ -19052,7 +19217,7 @@ window.showNewConversationPage = function() {
   var html = '<div style="display:flex;flex-direction:column;gap:12px;padding:4px 2px;">' +
     '<div style="font-size:12px;color:var(--text-dim);line-height:1.5;">' + esc(t('workspace.newConversationDesc')) + '</div>' +
     '<div class="auto-input-group"><label>' + esc(t('status.workspace')) + '</label><select id="new-conv-ws">' + options + '</select></div>' +
-    '<div class="auto-input-group" style="flex-direction:row;align-items:center;gap:8px;"><label style="display:flex;align-items:center;gap:6px;cursor:pointer;font-size:12px;"><input type="checkbox" id="new-conv-branch-comm" style="accent-color:var(--accent);">' + esc(t('conversation.branchCommunication')) + '</label></div>' +
+    '<div class="auto-input-group checkbox-row"><label><input type="checkbox" id="new-conv-branch-comm"><span>' + esc(t('conversation.branchCommunication')) + '</span></label></div>' +
     '<div style="display:flex;gap:8px;">' +
     '<button class="sec-btn primary" style="flex:1;" onclick="window.doNewConversationFromPage()">' + esc(t('workspace.createConversation')) + '</button>' +
     '<button class="sec-btn" style="flex:1;" onclick="window.showNewWorkspaceDialog()">' + esc(t('workspace.createAction')) + '</button>' +
@@ -19196,45 +19361,45 @@ window.archiveConv = function(conversationId) {
       orderIds: rollbackOrder,
       chatHtml: priorActiveId === targetId && els['chat-area'] ? els['chat-area'].innerHTML : ''
     };
-    convs.splice(idx, 1);
-    if (!convs.length) convs.push({ id: 'default', summary: t('workspace.defaultConversation'), archived: false, active: true });
-    var nextActiveId = priorActiveId && priorActiveId !== targetId ? priorActiveId : String(convs[Math.min(idx, convs.length - 1)].id || 'default');
-    var nextActiveIndex = Math.max(0, convs.findIndex(function(item) { return String(item && item.id || '') === nextActiveId; }));
-    for (var i = 0; i < convs.length; i++) convs[i].active = i === nextActiveIndex;
-    state.workspaceActiveConversation[workspaceKey] = nextActiveIndex;
-    state.activeConversation = nextActiveIndex;
-    state.conversations = convs;
-    if (priorActiveId === targetId) {
-      state.activeBackendConversationId = nextActiveId;
-      if (els['chat-area']) els['chat-area'].innerHTML = '';
-    }
-    // Archiving is a destructive handoff: remove the target's Flow takeover
-    // locally at click time as well as removing its conversation row. The
-    // backend cancellation/manifest write is asynchronous; a late Flow
-    // promise must not leave a visible running bubble over the replacement
-    // conversation while the archive is already in flight.
-    if (state.flowTakeovers) {
-      var archivedFlowKey = runtimeKeyFor(targetRuntime.workspaceId, targetRuntime.conversationId);
-      var archivedFlowRecord = state.flowTakeovers[archivedFlowKey];
-      if (archivedFlowRecord) {
-        archivedFlowRecord.running = false;
-        archivedFlowRecord.paused = false;
-        archivedFlowRecord.runtimeLease = null;
-        archivedFlowRecord.queueLease = null;
-        delete state.flowTakeovers[archivedFlowKey];
-      }
-      if (priorActiveId === targetId && window.renderFlowTakeover) {
-        window.renderFlowTakeover(false, '', { target: targetRuntime });
-      }
-    }
-    setConversationRuntimeState(targetRuntime, 'idle', '');
-    setWorking(!!runningConversationRecord(activeConversationId()));
+    // 归档中：不立即剔除行，按钮转圈等待；后端完成归档后再剔除前端。
     renderConversations();
-    if (priorActiveId === targetId) scheduleConversationArchiveActiveSync(workspaceKey);
     var archivePromise = api.archive ? api.archive(targetRuntime) : Promise.reject(new Error('Archive API unavailable'));
     archivePromise.then(function(receipt) {
       if (!receipt || receipt.ok !== true) throw new Error((receipt && receipt.error) || 'Archive failed');
       delete state.conversationArchivePending[pendingKey];
+      // 后端完成归档：现在才剔除前端行 + 切换 active + 清理 Flow takeover。
+      var currentConvs = currentWorkspaceConversations();
+      var currentIdx = currentConvs.findIndex(function(item) { return String(item && item.id || 'default') === targetId; });
+      if (currentIdx >= 0) currentConvs.splice(currentIdx, 1);
+      if (!currentConvs.length) currentConvs.push({ id: 'default', summary: t('workspace.defaultConversation'), archived: false, active: true });
+      var nextActiveId = priorActiveId && priorActiveId !== targetId ? priorActiveId : String(currentConvs[Math.min(Math.max(currentIdx, 0), currentConvs.length - 1)].id || 'default');
+      var nextActiveIndex = Math.max(0, currentConvs.findIndex(function(item) { return String(item && item.id || '') === nextActiveId; }));
+      for (var i = 0; i < currentConvs.length; i++) currentConvs[i].active = i === nextActiveIndex;
+      state.workspaceActiveConversation[workspaceKey] = nextActiveIndex;
+      state.activeConversation = nextActiveIndex;
+      state.conversations = currentConvs;
+      if (priorActiveId === targetId) {
+        state.activeBackendConversationId = nextActiveId;
+        if (els['chat-area']) els['chat-area'].innerHTML = '';
+      }
+      if (state.flowTakeovers) {
+        var archivedFlowKey = runtimeKeyFor(targetRuntime.workspaceId, targetRuntime.conversationId);
+        var archivedFlowRecord = state.flowTakeovers[archivedFlowKey];
+        if (archivedFlowRecord) {
+          archivedFlowRecord.running = false;
+          archivedFlowRecord.paused = false;
+          archivedFlowRecord.runtimeLease = null;
+          archivedFlowRecord.queueLease = null;
+          delete state.flowTakeovers[archivedFlowKey];
+        }
+        if (priorActiveId === targetId && window.renderFlowTakeover) {
+          window.renderFlowTakeover(false, '', { target: targetRuntime });
+        }
+      }
+      setConversationRuntimeState(targetRuntime, 'idle', '');
+      setWorking(!!runningConversationRecord(activeConversationId()));
+      renderConversations();
+      if (priorActiveId === targetId) scheduleConversationArchiveActiveSync(workspaceKey);
       var optimisticArchive = {
         id: receipt.fileName,
         name: receipt.fileName,
@@ -19262,10 +19427,8 @@ window.archiveConv = function(conversationId) {
       scheduleConversationArchiveRefresh(workspaceKey);
     }).catch(function(err) {
       delete state.conversationArchivePending[pendingKey];
-      // Keep the optimistic removal authoritative for this renderer session.
-      // A failed IPC receipt is surfaced, but never resurrects the row under
-      // the user's pointer; the next explicit workspace refresh is the only
-      // path allowed to reconcile a failed destructive operation.
+      // 归档失败：恢复按钮，保留行（不再乐观剔除）。
+      renderConversations();
       showUiNotice('[Archive] ' + t('workspace.saveFailed') + ': ' + (err.message || String(err)), 'error', 'archive-failed-' + targetId);
     });
   }
@@ -22511,6 +22674,11 @@ function schedulePostStartupUiRendering() {
   // navigation surfaces render after promotion on cancellable browser tasks.
   updateWorkspaceGate();
 
+  if (document.documentElement.classList.contains('config-reloading')) {
+    document.documentElement.classList.remove('config-reloading');
+    try { sessionStorage.removeItem('newmark-config-reloading'); } catch (_) {}
+  }
+
   // === Event Listeners ===
   function escapeBelongsToFocusedControl(event) {
     var target = event && event.target;

package/dist/ui/lucide-sprite.svg

@@ -112,6 +112,11 @@
     <symbol id="folder" viewBox="0 0 24 24">
       <path d="M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z" />
     </symbol>
+    <symbol id="git-branch" viewBox="0 0 24 24">
+      <path d="M15 6a9 9 0 0 0-9 9V3" />
+      <circle cx="18" cy="6" r="3" />
+      <circle cx="6" cy="18" r="3" />
+    </symbol>
     <symbol id="globe" viewBox="0 0 24 24">
       <circle cx="12" cy="12" r="10" />
       <path d="M12 2a14.5 14.5 0 0 0 0 20 14.5 14.5 0 0 0 0-20" />