@easynet/agent-model 1.0.66 → 1.0.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/create-agent-model-registry.d.ts +19 -0
- package/dist/api/create-agent-model-registry.d.ts.map +1 -0
- package/dist/{chunk-4OLU43SH.js → chunk-6EQCGQTV.js} +2 -13
- package/dist/chunk-6EQCGQTV.js.map +1 -0
- package/dist/{chunk-EPVJLBGC.js → chunk-AUQEXHUP.js} +2 -15
- package/dist/chunk-AUQEXHUP.js.map +1 -0
- package/dist/{chunk-K3JR2N4E.js → chunk-KE7IMUSA.js} +2 -29
- package/dist/chunk-KE7IMUSA.js.map +1 -0
- package/dist/chunk-MFLWZSWI.js +17 -0
- package/dist/chunk-MFLWZSWI.js.map +1 -0
- package/dist/{chunk-HSU6XZOI.js → chunk-RRZDREGU.js} +3 -3
- package/dist/cli/index.js +252 -8
- package/dist/cli/index.js.map +1 -1
- package/dist/config/index.js +44 -7
- package/dist/config/index.js.map +1 -1
- package/dist/connectivity/index.js +1 -2
- package/dist/extensions/index.js +3 -5
- package/dist/index.d.ts +3 -57
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +191 -109
- package/dist/index.js.map +1 -1
- package/dist/langchain/index.js +1 -2
- package/dist/model/index.js +172 -5
- package/dist/model/index.js.map +1 -1
- package/dist/npm/index.js +1 -2
- package/dist/registry/index.js +0 -2
- package/package.json +1 -33
- package/dist/chunk-4OLU43SH.js.map +0 -1
- package/dist/chunk-5QOKZ2JF.js +0 -83
- package/dist/chunk-5QOKZ2JF.js.map +0 -1
- package/dist/chunk-EPVJLBGC.js.map +0 -1
- package/dist/chunk-HCU4AWIV.js +0 -19
- package/dist/chunk-HCU4AWIV.js.map +0 -1
- package/dist/chunk-K3JR2N4E.js.map +0 -1
- package/dist/chunk-PZ5AY32C.js +0 -10
- package/dist/chunk-PZ5AY32C.js.map +0 -1
- package/dist/chunk-WMEFXWNS.js +0 -260
- package/dist/chunk-WMEFXWNS.js.map +0 -1
- package/dist/chunk-YOOYQBGK.js +0 -43
- package/dist/chunk-YOOYQBGK.js.map +0 -1
- package/dist/chunk-Z4E7LN4P.js +0 -205
- package/dist/chunk-Z4E7LN4P.js.map +0 -1
- /package/dist/{chunk-HSU6XZOI.js.map → chunk-RRZDREGU.js.map} +0 -0
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { BaseChatModel } from "@langchain/core/language_models/chat_models";
|
|
2
|
+
import type { Embeddings } from "@langchain/core/embeddings";
|
|
3
|
+
import { type ConnectionStatus } from "../connectivity/index.js";
|
|
4
|
+
export interface CreateAgentModelRegistryOptions {
|
|
5
|
+
configPath?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface CreateAgentModelChatOptions {
|
|
8
|
+
installNpmIfMissing?: boolean;
|
|
9
|
+
checkConnectivity?: boolean;
|
|
10
|
+
onConnectionStatus?: (status: ConnectionStatus) => void;
|
|
11
|
+
connectivityTimeoutMs?: number;
|
|
12
|
+
}
|
|
13
|
+
export interface AgentModel {
|
|
14
|
+
getChatModel(idOrOptions?: string | CreateAgentModelChatOptions, maybeOptions?: CreateAgentModelChatOptions): Promise<BaseChatModel>;
|
|
15
|
+
getEmbeddingModel(id?: string): Embeddings;
|
|
16
|
+
getVlmChatModel(idOrOptions?: string | CreateAgentModelChatOptions, maybeOptions?: CreateAgentModelChatOptions): Promise<BaseChatModel>;
|
|
17
|
+
}
|
|
18
|
+
export declare function createAgentModelRegistry(configPathOrOptions?: string | CreateAgentModelRegistryOptions): Promise<AgentModel>;
|
|
19
|
+
//# sourceMappingURL=create-agent-model-registry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-agent-model-registry.d.ts","sourceRoot":"","sources":["../../src/api/create-agent-model-registry.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,0BAA0B,CAAC;AAKlC,MAAM,WAAW,+BAA+B;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACxD,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,2BAA2B,EAAE,YAAY,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACrI,iBAAiB,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC3C,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,2BAA2B,EAAE,YAAY,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACzI;AAgLD,wBAAsB,wBAAwB,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,+BAA+B,GAAG,OAAO,CAAC,UAAU,CAAC,CAyElI"}
|
|
@@ -4,16 +4,6 @@ import {
|
|
|
4
4
|
import {
|
|
5
5
|
parseLlmSection
|
|
6
6
|
} from "./chunk-SPDXNDDD.js";
|
|
7
|
-
import {
|
|
8
|
-
__export
|
|
9
|
-
} from "./chunk-PZ5AY32C.js";
|
|
10
|
-
|
|
11
|
-
// src/langchain/index.ts
|
|
12
|
-
var langchain_exports = {};
|
|
13
|
-
__export(langchain_exports, {
|
|
14
|
-
applyToolChoiceAuto: () => applyToolChoiceAuto,
|
|
15
|
-
createChatModelFromLlmConfig: () => createChatModelFromLlmConfig
|
|
16
|
-
});
|
|
17
7
|
|
|
18
8
|
// src/langchain/openai-compatible.ts
|
|
19
9
|
import { ChatOpenAI } from "@langchain/openai";
|
|
@@ -159,7 +149,6 @@ function createChatModelFromLlmConfig(options = {}) {
|
|
|
159
149
|
|
|
160
150
|
export {
|
|
161
151
|
applyToolChoiceAuto,
|
|
162
|
-
createChatModelFromLlmConfig
|
|
163
|
-
langchain_exports
|
|
152
|
+
createChatModelFromLlmConfig
|
|
164
153
|
};
|
|
165
|
-
//# sourceMappingURL=chunk-
|
|
154
|
+
//# sourceMappingURL=chunk-6EQCGQTV.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/langchain/openai-compatible.ts","../src/langchain/tool-choice.ts","../src/langchain/index.ts"],"sourcesContent":["/**\n * Create ChatOpenAI from config - works with any OpenAI-compatible provider.\n * This is the ONLY place we create ChatOpenAI instances.\n */\n\nimport { ChatOpenAI } from \"@langchain/openai\";\nimport type { BaseChatModel } from \"@langchain/core/language_models/chat_models\";\nimport type { Agent } from \"node:http\";\n\nexport interface CreateChatOpenAIOptions {\n baseURL?: string;\n model: string;\n temperature?: number;\n apiKey?: string;\n defaultHeaders?: Record<string, string>;\n defaultQuery?: Record<string, string>;\n httpAgent?: Agent;\n}\n\n/**\n * Create ChatOpenAI from options.\n * Works with OpenAI and any OpenAI-compatible endpoint (CIS, Ollama, etc.).\n */\nexport function createChatOpenAI(options: CreateChatOpenAIOptions): BaseChatModel {\n const {\n baseURL,\n model,\n temperature = 0,\n apiKey,\n defaultHeaders,\n defaultQuery,\n httpAgent,\n } = options;\n\n const config: {\n baseURL?: string;\n defaultHeaders?: Record<string, string>;\n defaultQuery?: Record<string, string>;\n httpAgent?: Agent;\n } = {};\n\n if (baseURL) config.baseURL = baseURL;\n if (defaultHeaders) config.defaultHeaders = defaultHeaders;\n if (defaultQuery) config.defaultQuery = defaultQuery;\n if (httpAgent) config.httpAgent = httpAgent;\n\n return new ChatOpenAI({\n model,\n temperature,\n ...(apiKey ? { apiKey } : {}),\n ...(Object.keys(config).length > 0 ? { configuration: config } : {}),\n });\n}\n","interface ToolChoicePatchTarget {\n __agentLlmToolChoicePatched?: boolean;\n defaultOptions?: { tools?: unknown[] };\n bindTools?: (tools: unknown, opts?: Record<string, unknown>) => unknown;\n withConfig?: (config: Record<string, unknown>) => unknown;\n invoke?: (input: unknown, options?: Record<string, unknown>) => unknown;\n stream?: (input: unknown, options?: Record<string, unknown>) => unknown;\n}\n\nfunction hasTools(model: ToolChoicePatchTarget, options?: Record<string, unknown>): boolean {\n const optTools = options?.tools;\n if (Array.isArray(optTools) && optTools.length > 0) return true;\n const defaultTools = model.defaultOptions?.tools;\n return Array.isArray(defaultTools) && defaultTools.length > 0;\n}\n\nfunction sanitizeOptions(\n model: ToolChoicePatchTarget,\n options?: Record<string, unknown>\n): Record<string, unknown> | undefined {\n if (!options) return options;\n if (options.tool_choice !== \"none\") return options;\n if (!hasTools(model, options)) return options;\n return { ...options, tool_choice: \"auto\" };\n}\n\n/**\n * Force tool_choice to \"auto\" when tools are present.\n * Patches bindTools/withConfig/invoke/stream in-place for compatibility with providers\n * that default to tool_choice: \"none\".\n */\nexport function applyToolChoiceAuto(\n model: { bindTools?: (tools: unknown, opts?: Record<string, unknown>) => unknown }\n): void {\n const m = model as ToolChoicePatchTarget;\n if (m.__agentLlmToolChoicePatched) return;\n m.__agentLlmToolChoicePatched = true;\n\n const origBindTools = m.bindTools?.bind(model);\n if (origBindTools) {\n m.bindTools = function (tools: unknown, opts?: Record<string, unknown>) {\n const bound = origBindTools(tools, { ...opts, tool_choice: \"auto\" });\n applyToolChoiceAuto(\n bound as { bindTools?: (tools: unknown, opts?: Record<string, unknown>) => unknown }\n );\n return bound;\n };\n }\n\n const origWithConfig = m.withConfig?.bind(model);\n if (origWithConfig) {\n m.withConfig = function (config: Record<string, unknown>) {\n const sanitized = sanitizeOptions(this as ToolChoicePatchTarget, config) ?? config;\n const next = origWithConfig(sanitized);\n applyToolChoiceAuto(\n next as { bindTools?: (tools: unknown, opts?: Record<string, unknown>) => unknown }\n );\n return next;\n };\n }\n\n const origInvoke = m.invoke?.bind(model);\n if (origInvoke) {\n m.invoke = function (input: unknown, options?: Record<string, unknown>) {\n return origInvoke(input, sanitizeOptions(this as ToolChoicePatchTarget, options));\n };\n }\n\n const origStream = m.stream?.bind(model);\n if (origStream) {\n m.stream = function (input: unknown, options?: Record<string, unknown>) {\n return origStream(input, sanitizeOptions(this as ToolChoicePatchTarget, options));\n };\n }\n}\n","/**\n * Simple LangChain module: create ChatOpenAI from llm config.\n * Extensions can register custom ChatModel factories via the registry.\n */\n\nimport type { BaseChatModel } from \"@langchain/core/language_models/chat_models\";\nimport { parseLlmSection } from \"../model/llm-parser.js\";\nimport type { LLMConfig } from \"../model/types.js\";\nimport { getChatModelFactory } from \"../registry/chat-model.js\";\nimport { createChatOpenAI } from \"./openai-compatible.js\";\nimport type { Agent } from \"node:http\";\n\nconst DEFAULT_MODEL = \"gpt-4o-mini\";\n\nexport interface CreateChatModelOptions {\n llmSection?: unknown;\n modelEnv?: string;\n apiKeyEnv?: string;\n}\n\nexport { applyToolChoiceAuto } from \"./tool-choice.js\";\n\nfunction normalizeError(e: unknown, context: string): Error {\n if (e instanceof Error) return new Error(`${context}: ${e.message}`, { cause: e });\n return new Error(`${context}: ${String(e)}`);\n}\n\n/**\n * Create a LangChain ChatModel from agent config llm section.\n * Uses extension-registered factory when available; otherwise creates ChatOpenAI.\n */\nexport function createChatModelFromLlmConfig(\n options: CreateChatModelOptions = {}\n): BaseChatModel {\n const { llmSection, modelEnv, apiKeyEnv } = options;\n\n let defaultId: string;\n let configs: LLMConfig[];\n\n try {\n const parsed = parseLlmSection(llmSection ?? null);\n defaultId = parsed.defaultId;\n configs = parsed.configs;\n } catch (e) {\n throw normalizeError(e, \"Failed to parse llm section\");\n }\n\n const config = configs.find((c) => c.id === defaultId) ?? configs[0];\n\n // No config? Use default OpenAI\n if (!config) {\n const model = modelEnv ?? process.env.OPENAI_MODEL ?? DEFAULT_MODEL;\n const apiKey = apiKeyEnv ?? process.env.OPENAI_API_KEY;\n\n return createChatOpenAI({\n model,\n temperature: 0,\n ...(apiKey ? { apiKey } : {}),\n });\n }\n\n // Check for registered custom factory\n const provider = config.provider ?? \"openai\";\n const factory = getChatModelFactory(provider);\n\n if (factory) {\n try {\n return factory({\n ...config,\n model: modelEnv ?? config.model ?? DEFAULT_MODEL,\n temperature: typeof config.temperature === \"number\" ? config.temperature : 0,\n });\n } catch (e) {\n throw normalizeError(e, `Failed to create ChatModel for provider \"${provider}\"`);\n }\n }\n\n // Create standard ChatOpenAI for OpenAI-compatible provider\n const model = modelEnv ?? config.model ?? process.env.OPENAI_MODEL ?? DEFAULT_MODEL;\n let apiKey = apiKeyEnv ?? config.apiKey ?? process.env.OPENAI_API_KEY;\n let baseURL = config.baseURL;\n\n // Ensure baseURL ends with /v1\n if (baseURL && !baseURL.replace(/\\/$/, \"\").endsWith(\"/v1\")) {\n baseURL = baseURL.replace(/\\/$/, \"\") + \"/v1\";\n }\n\n // For local providers without API keys, use a placeholder\n if (baseURL && !apiKey) {\n apiKey = \"not-needed\";\n }\n\n const temperature = typeof config.temperature === \"number\" ? config.temperature : 0;\n\n // Extract options\n const opts = config.options as Record<string, unknown> | undefined;\n const defaultHeaders = opts?.defaultHeaders as Record<string, string> | undefined;\n const defaultQuery = opts?.defaultQuery as Record<string, string> | undefined;\n const httpAgent = opts?.httpAgent as Agent | undefined;\n\n return createChatOpenAI({\n model,\n temperature,\n baseURL,\n apiKey,\n defaultHeaders,\n defaultQuery,\n httpAgent,\n });\n}\n"],"mappings":"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","names":["model","apiKey"]}
|
|
@@ -1,15 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
__export
|
|
3
|
-
} from "./chunk-PZ5AY32C.js";
|
|
4
|
-
|
|
5
|
-
// src/connectivity/index.ts
|
|
6
|
-
var connectivity_exports = {};
|
|
7
|
-
__export(connectivity_exports, {
|
|
8
|
-
CIS_UNREACHABLE_REMINDER: () => CIS_UNREACHABLE_REMINDER,
|
|
9
|
-
buildUnreachableError: () => buildUnreachableError,
|
|
10
|
-
checkEndpointConnectivity: () => checkEndpointConnectivity
|
|
11
|
-
});
|
|
12
|
-
|
|
13
1
|
// src/connectivity/check.ts
|
|
14
2
|
import https from "https";
|
|
15
3
|
var DEFAULT_TIMEOUT_MS = 8e3;
|
|
@@ -112,7 +100,6 @@ function buildUnreachableError(endpointId, baseURL, detail) {
|
|
|
112
100
|
export {
|
|
113
101
|
checkEndpointConnectivity,
|
|
114
102
|
CIS_UNREACHABLE_REMINDER,
|
|
115
|
-
buildUnreachableError
|
|
116
|
-
connectivity_exports
|
|
103
|
+
buildUnreachableError
|
|
117
104
|
};
|
|
118
|
-
//# sourceMappingURL=chunk-
|
|
105
|
+
//# sourceMappingURL=chunk-AUQEXHUP.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/connectivity/check.ts"],"sourcesContent":["/**\n * Check connectivity to OpenAI-compatible / CIS endpoints.\n */\nimport https from \"node:https\";\nimport type { CheckConnectivityResult } from \"./types.js\";\n\nconst DEFAULT_TIMEOUT_MS = 8000;\n\nexport interface EndpointConnectivityOptions {\n timeoutMs?: number;\n resolveHost?: { from: string; to: string };\n host?: string;\n verifySSL?: boolean;\n bypassAuth?: boolean;\n featureKey?: string;\n}\n\nfunction probePath(baseURL: string): string {\n const base = baseURL.replace(/\\/+$/, \"\");\n if (base.endsWith(\"/v1\")) return `${base}/models`;\n return base.includes(\"/v1\") ? `${base}/models` : `${base}/v1/models`;\n}\n\nfunction resolveProbeRequest(\n baseURL: string,\n endpointOptions?: EndpointConnectivityOptions | null\n): { url: string; hostHeader: string | undefined } {\n let path = probePath(baseURL);\n const urlObj = new URL(path);\n const resolveFrom = endpointOptions?.resolveHost?.from;\n const resolveTo = endpointOptions?.resolveHost?.to;\n let hostHeader = endpointOptions?.host;\n if (resolveFrom && resolveTo && urlObj.hostname) {\n urlObj.hostname = urlObj.hostname.replace(resolveFrom, resolveTo);\n hostHeader = hostHeader ?? resolveFrom;\n }\n const searchParams = new URLSearchParams(urlObj.search);\n if (endpointOptions?.bypassAuth === true) searchParams.set(\"bypass_auth\", \"true\");\n urlObj.search = searchParams.toString();\n return { url: urlObj.toString(), hostHeader };\n}\n\nfunction checkWithHttps(\n url: string,\n hostHeader: string | undefined,\n options: { timeoutMs: number; verifySSL: boolean }\n): Promise<CheckConnectivityResult> {\n return new Promise((resolve) => {\n const u = new URL(url);\n const reqOpts: https.RequestOptions = {\n hostname: u.hostname,\n port: u.port || (u.protocol === \"https:\" ? 443 : 80),\n path: u.pathname + u.search,\n method: \"GET\",\n headers: { Accept: \"application/json\" },\n rejectUnauthorized: options.verifySSL,\n };\n if (hostHeader) reqOpts.headers = { ...reqOpts.headers, Host: hostHeader };\n\n const timeoutId = setTimeout(() => {\n req.destroy();\n resolve({ reachable: false, message: \"Connection timed out\" });\n }, options.timeoutMs);\n\n const req = https.request(reqOpts, (res) => {\n clearTimeout(timeoutId);\n resolve({\n reachable: true,\n message: res.statusCode === 200 ? \"OK\" : `HTTP ${res.statusCode}`,\n statusCode: res.statusCode,\n });\n });\n req.on(\"error\", (err) => {\n clearTimeout(timeoutId);\n resolve({ reachable: false, message: err.message || \"Connection failed\" });\n });\n req.end();\n });\n}\n\nexport async function checkEndpointConnectivity(\n baseURL: string,\n options?: { timeoutMs?: number } & EndpointConnectivityOptions\n): Promise<CheckConnectivityResult> {\n const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;\n const useHttps =\n options?.resolveHost != null ||\n options?.verifySSL === false ||\n options?.host != null ||\n options?.bypassAuth === true;\n\n if (useHttps) {\n const { url, hostHeader } = resolveProbeRequest(baseURL, options);\n return checkWithHttps(url, hostHeader, {\n timeoutMs,\n verifySSL: options?.verifySSL === true,\n });\n }\n\n const url = probePath(baseURL);\n const controller = new AbortController();\n const timeoutId = setTimeout(() => controller.abort(), timeoutMs);\n\n try {\n const res = await fetch(url, {\n method: \"GET\",\n signal: controller.signal,\n headers: { Accept: \"application/json\" },\n });\n clearTimeout(timeoutId);\n return {\n reachable: true,\n message: res.ok ? \"OK\" : `HTTP ${res.status}`,\n statusCode: res.status,\n };\n } catch (err) {\n clearTimeout(timeoutId);\n const message = err instanceof Error ? err.message : String(err);\n const isTimeout = err instanceof Error && err.name === \"AbortError\";\n return {\n reachable: false,\n message: isTimeout ? \"Connection timed out\" : message || \"Connection failed\",\n };\n }\n}\n\nexport const CIS_UNREACHABLE_REMINDER =\n \"Please ensure you are connected to Secure VPN and try again.\";\n\nexport function buildUnreachableError(\n endpointId: string,\n baseURL: string,\n detail?: string\n): string {\n const parts = [\n `Cannot connect to CIS (endpoint: ${endpointId}, base URL: ${baseURL}).`,\n detail && ` ${detail}`,\n ` ${CIS_UNREACHABLE_REMINDER}`,\n ];\n return parts.filter(Boolean).join(\"\").trim();\n}\n"],"mappings":"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","names":["url"]}
|
|
@@ -1,29 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
__export
|
|
3
|
-
} from "./chunk-PZ5AY32C.js";
|
|
4
|
-
|
|
5
|
-
// src/npm/index.ts
|
|
6
|
-
var npm_exports = {};
|
|
7
|
-
__export(npm_exports, {
|
|
8
|
-
NPM_PROTOCOL_PREFIX: () => NPM_PROTOCOL_PREFIX,
|
|
9
|
-
assertNpmCommandSuccess: () => assertNpmCommandSuccess,
|
|
10
|
-
clearVersionCache: () => clearVersionCache,
|
|
11
|
-
ensureNpmPackageInstalled: () => ensureNpmPackageInstalled,
|
|
12
|
-
formatProviderDisplay: () => formatProviderDisplay,
|
|
13
|
-
getInstalledVersion: () => getInstalledVersion,
|
|
14
|
-
isNpmProviderSpec: () => isNpmProviderSpec,
|
|
15
|
-
npmInstall: () => npmInstall,
|
|
16
|
-
npmPublish: () => npmPublish,
|
|
17
|
-
npmRoot: () => npmRoot,
|
|
18
|
-
npmRunScript: () => npmRunScript,
|
|
19
|
-
npmSearchJson: () => npmSearchJson,
|
|
20
|
-
parseNpmProvider: () => parseNpmProvider,
|
|
21
|
-
parseNpmProviderSpec: () => parseNpmProviderSpec,
|
|
22
|
-
resolveLatestVersionFromRegistry: () => resolveLatestVersionFromRegistry,
|
|
23
|
-
resolveNpmPackageVersion: () => resolveNpmPackageVersion,
|
|
24
|
-
runNpmCommand: () => runNpmCommand
|
|
25
|
-
});
|
|
26
|
-
|
|
27
1
|
// src/npm/provider.ts
|
|
28
2
|
var NPM_PROTOCOL_PREFIX = "npm:";
|
|
29
3
|
function isNpmProviderSpec(spec) {
|
|
@@ -244,7 +218,6 @@ export {
|
|
|
244
218
|
npmInstall,
|
|
245
219
|
npmRunScript,
|
|
246
220
|
npmPublish,
|
|
247
|
-
npmRoot
|
|
248
|
-
npm_exports
|
|
221
|
+
npmRoot
|
|
249
222
|
};
|
|
250
|
-
//# sourceMappingURL=chunk-
|
|
223
|
+
//# sourceMappingURL=chunk-KE7IMUSA.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/npm/provider.ts","../src/npm/version.ts","../src/npm/install.ts","../src/npm/command.ts"],"sourcesContent":["export const NPM_PROTOCOL_PREFIX = \"npm:\";\n\nexport interface NpmProviderInfo {\n pkg: string;\n tag?: string;\n fragment?: string;\n}\n\nexport interface NpmProviderSpec {\n packageName: string;\n version?: string;\n provider?: string;\n}\n\nexport function isNpmProviderSpec(spec: unknown): spec is string {\n return typeof spec === \"string\" && spec.startsWith(NPM_PROTOCOL_PREFIX);\n}\n\nexport function parseNpmProvider(provider: string): NpmProviderInfo | null {\n if (!isNpmProviderSpec(provider)) return null;\n const rest = provider.slice(NPM_PROTOCOL_PREFIX.length);\n const hashIdx = rest.indexOf(\"#\");\n const fragment = hashIdx >= 0 ? rest.slice(hashIdx + 1) : undefined;\n const beforeHash = hashIdx >= 0 ? rest.slice(0, hashIdx) : rest;\n const atIdx = beforeHash.startsWith(\"@\") ? beforeHash.indexOf(\"@\", 1) : beforeHash.lastIndexOf(\"@\");\n const pkg = atIdx > 0 ? beforeHash.slice(0, atIdx) : beforeHash;\n const tag = atIdx > 0 ? beforeHash.slice(atIdx + 1) : undefined;\n return { pkg: pkg || beforeHash, tag: tag || undefined, fragment };\n}\n\nexport function parseNpmProviderSpec(spec: string): NpmProviderSpec | null {\n const parsed = parseNpmProvider(spec);\n if (!parsed) return null;\n return {\n packageName: parsed.pkg,\n version: parsed.tag,\n provider: parsed.fragment,\n };\n}\n","import { execFileSync } from \"node:child_process\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { parseNpmProvider } from \"./provider.js\";\n\ninterface VersionCacheEntry {\n version: string;\n timestamp: number;\n}\n\nconst versionCache = new Map<string, VersionCacheEntry>();\nconst CACHE_TTL = 5 * 60 * 1000;\n\nexport interface ResolveNpmVersionOptions {\n cwd?: string;\n timeoutMs?: number;\n}\n\nexport function clearVersionCache(): void {\n versionCache.clear();\n}\n\nexport function resolveNpmPackageVersion(pkg: string, tag?: string, options: ResolveNpmVersionOptions = {}): string | null {\n const cacheKey = tag ? `${pkg}@${tag}` : pkg;\n const cached = versionCache.get(cacheKey);\n if (cached && Date.now() - cached.timestamp < CACHE_TTL) {\n return cached.version;\n }\n\n try {\n const spec = tag ? `${pkg}@${tag}` : pkg;\n const out = execFileSync(\"npm\", [\"view\", spec, \"version\"], {\n cwd: options.cwd ?? process.cwd(),\n encoding: \"utf-8\",\n timeout: options.timeoutMs ?? 8000,\n stdio: [\"ignore\", \"pipe\", \"pipe\"],\n });\n const version = out?.trim() ?? null;\n if (version) {\n versionCache.set(cacheKey, { version, timestamp: Date.now() });\n }\n return version;\n } catch {\n return null;\n }\n}\n\nexport function resolveLatestVersionFromRegistry(packageName: string, options: ResolveNpmVersionOptions = {}): string {\n const version = resolveNpmPackageVersion(packageName, undefined, options);\n if (!version) {\n throw new Error(`Failed to resolve latest version for ${packageName}`);\n }\n return version;\n}\n\nexport function formatProviderDisplay(provider: string): string {\n const parsed = parseNpmProvider(provider);\n if (parsed == null) return provider;\n\n const resolved = resolveNpmPackageVersion(parsed.pkg, parsed.tag);\n const version = resolved ?? parsed.tag ?? \"latest\";\n const frag = parsed.fragment ? `#${parsed.fragment}` : \"\";\n return `npm:${parsed.pkg}@${version}${frag}`;\n}\n\nexport function getInstalledVersion(packageName: string, options: { cwd?: string } = {}): string | null {\n let dir = path.resolve(options.cwd ?? process.cwd());\n const segs = packageName.split(\"/\");\n while (true) {\n const pkgJsonPath = path.join(dir, \"node_modules\", ...segs, \"package.json\");\n if (existsSync(pkgJsonPath)) {\n try {\n const j = JSON.parse(readFileSync(pkgJsonPath, \"utf-8\")) as { version?: string };\n return typeof j.version === \"string\" ? j.version : null;\n } catch {\n return null;\n }\n }\n const parent = path.dirname(dir);\n if (parent === dir) return null;\n dir = parent;\n }\n}\n","import { execFileSync, type ExecFileSyncOptions } from \"node:child_process\";\nimport { getInstalledVersion, resolveLatestVersionFromRegistry } from \"./version.js\";\n\nconst VERSION_LATEST = \"latest\";\n\nexport interface EnsureNpmPackageInstalledOptions {\n version?: string;\n cwd?: string;\n stdio?: \"inherit\" | \"pipe\";\n noPackageLock?: boolean;\n logPrefix?: string;\n}\n\nasync function resolveInstallVersion(\n packageName: string,\n version: string | undefined,\n cwd: string,\n): Promise<string> {\n const isLatestOrEmpty =\n version === undefined ||\n version === \"\" ||\n (typeof version === \"string\" && version.toLowerCase() === VERSION_LATEST);\n if (isLatestOrEmpty) {\n return resolveLatestVersionFromRegistry(packageName, { cwd });\n }\n return version;\n}\n\nexport async function ensureNpmPackageInstalled(\n packageName: string,\n options: EnsureNpmPackageInstalledOptions = {},\n): Promise<void> {\n if (typeof packageName !== \"string\" || packageName.trim().length === 0) {\n throw new Error(\"ensureNpmPackageInstalled requires a non-empty package name\");\n }\n\n const cwd = options.cwd ?? process.cwd();\n const resolvedVersion = await resolveInstallVersion(packageName, options.version, cwd);\n const installedVersion = getInstalledVersion(packageName, { cwd });\n\n if (installedVersion === resolvedVersion) return;\n\n const installSpec = `${packageName}@${resolvedVersion}`;\n const prefix = options.logPrefix ?? \"[agent-model]\";\n if (installedVersion === null) {\n console.info(`${prefix} Installing provider: ${installSpec}`);\n } else {\n console.info(`${prefix} Updating provider: ${packageName} ${installedVersion} -> ${resolvedVersion}`);\n }\n\n const args = [\"install\", installSpec];\n if (options.noPackageLock !== false) args.push(\"--no-package-lock\");\n\n const stdio: ExecFileSyncOptions[\"stdio\"] =\n options.stdio === \"pipe\"\n ? [\"ignore\", \"pipe\", \"pipe\"]\n : options.stdio ?? \"inherit\";\n\n try {\n execFileSync(\"npm\", args, {\n cwd,\n stdio,\n encoding: \"utf-8\",\n });\n } catch (e) {\n const msg = e instanceof Error ? e.message : String(e);\n throw new Error(`npm install failed for ${installSpec}: ${msg}`, { cause: e });\n }\n}\n","import { spawnSync } from \"node:child_process\";\n\nexport interface RunNpmCommandOptions {\n cwd?: string;\n env?: NodeJS.ProcessEnv;\n timeoutMs?: number;\n stdio?: \"pipe\" | \"inherit\";\n shell?: boolean;\n}\n\nexport interface NpmCommandResult {\n args: string[];\n status: number | null;\n stdout: string;\n stderr: string;\n signal: NodeJS.Signals | null;\n error?: Error;\n}\n\nexport interface NpmInstallOptions extends RunNpmCommandOptions {\n packages?: string[];\n global?: boolean;\n noPackageLock?: boolean;\n legacyPeerDeps?: boolean;\n registry?: string;\n}\n\nexport interface NpmPublishOptions extends RunNpmCommandOptions {\n tag?: string;\n access?: \"public\" | \"restricted\";\n registry?: string;\n}\n\nfunction normalizeOutput(v: unknown): string {\n return typeof v === \"string\" ? v : \"\";\n}\n\nexport function runNpmCommand(args: string[], options: RunNpmCommandOptions = {}): NpmCommandResult {\n const result = spawnSync(\"npm\", args, {\n cwd: options.cwd ?? process.cwd(),\n env: options.env ?? process.env,\n encoding: \"utf-8\",\n timeout: options.timeoutMs,\n stdio: options.stdio ?? \"pipe\",\n shell: options.shell ?? false,\n });\n\n return {\n args,\n status: result.status,\n stdout: normalizeOutput(result.stdout),\n stderr: normalizeOutput(result.stderr),\n signal: result.signal,\n error: result.error ?? undefined,\n };\n}\n\nexport function assertNpmCommandSuccess(result: NpmCommandResult, context: string): void {\n if (!result.error && result.status === 0) return;\n const details =\n result.error?.message ||\n result.stderr.trim() ||\n (result.status == null ? \"terminated\" : `exit code ${result.status}`);\n throw new Error(`${context} failed: npm ${result.args.join(\" \")} (${details})`);\n}\n\nexport function npmSearchJson(query: string, options: RunNpmCommandOptions = {}): unknown[] {\n const result = runNpmCommand([\"search\", query, \"--json\"], options);\n if (result.error || result.status !== 0) return [];\n const text = result.stdout.trim();\n if (!text) return [];\n try {\n const parsed = JSON.parse(text) as unknown;\n return Array.isArray(parsed) ? parsed : [];\n } catch {\n return [];\n }\n}\n\nexport function npmInstall(options: NpmInstallOptions = {}): void {\n const args: string[] = [\"install\"];\n if (options.global) args.push(\"-g\");\n if (options.registry) args.push(\"--registry\", options.registry);\n if (options.legacyPeerDeps) args.push(\"--legacy-peer-deps\");\n if (options.noPackageLock) args.push(\"--no-package-lock\");\n if (Array.isArray(options.packages) && options.packages.length > 0) {\n args.push(...options.packages);\n }\n const result = runNpmCommand(args, options);\n assertNpmCommandSuccess(result, \"npm install\");\n}\n\nexport function npmRunScript(script: string, options: RunNpmCommandOptions = {}): void {\n const result = runNpmCommand([\"run\", script], options);\n assertNpmCommandSuccess(result, `npm run ${script}`);\n}\n\nexport function npmPublish(options: NpmPublishOptions = {}): void {\n const args: string[] = [\"publish\"];\n if (options.tag) args.push(\"--tag\", options.tag);\n if (options.access) args.push(\"--access\", options.access);\n if (options.registry) args.push(\"--registry\", options.registry);\n const result = runNpmCommand(args, options);\n assertNpmCommandSuccess(result, \"npm publish\");\n}\n\nexport function npmRoot(options: RunNpmCommandOptions & { global?: boolean } = {}): string {\n const args = [\"root\", ...(options.global ? [\"-g\"] : [])];\n const result = runNpmCommand(args, options);\n assertNpmCommandSuccess(result, \"npm root\");\n return result.stdout.trim();\n}\n"],"mappings":"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","names":["execFileSync","execFileSync"]}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import {
|
|
2
|
+
parseLlmSection
|
|
3
|
+
} from "./chunk-SPDXNDDD.js";
|
|
4
|
+
|
|
5
|
+
// src/model/embed-parser.ts
|
|
6
|
+
function parseEmbedSection(section) {
|
|
7
|
+
const result = parseLlmSection(section);
|
|
8
|
+
for (const config of result.configs) {
|
|
9
|
+
config.type = "embed";
|
|
10
|
+
}
|
|
11
|
+
return result;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export {
|
|
15
|
+
parseEmbedSection
|
|
16
|
+
};
|
|
17
|
+
//# sourceMappingURL=chunk-MFLWZSWI.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/model/embed-parser.ts"],"sourcesContent":["/**\n * Parse embed section from model.yaml into normalized LLMConfig[] with type \"embed\".\n * Reuses parseLlmSection internally since the config shape is identical.\n */\n\nimport { parseLlmSection } from \"./llm-parser.js\";\nimport type { LLMConfig } from \"./types.js\";\n\n/**\n * Parse an `embed:` section from model.yaml.\n * Accepts the same flat-entry, instances[], or single-object formats as the llm section.\n *\n * @example\n * ```yaml\n * embed:\n * default: gemma\n * gemma:\n * provider: openai\n * base_url: https://ollama.example.com/v1\n * model: embeddinggemma:latest\n * apiKey: ollama\n * ```\n */\nexport function parseEmbedSection(\n section: unknown,\n): { defaultId: string; configs: LLMConfig[] } {\n const result = parseLlmSection(section);\n // Override type to \"embed\" for all parsed configs\n for (const config of result.configs) {\n config.type = \"embed\";\n }\n return result;\n}\n"],"mappings":";;;;;AAuBO,SAAS,kBACd,SAC6C;AAC7C,QAAM,SAAS,gBAAgB,OAAO;AAEtC,aAAW,UAAU,OAAO,SAAS;AACnC,WAAO,OAAO;AAAA,EAChB;AACA,SAAO;AACT;","names":[]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createChatModelFromLlmConfig
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-6EQCGQTV.js";
|
|
4
4
|
import {
|
|
5
5
|
getChatModelFactory,
|
|
6
6
|
registerChatModelProvider
|
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
isNpmProviderSpec,
|
|
12
12
|
parseNpmProviderSpec,
|
|
13
13
|
resolveLatestVersionFromRegistry
|
|
14
|
-
} from "./chunk-
|
|
14
|
+
} from "./chunk-KE7IMUSA.js";
|
|
15
15
|
|
|
16
16
|
// src/extensions/loader.ts
|
|
17
17
|
import { readdirSync, readFileSync, existsSync } from "fs";
|
|
@@ -351,4 +351,4 @@ export {
|
|
|
351
351
|
resolveLlmSectionWithNpm,
|
|
352
352
|
createChatModelWithNpm
|
|
353
353
|
};
|
|
354
|
-
//# sourceMappingURL=chunk-
|
|
354
|
+
//# sourceMappingURL=chunk-RRZDREGU.js.map
|
package/dist/cli/index.js
CHANGED
|
@@ -1,11 +1,255 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
import
|
|
6
|
-
|
|
2
|
+
import {
|
|
3
|
+
loadModelConfig
|
|
4
|
+
} from "../chunk-3HA2CHZN.js";
|
|
5
|
+
import {
|
|
6
|
+
buildUnreachableError,
|
|
7
|
+
checkEndpointConnectivity
|
|
8
|
+
} from "../chunk-AUQEXHUP.js";
|
|
9
|
+
import {
|
|
10
|
+
resolveLlmSectionWithNpm
|
|
11
|
+
} from "../chunk-RRZDREGU.js";
|
|
12
|
+
import {
|
|
13
|
+
createChatModelFromLlmConfig
|
|
14
|
+
} from "../chunk-6EQCGQTV.js";
|
|
7
15
|
import "../chunk-G7MKWPEI.js";
|
|
8
|
-
import
|
|
9
|
-
|
|
10
|
-
|
|
16
|
+
import {
|
|
17
|
+
parseLlmSection
|
|
18
|
+
} from "../chunk-SPDXNDDD.js";
|
|
19
|
+
import "../chunk-KE7IMUSA.js";
|
|
20
|
+
|
|
21
|
+
// src/api/create-agent-llm.ts
|
|
22
|
+
import { join } from "path";
|
|
23
|
+
function applyDefaultToolChoice(model) {
|
|
24
|
+
const m = model;
|
|
25
|
+
const orig = m.bindTools?.bind(model);
|
|
26
|
+
if (!orig) return;
|
|
27
|
+
m.bindTools = function(tools2, opts) {
|
|
28
|
+
return orig(tools2, { ...opts, tool_choice: "auto" });
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
var CIS_DEFAULT_RESOLVE_HOST = "s0010-ml-https.s0010.us-west-2.awswd";
|
|
32
|
+
var CIS_DEFAULT_RESOLVE_IP = "10.210.98.124";
|
|
33
|
+
function buildEndpointConnectivityOptions(config) {
|
|
34
|
+
const opts = config.options ?? config;
|
|
35
|
+
const provider = typeof config.provider === "string" ? config.provider : "";
|
|
36
|
+
const baseURL = config.baseURL;
|
|
37
|
+
const isCis = provider === "cis" || provider.includes("cis");
|
|
38
|
+
const useCisDefault = isCis && baseURL.includes(CIS_DEFAULT_RESOLVE_HOST) && opts?.resolveHost == null;
|
|
39
|
+
const resolveHost = opts?.resolveHost != null && typeof opts.resolveHost.from === "string" ? opts.resolveHost : useCisDefault ? { from: CIS_DEFAULT_RESOLVE_HOST, to: CIS_DEFAULT_RESOLVE_IP } : void 0;
|
|
40
|
+
const host = typeof opts?.host === "string" ? opts.host : resolveHost ? resolveHost.from : void 0;
|
|
41
|
+
if (resolveHost == null && host == null) return void 0;
|
|
42
|
+
const verifySSL = opts?.verifySSL === true;
|
|
43
|
+
const bypassAuth = opts?.bypassAuth !== false;
|
|
44
|
+
return {
|
|
45
|
+
resolveHost,
|
|
46
|
+
host,
|
|
47
|
+
verifySSL: resolveHost != null ? false : verifySSL ? true : void 0,
|
|
48
|
+
bypassAuth: bypassAuth ? true : void 0,
|
|
49
|
+
featureKey: typeof opts?.featureKey === "string" ? opts.featureKey : void 0
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
function resolveDefaultConfigPath() {
|
|
53
|
+
return join(process.cwd(), "model.yaml");
|
|
54
|
+
}
|
|
55
|
+
function normalizeOptions(configPathOrOptions) {
|
|
56
|
+
if (configPathOrOptions == null) return {};
|
|
57
|
+
if (typeof configPathOrOptions === "string") return { configPath: configPathOrOptions };
|
|
58
|
+
return configPathOrOptions;
|
|
59
|
+
}
|
|
60
|
+
function normalizeError(e, context) {
|
|
61
|
+
if (e instanceof Error) return new Error(`${context}: ${e.message}`, { cause: e });
|
|
62
|
+
return new Error(`${context}: ${String(e)}`);
|
|
63
|
+
}
|
|
64
|
+
async function ensureConnectivity(resolvedLlmSection, options) {
|
|
65
|
+
let configs;
|
|
66
|
+
try {
|
|
67
|
+
const parsed = parseLlmSection(resolvedLlmSection ?? null);
|
|
68
|
+
configs = parsed.configs.filter(
|
|
69
|
+
(c) => typeof c.baseURL === "string" && c.baseURL.length > 0 && (c.baseURL.startsWith("http://") || c.baseURL.startsWith("https://")) && !c.baseURL.includes("${")
|
|
70
|
+
);
|
|
71
|
+
} catch {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
const shouldCheck = options.checkConnectivity !== false && configs.length > 0;
|
|
75
|
+
if (!shouldCheck) return;
|
|
76
|
+
const report = (status) => options.onConnectionStatus?.(status);
|
|
77
|
+
const timeoutMs = options.connectivityTimeoutMs ?? 8e3;
|
|
78
|
+
for (const config of configs) {
|
|
79
|
+
const { id, baseURL } = config;
|
|
80
|
+
report({
|
|
81
|
+
phase: "checking",
|
|
82
|
+
endpointId: id,
|
|
83
|
+
baseURL,
|
|
84
|
+
message: "Checking connection..."
|
|
85
|
+
});
|
|
86
|
+
const endpointOpts = buildEndpointConnectivityOptions(config);
|
|
87
|
+
const result = await checkEndpointConnectivity(baseURL, {
|
|
88
|
+
timeoutMs,
|
|
89
|
+
...endpointOpts
|
|
90
|
+
});
|
|
91
|
+
if (result.reachable) {
|
|
92
|
+
report({
|
|
93
|
+
phase: "reachable",
|
|
94
|
+
endpointId: id,
|
|
95
|
+
baseURL,
|
|
96
|
+
message: result.message ?? "Connected"
|
|
97
|
+
});
|
|
98
|
+
} else {
|
|
99
|
+
report({
|
|
100
|
+
phase: "unreachable",
|
|
101
|
+
endpointId: id,
|
|
102
|
+
baseURL,
|
|
103
|
+
message: result.message ?? "Unreachable"
|
|
104
|
+
});
|
|
105
|
+
throw new Error(buildUnreachableError(id, baseURL, result.message));
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
async function createAgentLlm(configPathOrOptions) {
|
|
110
|
+
try {
|
|
111
|
+
const options = normalizeOptions(configPathOrOptions);
|
|
112
|
+
const configPath = options.configPath ?? resolveDefaultConfigPath();
|
|
113
|
+
const modelConfig = loadModelConfig(configPath);
|
|
114
|
+
if (modelConfig?.llm == null) {
|
|
115
|
+
throw new Error(
|
|
116
|
+
`No LLM config at ${configPath}. Add model.yaml in the current directory, or pass configPath.`
|
|
117
|
+
);
|
|
118
|
+
}
|
|
119
|
+
const resolvedSection = await resolveLlmSectionWithNpm(modelConfig.llm, {
|
|
120
|
+
installNpmIfMissing: options.installNpmIfMissing !== false,
|
|
121
|
+
cwd: process.cwd()
|
|
122
|
+
});
|
|
123
|
+
const checkConnectivity = options.checkConnectivity ?? modelConfig.runtime.check_connectivity;
|
|
124
|
+
await ensureConnectivity(resolvedSection, {
|
|
125
|
+
checkConnectivity,
|
|
126
|
+
onConnectionStatus: options.onConnectionStatus,
|
|
127
|
+
connectivityTimeoutMs: options.connectivityTimeoutMs
|
|
128
|
+
});
|
|
129
|
+
const model = createChatModelFromLlmConfig({ llmSection: resolvedSection });
|
|
130
|
+
applyDefaultToolChoice(model);
|
|
131
|
+
return model;
|
|
132
|
+
} catch (e) {
|
|
133
|
+
if (e instanceof Error && e.message.includes("No LLM config")) throw e;
|
|
134
|
+
if (e instanceof Error && e.message.includes("Cannot connect to")) throw e;
|
|
135
|
+
throw normalizeError(e, "createAgentLlm failed");
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
// src/cli/utils.ts
|
|
140
|
+
function messageContentToString(content) {
|
|
141
|
+
if (typeof content === "string") return content;
|
|
142
|
+
if (Array.isArray(content)) {
|
|
143
|
+
return content.map((c) => "text" in c && c.text ? c.text : "").join("");
|
|
144
|
+
}
|
|
145
|
+
return String(content ?? "");
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
// src/cli/index.ts
|
|
149
|
+
import { tool } from "@langchain/core/tools";
|
|
150
|
+
import { z } from "zod";
|
|
151
|
+
import { HumanMessage, ToolMessage } from "@langchain/core/messages";
|
|
152
|
+
import { fileURLToPath } from "url";
|
|
153
|
+
function parseArgv() {
|
|
154
|
+
const args = process.argv.slice(2);
|
|
155
|
+
let configPath;
|
|
156
|
+
let useTools = false;
|
|
157
|
+
const rest = [];
|
|
158
|
+
for (let i = 0; i < args.length; i++) {
|
|
159
|
+
if (args[i] === "--config" && args[i + 1]) {
|
|
160
|
+
configPath = args[i + 1];
|
|
161
|
+
i++;
|
|
162
|
+
} else if (args[i] === "--tools") {
|
|
163
|
+
useTools = true;
|
|
164
|
+
} else {
|
|
165
|
+
rest.push(args[i]);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
const query = rest.join(" ").trim() || "hi";
|
|
169
|
+
return { configPath, useTools, query };
|
|
170
|
+
}
|
|
171
|
+
var getWeather = tool(
|
|
172
|
+
(input) => {
|
|
173
|
+
const loc = input.location.toLowerCase();
|
|
174
|
+
if (["sf", "sf bay"].includes(loc)) return "It's 60\xB0F and foggy in the Bay Area.";
|
|
175
|
+
if (["ny", "new york"].includes(loc)) return "It's 72\xB0F and partly cloudy in New York.";
|
|
176
|
+
return `Weather for ${input.location}: 70\xB0F and sunny.`;
|
|
177
|
+
},
|
|
178
|
+
{
|
|
179
|
+
name: "get_weather",
|
|
180
|
+
description: "Get the current weather for a location.",
|
|
181
|
+
schema: z.object({
|
|
182
|
+
location: z.string().describe("City or place name (e.g. SF, New York)")
|
|
183
|
+
})
|
|
184
|
+
}
|
|
185
|
+
);
|
|
186
|
+
var addNumbers = tool(
|
|
187
|
+
(input) => String(input.a + input.b),
|
|
188
|
+
{
|
|
189
|
+
name: "add_numbers",
|
|
190
|
+
description: "Add two numbers.",
|
|
191
|
+
schema: z.object({
|
|
192
|
+
a: z.number().describe("First number"),
|
|
193
|
+
b: z.number().describe("Second number")
|
|
194
|
+
})
|
|
195
|
+
}
|
|
196
|
+
);
|
|
197
|
+
var tools = [getWeather, addNumbers];
|
|
198
|
+
var toolsByName = new Map(tools.map((t) => [t.name, t]));
|
|
199
|
+
var MAX_TURNS = 10;
|
|
200
|
+
async function runSimpleChat(model, query) {
|
|
201
|
+
const messages = [new HumanMessage(query)];
|
|
202
|
+
const response = await model.invoke(messages);
|
|
203
|
+
return messageContentToString(response.content);
|
|
204
|
+
}
|
|
205
|
+
async function runAgentWithTools(model, query) {
|
|
206
|
+
const withTools = model.bindTools?.(tools, { tool_choice: "auto" });
|
|
207
|
+
const messages = [new HumanMessage(query)];
|
|
208
|
+
if (!withTools) return runSimpleChat(model, query);
|
|
209
|
+
for (let turn = 0; turn < MAX_TURNS; turn++) {
|
|
210
|
+
const response = await withTools.invoke(messages);
|
|
211
|
+
const aiMessage = response;
|
|
212
|
+
if (!aiMessage.tool_calls?.length) {
|
|
213
|
+
return messageContentToString(aiMessage.content);
|
|
214
|
+
}
|
|
215
|
+
messages.push(aiMessage);
|
|
216
|
+
for (const tc of aiMessage.tool_calls) {
|
|
217
|
+
const id = tc.id ?? `call_${turn}_${tc.name}`;
|
|
218
|
+
const toolFn = toolsByName.get(tc.name);
|
|
219
|
+
let result;
|
|
220
|
+
if (toolFn) {
|
|
221
|
+
try {
|
|
222
|
+
const out = await toolFn.invoke(
|
|
223
|
+
tc.args
|
|
224
|
+
);
|
|
225
|
+
result = typeof out === "string" ? out : JSON.stringify(out);
|
|
226
|
+
} catch (err) {
|
|
227
|
+
result = `Error: ${err instanceof Error ? err.message : String(err)}`;
|
|
228
|
+
}
|
|
229
|
+
} else {
|
|
230
|
+
result = `Unknown tool: ${tc.name}`;
|
|
231
|
+
}
|
|
232
|
+
messages.push(new ToolMessage({ content: result, tool_call_id: id }));
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
return "Agent reached max turns without a final answer.";
|
|
236
|
+
}
|
|
237
|
+
async function main() {
|
|
238
|
+
const { configPath, useTools, query } = parseArgv();
|
|
239
|
+
const model = await createAgentLlm(configPath ? { configPath } : void 0);
|
|
240
|
+
console.log("Query:", query);
|
|
241
|
+
console.log("---");
|
|
242
|
+
const answer = useTools ? await runAgentWithTools(model, query) : await runSimpleChat(model, query);
|
|
243
|
+
console.log("Answer:", answer);
|
|
244
|
+
console.log("---");
|
|
245
|
+
console.log("Done.");
|
|
246
|
+
}
|
|
247
|
+
var entryArg = process.argv[1];
|
|
248
|
+
var isDirectRun = typeof entryArg === "string" && entryArg.length > 0 && fileURLToPath(import.meta.url) === entryArg;
|
|
249
|
+
if (isDirectRun) {
|
|
250
|
+
main().catch((err) => {
|
|
251
|
+
console.error(err);
|
|
252
|
+
process.exit(1);
|
|
253
|
+
});
|
|
254
|
+
}
|
|
11
255
|
//# sourceMappingURL=index.js.map
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}
|
|
1
|
+
{"version":3,"sources":["../../src/api/create-agent-llm.ts","../../src/cli/utils.ts","../../src/cli/index.ts"],"sourcesContent":["/**\n * Simple API: create LangChain ChatModel from model.yaml config.\n * Supports OpenAI-compatible providers with optional connectivity check and npm: provider resolution.\n */\nimport { join } from \"node:path\";\nimport type { BaseChatModel } from \"@langchain/core/language_models/chat_models\";\nimport {\n checkEndpointConnectivity,\n buildUnreachableError,\n type EndpointConnectivityOptions,\n type ConnectionStatus,\n} from \"../connectivity/index.js\";\nimport { parseLlmSection } from \"../model/llm-parser.js\";\nimport type { LLMConfig } from \"../model/types.js\";\nimport { createChatModelFromLlmConfig } from \"../langchain/index.js\";\nimport { resolveLlmSectionWithNpm } from \"../extensions/npm-protocol.js\";\nimport { loadModelConfig } from \"../config/loader.js\";\n\n/**\n * Ensure bindTools always receives tool_choice: \"auto\" when tools are bound.\n * Fixes \"Tool choice is none, but model called a tool\" when using this model\n * with LangChain createAgent (AgentNode leaves tool_choice undefined for non-structured tools).\n * Mutates the model in place so it still passes isBaseChatModel / bindTools checks.\n */\nfunction applyDefaultToolChoice(model: BaseChatModel): void {\n const m = model as {\n bindTools?: (tools: unknown, opts?: Record<string, unknown>) => unknown;\n };\n const orig = m.bindTools?.bind(model);\n if (!orig) return;\n m.bindTools = function (tools: unknown, opts?: Record<string, unknown>) {\n return orig(tools, { ...opts, tool_choice: \"auto\" });\n };\n}\n\nconst CIS_DEFAULT_RESOLVE_HOST = \"s0010-ml-https.s0010.us-west-2.awswd\";\nconst CIS_DEFAULT_RESOLVE_IP = \"10.210.98.124\";\n\nfunction buildEndpointConnectivityOptions(\n config: LLMConfig & { baseURL: string }\n): EndpointConnectivityOptions | undefined {\n const opts = (config.options as Record<string, unknown> | undefined) ?? config;\n const provider = typeof config.provider === \"string\" ? config.provider : \"\";\n const baseURL = config.baseURL;\n const isCis = provider === \"cis\" || provider.includes(\"cis\");\n const useCisDefault =\n isCis &&\n baseURL.includes(CIS_DEFAULT_RESOLVE_HOST) &&\n opts?.resolveHost == null;\n\n const resolveHost =\n opts?.resolveHost != null && typeof (opts.resolveHost as { from?: string; to?: string }).from === \"string\"\n ? (opts.resolveHost as { from: string; to: string })\n : useCisDefault\n ? { from: CIS_DEFAULT_RESOLVE_HOST, to: CIS_DEFAULT_RESOLVE_IP }\n : undefined;\n const host = typeof opts?.host === \"string\" ? opts.host : (resolveHost ? resolveHost.from : undefined);\n if (resolveHost == null && host == null) return undefined;\n\n const verifySSL = opts?.verifySSL === true;\n const bypassAuth = opts?.bypassAuth !== false;\n\n return {\n resolveHost,\n host,\n verifySSL: resolveHost != null ? false : (verifySSL ? true : undefined),\n bypassAuth: bypassAuth ? true : undefined,\n featureKey: typeof opts?.featureKey === \"string\" ? opts.featureKey : undefined,\n };\n}\n\nexport interface CreateAgentLlmOptions {\n configPath?: string;\n installNpmIfMissing?: boolean;\n checkConnectivity?: boolean;\n onConnectionStatus?: (status: ConnectionStatus) => void;\n connectivityTimeoutMs?: number;\n}\n\nfunction resolveDefaultConfigPath(): string {\n return join(process.cwd(), \"model.yaml\");\n}\n\nfunction normalizeOptions(\n configPathOrOptions?: string | CreateAgentLlmOptions\n): CreateAgentLlmOptions {\n if (configPathOrOptions == null) return {};\n if (typeof configPathOrOptions === \"string\") return { configPath: configPathOrOptions };\n return configPathOrOptions;\n}\n\nfunction normalizeError(e: unknown, context: string): Error {\n if (e instanceof Error) return new Error(`${context}: ${e.message}`, { cause: e });\n return new Error(`${context}: ${String(e)}`);\n}\n\nasync function ensureConnectivity(\n resolvedLlmSection: unknown,\n options: {\n checkConnectivity?: boolean;\n onConnectionStatus?: (status: ConnectionStatus) => void;\n connectivityTimeoutMs?: number;\n }\n): Promise<void> {\n let configs: Array<LLMConfig & { baseURL: string }>;\n try {\n const parsed = parseLlmSection(resolvedLlmSection ?? null);\n configs = parsed.configs.filter(\n (c: LLMConfig): c is LLMConfig & { baseURL: string } =>\n typeof c.baseURL === \"string\" &&\n c.baseURL.length > 0 &&\n (c.baseURL.startsWith(\"http://\") || c.baseURL.startsWith(\"https://\")) &&\n !c.baseURL.includes(\"${\")\n );\n } catch {\n return;\n }\n const shouldCheck = options.checkConnectivity !== false && configs.length > 0;\n if (!shouldCheck) return;\n\n const report = (status: ConnectionStatus) => options.onConnectionStatus?.(status);\n const timeoutMs = options.connectivityTimeoutMs ?? 8000;\n\n for (const config of configs) {\n const { id, baseURL } = config;\n report({\n phase: \"checking\",\n endpointId: id,\n baseURL,\n message: \"Checking connection...\",\n });\n\n const endpointOpts = buildEndpointConnectivityOptions(config);\n const result = await checkEndpointConnectivity(baseURL, {\n timeoutMs,\n ...endpointOpts,\n });\n\n if (result.reachable) {\n report({\n phase: \"reachable\",\n endpointId: id,\n baseURL,\n message: result.message ?? \"Connected\",\n });\n } else {\n report({\n phase: \"unreachable\",\n endpointId: id,\n baseURL,\n message: result.message ?? \"Unreachable\",\n });\n throw new Error(buildUnreachableError(id, baseURL, result.message));\n }\n }\n}\n\n/**\n * Create a LangChain ChatModel from model.yaml config.\n * Returns BaseChatModel compatible with LangChain's createAgent and other tools.\n */\nexport async function createAgentLlm(\n configPathOrOptions?: string | CreateAgentLlmOptions\n): Promise<BaseChatModel> {\n try {\n const options = normalizeOptions(configPathOrOptions);\n const configPath = options.configPath ?? resolveDefaultConfigPath();\n const modelConfig = loadModelConfig(configPath);\n\n if (modelConfig?.llm == null) {\n throw new Error(\n `No LLM config at ${configPath}. Add model.yaml in the current directory, or pass configPath.`\n );\n }\n\n const resolvedSection = await resolveLlmSectionWithNpm(modelConfig.llm, {\n installNpmIfMissing: options.installNpmIfMissing !== false,\n cwd: process.cwd(),\n });\n\n // Priority: caller option > YAML runtime > default (true)\n const checkConnectivity =\n options.checkConnectivity ?? modelConfig.runtime.check_connectivity;\n\n await ensureConnectivity(resolvedSection, {\n checkConnectivity,\n onConnectionStatus: options.onConnectionStatus,\n connectivityTimeoutMs: options.connectivityTimeoutMs,\n });\n\n const model = createChatModelFromLlmConfig({ llmSection: resolvedSection });\n applyDefaultToolChoice(model);\n return model;\n } catch (e) {\n if (e instanceof Error && e.message.includes(\"No LLM config\")) throw e;\n if (e instanceof Error && e.message.includes(\"Cannot connect to\")) throw e;\n throw normalizeError(e, \"createAgentLlm failed\");\n }\n}\n","/**\n * Shared CLI helpers for agent-model and provider CLIs.\n */\n\n/**\n * Turn LangChain message content (string | array of parts) into a single string.\n */\nexport function messageContentToString(content: unknown): string {\n if (typeof content === \"string\") return content;\n if (Array.isArray(content)) {\n return (content as { type?: string; text?: string }[])\n .map((c) => (\"text\" in c && c.text ? c.text : \"\"))\n .join(\"\");\n }\n return String(content ?? \"\");\n}\n\n/**\n * Log error and exit. Use in CLIs for consistent error handling.\n */\nexport function exitWithError(err: unknown, code = 1): never {\n console.error(\"Error:\", err instanceof Error ? err.message : String(err));\n process.exit(code);\n}\n","#!/usr/bin/env node\n/**\n * CLI for @easynet/agent-model: chat with the configured LLM (LangChain ChatOpenAI).\n * Usage: agent-model \"your question\"\n * or: agent-model --config ./model.yaml \"hi\"\n * or: agent-model --tools \"what is the weather in SF?\"\n */\nimport { createAgentLlm } from \"../api/create-agent-llm.js\";\nimport { messageContentToString } from \"./utils.js\";\nimport type { BaseChatModel } from \"@langchain/core/language_models/chat_models\";\nimport { tool } from \"@langchain/core/tools\";\nimport { z } from \"zod\";\nimport { HumanMessage, AIMessage, ToolMessage } from \"@langchain/core/messages\";\nimport type { BaseMessage } from \"@langchain/core/messages\";\nimport { fileURLToPath } from \"node:url\";\n\nfunction parseArgv(): { configPath: string | undefined; useTools: boolean; query: string } {\n const args = process.argv.slice(2);\n let configPath: string | undefined;\n let useTools = false;\n const rest: string[] = [];\n for (let i = 0; i < args.length; i++) {\n if (args[i] === \"--config\" && args[i + 1]) {\n configPath = args[i + 1];\n i++;\n } else if (args[i] === \"--tools\") {\n useTools = true;\n } else {\n rest.push(args[i]);\n }\n }\n const query = rest.join(\" \").trim() || \"hi\";\n return { configPath, useTools, query };\n}\n\nconst getWeather = tool(\n (input: { location: string }) => {\n const loc = input.location.toLowerCase();\n if ([\"sf\", \"sf bay\"].includes(loc)) return \"It's 60°F and foggy in the Bay Area.\";\n if ([\"ny\", \"new york\"].includes(loc)) return \"It's 72°F and partly cloudy in New York.\";\n return `Weather for ${input.location}: 70°F and sunny.`;\n },\n {\n name: \"get_weather\",\n description: \"Get the current weather for a location.\",\n schema: z.object({\n location: z.string().describe(\"City or place name (e.g. SF, New York)\"),\n }),\n }\n);\n\nconst addNumbers = tool(\n (input: { a: number; b: number }) => String(input.a + input.b),\n {\n name: \"add_numbers\",\n description: \"Add two numbers.\",\n schema: z.object({\n a: z.number().describe(\"First number\"),\n b: z.number().describe(\"Second number\"),\n }),\n }\n);\n\nconst tools = [getWeather, addNumbers];\nconst toolsByName = new Map(tools.map((t) => [t.name, t]));\nconst MAX_TURNS = 10;\n\nasync function runSimpleChat(model: BaseChatModel, query: string): Promise<string> {\n const messages: BaseMessage[] = [new HumanMessage(query)];\n const response = await model.invoke(messages);\n return messageContentToString(response.content);\n}\n\nasync function runAgentWithTools(model: BaseChatModel, query: string): Promise<string> {\n const withTools = model.bindTools?.(tools, { tool_choice: \"auto\" });\n const messages: BaseMessage[] = [new HumanMessage(query)];\n if (!withTools) return runSimpleChat(model, query);\n\n for (let turn = 0; turn < MAX_TURNS; turn++) {\n const response = await withTools.invoke(messages);\n const aiMessage = response as AIMessage;\n\n if (!aiMessage.tool_calls?.length) {\n return messageContentToString(aiMessage.content);\n }\n\n messages.push(aiMessage);\n for (const tc of aiMessage.tool_calls) {\n const id = tc.id ?? `call_${turn}_${tc.name}`;\n const toolFn = toolsByName.get(tc.name as \"get_weather\" | \"add_numbers\");\n let result: string;\n if (toolFn) {\n try {\n const out = await (toolFn as { invoke: (args: Record<string, unknown>) => Promise<unknown> }).invoke(\n tc.args as Record<string, unknown>\n );\n result = typeof out === \"string\" ? out : JSON.stringify(out);\n } catch (err) {\n result = `Error: ${err instanceof Error ? err.message : String(err)}`;\n }\n } else {\n result = `Unknown tool: ${tc.name}`;\n }\n messages.push(new ToolMessage({ content: result, tool_call_id: id }));\n }\n }\n return \"Agent reached max turns without a final answer.\";\n}\n\nasync function main() {\n const { configPath, useTools, query } = parseArgv();\n const model = await createAgentLlm(configPath ? { configPath } : undefined);\n\n console.log(\"Query:\", query);\n console.log(\"---\");\n const answer = useTools\n ? await runAgentWithTools(model, query)\n : await runSimpleChat(model, query);\n console.log(\"Answer:\", answer);\n console.log(\"---\");\n console.log(\"Done.\");\n}\n\nconst entryArg = process.argv[1];\nconst isDirectRun =\n typeof entryArg === \"string\" && entryArg.length > 0 && fileURLToPath(import.meta.url) === entryArg;\n\nif (isDirectRun) {\n main().catch((err) => {\n console.error(err);\n process.exit(1);\n });\n}\n"],"mappings":"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","names":["tools"]}
|
package/dist/config/index.js
CHANGED
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
createModelConfig,
|
|
3
|
-
loadModelRuntimeConfig,
|
|
4
|
-
loadYamlConfig,
|
|
5
|
-
normalizeAgentModelConfigRef
|
|
6
|
-
} from "../chunk-5QOKZ2JF.js";
|
|
7
1
|
import {
|
|
8
2
|
clearYamlFileCache,
|
|
9
3
|
loadLlmConfig,
|
|
4
|
+
loadModelConfig,
|
|
10
5
|
loadYamlFile,
|
|
11
6
|
loadYamlFileSync,
|
|
12
7
|
parseLlmYaml,
|
|
@@ -16,7 +11,49 @@ import {
|
|
|
16
11
|
import {
|
|
17
12
|
parseLlmSection
|
|
18
13
|
} from "../chunk-SPDXNDDD.js";
|
|
19
|
-
|
|
14
|
+
|
|
15
|
+
// src/config/index.ts
|
|
16
|
+
import { join } from "path";
|
|
17
|
+
import { deepMerge } from "@easynet/agent-common";
|
|
18
|
+
|
|
19
|
+
// src/config/yaml.ts
|
|
20
|
+
function loadYamlConfig(filePath) {
|
|
21
|
+
try {
|
|
22
|
+
const parsed = loadYamlFileSync(filePath, {
|
|
23
|
+
substituteEnv: true,
|
|
24
|
+
missingEnv: "keep",
|
|
25
|
+
cache: true
|
|
26
|
+
});
|
|
27
|
+
return parsed ?? {};
|
|
28
|
+
} catch (e) {
|
|
29
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
30
|
+
throw new Error(`Failed to load YAML config from ${filePath}: ${msg}`, { cause: e });
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
// src/config/ref.ts
|
|
35
|
+
function asObject(input) {
|
|
36
|
+
return typeof input === "object" && input !== null ? input : void 0;
|
|
37
|
+
}
|
|
38
|
+
function normalizeAgentModelConfigRef(raw) {
|
|
39
|
+
if (typeof raw === "string" && raw.trim().length > 0) return { ref: raw.trim() };
|
|
40
|
+
const obj = asObject(raw);
|
|
41
|
+
if (!obj) return {};
|
|
42
|
+
if (typeof obj.ref === "string" && obj.ref.trim().length > 0) return { ref: obj.ref.trim() };
|
|
43
|
+
return {};
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
// src/config/index.ts
|
|
47
|
+
function loadModelRuntimeConfig(options = {}) {
|
|
48
|
+
const configPath = options.configPath ?? join(process.cwd(), "model.yaml");
|
|
49
|
+
return loadModelConfig(configPath, options.loadOptions);
|
|
50
|
+
}
|
|
51
|
+
function createModelConfig(options = {}) {
|
|
52
|
+
const base = loadModelRuntimeConfig(options);
|
|
53
|
+
if (!base) return base;
|
|
54
|
+
if (!options.overrides) return base;
|
|
55
|
+
return deepMerge({}, base, options.overrides);
|
|
56
|
+
}
|
|
20
57
|
export {
|
|
21
58
|
clearYamlFileCache,
|
|
22
59
|
createModelConfig,
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}
|
|
1
|
+
{"version":3,"sources":["../../src/config/index.ts","../../src/config/yaml.ts","../../src/config/ref.ts"],"sourcesContent":["import { join } from \"node:path\";\nimport { deepMerge } from \"@easynet/agent-common\";\nimport { loadModelConfig, type LoadLlmConfigOptions, type ModelConfigResult } from \"./loader.js\";\n\nexport { parseLlmSection } from \"./parser.js\";\nexport { loadLlmConfig, parseLlmYaml, substituteEnv } from \"./loader.js\";\nexport { loadYamlConfig } from \"./yaml.js\";\nexport { normalizeAgentModelConfigRef } from \"./ref.js\";\nexport {\n loadYamlFile,\n loadYamlFileSync,\n parseYamlContent,\n clearYamlFileCache,\n type LoadYamlOptions,\n type YamlEnvOptions,\n} from \"./yaml-utils.js\";\nexport type { LoadLlmConfigOptions, ModelConfigResult } from \"./loader.js\";\nexport type { AgentModelConfigRef } from \"./ref.js\";\n\nexport interface LoadModelConfigOptions {\n configPath?: string;\n loadOptions?: LoadLlmConfigOptions;\n}\n\nexport interface CreateModelConfigOptions extends LoadModelConfigOptions {\n overrides?: Partial<ModelConfigResult>;\n}\n\nexport function loadModelRuntimeConfig(options: LoadModelConfigOptions = {}): ModelConfigResult | null {\n const configPath = options.configPath ?? join(process.cwd(), \"model.yaml\");\n return loadModelConfig(configPath, options.loadOptions);\n}\n\nexport function createModelConfig(options: CreateModelConfigOptions = {}): ModelConfigResult | null {\n const base = loadModelRuntimeConfig(options);\n if (!base) return base;\n if (!options.overrides) return base;\n return deepMerge({} as ModelConfigResult, base, options.overrides);\n}\n","/**\n * Generic YAML file loader utility.\n */\n\nimport { loadYamlFileSync } from \"./yaml-utils.js\";\n\n/**\n * Load and parse a YAML file into a typed object.\n * Returns empty object if file doesn't exist.\n */\nexport function loadYamlConfig<T = Record<string, unknown>>(filePath: string): T {\n try {\n const parsed = loadYamlFileSync<T>(filePath, {\n substituteEnv: true,\n missingEnv: \"keep\",\n cache: true,\n });\n return (parsed ?? ({} as T)) as T;\n } catch (e) {\n const msg = e instanceof Error ? e.message : String(e);\n throw new Error(`Failed to load YAML config from ${filePath}: ${msg}`, { cause: e });\n }\n}\n","/** Agent-level reference to models config file. */\nexport interface AgentModelConfigRef {\n ref?: string;\n}\n\nfunction asObject(input: unknown): Record<string, unknown> | undefined {\n return typeof input === \"object\" && input !== null ? (input as Record<string, unknown>) : undefined;\n}\n\n/** Normalize unknown value to AgentModelConfigRef. */\nexport function normalizeAgentModelConfigRef(raw: unknown): Partial<AgentModelConfigRef> {\n if (typeof raw === \"string\" && raw.trim().length > 0) return { ref: raw.trim() };\n const obj = asObject(raw);\n if (!obj) return {};\n if (typeof obj.ref === \"string\" && obj.ref.trim().length > 0) return { ref: obj.ref.trim() };\n return {};\n}\n"],"mappings":";;;;;;;;;;;;;;;AAAA,SAAS,YAAY;AACrB,SAAS,iBAAiB;;;ACSnB,SAAS,eAA4C,UAAqB;AAC/E,MAAI;AACF,UAAM,SAAS,iBAAoB,UAAU;AAAA,MAC3C,eAAe;AAAA,MACf,YAAY;AAAA,MACZ,OAAO;AAAA,IACT,CAAC;AACD,WAAQ,UAAW,CAAC;AAAA,EACtB,SAAS,GAAG;AACV,UAAM,MAAM,aAAa,QAAQ,EAAE,UAAU,OAAO,CAAC;AACrD,UAAM,IAAI,MAAM,mCAAmC,QAAQ,KAAK,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC;AAAA,EACrF;AACF;;;ACjBA,SAAS,SAAS,OAAqD;AACrE,SAAO,OAAO,UAAU,YAAY,UAAU,OAAQ,QAAoC;AAC5F;AAGO,SAAS,6BAA6B,KAA4C;AACvF,MAAI,OAAO,QAAQ,YAAY,IAAI,KAAK,EAAE,SAAS,EAAG,QAAO,EAAE,KAAK,IAAI,KAAK,EAAE;AAC/E,QAAM,MAAM,SAAS,GAAG;AACxB,MAAI,CAAC,IAAK,QAAO,CAAC;AAClB,MAAI,OAAO,IAAI,QAAQ,YAAY,IAAI,IAAI,KAAK,EAAE,SAAS,EAAG,QAAO,EAAE,KAAK,IAAI,IAAI,KAAK,EAAE;AAC3F,SAAO,CAAC;AACV;;;AFYO,SAAS,uBAAuB,UAAkC,CAAC,GAA6B;AACrG,QAAM,aAAa,QAAQ,cAAc,KAAK,QAAQ,IAAI,GAAG,YAAY;AACzE,SAAO,gBAAgB,YAAY,QAAQ,WAAW;AACxD;AAEO,SAAS,kBAAkB,UAAoC,CAAC,GAA6B;AAClG,QAAM,OAAO,uBAAuB,OAAO;AAC3C,MAAI,CAAC,KAAM,QAAO;AAClB,MAAI,CAAC,QAAQ,UAAW,QAAO;AAC/B,SAAO,UAAU,CAAC,GAAwB,MAAM,QAAQ,SAAS;AACnE;","names":[]}
|