@nhtio/adk 1.20260607.2 → 1.20260609.0

package/batteries/llm/ollama/validation.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Runtime validation schema and wrapper for native Ollama adapter options.
+ *
+ * @module @nhtio/adk/batteries/llm/ollama/validation
+ *
+ * @remarks
+ * Schema and call-site wrapper for validating `OllamaAdapterOptions`. Used at construction time
+ * and at the start of every iteration against the merged options shape (stash > executor >
+ * constructor). Throws `E_INVALID_OLLAMA_OPTIONS` on failure — same hard-fail policy as every other
+ * ADK contract.
+ *
+ * Note the deliberate `.unknown(...)` asymmetry: the TOP level is `.unknown(false)` so option typos
+ * fail loud, but the nested `options` (runtime/sampling) block is `.unknown(true)` so new llama.cpp
+ * parameters pass through without a library bump.
+ */
+import type { OllamaAdapterOptions } from "./types";
+/**
+ * Validator schema for `OllamaAdapterOptions`. Used by `validateOptions` at construction time and
+ * again at the start of every iteration after options have been merged (stash > executor >
+ * constructor). Rejects unknown top-level keys so typos fail loud.
+ */
+export declare const ollamaOptionsSchema: import("@nhtio/validation").ObjectSchema<OllamaAdapterOptions>;
+/**
+ * Validates an arbitrary input against `ollamaOptionsSchema` and returns the resolved options
+ * shape. Throws `E_INVALID_OLLAMA_OPTIONS` (carrying the validator's error report on `cause`) on
+ * failure.
+ *
+ * @param input - The raw options object to validate.
+ * @returns The resolved options object with defaults filled in.
+ */
+export declare const validateOptions: (input: unknown) => OllamaAdapterOptions;

package/batteries/llm/ollama/validation.mjs

