@jsonstudio/llms 0.6.141 → 0.6.147

package/dist/conversion/hub/response/response-runtime.js

@@ -358,6 +358,18 @@ export function buildAnthropicResponseFromChat(chatResponse, options) {
             default: return 'end_turn';
         }
     })();
+    const promptTokens = usage && typeof usage === 'object'
+        ? Number(usage.prompt_tokens ?? usage.input_tokens ?? 0)
+        : 0;
+    const completionTokens = usage && typeof usage === 'object'
+        ? Number(usage.completion_tokens ?? usage.output_tokens ?? 0)
+        : 0;
+    const usagePayload = (promptTokens || completionTokens)
+        ? {
+            input_tokens: promptTokens,
+            output_tokens: completionTokens
+        }
+        : undefined;
     const raw = {
         id: typeof chatResponse.id === 'string' ? chatResponse.id : `resp_${Date.now()}`,
         type: 'message',
@@ -366,10 +378,7 @@ export function buildAnthropicResponseFromChat(chatResponse, options) {
         model: typeof chatResponse.model === 'string' ? chatResponse.model : 'unknown',
         stop_reason: stopReasonMapped,
         usage: usage && typeof usage === 'object'
-            ? {
-                input_tokens: usage.prompt_tokens ?? 0,
-                output_tokens: usage.completion_tokens ?? 0
-            }
+            ? usagePayload
             : undefined
     };
     const sanitized = sanitizeAnthropicMessage(raw);

package/dist/conversion/shared/bridge-actions.js

@@ -540,7 +540,7 @@ const captureToolResultsAction = (ctx) => {
             name: typeof entry?.name === 'string' ? entry.name : undefined
         }));
     }
