@jsonstudio/llms 0.6.1739 → 0.6.1890

package/dist/servertool/stop-message-compare-context.js

@@ -0,0 +1,133 @@
+import { ensureRuntimeMetadata, readRuntimeMetadata } from '../conversion/shared/runtime-metadata.js';
+const STOP_MESSAGE_COMPARE_KEY = 'stopMessageCompareContext';
+export function attachStopMessageCompareContext(adapterContext, context) {
+    if (!adapterContext || typeof adapterContext !== 'object' || Array.isArray(adapterContext)) {
+        return;
+    }
+    try {
+        const runtime = ensureRuntimeMetadata(adapterContext);
+        runtime[STOP_MESSAGE_COMPARE_KEY] = {
+            armed: context.armed,
+            mode: context.mode,
+            allowModeOnly: context.allowModeOnly,
+            textLength: context.textLength,
+            maxRepeats: context.maxRepeats,
+            used: context.used,
+            remaining: context.remaining,
+            active: context.active,
+            stopEligible: context.stopEligible,
+            hasCapturedRequest: context.hasCapturedRequest,
+            compactionRequest: context.compactionRequest,
+            hasSeed: context.hasSeed,
+            decision: context.decision,
+            reason: context.reason,
+            ...(typeof context.stage === 'string' && context.stage.trim() ? { stage: context.stage.trim() } : {}),
+            ...(typeof context.bdWorkState === 'string' && context.bdWorkState.trim()
+                ? { bdWorkState: context.bdWorkState.trim() }
+                : {}),
+            ...(typeof context.observationHash === 'string' && context.observationHash.trim()
+                ? { observationHash: context.observationHash.trim() }
+                : {}),
+            ...(typeof context.observationStableCount === 'number' && Number.isFinite(context.observationStableCount)
+                ? { observationStableCount: Math.max(0, Math.floor(context.observationStableCount)) }
+                : {}),
+            ...(typeof context.toolSignatureHash === 'string' && context.toolSignatureHash.trim()
+                ? { toolSignatureHash: context.toolSignatureHash.trim() }
+                : {})
+        };
+    }
+    catch {
+        // ignore metadata write failures
+    }
+}
+export function readStopMessageCompareContext(adapterContext) {
+    if (!adapterContext || typeof adapterContext !== 'object' || Array.isArray(adapterContext)) {
+        return undefined;
+    }
+    const runtime = readRuntimeMetadata(adapterContext);
+    const raw = runtime && typeof runtime === 'object' ? runtime[STOP_MESSAGE_COMPARE_KEY] : undefined;
+    return normalizeStopMessageCompareContext(raw);
+}
+export function formatStopMessageCompareContext(context) {
+    if (!context) {
+        return 'decision=unknown reason=no_context';
+    }
+    return [
+        `decision=${context.decision}`,
+        `reason=${context.reason}`,
+        `armed=${context.armed}`,
+        `mode=${context.mode}`,
+        `allowModeOnly=${context.allowModeOnly}`,
+        `max=${context.maxRepeats}`,
+        `used=${context.used}`,
+        `left=${context.remaining}`,
+        `active=${context.active}`,
+        `stopEligible=${context.stopEligible}`,
+        `captured=${context.hasCapturedRequest}`,
+        `compaction=${context.compactionRequest}`,
+        `seed=${context.hasSeed}`,
+        ...(typeof context.stage === 'string' && context.stage ? [`stage=${context.stage}`] : []),
+        ...(typeof context.bdWorkState === 'string' && context.bdWorkState ? [`bd=${context.bdWorkState}`] : []),
+        `obs=${typeof context.observationHash === 'string' && context.observationHash ? context.observationHash : 'none'}`,
+        `stable=${typeof context.observationStableCount === 'number' && Number.isFinite(context.observationStableCount)
+            ? Math.max(0, Math.floor(context.observationStableCount))
+            : 'n/a'}`,
+        `toolSig=${typeof context.toolSignatureHash === 'string' && context.toolSignatureHash ? context.toolSignatureHash : 'none'}`
+    ].join(' ');
+}
+function normalizeStopMessageCompareContext(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        return undefined;
+    }
+    const record = raw;
+    const decisionRaw = typeof record.decision === 'string' ? record.decision.trim().toLowerCase() : '';
+    if (decisionRaw !== 'trigger' && decisionRaw !== 'skip') {
+        return undefined;
+    }
+    const modeRaw = typeof record.mode === 'string' ? record.mode.trim().toLowerCase() : '';
+    const mode = modeRaw === 'on' || modeRaw === 'auto' || modeRaw === 'off'
+        ? modeRaw
+        : 'off';
+    const reason = typeof record.reason === 'string' && record.reason.trim() ? record.reason.trim() : 'unknown';
+    const textLength = typeof record.textLength === 'number' && Number.isFinite(record.textLength)
+        ? Math.max(0, Math.floor(record.textLength))
+        : 0;
+    const maxRepeats = typeof record.maxRepeats === 'number' && Number.isFinite(record.maxRepeats)
+        ? Math.max(0, Math.floor(record.maxRepeats))
+        : 0;
+    const used = typeof record.used === 'number' && Number.isFinite(record.used)
+        ? Math.max(0, Math.floor(record.used))
+        : 0;
+    const remaining = typeof record.remaining === 'number' && Number.isFinite(record.remaining)
+        ? Math.max(0, Math.floor(record.remaining))
+        : Math.max(0, maxRepeats - used);
+    return {
+        armed: Boolean(record.armed),
+        mode,
+        allowModeOnly: Boolean(record.allowModeOnly),
+        textLength,
+        maxRepeats,
+        used,
+        remaining,
+        active: Boolean(record.active),
+        stopEligible: Boolean(record.stopEligible),
+        hasCapturedRequest: Boolean(record.hasCapturedRequest),
+        compactionRequest: Boolean(record.compactionRequest),
+        hasSeed: Boolean(record.hasSeed),
+        decision: decisionRaw,
+        reason,
+        ...(typeof record.stage === 'string' && record.stage.trim() ? { stage: record.stage.trim() } : {}),
+        ...(typeof record.bdWorkState === 'string' && record.bdWorkState.trim()
+            ? { bdWorkState: record.bdWorkState.trim() }
+            : {}),
+        ...(typeof record.observationHash === 'string' && record.observationHash.trim()
+            ? { observationHash: record.observationHash.trim() }
+            : {}),
+        ...(typeof record.observationStableCount === 'number' && Number.isFinite(record.observationStableCount)
+            ? { observationStableCount: Math.max(0, Math.floor(record.observationStableCount)) }
+            : {}),
+        ...(typeof record.toolSignatureHash === 'string' && record.toolSignatureHash.trim()
+            ? { toolSignatureHash: record.toolSignatureHash.trim() }
+            : {})
+    };
+}

