@jsonstudio/llms 0.6.633 → 0.6.743

package/dist/servertool/handlers/stop-message-auto.js

@@ -1,6 +1,7 @@
 import { registerServerToolHandler } from '../registry.js';
 import { cloneJson } from '../server-side-tools.js';
 import { loadRoutingInstructionStateSync, saveRoutingInstructionStateAsync } from '../../router/virtual-router/sticky-session-store.js';
+import { isCompactionRequest } from './compaction-detect.js';
 const STOPMESSAGE_DEBUG = (process.env.ROUTECODEX_STOPMESSAGE_DEBUG || '').trim() === '1';
 function debugLog(message, extra) {
     if (!STOPMESSAGE_DEBUG) {
@@ -23,9 +24,14 @@ const handler = async (ctx) => {
         requestId: record.requestId,
         providerProtocol: record.providerProtocol
     });
-    const followupRaw = record.serverToolFollowup;
-    if (followupRaw === true || (typeof followupRaw === 'string' && followupRaw.trim().toLowerCase() === 'true')) {
-        debugLog('skip_servertool_followup_flag');
+    const followupFlagRaw = record.serverToolFollowup;
+    if (followupFlagRaw === true ||
+        (typeof followupFlagRaw === 'string' && followupFlagRaw.trim().toLowerCase() === 'true')) {
+        debugLog('skip_followup_loop');
+        return null;
+    }
+    if (hasCompactionFlag(record)) {
+        debugLog('skip_compaction_flag');
         return null;
     }
     const connectionState = resolveClientConnectionState(record.clientConnectionState);
@@ -44,10 +50,21 @@ const handler = async (ctx) => {
         debugLog('skip_no_sticky_key');
         return null;
     }
-    const state = loadRoutingInstructionStateSync(stickyKey);
+    let state = loadRoutingInstructionStateSync(stickyKey);
     if (!state || !state.stopMessageText || !state.stopMessageMaxRepeats) {
-        debugLog('skip_no_state', { stickyKey });
-        return null;
+        const fallback = resolveStopMessageSnapshot(record.stopMessageState);
+        if (fallback) {
+            state = createStopMessageState(fallback);
+        }
+        else {
+            const implicit = resolveImplicitGeminiStopMessageSnapshot(ctx, record);
+            if (!implicit) {
+                debugLog('skip_no_state', { stickyKey });
+                return null;
+            }
+            state = createStopMessageState(implicit);
+        }
+        saveRoutingInstructionStateAsync(stickyKey, state);
     }
     const text = typeof state.stopMessageText === 'string' ? state.stopMessageText.trim() : '';
     const maxRepeats = typeof state.stopMessageMaxRepeats === 'number' && Number.isFinite(state.stopMessageMaxRepeats)
@@ -70,6 +87,12 @@ const handler = async (ctx) => {
             used,
             maxRepeats
         });
+        state.stopMessageText = undefined;
+        state.stopMessageMaxRepeats = undefined;
+        state.stopMessageUsed = undefined;
+        state.stopMessageUpdatedAt = undefined;
+        state.stopMessageLastUsedAt = undefined;
+        saveRoutingInstructionStateAsync(stickyKey, state);
         return null;
     }
     if (!isStopFinishReason(ctx.base)) {
@@ -85,16 +108,33 @@ const handler = async (ctx) => {
         });
         return null;
     }
-    state.stopMessageUsed = used + 1;
-    state.stopMessageLastUsedAt = Date.now();
-    saveRoutingInstructionStateAsync(stickyKey, state);
-    const followupPayload = buildStopMessageFollowupPayload(captured, text);
+    if (isCompactionRequest(captured)) {
+        debugLog('skip_compaction_request', { stickyKey });
+        return null;
+    }
+    const entryEndpoint = resolveEntryEndpoint(record);
+    const followupPayload = buildStopMessageFollowupPayload(captured, text, ctx.base);
     if (!followupPayload) {
         debugLog('skip_failed_build_followup', {
             stickyKey
         });
         return null;
     }
