@spunto/build 0.20.4 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spunto/build",
-  "version": "0.20.4",
+  "version": "0.21.0",
   "description": "Spunto's shared Build engine — the devcontainer image protocol and VS Code extension registry clients, with no database, no HTTP framework and no UI.",
   "type": "module",
   "license": "MIT",

package/src/agent-runners/catalogs.ts

@@ -47,6 +47,15 @@ export type AgentCatalog = {
 /** The variable a task's chosen parameters reach the runner in, as one JSON object. */
 export const OPTIONS_ENV = "SPUNTO_AGENT_OPTIONS"
 
+/**
+ * The variable the org's MCP servers reach the runner in (RFC 0049): a JSON array of
+ * `{ name, path }`, `path` being the platform's gateway for that server, resolved by the runner
+ * against `SPUNTO_API_URL` and called with `SPUNTO_WORKER_TOKEN`. No vendor token, no harness shape.
+ */
+export const MCP_ENV = "SPUNTO_AGENT_MCP"
+
+export type AgentMcpServer = { name: string; path: string }
+
 const CLAUDE_EFFORT: AgentParamValue[] = [
   { value: "low", label: "Low" },
   { value: "medium", label: "Medium" },

package/src/agent-runners/claude.mjs

@@ -13,6 +13,9 @@
 //           adapter it already had (`claude-runner`)
 //   env     SPUNTO_AGENT_OPTIONS — the task's parameters, as declared by the app's catalog
 //           (`./catalogs.ts`): `{"effort":"high"}`
+//           SPUNTO_AGENT_MCP — the org's MCP servers (RFC 0049), in the platform's words:
+//           `[{"name":"linear","path":"/api/mcp-gateway/…"}]`, reached through the platform's
+//           gateway with the machine's own identity (`SPUNTO_WORKER_TOKEN`)
 //   exit    0 once the input is closed and the last turn is over, 1 when the session could not run
 //
 // Credentials are not this file's business: whatever the member set as secrets (an
@@ -90,6 +93,30 @@ function readOptions() {
 }
 const params = readOptions()
 
+/**
+ * The org's MCP servers (RFC 0049), as the SDK's `mcpServers`. Each is the platform's gateway, not
+ * the vendor's server: the machine shows its own identity and never holds the vendor's token. One
+ * that can't be reached (no API URL, no identity) is left out rather than failing the session.
+ */
+function readMcpServers() {
+  let listed
+  try {
+    listed = JSON.parse(process.env.SPUNTO_AGENT_MCP || "[]")
+  } catch {
+    return {}
+  }
+  const api = (process.env.SPUNTO_API_URL || "").replace(/\/$/, "")
+  const token = process.env.SPUNTO_WORKER_TOKEN
+  if (!Array.isArray(listed) || !api || !token) return {}
+  const servers = {}
+  for (const s of listed) {
+    if (!s || typeof s.name !== "string" || typeof s.path !== "string") continue
+    servers[s.name] = { type: "http", url: `${api}${s.path}`, headers: { Authorization: `Bearer ${token}` } }
+  }
+  return servers
+}
+const mcpServers = readMcpServers()
+
 let sdk
 try {
   sdk = await import(SDK)
@@ -105,6 +132,8 @@ const session = sdk.query({
     ...(args.model ? { model: args.model } : {}),
     ...(args.resume ? { resume: args.resume } : {}),
     ...(typeof params.effort === "string" ? { effort: params.effort } : {}),
+    // Added to the servers Claude Code reads from its settings (`.mcp.json`, `~/.claude.json`).
+    ...(Object.keys(mcpServers).length ? { mcpServers } : {}),
     // A task runs unattended in a disposable machine — what `--dangerously-skip-permissions` did.
     permissionMode: "bypassPermissions",
     allowDangerouslySkipPermissions: true,

package/src/agent-runners/codex.mjs

@@ -6,6 +6,7 @@
 //   stdin   {"type":"user","text"} · {"type":"interrupt","id"} · {"type":"title",…} (ignored: Codex
 //           does not name its threads) ; closed = the session ends after its turn
 //   stdout  the SDK's `ThreadEvent`s, one per line (`codex-runner` in the platform's adapters)
+//   env     SPUNTO_AGENT_MCP — the org's MCP servers, through the platform's gateway (RFC 0049)
 //   env     SPUNTO_AGENT_OPTIONS — the task's parameters (`./catalogs.ts`):
 //           `{"reasoningEffort":"high","webSearch":"live"}`
 //   exit    0 once the input is closed and the last turn is over, 1 when the session could not run
@@ -59,6 +60,29 @@ function readOptions() {
 }
 const params = readOptions()
 
+/**
+ * The org's MCP servers (RFC 0049), as Codex's `mcp_servers` config. Each is the platform's
+ * gateway: Codex reads the machine's identity from `SPUNTO_WORKER_TOKEN` itself
+ * (`bearer_token_env_var`), and never holds the vendor's token.
+ */
+function readMcpServers() {
+  let listed
+  try {
+    listed = JSON.parse(process.env.SPUNTO_AGENT_MCP || "[]")
+  } catch {
+    return {}
+  }
+  const api = (process.env.SPUNTO_API_URL || "").replace(/\/$/, "")
+  if (!Array.isArray(listed) || !api || !process.env.SPUNTO_WORKER_TOKEN) return {}
+  const servers = {}
+  for (const s of listed) {
+    if (!s || typeof s.name !== "string" || typeof s.path !== "string") continue
+    servers[s.name] = { url: `${api}${s.path}`, bearer_token_env_var: "SPUNTO_WORKER_TOKEN" }
+  }
+  return servers
+}
+const mcpServers = readMcpServers()
+
 let sdk
 try {
   sdk = await import(SDK)
@@ -67,7 +91,10 @@ try {
 }
 
 const apiKey = process.env.OPENAI_API_KEY || process.env.CODEX_API_KEY
-const codex = new sdk.Codex(apiKey ? { apiKey } : {})
+const codex = new sdk.Codex({
+  ...(apiKey ? { apiKey } : {}),
+  ...(Object.keys(mcpServers).length ? { config: { mcp_servers: mcpServers } } : {}),
+})
 const threadOptions = {
   workingDirectory: process.cwd(),
   ...(args.model ? { model: args.model } : {}),

package/src/agent-runners/index.ts

@@ -91,5 +91,5 @@ export function harnessOfFeature(featureId: string): AgentHarness | null {
 }
 
 export { AGENT_FEATURE_SCRIPTS, AGENT_HOME, AGENT_NODE_VERSION } from "./features"
-export { AGENT_CATALOGS, OPTIONS_ENV, agentOptionsError } from "./catalogs"
-export type { AgentCatalog, AgentModel, AgentParam, AgentParamValue } from "./catalogs"
+export { AGENT_CATALOGS, MCP_ENV, OPTIONS_ENV, agentOptionsError } from "./catalogs"
+export type { AgentCatalog, AgentMcpServer, AgentModel, AgentParam, AgentParamValue } from "./catalogs"

package/src/script/local-features.ts

@@ -23,9 +23,10 @@ echo "[feature] google-cloud-cli: installing..."
 apt-get update -y -qq
 apt-get install -y -qq apt-transport-https ca-certificates gnupg curl
 
-# Modern apt key setup (no deprecated apt-key)
+# Modern apt key setup (no deprecated apt-key). --batch --yes: a recipe re-baked in place finds the
+# keyring of its first bake, and gpg asks on /dev/tty before overwriting it — no tty, exit 2.
 curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg \
-  | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
+  | gpg --batch --yes --dearmor -o /usr/share/keyrings/cloud.google.gpg
 
 echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" \
   | tee /etc/apt/sources.list.d/google-cloud-sdk.list