@ai-ecoverse/slicc-agent 7.28.3 → 7.28.4

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 CHANGED
@@ -394,13 +394,13 @@ MCP servers reachable over Streamable HTTP become native agent tools. The client
394
394
  ```
395
395
 
396
396
  - **Fields.** `url`, `type` (`http` or `streamable-http`), `headers`, `exposure`, `toolExposure`, `enabled`, `timeout` (seconds, default 60; progress resets it) and `description`.
397
- - **Refused.** `command` (stdio), `type: "sse"`, `auth`, the `oauth` fields that need a loopback or a client secret, `!command` values, and literal secrets: a credential-like header (`Authorization`, `Cookie`, or a name with `token`, `key`, `secret`, `password` or `session`) or a URL with a password or a key in its query. It holds only `${NAME}` placeholders: a secret belongs in the vault, even in a file only the worker can read.
397
+ - **Refused.** `command` (stdio), `type: "sse"`, `auth`, the `oauth` fields that need a loopback or a client secret, `!command` values, and literal secrets: a credential-like header (`Authorization`, `Cookie`, or a name with `token`, `key`, `secret`, `password` or `session`) or a URL with a password or a key in its query. It holds only `${NAME}` placeholders: a secret belongs in the vault, even in a file only the worker can read. A `Cookie` header may also name its cookies: `name=${NAME}` pairs separated by `; ` (`Cookie: fjv3_session=${MCP_DOCS_TOKEN}`, `Cookie: a=${A}; b=${B}`), so the vault holds only the value; a literal cookie value (`Cookie: name=literal`, `Cookie: literal`) is still refused.
398
398
  - **Problems.** Each refused or broken entry is skipped and becomes one `warn` lick naming the server and the field; the other servers still connect.
399
399
  - **Reconcile.** The worker watches the file. An unchanged server keeps its session, a changed one reconnects, and a removed one is closed and loses its tools. A server added later posts a "connected" lick naming its host, since a URL's path can carry a token.
400
400
 
401
401
  **Per agent.** Every cone gets every enabled server from the one file above: `/etc/slicc/agent/mcp.json` with users on, `/home/.pi/agent/mcp.json` with users off. A scoop doesn't read a file of its own: it inherits its cone's servers, and a role's `tools:` or `agent --tools` list narrows them. A list with no `mcp__` entry gets no MCP servers. A list with `mcp__docs__search` or `mcp__docs__*` keeps only those, and `codemode` is added so codemode tools stay reachable. The resource tools must be listed by name, and they reach only the servers the list names. A nested scoop without a list inherits its calling scoop's list. A `beforeTool` hook blocks the model's calls outside the list, and codemode scripts only get the tools on it.
402
402
 
403
- **Secrets.** `${NAME}` placeholders resolve to the vault's placeholders for that server (`records()`: an `mcp` record with `server` equal to the `mcp.json` key and that name, else the server's only record when the headers use one name, else an unbound record of that name, which covers mcpcat's `${MCP_<NAME>_TOKEN}` bridge tokens). The headers go out holding placeholders, and the vault fills them in its `mcp` op, only for that server's registered URL. A server whose record is missing comes up as needing one, with a lick, and reconnects when the record appears. The worker never holds a value; server log lines are scrubbed through the vault before they reach `~/.pi/agent/mcp.log`. **OAuth.** A server without an `Authorization` header that answers 401 needs a sign-in, as in pi. Its row in Settings › MCP servers offers Connect, which opens a held pop-up (`slicc-mcp-oauth`, see **Held sign-in windows**) on the authorization server, found through the server's protected-resource metadata (RFC 9728) or `oauth.authServerMetadataUrl`. SLICC registers itself dynamically as a public client named `SLICC` (`oauth.clientName` changes it), or uses `oauth.clientId`, with PKCE S256 and the redirect URI `https://<origin>/oauth/mcp-callback`. slicc-bios serves that path from `dist/oauth/mcp-callback.html` in this package. The callback page hands the code back over the `slicc-mcp-oauth` BroadcastChannel and clears it from its address. Before the pop-up opens, the worker registers the server's `tokenUrl` (the discovered `token_endpoint`, else `<authServer>/token`) with the vault. It exchanges the code, checking `state` and `iss`, as a prepared `mcp` request to that `tokenUrl`, and hands the token response straight to the vault's `grant`; the raw response is dropped, and pi-mcp keeps only the reply, which holds placeholders, with the client and discovery state in `/.slicc/accounts.json` under the server's name and URL. When the server answers 401, the worker asks the vault to `refresh` once and sends again; pi-mcp's own refresh is off, because the refresh token is a placeholder. When that fails, the row shows the sign-in as expired. Disconnect deletes the local state; spectrum removes the vault records. Without a vault, the exchange is refused ("MCP sign-in needs seven's vault: update seven") before any token is issued. `oauth.scope` sets the scopes, else the server's advertised ones are used. `clientSecret`, `callbackPort`, `callbackUrl` and `clientRegistration` are refused, because SLICC signs in as a public client through its own page.
403
+ **Secrets.** `${NAME}` placeholders resolve to the vault's placeholders for that server (`records()`: an `mcp` record with `server` equal to the `mcp.json` key and that name, else the server's only record when the headers use one name, else an unbound record of that name, which covers mcpcat's `${MCP_<NAME>_TOKEN}` bridge tokens). The headers go out holding placeholders, and the vault fills them in its `mcp` op, only for that server's registered URL. The headers are passed to the vault and on to the kernel's transport as data, never through a browser `Request`, so a forbidden request header such as `Cookie` isn't dropped on the way; whether it then reaches the server is up to the transport's route (the page's own fetch drops it, see slicc-kernel#1796). A server whose record is missing comes up as needing one, with a lick, and reconnects when the record appears. The worker never holds a value; server log lines are scrubbed through the vault before they reach `~/.pi/agent/mcp.log`. **OAuth.** A server without an `Authorization` header that answers 401 needs a sign-in, as in pi. Its row in Settings › MCP servers offers Connect, which opens a held pop-up (`slicc-mcp-oauth`, see **Held sign-in windows**) on the authorization server, found through the server's protected-resource metadata (RFC 9728) or `oauth.authServerMetadataUrl`. SLICC registers itself dynamically as a public client named `SLICC` (`oauth.clientName` changes it), or uses `oauth.clientId`, with PKCE S256 and the redirect URI `https://<origin>/oauth/mcp-callback`. slicc-bios serves that path from `dist/oauth/mcp-callback.html` in this package. The callback page hands the code back over the `slicc-mcp-oauth` BroadcastChannel and clears it from its address. Before the pop-up opens, the worker registers the server's `tokenUrl` (the discovered `token_endpoint`, else `<authServer>/token`) with the vault. It exchanges the code, checking `state` and `iss`, as a prepared `mcp` request to that `tokenUrl`, and hands the token response straight to the vault's `grant`; the raw response is dropped, and pi-mcp keeps only the reply, which holds placeholders, with the client and discovery state in `/.slicc/accounts.json` under the server's name and URL. When the server answers 401, the worker asks the vault to `refresh` once and sends again; pi-mcp's own refresh is off, because the refresh token is a placeholder. When that fails, the row shows the sign-in as expired. Disconnect deletes the local state; spectrum removes the vault records. Without a vault, the exchange is refused ("MCP sign-in needs seven's vault: update seven") before any token is issued. `oauth.scope` sets the scopes, else the server's advertised ones are used. `clientSecret`, `callbackPort`, `callbackUrl` and `clientRegistration` are refused, because SLICC signs in as a public client through its own page.
404
404
 
405
405
  **Settings › MCP servers** lists every server in the file, under its own heading below Accounts, with the URL host. A row's `state` says what it's doing: `connecting`, `connected`, `needs-secret`, `needs-auth` or `failed`, or `disabled` (`enabled: false`) and `refused` (the entry's check failed; the warn lick says why, `refusals()` below gives the owner the same sentence, and the row's only action is Remove). A server that needs nothing has `auth: 'local'` and no Connect; it turns into an `oauth` row with Connect if it answers 401. **Adding and removing.** `addServer(name, entry)` and `removeServer('mcp:<server>')` on the settings service are for the owner's page only: a view-only or control seat gets `{ ok: false, code: 'not-owner', reason }`, a guest has no settings service, and the spectrum adapter offers them only on the owner's connection. No tool or kernel command reaches them, so an agent still needs `sudo` to change the file. Both answer `{ ok: true }` or `{ ok: false, code, reason }`, where `code` is a stable `McpRefusalCode` from `src/services.ts`, for a page to act on, and `reason` is the sentence to show. `refusals()`, also the owner's alone (other seats and guests get `EACCES`, and an agent without MCP answers `{}`), answers `{ [server]: { code, reason } }` for the entries refused in the file, with no URL, header value or secret. `entry` goes through the same checks as reading the file, so a stdio or `type: "sse"` entry, a literal secret, or a URL with a password or key returns the reason and writes nothing, and so does a name that's taken. `token: true` writes `Authorization: Bearer ${MCP_<NAME>_TOKEN}` (`<NAME>` in upper case with anything else as `_`, the name mcpcat and jerk use), so the row offers Connect like any token server; without it, the server signs in through the OAuth path above if it answers 401. The other servers and unknown fields stay. A file that doesn't parse or can't be read is refused, with the reason, and never overwritten. The write goes to a `0600` temporary file beside it and is renamed over it, and the file watch does the rest. `removeServer` also forgets the server's local OAuth state; the vault's records and the page's endpoint registration are the page's to clear, as on Disconnect. The page can ask for a server's URL, the `mcp.json` URL without user name, password, query or fragment, with `serverUrl('mcp:<server>')`, so it can register it with the vault (its `endpoints` op) before it connects a token it put there; from slicc-vault 1.13.0 a page-sealed token is filled only on a URL the page registered. The URL is never in the replicated settings state, since a path can carry a token and view-only principals read that state; `serverUrl` is a settings method, which view-only principals don't get, and it answers `null` for model accounts. The spectrum adapter fills each MCP account's `url` from it. Connect takes the token, which fills every placeholder of a server that uses one name; a server whose headers use several different names can't be filled from Settings yet. The server then reconnects. A server that answers 401 shows as **Rejected**, with Reconnect, and Disconnect deletes the token. Tool cards and remote summaries label MCP calls `server · tool`, unless the name is ambiguous (a server name that starts or ends with `_`, or a name with more than two `__` separators); then they show the raw name.
