@samrahimi/smol-js 0.7.0 → 0.7.1

package/dist/index.mjs

@@ -724,7 +724,7 @@ Total time: ${(duration / 1e3).toFixed(2)}s`);
   }
   /** Sleep for a specified duration */
   sleep(ms) {
-    return new Promise((resolve6) => setTimeout(resolve6, ms));
+    return new Promise((resolve7) => setTimeout(resolve7, ms));
   }
 };
 
@@ -1393,12 +1393,12 @@ var UserInputTool = class extends Tool {
       input: process.stdin,
       output: process.stdout
     });
-    return new Promise((resolve6) => {
+    return new Promise((resolve7) => {
       rl.question(`
 [Agent asks]: ${question}
 Your response: `, (answer) => {
         rl.close();
-        resolve6(answer);
+        resolve7(answer);
       });
     });
   }
@@ -2727,7 +2727,7 @@ var ExaResearchTool = class extends Tool {
     while (Date.now() - startTime < this.maxPollTime) {
       attempts++;
       if (attempts > 1) {
-        await new Promise((resolve6) => setTimeout(resolve6, this.pollInterval));
+        await new Promise((resolve7) => setTimeout(resolve7, this.pollInterval));
       }
       const statusResponse = await fetch(`https://api.exa.ai/research/v1/${researchId}`, {
         method: "GET",
@@ -2780,6 +2780,7 @@ var ExaResearchTool = class extends Tool {
 
 // src/tools/ProxyTool.ts
 import { spawn } from "child_process";
+import * as path6 from "path";
 
 // src/utils/bunInstaller.ts
 import { execSync } from "child_process";
@@ -2838,10 +2839,12 @@ function whichBun() {
 }
 
 // src/tools/ProxyTool.ts
-var TOOL_OUTPUT_PREFIX = "[TOOL_OUTPUT]";
 var TOOL_RESULT_PREFIX = "[TOOL_RESULT]";
 var TOOL_ERROR_PREFIX = "[TOOL_ERROR]";
 var DEFAULT_TOOL_TIMEOUT_MS = 6e4;
+function resolveHarnessPath() {
+  return path6.resolve(__dirname, "..", "toolHarness.ts");
+}
 var ProxyTool = class extends Tool {
   name;
   description;
@@ -2850,6 +2853,7 @@ var ProxyTool = class extends Tool {
   toolPath;
   timeout;
   bunPath = null;
+  harnessPath = null;
   constructor(config) {
     super();
     this.name = config.name;
@@ -2860,23 +2864,25 @@ var ProxyTool = class extends Tool {
     this.timeout = config.timeout ?? DEFAULT_TOOL_TIMEOUT_MS;
   }
   /**
-   * Ensure Bun is available before first invocation.
+   * Ensure Bun is available and locate the harness before first invocation.
    */
   async setup() {
     this.bunPath = await ensureBunAvailable();
+    this.harnessPath = resolveHarnessPath();
     this.isSetup = true;
   }
   /**
-   * Spawn the tool in a Bun child process, pass serialized args via CLI,
-   * stream stdout back as log lines, and parse the final result.
+   * Spawn the harness in a Bun child process. The harness imports the tool,
+   * calls execute(args), and writes the protocol lines. Any console.log from
+   * the tool flows through stdout as plain lines.
    */
   async execute(args) {
-    if (!this.bunPath) {
+    if (!this.bunPath || !this.harnessPath) {
       await this.setup();
     }
     const serializedArgs = JSON.stringify(args);
-    return new Promise((resolve6, reject) => {
-      const child = spawn(this.bunPath, ["run", this.toolPath, serializedArgs], {
+    return new Promise((resolve7, reject) => {
+      const child = spawn(this.bunPath, ["run", this.harnessPath, this.toolPath, serializedArgs], {
         stdio: ["pipe", "pipe", "pipe"],
         env: { ...process.env }
       });
@@ -2941,12 +2947,12 @@ ${logBuffer.join("\n")}
 [Tool result]
 `;
             if (typeof result === "string") {
-              resolve6(logPrefix + result);
+              resolve7(logPrefix + result);
             } else {
-              resolve6({ logs: logBuffer.join("\n"), result });
+              resolve7({ logs: logBuffer.join("\n"), result });
             }
           } else {
-            resolve6(result);
+            resolve7(result);
           }
           return;
         }
@@ -2956,7 +2962,7 @@ ${logBuffer.join("\n")}
             `Custom tool "${this.name}" exited with code ${code}. Output: ${combined || "(none)"}`
           ));
         } else {
-          resolve6(combined || `Tool "${this.name}" produced no output.`);
+          resolve7(combined || `Tool "${this.name}" produced no output.`);
         }
       });
       child.on("error", (err) => {
@@ -2967,7 +2973,7 @@ ${logBuffer.join("\n")}
       });
     });
   }
-  // --- internal line parser ---
+  // --- line parser: protocol is spoken by harness, interpreted here ---
   processLine(line, handlers) {
     const trimmed = line.trimEnd();
     if (!trimmed) return;
@@ -2980,8 +2986,6 @@ ${logBuffer.join("\n")}
       }
     } else if (trimmed.startsWith(TOOL_ERROR_PREFIX)) {
       handlers.onError(trimmed.slice(TOOL_ERROR_PREFIX.length).trim());
-    } else if (trimmed.startsWith(TOOL_OUTPUT_PREFIX)) {
-      handlers.onOutput(trimmed.slice(TOOL_OUTPUT_PREFIX.length).trim());
     } else {
       handlers.onOutput(trimmed);
     }
@@ -2990,7 +2994,7 @@ ${logBuffer.join("\n")}
 
 // src/tools/CustomToolScanner.ts
 import * as fs6 from "fs";
-import * as path6 from "path";
+import * as path7 from "path";
 var METADATA_REGEX = /export\s+const\s+TOOL_METADATA\s*=\s*(\{[\s\S]*?\});\s*$/m;
 function scanCustomTools(folderPath) {
   if (!fs6.existsSync(folderPath)) {
@@ -3002,10 +3006,10 @@ function scanCustomTools(folderPath) {
   const discovered = [];
   for (const entry of entries) {
     if (entry.isDirectory()) continue;
-    const ext = path6.extname(entry.name).toLowerCase();
+    const ext = path7.extname(entry.name).toLowerCase();
     if (ext !== ".ts" && ext !== ".js") continue;
-    const filePath = path6.resolve(folderPath, entry.name);
-    const baseName = path6.basename(entry.name, ext);
+    const filePath = path7.resolve(folderPath, entry.name);
+    const baseName = path7.basename(entry.name, ext);
     let metadata;
     try {
       metadata = extractMetadata(filePath);
@@ -3073,7 +3077,7 @@ function loadCustomTools(folderPath) {
 
 // src/orchestrator/YAMLLoader.ts
 import * as fs7 from "fs";
-import * as path7 from "path";
+import * as path8 from "path";
 import YAML from "yaml";
 var TOOL_REGISTRY = {
   read_file: ReadFileTool,
@@ -3105,7 +3109,7 @@ var YAMLLoader = class {
    * Load a workflow from a YAML file path.
    */
   loadFromFile(filePath) {
-    const absolutePath = path7.isAbsolute(filePath) ? filePath : path7.resolve(process.cwd(), filePath);
+    const absolutePath = path8.isAbsolute(filePath) ? filePath : path8.resolve(process.cwd(), filePath);
     if (!fs7.existsSync(absolutePath)) {
       throw new Error(`Workflow file not found: ${absolutePath}`);
     }