@@ -0,0 +1,127 @@
+import { i as byteStoreSchema } from "../../../common-DYDUi99O.mjs";
+import "../../../guards.mjs";
+import { E_INVALID_OLLAMA_OPTIONS } from "./exceptions.mjs";
+import { validator } from "@nhtio/validation";
+//#region src/batteries/llm/ollama/validation.ts
+var jsonSchemaSchema = validator.object().unknown(true);
+var bucketLabelSchema = validator.string().valid("standingInstructions", "memories", "retrievables", "timeline");
+var bucketOrderSchema = validator.array().items(bucketLabelSchema).unique().default([
+	"standingInstructions",
+	"memories",
+	"retrievables",
+	"timeline"
+]);
+var tokenEncodingSchema = validator.alternatives(validator.string().valid("gpt2", "r50k_base", "p50k_base", "p50k_edit", "cl100k_base", "o200k_base", "gemini", "llama2", "claude"), validator.any().valid(null).optional()).default(null);
+var retrySchema = validator.object({
+	maxAttempts: validator.number().integer().min(1).default(1),
+	baseDelayMs: validator.number().integer().min(0).default(500),
+	maxDelayMs: validator.number().integer().min(1).default(3e4),
+	retriableStatuses: validator.array().items(validator.number().integer().min(100).max(599)).default([
+		429,
+		502,
+		503,
+		504
+	]),
+	honorRetryAfter: validator.boolean().default(true)
+}).unknown(false);
+var helperSchema = validator.function();
+var helpersSchema = validator.object({
+	descriptionToChatCompletionsJsonSchema: helperSchema.optional(),
+	renderUntrustedContent: helperSchema.optional(),
+	renderTrustedContent: helperSchema.optional(),
+	renderStandingInstructions: helperSchema.optional(),
+	renderMemories: helperSchema.optional(),
+	renderRetrievables: helperSchema.optional(),
+	renderRetrievableSafetyDirective: helperSchema.optional(),
+	renderFirstPartyRetrievables: helperSchema.optional(),
+	renderThirdPartyPublicRetrievables: helperSchema.optional(),
+	renderThirdPartyPrivateRetrievables: helperSchema.optional(),
+	renderThought: helperSchema.optional(),
+	filterThoughts: helperSchema.optional(),
+	toolsToChatCompletionsTools: helperSchema.optional(),
+	renderChatCompletionsSystemPrompt: helperSchema.optional(),
+	renderOllamaTimelineMessage: helperSchema.optional(),
+	renderOllamaToolCallResult: helperSchema.optional(),
+	buildOllamaHistory: helperSchema.optional()
+}).unknown(false);
+var thinkSchema = validator.alternatives(validator.boolean(), validator.string().valid("low", "medium", "high"));
+var formatSchema = validator.alternatives(validator.string().valid("json"), jsonSchemaSchema);
+var keepAliveSchema = validator.alternatives(validator.string(), validator.number());
+var stopSchema = validator.alternatives(validator.string(), validator.array().items(validator.string()));
+var runtimeOptionsSchema = validator.object({
+	num_ctx: validator.number().integer().min(1).optional(),
+	temperature: validator.number().min(0).optional(),
+	top_p: validator.number().min(0).max(1).optional(),
+	top_k: validator.number().integer().min(0).optional(),
+	min_p: validator.number().min(0).max(1).optional(),
+	typical_p: validator.number().min(0).max(1).optional(),
+	seed: validator.number().integer().optional(),
+	stop: stopSchema.optional(),
+	num_predict: validator.number().integer().optional(),
+	num_keep: validator.number().integer().min(0).optional(),
+	repeat_penalty: validator.number().optional(),
+	repeat_last_n: validator.number().integer().optional(),
+	presence_penalty: validator.number().optional(),
+	frequency_penalty: validator.number().optional(),
+	penalize_newline: validator.boolean().optional(),
+	num_batch: validator.number().integer().min(1).optional(),
+	num_gpu: validator.number().integer().min(0).optional(),
+	main_gpu: validator.number().integer().min(0).optional(),
+	num_thread: validator.number().integer().min(1).optional(),
+	numa: validator.boolean().optional(),
+	use_mmap: validator.boolean().optional()
+}).unknown(true);
+/**
+* Validator schema for `OllamaAdapterOptions`. Used by `validateOptions` at construction time and
+* again at the start of every iteration after options have been merged (stash > executor >
+* constructor). Rejects unknown top-level keys so typos fail loud.
+*/
+var ollamaOptionsSchema = validator.object({
+	apiKey: validator.string().optional(),
+	baseURL: validator.string().optional(),
+	headers: validator.object().pattern(validator.string(), validator.string()).optional(),
+	fetch: validator.function().optional(),
+	stream: validator.boolean().default(true),
+	streamIdleTimeoutMs: validator.number().integer().min(0).default(0),
+	requestTimeoutMs: validator.number().integer().min(0).default(0),
+	retry: retrySchema.optional(),
+	bucketOrder: bucketOrderSchema,
+	contextWindow: validator.number().integer().min(1).optional(),
+	selfIdentity: validator.string().min(1).default("assistant"),
+	thoughtSurfacing: validator.string().valid("all-self", "latest-self", "all").default("all-self"),
+	tokenEncoding: tokenEncodingSchema,
+	replayCompatibility: validator.array().items(validator.string().min(1)).default([]),
+	helpers: helpersSchema.optional(),
+	spoolStore: byteStoreSchema.optional(),
+	autoAck: validator.boolean().default(false),
+	unsupportedMediaPolicy: validator.alternatives(validator.string().valid("throw", "fallback-stash", "synthetic-description"), validator.object({
+		mode: validator.string().valid("fallback-stash").required(),
+		stashKeys: validator.array().items(validator.string().min(1)).required()
+	}).unknown(false)).default("throw"),
+	model: validator.string().required(),
+	think: thinkSchema.optional(),
+	format: formatSchema.optional(),
+	options: runtimeOptionsSchema.optional(),
+	keep_alive: keepAliveSchema.optional()
+}).unknown(false);
+var formatValidationDetails = (err) => err.details.map((d) => d.message).join(" and ");
+/**
+* Validates an arbitrary input against `ollamaOptionsSchema` and returns the resolved options
+* shape. Throws `E_INVALID_OLLAMA_OPTIONS` (carrying the validator's error report on `cause`) on
+* failure.
+*
+* @param input - The raw options object to validate.
+* @returns The resolved options object with defaults filled in.
+*/
+var validateOptions = (input) => {
+	const { value, error } = ollamaOptionsSchema.validate(input, {
+		abortEarly: false,
+		convert: false
+	});
+	if (error) throw new E_INVALID_OLLAMA_OPTIONS([formatValidationDetails(error)], { cause: error });
+	return value;
+};
+//#endregion
+export { ollamaOptionsSchema, validateOptions };
+
+//# sourceMappingURL=validation.mjs.map

