6bf8bebf51
CI / Test and Build (push) Failing after 1s
CI / Migrate Dev DB (push) Has been skipped
CI / Migrate DB (push) Has been skipped
CodeQL / Analyze actions (push) Has been cancelled
CodeQL / Analyze javascript-typescript (push) Has been cancelled
CI / Detect Version (push) Has been cancelled
CI / Detect Desktop Changes (push) Has been cancelled
CI / Build AMD64 (blacksmith-2vcpu-ubuntu-2404, ./docker/cron.Dockerfile, ubuntu-latest, ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Build AMD64 (blacksmith-2vcpu-ubuntu-2404, ./docker/db.Dockerfile, ECR_MIGRATIONS, ubuntu-latest, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (blacksmith-4vcpu-ubuntu-2404, ./docker/pii.Dockerfile, ECR_PII, ubuntu-latest, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (blacksmith-4vcpu-ubuntu-2404, ./docker/realtime.Dockerfile, ECR_REALTIME, ubuntu-latest, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build AMD64 (blacksmith-8vcpu-ubuntu-2404, ./docker/app.Dockerfile, ECR_APP, linux-x64-8-core, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/cron.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/db.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/pii.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/realtime.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-8vcpu-ubuntu-2404-arm, ./docker/app.Dockerfile, linux-arm64-8-core, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
Helm Chart / Lint, test, and validate chart (push) Has been cancelled
Helm Chart / Chart version bumped (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Build Dev ECR (blacksmith-8vcpu-ubuntu-2404, ./docker/app.Dockerfile, ECR_APP, linux-x64-8-core) (push) Has been cancelled
CI / Promote Images (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-2vcpu-ubuntu-2404, ./docker/db.Dockerfile, ECR_MIGRATIONS, ubuntu-latest) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-4vcpu-ubuntu-2404, ./docker/pii.Dockerfile, ECR_PII, ubuntu-latest) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-4vcpu-ubuntu-2404, ./docker/realtime.Dockerfile, ECR_REALTIME, ubuntu-latest) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Check Desktop Signing Secrets (push) Has been cancelled
CI / Desktop Release (push) Has been cancelled
CI / Create Desktop Prerelease (push) Has been cancelled
CI / Desktop Prerelease Build (push) Has been cancelled
CI / Publish Desktop Prerelease (push) Has been cancelled
CI / Prune Desktop Prereleases (push) Has been cancelled
Helm Chart / Install on kind and run helm test (push) Has been cancelled
70 lines
2.5 KiB
TypeScript
70 lines
2.5 KiB
TypeScript
/**
|
|
* Normalizes a tool ID by stripping resource ID suffix (UUID/tableId).
|
|
* Workflow tools: 'workflow_executor_<uuid>' -> 'workflow_executor'
|
|
* Knowledge tools: 'knowledge_search_<uuid>' -> 'knowledge_search'
|
|
* Table tools: 'table_query_rows_<tableId>' -> 'table_query_rows'
|
|
*
|
|
* Pure string utility — no server dependencies, safe to import in client components.
|
|
*/
|
|
|
|
/**
|
|
* A trailing `_v2`-style segment is a VERSION marker, not a resource id, so it
|
|
* must not be stripped: `table_query_rows_v2` is its own registered tool, and
|
|
* normalizing it to `table_query_rows` silently executes the v1 tool's request
|
|
* shape under the v2 tool's name.
|
|
*/
|
|
const VERSION_SUFFIX = /^v\d+$/
|
|
|
|
/**
|
|
* Longest id first, so a versioned op claims its own suffixed ids before the
|
|
* unversioned prefix can match them (`table_query_rows_v2_<tableId>` must
|
|
* normalize to `table_query_rows_v2`, not `table_query_rows`).
|
|
*/
|
|
function stripResourceSuffix(toolId: string, ops: string[]): string | null {
|
|
for (const op of [...ops].sort((a, b) => b.length - a.length)) {
|
|
if (!toolId.startsWith(`${op}_`) || toolId.length <= op.length + 1) continue
|
|
if (VERSION_SUFFIX.test(toolId.slice(op.length + 1))) continue
|
|
return op
|
|
}
|
|
return null
|
|
}
|
|
|
|
export function normalizeToolId(toolId: string): string {
|
|
// Custom (deploy-as-block) tools: 'deployed_block_executor_custom_block_<id>' ->
|
|
// 'deployed_block_executor'. Note the id deliberately does NOT start with
|
|
// `custom_` — that prefix is the user-defined custom-tool namespace
|
|
// (`isCustomTool`), and colliding with it misroutes resolution and permissions.
|
|
if (
|
|
toolId.startsWith('deployed_block_executor_') &&
|
|
toolId.length > 'deployed_block_executor_'.length
|
|
) {
|
|
return 'deployed_block_executor'
|
|
}
|
|
|
|
if (toolId.startsWith('workflow_executor_') && toolId.length > 'workflow_executor_'.length) {
|
|
return 'workflow_executor'
|
|
}
|
|
|
|
const knowledgeOps = ['knowledge_search', 'knowledge_upload_chunk', 'knowledge_create_document']
|
|
const knowledge = stripResourceSuffix(toolId, knowledgeOps)
|
|
if (knowledge) return knowledge
|
|
|
|
const tableOps = [
|
|
'table_query_rows',
|
|
'table_query_rows_v2',
|
|
'table_insert_row',
|
|
'table_batch_insert_rows',
|
|
'table_update_row',
|
|
'table_update_rows_by_filter',
|
|
'table_delete_rows_by_filter',
|
|
'table_upsert_row',
|
|
'table_get_row',
|
|
'table_delete_row',
|
|
'table_get_schema',
|
|
]
|
|
const table = stripResourceSuffix(toolId, tableOps)
|
|
if (table) return table
|
|
|
|
return toolId
|
|
}
|