package/dist/servertool/types.d.ts

@@ -28,6 +28,17 @@ export interface ToolCall {
     name: string;
     arguments: string;
 }
+export interface ServerToolAutoHookTraceEvent {
+    hookId: string;
+    phase: string;
+    priority: number;
+    queue: 'A_optional' | 'B_mandatory';
+    queueIndex: number;
+    queueTotal: number;
+    result: 'miss' | 'match' | 'error';
+    reason: string;
+    flowId?: string;
+}
 /**
  * ServerSideToolEngineOptions：ServerTool 引擎入参（ChatCompletion 视角）。
  */
@@ -48,6 +59,7 @@ export interface ServerSideToolEngineOptions {
         __sse_responses?: unknown;
         format?: string;
     }>;
+    onAutoHookTrace?: (event: ServerToolAutoHookTraceEvent) => void;
 }
 export type ServerToolFollowupInjectionOp = {
     op: 'preserve_tools';

package/dist/sse/sse-to-json/anthropic-sse-to-json-converter.d.ts

@@ -12,6 +12,7 @@ export declare class AnthropicSseToJsonConverter {
     private createContext;
     private chunkStrings;
     private updateStats;
+    private extractAnthropicErrorEventMessage;
     private wrapError;
 }
 export {};

package/dist/sse/sse-to-json/anthropic-sse-to-json-converter.js

@@ -26,7 +26,8 @@ export class AnthropicSseToJsonConverter {
                 'content_block_delta',
                 'content_block_stop',
                 'message_delta',
-                'message_stop'
+                'message_stop',
+                'error'
             ])
         });
         const builder = createAnthropicResponseBuilder({
@@ -41,6 +42,10 @@ export class AnthropicSseToJsonConverter {
                     }
                     continue;
                 }
+                const upstreamError = this.extractAnthropicErrorEventMessage(result.event);
+                if (upstreamError) {
+                    throw new Error(upstreamError);
+                }
                 if (result.event.protocol !== 'anthropic-messages') {
                     continue;
                 }
@@ -98,6 +103,36 @@ export class AnthropicSseToJsonConverter {
                 context.eventStats.textBlocks += 1;
         }
     }
