Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 207 additions & 0 deletions packages/worker/src/mcp/execute-modules/codemode-utils.node.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
import { expect, test } from 'vitest'
import {
type CapabilityArgs,
type CodemodeNamespace,
type ExecuteRequestInput,
createAuthenticatedFetch,
createExecuteHelperPrelude,
getExecuteHelperCapabilityNames,
refreshAccessToken,
} from './codemode-utils.ts'

type SecretSetCall = {
name: string
value: string
scope: string
}

type SandboxHelpers = {
refreshAccessToken: (providerName: string) => Promise<string>
createAuthenticatedFetch: (
providerName: string,
) => Promise<(input: ExecuteRequestInput, init?: RequestInit) => Promise<Response>>
}

const spotifyConnector = {
name: 'spotify',
tokenUrl: 'https://accounts.spotify.test/api/token',
apiBaseUrl: 'https://api.spotify.test/v1',
flow: 'pkce' as const,
clientIdValueName: 'spotifyClientId',
clientSecretSecretName: null,
accessTokenSecretName: 'spotifyAccessToken',
refreshTokenSecretName: 'spotifyRefreshToken',
requiredHosts: ['api.spotify.test'],
}

function createCodemode(payload: Record<string, unknown>) {
const secretSetCalls: Array<SecretSetCall> = []
const codemode = {
async connector_get(args: CapabilityArgs) {
const name = args.name
expect(name).toBe('spotify')
return { connector: spotifyConnector }
},
async value_get(args: CapabilityArgs) {
const name = args.name
expect(name).toBe('spotifyClientId')
return { value: 'spotify-client-id' }
},
async secret_set(args: CapabilityArgs) {
const call = args as SecretSetCall
secretSetCalls.push(call)
return {
name: call.name,
scope: call.scope,
}
},
} satisfies CodemodeNamespace

const fetchCalls: Array<Request> = []
const fetchStub: typeof globalThis.fetch = async (
input: ExecuteRequestInput,
init?: RequestInit,
) => {
const request = new Request(input, init)
fetchCalls.push(request)
if (request.url === spotifyConnector.tokenUrl) {
return new Response(JSON.stringify(payload), {
status: 200,
headers: { 'content-type': 'application/json' },
})
}
return new Response(JSON.stringify({ ok: true }), {
status: 200,
headers: { 'content-type': 'application/json' },
})
}

return { codemode, secretSetCalls, fetchCalls, fetchStub }
}

async function withPatchedFetch<T>(
fetchImpl: typeof globalThis.fetch,
callback: () => Promise<T>,
) {
const originalFetch = globalThis.fetch
globalThis.fetch = fetchImpl
try {
return await callback()
} finally {
globalThis.fetch = originalFetch
}
}

test('refreshAccessToken persists rotated refresh token and access token', async () => {
const { codemode, secretSetCalls, fetchStub, fetchCalls } = createCodemode({
access_token: 'new-access-token',
refresh_token: 'new-refresh-token',
})

const accessToken = await withPatchedFetch(fetchStub, () =>
refreshAccessToken(codemode, 'spotify'),
)

expect(accessToken).toBe('new-access-token')
expect(secretSetCalls).toEqual([
{
name: 'spotifyRefreshToken',
value: 'new-refresh-token',
scope: 'user',
},
{
name: 'spotifyAccessToken',
value: 'new-access-token',
scope: 'user',
},
])
expect(fetchCalls).toHaveLength(1)
expect(fetchCalls[0]?.method).toBe('POST')
expect(await fetchCalls[0]?.text()).toContain(
'refresh_token=%7B%7Bsecret%3AspotifyRefreshToken%7Cscope%3Duser%7D%7D',
)
})

