@ai-ecoverse/slicc-agent 7.8.15 → 7.9.0
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/README.md +6 -6
- package/dist/client.js +12 -4
- package/dist/client.js.map +2 -2
- package/dist/guests/client.js +3 -1
- package/dist/guests/client.js.map +2 -2
- package/dist/host.js +21 -10
- package/dist/host.js.map +2 -2
- package/dist/mcp/accounts.js +38 -5
- package/dist/mcp/accounts.js.map +2 -2
- package/dist/mcp/config.js +17 -5
- package/dist/mcp/config.js.map +2 -2
- package/dist/mcp/file.js +102 -0
- package/dist/mcp/file.js.map +7 -0
- package/dist/mcp/index.js +3 -0
- package/dist/mcp/index.js.map +2 -2
- package/dist/mcp/runtime.js +10 -3
- package/dist/mcp/runtime.js.map +2 -2
- package/dist/readonly.js +4 -1
- package/dist/readonly.js.map +2 -2
- package/dist/services.js +7 -0
- package/dist/services.js.map +2 -2
- package/dist/settings.js +3 -0
- package/dist/settings.js.map +2 -2
- package/dist/spectrum/index.js +4 -1
- package/dist/spectrum/index.js.map +2 -2
- package/dist/spectrum/settings-port.js +13 -1
- package/dist/spectrum/settings-port.js.map +2 -2
- package/dist/types/client.d.ts +1 -0
- package/dist/types/host.d.ts +8 -0
- package/dist/types/mcp/accounts.d.ts +7 -2
- package/dist/types/mcp/config.d.ts +6 -0
- package/dist/types/mcp/file.d.ts +13 -0
- package/dist/types/readonly.d.ts +2 -1
- package/dist/types/services.d.ts +12 -1
- package/dist/types/spectrum/settings-port.d.ts +5 -2
- package/package.json +1 -1
package/dist/mcp/config.js
CHANGED
|
@@ -64,7 +64,7 @@ function checkHeaders(name, headers) {
|
|
|
64
64
|
if (literalSecret(header, value))
|
|
65
65
|
return fail(
|
|
66
66
|
name,
|
|
67
|
-
`headers.${header} holds a literal secret. mcp.json
|
|
67
|
+
`headers.${header} holds a literal secret. mcp.json takes no secrets: write \${NAME} instead, and add the value in Settings \u203A MCP servers`,
|
|
68
68
|
`headers.${header}`
|
|
69
69
|
);
|
|
70
70
|
}
|
|
@@ -163,33 +163,44 @@ function validateServer(name, raw) {
|
|
|
163
163
|
function canonical(name) {
|
|
164
164
|
return name.replace(/-/g, "_");
|
|
165
165
|
}
|
|
166
|
+
function hostOf(raw) {
|
|
167
|
+
const url = isRecord(raw) ? raw.url : void 0;
|
|
168
|
+
return typeof url === "string" && URL.canParse(url) ? new URL(url).host : "";
|
|
169
|
+
}
|
|
166
170
|
function parseMcpConfig(text) {
|
|
167
|
-
if (text === void 0 || text.trim() === "") return { servers: [], problems: [] };
|
|
171
|
+
if (text === void 0 || text.trim() === "") return { servers: [], problems: [], refused: [] };
|
|
168
172
|
let parsed;
|
|
169
173
|
try {
|
|
170
174
|
parsed = JSON.parse(text);
|
|
171
175
|
} catch (error) {
|
|
172
|
-
return {
|
|
176
|
+
return {
|
|
177
|
+
servers: [],
|
|
178
|
+
problems: [{ message: `not valid JSON: ${error.message}` }],
|
|
179
|
+
refused: []
|
|
180
|
+
};
|
|
173
181
|
}
|
|
174
182
|
if (!isRecord(parsed) || parsed.mcpServers !== void 0 && !isRecord(parsed.mcpServers))
|
|
175
|
-
return { servers: [], problems: [{ message: "mcpServers must be an object" }] };
|
|
183
|
+
return { servers: [], problems: [{ message: "mcpServers must be an object" }], refused: [] };
|
|
176
184
|
const servers = [];
|
|
177
185
|
const problems = [];
|
|
186
|
+
const refused = [];
|
|
178
187
|
const seen = /* @__PURE__ */ new Set();
|
|
179
188
|
for (const [name, raw] of Object.entries(parsed.mcpServers ?? {})) {
|
|
180
189
|
const checked = validateServer(name, raw);
|
|
181
190
|
if ("message" in checked) {
|
|
182
191
|
problems.push(checked);
|
|
192
|
+
refused.push({ name, host: hostOf(raw) });
|
|
183
193
|
continue;
|
|
184
194
|
}
|
|
185
195
|
if (seen.has(canonical(name))) {
|
|
186
196
|
problems.push(fail(name, 'names that differ only in "-" and "_" count as the same server'));
|
|
197
|
+
refused.push({ name, host: hostOf(raw) });
|
|
187
198
|
continue;
|
|
188
199
|
}
|
|
189
200
|
seen.add(canonical(name));
|
|
190
201
|
servers.push({ name, config: checked });
|
|
191
202
|
}
|
|
192
|
-
return { servers, problems };
|
|
203
|
+
return { servers, problems, refused };
|
|
193
204
|
}
|
|
194
205
|
function patternRegExp(pattern) {
|
|
195
206
|
const source = pattern.split("*").map((part) => part.replace(/[.+?^${}()|[\]\\]/g, "\\$&")).join(".*");
|
|
@@ -222,6 +233,7 @@ function sameConfig(a, b) {
|
|
|
222
233
|
}
|
|
223
234
|
export {
|
|
224
235
|
DEFAULT_TIMEOUT_SECONDS,
|
|
236
|
+
isRecord,
|
|
225
237
|
literalSecret,
|
|
226
238
|
mcpNamespace,
|
|
227
239
|
mcpToolName,
|
package/dist/mcp/config.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/mcp/config.ts"],
|
|
4
|
-
"sourcesContent": ["import { hash } from '../licks/sources.ts';\n\nexport type McpExposure = 'codemode' | 'deferred' | 'direct' | 'hidden';\n\nexport interface McpServerConfig {\n url: string;\n headers?: Record<string, string>;\n exposure?: McpExposure;\n toolExposure?: Record<string, McpExposure>;\n enabled?: boolean;\n timeout?: number;\n description?: string;\n oauth?: McpOAuthConfig;\n}\n\nexport interface McpOAuthConfig {\n clientId?: string;\n clientName?: string;\n scope?: string;\n authServerMetadataUrl?: string;\n}\n\nexport interface McpServerEntry {\n name: string;\n config: McpServerConfig;\n}\n\nexport interface McpConfigProblem {\n server?: string;\n field?: string;\n message: string;\n}\n\nexport interface McpConfig {\n servers: McpServerEntry[];\n problems: McpConfigProblem[];\n}\n\nconst SERVER_NAME = /^[A-Za-z0-9_-]+$/;\nconst EXPOSURES: readonly string[] = ['codemode', 'deferred', 'direct', 'hidden'];\nconst ALIASES: Record<string, McpExposure> = { 'codemode-deferred': 'codemode' };\nconst ACCEPTED = new Set([\n 'type',\n 'url',\n 'headers',\n 'exposure',\n 'toolExposure',\n 'enabled',\n 'timeout',\n 'description',\n 'oauth',\n]);\nconst OAUTH_STRINGS = ['clientId', 'clientName', 'scope', 'authServerMetadataUrl'];\nconst OAUTH_REFUSED: Record<string, string> = {\n clientSecret: 'a client secret would have to live in mcp.json; SLICC signs in as a public client',\n callbackPort: 'SLICC signs in through its own page, not a loopback port',\n callbackUrl: 'SLICC signs in through its own page, not a loopback URL',\n clientRegistration: 'SLICC registers dynamically or uses oauth.clientId',\n};\nconst SECRET_HEADER = /authorization|cookie|token|key|secret|password|session/i;\nconst SECRET_PARAM = /token|key|secret|password|signature|sig|auth|code/i;\nconst PLACEHOLDER = /\\$\\{([A-Za-z_][A-Za-z0-9_]*)\\}/g;\nconst SCHEME = /^\\s*(?:bearer|basic|token|apikey|api-key)\\s+/i;\nconst MAX_TOOL_NAME = 64;\nexport const DEFAULT_TIMEOUT_SECONDS = 60;\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === 'object' && value !== null && !Array.isArray(value);\n}\n\nfunction alias(value: unknown): unknown {\n return typeof value === 'string' ? (ALIASES[value] ?? value) : value;\n}\n\nfunction isExposure(value: unknown): value is McpExposure {\n return typeof value === 'string' && EXPOSURES.includes(value);\n}\n\nexport function placeholders(value: string): string[] {\n return [...value.matchAll(PLACEHOLDER)].map((match) => match[1] as string);\n}\n\nexport function literalSecret(header: string, value: string): boolean {\n if (!SECRET_HEADER.test(header)) return false;\n return value.replace(PLACEHOLDER, '').replace(SCHEME, '').trim() !== '';\n}\n\nfunction urlSecret(url: URL): string | undefined {\n if (url.username || url.password) return 'url';\n for (const name of url.searchParams.keys()) if (SECRET_PARAM.test(name)) return `url ?${name}`;\n return undefined;\n}\n\ntype Checked = McpServerConfig | McpConfigProblem;\n\nfunction fail(server: string, message: string, field?: string): McpConfigProblem {\n return { server, ...(field ? { field } : {}), message };\n}\n\nfunction checkHeaders(name: string, headers: unknown): McpConfigProblem | undefined {\n if (headers === undefined) return undefined;\n if (!isRecord(headers) || !Object.values(headers).every((value) => typeof value === 'string'))\n return fail(name, 'headers must map names to strings', 'headers');\n for (const [header, value] of Object.entries(headers as Record<string, string>)) {\n if (value.trim().startsWith('!'))\n return fail(\n name,\n `headers.${header} runs a command, which SLICC can't do`,\n `headers.${header}`\n );\n if (literalSecret(header, value))\n return fail(\n name,\n `headers.${header} holds a literal secret. mcp.json is readable by every agent: write \\${NAME} instead, and add the value in Settings \u203A MCP servers`,\n `headers.${header}`\n );\n }\n return undefined;\n}\n\nfunction checkOAuth(name: string, value: Record<string, unknown>): McpConfigProblem | undefined {\n const { oauth } = value;\n if (oauth === undefined) return undefined;\n if (!isRecord(oauth)) return fail(name, 'oauth must be an object', 'oauth');\n if (Object.keys(value.headers ?? {}).some((header) => header.toLowerCase() === 'authorization'))\n return fail(name, 'oauth and an Authorization header exclude each other', 'oauth');\n for (const [key, entry] of Object.entries(oauth)) {\n const refused = OAUTH_REFUSED[key];\n if (refused) return fail(name, `oauth.${key} is not supported: ${refused}`, `oauth.${key}`);\n if (!OAUTH_STRINGS.includes(key))\n return fail(name, `oauth.${key} is not a known field`, `oauth.${key}`);\n if (typeof entry !== 'string' || !entry.trim())\n return fail(name, `oauth.${key} must be a non-empty string`, `oauth.${key}`);\n }\n const metadata = oauth.authServerMetadataUrl as string | undefined;\n if (\n metadata !== undefined &&\n (!URL.canParse(metadata) || new URL(metadata).protocol !== 'https:')\n )\n return fail(\n name,\n 'oauth.authServerMetadataUrl must be an https URL',\n 'oauth.authServerMetadataUrl'\n );\n return undefined;\n}\n\nexport function usesOAuth(config: McpServerConfig): boolean {\n return !Object.keys(config.headers ?? {}).some(\n (header) => header.toLowerCase() === 'authorization'\n );\n}\n\nfunction checkExposures(\n name: string,\n value: Record<string, unknown>\n): McpConfigProblem | undefined {\n const allowed = EXPOSURES.map((item) => `\"${item}\"`).join(', ');\n if (value.exposure !== undefined && !isExposure(value.exposure))\n return fail(name, `exposure must be one of ${allowed}`, 'exposure');\n if (value.toolExposure === undefined) return undefined;\n if (!isRecord(value.toolExposure))\n return fail(name, 'toolExposure must map tool names to exposures', 'toolExposure');\n for (const [tool, exposure] of Object.entries(value.toolExposure))\n if (!isExposure(exposure))\n return fail(name, `toolExposure \"${tool}\" must be one of ${allowed}`, `toolExposure.${tool}`);\n return undefined;\n}\n\nfunction checkFields(name: string, value: Record<string, unknown>): McpConfigProblem | undefined {\n if (value.enabled !== undefined && typeof value.enabled !== 'boolean')\n return fail(name, 'enabled must be a boolean', 'enabled');\n if (value.description !== undefined && typeof value.description !== 'string')\n return fail(name, 'description must be a string', 'description');\n if (value.timeout !== undefined && (typeof value.timeout !== 'number' || !(value.timeout > 0)))\n return fail(name, 'timeout must be a positive number of seconds', 'timeout');\n return undefined;\n}\n\nfunction checkTransport(\n name: string,\n value: Record<string, unknown>\n): McpConfigProblem | undefined {\n if (value.command !== undefined || value.type === 'stdio')\n return fail(name, 'stdio servers need slicc-kernel#68, so this one is skipped', 'command');\n if (value.type === 'sse')\n return fail(\n name,\n 'the legacy SSE transport is not supported; use the streamable HTTP URL',\n 'type'\n );\n if (value.type !== undefined && value.type !== 'http' && value.type !== 'streamable-http')\n return fail(name, 'type must be \"http\" or \"streamable-http\"', 'type');\n if (typeof value.url !== 'string') return fail(name, 'needs a \"url\" (streamable HTTP)', 'url');\n if (!URL.canParse(value.url) || !/^https?:$/.test(new URL(value.url).protocol))\n return fail(name, 'url must be an http or https URL', 'url');\n const secret = urlSecret(new URL(value.url));\n if (secret)\n return fail(\n name,\n `${secret} holds a literal secret. Put it in a header as \\${NAME} and add the value in Settings \u203A MCP servers`,\n 'url'\n );\n return undefined;\n}\n\nexport function validateServer(name: string, raw: unknown): Checked {\n if (!SERVER_NAME.test(name))\n return fail(name, `invalid server name \"${name}\" (use letters, digits, \"_\" and \"-\")`);\n if (!isRecord(raw)) return fail(name, 'must be an object');\n const value: Record<string, unknown> = { ...raw, exposure: alias(raw.exposure) };\n if (raw.exposure === undefined) delete value.exposure;\n if (isRecord(raw.toolExposure))\n value.toolExposure = Object.fromEntries(\n Object.entries(raw.toolExposure).map(([tool, exposure]) => [tool, alias(exposure)])\n );\n if (value.auth !== undefined) return fail(name, 'auth is not supported in SLICC yet', 'auth');\n const problem =\n checkTransport(name, value) ??\n checkHeaders(name, value.headers) ??\n checkOAuth(name, value) ??\n checkExposures(name, value) ??\n checkFields(name, value);\n if (problem) return problem;\n const config: Record<string, unknown> = {};\n for (const [key, entry] of Object.entries(value))\n if (ACCEPTED.has(key) && key !== 'type') config[key] = entry;\n return config as unknown as McpServerConfig;\n}\n\nfunction canonical(name: string): string {\n return name.replace(/-/g, '_');\n}\n\nexport function parseMcpConfig(text: string | undefined): McpConfig {\n if (text === undefined || text.trim() === '') return { servers: [], problems: [] };\n let parsed: unknown;\n try {\n parsed = JSON.parse(text);\n } catch (error) {\n return { servers: [], problems: [{ message: `not valid JSON: ${(error as Error).message}` }] };\n }\n if (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers)))\n return { servers: [], problems: [{ message: 'mcpServers must be an object' }] };\n const servers: McpServerEntry[] = [];\n const problems: McpConfigProblem[] = [];\n const seen = new Set<string>();\n for (const [name, raw] of Object.entries((parsed.mcpServers ?? {}) as Record<string, unknown>)) {\n const checked = validateServer(name, raw);\n if ('message' in checked) {\n problems.push(checked);\n continue;\n }\n if (seen.has(canonical(name))) {\n problems.push(fail(name, 'names that differ only in \"-\" and \"_\" count as the same server'));\n continue;\n }\n seen.add(canonical(name));\n servers.push({ name, config: checked });\n }\n return { servers, problems };\n}\n\nfunction patternRegExp(pattern: string): RegExp {\n const source = pattern\n .split('*')\n .map((part) => part.replace(/[.+?^${}()|[\\]\\\\]/g, '\\\\$&'))\n .join('.*');\n return new RegExp(`^${source}$`);\n}\n\nexport function nameMatcher(entries: readonly string[]): (name: string) => boolean {\n const names = new Set(entries.filter((entry) => !entry.includes('*')));\n const patterns = entries.filter((entry) => entry.includes('*')).map(patternRegExp);\n return (name) => names.has(name) || patterns.some((pattern) => pattern.test(name));\n}\n\nexport function toolExposure(config: McpServerConfig, tool: string): McpExposure {\n const overrides = config.toolExposure ?? {};\n const exact = overrides[tool];\n if (exact !== undefined) return exact;\n for (const [pattern, exposure] of Object.entries(overrides))\n if (pattern.includes('*') && patternRegExp(pattern).test(tool)) return exposure;\n return config.exposure ?? 'codemode';\n}\n\nexport function mcpNamespace(server: string): string {\n return `mcp__${canonical(server)}`;\n}\n\nexport function mcpToolName(\n server: string,\n tool: string,\n taken: (name: string) => boolean = () => false\n): string {\n const name = `mcp__${server}__${tool}`.replace(/[^A-Za-z0-9_]/g, '_');\n if (name.length <= MAX_TOOL_NAME && !taken(name)) return name;\n const suffix = hash(`${server}\\0${tool}`).padStart(7, '0').slice(0, 7);\n return `${name.slice(0, MAX_TOOL_NAME - suffix.length - 1)}_${suffix}`;\n}\n\nexport function sameConfig(a: McpServerConfig, b: McpServerConfig): boolean {\n return JSON.stringify(a) === JSON.stringify(b);\n}\n"],
|
|
5
|
-
"mappings": "AAAA,SAAS,YAAY;
|
|
4
|
+
"sourcesContent": ["import { hash } from '../licks/sources.ts';\n\nexport type McpExposure = 'codemode' | 'deferred' | 'direct' | 'hidden';\n\nexport interface McpServerConfig {\n url: string;\n headers?: Record<string, string>;\n exposure?: McpExposure;\n toolExposure?: Record<string, McpExposure>;\n enabled?: boolean;\n timeout?: number;\n description?: string;\n oauth?: McpOAuthConfig;\n}\n\nexport interface McpOAuthConfig {\n clientId?: string;\n clientName?: string;\n scope?: string;\n authServerMetadataUrl?: string;\n}\n\nexport interface McpServerEntry {\n name: string;\n config: McpServerConfig;\n}\n\nexport interface McpConfigProblem {\n server?: string;\n field?: string;\n message: string;\n}\n\nexport interface McpRefusedServer {\n name: string;\n host: string;\n}\n\nexport interface McpConfig {\n servers: McpServerEntry[];\n problems: McpConfigProblem[];\n refused: McpRefusedServer[];\n}\n\nconst SERVER_NAME = /^[A-Za-z0-9_-]+$/;\nconst EXPOSURES: readonly string[] = ['codemode', 'deferred', 'direct', 'hidden'];\nconst ALIASES: Record<string, McpExposure> = { 'codemode-deferred': 'codemode' };\nconst ACCEPTED = new Set([\n 'type',\n 'url',\n 'headers',\n 'exposure',\n 'toolExposure',\n 'enabled',\n 'timeout',\n 'description',\n 'oauth',\n]);\nconst OAUTH_STRINGS = ['clientId', 'clientName', 'scope', 'authServerMetadataUrl'];\nconst OAUTH_REFUSED: Record<string, string> = {\n clientSecret: 'a client secret would have to live in mcp.json; SLICC signs in as a public client',\n callbackPort: 'SLICC signs in through its own page, not a loopback port',\n callbackUrl: 'SLICC signs in through its own page, not a loopback URL',\n clientRegistration: 'SLICC registers dynamically or uses oauth.clientId',\n};\nconst SECRET_HEADER = /authorization|cookie|token|key|secret|password|session/i;\nconst SECRET_PARAM = /token|key|secret|password|signature|sig|auth|code/i;\nconst PLACEHOLDER = /\\$\\{([A-Za-z_][A-Za-z0-9_]*)\\}/g;\nconst SCHEME = /^\\s*(?:bearer|basic|token|apikey|api-key)\\s+/i;\nconst MAX_TOOL_NAME = 64;\nexport const DEFAULT_TIMEOUT_SECONDS = 60;\n\nexport function isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === 'object' && value !== null && !Array.isArray(value);\n}\n\nfunction alias(value: unknown): unknown {\n return typeof value === 'string' ? (ALIASES[value] ?? value) : value;\n}\n\nfunction isExposure(value: unknown): value is McpExposure {\n return typeof value === 'string' && EXPOSURES.includes(value);\n}\n\nexport function placeholders(value: string): string[] {\n return [...value.matchAll(PLACEHOLDER)].map((match) => match[1] as string);\n}\n\nexport function literalSecret(header: string, value: string): boolean {\n if (!SECRET_HEADER.test(header)) return false;\n return value.replace(PLACEHOLDER, '').replace(SCHEME, '').trim() !== '';\n}\n\nfunction urlSecret(url: URL): string | undefined {\n if (url.username || url.password) return 'url';\n for (const name of url.searchParams.keys()) if (SECRET_PARAM.test(name)) return `url ?${name}`;\n return undefined;\n}\n\ntype Checked = McpServerConfig | McpConfigProblem;\n\nfunction fail(server: string, message: string, field?: string): McpConfigProblem {\n return { server, ...(field ? { field } : {}), message };\n}\n\nfunction checkHeaders(name: string, headers: unknown): McpConfigProblem | undefined {\n if (headers === undefined) return undefined;\n if (!isRecord(headers) || !Object.values(headers).every((value) => typeof value === 'string'))\n return fail(name, 'headers must map names to strings', 'headers');\n for (const [header, value] of Object.entries(headers as Record<string, string>)) {\n if (value.trim().startsWith('!'))\n return fail(\n name,\n `headers.${header} runs a command, which SLICC can't do`,\n `headers.${header}`\n );\n if (literalSecret(header, value))\n return fail(\n name,\n `headers.${header} holds a literal secret. mcp.json takes no secrets: write \\${NAME} instead, and add the value in Settings \u203A MCP servers`,\n `headers.${header}`\n );\n }\n return undefined;\n}\n\nfunction checkOAuth(name: string, value: Record<string, unknown>): McpConfigProblem | undefined {\n const { oauth } = value;\n if (oauth === undefined) return undefined;\n if (!isRecord(oauth)) return fail(name, 'oauth must be an object', 'oauth');\n if (Object.keys(value.headers ?? {}).some((header) => header.toLowerCase() === 'authorization'))\n return fail(name, 'oauth and an Authorization header exclude each other', 'oauth');\n for (const [key, entry] of Object.entries(oauth)) {\n const refused = OAUTH_REFUSED[key];\n if (refused) return fail(name, `oauth.${key} is not supported: ${refused}`, `oauth.${key}`);\n if (!OAUTH_STRINGS.includes(key))\n return fail(name, `oauth.${key} is not a known field`, `oauth.${key}`);\n if (typeof entry !== 'string' || !entry.trim())\n return fail(name, `oauth.${key} must be a non-empty string`, `oauth.${key}`);\n }\n const metadata = oauth.authServerMetadataUrl as string | undefined;\n if (\n metadata !== undefined &&\n (!URL.canParse(metadata) || new URL(metadata).protocol !== 'https:')\n )\n return fail(\n name,\n 'oauth.authServerMetadataUrl must be an https URL',\n 'oauth.authServerMetadataUrl'\n );\n return undefined;\n}\n\nexport function usesOAuth(config: McpServerConfig): boolean {\n return !Object.keys(config.headers ?? {}).some(\n (header) => header.toLowerCase() === 'authorization'\n );\n}\n\nfunction checkExposures(\n name: string,\n value: Record<string, unknown>\n): McpConfigProblem | undefined {\n const allowed = EXPOSURES.map((item) => `\"${item}\"`).join(', ');\n if (value.exposure !== undefined && !isExposure(value.exposure))\n return fail(name, `exposure must be one of ${allowed}`, 'exposure');\n if (value.toolExposure === undefined) return undefined;\n if (!isRecord(value.toolExposure))\n return fail(name, 'toolExposure must map tool names to exposures', 'toolExposure');\n for (const [tool, exposure] of Object.entries(value.toolExposure))\n if (!isExposure(exposure))\n return fail(name, `toolExposure \"${tool}\" must be one of ${allowed}`, `toolExposure.${tool}`);\n return undefined;\n}\n\nfunction checkFields(name: string, value: Record<string, unknown>): McpConfigProblem | undefined {\n if (value.enabled !== undefined && typeof value.enabled !== 'boolean')\n return fail(name, 'enabled must be a boolean', 'enabled');\n if (value.description !== undefined && typeof value.description !== 'string')\n return fail(name, 'description must be a string', 'description');\n if (value.timeout !== undefined && (typeof value.timeout !== 'number' || !(value.timeout > 0)))\n return fail(name, 'timeout must be a positive number of seconds', 'timeout');\n return undefined;\n}\n\nfunction checkTransport(\n name: string,\n value: Record<string, unknown>\n): McpConfigProblem | undefined {\n if (value.command !== undefined || value.type === 'stdio')\n return fail(name, 'stdio servers need slicc-kernel#68, so this one is skipped', 'command');\n if (value.type === 'sse')\n return fail(\n name,\n 'the legacy SSE transport is not supported; use the streamable HTTP URL',\n 'type'\n );\n if (value.type !== undefined && value.type !== 'http' && value.type !== 'streamable-http')\n return fail(name, 'type must be \"http\" or \"streamable-http\"', 'type');\n if (typeof value.url !== 'string') return fail(name, 'needs a \"url\" (streamable HTTP)', 'url');\n if (!URL.canParse(value.url) || !/^https?:$/.test(new URL(value.url).protocol))\n return fail(name, 'url must be an http or https URL', 'url');\n const secret = urlSecret(new URL(value.url));\n if (secret)\n return fail(\n name,\n `${secret} holds a literal secret. Put it in a header as \\${NAME} and add the value in Settings \u203A MCP servers`,\n 'url'\n );\n return undefined;\n}\n\nexport function validateServer(name: string, raw: unknown): Checked {\n if (!SERVER_NAME.test(name))\n return fail(name, `invalid server name \"${name}\" (use letters, digits, \"_\" and \"-\")`);\n if (!isRecord(raw)) return fail(name, 'must be an object');\n const value: Record<string, unknown> = { ...raw, exposure: alias(raw.exposure) };\n if (raw.exposure === undefined) delete value.exposure;\n if (isRecord(raw.toolExposure))\n value.toolExposure = Object.fromEntries(\n Object.entries(raw.toolExposure).map(([tool, exposure]) => [tool, alias(exposure)])\n );\n if (value.auth !== undefined) return fail(name, 'auth is not supported in SLICC yet', 'auth');\n const problem =\n checkTransport(name, value) ??\n checkHeaders(name, value.headers) ??\n checkOAuth(name, value) ??\n checkExposures(name, value) ??\n checkFields(name, value);\n if (problem) return problem;\n const config: Record<string, unknown> = {};\n for (const [key, entry] of Object.entries(value))\n if (ACCEPTED.has(key) && key !== 'type') config[key] = entry;\n return config as unknown as McpServerConfig;\n}\n\nfunction canonical(name: string): string {\n return name.replace(/-/g, '_');\n}\n\nfunction hostOf(raw: unknown): string {\n const url = isRecord(raw) ? raw.url : undefined;\n return typeof url === 'string' && URL.canParse(url) ? new URL(url).host : '';\n}\n\nexport function parseMcpConfig(text: string | undefined): McpConfig {\n if (text === undefined || text.trim() === '') return { servers: [], problems: [], refused: [] };\n let parsed: unknown;\n try {\n parsed = JSON.parse(text);\n } catch (error) {\n return {\n servers: [],\n problems: [{ message: `not valid JSON: ${(error as Error).message}` }],\n refused: [],\n };\n }\n if (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers)))\n return { servers: [], problems: [{ message: 'mcpServers must be an object' }], refused: [] };\n const servers: McpServerEntry[] = [];\n const problems: McpConfigProblem[] = [];\n const refused: McpRefusedServer[] = [];\n const seen = new Set<string>();\n for (const [name, raw] of Object.entries((parsed.mcpServers ?? {}) as Record<string, unknown>)) {\n const checked = validateServer(name, raw);\n if ('message' in checked) {\n problems.push(checked);\n refused.push({ name, host: hostOf(raw) });\n continue;\n }\n if (seen.has(canonical(name))) {\n problems.push(fail(name, 'names that differ only in \"-\" and \"_\" count as the same server'));\n refused.push({ name, host: hostOf(raw) });\n continue;\n }\n seen.add(canonical(name));\n servers.push({ name, config: checked });\n }\n return { servers, problems, refused };\n}\n\nfunction patternRegExp(pattern: string): RegExp {\n const source = pattern\n .split('*')\n .map((part) => part.replace(/[.+?^${}()|[\\]\\\\]/g, '\\\\$&'))\n .join('.*');\n return new RegExp(`^${source}$`);\n}\n\nexport function nameMatcher(entries: readonly string[]): (name: string) => boolean {\n const names = new Set(entries.filter((entry) => !entry.includes('*')));\n const patterns = entries.filter((entry) => entry.includes('*')).map(patternRegExp);\n return (name) => names.has(name) || patterns.some((pattern) => pattern.test(name));\n}\n\nexport function toolExposure(config: McpServerConfig, tool: string): McpExposure {\n const overrides = config.toolExposure ?? {};\n const exact = overrides[tool];\n if (exact !== undefined) return exact;\n for (const [pattern, exposure] of Object.entries(overrides))\n if (pattern.includes('*') && patternRegExp(pattern).test(tool)) return exposure;\n return config.exposure ?? 'codemode';\n}\n\nexport function mcpNamespace(server: string): string {\n return `mcp__${canonical(server)}`;\n}\n\nexport function mcpToolName(\n server: string,\n tool: string,\n taken: (name: string) => boolean = () => false\n): string {\n const name = `mcp__${server}__${tool}`.replace(/[^A-Za-z0-9_]/g, '_');\n if (name.length <= MAX_TOOL_NAME && !taken(name)) return name;\n const suffix = hash(`${server}\\0${tool}`).padStart(7, '0').slice(0, 7);\n return `${name.slice(0, MAX_TOOL_NAME - suffix.length - 1)}_${suffix}`;\n}\n\nexport function sameConfig(a: McpServerConfig, b: McpServerConfig): boolean {\n return JSON.stringify(a) === JSON.stringify(b);\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/mcp/file.js
ADDED
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import { quote } from "../kernel/env.js";
|
|
2
|
+
import {
|
|
3
|
+
isRecord,
|
|
4
|
+
parseMcpConfig,
|
|
5
|
+
usesOAuth,
|
|
6
|
+
validateServer
|
|
7
|
+
} from "./config.js";
|
|
8
|
+
import { shown } from "./paths.js";
|
|
9
|
+
const refused = (reason) => ({ ok: false, reason });
|
|
10
|
+
function tokenName(server) {
|
|
11
|
+
return `MCP_${server.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_TOKEN`;
|
|
12
|
+
}
|
|
13
|
+
function entryOf(name, given) {
|
|
14
|
+
if (!isRecord(given)) return { reason: "must be an object" };
|
|
15
|
+
const { token, ...entry } = given;
|
|
16
|
+
if (token !== void 0 && typeof token !== "boolean")
|
|
17
|
+
return { reason: "token must be true or false" };
|
|
18
|
+
const checked = validateServer(name, entry);
|
|
19
|
+
if ("message" in checked) return { reason: checked.message };
|
|
20
|
+
if (!token) return checked;
|
|
21
|
+
if (!usesOAuth(checked))
|
|
22
|
+
return { reason: "a token and an Authorization header exclude each other" };
|
|
23
|
+
const authorization = `Bearer \${${tokenName(name)}}`;
|
|
24
|
+
const headers = { ...checked.headers, Authorization: authorization };
|
|
25
|
+
const signed = validateServer(name, { ...checked, headers });
|
|
26
|
+
return "message" in signed ? { reason: signed.message } : signed;
|
|
27
|
+
}
|
|
28
|
+
function rendered(root, servers) {
|
|
29
|
+
return `${JSON.stringify({ ...root, mcpServers: servers }, null, 2)}
|
|
30
|
+
`;
|
|
31
|
+
}
|
|
32
|
+
async function replace(env, path, text, context) {
|
|
33
|
+
const staged = `${path}.${crypto.randomUUID()}.tmp`;
|
|
34
|
+
const dir = quote(path.slice(0, path.lastIndexOf("/")));
|
|
35
|
+
const made = await env.exec(
|
|
36
|
+
`mkdir -p ${dir} && (umask 077 && : > ${quote(staged)}) && chmod 600 ${quote(staged)}`,
|
|
37
|
+
void 0,
|
|
38
|
+
context
|
|
39
|
+
);
|
|
40
|
+
if (made.ok && made.value.exitCode === 0) {
|
|
41
|
+
const wrote = await env.writeFile(staged, text, context);
|
|
42
|
+
if (wrote.ok && (await env.renameFile(staged, path, context)).ok) return true;
|
|
43
|
+
}
|
|
44
|
+
await env.remove(staged, { force: true }, context);
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
function mcpFile(env, path, home, context) {
|
|
48
|
+
const named = shown(path, home);
|
|
49
|
+
const unwritten = `Couldn't write ${named}, so it is unchanged.`;
|
|
50
|
+
let queue = Promise.resolve();
|
|
51
|
+
const inTurn = (run) => {
|
|
52
|
+
const next = queue.then(run);
|
|
53
|
+
queue = next.catch(() => void 0);
|
|
54
|
+
return next;
|
|
55
|
+
};
|
|
56
|
+
const load = async () => {
|
|
57
|
+
const read = await env.readTextFile(path, context);
|
|
58
|
+
if (!read.ok && read.error.code !== "not_found")
|
|
59
|
+
return { reason: `Couldn't read ${named}, so it is unchanged.` };
|
|
60
|
+
const text = read.ok ? read.value : "";
|
|
61
|
+
if (text.trim() === "") return { root: {}, servers: {}, text };
|
|
62
|
+
let root;
|
|
63
|
+
try {
|
|
64
|
+
root = JSON.parse(text);
|
|
65
|
+
} catch {
|
|
66
|
+
return { reason: `${named} isn't valid JSON, so it is unchanged. Fix the file first.` };
|
|
67
|
+
}
|
|
68
|
+
if (!isRecord(root) || root.mcpServers !== void 0 && !isRecord(root.mcpServers))
|
|
69
|
+
return { reason: `${named} needs an object of mcpServers, so it is unchanged.` };
|
|
70
|
+
return { root, servers: root.mcpServers ?? {}, text };
|
|
71
|
+
};
|
|
72
|
+
return {
|
|
73
|
+
add: (name, entry) => inTurn(async () => {
|
|
74
|
+
const file = await load();
|
|
75
|
+
if ("reason" in file) return refused(file.reason);
|
|
76
|
+
if (Object.hasOwn(file.servers, name))
|
|
77
|
+
return refused(`${named} already has a server called "${name}". Remove it first.`);
|
|
78
|
+
const config = entryOf(name, entry);
|
|
79
|
+
if ("reason" in config) return refused(config.reason);
|
|
80
|
+
const text = rendered(file.root, { ...file.servers, [name]: config });
|
|
81
|
+
const clash = parseMcpConfig(text).problems.find((problem) => problem.server === name);
|
|
82
|
+
if (clash) return refused(clash.message);
|
|
83
|
+
return await replace(env, path, text, context) ? { ok: true } : refused(unwritten);
|
|
84
|
+
}),
|
|
85
|
+
remove: (name) => inTurn(async () => {
|
|
86
|
+
const file = await load();
|
|
87
|
+
if ("reason" in file) return refused(file.reason);
|
|
88
|
+
if (!Object.hasOwn(file.servers, name))
|
|
89
|
+
return refused(`${named} has no server called "${name}".`);
|
|
90
|
+
const removed = parseMcpConfig(file.text).servers.find((entry) => entry.name === name);
|
|
91
|
+
const { [name]: _gone, ...servers } = file.servers;
|
|
92
|
+
const text = rendered(file.root, servers);
|
|
93
|
+
if (!await replace(env, path, text, context)) return refused(unwritten);
|
|
94
|
+
return { ok: true, ...removed ? { removed } : {} };
|
|
95
|
+
})
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
export {
|
|
99
|
+
mcpFile,
|
|
100
|
+
tokenName
|
|
101
|
+
};
|
|
102
|
+
//# sourceMappingURL=file.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/mcp/file.ts"],
|
|
4
|
+
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { ExecutionEnv } from '@earendil-works/pi-durable/env';\nimport { quote } from '../kernel/env.ts';\nimport type { McpEdit } from '../services.ts';\nimport {\n isRecord,\n type McpServerConfig,\n type McpServerEntry,\n parseMcpConfig,\n usesOAuth,\n validateServer,\n} from './config.ts';\nimport { shown } from './paths.ts';\n\nexport type McpRemoved = McpEdit & { removed?: McpServerEntry };\n\nexport interface McpFile {\n add(name: string, entry: unknown): Promise<McpEdit>;\n remove(name: string): Promise<McpRemoved>;\n}\n\ninterface McpDocument {\n root: Record<string, unknown>;\n servers: Record<string, unknown>;\n text: string;\n}\n\nconst refused = (reason: string) => ({ ok: false as const, reason });\n\nexport function tokenName(server: string): string {\n return `MCP_${server.toUpperCase().replace(/[^A-Z0-9]/g, '_')}_TOKEN`;\n}\n\nfunction entryOf(name: string, given: unknown): McpServerConfig | { reason: string } {\n if (!isRecord(given)) return { reason: 'must be an object' };\n const { token, ...entry } = given;\n if (token !== undefined && typeof token !== 'boolean')\n return { reason: 'token must be true or false' };\n const checked = validateServer(name, entry);\n if ('message' in checked) return { reason: checked.message };\n if (!token) return checked;\n if (!usesOAuth(checked))\n return { reason: 'a token and an Authorization header exclude each other' };\n const authorization = `Bearer \\${${tokenName(name)}}`;\n const headers = { ...checked.headers, Authorization: authorization };\n const signed = validateServer(name, { ...checked, headers });\n return 'message' in signed ? { reason: signed.message } : signed;\n}\n\nfunction rendered(root: Record<string, unknown>, servers: Record<string, unknown>): string {\n return `${JSON.stringify({ ...root, mcpServers: servers }, null, 2)}\\n`;\n}\n\nasync function replace(\n env: ExecutionEnv,\n path: string,\n text: string,\n context: Context\n): Promise<boolean> {\n const staged = `${path}.${crypto.randomUUID()}.tmp`;\n const dir = quote(path.slice(0, path.lastIndexOf('/')));\n const made = await env.exec(\n `mkdir -p ${dir} && (umask 077 && : > ${quote(staged)}) && chmod 600 ${quote(staged)}`,\n undefined,\n context\n );\n if (made.ok && made.value.exitCode === 0) {\n const wrote = await env.writeFile(staged, text, context);\n if (wrote.ok && (await env.renameFile(staged, path, context)).ok) return true;\n }\n await env.remove(staged, { force: true }, context);\n return false;\n}\n\nexport function mcpFile(env: ExecutionEnv, path: string, home: string, context: Context): McpFile {\n const named = shown(path, home);\n const unwritten = `Couldn't write ${named}, so it is unchanged.`;\n let queue: Promise<unknown> = Promise.resolve();\n const inTurn = <T>(run: () => Promise<T>): Promise<T> => {\n const next = queue.then(run);\n queue = next.catch(() => undefined);\n return next;\n };\n const load = async (): Promise<McpDocument | { reason: string }> => {\n const read = await env.readTextFile(path, context);\n if (!read.ok && read.error.code !== 'not_found')\n return { reason: `Couldn't read ${named}, so it is unchanged.` };\n const text = read.ok ? read.value : '';\n if (text.trim() === '') return { root: {}, servers: {}, text };\n let root: unknown;\n try {\n root = JSON.parse(text);\n } catch {\n return { reason: `${named} isn't valid JSON, so it is unchanged. Fix the file first.` };\n }\n if (!isRecord(root) || (root.mcpServers !== undefined && !isRecord(root.mcpServers)))\n return { reason: `${named} needs an object of mcpServers, so it is unchanged.` };\n return { root, servers: (root.mcpServers ?? {}) as Record<string, unknown>, text };\n };\n return {\n add: (name, entry) =>\n inTurn(async () => {\n const file = await load();\n if ('reason' in file) return refused(file.reason);\n if (Object.hasOwn(file.servers, name))\n return refused(`${named} already has a server called \"${name}\". Remove it first.`);\n const config = entryOf(name, entry);\n if ('reason' in config) return refused(config.reason);\n const text = rendered(file.root, { ...file.servers, [name]: config });\n const clash = parseMcpConfig(text).problems.find((problem) => problem.server === name);\n if (clash) return refused(clash.message);\n return (await replace(env, path, text, context)) ? { ok: true } : refused(unwritten);\n }),\n remove: (name) =>\n inTurn(async () => {\n const file = await load();\n if ('reason' in file) return refused(file.reason);\n if (!Object.hasOwn(file.servers, name))\n return refused(`${named} has no server called \"${name}\".`);\n const removed = parseMcpConfig(file.text).servers.find((entry) => entry.name === name);\n const { [name]: _gone, ...servers } = file.servers;\n const text = rendered(file.root, servers);\n if (!(await replace(env, path, text, context))) return refused(unwritten);\n return { ok: true, ...(removed ? { removed } : {}) };\n }),\n };\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": []
|
|
7
|
+
}
|
package/dist/mcp/index.js
CHANGED
|
@@ -2,6 +2,7 @@ import { parseMcpConfig } from "./config.js";
|
|
|
2
2
|
import { configPath, shown } from "./paths.js";
|
|
3
3
|
import { allows, McpAllowDoc, mcpEntries, serverAllowed } from "./allow.js";
|
|
4
4
|
const loadRuntime = () => import("./runtime.js");
|
|
5
|
+
const NOT_LOADED = { ok: false, reason: "the MCP client didn't load: update SLICC" };
|
|
5
6
|
const idle = {
|
|
6
7
|
accounts: async () => [],
|
|
7
8
|
signIn: async (id) => {
|
|
@@ -12,6 +13,8 @@ const idle = {
|
|
|
12
13
|
},
|
|
13
14
|
disconnect: async () => void 0,
|
|
14
15
|
serverUrl: async () => null,
|
|
16
|
+
addServer: async () => NOT_LOADED,
|
|
17
|
+
removeServer: async () => NOT_LOADED,
|
|
15
18
|
onChange: () => () => void 0,
|
|
16
19
|
status: () => [],
|
|
17
20
|
reload: async () => void 0,
|
package/dist/mcp/index.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/mcp/index.ts"],
|
|
4
|
-
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type {\n Agent,\n Registry,\n ToolExecutionApi,\n ToolRegistration,\n} from '@earendil-works/pi-durable';\nimport type { CodemodeExtra } from './allow.ts';\nimport type { McpCatalog } from './catalog.ts';\nimport { parseMcpConfig } from './config.ts';\nimport { configPath, shown } from './paths.ts';\nimport type { McpAttach, McpRuntime } from './runtime.ts';\n\nexport { allows, type CodemodeExtra, McpAllowDoc, mcpEntries, serverAllowed } from './allow.ts';\nexport type { McpAccounts, McpAttach, McpRuntime, ServerStatus } from './runtime.ts';\n\nexport type McpLoader = () => Promise<typeof import('./runtime.ts')>;\n\nexport const loadRuntime: McpLoader = () => import('./runtime.ts');\n\nexport interface McpSetup {\n catalog(): McpCatalog | undefined;\n direct(names: readonly string[]): ToolRegistration[];\n codemode(api: ToolExecutionApi, agent: Agent, context: Context): Promise<CodemodeExtra>;\n attach(options: McpAttach, context: Context): Promise<McpRuntime>;\n}\n\nconst idle: McpRuntime = {\n accounts: async () => [],\n signIn: async (id) => {\n throw new Error(`${id} is not an MCP server that signs in`);\n },\n connect: async (id) => {\n throw new Error(`${id} is not an MCP server that takes a token`);\n },\n disconnect: async () => undefined,\n serverUrl: async () => null,\n onChange: () => () => undefined,\n status: () => [],\n reload: async () => undefined,\n close: async () => undefined,\n};\n\nasync function unavailable(options: McpAttach, error: unknown, context: Context) {\n const file = configPath(options.home, options.agentDir);\n const named = shown(file, options.home);\n const read = await options.env.readTextFile(file, context);\n if (!parseMcpConfig(read.ok ? read.value : undefined).servers.length) return;\n await options.licks\n .deliver(\n {\n channel: 'fswatch',\n source: `mcp:${named}`,\n title: \"MCP servers can't start in this SLICC\",\n text: error instanceof Error ? error.message : String(error),\n body: `The MCP client didn't load, so the servers in ${named} stay off until SLICC is updated.`,\n target: 'cone',\n severity: 'warn',\n eventId: 'mcp\\nunavailable',\n },\n context\n )\n .catch(() => undefined);\n}\n\nexport function setupMcp(registry: Registry, load: McpLoader = loadRuntime): McpSetup {\n let catalog: McpCatalog | undefined;\n return {\n catalog: () => catalog,\n direct: (names) => catalog?.direct(names) ?? [],\n codemode: async (api, agent, context) =>\n catalog ? catalog.codemode(api, agent, context) : { tools: [], globals: [] },\n async attach(options, context) {\n let started: Awaited<ReturnType<Awaited<ReturnType<McpLoader>>['startMcp']>>;\n try {\n started = await (await load()).startMcp(registry, options, context);\n } catch (error) {\n await unavailable(options, error, context);\n return idle;\n }\n catalog = started.catalog;\n return started.runtime;\n },\n };\n}\n"],
|
|
5
|
-
"mappings": "AASA,SAAS,sBAAsB;AAC/B,SAAS,YAAY,aAAa;AAGlC,SAAS,QAA4B,aAAa,YAAY,qBAAqB;AAK5E,MAAM,cAAyB,MAAM,OAAO,cAAc;AASjE,MAAM,OAAmB;AAAA,EACvB,UAAU,YAAY,CAAC;AAAA,EACvB,QAAQ,OAAO,OAAO;AACpB,UAAM,IAAI,MAAM,GAAG,EAAE,qCAAqC;AAAA,EAC5D;AAAA,EACA,SAAS,OAAO,OAAO;AACrB,UAAM,IAAI,MAAM,GAAG,EAAE,0CAA0C;AAAA,EACjE;AAAA,EACA,YAAY,YAAY;AAAA,EACxB,WAAW,YAAY;AAAA,EACvB,UAAU,MAAM,MAAM;AAAA,EACtB,QAAQ,MAAM,CAAC;AAAA,EACf,QAAQ,YAAY;AAAA,EACpB,OAAO,YAAY;AACrB;AAEA,eAAe,YAAY,SAAoB,OAAgB,SAAkB;AAC/E,QAAM,OAAO,WAAW,QAAQ,MAAM,QAAQ,QAAQ;AACtD,QAAM,QAAQ,MAAM,MAAM,QAAQ,IAAI;AACtC,QAAM,OAAO,MAAM,QAAQ,IAAI,aAAa,MAAM,OAAO;AACzD,MAAI,CAAC,eAAe,KAAK,KAAK,KAAK,QAAQ,MAAS,EAAE,QAAQ,OAAQ;AACtE,QAAM,QAAQ,MACX;AAAA,IACC;AAAA,MACE,SAAS;AAAA,MACT,QAAQ,OAAO,KAAK;AAAA,MACpB,OAAO;AAAA,MACP,MAAM,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAAA,MAC3D,MAAM,iDAAiD,KAAK;AAAA,MAC5D,QAAQ;AAAA,MACR,UAAU;AAAA,MACV,SAAS;AAAA,IACX;AAAA,IACA;AAAA,EACF,EACC,MAAM,MAAM,MAAS;AAC1B;AAEO,SAAS,SAAS,UAAoB,OAAkB,aAAuB;AACpF,MAAI;AACJ,SAAO;AAAA,IACL,SAAS,MAAM;AAAA,IACf,QAAQ,CAAC,UAAU,SAAS,OAAO,KAAK,KAAK,CAAC;AAAA,IAC9C,UAAU,OAAO,KAAK,OAAO,YAC3B,UAAU,QAAQ,SAAS,KAAK,OAAO,OAAO,IAAI,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,EAAE;AAAA,IAC7E,MAAM,OAAO,SAAS,SAAS;AAC7B,UAAI;AACJ,UAAI;AACF,kBAAU,OAAO,MAAM,KAAK,GAAG,SAAS,UAAU,SAAS,OAAO;AAAA,MACpE,SAAS,OAAO;AACd,cAAM,YAAY,SAAS,OAAO,OAAO;AACzC,eAAO;AAAA,MACT;AACA,gBAAU,QAAQ;AAClB,aAAO,QAAQ;AAAA,IACjB;AAAA,EACF;AACF;",
|
|
4
|
+
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type {\n Agent,\n Registry,\n ToolExecutionApi,\n ToolRegistration,\n} from '@earendil-works/pi-durable';\nimport type { CodemodeExtra } from './allow.ts';\nimport type { McpCatalog } from './catalog.ts';\nimport { parseMcpConfig } from './config.ts';\nimport { configPath, shown } from './paths.ts';\nimport type { McpAttach, McpRuntime } from './runtime.ts';\n\nexport { allows, type CodemodeExtra, McpAllowDoc, mcpEntries, serverAllowed } from './allow.ts';\nexport type { McpAccounts, McpAttach, McpRuntime, ServerStatus } from './runtime.ts';\n\nexport type McpLoader = () => Promise<typeof import('./runtime.ts')>;\n\nexport const loadRuntime: McpLoader = () => import('./runtime.ts');\n\nexport interface McpSetup {\n catalog(): McpCatalog | undefined;\n direct(names: readonly string[]): ToolRegistration[];\n codemode(api: ToolExecutionApi, agent: Agent, context: Context): Promise<CodemodeExtra>;\n attach(options: McpAttach, context: Context): Promise<McpRuntime>;\n}\n\nconst NOT_LOADED = { ok: false as const, reason: \"the MCP client didn't load: update SLICC\" };\n\nconst idle: McpRuntime = {\n accounts: async () => [],\n signIn: async (id) => {\n throw new Error(`${id} is not an MCP server that signs in`);\n },\n connect: async (id) => {\n throw new Error(`${id} is not an MCP server that takes a token`);\n },\n disconnect: async () => undefined,\n serverUrl: async () => null,\n addServer: async () => NOT_LOADED,\n removeServer: async () => NOT_LOADED,\n onChange: () => () => undefined,\n status: () => [],\n reload: async () => undefined,\n close: async () => undefined,\n};\n\nasync function unavailable(options: McpAttach, error: unknown, context: Context) {\n const file = configPath(options.home, options.agentDir);\n const named = shown(file, options.home);\n const read = await options.env.readTextFile(file, context);\n if (!parseMcpConfig(read.ok ? read.value : undefined).servers.length) return;\n await options.licks\n .deliver(\n {\n channel: 'fswatch',\n source: `mcp:${named}`,\n title: \"MCP servers can't start in this SLICC\",\n text: error instanceof Error ? error.message : String(error),\n body: `The MCP client didn't load, so the servers in ${named} stay off until SLICC is updated.`,\n target: 'cone',\n severity: 'warn',\n eventId: 'mcp\\nunavailable',\n },\n context\n )\n .catch(() => undefined);\n}\n\nexport function setupMcp(registry: Registry, load: McpLoader = loadRuntime): McpSetup {\n let catalog: McpCatalog | undefined;\n return {\n catalog: () => catalog,\n direct: (names) => catalog?.direct(names) ?? [],\n codemode: async (api, agent, context) =>\n catalog ? catalog.codemode(api, agent, context) : { tools: [], globals: [] },\n async attach(options, context) {\n let started: Awaited<ReturnType<Awaited<ReturnType<McpLoader>>['startMcp']>>;\n try {\n started = await (await load()).startMcp(registry, options, context);\n } catch (error) {\n await unavailable(options, error, context);\n return idle;\n }\n catalog = started.catalog;\n return started.runtime;\n },\n };\n}\n"],
|
|
5
|
+
"mappings": "AASA,SAAS,sBAAsB;AAC/B,SAAS,YAAY,aAAa;AAGlC,SAAS,QAA4B,aAAa,YAAY,qBAAqB;AAK5E,MAAM,cAAyB,MAAM,OAAO,cAAc;AASjE,MAAM,aAAa,EAAE,IAAI,OAAgB,QAAQ,2CAA2C;AAE5F,MAAM,OAAmB;AAAA,EACvB,UAAU,YAAY,CAAC;AAAA,EACvB,QAAQ,OAAO,OAAO;AACpB,UAAM,IAAI,MAAM,GAAG,EAAE,qCAAqC;AAAA,EAC5D;AAAA,EACA,SAAS,OAAO,OAAO;AACrB,UAAM,IAAI,MAAM,GAAG,EAAE,0CAA0C;AAAA,EACjE;AAAA,EACA,YAAY,YAAY;AAAA,EACxB,WAAW,YAAY;AAAA,EACvB,WAAW,YAAY;AAAA,EACvB,cAAc,YAAY;AAAA,EAC1B,UAAU,MAAM,MAAM;AAAA,EACtB,QAAQ,MAAM,CAAC;AAAA,EACf,QAAQ,YAAY;AAAA,EACpB,OAAO,YAAY;AACrB;AAEA,eAAe,YAAY,SAAoB,OAAgB,SAAkB;AAC/E,QAAM,OAAO,WAAW,QAAQ,MAAM,QAAQ,QAAQ;AACtD,QAAM,QAAQ,MAAM,MAAM,QAAQ,IAAI;AACtC,QAAM,OAAO,MAAM,QAAQ,IAAI,aAAa,MAAM,OAAO;AACzD,MAAI,CAAC,eAAe,KAAK,KAAK,KAAK,QAAQ,MAAS,EAAE,QAAQ,OAAQ;AACtE,QAAM,QAAQ,MACX;AAAA,IACC;AAAA,MACE,SAAS;AAAA,MACT,QAAQ,OAAO,KAAK;AAAA,MACpB,OAAO;AAAA,MACP,MAAM,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAAA,MAC3D,MAAM,iDAAiD,KAAK;AAAA,MAC5D,QAAQ;AAAA,MACR,UAAU;AAAA,MACV,SAAS;AAAA,IACX;AAAA,IACA;AAAA,EACF,EACC,MAAM,MAAM,MAAS;AAC1B;AAEO,SAAS,SAAS,UAAoB,OAAkB,aAAuB;AACpF,MAAI;AACJ,SAAO;AAAA,IACL,SAAS,MAAM;AAAA,IACf,QAAQ,CAAC,UAAU,SAAS,OAAO,KAAK,KAAK,CAAC;AAAA,IAC9C,UAAU,OAAO,KAAK,OAAO,YAC3B,UAAU,QAAQ,SAAS,KAAK,OAAO,OAAO,IAAI,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,EAAE;AAAA,IAC7E,MAAM,OAAO,SAAS,SAAS;AAC7B,UAAI;AACJ,UAAI;AACF,kBAAU,OAAO,MAAM,KAAK,GAAG,SAAS,UAAU,SAAS,OAAO;AAAA,MACpE,SAAS,OAAO;AACd,cAAM,YAAY,SAAS,OAAO,OAAO;AACzC,eAAO;AAAA,MACT;AACA,gBAAU,QAAQ;AAClB,aAAO,QAAQ;AAAA,IACjB;AAAA,EACF;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/mcp/runtime.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { StreamableHttpTransport } from "@earendil-works/pi-mcp";
|
|
2
|
+
import { hash } from "../licks/sources.js";
|
|
2
3
|
import { scrubText } from "../secrets/scrub.js";
|
|
3
4
|
import { mcpAccounts } from "./accounts.js";
|
|
4
5
|
import { McpCatalog } from "./catalog.js";
|
|
@@ -9,6 +10,7 @@ import {
|
|
|
9
10
|
} from "./config.js";
|
|
10
11
|
import { McpServerConnection } from "./connection.js";
|
|
11
12
|
import { resolveHeaders, secretNames } from "./credentials.js";
|
|
13
|
+
import { mcpFile } from "./file.js";
|
|
12
14
|
import { authProvider as oauthAuth, StoredOAuth } from "./oauth.js";
|
|
13
15
|
import { configPath, logPath, shown } from "./paths.js";
|
|
14
16
|
import { patchSse } from "./sse.js";
|
|
@@ -69,15 +71,16 @@ ${blocked ? "cors" : error}`
|
|
|
69
71
|
}
|
|
70
72
|
function connectedLick(connection) {
|
|
71
73
|
const count = connection.tools.length;
|
|
74
|
+
const { url } = connection.entry.config;
|
|
72
75
|
return {
|
|
73
76
|
channel: "fswatch",
|
|
74
77
|
source: `mcp:${connection.name}`,
|
|
75
78
|
title: `MCP server "${connection.name}" connected`,
|
|
76
|
-
text: `${
|
|
79
|
+
text: `${new URL(url).host} offers ${count} tool${count === 1 ? "" : "s"}.`,
|
|
77
80
|
target: "cone",
|
|
78
81
|
eventId: `${connection.name}
|
|
79
82
|
connected
|
|
80
|
-
${
|
|
83
|
+
${hash(url)}`
|
|
81
84
|
};
|
|
82
85
|
}
|
|
83
86
|
function logLine(server, params, at) {
|
|
@@ -119,6 +122,7 @@ async function attachMcp(catalog, options, context) {
|
|
|
119
122
|
};
|
|
120
123
|
let initial = /* @__PURE__ */ new Set();
|
|
121
124
|
let first = true;
|
|
125
|
+
let listed = { servers: [], problems: [], refused: [] };
|
|
122
126
|
const log = serverLog(options, context);
|
|
123
127
|
const { vault } = options;
|
|
124
128
|
const base = (input, init) => options.fetch(input, init);
|
|
@@ -168,6 +172,7 @@ async function attachMcp(catalog, options, context) {
|
|
|
168
172
|
const parsed = parseMcpConfig(read.ok ? read.value : void 0);
|
|
169
173
|
for (const problem of parsed.problems)
|
|
170
174
|
await report(problemLick(problem, home, options.agentDir), using);
|
|
175
|
+
listed = parsed;
|
|
171
176
|
const wanted = new Map(
|
|
172
177
|
parsed.servers.filter((entry) => entry.config.enabled !== false).map((entry) => [entry.name, entry])
|
|
173
178
|
);
|
|
@@ -216,7 +221,9 @@ async function attachMcp(catalog, options, context) {
|
|
|
216
221
|
oauth,
|
|
217
222
|
fetch: fetcher,
|
|
218
223
|
grant: (server) => vault.grant(server, fetcher(server)),
|
|
219
|
-
register: (server, url) => vault.token(server, url)
|
|
224
|
+
register: (server, url) => vault.token(server, url),
|
|
225
|
+
listed: () => listed,
|
|
226
|
+
file: mcpFile(env, configPath(home, options.agentDir), home, context)
|
|
220
227
|
},
|
|
221
228
|
restart,
|
|
222
229
|
listeners
|
package/dist/mcp/runtime.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/mcp/runtime.ts"],
|
|
4
|
-
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { Registry } from '@earendil-works/pi-durable';\nimport type { ExecutionEnv, FileWatcher } from '@earendil-works/pi-durable/env';\nimport { StreamableHttpTransport } from '@earendil-works/pi-mcp';\nimport type { LickEvent, Licks } from '../licks/licks.ts';\nimport type { McpServerSource } from '../secrets/endpoints.ts';\nimport { scrubText } from '../secrets/scrub.ts';\nimport type { PlainStore } from '../secrets/store.ts';\nimport { type McpAccounts, mcpAccounts } from './accounts.ts';\nimport { McpCatalog } from './catalog.ts';\nimport {\n type McpConfigProblem,\n type McpServerEntry,\n parseMcpConfig,\n sameConfig,\n usesOAuth,\n} from './config.ts';\nimport { McpServerConnection } from './connection.ts';\nimport { type McpRecords, resolveHeaders, secretNames } from './credentials.ts';\nimport { authProvider as oauthAuth, StoredOAuth } from './oauth.ts';\nimport { configPath, logPath, shown } from './paths.ts';\nimport { patchSse } from './sse.ts';\n\nexport const MCP_LOG_MAX_BYTES = 5 * 1024 * 1024;\n\nexport { configPath, logPath, shown } from './paths.ts';\n\nexport interface McpVault {\n records: McpRecords & {\n refresh(context: Context): Promise<void>;\n state: { subscribe(listener: () => void): () => void };\n };\n fetch(server: string, base: typeof fetch): typeof fetch;\n grant(server: string, base: typeof fetch): typeof fetch;\n servers(list: readonly McpServerSource[]): Promise<void>;\n token(server: string, url: string): Promise<void>;\n}\n\nexport interface McpAttach {\n licks: Licks;\n env: ExecutionEnv;\n home: string;\n agentDir?: string;\n store: PlainStore;\n vault: McpVault;\n fetch: typeof fetch;\n version: string;\n reloadMs: number;\n codemode: boolean;\n cors: boolean;\n redirect: string;\n}\n\nexport interface ServerStatus {\n name: string;\n state: string;\n tools: number;\n error?: string;\n}\n\nexport type { McpAccounts } from './accounts.ts';\n\nexport interface McpRuntime extends McpAccounts {\n status(): ServerStatus[];\n reload(context: Context): Promise<void>;\n close(context: Context): Promise<void>;\n}\n\nexport function problemLick(problem: McpConfigProblem, home: string, dir?: string): LickEvent {\n const file = shown(configPath(home, dir), home);\n const where = problem.server ? `server \"${problem.server}\"` : file;\n const field = problem.field ? `, field ${problem.field}` : '';\n return {\n channel: 'fswatch',\n source: `mcp:${file}`,\n title: `MCP config problem: ${where}${field}`,\n text: problem.message,\n body: `${file}: the entry is skipped until it is fixed. The format is in the slicc-agent README.`,\n target: 'cone',\n severity: 'warn',\n eventId: `${problem.server ?? ''}\\n${problem.field ?? ''}\\n${problem.message}`,\n };\n}\n\nconst CORS_ERROR = /failed to fetch|networkerror|load failed|cors/i;\n\nexport function stateLick(connection: McpServerConnection, cors: boolean): LickEvent | undefined {\n const name = connection.name;\n const base = { channel: 'fswatch' as const, source: `mcp:${name}`, target: 'cone' as const };\n if (connection.state === 'needs-secret')\n return {\n ...base,\n title: `MCP server \"${name}\" needs a token`,\n text: `Its headers use ${connection.missing.map((item) => `\\${${item}}`).join(', ')}. Add the value in Settings \u203A MCP servers.`,\n severity: 'warn',\n eventId: `${name}\\nsecret\\n${connection.missing.join(',')}`,\n };\n if (connection.state === 'needs-auth')\n return {\n ...base,\n title: secretNames(connection.entry.config).length\n ? `MCP server \"${name}\" rejected its token`\n : `MCP server \"${name}\" needs sign-in`,\n text: connection.signInMessage(),\n severity: 'warn',\n eventId: `${name}\\nauth`,\n };\n if (connection.state !== 'failed') return undefined;\n const error = connection.error ?? 'unknown error';\n const blocked = cors && CORS_ERROR.test(error);\n return {\n ...base,\n title: `MCP server \"${name}\" can't connect`,\n text: blocked\n ? \"Seven reaches it with the page's own fetch, and the server sends no CORS headers. Link the `slicc` CLI or connect the SLICC extension; either fetches without CORS.\"\n : error,\n severity: 'warn',\n eventId: `${name}\\nfailed\\n${blocked ? 'cors' : error}`,\n };\n}\n\nexport function connectedLick(connection: McpServerConnection): LickEvent {\n const count = connection.tools.length;\n return {\n channel: 'fswatch',\n source: `mcp:${connection.name}`,\n title: `MCP server \"${connection.name}\" connected`,\n text: `${connection.entry.config.url} offers ${count} tool${count === 1 ? '' : 's'}.`,\n target: 'cone',\n eventId: `${connection.name}\\nconnected\\n${connection.entry.config.url}`,\n };\n}\n\nexport function logLine(server: string, params: unknown, at: Date): string {\n const { level, logger, data } = (params ?? {}) as {\n level?: string;\n logger?: string;\n data?: unknown;\n };\n const text = typeof data === 'string' ? data : (JSON.stringify(data) ?? '');\n return `${at.toISOString()} [${server}] ${level ?? 'info'}${logger ? ` ${logger}` : ''}: ${text}\\n`;\n}\n\nfunction serverLog(options: McpAttach, context: Context) {\n let logging = Promise.resolve();\n const path = logPath(options.home, options.agentDir);\n const { env } = options;\n return {\n write(connection: McpServerConnection, params: unknown) {\n const text = logLine(connection.name, params, new Date());\n logging = logging.then(async () => {\n const line = await scrubText(text);\n const info = await env.fileInfo(path, context);\n if (info.ok && info.value.size > MCP_LOG_MAX_BYTES)\n await env.renameFile(path, `${path}.1`, context);\n await env.appendFile(path, line, context);\n });\n },\n settled: () => logging,\n };\n}\n\nexport async function attachMcp(\n catalog: McpCatalog,\n options: McpAttach,\n context: Context\n): Promise<McpRuntime> {\n const { env, home } = options;\n catalog.codemodeOn = options.codemode;\n const reported = new Set<string>();\n const report = async (lick: LickEvent | undefined, using: Context) => {\n if (!lick?.eventId || reported.has(lick.eventId)) return;\n reported.add(lick.eventId);\n await options.licks.deliver(lick, using).catch(() => undefined);\n };\n const listeners = new Set<() => void>();\n const notify = () => {\n for (const listener of listeners) listener();\n };\n let initial: Set<string> = new Set();\n let first = true;\n const log = serverLog(options, context);\n const { vault } = options;\n const base = (input: string | URL | Request, init?: RequestInit) => options.fetch(input, init);\n const fetcher = (server: string) => vault.fetch(server, base);\n const oauth = (entry: McpServerEntry) => new StoredOAuth(entry, options.store, options.redirect);\n const transport = async (entry: McpServerEntry) => {\n const resolved = resolveHeaders(entry.name, entry.config, vault.records);\n if (!resolved.ok) return { missing: resolved.missing };\n const authProvider = usesOAuth(entry.config) ? oauthAuth(oauth(entry), entry) : undefined;\n return {\n transport: new StreamableHttpTransport({\n url: entry.config.url,\n headers: resolved.headers,\n fetch: fetcher(entry.name),\n ...(authProvider ? { authProvider } : {}),\n }),\n };\n };\n const register = (entries: Iterable<McpServerEntry>) =>\n vault\n .servers(\n [...entries].map((entry) => ({\n server: entry.name,\n url: entry.config.url,\n names: secretNames(entry.config),\n }))\n )\n .catch(() => undefined);\n const open = (entry: McpServerEntry) => {\n const connection = new McpServerConnection({\n entry,\n version: options.version,\n transport,\n onTools: () => catalog.rebuild(),\n onLog: log.write,\n onChange: (changed) => {\n if (catalog.connections.get(changed.name) !== changed) return;\n if (changed.state === 'connected' && !initial.has(changed.name))\n void report(connectedLick(changed), context);\n void report(stateLick(changed, options.cors), context);\n if (changed.state !== 'connected') catalog.rebuild();\n notify();\n },\n });\n catalog.connections.set(entry.name, connection);\n void connection.getClient().catch(() => undefined);\n };\n const reload = async (using: Context) => {\n const read = await env.readTextFile(configPath(home, options.agentDir), using);\n const parsed = parseMcpConfig(read.ok ? read.value : undefined);\n for (const problem of parsed.problems)\n await report(problemLick(problem, home, options.agentDir), using);\n const wanted = new Map(\n parsed.servers\n .filter((entry) => entry.config.enabled !== false)\n .map((entry) => [entry.name, entry])\n );\n const closing: Promise<void>[] = [];\n for (const [name, connection] of [...catalog.connections]) {\n const next = wanted.get(name);\n if (next && sameConfig(next.config, connection.entry.config)) continue;\n catalog.connections.delete(name);\n closing.push(connection.close());\n }\n if (first) initial = new Set(wanted.keys());\n first = false;\n void register(wanted.values());\n for (const [name, entry] of wanted) if (!catalog.connections.has(name)) open(entry);\n catalog.rebuild();\n notify();\n await Promise.all(closing);\n };\n await reload(context);\n let timer: ReturnType<typeof setTimeout> | undefined;\n const schedule = () => {\n clearTimeout(timer);\n timer = setTimeout(() => void reload(context).catch(() => undefined), options.reloadMs);\n };\n const watched = await env.watch(\n [{ path: configPath(home, options.agentDir) }],\n schedule,\n context\n );\n const watcher: FileWatcher | undefined = watched.ok ? watched.value : undefined;\n const restart = (connection: McpServerConnection) => {\n open(connection.entry);\n void connection.close();\n catalog.rebuild();\n };\n const stopRecords = vault.records.state.subscribe(() => {\n for (const connection of [...catalog.connections.values()])\n if (connection.state === 'needs-secret') restart(connection);\n notify();\n });\n return {\n ...mcpAccounts(\n catalog,\n {\n records: vault.records,\n oauth,\n fetch: fetcher,\n grant: (server) => vault.grant(server, fetcher(server)),\n register: (server, url) => vault.token(server, url),\n },\n restart,\n listeners\n ),\n status: () =>\n [...catalog.connections.values()].map((connection) => ({\n name: connection.name,\n state: connection.state,\n tools: connection.tools.length,\n ...(connection.error ? { error: connection.error } : {}),\n })),\n reload,\n async close(using) {\n clearTimeout(timer);\n stopRecords();\n await watcher?.close(using);\n const all = [...catalog.connections.values()];\n catalog.connections.clear();\n await Promise.all(all.map((connection) => connection.close()));\n catalog.rebuild();\n await log.settled();\n },\n };\n}\n\nexport async function startMcp(\n registry: Registry,\n options: McpAttach,\n context: Context\n): Promise<{ catalog: McpCatalog; runtime: McpRuntime }> {\n patchSse();\n const catalog = new McpCatalog(registry);\n return { catalog, runtime: await attachMcp(catalog, options, context) };\n}\n"],
|
|
5
|
-
"mappings": "AAGA,SAAS,+BAA+B;
|
|
4
|
+
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { Registry } from '@earendil-works/pi-durable';\nimport type { ExecutionEnv, FileWatcher } from '@earendil-works/pi-durable/env';\nimport { StreamableHttpTransport } from '@earendil-works/pi-mcp';\nimport type { LickEvent, Licks } from '../licks/licks.ts';\nimport { hash } from '../licks/sources.ts';\nimport type { McpServerSource } from '../secrets/endpoints.ts';\nimport { scrubText } from '../secrets/scrub.ts';\nimport type { PlainStore } from '../secrets/store.ts';\nimport { type McpAccounts, mcpAccounts } from './accounts.ts';\nimport { McpCatalog } from './catalog.ts';\nimport {\n type McpConfig,\n type McpConfigProblem,\n type McpServerEntry,\n parseMcpConfig,\n sameConfig,\n usesOAuth,\n} from './config.ts';\nimport { McpServerConnection } from './connection.ts';\nimport { type McpRecords, resolveHeaders, secretNames } from './credentials.ts';\nimport { mcpFile } from './file.ts';\nimport { authProvider as oauthAuth, StoredOAuth } from './oauth.ts';\nimport { configPath, logPath, shown } from './paths.ts';\nimport { patchSse } from './sse.ts';\n\nexport const MCP_LOG_MAX_BYTES = 5 * 1024 * 1024;\n\nexport { configPath, logPath, shown } from './paths.ts';\n\nexport interface McpVault {\n records: McpRecords & {\n refresh(context: Context): Promise<void>;\n state: { subscribe(listener: () => void): () => void };\n };\n fetch(server: string, base: typeof fetch): typeof fetch;\n grant(server: string, base: typeof fetch): typeof fetch;\n servers(list: readonly McpServerSource[]): Promise<void>;\n token(server: string, url: string): Promise<void>;\n}\n\nexport interface McpAttach {\n licks: Licks;\n env: ExecutionEnv;\n home: string;\n agentDir?: string;\n store: PlainStore;\n vault: McpVault;\n fetch: typeof fetch;\n version: string;\n reloadMs: number;\n codemode: boolean;\n cors: boolean;\n redirect: string;\n}\n\nexport interface ServerStatus {\n name: string;\n state: string;\n tools: number;\n error?: string;\n}\n\nexport type { McpAccounts } from './accounts.ts';\n\nexport interface McpRuntime extends McpAccounts {\n status(): ServerStatus[];\n reload(context: Context): Promise<void>;\n close(context: Context): Promise<void>;\n}\n\nexport function problemLick(problem: McpConfigProblem, home: string, dir?: string): LickEvent {\n const file = shown(configPath(home, dir), home);\n const where = problem.server ? `server \"${problem.server}\"` : file;\n const field = problem.field ? `, field ${problem.field}` : '';\n return {\n channel: 'fswatch',\n source: `mcp:${file}`,\n title: `MCP config problem: ${where}${field}`,\n text: problem.message,\n body: `${file}: the entry is skipped until it is fixed. The format is in the slicc-agent README.`,\n target: 'cone',\n severity: 'warn',\n eventId: `${problem.server ?? ''}\\n${problem.field ?? ''}\\n${problem.message}`,\n };\n}\n\nconst CORS_ERROR = /failed to fetch|networkerror|load failed|cors/i;\n\nexport function stateLick(connection: McpServerConnection, cors: boolean): LickEvent | undefined {\n const name = connection.name;\n const base = { channel: 'fswatch' as const, source: `mcp:${name}`, target: 'cone' as const };\n if (connection.state === 'needs-secret')\n return {\n ...base,\n title: `MCP server \"${name}\" needs a token`,\n text: `Its headers use ${connection.missing.map((item) => `\\${${item}}`).join(', ')}. Add the value in Settings \u203A MCP servers.`,\n severity: 'warn',\n eventId: `${name}\\nsecret\\n${connection.missing.join(',')}`,\n };\n if (connection.state === 'needs-auth')\n return {\n ...base,\n title: secretNames(connection.entry.config).length\n ? `MCP server \"${name}\" rejected its token`\n : `MCP server \"${name}\" needs sign-in`,\n text: connection.signInMessage(),\n severity: 'warn',\n eventId: `${name}\\nauth`,\n };\n if (connection.state !== 'failed') return undefined;\n const error = connection.error ?? 'unknown error';\n const blocked = cors && CORS_ERROR.test(error);\n return {\n ...base,\n title: `MCP server \"${name}\" can't connect`,\n text: blocked\n ? \"Seven reaches it with the page's own fetch, and the server sends no CORS headers. Link the `slicc` CLI or connect the SLICC extension; either fetches without CORS.\"\n : error,\n severity: 'warn',\n eventId: `${name}\\nfailed\\n${blocked ? 'cors' : error}`,\n };\n}\n\nexport function connectedLick(connection: McpServerConnection): LickEvent {\n const count = connection.tools.length;\n const { url } = connection.entry.config;\n return {\n channel: 'fswatch',\n source: `mcp:${connection.name}`,\n title: `MCP server \"${connection.name}\" connected`,\n text: `${new URL(url).host} offers ${count} tool${count === 1 ? '' : 's'}.`,\n target: 'cone',\n eventId: `${connection.name}\\nconnected\\n${hash(url)}`,\n };\n}\n\nexport function logLine(server: string, params: unknown, at: Date): string {\n const { level, logger, data } = (params ?? {}) as {\n level?: string;\n logger?: string;\n data?: unknown;\n };\n const text = typeof data === 'string' ? data : (JSON.stringify(data) ?? '');\n return `${at.toISOString()} [${server}] ${level ?? 'info'}${logger ? ` ${logger}` : ''}: ${text}\\n`;\n}\n\nfunction serverLog(options: McpAttach, context: Context) {\n let logging = Promise.resolve();\n const path = logPath(options.home, options.agentDir);\n const { env } = options;\n return {\n write(connection: McpServerConnection, params: unknown) {\n const text = logLine(connection.name, params, new Date());\n logging = logging.then(async () => {\n const line = await scrubText(text);\n const info = await env.fileInfo(path, context);\n if (info.ok && info.value.size > MCP_LOG_MAX_BYTES)\n await env.renameFile(path, `${path}.1`, context);\n await env.appendFile(path, line, context);\n });\n },\n settled: () => logging,\n };\n}\n\nexport async function attachMcp(\n catalog: McpCatalog,\n options: McpAttach,\n context: Context\n): Promise<McpRuntime> {\n const { env, home } = options;\n catalog.codemodeOn = options.codemode;\n const reported = new Set<string>();\n const report = async (lick: LickEvent | undefined, using: Context) => {\n if (!lick?.eventId || reported.has(lick.eventId)) return;\n reported.add(lick.eventId);\n await options.licks.deliver(lick, using).catch(() => undefined);\n };\n const listeners = new Set<() => void>();\n const notify = () => {\n for (const listener of listeners) listener();\n };\n let initial: Set<string> = new Set();\n let first = true;\n let listed: McpConfig = { servers: [], problems: [], refused: [] };\n const log = serverLog(options, context);\n const { vault } = options;\n const base = (input: string | URL | Request, init?: RequestInit) => options.fetch(input, init);\n const fetcher = (server: string) => vault.fetch(server, base);\n const oauth = (entry: McpServerEntry) => new StoredOAuth(entry, options.store, options.redirect);\n const transport = async (entry: McpServerEntry) => {\n const resolved = resolveHeaders(entry.name, entry.config, vault.records);\n if (!resolved.ok) return { missing: resolved.missing };\n const authProvider = usesOAuth(entry.config) ? oauthAuth(oauth(entry), entry) : undefined;\n return {\n transport: new StreamableHttpTransport({\n url: entry.config.url,\n headers: resolved.headers,\n fetch: fetcher(entry.name),\n ...(authProvider ? { authProvider } : {}),\n }),\n };\n };\n const register = (entries: Iterable<McpServerEntry>) =>\n vault\n .servers(\n [...entries].map((entry) => ({\n server: entry.name,\n url: entry.config.url,\n names: secretNames(entry.config),\n }))\n )\n .catch(() => undefined);\n const open = (entry: McpServerEntry) => {\n const connection = new McpServerConnection({\n entry,\n version: options.version,\n transport,\n onTools: () => catalog.rebuild(),\n onLog: log.write,\n onChange: (changed) => {\n if (catalog.connections.get(changed.name) !== changed) return;\n if (changed.state === 'connected' && !initial.has(changed.name))\n void report(connectedLick(changed), context);\n void report(stateLick(changed, options.cors), context);\n if (changed.state !== 'connected') catalog.rebuild();\n notify();\n },\n });\n catalog.connections.set(entry.name, connection);\n void connection.getClient().catch(() => undefined);\n };\n const reload = async (using: Context) => {\n const read = await env.readTextFile(configPath(home, options.agentDir), using);\n const parsed = parseMcpConfig(read.ok ? read.value : undefined);\n for (const problem of parsed.problems)\n await report(problemLick(problem, home, options.agentDir), using);\n listed = parsed;\n const wanted = new Map(\n parsed.servers\n .filter((entry) => entry.config.enabled !== false)\n .map((entry) => [entry.name, entry])\n );\n const closing: Promise<void>[] = [];\n for (const [name, connection] of [...catalog.connections]) {\n const next = wanted.get(name);\n if (next && sameConfig(next.config, connection.entry.config)) continue;\n catalog.connections.delete(name);\n closing.push(connection.close());\n }\n if (first) initial = new Set(wanted.keys());\n first = false;\n void register(wanted.values());\n for (const [name, entry] of wanted) if (!catalog.connections.has(name)) open(entry);\n catalog.rebuild();\n notify();\n await Promise.all(closing);\n };\n await reload(context);\n let timer: ReturnType<typeof setTimeout> | undefined;\n const schedule = () => {\n clearTimeout(timer);\n timer = setTimeout(() => void reload(context).catch(() => undefined), options.reloadMs);\n };\n const watched = await env.watch(\n [{ path: configPath(home, options.agentDir) }],\n schedule,\n context\n );\n const watcher: FileWatcher | undefined = watched.ok ? watched.value : undefined;\n const restart = (connection: McpServerConnection) => {\n open(connection.entry);\n void connection.close();\n catalog.rebuild();\n };\n const stopRecords = vault.records.state.subscribe(() => {\n for (const connection of [...catalog.connections.values()])\n if (connection.state === 'needs-secret') restart(connection);\n notify();\n });\n return {\n ...mcpAccounts(\n catalog,\n {\n records: vault.records,\n oauth,\n fetch: fetcher,\n grant: (server) => vault.grant(server, fetcher(server)),\n register: (server, url) => vault.token(server, url),\n listed: () => listed,\n file: mcpFile(env, configPath(home, options.agentDir), home, context),\n },\n restart,\n listeners\n ),\n status: () =>\n [...catalog.connections.values()].map((connection) => ({\n name: connection.name,\n state: connection.state,\n tools: connection.tools.length,\n ...(connection.error ? { error: connection.error } : {}),\n })),\n reload,\n async close(using) {\n clearTimeout(timer);\n stopRecords();\n await watcher?.close(using);\n const all = [...catalog.connections.values()];\n catalog.connections.clear();\n await Promise.all(all.map((connection) => connection.close()));\n catalog.rebuild();\n await log.settled();\n },\n };\n}\n\nexport async function startMcp(\n registry: Registry,\n options: McpAttach,\n context: Context\n): Promise<{ catalog: McpCatalog; runtime: McpRuntime }> {\n patchSse();\n const catalog = new McpCatalog(registry);\n return { catalog, runtime: await attachMcp(catalog, options, context) };\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["configPath", "logPath", "shown"]
|
|
7
7
|
}
|
package/dist/readonly.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { VIEW_ONLY } from "./view-only.js";
|
|
2
|
+
const NOT_OWNER = "Only the owner's page can change MCP servers.";
|
|
2
3
|
const refuse = () => Promise.reject(Object.assign(new Error(VIEW_ONLY), { code: "EACCES" }));
|
|
3
4
|
const refused = async () => ({
|
|
4
5
|
accepted: false,
|
|
@@ -7,7 +8,8 @@ const refused = async () => ({
|
|
|
7
8
|
});
|
|
8
9
|
const sends = /* @__PURE__ */ new Set(["send", "compact", "compactAgent"]);
|
|
9
10
|
const controlAnswer = (name) => sends.has(name) ? refused : refuse;
|
|
10
|
-
const
|
|
11
|
+
const notOwner = () => Promise.reject(Object.assign(new Error(NOT_OWNER), { code: "EACCES" }));
|
|
12
|
+
const settingsAnswer = (name) => name === "addServer" || name === "removeServer" ? notOwner : refuse;
|
|
11
13
|
const remoteAnswer = (name) => name === "prompt" ? async () => ({ ok: false, code: "EACCES", message: VIEW_ONLY }) : refuse;
|
|
12
14
|
function viewPages() {
|
|
13
15
|
return {
|
|
@@ -43,6 +45,7 @@ function viewRemote(remote) {
|
|
|
43
45
|
};
|
|
44
46
|
}
|
|
45
47
|
export {
|
|
48
|
+
NOT_OWNER,
|
|
46
49
|
VIEW_ONLY,
|
|
47
50
|
controlAnswer,
|
|
48
51
|
pageAnswer,
|
package/dist/readonly.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/readonly.ts"],
|
|
4
|
-
"sourcesContent": ["import type { AgentRemote } from './remote/host.ts';\nimport type { AgentPages } from './remote/pages.ts';\nimport { VIEW_ONLY } from './view-only.ts';\n\nexport { VIEW_ONLY };\n\ntype Answer = (...args: unknown[]) => Promise<unknown>;\n\nconst refuse: Answer = () =>\n Promise.reject(Object.assign(new Error(VIEW_ONLY), { code: 'EACCES' }));\n\nconst refused: Answer = async () => ({\n accepted: false as const,\n submissionId: null,\n error: { code: 'EACCES', message: VIEW_ONLY },\n});\n\nconst sends = new Set(['send', 'compact', 'compactAgent']);\n\nexport const controlAnswer = (name: string): Answer => (sends.has(name) ? refused : refuse);\n\nexport const settingsAnswer = (): Answer
|
|
5
|
-
"mappings": "AAEA,SAAS,iBAAiB;
|
|
4
|
+
"sourcesContent": ["import type { AgentRemote } from './remote/host.ts';\nimport type { AgentPages } from './remote/pages.ts';\nimport { VIEW_ONLY } from './view-only.ts';\n\nexport { VIEW_ONLY };\n\nexport const NOT_OWNER = \"Only the owner's page can change MCP servers.\";\n\ntype Answer = (...args: unknown[]) => Promise<unknown>;\n\nconst refuse: Answer = () =>\n Promise.reject(Object.assign(new Error(VIEW_ONLY), { code: 'EACCES' }));\n\nconst refused: Answer = async () => ({\n accepted: false as const,\n submissionId: null,\n error: { code: 'EACCES', message: VIEW_ONLY },\n});\n\nconst sends = new Set(['send', 'compact', 'compactAgent']);\n\nexport const controlAnswer = (name: string): Answer => (sends.has(name) ? refused : refuse);\n\nconst notOwner: Answer = () =>\n Promise.reject(Object.assign(new Error(NOT_OWNER), { code: 'EACCES' }));\n\nexport const settingsAnswer = (name: string): Answer =>\n name === 'addServer' || name === 'removeServer' ? notOwner : refuse;\n\nexport const remoteAnswer = (name: string): Answer =>\n name === 'prompt' ? async () => ({ ok: false, code: 'EACCES', message: VIEW_ONLY }) : refuse;\n\nexport function viewPages(): AgentPages {\n return {\n open: async () => ({ error: VIEW_ONLY }),\n report: async () => {},\n next: async () => ({ requests: [], done: true }),\n answer: async () => {},\n close: async () => {},\n };\n}\n\nexport const pageAnswer = (name: string): Answer =>\n (viewPages() as unknown as Record<string, Answer>)[name] as Answer;\n\nexport function viewRemote(remote: AgentRemote): Pick<AgentRemote, 'watch' | 'next' | 'close'> {\n const mine = new Set<string>();\n return {\n async watch(request, context) {\n const opened = await remote.watch(request, context);\n if (opened.ok) mine.add(opened.stream);\n return opened;\n },\n async next(stream, waitMs, context) {\n if (!mine.has(stream)) return { events: [], done: true };\n const batch = await remote.next(stream, waitMs, context);\n if (batch.done) mine.delete(stream);\n return batch;\n },\n async close(stream, context) {\n if (!mine.delete(stream)) return;\n await remote.close(stream, context);\n },\n };\n}\n"],
|
|
5
|
+
"mappings": "AAEA,SAAS,iBAAiB;AAInB,MAAM,YAAY;AAIzB,MAAM,SAAiB,MACrB,QAAQ,OAAO,OAAO,OAAO,IAAI,MAAM,SAAS,GAAG,EAAE,MAAM,SAAS,CAAC,CAAC;AAExE,MAAM,UAAkB,aAAa;AAAA,EACnC,UAAU;AAAA,EACV,cAAc;AAAA,EACd,OAAO,EAAE,MAAM,UAAU,SAAS,UAAU;AAC9C;AAEA,MAAM,QAAQ,oBAAI,IAAI,CAAC,QAAQ,WAAW,cAAc,CAAC;AAElD,MAAM,gBAAgB,CAAC,SAA0B,MAAM,IAAI,IAAI,IAAI,UAAU;AAEpF,MAAM,WAAmB,MACvB,QAAQ,OAAO,OAAO,OAAO,IAAI,MAAM,SAAS,GAAG,EAAE,MAAM,SAAS,CAAC,CAAC;AAEjE,MAAM,iBAAiB,CAAC,SAC7B,SAAS,eAAe,SAAS,iBAAiB,WAAW;AAExD,MAAM,eAAe,CAAC,SAC3B,SAAS,WAAW,aAAa,EAAE,IAAI,OAAO,MAAM,UAAU,SAAS,UAAU,KAAK;AAEjF,SAAS,YAAwB;AACtC,SAAO;AAAA,IACL,MAAM,aAAa,EAAE,OAAO,UAAU;AAAA,IACtC,QAAQ,YAAY;AAAA,IAAC;AAAA,IACrB,MAAM,aAAa,EAAE,UAAU,CAAC,GAAG,MAAM,KAAK;AAAA,IAC9C,QAAQ,YAAY;AAAA,IAAC;AAAA,IACrB,OAAO,YAAY;AAAA,IAAC;AAAA,EACtB;AACF;AAEO,MAAM,aAAa,CAAC,SACxB,UAAU,EAAwC,IAAI;AAElD,SAAS,WAAW,QAAoE;AAC7F,QAAM,OAAO,oBAAI,IAAY;AAC7B,SAAO;AAAA,IACL,MAAM,MAAM,SAAS,SAAS;AAC5B,YAAM,SAAS,MAAM,OAAO,MAAM,SAAS,OAAO;AAClD,UAAI,OAAO,GAAI,MAAK,IAAI,OAAO,MAAM;AACrC,aAAO;AAAA,IACT;AAAA,IACA,MAAM,KAAK,QAAQ,QAAQ,SAAS;AAClC,UAAI,CAAC,KAAK,IAAI,MAAM,EAAG,QAAO,EAAE,QAAQ,CAAC,GAAG,MAAM,KAAK;AACvD,YAAM,QAAQ,MAAM,OAAO,KAAK,QAAQ,QAAQ,OAAO;AACvD,UAAI,MAAM,KAAM,MAAK,OAAO,MAAM;AAClC,aAAO;AAAA,IACT;AAAA,IACA,MAAM,MAAM,QAAQ,SAAS;AAC3B,UAAI,CAAC,KAAK,OAAO,MAAM,EAAG;AAC1B,YAAM,OAAO,MAAM,QAAQ,OAAO;AAAA,IACpC;AAAA,EACF;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/services.js
CHANGED
|
@@ -131,7 +131,13 @@ const SETTINGS_METHODS = keys({
|
|
|
131
131
|
signIn: true,
|
|
132
132
|
dismissMoved: true
|
|
133
133
|
});
|
|
134
|
+
const OWNER_SETTINGS_METHODS = [
|
|
135
|
+
...SETTINGS_METHODS,
|
|
136
|
+
"addServer",
|
|
137
|
+
"removeServer"
|
|
138
|
+
];
|
|
134
139
|
const AgentSettings = contract("slicc.agent.settings", {
|
|
140
|
+
owner: { state: ["state"], methods: OWNER_SETTINGS_METHODS },
|
|
135
141
|
settings: { state: ["state"], methods: SETTINGS_METHODS },
|
|
136
142
|
view: { state: ["state"] }
|
|
137
143
|
});
|
|
@@ -148,6 +154,7 @@ export {
|
|
|
148
154
|
GUEST_METHODS,
|
|
149
155
|
GUEST_STATES,
|
|
150
156
|
OWNER_DEVICE_METHODS,
|
|
157
|
+
OWNER_SETTINGS_METHODS,
|
|
151
158
|
PAGE_METHODS,
|
|
152
159
|
REMOTE_METHODS,
|
|
153
160
|
REMOTE_READS,
|