@commandable/integration-data 0.0.1 → 0.0.5

package/integrations/notion/credentials.json

@@ -1,21 +1,26 @@
 {
-  "schema": {
-    "type": "object",
-    "properties": {
-      "token": {
-        "type": "string",
-        "title": "Internal Integration Token",
-        "description": "Notion internal integration token (starts with \"secret_\")."
+  "variants": {
+    "internal_integration": {
+      "label": "Internal Integration Token",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "token": {
+            "type": "string",
+            "title": "Internal Integration Token",
+            "description": "Notion internal integration token (starts with \"secret_\")."
+          }
+        },
+        "required": ["token"],
+        "additionalProperties": false
+      },
+      "injection": {
+        "headers": {
+          "Authorization": "Bearer {{token}}",
+          "Notion-Version": "2022-06-28"
+        }
       }
-    },
-    "required": ["token"],
-    "additionalProperties": false
-  },
-  "injection": {
-    "headers": {
-      "Authorization": "Bearer {{token}}",
-      "Notion-Version": "2022-06-28"
     }
-  }
+  },
+  "default": "internal_integration"
 }
-

package/integrations/trello/__tests__/get_handlers.test.ts

@@ -1,13 +1,10 @@
-import { beforeAll, describe, expect, it } from 'vitest'
-import { IntegrationProxy } from '../../../../server/src/integrations/proxy.js'
-import { loadIntegrationTools } from '../../../../server/src/integrations/dataLoader.js'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { createCredentialStore, createIntegrationNode, createProxy, createToolbox, hasEnv, safeCleanup } from '../../__tests__/liveHarness.js'
 
-// This is a LIVE integration test suite that hits Trello using managed OAuth.
+// This is a LIVE integration test suite that hits Trello using credentials.
 // Required env vars:
-// - COMMANDABLE_MANAGED_OAUTH_BASE_URL
-// - COMMANDABLE_MANAGED_OAUTH_SECRET_KEY
 // - TRELLO_API_KEY
-// - TRELLO_TEST_CONNECTION_ID (an existing managed OAuth connectionId for provider 'trello')
+// - TRELLO_API_TOKEN
 
 interface Ids {
   boardId?: string
@@ -16,68 +13,56 @@ interface Ids {
   orgId?: string
 }
 
-const env = process.env as Record<string, string>
-const hasEnv = (...keys: string[]) => keys.every(k => !!env[k] && env[k].trim().length > 0)
 const suite = hasEnv(
-  'COMMANDABLE_MANAGED_OAUTH_BASE_URL',
-  'COMMANDABLE_MANAGED_OAUTH_SECRET_KEY',
   'TRELLO_API_KEY',
-  'TRELLO_TEST_CONNECTION_ID',
+  'TRELLO_API_TOKEN',
 )
   ? describe
   : describe.skip
 
 suite('trello read handlers (live)', () => {
   const ids: Ids = {}
+  let boardId: string | undefined
+  let listId: string | undefined
 
-  let buildHandler: (name: string) => ((input: any) => Promise<any>)
+  let trello: ReturnType<typeof createToolbox>
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, TRELLO_API_KEY, TRELLO_TEST_CONNECTION_ID } = env
-
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
-      trelloApiKey: TRELLO_API_KEY,
-    })
-    const integrationNode = { id: 'node-trello', type: 'trello', label: 'Trello', connectionId: TRELLO_TEST_CONNECTION_ID } as any
-
-    const tools = loadIntegrationTools('trello')
-    expect(tools).toBeTruthy()
-
-    buildHandler = (name: string) => {
-      const tool = tools!.read.find(t => t.name === name)
-      expect(tool, `tool ${name} exists`).toBeTruthy()
-      const integration = {
-        fetch: (path: string, init?: RequestInit) => proxy.call(integrationNode, path, init),
-      }
-      const build = new Function('integration', `return (${tool!.handlerCode});`)
-      return build(integration) as (input: any) => Promise<any>
-    }
-
-    // Discover a board, list, card, and org for subsequent tests
-    const get_member_boards = buildHandler('get_member_boards')
-    const boards = await get_member_boards({})
-    expect(Array.isArray(boards)).toBe(true)
-    ids.boardId = boards[0]?.id
-
-    if (ids.boardId) {
-      const get_board_lists = buildHandler('get_board_lists')
-      const lists = await get_board_lists({ boardId: ids.boardId })
-      ids.listId = lists[0]?.id
-
-      const get_board_cards = buildHandler('get_board_cards')
-      const cards = await get_board_cards({ boardId: ids.boardId })
-      ids.cardId = cards[0]?.id
-    }
-
-    const get_member_organizations = buildHandler('get_member_organizations')
+    const env = process.env as Record<string, string | undefined>
+    const credentialStore = createCredentialStore(async () => ({ apiKey: env.TRELLO_API_KEY || '', apiToken: env.TRELLO_API_TOKEN || '' }))
+    const proxy = createProxy(credentialStore)
+    const node = createIntegrationNode('trello', { label: 'Trello', credentialId: 'trello-creds' })
+    trello = createToolbox('trello', proxy, node)
+
+    // Create an isolated board/list/card for this run so tests don’t touch random user boards.
+    const board = await trello.write('create_board')({ name: `CmdTest Trello Read ${Date.now()}`, defaultLists: false })
+    boardId = board?.id
+    ids.boardId = boardId
+    expect(ids.boardId).toBeTruthy()
+
+    const list = await trello.write('create_list')({ idBoard: boardId, name: 'CmdTest List' })
+    listId = list?.id
+    ids.listId = listId
+    expect(ids.listId).toBeTruthy()
+
+    const card = await trello.write('create_card')({ idList: listId, name: `CmdTest Card ${Date.now()}` })
+    ids.cardId = card?.id
+    expect(ids.cardId).toBeTruthy()
+
+    const get_member_organizations = trello.read('get_member_organizations')
     const orgs = await get_member_organizations({})
     ids.orgId = orgs[0]?.id
   }, 60000)
 
