computer: Add pi-ai and TanStack AI tool sets

Split each tool into a framework-neutral core under tools/common
(schema, description, executor; zod only) and an adapter per agent
library. tools/ai-sdk wraps the core with `tool()` from `ai`;
tools/pi-ai and tools/tanstack-ai build their own shapes from the
same core without importing their libraries, so each entry point
pulls in only what it uses.

The exec core is the one #181 and #182 settled on: `exec` takes a
backend map, every Workspace backend is offered by default, `backend`
appears only when there is a choice, and `input` only when a backend
is callable. All three tool sets resolve options through the same
resolveToolOptions, so they offer the same tools.

The pi and TanStack adapters come from #149.

Co-authored-by: aron <263346377+aron-cf@users.noreply.github.com>

Author: mattzcarey

packages/computer/package.json

@@ -55,6 +55,14 @@
       "types": "./dist/tools/ai-sdk.d.ts",
       "import": "./dist/tools/ai-sdk.js"
     },
+    "./tools/pi-ai": {
+      "types": "./dist/tools/pi-ai.d.ts",
+      "import": "./dist/tools/pi-ai.js"
+    },
+    "./tools/tanstack-ai": {
+      "types": "./dist/tools/tanstack-ai.d.ts",
+      "import": "./dist/tools/tanstack-ai.js"
+    },
     "./backends/container": {
       "types": "./dist/backends/container/index.d.ts",
       "import": "./dist/backends/container/index.js"

packages/computer/rolldown.config.ts

@@ -31,7 +31,9 @@ export default defineConfig({
     "artifacts/index": "src/artifacts/index.ts",
     "assets/index": "src/assets/index.ts",
     "tools/index": "src/tools/index.ts",
-    "tools/ai-sdk": "src/tools/ai-sdk.ts",
+    "tools/ai-sdk": "src/tools/ai-sdk/index.ts",
+    "tools/pi-ai": "src/tools/pi-ai/index.ts",
+    "tools/tanstack-ai": "src/tools/tanstack-ai/index.ts",
     "modules/container": "src/modules/container.ts",
     "modules/git": "src/modules/git.ts",
     "modules/artifacts": "src/modules/artifacts.ts",

packages/computer/src/client.test.ts

@@ -15,7 +15,7 @@ import { WorkerJavaScriptBackend } from "./backends/worker-javascript/worker-jav
 import { getWorkspace, type WorkspaceClient } from "./client.js";
 import type { WorkspaceBackendInfo } from "./runtime/runtime.js";
 import type { WorkspaceModuleBackend } from "./runtime/types.js";
-import { createAITools } from "./tools/ai-sdk.js";
+import { createAITools } from "./tools/ai-sdk/index.js";
 import { WORKSPACE, type WorkspaceStubHost } from "./with-workspace.js";
 import { type ThinkWorkspaceCompatibility, Workspace } from "./workspace.js";
 

packages/computer/src/tools/ai-sdk.ts

@@ -1,11 +1,10 @@
 import { SQLiteTestStorage } from "@cloudflare/dofs/testing";
 import { describe, expect, it } from "vitest";
 import { z } from "zod";
-import { WorkerJavaScriptBackend } from "../backends/worker-javascript/worker-javascript.js";
-import { createGitModule } from "../modules/git.js";
-import type { WorkspaceRuntimeExecHandle, WorkspaceRuntimeResult } from "../runtime/types.js";
-import { Workspace } from "../workspace.js";
-import { createAITools } from "./ai-sdk.js";
+import { WorkerJavaScriptBackend } from "../../backends/worker-javascript/worker-javascript.js";
+import { createGitModule } from "../../modules/git.js";
+import type { WorkspaceRuntimeExecHandle, WorkspaceRuntimeResult } from "../../runtime/types.js";
+import { Workspace } from "../../workspace.js";
 import {
   createDeleteTool,
   createEditTool,
@@ -15,7 +14,8 @@ import {
   createWriteTool,
   type FileStore,
   WorkspaceFileStore,
-} from "./index.js";
+} from "../index.js";
+import { createAITools } from "./index.js";
 
 const toolOptions = { toolCallId: "test-call", messages: [] };
 

…ckages/computer/src/tools/ai-sdk.test.ts …/computer/src/tools/ai-sdk/index.test.tspackages/computer/src/tools/ai-sdk.test.ts renamed to packages/computer/src/tools/ai-sdk/index.test.ts packages/computer/src/tools/ai-sdk.test.ts renamed to packages/computer/src/tools/ai-sdk/index.test.ts

@@ -0,0 +1,66 @@
+import type { ToolSet } from "ai";
+import { type CreateToolsOptions, resolveToolOptions } from "../common/options.js";
+import type { PublishWorkspaceLike } from "../common/publish.js";
+import {
+  createDeleteTool,
+  createEditTool,
+  createExecTool,
+  createFindTool,
+  createGrepTool,
+  createListTool,
+  createPublishTool,
+  createReadTool,
+  createWriteTool,
+} from "./tools.js";
+
+/** Options for {@link createAITools}. */
+export type CreateAIToolsOptions = CreateToolsOptions;
+
+export {
+  createDeleteTool,
+  createEditTool,
+  createExecTool,
+  createFindTool,
+  createGrepTool,
+  createListTool,
+  createPublishTool,
+  createReadTool,
+  createWriteTool,
+} from "./tools.js";
+
+/**
+ * Build the AI SDK tool set for a Workspace: `read`, `ls`, `find`, and
+ * `grep`, plus `write`, `edit`, `delete`, `exec`, and `publish` unless
+ * the set is read-only. `exec` offers every backend the Workspace has
+ * unless `exec` picks them.
+ *
+ * @param options - The Workspace and per-tool options.
+ * @returns An AI SDK `ToolSet` for `generateText`, `streamText`, or an agent's `getTools()`.
+ */
+export function createAITools(options: CreateAIToolsOptions): ToolSet {
+  const resolved = resolveToolOptions(options);
+  const workspace = resolved.workspace;
+
+  const tools: ToolSet = {
+    read: createReadTool(resolved.read),
+    ls: createListTool({ workspace }),
+    find: createFindTool({ workspace }),
+    grep: createGrepTool({ workspace }),
+  };
+
+  if (resolved.readonly) return tools;
+
+  tools.write = createWriteTool(resolved.write);
+  tools.edit = createEditTool(resolved.edit);
+  tools.delete = createDeleteTool(resolved.delete);
+
+  if (resolved.exec !== undefined) {
+    tools.exec = createExecTool(resolved.exec);
+  }
+
+  if (resolved.publish) {
+    tools.publish = createPublishTool({ workspace: workspace as PublishWorkspaceLike });
+  }
+
+  return tools;
+}

packages/computer/src/tools/ai-sdk/index.ts

@@ -0,0 +1,35 @@
+import type { JSONValue } from "ai";
+import type { ModelOutput } from "../common/model-output.js";
+
+export function toAISDKOutput(output: ModelOutput) {
+  switch (output.type) {
+    case "text":
+      return { type: "text" as const, value: output.value };
+    case "error-text":
+      return { type: "error-text" as const, value: output.value };
+    case "json":
+      return { type: "json" as const, value: toJSONValue(output.value) };
+    case "media":
+      return {
+        type: "content" as const,
+        value: [
+          { type: "text" as const, text: output.text },
+          {
+            type: "file" as const,
+            data: { type: "data" as const, data: output.data },
+            mediaType: output.mediaType,
+            filename: output.filename,
+          },
+        ],
+      };
+  }
+}
+
+export function toJSONValue(value: unknown): JSONValue {
+  try {
+    const json = JSON.stringify(value);
+    return json === undefined ? null : (JSON.parse(json) as JSONValue);
+  } catch {
+    return String(value);
+  }
+}