package/batteries/llm/ollama/validation.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validation.mjs","names":[],"sources":["../../../../src/batteries/llm/ollama/validation.ts"],"sourcesContent":["/**\n * Runtime validation schema and wrapper for native Ollama adapter options.\n *\n * @module @nhtio/adk/batteries/llm/ollama/validation\n *\n * @remarks\n * Schema and call-site wrapper for validating `OllamaAdapterOptions`. Used at construction time\n * and at the start of every iteration against the merged options shape (stash > executor >\n * constructor). Throws `E_INVALID_OLLAMA_OPTIONS` on failure — same hard-fail policy as every other\n * ADK contract.\n *\n * Note the deliberate `.unknown(...)` asymmetry: the TOP level is `.unknown(false)` so option typos\n * fail loud, but the nested `options` (runtime/sampling) block is `.unknown(true)` so new llama.cpp\n * parameters pass through without a library bump.\n */\n\nimport { isError } from '@nhtio/adk/guards'\nimport { byteStoreSchema } from '@nhtio/adk/common'\nimport { E_INVALID_OLLAMA_OPTIONS } from './exceptions'\nimport { validator, ValidationError } from '@nhtio/validation'\nimport type { OllamaAdapterOptions } from './types'\n\n// ─── Sub-schemas ──────────────────────────────────────────────────────────────\n\nconst jsonSchemaSchema = validator.object().unknown(true)\n\nconst bucketLabelSchema = validator\n  .string()\n  .valid('standingInstructions', 'memories', 'retrievables', 'timeline')\n\nconst bucketOrderSchema = validator\n  .array()\n  .items(bucketLabelSchema)\n  .unique()\n  .default(['standingInstructions', 'memories', 'retrievables', 'timeline'])\n\nconst tokenEncodingSchema = validator\n  .alternatives(\n    validator\n      .string()\n      .valid(\n        'gpt2',\n        'r50k_base',\n        'p50k_base',\n        'p50k_edit',\n        'cl100k_base',\n        'o200k_base',\n        'gemini',\n        'llama2',\n        'claude'\n      ),\n    // `tokenEncoding?: TokenEncoding | null` — OPTIONAL: a valid encoding string, explicit null, or\n    // absent (undefined = \"no token counting\"). `.optional()` makes the null/undefined disposition\n    // explicit per adk/require-validator-any-required, without rejecting the legitimate \"omitted\"\n    // case.\n    validator.any().valid(null).optional()\n  )\n  .default(null)\n\nconst retrySchema = validator\n  .object({\n    maxAttempts: validator.number().integer().min(1).default(1),\n    baseDelayMs: validator.number().integer().min(0).default(500),\n    maxDelayMs: validator.number().integer().min(1).default(30_000),\n    retriableStatuses: validator\n      .array()\n      .items(validator.number().integer().min(100).max(599))\n      .default([429, 502, 503, 504]),\n    honorRetryAfter: validator.boolean().default(true),\n  })\n  .unknown(false)\n\nconst helperSchema = validator.function()\n\nconst helpersSchema = validator\n  .object({\n    descriptionToChatCompletionsJsonSchema: helperSchema.optional(),\n    renderUntrustedContent: helperSchema.optional(),\n    renderTrustedContent: helperSchema.optional(),\n    renderStandingInstructions: helperSchema.optional(),\n    renderMemories: helperSchema.optional(),\n    renderRetrievables: helperSchema.optional(),\n    renderRetrievableSafetyDirective: helperSchema.optional(),\n    renderFirstPartyRetrievables: helperSchema.optional(),\n    renderThirdPartyPublicRetrievables: helperSchema.optional(),\n    renderThirdPartyPrivateRetrievables: helperSchema.optional(),\n    renderThought: helperSchema.optional(),\n    filterThoughts: helperSchema.optional(),\n    toolsToChatCompletionsTools: helperSchema.optional(),\n    renderChatCompletionsSystemPrompt: helperSchema.optional(),\n    renderOllamaTimelineMessage: helperSchema.optional(),\n    renderOllamaToolCallResult: helperSchema.optional(),\n    buildOllamaHistory: helperSchema.optional(),\n  })\n  .unknown(false)\n\n// ─── Native request-body sub-schemas ──────────────────────────────────────────\n\nconst thinkSchema = validator.alternatives(\n  validator.boolean(),\n  validator.string().valid('low', 'medium', 'high')\n)\n\nconst formatSchema = validator.alternatives(validator.string().valid('json'), jsonSchemaSchema)\n\nconst keepAliveSchema = validator.alternatives(validator.string(), validator.number())\n\nconst stopSchema = validator.alternatives(\n  validator.string(),\n  validator.array().items(validator.string())\n)\n\n// Nested runtime/sampling options block. `.unknown(true)` — the ONLY place unknown keys are\n// allowed — so new llama.cpp parameters pass through without a library bump.\nconst runtimeOptionsSchema = validator\n  .object({\n    num_ctx: validator.number().integer().min(1).optional(),\n    temperature: validator.number().min(0).optional(),\n    top_p: validator.number().min(0).max(1).optional(),\n    top_k: validator.number().integer().min(0).optional(),\n    min_p: validator.number().min(0).max(1).optional(),\n    typical_p: validator.number().min(0).max(1).optional(),\n    seed: validator.number().integer().optional(),\n    stop: stopSchema.optional(),\n    num_predict: validator.number().integer().optional(),\n    num_keep: validator.number().integer().min(0).optional(),\n    repeat_penalty: validator.number().optional(),\n    repeat_last_n: validator.number().integer().optional(),\n    presence_penalty: validator.number().optional(),\n    frequency_penalty: validator.number().optional(),\n    penalize_newline: validator.boolean().optional(),\n    num_batch: validator.number().integer().min(1).optional(),\n    num_gpu: validator.number().integer().min(0).optional(),\n    main_gpu: validator.number().integer().min(0).optional(),\n    num_thread: validator.number().integer().min(1).optional(),\n    numa: validator.boolean().optional(),\n    use_mmap: validator.boolean().optional(),\n  })\n  .unknown(true)\n\n// ─── Top-level schema ─────────────────────────────────────────────────────────\n\n/**\n * Validator schema for `OllamaAdapterOptions`. Used by `validateOptions` at construction time and\n * again at the start of every iteration after options have been merged (stash > executor >\n * constructor). Rejects unknown top-level keys so typos fail loud.\n */\nexport const ollamaOptionsSchema = validator\n  .object<OllamaAdapterOptions>({\n    // ADK control\n    apiKey: validator.string().optional(),\n    baseURL: validator.string().optional(),\n    headers: validator.object().pattern(validator.string(), validator.string()).optional(),\n    fetch: validator.function().optional(),\n    stream: validator.boolean().default(true),\n    streamIdleTimeoutMs: validator.number().integer().min(0).default(0),\n    requestTimeoutMs: validator.number().integer().min(0).default(0),\n    retry: retrySchema.optional(),\n    bucketOrder: bucketOrderSchema,\n    contextWindow: validator.number().integer().min(1).optional(),\n    selfIdentity: validator.string().min(1).default('assistant'),\n    thoughtSurfacing: validator\n      .string()\n      .valid('all-self', 'latest-self', 'all')\n      .default('all-self'),\n    tokenEncoding: tokenEncodingSchema,\n    replayCompatibility: validator.array().items(validator.string().min(1)).default([]),\n    helpers: helpersSchema.optional(),\n    spoolStore: byteStoreSchema.optional(),\n    // Opt-in: the executor only self-acks tool-call-free responses when true. Default false hands\n    // turn-completion control to the implementor's output pipeline.\n    autoAck: validator.boolean().default(false),\n    unsupportedMediaPolicy: validator\n      .alternatives(\n        validator.string().valid('throw', 'fallback-stash', 'synthetic-description'),\n        validator\n          .object({\n            mode: validator.string().valid('fallback-stash').required(),\n            stashKeys: validator.array().items(validator.string().min(1)).required(),\n          })\n          .unknown(false)\n      )\n      .default('throw'),\n\n    // Native /api/chat request body\n    model: validator.string().required(),\n    think: thinkSchema.optional(),\n    format: formatSchema.optional(),\n    options: runtimeOptionsSchema.optional(),\n    keep_alive: keepAliveSchema.optional(),\n  })\n  .unknown(false)\n\nconst isValidationError = (value: unknown): value is ValidationError =>\n  isError(value) && Array.isArray((value as ValidationError).details)\n\nconst formatValidationDetails = (err: ValidationError): string =>\n  err.details.map((d) => d.message).join(' and ')\n\n/**\n * Validates an arbitrary input against `ollamaOptionsSchema` and returns the resolved options\n * shape. Throws `E_INVALID_OLLAMA_OPTIONS` (carrying the validator's error report on `cause`) on\n * failure.\n *\n * @param input - The raw options object to validate.\n * @returns The resolved options object with defaults filled in.\n */\nexport const validateOptions = (input: unknown): OllamaAdapterOptions => {\n  const { value, error } = ollamaOptionsSchema.validate(input, {\n    abortEarly: false,\n    convert: false,\n  })\n  if (error) {\n    throw new E_INVALID_OLLAMA_OPTIONS([formatValidationDetails(error)], { cause: error })\n  }\n  return value as OllamaAdapterOptions\n}\n\n// suppress unused import warning when the alias isn't referenced\nvoid isValidationError\n"],"mappings":"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"}

