@jsonstudio/llms 0.6.802 → 0.6.938

package/dist/filters/special/response-apply-patch-toon-decode.js

@@ -1,460 +0,0 @@
-import { buildStructuredPatch, isStructuredApplyPatchPayload, StructuredApplyPatchError } from '../../tools/apply-patch-structured.js';
-function envEnabled() {
-    const v = String(process?.env?.RCC_TOON_ENABLE ||
-        process?.env?.ROUTECODEX_TOON_ENABLE ||
-        '').toLowerCase();
-    if (!v)
-        return true;
-    return !(v === '0' || v === 'false' || v === 'off');
-}
-function isObject(v) {
-    return !!v && typeof v === 'object' && !Array.isArray(v);
-}
-function readString(value) {
-    if (typeof value === 'string') {
-        const trimmed = value.trim();
-        return trimmed ? trimmed : undefined;
-    }
-    return undefined;
-}
-function stripCodeFences(text) {
-    const trimmed = text.trim();
-    const fenceRe = /```(?:diff|patch|apply_patch|toon|text|json)?\s*([\s\S]*?)```/gi;
-    const candidates = [];
-    let match = null;
-    while ((match = fenceRe.exec(trimmed))) {
-        if (match[1]) {
-            candidates.push(match[1].trim());
-        }
-    }
-    if (!candidates.length) {
-        return text;
-    }
-    for (const candidate of candidates) {
-        if (candidate.includes('*** Begin Patch') ||
-            candidate.includes('*** Update File:') ||
-            candidate.includes('diff --git')) {
-            return candidate;
-        }
-    }
-    return candidates[0] ?? text;
-}
-function looksLikePatch(text) {
-    if (!text)
-        return false;
-    const t = text.trim();
-    if (!t)
-        return false;
-    return (t.includes('*** Begin Patch') ||
-        t.includes('*** Update File:') ||
-        t.includes('*** Add File:') ||
-        t.includes('*** Delete File:') ||
-        t.includes('diff --git') ||
-        /^(?:@@|\+\+\+\s|---\s)/m.test(t));
-}
-function convertGitDiffToApplyPatch(text) {
-    const lines = text.replace(/\r\n/g, '\n').split('\n');
-    const files = [];
-    let current = null;
-    let sawDiff = false;
-    const flush = () => {
-        if (!current)
-            return;
-        if (current.path && current.kind === 'delete') {
-            files.push(current);
-            current = null;
-            return;
-        }
-        if (!current.path || (current.kind === 'update' && current.lines.length === 0)) {
-            current = null;
-            return;
-        }
-        files.push(current);
-        current = null;
-    };
-    for (const raw of lines) {
-        const line = raw;
-        const diffMatch = line.match(/^diff --git a\/(.+?) b\/(.+)$/);
-        if (diffMatch) {
-            sawDiff = true;
-            flush();
-            const path = diffMatch[2] || diffMatch[1];
-            current = { path, kind: 'update', lines: [] };
-            continue;
-        }
-        if (!current) {
-            continue;
-        }
-        if (line.startsWith('new file mode')) {
-            current.kind = 'add';
-            continue;
-        }
-        if (line.startsWith('deleted file mode')) {
-            current.kind = 'delete';
-            continue;
-        }
-        if (line.startsWith('index ') || line.startsWith('old mode') || line.startsWith('new mode')) {
-            continue;
-        }
-        if (line.startsWith('--- ')) {
-            if (line.includes('/dev/null')) {
-                current.kind = 'add';
-            }
-            continue;
-        }
-        if (line.startsWith('+++ ')) {
-            if (line.includes('/dev/null')) {
-                current.kind = 'delete';
-            }
-            else {
-                const plusMatch = line.match(/^\+\+\+\s+(?:b\/)?(.+)$/);
-                if (plusMatch && plusMatch[1]) {
-                    current.path = plusMatch[1];
-                }
-            }
-            continue;
-        }
-        if (current.kind === 'delete') {
-            continue;
-        }
-        if (current.kind === 'add') {
-            if (line.startsWith('+') && !line.startsWith('+++')) {
-                current.lines.push(line);
-            }
-            else if (line.startsWith('\\')) {
-                current.lines.push(`+${line}`);
-            }
-            continue;
-        }
-        if (line.startsWith('@@') ||
-            line.startsWith('+') ||
-            line.startsWith('-') ||
-            line.startsWith(' ') ||
-            line.startsWith('\\')) {
-            current.lines.push(line.startsWith('\\') ? ` ${line}` : line);
-        }
-    }
-    flush();
-    if (!sawDiff || files.length === 0) {
-        return null;
-    }
-    const output = ['*** Begin Patch'];
-    for (const file of files) {
-        if (!file.path)
-            continue;
-        if (file.kind === 'add') {
-            output.push(`*** Add File: ${file.path}`);
-            for (const line of file.lines) {
-                if (line.startsWith('+')) {
-                    output.push(line);
-                }
-                else {
-                    output.push(`+${line}`);
-                }
-            }
-            continue;
-        }
-        if (file.kind === 'delete') {
-            output.push(`*** Delete File: ${file.path}`);
-            continue;
-        }
-        output.push(`*** Update File: ${file.path}`);
-        for (const line of file.lines) {
-            if (line.startsWith('@@') || line.startsWith('+') || line.startsWith('-') || line.startsWith(' ')) {
-                output.push(line);
-            }
-            else {
-                output.push(` ${line}`);
-            }
-        }
-    }
-    output.push('*** End Patch');
-    return output.join('\n');
-}
-function normalizeApplyPatchText(raw) {
-    if (!raw)
-        return raw;
-    let text = raw.replace(/\r\n/g, '\n');
-    text = stripCodeFences(text);
-    text = text.trim();
-    if (!text) {
-        return raw;
-    }
-    if (!text.includes('*** Begin Patch') && text.includes('diff --git')) {
-        const converted = convertGitDiffToApplyPatch(text);
-        if (converted) {
-            text = converted;
-        }
-    }
-    if (text.includes('*** Create File:')) {
-        text = text.replace(/\*\*\* Create File:/g, '*** Add File:');
-    }
-    const hasBegin = text.includes('*** Begin Patch');
-    const hasEnd = text.includes('*** End Patch');
-    if (hasBegin && !hasEnd) {
-        text = `${text}\n*** End Patch`;
-    }
-    if (!hasBegin && /^\*\*\* (Add|Update|Delete) File:/m.test(text)) {
-        text = `*** Begin Patch\n${text}\n*** End Patch`;
-    }
-    if (!text.includes('*** Begin Patch')) {
-        return text;
-    }
-    const lines = text.split('\n');
-    const output = [];
-    let inUpdateSection = false;
-    let afterUpdateHeader = false;
-    for (const line of lines) {
-        if (line.startsWith('*** Begin Patch')) {
-            output.push(line);
-            inUpdateSection = false;
-            afterUpdateHeader = false;
-            continue;
-        }
-        if (line.startsWith('*** End Patch')) {
-            output.push(line);
-            inUpdateSection = false;
-            afterUpdateHeader = false;
-            continue;
-        }
-        if (line.startsWith('*** Update File:')) {
-            output.push(line);
-            inUpdateSection = true;
-            afterUpdateHeader = true;
-            continue;
-        }
-        if (line.startsWith('*** Add File:') || line.startsWith('*** Delete File:')) {
-            output.push(line);
-            inUpdateSection = false;
-            afterUpdateHeader = false;
-            continue;
-        }
-        if (inUpdateSection) {
-            if (afterUpdateHeader && line.trim() === '') {
-                continue;
-            }
-            afterUpdateHeader = false;
-            if (line.startsWith('@@') || line.startsWith('+') || line.startsWith('-') || line.startsWith(' ')) {
-                output.push(line);
-            }
-            else {
-                output.push(` ${line}`);
-            }
-            continue;
-        }
-        output.push(line);
-    }
-    return output.join('\n');
-}
-function collectFunctionCallAdapters(payload) {
-    const adapters = [];
-    const anyPayload = payload;
-    const choices = Array.isArray(anyPayload.choices)
-        ? (anyPayload.choices ?? [])
-        : [];
-    for (const choice of choices) {
-        const message = choice && typeof choice === 'object' ? choice.message : undefined;
-        const toolCalls = message && Array.isArray(message.tool_calls) ? message.tool_calls : [];
-        for (const tc of toolCalls) {
-            const fnObj = tc && typeof tc === 'object' ? tc.function : undefined;
-            if (fnObj && typeof fnObj === 'object') {
-                adapters.push({
-                    name: typeof fnObj.name === 'string' ? String(fnObj.name) : undefined,
-                    getArguments: () => fnObj.arguments,
-                    setArguments: (value) => {
-                        fnObj.arguments = value;
-                    }
-                });
-            }
-        }
-    }
-    const output = Array.isArray(anyPayload.output) ? anyPayload.output : [];
-    for (const item of output) {
-        if (!item || typeof item !== 'object')
-            continue;
-        const type = String(item.type || '').toLowerCase();
-        if (type === 'function_call') {
-            adapters.push({
-                name: typeof item.name === 'string' ? String(item.name) : undefined,
-                getArguments: () => item.arguments,
-                setArguments: (value) => {
-                    item.arguments = value;
-                }
-            });
-            continue;
-        }
-        if (type === 'message' && Array.isArray(item.tool_calls)) {
-            for (const tc of item.tool_calls) {
-                const fnObj = tc && typeof tc === 'object' ? tc.function : undefined;
-                if (!fnObj || typeof fnObj !== 'object')
-                    continue;
-                adapters.push({
-                    name: typeof fnObj.name === 'string' ? String(fnObj.name) : undefined,
-                    getArguments: () => fnObj.arguments,
-                    setArguments: (value) => {
-                        fnObj.arguments = value;
-                    }
-                });
-            }
-        }
-    }
-    return adapters;
-}
-function buildSingleChangePayload(record) {
-    const kindRaw = readString(record.kind);
-    if (!kindRaw)
-        return undefined;
-    const change = {
-        kind: kindRaw.toLowerCase(),
-        lines: record.lines ?? record.text ?? record.body,
-        target: readString(record.target),
-        anchor: readString(record.anchor)
-    };
-    if (typeof record.use_anchor_indent === 'boolean') {
-        change.use_anchor_indent = record.use_anchor_indent;
-    }
-    const changeFile = readString(record.file);
-    if (changeFile) {
-        change.file = changeFile;
-    }
-    return {
-        file: changeFile,
-        changes: [change]
-    };
-}
-function coerceStructuredPayload(record) {
-    if (isStructuredApplyPatchPayload(record)) {
-        return record;
-    }
-    if (Array.isArray(record.changes) && record.changes.length === 0) {
-        return undefined;
-    }
-    const single = buildSingleChangePayload(record);
-    if (single) {
-        return single;
-    }
-    return undefined;
-}
-function maybeNormalizeArguments(argIn) {
-    let parsed;
-    let patchText;
-    if (typeof argIn === 'string') {
-        const trimmed = argIn.trim();
-        if (!trimmed)
-            return undefined;
-        try {
-            parsed = JSON.parse(trimmed);
-        }
-        catch {
-            if (looksLikePatch(trimmed)) {
-                patchText = trimmed;
-            }
-            else {
-                const stripped = stripCodeFences(trimmed);
-                if (looksLikePatch(stripped)) {
-                    patchText = stripped;
-                }
-            }
-        }
-    }
-    else if (isObject(argIn)) {
-        parsed = argIn;
-    }
-    else {
-        return undefined;
-    }
-    const record = parsed ?? {};
-    if (!patchText) {
-        const toon = readString(record.toon);
-        if (looksLikePatch(toon)) {
-            patchText = toon;
-        }
-    }
-    if (!patchText) {
-        const payload = coerceStructuredPayload(record);
-        if (payload) {
-            try {
-                patchText = buildStructuredPatch(payload);
-            }
-            catch (error) {
-                if (!(error instanceof StructuredApplyPatchError)) {
-                    /* ignore */
-                }
-            }
-        }
-    }
-    if (!patchText) {
-        const patchField = readString(record.patch);
-        if (looksLikePatch(patchField)) {
-            patchText = patchField;
-        }
-    }
-    if (!patchText) {
-        const inputField = readString(record.input);
-        if (looksLikePatch(inputField)) {
-            patchText = inputField;
-        }
-    }
-    if (!patchText) {
-        return undefined;
-    }
-    const normalizedText = normalizeApplyPatchText(patchText);
-    if (!looksLikePatch(normalizedText)) {
-        return undefined;
-    }
-    return JSON.stringify({ input: normalizedText, patch: normalizedText });
-}
-/**
- * Response-side apply_patch arguments 规范化（TOON + 结构化 JSON → 统一 diff 文本）。
- *
- * 目标：
- * - 对上游模型：仍然可以使用结构化 JSON（changes 数组）或 toon 字段输出补丁；
- * - 对下游客户端（Codex CLI 等）：始终看到 { input, patch } 形式的统一 diff 文本，
- *   与本地 apply_patch 工具的旧语义完全一致（对客户端透明）。
- *
- * 支持两种入参形态（arguments 反序列化后）：
- * 1) { toon: "<*** Begin Patch ... *** End Patch>" }
- * 2) StructuredApplyPatchPayload（含 changes 数组等字段）
- *
- * 输出：
- * - arguments 统一替换为 JSON 字符串：{ input: patchText, patch: patchText }。
- *
- * Stage: response_pre（在 arguments stringify 之前运行）。
- */
-export class ResponseApplyPatchToonDecodeFilter {
-    name = 'response_apply_patch_toon_decode';
-    stage = 'response_pre';
-    apply(input) {
-        if (!envEnabled())
-            return { ok: true, data: input };
-        try {
-            const out = JSON.parse(JSON.stringify(input || {}));
-            const adapters = collectFunctionCallAdapters(out);
-            for (const adapter of adapters) {
-                try {
-                    const name = adapter.name ? adapter.name.trim().toLowerCase() : '';
-                    if (name !== 'apply_patch') {
-                        continue;
-                    }
-                    const normalizedArgs = maybeNormalizeArguments(adapter.getArguments());
-                    if (!normalizedArgs) {
-                        continue;
-                    }
-                    try {
-                        adapter.setArguments(normalizedArgs);
-                    }
-                    catch {
-                        // ignore single adapter failures
-                    }
-                }
-                catch {
-                    // 单个 tool_call best-effort
-                }
-            }
-            return { ok: true, data: out };
-        }
-        catch {
-            return { ok: true, data: input };
-        }
-    }
-}

