@nemesis-oss/ollama-sdk 1.12.0 → 1.13.0

package/dist/index.cjs

@@ -1765,9 +1765,10 @@ var ModelAffinityRouter = class {
     this.now = options.now ?? Date.now;
   }
   /**
-   * Synchronously reorders `candidates` so endpoints whose fresh `/api/ps`
+   * Synchronously reorders `candidates` so that, within each priority tier
+   * (run of consecutive equal `priority`), endpoints whose fresh `/api/ps`
    * snapshot shows `model` resident come first (relative order preserved within
-   * each group). Returns the input unchanged — and kicks a background refresh —
+   * each group). Never moves an endpoint across tiers. Returns the input unchanged — and kicks a background refresh —
    * when any candidate's snapshot is missing or stale: a wrong reorder is worse
    * than no reorder, and the first request after a cache miss simply isn't
    * reordered. No-op without a `model` or with fewer than two candidates.
@@ -1784,13 +1785,28 @@ var ModelAffinityRouter = class {
       }
     }
     if (!allFresh) return candidates;
-    const resident = candidates.filter((ep) => {
+    const isResident = (ep) => {
       const entry = this.cache.get(ep.name);
       return entry !== void 0 && isModelResident(entry.models, model);
-    });
-    if (resident.length === 0 || resident.length === candidates.length) return candidates;
-    const residentSet = new Set(resident.map((ep) => ep.name));
-    return [...resident, ...candidates.filter((ep) => !residentSet.has(ep.name))];
+    };
+    const reordered = [];
+    let changed = false;
+    for (let start = 0; start < candidates.length; ) {
+      const tierPriority = candidates[start].priority ?? 0;
+      let end = start + 1;
+      while (end < candidates.length && (candidates[end].priority ?? 0) === tierPriority) end++;
+      const tier = candidates.slice(start, end);
+      const resident = tier.filter(isResident);
+      if (resident.length === 0 || resident.length === tier.length) {
+        reordered.push(...tier);
+      } else {
+        const tierOrder = [...resident, ...tier.filter((ep) => !isResident(ep))];
+        changed ||= tierOrder.some((ep, i) => ep !== tier[i]);
+        reordered.push(...tierOrder);
+      }
+      start = end;
+    }
+    return changed ? reordered : candidates;
   }
   /**
    * Forces a refresh of the affinity cache for the given endpoints (deduped with
@@ -2835,7 +2851,11 @@ var ModelsClient = class {
 var OpenAIResponsesStreamError = class extends OllamaClientError {
   responsePayload;
   constructor(message, responsePayload) {
-    super(message, { code: "openai_responses_stream_error", retryable: false, response: { body: responsePayload } });
+    super(message, {
+      code: "openai_responses_stream_error",
+      retryable: false,
+      response: { body: responsePayload }
+    });
     this.responsePayload = responsePayload;
   }
 };
@@ -2977,7 +2997,9 @@ var OpenAIChatCompletionStream = class {
     } finally {
       if (!completed) {
         this.source.abort?.();
-        this.rejectFinal(new OllamaAbortError("OpenAI Chat Completion stream ended before completion"));
+        this.rejectFinal(
+          new OllamaAbortError("OpenAI Chat Completion stream ended before completion")
+        );
       }
     }
   }
@@ -3106,7 +3128,14 @@ var OpenAIResponsesStream = class {
         existing.kind = kind;
         return existing;
       }
-      const state = { itemId, kind, content: /* @__PURE__ */ new Map(), summary: /* @__PURE__ */ new Map(), arguments: "", reasoningText: "" };
+      const state = {
+        itemId,
+        kind,
+        content: /* @__PURE__ */ new Map(),
+        summary: /* @__PURE__ */ new Map(),
+        arguments: "",
+        reasoningText: ""
+      };
       outputs.set(outputIndex, state);
       return state;
     };
