newmark-agent 0.4.8 → 0.4.9

package/dist/server.js

@@ -33,6 +33,10 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.configureHostedServer = configureHostedServer;
+exports.stopHostedServer = stopHostedServer;
+exports.hostedServerStatus = hostedServerStatus;
+exports.setHostedServerEnabled = setHostedServerEnabled;
 exports.runServer = runServer;
 exports.setHostedServerAutomation = setHostedServerAutomation;
 const http = __importStar(require("http"));
@@ -59,6 +63,14 @@ const mobileWorkEventSubscribers = new Set();
 const mobileScopedRuntimes = new Map();
 let hostedWorkEventSink = null;
 let unsubscribeHostedWorkEvents = null;
+let unsubscribeServerAgentWorkEvents = null;
+let hostedServer = null;
+let hostedServerRoot = '';
+let hostedServerOptions = {};
+let hostedServerError = '';
+let hostedServerStartedAt = 0;
+let hostedAccessHost = '';
+let hostedAccessHostCheckedAt = 0;
 let hostedConversationUiState;
 let hostedConversationUiAction;
 let hostedConversationPrompt;
@@ -1107,7 +1119,7 @@ async function handleApi(req, res, body) {
                 const workspaceId = String(params.workspaceId || '');
                 const conversationId = String(params.conversationId || '');
                 const action = String(params.action || '');
-                const allowed = new Set(['goal_update', 'goal_guide', 'conversation_guide', 'goal_toggle_pause', 'goal_clear', 'flow_pause', 'flow_resume', 'flow_guide', 'conversation_stop', 'input_mode', 'queue_enqueue', 'queue_update', 'queue_delete', 'queue_toggle_pause', 'queue_guide']);
+                const allowed = new Set(['goal_update', 'goal_guide', 'conversation_guide', 'goal_toggle_pause', 'goal_clear', 'flow_pause', 'flow_resume', 'flow_guide', 'conversation_stop', 'input_mode', 'queue_enqueue', 'queue_update', 'queue_delete', 'queue_reorder', 'queue_toggle_pause', 'queue_guide']);
                 if (!workspaceId || !conversationId || !allowed.has(action)) {
                     mobileJson(res, { error: 'workspaceId, conversationId, and a valid action are required' }, 400);
                     return;
@@ -1448,7 +1460,8 @@ function startServer(root, options = {}) {
                 agent.setConversationFromStorage(previousConversation);
             }
         });