+    const nextUsed = used + 1;
+    state.stopMessageUsed = nextUsed;
+    state.stopMessageLastUsedAt = Date.now();
+    saveRoutingInstructionStateAsync(stickyKey, state);
+    const followupMetadata = {
+        serverToolFollowup: true,
+        stream: false,
+        preserveRouteHint: false,
+        disableStickyRoutes: true,
+        serverToolOriginalEntryEndpoint: entryEndpoint,
+        ...(connectionState ? { clientConnectionState: connectionState } : {})
+    };
+    if (shouldForceChatProtocol(entryEndpoint)) {
+        followupMetadata.serverToolFollowupProtocol = 'openai-chat';
+    }
     return {
         chatResponse: ctx.base,
         execution: {
@@ -102,13 +142,8 @@ const handler = async (ctx) => {
             followup: {
                 requestIdSuffix: ':stop_followup',
                 payload: followupPayload,
-                metadata: {
-                    serverToolFollowup: true,
-                    stream: false,
-                    preserveRouteHint: false,
-                    disableStickyRoutes: true,
-                    ...(connectionState ? { clientConnectionState: connectionState } : {})
-                }
+                entryEndpoint,
+                metadata: followupMetadata
             }
         }
     };
@@ -144,7 +179,14 @@ function isStopFinishReason(base) {
     const finishReason = typeof finishReasonRaw === 'string' && finishReasonRaw.trim()
         ? finishReasonRaw.trim().toLowerCase()
         : '';
-    if (finishReason !== 'stop') {
+    // 将模型视为“自然结束”的场景：
+    // - OpenAI 兼容：finish_reason === 'stop'
+    // - 截断场景：finish_reason === 'length'（例如 Gemini/Claude 流式输出被 max token 截断）
+    // 统一视作可触发 stopMessage 的终止点；仅排除显式的 tool_calls。
+    if (!finishReason || finishReason === 'tool_calls') {
+        return false;
+    }
+    if (finishReason !== 'stop' && finishReason !== 'length') {
         return false;
     }
     const message = first.message &&
@@ -157,6 +199,7 @@ function isStopFinishReason(base) {
     }
     const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
     if (toolCalls.length > 0) {
+        // 如果当前响应仍在发起工具调用，则由工具执行驱动后续轮次，不触发 stopMessage。
         return false;
     }
     return true;
@@ -171,7 +214,7 @@ function getCapturedRequest(adapterContext) {
     }
     return captured;
 }
-function buildStopMessageFollowupPayload(source, text) {
+function buildStopMessageFollowupPayload(source, text, baseResponse) {
     if (!source || typeof source !== 'object') {
         return null;
     }
@@ -181,6 +224,25 @@ function buildStopMessageFollowupPayload(source, text) {
     }
     const rawMessages = source.messages;
     const messages = Array.isArray(rawMessages) ? cloneJson(rawMessages) : [];
+    try {
+        if (baseResponse && typeof baseResponse === 'object' && !Array.isArray(baseResponse)) {
+            const base = baseResponse;
+            const choices = Array.isArray(base.choices) ? base.choices : [];
+            const primary = choices[0] && typeof choices[0] === 'object' ? choices[0] : null;
+            const msg = primary &&
+                primary.message &&
+                typeof primary.message === 'object' &&
+                !Array.isArray(primary.message)
+                ? primary.message
+                : null;
+            if (msg) {
+                messages.push(cloneJson(msg));
+            }
+        }
+    }
+    catch {
+        // best-effort: 如果无法解析上一条响应，就只使用已捕获的请求消息
+    }
     messages.push({
         role: 'user',
         content: text
@@ -202,3 +264,121 @@ function resolveClientConnectionState(value) {
     }
     return value;
 }
+function resolveStopMessageSnapshot(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        return null;
+    }
+    const record = raw;
+    const text = typeof record.stopMessageText === 'string' ? record.stopMessageText.trim() : '';
+    const maxRepeats = typeof record.stopMessageMaxRepeats === 'number' && Number.isFinite(record.stopMessageMaxRepeats)
+        ? Math.max(1, Math.floor(record.stopMessageMaxRepeats))
+        : 0;
+    if (!text || maxRepeats <= 0) {
+        return null;
+    }
+    const used = typeof record.stopMessageUsed === 'number' && Number.isFinite(record.stopMessageUsed)
+        ? Math.max(0, Math.floor(record.stopMessageUsed))
+        : 0;
+    const updatedAt = typeof record.stopMessageUpdatedAt === 'number' && Number.isFinite(record.stopMessageUpdatedAt)
+        ? record.stopMessageUpdatedAt
+        : undefined;
+    const lastUsedAt = typeof record.stopMessageLastUsedAt === 'number' && Number.isFinite(record.stopMessageLastUsedAt)
+        ? record.stopMessageLastUsedAt
+        : undefined;
+    const source = typeof record.stopMessageSource === 'string' && record.stopMessageSource.trim()
+        ? record.stopMessageSource.trim()
+        : undefined;
+    return {
+        text,
+        maxRepeats,
+        used,
+        ...(source ? { source } : {}),
+        ...(updatedAt ? { updatedAt } : {}),
+        ...(lastUsedAt ? { lastUsedAt } : {})
+    };
+}
+function hasCompactionFlag(record) {
+    const flag = record.compactionRequest;
+    if (flag === true) {
+        return true;
+    }
+    if (typeof flag === 'string' && flag.trim().toLowerCase() === 'true') {
+        return true;
+    }
+    return false;
+}
+function resolveImplicitGeminiStopMessageSnapshot(ctx, record) {
+    try {
+        const protoFromCtx = ctx.options?.providerProtocol;
+        const protoFromRecord = typeof record.providerProtocol === 'string' && record.providerProtocol.trim()
+            ? String(record.providerProtocol).trim()
+            : undefined;
+        const providerProtocol = (protoFromCtx || protoFromRecord || '').toString().toLowerCase();
+        if (providerProtocol !== 'gemini-chat') {
+            return null;
+        }
+        const entryFromRecord = typeof record.entryEndpoint === 'string' && record.entryEndpoint.trim()
+            ? String(record.entryEndpoint).trim()
+            : undefined;
+        const metaEntry = record.metadata &&
+            typeof record.metadata === 'object' &&
+            record.metadata.entryEndpoint;
+        const entryFromMeta = typeof metaEntry === 'string' && metaEntry.trim() ? metaEntry.trim() : undefined;
+        const entryEndpoint = (entryFromRecord || entryFromMeta || '').toLowerCase();
+        if (!entryEndpoint.includes('/v1/responses')) {
+            return null;
+        }
+        // 仅在本轮响应被视为“自然结束”（stop/length，且无 tool_calls）时触发，避免干扰正常对话。
+        if (!isStopFinishReason(ctx.base)) {
+            return null;
+        }
+        return {
+            text: '继续执行',
+            maxRepeats: 1,
+            used: 0,
+            source: 'auto'
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function createStopMessageState(snapshot) {
+    return {
+        forcedTarget: undefined,
+        stickyTarget: undefined,
+        allowedProviders: new Set(),
+        disabledProviders: new Set(),
+        disabledKeys: new Map(),
+        disabledModels: new Map(),
+        stopMessageSource: snapshot.source && snapshot.source.trim() ? snapshot.source.trim() : 'explicit',
+        stopMessageText: snapshot.text,
+        stopMessageMaxRepeats: snapshot.maxRepeats,
+        stopMessageUsed: snapshot.used,
+        stopMessageUpdatedAt: snapshot.updatedAt,
+        stopMessageLastUsedAt: snapshot.lastUsedAt
+    };
+}
+function resolveEntryEndpoint(record) {
+    const raw = typeof record.entryEndpoint === 'string' && record.entryEndpoint.trim()
+        ? record.entryEndpoint.trim()
+        : undefined;
+    if (raw) {
+        return raw;
+    }
+    const metaEntry = record.metadata && typeof record.metadata === 'object' && record.metadata.entryEndpoint;
+    if (typeof metaEntry === 'string' && metaEntry.trim()) {
+        return metaEntry.trim();
+    }
+    return '/v1/chat/completions';
+}
+function shouldForceChatProtocol(entryEndpoint) {
+    if (typeof entryEndpoint !== 'string') {
+        return false;
+    }
+    const normalized = entryEndpoint.trim().toLowerCase();
+    if (!normalized) {
+        return false;
+    }
+    return !normalized.includes('/v1/chat/completions');
+}

package/dist/servertool/server-side-tools.d.ts

@@ -2,7 +2,6 @@ import type { JsonObject } from '../conversion/hub/types/json.js';
 import type { ServerSideToolEngineOptions, ServerSideToolEngineResult, ToolCall } from './types.js';
 import './handlers/web-search.js';
 import './handlers/vision.js';
-import './handlers/gemini-empty-reply-continue.js';
 import './handlers/iflow-model-error-retry.js';
 import './handlers/stop-message-auto.js';
 export declare function runServerSideToolEngine(options: ServerSideToolEngineOptions): Promise<ServerSideToolEngineResult>;

package/dist/servertool/server-side-tools.js

@@ -1,7 +1,6 @@
 import { getServerToolHandler, listAutoServerToolHandlers } from './registry.js';
 import './handlers/web-search.js';
 import './handlers/vision.js';
-import './handlers/gemini-empty-reply-continue.js';
 import './handlers/iflow-model-error-retry.js';
 import './handlers/stop-message-auto.js';
 export async function runServerSideToolEngine(options) {

package/dist/servertool/types.d.ts

@@ -53,6 +53,7 @@ export interface ServerToolFollowupPlan {
     requestIdSuffix: string;
     payload: JsonObject;
     metadata?: JsonObject;
+    entryEndpoint?: string;
 }
 export interface ServerToolExecution {
     flowId: string;

package/dist/tools/apply-patch-structured.js

@@ -14,7 +14,27 @@ const SUPPORTED_KINDS = [
     'delete_file'
 ];
 const FILE_PATH_INVALID_RE = /[\r\n]/;
-const INVALID_FILE_FORMAT_RE = /^([A-Za-z]:|\/)/;
+const decodeEscapedNewlinesIfObvious = (value) => {
+    if (!value)
+        return value;
+    if (value.includes('\n'))
+        return value;
+    const lower = value.toLowerCase();
+    const looksEscaped = value.includes('\\r\\n') ||
+        (value.includes('\\n') && /\\n[ \t]/.test(value)) ||
+        lower.includes('\\u000a') ||
+        lower.includes('\\u000d');
+    if (!looksEscaped) {
+        return value;
+    }
+    let out = value;
+    out = out.replace(/\\r\\n/g, '\n');
+    out = out.replace(/\\n/g, '\n');
+    out = out.replace(/\\r/g, '\n');
+    out = out.replace(/\\u000a/gi, '\n');
+    out = out.replace(/\\u000d/gi, '\n');
+    return out;
+};
 const toSafeString = (value, label) => {
     const str = typeof value === 'string' ? value : '';
     if (!str.trim()) {
@@ -23,20 +43,22 @@ const toSafeString = (value, label) => {
     return str;
 };
 const normalizeFilePath = (raw, label) => {
-    const trimmed = raw.trim();
+    let trimmed = raw.trim();
     if (!trimmed) {
         throw new StructuredApplyPatchError('invalid_file', `${label} must not be empty`);
     }
     if (FILE_PATH_INVALID_RE.test(trimmed)) {
-        throw new StructuredApplyPatchError('invalid_file', `${label} must be a single-line relative path`);
-    }
-    if (INVALID_FILE_FORMAT_RE.test(trimmed)) {
-        throw new StructuredApplyPatchError('invalid_file', `${label} must be relative to the workspace root`);
+        const firstLine = trimmed.split(/[\r\n]/)[0]?.trim() ?? '';
+        if (!firstLine) {
+            throw new StructuredApplyPatchError('invalid_file', `${label} must be a single-line path`);
+        }
+        trimmed = firstLine;
     }
     return trimmed.replace(/\\/g, '/');
 };
 const splitTextIntoLines = (input) => {
-    const normalized = input.replace(/\r/g, '');
+    const decoded = decodeEscapedNewlinesIfObvious(input);
+    const normalized = decoded.replace(/\r/g, '');
     const parts = normalized.split('\n');
     if (parts.length && parts[parts.length - 1] === '') {
         parts.pop();
@@ -48,16 +70,27 @@ const normalizeLines = (value, label) => {
         if (!value.length) {
             return [];
         }
-        return value.map((entry, idx) => {
+        const out = [];
+        for (const [idx, entry] of value.entries()) {
             if (typeof entry !== 'string') {
                 if (entry === null || entry === undefined) {
-                    return '';
+                    out.push('');
+                    continue;
                 }
-                return String(entry);
+                out.push(String(entry));
+                continue;
             }
             // Preserve intentional whitespace
-            return entry.replace(/\r/g, '');
-        });
+            const normalized = entry.replace(/\r/g, '');
+            const decoded = decodeEscapedNewlinesIfObvious(normalized);
+            if (decoded.includes('\n')) {
+                out.push(...splitTextIntoLines(decoded));
+            }
+            else {
+                out.push(decoded);
+            }
+        }
+        return out;
     }
     if (typeof value === 'string') {
         return splitTextIntoLines(value);
@@ -176,7 +209,9 @@ export function buildStructuredPatch(payload) {
                 break;
             }
             case 'replace': {
-                const target = toSafeString(change.target, `changes[${index}].target`);
+                // 兼容仅提供 anchor 的 replace 形态：将 anchor 视为 target 以尽可能保留用户意图。
+                const targetSource = change.target ?? change.anchor;
+                const target = toSafeString(targetSource, `changes[${index}].target`);
                 const replacements = normalizeLines(change.lines, `changes[${index}].lines`);
                 const hunkBody = [
                     ...buildPrefixedLines(splitTextIntoLines(target), '-'),
@@ -215,8 +250,10 @@ export function buildStructuredPatch(payload) {
         }
         else {
             lines.push(`*** Update File: ${file}`);
-            for (const hunk of section.hunks) {
-                // 每个 hunk 仅需一个开头的 "@@" 行，后面直接跟上下文/增删行。
+            const hunks = section.hunks || [];
+            for (const hunk of hunks) {
+                // 结构化补丁仅负责生成统一 diff 形态，不对多段 hunk 做逻辑裁剪；
+                // 具体哪些 hunk 能成功应用由 apply_patch 客户端自行校验并返回错误信息。
                 for (const entry of hunk) {
                     if (!entry.startsWith('@@')) {
                         lines.push(entry);