@jsonstudio/llms 0.6.2125 → 0.6.2172

package/dist/router/virtual-router/message-utils.js

@@ -1,3 +1,4 @@
+import { isIP } from 'node:net';
 export function getLatestUserMessage(messages) {
     for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
         if (messages[idx]?.role === 'user') {
@@ -56,55 +57,179 @@ export function detectExtendedThinkingKeyword(text) {
     const keywords = ['仔细分析', '思考', '超级思考', '深度思考', 'careful analysis', 'deep thinking', 'deliberate'];
     return keywords.some((keyword) => text.includes(keyword));
 }
-export function detectImageAttachment(message) {
-    if (!message)
+const LOCAL_URL_SCHEMES = ['data:', 'file:', 'blob:'];
+function extractMediaUrlCandidate(record) {
+    if (typeof record.image_url === 'string') {
+        return record.image_url ?? '';
+    }
+    if (typeof record.video_url === 'string') {
+        return record.video_url ?? '';
+    }
+    if (record.image_url &&
+        typeof record.image_url?.url === 'string') {
+        return record.image_url?.url ?? '';
+    }
+    if (record.video_url &&
+        typeof record.video_url?.url === 'string') {
+        return record.video_url?.url ?? '';
+    }
+    if (typeof record.url === 'string') {
+        return record.url ?? '';
+    }
+    if (typeof record.uri === 'string') {
+        return record.uri ?? '';
+    }
+    if (typeof record.data === 'string') {
+        return record.data ?? '';
+    }
+    return '';
+}
+function resolveMediaKind(typeValue, record) {
+    if (typeValue.includes('video')) {
+        return 'video';
+    }
+    if (typeValue.includes('image')) {
+        return 'image';
+    }
+    if (Object.prototype.hasOwnProperty.call(record, 'video_url')) {
+        return 'video';
+    }
+    if (Object.prototype.hasOwnProperty.call(record, 'image_url')) {
+        return 'image';
+    }
+    return null;
+}
+function isPrivateHost(host) {
+    const normalized = host.trim().toLowerCase();
+    if (!normalized) {
+        return true;
+    }
+    if (normalized === 'localhost' || normalized.endsWith('.local')) {
+        return true;
+    }
+    const ipType = isIP(normalized);
+    if (ipType === 4) {
+        const octets = normalized.split('.').map((part) => Number.parseInt(part, 10));
+        if (octets.length !== 4 || octets.some((value) => !Number.isFinite(value))) {
+            return true;
+        }
+        if (octets[0] === 10)
+            return true;
+        if (octets[0] === 127)
+            return true;
+        if (octets[0] === 0)
+            return true;
+        if (octets[0] === 169 && octets[1] === 254)
+            return true;
+        if (octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31)
+            return true;
+        if (octets[0] === 192 && octets[1] === 168)
+            return true;
         return false;
-    // 仅基于标准 Chat 语义判断是否携带视觉媒体（图片/视频）：
-    // - content 为数组时查找 { type: 'image' | 'image_url' | 'input_image' | 'video' | 'video_url' | 'input_video', ... } 块；
-    // - 不再依赖 metadata.attachments，也不再用纯文本关键字或剪贴板标记作为信号。
-    if (Array.isArray(message.content)) {
-        for (const part of message.content) {
-            if (!part || typeof part !== 'object') {
-                continue;
-            }
-            const record = part;
-            const typeValue = typeof record.type === 'string' ? record.type.toLowerCase() : '';
-            // For chat/standardized content, media may appear as:
-            // - { type: "image_url", image_url: { url } }
-            // - { type: "image", uri: "...", data: "...", url: "..." }
-            // - { type: "input_image", image_url: "data:..." }
-            // - { type: "video_url", video_url: { url } }
-            // - { type: "video", uri: "...", data: "...", url: "..." }
-            // - { type: "input_video", video_url: "data:..." }
-            // Treat any non-empty URL/URI/data on a media-* block as a signal.
-            let imageCandidate = '';
-            if (typeof record.image_url === 'string') {
-                imageCandidate = record.image_url ?? '';
-            }
-            else if (typeof record.video_url === 'string') {
-                imageCandidate = record.video_url ?? '';
-            }
-            else if (record.image_url &&
-                typeof record.image_url?.url === 'string') {
-                imageCandidate = record.image_url?.url ?? '';
-            }
-            else if (record.video_url &&
-                typeof record.video_url?.url === 'string') {
-                imageCandidate = record.video_url?.url ?? '';
-            }
-            else if (typeof record.url === 'string') {
-                imageCandidate = record.url ?? '';
-            }
-            else if (typeof record.uri === 'string') {
-                imageCandidate = record.uri ?? '';
+    }
+    if (ipType === 6) {
+        if (normalized === '::1')
+            return true;
+        if (normalized.startsWith('fc') || normalized.startsWith('fd'))
+            return true;
+        if (normalized.startsWith('fe80:'))
+            return true;
+        return false;
+    }
+    return false;
+}
+function isRemotePublicHttpUrl(raw) {
+    const value = raw.trim();
+    if (!value) {
+        return false;
+    }
+    const lowered = value.toLowerCase();
+    if (LOCAL_URL_SCHEMES.some((prefix) => lowered.startsWith(prefix))) {
+        return false;
+    }
+    let parsed;
+    try {
+        parsed = new URL(value);
+    }
+    catch {
+        return false;
+    }
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+        return false;
+    }
+    return !isPrivateHost(parsed.hostname);
+}
+export function analyzeMediaAttachments(message) {
+    const result = {
+        hasAnyMedia: false,
+        hasImage: false,
+        hasVideo: false,
+        hasRemoteVideo: false,
+        hasLocalVideo: false
+    };
+    if (!message) {
+        return result;
+    }
+    if (typeof message.content === 'string' && message.content.trim()) {
+        const raw = message.content;
+        const hasImageBlock = /"type"\s*:\s*"(?:input_)?image(?:_url)?"/iu.test(raw);
+        const hasVideoBlock = /"type"\s*:\s*"(?:input_)?video(?:_url)?"/iu.test(raw);
+        const hasDataVideo = /data:video\//iu.test(raw);
+        const hasRemoteVideo = /https?:\/\/[^\s"'\\]+/iu.test(raw);
+        if (hasImageBlock || hasVideoBlock) {
+            result.hasAnyMedia = true;
+        }
+        if (hasImageBlock) {
+            result.hasImage = true;
+        }
+        if (hasVideoBlock) {
+            result.hasVideo = true;
+            if (hasDataVideo) {
+                result.hasLocalVideo = true;
             }
-            else if (typeof record.data === 'string') {
-                imageCandidate = record.data ?? '';
+            if (hasRemoteVideo) {
+                result.hasRemoteVideo = true;
             }
-            if ((typeValue.includes('image') || typeValue.includes('video')) && imageCandidate.trim().length > 0) {
-                return true;
+            if (!hasDataVideo && !hasRemoteVideo) {
+                result.hasLocalVideo = true;
             }
         }
+        if (result.hasAnyMedia) {
+            return result;
+        }
     }
-    return false;
+    if (!Array.isArray(message.content)) {
+        return result;
+    }
+    for (const part of message.content) {
+        if (!part || typeof part !== 'object') {
+            continue;
+        }
+        const record = part;
+        const typeValue = typeof record.type === 'string' ? record.type.toLowerCase() : '';
+        const mediaKind = resolveMediaKind(typeValue, record);
+        if (!mediaKind) {
+            continue;
+        }
+        const mediaUrl = extractMediaUrlCandidate(record).trim();
+        if (!mediaUrl) {
+            continue;
+        }
+        result.hasAnyMedia = true;
+        if (mediaKind === 'image') {
+            result.hasImage = true;
+            continue;
+        }
+        result.hasVideo = true;
+        if (isRemotePublicHttpUrl(mediaUrl)) {
+            result.hasRemoteVideo = true;
+        }
+        else {
+            result.hasLocalVideo = true;
+        }
+    }
+    return result;
+}
+export function detectImageAttachment(message) {
+    return analyzeMediaAttachments(message).hasAnyMedia;
 }

package/dist/router/virtual-router/token-counter.js

@@ -64,11 +64,54 @@ function countMessageTokens(message, encoder) {
     }
     return total;
 }
+function detectMediaKind(record) {
+    const typeValue = typeof record.type === 'string' ? record.type.trim().toLowerCase() : '';
+    if (typeValue.includes('video')) {
+        return 'video';
+    }
+    if (typeValue.includes('image')) {
+        return 'image';
+    }
+    if (Object.prototype.hasOwnProperty.call(record, 'video_url')) {
+        return 'video';
+    }
+    if (Object.prototype.hasOwnProperty.call(record, 'image_url')) {
+        return 'image';
+    }
+    const dataField = typeof record.data === 'string' ? record.data.trim().toLowerCase() : '';
+    if (dataField.startsWith('data:video/')) {
+        return 'video';
+    }
+    if (dataField.startsWith('data:image/')) {
+        return 'image';
+    }
+    return null;
+}
+function parseStructuredContentString(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed) {
+        return undefined;
+    }
+    const likelyJson = (trimmed.startsWith('{') && trimmed.endsWith('}')) || (trimmed.startsWith('[') && trimmed.endsWith(']'));
+    if (!likelyJson) {
+        return undefined;
+    }
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return undefined;
+    }
+}
 function encodeContent(content, encoder) {
     if (content === null || content === undefined) {
         return 0;
     }
     if (typeof content === 'string') {
+        const structured = parseStructuredContentString(content);
+        if (structured !== undefined) {
+            return encodeContent(structured, encoder);
+        }
         return encodeText(content, encoder);
     }
     if (Array.isArray(content)) {
@@ -79,17 +122,11 @@ function encodeContent(content, encoder) {
             }
             else if (part && typeof part === 'object') {
                 const record = part;
-                const typeValue = typeof record.type === 'string' ? record.type.toLowerCase() : '';
-                // Large binary/image payloads (data URIs, base64, etc.) should not
-                // dominate context estimation. For image-like blocks, only count a
-                // small textual placeholder instead of the full JSON/body.
-                if (typeValue.startsWith('image')) {
-                    const caption = typeof record.caption === 'string' && record.caption.trim().length
-                        ? record.caption
-                        : '[image]';
-                    total += encodeText(caption, encoder);
+                // Ignore image/video payload blocks in token estimation.
+                if (detectMediaKind(record)) {
+                    continue;
                 }
-                else if (typeof record.text === 'string') {
+                if (typeof record.text === 'string') {
                     total += encodeText(record.text, encoder);
                 }
                 else {
@@ -100,6 +137,10 @@ function encodeContent(content, encoder) {
         return total;
     }
     if (typeof content === 'object') {
+        const record = content;
+        if (detectMediaKind(record)) {
+            return 0;
+        }
         return encodeText(JSON.stringify(content), encoder);
     }
     return encodeText(String(content), encoder);

package/dist/router/virtual-router/types.d.ts

@@ -386,6 +386,9 @@ export interface RoutingFeatures {
     hasToolCallResponses: boolean;
     hasVisionTool: boolean;
     hasImageAttachment: boolean;
+    hasVideoAttachment?: boolean;
+    hasRemoteVideoAttachment?: boolean;
+    hasLocalVideoAttachment?: boolean;
     hasWebTool: boolean;
     hasWebSearchToolDeclared?: boolean;
     hasCodingTool: boolean;

package/dist/servertool/clock/session-scope.d.ts

@@ -0,0 +1,3 @@
+export declare function buildClockSessionScopeFromDaemonId(daemonId: string): string;
+export declare function extractClockDaemonIdFromSessionScope(sessionScope: string): string | null;
+export declare function resolveClockSessionScope(primary?: Record<string, unknown> | null, fallback?: Record<string, unknown> | null): string | null;

package/dist/servertool/clock/session-scope.js

@@ -0,0 +1,52 @@
+const CLOCK_DAEMON_SESSION_PREFIX = 'clockd.';
+function readToken(value) {
+    return typeof value === 'string' && value.trim().length ? value.trim() : '';
+}
+function readRecordToken(record, keys) {
+    if (!record) {
+        return '';
+    }
+    for (const key of keys) {
+        const value = readToken(record[key]);
+        if (value) {
+            return value;
+        }
+    }
+    return '';
+}
+export function buildClockSessionScopeFromDaemonId(daemonId) {
+    const normalized = readToken(daemonId);
+    if (!normalized) {
+        return '';
+    }
+    return `${CLOCK_DAEMON_SESSION_PREFIX}${normalized}`;
+}
+export function extractClockDaemonIdFromSessionScope(sessionScope) {
+    const normalized = readToken(sessionScope);
+    if (!normalized.startsWith(CLOCK_DAEMON_SESSION_PREFIX)) {
+        return null;
+    }
+    const daemonId = normalized.slice(CLOCK_DAEMON_SESSION_PREFIX.length).trim();
+    return daemonId || null;
+}
+export function resolveClockSessionScope(primary, fallback) {
+    const daemonId = readRecordToken(primary, ['clockDaemonId', 'clockClientDaemonId', 'clock_daemon_id', 'clock_client_daemon_id']) ||
+        readRecordToken(fallback, ['clockDaemonId', 'clockClientDaemonId', 'clock_daemon_id', 'clock_client_daemon_id']);
+    if (daemonId) {
+        const daemonScope = buildClockSessionScopeFromDaemonId(daemonId);
+        if (daemonScope) {
+            return daemonScope;
+        }
+    }
+    const sessionId = readRecordToken(primary, ['sessionId', 'session_id']) ||
+        readRecordToken(fallback, ['sessionId', 'session_id']);
+    if (sessionId) {
+        return sessionId;
+    }
+    const conversationId = readRecordToken(primary, ['conversationId', 'conversation_id']) ||
+        readRecordToken(fallback, ['conversationId', 'conversation_id']);
+    if (conversationId) {
+        return conversationId;
+    }
+    return null;
+}

package/dist/servertool/engine.js

@@ -7,6 +7,7 @@ import { deserializeRoutingInstructionState, serializeRoutingInstructionState }
 import { applyHubFollowupPolicyShadow } from './followup-shadow.js';
 import { buildServerToolFollowupChatPayloadFromInjection, extractCapturedChatSeed } from './handlers/followup-request-builder.js';
 import { findNextUndeliveredDueAtMs, listClockTasks, resolveClockConfig } from './clock/task-store.js';
+import { resolveClockSessionScope } from './clock/session-scope.js';
 import { savePendingServerToolInjection } from './pending-session.js';
 import { appendServerToolProgressFileEvent } from './log/progress-file.js';
 import { attachStopGatewayContext, inspectStopGatewaySignal } from './stop-gateway-context.js';
@@ -270,7 +271,7 @@ async function shouldDisableServerToolTimeoutForClockHold(args) {
     }
     const record = args.adapterContext;
     const rt = readRuntimeMetadata(record);
-    const sessionId = typeof record.sessionId === 'string' ? record.sessionId.trim() : '';
+    const sessionId = resolveClockSessionScope(record, rt);
     if (!sessionId) {
         return false;
     }
@@ -985,19 +986,78 @@ function resolveStickyKeyFromAdapterContext(adapterContext) {
     if (!adapterContext || typeof adapterContext !== 'object') {
         return undefined;
     }
-    const sessionId = typeof adapterContext.sessionId === 'string'
-        ? adapterContext.sessionId.trim()
-        : '';
-    const conversationId = typeof adapterContext.conversationId === 'string'
-        ? adapterContext.conversationId.trim()
-        : '';
+    const record = adapterContext;
+    const runtime = readRuntimeMetadata(record);
+    const providerProtocol = readTextFromAny(record.providerProtocol) ||
+        readTextFromAny(runtime?.providerProtocol) ||
+        readTextFromAny(record.provider_protocol) ||
+        readTextFromAny(runtime?.provider_protocol);
+    if (providerProtocol.trim().toLowerCase() === 'openai-responses') {
+        const previousRequestId = resolveResponsesResumePreviousRequestId(record, runtime);
+        if (previousRequestId) {
+            return previousRequestId;
+        }
+        const requestId = resolveStickyRequestId(record, runtime);
+        if (requestId) {
+            return requestId;
+        }
+    }
+    const sessionId = readTextFromAny(record.sessionId) ||
+        readTextFromAny(record.session_id) ||
+        readTextFromAny(runtime?.sessionId) ||
+        readTextFromAny(runtime?.session_id);
+    const conversationId = readTextFromAny(record.conversationId) ||
+        readTextFromAny(record.conversation_id) ||
+        readTextFromAny(runtime?.conversationId) ||
+        readTextFromAny(runtime?.conversation_id);
     if (sessionId) {
         return `session:${sessionId}`;
     }
     if (conversationId) {
         return `conversation:${conversationId}`;
     }
-    return undefined;
+    const requestId = resolveStickyRequestId(record, runtime);
+    return requestId || undefined;
+}
+function resolveStickyRequestId(context, runtime) {
+    return (readTextFromAny(context.requestId) ||
+        readTextFromAny(context.request_id) ||
+        readTextFromAny(runtime?.requestId) ||
+        readTextFromAny(runtime?.request_id));
+}
+function resolveResponsesResumePreviousRequestId(context, runtime) {
+    const contextMetadata = asRecord(context.metadata);
+    const contextMetadataContext = asRecord(contextMetadata?.context);
+    const originalRequest = asRecord(context.originalRequest);
+    const originalMetadata = asRecord(originalRequest?.metadata);
+    const candidates = [
+        context.responsesResume,
+        contextMetadata?.responsesResume,
+        contextMetadataContext?.responsesResume,
+        originalRequest?.responsesResume,
+        originalMetadata?.responsesResume,
+        runtime?.responsesResume
+    ];
+    for (const candidate of candidates) {
+        const resume = asRecord(candidate);
+        if (!resume) {
+            continue;
+        }
+        const previousRequestId = readTextFromAny(resume.previousRequestId) || readTextFromAny(resume.previous_request_id);
+        if (previousRequestId) {
+            return previousRequestId;
+        }
+    }
+    return '';
+}
+function asRecord(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return null;
+    }
+    return value;
+}
+function readTextFromAny(value) {
+    return typeof value === 'string' && value.trim().length ? value.trim() : '';
 }
 function cloneRoutingInstructionState(state) {
     if (!state) {

package/dist/servertool/handlers/clock-auto.js

@@ -4,6 +4,7 @@ import { readRuntimeMetadata } from '../../conversion/shared/runtime-metadata.js
 import { findNextUndeliveredDueAtMs, listClockTasks, reserveDueTasksForRequest, resolveClockConfig, startClockDaemonIfNeeded } from '../clock/task-store.js';
 import { nowMs } from '../clock/state.js';
 import { logClock } from '../clock/log.js';
+import { resolveClockSessionScope } from '../clock/session-scope.js';
 import { isStopEligibleForServerTool } from '../stop-gateway-context.js';
 const FLOW_ID = 'clock_hold_flow';
 function resolveClientConnectionState(value) {
@@ -40,13 +41,6 @@ function clientWantsStreaming(adapterContext) {
     }
     return false;
 }
-function resolveSessionId(adapterContext) {
-    if (!adapterContext || typeof adapterContext !== 'object' || Array.isArray(adapterContext)) {
-        return null;
-    }
-    const sessionId = typeof adapterContext.sessionId === 'string' ? String(adapterContext.sessionId).trim() : '';
-    return sessionId || null;
-}
 function computeHoldSleepMs(remainingMs) {
     if (remainingMs <= 0)
         return 0;
@@ -81,7 +75,7 @@ const handler = async (ctx) => {
         return null;
     }
     const rt = readRuntimeMetadata(ctx.adapterContext);
-    const sessionId = resolveSessionId(ctx.adapterContext);
+    const sessionId = resolveClockSessionScope(ctx.adapterContext, rt);
     if (!sessionId) {
         return null;
     }

package/dist/servertool/handlers/clock.js

@@ -6,6 +6,7 @@ import { cancelClockTask, clearClockTasks, listClockTasks, resolveClockConfig, p
 import { getClockTimeSnapshot } from '../clock/ntp.js';
 import { nowMs } from '../clock/state.js';
 import { logClock } from '../clock/log.js';
+import { resolveClockSessionScope } from '../clock/session-scope.js';
 const FLOW_ID = 'clock_flow';
 let fallbackClockToolCallSeq = 0;
 function ensureClockToolCall(toolCall, requestId) {
@@ -86,13 +87,6 @@ function parseToolArguments(toolCall) {
         return {};
     }
 }
-function resolveSessionId(adapterContext) {
-    if (!adapterContext || typeof adapterContext !== 'object' || Array.isArray(adapterContext)) {
-        return null;
-    }
-    const sessionId = typeof adapterContext.sessionId === 'string' ? String(adapterContext.sessionId).trim() : '';
-    return sessionId || null;
-}
 function injectClockToolOutput(base, toolCall, content) {
     const cloned = cloneJson(base);
     const existingOutputs = Array.isArray(cloned.tool_outputs)
@@ -277,7 +271,7 @@ const handler = async (ctx) => {
         return null;
     }
     const rt = readRuntimeMetadata(ctx.adapterContext);
-    const sessionId = resolveSessionId(ctx.adapterContext);
+    const sessionId = resolveClockSessionScope(ctx.adapterContext, rt);
     const rawConfig = rt?.clock ?? ctx.adapterContext.clock;
     // Default-enable clock when config is absent, but keep "explicitly disabled" honored.
     const clockConfig = resolveClockConfig(rawConfig);
@@ -391,7 +385,7 @@ const handler = async (ctx) => {
         return respond({
             ok: false,
             action,
-            message: 'clock requires sessionId (x-session-id header or metadata.sessionId).'
+            message: 'clock requires session scope (sessionId/conversationId or clockDaemonId).'
         });
     }
     if (action === 'list') {

package/dist/servertool/handlers/stop-message-auto/blocked-report.d.ts

@@ -0,0 +1,16 @@
+export interface StopMessageBlockedReport {
+    summary: string;
+    blocker: string;
+    impact?: string;
+    nextAction?: string;
+    evidence: string[];
+}
+export interface StopMessageBlockedIssueContext {
+    requestId?: string;
+    sessionId?: string;
+}
+export declare function extractBlockedReportFromMessages(messages: unknown[]): StopMessageBlockedReport | null;
+export declare function extractBlockedReportFromMessagesForTests(messages: unknown[]): StopMessageBlockedReport | null;
+export declare function createBdIssueFromBlockedReport(blockedReport: StopMessageBlockedReport, context?: StopMessageBlockedIssueContext, cwdOverride?: string): string | null;
+export declare function extractCapturedMessageText(message: unknown): string;
+export declare function extractTextFromMessageContent(content: unknown): string;