package/batteries/llm/ollama.cjs

@@ -0,0 +1,54 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("../../chunk-Ble4zEEl.js");
+const require_helpers = require("../../helpers-DSTFxTiC.js");
+const require_batteries_llm_ollama_exceptions = require("./ollama/exceptions.cjs");
+const require_batteries_llm_ollama_validation = require("./ollama/validation.cjs");
+const require_batteries_llm_ollama_helpers = require("./ollama/helpers.cjs");
+const require_batteries_llm_ollama_adapter = require("./ollama/adapter.cjs");
+exports.E_INVALID_OLLAMA_OPTIONS = require_batteries_llm_ollama_exceptions.E_INVALID_OLLAMA_OPTIONS;
+exports.E_OLLAMA_CONTEXT_OVERFLOW = require_batteries_llm_ollama_exceptions.E_OLLAMA_CONTEXT_OVERFLOW;
+exports.E_OLLAMA_HTTP_ERROR = require_batteries_llm_ollama_exceptions.E_OLLAMA_HTTP_ERROR;
+exports.E_OLLAMA_INVALID_TOOL_CALL_ARGS = require_batteries_llm_ollama_exceptions.E_OLLAMA_INVALID_TOOL_CALL_ARGS;
+exports.E_OLLAMA_REQUEST_TIMEOUT = require_batteries_llm_ollama_exceptions.E_OLLAMA_REQUEST_TIMEOUT;
+exports.E_OLLAMA_STREAM_ERROR = require_batteries_llm_ollama_exceptions.E_OLLAMA_STREAM_ERROR;
+exports.E_OLLAMA_STREAM_STALLED = require_batteries_llm_ollama_exceptions.E_OLLAMA_STREAM_STALLED;
+exports.E_OLLAMA_UNSUPPORTED_MEDIA_MODALITY = require_batteries_llm_ollama_exceptions.E_OLLAMA_UNSUPPORTED_MEDIA_MODALITY;
+exports.OllamaAdapter = require_batteries_llm_ollama_adapter.OllamaAdapter;
+exports.buildOllamaHistory = require_batteries_llm_ollama_helpers.buildOllamaHistory;
+exports.defaultBuildOllamaHistory = require_batteries_llm_ollama_helpers.defaultBuildOllamaHistory;
+exports.defaultDescriptionToChatCompletionsJsonSchema = require_helpers.defaultDescriptionToChatCompletionsJsonSchema;
+exports.defaultFilterThoughts = require_helpers.defaultFilterThoughts;
+exports.defaultOllamaToolsFromTools = require_batteries_llm_ollama_helpers.defaultOllamaToolsFromTools;
+exports.defaultRenderChatCompletionsSystemPrompt = require_helpers.defaultRenderChatCompletionsSystemPrompt;
+exports.defaultRenderFirstPartyRetrievables = require_helpers.defaultRenderFirstPartyRetrievables;
+exports.defaultRenderMemories = require_helpers.defaultRenderMemories;
+exports.defaultRenderOllamaTimelineMessage = require_batteries_llm_ollama_helpers.defaultRenderOllamaTimelineMessage;
+exports.defaultRenderOllamaToolCallResult = require_batteries_llm_ollama_helpers.defaultRenderOllamaToolCallResult;
+exports.defaultRenderRetrievableSafetyDirective = require_helpers.defaultRenderRetrievableSafetyDirective;
+exports.defaultRenderRetrievables = require_helpers.defaultRenderRetrievables;
+exports.defaultRenderStandingInstructions = require_helpers.defaultRenderStandingInstructions;
+exports.defaultRenderThirdPartyPrivateRetrievables = require_helpers.defaultRenderThirdPartyPrivateRetrievables;
+exports.defaultRenderThirdPartyPublicRetrievables = require_helpers.defaultRenderThirdPartyPublicRetrievables;
+exports.defaultRenderThought = require_helpers.defaultRenderThought;
+exports.defaultRenderTrustedContent = require_helpers.defaultRenderTrustedContent;
+exports.defaultRenderUntrustedContent = require_helpers.defaultRenderUntrustedContent;
+exports.defaultToolsToChatCompletionsTools = require_helpers.defaultToolsToChatCompletionsTools;
+exports.descriptionToChatCompletionsJsonSchema = require_helpers.descriptionToChatCompletionsJsonSchema;
+exports.filterThoughts = require_helpers.filterThoughts;
+exports.ollamaOptionsSchema = require_batteries_llm_ollama_validation.ollamaOptionsSchema;
+exports.ollamaToolsFromTools = require_batteries_llm_ollama_helpers.ollamaToolsFromTools;
+exports.renderChatCompletionsSystemPrompt = require_helpers.renderChatCompletionsSystemPrompt;
+exports.renderFirstPartyRetrievables = require_helpers.renderFirstPartyRetrievables;
+exports.renderMemories = require_helpers.renderMemories;
+exports.renderOllamaTimelineMessage = require_batteries_llm_ollama_helpers.renderOllamaTimelineMessage;
+exports.renderOllamaToolCallResult = require_batteries_llm_ollama_helpers.renderOllamaToolCallResult;
+exports.renderRetrievableSafetyDirective = require_helpers.renderRetrievableSafetyDirective;
+exports.renderRetrievables = require_helpers.renderRetrievables;
+exports.renderStandingInstructions = require_helpers.renderStandingInstructions;
+exports.renderThirdPartyPrivateRetrievables = require_helpers.renderThirdPartyPrivateRetrievables;
+exports.renderThirdPartyPublicRetrievables = require_helpers.renderThirdPartyPublicRetrievables;
+exports.renderThought = require_helpers.renderThought;
+exports.renderTrustedContent = require_helpers.renderTrustedContent;
+exports.renderUntrustedContent = require_helpers.renderUntrustedContent;
+exports.toolsToChatCompletionsTools = require_helpers.toolsToChatCompletionsTools;
+exports.validateOptions = require_batteries_llm_ollama_validation.validateOptions;

