tools system - web-fetch

src/servers/api/pi/pi-bridge.ts

@@ -3,7 +3,7 @@ import { readdirSync, existsSync, mkdirSync } from "node:fs";
 import type { Subprocess } from "bun";
 import type { PiEvent, MessageCost } from "./types";
 import { readApiKeys } from "../server-settings/pi-mono";
-import { PI_CONFIG_DIR, getGlobalSkillsDir, getUserSkillsDir } from "../../data-path";
+import { PI_CONFIG_DIR, getGlobalSkillsDir, getUserSkillsDir, getGlobalExtensionsDir, getUserExtensionsDir, getGlobalToolsDir, getUserToolsDir } from "../../data-path";
 import { ensureDockerContainer } from "../terminal/websocket";
 import { logger } from "./logger";
 
@@ -28,6 +28,25 @@ function collectSkillFlags(email: string): string[] {
   return flags;
 }
 
+function collectExtensionFlags(email: string): string[] {
+  const flags: string[] = [];
+  const dirs = [getGlobalExtensionsDir(), getUserExtensionsDir(email)];
+
+  for (const dir of dirs) {
+    if (!existsSync(dir)) continue;
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const entryFile = join(dir, entry.name, 'index.ts');
+      if (existsSync(entryFile)) {
+        flags.push('--extension', entryFile);
+      }
+    }
+  }
+
+  return flags;
+}
+
 type SandboxOptions = {
   userId: number;
   username: string;
@@ -81,22 +100,29 @@ export async function spawnPi(
   } else {
     const storedKeys = await readApiKeys();
     const skillFlags = collectSkillFlags(email);
-    const args = ['pi', '--mode', 'rpc', '--no-extensions', '--no-skills', '--no-prompt-templates', '--no-themes', ...skillFlags];
+    const extensionFlags = collectExtensionFlags(email);
+    const args = ['pi', '--mode', 'rpc', '--no-skills', '--no-prompt-templates', '--no-themes', ...skillFlags, ...extensionFlags];
     if (model) args.push('--model', model);
 
     if (!existsSync(cwd)) {
       mkdirSync(cwd, { recursive: true });
     }
 
+    const toolsDirs = [getGlobalToolsDir(), getUserToolsDir(email)].join(':');
+
     proc = Bun.spawn(args, {
       cwd,
       stdin: 'pipe',
       stdout: 'pipe',
       stderr: 'pipe',
-      env: { ...process.env, ...storedKeys, PI_CODING_AGENT_DIR: PI_CONFIG_DIR },
+      env: { ...process.env, ...storedKeys, PI_CODING_AGENT_DIR: PI_CONFIG_DIR, PI_TOOLS_DIRS: toolsDirs },
     });
 
-    logger.info('Spawned Pi locally', { model, skills: skillFlags.filter((f) => f !== '--skill').length });
+    logger.info('Spawned Pi locally', {
+      model,
+      skills: skillFlags.filter((f) => f !== '--skill').length,
+      extensions: extensionFlags.filter((f) => f !== '--extension').length,
+    });
   }
 
   // Read stdout JSON event stream (runs in background)