+    extractAnthropicErrorEventMessage(event) {
+        const node = event;
+        if (node?.type !== 'error') {
+            return null;
+        }
+        const dataNode = node.data;
+        if (typeof dataNode === 'string' && dataNode.trim()) {
+            return `Anthropic SSE error event: ${dataNode.trim()}`;
+        }
+        const nestedError = dataNode && typeof dataNode === 'object' ? dataNode.error : undefined;
+        const message = (nestedError && typeof nestedError.message === 'string' && nestedError.message.trim()) ||
+            (dataNode && typeof dataNode === 'object' && typeof dataNode.message === 'string' && dataNode.message.trim()) ||
+            'Anthropic SSE upstream returned an error event';
+        const code = (nestedError && typeof nestedError.code === 'string' && nestedError.code.trim()) ||
+            (nestedError && typeof nestedError.code === 'number' ? String(nestedError.code) : '') ||
+            (dataNode && typeof dataNode === 'object' && typeof dataNode.code === 'string' && dataNode.code.trim()) ||
+            (dataNode && typeof dataNode === 'object' && typeof dataNode.code === 'number' ? String(dataNode.code) : '');
+        const requestId = (dataNode && typeof dataNode === 'object' && typeof dataNode.request_id === 'string' && dataNode.request_id.trim()) ||
+            (dataNode && typeof dataNode === 'object' && typeof dataNode.requestId === 'string' && dataNode.requestId.trim()) ||
+            '';
+        const parts = ['Anthropic SSE error event'];
+        if (code) {
+            parts.push(`[${code}]`);
+        }
+        parts.push(message);
+        if (requestId) {
+            parts.push(`(request_id=${requestId})`);
+        }
+        return parts.join(' ');
+    }
     wrapError(code, error, requestId) {
         return ErrorUtils.createError(error.message, code, { requestId });
     }

package/dist/sse/sse-to-json/builders/anthropic-response-builder.js

