@commandable/integration-data 0.0.1 → 0.0.5

package/integrations/google-slides/__tests__/write_handlers.test.ts

@@ -1,76 +1,68 @@
-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'
 
-// LIVE Google Slides write tests using managed OAuth
+// LIVE Google Slides write tests using credentials
 // Required env vars:
-// - COMMANDABLE_MANAGED_OAUTH_BASE_URL
-// - COMMANDABLE_MANAGED_OAUTH_SECRET_KEY
-// - GSLIDES_TEST_CONNECTION_ID (managed OAuth connection for provider 'google-slides')
-// - GSLIDES_TEST_PRESENTATION_ID (a presentation ID with write access)
-
-interface Ctx { presentationId?: 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',
-  'GSLIDES_TEST_CONNECTION_ID',
-  'GSLIDES_TEST_PRESENTATION_ID',
-)
+// - Either GOOGLE_TOKEN, OR GOOGLE_SERVICE_ACCOUNT_JSON
+
+interface Ctx { presentationId?: string, folderId?: string, anchorText?: string }
+
+const suite = (hasEnv('GOOGLE_TOKEN') || hasEnv('GOOGLE_SERVICE_ACCOUNT_JSON'))
   ? describe
   : describe.skip
 
 suite('google-slides write handlers (live)', () => {
   const ctx: Ctx = {}
-  let buildWriteHandler: (name: string) => ((input: any) => Promise<any>)
+  let slides: ReturnType<typeof createToolbox>
+  let drive: ReturnType<typeof createToolbox>
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, GSLIDES_TEST_CONNECTION_ID, GSLIDES_TEST_PRESENTATION_ID } = env
-
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
+    const env = process.env as Record<string, string | undefined>
+    const credentialStore = createCredentialStore(async () => ({
+      token: env.GOOGLE_TOKEN || '',
+      serviceAccountJson: env.GOOGLE_SERVICE_ACCOUNT_JSON || '',
+      subject: env.GOOGLE_IMPERSONATE_SUBJECT || '',
+    }))
+    const proxy = createProxy(credentialStore)
+    slides = createToolbox('google-slides', proxy, createIntegrationNode('google-slides', { label: 'Google Slides', credentialId: 'google-slides-creds' }))
+    drive = createToolbox('google-drive', proxy, createIntegrationNode('google-drive', { label: 'Google Drive', credentialId: 'google-drive-creds' }))
+
+    const folder = await drive.write('create_folder')({ name: `CmdTest Slides Write ${Date.now()}` })
+    ctx.folderId = folder?.id
+    expect(ctx.folderId).toBeTruthy()
+
+    const created = await drive.write('create_file')({
+      name: `CmdTest Slides ${Date.now()}`,
+      mimeType: 'application/vnd.google-apps.presentation',
+      parentId: ctx.folderId,
     })
-    const integrationNode = { id: 'node-gslides', type: 'google-slides', label: 'Google Slides', connectionId: GSLIDES_TEST_CONNECTION_ID } as any
-
-    const tools = loadIntegrationTools('google-slides')
-    expect(tools).toBeTruthy()
+    ctx.presentationId = created?.id
+    expect(ctx.presentationId).toBeTruthy()
 
-    buildWriteHandler = (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>
-    }
-
-    ctx.presentationId = GSLIDES_TEST_PRESENTATION_ID
+    ctx.anchorText = `CMD_ANCHOR_${Date.now()}`
+    const appendTitle = slides.write('append_text_to_title_of_slide_index')
+    await appendTitle({ presentationId: ctx.presentationId, slideIndex: 0, text: ` ${ctx.anchorText} ` })
   }, 60000)
 
+  afterAll(async () => {
+    await safeCleanup(async () => ctx.presentationId ? drive.write('delete_file')({ fileId: ctx.presentationId }) : Promise.resolve())
+    await safeCleanup(async () => ctx.folderId ? drive.write('delete_file')({ fileId: ctx.folderId }) : Promise.resolve())
+  }, 60_000)
+
   it('batch_update performs a trivial update (no-op replace)', async () => {
     if (!ctx.presentationId)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('batch_update')
+    const handler = slides.write('batch_update')
     const res = await handler({ presentationId: ctx.presentationId, requests: [
       { replaceAllText: { containsText: { text: '___unlikely___', matchCase: true }, replaceText: '___unlikely___' } },
     ] })
     expect(res?.presentationId || Array.isArray(res?.replies) || res?.writeControl).toBeTruthy()
   }, 60000)
 
