evolcore 0.0.2 → 0.0.4

package/dist/agents/claude-runner.js

@@ -719,7 +719,7 @@ export class AgentRunner {
         if (!permCtx?.adapter || !permCtx?.channelId) {
             return this.handleAskUserQuestionFallback(sessionId, input, questions, options);
         }
-        const adapterHasInteractionPath = !!permCtx.adapter.send;
+        const adapterHasInteractionPath = permCtx.adapter.capabilities?.interaction === true;
         if (!adapterHasInteractionPath || !permCtx.interactionRouter) {
             return this.handleAskUserQuestionFallback(sessionId, input, questions, options);
         }
@@ -756,6 +756,7 @@ export class AgentRunner {
                     },
                     channelId: permCtx.channelId,
                     sessionId,
+                    initiatorId: permCtx.userId,
                 };
             }
             else {
@@ -783,6 +784,7 @@ export class AgentRunner {
                     },
                     channelId: permCtx.channelId,
                     sessionId,
+                    initiatorId: permCtx.userId,
                 };
             }
             let cardSent = false;
@@ -797,7 +799,10 @@ export class AgentRunner {
                     replyContext: permCtx.replyContext,
                 });
                 const optionLines = q.options.map((o, idx) => `  ${idx + 1}. ${o.label}${o.description ? ` — ${o.description}` : ''}`).join('\n');
-                const fallbackText = `💬 ${q.header || q.question}\n${q.header ? q.question + '\n' : ''}${optionLines}`;
+                const answerHint = q.multiSelect
+                    ? '回复 /ask 1,2（多选用逗号分隔），或 /ask <自定义内容>'
+                    : '回复 /ask 1，或 /ask <自定义内容>';
+                const fallbackText = `💬 ${q.header || q.question}\n${q.header ? q.question + '\n' : ''}${optionLines}\n\n${answerHint}`;
                 const result = await sendInteractionPayload(permCtx.adapter, envelope, interaction, fallbackText, permCtx.replyContext);
                 cardSent = !!result;
             }
@@ -850,20 +855,6 @@ export class AgentRunner {
                         const customText = values?.custom_text;
                         finish({ kind: 'answered', value: typeof customText === 'string' && customText.trim() ? customText.trim() : null });
                     }