package/dist/filters/special/response-tool-arguments-toon-decode.d.ts

@@ -1,10 +0,0 @@
-import type { Filter, FilterContext, FilterResult, JsonObject } from '../types.js';
-/**
- * Decode arguments.toon to standard JSON ({command, workdir?}) and map tool name 'shell_toon' → 'shell'.
- * Stage: response_pre (before arguments stringify and invariants).
- */
-export declare class ResponseToolArgumentsToonDecodeFilter implements Filter<JsonObject> {
-    readonly name = "response_tool_arguments_toon_decode";
-    readonly stage: FilterContext['stage'];
-    apply(input: JsonObject, ctx: FilterContext): FilterResult<JsonObject>;
-}

package/dist/filters/special/response-tool-arguments-toon-decode.js

@@ -1,154 +0,0 @@
-import { isShellToolName, normalizeToolName } from '../../tools/tool-description-utils.js';
-import { repairFindMeta } from '../../conversion/shared/tooling.js';
-import { decodeToonToKeyValue, coerceToonValue } from '../../utils/toon.js';
-function envEnabled() {
-    // Default ON. Allow disabling via env RCC_TOON_ENABLE/ROUTECODEX_TOON_ENABLE = 0|false|off
-    const v = String(process?.env?.RCC_TOON_ENABLE || process?.env?.ROUTECODEX_TOON_ENABLE || '').toLowerCase();
-    if (!v)
-        return true;
-    return !(v === '0' || v === 'false' || v === 'off');
-}
-function isObject(v) { return !!v && typeof v === 'object' && !Array.isArray(v); }
-/**
- * Decode arguments.toon to standard JSON ({command, workdir?}) and map tool name 'shell_toon' → 'shell'.
- * Stage: response_pre (before arguments stringify and invariants).
- */
-export class ResponseToolArgumentsToonDecodeFilter {
-    name = 'response_tool_arguments_toon_decode';
-    stage = 'response_pre';
-    apply(input, ctx) {
-        if (!envEnabled())
-            return { ok: true, data: input };
-        try {
-            const out = JSON.parse(JSON.stringify(input || {}));
-            const warnings = [];
-            const choices = Array.isArray(out.choices) ? out.choices : [];
-            for (const ch of choices) {
-                const msg = ch && ch.message ? ch.message : undefined;
-                const tcs = msg && Array.isArray(msg.tool_calls) ? msg.tool_calls : [];
-                for (const tc of tcs) {
-                    try {
-                        const fn = tc && tc.function ? tc.function : undefined;
-                        if (!fn || typeof fn !== 'object')
-                            continue;
-                        const rawName = fn.name;
-                        const toolName = typeof rawName === 'string' ? rawName : '';
-                        const normalizedName = normalizeToolName(toolName);
-                        const isShellLike = isShellToolName(toolName);
-                        const argIn = fn.arguments;
-                        let parsed = undefined;
-                        if (typeof argIn === 'string') {
-                            try {
-                                parsed = JSON.parse(argIn);
-                            }
-                            catch {
-                                parsed = undefined;
-                            }
-                        }
-                        else if (isObject(argIn)) {
-                            parsed = argIn;
-                        }
-                        if (!isObject(parsed))
-                            continue;
-                        const toon = parsed.toon;
-                        if (typeof toon !== 'string' || !toon.trim())
-                            continue;
-                        const kv = decodeToonToKeyValue(toon);
-                        if (!kv) {
-                            const preview = toon.split(/\r?\n/).slice(0, 5).join('\n');
-                            const warnMsg = `response_tool_arguments_toon_decode: failed to decode TOON arguments for tool "${fn.name ?? 'unknown'}"`;
-                            warnings.push(warnMsg);
-                            if (ctx?.debug?.emit) {
-                                ctx.debug.emit('tool_toon_decode_error', {
-                                    requestId: ctx.requestId,
-                                    model: ctx.model,
-                                    endpoint: ctx.endpoint,
-                                    stage: ctx.stage,
-                                    provider: ctx.provider,
-                                    toolName: fn.name ?? 'unknown',
-                                    message: warnMsg,
-                                    toonPreview: preview
-                                });
-                            }
-                            continue; // keep original if decode fails
-                        }
-                        if (isShellLike) {
-                            const commandRaw = (typeof kv['command'] === 'string' && kv['command'].trim()
-                                ? kv['command']
-                                : typeof kv['cmd'] === 'string' && kv['cmd'].trim()
-                                    ? kv['cmd']
-                                    : undefined) ?? '';
-                            const workdirRaw = (typeof kv['workdir'] === 'string' && kv['workdir'].trim()
-                                ? kv['workdir']
-                                : typeof kv['cwd'] === 'string' && kv['cwd'].trim()
-                                    ? kv['cwd']
-                                    : undefined) ?? '';
-                            const timeoutRaw = typeof kv['timeout_ms'] === 'string' ? kv['timeout_ms'] : undefined;
-                            const escalatedRaw = typeof kv['with_escalated_permissions'] === 'string'
-                                ? kv['with_escalated_permissions']
-                                : undefined;
-                            const justificationRaw = typeof kv['justification'] === 'string' ? kv['justification'] : undefined;
-                            const command = repairFindMeta(commandRaw.trim());
-                            if (command) {
-                                const merged = {
-                                    cmd: command,
-                                    command
-                                };
-                                const workdir = workdirRaw.trim();
-                                if (workdir) {
-                                    merged.workdir = workdir;
-                                }
-                                if (timeoutRaw) {
-                                    const timeoutNum = Number(timeoutRaw);
-                                    if (Number.isFinite(timeoutNum)) {
-                                        merged.timeout_ms = timeoutNum;
-                                    }
-                                }
-                                if (escalatedRaw) {
-                                    const escLower = escalatedRaw.trim().toLowerCase();
-                                    if (escLower === 'true' || escLower === 'yes' || escLower === '1') {
-                                        merged.with_escalated_permissions = true;
-                                    }
-                                    else if (escLower === 'false' || escLower === 'no' || escLower === '0') {
-                                        merged.with_escalated_permissions = false;
-                                    }
-                                }
-                                if (justificationRaw && justificationRaw.trim()) {
-                                    merged.justification = justificationRaw;
-                                }
-                                try {
-                                    fn.arguments = JSON.stringify(merged);
-                                }
-                                catch {
-                                    /* keep original */
-                                }
-                            }
-                            if (typeof fn.name === 'string' && fn.name === 'shell_toon') {
-                                fn.name = 'shell';
-                            }
-                        }
-                        else {
-                            // 通用 TOON → JSON 解码：除 shell / apply_patch 以外的工具，将 key: value 对映射为普通 JSON 字段。
-                            const merged = {};
-                            for (const [key, value] of Object.entries(kv)) {
-                                merged[key] = coerceToonValue(value);
-                            }
-                            try {
-                                fn.arguments = JSON.stringify(merged);
-                            }
-                            catch {
-                                // keep original on stringify failure
-                            }
-                        }
-                    }
-                    catch { /* one tool_call decode failure → ignore */ }
-                }
-            }
-            out.choices = choices;
-            return warnings.length ? { ok: true, data: out, warnings } : { ok: true, data: out };
-        }
-        catch {
-            return { ok: true, data: input };
-        }
-    }
-}