-    agent.subscribeWorkEvents(publishServerWorkEvent);
+    unsubscribeServerAgentWorkEvents?.();
+    unsubscribeServerAgentWorkEvents = agent.subscribeWorkEvents(publishServerWorkEvent);
     if (automation) {
         agent.setAutomationManager(automation);
         if (!options.automation)
@@ -1492,6 +1505,14 @@ function startServer(root, options = {}) {
     const lan = (0, mobilePairing_1.lanIpv4)();
     const accessHost = tailscale || lan || '<lan-or-tailscale-ip>';
     const tokenPath = path.join(root, '.newmark-mobile-token');
+    hostedServer = server;
+    hostedServerError = '';
+    hostedServerStartedAt = Date.now();
+    server.once('error', error => {
+        hostedServerError = error instanceof Error ? error.message : String(error);
+        if (hostedServer === server)
+            hostedServer = null;
+    });
     server.listen(PORT, bindHost, () => {
         console.log(`\n  Newmark Agent v1.0 - Server Mode`);
         console.log(`  Bind: ${bindHost}:${PORT}`);
@@ -1503,14 +1524,137 @@ function startServer(root, options = {}) {
         console.log(`  Mobile events (SSE): http://${accessHost}:${PORT}/api/mobile/events?token=<token>`);
         console.log(`  Press Ctrl+C to stop\n`);
     });
+    return server;
+}
+function configuredAccessHost() {
+    const now = Date.now();
+    if (now - hostedAccessHostCheckedAt < 30_000)
+        return hostedAccessHost;
+    hostedAccessHost = (0, mobilePairing_1.tailscaleIpv4)() || (0, mobilePairing_1.lanIpv4)() || '';
+    hostedAccessHostCheckedAt = now;
+    return hostedAccessHost;
+}
+function waitForHostedServerListening(timeoutMs = 5000) {
+    if (hostedServer?.listening)
+        return Promise.resolve();
+    return new Promise((resolve, reject) => {
+        const deadline = Date.now() + timeoutMs;
+        const tick = () => {
+            if (hostedServer?.listening)
+                return resolve();
+            if (hostedServerError)
+                return reject(new Error(hostedServerError));
+            if (Date.now() >= deadline)
+                return reject(new Error('Mobile server listen timeout'));
+            setTimeout(tick, 50);
+        };
+        tick();
+    });
+}
+async function probeHostedServer(host) {
+    if (!hostedServer?.listening || !mobileToken)
+        return { ok: false, error: hostedServerError || 'Mobile server is not listening' };
+    return await new Promise(resolve => {
+        const request = http.get({
+            hostname: host,
+            port: PORT,
+            path: `/api/mobile/hello?token=${encodeURIComponent(mobileToken)}`,
+            timeout: 1800,
+        }, response => {
+            let body = '';
+            response.setEncoding('utf8');
+            response.on('data', chunk => { body += chunk; });
+            response.on('end', () => {
+                try {
+                    const parsed = JSON.parse(body || '{}');
+                    const ok = response.statusCode === 200 && parsed.ok === true;
+                    resolve({ ok, error: ok ? '' : String(parsed.error || `HTTP ${response.statusCode || 0}`) });
+                }
+                catch (error) {
+                    resolve({ ok: false, error: error instanceof Error ? error.message : String(error) });
+                }
+            });
+        });
+        request.on('timeout', () => request.destroy(new Error('Mobile server probe timeout')));
+        request.on('error', error => resolve({ ok: false, error: error.message }));
+    });
+}
+function configureHostedServer(root, options = {}) {
+    hostedServerRoot = root;
+    hostedServerOptions = options;
+}
+async function stopHostedServer() {
+    const server = hostedServer;
+    hostedServer = null;
+    if (server) {
+        await new Promise(resolve => {
+            const timer = setTimeout(resolve, 2500);
+            server.close(() => {
+                clearTimeout(timer);
+                resolve();
+            });
+            server.closeAllConnections?.();
+        });
+    }
+    unsubscribeHostedWorkEvents?.();
+    unsubscribeHostedWorkEvents = null;
+    unsubscribeServerAgentWorkEvents?.();
+    unsubscribeServerAgentWorkEvents = null;
+    hostedServerStartedAt = 0;
+}
+async function hostedServerStatus(enabled = true, probeHost = '') {
+    const listening = !!hostedServer?.listening;
+    const host = enabled ? (String(probeHost || '').trim() || configuredAccessHost()) : '';
+    let reachable = false;
+    let error = hostedServerError;
+    if (enabled && listening) {
+        if (!host)
+            error = 'No LAN or Tailscale IPv4 address is available';
+        else {
+            const probe = await probeHostedServer(host);
+            reachable = probe.ok;
+            if (!probe.ok)
+                error = probe.error;
+        }
+    }
+    const state = !enabled ? 'off' : listening && reachable ? 'listening' : 'error';
+    return {
+        enabled,
+        listening,
+        reachable,
+        state,
+        host,
+        port: PORT,
+        error: state === 'error' ? (error || 'Mobile server is not reachable') : '',
+        checkedAt: new Date().toISOString(),
+        startedAt: hostedServerStartedAt,
+    };
+}
+async function setHostedServerEnabled(enabled, probeHost = '') {
+    await stopHostedServer();
+    hostedServerError = '';
+    if (enabled) {
+        if (!hostedServerRoot)
+            throw new Error('Hosted mobile server is not configured');
+        startServer(hostedServerRoot, hostedServerOptions);
+        try {
+            await waitForHostedServerListening();
+        }
+        catch (error) {
+            hostedServerError = error instanceof Error ? error.message : String(error);
+        }
+    }
+    return await hostedServerStatus(enabled, probeHost);
 }
-let hostedServerStarted = false;
 /** 托管启动 server（GUI/TUI 内嵌调用；幂等防重入，进程常驻即服务常驻） */
 function runServer(root, options = {}) {
-    if (hostedServerStarted)
+    if (!hostedServerRoot || Object.keys(options).length > 0)
+        configureHostedServer(root, options);
+    else
+        hostedServerRoot = root;
+    if (hostedServer?.listening)
         return;
-    hostedServerStarted = true;
-    startServer(root, options);
+    startServer(hostedServerRoot, hostedServerOptions);
 }
 /** Attach the GUI-owned automation manager after deferred startup. */
 function setHostedServerAutomation(manager) {

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));
@@ -6302,6 +6340,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 +6525,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 +7256,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 +7438,7 @@ var NEWMARK_I18N = {
     'model.unavailable': '不可用',
     'model.no': '否',
     'model.yes': '是',
-    'model.notChecked': '未校验',
+    'model.notChecked': '未检测',
     'archive.current': '归档当前对话',
     'archive.archiving': '归档中...',
     'archive.empty': '暂无归档。',
@@ -15464,7 +15513,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 +15525,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 +15589,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 +15706,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 +16275,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 +16610,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 : '',
@@ -23088,6 +23222,7 @@ function schedulePostStartupUiRendering() {
   }
 
   updateMarqueeFromConfig();
+  window.startRemoteTouchStatusPolling();
 
   // Populate selects
   if (els['mode-select']) els['mode-select'].value = state.mode;
@@ -23351,6 +23486,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 });