refactor: streamline query requests and session storage

2026-11-09 18:49:32 +08:00
parent 6279a4b555
commit 5ee93329a4
25 changed files with 111 additions and 100 deletions
@@ -203,7 +203,8 @@ export class McpQueryClient {
    if (!owner.context.projectId || owner.context.projectKey.startsWith("personal-") || !owner.context.purpose || !["ordinary_chat", "task_execution", "task_collaboration"].includes(owner.context.purpose)) throw error(403, "Project query context required");
    // No model-supplied identity, scope, bearer or Server URL can pass this boundary.
    const schema = this.catalog().find((tool) => tool.name === name)!.inputSchema;
-    const budget = queryTimeouts(this.tools.find((tool) => tool.name === name)!, args);
+    const definition = this.tools.find((tool) => tool.name === name)!;
+    const budget = queryTimeouts(definition, args);
    const reserved = new Set(["context_handle", "authorization", "headers", "project_id", "projectId", "network", "url", "server_url", "user_id", "subject", "client_id", "purpose", "native_session_id", "parent_session_id", "task_id", "scope", "scopes"]);
    if (Object.keys(args).some((key) => reserved.has(key) || !Object.hasOwn(schema.properties ?? {}, key))) throw error(400, "Unknown query parameter");
    const token = await this.userToken(owner.runtimeSessionId, owner.context.projectId, signal);
@@ -223,8 +224,7 @@ export class McpQueryClient {
    const handle = body.context_handle;
    try {
      return await this.withClient(token.token, project, signal, async (client) => {
-        await client.listTools(undefined, { signal, timeout: 5000 });
-        return client.callTool({ name, arguments: { ...args, ...(this.tools.find((tool) => tool.name === name)!.inputSchema.properties?.timeout_seconds ? { timeout_seconds: budget.serverMs / 1000 } : {}), context_handle: handle }, _meta: { "io.tjwater/callId": callId } }, { signal, timeout: budget.callMs });
+        return client.callTool({ name, arguments: { ...args, ...(definition.inputSchema.properties?.timeout_seconds ? { timeout_seconds: budget.serverMs / 1000 } : {}), context_handle: handle }, _meta: { "io.tjwater/callId": callId } }, { signal, timeout: budget.callMs, toolDefinition: definition });
      }, budget.callMs);
    } finally {
      // Expiry remains authoritative if transport cancellation prevents revocation.