@lowire/loop 0.0.23 → 0.0.24

package/lib/cache.d.ts

@@ -20,4 +20,5 @@ export type ReplayCaches = {
 };
 export declare function cachedComplete(provider: types.Provider, conversation: types.Conversation, caches: ReplayCaches | undefined, options: types.CompletionOptions & {
     secrets?: Record<string, string>;
+    cacheMode?: 'strict' | 'lax';
 }): ReturnType<types.Provider['complete']>;

package/lib/cache.js

@@ -28,8 +28,13 @@ async function cachedComplete(provider, conversation, caches, options) {
 async function cachedCompleteNoSecrets(provider, conversation, caches, options) {
     if (!caches)
         return await provider.complete(conversation, options);
-    const { maxTokens, reasoning, temperature } = options;
-    const key = calculateSha1(JSON.stringify({ conversation, maxTokens, reasoning, temperature }));
+    const keyObject = {
+        conversation: options.cacheMode === 'lax' ? { ...conversation, tools: [] } : conversation,
+        maxTokens: options.maxTokens,
+        reasoning: options.reasoning,
+        temperature: options.temperature,
+    };
+    const key = calculateSha1(JSON.stringify(keyObject));
     if (!process.env.LOWIRE_NO_CACHE && caches.input[key]) {
         caches.output[key] = caches.input[key];
         return caches.input[key] ?? caches.output[key];

package/lib/loop.d.ts

@@ -48,6 +48,7 @@ export type LoopOptions = types.CompletionOptions & LoopEvents & {
     maxToolCalls?: number;
     maxToolCallRetries?: number;
     cache?: types.ReplayCache;
+    cacheMode?: 'strict' | 'lax';
     secrets?: Record<string, string>;
     summarize?: boolean;
 };

package/lib/loop.js

@@ -68,10 +68,10 @@ class Loop {
                 maxTokens: budget.tokens !== undefined ? budget.tokens - tokenEstimate : undefined,
                 signal: abortController?.signal,
             });
+            if (assistantMessage.stopReason.code === 'error')
+                return { status: 'error', error: assistantMessage.stopReason.message, usage: totalUsage, turns };
             if (assistantMessage.stopReason.code === 'max_tokens')
                 return { status: 'error', error: `Max tokens exhausted`, usage: totalUsage, turns };
-            if (assistantMessage.stopReason.code === 'other')
-                return { status: 'error', error: assistantMessage.stopReason.message, usage: totalUsage, turns };
             const intent = assistantMessage.content.filter(part => part.type === 'text').map(part => part.text).join('\n');
             totalUsage.input += usage.input;
             totalUsage.output += usage.output;

package/lib/providers/anthropic.js

@@ -17,11 +17,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Anthropic = void 0;
 const fetchWithTimeout_1 = require("../fetchWithTimeout");
+const types_1 = require("../types");
 class Anthropic {
     name = 'anthropic';
     async complete(conversation, options) {
         const maxTokens = Math.min(options.maxTokens ?? 32_768, 32_768);
-        const response = await create({
+        const { response, error } = await create({
             model: options.model,
             max_tokens: maxTokens,
             temperature: options.temperature,
@@ -33,6 +34,8 @@ class Anthropic {
                 budget_tokens: options.maxTokens ? Math.round(maxTokens / 10) : 1024,
             } : undefined,
         }, options);
+        if (error || !response)
+            return { result: (0, types_1.assistantMessageFromError)(error ?? 'No response from Anthropic API'), usage: (0, types_1.emptyUsage)() };
         const result = toAssistantMessage(response);
         const usage = {
             input: response.usage.input_tokens,
@@ -57,13 +60,14 @@ async function create(createParams, options) {
         signal: options.signal,
         timeout: options.apiTimeout
     });
+    const responseText = await response.text();
+    const responseBody = JSON.parse(responseText);
+    options.debug?.('lowire:anthropic')('Response:', responseText);
     if (!response.ok) {
         options.debug?.('lowire:anthropic')('Response:', response.status);
-        throw new Error(`API error: ${response.status} ${response.statusText} ${await response.text()}`);
+        return { error: `API error: ${response.status} ${response.statusText} ${responseText}` };
     }
-    const responseBody = await response.json();
-    options.debug?.('lowire:anthropic')('Response:', JSON.stringify(responseBody, null, 2));
-    return responseBody;
+    return { response: responseBody };
 }
 function toContentPart(block) {
     if (block.type === 'text') {
@@ -110,16 +114,8 @@ function toAnthropicResultParam(part) {
 }
 function toAssistantMessage(message) {
     const stopReason = { code: 'ok' };
-    if (message.stop_reason === 'max_tokens') {
+    if (message.stop_reason === 'max_tokens')
         stopReason.code = 'max_tokens';
-    }
-    else if (message.stop_reason === 'tool_use') {
-        stopReason.code = 'ok';
-    }
-    else {
-        stopReason.code = 'other';
-        stopReason.message = `Unexpected stop reason: ${message.stop_reason}`;
-    }
     return {
         role: 'assistant',
         content: message.content.map(toContentPart).filter(Boolean),

package/lib/providers/google.js

@@ -17,11 +17,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Google = void 0;
 const fetchWithTimeout_1 = require("../fetchWithTimeout");
+const types_1 = require("../types");
 class Google {
     name = 'google';
     async complete(conversation, options) {
         const contents = conversation.messages.map(toGeminiContent).flat();
-        const response = await create(options.model ?? 'gemini-2.5-pro', {
+        const { response, error } = await create(options.model ?? 'gemini-2.5-pro', {
             systemInstruction: {
                 role: 'system',
                 parts: [
@@ -35,9 +36,9 @@ class Google {
                 maxOutputTokens: options.maxTokens
             },
         }, options);
-        const [candidate] = response.candidates ?? [];
-        if (!candidate)
-            throw new Error('No candidates in response');
+        const [candidate] = response?.candidates ?? [];
+        if (error || !response || !candidate)
+            return { result: (0, types_1.assistantMessageFromError)(error ?? 'No response from Google API'), usage: (0, types_1.emptyUsage)() };
         const usage = {
             input: response.usageMetadata?.promptTokenCount ?? 0,
             output: response.usageMetadata?.candidatesTokenCount ?? 0,
@@ -62,11 +63,11 @@ async function create(model, createParams, options) {
     });
     if (!response.ok) {
         options.debug?.('lowire:google')('Response:', response.status);
-        throw new Error(`API error: ${response.status} ${response.statusText} ${await response.text()}`);
+        return { error: `API error: ${response.status} ${response.statusText} ${await response.text()}` };
     }
     const responseBody = await response.json();
     options.debug?.('lowire:google')('Response:', JSON.stringify(responseBody, null, 2));
-    return responseBody;
+    return { response: responseBody };
 }
 function toGeminiTool(tool) {
     return {
@@ -89,20 +90,8 @@ function stripUnsupportedSchemaFields(schema) {
 }
 function toAssistantMessage(candidate) {
     const stopReason = { code: 'ok' };
-    const finishReason = candidate.finishReason;
-    if (finishReason === 'MAX_TOKENS') {
+    if (candidate.finishReason === 'MAX_TOKENS')
         stopReason.code = 'max_tokens';
-    }
-    else if (!finishReason || finishReason === 'STOP') {
-        stopReason.code = 'ok';
-    }
-    else if (finishReason.includes('FUNCTION') || finishReason.includes('TOOL')) {
-        stopReason.code = 'ok';
-    }
-    else {
-        stopReason.code = 'other';
-        stopReason.message = `Unexpected finish reason: ${finishReason}`;
-    }
     return {
         role: 'assistant',
         content: (candidate.content.parts || []).map(toContentPart).filter(Boolean),

package/lib/providers/openai.js

@@ -17,6 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAI = void 0;
 const fetchWithTimeout_1 = require("../fetchWithTimeout");
+const types_1 = require("../types");
 class OpenAI {
     name = 'openai';
     async complete(conversation, options) {
@@ -39,20 +40,11 @@ async function complete(conversation, options) {
         reasoning: toOpenAIReasoning(options.reasoning),
     }, options);
     if (!response || error)
-        return { result: { role: 'assistant', content: [], stopReason: { code: 'other', message: error } }, usage: { input: 0, output: 0 } };
+        return { result: (0, types_1.assistantMessageFromError)(error ?? 'No response from OpenAI API'), usage: (0, types_1.emptyUsage)() };
     // Parse response output items
     const stopReason = { code: 'ok' };
-    if (response.incomplete_details?.reason === 'max_output_tokens') {
+    if (response.incomplete_details?.reason === 'max_output_tokens')
         stopReason.code = 'max_tokens';
-    }
-    else if (response.incomplete_details?.reason === 'content_filter') {
-        stopReason.code = 'other';
-        stopReason.message = 'Content filter triggered';
-    }
-    else if (response.incomplete_details?.reason) {
-        stopReason.code = 'other';
-        stopReason.message = `Unexpected incomplete reason: ${response.incomplete_details.reason}`;
-    }
     const result = { role: 'assistant', content: [], stopReason };
     const usage = {
         input: response.usage?.input_tokens ?? 0,

package/lib/providers/openaiCompatible.js

@@ -17,6 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAICompatible = void 0;
 const fetchWithTimeout_1 = require("../fetchWithTimeout");
+const types_1 = require("../types");
 class OpenAICompatible {
     name = 'openai-compatible';
     async complete(conversation, options) {
@@ -42,13 +43,8 @@ async function complete(conversation, options) {
         reasoning_effort: toCompletionsReasoning(options.reasoning),
         parallel_tool_calls: false,
     }, options);
-    if (error) {
-        if (error.type === 'invalid_request_error')
-            return { result: { role: 'assistant', content: [], stopReason: { code: 'max_tokens' } }, usage: { input: 0, output: 0 } };
-        return { result: { role: 'assistant', content: [], stopReason: { code: 'other', message: response.error.message } }, usage: { input: 0, output: 0 } };
-    }
-    if (!response || !response.choices.length)
-        return { result: { role: 'assistant', content: [], stopReason: { code: 'other', message: 'Failed to get response from OpenAI completions' } }, usage: { input: 0, output: 0 } };
+    if (error || !response)
+        return { result: (0, types_1.assistantMessageFromError)(error?.message ?? 'No response from OpenAI compatible API'), usage: (0, types_1.emptyUsage)() };
     const result = { role: 'assistant', content: [], stopReason: { code: 'ok' } };
     const finishReason = response.choices[0]?.finish_reason;
     for (const choice of response.choices) {
@@ -63,8 +59,6 @@ async function complete(conversation, options) {
     }
     if (finishReason === 'length')
         result.stopReason = { code: 'max_tokens' };
-    else if (finishReason !== 'tool_calls' && finishReason !== 'function_call' && finishReason !== 'stop')
-        result.stopReason = { code: 'other', message: `Unexpected finish reason: ${finishReason}` };
     const usage = {
         input: response.usage?.prompt_tokens ?? 0,
         output: response.usage?.completion_tokens ?? 0,

package/lib/types.d.ts

@@ -39,7 +39,7 @@ export type AssistantMessage = BaseMessage & {
     role: 'assistant';
     content: (TextContentPart | ToolCallContentPart | ThinkingContentPart)[];
     stopReason: {
-        code: 'max_tokens' | 'ok' | 'other';
+        code: 'ok' | 'max_tokens' | 'error';
         message?: string;
     };
     openaiId?: string;
@@ -120,3 +120,5 @@ export type ReplayCache = Record<string, {
     result: AssistantMessage;
     usage: Usage;
 }>;
+export declare function assistantMessageFromError(error: string): AssistantMessage;
+export declare function emptyUsage(): Usage;

package/lib/types.js

@@ -15,3 +15,18 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.assistantMessageFromError = assistantMessageFromError;
+exports.emptyUsage = emptyUsage;
+function assistantMessageFromError(error) {
+    return {
+        role: 'assistant',
+        content: [],
+        stopReason: { code: 'error', message: error },
+    };
+}
+function emptyUsage() {
+    return {
+        input: 0,
+        output: 0,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowire/loop",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "Small agentic loop",
   "repository": {
     "type": "git",