package/batteries/llm/ollama.mjs

@@ -0,0 +1,6 @@
+import { C as renderRetrievables, D as renderThought, E as renderThirdPartyPublicRetrievables, M as toolsToChatCompletionsTools, O as renderTrustedContent, S as renderRetrievableSafetyDirective, T as renderThirdPartyPrivateRetrievables, _ as filterThoughts, a as defaultRenderMemories, b as renderFirstPartyRetrievables, c as defaultRenderStandingInstructions, d as defaultRenderThought, f as defaultRenderTrustedContent, h as descriptionToChatCompletionsJsonSchema, i as defaultRenderFirstPartyRetrievables, k as renderUntrustedContent, l as defaultRenderThirdPartyPrivateRetrievables, m as defaultToolsToChatCompletionsTools, n as defaultFilterThoughts, o as defaultRenderRetrievableSafetyDirective, p as defaultRenderUntrustedContent, r as defaultRenderChatCompletionsSystemPrompt, s as defaultRenderRetrievables, t as defaultDescriptionToChatCompletionsJsonSchema, u as defaultRenderThirdPartyPublicRetrievables, w as renderStandingInstructions, x as renderMemories, y as renderChatCompletionsSystemPrompt } from "../../helpers-xhrQbMAG.mjs";
+import { E_INVALID_OLLAMA_OPTIONS, E_OLLAMA_CONTEXT_OVERFLOW, E_OLLAMA_HTTP_ERROR, E_OLLAMA_INVALID_TOOL_CALL_ARGS, E_OLLAMA_REQUEST_TIMEOUT, E_OLLAMA_STREAM_ERROR, E_OLLAMA_STREAM_STALLED, E_OLLAMA_UNSUPPORTED_MEDIA_MODALITY } from "./ollama/exceptions.mjs";
+import { ollamaOptionsSchema, validateOptions } from "./ollama/validation.mjs";
+import { buildOllamaHistory, defaultBuildOllamaHistory, defaultOllamaToolsFromTools, defaultRenderOllamaTimelineMessage, defaultRenderOllamaToolCallResult, ollamaToolsFromTools, renderOllamaTimelineMessage, renderOllamaToolCallResult } from "./ollama/helpers.mjs";
+import { OllamaAdapter } from "./ollama/adapter.mjs";
+export { E_INVALID_OLLAMA_OPTIONS, E_OLLAMA_CONTEXT_OVERFLOW, E_OLLAMA_HTTP_ERROR, E_OLLAMA_INVALID_TOOL_CALL_ARGS, E_OLLAMA_REQUEST_TIMEOUT, E_OLLAMA_STREAM_ERROR, E_OLLAMA_STREAM_STALLED, E_OLLAMA_UNSUPPORTED_MEDIA_MODALITY, OllamaAdapter, buildOllamaHistory, defaultBuildOllamaHistory, defaultDescriptionToChatCompletionsJsonSchema, defaultFilterThoughts, defaultOllamaToolsFromTools, defaultRenderChatCompletionsSystemPrompt, defaultRenderFirstPartyRetrievables, defaultRenderMemories, defaultRenderOllamaTimelineMessage, defaultRenderOllamaToolCallResult, defaultRenderRetrievableSafetyDirective, defaultRenderRetrievables, defaultRenderStandingInstructions, defaultRenderThirdPartyPrivateRetrievables, defaultRenderThirdPartyPublicRetrievables, defaultRenderThought, defaultRenderTrustedContent, defaultRenderUntrustedContent, defaultToolsToChatCompletionsTools, descriptionToChatCompletionsJsonSchema, filterThoughts, ollamaOptionsSchema, ollamaToolsFromTools, renderChatCompletionsSystemPrompt, renderFirstPartyRetrievables, renderMemories, renderOllamaTimelineMessage, renderOllamaToolCallResult, renderRetrievableSafetyDirective, renderRetrievables, renderStandingInstructions, renderThirdPartyPrivateRetrievables, renderThirdPartyPublicRetrievables, renderThought, renderTrustedContent, renderUntrustedContent, toolsToChatCompletionsTools, validateOptions };