-  it('create_presentation creates a presentation when allowed', async () => {
-    if (!env.GSLIDES_ALLOW_CREATE)
-      return expect(true).toBe(true)
-    const handler = buildWriteHandler('create_presentation')
-    const res = await handler({ title: `Cmd Slides ${Date.now()}` })
-    expect(typeof res?.presentationId === 'string').toBe(true)
-  }, 60000)
-
   it('append_text_to_title_of_slide_index appends to title', async () => {
     if (!ctx.presentationId)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('append_text_to_title_of_slide_index')
+    const handler = slides.write('append_text_to_title_of_slide_index')
     const res = await handler({ presentationId: ctx.presentationId, slideIndex: 0, text: ` CmdTest ${Date.now()}` })
     expect(res?.presentationId || Array.isArray(res?.replies)).toBeTruthy()
   }, 60000)
@@ -78,7 +70,7 @@ suite('google-slides write handlers (live)', () => {
   it('replace_text_first_match replaces text (no-op ok)', async () => {
     if (!ctx.presentationId)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('replace_text_first_match')
+    const handler = slides.write('replace_text_first_match')
     const res = await handler({ presentationId: ctx.presentationId, findText: '___unlikely___', replaceText: '___unlikely___' })
     expect(res?.presentationId || Array.isArray(res?.replies)).toBeTruthy()
   }, 60000)
@@ -86,40 +78,54 @@ suite('google-slides write handlers (live)', () => {
   it('style_text_first_match applies style', async () => {
     if (!ctx.presentationId)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('style_text_first_match')
-    const res = await handler({ presentationId: ctx.presentationId, findText: 'the', textStyle: { bold: true } })
+    if (!ctx.anchorText)
+      return expect(true).toBe(true)
+    const handler = slides.write('style_text_first_match')
+    const res = await handler({ presentationId: ctx.presentationId, findText: ctx.anchorText, textStyle: { bold: true } })
     expect(res?.presentationId || Array.isArray(res?.replies)).toBeTruthy()
   }, 60000)
 
   it('insert_shape_after_first_match inserts a shape', async () => {
     if (!ctx.presentationId)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('insert_shape_after_first_match')
-    const res = await handler({ presentationId: ctx.presentationId, findText: 'the', shapeType: 'RECTANGLE' })
+    if (!ctx.anchorText)
+      return expect(true).toBe(true)
+    const handler = slides.write('insert_shape_after_first_match')
+    const res = await handler({ presentationId: ctx.presentationId, findText: ctx.anchorText, shapeType: 'RECTANGLE' })
     expect(res?.presentationId || Array.isArray(res?.replies)).toBeTruthy()
   }, 60000)
 
   it('insert_image_after_first_match inserts an image when allowed', async () => {
-    if (!ctx.presentationId || !env.GSLIDES_TEST_IMAGE_URI)
+    if (!ctx.presentationId || !ctx.anchorText)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('insert_image_after_first_match')
-    const res = await handler({ presentationId: ctx.presentationId, findText: 'the', uri: env.GSLIDES_TEST_IMAGE_URI })
+    const imageUri = 'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'
+    const handler = slides.write('insert_image_after_first_match')
+    const res = await handler({ presentationId: ctx.presentationId, findText: ctx.anchorText, uri: imageUri })
     expect(res?.presentationId || Array.isArray(res?.replies)).toBeTruthy()
   }, 60000)
 
   it('create_slide_after_first_match creates a slide near anchor', async () => {
     if (!ctx.presentationId)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('create_slide_after_first_match')
-    const res = await handler({ presentationId: ctx.presentationId, findText: 'the', layout: 'BLANK' })
+    if (!ctx.anchorText)
+      return expect(true).toBe(true)
+    const handler = slides.write('create_slide_after_first_match')
+    const res = await handler({ presentationId: ctx.presentationId, findText: ctx.anchorText, layout: 'BLANK' })
     expect(res?.presentationId || Array.isArray(res?.replies)).toBeTruthy()
   }, 60000)
 
   it('set_background_color_for_slide_index sets color', async () => {
     if (!ctx.presentationId)
       return expect(true).toBe(true)
-    const handler = buildWriteHandler('set_background_color_for_slide_index')
+    const handler = slides.write('set_background_color_for_slide_index')
     const res = await handler({ presentationId: ctx.presentationId, slideIndex: 0, rgbColor: { red: 0.9, green: 0.9, blue: 0.9 } })
     expect(res?.presentationId || Array.isArray(res?.replies)).toBeTruthy()
   }, 60000)
+
+  it('create_presentation creates a presentation (self-cleaning)', async () => {
+    const created = await slides.write('create_presentation')({ title: `CmdTest Slides Tool ${Date.now()}` })
+    const id = created?.presentationId
+    expect(typeof id).toBe('string')
+    await safeCleanup(async () => id ? drive.write('delete_file')({ fileId: id }) : Promise.resolve())
+  }, 60000)
 })

package/integrations/google-slides/credentials.json

@@ -1,36 +1,57 @@
 {
-  "schema": {
-    "type": "object",
-    "properties": {
-      "token": {
-        "type": "string",
-        "title": "OAuth Access Token (optional)",
-        "description": "Google OAuth access token to use as a Bearer token (typically short-lived)."
+  "variants": {
+    "service_account": {
+      "label": "Service Account (recommended)",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "serviceAccountJson": {
+            "type": "string",
+            "title": "Service Account JSON",
+            "description": "Full service account key JSON (contents of the downloaded JSON file from Google Cloud)."
+          },
+          "subject": {
+            "type": "string",
+            "title": "Subject / impersonated user (optional)",
+            "description": "Optional user email to impersonate when using Google Workspace domain-wide delegation."
+          },
+          "scopes": {
+            "type": "array",
+            "title": "OAuth scopes (optional)",
+            "description": "Optional override for OAuth scopes. Defaults to presentations + drive.",
+            "items": { "type": "string" }
+          }
+        },
+        "required": ["serviceAccountJson"],
+        "additionalProperties": false
       },
-      "serviceAccountJson": {
-        "type": "string",
-        "title": "Service Account JSON (recommended)",
-        "description": "Full service account key JSON (contents of the downloaded JSON file)."
+      "injection": {
+        "headers": {
+          "Authorization": "Bearer {{token}}"
+        }
       },
-      "subject": {
-        "type": "string",
-        "title": "Subject / impersonated user (optional)",
-        "description": "Optional user email to impersonate when using Google Workspace domain-wide delegation."
+      "preprocess": "google_service_account"
+    },
+    "oauth_token": {
+      "label": "OAuth Access Token (short-lived)",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "token": {
+            "type": "string",
+            "title": "OAuth Access Token",
+            "description": "Short-lived Google OAuth access token with presentations and drive scopes."
+          }
+        },
+        "required": ["token"],
+        "additionalProperties": false
       },
-      "scopes": {
-        "type": "array",
-        "title": "OAuth scopes (optional)",
-        "description": "Optional override for OAuth scopes.",
-        "items": { "type": "string" }
+      "injection": {
+        "headers": {
+          "Authorization": "Bearer {{token}}"
+        }
       }
-    },
-    "required": [],
-    "additionalProperties": false
-  },
-  "injection": {
-    "headers": {
-      "Authorization": "Bearer {{token}}"
     }
-  }
+  },
+  "default": "service_account"
 }
-

package/integrations/google-slides/credentials_hint_oauth_token.md

@@ -0,0 +1,8 @@
+Obtain a short-lived Google OAuth access token:
+
+1. Use the Google OAuth 2.0 Playground (`https://developers.google.com/oauthplayground/`) or your own OAuth flow
+2. Select the scopes: `https://www.googleapis.com/auth/presentations` and `https://www.googleapis.com/auth/drive`
+3. Exchange the authorization code for an access token
+4. Paste the access token here
+
+Note: OAuth access tokens are short-lived (typically 1 hour). For long-running use, prefer the Service Account variant.

package/integrations/google-slides/credentials_hint_service_account.md

@@ -0,0 +1,10 @@
+Set up a Google Cloud Service Account:
+
+1. Open the [Google Cloud Console](https://console.cloud.google.com/)
+2. Enable the **Google Slides API** and **Google Drive API** for your project
+3. Go to **IAM & Admin → Service Accounts** and create a new service account
+4. Under **Keys**, click **Add Key → Create new key → JSON** and download the file
+5. Paste the full contents of the JSON file here
+6. Share your target presentations with the service account's `client_email`
+
+For Google Workspace users: optionally configure domain-wide delegation and set `subject` to the user's email.

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

@@ -1,12 +1,10 @@
 import { beforeAll, describe, expect, it } from 'vitest'
-import { IntegrationProxy } from '../../../src/integrations/proxy.js'
-import { loadIntegrationTools } from '../../../src/integrations/dataLoader.js'
+import { IntegrationProxy } from '../../../../server/src/integrations/proxy.js'
+import { loadIntegrationTools } from '../../../../server/src/integrations/dataLoader.js'
 
-// LIVE Notion integration tests using managed OAuth
+// LIVE Notion integration tests using credentials
 // Required env vars:
-// - COMMANDABLE_MANAGED_OAUTH_BASE_URL
-// - COMMANDABLE_MANAGED_OAUTH_SECRET_KEY
-// - NOTION_TEST_CONNECTION_ID (managed OAuth connection for provider 'notion')
+// - NOTION_TOKEN
 
 interface Ctx {
   database_id?: string
@@ -17,9 +15,7 @@ interface Ctx {
 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',
-  'NOTION_TEST_CONNECTION_ID',
+  'NOTION_TOKEN',
 )
   ? describe
   : describe.skip
@@ -29,13 +25,20 @@ suite('notion read handlers (live)', () => {
   let buildHandler: (name: string) => ((input: any) => Promise<any>)
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, NOTION_TEST_CONNECTION_ID } = env
+    const credentialStore = {
+      getCredentials: async () => ({ token: env.NOTION_TOKEN || '' }),
+    }
 
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
-    })
-    const integrationNode = { id: 'node-notion', type: 'notion', label: 'Notion', connectionId: NOTION_TEST_CONNECTION_ID } as any
+    const proxy = new IntegrationProxy({ credentialStore })
+    const integrationNode = {
+      spaceId: 'ci',
+      id: 'node-notion',
+      referenceId: 'node-notion',
+      type: 'notion',
+      label: 'Notion',
+      connectionMethod: 'credentials',
+      credentialId: 'notion-creds',
+    } as any
 
     const tools = loadIntegrationTools('notion')
     expect(tools).toBeTruthy()

package/integrations/notion/__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('notion static usage parity', () => {
-  it('every manifest tool is referenced in tests via build*(name)', () => {
-    const manifest = loadIntegrationManifest('notion')!
-    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: 'notion', importMetaUrl: import.meta.url })
     expect(missing, `Missing handler usages in tests: ${missing.join(', ')}`).toEqual([])
   })
 })

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

@@ -1,73 +1,69 @@
-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 {
   createdPageId?: string
-  parentDatabaseId?: string
+  testDatabaseId?: string
   createdDatabaseId?: 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',
-  'NOTION_TEST_CONNECTION_ID',
+  'NOTION_TOKEN',
+  'NOTION_TEST_PARENT_PAGE_ID',
 )
   ? describe
   : describe.skip
 
 suite('notion write handlers (live)', () => {
   const ctx: Ctx = {}
-  let buildWrite: (name: string) => ((input: any) => Promise<any>)
-  let buildRead: (name: string) => ((input: any) => Promise<any>)
+  let notion: ReturnType<typeof createToolbox>
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, NOTION_TEST_CONNECTION_ID } = env
-
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
+    const env = process.env as Record<string, string | undefined>
+    const credentialStore = createCredentialStore(async () => ({ token: env.NOTION_TOKEN || '' }))
+    const proxy = createProxy(credentialStore)
+    notion = createToolbox('notion', proxy, createIntegrationNode('notion', { label: 'Notion', credentialId: 'notion-creds' }))
+
+    // Create a dedicated database under a known parent page for this run
+    const create_database = notion.write('create_database')
+    const createdDb = await create_database({
+      parent: { page_id: env.NOTION_TEST_PARENT_PAGE_ID },
+      title: [{ type: 'text', text: { content: `CmdTest DB ${Date.now()}` } }],
+      properties: {
+        Name: { title: {} },
+        Status: { select: { options: [{ name: 'Open' }, { name: 'Done' }] } },
+      },
     })
-    const integrationNode = { id: 'node-notion', type: 'notion', label: 'Notion', connectionId: NOTION_TEST_CONNECTION_ID } as any
-
-    const tools = loadIntegrationTools('notion')
-    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>
-    }
-
-    // Try to find a database to create a page in by searching
-    try {
-      const search = buildRead('search')
-      const res = await search({ query: '', filter: { value: 'database', property: 'object' }, page_size: 1 })
-      ctx.parentDatabaseId = res?.results?.[0]?.id
-    }
-    catch {}
+    ctx.testDatabaseId = createdDb?.id
+    expect(ctx.testDatabaseId).toBeTruthy()
   }, 60000)
 
