PR Custody

Handle ToolRouter aliases and historical tool slugs

@shreysingla11checks n/achecks…fix/toolrouter-alias-historical-slugs → master11 files · +689 −52review: @sohamganatrareview: @kaavee315review: @anshugarg15updated 1w ago

GitHub

▸Description

Summary

This PR makes ToolRouter tolerant of Mercury tool renames and historical deletions without exposing deleted tools as currently executable session tools.

Changes included:

Extends Thermos tool enum listing with optional include_aliases and include_all_versions query params while preserving the existing default behavior.
Updates ToolRouter session config validation to accept current aliases and slugs that existed historically for the same toolkit bucket.
Keeps validation strict for never-known slugs and slugs placed under the wrong toolkit bucket.
Updates preload create/read behavior so historical-only preloads remain in stored config but are skipped from visible tool_router_tools and session /tools output.
Makes execution denylist checks alias-aware by checking both the requested slug and the canonical alias_of slug.
Adds focused Apollo unit tests and Thermos service-isolation coverage for enum alias/all-version behavior.

Behavioral Invariants

Public list/discovery endpoints remain canonical/latest by default and do not expose aliases unless explicitly requested through the new internal enum options.
ToolRouter accepts old alias slugs as input across session configuration and runtime surfaces.
Alias and canonical slugs are treated as the same underlying tool for allow/deny behavior.
Historical-only slugs for the same toolkit do not break session creation or patching.
Deleted historical tools are not exposed as currently executable tools and may fail at execution time with tool-not-found.
Slugs that never existed, or belong to another toolkit bucket, are still rejected.

Compatibility

The new Thermos query params are optional and default to the previous behavior. Apollo uses them only for ToolRouter validation paths that need alias/historical awareness.

Testing

Passed:

cd apps/apollo && pnpm exec oxfmt src/lib/toolRouterV2/features/session/create.ts src/lib/toolRouterV2/features/session/helpers/validateSessionConfigFields.ts src/lib/toolRouterV2/features/session/helpers/validateSessionConfigFields.unit.test.ts src/lib/toolRouterV2/utils/preload.ts src/lib/toolRouterV2/utils/preload.unit.test.ts src/lib/toolRouterV2/features/execution/executeForSessionRPC.ts src/lib/tool_execution/execute_tool.ts src/generated/thermos/types.gen.ts src/generated/thermos/services.gen.ts
cd apps/thermos && gofmt -w handlers/tools/enums.go ent/registrydb/utils/tool.go service_isolation/tool_alias_versioning_test.go
cd apps/apollo && pnpm exec vitest run src/lib/toolRouterV2/utils/preload.unit.test.ts --config vitest.unit.config.ts (39 tests)
cd apps/apollo && pnpm exec vitest run src/lib/toolRouterV2/features/session/helpers/validateSessionConfigFields.unit.test.ts --config vitest.unit.config.ts (14 tests)
cd apps/thermos && go test ./handlers/tools ./ent/registrydb/utils
Local HTTP probe with Todoist alias/historical fixtures: create, GET session, patch, /tools, execute, wrong-toolkit rejection, and never-known rejection all matched the intended invariant.
cd apps/apollo && pnpm lint completed with 0 errors and existing warnings only.

Known existing blockers observed locally:

cd apps/apollo && pnpm exec tsgo --noEmit --pretty false still fails on existing unrelated test type issues in tool_router_e2e.test.ts, restrictionConfig.test.ts, link_flow_scenario.test.ts, and session/[session_id]/execute.test.ts.
cd apps/thermos && go test -tags service_isolation ./service_isolation -run 'TestAlias_ListToolEnumsByGroup' could not run locally because the service-isolation DB on localhost:54112 was not available.

loading diff…