diff --git a/apps/playground/src/app/api/chat/route.ts b/apps/playground/src/app/api/chat/route.ts index 9098931..28e7b27 100644 --- a/apps/playground/src/app/api/chat/route.ts +++ b/apps/playground/src/app/api/chat/route.ts @@ -144,7 +144,7 @@ export async function POST(request: NextRequest) { if (searchResult.tools && searchResult.tools.length > 0) { console.log( 'šŸ”§ Tools found:', - searchResult.tools.map((t: any) => `${t.packageName}/${t.exportName}`) + searchResult.tools.map((t: any) => `${t.packageName}/${t.name}`) ); // Dynamically load tools from esm.sh @@ -152,7 +152,7 @@ export async function POST(request: NextRequest) { const toolsToLoad = searchResult.tools.map((meta: any) => ({ packageName: meta.packageName, - exportName: meta.exportName, + name: meta.name, version: meta.version, importUrl: meta.importUrl, })); diff --git a/apps/playground/src/app/api/tools/route.ts b/apps/playground/src/app/api/tools/route.ts index 7e2eaec..b892796 100644 --- a/apps/playground/src/app/api/tools/route.ts +++ b/apps/playground/src/app/api/tools/route.ts @@ -5,7 +5,7 @@ export const dynamic = 'force-dynamic'; interface RawTool { id: string; - exportName: string; + name: string; description: string; qualityScore: number; importHealth: 'HEALTHY' | 'BROKEN' | 'UNKNOWN'; @@ -25,7 +25,7 @@ function transformTool(tool: RawTool) { return { toolId: tool.id, packageName: tool.package?.npmPackageName, - exportName: tool.exportName, + name: tool.name, description: tool.description, category: tool.package?.category, version: tool.package?.npmVersion, diff --git a/apps/playground/src/components/sidebar/ToolsSidebar.tsx b/apps/playground/src/components/sidebar/ToolsSidebar.tsx index ac3180d..d33bb2c 100644 --- a/apps/playground/src/components/sidebar/ToolsSidebar.tsx +++ b/apps/playground/src/components/sidebar/ToolsSidebar.tsx @@ -10,7 +10,7 @@ import { useEffect, useState } from 'react'; interface Tool { toolId?: string; packageName: string; - exportName: string; + name: string; description: string; category: string; version: string; @@ -62,7 +62,7 @@ export function ToolsSidebar(): React.ReactElement { // Filter by search text const matchesFilter = tool.packageName?.toLowerCase().includes(filter.toLowerCase()) || - tool.exportName?.toLowerCase().includes(filter.toLowerCase()) || + tool.name?.toLowerCase().includes(filter.toLowerCase()) || tool.description?.toLowerCase().includes(filter.toLowerCase()) || tool.category?.toLowerCase().includes(filter.toLowerCase()); @@ -124,7 +124,7 @@ export function ToolsSidebar(): React.ReactElement { filteredTools.map((tool) => ( // biome-ignore lint/a11y/useSemanticElements: Custom styled card with complex layout
setSelectedTool(tool)} onKeyDown={(e) => e.key === 'Enter' && setSelectedTool(tool)} @@ -132,7 +132,7 @@ export function ToolsSidebar(): React.ReactElement { tabIndex={0} >
-

{tool.exportName}

+

{tool.name}

-

{selectedTool.exportName}

+

{selectedTool.name}

{selectedTool.packageName}

{selectedTool.category} diff --git a/apps/playground/src/lib/dynamic-tool-loader.ts b/apps/playground/src/lib/dynamic-tool-loader.ts index 4327361..62d447d 100644 --- a/apps/playground/src/lib/dynamic-tool-loader.ts +++ b/apps/playground/src/lib/dynamic-tool-loader.ts @@ -17,8 +17,8 @@ const RAILWAY_SERVICE_URL = /** * Generate cache key for a tool */ -function getCacheKey(packageName: string, exportName: string): string { - return `${packageName}::${exportName}`; +function getCacheKey(packageName: string, name: string): string { + return `${packageName}::${name}`; } /** @@ -43,14 +43,14 @@ function getConversationEnv(conversationId: string): Record { */ export async function loadToolDynamically( packageName: string, - exportName: string, + name: string, version: string, conversationId: string, importUrl?: string, env?: Record // biome-ignore lint/suspicious/noExplicitAny: Tool types from AI SDK are complex ): Promise { - const cacheKey = getCacheKey(packageName, exportName); + const cacheKey = getCacheKey(packageName, name); // Check cache first if (moduleCache.has(cacheKey)) { @@ -59,7 +59,7 @@ export async function loadToolDynamically( } try { - console.log(`šŸ“¦ Loading from Railway: ${packageName}/${exportName}`); + console.log(`šŸ“¦ Loading from Railway: ${packageName}/${name}`); console.log(`šŸ”— Railway URL: ${RAILWAY_SERVICE_URL}`); // Call Railway service to load and describe tool @@ -78,7 +78,7 @@ export async function loadToolDynamically( headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName, - exportName, + name, version, importUrl: importUrl || `https://esm.sh/${packageName}@${version}`, env: env || {}, @@ -105,7 +105,7 @@ export async function loadToolDynamically( clearTimeout(timeout); if (fetchError instanceof Error && fetchError.name === 'AbortError') { - console.error(`āŒ Railway request timeout after 120s for ${packageName}/${exportName}`); + console.error(`āŒ Railway request timeout after 120s for ${packageName}/${name}`); return null; } @@ -130,7 +130,7 @@ export async function loadToolDynamically( : jsonSchema({ type: 'object', properties: {}, additionalProperties: false }), // biome-ignore lint/suspicious/noExplicitAny: Tool params are dynamic execute: async (params: any) => { - console.log(`šŸš€ Executing ${packageName}/${exportName} remotely with params:`, params); + console.log(`šŸš€ Executing ${packageName}/${name} remotely with params:`, params); // Get the latest env vars for this conversation (not from closure!) const currentEnv = getConversationEnv(conversationId); @@ -144,7 +144,7 @@ export async function loadToolDynamically( headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName, - exportName, + name, version, importUrl: importUrl || `https://esm.sh/${packageName}@${version}`, params, @@ -171,7 +171,7 @@ export async function loadToolDynamically( return toolWrapper; } catch (error) { - console.error(`āŒ Failed to load ${packageName}#${exportName}:`, error); + console.error(`āŒ Failed to load ${packageName}#${name}:`, error); console.error(' Stack:', error instanceof Error ? error.stack : 'No stack trace'); return null; } @@ -183,7 +183,7 @@ export async function loadToolDynamically( export async function loadToolsBatch( toolMetadata: Array<{ packageName: string; - exportName: string; + name: string; version: string; importUrl?: string; }>, @@ -197,15 +197,15 @@ export async function loadToolsBatch( const promises = toolMetadata.map((meta) => loadToolDynamically( meta.packageName, - meta.exportName, + meta.name, meta.version, conversationId, meta.importUrl, env ).then((tool) => ({ packageName: meta.packageName, - exportName: meta.exportName, - key: getCacheKey(meta.packageName, meta.exportName), + name: meta.name, + key: getCacheKey(meta.packageName, meta.name), tool, success: tool !== null, })) @@ -232,7 +232,7 @@ export async function loadToolsBatch( if (failed.length > 0) { console.log('\nāŒ Failed Tools:'); for (const result of failed) { - console.log(` - ${result.packageName}/${result.exportName}`); + console.log(` - ${result.packageName}/${result.name}`); } console.log('\nšŸ’” Note: Tool failures have been reported to the health service.'); } diff --git a/apps/playground/src/lib/tool-loader.ts b/apps/playground/src/lib/tool-loader.ts index 0e1b825..c2273f7 100644 --- a/apps/playground/src/lib/tool-loader.ts +++ b/apps/playground/src/lib/tool-loader.ts @@ -17,7 +17,7 @@ const TOOL_REGISTRY: Record> = { * Uses static imports to work with Next.js/webpack bundling */ // biome-ignore lint/suspicious/noExplicitAny: Tool types from AI SDK are complex and using any is appropriate here -export async function loadTpmjsTool(packageName: string, exportName: string): Promise { +export async function loadTpmjsTool(packageName: string, name: string): Promise { try { // Look up the package in the registry const packageTools = TOOL_REGISTRY[packageName]; @@ -27,10 +27,10 @@ export async function loadTpmjsTool(packageName: string, exportName: string): Pr } // Look up the specific tool export - const tool = packageTools[exportName]; + const tool = packageTools[name]; if (!tool) { console.warn( - `Export '${exportName}' not found in package ${packageName}. Available exports:`, + `Export '${name}' not found in package ${packageName}. Available exports:`, Object.keys(packageTools) ); return null; @@ -38,7 +38,7 @@ export async function loadTpmjsTool(packageName: string, exportName: string): Pr return tool; } catch (error) { - console.error(`Failed to load tool ${packageName}/${exportName}:`, error); + console.error(`Failed to load tool ${packageName}/${name}:`, error); return null; } } @@ -56,7 +56,7 @@ export function sanitizeToolName(name: string): string { /** * Load all installed TPMJS tools - * Returns a flat object with all tools keyed by sanitized packageName-exportName + * Returns a flat object with all tools keyed by sanitized packageName-name */ // biome-ignore lint/suspicious/noExplicitAny: Tool types from AI SDK are complex and using any is appropriate here export async function loadAllTools(): Promise> { @@ -65,9 +65,9 @@ export async function loadAllTools(): Promise> { // Iterate through all registered packages for (const [packageName, packageTools] of Object.entries(TOOL_REGISTRY)) { - for (const [exportName, tool] of Object.entries(packageTools)) { + for (const [name, tool] of Object.entries(packageTools)) { // Create a unique, sanitized key for this tool - const toolKey = sanitizeToolName(`${packageName}-${exportName}`); + const toolKey = sanitizeToolName(`${packageName}-${name}`); tools[toolKey] = tool; } } diff --git a/apps/railway-executor/server.ts b/apps/railway-executor/server.ts index 1a1501d..95629ff 100644 --- a/apps/railway-executor/server.ts +++ b/apps/railway-executor/server.ts @@ -78,7 +78,7 @@ const TPMJS_API_URL = Deno.env.get('TPMJS_API_URL') || 'https://tpmjs.com'; */ async function reportToolHealth( packageName: string, - exportName: string, + name: string, success: boolean, error?: string ): Promise { @@ -88,7 +88,7 @@ async function reportToolHealth( headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName, - exportName, + name, success, error, }), @@ -96,7 +96,7 @@ async function reportToolHealth( if (response.ok) { console.log( - `šŸ“Š Health reported for ${packageName}/${exportName}: ${success ? 'SUCCESS' : 'FAILURE'}` + `šŸ“Š Health reported for ${packageName}/${name}: ${success ? 'SUCCESS' : 'FAILURE'}` ); } else { console.warn(`āš ļø Failed to report health: ${response.status}`); @@ -113,7 +113,7 @@ async function reportToolHealth( */ async function updateToolSchema( packageName: string, - exportName: string, + name: string, description: string, // biome-ignore lint/suspicious/noExplicitAny: JSON Schema can have any structure inputSchema: any @@ -124,7 +124,7 @@ async function updateToolSchema( headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName, - exportName, + name, description, inputSchema, }), @@ -133,7 +133,7 @@ async function updateToolSchema( if (response.ok) { const data = await response.json(); console.log( - `šŸ“‹ Schema updated for ${packageName}/${exportName}:`, + `šŸ“‹ Schema updated for ${packageName}/${name}:`, data.updated ? 'UPDATED' : 'NO CHANGE' ); } else { @@ -216,19 +216,19 @@ function sanitizeJsonSchema(schema: any): any { async function loadAndDescribe(req: Request): Promise { try { const body = await req.json(); - const { packageName, exportName, version, importUrl, env } = body; + const { packageName, name, version, importUrl, env } = body; - if (!packageName || !exportName || !version) { + if (!packageName || !name || !version) { return Response.json( { success: false, - error: 'Missing required fields: packageName, exportName, version', + error: 'Missing required fields: packageName, name, version', }, { status: 400 } ); } - const cacheKey = `${packageName}::${exportName}`; + const cacheKey = `${packageName}::${name}`; // biome-ignore lint/suspicious/noImplicitAnyLet: Tool type is determined dynamically after import let toolModule; @@ -244,14 +244,14 @@ async function loadAndDescribe(req: Request): Promise { console.log(`šŸ“¦ Importing: ${url}`); const module = await import(url); - let rawExport = module[exportName]; + let rawExport = module[name]; if (!rawExport) { - console.error(`āŒ Export "${exportName}" not found. Available:`, Object.keys(module)); + console.error(`āŒ Export "${name}" not found. Available:`, Object.keys(module)); return Response.json( { success: false, - error: `Export "${exportName}" not found in module`, + error: `Export "${name}" not found in module`, availableExports: Object.keys(module), }, { status: 404 } @@ -266,7 +266,7 @@ async function loadAndDescribe(req: Request): Promise { // Strategy 1: Try calling with no arguments try { - console.log(` Trying: ${exportName}()`); + console.log(` Trying: ${name}()`); factoryResult = rawExport(); if (factoryResult?.description && factoryResult?.execute) { console.log(' āœ… Success with no-args factory'); @@ -300,7 +300,7 @@ async function loadAndDescribe(req: Request): Promise { // Try each config variation for (const config of configVariations) { try { - console.log(` Trying: ${exportName}(`, Object.keys(config), ')'); + console.log(` Trying: ${name}(`, Object.keys(config), ')'); factoryResult = rawExport(config); if (factoryResult?.description && factoryResult?.execute) { console.log(' āœ… Success with config:', Object.keys(config)); @@ -318,7 +318,7 @@ async function loadAndDescribe(req: Request): Promise { try { const firstValue = Object.values(env)[0]; if (firstValue) { - console.log(` Trying: ${exportName}(firstEnvValue)`); + console.log(` Trying: ${name}(firstEnvValue)`); factoryResult = rawExport(firstValue); if (factoryResult?.description && factoryResult?.execute) { console.log(' āœ… Success with single-arg factory'); @@ -336,7 +336,7 @@ async function loadAndDescribe(req: Request): Promise { return Response.json( { success: false, - error: `Tool "${exportName}" is a factory function but couldn't be initialized. Tried: no-args, config object, and single-arg patterns.`, + error: `Tool "${name}" is a factory function but couldn't be initialized. Tried: no-args, config object, and single-arg patterns.`, hint: 'This tool may require specific configuration. Check package documentation.', }, { status: 400 } @@ -436,7 +436,7 @@ async function loadAndDescribe(req: Request): Promise { return Response.json( { success: false, - error: `Tool "${exportName}" has no valid inputSchema. Tools must use AI SDK jsonSchema(), Zod v4 toJSONSchema(), or Zod v3 schemas.`, + error: `Tool "${name}" has no valid inputSchema. Tools must use AI SDK jsonSchema(), Zod v4 toJSONSchema(), or Zod v3 schemas.`, debug: { hasInputSchema: !!toolModule.inputSchema, availableMethods: toolModule.inputSchema ? Object.keys(toolModule.inputSchema) : [], @@ -453,16 +453,14 @@ async function loadAndDescribe(req: Request): Promise { const sanitizedSchema = sanitizeJsonSchema(rawJsonSchema); // Update TPM.js database with the schema (async, non-blocking) - updateToolSchema(packageName, exportName, toolModule.description, sanitizedSchema).catch( - (err) => { - console.warn('āš ļø Failed to update schema in database:', err); - } - ); + updateToolSchema(packageName, name, toolModule.description, sanitizedSchema).catch((err) => { + console.warn('āš ļø Failed to update schema in database:', err); + }); return Response.json({ success: true, tool: { - exportName, + name, description: toolModule.description, inputSchema: sanitizedSchema, // Plain JSON Schema - fully serializable }, @@ -486,32 +484,32 @@ async function executeTool(req: Request): Promise { const startTime = Date.now(); // Declare these before try block so they're available in catch for error reporting let packageName = 'unknown'; - let exportName = 'unknown'; + let toolName = 'unknown'; try { const body = await req.json(); - const { packageName: pkg, exportName: exp, version, importUrl, params, env } = body; + const { packageName: pkg, name, version, importUrl, params, env } = body; packageName = pkg || 'unknown'; - exportName = exp || 'unknown'; + toolName = name || 'unknown'; console.log('šŸ“„ Execute request:', { packageName, - exportName, + name: toolName, version, envKeys: env ? Object.keys(env) : [], envValues: env || {}, }); - if (!packageName || !exportName || !version) { + if (!packageName || !toolName || !version) { return Response.json( { success: false, - error: 'Missing required fields: packageName, exportName, version', + error: 'Missing required fields: packageName, name, version', }, { status: 400 } ); } - const cacheKey = `${packageName}::${exportName}`; + const cacheKey = `${packageName}::${toolName}`; // Inject environment variables FIRST - before cache check and factory calls // This ensures process.env is set when factory functions read from it @@ -561,7 +559,7 @@ async function executeTool(req: Request): Promise { console.log(`šŸ“¦ Importing for execution: ${url}`); const module = await import(url); - let rawExport = module[exportName]; + let rawExport = module[toolName]; if (!rawExport) { return Response.json( @@ -587,7 +585,7 @@ async function executeTool(req: Request): Promise { // Strategy 1: Try calling with no arguments try { - console.log(` Trying: ${exportName}()`); + console.log(` Trying: ${toolName}()`); factoryResult = rawExport(); if (factoryResult?.execute) { console.log(' āœ… Success with no-args factory'); @@ -621,7 +619,7 @@ async function executeTool(req: Request): Promise { // Try each config variation for (const config of configVariations) { try { - console.log(` Trying: ${exportName}(`, Object.keys(config), ')'); + console.log(` Trying: ${toolName}(`, Object.keys(config), ')'); factoryResult = rawExport(config); if (factoryResult?.execute) { console.log(' āœ… Success with config:', Object.keys(config)); @@ -639,7 +637,7 @@ async function executeTool(req: Request): Promise { try { const firstValue = Object.values(env)[0]; if (firstValue) { - console.log(` Trying: ${exportName}(firstEnvValue)`); + console.log(` Trying: ${toolName}(firstEnvValue)`); factoryResult = rawExport(firstValue); if (factoryResult?.execute) { console.log(' āœ… Success with single-arg factory'); @@ -655,7 +653,7 @@ async function executeTool(req: Request): Promise { return Response.json( { success: false, - error: `Tool "${exportName}" is a factory function but couldn't be initialized`, + error: `Tool "${toolName}" is a factory function but couldn't be initialized`, executionTimeMs: Date.now() - startTime, }, { status: 400 } @@ -700,7 +698,7 @@ async function executeTool(req: Request): Promise { console.log(`āœ… Execution complete in ${executionTimeMs}ms`); // Report successful execution to health service (non-blocking) - reportToolHealth(packageName, exportName, true).catch(() => {}); + reportToolHealth(packageName, toolName, true).catch(() => {}); return Response.json({ success: true, @@ -712,7 +710,7 @@ async function executeTool(req: Request): Promise { console.error('āŒ Tool execution failed:', error); // Report failed execution to health service (non-blocking) - reportToolHealth(packageName, exportName, false, error.message).catch(() => {}); + reportToolHealth(packageName, toolName, false, error.message).catch(() => {}); return Response.json( { diff --git a/apps/web/src/app/api/sync/changes/route.ts b/apps/web/src/app/api/sync/changes/route.ts index bbe97f2..e786e84 100644 --- a/apps/web/src/app/api/sync/changes/route.ts +++ b/apps/web/src/app/api/sync/changes/route.ts @@ -176,14 +176,14 @@ export async function POST(request: NextRequest) { const upsertedTool = await prisma.tool.upsert({ where: { - packageId_exportName: { + packageId_name: { packageId: packageRecord.id, - exportName: toolName, + name: toolName, }, }, create: { packageId: packageRecord.id, - exportName: toolName, + name: toolName, description: toolDef.description || 'No description provided', // biome-ignore lint/suspicious/noExplicitAny: Prisma Json type compatibility workaround parameters: toolDef.parameters ? (toolDef.parameters as any) : undefined, @@ -254,8 +254,7 @@ export async function POST(request: NextRequest) { // Delete orphaned tools (tools removed from package.json) const orphanedTools = existingTools.filter( - (existingTool) => - !toolsToProcess.some((toolDef) => toolDef.name === existingTool.exportName) + (existingTool) => !toolsToProcess.some((toolDef) => toolDef.name === existingTool.name) ); if (orphanedTools.length > 0) { diff --git a/apps/web/src/app/api/sync/keyword/route.ts b/apps/web/src/app/api/sync/keyword/route.ts index 902e17b..c9a853a 100644 --- a/apps/web/src/app/api/sync/keyword/route.ts +++ b/apps/web/src/app/api/sync/keyword/route.ts @@ -195,14 +195,14 @@ export async function POST(request: NextRequest) { const upsertedTool = await prisma.tool.upsert({ where: { - packageId_exportName: { + packageId_name: { packageId: packageRecord.id, - exportName: toolName, + name: toolName, }, }, create: { packageId: packageRecord.id, - exportName: toolName, + name: toolName, description: toolDef.description || 'No description provided', // biome-ignore lint/suspicious/noExplicitAny: Prisma Json type compatibility workaround parameters: toolDef.parameters ? (toolDef.parameters as any) : undefined, @@ -273,8 +273,7 @@ export async function POST(request: NextRequest) { // Delete orphaned tools (tools removed from package.json) const orphanedTools = existingTools.filter( - (existingTool) => - !toolsToProcess.some((toolDef) => toolDef.name === existingTool.exportName) + (existingTool) => !toolsToProcess.some((toolDef) => toolDef.name === existingTool.name) ); if (orphanedTools.length > 0) { diff --git a/apps/web/src/app/api/tools/[...slug]/route.ts b/apps/web/src/app/api/tools/[...slug]/route.ts index 1238217..6b18104 100644 --- a/apps/web/src/app/api/tools/[...slug]/route.ts +++ b/apps/web/src/app/api/tools/[...slug]/route.ts @@ -10,30 +10,30 @@ export const maxDuration = 60; /** * Parse tool slug to extract package name and export name */ -function parseSlug(slug: string[]): { packageName: string; exportName: string | undefined } { +function parseSlug(slug: string[]): { packageName: string; name: string | undefined } { let packageName: string; - let exportName: string | undefined; + let name: string | undefined; if (slug.length === 1) { // Single slug - package name without scope packageName = slug[0] || ''; } else if (slug.length === 2) { - // Could be: @scope/package OR package/exportName + // Could be: @scope/package OR package/name if (slug[0]?.startsWith('@')) { // @scope/package packageName = slug.join('/'); } else { - // package + exportName + // package + name packageName = slug[0] || ''; - exportName = slug[1]; + name = slug[1]; } } else { - // 3+ slugs: @scope/package/exportName + // 3+ slugs: @scope/package/name packageName = slug.slice(0, slug[0]?.startsWith('@') ? 2 : 1).join('/'); - exportName = slug[slug.length - 1]; + name = slug[slug.length - 1]; } - return { packageName, exportName }; + return { packageName, name }; } /** @@ -54,14 +54,14 @@ export async function GET( try { const { slug } = await params; - const { packageName, exportName } = parseSlug(slug); + const { packageName, name } = parseSlug(slug); - if (exportName) { + if (name) { // Find specific tool by package name and export name const tool = await prisma.tool.findFirst({ where: { package: { npmPackageName: packageName }, - exportName: exportName, + name: name, }, include: { package: true }, }); @@ -138,10 +138,10 @@ export async function POST( try { const { slug } = await params; - const { packageName, exportName } = parseSlug(slug); + const { packageName, name } = parseSlug(slug); // Health checks require export name - if (!exportName) { + if (!name) { return NextResponse.json( { success: false, @@ -155,7 +155,7 @@ export async function POST( const tool = await prisma.tool.findFirst({ where: { package: { npmPackageName: packageName }, - exportName: exportName, + name: name, }, select: { id: true, @@ -190,7 +190,7 @@ export async function POST( } // Perform health check - console.log(`šŸ„ Manual health check triggered for ${packageName}/${exportName}`); + console.log(`šŸ„ Manual health check triggered for ${packageName}/${name}`); const result = await performHealthCheck(tool.id, 'manual'); return NextResponse.json({ @@ -198,7 +198,7 @@ export async function POST( data: { toolId: result.toolId, packageName: packageName, - exportName: exportName, + name: name, importStatus: result.importStatus, importError: result.importError, importTimeMs: result.importTimeMs, diff --git a/apps/web/src/app/api/tools/execute/[...slug]/route.ts b/apps/web/src/app/api/tools/execute/[...slug]/route.ts index ee34d5c..dacbb1d 100644 --- a/apps/web/src/app/api/tools/execute/[...slug]/route.ts +++ b/apps/web/src/app/api/tools/execute/[...slug]/route.ts @@ -21,7 +21,7 @@ interface ExecuteRequest { * POST /api/tools/execute/[...slug] * Executes a tool with an AI agent and streams the response via SSE * - * Slug format: [toolId] or [packageName, exportName] + * Slug format: [toolId] or [packageName, name] * Examples: * /api/tools/execute/clx123abc (by tool ID) * /api/tools/execute/@tpmjs/hello/helloWorldTool (by package and export name) @@ -68,7 +68,7 @@ export async function POST( } // Fetch tool from database with package relation - // Support both ID-based lookup and packageName/exportName lookup + // Support both ID-based lookup and packageName/name lookup const tool = slug.length === 1 ? // Single slug - treat as tool ID @@ -76,11 +76,11 @@ export async function POST( where: { id: slug[0] || '' }, include: { package: true }, }) - : // Multiple slugs - treat as packageName/exportName + : // Multiple slugs - treat as packageName/name await prisma.tool.findFirst({ where: { package: { npmPackageName: decodeURIComponent(slug.slice(0, -1).join('/')) }, - exportName: decodeURIComponent(slug[slug.length - 1] || ''), + name: decodeURIComponent(slug[slug.length - 1] || ''), }, include: { package: true }, }); diff --git a/apps/web/src/app/api/tools/extract-schema/route.ts b/apps/web/src/app/api/tools/extract-schema/route.ts index 26e7c01..cc0a439 100644 --- a/apps/web/src/app/api/tools/extract-schema/route.ts +++ b/apps/web/src/app/api/tools/extract-schema/route.ts @@ -11,28 +11,28 @@ export const dynamic = 'force-dynamic'; * * Body: * - packageName: npm package name - * - exportName: exported function name + * - name: exported function name * * Rate limited to 1 extraction per minute per tool */ export async function POST(request: NextRequest) { try { const body = await request.json(); - const { packageName, exportName } = body; + const { packageName, name } = body; - if (!packageName || !exportName) { + if (!packageName || !name) { return NextResponse.json( - { success: false, error: 'packageName and exportName are required' }, + { success: false, error: 'packageName and name are required' }, { status: 400 } ); } - console.log('[Extract Schema] Looking up tool:', { packageName, exportName }); + console.log('[Extract Schema] Looking up tool:', { packageName, name }); // Find the tool by package name and export name const tool = await prisma.tool.findFirst({ where: { - exportName, + name, package: { npmPackageName: packageName, }, @@ -49,7 +49,7 @@ export async function POST(request: NextRequest) { }); if (!tool) { - console.log('[Extract Schema] Tool not found:', { packageName, exportName }); + console.log('[Extract Schema] Tool not found:', { packageName, name }); return NextResponse.json({ success: false, error: 'Tool not found' }, { status: 404 }); } @@ -74,14 +74,14 @@ export async function POST(request: NextRequest) { console.log('[Extract Schema] Extracting schema for:', { packageName: tool.package.npmPackageName, - exportName: tool.exportName, + name: tool.name, version: tool.package.npmVersion, }); // Extract schema from executor const schemaResult = await extractToolSchema( tool.package.npmPackageName, - tool.exportName, + tool.name, tool.package.npmVersion, tool.package.env as Record | null ); @@ -101,7 +101,7 @@ export async function POST(request: NextRequest) { }, select: { id: true, - exportName: true, + name: true, inputSchema: true, parameters: true, schemaSource: true, @@ -111,7 +111,7 @@ export async function POST(request: NextRequest) { console.log('[Extract Schema] Schema extracted successfully:', { toolId: updatedTool.id, - exportName: updatedTool.exportName, + name: updatedTool.name, schemaSource: updatedTool.schemaSource, }); @@ -126,7 +126,7 @@ export async function POST(request: NextRequest) { // Extraction failed console.log('[Extract Schema] Extraction failed:', { packageName, - exportName, + name, error: schemaResult.error, }); diff --git a/apps/web/src/app/api/tools/report-health/route.ts b/apps/web/src/app/api/tools/report-health/route.ts index 857dfa2..fb9aeb7 100644 --- a/apps/web/src/app/api/tools/report-health/route.ts +++ b/apps/web/src/app/api/tools/report-health/route.ts @@ -64,7 +64,7 @@ function isNonBreakingError(error: string): boolean { interface ReportHealthRequest { packageName: string; - exportName: string; + name: string; success: boolean; error?: string; } @@ -87,11 +87,11 @@ export async function POST(request: NextRequest): Promise { try { const body: ReportHealthRequest = await request.json(); - const { packageName, exportName, success, error } = body; + const { packageName, name, success, error } = body; - if (!packageName || !exportName) { + if (!packageName || !name) { return NextResponse.json( - { success: false, error: 'packageName and exportName are required' }, + { success: false, error: 'packageName and name are required' }, { status: 400 } ); } @@ -99,7 +99,7 @@ export async function POST(request: NextRequest): Promise { // Find the tool const tool = await prisma.tool.findFirst({ where: { - exportName, + name, package: { npmPackageName: packageName }, }, select: { id: true }, @@ -119,9 +119,7 @@ export async function POST(request: NextRequest): Promise { } else if (error && isNonBreakingError(error)) { // Failed due to config/validation = HEALTHY (tool works, just needs setup) healthStatus = 'HEALTHY'; - console.log( - `ā„¹ļø ${packageName}/${exportName} failed due to config issue (not broken): ${error}` - ); + console.log(`ā„¹ļø ${packageName}/${name} failed due to config issue (not broken): ${error}`); } else { // Real failure = BROKEN healthStatus = 'BROKEN'; @@ -138,7 +136,7 @@ export async function POST(request: NextRequest): Promise { }, }); - console.log(`šŸ„ Health updated for ${packageName}/${exportName}: ${healthStatus}`); + console.log(`šŸ„ Health updated for ${packageName}/${name}: ${healthStatus}`); return NextResponse.json({ success: true, diff --git a/apps/web/src/app/api/tools/search/route.ts b/apps/web/src/app/api/tools/search/route.ts index 948fe2b..f5a9452 100644 --- a/apps/web/src/app/api/tools/search/route.ts +++ b/apps/web/src/app/api/tools/search/route.ts @@ -100,7 +100,7 @@ export async function GET(request: NextRequest) { tool, text: [ tool.description, - tool.exportName, + tool.name, tool.package.npmPackageName, tool.package.npmDescription || '', ...(tool.package.npmKeywords || []), @@ -157,7 +157,7 @@ export async function GET(request: NextRequest) { returned: results.length, tools: results.map(({ tool }) => ({ id: tool.id, - exportName: tool.exportName, + name: tool.name, description: tool.description, qualityScore: tool.qualityScore, importHealth: tool.importHealth, diff --git a/apps/web/src/app/api/tools/simulations/[...slug]/route.ts b/apps/web/src/app/api/tools/simulations/[...slug]/route.ts index 67ee400..6117cee 100644 --- a/apps/web/src/app/api/tools/simulations/[...slug]/route.ts +++ b/apps/web/src/app/api/tools/simulations/[...slug]/route.ts @@ -30,14 +30,14 @@ export async function GET( select: { id: true }, }); } else { - // Multiple slugs - treat as packageName/exportName + // Multiple slugs - treat as packageName/name const packageName = decodeURIComponent(slug.slice(0, -1).join('/')); - const exportName = decodeURIComponent(slug[slug.length - 1] || ''); + const name = decodeURIComponent(slug[slug.length - 1] || ''); tool = await prisma.tool.findFirst({ where: { package: { npmPackageName: packageName }, - exportName: exportName, + name: name, }, select: { id: true }, }); diff --git a/apps/web/src/app/api/tools/update-schema/route.ts b/apps/web/src/app/api/tools/update-schema/route.ts index 1eb16b6..4379852 100644 --- a/apps/web/src/app/api/tools/update-schema/route.ts +++ b/apps/web/src/app/api/tools/update-schema/route.ts @@ -10,23 +10,23 @@ export const dynamic = 'force-dynamic'; * Update a tool's input schema * * Called by the executor when it loads a tool and discovers its schema. - * Looks up tool by packageName + exportName (unique constraint). + * Looks up tool by packageName + name (unique constraint). * Stores the full JSON Schema and also converts to parameters array for backward compatibility. * * Body: * - packageName: npm package name - * - exportName: exported function name + * - name: exported function name * - inputSchema: The JSON Schema for the tool's input parameters * - description: Optional updated description from the tool */ export async function POST(request: NextRequest) { try { const body = await request.json(); - const { packageName, exportName, inputSchema, description } = body; + const { packageName, name, inputSchema, description } = body; - if (!packageName || !exportName) { + if (!packageName || !name) { return NextResponse.json( - { success: false, error: 'packageName and exportName are required' }, + { success: false, error: 'packageName and name are required' }, { status: 400 } ); } @@ -38,12 +38,12 @@ export async function POST(request: NextRequest) { ); } - console.log('[Update Schema] Looking up tool:', { packageName, exportName }); + console.log('[Update Schema] Looking up tool:', { packageName, name }); - // Find the tool by package name and export name + // Find the tool by package name and name const tool = await prisma.tool.findFirst({ where: { - exportName, + name, package: { npmPackageName: packageName, }, @@ -56,7 +56,7 @@ export async function POST(request: NextRequest) { }); if (!tool) { - console.log('[Update Schema] Tool not found:', { packageName, exportName }); + console.log('[Update Schema] Tool not found:', { packageName, name }); return NextResponse.json( { success: false, error: 'Tool not found', updated: false }, { status: 404 } @@ -73,7 +73,7 @@ export async function POST(request: NextRequest) { tool.schemaSource === 'extracted' && JSON.stringify(existingSchema) === JSON.stringify(inputSchema) ) { - console.log('[Update Schema] Schema already up to date:', { packageName, exportName }); + console.log('[Update Schema] Schema already up to date:', { packageName, name }); return NextResponse.json({ success: true, updated: false, @@ -107,7 +107,7 @@ export async function POST(request: NextRequest) { data: updateData, select: { id: true, - exportName: true, + name: true, description: true, parameters: true, inputSchema: true, @@ -118,7 +118,7 @@ export async function POST(request: NextRequest) { console.log('[Update Schema] Tool updated:', { id: updatedTool.id, - exportName: updatedTool.exportName, + name: updatedTool.name, parameterCount: parameters.length, parameterNames: parameters.map((p) => p.name), schemaSource: updatedTool.schemaSource, diff --git a/apps/web/src/app/docs/page.tsx b/apps/web/src/app/docs/page.tsx index 70529eb..cf614e2 100644 --- a/apps/web/src/app/docs/page.tsx +++ b/apps/web/src/app/docs/page.tsx @@ -492,7 +492,7 @@ Use registrySearch to find tools, then registryExecute to run them.\`, name: 'toolId', type: 'string', required: true, - description: 'Tool identifier (format: package::exportName)', + description: 'Tool identifier (format: package::name)', }, { name: 'params', @@ -1146,7 +1146,7 @@ export TPMJS_EXECUTOR_URL=https://executor.mycompany.com`}
  • Check that required environment variables are passed
    • -
  • Verify the toolId format is correct (package::exportName)
    • +
  • Verify the toolId format is correct (package::name)
  • Check the tool's health status on tpmjs.com
 diff --git a/apps/web/src/app/faq/page.tsx b/apps/web/src/app/faq/page.tsx index b47a8f5..3f223de 100644 --- a/apps/web/src/app/faq/page.tsx +++ b/apps/web/src/app/faq/page.tsx @@ -138,7 +138,7 @@ export default function FAQPage(): React.ReactElement {

This simplifies publishing - you only need to provide category, description, and - exportName. See our{' '} + name. See our{' '} specification {' '} diff --git a/apps/web/src/app/how-it-works/page.tsx b/apps/web/src/app/how-it-works/page.tsx index 37ba788..9f62845 100644 --- a/apps/web/src/app/how-it-works/page.tsx +++ b/apps/web/src/app/how-it-works/page.tsx @@ -97,7 +97,7 @@ export default function HowItWorksPage(): React.ReactElement { "category": "text-analysis", "frameworks": ["vercel-ai"], "tools": [{ - "exportName": "analyzeSentiment", + "name": "analyzeSentiment", "description": "Analyze sentiment of text and return positive/negative/neutral" }] } diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx index a19dfcf..53293a5 100644 --- a/apps/web/src/app/page.tsx +++ b/apps/web/src/app/page.tsx @@ -24,7 +24,7 @@ async function getHomePageData() { take: 6, select: { id: true, - exportName: true, + name: true, description: true, qualityScore: true, package: { @@ -100,7 +100,7 @@ export default async function HomePage(): Promise { {data.featuredTools.map((tool) => (

@@ -108,7 +108,7 @@ export default async function HomePage(): Promise {

{tool.package.npmPackageName} - ({tool.exportName}) + ({tool.name})

{tool.package.isOfficial && ( diff --git a/apps/web/src/app/sdk/page.tsx b/apps/web/src/app/sdk/page.tsx index 8765b7a..4b26f9a 100644 --- a/apps/web/src/app/sdk/page.tsx +++ b/apps/web/src/app/sdk/page.tsx @@ -352,7 +352,7 @@ Use registrySearch to find tools, then registryExecute to run them.\`, string Yes - Tool identifier (format: package::exportName) + Tool identifier (format: package::name) diff --git a/apps/web/src/app/sitemap.ts b/apps/web/src/app/sitemap.ts index 13500fb..23bd2a9 100644 --- a/apps/web/src/app/sitemap.ts +++ b/apps/web/src/app/sitemap.ts @@ -67,7 +67,7 @@ export default async function sitemap(): Promise { updatedAt: true, }, }, - exportName: true, + name: true, updatedAt: true, }, orderBy: { @@ -83,7 +83,7 @@ export default async function sitemap(): Promise { tool.updatedAt > tool.package.updatedAt ? tool.updatedAt : tool.package.updatedAt; return { - url: `${baseUrl}/tool/${tool.package.npmPackageName}/${tool.exportName}`, + url: `${baseUrl}/tool/${tool.package.npmPackageName}/${tool.name}`, lastModified, changeFrequency: 'weekly' as const, priority: 0.7, diff --git a/apps/web/src/app/tool/[...slug]/page.tsx b/apps/web/src/app/tool/[...slug]/page.tsx index 6a5ee8d..9c4ae36 100644 --- a/apps/web/src/app/tool/[...slug]/page.tsx +++ b/apps/web/src/app/tool/[...slug]/page.tsx @@ -38,7 +38,7 @@ interface Package { interface Tool { id: string; - exportName: string; + name: string; description: string; parameters: Array<{ name: string; @@ -152,7 +152,7 @@ export default function ToolDetailPage({ const softwareApplicationSchema = { '@context': 'https://schema.org', '@type': 'SoftwareApplication', - name: tool.exportName, + name: tool.name, description: tool.description, applicationCategory: 'DeveloperApplication', operatingSystem: 'Any', @@ -165,7 +165,7 @@ export default function ToolDetailPage({ '@type': authorName ? 'Person' : 'Organization', name: authorName || 'Unknown', }, - url: `https://tpmjs.com/tool/${pkg.npmPackageName}/${tool.exportName}`, + url: `https://tpmjs.com/tool/${pkg.npmPackageName}/${tool.name}`, softwareVersion: pkg.npmVersion, ...(pkg.npmHomepage && { mainEntityOfPage: pkg.npmHomepage }), ...(pkg.npmRepository && @@ -223,7 +223,7 @@ export default function ToolDetailPage({ headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName: tool.package.npmPackageName, - exportName: tool.exportName, + name: tool.name, }), }); @@ -274,7 +274,7 @@ export default function ToolDetailPage({
-

{tool.exportName}

+

{tool.name}

{pkg.npmPackageName}

@@ -409,7 +409,7 @@ export default function ToolDetailPage({

2. Import the tool

@@ -420,11 +420,11 @@ export default function ToolDetailPage({ {/* biome-ignore lint/complexity/noExcessiveCognitiveComplexity: Broken tools page requires conditional rendering for health status */} {tools.map((tool) => { - const toolUrl = `/tool/${tool.package.npmPackageName}/${tool.exportName}`; + const toolUrl = `/tool/${tool.package.npmPackageName}/${tool.name}`; const lastCheckedDate = tool.lastHealthCheck ? new Date(tool.lastHealthCheck) : null; @@ -153,9 +153,7 @@ export default function BrokenToolsPage(): React.ReactElement {
- {tool.exportName !== 'default' - ? tool.exportName - : tool.package.npmPackageName} + {tool.name !== 'default' ? tool.name : tool.package.npmPackageName}
{tool.package.npmPackageName} diff --git a/apps/web/src/app/tool/tool-search/page.tsx b/apps/web/src/app/tool/tool-search/page.tsx index dcfa72f..5ffd61d 100644 --- a/apps/web/src/app/tool/tool-search/page.tsx +++ b/apps/web/src/app/tool/tool-search/page.tsx @@ -17,7 +17,7 @@ import { AppHeader } from '~/components/AppHeader'; interface Tool { id: string; - exportName: string; + name: string; description: string; qualityScore: string; importHealth?: 'HEALTHY' | 'BROKEN' | 'UNKNOWN'; @@ -245,7 +245,7 @@ export default function ToolSearchPage(): React.ReactElement { return ( @@ -254,9 +254,7 @@ export default function ToolSearchPage(): React.ReactElement {
- {tool.exportName !== 'default' - ? tool.exportName - : tool.package.npmPackageName} + {tool.name !== 'default' ? tool.name : tool.package.npmPackageName}
{tool.package.npmPackageName} diff --git a/apps/web/src/components/ToolPlayground.tsx b/apps/web/src/components/ToolPlayground.tsx index 1fdba89..b59986e 100644 --- a/apps/web/src/components/ToolPlayground.tsx +++ b/apps/web/src/components/ToolPlayground.tsx @@ -49,7 +49,7 @@ export function ToolPlayground({ tool }: ToolPlaygroundProps): React.ReactElemen try { const response = await fetch( - `/api/tools/execute/${encodeURIComponent(tool.package.npmPackageName)}/${encodeURIComponent(tool.exportName)}`, + `/api/tools/execute/${encodeURIComponent(tool.package.npmPackageName)}/${encodeURIComponent(tool.name)}`, { method: 'POST', headers: { @@ -196,7 +196,7 @@ export function ToolPlayground({ tool }: ToolPlaygroundProps): React.ReactElemen

Interactive Playground

- Test {tool.package.npmPackageName} ({tool.exportName}) with AI-powered execution + Test {tool.package.npmPackageName} ({tool.name}) with AI-powered execution

{rateLimitInfo && ( diff --git a/apps/web/src/lib/ai-agent/tool-executor-agent.ts b/apps/web/src/lib/ai-agent/tool-executor-agent.ts index 86bb256..6ce7bb8 100644 --- a/apps/web/src/lib/ai-agent/tool-executor-agent.ts +++ b/apps/web/src/lib/ai-agent/tool-executor-agent.ts @@ -97,7 +97,7 @@ export function createToolDefinition(tool: Tool & { package: Package }) { ? (tool.parameters as unknown as TPMJSParameter[]) : []; - console.log('[createToolDefinition] Tool:', tool.package.npmPackageName, '/', tool.exportName); + console.log('[createToolDefinition] Tool:', tool.package.npmPackageName, '/', tool.name); console.log('[createToolDefinition] Parameters array:', JSON.stringify(parameters)); console.log('[createToolDefinition] Parameters length:', parameters.length); @@ -109,7 +109,7 @@ export function createToolDefinition(tool: Tool & { package: Package }) { console.log('[createToolDefinition] Created Zod schema:', inputSchema); - const sanitizedName = sanitizeToolName(`${tool.package.npmPackageName}-${tool.exportName}`); + const sanitizedName = sanitizeToolName(`${tool.package.npmPackageName}-${tool.name}`); // AI SDK v6 tool definition return { @@ -122,7 +122,7 @@ export function createToolDefinition(tool: Tool & { package: Package }) { // Use the actual export name from the Tool record const result = await executePackage( tool.package.npmPackageName, - tool.exportName, // Use actual export name (e.g., "helloWorldTool", "default") + tool.name, // Use actual export name (e.g., "helloWorldTool", "default") params, { timeout: 5000 } ); @@ -197,7 +197,7 @@ export async function executeToolWithAgent( onTokenUpdate?: (tokens: Partial) => void ) { const toolDef = createToolDefinition(tool); - const sanitizedToolName = sanitizeToolName(`${tool.package.npmPackageName}-${tool.exportName}`); + const sanitizedToolName = sanitizeToolName(`${tool.package.npmPackageName}-${tool.name}`); console.log('[executeToolWithAgent] Tool name:', sanitizedToolName); diff --git a/apps/web/src/lib/health-check/health-check-service.ts b/apps/web/src/lib/health-check/health-check-service.ts index 254b0c7..6205140 100644 --- a/apps/web/src/lib/health-check/health-check-service.ts +++ b/apps/web/src/lib/health-check/health-check-service.ts @@ -35,7 +35,7 @@ async function checkImportHealth(tool: Tool & { package: Package }): Promise<{ headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName: tool.package.npmPackageName, - exportName: tool.exportName, + name: tool.name, version: tool.package.npmVersion, env: tool.package.env || {}, }), @@ -118,7 +118,7 @@ async function checkExecutionHealth(tool: Tool & { package: Package }): Promise< headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName: tool.package.npmPackageName, - exportName: tool.exportName, + name: tool.name, version: tool.package.npmVersion, params: testParams, env: tool.package.env || {}, @@ -284,7 +284,7 @@ export async function performHealthCheck( throw new Error(`Tool not found: ${toolId}`); } - console.log(`šŸ„ Health check starting for ${tool.package.npmPackageName}/${tool.exportName}`); + console.log(`šŸ„ Health check starting for ${tool.package.npmPackageName}/${tool.name}`); // Check import health const importResult = await checkImportHealth(tool); diff --git a/apps/web/src/lib/schema-extraction.ts b/apps/web/src/lib/schema-extraction.ts index b42dcf2..61aba95 100644 --- a/apps/web/src/lib/schema-extraction.ts +++ b/apps/web/src/lib/schema-extraction.ts @@ -107,14 +107,14 @@ export type SchemaExtractionResult = SchemaExtractionSuccess | SchemaExtractionF * Extract inputSchema from a tool by calling the executor's /load-and-describe endpoint * * @param packageName - NPM package name (e.g., "@tpmjs/hello-world") - * @param exportName - Export name (e.g., "helloWorldTool" or "default") + * @param name - Export name (e.g., "helloWorldTool" or "default") * @param version - Package version (e.g., "1.0.0") * @param packageEnv - Package-level environment variables (optional) * @returns Schema extraction result with inputSchema or error */ export async function extractToolSchema( packageName: string, - exportName: string, + name: string, version: string, packageEnv?: Record | null ): Promise { @@ -124,7 +124,7 @@ export async function extractToolSchema( headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName, - exportName, + name, version, env: packageEnv || {}, }), diff --git a/manual-tools.ts b/manual-tools.ts index 890d4d2..8813acf 100644 --- a/manual-tools.ts +++ b/manual-tools.ts @@ -767,7 +767,7 @@ export const manualTools: ManualTool[] = [ returns: { type: 'object', description: - 'Search results with tool metadata including packageName, exportName, version, importUrl', + 'Search results with tool metadata including packageName, name, version, importUrl', }, aiAgent: { useCase: @@ -786,7 +786,7 @@ export const manualTools: ManualTool[] = [ npmPackageName: '@airweave/vercel-ai-sdk', category: 'search', frameworks: ['vercel-ai'], - exportName: 'airweaveSearch', + name: 'airweaveSearch', description: 'Provides unified search across all connected data sources using semantic search.', tags: ['search', 'rag', 'data-sources', 'semantic-search'], env: [ @@ -794,7 +794,7 @@ export const manualTools: ManualTool[] = [ name: 'AIRWEAVE_API_KEY', description: 'API key for authenticating with Airweave services.', required: true, - } + }, ], parameters: [ { @@ -802,7 +802,7 @@ export const manualTools: ManualTool[] = [ type: 'string', description: 'The default collection to search within.', required: true, - } + }, ], returns: { type: 'object', diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma index 342c484..6e9ab7d 100644 --- a/packages/db/prisma/schema.prisma +++ b/packages/db/prisma/schema.prisma @@ -62,7 +62,7 @@ model Tool { package Package @relation(fields: [packageId], references: [id], onDelete: Cascade) // Tool Identity - exportName String @map("export_name") @db.VarChar(100) // e.g., "helloWorldTool", "default" + name String @db.VarChar(100) // e.g., "helloWorldTool", "default" // Tool Metadata description String @db.Text @@ -95,7 +95,7 @@ model Tool { simulations Simulation[] healthChecks HealthCheck[] - @@unique([packageId, exportName]) + @@unique([packageId, name]) @@index([qualityScore]) @@index([importHealth]) @@index([executionHealth]) diff --git a/packages/tools/create-basic-tools/src/cli.ts b/packages/tools/create-basic-tools/src/cli.ts index 19b98e2..c0ded42 100644 --- a/packages/tools/create-basic-tools/src/cli.ts +++ b/packages/tools/create-basic-tools/src/cli.ts @@ -61,11 +61,11 @@ export async function runInteractiveCLI(): Promise { const tools = [ { - exportName: 'exampleTool', + name: 'exampleTool', description: 'An example tool - customize this for your use case', }, { - exportName: 'anotherTool', + name: 'anotherTool', description: 'Another example tool - add your implementation here', }, ]; @@ -124,9 +124,9 @@ async function generatePackage(config: GeneratorConfig): Promise ({ - name: tool.exportName, + name: tool.name, description: tool.description, })), ...(tools.some((t) => t.env) && { diff --git a/packages/tools/create-basic-tools/src/generators/readme.ts b/packages/tools/create-basic-tools/src/generators/readme.ts index f9ac3fc..82a5ced 100644 --- a/packages/tools/create-basic-tools/src/generators/readme.ts +++ b/packages/tools/create-basic-tools/src/generators/readme.ts @@ -6,7 +6,7 @@ import type { GeneratorConfig } from '../types.js'; export function generateReadme(config: GeneratorConfig): string { const { packageInfo, tools } = config; - const toolsList = tools.map((tool) => `- **${tool.exportName}**: ${tool.description}`).join('\n'); + const toolsList = tools.map((tool) => `- **${tool.name}**: ${tool.description}`).join('\n'); const usageExample = tools[0]; if (!usageExample) { @@ -32,7 +32,7 @@ ${toolsList} ## Usage \`\`\`typescript -import { ${usageExample.exportName} } from '${packageInfo.name}'; +import { ${usageExample.name} } from '${packageInfo.name}'; import { generateText } from 'ai'; import { openai } from '@ai-sdk/openai'; @@ -40,7 +40,7 @@ const result = await generateText({ model: openai('gpt-4'), prompt: 'Process this text for me', tools: { - ${usageExample.exportName}, + ${usageExample.name}, }, }); diff --git a/packages/tools/create-basic-tools/src/generators/source-code.ts b/packages/tools/create-basic-tools/src/generators/source-code.ts index 2aceab7..ff479d0 100644 --- a/packages/tools/create-basic-tools/src/generators/source-code.ts +++ b/packages/tools/create-basic-tools/src/generators/source-code.ts @@ -4,10 +4,10 @@ import type { ToolDefinition } from '../types.js'; * Generates a single tool file with Zod schema */ export function generateToolFile(tool: ToolDefinition): string { - const { exportName, description } = tool; + const { name, description } = tool; // Generate schema name (capitalize first letter + "Schema") - const schemaName = `${exportName.charAt(0).toUpperCase()}${exportName.slice(1)}Schema`; + const schemaName = `${name.charAt(0).toUpperCase()}${name.slice(1)}Schema`; // Generate simple Zod schema (can be enhanced in advanced mode) const schemaContent = generateSimpleSchema(); @@ -19,7 +19,7 @@ const ${schemaName} = z.object({ ${schemaContent} }); -export const ${exportName} = tool({ +export const ${name} = tool({ description: '${description}', inputSchema: ${schemaName}, async execute(input: z.infer) { @@ -33,7 +33,7 @@ export const ${exportName} = tool({ } // TODO: Implement the tool logic here - console.log('${exportName} called with:', input); + console.log('${name} called with:', input); return { success: true, @@ -61,7 +61,7 @@ function generateSimpleSchema(): string { */ export function generateIndexFile(tools: ToolDefinition[]): string { const exports = tools - .map((tool) => `export { ${tool.exportName} } from './tools/${tool.exportName}.js';`) + .map((tool) => `export { ${tool.name} } from './tools/${tool.name}.js';`) .join('\n'); return `/** diff --git a/packages/tools/create-basic-tools/src/index.ts b/packages/tools/create-basic-tools/src/index.ts index 0a525a1..a2ba57d 100644 --- a/packages/tools/create-basic-tools/src/index.ts +++ b/packages/tools/create-basic-tools/src/index.ts @@ -10,7 +10,7 @@ program .option('--name ', 'Package name (e.g., @myorg/content-tools)') .option('--description ', 'Package description') .option('--category ', 'Tool category') - .option('--tool ', 'Tool definition (format: "exportName:description")') + .option('--tool ', 'Tool definition (format: "name:description")') .option('--output ', 'Output path') .option('--yes', 'Skip confirmation prompt') .action(async (options) => { diff --git a/packages/tools/create-basic-tools/src/prompts/tools.ts b/packages/tools/create-basic-tools/src/prompts/tools.ts index 7e00da0..ecdc61b 100644 --- a/packages/tools/create-basic-tools/src/prompts/tools.ts +++ b/packages/tools/create-basic-tools/src/prompts/tools.ts @@ -55,7 +55,7 @@ export async function promptTools(): Promise { * Prompts for a single tool definition */ async function promptSingleTool(number: number): Promise { - const exportName = await clack.text({ + const name = await clack.text({ message: `Tool #${number} export name`, placeholder: number === 1 ? 'summarizeText' : number === 2 ? 'extractKeywords' : 'myTool', validate: (value) => { @@ -67,7 +67,7 @@ async function promptSingleTool(number: number): Promise }, }); - if (clack.isCancel(exportName)) { + if (clack.isCancel(name)) { return null; } @@ -93,7 +93,7 @@ async function promptSingleTool(number: number): Promise } return { - exportName: exportName as string, + name: name as string, description: description as string, }; } diff --git a/packages/tools/create-basic-tools/src/types.ts b/packages/tools/create-basic-tools/src/types.ts index c414762..8f1cc25 100644 --- a/packages/tools/create-basic-tools/src/types.ts +++ b/packages/tools/create-basic-tools/src/types.ts @@ -3,7 +3,7 @@ */ export interface ToolDefinition { - exportName: string; + name: string; description: string; parameters?: ParameterDefinition[]; returns?: ReturnDefinition; diff --git a/packages/tools/registryExecute/src/index.ts b/packages/tools/registryExecute/src/index.ts index 52ea991..3b674f7 100644 --- a/packages/tools/registryExecute/src/index.ts +++ b/packages/tools/registryExecute/src/index.ts @@ -30,7 +30,7 @@ export const registryExecuteTool = tool({ properties: { toolId: { type: 'string', - description: "Tool identifier from registrySearchTool (format: 'package::exportName')", + description: "Tool identifier from registrySearchTool (format: 'package::name')", }, params: { type: 'object', @@ -49,22 +49,22 @@ export const registryExecuteTool = tool({ additionalProperties: false, }), async execute({ toolId, params, env }) { - // Parse toolId format: "package::exportName" + // Parse toolId format: "package::name" const separatorIndex = toolId.lastIndexOf('::'); if (separatorIndex === -1) { - throw new Error(`Invalid toolId format. Expected "package::exportName", got "${toolId}"`); + throw new Error(`Invalid toolId format. Expected "package::name", got "${toolId}"`); } const packageName = toolId.substring(0, separatorIndex); - const exportName = toolId.substring(separatorIndex + 2); + const name = toolId.substring(separatorIndex + 2); - if (!packageName || !exportName) { - throw new Error(`Invalid toolId format. Expected "package::exportName", got "${toolId}"`); + if (!packageName || !name) { + throw new Error(`Invalid toolId format. Expected "package::name", got "${toolId}"`); } // Fetch tool metadata to get version and importUrl const metaParams = new URLSearchParams({ - q: exportName, + q: name, limit: '10', }); const metaResponse = await fetch(`${TPMJS_API_URL}/api/tools/search?${metaParams}`); @@ -80,7 +80,7 @@ export const registryExecuteTool = tool({ // Find the exact tool match // biome-ignore lint/suspicious/noExplicitAny: API response types vary const toolMeta = toolsArray.find( - (t: any) => t.package.npmPackageName === packageName && t.exportName === exportName + (t: any) => t.package.npmPackageName === packageName && t.name === name ); if (!toolMeta) { @@ -96,7 +96,7 @@ export const registryExecuteTool = tool({ headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ packageName, - exportName, + name, version, importUrl, params, diff --git a/packages/tools/registrySearch/src/index.ts b/packages/tools/registrySearch/src/index.ts index ef52213..1d6247e 100644 --- a/packages/tools/registrySearch/src/index.ts +++ b/packages/tools/registrySearch/src/index.ts @@ -81,10 +81,10 @@ export const registrySearchTool = tool({ // biome-ignore lint/suspicious/noExplicitAny: Tool types from API vary tools: toolsArray.map((t: any) => ({ // Unique identifier for registryExecuteTool - toolId: `${t.package.npmPackageName}::${t.exportName}`, + toolId: `${t.package.npmPackageName}::${t.name}`, // Human-readable info - name: t.exportName, + name: t.name, package: t.package.npmPackageName, description: t.description, category: t.package.category, diff --git a/packages/tools/search-registry/src/index.ts b/packages/tools/search-registry/src/index.ts index 2e488c4..647f69d 100644 --- a/packages/tools/search-registry/src/index.ts +++ b/packages/tools/search-registry/src/index.ts @@ -110,7 +110,7 @@ export const searchTpmjsToolsTool = tool({ tools: toolsArray.map((tool: any) => ({ toolId: tool.id, packageName: tool.package.npmPackageName, - exportName: tool.exportName, + name: tool.name, description: tool.description, category: tool.package.category, qualityScore: tool.qualityScore, diff --git a/scripts/backfill-health-checks.ts b/scripts/backfill-health-checks.ts index 87cfb2c..ca0dd03 100644 --- a/scripts/backfill-health-checks.ts +++ b/scripts/backfill-health-checks.ts @@ -27,7 +27,7 @@ async function main() { const tools = await prisma.tool.findMany({ select: { id: true, - exportName: true, + name: true, package: { select: { npmPackageName: true, @@ -97,7 +97,7 @@ async function main() { OR: [{ importHealth: 'BROKEN' }, { executionHealth: 'BROKEN' }], }, select: { - exportName: true, + name: true, package: { select: { npmPackageName: true, @@ -113,7 +113,7 @@ async function main() { console.log(`\nāš ļø Broken Tools (${brokenTools.length}):`); for (const tool of brokenTools) { console.log( - ` - ${tool.package.npmPackageName}/${tool.exportName} (Import: ${tool.importHealth}, Execution: ${tool.executionHealth})` + ` - ${tool.package.npmPackageName}/${tool.name} (Import: ${tool.importHealth}, Execution: ${tool.executionHealth})` ); if (tool.healthCheckError) { console.log(` Error: ${tool.healthCheckError.slice(0, 100)}...`); diff --git a/sync-hello.ts b/sync-hello.ts index 7f3df6b..2d5e8aa 100644 --- a/sync-hello.ts +++ b/sync-hello.ts @@ -66,14 +66,14 @@ async function syncHello() { for (const toolDef of validation.tools || []) { const tool = await prisma.tool.upsert({ where: { - packageId_exportName: { + packageId_name: { packageId: packageRecord.id, - exportName: toolDef.exportName, + name: toolDef.name, }, }, create: { packageId: packageRecord.id, - exportName: toolDef.exportName, + name: toolDef.name, description: toolDef.description, parameters: toolDef.parameters ? (toolDef.parameters as any) : undefined, returns: toolDef.returns ? (toolDef.returns as any) : undefined, @@ -88,13 +88,12 @@ async function syncHello() { }, }); - console.log(`āœ… Tool upserted: ${tool.exportName} (${tool.id})`); + console.log(`āœ… Tool upserted: ${tool.name} (${tool.id})`); } // Delete orphaned tools const orphanedTools = existingTools.filter( - (existingTool) => - !validation.tools?.some((toolDef) => toolDef.exportName === existingTool.exportName) + (existingTool) => !validation.tools?.some((toolDef) => toolDef.name === existingTool.name) ); if (orphanedTools.length > 0) { diff --git a/sync-manual-tools.ts b/sync-manual-tools.ts index 7885e1f..3fc34cc 100644 --- a/sync-manual-tools.ts +++ b/sync-manual-tools.ts @@ -83,14 +83,14 @@ async function syncManualTools() { // Upsert the tool const tool = await prisma.tool.upsert({ where: { - packageId_exportName: { + packageId_name: { packageId: packageRecord.id, - exportName: manualTool.name, + name: manualTool.name, }, }, create: { packageId: packageRecord.id, - exportName: manualTool.name, + name: manualTool.name, description: manualTool.description, // biome-ignore lint/suspicious/noExplicitAny: Prisma Json type compatibility parameters: manualTool.parameters ? (manualTool.parameters as any) : null, @@ -110,7 +110,7 @@ async function syncManualTools() { }, }); - console.log(` āœ… Tool upserted: ${tool.exportName} (${tool.id})`); + console.log(` āœ… Tool upserted: ${tool.name} (${tool.id})`); processed++; } catch (error) { console.error( diff --git a/test-schema.ts b/test-schema.ts index 902d6cb..8861655 100644 --- a/test-schema.ts +++ b/test-schema.ts @@ -26,20 +26,20 @@ async function testSchema() { const tool1 = await prisma.tool.create({ data: { packageId: pkg.id, - exportName: 'helloWorldTool', + name: 'helloWorldTool', description: 'Returns a simple Hello World greeting', }, }); - console.log(`āœ… Tool 1 created: ${tool1.exportName}`); + console.log(`āœ… Tool 1 created: ${tool1.name}`); const tool2 = await prisma.tool.create({ data: { packageId: pkg.id, - exportName: 'helloNameTool', + name: 'helloNameTool', description: 'Returns a personalized greeting with name', }, }); - console.log(`āœ… Tool 2 created: ${tool2.exportName}\n`); + console.log(`āœ… Tool 2 created: ${tool2.name}\n`); // Test 3: Query package with tools console.log('3. Querying package with tools...'); @@ -49,7 +49,7 @@ async function testSchema() { }); console.log(`āœ… Found package with ${packageWithTools?.tools.length} tools:`); packageWithTools?.tools.forEach((t) => { - console.log(` - ${t.exportName}: ${t.description}`); + console.log(` - ${t.name}: ${t.description}`); }); console.log(); @@ -58,11 +58,11 @@ async function testSchema() { const toolWithPackage = await prisma.tool.findFirst({ where: { package: { npmPackageName: '@test/hello' }, - exportName: 'helloWorldTool', + name: 'helloWorldTool', }, include: { package: true }, }); - console.log(`āœ… Found tool: ${toolWithPackage?.exportName}`); + console.log(`āœ… Found tool: ${toolWithPackage?.name}`); console.log(` Package: ${toolWithPackage?.package.npmPackageName}`); console.log(` Category: ${toolWithPackage?.package.category}\n`);