Restore tool metadata responses

Author: RhysSullivan

apps/cli/src/main.ts

@@ -1065,29 +1065,28 @@ const runCallHelp = (
       ? tools.find((tool) => tool.id === inspection.exactPath)
       : undefined;
 
-    const exactToolSchema = exactTool
-      ? yield* client.tools
-          .schema({
-            params: {
-              scopeId: scopeInfo.id,
-              toolId: exactTool.id,
-            },
-          })
-          .pipe(Effect.catchCause(() => Effect.succeed(undefined)))
-      : undefined;
-
     if (exactTool && inspection.children.length === 0) {
+      const schema = yield* client.tools
+        .schema({
+          params: {
+            scopeId: scopeInfo.id,
+            toolId: exactTool.id,
+          },
+        })
+        .pipe(
+          Effect.map((result) => ({
+            inputTypeScript: result.inputTypeScript,
+            outputTypeScript: result.outputTypeScript,
+          })),
+          Effect.catchCause(() => Effect.succeed(undefined)),
+        );
+
       yield* printCallLeafHelp({
         tool: {
           id: exactTool.id,
-          description: exactToolSchema?.description,
+          description: exactTool.description,
         },
-        schema: exactToolSchema
-          ? {
-              inputTypeScript: exactToolSchema.inputTypeScript,
-              outputTypeScript: exactToolSchema.outputTypeScript,
-            }
-          : undefined,
+        schema,
       });
       return;
     }
@@ -1107,7 +1106,7 @@ const runCallHelp = (
       exactTool: exactTool
         ? {
             id: exactTool.id,
-            description: exactToolSchema?.description,
+            description: exactTool.description,
           }
         : undefined,
     });

apps/cloud/src/services/sources-refresh.node.test.ts

@@ -123,8 +123,8 @@ describe("sources.refresh (HTTP)", () => {
           }),
         );
         expect(beforeTools.length).toBe(1);
-        expect(beforeTools.some((t) => t.id.startsWith(`${namespace}.ping.`))).toBe(true);
-        expect(beforeTools.some((t) => t.id.startsWith(`${namespace}.pong.`))).toBe(false);
+        expect(beforeTools.some((t) => t.name.startsWith("ping"))).toBe(true);
+        expect(beforeTools.some((t) => t.name.startsWith("pong"))).toBe(false);
 
         // Flip the remote to v2 (adds `pong`) and trigger refresh.
         server.setSpec(specV2);
@@ -144,8 +144,8 @@ describe("sources.refresh (HTTP)", () => {
           }),
         );
         expect(afterTools.length).toBe(2);
-        expect(afterTools.some((t) => t.id.startsWith(`${namespace}.ping.`))).toBe(true);
-        expect(afterTools.some((t) => t.id.startsWith(`${namespace}.pong.`))).toBe(true);
+        expect(afterTools.some((t) => t.name.startsWith("ping"))).toBe(true);
+        expect(afterTools.some((t) => t.name.startsWith("pong"))).toBe(true);
       }),
     ),
   );

apps/cloud/src/services/tenant-isolation.node.test.ts

@@ -140,6 +140,7 @@ describe("tenant isolation (HTTP)", () => {
       const orgBTools = yield* asOrg(orgB, (client) =>
         client.tools.list({ params: { scopeId: ScopeId.make(orgB) } }),
       );
+      expect(orgBTools.map((t) => t.sourceId)).not.toContain(namespaceA);
       for (const id of orgBTools.map((t) => t.id)) {
         expect(id).not.toContain(namespaceA);
       }

packages/core/api/src/handlers/sources.ts

@@ -61,9 +61,13 @@ export const SourcesHandlers = HttpApiBuilder.group(ExecutorApi, "sources", (han
           });
           return tools.map((t) => ({
             id: ToolId.make(t.id),
-            ...(t.annotations?.requiresApproval !== undefined
-              ? { requiresApproval: t.annotations.requiresApproval }
-              : {}),
+            pluginId: t.pluginId,
+            sourceId: t.sourceId,
+            name: t.name,
+            description: t.description,
+            mayElicit: t.annotations?.mayElicit,
+            requiresApproval: t.annotations?.requiresApproval,
+            approvalDescription: t.annotations?.approvalDescription,
           }));
         }),
       ),

packages/core/api/src/handlers/tools.ts

@@ -21,9 +21,12 @@ export const ToolsHandlers = HttpApiBuilder.group(ExecutorApi, "tools", (handler
           });
           return tools.map((t) => ({
             id: ToolId.make(t.id),
-            ...(t.annotations?.requiresApproval !== undefined
-              ? { requiresApproval: t.annotations.requiresApproval }
-              : {}),
+            pluginId: t.pluginId,
+            sourceId: t.sourceId,
+            name: t.name,
+            description: t.description,
+            mayElicit: t.annotations?.mayElicit,
+            requiresApproval: t.annotations?.requiresApproval,
           }));
         }),
       ),

packages/core/api/src/sources/api.ts

@@ -40,9 +40,15 @@ const SourceRefreshResponse = Schema.Struct({
 
 const ToolMetadataResponse = Schema.Struct({
   id: ToolId,
+  pluginId: Schema.String,
+  sourceId: Schema.String,
+  name: Schema.String,
+  description: Schema.optional(Schema.String),
+  mayElicit: Schema.optional(Schema.Boolean),
   /** Plugin-derived default approval annotation. Surfaces in the UI as
    *  the "default" policy when no user `tool_policy` rule matches. */
   requiresApproval: Schema.optional(Schema.Boolean),
+  approvalDescription: Schema.optional(Schema.String),
 });
 
 const DetectRequest = Schema.Struct({

packages/core/api/src/tools/api.ts

@@ -17,6 +17,11 @@ const PathParams = {
 
 const ToolMetadataResponse = Schema.Struct({
   id: ToolId,
+  pluginId: Schema.String,
+  sourceId: Schema.String,
+  name: Schema.String,
+  description: Schema.optional(Schema.String),
+  mayElicit: Schema.optional(Schema.Boolean),
   requiresApproval: Schema.optional(Schema.Boolean),
 });