package/batteries/llm/openai_chat_completions/adapter.cjs

@@ -1,15 +1,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../../../chunk-Ble4zEEl.js");
-const require_tool_registry = require("../../../tool_registry-DYUYqXvo.js");
-const require_thought = require("../../../thought-BbwhJ1wb.js");
-const require_spooled_artifact = require("../../../spooled_artifact-BTq6Nzfy.js");
-require("../../../common-Cj8TaQ9U.js");
-const require_tool_call = require("../../../tool_call-Db68hB7y.js");
+const require_tool_registry = require("../../../tool_registry-CKJPze3j.js");
+const require_thought = require("../../../thought-DLwpF7MI.js");
+const require_spooled_artifact = require("../../../spooled_artifact-DX8LLyUX.js");
+require("../../../common-DZl3ADJs.js");
+const require_tool_call = require("../../../tool_call-DixVlW40.js");
 require("../../../guards.cjs");
 const require_lib_utils_retry = require("../../../lib/utils/retry.cjs");
 const require_batteries_llm_openai_chat_completions_exceptions = require("./exceptions.cjs");
 const require_batteries_llm_openai_chat_completions_validation = require("./validation.cjs");
 const require_batteries_storage_in_memory = require("../../storage/in_memory.cjs");
+const require_helpers = require("../../../helpers-DSTFxTiC.js");
 const require_batteries_llm_openai_chat_completions_helpers = require("./helpers.cjs");
 let luxon = require("luxon");
 let js_sha256 = require("js-sha256");
