extrait 0.6.0 → 0.6.1

package/dist/index.cjs

@@ -1553,7 +1553,15 @@ function normalizeBaseURL(baseURL) {
   return baseURL.endsWith("/") ? baseURL : `${baseURL}/`;
 }
 function buildURL(baseURL, path) {
-  return new URL(path, normalizeBaseURL(baseURL)).toString();
+  try {
+    return new URL(path).toString();
+  } catch {}
+  const base = new URL(normalizeBaseURL(baseURL));
+  const resolvedPath = new URL(path, "http://provider-path.local");
+  base.pathname = mergePathnames(base.pathname, resolvedPath.pathname);
+  base.search = resolvedPath.search;
+  base.hash = resolvedPath.hash;
+  return base.toString();
 }
 function safeJSONParse(input) {
   try {
@@ -1628,6 +1636,36 @@ function addOptional(a, b) {
   }
   return (a ?? 0) + (b ?? 0);
 }
+function mergePathnames(basePathname, pathPathname) {
+  const baseSegments = splitPathSegments(basePathname);
+  const pathSegments = splitPathSegments(pathPathname);
+  const overlap = findPathOverlap(baseSegments, pathSegments);
+  const mergedSegments = [...baseSegments, ...pathSegments.slice(overlap)];
+  if (mergedSegments.length === 0) {
+    return "/";
+  }
+  const mergedPathname = `/${mergedSegments.join("/")}`;
+  return pathPathname.endsWith("/") && pathPathname !== "/" ? `${mergedPathname}/` : mergedPathname;
+}
+function splitPathSegments(pathname) {
+  return pathname.split("/").filter((segment) => segment.length > 0);
+}
+function findPathOverlap(baseSegments, pathSegments) {
+  const maxOverlap = Math.min(baseSegments.length, pathSegments.length);
+  for (let size = maxOverlap;size > 0; size -= 1) {
+    let matches = true;
+    for (let index = 0;index < size; index += 1) {
+      if (baseSegments[baseSegments.length - size + index] !== pathSegments[index]) {
+        matches = false;
+        break;
+      }
+    }
+    if (matches) {
+      return size;
+    }
+  }
+  return 0;
+}
 
 // src/providers/openai-compatible.ts
 function createOpenAICompatibleAdapter(options) {
@@ -1786,7 +1824,7 @@ async function completeWithChatCompletionsPassThrough(options, fetcher, path, re
     const message = await response.text();
     throw new Error(`HTTP ${response.status}: ${message}`);
   }
-  const payload = await response.json();
+  const payload = await parseOpenAICompatibleJSONResponse(response, "Failed to parse OpenAI-compatible chat completion response");
   const assistantMessage = pickAssistantMessage(payload);
   if (!assistantMessage) {
     throw new Error("No assistant message in OpenAI-compatible response.");
@@ -1802,6 +1840,25 @@ async function completeWithChatCompletionsPassThrough(options, fetcher, path, re
     toolCalls: toolCalls.length > 0 ? toolCalls : undefined
   };
 }
+async function parseOpenAICompatibleJSONResponse(response, context) {
+  const rawBody = await response.text();
+  try {
+    return JSON.parse(rawBody);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`${context} (HTTP ${response.status}): ${message}. Raw body: ${formatResponseBodyForError(rawBody)}`);
+  }
+}
+function formatResponseBodyForError(rawBody, maxLength = 2000) {
+  const normalized = rawBody.trim();
+  if (normalized.length === 0) {
+    return "[empty body]";
+  }
+  if (normalized.length <= maxLength) {
+    return normalized;
+  }
+  return `${normalized.slice(0, maxLength)}...[truncated ${normalized.length - maxLength} chars]`;
+}
 async function completeWithChatCompletionsWithMCP(options, fetcher, path, request) {
   const maxToolRounds = normalizeMaxToolRounds(request.maxToolRounds ?? options.defaultMaxToolRounds);
   let messages = buildMessages(request);

package/dist/index.d.ts

@@ -15,4 +15,4 @@ export { createOpenAICompatibleAdapter, type OpenAICompatibleAdapterOptions, } f
 export { createAnthropicCompatibleAdapter, DEFAULT_ANTHROPIC_MAX_TOKENS, DEFAULT_ANTHROPIC_VERSION, type AnthropicCompatibleAdapterOptions, } from "./providers/anthropic-compatible";
 export { DEFAULT_MAX_TOOL_ROUNDS } from "./providers/mcp-runtime";
 export { createDefaultProviderRegistry, createModelAdapter, createProviderRegistry, registerBuiltinProviders, type BuiltinProviderKind, type ModelAdapterConfig, type ProviderFactory, type ProviderRegistry, type ProviderTransportConfig, } from "./providers/registry";
-export type { CandidateDiagnostics, EmbeddingRequest, EmbeddingResult, LLMImageContent, LLMMessageContent, LLMTextContent, ExtractJsonCandidatesOptions, ExtractionCandidate, ExtractionHeuristicsOptions, ExtractionParseHint, HTTPHeaders, LLMAdapter, LLMMessage, LLMRequest, LLMResponse, LLMStreamCallbacks, LLMStreamChunk, LLMToolCall, LLMToolCallRef, LLMToolDebugOptions, LLMToolExecution, LLMToolOutputTransformer, LLMToolArgumentsTransformer, LLMToolCallParamsTransformer, LLMToolChoice, MCPCallToolParams, MCPListToolsResult, MCPToolClient, MCPToolDescriptor, MCPToolSchema, LLMUsage, MarkdownCodeBlock, MarkdownCodeOptions, ParseLLMOutputOptions, ParseLLMOutputResult, ParseTraceEvent, PipelineError, StructuredAttempt, StructuredCallOptions, StructuredDebugOptions, StructuredError, StructuredMode, StructuredOptions, StructuredPromptBuilder, StructuredPromptContext, StructuredPromptPayload, StructuredPromptResolver, StructuredPromptValue, StructuredResult, StructuredStreamData, StructuredStreamDelta, StructuredStreamEvent, StructuredStreamInput, StructuredStreamOptions, StructuredStreamSnapshot, StructuredSelfHealInput, StructuredTimeoutOptions, ThinkDiagnostics, ThinkBlock, StructuredTraceEvent, GenerateAttempt, GenerateCallOptions, GenerateOptions, GenerateResult, GenerateStreamDelta, GenerateStreamEvent, GenerateStreamInput, GenerateStreamOptions, GenerateStreamSnapshot, GenerateTraceEvent, } from "./types";
+export type { CandidateDiagnostics, EmbeddingRequest, EmbeddingResult, LLMImageContent, LLMMessageContent, LLMReasoningEffort, LLMTextContent, ExtractJsonCandidatesOptions, ExtractionCandidate, ExtractionHeuristicsOptions, ExtractionParseHint, HTTPHeaders, LLMAdapter, LLMMessage, LLMRequest, LLMResponse, LLMStreamCallbacks, LLMStreamChunk, LLMToolCall, LLMToolCallRef, LLMToolDebugOptions, LLMToolExecution, LLMToolOutputTransformer, LLMToolArgumentsTransformer, LLMToolCallParamsTransformer, LLMToolChoice, MCPCallToolParams, MCPListToolsResult, MCPToolClient, MCPToolDescriptor, MCPToolSchema, LLMUsage, MarkdownCodeBlock, MarkdownCodeOptions, ParseLLMOutputOptions, ParseLLMOutputResult, ParseTraceEvent, PipelineError, StructuredAttempt, StructuredCallOptions, StructuredDebugOptions, StructuredError, StructuredMode, StructuredOptions, StructuredPromptBuilder, StructuredPromptContext, StructuredPromptPayload, StructuredPromptResolver, StructuredPromptValue, StructuredResult, StructuredStreamData, StructuredStreamDelta, StructuredStreamEvent, StructuredStreamInput, StructuredStreamOptions, StructuredStreamSnapshot, StructuredSelfHealInput, StructuredTimeoutOptions, ThinkDiagnostics, ThinkBlock, StructuredTraceEvent, GenerateAttempt, GenerateCallOptions, GenerateOptions, GenerateResult, GenerateStreamDelta, GenerateStreamEvent, GenerateStreamInput, GenerateStreamOptions, GenerateStreamSnapshot, GenerateTraceEvent, } from "./types";

package/dist/index.js

@@ -1463,7 +1463,15 @@ function normalizeBaseURL(baseURL) {
   return baseURL.endsWith("/") ? baseURL : `${baseURL}/`;
 }
 function buildURL(baseURL, path) {
-  return new URL(path, normalizeBaseURL(baseURL)).toString();
+  try {
+    return new URL(path).toString();
+  } catch {}
+  const base = new URL(normalizeBaseURL(baseURL));
+  const resolvedPath = new URL(path, "http://provider-path.local");
+  base.pathname = mergePathnames(base.pathname, resolvedPath.pathname);
+  base.search = resolvedPath.search;
+  base.hash = resolvedPath.hash;
+  return base.toString();
 }
 function safeJSONParse(input) {
   try {
@@ -1538,6 +1546,36 @@ function addOptional(a, b) {
   }
   return (a ?? 0) + (b ?? 0);
 }
+function mergePathnames(basePathname, pathPathname) {
+  const baseSegments = splitPathSegments(basePathname);
+  const pathSegments = splitPathSegments(pathPathname);
+  const overlap = findPathOverlap(baseSegments, pathSegments);
+  const mergedSegments = [...baseSegments, ...pathSegments.slice(overlap)];
+  if (mergedSegments.length === 0) {
+    return "/";
+  }
+  const mergedPathname = `/${mergedSegments.join("/")}`;
+  return pathPathname.endsWith("/") && pathPathname !== "/" ? `${mergedPathname}/` : mergedPathname;
+}
+function splitPathSegments(pathname) {
+  return pathname.split("/").filter((segment) => segment.length > 0);
+}
+function findPathOverlap(baseSegments, pathSegments) {
+  const maxOverlap = Math.min(baseSegments.length, pathSegments.length);
+  for (let size = maxOverlap;size > 0; size -= 1) {
+    let matches = true;
+    for (let index = 0;index < size; index += 1) {
+      if (baseSegments[baseSegments.length - size + index] !== pathSegments[index]) {
+        matches = false;
+        break;
+      }
+    }
+    if (matches) {
+      return size;
+    }
+  }
+  return 0;
+}
 
 // src/providers/openai-compatible.ts
 function createOpenAICompatibleAdapter(options) {
@@ -1696,7 +1734,7 @@ async function completeWithChatCompletionsPassThrough(options, fetcher, path, re
     const message = await response.text();
     throw new Error(`HTTP ${response.status}: ${message}`);
   }
-  const payload = await response.json();
+  const payload = await parseOpenAICompatibleJSONResponse(response, "Failed to parse OpenAI-compatible chat completion response");
   const assistantMessage = pickAssistantMessage(payload);
   if (!assistantMessage) {
     throw new Error("No assistant message in OpenAI-compatible response.");
@@ -1712,6 +1750,25 @@ async function completeWithChatCompletionsPassThrough(options, fetcher, path, re
     toolCalls: toolCalls.length > 0 ? toolCalls : undefined
   };
 }
+async function parseOpenAICompatibleJSONResponse(response, context) {
+  const rawBody = await response.text();
+  try {
+    return JSON.parse(rawBody);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`${context} (HTTP ${response.status}): ${message}. Raw body: ${formatResponseBodyForError(rawBody)}`);
+  }
+}
+function formatResponseBodyForError(rawBody, maxLength = 2000) {
+  const normalized = rawBody.trim();
+  if (normalized.length === 0) {
+    return "[empty body]";
+  }
+  if (normalized.length <= maxLength) {
+    return normalized;
+  }
+  return `${normalized.slice(0, maxLength)}...[truncated ${normalized.length - maxLength} chars]`;
+}
 async function completeWithChatCompletionsWithMCP(options, fetcher, path, request) {
   const maxToolRounds = normalizeMaxToolRounds(request.maxToolRounds ?? options.defaultMaxToolRounds);
   let messages = buildMessages(request);

package/dist/types.d.ts

@@ -144,12 +144,13 @@ export interface LLMMessage {
     content: LLMMessageContent;
     [key: string]: unknown;
 }
+export type LLMReasoningEffort = "none" | "minimal" | "low" | "medium" | "high" | "max";
 export interface LLMRequest {
     prompt?: string;
     systemPrompt?: string;
     messages?: LLMMessage[];
     temperature?: number;
-    reasoningEffort?: "low" | "medium" | "high" | "max";
+    reasoningEffort?: LLMReasoningEffort;
     maxTokens?: number;
     mcpClients?: MCPToolClient[];
     toolChoice?: LLMToolChoice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extrait",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tterrasson/extrait.git"
@@ -8,12 +8,12 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.27.1",
-    "jsonrepair": "^3.13.2",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "jsonrepair": "^3.13.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.10",
+    "@types/bun": "^1.3.11",
     "@types/sharp": "^0.32.0",
     "typescript": "^5.9.3"
   },