@samrahimi/smol-js 0.7.0 → 0.7.1

package/dist/cli.js

@@ -25,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/cli.ts
 var fs8 = __toESM(require("fs"));
-var path8 = __toESM(require("path"));
+var path9 = __toESM(require("path"));
 var readline = __toESM(require("readline"));
 var import_chalk3 = __toESM(require("chalk"));
 var import_dotenv = __toESM(require("dotenv"));
@@ -755,7 +755,7 @@ Total time: ${(duration / 1e3).toFixed(2)}s`);
   }
   /** Sleep for a specified duration */
   sleep(ms) {
-    return new Promise((resolve7) => setTimeout(resolve7, ms));
+    return new Promise((resolve8) => setTimeout(resolve8, ms));
   }
 };
 
@@ -2707,7 +2707,7 @@ var ExaResearchTool = class extends Tool {
     while (Date.now() - startTime < this.maxPollTime) {
       attempts++;
       if (attempts > 1) {
-        await new Promise((resolve7) => setTimeout(resolve7, this.pollInterval));
+        await new Promise((resolve8) => setTimeout(resolve8, this.pollInterval));
       }
       const statusResponse = await fetch(`https://api.exa.ai/research/v1/${researchId}`, {
         method: "GET",
@@ -3337,10 +3337,11 @@ var Orchestrator = class {
 
 // src/tools/CustomToolScanner.ts
 var fs7 = __toESM(require("fs"));
-var path7 = __toESM(require("path"));
+var path8 = __toESM(require("path"));
 
 // src/tools/ProxyTool.ts
 var import_child_process2 = require("child_process");
+var path7 = __toESM(require("path"));
 
 // src/utils/bunInstaller.ts
 var import_child_process = require("child_process");
@@ -3399,10 +3400,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 path7.resolve(__dirname, "..", "toolHarness.ts");
+}
 var ProxyTool = class extends Tool {
   name;
   description;
@@ -3411,6 +3414,7 @@ var ProxyTool = class extends Tool {
   toolPath;
   timeout;
   bunPath = null;
+  harnessPath = null;
   constructor(config) {
     super();
     this.name = config.name;
@@ -3421,23 +3425,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((resolve7, reject) => {
-      const child = (0, import_child_process2.spawn)(this.bunPath, ["run", this.toolPath, serializedArgs], {
+    return new Promise((resolve8, reject) => {
+      const child = (0, import_child_process2.spawn)(this.bunPath, ["run", this.harnessPath, this.toolPath, serializedArgs], {
         stdio: ["pipe", "pipe", "pipe"],
         env: { ...process.env }
       });
@@ -3502,12 +3508,12 @@ ${logBuffer.join("\n")}
 [Tool result]
 `;
             if (typeof result === "string") {
-              resolve7(logPrefix + result);
+              resolve8(logPrefix + result);
             } else {
-              resolve7({ logs: logBuffer.join("\n"), result });
+              resolve8({ logs: logBuffer.join("\n"), result });
             }
           } else {
-            resolve7(result);
+            resolve8(result);
           }
           return;
         }
@@ -3517,7 +3523,7 @@ ${logBuffer.join("\n")}
             `Custom tool "${this.name}" exited with code ${code}. Output: ${combined || "(none)"}`
           ));
         } else {
-          resolve7(combined || `Tool "${this.name}" produced no output.`);
+          resolve8(combined || `Tool "${this.name}" produced no output.`);
         }
       });
       child.on("error", (err) => {
@@ -3528,7 +3534,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;
@@ -3541,8 +3547,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);
     }
@@ -3561,10 +3565,10 @@ function scanCustomTools(folderPath) {
   const discovered = [];
   for (const entry of entries) {
     if (entry.isDirectory()) continue;
-    const ext = path7.extname(entry.name).toLowerCase();
+    const ext = path8.extname(entry.name).toLowerCase();
     if (ext !== ".ts" && ext !== ".js") continue;
-    const filePath = path7.resolve(folderPath, entry.name);
-    const baseName = path7.basename(entry.name, ext);
+    const filePath = path8.resolve(folderPath, entry.name);
+    const baseName = path8.basename(entry.name, ext);
     let metadata;
     try {
       metadata = extractMetadata(filePath);
@@ -3718,7 +3722,7 @@ async function runCommand(args) {
   if (outputFormat === "json" && !runId) {
     runId = `run-${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
   }
-  const resolvedPath = path8.isAbsolute(filePath) ? filePath : path8.resolve(process.cwd(), filePath);
+  const resolvedPath = path9.isAbsolute(filePath) ? filePath : path9.resolve(process.cwd(), filePath);
   if (!fs8.existsSync(resolvedPath)) {
     if (outputFormat === "json") {
       console.log(JSON.stringify({
@@ -3749,7 +3753,7 @@ async function runCommand(args) {
     }
   }
   if (cwd) {
-    const resolvedCwd = path8.isAbsolute(cwd) ? cwd : path8.resolve(process.cwd(), cwd);
+    const resolvedCwd = path9.isAbsolute(cwd) ? cwd : path9.resolve(process.cwd(), cwd);
     if (!fs8.existsSync(resolvedCwd)) {
       fs8.mkdirSync(resolvedCwd, { recursive: true });
     }
@@ -3762,7 +3766,7 @@ async function runCommand(args) {
     cwd: cwd || void 0
   });
   if (customToolsFolder) {
-    const resolvedToolsFolder = path8.isAbsolute(customToolsFolder) ? customToolsFolder : path8.resolve(process.cwd(), customToolsFolder);
+    const resolvedToolsFolder = path9.isAbsolute(customToolsFolder) ? customToolsFolder : path9.resolve(process.cwd(), customToolsFolder);
     if (outputFormat !== "json") {
       console.log(import_chalk3.default.gray(`
 Scanning custom tools in: ${resolvedToolsFolder}
@@ -3816,7 +3820,7 @@ async function validateCommand(args) {
     process.exit(1);
   }
   const filePath = args[0];
-  const resolvedPath = path8.isAbsolute(filePath) ? filePath : path8.resolve(process.cwd(), filePath);
+  const resolvedPath = path9.isAbsolute(filePath) ? filePath : path9.resolve(process.cwd(), filePath);
   if (!fs8.existsSync(resolvedPath)) {
     console.error(import_chalk3.default.red(`Error: file not found: ${resolvedPath}`));
     process.exit(1);
@@ -3840,10 +3844,10 @@ function promptUser(question) {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     rl.question(import_chalk3.default.cyan(question), (answer) => {
       rl.close();
-      resolve7(answer);
+      resolve8(answer);
     });
   });
 }