@brainpilot/runtime 0.0.4 → 0.0.5
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/agent-factory.d.ts.map +1 -1
- package/dist/agent-factory.js +9 -4
- package/dist/agent-factory.js.map +1 -1
- package/dist/mcp-bridge.d.ts +15 -2
- package/dist/mcp-bridge.d.ts.map +1 -1
- package/dist/mcp-bridge.js +53 -10
- package/dist/mcp-bridge.js.map +1 -1
- package/dist/mem-watchdog.d.ts +63 -0
- package/dist/mem-watchdog.d.ts.map +1 -0
- package/dist/mem-watchdog.js +81 -0
- package/dist/mem-watchdog.js.map +1 -0
- package/dist/pi-provider.d.ts +27 -1
- package/dist/pi-provider.d.ts.map +1 -1
- package/dist/pi-provider.js +64 -0
- package/dist/pi-provider.js.map +1 -1
- package/dist/provider-config.d.ts +18 -0
- package/dist/provider-config.d.ts.map +1 -0
- package/dist/provider-config.js +47 -0
- package/dist/provider-config.js.map +1 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +64 -0
- package/dist/server.js.map +1 -1
- package/dist/session-manager.d.ts +57 -1
- package/dist/session-manager.d.ts.map +1 -1
- package/dist/session-manager.js +188 -2
- package/dist/session-manager.js.map +1 -1
- package/dist/types.d.ts +10 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-factory.d.ts","sourceRoot":"","sources":["../src/agent-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAA2C,MAAM,YAAY,CAAC;AAI/F,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,OAAO,CAEzF;AAED,eAAO,MAAM,gBAAgB,EAAE,mBAE9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"agent-factory.d.ts","sourceRoot":"","sources":["../src/agent-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAA2C,MAAM,YAAY,CAAC;AAI/F,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,OAAO,CAEzF;AAED,eAAO,MAAM,gBAAgB,EAAE,mBAE9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,mBAkD9B,CAAC;AAEF,wBAAgB,aAAa,IAAI,mBAAmB,CAEnD"}
|
package/dist/agent-factory.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MockAgentSession } from "./mock-agent.js";
|
|
2
|
-
import { resolveGatewayModel } from "./pi-provider.js";
|
|
2
|
+
import { resolveGatewayModel, resolveSessionModel } from "./pi-provider.js";
|
|
3
3
|
export function isMockMode(env = process.env) {
|
|
4
4
|
return env.BP_MOCK === "1" || env.BP_MOCK === "true";
|
|
5
5
|
}
|
|
@@ -15,9 +15,13 @@ export const realAgentFactory = async (params) => {
|
|
|
15
15
|
const { createAgentSession, defineTool, SessionManager, DefaultResourceLoader, getAgentDir } = sdk;
|
|
16
16
|
const customTools = params.systemTools.map((t) => adaptTool(defineTool, t));
|
|
17
17
|
const agentDir = getAgentDir();
|
|
18
|
-
// Target a custom Anthropic-compatible gateway
|
|
19
|
-
// (
|
|
20
|
-
|
|
18
|
+
// Target a custom Anthropic-compatible gateway. A per-session providerConfig
|
|
19
|
+
// (from providers.json) wins and isolates its key via setRuntimeApiKey;
|
|
20
|
+
// otherwise fall back to the env-based gateway (Docker/static compat).
|
|
21
|
+
const resolved = params.providerConfig
|
|
22
|
+
? resolveSessionModel(sdk, agentDir, params.providerConfig)
|
|
23
|
+
: resolveGatewayModel(sdk, agentDir);
|
|
24
|
+
const { model, modelRegistry, authStorage } = resolved;
|
|
21
25
|
// `createAgentSession` has NO `systemPrompt`/`instructions` option — the
|
|
22
26
|
// per-role persona is injected through a DefaultResourceLoader. We use
|
|
23
27
|
// `appendSystemPrompt` (NOT `systemPrompt`) so Pi's built-in tool-calling
|
|
@@ -47,6 +51,7 @@ export const realAgentFactory = async (params) => {
|
|
|
47
51
|
sessionManager: SessionManager.open(params.historyPath),
|
|
48
52
|
...(model ? { model } : {}),
|
|
49
53
|
...(modelRegistry ? { modelRegistry } : {}),
|
|
54
|
+
...(authStorage ? { authStorage } : {}),
|
|
50
55
|
});
|
|
51
56
|
return new RealAgentSession(session);
|
|
52
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-factory.js","sourceRoot":"","sources":["../src/agent-factory.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAsB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-factory.js","sourceRoot":"","sources":["../src/agent-factory.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp-bridge.d.ts
CHANGED
|
@@ -1,8 +1,19 @@
|
|
|
1
1
|
import type { SystemTool } from "./types.js";
|
|
2
|
+
/** Wire transport for an MCP server. Absent ⇒ "stdio" (back-compat). */
|
|
3
|
+
export type McpTransportType = "stdio" | "http" | "sse";
|
|
2
4
|
export interface McpServerSpec {
|
|
3
|
-
|
|
5
|
+
/** Transport. Defaults to "stdio" when omitted. */
|
|
6
|
+
type?: McpTransportType;
|
|
7
|
+
/** stdio: executable to spawn. */
|
|
8
|
+
command?: string;
|
|
9
|
+
/** stdio: arguments for `command`. */
|
|
4
10
|
args?: string[];
|
|
11
|
+
/** stdio: extra environment for the spawned process. */
|
|
5
12
|
env?: Record<string, string>;
|
|
13
|
+
/** http/sse: endpoint URL of the remote MCP server. */
|
|
14
|
+
url?: string;
|
|
15
|
+
/** http/sse: extra HTTP headers (e.g. Authorization) sent on every request. */
|
|
16
|
+
headers?: Record<string, string>;
|
|
6
17
|
}
|
|
7
18
|
export interface McpServersConfig {
|
|
8
19
|
mcpServers: Record<string, McpServerSpec>;
|
|
@@ -34,8 +45,10 @@ export type McpConnectFn = (name: string, spec: McpServerSpec) => Promise<McpCli
|
|
|
34
45
|
* absent — MCP is entirely opt-in and adds zero overhead when unconfigured.
|
|
35
46
|
*/
|
|
36
47
|
export declare function loadMcpServersConfig(dataRoot: string): Promise<McpServersConfig | null>;
|
|
37
|
-
/** Real connect:
|
|
48
|
+
/** Real connect: open the transport named by `spec.type` and hand back a thin client. */
|
|
38
49
|
export declare const defaultMcpConnect: McpConnectFn;
|
|
50
|
+
/** Build the SDK transport for a server spec; defaults to stdio. Exported for tests. */
|
|
51
|
+
export declare function openTransport(name: string, spec: McpServerSpec): Promise<import("@modelcontextprotocol/sdk/client/streamableHttp.js").StreamableHTTPClientTransport | import("@modelcontextprotocol/sdk/client/sse.js").SSEClientTransport | import("@modelcontextprotocol/sdk/client/stdio.js").StdioClientTransport>;
|
|
39
52
|
export declare class McpBridge {
|
|
40
53
|
private readonly connect;
|
|
41
54
|
private clients;
|
package/dist/mcp-bridge.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-bridge.d.ts","sourceRoot":"","sources":["../src/mcp-bridge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-bridge.d.ts","sourceRoot":"","sources":["../src/mcp-bridge.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,YAAY,CAAC;AAE/D,wEAAwE;AACxE,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,wDAAwD;IACxD,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAC3C;AAED,yEAAyE;AACzE,MAAM,WAAW,aAAa;IAC5B,SAAS,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,iBAAiB,EAAE,CAAA;KAAE,CAAC,CAAC;IACrD,QAAQ,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7F,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AAEzF;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAa7F;AAED,yFAAyF;AACzF,eAAO,MAAM,iBAAiB,EAAE,YAS/B,CAAC;AAEF,wFAAwF;AACxF,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,yPA2BpE;AAED,qBAAa,SAAS;IAIR,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,MAAM,CAAoB;gBAEL,OAAO,GAAE,YAAgC;IAEtE,IAAI,KAAK,IAAI,UAAU,EAAE,CAExB;IAED,kEAAkE;IAC5D,UAAU,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAsB9D,OAAO,CAAC,IAAI;IAYZ,mDAAmD;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}
|
package/dist/mcp-bridge.js
CHANGED
|
@@ -10,8 +10,11 @@
|
|
|
10
10
|
* Tools are namespaced `mcp__<server>__<tool>` to avoid cross-server collisions.
|
|
11
11
|
* A failing server is logged and skipped — it never aborts the others.
|
|
12
12
|
*
|
|
13
|
-
* Config shape (standard MCP/Claude format)
|
|
14
|
-
*
|
|
13
|
+
* Config shape (standard MCP/Claude format). Three transports are supported,
|
|
14
|
+
* selected by the optional `type` field (defaults to "stdio" for back-compat):
|
|
15
|
+
* stdio: { "fs": { "command": "npx", "args": ["-y", "..."], "env": {} } }
|
|
16
|
+
* http: { "api": { "type": "http", "url": "https://host/mcp", "headers": {} } }
|
|
17
|
+
* sse: { "evt": { "type": "sse", "url": "https://host/sse", "headers": {} } }
|
|
15
18
|
*/
|
|
16
19
|
import { readFile } from "node:fs/promises";
|
|
17
20
|
import { join } from "node:path";
|
|
@@ -35,23 +38,44 @@ export async function loadMcpServersConfig(dataRoot) {
|
|
|
35
38
|
}
|
|
36
39
|
return null;
|
|
37
40
|
}
|
|
38
|
-
/** Real connect:
|
|
41
|
+
/** Real connect: open the transport named by `spec.type` and hand back a thin client. */
|
|
39
42
|
export const defaultMcpConnect = async (name, spec) => {
|
|
40
43
|
const { Client } = await import("@modelcontextprotocol/sdk/client/index.js");
|
|
41
|
-
const { StdioClientTransport } = await import("@modelcontextprotocol/sdk/client/stdio.js");
|
|
42
|
-
const transport = new StdioClientTransport({
|
|
43
|
-
command: spec.command,
|
|
44
|
-
args: spec.args ?? [],
|
|
45
|
-
...(spec.env ? { env: spec.env } : {}),
|
|
46
|
-
});
|
|
47
44
|
const client = new Client({ name: `brainpilot-${name}`, version: "0.1.0" });
|
|
48
|
-
await client.connect(
|
|
45
|
+
await client.connect(await openTransport(name, spec));
|
|
49
46
|
return {
|
|
50
47
|
listTools: () => client.listTools(),
|
|
51
48
|
callTool: (a) => client.callTool(a),
|
|
52
49
|
close: () => client.close(),
|
|
53
50
|
};
|
|
54
51
|
};
|
|
52
|
+
/** Build the SDK transport for a server spec; defaults to stdio. Exported for tests. */
|
|
53
|
+
export async function openTransport(name, spec) {
|
|
54
|
+
const type = spec.type ?? "stdio";
|
|
55
|
+
if (type === "http" || type === "sse") {
|
|
56
|
+
if (!spec.url) {
|
|
57
|
+
throw new Error(`mcp server '${name}': type '${type}' requires a 'url'`);
|
|
58
|
+
}
|
|
59
|
+
const url = new URL(spec.url);
|
|
60
|
+
// Custom headers (e.g. Authorization) ride on `requestInit` for both transports.
|
|
61
|
+
const opts = spec.headers ? { requestInit: { headers: spec.headers } } : undefined;
|
|
62
|
+
if (type === "http") {
|
|
63
|
+
const { StreamableHTTPClientTransport } = await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
|
|
64
|
+
return new StreamableHTTPClientTransport(url, opts);
|
|
65
|
+
}
|
|
66
|
+
const { SSEClientTransport } = await import("@modelcontextprotocol/sdk/client/sse.js");
|
|
67
|
+
return new SSEClientTransport(url, opts);
|
|
68
|
+
}
|
|
69
|
+
if (!spec.command) {
|
|
70
|
+
throw new Error(`mcp server '${name}': type 'stdio' requires a 'command'`);
|
|
71
|
+
}
|
|
72
|
+
const { StdioClientTransport } = await import("@modelcontextprotocol/sdk/client/stdio.js");
|
|
73
|
+
return new StdioClientTransport({
|
|
74
|
+
command: spec.command,
|
|
75
|
+
args: spec.args ?? [],
|
|
76
|
+
...(spec.env ? { env: spec.env } : {}),
|
|
77
|
+
});
|
|
78
|
+
}
|
|
55
79
|
export class McpBridge {
|
|
56
80
|
connect;
|
|
57
81
|
clients = [];
|
|
@@ -65,6 +89,13 @@ export class McpBridge {
|
|
|
65
89
|
/** Connect every server in the config and collect their tools. */
|
|
66
90
|
async connectAll(cfg) {
|
|
67
91
|
for (const [name, spec] of Object.entries(cfg.mcpServers)) {
|
|
92
|
+
if (isPlaceholderSpec(spec)) {
|
|
93
|
+
// A scaffolded slot whose url/command hasn't been filled in yet — skip
|
|
94
|
+
// quietly so the default config never delays launch or logs an error.
|
|
95
|
+
// eslint-disable-next-line no-console
|
|
96
|
+
console.info(`[mcp] server '${name}' not configured yet — skipping`);
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
68
99
|
try {
|
|
69
100
|
const client = await this.connect(name, spec);
|
|
70
101
|
this.clients.push(client);
|
|
@@ -97,6 +128,18 @@ export class McpBridge {
|
|
|
97
128
|
this._tools = [];
|
|
98
129
|
}
|
|
99
130
|
}
|
|
131
|
+
/**
|
|
132
|
+
* A spec is a "placeholder" when its required address field is blank: an
|
|
133
|
+
* http/sse entry with no `url`, or a stdio entry with no `command`. The scaffold
|
|
134
|
+
* ships one such slot (`type:"http", url:""`) so the runtime treats an unfilled
|
|
135
|
+
* default as opt-in rather than a misconfiguration.
|
|
136
|
+
*/
|
|
137
|
+
function isPlaceholderSpec(spec) {
|
|
138
|
+
const type = spec.type ?? "stdio";
|
|
139
|
+
if (type === "http" || type === "sse")
|
|
140
|
+
return !spec.url?.trim();
|
|
141
|
+
return !spec.command?.trim();
|
|
142
|
+
}
|
|
100
143
|
/** Map an MCP tool-call `content` payload into our text-content shape. */
|
|
101
144
|
function normalizeContent(content) {
|
|
102
145
|
if (Array.isArray(content)) {
|
package/dist/mcp-bridge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-bridge.js","sourceRoot":"","sources":["../src/mcp-bridge.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"mcp-bridge.js","sourceRoot":"","sources":["../src/mcp-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Memory watchdog (§R-4 / issue #20) — opt-in, in-process soft defense against
|
|
3
|
+
* the container memory budget.
|
|
4
|
+
*
|
|
5
|
+
* The hosted instance-per-user layer injects `BP_MEM_LIMIT_MB` and enforces a
|
|
6
|
+
* hard cgroup ceiling. This watchdog lets the runtime *self-throttle* before
|
|
7
|
+
* the kernel OOM-kills it: past a soft threshold (default 85% of the budget)
|
|
8
|
+
* the SessionManager refuses new sessions/messages and emits a system message.
|
|
9
|
+
*
|
|
10
|
+
* STRICT OPT-IN: `BP_MEM_LIMIT_MB` unset (or non-positive / unparseable) means
|
|
11
|
+
* the feature is entirely disabled — identical behavior to today. We never
|
|
12
|
+
* invent a ceiling for single-user self-hosting; the cgroup `--memory` (when
|
|
13
|
+
* present) remains the only backstop in that case.
|
|
14
|
+
*
|
|
15
|
+
* The RSS reader and interval are injectable so the policy is unit-testable
|
|
16
|
+
* without real memory pressure or wall-clock timers.
|
|
17
|
+
*/
|
|
18
|
+
/**
|
|
19
|
+
* Parse `BP_MEM_LIMIT_MB` into a byte budget. Returns `null` (feature off)
|
|
20
|
+
* unless the value is a positive, finite number of megabytes.
|
|
21
|
+
*/
|
|
22
|
+
export declare function parseMemLimitMb(env?: NodeJS.ProcessEnv): number | null;
|
|
23
|
+
export interface MemWatchdogOptions {
|
|
24
|
+
/** Budget in bytes (typically from {@link parseMemLimitMb}). */
|
|
25
|
+
limitBytes: number;
|
|
26
|
+
/** Fraction of the budget at which to start throttling (default 0.85). */
|
|
27
|
+
softRatio?: number;
|
|
28
|
+
/** Poll interval in ms (default 2000). */
|
|
29
|
+
pollMs?: number;
|
|
30
|
+
/** RSS reader; default reads the real process RSS. Injected in tests. */
|
|
31
|
+
readRss?: () => number;
|
|
32
|
+
/**
|
|
33
|
+
* Called once on the rising edge into the throttled state (not every tick),
|
|
34
|
+
* so the caller can emit a single warning rather than spamming.
|
|
35
|
+
*/
|
|
36
|
+
onThrottle?: (snapshot: MemSnapshot) => void;
|
|
37
|
+
}
|
|
38
|
+
export interface MemSnapshot {
|
|
39
|
+
limitBytes: number;
|
|
40
|
+
rss: number;
|
|
41
|
+
/** rss / limitBytes. */
|
|
42
|
+
ratio: number;
|
|
43
|
+
}
|
|
44
|
+
export declare class MemWatchdog {
|
|
45
|
+
private readonly limitBytes;
|
|
46
|
+
private readonly softRatio;
|
|
47
|
+
private readonly pollMs;
|
|
48
|
+
private readonly readRss;
|
|
49
|
+
private readonly onThrottle?;
|
|
50
|
+
private timer;
|
|
51
|
+
private throttling;
|
|
52
|
+
constructor(opts: MemWatchdogOptions);
|
|
53
|
+
/** Current footprint relative to the budget. */
|
|
54
|
+
snapshot(): MemSnapshot;
|
|
55
|
+
/** True once RSS has reached the soft threshold — the signal to refuse work. */
|
|
56
|
+
isOverSoftLimit(): boolean;
|
|
57
|
+
/** Begin polling. The interval is `unref()`d so it never holds the process open. */
|
|
58
|
+
start(): void;
|
|
59
|
+
stop(): void;
|
|
60
|
+
/** Evaluate the threshold; fire {@link MemWatchdogOptions.onThrottle} on the rising edge. */
|
|
61
|
+
tick(): void;
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=mem-watchdog.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mem-watchdog.d.ts","sourceRoot":"","sources":["../src/mem-watchdog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,GAAG,IAAI,CAMnF;AAED,MAAM,WAAW,kBAAkB;IACjC,gEAAgE;IAChE,UAAU,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,KAAK,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,wBAAwB;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAkC;IAC9D,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,UAAU,CAAS;gBAEf,IAAI,EAAE,kBAAkB;IAQpC,gDAAgD;IAChD,QAAQ,IAAI,WAAW;IAKvB,gFAAgF;IAChF,eAAe,IAAI,OAAO;IAI1B,oFAAoF;IACpF,KAAK,IAAI,IAAI;IAMb,IAAI,IAAI,IAAI;IAOZ,6FAA6F;IAC7F,IAAI,IAAI,IAAI;CAUb"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Memory watchdog (§R-4 / issue #20) — opt-in, in-process soft defense against
|
|
3
|
+
* the container memory budget.
|
|
4
|
+
*
|
|
5
|
+
* The hosted instance-per-user layer injects `BP_MEM_LIMIT_MB` and enforces a
|
|
6
|
+
* hard cgroup ceiling. This watchdog lets the runtime *self-throttle* before
|
|
7
|
+
* the kernel OOM-kills it: past a soft threshold (default 85% of the budget)
|
|
8
|
+
* the SessionManager refuses new sessions/messages and emits a system message.
|
|
9
|
+
*
|
|
10
|
+
* STRICT OPT-IN: `BP_MEM_LIMIT_MB` unset (or non-positive / unparseable) means
|
|
11
|
+
* the feature is entirely disabled — identical behavior to today. We never
|
|
12
|
+
* invent a ceiling for single-user self-hosting; the cgroup `--memory` (when
|
|
13
|
+
* present) remains the only backstop in that case.
|
|
14
|
+
*
|
|
15
|
+
* The RSS reader and interval are injectable so the policy is unit-testable
|
|
16
|
+
* without real memory pressure or wall-clock timers.
|
|
17
|
+
*/
|
|
18
|
+
/**
|
|
19
|
+
* Parse `BP_MEM_LIMIT_MB` into a byte budget. Returns `null` (feature off)
|
|
20
|
+
* unless the value is a positive, finite number of megabytes.
|
|
21
|
+
*/
|
|
22
|
+
export function parseMemLimitMb(env = process.env) {
|
|
23
|
+
const raw = env.BP_MEM_LIMIT_MB;
|
|
24
|
+
if (raw === undefined || raw.trim() === "")
|
|
25
|
+
return null;
|
|
26
|
+
const mb = Number(raw);
|
|
27
|
+
if (!Number.isFinite(mb) || mb <= 0)
|
|
28
|
+
return null;
|
|
29
|
+
return Math.floor(mb) * 1024 * 1024;
|
|
30
|
+
}
|
|
31
|
+
export class MemWatchdog {
|
|
32
|
+
limitBytes;
|
|
33
|
+
softRatio;
|
|
34
|
+
pollMs;
|
|
35
|
+
readRss;
|
|
36
|
+
onThrottle;
|
|
37
|
+
timer = null;
|
|
38
|
+
throttling = false;
|
|
39
|
+
constructor(opts) {
|
|
40
|
+
this.limitBytes = opts.limitBytes;
|
|
41
|
+
this.softRatio = opts.softRatio ?? 0.85;
|
|
42
|
+
this.pollMs = opts.pollMs ?? 2000;
|
|
43
|
+
this.readRss = opts.readRss ?? (() => process.memoryUsage().rss);
|
|
44
|
+
this.onThrottle = opts.onThrottle;
|
|
45
|
+
}
|
|
46
|
+
/** Current footprint relative to the budget. */
|
|
47
|
+
snapshot() {
|
|
48
|
+
const rss = this.readRss();
|
|
49
|
+
return { limitBytes: this.limitBytes, rss, ratio: rss / this.limitBytes };
|
|
50
|
+
}
|
|
51
|
+
/** True once RSS has reached the soft threshold — the signal to refuse work. */
|
|
52
|
+
isOverSoftLimit() {
|
|
53
|
+
return this.readRss() >= this.limitBytes * this.softRatio;
|
|
54
|
+
}
|
|
55
|
+
/** Begin polling. The interval is `unref()`d so it never holds the process open. */
|
|
56
|
+
start() {
|
|
57
|
+
if (this.timer)
|
|
58
|
+
return;
|
|
59
|
+
this.timer = setInterval(() => this.tick(), this.pollMs);
|
|
60
|
+
this.timer.unref?.();
|
|
61
|
+
}
|
|
62
|
+
stop() {
|
|
63
|
+
if (this.timer) {
|
|
64
|
+
clearInterval(this.timer);
|
|
65
|
+
this.timer = null;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
/** Evaluate the threshold; fire {@link MemWatchdogOptions.onThrottle} on the rising edge. */
|
|
69
|
+
tick() {
|
|
70
|
+
const over = this.isOverSoftLimit();
|
|
71
|
+
if (over && !this.throttling) {
|
|
72
|
+
this.throttling = true;
|
|
73
|
+
this.onThrottle?.(this.snapshot());
|
|
74
|
+
}
|
|
75
|
+
else if (!over && this.throttling) {
|
|
76
|
+
// Fell back below the threshold — re-arm so a later spike warns again.
|
|
77
|
+
this.throttling = false;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=mem-watchdog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mem-watchdog.js","sourceRoot":"","sources":["../src/mem-watchdog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,MAAyB,OAAO,CAAC,GAAG;IAClE,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC;IAChC,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IACxD,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACjD,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AACtC,CAAC;AAyBD,MAAM,OAAO,WAAW;IACL,UAAU,CAAS;IACnB,SAAS,CAAS;IAClB,MAAM,CAAS;IACf,OAAO,CAAe;IACtB,UAAU,CAAmC;IACtD,KAAK,GAA0C,IAAI,CAAC;IACpD,UAAU,GAAG,KAAK,CAAC;IAE3B,YAAY,IAAwB;QAClC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACpC,CAAC;IAED,gDAAgD;IAChD,QAAQ;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAC5E,CAAC;IAED,gFAAgF;IAChF,eAAe;QACb,OAAO,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;IAC5D,CAAC;IAED,oFAAoF;IACpF,KAAK;QACH,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO;QACvB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;IACvB,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,6FAA6F;IAC7F,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACpC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpC,uEAAuE;YACvE,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;CACF"}
|
package/dist/pi-provider.d.ts
CHANGED
|
@@ -3,7 +3,8 @@ export declare const GATEWAY_PROVIDER = "bp-gateway";
|
|
|
3
3
|
/** Minimal structural surface of the Pi SDK bits this module needs. */
|
|
4
4
|
export interface PiProviderSdk {
|
|
5
5
|
AuthStorage: {
|
|
6
|
-
create(path: string):
|
|
6
|
+
create(path: string): PiAuthStorage;
|
|
7
|
+
inMemory?(): PiAuthStorage;
|
|
7
8
|
};
|
|
8
9
|
ModelRegistry: {
|
|
9
10
|
create(authStorage: unknown, modelsJsonPath?: string): {
|
|
@@ -13,13 +14,38 @@ export interface PiProviderSdk {
|
|
|
13
14
|
};
|
|
14
15
|
};
|
|
15
16
|
}
|
|
17
|
+
export interface PiAuthStorage {
|
|
18
|
+
/** In-memory, non-persisted, highest-priority key override (per provider). */
|
|
19
|
+
setRuntimeApiKey?(provider: string, key: string): void;
|
|
20
|
+
}
|
|
21
|
+
/** A concrete per-session provider config resolved from providers.json. */
|
|
22
|
+
export interface SessionProviderConfig {
|
|
23
|
+
providerId: string;
|
|
24
|
+
baseUrl?: string;
|
|
25
|
+
apiKey: string;
|
|
26
|
+
modelId?: string;
|
|
27
|
+
}
|
|
16
28
|
export interface ResolvedProvider {
|
|
17
29
|
model?: unknown;
|
|
18
30
|
modelRegistry?: unknown;
|
|
31
|
+
/** Per-session AuthStorage holding the runtime key (when provider-configured). */
|
|
32
|
+
authStorage?: unknown;
|
|
19
33
|
}
|
|
20
34
|
/**
|
|
21
35
|
* Resolve a custom model from env, or return `{}` when none is configured.
|
|
22
36
|
* `agentDir` is Pi's global config dir (getAgentDir()).
|
|
23
37
|
*/
|
|
24
38
|
export declare function resolveGatewayModel(sdk: PiProviderSdk, agentDir: string): ResolvedProvider;
|
|
39
|
+
/**
|
|
40
|
+
* Resolve a model for a PER-SESSION provider config (from providers.json),
|
|
41
|
+
* isolated from process env so concurrent sessions can use different keys.
|
|
42
|
+
*
|
|
43
|
+
* Strategy (per the Pi SDK): build a dedicated models.json + ModelRegistry +
|
|
44
|
+
* AuthStorage for this provider, then push the key via
|
|
45
|
+
* `authStorage.setRuntimeApiKey` — an in-memory, non-persisted, top-priority
|
|
46
|
+
* override. The models.json `apiKey` is a harmless placeholder; the runtime
|
|
47
|
+
* override wins at request time. Returns `{}` when no usable config is given,
|
|
48
|
+
* so the caller falls back to {@link resolveGatewayModel} (env-based).
|
|
49
|
+
*/
|
|
50
|
+
export declare function resolveSessionModel(sdk: PiProviderSdk, agentDir: string, cfg: SessionProviderConfig): ResolvedProvider;
|
|
25
51
|
//# sourceMappingURL=pi-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi-provider.d.ts","sourceRoot":"","sources":["../src/pi-provider.ts"],"names":[],"mappings":"AAyBA,8EAA8E;AAC9E,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAM7C,uEAAuE;AACvE,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"pi-provider.d.ts","sourceRoot":"","sources":["../src/pi-provider.ts"],"names":[],"mappings":"AAyBA,8EAA8E;AAC9E,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAM7C,uEAAuE;AACvE,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE;QACX,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC;QACpC,QAAQ,CAAC,IAAI,aAAa,CAAC;KAC5B,CAAC;IACF,aAAa,EAAE;QACb,MAAM,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG;YACrD,OAAO,IAAI,IAAI,CAAC;YAChB,QAAQ,IAAI,MAAM,GAAG,SAAS,CAAC;YAC/B,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;SAClD,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,8EAA8E;IAC9E,gBAAgB,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACxD;AAED,2EAA2E;AAC3E,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kFAAkF;IAClF,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAUD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAmD1F;AAgDD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,qBAAqB,GACzB,gBAAgB,CAkDlB"}
|
package/dist/pi-provider.js
CHANGED
|
@@ -129,4 +129,68 @@ function select(sdk, agentDir, modelsJsonPath, provider, modelId) {
|
|
|
129
129
|
}
|
|
130
130
|
return { model, modelRegistry };
|
|
131
131
|
}
|
|
132
|
+
/**
|
|
133
|
+
* Resolve a model for a PER-SESSION provider config (from providers.json),
|
|
134
|
+
* isolated from process env so concurrent sessions can use different keys.
|
|
135
|
+
*
|
|
136
|
+
* Strategy (per the Pi SDK): build a dedicated models.json + ModelRegistry +
|
|
137
|
+
* AuthStorage for this provider, then push the key via
|
|
138
|
+
* `authStorage.setRuntimeApiKey` — an in-memory, non-persisted, top-priority
|
|
139
|
+
* override. The models.json `apiKey` is a harmless placeholder; the runtime
|
|
140
|
+
* override wins at request time. Returns `{}` when no usable config is given,
|
|
141
|
+
* so the caller falls back to {@link resolveGatewayModel} (env-based).
|
|
142
|
+
*/
|
|
143
|
+
export function resolveSessionModel(sdk, agentDir, cfg) {
|
|
144
|
+
if (!cfg.apiKey || !cfg.baseUrl || !cfg.modelId)
|
|
145
|
+
return {};
|
|
146
|
+
mkdirSync(agentDir, { recursive: true });
|
|
147
|
+
// One models.json per provider id — distinct registries stay isolated.
|
|
148
|
+
const modelsJsonPath = join(agentDir, `bp-session-${sanitize(cfg.providerId)}-models.json`);
|
|
149
|
+
const desired = JSON.stringify({
|
|
150
|
+
providers: {
|
|
151
|
+
[cfg.providerId]: {
|
|
152
|
+
baseUrl: cfg.baseUrl,
|
|
153
|
+
api: "anthropic-messages",
|
|
154
|
+
// Placeholder — the real key is injected via setRuntimeApiKey below.
|
|
155
|
+
apiKey: `$BP_PROVIDER_${sanitize(cfg.providerId).toUpperCase()}`,
|
|
156
|
+
models: [
|
|
157
|
+
{
|
|
158
|
+
id: cfg.modelId,
|
|
159
|
+
input: ["text"],
|
|
160
|
+
contextWindow: intEnv("ANTHROPIC_CONTEXT_WINDOW") ?? DEFAULT_CONTEXT_WINDOW,
|
|
161
|
+
maxTokens: intEnv("ANTHROPIC_MAX_TOKENS") ?? DEFAULT_MAX_TOKENS,
|
|
162
|
+
},
|
|
163
|
+
],
|
|
164
|
+
},
|
|
165
|
+
},
|
|
166
|
+
}, null, 2);
|
|
167
|
+
let current;
|
|
168
|
+
try {
|
|
169
|
+
current = readFileSync(modelsJsonPath, "utf8");
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
/* not written yet */
|
|
173
|
+
}
|
|
174
|
+
if (current !== desired)
|
|
175
|
+
writeFileSync(modelsJsonPath, desired);
|
|
176
|
+
// A per-session AuthStorage isolates the runtime key. Prefer inMemory()
|
|
177
|
+
// (never touches disk); fall back to a file-backed instance if unavailable.
|
|
178
|
+
const authStorage = sdk.AuthStorage.inMemory
|
|
179
|
+
? sdk.AuthStorage.inMemory()
|
|
180
|
+
: sdk.AuthStorage.create(join(agentDir, `auth-${sanitize(cfg.providerId)}.json`));
|
|
181
|
+
authStorage.setRuntimeApiKey?.(cfg.providerId, cfg.apiKey);
|
|
182
|
+
const modelRegistry = sdk.ModelRegistry.create(authStorage, modelsJsonPath);
|
|
183
|
+
modelRegistry.refresh();
|
|
184
|
+
const err = modelRegistry.getError();
|
|
185
|
+
if (err)
|
|
186
|
+
throw new Error(`Pi models.json load error (${modelsJsonPath}): ${err}`);
|
|
187
|
+
const model = modelRegistry.find(cfg.providerId, cfg.modelId);
|
|
188
|
+
if (!model)
|
|
189
|
+
throw new Error(`model not found: ${cfg.providerId}/${cfg.modelId}`);
|
|
190
|
+
return { model, modelRegistry, authStorage };
|
|
191
|
+
}
|
|
192
|
+
/** Filesystem/JSON-key-safe form of a provider id. */
|
|
193
|
+
function sanitize(id) {
|
|
194
|
+
return id.replace(/[^A-Za-z0-9_-]/g, "_");
|
|
195
|
+
}
|
|
132
196
|
//# sourceMappingURL=pi-provider.js.map
|
package/dist/pi-provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi-provider.js","sourceRoot":"","sources":["../src/pi-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,8EAA8E;AAC9E,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAE7C,6EAA6E;AAC7E,MAAM,sBAAsB,GAAG,OAAO,CAAC;AACvC,MAAM,kBAAkB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"pi-provider.js","sourceRoot":"","sources":["../src/pi-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export interface ProviderConfig {
|
|
2
|
+
providerId: string;
|
|
3
|
+
baseUrl?: string;
|
|
4
|
+
apiKey: string;
|
|
5
|
+
modelId?: string;
|
|
6
|
+
}
|
|
7
|
+
/** Per-session reference written by SessionManager.createSession. */
|
|
8
|
+
export interface SessionProviderRef {
|
|
9
|
+
providerId?: string;
|
|
10
|
+
modelId?: string;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Resolve the effective provider config for a session. `ref` is the session's
|
|
14
|
+
* stored `{ providerId, modelId }` (may be empty). Returns undefined when no
|
|
15
|
+
* usable profile/key exists.
|
|
16
|
+
*/
|
|
17
|
+
export declare function resolveSessionProvider(dataRoot: string, ref: SessionProviderRef): Promise<ProviderConfig | undefined>;
|
|
18
|
+
//# sourceMappingURL=provider-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-config.d.ts","sourceRoot":"","sources":["../src/provider-config.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAiBD,qEAAqE;AACrE,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,kBAAkB,GACtB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAuBrC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* provider-config.ts — runtime-side resolver for the per-session LLM provider.
|
|
3
|
+
*
|
|
4
|
+
* The backend owns provider CRUD; the runtime only READS the same on-disk SSOT
|
|
5
|
+
* (`<dataRoot>/bp_template/providers.json`) plus a per-session reference
|
|
6
|
+
* (`<dataRoot>/.bp/<sid>/provider.json` = `{ providerId, modelId }`). It turns
|
|
7
|
+
* those into a concrete `{ baseUrl, apiKey, modelId }` for the agent factory.
|
|
8
|
+
*
|
|
9
|
+
* Resolution: session ref's providerId → else the file's selectedProfileId →
|
|
10
|
+
* else the first profile. Returns `undefined` when nothing is configured, so
|
|
11
|
+
* the factory falls back to Pi's env-based default (Docker/static compat).
|
|
12
|
+
*/
|
|
13
|
+
import { readFile } from "node:fs/promises";
|
|
14
|
+
import { join } from "node:path";
|
|
15
|
+
async function readJson(file) {
|
|
16
|
+
try {
|
|
17
|
+
return JSON.parse(await readFile(file, "utf8"));
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Resolve the effective provider config for a session. `ref` is the session's
|
|
25
|
+
* stored `{ providerId, modelId }` (may be empty). Returns undefined when no
|
|
26
|
+
* usable profile/key exists.
|
|
27
|
+
*/
|
|
28
|
+
export async function resolveSessionProvider(dataRoot, ref) {
|
|
29
|
+
const file = await readJson(join(dataRoot, "bp_template", "providers.json"));
|
|
30
|
+
const profiles = file?.profiles ?? [];
|
|
31
|
+
if (profiles.length === 0)
|
|
32
|
+
return undefined;
|
|
33
|
+
const profile = profiles.find((p) => p.id === ref.providerId) ??
|
|
34
|
+
profiles.find((p) => p.id === file?.selectedProfileId) ??
|
|
35
|
+
profiles[0];
|
|
36
|
+
if (!profile?.apiKey)
|
|
37
|
+
return undefined;
|
|
38
|
+
// Model: the session's choice if still offered by the profile, else default.
|
|
39
|
+
const modelId = ref.modelId && profile.models?.includes(ref.modelId) ? ref.modelId : profile.models?.[0];
|
|
40
|
+
return {
|
|
41
|
+
providerId: profile.id,
|
|
42
|
+
baseUrl: profile.baseUrl || undefined,
|
|
43
|
+
apiKey: profile.apiKey,
|
|
44
|
+
modelId,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
//# sourceMappingURL=provider-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-config.js","sourceRoot":"","sources":["../src/provider-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAgBjC,KAAK,UAAU,QAAQ,CAAI,IAAY;IACrC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAM,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAQD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,GAAuB;IAEvB,MAAM,IAAI,GAAG,MAAM,QAAQ,CACzB,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAChD,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC;IACtC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAE5C,MAAM,OAAO,GACX,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,UAAU,CAAC;QAC7C,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,iBAAiB,CAAC;QACtD,QAAQ,CAAC,CAAC,CAAC,CAAC;IACd,IAAI,CAAC,OAAO,EAAE,MAAM;QAAE,OAAO,SAAS,CAAC;IAEvC,6EAA6E;IAC7E,MAAM,OAAO,GACX,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3F,OAAO;QACL,UAAU,EAAE,OAAO,CAAC,EAAE;QACtB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;QACrC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO;KACR,CAAC;AACJ,CAAC"}
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAQ5B,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAElF,wBAAgB,YAAY,CAAC,IAAI,GAAE,qBAAqB,GAAG;IAAE,OAAO,CAAC,EAAE,cAAc,CAAA;CAAO,GAAG;IAC7F,GAAG,EAAE,IAAI,CAAC;IACV,OAAO,EAAE,cAAc,CAAC;CACzB,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAQ5B,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAElF,wBAAgB,YAAY,CAAC,IAAI,GAAE,qBAAqB,GAAG;IAAE,OAAO,CAAC,EAAE,cAAc,CAAA;CAAO,GAAG;IAC7F,GAAG,EAAE,IAAI,CAAC;IACV,OAAO,EAAE,cAAc,CAAC;CACzB,CAuJA;AAUD,MAAM,WAAW,kBAAmB,SAAQ,qBAAqB;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,IAAI,GAAE,kBAAuB,GAAG;IAC1D,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAuCA"}
|