newmark-agent 0.4.5 → 0.4.7

package/dist/core/toolPolicy.js

@@ -26,6 +26,10 @@ const MODE_SCOPED_TOOLS = new Set([
     'task_read',
     'task_create',
     'question',
+    'SubAgent',
+    'subagent_create',
+    // Legacy runtime alias. It is no longer published to models because its
+    // generic name collides with the persistent task checklist.
     'task',
     'subagent_list',
     'subagent_read',
@@ -59,6 +63,8 @@ const PLAN_READ_ONLY_TOOLS = new Set([
     'skill',
     'linked_plan',
     'build_history_query',
+    'SubAgent',
+    'subagent_create',
     'task',
     'subagent_list',
     'subagent_read',
@@ -76,9 +82,10 @@ const PLAN_BROWSER_USE_ACTION_SET = new Set(exports.PLAN_BROWSER_USE_ACTIONS);
 /**
  * 并发安全工具集合（DSH isConcurrencySafe 语义的 Newmark 落地）。
  *
- * 只有确定性无副作用的只读工具才允许与兄弟 tool call 并发执行；任何写入、
- * shell 命令、浏览器交互、子代理编排、以及会改变对话/文件/外部状态的工具
- * 都保持独占串行，避免盲目 Promise.all 引发竞态。缺省保守：不在集合中的
+ * 确定性无副作用的只读工具允许与兄弟 tool call 并发执行。`SubAgent` 创建是
+ * 唯一允许并发的受控写操作：每个调用只追加一个独立 UUID 记录，真正的 worker
+ * 并发由 SubagentManager 的 4/16 槽位及 Build Block 硬上限管理。其他写入、shell、
+ * 浏览器交互、子代理发送/关闭等操作仍保持独占串行。缺省保守：不在集合中的
  * 工具一律视为独占。
  *
  * 注意：read/grep/glob/pwd 是同一进程内的内存/文件系统只读，可安全重叠；
@@ -96,6 +103,7 @@ const CONCURRENCY_SAFE_TOOLS = new Set([
     'git_status',
     'file_audit',
     'repo_security_audit',
+    'SubAgent',
 ]);
 /** 判断一个工具是否可参与并行调度。缺省 false（独占）。
  *  优先看 toolchain registry 推断的 riskLevel（'read' 工具天然并发安全，

package/dist/launcher.js

@@ -312,6 +312,19 @@ if (isGui) {
     launchGui();
 }
 else if (isTui) {
+    // 远程触及开关开启 → 后端托管启动 mobile server（不阻塞 TUI 其他功能；TUI 退出即随终端托管结束）
+    try {
+        const { ConfigManager } = require('./core/config');
+        const tuiConfig = new ConfigManager(root);
+        if (tuiConfig.getBool('remote', 'touch_enabled')) {
+            const { runServer } = require('./server');
+            runServer(root);
+            console.log('[Newmark] mobile server hosted (remote touch enabled)');
+        }
+    }
+    catch (error) {
+        console.error('[Newmark] TUI hosted mobile server failed:', error instanceof Error ? error.message : String(error));
+    }
     const { start } = require('./tui/src/app');
     start({ root, workspacePath: resolveTuiWorkspacePath(args, root), desktopDist: __dirname });
 }
@@ -363,18 +376,8 @@ else if (isCli || (!isServer && isTerminal())) {
     runCli(root);
 }
 else {
-    // Server mode - start HTTP server and open browser
+    // Server mode - start HTTP server（不绑定启动浏览器）
     const { runServer } = require('./server');
     runServer(root);
-    if (!args.includes('--no-browser')) {
-        const { exec } = require('child_process');
-        const port = 47890;
-        const cmd = process.platform === 'win32'
-            ? `start http://localhost:${port}`
-            : process.platform === 'darwin'
-                ? `open http://localhost:${port}`
-                : `xdg-open http://localhost:${port}`;
-        exec(cmd);
-    }
 }
 //# sourceMappingURL=launcher.js.map

package/dist/main.js

@@ -55,6 +55,7 @@ const cli_discovery_1 = require("./cli-discovery");
 const config_1 = require("./core/config");
 const memoryLab_1 = require("./core/memoryLab");
 const installUpdate_1 = require("./core/installUpdate");
+const mobilePairing_1 = require("./core/mobilePairing");
 const terminalTakeover_1 = require("./tools/terminalTakeover");
 const nativeBash_1 = require("./core/nativeBash");
 const nativeTools_1 = require("./tools/nativeTools");
@@ -419,9 +420,10 @@ function relayFlowAgentWorkEvents(flowAgent, target) {
     });
 }
 function themedAppIconPath() {
-    const themeName = electron_1.nativeTheme.shouldUseDarkColors ? 'light' : 'dark';
-    const compactPath = path.join(__dirname, 'assets', `app-icon-${themeName}-64.png`);
-    return fs.existsSync(compactPath) ? compactPath : appAssetPath(`app-icon-${themeName}.png`);
+    // Fixed black-on-white icon across every theme: the titlebar, taskbar, tray,
+    // and Windows executable all share the same dark icon asset.
+    const compactPath = path.join(__dirname, 'assets', 'app-icon-dark-64.png');
+    return fs.existsSync(compactPath) ? compactPath : appAssetPath('app-icon-dark.png');
 }
 function createAppIconImage(size) {
     const image = electron_1.nativeImage.createFromPath(themedAppIconPath());
@@ -1880,6 +1882,17 @@ else {
                     ensureWorkspaceRegistryWatcher();
                     restoreStoredFlowSuspension();
                     recordStartup('agent-ready');
+                    // 远程触及开关开启 → GUI 进程内托管启动 mobile server（托盘常驻不中断）
+                    if (agent.config.getBool('remote', 'touch_enabled')) {
+                        try {
+                            const { runServer } = require('./server');
+                            runServer(root);
+                            recordStartup('mobile-server-hosted');
+                        }
+                        catch (error) {
+                            console.error('[Newmark] hosted mobile server failed:', error instanceof Error ? error.message : String(error));
+                        }
+                    }
                 }
             };
             const localConversationSnapshotForStartup = (target) => {
@@ -3472,6 +3485,7 @@ else {
                         },
                     configuredAgentBackend: agent.config.getBool('agent', 'run_in_wsl') ? 'wsl' : 'windows',
                     agentBackendRestartRequired: (agent.config.getBool('agent', 'run_in_wsl') ? 'wsl' : 'windows') !== activeAgentBackendMode,
+                    remoteTouchEnabled: agent.config.getBool('remote', 'touch_enabled'),
                     wslAvailable: wslDistros.length > 0,
                     wslDistros,
                 };
@@ -4784,6 +4798,15 @@ else {
                 return { servers: mcpManager.list(), discovered };
             });
             electron_1.ipcMain.handle('dsh:discover', async () => (0, dshCompatibility_1.discoverDshCompatibility)(root));
+            electron_1.ipcMain.handle('dsh:installBundle', async (_event, manifestPath) => {
+                return (0, dshCompatibility_1.installDshBundle)(root, String(manifestPath || ''));
+            });
+            electron_1.ipcMain.handle('dsh:uninstallBundle', async (_event, name) => {
+                return (0, dshCompatibility_1.uninstallDshBundle)(root, String(name || ''));
+            });
+            electron_1.ipcMain.handle('dsh:setBundleEnabled', async (_event, name, enabled) => {
+                return (0, dshCompatibility_1.setDshBundleEnabled)(root, String(name || ''), enabled === true);
+            });
             electron_1.ipcMain.handle('mcp:upsert', async (_event, input) => {
                 if (!mcpManager)
                     return { ok: false, error: 'MCP manager is unavailable.' };
@@ -4855,6 +4878,21 @@ else {
             electron_1.ipcMain.handle('update:version', async () => {
                 return { ok: true, version: (0, installUpdate_1.currentAppVersion)(), root };
             });
+            electron_1.ipcMain.handle('mobile:pairingQr', async () => {
+                const qr = await (0, mobilePairing_1.pairingQrDataUrl)(root);
+                return {
+                    ok: true,
+                    url: qr.session.url,
+                    dataUrl: qr.dataUrl,
+                    pairingId: qr.session.pairingId,
+                    expiresAt: qr.session.expiresAt,
+                    tokenFile: (0, mobilePairing_1.pairingTokenPath)(root),
+                    tailscaleIpv4: (0, mobilePairing_1.tailscaleIpv4)(),
+                };
+            });
+            electron_1.ipcMain.handle('mobile:pairingStatus', async () => {
+                return { ok: true, status: (0, mobilePairing_1.pairingStatus)(root) };
+            });
             electron_1.ipcMain.handle('update:checkGithub', async (_event, input = {}) => {
                 return (0, installUpdate_1.checkGitHubUpdate)(String(input.repo || ''), String(input.tag || ''), String(input.asset || ''));
             });
@@ -4884,6 +4922,29 @@ else {
                     setTimeout(() => electron_1.app.quit(), 150);
                 return result;
             });
+            electron_1.ipcMain.handle('update:planMsi', async (_event, input = {}) => {
+                return (0, installUpdate_1.planManagedMsiInstall)(String(input.msiPath || ''), {
+                    stopConfirmed: input.stopConfirmed === true,
+                    removeLegacyConfirmed: input.removeLegacyConfirmed === true,
+                    uninstallPrevious: input.uninstallPrevious !== false,
+                    allowElevate: input.allowElevate !== false,
+                    excludeRoots: Array.isArray(input.excludeRoots) ? input.excludeRoots.map(String) : undefined,
+                    logDir: typeof input.logDir === 'string' ? input.logDir : undefined,
+                });
+            });
+            electron_1.ipcMain.handle('update:executeMsi', async (_event, input = {}) => {
+                const result = (0, installUpdate_1.executeManagedMsiInstall)(String(input.msiPath || ''), {
+                    stopConfirmed: input.stopConfirmed === true,
+                    removeLegacyConfirmed: input.removeLegacyConfirmed === true,
+                    uninstallPrevious: input.uninstallPrevious !== false,
+                    allowElevate: input.allowElevate !== false,
+                    excludeRoots: Array.isArray(input.excludeRoots) ? input.excludeRoots.map(String) : undefined,
+                    logDir: typeof input.logDir === 'string' ? input.logDir : undefined,
+                });
+                if (result.ok)
+                    setTimeout(() => electron_1.app.quit(), 150);
+                return result;
+            });
             electron_1.ipcMain.handle('github:gh', async (_event, argv = []) => {
                 const safeArgs = Array.isArray(argv) ? argv.map(String).filter(a => a.length < 400) : [];
                 try {

package/dist/preload.js

@@ -124,6 +124,9 @@ contextBridge.exposeInMainWorld('api', {
     refreshSkills: () => ipcRenderer.invoke('skills:refresh'),
     listMcpServers: () => ipcRenderer.invoke('mcp:list'),
     discoverDshCompatibility: () => ipcRenderer.invoke('dsh:discover'),
+    installDshBundle: (manifestPath) => ipcRenderer.invoke('dsh:installBundle', manifestPath),
+    uninstallDshBundle: (name) => ipcRenderer.invoke('dsh:uninstallBundle', name),
+    setDshBundleEnabled: (name, enabled) => ipcRenderer.invoke('dsh:setBundleEnabled', name, enabled),
     upsertMcpServer: (input) => ipcRenderer.invoke('mcp:upsert', input),
     setMcpServerEnabled: (id, enabled) => ipcRenderer.invoke('mcp:setEnabled', id, enabled),
     removeMcpServer: (id) => ipcRenderer.invoke('mcp:remove', id),
@@ -134,6 +137,8 @@ contextBridge.exposeInMainWorld('api', {
     memoryLabUpdate: (input) => ipcRenderer.invoke('memoryLab:update', input),
     memoryLabReindex: () => ipcRenderer.invoke('memoryLab:reindex'),
     updateVersion: () => ipcRenderer.invoke('update:version'),
+    mobilePairingQr: () => ipcRenderer.invoke('mobile:pairingQr'),
+    mobilePairingStatus: () => ipcRenderer.invoke('mobile:pairingStatus'),
     updateCheckGithub: (input) => ipcRenderer.invoke('update:checkGithub', input),
     updateApplyGithub: (input) => ipcRenderer.invoke('update:applyGithub', input),
     updateInstallLocal: (input) => ipcRenderer.invoke('update:installLocal', input),

package/dist/providers/chat-completions.adapter.js

@@ -38,14 +38,18 @@ class ChatCompletionsAdapter {
             ...(request.systemPrompt ? [{ role: CHAT_SYSTEM_ROLE, content: request.systemPrompt }] : []),
             ...(0, chat_messages_1.openAIChatMessages)(request.messages),
         ];
+        const tools = this.serializeTools(request.tools);
         const body = {
             model: request.model,
             messages,
             temperature: request.temperature,
             max_tokens: request.maxOutputTokens,
-            tools: this.serializeTools(request.tools),
-            tool_choice: 'auto',
         };
+        if (tools.length) {
+            body.tools = tools;
+            body.tool_choice = 'auto';
+            body.parallel_tool_calls = true;
+        }
         if (request.reasoningEffort)
             body.reasoning_effort = request.reasoningEffort;
         // 会话标识透传：仅当上层（支持 session_id 语义的 provider）显式填充时写进

package/dist/providers/responses.adapter.js

@@ -78,6 +78,7 @@ class ResponsesAdapter {
         if (tools.length) {
             body.tools = tools;
             body.tool_choice = 'auto';
+            body.parallel_tool_calls = true;
         }
         const base = request.baseUrl.replace(/\/+$/, '');
         return {

package/dist/server.d.ts

@@ -1,2 +1,3 @@
+/** 托管启动 server（GUI/TUI 内嵌调用；幂等防重入，进程常驻即服务常驻） */
 export declare function runServer(root: string): void;
 //# sourceMappingURL=server.d.ts.map