@@ -142,21 +143,21 @@ var mergeOptions = (baseline, exec, stash) => {
 var resolveHelpers = (overrides) => {
 	const src = overrides ?? {};
 	return {
-		descriptionToChatCompletionsJsonSchema: src.descriptionToChatCompletionsJsonSchema ?? require_batteries_llm_openai_chat_completions_helpers.defaultDescriptionToChatCompletionsJsonSchema,
-		renderUntrustedContent: src.renderUntrustedContent ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderUntrustedContent,
-		renderTrustedContent: src.renderTrustedContent ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderTrustedContent,
-		renderStandingInstructions: src.renderStandingInstructions ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderStandingInstructions,
-		renderMemories: src.renderMemories ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderMemories,
-		renderRetrievables: src.renderRetrievables ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderRetrievables,
-		renderRetrievableSafetyDirective: src.renderRetrievableSafetyDirective ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderRetrievableSafetyDirective,
-		renderFirstPartyRetrievables: src.renderFirstPartyRetrievables ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderFirstPartyRetrievables,
-		renderThirdPartyPublicRetrievables: src.renderThirdPartyPublicRetrievables ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderThirdPartyPublicRetrievables,
-		renderThirdPartyPrivateRetrievables: src.renderThirdPartyPrivateRetrievables ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderThirdPartyPrivateRetrievables,
+		descriptionToChatCompletionsJsonSchema: src.descriptionToChatCompletionsJsonSchema ?? require_helpers.defaultDescriptionToChatCompletionsJsonSchema,
+		renderUntrustedContent: src.renderUntrustedContent ?? require_helpers.defaultRenderUntrustedContent,
+		renderTrustedContent: src.renderTrustedContent ?? require_helpers.defaultRenderTrustedContent,
+		renderStandingInstructions: src.renderStandingInstructions ?? require_helpers.defaultRenderStandingInstructions,
+		renderMemories: src.renderMemories ?? require_helpers.defaultRenderMemories,
+		renderRetrievables: src.renderRetrievables ?? require_helpers.defaultRenderRetrievables,
+		renderRetrievableSafetyDirective: src.renderRetrievableSafetyDirective ?? require_helpers.defaultRenderRetrievableSafetyDirective,
+		renderFirstPartyRetrievables: src.renderFirstPartyRetrievables ?? require_helpers.defaultRenderFirstPartyRetrievables,
+		renderThirdPartyPublicRetrievables: src.renderThirdPartyPublicRetrievables ?? require_helpers.defaultRenderThirdPartyPublicRetrievables,
+		renderThirdPartyPrivateRetrievables: src.renderThirdPartyPrivateRetrievables ?? require_helpers.defaultRenderThirdPartyPrivateRetrievables,
 		renderTimelineMessage: src.renderTimelineMessage ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderTimelineMessage,
-		renderThought: src.renderThought ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderThought,
-		filterThoughts: src.filterThoughts ?? require_batteries_llm_openai_chat_completions_helpers.defaultFilterThoughts,
-		toolsToChatCompletionsTools: src.toolsToChatCompletionsTools ?? require_batteries_llm_openai_chat_completions_helpers.defaultToolsToChatCompletionsTools,
-		renderChatCompletionsSystemPrompt: src.renderChatCompletionsSystemPrompt ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderChatCompletionsSystemPrompt,
+		renderThought: src.renderThought ?? require_helpers.defaultRenderThought,
+		filterThoughts: src.filterThoughts ?? require_helpers.defaultFilterThoughts,
+		toolsToChatCompletionsTools: src.toolsToChatCompletionsTools ?? require_helpers.defaultToolsToChatCompletionsTools,
+		renderChatCompletionsSystemPrompt: src.renderChatCompletionsSystemPrompt ?? require_helpers.defaultRenderChatCompletionsSystemPrompt,
 		renderChatCompletionsToolCallResult: src.renderChatCompletionsToolCallResult ?? require_batteries_llm_openai_chat_completions_helpers.defaultRenderChatCompletionsToolCallResult,
 		buildChatCompletionsHistory: src.buildChatCompletionsHistory ?? require_batteries_llm_openai_chat_completions_helpers.defaultBuildChatCompletionsHistory,
 		createChatCompletionsToolCallDeltaAccumulator: src.createChatCompletionsToolCallDeltaAccumulator ?? require_batteries_llm_openai_chat_completions_helpers.defaultCreateChatCompletionsToolCallDeltaAccumulator
@@ -451,6 +452,22 @@ var OpenAIChatCompletionsAdapter = class OpenAIChatCompletionsAdapter {
 							detail: require_tool_registry.isError(err) ? err.message : String(err)
 						}
 					});
+					if (attempt < maxAttempts) {
+						const delay = require_lib_utils_retry.computeBackoff(attempt, retryCfg);
+						helpers.log.debug({
+							kind: "retry-attempt",
+							message: `Retrying after transport failure in ~${delay}ms (attempt ${attempt + 1}/${maxAttempts})`,
+							payload: {
+								reason: "transport-error",
+								delayMs: delay,
+								attempt: attempt + 1,
+								maxAttempts
+							}
+						});
+						await require_lib_utils_retry.sleepWithJitter(delay, ctx.abortSignal);
+						attempt += 1;
+						continue;
+					}
 					ctx.nack(new require_batteries_llm_openai_chat_completions_exceptions.E_OPENAI_CHAT_COMPLETIONS_HTTP_ERROR([0, require_tool_registry.isError(err) ? err.message : String(err)]));
 					return;
 				}