@relaycast/mcp 0.5.1 → 0.5.3

package/dist/transports.js

@@ -1,56 +1,136 @@
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import { createInternalRelayCast } from "@relaycast/sdk/internal";
-import { createRelayMcpServer, MCP_VERSION, } from "./server.js";
-import { randomUUID } from "node:crypto";
-import { createMcpTelemetry } from "./telemetry.js";
-async function resolveStdioBootstrapOptions(options) {
-    if (!options.apiKey || !options.agentName) {
-        return options;
-    }
-    const relay = createInternalRelayCast({
-        apiKey: options.apiKey,
-        baseUrl: options.baseUrl,
-    }, {
-        surface: "mcp",
-        client: "@relaycast/mcp",
-        version: MCP_VERSION,
-    });
-    if (options.agentToken) {
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { createRelayMcpServer, MCP_VERSION } from './server.js';
+import { randomUUID } from 'node:crypto';
+import { createMcpTelemetry } from './telemetry.js';
+import { createInternalRelayCast } from '@relaycast/sdk/internal';
+import { resolveDefaultWorkspaceId } from './workspaces.js';
+const mcpOrigin = {
+    surface: 'mcp',
+    client: '@relaycast/mcp',
+    version: MCP_VERSION,
+};
+/**
+ * Bootstrap a single workspace by verifying/refreshing its token.
+ * Wrapped with a per-workspace timeout enforced via Promise.race so
+ * one slow workspace doesn't block all others.
+ */
+async function bootstrapOneWorkspace(ws, baseUrl, timeoutMs = 5_000) {
+    const doBootstrap = async () => {
+        const relay = createInternalRelayCast({
+            apiKey: ws.api_key,
+            baseUrl,
+        }, mcpOrigin);
+        let token = ws.agent_token;
+        const agentName = ws.agent_name ?? ws.workspace_alias ?? ws.workspace_id;
+        let workspaceName = ws.workspace_name;
         try {
-            await relay.as(options.agentToken).inbox();
-            return options;
+            const workspace = await relay.workspace.info();
+            workspaceName = workspace.name;
+        }
+        catch {
+            // Keep any pre-supplied name or leave undefined if workspace info is unavailable.
         }
-        catch (err) {
-            const relayErr = err;
-            const unauthorized = relayErr?.code === "unauthorized" ||
-                relayErr?.statusCode === 401 ||
-                relayErr?.statusCode === 403;
-            if (!unauthorized) {
-                throw err;
+        // If we have a token, verify it's still valid via an inbox call
+        if (token) {
+            try {
+                const client = relay.as(token);
+                await client.inbox();
+            }
+            catch {
+                // Token is invalid, need to re-register
+                token = undefined;
             }
         }
+        // If no valid token, register or rotate
+        if (!token) {
+            const result = await relay.agents.registerOrRotate({
+                name: agentName,
+                type: 'agent',
+            });
+            token = result.token;
+        }
+        return {
+            ...ws,
+            agent_token: token,
+            agent_name: agentName,
+            workspace_name: workspaceName,
+        };
+    };
+    try {
+        let timer;
+        const timeout = new Promise((_, reject) => {
+            timer = setTimeout(() => reject(new Error(`Bootstrap timed out after ${timeoutMs}ms`)), timeoutMs);
+        });
+        const result = await Promise.race([doBootstrap(), timeout]);
+        clearTimeout(timer);
+        return result;
     }
-    const registered = await relay.agents.registerOrRotate({
-        name: options.agentName,
-        type: options.agentType,
+    catch (err) {
+        console.error(`[bootstrap] Failed to bootstrap workspace ${ws.workspace_id}: ${err instanceof Error ? err.message : String(err)}`);
+        // Still return the workspace config even if bootstrap failed,
+        // so it can be retried later
+        return ws;
+    }
+}
+/**
+ * Bootstrap workspaces by verifying/refreshing tokens and joining each
+ * workspace into the MCP server's session via setSession + saveWorkspaceContext.
+ *
+ * All workspaces are bootstrapped concurrently with individual timeouts.
+ */
+async function bootstrapWorkspaces(workspaces, baseUrl) {
+    const results = await Promise.allSettled(workspaces.map(ws => bootstrapOneWorkspace(ws, baseUrl)));
+    return results.map((result, i) => {
+        if (result.status === 'fulfilled')
+            return result.value;
+        console.error(`[bootstrap] Workspace ${workspaces[i].workspace_id} rejected: ${result.reason}`);
+        return workspaces[i];
     });
-    return {
-        ...options,
-        agentToken: registered.token,
-        agentName: registered.name ?? options.agentName,
-    };
 }
 /**
  * Start MCP server with stdio transport (single agent).
  * Reads from stdin, writes to stdout.
  */
 export async function startStdio(options) {
-    const bootstrappedOptions = await resolveStdioBootstrapOptions(options);
-    const mcpServer = createRelayMcpServer({
-        ...bootstrappedOptions,
-        telemetryTransport: "stdio",
-    });
+    let effectiveOptions = { ...options, telemetryTransport: 'stdio' };
+    const hasAgentToken = Boolean(options.agentToken);
+    const hasWorkspaces = Boolean(options.workspaces?.length);
+    if (hasWorkspaces) {
+        if (hasAgentToken) {
+            // When agentToken is pre-provided (broker-spawned), skip bootstrap entirely —
+            // the token is already valid. Use workspace configs as-is for routing context.
+            const withNames = options.workspaces.map(ws => ({
+                ...ws,
+                agent_name: ws.agent_name ?? ws.workspace_alias ?? ws.workspace_id,
+            }));
+            effectiveOptions = { ...effectiveOptions, workspaces: withNames };
+            // Promote default workspace credentials so routing resolves correctly
+            const defaultWsId = resolveDefaultWorkspaceId(withNames, options.defaultWorkspace);
+            const defaultWs = withNames.find(w => w.workspace_id === defaultWsId);
+            if (defaultWs) {
+                effectiveOptions.apiKey = effectiveOptions.apiKey ?? defaultWs.api_key;
+                effectiveOptions.agentName = effectiveOptions.agentName ?? defaultWs.agent_name;
+            }
+        }
+        else {
+            // CLI user with RELAY_WORKSPACES_JSON — bootstrap is needed but now
+            // runs all workspaces concurrently (with per-workspace timeouts).
+            const bootstrapped = await bootstrapWorkspaces(options.workspaces, options.baseUrl);
+            effectiveOptions = { ...effectiveOptions, workspaces: bootstrapped };
+            // Set the default workspace's api key/token/name as the primary session
+            const defaultWsId = resolveDefaultWorkspaceId(bootstrapped, options.defaultWorkspace);
+            const defaultWs = bootstrapped.find(w => w.workspace_id === defaultWsId && w.agent_token);
+            if (defaultWs) {
+                effectiveOptions.apiKey = effectiveOptions.apiKey ?? defaultWs.api_key;
+                effectiveOptions.agentToken = effectiveOptions.agentToken ?? defaultWs.agent_token;
+                effectiveOptions.agentName = effectiveOptions.agentName ?? defaultWs.agent_name;
+            }
+        }
+    }
+    // createRelayMcpServer populates session.workspaces from
+    // effectiveOptions.workspaces internally — no need to reach into internals.
+    const mcpServer = createRelayMcpServer(effectiveOptions);
     const transport = new StdioServerTransport();
     await mcpServer.connect(transport);
 }
@@ -69,7 +149,7 @@ export function createHttpHandler(baseOptions, lifecycle) {
         hasSession: (sessionId) => sessions.has(sessionId),
         handleRequest: async (req, res) => {
             // Check for existing session
-            const sessionId = req.headers["mcp-session-id"];
+            const sessionId = req.headers['mcp-session-id'];
             if (sessionId && sessions.has(sessionId)) {
                 const session = sessions.get(sessionId);
                 await session.transport.handleRequest(req, res);
@@ -77,8 +157,8 @@ export function createHttpHandler(baseOptions, lifecycle) {
             }
             // New session — create fresh MCP server + transport + telemetry
             const telemetry = createMcpTelemetry(MCP_VERSION, {
-                originSurface: "mcp",
-                originClient: "@relaycast/mcp",
+                originSurface: 'mcp',
+                originClient: '@relaycast/mcp',
                 originVersion: MCP_VERSION,
             });
             const transport = new StreamableHTTPServerTransport({
@@ -86,7 +166,7 @@ export function createHttpHandler(baseOptions, lifecycle) {
             });
             const mcpServer = createRelayMcpServer({
                 ...baseOptions,
-                telemetryTransport: "http",
+                telemetryTransport: 'http',
                 telemetry,
             });
             transport.onclose = () => {
@@ -102,9 +182,9 @@ export function createHttpHandler(baseOptions, lifecycle) {
             if (transport.sessionId && !sessions.has(transport.sessionId)) {
                 sessions.set(transport.sessionId, { transport });
                 lifecycle?.onCreated?.(transport.sessionId);
-                telemetry.capture("relaycast_mcp_http_session_started", {
-                    source_surface: "mcp",
-                    transport: "http",
+                telemetry.capture('relaycast_mcp_http_session_started', {
+                    source_surface: 'mcp',
+                    transport: 'http',
                     mcp_transport_session_id: transport.sessionId,
                 });
             }

package/dist/transports.js.map

@@ -1 +1 @@
-{"version":3,"file":"transports.js","sourceRoot":"","sources":["../src/transports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,WAAW,GAEZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,KAAK,UAAU,4BAA4B,CACzC,OAAyB;IAEzB,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1C,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,KAAK,GAAG,uBAAuB,CACnC;QACE,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,EACD;QACE,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,gBAAgB;QACxB,OAAO,EAAE,WAAW;KACrB,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC;YAC3C,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,GAAsC,CAAC;YACxD,MAAM,YAAY,GAChB,QAAQ,EAAE,IAAI,KAAK,cAAc;gBACjC,QAAQ,EAAE,UAAU,KAAK,GAAG;gBAC5B,QAAQ,EAAE,UAAU,KAAK,GAAG,CAAC;YAC/B,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACrD,IAAI,EAAE,OAAO,CAAC,SAAS;QACvB,IAAI,EAAE,OAAO,CAAC,SAAS;KACxB,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,OAAO;QACV,UAAU,EAAE,UAAU,CAAC,KAAK;QAC5B,SAAS,EAAE,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS;KAChD,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAyB;IACxD,MAAM,mBAAmB,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,oBAAoB,CAAC;QACrC,GAAG,mBAAmB;QACtB,kBAAkB,EAAE,OAAO;KAC5B,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAC7C,MAAM,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACrC,CAAC;AAWD;;;GAGG;AACH,MAAM,QAAQ,GAAG,IAAI,GAAG,EAGrB,CAAC;AAEJ;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,WAA6B,EAC7B,SAA4B;IAE5B,OAAO;QACL,2DAA2D;QAC3D,UAAU,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC;QAE1D,aAAa,EAAE,KAAK,EAClB,GAAwC,EACxC,GAAuC,EACvC,EAAE;YACF,6BAA6B;YAC7B,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAuB,CAAC;YAEtE,IAAI,SAAS,IAAI,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;gBACzC,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAChD,OAAO;YACT,CAAC;YAED,gEAAgE;YAChE,MAAM,SAAS,GAAG,kBAAkB,CAAC,WAAW,EAAE;gBAChD,aAAa,EAAE,KAAK;gBACpB,YAAY,EAAE,gBAAgB;gBAC9B,aAAa,EAAE,WAAW;aAC3B,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAC;gBAClD,kBAAkB,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE;aACvC,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,oBAAoB,CAAC;gBACrC,GAAG,WAAW;gBACd,kBAAkB,EAAE,MAAM;gBAC1B,SAAS;aACV,CAAC,CAAC;YAEH,SAAS,CAAC,OAAO,GAAG,GAAG,EAAE;gBACvB,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;oBACxB,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBACrC,SAAS,EAAE,QAAQ,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC,CAAC;YAEF,MAAM,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAEnC,oEAAoE;YACpE,kDAAkD;YAClD,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAExC,IAAI,SAAS,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9D,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;gBACjD,SAAS,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC5C,SAAS,CAAC,OAAO,CAAC,oCAAoC,EAAE;oBACtD,cAAc,EAAE,KAAK;oBACrB,SAAS,EAAE,MAAM;oBACjB,wBAAwB,EAAE,SAAS,CAAC,SAAS;iBAC9C,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"transports.js","sourceRoot":"","sources":["../src/transports.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -1,12 +1,35 @@
 import type { WsBridge } from './resources/ws-bridge.js';
 import type { SubscriptionManager } from './resources/subscriptions.js';
+export interface RegisteredAgent {
+    agentName: string;
+    agentToken: string;
+}
+/** Saved context for a single workspace membership. */
+export interface WorkspaceContext {
+    workspaceKey: string;
+    agentToken: string;
+    agentName: string;
+    /** Registered agent tokens for this workspace, keyed by agent name. */
+    agents: Map<string, RegisteredAgent>;
+    /** Canonical workspace name from the Relaycast API. */
+    workspaceName?: string;
+    /** Optional user-saved label for switching. */
+    workspaceLabel?: string;
+    wsBridge: WsBridge | null;
+    subscriptions: SubscriptionManager | null;
+    wsInitAttempted: boolean;
+}
 export interface SessionState {
     workspaceKey: string | null;
     agentToken: string | null;
     agentName: string | null;
+    /** Registered agent tokens for the active workspace, keyed by agent name. */
+    agents: Map<string, RegisteredAgent>;
     wsBridge: WsBridge | null;
     subscriptions: SubscriptionManager | null;
     wsInitAttempted: boolean;
+    /** Map of workspace key → saved context for joined workspaces. */
+    workspaces: Map<string, WorkspaceContext>;
 }
 export interface InitialSessionOptions {
     workspaceKey?: string | null;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC1C,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,wBAAgB,oBAAoB,CAClC,qBAAqB,GAAE,MAAM,GAAG,IAAI,GAAG,qBAA4B,GAClE,YAAY,CAcd"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,uDAAuD;AACvD,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACrC,uDAAuD;IACvD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC1C,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,6EAA6E;IAC7E,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACrC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC1C,eAAe,EAAE,OAAO,CAAC;IACzB,kEAAkE;IAClE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,wBAAgB,oBAAoB,CAClC,qBAAqB,GAAE,MAAM,GAAG,IAAI,GAAG,qBAA4B,GAClE,YAAY,CAmBd"}

package/dist/types.js

@@ -6,9 +6,13 @@ export function createInitialSession(workspaceKeyOrOptions = null) {
         workspaceKey: opts.workspaceKey ?? null,
         agentToken: opts.agentToken ?? null,
         agentName: opts.agentName ?? null,
+        agents: opts.agentName && opts.agentToken
+            ? new Map([[opts.agentName, { agentName: opts.agentName, agentToken: opts.agentToken }]])
+            : new Map(),
         wsBridge: null,
         subscriptions: null,
         wsInitAttempted: false,
+        workspaces: new Map(),
     };
 }
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAkBA,MAAM,UAAU,oBAAoB,CAClC,wBAA+D,IAAI;IAEnE,MAAM,IAAI,GACR,OAAO,qBAAqB,KAAK,QAAQ,IAAI,qBAAqB,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,cAAc,IAAI,qBAAqB;QAC7J,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,EAAE,YAAY,EAAE,qBAAsC,EAAE,CAAC;IAE/D,OAAO;QACL,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI;QACvC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;QACjC,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,eAAe,EAAE,KAAK;KACvB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AA2CA,MAAM,UAAU,oBAAoB,CAClC,wBAA+D,IAAI;IAEnE,MAAM,IAAI,GACR,OAAO,qBAAqB,KAAK,QAAQ,IAAI,qBAAqB,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,cAAc,IAAI,qBAAqB;QAC7J,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,EAAE,YAAY,EAAE,qBAAsC,EAAE,CAAC;IAE/D,OAAO;QACL,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI;QACvC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;QACjC,MAAM,EACJ,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU;YAC/B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACzF,CAAC,CAAC,IAAI,GAAG,EAAE;QACf,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,IAAI,GAAG,EAAE;KACtB,CAAC;AACJ,CAAC"}

package/dist/workspaces.d.ts

@@ -0,0 +1,69 @@
+import { z } from 'zod';
+import type { SessionState, WorkspaceContext } from './types.js';
+export type WorkspaceRouting = {
+    workspace_id?: string;
+    workspace_alias?: string;
+};
+export type AgentRouting = WorkspaceRouting & {
+    as?: string;
+};
+/**
+ * Configuration for a single workspace provided via RELAY_WORKSPACES_JSON.
+ */
+export interface McpWorkspaceConfig {
+    workspace_id: string;
+    workspace_alias?: string;
+    workspace_name?: string;
+    api_key: string;
+    agent_token?: string;
+    agent_name?: string;
+}
+/**
+ * Parse RELAY_WORKSPACES_JSON env var into an array of workspace configs.
+ * Returns an empty array if the env var is not set or empty.
+ */
+export declare function parseWorkspaceEnv(raw?: string): McpWorkspaceConfig[];
+/**
+ * Validate an array of workspace config objects.
+ * Ensures each entry has the required fields.
+ */
+export declare function validateWorkspaceConfigs(configs: unknown[]): McpWorkspaceConfig[];
+/**
+ * Resolve which workspace ID should be the default/active workspace.
+ * Falls back to the first workspace in the list.
+ */
+export declare function resolveDefaultWorkspaceId(configs: McpWorkspaceConfig[], defaultWorkspace?: string): string | undefined;
+/**
+ * Optional workspace routing params added to messaging tools.
+ * When provided, the tool targets a specific workspace instead of the active one.
+ */
+export declare const workspaceRoutingInputShape: {
+    workspace_id: z.ZodOptional<z.ZodString>;
+    workspace_alias: z.ZodOptional<z.ZodString>;
+};
+/**
+ * Optional agent identity override for tools whose behavior depends on the
+ * authenticated agent.
+ */
+export declare const identityOverrideInputShape: {
+    as: z.ZodOptional<z.ZodString>;
+};
+/**
+ * Extract optional workspace and identity routing from loose request params.
+ * Throws on invalid types so resource requests match tool-layer validation.
+ */
+export declare function parseAgentRouting(raw: unknown): AgentRouting | undefined;
+/**
+ * Extract workspace routing info from tool arguments.
+ * Returns the workspace_id or workspace_alias if provided, or undefined.
+ */
+export declare function workspaceRefFromArgs(args: WorkspaceRouting): WorkspaceRouting | undefined;
+/**
+ * Find a WorkspaceContext in the session by workspace_id or workspace_alias.
+ * Falls back to matching a saved workspace label or canonical workspace name.
+ */
+export declare function findWorkspaceContext(session: SessionState, ref: {
+    workspace_id?: string;
+    workspace_alias?: string;
+}, configs?: McpWorkspaceConfig[]): WorkspaceContext | undefined;
+//# sourceMappingURL=workspaces.d.ts.map

package/dist/workspaces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../src/workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,gBAAgB,GAAG;IAC5C,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAWD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAcpE;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,CAYjF;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,kBAAkB,EAAE,EAC7B,gBAAgB,CAAC,EAAE,MAAM,GACxB,MAAM,GAAG,SAAS,CASpB;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;CAOtC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;CAItC,CAAC;AAOF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CASxE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,gBAAgB,GACrB,gBAAgB,GAAG,SAAS,CAQ9B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,EACxD,OAAO,CAAC,EAAE,kBAAkB,EAAE,GAC7B,gBAAgB,GAAG,SAAS,CA0B9B"}

package/dist/workspaces.js

@@ -0,0 +1,134 @@
+import { z } from 'zod';
+const mcpWorkspaceConfigSchema = z.object({
+    workspace_id: z.string({ error: 'is required and must be a string' }),
+    workspace_alias: z.string().optional(),
+    workspace_name: z.string().optional(),
+    api_key: z.string({ error: 'is required and must be a string' }),
+    agent_token: z.string().optional(),
+    agent_name: z.string().optional(),
+});
+/**
+ * Parse RELAY_WORKSPACES_JSON env var into an array of workspace configs.
+ * Returns an empty array if the env var is not set or empty.
+ */
+export function parseWorkspaceEnv(raw) {
+    if (!raw || !raw.trim())
+        return [];
+    try {
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed)) {
+            throw new Error('RELAY_WORKSPACES_JSON must be a JSON array');
+        }
+        return validateWorkspaceConfigs(parsed);
+    }
+    catch (err) {
+        if (err instanceof SyntaxError) {
+            throw new Error(`RELAY_WORKSPACES_JSON is not valid JSON: ${err.message}`);
+        }
+        throw err;
+    }
+}
+/**
+ * Validate an array of workspace config objects.
+ * Ensures each entry has the required fields.
+ */
+export function validateWorkspaceConfigs(configs) {
+    return configs.map((cfg, i) => {
+        const result = mcpWorkspaceConfigSchema.safeParse(cfg);
+        if (!result.success) {
+            const issue = result.error.issues[0];
+            if (!issue.path.length) {
+                throw new Error(`RELAY_WORKSPACES_JSON[${i}] must be an object`);
+            }
+            throw new Error(`RELAY_WORKSPACES_JSON[${i}].${issue.path.join('.')} ${issue.message}`);
+        }
+        return result.data;
+    });
+}
+/**
+ * Resolve which workspace ID should be the default/active workspace.
+ * Falls back to the first workspace in the list.
+ */
+export function resolveDefaultWorkspaceId(configs, defaultWorkspace) {
+    if (!configs.length)
+        return undefined;
+    if (defaultWorkspace) {
+        const match = configs.find(c => c.workspace_id === defaultWorkspace || c.workspace_alias === defaultWorkspace);
+        if (match)
+            return match.workspace_id;
+    }
+    return configs[0].workspace_id;
+}
+/**
+ * Optional workspace routing params added to messaging tools.
+ * When provided, the tool targets a specific workspace instead of the active one.
+ */
+export const workspaceRoutingInputShape = {
+    workspace_id: z.string().optional().describe('Target a specific workspace by its workspace_id (from RELAY_WORKSPACES_JSON). If omitted, uses the active workspace.'),
+    workspace_alias: z.string().optional().describe('Target a specific workspace by its alias (from RELAY_WORKSPACES_JSON). If omitted, uses the active workspace.'),
+};
+/**
+ * Optional agent identity override for tools whose behavior depends on the
+ * authenticated agent.
+ */
+export const identityOverrideInputShape = {
+    as: z.string().optional().describe('Act as a specific registered agent name in the target workspace. If omitted, uses the active agent identity.'),
+};
+const agentRoutingSchema = z.object({
+    ...workspaceRoutingInputShape,
+    ...identityOverrideInputShape,
+}).passthrough();
+/**
+ * Extract optional workspace and identity routing from loose request params.
+ * Throws on invalid types so resource requests match tool-layer validation.
+ */
+export function parseAgentRouting(raw) {
+    const parsed = agentRoutingSchema.parse(raw ?? {});
+    const { workspace_id, workspace_alias, as } = parsed;
+    if (!workspace_id && !workspace_alias && !as) {
+        return undefined;
+    }
+    return { workspace_id, workspace_alias, as };
+}
+/**
+ * Extract workspace routing info from tool arguments.
+ * Returns the workspace_id or workspace_alias if provided, or undefined.
+ */
+export function workspaceRefFromArgs(args) {
+    if (args.workspace_id || args.workspace_alias) {
+        return {
+            workspace_id: args.workspace_id,
+            workspace_alias: args.workspace_alias,
+        };
+    }
+    return undefined;
+}
+/**
+ * Find a WorkspaceContext in the session by workspace_id or workspace_alias.
+ * Falls back to matching a saved workspace label or canonical workspace name.
+ */
+export function findWorkspaceContext(session, ref, configs) {
+    // Try to find the matching config first to get the api_key
+    const config = configs?.find(c => {
+        if (ref.workspace_id && c.workspace_id === ref.workspace_id)
+            return true;
+        if (ref.workspace_alias && c.workspace_alias === ref.workspace_alias)
+            return true;
+        return false;
+    });
+    if (config) {
+        return session.workspaces.get(config.api_key);
+    }
+    // Fall back to matching by workspace_alias against saved workspace metadata.
+    if (ref.workspace_alias) {
+        const target = ref.workspace_alias.toLowerCase();
+        for (const ctx of session.workspaces.values()) {
+            if (ctx.workspaceLabel?.toLowerCase() === target
+                || ctx.workspaceName?.toLowerCase() === target) {
+                return ctx;
+            }
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=workspaces.js.map

package/dist/workspaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../src/workspaces.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@relaycast/mcp",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,8 +13,8 @@
     "lint": "eslint src/"
   },
   "dependencies": {
-    "@relaycast/sdk": "0.5.1",
-    "@relaycast/types": "0.5.1",
+    "@relaycast/sdk": "0.5.3",
+    "@relaycast/types": "0.5.3",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "express": "^5.2.1",
     "zod": "^4.3.6"