+  afterAll(async () => {
+    // Archive any created page + any created databases from this run
+    await safeCleanup(async () => {
+      if (!ctx.createdPageId)
+        return
+      const update_page_properties = notion.write('update_page_properties')
+      await update_page_properties({ page_id: ctx.createdPageId, properties: {}, archived: true })
+    })
+
+    await safeCleanup(async () => {
+      const update_database = notion.write('update_database')
+      if (ctx.createdDatabaseId)
+        await update_database({ database_id: ctx.createdDatabaseId, archived: true })
+      if (ctx.testDatabaseId)
+        await update_database({ database_id: ctx.testDatabaseId, archived: true })
+    })
+  }, 60_000)
+
   it('create_page -> retrieve_page -> update_page_properties', async () => {
-    if (!ctx.parentDatabaseId)
+    if (!ctx.testDatabaseId)
       return expect(true).toBe(true)
 
-    const create_page = buildWrite('create_page')
+    const create_page = notion.write('create_page')
     const titleText = `CmdTest ${Date.now()}`
     const created = await create_page({
-      parent: { database_id: ctx.parentDatabaseId },
+      parent: { database_id: ctx.testDatabaseId },
       properties: {
         Name: { title: [{ type: 'text', text: { content: titleText } }] },
       },
@@ -76,11 +72,11 @@ suite('notion write handlers (live)', () => {
     expect(pageId).toBeTruthy()
     ctx.createdPageId = pageId
 
-    const retrieve_page = buildRead('retrieve_page')
+    const retrieve_page = notion.read('retrieve_page')
     const got = await retrieve_page({ page_id: pageId })
     expect(got?.id).toBe(pageId)
 
-    const update_page_properties = buildWrite('update_page_properties')
+    const update_page_properties = notion.write('update_page_properties')
     const newTitle = `${titleText} Updated`
     const updated = await update_page_properties({ page_id: pageId, properties: { Name: { title: [{ type: 'text', text: { content: newTitle } }] } } })
     expect(updated?.id).toBe(pageId)
@@ -94,7 +90,7 @@ suite('notion write handlers (live)', () => {
   it('append_block_children on created page', async () => {
     if (!ctx.createdPageId)
       return expect(true).toBe(true)
-    const append_block_children = buildWrite('append_block_children')
+    const append_block_children = notion.write('append_block_children')
     const contentText = 'Hello from test'
     const res = await append_block_children({
       block_id: ctx.createdPageId,
@@ -105,7 +101,7 @@ suite('notion write handlers (live)', () => {
     expect(res).toBeTruthy()
 
     // Verify via list_block_children
-    const list_block_children = buildRead('list_block_children')
+    const list_block_children = notion.read('list_block_children')
     const listed = await list_block_children({ block_id: ctx.createdPageId })
     const found = (listed?.results || listed || []).some((b: any) => b?.paragraph?.rich_text?.some((t: any) => (t?.plain_text || t?.text?.content) === contentText))
     expect(found).toBe(true)
@@ -114,13 +110,13 @@ suite('notion write handlers (live)', () => {
   it('create_comment on created page', async () => {
     if (!ctx.createdPageId)
       return expect(true).toBe(true)
-    const create_comment = buildWrite('create_comment')
+    const create_comment = notion.write('create_comment')
     const commentText = 'Test comment'
     const res = await create_comment({ parent: { block_id: ctx.createdPageId }, rich_text: [{ type: 'text', text: { content: commentText } }] })
     expect(res?.object === 'comment' || res?.results).toBeTruthy()
 
     // Verify via list_comments
-    const list_comments = buildRead('list_comments')
+    const list_comments = notion.read('list_comments')
     const comments = await list_comments({ block_id: ctx.createdPageId })
     const hasComment = (comments?.results || comments || []).some((c: any) => c?.rich_text?.some((t: any) => (t?.plain_text || t?.text?.content)?.includes(commentText)))
     expect(hasComment).toBe(true)
@@ -130,7 +126,7 @@ suite('notion write handlers (live)', () => {
     if (!ctx.createdPageId)
       return expect(true).toBe(true)
     // Create a specific block to edit
-    const append_block_children = buildWrite('append_block_children')
+    const append_block_children = notion.write('append_block_children')
     const appended = await append_block_children({
       block_id: ctx.createdPageId,
       children: [
@@ -141,18 +137,18 @@ suite('notion write handlers (live)', () => {
     if (!blockId)
       return expect(true).toBe(true)
 
-    const update_block = buildWrite('update_block')
+    const update_block = notion.write('update_block')
     const editedText = 'Edited'
     const updated = await update_block({ block_id: blockId, body: { paragraph: { rich_text: [{ type: 'text', text: { content: editedText } }] } } })
     expect(updated?.id).toBe(blockId)
 
     // Verify via retrieve_block
-    const retrieve_block = buildRead('retrieve_block')
+    const retrieve_block = notion.read('retrieve_block')
     const gotBlock = await retrieve_block({ block_id: blockId })
     const gotEdited = gotBlock?.paragraph?.rich_text?.some((t: any) => (t?.plain_text || t?.text?.content) === editedText)
     expect(gotEdited).toBe(true)
 
-    const delete_block = buildWrite('delete_block')
+    const delete_block = notion.write('delete_block')
     const del = await delete_block({ block_id: blockId })
     expect(del?.archived === true || del?.id === blockId).toBe(true)
 
@@ -164,7 +160,7 @@ suite('notion write handlers (live)', () => {
   it('create_database then update_database under created page (optional)', async () => {
     if (!ctx.createdPageId)
       return expect(true).toBe(true)
-    const create_database = buildWrite('create_database')
+    const create_database = notion.write('create_database')
     const created = await create_database({
       parent: { page_id: ctx.createdPageId },
       title: [{ type: 'text', text: { content: `CmdDB ${Date.now()}` } }],
@@ -177,12 +173,12 @@ suite('notion write handlers (live)', () => {
     ctx.createdDatabaseId = dbId
     expect(dbId).toBeTruthy()
 
-    const update_database = buildWrite('update_database')
+    const update_database = notion.write('update_database')
     const updated = await update_database({ database_id: dbId, title: [{ type: 'text', text: { content: 'CmdDB Updated' } }] })
     expect(updated?.id).toBe(dbId)
 
     // Verify via retrieve_database
-    const retrieve_database = buildRead('retrieve_database')
+    const retrieve_database = notion.read('retrieve_database')
     const gotDb = await retrieve_database({ database_id: dbId })
     const titleText = gotDb?.title?.[0]?.plain_text || gotDb?.title?.[0]?.text?.content
     expect(titleText?.includes('Updated')).toBe(true)