@@ -136,6 +136,9 @@ export function createAnthropicResponseBuilder(options) {
         },
         getResult() {
             if (!state.completed) {
+                // 网络提前断开时可能缺失 content_block_stop/message_stop，
+                // 先尝试 flush 当前 block，尽最大努力还原已接收内容。
+                flushCurrent();
                 // 对部分实现（或网络提前关闭）导致缺失 message_stop 的 SSE 流，
                 // 只要已经累计到可用内容，就以最佳努力方式返回结果，而不是直接抛错。
                 if (state.content.length > 0) {

package/dist/sse/sse-to-json/chat-sse-to-json-converter.d.ts

@@ -39,6 +39,9 @@ export declare class ChatSseToJsonConverter {
      * 处理chat_chunk事件
      */
     private processChatChunk;
+    private ensureChoiceBuilder;
+    private tryProcessDeepSeekWebPatchEvent;
+    private getDeepSeekPatchState;
     /**
      * 处理choice
      */

package/dist/sse/sse-to-json/chat-sse-to-json-converter.js

@@ -135,6 +135,11 @@ export class ChatSseToJsonConverter {
                 return 'ping';
             if (v === 'error')
                 return 'error';
+            // DeepSeek-web style control events (non-content).
+            if (v === 'ready' || v === 'update_session' || v === 'title')
+                return 'ping';
+            if (v === 'finish' || v === 'close')
+                return 'chat.done';
             // Legacy aliases
             if (v === 'chunk')
                 return 'chat_chunk';
@@ -235,7 +240,11 @@ export class ChatSseToJsonConverter {
     async processChatChunk(event, context) {
         try {
             const payload = typeof event.data === 'string' ? event.data : JSON.stringify(event.data ?? {});
-            const chunk = JSON.parse(payload);
+            const parsed = JSON.parse(payload);
+            if (this.tryProcessDeepSeekWebPatchEvent(parsed, context)) {
+                return;
+            }
+            const chunk = parsed;
             // 验证chunk格式
             if (context.options.validateChunks) {
                 this.validateChatChunk(chunk);
@@ -259,6 +268,114 @@ export class ChatSseToJsonConverter {
             throw ErrorUtils.wrapError(error, 'Failed to parse chat_chunk');
         }
     }
+    ensureChoiceBuilder(context, choiceIndex) {
+        let choiceBuilder = context.choiceIndexMap.get(choiceIndex);
+        if (!choiceBuilder) {
+            choiceBuilder = this.createChoiceBuilder(choiceIndex);
+            context.choiceIndexMap.set(choiceIndex, choiceBuilder);
+            context.currentResponse.choices?.push({
+                index: choiceIndex,
+                message: {
+                    role: 'assistant',
+                    content: ''
+                },
+                finish_reason: 'stop'
+            });
+        }
+        return choiceBuilder;
+    }
+    tryProcessDeepSeekWebPatchEvent(parsed, context) {
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            return false;
+        }
+        const payload = parsed;
+        // Standard OpenAI chunk path should continue with default processing.
+        if (Array.isArray(payload.choices) || payload.object === 'chat.completion.chunk') {
+            return false;
+        }
+        const path = typeof payload.p === 'string' ? payload.p : '';
+        const op = typeof payload.o === 'string' ? payload.o : '';
+        const value = payload.v;
+        const deepseekState = this.getDeepSeekPatchState(context);
+        const isBareContinuation = deepseekState.patchAppendActive && !path && typeof value === 'string';
+        const looksLikeDeepSeekPatch = path.startsWith('response/')
+            || typeof payload.request_message_id === 'number'
+            || typeof payload.response_message_id === 'number'
+            || typeof payload.updated_at === 'number'
+            || (value !== null && typeof value === 'object' && !Array.isArray(value))
+            || isBareContinuation;
+        if (!looksLikeDeepSeekPatch) {
+            return false;
+        }
+        if (!context.currentResponse.id) {
+            context.currentResponse.id = `chat_${context.requestId}`;
+        }
+        if (!context.currentResponse.object) {
+            context.currentResponse.object = 'chat.completion';
+        }
+        if (!context.currentResponse.created) {
+            context.currentResponse.created = Math.floor(Date.now() / 1000);
+        }
+        if (!context.currentResponse.model) {
+            context.currentResponse.model = context.model;
+        }
+        const choiceBuilder = this.ensureChoiceBuilder(context, 0);
+        choiceBuilder.messageBuilder.role = choiceBuilder.messageBuilder.role || 'assistant';
+        if (path === 'response/content' && op === 'APPEND' && typeof value === 'string') {
+            deepseekState.patchAppendActive = true;
+            choiceBuilder.messageBuilder.content = (choiceBuilder.messageBuilder.content || '') + value;
+            choiceBuilder.accumulatedContent += value;
+        }
+        else if (!path && typeof value === 'string' && value.length > 0) {
+            // DeepSeek sometimes continues APPEND content via bare {"v":"..."} frames.
+            choiceBuilder.messageBuilder.content = (choiceBuilder.messageBuilder.content || '') + value;
+            choiceBuilder.accumulatedContent += value;
+        }
+        else if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+            const inner = value;
+            const responseNode = inner.response;
+            if (responseNode && typeof responseNode === 'object' && !Array.isArray(responseNode)) {
+                const responseRecord = responseNode;
+                if (typeof responseRecord.content === 'string' && responseRecord.content.length > 0) {
+                    choiceBuilder.messageBuilder.content =
+                        (choiceBuilder.messageBuilder.content || '') + responseRecord.content;
+                    choiceBuilder.accumulatedContent += responseRecord.content;
+                }
+                if (typeof responseRecord.status === 'string' && responseRecord.status.toUpperCase() === 'FINISHED') {
+                    choiceBuilder.finishReason = 'stop';
+                    choiceBuilder.isCompleted = true;
+                }
+            }
+        }
+        if (path === 'response/accumulated_token_usage' && typeof value === 'number') {
+            context.eventStats.totalTokens = value;
+        }
+        if (path === 'response/status' && typeof value === 'string' && value.toUpperCase() === 'FINISHED') {
+            deepseekState.patchAppendActive = false;
+            choiceBuilder.finishReason = 'stop';
+            choiceBuilder.isCompleted = true;
+            context.isCompleted = true;
+        }
+        this.updateResponseChoice(0, choiceBuilder, context);
+        return true;
+    }
+    getDeepSeekPatchState(context) {
+        const carrier = context;
+        if (!carrier.deepseekPatchState) {
+            carrier.deepseekPatchState = { patchAppendActive: false };
+        }
+        return {
+            get patchAppendActive() {
+                return Boolean(carrier.deepseekPatchState?.patchAppendActive);
+            },
+            set patchAppendActive(value) {
+                if (!carrier.deepseekPatchState) {
+                    carrier.deepseekPatchState = {};
+                }
+                carrier.deepseekPatchState.patchAppendActive = value;
+            }
+        };
+    }
     /**
      * 处理choice
      */

package/dist/tools/apply-patch/args-normalizer/default-actions.js

@@ -3,7 +3,7 @@ export const DEFAULT_APPLY_PATCH_NORMALIZE_ACTIONS = [
     { action: 'json_container_patch_fallback' },
     { action: 'record_text_fields', fields: ['patch'] },
     { action: 'record_conflict_patch', patchField: 'patch', fileFields: ['file', 'path', 'filepath', 'filename'] },
-    { action: 'record_text_fields', fields: ['diff', 'patchText', 'body', 'input', 'instructions'] },
+    { action: 'record_text_fields', fields: ['diff', 'patchText', 'body', 'input', 'instructions', 'command'] },
     { action: 'record_raw_envelope', field: '_raw', parseJson: true, maxDepth: 3 },
     { action: 'record_structured_payload' },
     { action: 'array_structured_payload' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.1739",
+  "version": "0.6.1890",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",