@nemesis-oss/ollama-sdk 1.6.0 → 1.8.0

package/dist/index.js

@@ -182,6 +182,35 @@ var OllamaRequestValidationError = class extends OllamaClientError {
     this.issues = options.issues;
   }
 };
+var OllamaRequestTooLargeError = class extends OllamaClientError {
+  operationId;
+  actualBytes;
+  maxBytes;
+  constructor(message, options) {
+    super(message, { ...options, code: "request_too_large", retryable: false, status: 413 });
+    this.operationId = options.operationId;
+    this.actualBytes = options.actualBytes;
+    this.maxBytes = options.maxBytes;
+  }
+};
+var OllamaResponseValidationError = class extends OllamaClientError {
+  operationId;
+  issues;
+  constructor(message, options) {
+    super(message, { ...options, code: "response_validation_error", retryable: false });
+    this.operationId = options.operationId;
+    this.issues = options.issues;
+  }
+};
+var OllamaServerVersionUnknownError = class extends OllamaClientError {
+  operationId;
+  minRequiredVersion;
+  constructor(message, options) {
+    super(message, { ...options, code: "server_version_unknown", retryable: false });
+    this.operationId = options.operationId;
+    this.minRequiredVersion = options.minRequiredVersion;
+  }
+};
 var OllamaToolTimeoutError = class extends OllamaClientError {
   toolName;
   timeoutMs;
@@ -237,10 +266,12 @@ var OllamaAgentMaxIterationsError = class extends OllamaClientError {
 var OllamaMcpError = class extends OllamaClientError {
   mcpMethod;
   toolName;
+  issues;
   constructor(message, options) {
     super(message, { ...options, code: "mcp_error", retryable: options.retryable ?? false });
     this.mcpMethod = options.mcpMethod;
     this.toolName = options.toolName;
+    this.issues = options.issues;
   }
 };
 var OllamaSkillNotFoundError = class extends OllamaClientError {
@@ -1883,8 +1914,9 @@ var ModelsClient = class {
         { singleEndpoint: true }
       );
       return true;
-    } catch {
-      return false;
+    } catch (err) {
+      if (err instanceof OllamaNotFoundError) return false;
+      throw err;
     }
   }
 };
@@ -2794,28 +2826,45 @@ var ChatRequestSchema = z.object({
   logprobs: z.boolean().optional(),
   top_logprobs: z.number().optional()
 });
