@animalabs/membrane 0.5.40 → 0.5.42

package/src/providers/bedrock.ts

@@ -20,6 +20,7 @@ import {
   serverError,
   abortError,
 } from '../types/index.js';
+import { createCombinedSignal } from './utils.js';
 
 // ============================================================================
 // Adapter Configuration
@@ -274,8 +275,8 @@ export class BedrockAdapter implements ProviderAdapter {
 
     // If already in Bedrock format, use as-is
     // Supports both direct model IDs (anthropic.claude-...) and
-    // cross-region inference profile IDs (us.anthropic.claude-..., eu.anthropic.claude-...)
-    if (modelId.startsWith('anthropic.') || /^[a-z]{2}\.anthropic\./.test(modelId)) {
+    // cross-region inference profile IDs (us.anthropic.claude-..., eu.anthropic.claude-..., apac.anthropic.claude-...)
+    if (modelId.startsWith('anthropic.') || /^[a-z]{2,4}\.anthropic\./.test(modelId)) {
       return modelId;
     }
 
@@ -306,11 +307,14 @@ export class BedrockAdapter implements ProviderAdapter {
     const fullRequest = { modelId: bedrockModelId, ...bedrockRequest };
     options?.onRequest?.(fullRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
-      const response = await this.invokeModel(bedrockModelId, bedrockRequest, options?.signal);
+      const response = await this.invokeModel(bedrockModelId, bedrockRequest, combinedSignal);
       return this.parseResponse(response, fullRequest);
     } catch (error) {
       throw this.handleError(error, fullRequest);
+    } finally {
+      cleanup?.();
     }
   }
 
@@ -324,10 +328,13 @@ export class BedrockAdapter implements ProviderAdapter {
     const fullRequest = { modelId: bedrockModelId, ...bedrockRequest, stream: true };
     options?.onRequest?.(fullRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
-      return await this.invokeModelWithStream(bedrockModelId, bedrockRequest, callbacks, options?.signal);
+      return await this.invokeModelWithStream(bedrockModelId, bedrockRequest, callbacks, combinedSignal);
     } catch (error) {
       throw this.handleError(error, fullRequest);
+    } finally {
+      cleanup?.();
     }
   }
 
@@ -477,7 +484,7 @@ export class BedrockAdapter implements ProviderAdapter {
     }
 
     // Parse the binary event stream
-    const contentBlocks: Array<{ type: string; text?: string }> = [];
+    const contentBlocks: Array<{ type: string; text?: string; thinking?: string; signature?: string }> = [];
     let currentBlockIndex = -1;
     let finalMessage: BedrockMessageResponse | undefined;
     let inputTokens = 0;
@@ -583,6 +590,13 @@ export class BedrockAdapter implements ProviderAdapter {
                     }
                   } else if (eventData.delta?.type === 'thinking_delta' && eventData.delta.thinking) {
                     callbacks.onChunk(eventData.delta.thinking);
+                    if (contentBlocks[currentBlockIndex]) {
+                      contentBlocks[currentBlockIndex]!.thinking = (contentBlocks[currentBlockIndex]!.thinking ?? '') + eventData.delta.thinking;
+                    }
+                  } else if (eventData.delta?.type === 'signature_delta' && (eventData.delta as any).signature) {
+                    if (contentBlocks[currentBlockIndex]) {
+                      contentBlocks[currentBlockIndex]!.signature = (contentBlocks[currentBlockIndex]!.signature ?? '') + (eventData.delta as any).signature;
+                    }
                   }
                 } else if (eventData.type === 'message_delta') {
                   if (eventData.usage) {
@@ -611,10 +625,12 @@ export class BedrockAdapter implements ProviderAdapter {
       id: 'msg_stream',
       type: 'message',
       role: 'assistant',
-      content: contentBlocks.map(b => ({
-        type: b.type as 'text',
-        text: b.text,
-      })),
+      content: contentBlocks.map(b => {
+        if (b.type === 'thinking') {
+          return { type: 'thinking' as const, thinking: b.thinking, signature: b.signature };
+        }
+        return { type: b.type as 'text', text: b.text };
+      }),
       model: modelId,
       stop_reason: stopReason as BedrockMessageResponse['stop_reason'],
       usage: {

package/src/providers/gemini.ts

@@ -28,6 +28,7 @@ import {
   abortError,
   networkError,
 } from '../types/index.js';
+import { createCombinedSignal } from './utils.js';
 
 // ============================================================================
 // Gemini API Types
@@ -127,13 +128,14 @@ export class GeminiAdapter implements ProviderAdapter {
     const geminiRequest = this.buildRequest(request);
     options?.onRequest?.(geminiRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
       const url = `${this.baseURL}/models/${request.model}:generateContent?key=${this.apiKey}`;
       const response = await fetch(url, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(geminiRequest),
-        signal: options?.signal,
+        signal: combinedSignal,
       });
 
       if (!response.ok) {
@@ -150,6 +152,8 @@ export class GeminiAdapter implements ProviderAdapter {
       return this.parseResponse(data, request.model, geminiRequest);
     } catch (error) {
       throw this.handleError(error, geminiRequest);
+    } finally {
+      cleanup?.();
     }
   }
 
@@ -161,13 +165,14 @@ export class GeminiAdapter implements ProviderAdapter {
     const geminiRequest = this.buildRequest(request);
     options?.onRequest?.(geminiRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
       const url = `${this.baseURL}/models/${request.model}:streamGenerateContent?alt=sse&key=${this.apiKey}`;
       const response = await fetch(url, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(geminiRequest),
-        signal: options?.signal,
+        signal: combinedSignal,
       });
 
       if (!response.ok) {
@@ -300,6 +305,8 @@ export class GeminiAdapter implements ProviderAdapter {
       };
     } catch (error) {
       throw this.handleError(error, geminiRequest);
+    } finally {
+      cleanup?.();
     }
   }
 

package/src/providers/openai-compatible.ts

@@ -30,6 +30,7 @@ import {
   abortError,
   networkError,
 } from '../types/index.js';
+import { safeParseJson, createCombinedSignal, SSELineParser } from './utils.js';
 
 // ============================================================================
 // Types
@@ -155,12 +156,13 @@ export class OpenAICompatibleAdapter implements ProviderAdapter {
     openAIRequest.stream = true;
     options?.onRequest?.(openAIRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
       const response = await fetch(`${this.baseURL}/chat/completions`, {
         method: 'POST',
         headers: this.getHeaders(),
         body: JSON.stringify(openAIRequest),
-        signal: options?.signal,
+        signal: combinedSignal,
       });
 
       if (!response.ok) {
@@ -174,6 +176,7 @@ export class OpenAICompatibleAdapter implements ProviderAdapter {
       }
 
       const decoder = new TextDecoder();
+      const sseParser = new SSELineParser();
       let accumulated = '';
       let finishReason = 'stop';
       let toolCalls: OpenAIToolCall[] = [];
@@ -183,10 +186,9 @@ export class OpenAICompatibleAdapter implements ProviderAdapter {
         if (done) break;
 
         const chunk = decoder.decode(value, { stream: true });
-        const lines = chunk.split('\n').filter(line => line.startsWith('data: '));
+        const dataLines = sseParser.feed(chunk);
 
-        for (const line of lines) {
-          const data = line.slice(6);
+        for (const data of dataLines) {
           if (data === '[DONE]') continue;
 
           try {
@@ -240,6 +242,8 @@ export class OpenAICompatibleAdapter implements ProviderAdapter {
 
     } catch (error) {
       throw this.handleError(error, openAIRequest);
+    } finally {
+      cleanup?.();
     }
   }
 
@@ -415,19 +419,24 @@ export class OpenAICompatibleAdapter implements ProviderAdapter {
   }
 
   private async makeRequest(request: any, options?: ProviderRequestOptions): Promise<OpenAIResponse> {
-    const response = await fetch(`${this.baseURL}/chat/completions`, {
-      method: 'POST',
-      headers: this.getHeaders(),
-      body: JSON.stringify(request),
-      signal: options?.signal,
-    });
-    
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`API error: ${response.status} ${errorText}`);
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
+    try {
+      const response = await fetch(`${this.baseURL}/chat/completions`, {
+        method: 'POST',
+        headers: this.getHeaders(),
+        body: JSON.stringify(request),
+        signal: combinedSignal,
+      });
+
+      if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`API error: ${response.status} ${errorText}`);
+      }
+
+      return await response.json() as OpenAIResponse;
+    } finally {
+      cleanup?.();
     }
-    
-    return response.json() as Promise<OpenAIResponse>;
   }
 
   private parseResponse(response: OpenAIResponse, requestedModel: string, rawRequest: unknown): ProviderResponse {
@@ -484,7 +493,7 @@ export class OpenAICompatibleAdapter implements ProviderAdapter {
           type: 'tool_use',
           id: tc.id,
           name: tc.function.name,
-          input: JSON.parse(tc.function.arguments || '{}'),
+          input: safeParseJson(tc.function.arguments),
         });
       }
     }
@@ -625,7 +634,7 @@ export function fromOpenAIMessage(message: OpenAIMessage): ContentBlock[] {
         type: 'tool_use',
         id: tc.id,
         name: tc.function.name,
-        input: JSON.parse(tc.function.arguments || '{}'),
+        input: safeParseJson(tc.function.arguments),
       });
     }
   }

package/src/providers/openai-completions.ts

@@ -27,6 +27,7 @@ import {
   abortError,
   networkError,
 } from '../types/index.js';
+import { createCombinedSignal, SSELineParser } from './utils.js';
 
 // ============================================================================
 // Types
@@ -169,12 +170,13 @@ export class OpenAICompletionsAdapter implements ProviderAdapter {
     completionsRequest.stream = true;
     options?.onRequest?.(completionsRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
       const response = await fetch(`${this.baseURL}/completions`, {
         method: 'POST',
         headers: this.getHeaders(),
         body: JSON.stringify(completionsRequest),
-        signal: options?.signal,
+        signal: combinedSignal,
       });
 
       if (!response.ok) {
@@ -188,6 +190,7 @@ export class OpenAICompletionsAdapter implements ProviderAdapter {
       }
 
       const decoder = new TextDecoder();
+      const sseParser = new SSELineParser();
       let accumulated = '';
       let finishReason = 'stop';
 
@@ -196,10 +199,9 @@ export class OpenAICompletionsAdapter implements ProviderAdapter {
         if (done) break;
 
         const chunk = decoder.decode(value, { stream: true });
-        const lines = chunk.split('\n').filter(line => line.startsWith('data: '));
+        const dataLines = sseParser.feed(chunk);
 
-        for (const line of lines) {
-          const data = line.slice(6);
+        for (const data of dataLines) {
           if (data === '[DONE]') continue;
 
           try {
@@ -224,6 +226,8 @@ export class OpenAICompletionsAdapter implements ProviderAdapter {
 
     } catch (error) {
       throw this.handleError(error, completionsRequest);
+    } finally {
+      cleanup?.();
     }
   }
 
@@ -333,9 +337,29 @@ export class OpenAICompletionsAdapter implements ProviderAdapter {
   }
 
   private buildRequest(request: ProviderRequest): CompletionsRequest {
-    // Prefer normalizedMessages (has participant names) over messages (has role)
-    const messages = (request.extra?.normalizedMessages as any[]) || (request.messages as any[]);
-    const { prompt, participants } = this.serializeToPrompt(messages);
+    let prompt: string;
+    let stopSequences: string[];
+
+    if (typeof request.extra?.prompt === 'string') {
+      // Continuation path: prompt is already serialized, skip re-serialization.
+      // No participant-based stops or eotToken — the prompt already contains them.
+      prompt = request.extra.prompt;
+      stopSequences = [
+        ...this.extraStopSequences,
+        ...(request.stopSequences || []),
+      ];
+    } else {
+      // Normal path: serialize messages into prompt format
+      const messages = (request.extra?.normalizedMessages as any[]) || (request.messages as any[]);
+      const result = this.serializeToPrompt(messages);
+      prompt = result.prompt;
+      stopSequences = [
+        ...this.generateStopSequences(result.participants),
+        ...(this.eotToken ? [this.eotToken] : []),
+        ...this.extraStopSequences,
+        ...(request.stopSequences || []),
+      ];
+    }
 
     const params: CompletionsRequest = {
       model: request.model,
@@ -359,13 +383,6 @@ export class OpenAICompletionsAdapter implements ProviderAdapter {
       params.frequency_penalty = request.frequencyPenalty;
     }
 
-    // Generate stop sequences from participant names + EOT token + any extras
-    const stopSequences = [
-      ...this.generateStopSequences(participants),
-      ...(this.eotToken ? [this.eotToken] : []),
-      ...this.extraStopSequences,
-      ...(request.stopSequences || []),
-    ];
     if (stopSequences.length > 0) {
       params.stop = stopSequences;
     }
@@ -380,19 +397,24 @@ export class OpenAICompletionsAdapter implements ProviderAdapter {
   }
 
   private async makeRequest(request: CompletionsRequest, options?: ProviderRequestOptions): Promise<CompletionsResponse> {
-    const response = await fetch(`${this.baseURL}/completions`, {
-      method: 'POST',
-      headers: this.getHeaders(),
-      body: JSON.stringify(request),
-      signal: options?.signal,
-    });
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
+    try {
+      const response = await fetch(`${this.baseURL}/completions`, {
+        method: 'POST',
+        headers: this.getHeaders(),
+        body: JSON.stringify(request),
+        signal: combinedSignal,
+      });
 
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`API error: ${response.status} ${errorText}`);
-    }
+      if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`API error: ${response.status} ${errorText}`);
+      }
 
-    return response.json() as Promise<CompletionsResponse>;
+      return await response.json() as CompletionsResponse;
+    } finally {
+      cleanup?.();
+    }
   }
 
   private parseResponse(response: CompletionsResponse, requestedModel: string, rawRequest: unknown): ProviderResponse {

package/src/providers/openai-responses.ts

@@ -39,6 +39,7 @@ import {
   abortError,
   networkError,
 } from '../types/index.js';
+import { createCombinedSignal } from './utils.js';
 
 // ============================================================================
 // Images API Types
@@ -152,10 +153,11 @@ export class OpenAIResponsesAdapter implements ProviderAdapter {
     const imagesRequest = this.buildRequest(request, inputImages);
     options?.onRequest?.(imagesRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
       const fetchOptions: RequestInit = {
         method: 'POST',
-        signal: options?.signal,
+        signal: combinedSignal,
       };
 
       if (isEdit) {
@@ -198,6 +200,8 @@ export class OpenAIResponsesAdapter implements ProviderAdapter {
       return this.parseResponse(data, request.model, imagesRequest);
     } catch (error) {
       throw this.handleError(error, imagesRequest);
+    } finally {
+      cleanup?.();
     }
   }
 

package/src/providers/openai.ts

@@ -29,6 +29,7 @@ import {
   abortError,
   networkError,
 } from '../types/index.js';
+import { safeParseJson, createCombinedSignal, SSELineParser } from './utils.js';
 
 // ============================================================================
 // Types
@@ -239,12 +240,13 @@ export class OpenAIAdapter implements ProviderAdapter {
     openAIRequest.stream_options = { include_usage: true };
     options?.onRequest?.(openAIRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
       const response = await fetch(`${this.baseURL}/chat/completions`, {
         method: 'POST',
         headers: this.getHeaders(),
         body: JSON.stringify(openAIRequest),
-        signal: options?.signal,
+        signal: combinedSignal,
       });
 
       if (!response.ok) {
@@ -258,6 +260,7 @@ export class OpenAIAdapter implements ProviderAdapter {
       }
 
       const decoder = new TextDecoder();
+      const sseParser = new SSELineParser();
       let accumulated = '';
       let finishReason = 'stop';
       let toolCalls: OpenAIToolCall[] = [];
@@ -268,10 +271,9 @@ export class OpenAIAdapter implements ProviderAdapter {
         if (done) break;
 
         const chunk = decoder.decode(value, { stream: true });
-        const lines = chunk.split('\n').filter(line => line.startsWith('data: '));
+        const dataLines = sseParser.feed(chunk);
 
-        for (const line of lines) {
-          const data = line.slice(6);
+        for (const data of dataLines) {
           if (data === '[DONE]') continue;
 
           try {
@@ -330,6 +332,8 @@ export class OpenAIAdapter implements ProviderAdapter {
 
     } catch (error) {
       throw this.handleError(error, openAIRequest);
+    } finally {
+      cleanup?.();
     }
   }
 
@@ -513,19 +517,24 @@ export class OpenAIAdapter implements ProviderAdapter {
   }
 
   private async makeRequest(request: any, options?: ProviderRequestOptions): Promise<OpenAIResponse> {
-    const response = await fetch(`${this.baseURL}/chat/completions`, {
-      method: 'POST',
-      headers: this.getHeaders(),
-      body: JSON.stringify(request),
-      signal: options?.signal,
-    });
-    
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`OpenAI API error: ${response.status} ${errorText}`);
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
+    try {
+      const response = await fetch(`${this.baseURL}/chat/completions`, {
+        method: 'POST',
+        headers: this.getHeaders(),
+        body: JSON.stringify(request),
+        signal: combinedSignal,
+      });
+
+      if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`OpenAI API error: ${response.status} ${errorText}`);
+      }
+
+      return await response.json() as OpenAIResponse;
+    } finally {
+      cleanup?.();
     }
-    
-    return response.json() as Promise<OpenAIResponse>;
   }
 
   private parseResponse(response: OpenAIResponse, requestedModel: string, rawRequest: unknown): ProviderResponse {
@@ -594,7 +603,7 @@ export class OpenAIAdapter implements ProviderAdapter {
           type: 'tool_use',
           id: tc.id,
           name: tc.function.name,
-          input: JSON.parse(tc.function.arguments || '{}'),
+          input: safeParseJson(tc.function.arguments),
         });
       }
     }
@@ -690,7 +699,7 @@ export function fromOpenAIContent(message: OpenAIMessage): ContentBlock[] {
         type: 'tool_use',
         id: tc.id,
         name: tc.function.name,
-        input: JSON.parse(tc.function.arguments || '{}'),
+        input: safeParseJson(tc.function.arguments),
       });
     }
   }

package/src/providers/openrouter.ts

@@ -22,6 +22,7 @@ import {
   abortError,
   networkError,
 } from '../types/index.js';
+import { safeParseJson, createCombinedSignal, SSELineParser } from './utils.js';
 
 // ============================================================================
 // Types
@@ -156,12 +157,13 @@ export class OpenRouterAdapter implements ProviderAdapter {
     openRouterRequest.stream_options = { include_usage: true };
     options?.onRequest?.(openRouterRequest);
 
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
     try {
       const response = await fetch(`${this.baseURL}/chat/completions`, {
         method: 'POST',
         headers: this.getHeaders(),
         body: JSON.stringify(openRouterRequest),
-        signal: options?.signal,
+        signal: combinedSignal,
       });
 
       if (!response.ok) {
@@ -175,6 +177,7 @@ export class OpenRouterAdapter implements ProviderAdapter {
       }
 
       const decoder = new TextDecoder();
+      const sseParser = new SSELineParser();
       let accumulated = '';
       let finishReason = 'stop';
       let toolCalls: OpenRouterToolCall[] = [];
@@ -185,10 +188,9 @@ export class OpenRouterAdapter implements ProviderAdapter {
         if (done) break;
 
         const chunk = decoder.decode(value, { stream: true });
-        const lines = chunk.split('\n').filter(line => line.startsWith('data: '));
+        const dataLines = sseParser.feed(chunk);
 
-        for (const line of lines) {
-          const data = line.slice(6);
+        for (const data of dataLines) {
           if (data === '[DONE]') continue;
 
           try {
@@ -247,6 +249,8 @@ export class OpenRouterAdapter implements ProviderAdapter {
 
     } catch (error) {
       throw this.handleError(error, openRouterRequest);
+    } finally {
+      cleanup?.();
     }
   }
 
@@ -464,19 +468,24 @@ export class OpenRouterAdapter implements ProviderAdapter {
   }
 
   private async makeRequest(request: any, options?: ProviderRequestOptions): Promise<OpenRouterResponse> {
-    const response = await fetch(`${this.baseURL}/chat/completions`, {
-      method: 'POST',
-      headers: this.getHeaders(),
-      body: JSON.stringify(request),
-      signal: options?.signal,
-    });
-    
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`OpenRouter error: ${response.status} ${errorText}`);
+    const { signal: combinedSignal, cleanup } = createCombinedSignal(options?.signal, options?.timeoutMs);
+    try {
+      const response = await fetch(`${this.baseURL}/chat/completions`, {
+        method: 'POST',
+        headers: this.getHeaders(),
+        body: JSON.stringify(request),
+        signal: combinedSignal,
+      });
+
+      if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`OpenRouter error: ${response.status} ${errorText}`);
+      }
+
+      return await response.json() as OpenRouterResponse;
+    } finally {
+      cleanup?.();
     }
-    
-    return response.json() as Promise<OpenRouterResponse>;
   }
 
   private parseResponse(response: OpenRouterResponse, requestedModel: string, rawRequest: unknown): ProviderResponse {
@@ -540,7 +549,15 @@ export class OpenRouterAdapter implements ProviderAdapter {
     const content: any[] = [];
     
     if (message.content) {
-      content.push({ type: 'text', text: message.content });
+      if (typeof message.content === 'string') {
+        content.push({ type: 'text', text: message.content });
+      } else if (Array.isArray(message.content)) {
+        for (const block of message.content) {
+          if (block.type === 'text') {
+            content.push({ type: 'text', text: block.text });
+          }
+        }
+      }
     }
     
     if (message.tool_calls) {
@@ -549,7 +566,7 @@ export class OpenRouterAdapter implements ProviderAdapter {
           type: 'tool_use',
           id: tc.id,
           name: tc.function.name,
-          input: JSON.parse(tc.function.arguments || '{}'),
+          input: safeParseJson(tc.function.arguments),
         });
       }
     }
@@ -698,7 +715,7 @@ export function fromOpenRouterMessage(message: OpenRouterMessage): ContentBlock[
         type: 'tool_use',
         id: tc.id,
         name: tc.function.name,
-        input: JSON.parse(tc.function.arguments || '{}'),
+        input: safeParseJson(tc.function.arguments),
       });
     }
   }