-    if (ctx.stage === 'request_outbound' &&
+    if ((ctx.stage === 'request_outbound' || ctx.stage === 'response_outbound') &&
         Array.isArray(ctx.state.capturedToolResults) &&
         ctx.state.capturedToolResults.length) {
         const metadata = ensureMetadataRecord(ctx.state);

package/dist/conversion/shared/bridge-policies.js

@@ -232,6 +232,7 @@ const ANTHROPIC_POLICY = {
         ],
         outbound: [
             reasoningAction('anthropic_reasoning'),
+            { name: 'tools.capture-results' },
             toolCallNormalizationAction('anthropic_tool_call'),
             { name: 'metadata.extra-fields', options: { allowedKeys: ANTHROPIC_ALLOWED_FIELDS } }
         ]

package/dist/router/virtual-router/classifier.js

@@ -36,22 +36,21 @@ export class RoutingClassifier {
             : undefined;
         const websearchKeywordHit = containsKeywords(features.userTextSample, WEBSEARCH_HINT_KEYWORDS);
         const codingContinuation = hasWriteToolCall || lastToolCategory === 'write';
-        const thinkingContinuation = hasReadToolCall || lastToolCategory === 'read';
+        const readingContinuation = hasReadToolCall || lastToolCategory === 'read';
         const userInputDetected = typeof features.userTextSample === 'string'
             ? features.userTextSample.trim().length > 0
             : false;
-        const searchContinuation = features.assistantCalledWebSearchTool === true;
+        const searchContinuation = features.assistantCalledWebSearchTool === true || hasSearchToolCall;
         const toolsContinuation = hasOtherToolCall ||
             searchContinuation ||
-            (hasToolCall && !hasSearchToolCall && !hasWriteToolCall && !hasReadToolCall);
+            (hasToolCall && !hasWriteToolCall && !readingContinuation);
         const toolContinuationReason = hasOtherToolCall
             ? formatToolContinuationReason(features.lastAssistantToolName, features.lastAssistantToolDetail)
-            : 'tools:tool-call-detected';
-        const thinkingReason = thinkingContinuation
-            ? 'thinking:last-tool-read'
-            : userInputDetected
-                ? 'thinking:user-input'
-                : 'thinking';
+            : searchContinuation
+                ? 'tools:last-tool-search'
+                : 'tools:tool-call-detected';
+        const thinkingContinuation = readingContinuation || (Boolean(features.hasThinkingKeyword) && !toolsContinuation && !codingContinuation);
+        const thinkingReason = readingContinuation ? 'thinking:last-tool-read' : 'thinking:keywords';
         const evaluationMap = {
             vision: {
                 triggered: features.hasVisionTool && features.hasImageAttachment,
@@ -70,7 +69,7 @@ export class RoutingClassifier {
                 reason: 'coding:last-tool-write'
             },
             thinking: {
-                triggered: thinkingContinuation || userInputDetected,
+                triggered: thinkingContinuation,
                 reason: thinkingReason
             },
             tools: {

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

@@ -34,6 +34,7 @@ export declare class VirtualRouterEngine {
     private recordSelectionSnapshot;
     private buildStickyPlan;
     private storeStickyPlan;
+    private dropStickyForRequest;
     private resolveStickyDescriptor;
     private maybeForceStickyFromHistory;
     private shouldForceApplyPatchSticky;

package/dist/router/virtual-router/engine.js

@@ -108,6 +108,9 @@ export class VirtualRouterEngine {
         }
     }
     handleProviderError(event) {
+        if (event?.runtime?.requestId) {
+            this.dropStickyForRequest(event.runtime.requestId);
+        }
         const derived = this.mapProviderError(event);
         if (!derived) {
             return;
@@ -225,6 +228,13 @@ export class VirtualRouterEngine {
             this.stickyPlans.delete(requestId);
         }
     }
+    dropStickyForRequest(requestId) {
+        if (!requestId) {
+            return;
+        }
+        this.stickyPlans.delete(requestId);
+        this.selectionHistory.delete(requestId);
+    }
     resolveStickyDescriptor(routeName, features) {
         if (this.shouldForceApplyPatchSticky(features)) {
             return { strategy: 'target', rounds: 1, reason: 'apply_patch' };

package/dist/router/virtual-router/features.js

@@ -68,25 +68,11 @@ const SHELL_WRITE_PATTERNS = [
     'chown',
     'chgrp',
     'tar ',
-    'git add',
-    'git commit',
     'git apply',
     'git am',
-    'git rebase',
     'git checkout',
     'git merge',
-    'patch <<',
-    'npm install',
-    'pnpm install',
-    'yarn add',
-    'yarn install',
-    'pip install',
-    'pip3 install',
-    'brew install',
-    'cargo add',
-    'cargo install',
-    'go install',
-    'make install'
+    'patch <<'
 ];
 const SHELL_SEARCH_PATTERNS = [
     'rg ',
@@ -105,18 +91,13 @@ const SHELL_SEARCH_PATTERNS = [
     'codesearch'
 ];
 const SHELL_READ_PATTERNS = [
-    'ls',
-    'dir ',
-    'pwd',
     'cat ',
     'type ',
     'head ',
     'tail ',
+    'stat ',
     'stat',
-    'tree',
     'wc ',
-    'du ',
-    'printf "',
     'python - <<',
     'python -c',
     'node - <<',
@@ -522,26 +503,31 @@ function classifyShellCommand(command) {
     if (SHELL_HEREDOC_PATTERN.test(command)) {
         return 'write';
     }
-    const segments = splitCommandSegments(command).map(stripShellWrapper);
-    if (segments.some((segment) => matchesAnyPattern(segment, SHELL_WRITE_PATTERNS))) {
+    const segments = splitCommandSegments(command)
+        .map(stripShellWrapper)
+        .filter(Boolean);
+    const hasWrite = segments.some((segment) => matchesAnyPattern(segment, SHELL_WRITE_PATTERNS));
+    const hasRead = segments.some((segment) => matchesAnyPattern(segment, SHELL_READ_PATTERNS));
+    if (hasWrite) {
         return 'write';
     }
-    if (segments.some((segment) => matchesAnyPattern(segment, SHELL_SEARCH_PATTERNS))) {
-        return 'search';
-    }
-    if (segments.some((segment) => matchesAnyPattern(segment, SHELL_READ_PATTERNS))) {
+    if (hasRead) {
         return 'read';
     }
+    const hasSearch = segments.some((segment) => matchesAnyPattern(segment, SHELL_SEARCH_PATTERNS));
+    if (hasSearch) {
+        return 'search';
+    }
     const stripped = stripShellWrapper(command);
     if (matchesAnyPattern(stripped, SHELL_WRITE_PATTERNS)) {
         return 'write';
     }
-    if (matchesAnyPattern(stripped, SHELL_SEARCH_PATTERNS)) {
-        return 'search';
-    }
     if (matchesAnyPattern(stripped, SHELL_READ_PATTERNS)) {
         return 'read';
     }
+    if (matchesAnyPattern(stripped, SHELL_SEARCH_PATTERNS)) {
+        return 'search';
+    }
     return 'other';
 }
 function splitCommandSegments(command) {

package/package.json

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