@supen-ai/cli 1.3.4 → 1.4.1

package/daemon/dist/core/cortex.js

@@ -1,12 +1,11 @@
 import fs from 'fs';
 import path from 'path';
-import Anthropic from '@anthropic-ai/sdk';
 import { logger } from './logger.js';
 import { getGatewayInstance, getLlmToken, getLlmTokenOrWait } from './gateway.js';
 import { AGENT_MIND_FILES, ASSISTANT_NAME, agentPaths, getAgentModelConfig, } from './config.js';
 import { cleanupTaskFolderWithoutMeaningfulArtifacts, ensureTaskArtifactLayout, resolveSessionTaskArtifactPaths, } from './task-artifacts.js';
 import { getUsageStats, appendGlobalUsage, clearSessionSdkId, ensureSession, updateSessionStatus, updateSessionSdkId, updateSessionUsage, getSessionForAgent, storeSessionUiEvent, } from './store.js';
-import { usesAnthropicMessagesApi } from '../http/thread-title.js';
+import { appendThreadEvent } from './thread-event-log.js';
 import { LoopGuard } from './loop-guard.js';
 import { convertSdkEventToUiMessageChunks, enrichUiMessageChunksWithDocumentRefs, serializeUiMessageChunks, } from './protocol-adapter.js';
 import { resolveMcpServers } from '../mcp/default-servers.js';
@@ -16,7 +15,6 @@ import { resolveInstalledPluginMcpServers } from '../plugins/hub.js';
 import { resolveEnabledSkillMcpServers } from '../skills/mcp-config.js';
 import { getRuntimeSpaceEnvVars, withRuntimeSpaceEnv } from './space-env.js';
 import { buildAssistantOutputExcerpt, buildObservableToolDetail, buildTaskContextExcerpt, excerptText, } from './observable-logging.js';
-import { shouldWaitForGatewayToken } from './sdk-wrapper.js';
 import { classifySessionInsight } from '../agent-sdk/session-events.js';
 import { SessionManager } from '../agent-sdk/session-manager.js';
 import { convertDriverOutputsToUiMessageChunks } from '../agent-sdk/driver-output-ui.js';
@@ -88,14 +86,16 @@ function resolveRuntimeAttachments(message, artifacts) {
     })
         .filter((attachment) => Boolean(attachment));
 }
-const APP_SERVER_REASONING_DELTA_METHODS = new Set([
-    'item/reasoningSummary/delta',
-    'item/reasoning/delta',
-    'item/reasoning/summaryTextDelta',
-    'item/reasoning/textDelta',
-    'item/plan/delta',
-    'item/reasoning/summaryPartAdded',
-]);
+function shouldWaitForGatewayToken(agentId) {
+    if (getLlmToken())
+        return false;
+    const selectedModel = getAgentModelConfig(agentId, true)[0];
+    const providerId = selectedModel?.provider_id?.toLowerCase() || '';
+    const isGatewayBackedProvider = providerId === 'supen' || providerId === 'babelark';
+    if (isGatewayBackedProvider)
+        return true;
+    return !selectedModel?.api_key;
+}
 function shouldPersistUiChunkToChat(chunk) {
     return true;
 }