406
406
 
@@ -24,6 +24,7 @@ const SECRET_HEADER = /authorization|cookie|token|key|secret|password|session/i;
24
24
  const SECRET_PARAM = /token|key|secret|password|signature|sig|auth|code/i;
25
25
  const PLACEHOLDER = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
26
26
  const SCHEME = /^\s*(?:bearer|basic|token|apikey|api-key)\s+/i;
27
+ const COOKIE_PAIR = /^(?:[!#$%&'*+.^_`|~0-9A-Za-z-]+=)?(?:\$\{[A-Za-z_][A-Za-z0-9_]*\})+$/;
27
28
  const MAX_TOOL_NAME = 64;
28
29
  const DEFAULT_TIMEOUT_SECONDS = 60;
29
30
  function isRecord(value) {
@@ -40,6 +41,8 @@ function placeholders(value) {
40
41
  }
41
42
  function literalSecret(header, value) {
42
43
  if (!SECRET_HEADER.test(header)) return false;
44
+ if (header.toLowerCase() === "cookie")
45
+ return value.split(";").some((pair) => pair.trim() !== "" && !COOKIE_PAIR.test(pair.trim()));
43
46
  return value.replace(PLACEHOLDER, "").replace(SCHEME, "").trim() !== "";
44
47
  }
45
48
  function urlSecret(url) {
@@ -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';\nimport type { McpRefusal, McpRefusalCode } from '../services.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 code?: McpRefusalCode;\n}\n\nexport interface McpRefusedServer extends McpRefusal {\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:\n 'SLICC registers dynamically, sends a client metadata document 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 Failed = McpConfigProblem & { code: McpRefusalCode };\ntype Checked = McpServerConfig | Failed;\n\nfunction fail(server: string, code: McpRefusalCode, message: string, field?: string): Failed {\n return { server, ...(field ? { field } : {}), message, code };\n}\n\nfunction checkHeaders(name: string, headers: unknown): Failed | undefined {\n if (headers === undefined) return undefined;\n if (!isRecord(headers) || !Object.values(headers).every((value) => typeof value === 'string'))\n return fail(name, 'invalid', '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 'invalid',\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 'header-secret',\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>): Failed | undefined {\n const { oauth } = value;\n if (oauth === undefined) return undefined;\n if (!isRecord(oauth)) return fail(name, 'invalid', 'oauth must be an object', 'oauth');\n if (Object.keys(value.headers ?? {}).some((header) => header.toLowerCase() === 'authorization'))\n return fail(name, 'invalid', '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)\n return fail(name, 'invalid', `oauth.${key} is not supported: ${refused}`, `oauth.${key}`);\n if (!OAUTH_STRINGS.includes(key))\n return fail(name, 'invalid', `oauth.${key} is not a known field`, `oauth.${key}`);\n if (typeof entry !== 'string' || !entry.trim())\n return fail(name, 'invalid', `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 URL.canParse(metadata) ? 'insecure-url' : 'bad-url',\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(name: string, value: Record<string, unknown>): Failed | undefined {\n const allowed = EXPOSURES.map((item) => `\"${item}\"`).join(', ');\n if (value.exposure !== undefined && !isExposure(value.exposure))\n return fail(name, 'invalid', `exposure must be one of ${allowed}`, 'exposure');\n if (value.toolExposure === undefined) return undefined;\n if (!isRecord(value.toolExposure))\n return fail(name, 'invalid', '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(\n name,\n 'invalid',\n `toolExposure \"${tool}\" must be one of ${allowed}`,\n `toolExposure.${tool}`\n );\n return undefined;\n}\n\nfunction checkFields(name: string, value: Record<string, unknown>): Failed | undefined {\n if (value.enabled !== undefined && typeof value.enabled !== 'boolean')\n return fail(name, 'invalid', 'enabled must be a boolean', 'enabled');\n if (value.description !== undefined && typeof value.description !== 'string')\n return fail(name, 'invalid', 'description must be a string', 'description');\n if (value.timeout !== undefined && (typeof value.timeout !== 'number' || !(value.timeout > 0)))\n return fail(name, 'invalid', 'timeout must be a positive number of seconds', 'timeout');\n return undefined;\n}\n\nfunction checkTransport(name: string, value: Record<string, unknown>): Failed | undefined {\n if (value.command !== undefined || value.type === 'stdio')\n return fail(\n name,\n 'stdio',\n 'stdio servers need slicc-kernel#68, so this one is skipped',\n 'command'\n );\n if (value.type === 'sse')\n return fail(\n name,\n 'sse',\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, 'invalid', 'type must be \"http\" or \"streamable-http\"', 'type');\n if (typeof value.url !== 'string')\n return fail(name, 'bad-url', 'needs a \"url\" (streamable HTTP)', 'url');\n if (!URL.canParse(value.url) || !/^https?:$/.test(new URL(value.url).protocol))\n return fail(name, 'bad-url', '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 'url-secret',\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(\n name,\n 'bad-name',\n `invalid server name \"${name}\" (use letters, digits, \"_\" and \"-\")`\n );\n if (!isRecord(raw)) return fail(name, 'not-object', '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)\n return fail(name, 'invalid', '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 const refuse = (name: string, raw: unknown, problem: Failed) => {\n problems.push(problem);\n refused.push({ name, host: hostOf(raw), code: problem.code, reason: problem.message });\n };\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 refuse(name, raw, checked);\n continue;\n }\n if (seen.has(canonical(name))) {\n const twin = 'names that differ only in \"-\" and \"_\" count as the same server';\n refuse(name, raw, fail(name, 'duplicate', twin));\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": "AAAA,SAAS,YAAY;AA8CrB,MAAM,cAAc;AACpB,MAAM,YAA+B,CAAC,YAAY,YAAY,UAAU,QAAQ;AAChF,MAAM,UAAuC,EAAE,qBAAqB,WAAW;AAC/E,MAAM,WAAW,oBAAI,IAAI;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AACD,MAAM,gBAAgB,CAAC,YAAY,cAAc,SAAS,uBAAuB;AACjF,MAAM,gBAAwC;AAAA,EAC5C,cAAc;AAAA,EACd,cAAc;AAAA,EACd,aAAa;AAAA,EACb,oBACE;AACJ;AACA,MAAM,gBAAgB;AACtB,MAAM,eAAe;AACrB,MAAM,cAAc;AACpB,MAAM,SAAS;AACf,MAAM,gBAAgB;AACf,MAAM,0BAA0B;AAEhC,SAAS,SAAS,OAAkD;AACzE,SAAO,OAAO,UAAU,YAAY,UAAU,QAAQ,CAAC,MAAM,QAAQ,KAAK;AAC5E;AAEA,SAAS,MAAM,OAAyB;AACtC,SAAO,OAAO,UAAU,WAAY,QAAQ,KAAK,KAAK,QAAS;AACjE;AAEA,SAAS,WAAW,OAAsC;AACxD,SAAO,OAAO,UAAU,YAAY,UAAU,SAAS,KAAK;AAC9D;AAEO,SAAS,aAAa,OAAyB;AACpD,SAAO,CAAC,GAAG,MAAM,SAAS,WAAW,CAAC,EAAE,IAAI,CAAC,UAAU,MAAM,CAAC,CAAW;AAC3E;AAEO,SAAS,cAAc,QAAgB,OAAwB;AACpE,MAAI,CAAC,cAAc,KAAK,MAAM,EAAG,QAAO;AACxC,SAAO,MAAM,QAAQ,aAAa,EAAE,EAAE,QAAQ,QAAQ,EAAE,EAAE,KAAK,MAAM;AACvE;AAEA,SAAS,UAAU,KAA8B;AAC/C,MAAI,IAAI,YAAY,IAAI,SAAU,QAAO;AACzC,aAAW,QAAQ,IAAI,aAAa,KAAK,EAAG,KAAI,aAAa,KAAK,IAAI,EAAG,QAAO,QAAQ,IAAI;AAC5F,SAAO;AACT;AAKA,SAAS,KAAK,QAAgB,MAAsB,SAAiB,OAAwB;AAC3F,SAAO,EAAE,QAAQ,GAAI,QAAQ,EAAE,MAAM,IAAI,CAAC,GAAI,SAAS,KAAK;AAC9D;AAEA,SAAS,aAAa,MAAc,SAAsC;AACxE,MAAI,YAAY,OAAW,QAAO;AAClC,MAAI,CAAC,SAAS,OAAO,KAAK,CAAC,OAAO,OAAO,OAAO,EAAE,MAAM,CAAC,UAAU,OAAO,UAAU,QAAQ;AAC1F,WAAO,KAAK,MAAM,WAAW,qCAAqC,SAAS;AAC7E,aAAW,CAAC,QAAQ,KAAK,KAAK,OAAO,QAAQ,OAAiC,GAAG;AAC/E,QAAI,MAAM,KAAK,EAAE,WAAW,GAAG;AAC7B,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA,WAAW,MAAM;AAAA,QACjB,WAAW,MAAM;AAAA,MACnB;AACF,QAAI,cAAc,QAAQ,KAAK;AAC7B,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA,WAAW,MAAM;AAAA,QACjB,WAAW,MAAM;AAAA,MACnB;AAAA,EACJ;AACA,SAAO;AACT;AAEA,SAAS,WAAW,MAAc,OAAoD;AACpF,QAAM,EAAE,MAAM,IAAI;AAClB,MAAI,UAAU,OAAW,QAAO;AAChC,MAAI,CAAC,SAAS,KAAK,EAAG,QAAO,KAAK,MAAM,WAAW,2BAA2B,OAAO;AACrF,MAAI,OAAO,KAAK,MAAM,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,OAAO,YAAY,MAAM,eAAe;AAC5F,WAAO,KAAK,MAAM,WAAW,wDAAwD,OAAO;AAC9F,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,KAAK,GAAG;AAChD,UAAM,UAAU,cAAc,GAAG;AACjC,QAAI;AACF,aAAO,KAAK,MAAM,WAAW,SAAS,GAAG,sBAAsB,OAAO,IAAI,SAAS,GAAG,EAAE;AAC1F,QAAI,CAAC,cAAc,SAAS,GAAG;AAC7B,aAAO,KAAK,MAAM,WAAW,SAAS,GAAG,yBAAyB,SAAS,GAAG,EAAE;AAClF,QAAI,OAAO,UAAU,YAAY,CAAC,MAAM,KAAK;AAC3C,aAAO,KAAK,MAAM,WAAW,SAAS,GAAG,+BAA+B,SAAS,GAAG,EAAE;AAAA,EAC1F;AACA,QAAM,WAAW,MAAM;AACvB,MACE,aAAa,WACZ,CAAC,IAAI,SAAS,QAAQ,KAAK,IAAI,IAAI,QAAQ,EAAE,aAAa;AAE3D,WAAO;AAAA,MACL;AAAA,MACA,IAAI,SAAS,QAAQ,IAAI,iBAAiB;AAAA,MAC1C;AAAA,MACA;AAAA,IACF;AACF,SAAO;AACT;AAEO,SAAS,UAAU,QAAkC;AAC1D,SAAO,CAAC,OAAO,KAAK,OAAO,WAAW,CAAC,CAAC,EAAE;AAAA,IACxC,CAAC,WAAW,OAAO,YAAY,MAAM;AAAA,EACvC;AACF;AAEA,SAAS,eAAe,MAAc,OAAoD;AACxF,QAAM,UAAU,UAAU,IAAI,CAAC,SAAS,IAAI,IAAI,GAAG,EAAE,KAAK,IAAI;AAC9D,MAAI,MAAM,aAAa,UAAa,CAAC,WAAW,MAAM,QAAQ;AAC5D,WAAO,KAAK,MAAM,WAAW,2BAA2B,OAAO,IAAI,UAAU;AAC/E,MAAI,MAAM,iBAAiB,OAAW,QAAO;AAC7C,MAAI,CAAC,SAAS,MAAM,YAAY;AAC9B,WAAO,KAAK,MAAM,WAAW,iDAAiD,cAAc;AAC9F,aAAW,CAAC,MAAM,QAAQ,KAAK,OAAO,QAAQ,MAAM,YAAY;AAC9D,QAAI,CAAC,WAAW,QAAQ;AACtB,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA,iBAAiB,IAAI,oBAAoB,OAAO;AAAA,QAChD,gBAAgB,IAAI;AAAA,MACtB;AACJ,SAAO;AACT;AAEA,SAAS,YAAY,MAAc,OAAoD;AACrF,MAAI,MAAM,YAAY,UAAa,OAAO,MAAM,YAAY;AAC1D,WAAO,KAAK,MAAM,WAAW,6BAA6B,SAAS;AACrE,MAAI,MAAM,gBAAgB,UAAa,OAAO,MAAM,gBAAgB;AAClE,WAAO,KAAK,MAAM,WAAW,gCAAgC,aAAa;AAC5E,MAAI,MAAM,YAAY,WAAc,OAAO,MAAM,YAAY,YAAY,EAAE,MAAM,UAAU;AACzF,WAAO,KAAK,MAAM,WAAW,gDAAgD,SAAS;AACxF,SAAO;AACT;AAEA,SAAS,eAAe,MAAc,OAAoD;AACxF,MAAI,MAAM,YAAY,UAAa,MAAM,SAAS;AAChD,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AACF,MAAI,MAAM,SAAS;AACjB,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AACF,MAAI,MAAM,SAAS,UAAa,MAAM,SAAS,UAAU,MAAM,SAAS;AACtE,WAAO,KAAK,MAAM,WAAW,4CAA4C,MAAM;AACjF,MAAI,OAAO,MAAM,QAAQ;AACvB,WAAO,KAAK,MAAM,WAAW,mCAAmC,KAAK;AACvE,MAAI,CAAC,IAAI,SAAS,MAAM,GAAG,KAAK,CAAC,YAAY,KAAK,IAAI,IAAI,MAAM,GAAG,EAAE,QAAQ;AAC3E,WAAO,KAAK,MAAM,WAAW,oCAAoC,KAAK;AACxE,QAAM,SAAS,UAAU,IAAI,IAAI,MAAM,GAAG,CAAC;AAC3C,MAAI;AACF,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,GAAG,MAAM;AAAA,MACT;AAAA,IACF;AACF,SAAO;AACT;AAEO,SAAS,eAAe,MAAc,KAAuB;AAClE,MAAI,CAAC,YAAY,KAAK,IAAI;AACxB,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,wBAAwB,IAAI;AAAA,IAC9B;AACF,MAAI,CAAC,SAAS,GAAG,EAAG,QAAO,KAAK,MAAM,cAAc,mBAAmB;AACvE,QAAM,QAAiC,EAAE,GAAG,KAAK,UAAU,MAAM,IAAI,QAAQ,EAAE;AAC/E,MAAI,IAAI,aAAa,OAAW,QAAO,MAAM;AAC7C,MAAI,SAAS,IAAI,YAAY;AAC3B,UAAM,eAAe,OAAO;AAAA,MAC1B,OAAO,QAAQ,IAAI,YAAY,EAAE,IAAI,CAAC,CAAC,MAAM,QAAQ,MAAM,CAAC,MAAM,MAAM,QAAQ,CAAC,CAAC;AAAA,IACpF;AACF,MAAI,MAAM,SAAS;AACjB,WAAO,KAAK,MAAM,WAAW,sCAAsC,MAAM;AAC3E,QAAM,UACJ,eAAe,MAAM,KAAK,KAC1B,aAAa,MAAM,MAAM,OAAO,KAChC,WAAW,MAAM,KAAK,KACtB,eAAe,MAAM,KAAK,KAC1B,YAAY,MAAM,KAAK;AACzB,MAAI,QAAS,QAAO;AACpB,QAAM,SAAkC,CAAC;AACzC,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,KAAK;AAC7C,QAAI,SAAS,IAAI,GAAG,KAAK,QAAQ,OAAQ,QAAO,GAAG,IAAI;AACzD,SAAO;AACT;AAEA,SAAS,UAAU,MAAsB;AACvC,SAAO,KAAK,QAAQ,MAAM,GAAG;AAC/B;AAEA,SAAS,OAAO,KAAsB;AACpC,QAAM,MAAM,SAAS,GAAG,IAAI,IAAI,MAAM;AACtC,SAAO,OAAO,QAAQ,YAAY,IAAI,SAAS,GAAG,IAAI,IAAI,IAAI,GAAG,EAAE,OAAO;AAC5E;AAEO,SAAS,eAAe,MAAqC;AAClE,MAAI,SAAS,UAAa,KAAK,KAAK,MAAM,GAAI,QAAO,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,GAAG,SAAS,CAAC,EAAE;AAC9F,MAAI;AACJ,MAAI;AACF,aAAS,KAAK,MAAM,IAAI;AAAA,EAC1B,SAAS,OAAO;AACd,WAAO;AAAA,MACL,SAAS,CAAC;AAAA,MACV,UAAU,CAAC,EAAE,SAAS,mBAAoB,MAAgB,OAAO,GAAG,CAAC;AAAA,MACrE,SAAS,CAAC;AAAA,IACZ;AAAA,EACF;AACA,MAAI,CAAC,SAAS,MAAM,KAAM,OAAO,eAAe,UAAa,CAAC,SAAS,OAAO,UAAU;AACtF,WAAO,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE,SAAS,+BAA+B,CAAC,GAAG,SAAS,CAAC,EAAE;AAC7F,QAAM,UAA4B,CAAC;AACnC,QAAM,WAA+B,CAAC;AACtC,QAAM,UAA8B,CAAC;AACrC,QAAM,OAAO,oBAAI,IAAY;AAC7B,QAAM,SAAS,CAAC,MAAc,KAAc,YAAoB;AAC9D,aAAS,KAAK,OAAO;AACrB,YAAQ,KAAK,EAAE,MAAM,MAAM,OAAO,GAAG,GAAG,MAAM,QAAQ,MAAM,QAAQ,QAAQ,QAAQ,CAAC;AAAA,EACvF;AACA,aAAW,CAAC,MAAM,GAAG,KAAK,OAAO,QAAS,OAAO,cAAc,CAAC,CAA6B,GAAG;AAC9F,UAAM,UAAU,eAAe,MAAM,GAAG;AACxC,QAAI,aAAa,SAAS;AACxB,aAAO,MAAM,KAAK,OAAO;AACzB;AAAA,IACF;AACA,QAAI,KAAK,IAAI,UAAU,IAAI,CAAC,GAAG;AAC7B,YAAM,OAAO;AACb,aAAO,MAAM,KAAK,KAAK,MAAM,aAAa,IAAI,CAAC;AAC/C;AAAA,IACF;AACA,SAAK,IAAI,UAAU,IAAI,CAAC;AACxB,YAAQ,KAAK,EAAE,MAAM,QAAQ,QAAQ,CAAC;AAAA,EACxC;AACA,SAAO,EAAE,SAAS,UAAU,QAAQ;AACtC;AAEA,SAAS,cAAc,SAAyB;AAC9C,QAAM,SAAS,QACZ,MAAM,GAAG,EACT,IAAI,CAAC,SAAS,KAAK,QAAQ,sBAAsB,MAAM,CAAC,EACxD,KAAK,IAAI;AACZ,SAAO,IAAI,OAAO,IAAI,MAAM,GAAG;AACjC;AAEO,SAAS,YAAY,SAAuD;AACjF,QAAM,QAAQ,IAAI,IAAI,QAAQ,OAAO,CAAC,UAAU,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC;AACrE,QAAM,WAAW,QAAQ,OAAO,CAAC,UAAU,MAAM,SAAS,GAAG,CAAC,EAAE,IAAI,aAAa;AACjF,SAAO,CAAC,SAAS,MAAM,IAAI,IAAI,KAAK,SAAS,KAAK,CAAC,YAAY,QAAQ,KAAK,IAAI,CAAC;AACnF;AAEO,SAAS,aAAa,QAAyB,MAA2B;AAC/E,QAAM,YAAY,OAAO,gBAAgB,CAAC;AAC1C,QAAM,QAAQ,UAAU,IAAI;AAC5B,MAAI,UAAU,OAAW,QAAO;AAChC,aAAW,CAAC,SAAS,QAAQ,KAAK,OAAO,QAAQ,SAAS;AACxD,QAAI,QAAQ,SAAS,GAAG,KAAK,cAAc,OAAO,EAAE,KAAK,IAAI,EAAG,QAAO;AACzE,SAAO,OAAO,YAAY;AAC5B;AAEO,SAAS,aAAa,QAAwB;AACnD,SAAO,QAAQ,UAAU,MAAM,CAAC;AAClC;AAEO,SAAS,YACd,QACA,MACA,QAAmC,MAAM,OACjC;AACR,QAAM,OAAO,QAAQ,MAAM,KAAK,IAAI,GAAG,QAAQ,kBAAkB,GAAG;AACpE,MAAI,KAAK,UAAU,iBAAiB,CAAC,MAAM,IAAI,EAAG,QAAO;AACzD,QAAM,SAAS,KAAK,GAAG,MAAM,KAAK,IAAI,EAAE,EAAE,SAAS,GAAG,GAAG,EAAE,MAAM,GAAG,CAAC;AACrE,SAAO,GAAG,KAAK,MAAM,GAAG,gBAAgB,OAAO,SAAS,CAAC,CAAC,IAAI,MAAM;AACtE;AAEO,SAAS,WAAW,GAAoB,GAA6B;AAC1E,SAAO,KAAK,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC;AAC/C;",
4
+ "sourcesContent": ["import { hash } from '../licks/sources.ts';\nimport type { McpRefusal, McpRefusalCode } from '../services.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 code?: McpRefusalCode;\n}\n\nexport interface McpRefusedServer extends McpRefusal {\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:\n 'SLICC registers dynamically, sends a client metadata document 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 COOKIE_PAIR = /^(?:[!#$%&'*+.^_`|~0-9A-Za-z-]+=)?(?:\\$\\{[A-Za-z_][A-Za-z0-9_]*\\})+$/;\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 if (header.toLowerCase() === 'cookie')\n return value.split(';').some((pair) => pair.trim() !== '' && !COOKIE_PAIR.test(pair.trim()));\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 Failed = McpConfigProblem & { code: McpRefusalCode };\ntype Checked = McpServerConfig | Failed;\n\nfunction fail(server: string, code: McpRefusalCode, message: string, field?: string): Failed {\n return { server, ...(field ? { field } : {}), message, code };\n}\n\nfunction checkHeaders(name: string, headers: unknown): Failed | undefined {\n if (headers === undefined) return undefined;\n if (!isRecord(headers) || !Object.values(headers).every((value) => typeof value === 'string'))\n return fail(name, 'invalid', '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 'invalid',\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 'header-secret',\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>): Failed | undefined {\n const { oauth } = value;\n if (oauth === undefined) return undefined;\n if (!isRecord(oauth)) return fail(name, 'invalid', 'oauth must be an object', 'oauth');\n if (Object.keys(value.headers ?? {}).some((header) => header.toLowerCase() === 'authorization'))\n return fail(name, 'invalid', '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)\n return fail(name, 'invalid', `oauth.${key} is not supported: ${refused}`, `oauth.${key}`);\n if (!OAUTH_STRINGS.includes(key))\n return fail(name, 'invalid', `oauth.${key} is not a known field`, `oauth.${key}`);\n if (typeof entry !== 'string' || !entry.trim())\n return fail(name, 'invalid', `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 URL.canParse(metadata) ? 'insecure-url' : 'bad-url',\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(name: string, value: Record<string, unknown>): Failed | undefined {\n const allowed = EXPOSURES.map((item) => `\"${item}\"`).join(', ');\n if (value.exposure !== undefined && !isExposure(value.exposure))\n return fail(name, 'invalid', `exposure must be one of ${allowed}`, 'exposure');\n if (value.toolExposure === undefined) return undefined;\n if (!isRecord(value.toolExposure))\n return fail(name, 'invalid', '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(\n name,\n 'invalid',\n `toolExposure \"${tool}\" must be one of ${allowed}`,\n `toolExposure.${tool}`\n );\n return undefined;\n}\n\nfunction checkFields(name: string, value: Record<string, unknown>): Failed | undefined {\n if (value.enabled !== undefined && typeof value.enabled !== 'boolean')\n return fail(name, 'invalid', 'enabled must be a boolean', 'enabled');\n if (value.description !== undefined && typeof value.description !== 'string')\n return fail(name, 'invalid', 'description must be a string', 'description');\n if (value.timeout !== undefined && (typeof value.timeout !== 'number' || !(value.timeout > 0)))\n return fail(name, 'invalid', 'timeout must be a positive number of seconds', 'timeout');\n return undefined;\n}\n\nfunction checkTransport(name: string, value: Record<string, unknown>): Failed | undefined {\n if (value.command !== undefined || value.type === 'stdio')\n return fail(\n name,\n 'stdio',\n 'stdio servers need slicc-kernel#68, so this one is skipped',\n 'command'\n );\n if (value.type === 'sse')\n return fail(\n name,\n 'sse',\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, 'invalid', 'type must be \"http\" or \"streamable-http\"', 'type');\n if (typeof value.url !== 'string')\n return fail(name, 'bad-url', 'needs a \"url\" (streamable HTTP)', 'url');\n if (!URL.canParse(value.url) || !/^https?:$/.test(new URL(value.url).protocol))\n return fail(name, 'bad-url', '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 'url-secret',\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(\n name,\n 'bad-name',\n `invalid server name \"${name}\" (use letters, digits, \"_\" and \"-\")`\n );\n if (!isRecord(raw)) return fail(name, 'not-object', '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)\n return fail(name, 'invalid', '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 const refuse = (name: string, raw: unknown, problem: Failed) => {\n problems.push(problem);\n refused.push({ name, host: hostOf(raw), code: problem.code, reason: problem.message });\n };\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 refuse(name, raw, checked);\n continue;\n }\n if (seen.has(canonical(name))) {\n const twin = 'names that differ only in \"-\" and \"_\" count as the same server';\n refuse(name, raw, fail(name, 'duplicate', twin));\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/net.js CHANGED
@@ -62,14 +62,16 @@ async function dropped(response) {
62
62
  await stream(response.body).cancel().catch(() => void 0);
63
63
  }
64
64
  const TELEMETRY = "x-stainless-";
65
- function untracked(request) {
66
- const telemetry = [...request.headers.keys()].filter((name) => name.startsWith(TELEMETRY));
67
- if (!telemetry.length) return request;
65
+ function headerList(request, input, init) {
68
66
  const headers = new Headers(request.headers);
69
- for (const name of telemetry) headers.delete(name);
70
- return new Request(request, { headers });
67
+ const given = init?.headers ?? (input instanceof Request ? input.headers : void 0);
68
+ for (const [name, value] of new Headers(given)) headers.set(name, value);
69
+ return [...headers];
71
70
  }
72
- async function carried(transport, request) {
71
+ function untracked(headers) {
72
+ return headers.filter(([name]) => !name.startsWith(TELEMETRY));
73
+ }
74
+ async function carried(transport, request, headers) {
73
75
  const manual = request.redirect === "manual";
74
76
  if (manual && !honorsManual(transport.traits)) return refused();
75
77
  const told = manual || request.redirect === "error" && transport.traits?.redirectPolicy === true;
@@ -77,7 +79,7 @@ async function carried(transport, request) {
77
79
  const response = await transport.fetch({
78
80
  url: request.url,
79
81
  method: request.method,
80
- headers: [...request.headers],
82
+ headers,
81
83
  ...body ? { body } : {},
82
84
  signal: request.signal,
83
85
  ...told ? { redirect: request.redirect } : {}
@@ -100,16 +102,19 @@ async function carried(transport, request) {
100
102
  }
101
103
  function transportFetch(transport, origin, native = globalThis.fetch.bind(globalThis), loopback) {
102
104
  return async (input, init) => {
103
- const request = untracked(new Request(input, init));
105
+ const given = new Request(input, init);
106
+ const headers = untracked(headerList(given, input, init));
107
+ const request = new Request(given, { headers });
104
108
  const port = kernelPort(request.url);
105
109
  if (loopback && port) return loopback(request, { port, signal: request.signal });
106
110
  if (request.redirect !== "manual" && (new URL(request.url).origin === origin || transport.traits?.unavailable || request.credentials === "include")) {
107
111
  return native(request);
108
112
  }
109
- return carried(transport, request);
113
+ return carried(transport, request, headers);
110
114
  };
111
115
  }
112
116
  export {
117
+ headerList,
113
118
  kernelPort,
114
119
  linkedExit,
115
120
  pageOnly,
package/dist/net.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/net.ts"],
4
- "sourcesContent": ["import { FACADE_PORT, kernelHost, ownKernelServer } from './kernel/loopback.ts';\n\nexport interface TransportResponse {\n url?: string;\n redirected?: boolean;\n redirects?: readonly unknown[];\n opaqueRedirect?: boolean;\n status: number;\n statusText?: string;\n headers: HeadersInit;\n body: AsyncIterable<Uint8Array>;\n}\n\nexport interface Transport {\n traits?: {\n crossOrigin?: 'cors' | 'any';\n manualRedirects?: boolean;\n redirectHops?: boolean;\n redirectPolicy?: boolean;\n unavailable?: boolean;\n exit?: TransportExit;\n };\n fetch(request: {\n url: string;\n method: string;\n headers: [string, string][];\n body?: Uint8Array;\n signal?: AbortSignal;\n redirect?: RequestRedirect;\n }): Promise<TransportResponse>;\n}\n\nexport interface TransportExit {\n kind: string;\n caps: string[];\n}\n\nexport function linkedExit(transport: Transport | undefined): TransportExit | undefined {\n const exit = transport?.traits?.exit;\n return typeof exit?.kind === 'string' ? exit : undefined;\n}\n\nexport function pageOnly(transport: Transport | undefined): boolean {\n return transport?.traits?.crossOrigin === 'cors' && !linkedExit(transport);\n}\n\nexport interface Reach {\n free(): boolean;\n onChange(listener: () => void): () => void;\n}\n\nexport function transportReach(client: {\n transport: Transport;\n onTraits?: (listener: () => void) => () => void;\n}): Reach {\n return {\n free: () => !client.transport.traits?.unavailable && !pageOnly(client.transport),\n onChange: (listener) => client.onTraits?.(() => listener()) ?? (() => undefined),\n };\n}\n\nexport type Loopback = (\n request: Request,\n options: { port: number; signal?: AbortSignal }\n) => Promise<Response>;\n\nconst empty = new Set([101, 103, 204, 205, 304]);\nconst redirects = new Set([301, 302, 303, 307, 308]);\nconst bare = (url: string) => url.split('#')[0];\n\nexport function kernelPort(url: string): number | undefined {\n const host = new URL(url).hostname.replace(/\\.+$/, '');\n if (!kernelHost(host)) return undefined;\n if (!ownKernelServer(host))\n throw new TypeError(\n `${host} isn't a kernel server SLICC may reach: use <port>.kernel.localhost with a port from 1 to 65535 other than ${FACADE_PORT}, the CDP facade`\n );\n return Number(host.split('.')[0]);\n}\n\nfunction stream(body: AsyncIterable<Uint8Array>): ReadableStream<Uint8Array> {\n const iterator = body[Symbol.asyncIterator]();\n return new ReadableStream({\n async pull(controller) {\n const next = await iterator.next();\n if (next.done) controller.close();\n else controller.enqueue(next.value);\n },\n async cancel() {\n await iterator.return?.();\n },\n });\n}\n\nconst UNPROVEN =\n \"this route can't show it won't follow a redirect, so a request that holds a credential isn't sent\";\n\nfunction honorsManual(traits: Transport['traits']): boolean {\n if (traits?.unavailable) return false;\n if (traits?.redirectPolicy === true) return true;\n const hops = traits?.redirectHops;\n return traits?.manualRedirects === true && (hops === undefined || hops === false);\n}\n\nfunction refused(): Response {\n return new Response(UNPROVEN, {\n status: 403,\n headers: { 'content-type': 'text/plain; charset=utf-8' },\n });\n}\n\nfunction opaque(): Response {\n const response = new Response(null, { status: 502 });\n Object.defineProperty(response, 'type', { value: 'opaqueredirect' });\n return response;\n}\n\nfunction followedBy(response: TransportResponse, url: string): boolean {\n return (\n !!response.redirected ||\n !!response.redirects?.length ||\n (!!response.url && bare(response.url) !== bare(url))\n );\n}\n\nasync function dropped(response: TransportResponse): Promise<void> {\n await stream(response.body)\n .cancel()\n .catch(() => undefined);\n}\n\nconst TELEMETRY = 'x-stainless-';\n\nfunction untracked(request: Request): Request {\n const telemetry = [...request.headers.keys()].filter((name) => name.startsWith(TELEMETRY));\n if (!telemetry.length) return request;\n const headers = new Headers(request.headers);\n for (const name of telemetry) headers.delete(name);\n return new Request(request, { headers });\n}\n\nasync function carried(transport: Transport, request: Request): Promise<Response> {\n const manual = request.redirect === 'manual';\n if (manual && !honorsManual(transport.traits)) return refused();\n const told =\n manual || (request.redirect === 'error' && transport.traits?.redirectPolicy === true);\n const body = ['GET', 'HEAD'].includes(request.method)\n ? undefined\n : new Uint8Array(await request.arrayBuffer());\n const response = await transport.fetch({\n url: request.url,\n method: request.method,\n headers: [...request.headers],\n ...(body ? { body } : {}),\n signal: request.signal,\n ...(told ? { redirect: request.redirect } : {}),\n });\n const followed = followedBy(response, request.url);\n const redirected =\n followed || (transport.traits?.manualRedirects && redirects.has(response.status));\n if ((request.redirect === 'error' && redirected) || (manual && followed)) {\n await dropped(response);\n throw new TypeError('unexpected redirect');\n }\n if (response.opaqueRedirect) {\n await dropped(response);\n return opaque();\n }\n return new Response(empty.has(response.status) ? null : stream(response.body), {\n status: response.status,\n statusText: response.statusText ?? '',\n headers: response.headers,\n });\n}\n\nexport function transportFetch(\n transport: Transport,\n origin: string,\n native: typeof fetch = globalThis.fetch.bind(globalThis),\n loopback?: Loopback\n): typeof fetch {\n return async (input, init) => {\n const request = untracked(new Request(input, init));\n const port = kernelPort(request.url);\n if (loopback && port) return loopback(request, { port, signal: request.signal });\n if (\n request.redirect !== 'manual' &&\n (new URL(request.url).origin === origin ||\n transport.traits?.unavailable ||\n request.credentials === 'include')\n ) {\n return native(request);\n }\n return carried(transport, request);\n };\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import { FACADE_PORT, kernelHost, ownKernelServer } from './kernel/loopback.ts';\n\nexport interface TransportResponse {\n url?: string;\n redirected?: boolean;\n redirects?: readonly unknown[];\n opaqueRedirect?: boolean;\n status: number;\n statusText?: string;\n headers: HeadersInit;\n body: AsyncIterable<Uint8Array>;\n}\n\nexport interface Transport {\n traits?: {\n crossOrigin?: 'cors' | 'any';\n manualRedirects?: boolean;\n redirectHops?: boolean;\n redirectPolicy?: boolean;\n unavailable?: boolean;\n exit?: TransportExit;\n };\n fetch(request: {\n url: string;\n method: string;\n headers: [string, string][];\n body?: Uint8Array;\n signal?: AbortSignal;\n redirect?: RequestRedirect;\n }): Promise<TransportResponse>;\n}\n\nexport interface TransportExit {\n kind: string;\n caps: string[];\n}\n\nexport function linkedExit(transport: Transport | undefined): TransportExit | undefined {\n const exit = transport?.traits?.exit;\n return typeof exit?.kind === 'string' ? exit : undefined;\n}\n\nexport function pageOnly(transport: Transport | undefined): boolean {\n return transport?.traits?.crossOrigin === 'cors' && !linkedExit(transport);\n}\n\nexport interface Reach {\n free(): boolean;\n onChange(listener: () => void): () => void;\n}\n\nexport function transportReach(client: {\n transport: Transport;\n onTraits?: (listener: () => void) => () => void;\n}): Reach {\n return {\n free: () => !client.transport.traits?.unavailable && !pageOnly(client.transport),\n onChange: (listener) => client.onTraits?.(() => listener()) ?? (() => undefined),\n };\n}\n\nexport type Loopback = (\n request: Request,\n options: { port: number; signal?: AbortSignal }\n) => Promise<Response>;\n\nconst empty = new Set([101, 103, 204, 205, 304]);\nconst redirects = new Set([301, 302, 303, 307, 308]);\nconst bare = (url: string) => url.split('#')[0];\n\nexport function kernelPort(url: string): number | undefined {\n const host = new URL(url).hostname.replace(/\\.+$/, '');\n if (!kernelHost(host)) return undefined;\n if (!ownKernelServer(host))\n throw new TypeError(\n `${host} isn't a kernel server SLICC may reach: use <port>.kernel.localhost with a port from 1 to 65535 other than ${FACADE_PORT}, the CDP facade`\n );\n return Number(host.split('.')[0]);\n}\n\nfunction stream(body: AsyncIterable<Uint8Array>): ReadableStream<Uint8Array> {\n const iterator = body[Symbol.asyncIterator]();\n return new ReadableStream({\n async pull(controller) {\n const next = await iterator.next();\n if (next.done) controller.close();\n else controller.enqueue(next.value);\n },\n async cancel() {\n await iterator.return?.();\n },\n });\n}\n\nconst UNPROVEN =\n \"this route can't show it won't follow a redirect, so a request that holds a credential isn't sent\";\n\nfunction honorsManual(traits: Transport['traits']): boolean {\n if (traits?.unavailable) return false;\n if (traits?.redirectPolicy === true) return true;\n const hops = traits?.redirectHops;\n return traits?.manualRedirects === true && (hops === undefined || hops === false);\n}\n\nfunction refused(): Response {\n return new Response(UNPROVEN, {\n status: 403,\n headers: { 'content-type': 'text/plain; charset=utf-8' },\n });\n}\n\nfunction opaque(): Response {\n const response = new Response(null, { status: 502 });\n Object.defineProperty(response, 'type', { value: 'opaqueredirect' });\n return response;\n}\n\nfunction followedBy(response: TransportResponse, url: string): boolean {\n return (\n !!response.redirected ||\n !!response.redirects?.length ||\n (!!response.url && bare(response.url) !== bare(url))\n );\n}\n\nasync function dropped(response: TransportResponse): Promise<void> {\n await stream(response.body)\n .cancel()\n .catch(() => undefined);\n}\n\nconst TELEMETRY = 'x-stainless-';\n\nexport type HeaderList = [string, string][];\n\nexport function headerList(\n request: Request,\n input: RequestInfo | URL,\n init?: RequestInit\n): HeaderList {\n const headers = new Headers(request.headers);\n const given = init?.headers ?? (input instanceof Request ? input.headers : undefined);\n for (const [name, value] of new Headers(given)) headers.set(name, value);\n return [...headers];\n}\n\nfunction untracked(headers: HeaderList): HeaderList {\n return headers.filter(([name]) => !name.startsWith(TELEMETRY));\n}\n\nasync function carried(\n transport: Transport,\n request: Request,\n headers: HeaderList\n): Promise<Response> {\n const manual = request.redirect === 'manual';\n if (manual && !honorsManual(transport.traits)) return refused();\n const told =\n manual || (request.redirect === 'error' && transport.traits?.redirectPolicy === true);\n const body = ['GET', 'HEAD'].includes(request.method)\n ? undefined\n : new Uint8Array(await request.arrayBuffer());\n const response = await transport.fetch({\n url: request.url,\n method: request.method,\n headers,\n ...(body ? { body } : {}),\n signal: request.signal,\n ...(told ? { redirect: request.redirect } : {}),\n });\n const followed = followedBy(response, request.url);\n const redirected =\n followed || (transport.traits?.manualRedirects && redirects.has(response.status));\n if ((request.redirect === 'error' && redirected) || (manual && followed)) {\n await dropped(response);\n throw new TypeError('unexpected redirect');\n }\n if (response.opaqueRedirect) {\n await dropped(response);\n return opaque();\n }\n return new Response(empty.has(response.status) ? null : stream(response.body), {\n status: response.status,\n statusText: response.statusText ?? '',\n headers: response.headers,\n });\n}\n\nexport function transportFetch(\n transport: Transport,\n origin: string,\n native: typeof fetch = globalThis.fetch.bind(globalThis),\n loopback?: Loopback\n): typeof fetch {\n return async (input, init) => {\n const given = new Request(input, init);\n const headers = untracked(headerList(given, input, init));\n const request = new Request(given, { headers });\n const port = kernelPort(request.url);\n if (loopback && port) return loopback(request, { port, signal: request.signal });\n if (\n request.redirect !== 'manual' &&\n (new URL(request.url).origin === origin ||\n transport.traits?.unavailable ||\n request.credentials === 'include')\n ) {\n return native(request);\n }\n return carried(transport, request, headers);\n };\n}\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
@@ -1,3 +1,4 @@
1
+ import { headerList } from "../net.js";
1
2
  import { VaultRefusal } from "./vault.js";
2
3
  const BODYLESS = /* @__PURE__ */ new Set(["GET", "HEAD"]);
3
4
  const MIN_PART = 8;
@@ -12,12 +13,12 @@ const BODY_HEADERS = /* @__PURE__ */ new Set([
12
13
  function absent(vault) {
13
14
  return !vault.connected && !vault.needed;
14
15
  }
15
- async function outgoing(request) {
16
+ async function outgoing(request, headers) {
16
17
  const body = BODYLESS.has(request.method) ? void 0 : new Uint8Array(await request.arrayBuffer());
17
18
  return {
18
19
  method: request.method,
19
20
  url: request.url,
20
- headers: [...request.headers],
21
+ headers,
21
22
  ...body ? { body } : {}
22
23
  };
23
24
  }
@@ -96,8 +97,8 @@ function unfollowed(url) {
96
97
  )
97
98
  );
98
99
  }
99
- async function through(op, inner, request) {
100
- let current = await outgoing(request);
100
+ async function through(op, inner, request, headers) {
101
+ let current = await outgoing(request, headers);
101
102
  let refreshed = false;
102
103
  let hops = 0;
103
104
  for (; ; ) {
@@ -130,8 +131,9 @@ async function through(op, inner, request) {
130
131
  function vaultFetch(vault, inner, route, rejecting = () => () => void 0) {
131
132
  return async (input, init) => {
132
133
  const request = new Request(input, init);
134
+ const headers = headerList(request, input, init);
133
135
  const provider = absent(vault) ? void 0 : route(request);
134
- if (provider === void 0) return inner(request);
136
+ if (provider === void 0) return inner(request, { headers });
135
137
  const target = provider === null ? void 0 : { provider };
136
138
  const rejected = provider === null ? void 0 : rejecting(provider);
137
139
  const response = await through(
@@ -140,7 +142,8 @@ function vaultFetch(vault, inner, route, rejecting = () => () => void 0) {
140
142
  ...target ? { refresh: () => vault.refresh(target) } : {}
141
143
  },
142
144
  inner,
143
- request
145
+ request,
146
+ headers
144
147
  );
145
148
  if (response.status === 401) rejected?.();
146
149
  return response;
@@ -148,15 +151,16 @@ function vaultFetch(vault, inner, route, rejecting = () => () => void 0) {
148
151
  }
149
152
  function mcpFetch(vault, inner, server) {
150
153
  return async (input, init) => {
154
+ if (absent(vault)) return inner(input, init);
151
155
  const request = new Request(input, init);
152
- if (absent(vault)) return inner(request);
153
156
  return through(
154
157
  {
155
158
  prepare: (outgoing2) => vault.mcp(server, outgoing2),
156
159
  refresh: () => vault.refresh({ server })
157
160
  },
158
161
  inner,
159
- request
162
+ request,
163
+ headerList(request, input, init)
160
164
  );
161
165
  };
162
166
  }
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/secrets/fetch.ts"],
4
- "sourcesContent": ["import type { OAuthConfig, OutgoingRequest } from '@ai-ecoverse/slicc-vault';\nimport { type RefreshTarget, type Vault, VaultRefusal } from './vault.ts';\n\ntype Fetch = typeof fetch;\n\ntype Port = Pick<Vault, 'connected' | 'needed' | 'model' | 'mcp' | 'refresh' | 'grant'>;\n\nexport type ModelRoute = (request: Request) => string | null | undefined;\n\ninterface Op {\n prepare(request: OutgoingRequest): Promise<OutgoingRequest>;\n refresh?(): Promise<unknown>;\n}\n\nconst BODYLESS = new Set(['GET', 'HEAD']);\nconst MIN_PART = 8;\nconst HOPS = 5;\nconst MOVED = new Set([301, 302, 303, 307, 308]);\nconst BODY_HEADERS = new Set([\n 'content-encoding',\n 'content-language',\n 'content-location',\n 'content-type',\n]);\n\nexport function absent(vault: Pick<Vault, 'connected' | 'needed'>): boolean {\n return !vault.connected && !vault.needed;\n}\n\nasync function outgoing(request: Request): Promise<OutgoingRequest> {\n const body = BODYLESS.has(request.method)\n ? undefined\n : new Uint8Array(await request.arrayBuffer());\n return {\n method: request.method,\n url: request.url,\n headers: [...request.headers],\n ...(body ? { body } : {}),\n };\n}\n\nexport function refusal(error: unknown): Response {\n const code = error instanceof VaultRefusal ? error.code : undefined;\n const status = code === 'EACCES' ? 403 : code === 'EINVAL' ? 400 : 503;\n const text = error instanceof Error ? error.message : String(error);\n return new Response(text, {\n status,\n headers: { 'content-type': 'text/plain; charset=utf-8' },\n });\n}\n\nasync function prepared(op: Op, request: OutgoingRequest): Promise<OutgoingRequest> {\n try {\n return await op.prepare(request);\n } catch (error) {\n if (error instanceof VaultRefusal && error.code === 'EAGAIN') return op.prepare(request);\n throw error;\n }\n}\n\nfunction added(original: OutgoingRequest, ready: OutgoingRequest): string[] {\n const sent = new Set(original.headers.map(([, value]) => value));\n return ready.headers.map(([, value]) => value).filter((value) => !sent.has(value));\n}\n\nfunction filled(original: OutgoingRequest, ready: OutgoingRequest): string[] {\n const values = added(original, ready);\n if (ready.url !== original.url) values.push(ready.url, decodeURIComponent(ready.url));\n return values.flatMap((value) => [\n value,\n ...value.split(/[\\s=&?]+/).filter((part) => part.length >= MIN_PART),\n ]);\n}\n\nexport function safeError(error: unknown, original: OutgoingRequest, ready: OutgoingRequest) {\n if (\n error instanceof DOMException &&\n (error.name === 'AbortError' || error.name === 'TimeoutError')\n )\n return error;\n const text = error instanceof Error ? error.message : String(error);\n const parts = filled(original, ready);\n const shown = parts.some((part) => text.includes(part)) ? 'the request failed' : text;\n return new TypeError(`${ready.method} ${new URL(ready.url).origin}: ${shown}`);\n}\n\nasync function sent(\n inner: Fetch,\n request: Request,\n original: OutgoingRequest,\n ready: OutgoingRequest,\n redirect: RequestRedirect\n) {\n const init: RequestInit = {\n method: ready.method,\n headers: ready.headers,\n signal: request.signal,\n redirect,\n credentials: request.credentials,\n ...(ready.body === undefined ? {} : { body: ready.body as BodyInit }),\n };\n try {\n return await inner(ready.url, init);\n } catch (error) {\n throw safeError(error, original, ready);\n }\n}\n\nfunction moved(response: Response): boolean {\n return (\n response.type === 'opaqueredirect' ||\n (MOVED.has(response.status) && response.headers.has('location'))\n );\n}\n\nfunction followed(current: OutgoingRequest, response: Response): OutgoingRequest | undefined {\n if (response.type === 'opaqueredirect') return undefined;\n const target = URL.parse(response.headers.get('location') as string, current.url);\n if (target?.origin !== new URL(current.url).origin || target.username || target.password)\n return undefined;\n const { body, ...head } = current;\n const toGet =\n response.status === 303\n ? !BODYLESS.has(current.method)\n : response.status < 303 && current.method === 'POST';\n if (!toGet) return { ...current, url: target.href };\n const headers = current.headers.filter(([name]) => !BODY_HEADERS.has(name.toLowerCase()));\n return { ...head, method: 'GET', url: target.href, headers };\n}\n\nfunction unfollowed(url: string): Response {\n const { origin } = new URL(url);\n return refusal(\n new VaultRefusal(\n 'EACCES',\n `${origin} redirected a request that holds a credential, so it wasn't followed`\n )\n );\n}\n\nasync function through(op: Op, inner: Fetch, request: Request): Promise<Response> {\n let current = await outgoing(request);\n let refreshed = false;\n let hops = 0;\n for (;;) {\n let ready: OutgoingRequest;\n try {\n ready = await prepared(op, current);\n } catch (error) {\n return refusal(error);\n }\n const held =\n request.redirect === 'manual' || ready.url !== current.url || !!added(current, ready).length;\n const response = await sent(inner, request, current, ready, held ? 'manual' : request.redirect);\n if (held && moved(response)) {\n await response.body?.cancel().catch(() => undefined);\n const next = hops < HOPS ? followed(current, response) : undefined;\n if (!next) return unfollowed(current.url);\n current = next;\n hops += 1;\n continue;\n }\n if (response.status !== 401 || refreshed || !op.refresh) return response;\n refreshed = true;\n if (\n !(await op.refresh().then(\n () => true,\n () => false\n ))\n )\n return response;\n await response.body?.cancel().catch(() => undefined);\n }\n}\n\nexport function vaultFetch(\n vault: Port,\n inner: Fetch,\n route: ModelRoute,\n rejecting: (provider: string) => () => void = () => () => undefined\n): Fetch {\n return async (input, init) => {\n const request = new Request(input, init);\n const provider = absent(vault) ? undefined : route(request);\n if (provider === undefined) return inner(request);\n const target: RefreshTarget | undefined = provider === null ? undefined : { provider };\n const rejected = provider === null ? undefined : rejecting(provider);\n const response = await through(\n {\n prepare: (outgoing) => vault.model(provider ?? undefined, outgoing),\n ...(target ? { refresh: () => vault.refresh(target) } : {}),\n },\n inner,\n request\n );\n if (response.status === 401) rejected?.();\n return response;\n };\n}\n\nexport function mcpFetch(vault: Port, inner: Fetch, server: string): Fetch {\n return async (input, init) => {\n const request = new Request(input, init);\n if (absent(vault)) return inner(request);\n return through(\n {\n prepare: (outgoing) => vault.mcp(server, outgoing),\n refresh: () => vault.refresh({ server }),\n },\n inner,\n request\n );\n };\n}\n\nexport const NO_VAULT_SIGN_IN = \"MCP sign-in needs seven's vault: update seven\";\n\nfunction oauthOf(url: string, params: URLSearchParams): OAuthConfig {\n const scope = params.get('scope');\n const resource = params.get('resource');\n return {\n tokenUrl: url,\n clientId: params.get('client_id') ?? '',\n ...(scope ? { scope } : {}),\n ...(resource ? { resource } : {}),\n };\n}\n\nexport function grantFetch(vault: Port, server: string, base: Fetch): Fetch {\n return async (input, init) => {\n const request = new Request(input, init);\n const params =\n request.method === 'POST' ? new URLSearchParams(await request.clone().text()) : undefined;\n if (params?.get('grant_type') !== 'authorization_code') return base(request);\n if (absent(vault)) throw new Error(NO_VAULT_SIGN_IN);\n const response = await base(new Request(request, { redirect: 'manual' }));\n if (!response.ok) return response;\n const raw = new Uint8Array(await response.arrayBuffer());\n try {\n const granted = await vault.grant(server, raw, oauthOf(request.url, params));\n return new Response(granted.response as BodyInit, {\n status: response.status,\n headers: { 'content-type': 'application/json' },\n });\n } catch (error) {\n throw new Error(\n `the vault didn't keep the sign-in: ${error instanceof Error ? error.message : String(error)}`\n );\n } finally {\n raw.fill(0);\n }\n };\n}\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["import type { OAuthConfig, OutgoingRequest } from '@ai-ecoverse/slicc-vault';\nimport { type HeaderList, headerList } from '../net.ts';\nimport { type RefreshTarget, type Vault, VaultRefusal } from './vault.ts';\n\ntype Fetch = typeof fetch;\n\ntype Port = Pick<Vault, 'connected' | 'needed' | 'model' | 'mcp' | 'refresh' | 'grant'>;\n\nexport type ModelRoute = (request: Request) => string | null | undefined;\n\ninterface Op {\n prepare(request: OutgoingRequest): Promise<OutgoingRequest>;\n refresh?(): Promise<unknown>;\n}\n\nconst BODYLESS = new Set(['GET', 'HEAD']);\nconst MIN_PART = 8;\nconst HOPS = 5;\nconst MOVED = new Set([301, 302, 303, 307, 308]);\nconst BODY_HEADERS = new Set([\n 'content-encoding',\n 'content-language',\n 'content-location',\n 'content-type',\n]);\n\nexport function absent(vault: Pick<Vault, 'connected' | 'needed'>): boolean {\n return !vault.connected && !vault.needed;\n}\n\nasync function outgoing(request: Request, headers: HeaderList): Promise<OutgoingRequest> {\n const body = BODYLESS.has(request.method)\n ? undefined\n : new Uint8Array(await request.arrayBuffer());\n return {\n method: request.method,\n url: request.url,\n headers,\n ...(body ? { body } : {}),\n };\n}\n\nexport function refusal(error: unknown): Response {\n const code = error instanceof VaultRefusal ? error.code : undefined;\n const status = code === 'EACCES' ? 403 : code === 'EINVAL' ? 400 : 503;\n const text = error instanceof Error ? error.message : String(error);\n return new Response(text, {\n status,\n headers: { 'content-type': 'text/plain; charset=utf-8' },\n });\n}\n\nasync function prepared(op: Op, request: OutgoingRequest): Promise<OutgoingRequest> {\n try {\n return await op.prepare(request);\n } catch (error) {\n if (error instanceof VaultRefusal && error.code === 'EAGAIN') return op.prepare(request);\n throw error;\n }\n}\n\nfunction added(original: OutgoingRequest, ready: OutgoingRequest): string[] {\n const sent = new Set(original.headers.map(([, value]) => value));\n return ready.headers.map(([, value]) => value).filter((value) => !sent.has(value));\n}\n\nfunction filled(original: OutgoingRequest, ready: OutgoingRequest): string[] {\n const values = added(original, ready);\n if (ready.url !== original.url) values.push(ready.url, decodeURIComponent(ready.url));\n return values.flatMap((value) => [\n value,\n ...value.split(/[\\s=&?]+/).filter((part) => part.length >= MIN_PART),\n ]);\n}\n\nexport function safeError(error: unknown, original: OutgoingRequest, ready: OutgoingRequest) {\n if (\n error instanceof DOMException &&\n (error.name === 'AbortError' || error.name === 'TimeoutError')\n )\n return error;\n const text = error instanceof Error ? error.message : String(error);\n const parts = filled(original, ready);\n const shown = parts.some((part) => text.includes(part)) ? 'the request failed' : text;\n return new TypeError(`${ready.method} ${new URL(ready.url).origin}: ${shown}`);\n}\n\nasync function sent(\n inner: Fetch,\n request: Request,\n original: OutgoingRequest,\n ready: OutgoingRequest,\n redirect: RequestRedirect\n) {\n const init: RequestInit = {\n method: ready.method,\n headers: ready.headers,\n signal: request.signal,\n redirect,\n credentials: request.credentials,\n ...(ready.body === undefined ? {} : { body: ready.body as BodyInit }),\n };\n try {\n return await inner(ready.url, init);\n } catch (error) {\n throw safeError(error, original, ready);\n }\n}\n\nfunction moved(response: Response): boolean {\n return (\n response.type === 'opaqueredirect' ||\n (MOVED.has(response.status) && response.headers.has('location'))\n );\n}\n\nfunction followed(current: OutgoingRequest, response: Response): OutgoingRequest | undefined {\n if (response.type === 'opaqueredirect') return undefined;\n const target = URL.parse(response.headers.get('location') as string, current.url);\n if (target?.origin !== new URL(current.url).origin || target.username || target.password)\n return undefined;\n const { body, ...head } = current;\n const toGet =\n response.status === 303\n ? !BODYLESS.has(current.method)\n : response.status < 303 && current.method === 'POST';\n if (!toGet) return { ...current, url: target.href };\n const headers = current.headers.filter(([name]) => !BODY_HEADERS.has(name.toLowerCase()));\n return { ...head, method: 'GET', url: target.href, headers };\n}\n\nfunction unfollowed(url: string): Response {\n const { origin } = new URL(url);\n return refusal(\n new VaultRefusal(\n 'EACCES',\n `${origin} redirected a request that holds a credential, so it wasn't followed`\n )\n );\n}\n\nasync function through(\n op: Op,\n inner: Fetch,\n request: Request,\n headers: HeaderList\n): Promise<Response> {\n let current = await outgoing(request, headers);\n let refreshed = false;\n let hops = 0;\n for (;;) {\n let ready: OutgoingRequest;\n try {\n ready = await prepared(op, current);\n } catch (error) {\n return refusal(error);\n }\n const held =\n request.redirect === 'manual' || ready.url !== current.url || !!added(current, ready).length;\n const response = await sent(inner, request, current, ready, held ? 'manual' : request.redirect);\n if (held && moved(response)) {\n await response.body?.cancel().catch(() => undefined);\n const next = hops < HOPS ? followed(current, response) : undefined;\n if (!next) return unfollowed(current.url);\n current = next;\n hops += 1;\n continue;\n }\n if (response.status !== 401 || refreshed || !op.refresh) return response;\n refreshed = true;\n if (\n !(await op.refresh().then(\n () => true,\n () => false\n ))\n )\n return response;\n await response.body?.cancel().catch(() => undefined);\n }\n}\n\nexport function vaultFetch(\n vault: Port,\n inner: Fetch,\n route: ModelRoute,\n rejecting: (provider: string) => () => void = () => () => undefined\n): Fetch {\n return async (input, init) => {\n const request = new Request(input, init);\n const headers = headerList(request, input, init);\n const provider = absent(vault) ? undefined : route(request);\n if (provider === undefined) return inner(request, { headers });\n const target: RefreshTarget | undefined = provider === null ? undefined : { provider };\n const rejected = provider === null ? undefined : rejecting(provider);\n const response = await through(\n {\n prepare: (outgoing) => vault.model(provider ?? undefined, outgoing),\n ...(target ? { refresh: () => vault.refresh(target) } : {}),\n },\n inner,\n request,\n headers\n );\n if (response.status === 401) rejected?.();\n return response;\n };\n}\n\nexport function mcpFetch(vault: Port, inner: Fetch, server: string): Fetch {\n return async (input, init) => {\n if (absent(vault)) return inner(input, init);\n const request = new Request(input, init);\n return through(\n {\n prepare: (outgoing) => vault.mcp(server, outgoing),\n refresh: () => vault.refresh({ server }),\n },\n inner,\n request,\n headerList(request, input, init)\n );\n };\n}\n\nexport const NO_VAULT_SIGN_IN = \"MCP sign-in needs seven's vault: update seven\";\n\nfunction oauthOf(url: string, params: URLSearchParams): OAuthConfig {\n const scope = params.get('scope');\n const resource = params.get('resource');\n return {\n tokenUrl: url,\n clientId: params.get('client_id') ?? '',\n ...(scope ? { scope } : {}),\n ...(resource ? { resource } : {}),\n };\n}\n\nexport function grantFetch(vault: Port, server: string, base: Fetch): Fetch {\n return async (input, init) => {\n const request = new Request(input, init);\n const params =\n request.method === 'POST' ? new URLSearchParams(await request.clone().text()) : undefined;\n if (params?.get('grant_type') !== 'authorization_code') return base(request);\n if (absent(vault)) throw new Error(NO_VAULT_SIGN_IN);\n const response = await base(new Request(request, { redirect: 'manual' }));\n if (!response.ok) return response;\n const raw = new Uint8Array(await response.arrayBuffer());\n try {\n const granted = await vault.grant(server, raw, oauthOf(request.url, params));\n return new Response(granted.response as BodyInit, {\n status: response.status,\n headers: { 'content-type': 'application/json' },\n });\n } catch (error) {\n throw new Error(\n `the vault didn't keep the sign-in: ${error instanceof Error ? error.message : String(error)}`\n );\n } finally {\n raw.fill(0);\n }\n };\n}\n"],
5
+ "mappings": "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",
6
6
  "names": ["sent", "outgoing"]
7
7
  }
@@ -45,4 +45,6 @@ export type Loopback = (request: Request, options: {
45
45
  signal?: AbortSignal;
46
46
  }) => Promise<Response>;
47
47
  export declare function kernelPort(url: string): number | undefined;
48
+ export type HeaderList = [string, string][];
49
+ export declare function headerList(request: Request, input: RequestInfo | URL, init?: RequestInit): HeaderList;
48
50
  export declare function transportFetch(transport: Transport, origin: string, native?: typeof fetch, loopback?: Loopback): typeof fetch;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ai-ecoverse/slicc-agent",
3
- "version": "7.28.3",
3
+ "version": "7.28.4",
4
4
  "description": "SLICC's agent core on pi durable: an agent worker, session storage, remoting and pi extensions",
5
5
  "type": "module",
6
6
  "license": "Apache-2.0",