diff --git a/examples/mastra/bin/weather.ts b/examples/mastra/bin/weather.ts index cededa1..286ef4d 100644 --- a/examples/mastra/bin/weather.ts +++ b/examples/mastra/bin/weather.ts @@ -11,7 +11,8 @@ async function main() { const weatherAgent = new Agent({ name: 'Weather Agent', instructions: 'You are a helpful assistant. Be as concise as possible.', - model: openai('gpt-4o-mini'), + // TODO: this appears to be a recent bug in mastra or ai-sdk requiring an `any` here + model: openai('gpt-4o-mini') as any, tools: createMastraTools(weather) }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ced7e8..9593c5c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,8 +46,8 @@ catalogs: specifier: ^22.13.13 version: 22.13.13 '@xsai/tool': - specifier: ^0.1.3 - version: 0.1.3 + specifier: ^0.2.0-beta.1 + version: 0.2.0-beta.1 ai: specifier: ^4.2.2 version: 4.2.2 @@ -184,8 +184,8 @@ catalogs: specifier: ^10.2.2 version: 10.2.2 xsai: - specifier: ^0.1.3 - version: 0.1.3 + specifier: ^0.2.0-beta.1 + version: 0.2.0-beta.1 zod: specifier: ^3.24.2 version: 3.24.2 @@ -462,10 +462,10 @@ importers: version: link:../../packages/xsai '@xsai/tool': specifier: 'catalog:' - version: 0.1.3(zod-to-json-schema@3.24.5(zod@3.24.2)) + version: 0.2.0-beta.1(zod-to-json-schema@3.24.5(zod@3.24.2)) xsai: specifier: 'catalog:' - version: 0.1.3(zod-to-json-schema@3.24.5(zod@3.24.2)) + version: 0.2.0-beta.1(zod-to-json-schema@3.24.5(zod@3.24.2)) zod: specifier: 'catalog:' version: 3.24.2 @@ -1477,7 +1477,7 @@ importers: version: link:../tsconfig '@xsai/tool': specifier: 'catalog:' - version: 0.1.3(zod-to-json-schema@3.24.5(zod@3.24.2)) + version: 0.2.0-beta.1(zod-to-json-schema@3.24.5(zod@3.24.2)) packages/zoominfo: dependencies: @@ -3401,9 +3401,6 @@ packages: '@xsai/stream-text@0.2.0-beta.1': resolution: {integrity: sha512-Ih/qn/WBwDNTcQKz4lueAbw0T/XZMy2oqPtQI/5RWKiLeZcd+H6E5PbJY3fsDfndWu+2W8BDcXA7ZDV72cZ1NA==} - '@xsai/tool@0.1.3': - resolution: {integrity: sha512-Qf+FRpvCAEF4Is7XkFr52P/cI0JDunbYPV+3dAdG0c/QtB7g+hwVgKQLcwIMtg2IZNGy7ggSGVBZZtNPBUnjyQ==} - '@xsai/tool@0.2.0-beta.1': resolution: {integrity: sha512-4nauvwJnnd68yh8IXPkfXBzRtbtqoJuv+qbV7aeA+zx2wFTntHCuGmjKMoEmPzO95Pe6d2V4+q4sBu/J53iG/Q==} @@ -6778,8 +6775,8 @@ packages: utf-8-validate: optional: true - xsai@0.1.3: - resolution: {integrity: sha512-JVQI2Mdr/NU8ed4D40u1rQqBDwCigjtuM2RQn0hd91iCBB54zCsKoQkFq7uVc0hSEMPn755SwRHgM0LXWrVy9Q==} + xsai@0.2.0-beta.1: + resolution: {integrity: sha512-M9c5xEXw18CZrfhJV+iEIEZ04fTpmMKyZtV63rUjGhJnXdn3sWelR/r9yNQdRX+35Ptjze/O8pxmWbsvYA/iFQ==} xsschema@0.2.0-beta.1: resolution: {integrity: sha512-54jKWehz8z0jhPYhoDEA51gZe4xbBD3jJ+BWvyZMuQyUzUPUmsr/QMxIqie3o82vMrFFmzJ3vb5if4b5jHerhA==} @@ -7572,8 +7569,8 @@ snapshots: '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.8.2) '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.8.2) eslint-config-prettier: 9.1.0(eslint@8.57.1) - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0)(eslint@8.57.1) - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) eslint-plugin-jest: 28.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1)(typescript@5.8.2) eslint-plugin-jest-dom: 5.4.0(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1) @@ -9558,17 +9555,6 @@ snapshots: dependencies: '@xsai/shared-chat': 0.2.0-beta.1 - '@xsai/tool@0.1.3(zod-to-json-schema@3.24.5(zod@3.24.2))': - dependencies: - '@xsai/shared': 0.2.0-beta.1 - '@xsai/shared-chat': 0.2.0-beta.1 - xsschema: 0.2.0-beta.1(zod-to-json-schema@3.24.5(zod@3.24.2)) - transitivePeerDependencies: - - '@valibot/to-json-schema' - - arktype - - effect - - zod-to-json-schema - '@xsai/tool@0.2.0-beta.1(zod-to-json-schema@3.24.5(zod@3.24.2))': dependencies: '@xsai/shared': 0.2.0-beta.1 @@ -10429,37 +10415,37 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0)(eslint@8.57.1): + eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.4.0 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) fast-glob: 3.3.3 get-tsconfig: 4.10.0 is-bun-module: 1.2.1 is-glob: 4.0.3 optionalDependencies: - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) transitivePeerDependencies: - '@typescript-eslint/parser' - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.8.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0)(eslint@8.57.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1) transitivePeerDependencies: - supports-color - eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): + eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 @@ -10470,7 +10456,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.8.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -13202,7 +13188,7 @@ snapshots: ws@8.18.0: {} - xsai@0.1.3(zod-to-json-schema@3.24.5(zod@3.24.2)): + xsai@0.2.0-beta.1(zod-to-json-schema@3.24.5(zod@3.24.2)): dependencies: '@xsai/embed': 0.2.0-beta.1 '@xsai/generate-object': 0.2.0-beta.1(zod-to-json-schema@3.24.5(zod@3.24.2)) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index fef148d..e856979 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -19,7 +19,7 @@ catalog: '@total-typescript/ts-reset': ^0.6.1 '@types/jsrsasign': ^10.5.15 '@types/node': ^22.13.13 - '@xsai/tool': ^0.1.3 + '@xsai/tool': ^0.2.0-beta.1 ai: ^4.2.2 bumpp: ^10.1.0 camelcase: ^8.0.0 @@ -66,7 +66,7 @@ catalog: typescript: ^5.8.2 vitest: ^3.0.9 wikibase-sdk: ^10.2.2 - xsai: ^0.1.3 + xsai: ^0.2.0-beta.1 zod: ^3.24.2 zod-validation-error: ^3.4.0 zoominfo-api-auth-client: ^1.0.1