newmark-agent 0.4.8 → 0.5.0

package/dist/ui/index.html

@@ -4221,6 +4221,44 @@ textarea.mcp-input { min-height:76px; resize:vertical; font-family:var(--font-mo
 .setting-control { flex: 1; }
 .settings-load-error { color: var(--notice-error-text); }
 
+.remote-touch-copy {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+.remote-touch-copy-title {
+  color: var(--text);
+  font-size: 11px;
+  font-weight: 700;
+  line-height: 1.25;
+}
+.remote-touch-copy-desc {
+  color: var(--text-dim);
+  font-size: 10px;
+  font-weight: 400;
+  line-height: 1.35;
+}
+.remote-touch-action {
+  flex: 0 0 120px;
+  width: 120px;
+  min-width: 120px;
+  min-height: 28px;
+  box-sizing: border-box;
+}
+.remote-touch-status {
+  background: transparent !important;
+  border-color: currentColor;
+  box-shadow: 0 0 0 1px currentColor, 0 0 10px color-mix(in srgb, currentColor 42%, transparent);
+}
+.remote-touch-status:hover { background: transparent !important; }
+.remote-touch-status.listening { color: var(--accent2); }
+.remote-touch-status.error,
+.remote-touch-status.checking { color: #ffb454; }
+.remote-touch-status.off { color: var(--notice-error-text); }
+.remote-touch-status[aria-busy="true"] { cursor: wait; }
+
 .segmented-control {
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -6118,6 +6156,8 @@ var state = {
   agentWorkUiByConversation: {},
   workRunsByTarget: {},
   workRunsByBranch: {},
+  conversationMessagesByTarget: {},
+  pendingConversationActivations: {},
   runtimeBranchPathsByTarget: {},
   workRunAnchorIndexesByTarget: {},
   guideMessagesByTarget: {},
@@ -6302,6 +6342,9 @@ var state = {
   configuredAgentBackend: 'windows',
   agentBackendRestartRequired: false,
   remoteTouchEnabled: true,
+  remoteTouchServer: { enabled: true, listening: false, reachable: false, state: 'checking', host: '', port: 47890, error: '', checkedAt: '', startedAt: 0 },
+  remoteTouchStatusBusy: false,
+  _remoteTouchStatusTimer: null,
   wslAvailable: false,
   wslDistros: [],
   defaultTerminalShell: 'powershell',
@@ -6484,6 +6527,10 @@ var NEWMARK_I18N = {
     'settings.runInWslDesc': 'Keeps the Windows UI and native desktop tools local while running the persistent Agent kernel, model calls, shell, and file tools inside WSL.',
     'settings.remoteTouch': 'Mobile remote-touch',
     'settings.remoteTouchDesc': 'Allow mobile access on the same LAN / Tailscale network',
+    'settings.remoteTouchListening': 'Listening',
+    'settings.remoteTouchError': 'Unreachable',
+    'settings.remoteTouchOff': 'Off',
+    'settings.remoteTouchChecking': 'Checking',
     'settings.remoteBehavior': 'Remote behavior',
     'settings.remoteConnect': 'Start connection',
     'settings.remoteConnectDesc': 'Show pairing QR',
@@ -7211,6 +7258,10 @@ var NEWMARK_I18N = {
     'settings.runInWslDesc': 'Windows UI 与桌面原生工具保留在本机，持续 Agent 内核、模型请求、Shell 和文件工具运行在 WSL。',
     'settings.remoteTouch': '移动端远程触及',
     'settings.remoteTouchDesc': '允许移动端通过同一内网 / Tailscale 连接',
+    'settings.remoteTouchListening': '监听中',
+    'settings.remoteTouchError': '不可触及',
+    'settings.remoteTouchOff': '已关闭',
+    'settings.remoteTouchChecking': '检测中',
     'settings.remoteBehavior': '远程行为',
     'settings.remoteConnect': '发起连接',
     'settings.remoteConnectDesc': '显示配对二维码',
@@ -7389,7 +7440,7 @@ var NEWMARK_I18N = {
     'model.unavailable': '不可用',
     'model.no': '否',
     'model.yes': '是',
-    'model.notChecked': '未校验',
+    'model.notChecked': '未检测',
     'archive.current': '归档当前对话',
     'archive.archiving': '归档中...',
     'archive.empty': '暂无归档。',
@@ -9607,11 +9658,18 @@ function recordGuideUiMessage(input, target) {
     createdAt: String(receipt.createdAt || input.createdAt || (prior && prior.createdAt) || new Date().toISOString()),
     updatedAt: String(receipt.updatedAt || input.updatedAt || new Date().toISOString()),
     reason: explicitReason || (status === 'deferred' || status === 'rejected' ? String(prior && prior.reason || '') : ''),
+    awaitingAck: input.awaitingAck === true || receipt.awaitingAck === true,
     attachments: normalizeConversationImageAttachments(input.attachments || receipt.attachments || (prior && prior.attachments) || [])
   };
   messages[clientMessageId] = record;
   if (isActiveConversationTarget(target)) {
     var element = findGuideMessageElement(clientMessageId);
+    if (element) {
+      if (prior && prior.awaitingAck && !record.awaitingAck && element.closest && element.closest('.work-run-pending-guides')) {
+        element.remove();
+        element = null;
+      }
+    }
     if (element) {
       applyGuideMessageMeta(element, record);
       if (record.runId && !element.classList.contains('work-run-guide-message')) element.remove();
@@ -9652,6 +9710,26 @@ function renderPendingGuideMessages(target, persistedGuideIds) {
   });
   pending.forEach(function(item) {
     var element = findGuideMessageElement(item.clientMessageId);
+    if (item.awaitingAck && item.runId) {
+      var runElement = findWorkRunElement({ runId: item.runId });
+      var runBody = runElement && runElement.querySelector('.conversation-work-run-body');
+      if (runBody) {
+        var pendingStack = runBody.querySelector(':scope > .work-run-pending-guides');
+        if (!pendingStack) {
+          pendingStack = document.createElement('div');
+          pendingStack.className = 'work-run-pending-guides';
+          runBody.appendChild(pendingStack);
+        }
+        if (!element || !pendingStack.contains(element)) {
+          var holder = document.createElement('div');
+          holder.innerHTML = renderWorkRunGuideMessage(Object.assign({}, item, { status: 'accepted' }));
+          element = holder.firstElementChild;
+          if (element) pendingStack.appendChild(element);
+        }
+        if (element) applyGuideMessageMeta(element, item);
+        return;
+      }
+    }
     if (element) applyGuideMessageMeta(element, item);
     else addMsg('user', item.content || 'Guide', 'guide', item.model || state.model, undefined, {
       clientMessageId: item.clientMessageId,
@@ -9915,7 +9993,7 @@ function normalizedWorkRun(run, target) {
   var status = String(run.status || 'running');
   var live = ['running', 'stopping', 'force_restarting'].indexOf(status) >= 0;
   var expanded = run.expanded === undefined
-    ? live && state.expandToolsDefault !== false
+    ? (status === 'error' || (live && state.expandToolsDefault !== false))
     : !!run.expanded;
   return {
     runId: String(run.runId || run.id || ('run-' + Date.now() + '-' + Math.random().toString(16).slice(2))),
@@ -10583,6 +10661,7 @@ function updateConversationWorkRunElement(run, element) {
     '<span class="conversation-work-run-status">' + esc(String(run.status || '')) + '</span>' +
     '<span class="conversation-work-run-chevron" aria-hidden="true"></span></button>' +
     '<div class="conversation-work-run-body">' + renderWorkRunEvents(run, expanded) + '</div>';
+  renderPendingGuideMessages(run.target, {});
   var wrapper = element.closest ? element.closest('.work-run-message') : null;
   if (wrapper) {
     wrapper.classList.toggle('flow-result-only', !!(run.flow && run.flow.activityVisibility === 'result-only'));
@@ -10729,14 +10808,14 @@ function applyAgentWorkEventToRun(event) {
   }
   run.sequence = Math.max(Number(run.sequence || 0), Number(event.sequence || 0));
   if (type === 'done') { run.status = 'completed'; run.endedAt = event.endedAt || event.timestampIso || new Date().toISOString(); if (run.userToggled !== true) run.expanded = false; }
-  else if (type === 'error') { run.status = 'error'; run.endedAt = event.endedAt || event.timestampIso || new Date().toISOString(); if (run.userToggled !== true) run.expanded = false; }
+  else if (type === 'error') { run.status = 'error'; run.endedAt = event.endedAt || event.timestampIso || new Date().toISOString(); if (run.userToggled !== true) run.expanded = true; }
   else if (type === 'interrupted') { run.status = 'interrupted'; run.endedAt = event.endedAt || event.timestampIso || new Date().toISOString(); if (run.userToggled !== true) run.expanded = false; }
   else if (type === 'force_interrupted') { run.status = 'force_interrupted'; run.endedAt = event.endedAt || event.timestampIso || new Date().toISOString(); if (run.userToggled !== true) run.expanded = false; }
   else if (event.status && type.indexOf('guide') !== 0) {
     run.status = String(event.status);
     if (['completed', 'interrupted', 'force_interrupted', 'error'].indexOf(run.status) >= 0) {
       run.endedAt = event.endedAt || event.timestampIso || new Date().toISOString();
-      if (run.userToggled !== true) run.expanded = false;
+      if (run.userToggled !== true) run.expanded = run.status === 'error';
     }
   }
   if (isActiveConversationTarget(target) && (!branchIds.viewed || !eventBranchId || branchIds.viewed === eventBranchId)) {
@@ -11017,14 +11096,58 @@ function renderPersistedToolMessage(message) {
   }, resultPrefix.test(content) || /\bcompleted\.?$/i.test(content) ? 'completed' : '');
 }
 
-function renderChatMessages(messages) {
-  state.renderedChatMessages = Array.isArray(messages) ? messages.map(function(message) { return Object.assign({}, message); }) : [];
+function conversationMessageCache(target) {
+  var scopedTarget = target || currentConversationTarget();
+  var key = runtimeKeyFor(scopedTarget.workspaceId, scopedTarget.conversationId);
+  if (!state.conversationMessagesByTarget) state.conversationMessagesByTarget = {};
+  return Array.isArray(state.conversationMessagesByTarget[key])
+    ? state.conversationMessagesByTarget[key].map(function(message) { return Object.assign({}, message); })
+    : [];
+}
+
+function cacheConversationMessages(messages, target) {
+  var scopedTarget = target || currentConversationTarget();
+  var key = runtimeKeyFor(scopedTarget.workspaceId, scopedTarget.conversationId);
+  var cloned = Array.isArray(messages) ? messages.map(function(message) { return Object.assign({}, message); }) : [];
+  if (!state.conversationMessagesByTarget) state.conversationMessagesByTarget = {};
+  state.conversationMessagesByTarget[key] = cloned;
+  return cloned.map(function(message) { return Object.assign({}, message); });
+}
+
+function conversationHasReadableHistory(target) {
+  return conversationMessageCache(target).length > 0 || workRunsForTarget(target).length > 0;
+}
+
+function snapshotHasReadableConversationHistory(snapshot) {
+  return !!(snapshot && ((Array.isArray(snapshot.chatMessages) && snapshot.chatMessages.length > 0)
+    || (Array.isArray(snapshot.workRuns) && snapshot.workRuns.length > 0)));
+}
+
+function renderConversationHistoryFirst(target) {
+  if (!isActiveConversationTarget(target)) return false;
+  var cachedMessages = conversationMessageCache(target);
+  if (cachedMessages.length > 0) {
+    renderChatMessages(cachedMessages, target);
+    renderLoadEarlierButton();
+    return true;
+  }
+  if (workRunsForTarget(target).length > 0) {
+    renderChatMessages([], target);
+    renderLoadEarlierButton();
+    return true;
+  }
+  return false;
+}
+
+function renderChatMessages(messages, target) {
+  var renderTarget = target || currentConversationTarget(activeConversationId());
+  var normalizedMessages = cacheConversationMessages(messages, renderTarget);
+  state.renderedChatMessages = normalizedMessages;
   if (!els['chat-area']) return;
   var chatWasAtBottom = shouldAutoScroll(els['chat-area']);
   els['chat-area'].innerHTML = '';
   if (chatWasAtBottom) _chatShouldAutoScroll = true;
-  var renderConversationId = activeConversationId();
-  var renderTarget = currentConversationTarget(renderConversationId);
+  var renderConversationId = renderTarget.conversationId;
   var guideMessages = guideMessagesForTarget(renderTarget);
   var persistedGuideIds = {};
   var persistedRuns = workRunsForTarget(renderTarget).slice();
@@ -11050,7 +11173,7 @@ function renderChatMessages(messages) {
       persistedRunIndexes[runId] = runIndex;
     }
   });
-  (Array.isArray(messages) ? messages : []).forEach(function(message, messageIndex) {
+  normalizedMessages.forEach(function(message, messageIndex) {
     var runId = String(message && message.runId || '');
     var role = String(message && message.role || '');
     var indexedGuideId = String(message && message.clientMessageId || '');
@@ -11095,7 +11218,7 @@ function renderChatMessages(messages) {
   var pendingWorkReview = conversationWorkUiState(renderConversationId).pendingWorkReview;
   resetConversationWorkUi(renderConversationId, false);
   conversationWorkUiState(renderConversationId).pendingWorkReview = pendingWorkReview;
-  if (!messages || !messages.length) {
+  if (!normalizedMessages.length) {
     persistedRuns.forEach(function(run) { renderOwnedWorkRun(run, true); });
     var pendingGuideCount = renderPendingGuideMessages(renderTarget, persistedGuideIds);
     if (!persistedRuns.length && !pendingGuideCount) {
@@ -11533,8 +11656,19 @@ function loadActiveConversationMessages(conversationId) {
       requestedConversationId === String(activeConversationId() || 'default') &&
       responseConversationId === requestedConversationId;
     if (!responseIsCurrent) return;
-    applyConversationSnapshot(s, requestedConversationId);
-  }).catch(function(){});
+    applyConversationSnapshot(s, requestedConversationId, { preserveReadableHistory: true, allowEmptyHistory: true });
+  }).catch(function(error) {
+    var stillCurrent = loadGeneration === state.conversationLoadGeneration &&
+      requestedWorkspaceKey === currentWorkspaceKey() &&
+      requestedConversationId === String(activeConversationId() || 'default');
+    if (!stillCurrent) return;
+    showUiNotice(
+      currentLang() === 'zh' ? '历史记录增强加载失败，已保留当前内容。' : 'History enhancement failed; current content was preserved.',
+      'error',
+      'conversation-history-load-' + requestedWorkspaceKey + '-' + requestedConversationId
+    );
+    console.error('[Conversation] history enhancement failed:', error && error.message ? error.message : String(error));
+  });
 }
 
 function hydrateConversationBranchState(snapshot) {
@@ -11551,7 +11685,7 @@ function hydrateConversationBranchState(snapshot) {
   rememberRuntimeConversationBranchPath(currentConversationTarget(s.conversationId || activeConversationId()));
 }
 
-function applyConversationSnapshot(s, requestedConversationId) {
+function applyConversationSnapshot(s, requestedConversationId, options) {
   if (!s) return;
   if (s.computerUse) {
     var computerTarget = currentConversationTarget(s.conversationId || requestedConversationId || activeConversationId());
@@ -11567,18 +11701,21 @@ function applyConversationSnapshot(s, requestedConversationId) {
       workspaceId: String((s && (s.workspaceId || (s.target && s.target.workspaceId))) || runtimeWorkspaceId('')),
       conversationId: String((s && (s.conversationId || (s.target && s.target.conversationId))) || requestedConversationId)
     };
+    var preserveReadableHistory = !!(options && options.preserveReadableHistory
+      && !snapshotHasReadableConversationHistory(s)
+      && (!options.allowEmptyHistory || conversationHasReadableHistory(snapshotTarget)));
     if (s && s.runtimeKey) registerRuntimeKey(snapshotTarget, s.runtimeKey);
     hydrateConversationBranchState(s);
     rebindQueueToRuntimeBranch(snapshotTarget);
-    if (s && Array.isArray(s.workRuns)) {
+    if (s && Array.isArray(s.workRuns) && !preserveReadableHistory) {
       var viewedBranchIdForSync = Array.isArray(s.viewedBranchNodePath) && s.viewedBranchNodePath.length
         ? String(s.viewedBranchNodePath[s.viewedBranchNodePath.length - 1])
         : '';
       syncWorkRunsSnapshot(s.workRuns, snapshotTarget, viewedBranchIdForSync || undefined);
     }
     applyAutoRouteRatingState(s);
-    if (s && s.chatMessages) {
-      renderChatMessages(s.chatMessages);
+    if (s && Array.isArray(s.chatMessages) && !preserveReadableHistory) {
+      renderChatMessages(s.chatMessages, snapshotTarget);
       renderLoadEarlierButton();
     }
     if (s && s.conversationId) {
@@ -13464,18 +13601,10 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
       attachments: optimisticAttachments,
       model: state.model,
       createdAt: envelope.createdAt,
+      awaitingAck: true,
       allowStatusReset: retryingUnacknowledgedGuide
     }, lockedTarget);
-    applyAgentWorkEventToRun({
-      id: 'guide-' + clientMessageId + '-accepted',
-      type: 'guide_accepted',
-      content: displayText,
-      workspaceId: lockedTarget.workspaceId,
-      conversationId: lockedTarget.conversationId,
-      runId: envelope.runId,
-      clientMessageId: clientMessageId,
-      guide: optimisticGuide
-    });
+    renderPendingGuideMessages(lockedTarget, {});
     var enqueue = api.enqueueGuide ? api.enqueueGuide(envelope) : api.sendMessage(requestMessage, lockedConversationId);
     return Promise.resolve(enqueue).then(function(receipt) {
       if (!receipt || typeof receipt !== 'object' || !String(receipt.status || '').trim()) {
@@ -13631,6 +13760,8 @@ window.sendMessage = async function(modeOverride, queuedText, opts) {
   var responseMsg = null;
   var sendFailure = '';
   try {
+    var activationBeforeSend = pendingConversationActivation(lockedTarget);
+    if (activationBeforeSend) await activationBeforeSend;
     var sendPromise = api.sendMessage(requestMessage, lockedTarget);
     if (requestedMode === 'goal') activateSubmittedGoal(opts.goalObjective || rawText);
     var r = await sendPromise;
@@ -15464,7 +15595,7 @@ function formatModelStatus(status) {
   if (raw === 'available' || raw === 'verified') return t('model.available');
   if (raw === 'degraded') return t('model.degraded');
   if (raw === 'unavailable' || raw === 'failed' || raw === 'error') return t('model.unavailable');
-  if (raw === 'not checked' || raw === 'not_checked' || raw === 'pending') return t('model.notChecked');
+  if (raw === 'not checked' || raw === 'not_checked' || raw === 'unvalidated' || raw === 'pending') return t('model.notChecked');
   return status || t('model.notChecked');
 }
 
@@ -15476,6 +15607,7 @@ function effectiveUiModelStatus(modelEntry) {
   var textEvidence = capabilities.text === true || capabilities.text_input === true || capabilities.text_output === true
     || !!(modelEntry.evaluation && (modelEntry.evaluation.text_input || modelEntry.evaluation.text_output));
   if (rawValidation === 'auth_error' || rawValidation === 'invalid_config') return rawValidation;
+  if (String((modelEntry.validation && modelEntry.validation.level) || '').toLowerCase() === 'discovered') return 'unvalidated';
   if (textEvidence && rawValidation === 'unavailable') return 'degraded';
   return rawValidation || rawEvaluation;
 }
@@ -15539,15 +15671,15 @@ function renderGeneralSettings() {
     '<div class="setting-desc" id="agent-wsl-status">' + esc(state.agentBackend && state.agentBackend.connected ? t('settings.wslConnected') : t('settings.wslDisconnected')) + '</div></div></div>' : '';
   return wslHtml + '<div class="setting-subsection">' +
     '<div class="setting-subsection-title">' + esc(t('settings.remoteBehavior')) + '</div>' +
-    '<div class="setting-row">' +
-    '<label class="setting-label" for="remote-touch-enabled" style="display:inline-flex;align-items:center;gap:6px;min-width:120px;">' +
-    '<input type="checkbox" id="remote-touch-enabled"' + (state.remoteTouchEnabled ? ' checked' : '') + ' onchange="window.setRemoteTouchEnabled(this.checked)">' +
-    '<span>' + esc(t('settings.remoteTouch')) + '</span></label>' +
-    '<span class="setting-desc" style="flex:1;min-width:140px;">' + esc(t('settings.remoteTouchDesc')) + '</span>' +
+    '<div class="setting-row remote-touch-row">' +
+    '<button type="button" id="remote-touch-status-button" class="sec-btn remote-touch-action remote-touch-status ' + esc(remoteTouchStatusClass()) + '" aria-pressed="' + (state.remoteTouchEnabled ? 'true' : 'false') + '" aria-busy="' + (state.remoteTouchStatusBusy ? 'true' : 'false') + '" onclick="window.setRemoteTouchEnabled(!state.remoteTouchEnabled)" title="' + esc(remoteTouchStatusTitle()) + '"' + (state.remoteTouchStatusBusy ? ' disabled' : '') + '>' + esc(remoteTouchStatusText()) + '</button>' +
+    '<div class="remote-touch-copy"><div class="remote-touch-copy-title">' + esc(t('settings.remoteTouch')) + '</div>' +
+    '<div class="remote-touch-copy-desc">' + esc(t('settings.remoteTouchDesc')) + '</div></div>' +
     '</div>' +
-    '<div class="setting-row" style="border-bottom:none;">' +
-    '<button type="button" class="sec-btn primary" onclick="window.showMobilePairing()">' + esc(t('settings.remoteConnect')) + '</button>' +
-    '<span class="setting-desc" style="flex:1;">' + esc(t('settings.remoteConnectDesc')) + '</span>' +
+    '<div class="setting-row remote-touch-row" style="border-bottom:none;">' +
+    '<button type="button" id="remote-touch-connect-button" class="sec-btn primary remote-touch-action" onclick="window.showMobilePairing()">' + esc(t('settings.remoteConnect')) + '</button>' +
+    '<div class="remote-touch-copy"><div class="remote-touch-copy-title">' + esc(t('mobile.pair')) + '</div>' +
+    '<div class="remote-touch-copy-desc">' + esc(t('settings.remoteConnectDesc')) + '</div></div>' +
     '</div>' +
     '</div>' +
     '<div class="setting-row">' +
@@ -15656,7 +15788,7 @@ function renderModelSettings() {
       var normalizedStatus = String(statusRaw || '').toLowerCase();
       var statusClass = normalizedStatus === 'available' || normalizedStatus === 'verified' || normalizedStatus === 'degraded'
         ? 'model-eval-ok'
-        : (normalizedStatus === 'not checked' ? 'model-eval-pending' : 'model-eval-bad');
+        : (normalizedStatus === 'not checked' || normalizedStatus === 'unvalidated' ? '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;
@@ -16225,13 +16357,96 @@ window.setAgentBackendMode = async function(mode) {
   return true;
 };
 
+function remoteTouchStatusClass() {
+  if (state.remoteTouchStatusBusy) return 'checking';
+  var status = state.remoteTouchServer || {};
+  if (!state.remoteTouchEnabled || status.state === 'off') return 'off';
+  return status.state === 'listening' && status.listening && status.reachable ? 'listening' : 'error';
+}
+
+function remoteTouchStatusText() {
+  var statusClass = remoteTouchStatusClass();
+  if (statusClass === 'checking') return t('settings.remoteTouchChecking');
+  if (statusClass === 'listening') return t('settings.remoteTouchListening');
+  if (statusClass === 'error') return t('settings.remoteTouchError');
+  return t('settings.remoteTouchOff');
+}
+
+function remoteTouchStatusTitle() {
+  var status = state.remoteTouchServer || {};
+  var endpoint = status.host ? status.host + ':' + (status.port || 47890) : '';
+  return [remoteTouchStatusText(), endpoint, status.error || ''].filter(Boolean).join(' · ');
+}
+
+window.updateRemoteTouchStatusButton = function() {
+  var button = document.getElementById('remote-touch-status-button');
+  if (!button) return;
+  button.className = 'sec-btn remote-touch-action remote-touch-status ' + remoteTouchStatusClass();
+  button.textContent = remoteTouchStatusText();
+  button.setAttribute('aria-pressed', state.remoteTouchEnabled ? 'true' : 'false');
+  button.setAttribute('aria-busy', state.remoteTouchStatusBusy ? 'true' : 'false');
+  button.title = remoteTouchStatusTitle();
+  button.disabled = !!state.remoteTouchStatusBusy;
+};
+
+window.refreshRemoteTouchServerStatus = async function() {
+  if (!api.mobileServerStatus) return state.remoteTouchServer;
+  try {
+    var result = await api.mobileServerStatus();
+    if (result && result.state) {
+      state.remoteTouchServer = result;
+      state.remoteTouchEnabled = !!result.enabled;
+    }
+  } catch (error) {
+    state.remoteTouchServer = {
+      enabled: state.remoteTouchEnabled,
+      listening: false,
+      reachable: false,
+      state: state.remoteTouchEnabled ? 'error' : 'off',
+      host: '',
+      port: 47890,
+      error: error && error.message ? error.message : String(error || ''),
+      checkedAt: new Date().toISOString(),
+      startedAt: 0
+    };
+  }
+  window.updateRemoteTouchStatusButton();
+  return state.remoteTouchServer;
+};
+
+window.startRemoteTouchStatusPolling = function() {
+  if (state._remoteTouchStatusTimer) clearInterval(state._remoteTouchStatusTimer);
+  window.refreshRemoteTouchServerStatus().catch(function(){});
+  state._remoteTouchStatusTimer = setInterval(function() {
+    window.refreshRemoteTouchServerStatus().catch(function(){});
+  }, 5000);
+};
+
 window.setRemoteTouchEnabled = async function(value) {
   var next = !!value;
   state.remoteTouchEnabled = next;
-  if (api.saveSetting) {
-    try { await api.saveSetting('remote', 'touch_enabled', next); } catch (e) {}
+  state.remoteTouchStatusBusy = true;
+  window.updateRemoteTouchStatusButton();
+  try {
+    var result = api.setRemoteTouchEnabled
+      ? await api.setRemoteTouchEnabled(next)
+      : (api.saveSetting ? await api.saveSetting('remote', 'touch_enabled', next) : null);
+    if (result && result.state) state.remoteTouchServer = result;
+  } catch (error) {
+    state.remoteTouchServer = {
+      enabled: next,
+      listening: false,
+      reachable: false,
+      state: next ? 'error' : 'off',
+      host: '', port: 47890,
+      error: error && error.message ? error.message : String(error || ''),
+      checkedAt: new Date().toISOString(), startedAt: 0
+    };
+  } finally {
+    state.remoteTouchStatusBusy = false;
   }
-  window.settingsTab('general');
+  await window.refreshRemoteTouchServerStatus();
+  window.updateRemoteTouchStatusButton();
 };
 
 window.setAgentWslDistro = async function(value) {
@@ -16477,6 +16692,7 @@ window.saveModelEdit = function(oldProvIdx, modelIdx) {
   if (typeof previous === 'string') previous = { name: previous, display: previous };
   var tierMap = window.parseThinkingTierMap(tierMapEl ? tierMapEl.value : '');
   var updated = Object.assign({}, previous, {
+    _previous_name: previous.name || name,
     name: name,
     display: name,
     description: descEl ? descEl.value : '',
@@ -19214,6 +19430,12 @@ function holdForegroundConversation(id, ms) {
   state.foregroundConversationHoldUntil = Date.now() + (ms || 4500);
 }
 
+function pendingConversationActivation(target) {
+  var scopedTarget = target || currentConversationTarget();
+  var key = runtimeKeyFor(scopedTarget.workspaceId, scopedTarget.conversationId);
+  return state.pendingConversationActivations && state.pendingConversationActivations[key];
+}
+
 function applyBackendConversations(items, activeId, workspaceId) {
   if (!state.currentWorkspace || !items || !items.length) return;
   var key = currentWorkspaceKey(workspaceId);
@@ -19275,14 +19497,24 @@ function syncBackendConversation() {
   }
   if (conv && api.ensureConversation) {
     var requestedTarget = currentConversationTarget(conv.id);
+    state.activeBackendConversationId = conv.id;
+    var historyPromise = loadActiveConversationMessages(conv.id);
     var activate = api.activateConversation ? api.activateConversation(requestedTarget) : api.ensureConversation(requestedTarget);
-    return activate.then(function(s) {
+    var activationPromise = activate.then(function(s) {
       var id = (s && s.conversationId) || conv.id;
       if (!requestIsCurrent() || String(id) !== requestedConversationId) return;
       state.activeBackendConversationId = id;
-      applyConversationSnapshot(s, id);
-      if (s && s.runtimeDeferred) return loadActiveConversationMessages(id);
-    }).catch(function(){});
+      applyConversationSnapshot(s, id, { preserveReadableHistory: true });
+    }).catch(function(error) {
+      if (!requestIsCurrent()) return;
+      showUiNotice(
+        currentLang() === 'zh' ? '对话运行时激活失败，历史记录仍可查看。' : 'Conversation runtime activation failed; history remains available.',
+        'error',
+        'conversation-activation-' + requestedWorkspaceKey + '-' + requestedConversationId
+      );
+      console.error('[Conversation] runtime activation failed:', error && error.message ? error.message : String(error));
+    });
+    return Promise.allSettled([historyPromise, activationPromise]);
   }
   if (conv) {
     if (!requestIsCurrent()) return Promise.resolve();
@@ -19498,10 +19730,11 @@ window.newConversation = function(workspaceReference, branchCommunication) {
   els['chat-area'].innerHTML = '';
   var target = currentConversationTarget(id);
   var activation = api.activateConversation ? api.activateConversation(target) : (api.ensureConversation ? api.ensureConversation(target) : Promise.resolve(null));
-  return activation.then(function(s) {
+  var activationKey = runtimeKeyFor(target.workspaceId, target.conversationId);
+  var activationReady = activation.then(function(s) {
     if (createdWorkspaceKey !== currentWorkspaceKey() || id !== String(activeConversationId() || 'default')) return;
     state.activeBackendConversationId = String((s && s.conversationId) || id);
-    if (s) applyConversationSnapshot(s, id);
+    if (s) applyConversationSnapshot(s, id, { preserveReadableHistory: true });
     if (branchCommunication && api.setConversationBranchCommunication) {
       api.setConversationBranchCommunication(target, true).then(function() {
         var convsNow = currentWorkspaceConversations();
@@ -19511,16 +19744,23 @@ window.newConversation = function(workspaceReference, branchCommunication) {
     }
   }).then(function() {
     if (createdWorkspaceKey !== currentWorkspaceKey() || id !== String(activeConversationId() || 'default')) return;
-    state.foregroundConversationHoldId = '';
-    state.foregroundConversationHoldUntil = 0;
-    renderChatMessages([]);
-    addMsg('system', '[System] ' + t('workspace.newConversation') + ': ' + summary, 'system', '');
+    if (!conversationHasReadableHistory(target)) {
+      renderChatMessages([], target);
+      addMsg('system', '[System] ' + t('workspace.newConversation') + ': ' + summary, 'system', '');
+    }
   }).catch(function(error) {
     if (createdWorkspaceKey === currentWorkspaceKey() && id === String(activeConversationId() || 'default')) {
       showUiNotice((currentLang() === 'zh' ? '新对话持久化失败：' : 'Failed to persist the new conversation: ') + (error && error.message ? error.message : String(error)), 'error', 'new-conversation-activation-' + id);
     }
     throw error;
+  }).finally(function() {
+    if (state.pendingConversationActivations && state.pendingConversationActivations[activationKey] === activationReady) {
+      delete state.pendingConversationActivations[activationKey];
+    }
   });
+  if (!state.pendingConversationActivations) state.pendingConversationActivations = {};
+  state.pendingConversationActivations[activationKey] = activationReady;
+  return activationReady;
 };
 
 window.showNewConversationPage = function() {
@@ -19590,7 +19830,7 @@ window.switchConversation = function(idx) {
   renderConversations();
   var switchSeq = (state._conversationSwitchSeq || 0) + 1;
   state._conversationSwitchSeq = switchSeq;
-  els['chat-area'].innerHTML = '';
+  var restoredReadableHistory = renderConversationHistoryFirst(activeBrowserTarget);
   // The Flow takeover bubble is conversation-local. Immediately reconcile it to
   // the newly active conversation: if the incoming conversation owns a Flow,
   // show it; otherwise hide the bubble instantly so no takeover ever leaks
@@ -19599,7 +19839,9 @@ window.switchConversation = function(idx) {
   if (state._conversationLoadingMsgEl && state._conversationLoadingMsgEl.parentNode) {
     state._conversationLoadingMsgEl.parentNode.removeChild(state._conversationLoadingMsgEl);
   }
-  state._conversationLoadingMsgEl = addMsg('workflow running', t('conversation.loadingIsolated'), 'system', state.model);
+  state._conversationLoadingMsgEl = restoredReadableHistory
+    ? null
+    : addMsg('workflow running', t('conversation.loadingIsolated'), 'system', state.model);
   syncBackendConversation().then(function() {
     // Only the latest switch may touch the UI: an earlier switch's sync
     // resolution must not restore drafts into or re-render the now-current
@@ -23088,6 +23330,7 @@ function schedulePostStartupUiRendering() {
   }
 
   updateMarqueeFromConfig();
+  window.startRemoteTouchStatusPolling();
 
   // Populate selects
   if (els['mode-select']) els['mode-select'].value = state.mode;
@@ -23351,6 +23594,7 @@ function schedulePostStartupUiRendering() {
 
   window.addEventListener('beforeunload', function() {
     if (state._postStartupUiRendering && state._postStartupUiRendering.cancel) state._postStartupUiRendering.cancel();
+    if (state._remoteTouchStatusTimer) clearInterval(state._remoteTouchStatusTimer);
     cancelBrowserGuestIdleDestroy();
     flushPendingConversationDraftPersists();
   }, { once: true });