package/dist/servertool/flow-types.d.ts

@@ -1,40 +0,0 @@
-import type { JsonObject } from '../conversion/hub/types/json.js';
-import type { ServerToolOrchestrationOptions, ServerToolOrchestrationResult } from './orchestration-types.js';
-export interface ServerToolFlowContext {
-    options: ServerToolOrchestrationOptions;
-    baseChatResponse: JsonObject;
-    capturedChatRequest?: JsonObject;
-    routeId?: string;
-    cache: Record<string, unknown>;
-}
-export interface ServerToolHopResult {
-    body?: JsonObject;
-    __sse_responses?: unknown;
-    format?: string;
-}
-export interface ServerToolReenterCallOptions {
-    requestIdSuffix: string;
-    body: JsonObject;
-    entryEndpoint?: string;
-    metadata?: JsonObject;
-}
-export interface ServerToolProviderCallOptions {
-    requestIdSuffix: string;
-    providerKey: string;
-    providerProtocol: string;
-    entryEndpoint: string;
-    payload: JsonObject;
-    modelId?: string;
-    routeHint?: string;
-}
-export interface ServerToolFlowHelpers {
-    makeRequestId: (suffix: string) => string;
-    callReenterHop: (options: ServerToolReenterCallOptions) => Promise<ServerToolHopResult | null>;
-    callProviderHop: (options: ServerToolProviderCallOptions) => Promise<ServerToolHopResult | null>;
-    getRouteHintForFollowup: (exclude?: string) => string | undefined;
-}
-export interface ServerToolFlow {
-    id: string;
-    shouldRun: (context: ServerToolFlowContext) => Promise<boolean> | boolean;
-    run: (context: ServerToolFlowContext, helpers: ServerToolFlowHelpers) => Promise<ServerToolOrchestrationResult | null>;
-}

package/dist/servertool/flow-types.js

@@ -1 +0,0 @@
-export {};