newmark-agent 0.5.14 → 0.6.0

package/dist/server.js

@@ -56,6 +56,7 @@ const nativeBash_1 = require("./core/nativeBash");
 const installUpdate_1 = require("./core/installUpdate");
 const mobilePairing_1 = require("./core/mobilePairing");
 const workEventCoalescer_1 = require("./core/workEventCoalescer");
+const conversationListEvent_1 = require("./core/conversationListEvent");
 const searchMcpPool_1 = require("./core/searchMcpPool");
 const PORT = 47890;
 let agent = null;
@@ -124,6 +125,36 @@ function resolveMobileWorkspace(current, workspaceId) {
     return [...current.workspace.internal, ...current.workspace.external].find(workspace => workspace.id === clean)
         || (current.workspace.current?.id === clean ? current.workspace.current : null);
 }
+function hostedCommandTarget(current, params) {
+    const workspaceId = String(params.workspaceId || current.workspace.current?.id || '');
+    const workspace = workspaceId ? resolveMobileWorkspace(current, workspaceId) : null;
+    if (workspaceId && !workspace)
+        throw new Error('Unknown workspace');
+    const explicitConversation = params.conversationId || params.conversation;
+    const conversationId = String(explicitConversation || (workspace ? current.activeConversationIdForWorkspace(workspace) : current.activeConversationId));
+    if (workspace && explicitConversation && !current.hasConversationInWorkspace(conversationId, workspace))
+        throw new Error('Conversation not found in workspace');
+    return { workspaceId, conversationId };
+}
+function promptCommandMessage(input) {
+    if (typeof input === 'string')
+        return input.trim() ? input : null;
+    if (!input || typeof input !== 'object' || Array.isArray(input))
+        return null;
+    const message = input;
+    return typeof message.text === 'string'
+        && (message.text.trim() || (Array.isArray(message.images) && message.images.length > 0)) ? message : null;
+}
+function hostedCommandOptions(params) {
+    return {
+        requestedMode: String(params.requestedMode || params.mode || ''),
+        goalObjective: String(params.goalObjective || ''),
+        inputMode: String(params.inputMode || ''),
+        clientMessageId: String(params.clientMessageId || ''),
+        flowName: String(params.flowName || params.defaultFlow || ''),
+        flowStart: typeof params.flowStart === 'number' && Number.isFinite(params.flowStart) ? params.flowStart : undefined,
+    };
+}
 const MOBILE_EDITABLE_EXTENSIONS = new Set([
     '.txt', '.md', '.markdown', '.json', '.jsonc', '.yaml', '.yml', '.toml', '.ini', '.cfg', '.conf',
     '.js', '.mjs', '.cjs', '.ts', '.tsx', '.jsx', '.css', '.scss', '.html', '.htm', '.xml', '.svg',
@@ -629,17 +660,27 @@ async function handleApi(req, res, body) {
                         messages: s.messages.slice(-20),
                     })),
                     archives: agent.listArchives(),
+                    ...(hostedConversationUiState ? await hostedConversationUiState(hostedCommandTarget(agent, Object.fromEntries(url.searchParams))) : {}),
                 });
                 return;
             }
             case '/api/send':
             case '/api/send-prompt': {
                 const params = JSON.parse(body || '{}');
-                const message = params.message || '';
+                const message = promptCommandMessage(params.message);
                 if (!message) {
                     jsonResponse(res, { error: 'No message' }, 400);
                     return;
                 }
+                if (hostedConversationPrompt) {
+                    const result = await hostedConversationPrompt(hostedCommandTarget(agent, params), message, hostedCommandOptions(params));
+                    if (pathname === '/api/send-prompt' && Array.isArray(result.tokens)) {
+                        jsonResponse(res, result.tokens.map((token) => token.text || '').join(''));
+                    }
+                    else
+                        jsonResponse(res, result);
+                    return;
+                }
                 if (params.conversation)
                     agent.setConversation(String(params.conversation));
                 const tokens = await agent.process(message);
@@ -666,7 +707,12 @@ async function handleApi(req, res, body) {
                 return;
             }
             case '/api/mode': {
-                const m = JSON.parse(body || '{}').mode || 'build';
+                const params = JSON.parse(body || '{}');
+                const m = params.mode || 'build';
+                if (hostedConversationUiAction) {
+                    jsonResponse(res, await hostedConversationUiAction(hostedCommandTarget(agent, params), 'mode', String(m), params));
+                    return;
+                }
                 agent.setMode(m);
                 jsonResponse(res, { mode: agent.mode });
                 return;
@@ -996,6 +1042,18 @@ async function handleApi(req, res, body) {
                 });
                 return;
             }