+  afterAll(async () => {
+    if (!boardId)
+      return
+    await safeCleanup(async () => trello.write('close_board')({ boardId }))
+    await safeCleanup(async () => trello.write('delete_board')({ boardId }))
+  }, 60_000)
+
   it('get_member returns current member', async () => {
-    const handler = buildHandler('get_member')
+    const handler = trello.read('get_member')
     const result = await handler({})
     expect(result).toBeTruthy()
     expect(typeof result.id).toBe('string')
@@ -85,13 +70,13 @@ suite('trello read handlers (live)', () => {
   }, 30000)
 
   it('get_member_boards returns an array', async () => {
-    const handler = buildHandler('get_member_boards')
+    const handler = trello.read('get_member_boards')
     const result = await handler({})
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
 
   it('get_member_organizations returns an array', async () => {
-    const handler = buildHandler('get_member_organizations')
+    const handler = trello.read('get_member_organizations')
     const result = await handler({})
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -99,7 +84,7 @@ suite('trello read handlers (live)', () => {
   it('get_board works with boardId', async () => {
     if (!ids.boardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_board')
+    const handler = trello.read('get_board')
     const result = await handler({ boardId: ids.boardId })
     expect(result?.id).toBe(ids.boardId)
   }, 30000)
@@ -107,7 +92,7 @@ suite('trello read handlers (live)', () => {
   it('get_board_lists returns lists', async () => {
     if (!ids.boardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_board_lists')
+    const handler = trello.read('get_board_lists')
     const result = await handler({ boardId: ids.boardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -115,7 +100,7 @@ suite('trello read handlers (live)', () => {
   it('get_board_cards returns cards', async () => {
     if (!ids.boardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_board_cards')
+    const handler = trello.read('get_board_cards')
     const result = await handler({ boardId: ids.boardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -123,7 +108,7 @@ suite('trello read handlers (live)', () => {
   it('get_board_members returns members', async () => {
     if (!ids.boardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_board_members')
+    const handler = trello.read('get_board_members')
     const result = await handler({ boardId: ids.boardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -131,7 +116,7 @@ suite('trello read handlers (live)', () => {
   it('get_board_labels returns labels', async () => {
     if (!ids.boardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_board_labels')
+    const handler = trello.read('get_board_labels')
     const result = await handler({ boardId: ids.boardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -139,7 +124,7 @@ suite('trello read handlers (live)', () => {
   it('get_board_custom_fields returns custom fields', async () => {
     if (!ids.boardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_board_custom_fields')
+    const handler = trello.read('get_board_custom_fields')
     const result = await handler({ boardId: ids.boardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -147,7 +132,7 @@ suite('trello read handlers (live)', () => {
   it('get_board_memberships returns memberships', async () => {
     if (!ids.boardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_board_memberships')
+    const handler = trello.read('get_board_memberships')
     const result = await handler({ boardId: ids.boardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -155,7 +140,7 @@ suite('trello read handlers (live)', () => {
   it('get_list returns a list', async () => {
     if (!ids.listId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_list')
+    const handler = trello.read('get_list')
     const result = await handler({ listId: ids.listId })
     expect(result?.id).toBe(ids.listId)
   }, 30000)
@@ -163,7 +148,7 @@ suite('trello read handlers (live)', () => {
   it('get_list_cards returns cards in a list', async () => {
     if (!ids.listId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_list_cards')
+    const handler = trello.read('get_list_cards')
     const result = await handler({ listId: ids.listId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -171,7 +156,7 @@ suite('trello read handlers (live)', () => {
   it('get_card returns a card', async () => {
     if (!ids.cardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_card')
+    const handler = trello.read('get_card')
     const result = await handler({ cardId: ids.cardId })
     expect(result?.id).toBe(ids.cardId)
   }, 30000)
@@ -179,7 +164,7 @@ suite('trello read handlers (live)', () => {
   it('get_card_members returns members for a card', async () => {
     if (!ids.cardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_card_members')
+    const handler = trello.read('get_card_members')
     const result = await handler({ cardId: ids.cardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -187,7 +172,7 @@ suite('trello read handlers (live)', () => {
   it('get_card_attachments returns attachments for a card', async () => {
     if (!ids.cardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_card_attachments')
+    const handler = trello.read('get_card_attachments')
     const result = await handler({ cardId: ids.cardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -195,7 +180,7 @@ suite('trello read handlers (live)', () => {
   it('get_card_actions returns actions for a card', async () => {
     if (!ids.cardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_card_actions')
+    const handler = trello.read('get_card_actions')
     const result = await handler({ cardId: ids.cardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -203,7 +188,7 @@ suite('trello read handlers (live)', () => {
   it('get_card_checklists returns checklists for a card', async () => {
     if (!ids.cardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_card_checklists')
+    const handler = trello.read('get_card_checklists')
     const result = await handler({ cardId: ids.cardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -211,7 +196,7 @@ suite('trello read handlers (live)', () => {
   it('get_card_custom_field_items returns custom field items', async () => {
     if (!ids.cardId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_card_custom_field_items')
+    const handler = trello.read('get_card_custom_field_items')
     const result = await handler({ cardId: ids.cardId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
@@ -219,7 +204,7 @@ suite('trello read handlers (live)', () => {
   it('get_organization returns an organization', async () => {
     if (!ids.orgId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_organization')
+    const handler = trello.read('get_organization')
     const result = await handler({ orgId: ids.orgId })
     expect(result?.id).toBe(ids.orgId)
   }, 30000)
@@ -227,13 +212,13 @@ suite('trello read handlers (live)', () => {
   it('get_organization_boards returns boards in an org', async () => {
     if (!ids.orgId)
       return expect(true).toBe(true)
-    const handler = buildHandler('get_organization_boards')
+    const handler = trello.read('get_organization_boards')
     const result = await handler({ orgId: ids.orgId })
     expect(Array.isArray(result)).toBe(true)
   }, 30000)
 
   it('search returns results for a generic query', async () => {
-    const handler = buildHandler('search')
+    const handler = trello.read('search')
     const result = await handler({ query: 'test' })
     expect(result).toBeTruthy()
   }, 30000)

package/integrations/trello/__tests__/usage_parity.test.ts

@@ -1,34 +1,9 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { loadIntegrationManifest } from '../../../src/integrations/dataLoader.js'
-
-function escapeRegExp(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
+import { getMissingToolUsages } from '../../__tests__/usageParity.js'
 
 describe('trello static usage parity', () => {
-  it('every manifest tool is referenced in tests via build*(name)', () => {
-    const manifest = loadIntegrationManifest('trello')!
-    const toolNames = (manifest.tools as any[]).map(t => t.name)
-
-    const testsDir = fileURLToPath(new URL('.', import.meta.url))
-    expect(existsSync(testsDir)).toBe(true)
-    const testFiles = readdirSync(testsDir)
-      .filter(f => /\.test\.(t|j)s$/.test(f) && !f.includes('usage_parity.test'))
-      .map(f => resolve(testsDir, f))
-
-    const fileContents = testFiles.map(f => readFileSync(f, 'utf8'))
-
-    const missing: string[] = []
-    for (const name of toolNames) {
-      const nameRe = new RegExp(`build(?:Read|Write|Admin)?(?:Handler)?\\(\\s*['\"\`]${escapeRegExp(name)}['\"\`]\\s*\\)`, 'm')
-      const found = fileContents.some(src => nameRe.test(src))
-      if (!found)
-        missing.push(name)
-    }
-
+  it('every manifest tool is referenced in tests', () => {
+    const missing = getMissingToolUsages({ integrationName: 'trello', importMetaUrl: import.meta.url })
     expect(missing, `Missing handler usages in tests: ${missing.join(', ')}`).toEqual([])
   })
 })

package/integrations/trello/__tests__/write_and_admin_handlers.test.ts

@@ -1,6 +1,5 @@
-import { beforeAll, describe, expect, it } from 'vitest'
-import { IntegrationProxy } from '../../../src/integrations/proxy.js'
-import { loadIntegrationTools } from '../../../src/integrations/dataLoader.js'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { createCredentialStore, createIntegrationNode, createProxy, createToolbox, hasEnv, safeCleanup } from '../../__tests__/liveHarness.js'
 
 interface Ctx {
   boardId?: string
@@ -10,86 +9,69 @@ interface Ctx {
   memberId?: string
 }
 
-const env = process.env as Record<string, string>
-const hasEnv = (...keys: string[]) => keys.every(k => !!env[k] && env[k].trim().length > 0)
 const suite = hasEnv(
-  'COMMANDABLE_MANAGED_OAUTH_BASE_URL',
-  'COMMANDABLE_MANAGED_OAUTH_SECRET_KEY',
   'TRELLO_API_KEY',
-  'TRELLO_TEST_CONNECTION_ID',
+  'TRELLO_API_TOKEN',
 )
   ? describe
   : describe.skip
 
 suite('trello write handlers (live)', () => {
   const ctx: Ctx = {}
-  let buildWrite: (name: string) => ((input: any) => Promise<any>)
-  let buildRead: (name: string) => ((input: any) => Promise<any>)
+  let trello: ReturnType<typeof createToolbox>
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, TRELLO_API_KEY, TRELLO_TEST_CONNECTION_ID } = env
-
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
-      trelloApiKey: TRELLO_API_KEY,
-    })
-    const integrationNode = { id: 'node-trello', type: 'trello', label: 'Trello', connectionId: TRELLO_TEST_CONNECTION_ID } as any
-
-    const tools = loadIntegrationTools('trello')
-    expect(tools).toBeTruthy()
-
-    buildWrite = (name: string) => {
-      const tool = tools!.write.find(t => t.name === name)
-      expect(tool, `write tool ${name} exists`).toBeTruthy()
-      const integration = { fetch: (path: string, init?: RequestInit) => proxy.call(integrationNode, path, init) }
-      const build = new Function('integration', `return (${tool!.handlerCode});`)
-      return build(integration) as (input: any) => Promise<any>
-    }
-
-    buildRead = (name: string) => {
-      const tool = tools!.read.find(t => t.name === name)
-      expect(tool, `read tool ${name} exists`).toBeTruthy()
-      const integration = { fetch: (path: string, init?: RequestInit) => proxy.call(integrationNode, path, init) }
-      const build = new Function('integration', `return (${tool!.handlerCode});`)
-      return build(integration) as (input: any) => Promise<any>
-    }
-
-    // Discover a board and list for tests
-    const get_member_boards = buildRead('get_member_boards')
-    const boards = await get_member_boards({})
-    ctx.boardId = boards?.[0]?.id
-    if (ctx.boardId) {
-      const get_board_lists = buildRead('get_board_lists')
-      const lists = await get_board_lists({ boardId: ctx.boardId })
-      ctx.listId = lists?.[0]?.id
-      ctx.listId2 = lists?.[1]?.id || ctx.listId
-    }
+    const env = process.env as Record<string, string | undefined>
+    const credentialStore = createCredentialStore(async () => ({ apiKey: env.TRELLO_API_KEY || '', apiToken: env.TRELLO_API_TOKEN || '' }))
+    const proxy = createProxy(credentialStore)
+    const node = createIntegrationNode('trello', { label: 'Trello', credentialId: 'trello-creds' })
+    trello = createToolbox('trello', proxy, node)
+
+    // Create an isolated board + two lists for this test run
+    const create_board = trello.write('create_board')
+    const board = await create_board({ name: `CmdTest Trello ${Date.now()}`, defaultLists: false })
+    ctx.boardId = board?.id
+    expect(ctx.boardId).toBeTruthy()
+
+    const create_list = trello.write('create_list')
+    const list1 = await create_list({ idBoard: ctx.boardId, name: 'CmdTest List A' })
+    const list2 = await create_list({ idBoard: ctx.boardId, name: 'CmdTest List B' })
+    ctx.listId = list1?.id
+    ctx.listId2 = list2?.id
+    expect(ctx.listId).toBeTruthy()
+    expect(ctx.listId2).toBeTruthy()
 
     // Discover a member to add to card (self)
-    const get_member = buildRead('get_member')
+    const get_member = trello.read('get_member')
     const me = await get_member({})
     ctx.memberId = me?.id
   }, 60000)
 
+  afterAll(async () => {
+    if (!ctx.boardId)
+      return
+    await safeCleanup(async () => trello.write('close_board')({ boardId: ctx.boardId }))
+    await safeCleanup(async () => trello.write('delete_board')({ boardId: ctx.boardId }))
+  }, 60_000)
+
   it('create_card -> get_card -> update_card -> move_card_to_list -> delete_card', async () => {
     if (!ctx.boardId || !ctx.listId || !ctx.memberId)
       return expect(true).toBe(true)
 
     // Create card
-    const create_card = buildWrite('create_card')
+    const create_card = trello.write('create_card')
     const created = await create_card({ idList: ctx.listId, name: `CmdCard ${Date.now()}`, desc: 'Initial desc' })
     const cardId = created?.id
     expect(cardId).toBeTruthy()
     ctx.cardId = cardId
 
     // Read card
-    const get_card = buildRead('get_card')
+    const get_card = trello.read('get_card')
     const got = await get_card({ cardId })
     expect(got?.id).toBe(cardId)
 
     // Update card
-    const update_card = buildWrite('update_card')
+    const update_card = trello.write('update_card')
     const updated = await update_card({ cardId, name: 'Updated Name', desc: 'Updated desc' })
     expect(updated?.id).toBe(cardId)
 
@@ -99,7 +81,7 @@ suite('trello write handlers (live)', () => {
 
     // Move card
     if (ctx.listId2 && ctx.listId2 !== ctx.listId) {
-      const move_card_to_list = buildWrite('move_card_to_list')
+      const move_card_to_list = trello.write('move_card_to_list')
       const moved = await move_card_to_list({ cardId, listId: ctx.listId2 })
       expect(moved?.id).toBe(cardId)
       const got3 = await get_card({ cardId })
@@ -107,7 +89,7 @@ suite('trello write handlers (live)', () => {
     }
 
     // Delete card
-    const delete_card = buildWrite('delete_card')
+    const delete_card = trello.write('delete_card')
     const del = await delete_card({ cardId })
     expect(Boolean(del === '' || del?.limits || del?.id === cardId || (del && typeof del === 'object'))).toBe(true)
   }, 120000)
@@ -117,26 +99,26 @@ suite('trello write handlers (live)', () => {
       return expect(true).toBe(true)
 
     // Create an isolated card for this test
-    const create_card = buildWrite('create_card')
+    const create_card = trello.write('create_card')
     const created = await create_card({ idList: ctx.listId, name: `CmdCard Members ${Date.now()}` })
     const cardId = created?.id
     expect(cardId).toBeTruthy()
 
-    const add_member_to_card = buildWrite('add_member_to_card')
+    const add_member_to_card = trello.write('add_member_to_card')
     const added = await add_member_to_card({ cardId, memberId: ctx.memberId })
     expect(added).toBeTruthy()
 
-    const get_card_members = buildRead('get_card_members')
+    const get_card_members = trello.read('get_card_members')
     const members = await get_card_members({ cardId })
     const hasMember = (members || []).some((m: any) => m?.id === ctx.memberId)
     expect(hasMember).toBe(true)
 
-    const remove_member_from_card = buildWrite('remove_member_from_card')
+    const remove_member_from_card = trello.write('remove_member_from_card')
     const removed = await remove_member_from_card({ cardId, memberId: ctx.memberId })
     expect(removed === '' || (removed && typeof removed === 'object')).toBe(true)
 
     // Cleanup
-    const delete_card = buildWrite('delete_card')
+    const delete_card = trello.write('delete_card')
     await delete_card({ cardId })
   }, 90000)
 
@@ -145,44 +127,44 @@ suite('trello write handlers (live)', () => {
       return expect(true).toBe(true)
 
     // Create an isolated card for this test
-    const create_card = buildWrite('create_card')
+    const create_card = trello.write('create_card')
     const createdCard = await create_card({ idList: ctx.listId, name: `CmdCard Checklist ${Date.now()}` })
     const cardId = createdCard?.id
     expect(cardId).toBeTruthy()
 
-    const add_checklist_to_card = buildWrite('add_checklist_to_card')
+    const add_checklist_to_card = trello.write('add_checklist_to_card')
     const created = await add_checklist_to_card({ cardId, name: `Checklist ${Date.now()}` })
     expect(created?.id).toBeTruthy()
 
-    const get_card_checklists = buildRead('get_card_checklists')
+    const get_card_checklists = trello.read('get_card_checklists')
     const lists = await get_card_checklists({ cardId })
     expect(Array.isArray(lists)).toBe(true)
 
     // Cleanup
-    const delete_card = buildWrite('delete_card')
+    const delete_card = trello.write('delete_card')
     await delete_card({ cardId })
   }, 60000)
 
   it('create_list -> get_list -> update_list -> archive_list', async () => {
     if (!ctx.boardId)
       return expect(true).toBe(true)
-    const create_list = buildWrite('create_list')
+    const create_list = trello.write('create_list')
     const created = await create_list({ idBoard: ctx.boardId, name: `CmdList ${Date.now()}` })
     const listId = created?.id
     expect(listId).toBeTruthy()
 
-    const get_list = buildRead('get_list')
+    const get_list = trello.read('get_list')
     const got = await get_list({ listId })
     expect(got?.id).toBe(listId)
 
-    const update_list = buildWrite('update_list')
+    const update_list = trello.write('update_list')
     const updated = await update_list({ listId, name: 'Updated List Name' })
     expect(updated?.id).toBe(listId)
 
     const got2 = await get_list({ listId })
     expect(got2?.name).toBe('Updated List Name')
 
-    const archive_list = buildWrite('archive_list')
+    const archive_list = trello.write('archive_list')
     const archived = await archive_list({ listId })
     expect(archived?.closed === true).toBe(true)
   }, 120000)

package/integrations/trello/credentials.json

@@ -1,26 +1,31 @@
 {
-  "schema": {
-    "type": "object",
-    "properties": {
-      "apiKey": {
-        "type": "string",
-        "title": "API Key",
-        "description": "Your Trello API key from https://trello.com/power-ups/admin"
+  "variants": {
+    "api_key_token": {
+      "label": "API Key + Token",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "apiKey": {
+            "type": "string",
+            "title": "API Key",
+            "description": "Your Trello API key from https://trello.com/power-ups/admin"
+          },
+          "apiToken": {
+            "type": "string",
+            "title": "API Token",
+            "description": "Your Trello API token (\"token\" param). Generate one via Trello's authorize flow."
+          }
+        },
+        "required": ["apiKey", "apiToken"],
+        "additionalProperties": false
       },
-      "apiToken": {
-        "type": "string",
-        "title": "API Token",
-        "description": "Your Trello API token (\"token\" param). Generate one via Trello's authorize flow."
+      "injection": {
+        "query": {
+          "key": "{{apiKey}}",
+          "token": "{{apiToken}}"
+        }
       }
-    },
-    "required": ["apiKey", "apiToken"],
-    "additionalProperties": false
-  },
-  "injection": {
-    "query": {
-      "key": "{{apiKey}}",
-      "token": "{{apiToken}}"
     }
-  }
+  },
+  "default": "api_key_token"
 }
-