@@ -125,45 +125,30 @@ function appendNormalizedOutputToFinalText(normalizedOutputs, current) {
         }
         if (output.kind === 'app-server-event') {
             const event = output.event;
-            const params = event?.params;
             if (event?.method === 'item/agentMessage/delta') {
+                const delta = typeof event.params?.delta === 'string' ? event.params.delta : '';
+                if (delta) {
+                    next += delta;
+                    receivedText = true;
+                }
                 continue;
             }
             if (event?.method === 'item/completed') {
-                const item = params?.item && typeof params.item === 'object'
-                    ? params.item
-                    : {};
-                const phase = typeof item.phase === 'string' ? item.phase : '';
-                if (phase && phase !== 'final_answer') {
-                    continue;
-                }
-                const text = item.type === 'agentMessage' && typeof item.text === 'string' ? item.text : '';
-                if (text) {
+                const item = event.params?.item;
+                const text = typeof item?.text === 'string' ? item.text : '';
+                const phase = typeof item?.phase === 'string' ? item.phase : '';
+                if (item?.type === 'agentMessage' && text && (!phase || phase === 'final_answer')) {
                     next = text;
                     receivedText = true;
                 }
             }
+            continue;
         }
     }
     return { next, receivedText };
 }
 function extractTerminalResultText(normalizedOutputs) {
     for (const output of normalizedOutputs) {
-        if (output.kind === 'app-server-event') {
-            const event = output.event;
-            if (event?.method !== 'turn/completed')
-                continue;
-            const params = event.params;
-            const turn = params?.turn && typeof params.turn === 'object'
-                ? params.turn
-                : {};
-            if (turn.status && turn.status !== 'completed')
-                continue;
-            const result = typeof turn.result === 'string' ? turn.result : '';
-            if (result.trim())
-                return result;
-            continue;
-        }
         if (output.kind !== 'session-event')
             continue;
         if (output.event?.type !== 'turn.completed')
@@ -177,31 +162,6 @@ function extractTerminalResultText(normalizedOutputs) {
 }
 function extractTerminalFailureText(normalizedOutputs) {
     for (const output of normalizedOutputs) {
-        if (output.kind === 'app-server-event') {
-            const event = output.event;
-            if (event?.method !== 'turn/completed' && event?.method !== 'turn/failed' && event?.method !== 'turn/cancelled') {
-                continue;
-            }
-            const params = event.params;
-            const turn = params?.turn && typeof params.turn === 'object'
-                ? params.turn
-                : {};
-            const status = typeof turn.status === 'string' ? turn.status : '';
-            if (event.method === 'turn/completed' && status !== 'failed' && status !== 'cancelled') {
-                continue;
-            }
-            const error = turn.error && typeof turn.error === 'object'
-                ? turn.error
-                : {};
-            const candidates = [error.message, turn.error, params?.error, params?.message];
-            for (const candidate of candidates) {
-                if (typeof candidate === 'string' && candidate.trim())
-                    return candidate.trim();
-            }
-            return status === 'cancelled' || event.method === 'turn/cancelled'
-                ? 'Agent turn was cancelled.'
-                : 'Agent turn failed before producing a result.';
-        }
         if (output.kind !== 'session-event')
             continue;
         if (output.event?.type !== 'turn.failed' && output.event?.type !== 'turn.cancelled')
@@ -223,30 +183,8 @@ function chunksContainTextDelta(chunks) {
         return chunk.type === 'text-delta' && typeof chunk.delta === 'string' && chunk.delta.length > 0;
     });
 }
-function chunksContainAppServerAgentMessage(chunks) {
-    return chunks.some((chunk) => isAppServerAgentMessageChunk(chunk));
-}
-function isAppServerAgentMessageChunk(chunk) {
-    if (chunk.type !== 'data-codex-event')
-        return false;
-    const data = chunk.data && typeof chunk.data === 'object'
-        ? chunk.data
-        : null;
-    const raw = data?.raw && typeof data.raw === 'object'
-        ? data.raw
-        : null;
-    const method = typeof raw?.method === 'string' ? raw.method : '';
-    if (method === 'item/agentMessage/delta')
-        return true;
-    if (method !== 'item/completed')
-        return false;
-    const params = raw?.params && typeof raw.params === 'object'
-        ? raw.params
-        : null;
-    const item = params?.item && typeof params.item === 'object'
-        ? params.item
-        : null;
-    return item?.type === 'agentMessage';
+function chunksContainCodexEvent(chunks) {
+    return chunks.some((chunk) => chunk.type === 'data-codex-event');
 }
 function extractUiErrorText(chunks) {
     for (const chunk of chunks) {
@@ -893,8 +831,6 @@ export class AgentCortex {
                 let emittedTextToUi = false;
                 let receivedIncrementalText = false;
                 let receivedIncrementalReasoning = false;
-                const appServerDeltaReasoningItemIds = new Set();
-                const appServerCommandOutputByItemId = new Map();
                 const assistantMessageId = `${taskId}-assistant`;
                 const sdkSessionRecord = createSession({ id: self.state.session_id });
                 const sdkTurn = createTurn({ sessionId: sdkSessionRecord.id });
@@ -917,6 +853,24 @@ export class AgentCortex {
                             task_id: taskId,
                             chunk,
                         });
+                        if (chunk.type === 'data-codex-event') {
+                            const data = chunk.data && typeof chunk.data === 'object'
+                                ? chunk.data
+                                : {};
+                            const raw = data.raw && typeof data.raw === 'object'
+                                ? data.raw
+                                : null;
+                            if (raw && typeof raw.method === 'string') {
+                                appendThreadEvent({
+                                    threadId: self.state.session_id,
+                                    runtimeThreadId: self.state.sdk_session_id || self.state.session_id,
+                                    source: 'codex-app-server',
+                                    eventType: raw.method,
+                                    rawPayload: raw,
+                                    receivedAt: timestamp,
+                                });
+                            }
+                        }
                     }
                 };
                 const nextTextPartId = () => {
@@ -1011,7 +965,7 @@ export class AgentCortex {
                     if (chunksContainTextDelta(normalizedChunks)) {
                         emittedTextToUi = true;
                     }
-                    if (chunksContainAppServerAgentMessage(normalizedChunks)) {
+                    if (chunksContainCodexEvent(normalizedChunks)) {
                         emittedTextToUi = true;
                     }
                     persistUiChunks(normalizedChunks);
@@ -1081,21 +1035,6 @@ export class AgentCortex {
                         logger.error({ err: callbackError }, 'runNativeStream: onError failed');
                     }
                 };
-                enqueueUiMessageChunks([
-                    {
-                        type: 'data-codex-event',
-                        data: {
-                            eventType: 'system',
-                            subtype: 'status',
-                            raw: {
-                                type: 'system',
-                                subtype: 'status',
-                                status: 'requesting',
-                                message: 'Thinking',
-                            },
-                        },
-                    },
-                ]);
                 try {
                     sdkSession = await self.ensureNativeSdkSession({
                         model: options?.model,
@@ -1205,69 +1144,31 @@ export class AgentCortex {
                                 receivedIncrementalText = true;
                             }
                         }
-                        const completedReasoningSnapshotIdsWithPriorDeltas = new Set();
-                        for (const output of normalizedOutputs) {
-                            if (output.kind !== 'app-server-event')
-                                continue;
-                            const event = output.event;
-                            const params = event.params && typeof event.params === 'object'
-                                ? event.params
-                                : {};
-                            if (APP_SERVER_REASONING_DELTA_METHODS.has(event.method)) {
-                                const itemId = typeof params.itemId === 'string' ? params.itemId : '';
-                                if (itemId) {
-                                    appServerDeltaReasoningItemIds.add(itemId);
-                                }
-                                continue;
-                            }
-                            if (event.method === 'item/agentMessage/delta') {
-                                continue;
-                            }
-                            if (event.method !== 'item/completed')
-                                continue;
-                            const item = params.item && typeof params.item === 'object'
-                                ? params.item
-                                : {};
-                            const itemId = typeof item.id === 'string' ? item.id : '';
-                            if (item.type === 'reasoning' && itemId && appServerDeltaReasoningItemIds.has(itemId)) {
-                                completedReasoningSnapshotIdsWithPriorDeltas.add(itemId);
-                            }
-                        }
-                        const normalizedChunksBaseRaw = convertDriverOutputsToUiMessageChunks(normalizedOutputs, {
-                            commandOutputByItemId: appServerCommandOutputByItemId,
-                        });
-                        const normalizedChunksBase = normalizedChunksBaseRaw.filter((chunk) => {
-                            if (chunk.type === 'reasoning-delta' &&
-                                typeof chunk.id === 'string' &&
-                                completedReasoningSnapshotIdsWithPriorDeltas.has(chunk.id)) {
-                                return false;
-                            }
-                            return true;
-                        });
-                        const fallbackChunksBase = convertSdkEventToUiMessageChunks(message);
-                        const baseChunksSource = normalizedChunksBase.length > 0
+                        const hasAppServerEvent = normalizedOutputs.some((output) => output.kind === 'app-server-event');
+                        const normalizedChunksBase = convertDriverOutputsToUiMessageChunks(normalizedOutputs);
+                        const chunks = hasAppServerEvent
                             ? normalizedChunksBase
-                            : fallbackChunksBase;
-                        const baseChunks = baseChunksSource.filter((chunk) => {
-                            if (receivedIncrementalText &&
-                                message.type === 'assistant' &&
-                                normalizedChunksBase.length === 0 &&
-                                chunk.type === 'text-delta') {
-                                return false;
-                            }
-                            if (receivedIncrementalReasoning &&
-                                message.type === 'assistant' &&
-                                (chunk.type === 'reasoning-start' ||
-                                    chunk.type === 'reasoning-delta' ||
-                                    chunk.type === 'reasoning-end')) {
-                                return false;
-                            }
-                            return true;
-                        });
-                        const chunks = enrichUiMessageChunksWithDocumentRefs(baseChunks, {
-                            agentId,
-                            workspaceRoot: artifacts.artifactRoot,
-                        });
+                            : enrichUiMessageChunksWithDocumentRefs((normalizedChunksBase.length > 0
+                                ? normalizedChunksBase
+                                : convertSdkEventToUiMessageChunks(message)).filter((chunk) => {
+                                if (receivedIncrementalText &&
+                                    message.type === 'assistant' &&
+                                    normalizedChunksBase.length === 0 &&
+                                    chunk.type === 'text-delta') {
+                                    return false;
+                                }
+                                if (receivedIncrementalReasoning &&
+                                    message.type === 'assistant' &&
+                                    (chunk.type === 'reasoning-start' ||
+                                        chunk.type === 'reasoning-delta' ||
+                                        chunk.type === 'reasoning-end')) {
+                                    return false;
+                                }
+                                return true;
+                            }), {
+                                agentId,
+                                workspaceRoot: artifacts.artifactRoot,
+                            });
                         const emittedErrorChunk = chunks.some((chunk) => chunk.type === 'error');
                         const uiErrorText = extractUiErrorText(chunks);
                         if (uiErrorText && !streamError) {
@@ -1280,8 +1181,11 @@ export class AgentCortex {
                                 output_excerpt: buildAssistantOutputExcerpt(serializeUiMessageChunks(chunks)?.trim() ?? ''),
                             }, 'Task stream chunk');
                             enqueueUiMessageChunks(chunks);
+                            emittedTextToUi = true;
                         }
-                        const terminalResultText = extractTerminalResultText(normalizedOutputs);
+                        const terminalResultText = hasAppServerEvent
+                            ? ''
+                            : extractTerminalResultText(normalizedOutputs);
                         if (terminalResultText && !finalText.trim()) {
                             finalText = terminalResultText;
                         }
@@ -1290,7 +1194,9 @@ export class AgentCortex {
                                 { type: 'text-delta', id: '1', delta: terminalResultText },
                             ]);
                         }
-                        const terminalFailureText = extractTerminalFailureText(normalizedOutputs);
+                        const terminalFailureText = hasAppServerEvent
+                            ? ''
+                            : extractTerminalFailureText(normalizedOutputs);
                         if (terminalFailureText && !streamError) {
                             streamError = new Error(terminalFailureText);
                             clearSessionSdkId(self.state.agent_id, self.state.session_id);
@@ -1545,46 +1451,25 @@ ${result}`;
                 headers['Authorization'] = `Bearer ${llmToken}`;
             }
             let summary;
-            const modelForApiDetection = selectedModel
-                ? { ...selectedModel, api_key: llmToken || selectedModel.api_key }
-                : null;
-            if (usesAnthropicMessagesApi(modelForApiDetection)) {
-                const client = new Anthropic({
-                    apiKey: llmToken,
-                    baseURL: process.env.TEST_ANTHROPIC_BASE_URL || selectedModel?.base_url || undefined,
-                });
-                const response = await client.messages.create({
-                    model: selectedModel?.model || 'claude-3-5-sonnet-latest',
-                    max_tokens: 400,
+            const baseUrl = process.env.TEST_ANTHROPIC_BASE_URL ||
+                selectedModel?.base_url ||
+                'http://127.0.0.1:2755/api/llm/openrouter';
+            const endpoint = baseUrl.endsWith('/v1')
+                ? `${baseUrl}/chat/completions`
+                : `${baseUrl}/v1/chat/completions`;
+            const response = await fetch(endpoint, {
+                method: 'POST',
+                headers,
+                body: JSON.stringify({
+                    model: selectedModel?.model || 'google/gemini-2.5-flash',
                     messages: [{ role: 'user', content: summaryPrompt }],
-                });
-                summary = response.content
-                    .filter((block) => block.type === 'text')
-                    .map((block) => block.text)
-                    .join('\n')
-                    .trim();
-            }
-            else {
-                const baseUrl = process.env.TEST_ANTHROPIC_BASE_URL ||
-                    selectedModel?.base_url ||
-                    'http://127.0.0.1:2755/api/llm/openrouter';
-                const endpoint = baseUrl.endsWith('/v1')
-                    ? `${baseUrl}/chat/completions`
-                    : `${baseUrl}/v1/chat/completions`;
-                const response = await fetch(endpoint, {
-                    method: 'POST',
-                    headers,
-                    body: JSON.stringify({
-                        model: selectedModel?.model || 'google/gemini-2.5-flash',
-                        messages: [{ role: 'user', content: summaryPrompt }],
-                    })
-                });
-                if (!response.ok) {
-                    throw new Error(`Failed to call LLM: ${response.status} ${response.statusText}`);
-                }
-                const data = await response.json();
-                summary = data.choices?.[0]?.message?.content?.trim();
+                })
+            });
+            if (!response.ok) {
+                throw new Error(`Failed to call LLM: ${response.status} ${response.statusText}`);
             }
+            const data = await response.json();
+            summary = data.choices?.[0]?.message?.content?.trim();
             if (summary && !summary.toLowerCase().includes('no new facts')) {
                 await this.memorySubsystem.writeEphemeral({
                     scope: 'session',