+            case '/api/input-mode': {
+                const params = JSON.parse(body || '{}');
+                const inputMode = params.inputMode === 'next' ? 'next' : 'guide';
+                if (hostedConversationUiAction) {
+                    jsonResponse(res, await hostedConversationUiAction(hostedCommandTarget(agent, params), 'input_mode', inputMode, params));
+                }
+                else {
+                    agent.setInputMode(inputMode);
+                    jsonResponse(res, { inputMode: agent.inputMode });
+                }
+                return;
+            }
             case '/api/mobile/web-search': {
                 const input = JSON.parse(body || '{}');
                 const query = String(input.query || '').trim();
@@ -1082,10 +1140,14 @@ async function handleApi(req, res, body) {
                     mobileJson(res, { error: 'Conversation not found in workspace' }, 404);
                     return;
                 }
-                // GUI conversations normally execute inside isolated runtime pools.
-                // Their durable target state can be newer than the hosted main Agent's
-                // foreground memory, so workspace-bound mobile reads must hydrate a
-                // fresh read-only target Agent from storage.
+                // The GUI owner may contain live deltas not yet persisted. Forward the
+                // requested history window to that same owner, without another slice.
+                if (hostedConversationUiState) {
+                    const targetWorkspaceId = ws?.id || current.workspace.current?.id || '';
+                    mobileJson(res, await hostedConversationUiState({ workspaceId: targetWorkspaceId, conversationId: String(conversationId) }, { window: windowSize, before }));
+                    return;
+                }
+                // Standalone server mode has no GUI runtime owner to delegate to.
                 const snapshotAgent = ws ? mobileScopedAgent(ws, String(conversationId)) : current;
                 const snapshot = snapshotAgent.getConversationSnapshot(String(conversationId), {
                     window: windowSize,
@@ -1278,6 +1340,7 @@ async function handleApi(req, res, body) {
                     return;
                 }
                 const created = agent.createConversationInWorkspace(ws, String(params.title || ''));
+                publishServerWorkEvent((0, conversationListEvent_1.conversationListEvent)(agent, ws));
                 mobileJson(res, {
                     ok: true,
                     workspace: { id: ws.id, name: ws.name, path: ws.path, isInternal: ws.isInternal },
@@ -1312,7 +1375,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_reorder', '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', 'mode', 'input_mode', 'queue_enqueue', 'queue_update', 'queue_delete', 'queue_reorder', 'queue_toggle_pause', 'queue_set_pause', 'queue_guide']);
                 if (!workspaceId || !conversationId || !allowed.has(action)) {
                     mobileJson(res, { error: 'workspaceId, conversationId, and a valid action are required' }, 400);
                     return;
@@ -1342,7 +1405,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(['queue_enqueue', 'queue_update', 'queue_delete', 'queue_reorder', 'queue_toggle_pause', 'queue_guide']);
+                const allowed = new Set(['queue_enqueue', 'queue_update', 'queue_delete', 'queue_reorder', 'queue_toggle_pause', 'queue_set_pause', 'queue_guide']);
                 if (!workspaceId || !conversationId || !allowed.has(action)) {
                     jsonResponse(res, { error: 'workspaceId, conversationId, and a valid queue action are required' }, 400);
                     return;
@@ -1373,6 +1436,7 @@ async function handleApi(req, res, body) {
                     mobileJson(res, { ok: false, error: 'Conversation rename failed' }, 404);
                     return;
                 }
+                publishServerWorkEvent((0, conversationListEvent_1.conversationListEvent)(agent, ws));
                 mobileJson(res, { ok: true, conversations: mobileWorkspaceConversationRows(agent, ws) });
                 return;
             }
@@ -1395,6 +1459,7 @@ async function handleApi(req, res, body) {
                     mobileJson(res, { ok: false, error: 'Conversation pin update failed' }, 404);
                     return;
                 }
+                publishServerWorkEvent((0, conversationListEvent_1.conversationListEvent)(agent, ws));
                 mobileJson(res, { ok: true, pinned, conversations: mobileWorkspaceConversationRows(agent, ws) });
                 return;
             }
@@ -1432,19 +1497,18 @@ async function handleApi(req, res, body) {
                     mobileJson(res, { ok: false, error: 'Conversation reorder failed' }, 409);
                     return;
                 }
+                publishServerWorkEvent((0, conversationListEvent_1.conversationListEvent)(current, ws));
                 mobileJson(res, { ok: true, conversations: mobileWorkspaceConversationRows(current, ws) });
                 return;
             }
             case '/api/mobile/send': {
                 const params = JSON.parse(body || '{}');
-                const message = String(params.message || '');
+                const message = promptCommandMessage(params.message);
                 if (!message) {
                     mobileJson(res, { error: 'No message' }, 400);
                     return;
                 }
-                const workspaceId = String(params.workspaceId || '');
-                let requestAgent = agent;
-                let requestWorkspace = agent.workspace.current;
+                const workspaceId = String(params.workspaceId || agent.workspace.current?.id || '');
                 let resolvedWorkspace = null;
                 if (workspaceId) {
                     const ws = resolveMobileWorkspace(agent, workspaceId);
@@ -1453,7 +1517,6 @@ async function handleApi(req, res, body) {
                         return;
                     }
                     resolvedWorkspace = ws;
-                    requestWorkspace = ws;
                 }
                 const conversationId = String(params.conversationId
                     || (resolvedWorkspace ? agent.activeConversationIdForWorkspace(resolvedWorkspace) : agent.activeConversationId));
@@ -1463,20 +1526,22 @@ async function handleApi(req, res, body) {
                         mobileJson(res, { error: 'Conversation not found in workspace' }, 404);
                         return;
                     }
-                    const currentWs = agent.workspace.current;
-                    if (!currentWs || path.resolve(currentWs.path) !== path.resolve(ws.path)) {
-                        requestAgent = mobileScopedAgent(ws, conversationId);
-                    }
                 }
-                if (hostedConversationPrompt && resolvedWorkspace) {
-                    const result = await hostedConversationPrompt({ workspaceId, conversationId }, message, {
-                        requestedMode: String(params.requestedMode || ''),
-                        goalObjective: String(params.goalObjective || ''),
-                        inputMode: String(params.inputMode || ''),
-                    });
+                // The hosted command owns execution and queueing for both IPC and HTTP.
+                // Resolve/authenticate the target without creating a second Agent here.
+                if (hostedConversationPrompt) {
+                    const result = await hostedConversationPrompt({ workspaceId, conversationId }, message, hostedCommandOptions(params));
                     mobileJson(res, { ok: true, conversationId, ...result });
                     return;
                 }
+                let requestAgent = agent;
+                const requestWorkspace = resolvedWorkspace || agent.workspace.current;
+                if (resolvedWorkspace) {
+                    const currentWs = agent.workspace.current;
+                    if (!currentWs || path.resolve(currentWs.path) !== path.resolve(resolvedWorkspace.path)) {
+                        requestAgent = mobileScopedAgent(resolvedWorkspace, conversationId);
+                    }
+                }
                 if (requestAgent === agent && params.conversationId)
                     requestAgent.setConversation(conversationId);
                 let scopedRuntimeKey = '';
@@ -1546,6 +1611,12 @@ async function handleApi(req, res, body) {
                     mobileJson(res, { error: 'Conversation not found in workspace' }, 404);
                     return;
                 }
+                if (hostedConversationUiAction) {
+                    const action = pathname === '/api/mobile/conversation-branch-inspect' ? 'conversation_branch_inspect'
+                        : pathname === '/api/mobile/conversation-branch-activate' ? 'conversation_branch_activate' : 'conversation_branch_create';
+                    mobileJson(res, await hostedConversationUiAction({ workspaceId, conversationId }, action, '', params));
+                    return;
+                }
                 const scoped = mobileScopedAgent(ws, conversationId);
                 if (pathname === '/api/mobile/conversation-branch-inspect') {
                     const branchId = String(params.branchId || '');
@@ -1605,7 +1676,11 @@ async function handleApi(req, res, body) {
                     mobileJson(res, { ok: false, error: 'Conversation not found in workspace' }, 404);
                     return;
                 }
-                // 运行中拒绝：与移动端 running 判定一致（activeConversationId + agent.status 非 idle）
+                if (hostedConversationUiAction) {
+                    mobileJson(res, await hostedConversationUiAction({ workspaceId, conversationId }, 'conversation_archive', '', params));
+                    return;
+                }
+                // Standalone server fallback; GUI-hosted archive uses its shared owner above.
                 if (mobileConversationRuntimeBusy(agent, ws, conversationId)) {
                     mobileJson(res, { ok: false, error: 'Conversation is running' }, 423);
                     return;
@@ -1615,6 +1690,7 @@ async function handleApi(req, res, body) {
                     mobileJson(res, { ok: false, error: 'Conversation archive could not be written.' }, 500);
                     return;
                 }
+                publishServerWorkEvent((0, conversationListEvent_1.conversationListEvent)(agent, ws));
                 mobileJson(res, {
                     ok: true,
                     fileName: filename,

package/dist/tools/index.js

@@ -490,7 +490,23 @@ class ToolExecutor {
             t('SubAgent', 'Create one real same-conversation peer SubAgent and return immediately. This tool is only for delegation; never use it to create or update the conversation task checklist (use task_create for that). Creation is bound to the currently running Build Block: non-Ultra intelligence has a hard ceiling of 4 active peers for that Build, Ultra has 16, and excess calls terminate without creating or queueing a record. The peer has a stable human-readable name plus a separate exact id. Pass model to select an exact configured model deployment (deployment:providerId:modelId or an unambiguous provider/model name). When model is omitted, the peer inherits the parent Agent\'s currently resolved model deployment. Plan mode peers are forced to Plan.', { name: { type: 'string', description: 'Human-readable SubAgent name shown in the monitoring sidebar. Omit only when a named preset supplies it.' }, nature: { type: 'string', description: 'Legacy alias for name.' }, prompt: { type: 'string', description: 'Work delegated to this SubAgent; this is not a checklist item.' }, preset: { type: 'string' }, agent: { type: 'string' }, model: { type: 'string', description: 'Optional exact model deployment. Omit to inherit the parent Agent resolved model.' }, mode: { type: 'string' }, input_mode: { type: 'string' }, flow: { type: 'string' } }, ['prompt']),
             t('subagent_list', 'List flat same-conversation peer agents, optionally filtered by status. Each entry exposes both the stable name and the exact id; use the id for any subsequent targeting.', { status: { type: 'string', enum: ['idle', 'queued', 'working', 'completed', 'error', 'closed'] } }, []),
             t('subagent_read', 'Read one same-conversation peer status, queue/mailbox summary, latest bounded feedback, and result. Available for running, queued, completed, error, and closed peers. Pass the exact id returned by subagent_list, or a name for convenience lookup.', { id: { type: 'string', description: 'Exact peer id from subagent_list.' }, name: { type: 'string', description: 'Convenience peer name; ambiguous names resolve to the first match.' }, max_chars: { type: 'number', description: 'Bounded result size from 2000 to 32000 characters.' } }, []),
-            t('subagent_send', 'Persist a mailbox message to a same-conversation peer agent. Target by exact id (preferred) or name.', { id: { type: 'string', description: 'Exact peer id from subagent_list.' }, name: { type: 'string', description: 'Convenience peer name.' }, message: { type: 'string' }, prompt: { type: 'string', description: 'Legacy alias for message.' }, kind: { type: 'string', enum: ['directive', 'question', 'result', 'handoff'] }, reply_to: { type: 'string' }, correlation_id: { type: 'string' } }, []),
+            t('subagent_send', 'Send selected content from your own history to a same-conversation peer, or id="root" for the main agent. wakeup defaults to false: an inactive receiver only stores the message; true requests activation. An active receiver handles either value normally. With no content/message, send the last visible text-history entry. Choose each explicit content kind and its range; summaries are written by you, not generated by the tool. Existing receiver history and static request metadata are unchanged until receipt.', {
+                id: { type: 'string', description: 'Exact peer id, or root for the main agent.' },
+                name: { type: 'string', description: 'Convenience peer name.' },
+                wakeup: { type: 'boolean', default: false, description: 'Activate an inactive receiver when true; false only stores mail. Both deliver normally to an active receiver.' },
+                content: { type: 'array', minItems: 1, maxItems: 16, description: 'Ordered content selections. Each selection requires a range. Do not combine with message/prompt.', items: {
+                        type: 'object', required: ['kind', 'range'], additionalProperties: false, properties: {
+                            kind: { type: 'string', enum: ['summary', 'text_history', 'tool_history'] },
+                            range: { type: 'object', additionalProperties: false, description: 'Use last:N, or the 1-based inclusive start/end range in the selected kind. Text entries exclude hidden input; tool entries are complete call/result pairs; summary uses the combined visible timeline.', properties: {
+                                    last: { type: 'integer', minimum: 1 }, start: { type: 'integer', minimum: 1 }, end: { type: 'integer', minimum: 1 },
+                                } },
+                            text: { type: 'string', description: 'Your concise summary of the selected source range, required only for kind=summary.' },
+                        },
+                    } },
+                message: { type: 'string', description: 'Explicit free text, for a new directive or correction. Cannot be combined with content.' },
+                prompt: { type: 'string', description: 'Legacy alias for message.' },
+                kind: { type: 'string', enum: ['directive', 'question', 'result', 'handoff'] }, reply_to: { type: 'string' }, correlation_id: { type: 'string' },
+            }, []),
             t('subagent_result', 'Return the persisted transcript, mailbox summary, status, and latest result for a peer agent. Target by exact id (preferred) or name.', { id: { type: 'string', description: 'Exact peer id from subagent_list.' }, name: { type: 'string', description: 'Convenience peer name.' } }, []),
             t('subagent_close', 'Close a same-conversation peer. Root can close any peer; a peer can close only itself. Target by exact id (preferred) or name.', { id: { type: 'string', description: 'Exact peer id from subagent_list.' }, name: { type: 'string', description: 'Convenience peer name.' } }, []),
             t('linked_plan', 'Read or incrementally update the current conversation linked Markdown plan. Update requires expected_revision. Prefer append or old_text/new_text for local changes; markdown remains the legacy full replacement path.', { action: { type: 'string', enum: ['get', 'update'] }, markdown: { type: 'string' }, append: { type: 'string' }, old_text: { type: 'string' }, new_text: { type: 'string' }, replace_all: { type: 'boolean' }, expected_revision: { type: 'number' } }, ['action']),