@@ -3137,9 +3166,33 @@ var OpenAIResponsesStream = class {
     const reconstructedOutput = () => [...outputs.entries()].sort(([a], [b]) => a - b).map(([outputIndex, state]) => {
       const canonical = canonicalOutputItems.get(outputIndex);
       if (canonical) return canonical;
-      if (state.kind === "message") return { type: "message", ...state.itemId ? { id: state.itemId } : {}, ...state.status ? { status: state.status } : {}, role: state.role ?? "assistant", ...state.phase ? { phase: state.phase } : {}, content: [...state.content.entries()].sort(([a], [b]) => a - b).map(([, p]) => p) };
-      if (state.kind === "function_call") return { type: "function_call", ...state.itemId ? { id: state.itemId } : {}, ...state.callId ? { call_id: state.callId } : {}, ...state.status ? { status: state.status } : {}, name: state.name ?? "", arguments: state.arguments };
-      return { type: "reasoning", ...state.itemId ? { id: state.itemId } : {}, ...state.status ? { status: state.status } : {}, ...state.summary.size ? { summary: [...state.summary.entries()].sort(([a], [b]) => a - b).map(([, text]) => ({ type: "summary_text", text })) } : {}, ...state.reasoningText ? { text: state.reasoningText } : {} };
+      if (state.kind === "message")
+        return {
+          type: "message",
+          ...state.itemId ? { id: state.itemId } : {},
+          ...state.status ? { status: state.status } : {},
+          role: state.role ?? "assistant",
+          ...state.phase ? { phase: state.phase } : {},
+          content: [...state.content.entries()].sort(([a], [b]) => a - b).map(([, p]) => p)
+        };
+      if (state.kind === "function_call")
+        return {
+          type: "function_call",
+          ...state.itemId ? { id: state.itemId } : {},
+          ...state.callId ? { call_id: state.callId } : {},
+          ...state.status ? { status: state.status } : {},
+          name: state.name ?? "",
+          arguments: state.arguments
+        };
+      return {
+        type: "reasoning",
+        ...state.itemId ? { id: state.itemId } : {},
+        ...state.status ? { status: state.status } : {},
+        ...state.summary.size ? {
+          summary: [...state.summary.entries()].sort(([a], [b]) => a - b).map(([, text]) => ({ type: "summary_text", text }))
+        } : {},
+        ...state.reasoningText ? { text: state.reasoningText } : {}
+      };
     });
     try {
       for await (const event of this.source) {
@@ -3183,7 +3236,12 @@ var OpenAIResponsesStream = class {
           case "response.content_part.done": {
             const e = payload;
             if (e.part.type === "output_text" && "text" in e.part && typeof e.part.text === "string" || e.part.type === "refusal" && "refusal" in e.part && typeof e.part.refusal === "string") {
-              applyContentPart(e.output_index, e.item_id, e.content_index, e.part);
+              applyContentPart(
+                e.output_index,
+                e.item_id,
+                e.content_index,
+                e.part
+              );
             }
             break;
           }
@@ -3191,7 +3249,10 @@ var OpenAIResponsesStream = class {
             const e = payload;
             const s = ensureState(e.output_index, e.item_id, "message");
             const p = s.content.get(e.content_index);
-            s.content.set(e.content_index, { type: "output_text", text: (p?.type === "output_text" ? p.text : "") + e.delta });
+            s.content.set(e.content_index, {
+              type: "output_text",
+              text: (p?.type === "output_text" ? p.text : "") + e.delta
+            });
             break;
           }
           case "response.output_text.done": {
@@ -3204,7 +3265,10 @@ var OpenAIResponsesStream = class {
             const e = payload;
             const s = ensureState(e.output_index, e.item_id, "message");
             const p = s.content.get(e.content_index);
-            s.content.set(e.content_index, { type: "refusal", refusal: (p?.type === "refusal" ? p.refusal : "") + e.delta });
+            s.content.set(e.content_index, {
+              type: "refusal",
+              refusal: (p?.type === "refusal" ? p.refusal : "") + e.delta
+            });
             break;
           }
           case "response.refusal.done": {
@@ -3266,20 +3330,31 @@ var OpenAIResponsesStream = class {
         const response = terminalFailure ?? terminalIncomplete;
         const status = terminalFailure ? "failed" : "incomplete";
         const detail = response.error?.message ?? response.incomplete_details?.reason ?? "unknown error";
-        throw new OpenAIResponsesStreamError("OpenAI Responses stream " + status + ": " + detail, response);
+        throw new OpenAIResponsesStreamError(
+          "OpenAI Responses stream " + status + ": " + detail,
+          response
+        );
       }
       if (!finalResponse) {
-        if (!responseMeta) throw new Error("OpenAI Responses stream ended without a terminal response payload");
+        if (!responseMeta)
+          throw new Error("OpenAI Responses stream ended without a terminal response payload");
         if (responseMeta.status === "failed" || responseMeta.status === "incomplete") {
           const detail = responseMeta.error?.message ?? responseMeta.incomplete_details?.reason ?? "unknown error";
-          throw new OpenAIResponsesStreamError("OpenAI Responses stream " + responseMeta.status + ": " + detail, responseMeta);
+          throw new OpenAIResponsesStreamError(
+            "OpenAI Responses stream " + responseMeta.status + ": " + detail,
+            responseMeta
+          );
         }
         finalResponse = { ...responseMeta, output: reconstructedOutput(), status: "completed" };
       } else if (finalResponse.status === "failed" || finalResponse.status === "incomplete") {
         const detail = finalResponse.error?.message ?? finalResponse.incomplete_details?.reason ?? "unknown error";
-        throw new OpenAIResponsesStreamError("OpenAI Responses stream " + finalResponse.status + ": " + detail, finalResponse);
+        throw new OpenAIResponsesStreamError(
+          "OpenAI Responses stream " + finalResponse.status + ": " + detail,
+          finalResponse
+        );
       }
-      if (finalResponse.output.length === 0 && outputs.size > 0) finalResponse = { ...finalResponse, output: reconstructedOutput() };
+      if (finalResponse.output.length === 0 && outputs.size > 0)
+        finalResponse = { ...finalResponse, output: reconstructedOutput() };
       completed = true;
       this.removeAbortListener?.();
       this.removeAbortListener = void 0;
@@ -3304,14 +3379,11 @@ var OpenAICompatClient = class {
   }
   request(operation, model, signal, holdUntil) {
     if (this.runner) {
-      return this.runner(
-        (http, runnerSignal) => operation(http, runnerSignal),
-        {
-          ...model !== void 0 ? { model } : {},
-          ...signal !== void 0 ? { signal } : {},
-          ...holdUntil !== void 0 ? { holdUntil } : {}
-        }
-      );
+      return this.runner((http, runnerSignal) => operation(http, runnerSignal), {
+        ...model !== void 0 ? { model } : {},
+        ...signal !== void 0 ? { signal } : {},
+        ...holdUntil !== void 0 ? { holdUntil } : {}
+      });
     }
     return operation(this.http, signal);
   }
@@ -3940,7 +4012,7 @@ var SystemOneContentSchema = zod.z.union([
 var SystemOneChoiceQuestionSchema = zod.z.object({
   type: zod.z.enum(["choice"]),
   instructions: SystemOneContentSchema,
-  criteria: zod.z.object({}).catchall(zod.z.union([zod.z.string(), zod.z.null()])).refine((v) => Object.keys(v).length >= 2, { message: "must have at least 2 properties" }).refine((v) => Object.keys(v).length <= 26, { message: "must have at most 26 properties" }).refine((v) => Object.keys(v).every((k) => new RegExp("\\S").test(k)), {
+  criteria: zod.z.object({}).catchall(zod.z.union([zod.z.string(), zod.z.null()])).refine((v) => Object.keys(v).length >= 2, { message: "must have at least 2 properties" }).refine((v) => Object.keys(v).length <= 255, { message: "must have at most 255 properties" }).refine((v) => Object.keys(v).every((k) => new RegExp("\\S").test(k)), {
     message: 'property names must match pattern "\\S"'
   })
 });
@@ -4079,6 +4151,7 @@ var requestSchemas = {
 var responseSchemas = {
   balance: BalanceResponseSchema,
   chat: ChatResponseSchema,
+  copy: StatusResponseSchema,
   create: StatusResponseSchema,
   embed: EmbedResponseSchema,
   generate: GenerateResponseSchema,
@@ -4985,6 +5058,7 @@ var copyOp = {
   method: "POST",
   path: "/api/copy",
   request: { $ref: "#/schemas/CopyRequest" },
+  response: { $ref: "#/schemas/StatusResponse" },
   environment: { local: true, cloud: false },
   transport: { mode: "json", streaming: false },
   capabilities: {},
@@ -6871,6 +6945,93 @@ var ToolRegistry = class {
     };
   }
 };
+var WEB_SEARCH_TOOL_NAME = "web_search";
+var WEB_FETCH_TOOL_NAME = "web_fetch";
+var DEFAULT_MAX_OUTPUT_CHARS = 2e3 * 4;
+var DEFAULT_MAX_LINKS = 25;
+var TRUNCATION_MARKER = "\u2026[truncated]";
+var webSearchSchema = zod.z.object({
+  query: zod.z.string().min(1).describe("The search query string"),
+  max_results: zod.z.number().int().min(1).max(10).optional().describe("Maximum results to return (default 5, max 10)")
+});
+var webFetchSchema = zod.z.object({
+  url: zod.z.string().min(1).describe("The URL of the web page to fetch")
+});
+function positiveInt2(value, fallback, name) {
+  if (value === void 0) return fallback;
+  if (!Number.isInteger(value) || value < 1) {
+    throw new RangeError(`${name} must be a positive integer, received ${String(value)}`);
+  }
+  return value;
+}
+function truncate(text, maxChars) {
+  if (text.length <= maxChars) return text;
+  if (maxChars <= TRUNCATION_MARKER.length) return text.slice(0, maxChars);
+  return text.slice(0, maxChars - TRUNCATION_MARKER.length) + TRUNCATION_MARKER;
+}
+function formatWebSearchResult(res, maxChars) {
+  const results = res.results.map(({ title, url, content }) => ({ title, url, content }));
+  const full = JSON.stringify({ results });
+  if (full.length <= maxChars || results.length === 0) return truncate(full, maxChars);
+  const overhead = JSON.stringify({
+    results: results.map((r) => ({ ...r, content: "" }))
+  }).length;
+  const perResult = Math.max(0, Math.floor((maxChars - overhead) / results.length));
+  const trimmed = JSON.stringify({
+    results: results.map((r) => ({ ...r, content: truncate(r.content, perResult) }))
+  });
+  return trimmed.length <= maxChars ? trimmed : truncate(trimmed, maxChars);
+}
+function formatWebFetchResult(res, maxChars, maxLinks = DEFAULT_MAX_LINKS) {
+  const page = {
+    title: res.title ?? "",
+    content: res.content,
+    links: (res.links ?? []).slice(0, maxLinks)
+  };
+  const full = JSON.stringify(page);
+  if (full.length <= maxChars) return full;
+  const overhead = JSON.stringify({ ...page, content: "" }).length;
+  const trimmed = JSON.stringify({
+    ...page,
+    content: truncate(page.content, Math.max(0, maxChars - overhead))
+  });
+  return trimmed.length <= maxChars ? trimmed : truncate(trimmed, maxChars);
+}
+function createWebSearchTool(client, options = {}) {
+  const maxChars = positiveInt2(options.maxOutputChars, DEFAULT_MAX_OUTPUT_CHARS, "maxOutputChars");
+  const defaultMaxResults = options.defaultMaxResults === void 0 ? void 0 : Math.min(positiveInt2(options.defaultMaxResults, 5, "defaultMaxResults"), 10);
+  return defineTool({
+    name: WEB_SEARCH_TOOL_NAME,
+    description: "Search the web for current information. Returns a list of results, each with a title, url, and relevant content snippet.",
+    schema: webSearchSchema,
+    timeoutMs: options.timeoutMs,
+    execute: async ({ query, max_results }, { signal }) => {
+      const res = await client.webSearch({
+        query,
+        ...(max_results ?? defaultMaxResults) !== void 0 ? { max_results: max_results ?? defaultMaxResults } : {},
+        ...signal !== void 0 ? { signal } : {}
+      });
+      return formatWebSearchResult(res, maxChars);
+    }
+  });
+}
+function createWebFetchTool(client, options = {}) {
+  const maxChars = positiveInt2(options.maxOutputChars, DEFAULT_MAX_OUTPUT_CHARS, "maxOutputChars");
+  const maxLinks = positiveInt2(options.maxLinks, DEFAULT_MAX_LINKS, "maxLinks");
+  return defineTool({
+    name: WEB_FETCH_TOOL_NAME,
+    description: "Fetch a single web page by URL. Returns the page title, its main content, and links found on the page.",
+    schema: webFetchSchema,
+    timeoutMs: options.timeoutMs,
+    execute: async ({ url }, { signal }) => {
+      const res = await client.webFetch({ url, ...signal !== void 0 ? { signal } : {} });
+      return formatWebFetchResult(res, maxChars, maxLinks);
+    }
+  });
+}
+function createWebTools(client, options = {}) {
+  return [createWebSearchTool(client, options), createWebFetchTool(client, options)];
+}
 
 // src/mcp/json-schema.ts
 function label(path) {
@@ -7807,6 +7968,8 @@ exports.RETRYABLE_STATUS_CODES = RETRYABLE_STATUS_CODES;
 exports.ResponsesModule = ResponsesModule;
 exports.ToolCallAccumulator = ToolCallAccumulator;
 exports.ToolRegistry = ToolRegistry;
+exports.WEB_FETCH_TOOL_NAME = WEB_FETCH_TOOL_NAME;
+exports.WEB_SEARCH_TOOL_NAME = WEB_SEARCH_TOOL_NAME;
 exports.addSpanEvent = addSpanEvent;
 exports.applySkill = applySkill;
 exports.batchEmbed = batchEmbed;
@@ -7823,6 +7986,9 @@ exports.createDecision = createDecision;
 exports.createModelAffinityScheduler = createModelAffinityScheduler;
 exports.createOllamaCloudFreeTierQuota = createOllamaCloudFreeTierQuota;
 exports.createTimeoutSignal = createTimeoutSignal;
+exports.createWebFetchTool = createWebFetchTool;
+exports.createWebSearchTool = createWebSearchTool;
+exports.createWebTools = createWebTools;
 exports.defineTool = defineTool;
 exports.detectModelCapabilities = detectModelCapabilities;
 exports.embedBatchOverflowMessage = embedBatchOverflowMessage;
@@ -7839,6 +8005,8 @@ exports.fetchWithBackoff = fetchWithBackoff;
 exports.findOversizedEmbedInputs = findOversizedEmbedInputs;
 exports.findRunningModelContextLength = findRunningModelContextLength;
 exports.formatTelemetry = formatTelemetry;
+exports.formatWebFetchResult = formatWebFetchResult;
+exports.formatWebSearchResult = formatWebSearchResult;
 exports.imageStringNeedsResolution = imageStringNeedsResolution;
 exports.inferRuntimeMode = inferRuntimeMode;
 exports.isKeepAliveSugar = isKeepAliveSugar;