test('createAuthenticatedFetch persists refreshed access token even without refresh token rotation', async () => {
const { codemode, secretSetCalls, fetchStub, fetchCalls } = createCodemode({
access_token: 'new-access-token',
})

const authenticatedFetch = await withPatchedFetch(fetchStub, () =>
createAuthenticatedFetch(codemode, 'spotify'),
)
const response = await withPatchedFetch(fetchStub, () =>
authenticatedFetch('/me?market=US'),
)

expect(secretSetCalls).toEqual([
{
name: 'spotifyAccessToken',
value: 'new-access-token',
scope: 'user',
},
])
expect(fetchCalls).toHaveLength(2)
expect(fetchCalls[1]?.url).toBe('https://api.spotify.test/v1/me?market=US')
expect(fetchCalls[1]?.headers.get('authorization')).toBe(
'Bearer new-access-token',
)
expect(await response.json()).toEqual({ ok: true })
})

test('createExecuteHelperPrelude persists rotated refresh token and access token', async () => {
const { codemode, secretSetCalls, fetchStub, fetchCalls } = createCodemode({
access_token: 'new-access-token',
refresh_token: 'new-refresh-token',
})
const prelude = createExecuteHelperPrelude()
const createSandboxHelpers = new Function(
'codemode',
`${prelude}; return { refreshAccessToken, createAuthenticatedFetch };`,
) as (codemodeNamespace: CodemodeNamespace) => SandboxHelpers

const helpers = createSandboxHelpers(codemode)
const accessToken = await withPatchedFetch(fetchStub, () =>
helpers.refreshAccessToken('spotify'),
)
const authenticatedFetch = await withPatchedFetch(fetchStub, () =>
helpers.createAuthenticatedFetch('spotify'),
)
await withPatchedFetch(fetchStub, () => authenticatedFetch('/me'))

expect(accessToken).toBe('new-access-token')
expect(secretSetCalls).toEqual([
{
name: 'spotifyRefreshToken',
value: 'new-refresh-token',
scope: 'user',
},
{
name: 'spotifyAccessToken',
value: 'new-access-token',
scope: 'user',
},
{
name: 'spotifyRefreshToken',
value: 'new-refresh-token',
scope: 'user',
},
{
name: 'spotifyAccessToken',
value: 'new-access-token',
scope: 'user',
},
])
expect(fetchCalls).toHaveLength(3)
expect(fetchCalls[2]?.headers.get('authorization')).toBe(
'Bearer new-access-token',
)
})

test('getExecuteHelperCapabilityNames includes secret_set for refresh persistence', () => {
expect(getExecuteHelperCapabilityNames()).toEqual([
'connector_get',
'value_get',
'secret_set',
])
})
91 changes: 86 additions & 5 deletions packages/worker/src/mcp/execute-modules/codemode-utils.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
type CapabilityResult = unknown

type CapabilityArgs = Record<string, unknown>
export type CapabilityArgs = Record<string, unknown>

type CodemodeNamespace = Record<
export type CodemodeNamespace = Record<
string,
(args: CapabilityArgs) => Promise<CapabilityResult>
>
Expand Down Expand Up @@ -34,9 +34,13 @@ type ValueGetResult = {
ttl_ms: number | null
} | null

type ExecuteRequestInput = string | URL | Request
export type ExecuteRequestInput = string | URL | Request

const executeHelperCapabilityNames = ['connector_get', 'value_get'] as const
export const EXECUTE_HELPER_CAPABILITY_NAMES = [
'connector_get',
'value_get',
'secret_set',
] as const

