@jsonstudio/llms 0.6.3541 → 0.6.3685

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

@@ -1,4 +1,3 @@
-import { readRuntimeMetadata } from '../../../conversion/runtime-metadata.js';
 import { saveRoutingInstructionStateSync } from '../../../router/virtual-router/sticky-session-store.js';
 import { isStopEligibleForServerTool } from '../../stop-gateway-context.js';
 import { extractResponsesOutputText, hasToolLikeOutput } from './iflow-followup.js';
@@ -101,17 +100,6 @@ export function getCapturedRequest(adapterContext) {
     if (direct && typeof direct === 'object' && !Array.isArray(direct)) {
         return direct;
     }
-    const runtime = readRuntimeMetadata(contextRecord);
-    const runtimeCaptured = runtime && typeof runtime === 'object' && !Array.isArray(runtime)
-        ? runtime.capturedChatRequest
-        : undefined;
-    if (runtimeCaptured && typeof runtimeCaptured === 'object' && !Array.isArray(runtimeCaptured)) {
-        return runtimeCaptured;
-    }
-    const originalRequest = contextRecord.originalRequest;
-    if (originalRequest && typeof originalRequest === 'object' && !Array.isArray(originalRequest)) {
-        return originalRequest;
-    }
     return null;
 }
 export function resolveClientConnectionState(value) {
@@ -276,23 +264,6 @@ function readSessionScopeValue(record, runtimeMetadata, key) {
     if (fromMetadataCapture) {
         return fromMetadataCapture;
     }
-    const originalRequest = asRecord(record.originalRequest);
-    const fromOriginalMetadata = originalRequest
-        ? toNonEmptyText(asRecord(originalRequest.metadata)?.[key])
-        : '';
-    if (fromOriginalMetadata) {
-        return fromOriginalMetadata;
-    }
-    const fromOriginalCapture = originalRequest ? readHubCaptureContextValue(originalRequest, key) : '';
-    if (fromOriginalCapture) {
-        return fromOriginalCapture;
-    }
-    const fromOriginalMetadataCapture = originalRequest
-        ? readHubCaptureContextValue(asRecord(originalRequest.metadata), key)
-        : '';
-    if (fromOriginalMetadataCapture) {
-        return fromOriginalMetadataCapture;
-    }
     const runtime = asRecord(runtimeMetadata);
     const fromRuntime = runtime ? toNonEmptyText(runtime[key]) : '';
     if (fromRuntime) {

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

@@ -214,15 +214,10 @@ const handler = async (ctx) => {
         const stickyKey = strictSessionScope || resolveStickyKey(record, rt);
         let stickyState = stickyKey ? loadRoutingInstructionStateSync(stickyKey) : null;
         let snapshot = resolveStopMessageSnapshot(stickyState);
-        if (!snapshot) {
-            snapshot = resolveStopMessageSnapshot(rt?.stopMessageState);
-            if (snapshot && stickyKey) {
-                stickyState = createStopMessageState(snapshot);
-                persistStopMessageState(stickyKey, stickyState);
-            }
-        }
         const stickyMode = readStopMessageStageMode(stickyState);
-        const runtimeMode = readStopMessageStageMode(rt?.stopMessageState);
+        const runtimeStopState = rt?.stopMessageState;
+        const runtimeSnapshot = resolveStopMessageSnapshot(runtimeStopState);
+        const runtimeMode = readStopMessageStageMode(runtimeStopState);
         const explicitMode = stickyMode ?? runtimeMode;
         if (!snapshot && explicitMode === 'off') {
             debugLog('skip_explicit_mode_off', { stickyKey });
@@ -235,6 +230,13 @@ const handler = async (ctx) => {
                 used: 0
             });
         }
+        if (!snapshot && runtimeSnapshot) {
+            snapshot = runtimeSnapshot;
+            if (stickyKey) {
+                stickyState = createStopMessageState(snapshot);
+                persistStopMessageState(stickyKey, stickyState);
+            }
+        }
         if (!snapshot) {
             const implicit = STOPMESSAGE_IMPLICIT_GEMINI
                 ? resolveImplicitGeminiStopMessageSnapshot(ctx, record)
@@ -379,7 +381,7 @@ const handler = async (ctx) => {
             debugLog('skip_failed_build_followup');
             return markSkip('skip_failed_build_followup');
         }
-        const historyStateCandidate = stickyState ?? rt?.stopMessageState;
+        const historyStateCandidate = stickyState;
         const existingSeedPrompt = readStopMessageAiSeedPrompt(historyStateCandidate);
         const existingHistory = readStopMessageAiHistory(historyStateCandidate);
         const fallbackCandidateFollowupText = existingSeedPrompt || text || '继续执行';

package/dist/servertool/handlers/vision.js

@@ -1,6 +1,7 @@
 import { registerServerToolHandler } from '../registry.js';
 import { cloneJson, extractTextFromChatLike } from '../server-side-tools.js';
 import { extractCapturedChatSeed } from './followup-request-builder.js';
+import { containsImageAttachment } from '../../conversion/hub/process/chat-process-media.js';
 import { reenterServerToolBackend } from '../reenter-backend.js';
 import { readRuntimeMetadata } from '../../conversion/runtime-metadata.js';
 const FLOW_ID = 'vision_flow';
@@ -91,7 +92,9 @@ function shouldRunVisionFlow(ctx) {
     if (followupFlag) {
         return false;
     }
-    const hasImageAttachment = record.hasImageAttachment === true || record.hasImageAttachment === 'true';
+    const captured = getCapturedRequest(ctx.adapterContext);
+    const seed = captured ? extractCapturedChatSeed(captured) : null;
+    const hasImageAttachment = Boolean(seed && Array.isArray(seed.messages) && containsImageAttachment(seed.messages));
     if (!hasImageAttachment) {
         return false;
     }

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

@@ -1,7 +1,6 @@
 import type { JsonObject } from '../conversion/hub/types/json.js';
 import type { ServerSideToolEngineOptions, ServerSideToolEngineResult, ToolCall } from './types.js';
 import './handlers/iflow-model-error-retry.js';
-import './handlers/gemini-empty-reply-continue.js';
 import './handlers/antigravity-thought-signature-bootstrap.js';
 import './handlers/stop-message-auto.js';
 import './handlers/clock.js';

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

@@ -3,7 +3,6 @@ import { ProviderProtocolError } from '../conversion/provider-protocol-error.js'
 import { executeWebSearchBackendPlan } from './handlers/web-search.js';
 import { executeVisionBackendPlan } from './handlers/vision.js';
 import './handlers/iflow-model-error-retry.js';
-import './handlers/gemini-empty-reply-continue.js';
 import './handlers/antigravity-thought-signature-bootstrap.js';
 import './handlers/stop-message-auto.js';
 import './handlers/clock.js';
@@ -14,6 +13,7 @@ import './handlers/continue-execution.js';
 import './handlers/review.js';
 import { runPreCommandHooks } from './pre-command-hooks.js';
 import { readRuntimeMetadata } from '../conversion/runtime-metadata.js';
+import { loadRoutingInstructionStateSync } from '../router/virtual-router/sticky-session-store.js';
 function traceAutoHook(options, event) {
     try {
         options.onAutoHookTrace?.(event);
@@ -22,7 +22,7 @@ function traceAutoHook(options, event) {
         // best-effort trace callback
     }
 }
-const OPTIONAL_PRIMARY_HOOK_ORDER = ['empty_reply_continue', 'clock_auto', 'stop_message_auto'];
+const OPTIONAL_PRIMARY_HOOK_ORDER = ['clock_auto', 'stop_message_auto'];
 const MANDATORY_HOOK_ORDER = [];
 let fallbackToolCallIdSeq = 0;
 function ensureToolCallId(record) {
@@ -116,6 +116,59 @@ function normalizeServerToolCallName(name) {
     }
     return normalized;
 }
+function readText(value) {
+    return typeof value === 'string' && value.trim() ? value.trim() : '';
+}
+function resolveStickyKeyFromAdapterContext(record) {
+    const runtime = readRuntimeMetadata(record);
+    const metadata = record.metadata && typeof record.metadata === 'object' && !Array.isArray(record.metadata)
+        ? record.metadata
+        : undefined;
+    const explicitScope = readText(runtime?.stopMessageClientInjectSessionScope) ||
+        readText(runtime?.stopMessageClientInjectScope) ||
+        readText(record.stopMessageClientInjectSessionScope) ||
+        readText(record.stopMessageClientInjectScope);
+    if (explicitScope &&
+        (explicitScope.startsWith('tmux:') ||
+            explicitScope.startsWith('session:') ||
+            explicitScope.startsWith('conversation:'))) {
+        return explicitScope;
+    }
+    const tmuxSessionId = readText(record.clientTmuxSessionId) ||
+        readText(record.client_tmux_session_id) ||
+        readText(record.tmuxSessionId) ||
+        readText(record.tmux_session_id) ||
+        readText(runtime?.clientTmuxSessionId) ||
+        readText(runtime?.client_tmux_session_id) ||
+        readText(runtime?.tmuxSessionId) ||
+        readText(runtime?.tmux_session_id) ||
+        readText(metadata?.clientTmuxSessionId) ||
+        readText(metadata?.client_tmux_session_id) ||
+        readText(metadata?.tmuxSessionId) ||
+        readText(metadata?.tmux_session_id);
+    if (tmuxSessionId) {
+        return `tmux:${tmuxSessionId}`;
+    }
+    const sessionId = readText(record.sessionId) ||
+        readText(record.session_id) ||
+        readText(runtime?.sessionId) ||
+        readText(runtime?.session_id) ||
+        readText(metadata?.sessionId) ||
+        readText(metadata?.session_id);
+    if (sessionId) {
+        return `session:${sessionId}`;
+    }
+    const conversationId = readText(record.conversationId) ||
+        readText(record.conversation_id) ||
+        readText(runtime?.conversationId) ||
+        readText(runtime?.conversation_id) ||
+        readText(metadata?.conversationId) ||
+        readText(metadata?.conversation_id);
+    if (conversationId) {
+        return `conversation:${conversationId}`;
+    }
+    return undefined;
+}
 function extractToolCallsFromMessage(message) {
     const toolCalls = getArray(message.tool_calls);
     const out = [];
@@ -310,9 +363,18 @@ export async function runServerSideToolEngine(options) {
     let lastExecution;
     const attemptedToolCallsByMessage = [];
     const runtimeMetadata = readRuntimeMetadata(options.adapterContext);
-    const runtimePreCommandState = runtimeMetadata && typeof runtimeMetadata === 'object'
-        ? runtimeMetadata.preCommandState
-        : undefined;
+    const runtimePreCommandState = (() => {
+        const stickyKey = resolveStickyKeyFromAdapterContext(options.adapterContext);
+        if (!stickyKey) {
+            return undefined;
+        }
+        try {
+            return loadRoutingInstructionStateSync(stickyKey) ?? undefined;
+        }
+        catch {
+            return undefined;
+        }
+    })();
     const choices = getArray(base.choices);
     for (const choice of choices) {
         const choiceObj = asObject(choice);

package/dist/tools/apply-patch/execution-capturer.d.ts

@@ -10,4 +10,4 @@ export declare function captureApplyPatchExecutionFailure(content: string, conte
     toolCallId?: string;
     toolCallArgs?: string;
 }): void;
-export declare function captureApplyPatchExecutionFailuresFromProcessedRequest(processedRequest: unknown): void;
+export declare function captureApplyPatchExecutionFailuresFromProcessedRequest(processedRequest: unknown, applyPatchToolMode?: 'schema' | 'freeform'): void;

package/dist/tools/apply-patch/execution-capturer.js

@@ -120,7 +120,7 @@ export function captureApplyPatchExecutionFailure(content, context) {
         // Silently fail to avoid disrupting runtime
     }
 }
-export function captureApplyPatchExecutionFailuresFromProcessedRequest(processedRequest) {
+export function captureApplyPatchExecutionFailuresFromProcessedRequest(processedRequest, applyPatchToolMode) {
     try {
         if (!EXEC_ERRORSAMPLES_ENABLED)
             return;
@@ -133,7 +133,6 @@ export function captureApplyPatchExecutionFailuresFromProcessedRequest(processed
         const entryEndpoint = typeof metadata?.originalEndpoint === 'string' ? metadata.originalEndpoint : undefined;
         const providerKey = typeof metadata?.providerKey === 'string' ? metadata.providerKey : undefined;
         const model = typeof anyReq?.model === 'string' ? anyReq.model : undefined;
-        const applyPatchToolMode = typeof metadata?.applyPatchToolMode === 'string' ? String(metadata.applyPatchToolMode).trim().toLowerCase() : '';
         const resolvedMode = applyPatchToolMode === 'schema' ? 'schema' : 'freeform';
         const toolCallArgsById = new Map();
         for (const msg of messages) {

package/dist/tools/apply-patch/regression-capturer.js

@@ -73,8 +73,9 @@ function isContextError(error) {
 }
 function stableSampleId(sample) {
     const mode = String(sample.meta?.applyPatchToolMode || '').trim();
+    const source = String(sample.source || '').trim();
     const key = `${String(sample.errorType || 'unknown')}:${String(sample.originalArgs ?? '')}:` +
-        `${String(sample.normalizedArgs ?? '')}:${String(sample.fixerResult ?? '')}:${String(sample.validationError ?? '')}:${mode}`;
+        `${String(sample.normalizedArgs ?? '')}:${String(sample.fixerResult ?? '')}:${String(sample.validationError ?? '')}:${mode}:${source}`;
     return createHash('sha1').update(key).digest('hex').slice(0, 16);
 }
 export function captureApplyPatchRegression(sample) {

package/dist/tools/tool-registry.js

@@ -129,8 +129,7 @@ export function validateToolCall(name, argsString, options) {
                     originalArgs: typeof argsString === 'string' ? argsString : String(argsString ?? ''),
                     normalizedArgs: typeof argsString === 'string' ? argsString : String(argsString ?? ''),
                     validationError: reason,
-                    source: 'tool-registry.validateToolCall',
-                    meta: { applyPatchToolMode: 'freeform' }
+                    source: 'tool-registry.validateToolCall'
                 });
                 return { ok: false, reason };
             }

package/package.json

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