-                    else if (action === '_show_input') {
-                        if (permCtx?.interceptNextMessage) {
-                            permCtx.interactionRouter?.markWaiting(sessionId);
-                            sendPrompt?.('✏️ 请直接发送你的自定义回复').catch(() => { });
-                            permCtx.interceptNextMessage(sessionId, (msg) => {
-                                permCtx.interactionRouter?.unmarkWaiting(sessionId);
-                                const text = (msg.content || '').trim();
-                                finish({ kind: 'answered', value: text || null });
-                            });
-                        }
-                        else {
-                            finish({ kind: 'cancelled', reason: 'explicit_cancel' });
-                        }
-                    }
                     else if (action === 'submit' && q.multiSelect && values) {
                         const selected = [];
                         q.options.forEach((opt, idx) => {
@@ -895,7 +886,6 @@ export class AgentRunner {
             });
             if (settlement.kind === 'cancelled') {
                 try {
-                    permCtx.cancelIntercept?.(sessionId);
                     try {
                         await permCtx.turn?.onInteractionSettled?.(requestId, settlement.reason === 'timeout' ? 'timed_out' : 'cancelled');
                     }
@@ -958,7 +948,9 @@ export class AgentRunner {
                             command: 'ask',
                             buttonArgMap: Object.fromEntries(q.options.map((_, i) => [`opt-${i}`, String(i + 1)])),
                             acceptFreeText: true,
-                            freeTextHint: '或回复 /ask <自定义内容>',
+                            freeTextHint: q.multiSelect
+                                ? '多选请回复 /ask 1,2；也可回复 /ask <自定义内容>'
+                                : '或回复 /ask <自定义内容>',
                         },
                     };
                     await sendPrompt(renderActionAsText(interaction));
@@ -990,12 +982,25 @@ export class AgentRunner {
                             finish({ kind: 'cancelled', reason: 'aborted' });
                         };
                         permCtx.interactionRouter.register(requestId, sessionId, (action) => {
-                            const num = parseInt(action.trim(), 10);
-                            if (num >= 1 && num <= q.options.length) {
-                                finish({ kind: 'answered', value: q.options[num - 1].label });
+                            const answer = action.trim();
+                            const selectionParts = answer.split(/[,，]/).map(part => part.trim());
+                            const selectedIndexes = selectionParts.map(part => Number(part));
+                            const hasValidNumericSelection = selectionParts.length > 0
+                                && selectionParts.every((part, index) => (/^\d+$/.test(part)
+                                    && Number.isInteger(selectedIndexes[index])
+                                    && selectedIndexes[index] >= 1
+                                    && selectedIndexes[index] <= q.options.length));
+                            if (q.multiSelect && hasValidNumericSelection) {
+                                finish({
+                                    kind: 'answered',
+                                    value: [...new Set(selectedIndexes)].map(num => q.options[num - 1].label),
+                                });
+                            }
+                            else if (!q.multiSelect && hasValidNumericSelection && selectedIndexes.length === 1) {
+                                finish({ kind: 'answered', value: q.options[selectedIndexes[0] - 1].label });
                             }
                             else {
-                                finish({ kind: 'answered', value: action.trim() });
+                                finish({ kind: 'answered', value: answer });
                             }
                         }, {
                             initiatorId: permCtx.userId,
@@ -1113,20 +1118,6 @@ export class AgentRunner {
                         const feedback = typeof values?.custom_text === 'string' ? values.custom_text.trim() : '';
                         deny(feedback || '用户提交了反馈');
                     }
-                    else if (trimmed === '_show_input') {
-                        if (permCtx.interceptNextMessage) {
-                            router.markWaiting(sessionId);
-                            sendPrompt?.('✏️ 请直接发送你的反馈意见').catch(() => { });
-                            permCtx.interceptNextMessage(sessionId, msg => {
-                                router.unmarkWaiting(sessionId);
-                                const feedback = (msg.content || '').trim();
-                                deny(feedback || '用户提交了反馈');
-                            });
-                        }
-                        else {
-                            deny('用户提交了反馈');
-                        }
-                    }
                     else if (trimmed === '2' || trimmed.toLowerCase() === 'reject' || trimmed === '拒绝') {
                         deny('用户拒绝了计划');
                     }
@@ -1153,7 +1144,6 @@ export class AgentRunner {
             });
             try {
                 if (settlement.kind === 'cancelled') {
-                    permCtx.cancelIntercept?.(sessionId);
                     try {
                         await permCtx.turn?.onInteractionSettled?.(requestId, settlement.reason === 'timeout' ? 'timed_out' : 'cancelled');
                     }
@@ -1181,7 +1171,7 @@ export class AgentRunner {
         };
         // 尝试发送交互卡片
         let cardSent = false;
-        if (permCtx.adapter?.send) {
+        if (permCtx.adapter?.capabilities?.interaction === true) {
             // 发送计划内容：找 plans 目录中最新修改的 .md 文件
             if (sendPrompt) {
                 try {
@@ -1283,10 +1273,20 @@ export class AgentRunner {
      * SDK 原始事件 → 标准 AgentEvent 转换
      * 所有 SDK 特有的事件类型引用封装在此方法内
      */
-    async *transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel) {
+    async *transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, isResuming = false) {
         let lastSessionId;
+        let hasTurnActivity = false;
+        let ignoredPreTurnResult = false;
+        let waitingForBackgroundCompletion = false;
+        let liveBackgroundTasks = new Set();
+        const unsettledTasks = new Set();
+        const terminalTasks = new Set();
+        const ambientTasks = new Set();
+        const awaitedTaskNotifications = new Set();
+        const taskMetadata = new Map();
         // tool_use_id → tool_name 映射，用于从 SDKUserMessage 的 tool_result 块中还原工具名
         const toolUseNames = new Map();
+        const emittedToolResultIds = new Set();
         let turnCount = 0;
         const seenMessageIds = new Set();
         let lastModelCall;
@@ -1302,11 +1302,99 @@ export class AgentRunner {
                     yield { type: 'session_id', sessionId: event.session_id };
                 }
                 if (event.type === 'user' && event.uuid === inputId) {
+                    hasTurnActivity = true;
                     yield { type: 'input_accepted', inputId };
                 }
+                if (event.type === 'system' && event.subtype === 'task_started' && typeof event.task_id === 'string') {
+                    const taskKind = event.subagent_type || event.task_type === 'remote_agent'
+                        ? 'agent'
+                        : event.workflow_name || event.task_type === 'local_workflow'
+                            ? 'workflow'
+                            : 'background';
+                    taskMetadata.set(event.task_id, {
+                        taskKind,
+                        description: event.description,
+                        subagentType: event.subagent_type,
+                        taskType: event.task_type,
+                    });
+                    if (event.skip_transcript === true) {
+                        ambientTasks.add(event.task_id);
+                        unsettledTasks.delete(event.task_id);
+                        liveBackgroundTasks.delete(event.task_id);
+                    }
+                    else if (!terminalTasks.has(event.task_id)) {
+                        unsettledTasks.add(event.task_id);
+                        hasTurnActivity = true;
+                    }
+                    yield {
+                        type: 'task_started',
+                        taskId: event.task_id,
+                        taskKind,
+                        toolUseId: event.tool_use_id,
+                        description: event.description || event.task_id,
+                        subagentType: event.subagent_type,
+                        taskType: event.task_type,
+                        workflowName: event.workflow_name,
+                        prompt: event.prompt,
+                        skipTranscript: event.skip_transcript,
+                    };
+                    continue;
+                }
+                if (event.type === 'system' && event.subtype === 'background_tasks_changed') {
+                    const tasks = Array.isArray(event.tasks) ? event.tasks : [];
+                    liveBackgroundTasks = new Set(tasks
+                        .map((task) => task?.task_id)
+                        .filter((taskId) => (typeof taskId === 'string'
+                        && !terminalTasks.has(taskId)
+                        && !ambientTasks.has(taskId))));
+                    yield {
+                        type: 'background_tasks_changed',
+                        tasks: tasks.map((task) => ({
+                            taskId: task.task_id,
+                            taskKind: task.task_type === 'remote_agent'
+                                ? 'agent'
+                                : task.task_type === 'local_workflow'
+                                    ? 'workflow'
+                                    : taskMetadata.get(task.task_id)?.taskKind || 'background',
+                            taskType: task.task_type,
+                            description: task.description,
+                        })),
+                    };
+                    continue;
+                }
+                if (event.type === 'system' && event.subtype === 'task_notification' && typeof event.task_id === 'string') {
+                    const metadata = taskMetadata.get(event.task_id);
+                    const taskKind = metadata?.taskKind
+                        || (event.tool_use_id && toolUseNames.get(event.tool_use_id) === 'Agent' ? 'agent' : undefined)
+                        || (typeof event.summary === 'string' && /^Agent\b/.test(event.summary) ? 'agent' : 'background');
+                    terminalTasks.add(event.task_id);
+                    ambientTasks.delete(event.task_id);
+                    unsettledTasks.delete(event.task_id);
+                    liveBackgroundTasks.delete(event.task_id);
+                    awaitedTaskNotifications.delete(event.task_id);
+                    yield {
+                        type: 'task_notification',
+                        taskId: event.task_id,
+                        taskKind,
+                        toolUseId: event.tool_use_id,
+                        description: metadata?.description,
+                        subagentType: metadata?.subagentType,
+                        status: event.status || 'completed',
+                        outputFile: event.output_file,
+                        summary: event.summary,
+                        usage: event.usage ? {
+                            totalTokens: event.usage.total_tokens,
+                            toolUses: event.usage.tool_uses,
+                            durationMs: event.usage.duration_ms,
+                        } : undefined,
+                        skipTranscript: event.skip_transcript,
+                    };
+                    continue;
+                }
                 if (event.type === 'stream_event') {
                     const streamEvent = event.event;
                     if (streamEvent?.type === 'message_start' && streamEvent.message?.usage) {
+                        hasTurnActivity = true;
                         lastModelCall = {
                             uuid: event.uuid,
                             model: streamEvent.message.model,
@@ -1347,11 +1435,21 @@ export class AgentRunner {
                 }
                 // system: task_progress → task_progress
                 if (event.type === 'system' && event.subtype === 'task_progress') {
+                    const metadata = typeof event.task_id === 'string' ? taskMetadata.get(event.task_id) : undefined;
+                    if (!event.task_id || !ambientTasks.has(event.task_id))
+                        hasTurnActivity = true;
                     yield {
                         type: 'task_progress',
+                        taskId: event.task_id,
+                        taskKind: metadata?.taskKind || (event.subagent_type ? 'agent' : undefined),
+                        toolUseId: event.tool_use_id,
+                        description: event.description,
+                        subagentType: event.subagent_type || metadata?.subagentType,
                         summary: event.summary,
-                        toolUses: event.tool_uses,
-                        durationMs: event.duration_ms,
+                        lastToolName: event.last_tool_name,
+                        totalTokens: event.usage?.total_tokens,
+                        toolUses: event.usage?.tool_uses ?? event.tool_uses,
+                        durationMs: event.usage?.duration_ms ?? event.duration_ms,
                     };
                 }
                 // system: session_state_changed → state_changed
@@ -1360,6 +1458,7 @@ export class AgentRunner {
                 }
                 // assistant: 提取 tool_use 和文本（仅无 text_delta 时提取文本）
                 if (event.type === 'assistant' && event.message?.content) {
+                    hasTurnActivity = true;
                     lastAssistantUuid = event.uuid ?? lastAssistantUuid;
                     const msgId = event.message.id;
                     if (!msgId || !seenMessageIds.has(msgId)) {
@@ -1410,6 +1509,8 @@ export class AgentRunner {
                             const resultContent = typeof block.content === 'string'
                                 ? block.content
                                 : block.content != null ? JSON.stringify(block.content) : '';
+                            if (block.tool_use_id)
+                                emittedToolResultIds.add(block.tool_use_id);
                             yield {
                                 type: 'tool_result',
                                 name: toolName,
@@ -1423,15 +1524,22 @@ export class AgentRunner {
                 }
                 // result → complete（含 permission_denials 提取）
                 if (event.type === 'result') {
-                    // 先发出被拒绝的权限事件
+                    // Most SDK streams surface denials as user-message tool_result blocks.
+                    // The terminal summary is only a fallback for incomplete streams.
                     if (Array.isArray(event.permission_denials)) {
                         for (const denial of event.permission_denials) {
+                            const callId = typeof denial.tool_use_id === 'string' ? denial.tool_use_id : undefined;
+                            if (callId && emittedToolResultIds.has(callId))
+                                continue;
+                            if (callId)
+                                emittedToolResultIds.add(callId);
                             yield {
                                 type: 'tool_result',
                                 name: denial.tool_name || '',
                                 result: '',
                                 isError: true,
-                                error: `权限被拒绝: ${denial.tool_name}`,
+                                error: `权限被拒绝: ${denial.tool_name || 'unknown tool'}`,
+                                callId,
                             };
                         }
                     }
@@ -1502,7 +1610,7 @@ export class AgentRunner {
                         // 降级：无逐次数据，写一条累计行
                         modelCalls = [{ call_index: 0, model: callModel_, tokenUsage: u, contextUsage: contextUsageForCall(u), degraded: true }];
                     }
-                    yield {
+                    const completeEvent = {
                         type: 'complete',
                         result: cleanResult,
                         subtype: event.subtype,
@@ -1520,10 +1628,53 @@ export class AgentRunner {
                         modelCalls,
                         assistantUuid: lastAssistantUuid,
                     };
-                    // result 是 SDK 流的终结事件，不再等待后续（防止 interrupt 后流不关闭导致挂起）
+                    // Fatal results belong to the query transport itself and must terminate
+                    // even when the current input was not echoed back by the CLI.
+                    if (event.is_error) {
+                        yield { ...completeEvent, queryFinal: true };
+                        return;
+                    }
+                    if (isResuming && !hasTurnActivity && !ignoredPreTurnResult) {
+                        ignoredPreTurnResult = true;
+                        logger.info(`[AgentRunner] Ignoring pre-turn result while resuming session=${sessionId} input=${inputId}`);
+                        continue;
+                    }
+                    const hasLiveTasks = liveBackgroundTasks.size > 0 || unsettledTasks.size > 0;
+                    if (hasLiveTasks) {
+                        waitingForBackgroundCompletion = true;
+                        for (const taskId of liveBackgroundTasks)
+                            awaitedTaskNotifications.add(taskId);
+                        for (const taskId of unsettledTasks)
+                            awaitedTaskNotifications.add(taskId);
+                        yield { ...completeEvent, queryFinal: false };
+                        hasTurnActivity = false;
+                        ignoredPreTurnResult = false;
+                        continue;
+                    }
+                    // background_tasks_changed may report an empty set before the matching
+                    // task_notification. Do not close in that gap: the notification wakes the
+                    // parent agent for the final synthesis turn.
+                    if (waitingForBackgroundCompletion && awaitedTaskNotifications.size > 0) {
+                        yield { ...completeEvent, queryFinal: false };
+                        hasTurnActivity = false;
+                        ignoredPreTurnResult = false;
+                        continue;
+                    }
+                    yield { ...completeEvent, queryFinal: true };
                     return;
                 }
             }
+            if (waitingForBackgroundCompletion) {
+                yield {
+                    type: 'complete',
+                    isError: true,
+                    subtype: 'protocol_incomplete',
+                    terminalReason: 'background_tasks_incomplete',
+                    protocolIncompleteReason: 'background_tasks_incomplete',
+                    errors: ['Claude SDK stream ended before background tasks produced a final parent result'],
+                    queryFinal: true,
+                };
+            }
         }
         catch (err) {
             // 子进程崩溃（如 exited with code 1）时，把缓冲的 stderr 打出来还原真实原因。
@@ -1705,7 +1856,7 @@ export class AgentRunner {
             }
             // These tools need the dedicated canUseTool interaction handlers below.
             if (toolName === 'AskUserQuestion' || toolName === 'ExitPlanMode') {
-                return hookDecision('defer', undefined, updatedInput);
+                return hookDecision('ask', undefined, updatedInput);
             }
             if (callPermissionMode === 'readonly') {
                 const permCtx = this.permissionContexts.get(sessionId);
@@ -2107,7 +2258,6 @@ export class AgentRunner {
             logger.info('[AgentRunner] Creating query with images:', images.length, 'first image size:', images[0]?.data?.length ?? 0);
             logger.debug('[AgentRunner] Skipping resume for image message to avoid history conflict');
             msgStream.push(prompt, images, inputId);
-            msgStream.end();
             sdkStream = createQuery(msgStream);
         }
         else {
@@ -2124,7 +2274,7 @@ export class AgentRunner {
             this.interruptFns.set(sessionId, () => sdkStream.interrupt());
         }
         // 返回标准 AgentEvent 流（重试由 MessageProcessor 层负责）
-        const transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel);
+        const transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId);
         const self = this;
         return (async function* () {
             try {

package/dist/agents/codex-app-server-client.js

@@ -167,6 +167,74 @@ export class CodexAppServerClient {
         await this.request('thread/metadata/update', params);
         return true;
     }
+    async threadShellCommand(threadId, command, timeoutMs = 10_000) {
+        let commandItemId;
+        let output = '';
+        let settle;
+        let fail;
+        const completion = new Promise((resolve, reject) => {
+            settle = resolve;
+            fail = reject;
+        });
+        const unsubscribe = this.onNotification(notification => {
+            const params = (notification.params || {});
+            const notificationThreadId = params.threadId ?? params.thread_id;
+            if (notificationThreadId !== threadId)
+                return;
+            const item = params.item && typeof params.item === 'object'
+                ? params.item
+                : undefined;
+            const itemId = typeof item?.id === 'string'
+                ? item.id
+                : typeof params.itemId === 'string'
+                    ? params.itemId
+                    : undefined;
+            const source = item?.source;
+            const isUserShell = source === 'userShell' || source === 'user_shell';
+            if (notification.method === 'item/started'
+                && item?.type === 'commandExecution'
+                && isUserShell
+                && (item.command === command || commandItemId === undefined)) {
+                commandItemId = itemId;
+                return;
+            }
+            if (notification.method === 'item/commandExecution/outputDelta'
+                && commandItemId
+                && itemId === commandItemId
+                && typeof params.delta === 'string') {
+                output += params.delta;
+                return;
+            }
+            if (notification.method === 'item/completed'
+                && item?.type === 'commandExecution'
+                && isUserShell
+                && (!commandItemId || itemId === commandItemId)) {
+                const aggregated = typeof item.aggregatedOutput === 'string'
+                    ? item.aggregatedOutput
+                    : typeof item.aggregated_output === 'string'
+                        ? item.aggregated_output
+                        : output;
+                const exitCode = typeof item.exitCode === 'number'
+                    ? item.exitCode
+                    : typeof item.exit_code === 'number'
+                        ? item.exit_code
+                        : undefined;
+                settle({ output: aggregated, ...(exitCode !== undefined ? { exitCode } : {}) });
+            }
+        });
+        const timer = setTimeout(() => {
+            fail(new Error(`thread/shellCommand timed out for thread ${threadId}`));
+        }, timeoutMs);
+        timer.unref?.();
+        try {
+            await this.request('thread/shellCommand', { threadId, command });
+            return await completion;
+        }
+        finally {
+            clearTimeout(timer);
+            unsubscribe();
+        }
+    }
     async turnInterrupt(threadId, turnId) {
         await this.request('turn/interrupt', { threadId, turnId });
         return true;