-var GenerateRequestSchema = z.object({
-  model: z.string(),
-  prompt: z.string().optional(),
-  suffix: z.string().optional(),
-  images: z.array(z.string()).optional(),
-  format: z.union([z.string(), z.object({})]).optional(),
-  system: z.string().optional(),
-  stream: z.boolean().optional(),
-  think: ThinkValueSchema.optional(),
-  raw: z.boolean().optional(),
-  keep_alive: z.union([z.string(), z.number()]).optional(),
-  options: ModelOptionsSchema.optional(),
-  logprobs: z.boolean().optional(),
-  top_logprobs: z.number().optional()
+var TokenLogprobSchema = z.object({
+  token: z.string().optional(),
+  logprob: z.number().optional(),
+  bytes: z.array(z.number()).optional()
 });
-var EmbedRequestSchema = z.object({
-  model: z.string(),
-  input: z.union([z.string(), z.array(z.string())]),
-  truncate: z.boolean().optional(),
-  dimensions: z.number().optional(),
-  keep_alive: z.string().optional(),
-  options: ModelOptionsSchema.optional()
+
+// src/generated/models/Logprob.schema.ts
+var LogprobSchema = z.object({
+  token: z.string().optional(),
+  logprob: z.number().optional(),
+  bytes: z.array(z.number()).optional(),
+  top_logprobs: z.array(TokenLogprobSchema).optional()
+});
+
+// src/generated/models/ChatResponse.schema.ts
+var ChatResponseSchema = z.object({
+  model: z.string().optional(),
+  created_at: z.string().optional(),
+  message: z.object({
+    role: z.enum(["assistant"]).optional(),
+    content: z.string().optional(),
+    thinking: z.string().optional(),
+    tool_calls: z.array(ToolCallSchema).optional(),
+    images: z.array(z.string()).optional()
+  }).optional(),
+  done: z.boolean().optional(),
+  done_reason: z.string().optional(),
+  total_duration: z.number().optional(),
+  load_duration: z.number().optional(),
+  prompt_eval_count: z.number().optional(),
+  prompt_eval_cached_count: z.number().optional(),
+  prompt_eval_duration: z.number().optional(),
+  eval_count: z.number().optional(),
+  eval_duration: z.number().optional(),
+  logprobs: z.array(LogprobSchema).optional()
+});
+var CopyRequestSchema = z.object({
+  source: z.string(),
+  destination: z.string()
 });
 var CreateRequestSchema = z.object({
   model: z.string(),
@@ -2834,13 +2883,91 @@ var CreateRequestSchema = z.object({
   requires: z.string().optional(),
   stream: z.boolean().optional()
 });
-var CopyRequestSchema = z.object({
-  source: z.string(),
-  destination: z.string()
-});
 var DeleteRequestSchema = z.object({
   model: z.string()
 });
+var EmbedRequestSchema = z.object({
+  model: z.string(),
+  input: z.union([z.string(), z.array(z.string())]),
+  truncate: z.boolean().optional(),
+  dimensions: z.number().optional(),
+  keep_alive: z.string().optional(),
+  options: ModelOptionsSchema.optional()
+});
+var EmbedResponseSchema = z.object({
+  model: z.string().optional(),
+  embeddings: z.array(z.array(z.number())).optional(),
+  total_duration: z.number().optional(),
+  load_duration: z.number().optional(),
+  prompt_eval_count: z.number().optional()
+});
+var GenerateRequestSchema = z.object({
+  model: z.string(),
+  prompt: z.string().optional(),
+  suffix: z.string().optional(),
+  images: z.array(z.string()).optional(),
+  format: z.union([z.string(), z.object({})]).optional(),
+  system: z.string().optional(),
+  stream: z.boolean().optional(),
+  think: ThinkValueSchema.optional(),
+  raw: z.boolean().optional(),
+  keep_alive: z.union([z.string(), z.number()]).optional(),
+  options: ModelOptionsSchema.optional(),
+  logprobs: z.boolean().optional(),
+  top_logprobs: z.number().optional()
+});
+var GenerateResponseSchema = z.object({
+  model: z.string().optional(),
+  created_at: z.string().optional(),
+  response: z.string().optional(),
+  thinking: z.string().optional(),
+  done: z.boolean().optional(),
+  done_reason: z.string().optional(),
+  total_duration: z.number().optional(),
+  load_duration: z.number().optional(),
+  prompt_eval_count: z.number().optional(),
+  prompt_eval_cached_count: z.number().optional(),
+  prompt_eval_duration: z.number().optional(),
+  eval_count: z.number().optional(),
+  eval_duration: z.number().optional(),
+  logprobs: z.array(LogprobSchema).optional()
+});
+var ModelSummarySchema = z.object({
+  name: z.string().optional(),
+  model: z.string().optional(),
+  remote_model: z.string().optional(),
+  remote_host: z.string().optional(),
+  modified_at: z.string().optional(),
+  size: z.number().optional(),
+  digest: z.string().optional(),
+  details: z.object({
+    format: z.string().optional(),
+    family: z.string().optional(),
+    families: z.array(z.string()).optional(),
+    parameter_size: z.string().optional(),
+    quantization_level: z.string().optional()
+  }).optional()
+});
+
+// src/generated/models/ListResponse.schema.ts
+var ListResponseSchema = z.object({
+  models: z.array(ModelSummarySchema).optional()
+});
+var PsSchema = z.object({
+  name: z.string().optional(),
+  model: z.string().optional(),
+  size: z.number().optional(),
+  digest: z.string().optional(),
+  details: z.object({}).optional(),
+  expires_at: z.string().optional(),
+  size_vram: z.number().optional(),
+  context_length: z.number().optional()
+});
+
+// src/generated/models/PsResponse.schema.ts
+var PsResponseSchema = z.object({
+  models: z.array(PsSchema).optional()
+});
 var PullRequestSchema = z.object({
   model: z.string(),
   insecure: z.boolean().optional(),
@@ -2855,27 +2982,164 @@ var ShowRequestSchema = z.object({
   model: z.string(),
   verbose: z.boolean().optional()
 });
+var ThinkingSchema = z.object({
+  values: z.array(z.union([z.boolean(), z.string()])),
+  default: z.union([z.boolean(), z.string()])
+});
+
+// src/generated/models/ShowResponse.schema.ts
+var ShowResponseSchema = z.object({
+  thinking: ThinkingSchema.optional(),
+  parameters: z.string().optional(),
+  license: z.string().optional(),
+  modified_at: z.string().optional(),
+  details: z.object({}).optional(),
+  template: z.string().optional(),
+  capabilities: z.array(z.string()).optional(),
+  model_info: z.object({}).optional()
+});
+var StatusResponseSchema = z.object({
+  status: z.string().optional()
+});
+var SystemOneContentSchema = z.union([
+  z.string().regex(new RegExp("\\S")),
+  z.object({}).catchall(z.unknown()),
+  z.array(z.unknown())
+]);
+
+// src/generated/models/SystemOneChoiceQuestion.schema.ts
+var SystemOneChoiceQuestionSchema = z.object({
+  type: z.enum(["choice"]),
+  instructions: SystemOneContentSchema,
+  criteria: z.object({}).catchall(z.union([z.string(), 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)), {
+    message: 'property names must match pattern "\\S"'
+  })
+});
+var SystemOneNoulQuestionSchema = z.object({
+  type: z.enum(["noul"]),
+  instructions: SystemOneContentSchema,
+  criteria: z.object({
+    false: z.string().optional(),
+    true: z.string().optional()
+  }).optional()
+});
+var SystemOneScoreQuestionSchema = z.object({
+  type: z.enum(["score"]),
+  instructions: SystemOneContentSchema,
+  criteria: z.array(z.string()).min(2).max(26)
+});
+
+// src/generated/models/SystemOneRequest.schema.ts
+var SystemOneRequestSchema = z.object({
+  model: z.string().regex(new RegExp("\\S")),
+  state: SystemOneContentSchema,
+  images: z.array(z.string()).optional(),
+  questions: z.object({}).catchall(
+    z.union([
+      SystemOneChoiceQuestionSchema,
+      SystemOneNoulQuestionSchema,
+      SystemOneScoreQuestionSchema
+    ])
+  ).refine((v) => Object.keys(v).length >= 1, { message: "must have at least 1 properties" }).refine((v) => Object.keys(v).length <= 64, { message: "must have at most 64 properties" }).refine((v) => Object.keys(v).every((k) => new RegExp("\\S").test(k)), {
+    message: 'property names must match pattern "\\S"'
+  }),
+  keep_alive: z.union([z.string(), z.number()]).optional()
+});
+var SystemOneConfidenceSchema = z.number().min(0).max(1);
+var SystemOneProbabilitiesSchema = z.object({}).catchall(z.number().min(0).max(1));
+
+// src/generated/models/SystemOneChoiceAnswer.schema.ts
+var SystemOneChoiceAnswerSchema = z.object({
+  type: z.enum(["choice"]),
+  choice: z.string(),
+  probabilities: SystemOneProbabilitiesSchema,
+  confidence: SystemOneConfidenceSchema
+});
+var SystemOneNoulAnswerSchema = z.object({
+  type: z.enum(["noul"]),
+  noul: z.number().min(0).max(1)
+});
+var SystemOneScoreAnswerSchema = z.object({
+  type: z.enum(["score"]),
+  score: z.number().min(0).max(25),
+  legend: z.object({}).catchall(z.string()),
+  probabilities: SystemOneProbabilitiesSchema,
+  confidence: SystemOneConfidenceSchema
+});
+
+// src/generated/models/SystemOneResponse.schema.ts
+var SystemOneResponseSchema = z.object({
+  model: z.string(),
+  answers: z.object({}).catchall(
+    z.union([SystemOneChoiceAnswerSchema, SystemOneNoulAnswerSchema, SystemOneScoreAnswerSchema])
+  ),
+  usage: z.object({
+    input_tokens: z.number().min(0),
+    output_tokens: z.number().min(0)
+  })
+});
+var VersionResponseSchema = z.object({
+  version: z.string().optional()
+});
+var WebFetchRequestSchema = z.object({
+  url: z.string()
+});
+var WebFetchResponseSchema = z.object({
+  title: z.string().optional(),
+  content: z.string().optional(),
+  links: z.array(z.string()).optional()
+});
+var WebSearchRequestSchema = z.object({
+  query: z.string(),
+  max_results: z.number().min(1).max(10).optional()
+});
+var WebSearchResultSchema = z.object({
+  title: z.string().optional(),
+  url: z.string().optional(),
+  content: z.string().optional()
+});
+
+// src/generated/models/WebSearchResponse.schema.ts
+var WebSearchResponseSchema = z.object({
+  results: z.array(WebSearchResultSchema).optional()
+});
 
 // src/generated/runtime/schema-registry.ts
 var requestSchemas = {
   chat: ChatRequestSchema,
-  generate: GenerateRequestSchema,
-  embed: EmbedRequestSchema,
-  create: CreateRequestSchema,
   copy: CopyRequestSchema,
+  create: CreateRequestSchema,
   delete: DeleteRequestSchema,
+  embed: EmbedRequestSchema,
+  generate: GenerateRequestSchema,
   pull: PullRequestSchema,
   push: PushRequestSchema,
-  show: ShowRequestSchema
-  // Operations without a registered request schema (blobs, ps, tags,
-  // version, systemOne, openai*, anthropic*) skip validation. This is
-  // deliberate — the OpenAPI spec doesn't define request bodies for
-  // GET/HEAD operations, and the compat-surface request schemas (OpenAI,
-  // Anthropic) are richer than what the IR currently models.
+  show: ShowRequestSchema,
+  systemOne: SystemOneRequestSchema,
+  webFetch: WebFetchRequestSchema,
+  webSearch: WebSearchRequestSchema
+};
+var responseSchemas = {
+  chat: ChatResponseSchema,
+  create: StatusResponseSchema,
+  embed: EmbedResponseSchema,
+  generate: GenerateResponseSchema,
+  ps: PsResponseSchema,
+  pull: StatusResponseSchema,
+  push: StatusResponseSchema,
+  show: ShowResponseSchema,
+  systemOne: SystemOneResponseSchema,
+  tags: ListResponseSchema,
+  version: VersionResponseSchema,
+  webFetch: WebFetchResponseSchema,
+  webSearch: WebSearchResponseSchema
 };
 function getRequestSchema(operationId) {
   return requestSchemas[operationId];
 }
+function getResponseSchema(operationId) {
+  return responseSchemas[operationId];
+}
 
 // src/generated/runtime/runtime.ts
 function compareVersions(a, b) {
@@ -2888,18 +3152,13 @@ function compareVersions(a, b) {
   }
   return 0;
 }
-function assertOperationAllowed(operation, options) {
-  const localMode = options.localMode ?? true;
-  if (!localMode && !operation.environment.cloud) {
-    throw new OllamaGenericClientError(
-      `Operation ${operation.operationId} (${operation.method} ${operation.path}) is local-only and not supported in cloud mode.`
-    );
-  }
-  if (operation.constraints?.minOllamaVersion && options.serverVersion && compareVersions(options.serverVersion, operation.constraints.minOllamaVersion) < 0) {
-    throw new OllamaGenericClientError(
-      `Operation ${operation.operationId} (${operation.method} ${operation.path}) requires Ollama >= ${operation.constraints.minOllamaVersion} (server reports ${options.serverVersion}).`
-    );
-  }
+async function fetchServerVersion(http) {
+  const result = await http.request({
+    path: "/api/version",
+    method: "GET"
+  });
+  if (result && typeof result.version === "string") return result.version;
+  return void 0;
 }
 function shouldStream(req) {
   if (req.body && typeof req.body === "object" && "stream" in req.body) {
@@ -2922,6 +3181,35 @@ var OllamaRuntime = class {
     this.options = options;
   }
   options;
+  /**
+   * Cached promise of the Ollama server version, populated lazily the first
+   * time a version-gated operation is invoked. `undefined` until then.
+   *
+   * Wave 12 (P0 #5): see {@link OllamaRuntimeOptions.enforceVersion}.
+   */
+  serverVersionCache;
+  /**
+   * Wave 15 (P0): resolve the HTTP backend for a given operation.
+   *
+   * Operations with a declared `host` (e.g. web search/fetch at
+   * https://ollama.com) must route to a HttpClient pointed at that host,
+   * not the default one. The runtime accepts an optional `cloudHttp`
+   * backend for this purpose — if the operation declares a host and no
+   * cloud backend is configured, the runtime throws rather than silently
+   * sending the request to the wrong server.
+   */
+  resolveHttpBackend(operation) {
+    if (operation.host) {
+      const cloudHttp = this.options.cloudHttp;
+      if (!cloudHttp) {
+        throw new OllamaGenericClientError(
+          `Operation ${operation.operationId} (${operation.method} ${operation.path}) targets host "${operation.host}" but the runtime has no cloudHttp backend configured. Use OllamaClient.webSearch() / OllamaClient.webFetch() for cloud-hosted operations, or construct OllamaRuntime with a cloudHttp option.`
+        );
+      }
+      return cloudHttp;
+    }
+    return this.options.http;
+  }
   /**
    * Invoke an operation. Called by every generated API method.
    *
@@ -2930,7 +3218,7 @@ var OllamaRuntime = class {
    * class's overloads pick the right return type at compile time.
    */
   async invoke(req) {
-    assertOperationAllowed(req.operation, this.options);
+    await this.assertOperationAllowed(req.operation);
     let body = buildBody(req);
     if (this.options.validateRequests === true && body !== void 0) {
       const schema = getRequestSchema(req.operation.operationId);
@@ -2949,32 +3237,668 @@ var OllamaRuntime = class {
         body = result.data;
       }
     }
+    if (body !== void 0) {
+      const serialized = serializeForByteCount(body);
+      const hasImages = bodyHasImages(body);
+      const maxBytesWithImages = req.operation.constraints?.maxRequestBytesWithImages;
+      const maxBytesBase = req.operation.constraints?.maxRequestBytes;
+      const applicableLimit = hasImages && maxBytesWithImages !== void 0 ? maxBytesWithImages : maxBytesBase;
+      if (applicableLimit !== void 0 && serialized.byteLength > applicableLimit) {
+        throw new OllamaRequestTooLargeError(
+          `Operation ${req.operation.operationId} (${req.operation.method} ${req.operation.path}) request body is ${serialized.byteLength} bytes, exceeding the contract limit of ${applicableLimit} bytes` + (hasImages ? " (images limit)." : "."),
+          {
+            operationId: req.operation.operationId,
+            actualBytes: serialized.byteLength,
+            maxBytes: applicableLimit,
+            request: { method: req.operation.method, url: req.operation.path }
+          }
+        );
+      }
+    }
     const streaming = shouldStream(req);
+    const resolvedPath = resolvePathParams(req.operation.path, req.pathParams);
+    const model = req.model ?? extractModelFromBody(body);
     const httpReq = {
-      path: req.operation.path,
+      path: resolvedPath,
       method: req.operation.method,
       ...body !== void 0 ? { body } : {},
       ...req.signal !== void 0 ? { signal: req.signal } : {},
-      // For streaming calls, request the raw Response so we can pipe it
-      // through parseNdjsonStream directly. This inherits middleware,
-      // retry, telemetry, and error-mapping from HttpClient — the
-      // previous Wave 3 implementation bypassed them with a direct
-      // `fetch()` call.
-      ...streaming ? { raw: true } : {}
+      ...streaming ? { raw: true } : {},
+      ...model !== void 0 ? { model } : {}
     };
     if (!streaming) {
-      return await this.options.http.request(httpReq);
+      const result = await this.resolveHttpBackend(req.operation).request(httpReq);
+      if (this.options.validateResponses === true) {
+        const responseSchema = getResponseSchema(req.operation.operationId);
+        if (responseSchema) {
+          const result2 = responseSchema.safeParse(result);
+          if (!result2.success) {
+            throw new OllamaResponseValidationError(
+              `Response validation failed for operation "${req.operation.operationId}" (${req.operation.method} ${req.operation.path}): ` + result2.error.issues.map((i) => `${i.path.join(".") || "<root>"}: ${i.message}`).join("; "),
+              {
+                operationId: req.operation.operationId,
+                issues: result2.error.issues,
+                request: { method: req.operation.method, url: req.operation.path }
+              }
+            );
+          }
+        }
+      }
+      return result;
     }
-    const response = await this.options.http.request(httpReq);
+    const response = await this.resolveHttpBackend(req.operation).request(httpReq);
     if (!response.body) {
       throw new OllamaGenericClientError(
         `Operation ${req.operation.operationId}: streaming response had no body.`
       );
     }
-    return parseNdjsonStream(response.body);
+    return parseStreamByMode(req.operation.transport.mode, response.body);
+  }
+  /**
+   * Apply environment + version guards before delegating to HttpClient.
+   *
+   * Throws {@link OllamaGenericClientError} when:
+   *   - The operation is local-only and the runtime is in cloud mode.
+   *   - The operation has `constraints.minOllamaVersion` and the server is older.
+   *
+   * Wave 12 (P0 #5): when `minOllamaVersion` is declared but the runtime's
+   * `serverVersion` is unknown AND `enforceVersion` is `'auto'` or
+   * `'strict'`, the runtime lazily fetches `/api/version` (cached on the
+   * runtime instance) so the constraint is actually enforced even when the
+   * caller didn't supply it. Previously the constraint was only enforced
+   * when `serverVersion` was manually supplied — meaning in practice it was
+   * almost never enforced.
+   */
+  async assertOperationAllowed(operation) {
+    const localMode = this.options.localMode ?? true;
+    if (!localMode && !operation.environment.cloud) {
+      throw new OllamaGenericClientError(
+        `Operation ${operation.operationId} (${operation.method} ${operation.path}) is local-only and not supported in cloud mode.`
+      );
+    }
+    const minVersion = operation.constraints?.minOllamaVersion;
+    if (!minVersion) return;
+    let serverVersion = this.options.serverVersion;
+    const policy = this.options.enforceVersion ?? "auto";
+    if (!serverVersion && policy !== "off") {
+      if (!this.serverVersionCache) {
+        const p = fetchServerVersion(this.options.http).catch((err) => {
+          if (policy === "strict") {
+            throw new OllamaServerVersionUnknownError(
+              `Operation ${operation.operationId} requires Ollama >= ${minVersion} but the runtime could not determine the server version (enforceVersion: 'strict').`,
+              {
+                operationId: operation.operationId,
+                minRequiredVersion: minVersion,
+                cause: err
+              }
+            );
+          }
+          return void 0;
+        });
+        this.serverVersionCache = p;
+      }
+      serverVersion = await this.serverVersionCache ?? void 0;
+    }
+    if (serverVersion && compareVersions(serverVersion, minVersion) < 0) {
+      throw new OllamaGenericClientError(
+        `Operation ${operation.operationId} (${operation.method} ${operation.path}) requires Ollama >= ${minVersion} (server reports ${serverVersion}).`
+      );
+    }
+  }
+};
+function parseStreamByMode(mode, body) {
+  if (mode === "ndjson") {
+    return parseNdjsonStream(body);
+  }
+  if (mode === "sse") {
+    return parseSseStreamAsJson(body);
+  }
+  throw new OllamaGenericClientError(
+    `Transport mode "${mode}" is not a streaming mode; cannot parse a stream for it.`
+  );
+}
+async function* parseSseStreamAsJson(body) {
+  for await (const event of parseSseStream(body)) {
+    const data = event.data;
+    if (!data) continue;
+    if (data === "[DONE]") return;
+    try {
+      yield JSON.parse(data);
+    } catch (err) {
+      throw new OllamaGenericClientError(`Failed to parse SSE event data as JSON: ${data}`, {
+        cause: err
+      });
+    }
+  }
+}
+function serializeForByteCount(body) {
+  if (body instanceof Uint8Array) return body;
+  if (typeof body === "string") return new TextEncoder().encode(body);
+  const json = JSON.stringify(body);
+  return new TextEncoder().encode(json);
+}
+function bodyHasImages(body) {
+  if (typeof body !== "object" || body === null) return false;
+  const obj = body;
+  const images = obj.images;
+  return Array.isArray(images) && images.length > 0;
+}
+function resolvePathParams(pathTemplate, pathParams) {
+  if (!pathTemplate.includes("{")) return pathTemplate;
+  const params = pathParams ?? {};
+  return pathTemplate.replace(/\{([^}]+)\}/g, (_match, name) => {
+    const value = params[name];
+    if (value === void 0) {
+      throw new OllamaGenericClientError(
+        `Missing path parameter "${name}" for path template "${pathTemplate}". Provide it via the pathParams field on the invoke() request.`
+      );
+    }
+    return encodeURIComponent(value);
+  });
+}
+function extractModelFromBody(body) {
+  if (typeof body !== "object" || body === null) return void 0;
+  const obj = body;
+  const model = obj.model;
+  return typeof model === "string" ? model : void 0;
+}
+
+// src/generated/api/operations.ts
+var blobsOp = {
+  operationId: "blobs",
+  method: "HEAD",
+  path: "/api/blobs/{digest}",
+  environment: { local: true, cloud: false },
+  parameters: [{ name: "digest", in: "path", required: true, schema: { type: "string" } }],
+  transport: { mode: "json", streaming: false },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native",
+  notes: [
+    "HEAD-only endpoint for blob existence checks; declared in OpenAPI but not in the legacy parity manifest."
+  ]
+};
+var chatOp = {
+  operationId: "chat",
+  method: "POST",
+  path: "/api/chat",
+  request: { $ref: "#/schemas/ChatRequest" },
+  response: { $ref: "#/schemas/ChatResponse" },
+  environment: { local: true, cloud: true },
+  transport: { mode: "ndjson", streaming: true, streamingDefault: true },
+  capabilities: {
+    thinking: "model-dependent",
+    tools: "model-dependent",
+    vision: "model-dependent",
+    structuredOutput: "supported",
+    logprobs: "supported"
+  },
+  status: { documented: true },
+  domain: "native",
+  notes: [
+    "Use /api/show to discover model-specific thinking values and defaults.",
+    "Structured output (format field) is rejected by Ollama Cloud."
+  ]
+};
+var copyOp = {
+  operationId: "copy",
+  method: "POST",
+  path: "/api/copy",
+  request: { $ref: "#/schemas/CopyRequest" },
+  environment: { local: true, cloud: false },
+  transport: { mode: "json", streaming: false },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native"
+};
+var createOp = {
+  operationId: "create",
+  method: "POST",
+  path: "/api/create",
+  request: { $ref: "#/schemas/CreateRequest" },
+  response: { $ref: "#/schemas/StatusResponse" },
+  environment: { local: true, cloud: false },
+  transport: { mode: "ndjson", streaming: true, streamingDefault: true },
+  capabilities: { thinking: "unsupported", tools: "unsupported" },
+  status: { documented: true },
+  domain: "native",
+  notes: ["Model creation is local-only; Ollama Cloud does not support it."]
+};
+var deleteOp = {
+  operationId: "delete",
+  method: "DELETE",
+  path: "/api/delete",
+  request: { $ref: "#/schemas/DeleteRequest" },
+  environment: { local: true, cloud: false },
+  transport: { mode: "json", streaming: false },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native"
+};
+var embedOp = {
+  operationId: "embed",
+  method: "POST",
+  path: "/api/embed",
+  request: { $ref: "#/schemas/EmbedRequest" },
+  response: { $ref: "#/schemas/EmbedResponse" },
+  environment: { local: true, cloud: true },
+  transport: { mode: "json", streaming: false },
+  capabilities: { embeddings: "supported" },
+  status: { documented: true },
+  domain: "native"
+};
+var generateOp = {
+  operationId: "generate",
+  method: "POST",
+  path: "/api/generate",
+  request: { $ref: "#/schemas/GenerateRequest" },
+  response: { $ref: "#/schemas/GenerateResponse" },
+  environment: { local: true, cloud: true },
+  transport: { mode: "ndjson", streaming: true, streamingDefault: true },
+  capabilities: {
+    thinking: "model-dependent",
+    vision: "supported",
+    structuredOutput: "supported",
+    logprobs: "supported"
+  },
+  status: { documented: true },
+  domain: "native"
+};
+var psOp = {
+  operationId: "ps",
+  method: "GET",
+  path: "/api/ps",
+  response: { $ref: "#/schemas/PsResponse" },
+  environment: { local: true, cloud: true },
+  transport: { mode: "json", streaming: false },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native"
+};
+var pullOp = {
+  operationId: "pull",
+  method: "POST",
+  path: "/api/pull",
+  request: { $ref: "#/schemas/PullRequest" },
+  response: { $ref: "#/schemas/StatusResponse" },
+  environment: { local: true, cloud: false },
+  transport: { mode: "ndjson", streaming: true, streamingDefault: true },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native"
+};
+var pushOp = {
+  operationId: "push",
+  method: "POST",
+  path: "/api/push",
+  request: { $ref: "#/schemas/PushRequest" },
+  response: { $ref: "#/schemas/StatusResponse" },
+  environment: { local: true, cloud: false },
+  transport: { mode: "ndjson", streaming: true, streamingDefault: true },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native"
+};
+var showOp = {
+  operationId: "show",
+  method: "POST",
+  path: "/api/show",
+  request: { $ref: "#/schemas/ShowRequest" },
+  response: { $ref: "#/schemas/ShowResponse" },
+  environment: { local: true, cloud: true },
+  transport: { mode: "json", streaming: false },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native",
+  notes: [
+    "Capabilities source: /api/show is the runtime source of truth for model-dependent capability values (tools, vision, thinking, embeddings)."
+  ]
+};
+var systemOneOp = {
+  operationId: "systemOne",
+  method: "POST",
+  path: "/v1/systemone",
+  request: { $ref: "#/schemas/SystemOneRequest" },
+  response: { $ref: "#/schemas/SystemOneResponse" },
+  environment: { local: true, cloud: false },
+  transport: { mode: "json", streaming: false },
+  capabilities: {
+    thinking: "unsupported",
+    tools: "unsupported",
+    vision: "model-dependent",
+    structuredOutput: "unsupported",
+    logprobs: "unsupported",
+    embeddings: "unsupported"
+  },
+  constraints: {
+    minOllamaVersion: "0.35.0",
+    maxRequestBytes: 65536,
+    maxRequestBytesWithImages: 33554432
+  },
+  status: { documented: true, experimental: true },
+  domain: "native",
+  notes: [
+    "Local-only; Ollama Cloud rejects /v1/systemone.",
+    "64 KiB request limit without images, 32 MiB with images (includes JSON/base64 overhead).",
+    "No tools, no generation controls (temperature, top_p, etc.).",
+    "Vision is model-dependent: images are accepted by vision-weighted models (Clef/Clef Flash) but not by text-only models.",
+    "Experimental: behavioral surface may change between Ollama releases."
+  ]
+};
+var tagsOp = {
+  operationId: "tags",
+  method: "GET",
+  path: "/api/tags",
+  response: { $ref: "#/schemas/ListResponse" },
+  environment: { local: true, cloud: true },
+  transport: { mode: "json", streaming: false },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native"
+};
+var versionOp = {
+  operationId: "version",
+  method: "GET",
+  path: "/api/version",
+  response: { $ref: "#/schemas/VersionResponse" },
+  environment: { local: true, cloud: true },
+  transport: { mode: "json", streaming: false },
+  capabilities: {},
+  status: { documented: true },
+  domain: "native"
+};
+
+// src/generated/api/native-api.ts
+var NativeApi = class {
+  constructor(runtime) {
+    this.runtime = runtime;
+  }
+  runtime;
+  blobs(digest, options) {
+    return this.runtime.invoke({
+      operation: blobsOp,
+      body: void 0,
+      pathParams: { digest },
+      ...options?.signal !== void 0 ? { signal: options.signal } : {}
+    });
+  }
+  chat(request) {
+    return this.runtime.invoke({
+      operation: chatOp,
+      body: request,
+      streamingDefault: true
+    });
+  }
+  copy(request) {
+    return this.runtime.invoke({
+      operation: copyOp,
+      body: request
+    });
+  }
+  create(request) {
+    return this.runtime.invoke({
+      operation: createOp,
+      body: request,
+      streamingDefault: true
+    });
+  }
+  delete(request) {
+    return this.runtime.invoke({
+      operation: deleteOp,
+      body: request
+    });
+  }
+  embed(request) {
+    return this.runtime.invoke({
+      operation: embedOp,
+      body: request
+    });
+  }
+  generate(request) {
+    return this.runtime.invoke({
+      operation: generateOp,
+      body: request,
+      streamingDefault: true
+    });
+  }
+  ps(options) {
+    return this.runtime.invoke({
+      operation: psOp,
+      body: void 0,
+      ...options?.signal !== void 0 ? { signal: options.signal } : {}
+    });
+  }
+  pull(request) {
+    return this.runtime.invoke({
+      operation: pullOp,
+      body: request,
+      streamingDefault: true
+    });
+  }
+  push(request) {
+    return this.runtime.invoke({
+      operation: pushOp,
+      body: request,
+      streamingDefault: true
+    });
+  }
+  show(request) {
+    return this.runtime.invoke({
+      operation: showOp,
+      body: request
+    });
+  }
+  systemOne(request) {
+    return this.runtime.invoke({
+      operation: systemOneOp,
+      body: request
+    });
+  }
+  tags(options) {
+    return this.runtime.invoke({
+      operation: tagsOp,
+      body: void 0,
+      ...options?.signal !== void 0 ? { signal: options.signal } : {}
+    });
+  }
+  version(options) {
+    return this.runtime.invoke({
+      operation: versionOp,
+      body: void 0,
+      ...options?.signal !== void 0 ? { signal: options.signal } : {}
+    });
   }
 };
 
+// src/failover-http-client.ts
+var FailoverHttpClient = class {
+  constructor(client, baseUrl) {
+    this.client = client;
+    this.baseUrl = baseUrl;
+  }
+  client;
+  /**
+   * The first candidate endpoint's base URL. Used for inferRuntimeMode()
+   * checks (local vs cloud). The actual request routing picks the best
+   * healthy endpoint per call.
+   */
+  baseUrl;
+  /**
+   * Route a request through OllamaClient's failover machinery.
+   *
+   * Each call to request() goes through executeWithFailover, which:
+   *   - Picks the best healthy endpoint from the registry
+   *   - Applies retry/backoff within that endpoint
+   *   - Fails over to the next candidate on retryable errors
+   *   - Reports success/failure to the endpoint health tracker
+   *
+   * Wave 15 (P1): the model is extracted from the request body by the
+   * runtime and passed via the `model` field on the options. This lets
+   * the failover layer filter endpoints by `OllamaEndpoint.models`
+   * (credential-scoped routing). If no model is provided, all endpoints
+   * are considered.
+   *
+   * The `raw` option (for streaming responses) is passed through
+   * unchanged — executeWithFailover returns whatever the operation
+   * callback returns, including raw Response objects.
+   */
+  async request(options) {
+    const { model, ...httpOptions } = options;
+    return this.client.executeWithFailover(
+      async (http, signal) => {
+        const mergedOptions = {
+          ...httpOptions,
+          ...httpOptions.signal !== void 0 ? { signal } : { signal }
+        };
+        return http.request(mergedOptions);
+      },
+      {
+        singleEndpoint: false,
+        ...model !== void 0 ? { model } : {}
+      }
+    );
+  }
+};
+
+// src/decision.ts
+function createDecision(client) {
+  return {
+    async choice(params) {
+      const response = await client.systemOne({
+        model: params.model,
+        state: params.state,
+        ...params.images ? { images: params.images } : {},
+        questions: {
+          decision: {
+            type: "choice",
+            instructions: params.instructions,
+            criteria: params.criteria
+          }
+        },
+        ...params.keepAlive !== void 0 ? { keep_alive: params.keepAlive } : {}
+      });
+      const answer = response.answers.decision;
+      return {
+        choice: answer.choice,
+        probabilities: answer.probabilities,
+        confidence: answer.confidence,
+        usage: response.usage
+      };
+    },
+    async noul(params) {
+      const response = await client.systemOne({
+        model: params.model,
+        state: params.state,
+        ...params.images ? { images: params.images } : {},
+        questions: {
+          decision: {
+            type: "noul",
+            instructions: params.instructions
+          }
+        },
+        ...params.keepAlive !== void 0 ? { keep_alive: params.keepAlive } : {}
+      });
+      const answer = response.answers.decision;
+      return {
+        noul: answer.noul,
+        bool: answer.noul >= 0.5,
+        usage: response.usage
+      };
+    },
+    async score(params) {
+      const response = await client.systemOne({
+        model: params.model,
+        state: params.state,
+        ...params.images ? { images: params.images } : {},
+        questions: {
+          decision: {
+            type: "score",
+            instructions: params.instructions,
+            criteria: params.criteria
+          }
+        },
+        ...params.keepAlive !== void 0 ? { keep_alive: params.keepAlive } : {}
+      });
+      const answer = response.answers.decision;
+      return {
+        score: answer.score,
+        legend: answer.legend,
+        probabilities: answer.probabilities,
+        confidence: answer.confidence,
+        usage: response.usage
+      };
+    },
+    async route(params) {
+      const response = await client.systemOne({
+        model: params.model,
+        state: params.state,
+        ...params.images ? { images: params.images } : {},
+        questions: {
+          decision: {
+            type: "choice",
+            instructions: params.instructions,
+            criteria: params.criteria
+          }
+        },
+        ...params.keepAlive !== void 0 ? { keep_alive: params.keepAlive } : {}
+      });
+      const answer = response.answers.decision;
+      return {
+        route: answer.choice,
+        confidence: answer.confidence
+      };
+    },
+    async verify(params) {
+      const state = {
+        claim: params.claim,
+        evidence: params.evidence
+      };
+      const response = await client.systemOne({
+        model: params.model,
+        state,
+        ...params.images ? { images: params.images } : {},
+        questions: {
+          decision: {
+            type: "noul",
+            instructions: params.instructions ?? "Is the claim supported by the evidence?"
+          }
+        },
+        ...params.keepAlive !== void 0 ? { keep_alive: params.keepAlive } : {}
+      });
+      const answer = response.answers.decision;
+      return {
+        verified: answer.noul >= 0.5,
+        probability: answer.noul
+      };
+    },
+    async rank(params) {
+      const promises = params.candidates.map(async (candidate) => {
+        const response = await client.systemOne({
+          model: params.model,
+          state: candidate.state,
+          ...params.images ? { images: params.images } : {},
+          questions: {
+            decision: {
+              type: "score",
+              instructions: params.instructions,
+              criteria: params.criteria
+            }
+          },
+          ...params.keepAlive !== void 0 ? { keep_alive: params.keepAlive } : {}
+        });
+        const answer = response.answers.decision;
+        return {
+          candidate: candidate.id,
+          score: answer.score,
+          confidence: answer.confidence
+        };
+      });
+      const results = await Promise.all(promises);
+      return results.sort((a, b) => b.score - a.score);
+    }
+  };
+}
+
 // src/client.ts
 var logicalRequestSequence = 0;
 function createLogicalRequestId() {
@@ -3035,42 +3959,82 @@ var OllamaClient = class {
    * API with the generated `NativeApi` / `OpenAIApi` / `AnthropicApi`
    * surface without configuring two separate HttpClient instances.
    *
-   * The returned runtime is bound to the registry's first candidate
-   * endpoint (or the resolved single-endpoint config if no `endpoints`
-   * array was provided). For multi-endpoint configs that need per-call
-   * routing, prefer constructing `OllamaRuntime` directly with a
-   * specific HttpClient:
-   *
-   * ```ts
-   * const http = new HttpClient({ baseUrl: 'http://host-a:11434' });
-   * const runtime = new OllamaRuntime({ http });
-   * const api = new NativeApi(runtime);
-   * ```
+   * Wave 14: the runtime now participates in multi-endpoint failover.
+   * Each request is routed through this client's `executeWithFailover`
+   * machinery via a {@link FailoverHttpClient} wrapper. If the first
+   * candidate endpoint is down, requests automatically fail over to
+   * the next healthy candidate — matching the behavior of the
+   * hand-written OllamaClient methods (chat, generate, etc.).
    *
    * The runtime is cached on first call — subsequent calls return the
-   * same instance.
+   * same instance. The `FailoverHttpClient` holds a reference to this
+   * client, so it always sees the current endpoint registry state.
    */
   get runtime() {
     if (this._runtime === void 0) {
       const candidates = this.registry.candidates();
       const endpoint = candidates[0];
       const baseUrl = endpoint?.baseUrl ?? "http://localhost:11434";
-      const http = new HttpClient({
-        baseUrl,
-        ...endpoint?.apiKey !== void 0 ? { apiKey: endpoint.apiKey } : {},
-        ...endpoint?.headers !== void 0 ? { headers: endpoint.headers } : {},
+      const http = new FailoverHttpClient(this, baseUrl);
+      const cloudHttp = new HttpClient({
+        baseUrl: OLLAMA_CLOUD_BASE_URL,
+        ...this.cloudApiKey !== void 0 ? { apiKey: this.cloudApiKey } : {},
         fetch: this.fetchImpl,
         ...this.middleware !== void 0 ? { middleware: this.middleware } : {},
         ...this.onLifecycleEvent !== void 0 ? { onLifecycleEvent: this.onLifecycleEvent } : {}
       });
       this._runtime = new OllamaRuntime({
         http,
+        cloudHttp,
         localMode: inferRuntimeMode(baseUrl) === "local"
       });
     }
     return this._runtime;
   }
   _runtime;
+  /**
+   * Lazily-constructed `NativeApi` bound to this client's runtime. Exposes
+   * the full generated native API surface (chat, generate, embed, systemOne,
+   * etc.) with contract-driven types and runtime enforcement.
+   *
+   * Wave 13: `systemOne()` delegates to this accessor.
+   */
+  get native() {
+    if (this._nativeApi === void 0) {
+      this._nativeApi = new NativeApi(this.runtime);
+    }
+    return this._nativeApi;
+  }
+  _nativeApi;
+  /**
+   * Higher-level System One decision helpers (Wave 14B).
+   *
+   * Ergonomic wrappers around `systemOne()` for the six most common
+   * decision patterns: `choice()`, `noul()`, `score()`, `route()`,
+   * `verify()`, `rank()`. Each constructs a single-question request
+   * and extracts the typed answer.
+   *
+   * ```ts
+   * const result = await client.decision.choice({
+   *   model: 'tev1:4b',
+   *   state: 'Customer was charged twice',
+   *   instructions: 'What is the primary intent?',
+   *   criteria: {
+   *     refund: 'Customer wants a refund',
+   *     duplicate_charge: 'Customer reports multiple charges',
+   *   },
+   * });
+   * console.log(result.choice); // 'duplicate_charge'
+   * console.log(result.confidence); // 0.89
+   * ```
+   */
+  get decision() {
+    if (this._decision === void 0) {
+      this._decision = createDecision(this);
+    }
+    return this._decision;
+  }
+  _decision;
   /**
    * Fail-fast guard for `format` (structured output) requests: throws before any network
    * call if the candidate endpoint is inferred as Ollama Cloud, which does not currently
@@ -3343,6 +4307,43 @@ var OllamaClient = class {
   version = () => this.models.version();
   createBlob = (digest, data) => this.models.createBlob(digest, data);
   checkBlob = (digest) => this.models.checkBlob(digest);
+  // --- System One (Wave 13) ---
+  /**
+   * Ollama's System One decision layer (`POST /v1/systemone`) — evaluates
+   * 1–64 typed questions (choice, noul, or score) against a provided state
+   * and returns typed answers with probabilities and confidence.
+   *
+   * Local-only; requires Ollama >= 0.35.0. The runtime enforces the
+   * version constraint automatically (lazily fetching `/api/version` when
+   * `enforceVersion` is `'auto'` or `'strict'`) and rejects cloud-mode
+   * calls. Request size is checked client-side: 64 KiB without images,
+   * 32 MiB with images.
+   *
+   * The generic `Q` parameter captures the caller's question map at
+   * compile time, giving key-safe answer access:
+   *
+   * ```ts
+   * const result = await ollama.systemOne({
+   *   model: 'tev1:4b',
+   *   state: { ticket: 'Customer was charged twice' },
+   *   questions: {
+   *     intent: { type: 'choice', instructions: '...', criteria: { ... } },
+   *     urgent: { type: 'noul', instructions: '...' },
+   *   },
+   * });
+   * result.answers.intent  // ✓ SystemOneAnswer (choice)
+   * result.answers.urgent  // ✓ SystemOneAnswer (noul)
+   * result.answers.typo    // ✗ TypeScript error
+   * ```
+   *
+   * For the low-level generated API (without the generic wrapper), use
+   * `client.native.systemOne(request)` directly.
+   */
+  async systemOne(request) {
+    return this.native.systemOne(
+      request
+    );
+  }
   // --- Web Endpoints ---
   /**
    * Ollama's hosted web search tool (`POST https://ollama.com/api/web_search`) — a fixed
@@ -4004,6 +5005,22 @@ async function listAllMcpTools(mcpClient, options = {}, signal) {
     const params = cursor !== void 0 ? { cursor } : void 0;
     const requestOptions = signal !== void 0 ? { signal } : void 0;
     const page = await mcpClient.listTools(params, requestOptions);
+    const pageNames = /* @__PURE__ */ new Set();
+    for (const tool of page.tools) {
+      if (pageNames.has(tool.name)) {
+        throw new OllamaMcpError(
+          `MCP tools/list returned duplicate tool name "${tool.name}"`,
+          { mcpMethod: "listTools", toolName: tool.name }
+        );
+      }
+      pageNames.add(tool.name);
+      if (tools.some((existing) => existing.name === tool.name)) {
+        throw new OllamaMcpError(
+          `MCP tools/list returned duplicate tool name "${tool.name}" across pages`,
+          { mcpMethod: "listTools", toolName: tool.name }
+        );
+      }
+    }
     tools.push(...page.tools);
     if (page.nextCursor === void 0) {
       return tools;
@@ -4017,6 +5034,9 @@ async function listAllMcpTools(mcpClient, options = {}, signal) {
   throw new Error("MCP tools/list exceeded maxPages (" + maxPages + ")");
 }
 function formatMcpToolResult(result) {
+  if ("resultType" in result || "task" in result) {
+    return JSON.stringify(result) ?? String(result);
+  }
   const parts = result.content.map((block) => {
     if (block.type === "text" && typeof block.text === "string") {
       return block.text;
@@ -4038,6 +5058,20 @@ function formatMcpToolResult(result) {
   }
   return parts.join("\n");
 }
+function supportsTaskCalls(mcpClient) {
+  return mcpClient.getServerCapabilities?.()?.tasks?.requests?.tools?.call !== void 0;
+}
+function shouldCallAsTask(descriptor, options, serverSupportsTasks) {
+  const support = descriptor.execution?.taskSupport;
+  if (support === "required" && !serverSupportsTasks) {
+    throw new OllamaMcpError(
+      `MCP tool "${descriptor.name}" requires task execution, but the server does not advertise tasks.requests.tools.call`,
+      { mcpMethod: "callTool", toolName: descriptor.name }
+    );
+  }
+  if (!serverSupportsTasks || support === void 0 || support === "forbidden") return false;
+  return support === "required" || options.taskMode === "all-supported";
+}
 function createInputValidator(inputSchema) {
   return z.custom().superRefine((value, ctx) => {
     const issues = validateJsonSchema(value, inputSchema);
@@ -4050,7 +5084,7 @@ function createInputValidator(inputSchema) {
     }
   });
 }
-function convertMcpDescriptorToTool(descriptor, mcpClient, namePrefix = "", resultMode = "text") {
+function convertMcpDescriptorToTool(descriptor, mcpClient, namePrefix = "", resultMode = "text", validateOutputSchema = true, executeAsTask = false, taskTtlMs) {
   const toolName = `${namePrefix}${descriptor.name}`;
   const inputSchema = descriptor.inputSchema ?? { type: "object", properties: {} };
   const properties = inputSchema["properties"] ?? {};
@@ -4070,10 +5104,27 @@ function convertMcpDescriptorToTool(descriptor, mcpClient, namePrefix = "", resu
         const result = await mcpClient.callTool(
           {
             name: descriptor.name,
-            arguments: args
+            arguments: args,
+            ...executeAsTask ? { task: taskTtlMs !== void 0 ? { ttl: taskTtlMs } : {} } : {}
           },
-          context.signal !== void 0 ? { signal: context.signal } : void 0
+          {
+            ...context.signal !== void 0 ? { signal: context.signal } : {},
+            allowInputRequired: true
+          }
         );
+        if (!("resultType" in result) && !("task" in result) && validateOutputSchema && descriptor.outputSchema !== void 0 && result.structuredContent !== void 0) {
+          const issues = validateJsonSchema(result.structuredContent, descriptor.outputSchema);
+          if (issues.length > 0) {
+            throw new OllamaMcpError(
+              `MCP tool "${descriptor.name}" returned structuredContent that violates outputSchema`,
+              {
+                mcpMethod: "tools/call",
+                toolName: descriptor.name,
+                issues
+              }
+            );
+          }
+        }
         return resultMode === "structured" ? result : formatMcpToolResult(result);
       } catch (err) {
         if (err instanceof OllamaMcpError) throw err;
@@ -4096,9 +5147,29 @@ function convertMcpDescriptorToTool(descriptor, mcpClient, namePrefix = "", resu
 }
 async function loadMcpTools(mcpClient, options = {}, signal) {
   try {
+    if (options.taskTtlMs !== void 0 && (!Number.isFinite(options.taskTtlMs) || options.taskTtlMs <= 0)) {
+      throw new RangeError("MCP taskTtlMs must be a positive finite number");
+    }
     const tools = await listAllMcpTools(mcpClient, options, signal);
-    return tools.map((t) => convertMcpDescriptorToTool(t, mcpClient, options.namePrefix, options.resultMode));
+    const serverSupportsTasks = supportsTaskCalls(mcpClient);
+    return tools.map((tool) => {
+      const taskCall = shouldCallAsTask(
+        tool,
+        options,
+        serverSupportsTasks
+      );
+      return convertMcpDescriptorToTool(
+        tool,
+        mcpClient,
+        options.namePrefix,
+        options.resultMode,
+        options.validateOutputSchema ?? true,
+        taskCall,
+        options.taskTtlMs
+      );
+    });
   } catch (err) {
+    if (err instanceof OllamaMcpError) throw err;
     throw new OllamaMcpError("Failed listing MCP tools from client", {
       mcpMethod: "listTools",
       cause: err
@@ -4109,8 +5180,18 @@ async function registerMcpTools(registry, mcpClient, options = {}, signal) {
   const tools = await loadMcpTools(mcpClient, options, signal);
   registry.registerMany(tools);
 }
-
-// src/mcp/bridge.ts
+var taskSchema = z.object({
+  taskId: z.string(),
+  status: z.enum(["working", "input_required", "completed", "failed", "cancelled"]),
+  statusMessage: z.string().optional(),
+  createdAt: z.string(),
+  lastUpdatedAt: z.string(),
+  ttl: z.number().optional(),
+  pollInterval: z.number().optional()
+}).passthrough();
+var callToolResultSchema = z.custom(
+  (value) => typeof value === "object" && value !== null && "content" in value && Array.isArray(value.content)
+);
 var McpBridge = class _McpBridge {
   constructor(client, options = {}) {
     this.client = client;
@@ -4145,6 +5226,50 @@ var McpBridge = class _McpBridge {
   async register(registry, signal) {
     await registry.registerMany(await this.loadTools(signal));
   }
+  /** Refreshes the current MCP tool catalog into an existing registry without clearing local tools. */
+  async refresh(registry, signal) {
+    await registry.registerMany(await this.loadTools(signal));
+  }
+  /** Fetches one legacy MCP task's current status without starting a polling loop. */
+  async getTaskStatus(taskId, signal) {
+    return this.requestTask(
+      "tasks/get",
+      taskId,
+      taskSchema,
+      signal
+    );
+  }
+  /** Retrieves a completed legacy MCP task's result. */
+  async getTaskResult(taskId, signal) {
+    return this.requestTask(
+      "tasks/result",
+      taskId,
+      callToolResultSchema,
+      signal
+    );
+  }
+  /** Cancels one legacy MCP task. */
+  async cancelTask(taskId, signal) {
+    return this.requestTask(
+      "tasks/cancel",
+      taskId,
+      taskSchema,
+      signal
+    );
+  }
+  requestTask(method, taskId, resultSchema, signal) {
+    if (this.client.request === void 0) {
+      throw new OllamaMcpError(
+        `MCP client does not support ${method} requests`,
+        { mcpMethod: method }
+      );
+    }
+    return this.client.request(
+      { method, params: { taskId } },
+      resultSchema,
+      signal !== void 0 ? { signal } : void 0
+    );
+  }
 };
 
 // src/skills/frontmatter.ts
@@ -4370,6 +5495,6 @@ var Agent = class {
   }
 };
 
-export { ATTR_GEN_AI_OPERATION_NAME, ATTR_GEN_AI_REQUEST_MODEL, ATTR_GEN_AI_RESPONSE_MODEL, ATTR_GEN_AI_SYSTEM, ATTR_GEN_AI_TOOL_CALL_ID, ATTR_GEN_AI_TOOL_NAME, ATTR_GEN_AI_USAGE_INPUT_TOKENS, ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_OLLAMA_AGENT_ITERATION, ATTR_OLLAMA_AGENT_MAX_ITERATIONS, ATTR_OLLAMA_ENDPOINT_ATTEMPT, ATTR_OLLAMA_ENDPOINT_NAME, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT, ATTR_URL_FULL, Agent, AnthropicCompatClient, AnthropicMessagesStream, DEFAULT_BACKOFF, DEFAULT_BASE_URL, DEFAULT_FAILOVER_CODES, DEFAULT_RETRY_CONFIG, DEFAULT_TIMEOUT_MS, EndpointRegistry, GEN_AI_SYSTEM_OLLAMA, HttpClient, McpBridge, ModelsClient, NANOS_PER_MS, NANOS_PER_SECOND, NOOP_LOGGER, OLLAMA_CLOUD_BASE_URL, OllamaAbortError, OllamaAgentMaxIterationsError, OllamaAgentMaxToolCallsError, OllamaAuthError, OllamaClient, OllamaClientError, OllamaGenericClientError, OllamaIncompatibleModelError, OllamaMcpError, OllamaModelRoutingError, OllamaNetworkError, OllamaNotFoundError, OllamaQuotaExceededError, OllamaRateLimitError, OllamaRequestValidationError, OllamaServerError, OllamaSkillInvalidError, OllamaSkillNotFoundError, OllamaStream, OllamaTimeoutError, OllamaToolTimeoutError, OllamaToolValidationError, OllamaUnsupportedCapabilityError, OpenAIChatCompletionStream, OpenAICompatClient, OpenAICompletionStream, OpenAIResponsesStream, OpenAIResponsesStreamError, QuotaManager, ToolRegistry, addSpanEvent, applySkill, calculateBackoff, checkEndpointHealth, composeMiddleware, createConsoleLogger, createOllamaCloudFreeTierQuota, createTimeoutSignal, defineTool, detectModelCapabilities, encodeImage, extractUsage, inferRuntimeMode, listAllMcpTools, listAvailableModels, loadMcpTools, mapError, normalizeChatStream, normalizeGenerateStream, normalizeProgressStream, parseFrontmatter, parseNdjsonStream, parseSseStream, parseStructuredOutput, registerMcpTools, resolveCredentialEndpoints, setSpanError, toDataStream, toResponse, toTextStream, withRetry, withSpan, zodToJsonSchema };
+export { ATTR_GEN_AI_OPERATION_NAME, ATTR_GEN_AI_REQUEST_MODEL, ATTR_GEN_AI_RESPONSE_MODEL, ATTR_GEN_AI_SYSTEM, ATTR_GEN_AI_TOOL_CALL_ID, ATTR_GEN_AI_TOOL_NAME, ATTR_GEN_AI_USAGE_INPUT_TOKENS, ATTR_GEN_AI_USAGE_OUTPUT_TOKENS, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_OLLAMA_AGENT_ITERATION, ATTR_OLLAMA_AGENT_MAX_ITERATIONS, ATTR_OLLAMA_ENDPOINT_ATTEMPT, ATTR_OLLAMA_ENDPOINT_NAME, ATTR_SERVER_ADDRESS, ATTR_SERVER_PORT, ATTR_URL_FULL, Agent, AnthropicCompatClient, AnthropicMessagesStream, DEFAULT_BACKOFF, DEFAULT_BASE_URL, DEFAULT_FAILOVER_CODES, DEFAULT_RETRY_CONFIG, DEFAULT_TIMEOUT_MS, EndpointRegistry, GEN_AI_SYSTEM_OLLAMA, HttpClient, McpBridge, ModelsClient, NANOS_PER_MS, NANOS_PER_SECOND, NOOP_LOGGER, OLLAMA_CLOUD_BASE_URL, OllamaAbortError, OllamaAgentMaxIterationsError, OllamaAgentMaxToolCallsError, OllamaAuthError, OllamaClient, OllamaClientError, OllamaGenericClientError, OllamaIncompatibleModelError, OllamaMcpError, OllamaModelRoutingError, OllamaNetworkError, OllamaNotFoundError, OllamaQuotaExceededError, OllamaRateLimitError, OllamaRequestTooLargeError, OllamaRequestValidationError, OllamaResponseValidationError, OllamaServerError, OllamaServerVersionUnknownError, OllamaSkillInvalidError, OllamaSkillNotFoundError, OllamaStream, OllamaTimeoutError, OllamaToolTimeoutError, OllamaToolValidationError, OllamaUnsupportedCapabilityError, OpenAIChatCompletionStream, OpenAICompatClient, OpenAICompletionStream, OpenAIResponsesStream, OpenAIResponsesStreamError, QuotaManager, ToolRegistry, addSpanEvent, applySkill, calculateBackoff, checkEndpointHealth, composeMiddleware, createConsoleLogger, createDecision, createOllamaCloudFreeTierQuota, createTimeoutSignal, defineTool, detectModelCapabilities, encodeImage, extractUsage, inferRuntimeMode, listAllMcpTools, listAvailableModels, loadMcpTools, mapError, normalizeChatStream, normalizeGenerateStream, normalizeProgressStream, parseFrontmatter, parseNdjsonStream, parseSseStream, parseStructuredOutput, registerMcpTools, resolveCredentialEndpoints, setSpanError, toDataStream, toResponse, toTextStream, withRetry, withSpan, zodToJsonSchema };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map