export async function refreshAccessToken(
codemode: CodemodeNamespace,
Expand Down Expand Up @@ -109,6 +113,30 @@ async function readClientId(
return value.value
}

async function persistSecret(
codemode: CodemodeNamespace,
providerName: string,
secretName: string,
secretKind: 'access token' | 'refresh token',
value: string,
) {
const secretSet = codemode.secret_set
if (typeof secretSet !== 'function') {
throw new Error('codemode.secret_set is not available in this sandbox.')
}
const normalizedSecretName = secretName.trim()
if (!normalizedSecretName) {
throw new Error(
`Connector "${providerName}" does not define an ${secretKind} secret name.`,
)
}
await secretSet({
name: normalizedSecretName,
value,
scope: 'user',
})
}

async function refreshAccessTokenWithConnector(
codemode: CodemodeNamespace,
providerName: string,
Expand Down Expand Up @@ -168,6 +196,23 @@ async function refreshAccessTokenWithConnector(
)
}

if (typeof payload.refresh_token === 'string' && payload.refresh_token.length > 0) {
await persistSecret(
codemode,
providerName,
refreshTokenSecretName,
'refresh token',
payload.refresh_token,
)
}
await persistSecret(
codemode,
providerName,
connector.accessTokenSecretName,
'access token',
payload.access_token,
)

return payload.access_token
}

Expand Down Expand Up @@ -240,7 +285,7 @@ function resolveRelativeUrl(pathname: string, connector: ConnectorConfig) {
}

export function getExecuteHelperCapabilityNames() {
return [...executeHelperCapabilityNames]
return [...EXECUTE_HELPER_CAPABILITY_NAMES]
}

export function createExecuteHelperPrelude() {
Expand Down Expand Up @@ -272,6 +317,28 @@ const __kodyReadClientId = async (connector) => {
}
return value.value;
};
const __kodyPersistSecret = async (
providerName,
secretName,
secretKind,
value,
) => {
const secretSet = codemode.secret_set;
if (typeof secretSet !== 'function') {
throw new Error('codemode.secret_set is not available in this sandbox.');
}
const normalizedSecretName = secretName.trim();
if (!normalizedSecretName) {
throw new Error(
\`Connector "\${providerName}" does not define an \${secretKind} secret name.\`,
);
}
await secretSet({
name: normalizedSecretName,
value,
scope: 'user',
});
};
const __kodyGetNormalizedApiBaseUrl = (connector) => {
if (!connector.apiBaseUrl) return null;
return connector.apiBaseUrl.endsWith('/')
Expand Down Expand Up @@ -364,6 +431,20 @@ const __kodyRefreshAccessToken = async (providerName) => {
\`Token refresh for connector "\${providerName}" did not return an access_token.\`,
);
}
if (typeof payload.refresh_token === 'string' && payload.refresh_token.length > 0) {
await __kodyPersistSecret(
providerName,
refreshTokenSecretName,
'refresh token',
payload.refresh_token,
);
}
await __kodyPersistSecret(
providerName,
connector.accessTokenSecretName,
'access token',
payload.access_token,
);
return payload.access_token;
};
const __kodyCreateAuthenticatedFetch = async (providerName) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ test('infers capabilities from execute-time helper names', () => {
}`
const { helperNames, inferencePartial } = inferCodemodeCapabilities(src)
expect(inferencePartial).toBe(false)
expect(helperNames).toEqual(['connector_get', 'value_get'])
expect(helperNames).toEqual(['connector_get', 'secret_set', 'value_get'])
})
5 changes: 2 additions & 3 deletions packages/worker/src/mcp/skills/infer-codemode-capabilities.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { parse, type Node, type Program } from 'acorn'

const executeHelperCapabilities = ['connector_get', 'value_get'] as const
import { EXECUTE_HELPER_CAPABILITY_NAMES } from '#mcp/execute-modules/codemode-utils.ts'
const executeHelperNames = new Set([
'refreshAccessToken',
'createAuthenticatedFetch',
Expand Down Expand Up @@ -111,7 +110,7 @@ export function inferCodemodeCapabilitiesFromAst(
(n as { callee?: unknown }).callee ?? null,
)
if (calleeName && executeHelperNames.has(calleeName)) {
for (const capabilityName of executeHelperCapabilities) {
for (const capabilityName of EXECUTE_HELPER_CAPABILITY_NAMES) {
helperSet.add(capabilityName)
}
}
Expand Down
Loading