botinabox 2.16.5 → 2.16.6

package/dist/index.js

@@ -2101,6 +2101,144 @@ ${list}`);
   return sections.join("\n\n");
 }
 
+// src/core/orchestrator/execution-engine.ts
+function formatContextFilesBlock(files) {
+  if (!files || files.length === 0) return "";
+  return files.map((f) => `<file path="${f.path}">
+${f.content}
+</file>`).join("\n\n");
+}
+async function registerExecutionEngine(opts) {
+  const { db, hooks, runs, config } = opts;
+  const model = config.model ?? "claude-sonnet-4-20250514";
+  const maxIterations = config.maxIterations ?? 5;
+  const includeContext = config.includeSystemContext ?? true;
+  const systemContext = includeContext ? await buildSystemContext(db) : "";
+  const toolDefs = (config.tools ?? []).map((t) => t.definition);
+  const toolHandlers = new Map(
+    (config.tools ?? []).map((t) => [t.definition.name, t.handler])
+  );
+  async function tryExecuteTask(taskId, hintAgentId) {
+    const task = await db.get("tasks", { id: taskId });
+    if (!task || task.status !== "todo") return;
+    const nextRetryAt = task["next_retry_at"];
+    if (nextRetryAt && new Date(nextRetryAt) > /* @__PURE__ */ new Date()) return;
+    const assigneeId = hintAgentId ?? task.assignee_id;
+    if (!assigneeId) return;
+    if (runs.isLocked(assigneeId)) return;
+    const agent = await db.get("agents", { id: assigneeId });
+    if (!agent) return;
+    let runId;
+    try {
+      runId = await runs.startRun(assigneeId, taskId, "api");
+    } catch {
+      return;
+    }
+    const prompt = task.description ?? task.title ?? "";
+    try {
+      const taskModel = config.resolveModel ? config.resolveModel({ agent, task }) ?? model : model;
+      const contextFiles = config.resolveContextFiles ? await config.resolveContextFiles({ agent, task }) : [];
+      const contextFilesBlock = formatContextFilesBlock(contextFiles);
+      const toolListing = toolDefs.length > 0 ? `
+## Available Tools
+${toolDefs.map((t) => `- **${t.name}**: ${t.description}`).join("\n")}
+
+Use your tools to take action. Do NOT describe what you would do \u2014 call the tool.` : "";
+      const systemPrompt = [
+        `You are ${agent.name}, an AI agent with role: ${agent.role}.`,
+        systemContext ? `
+${systemContext}` : "",
+        contextFilesBlock ? `
+${contextFilesBlock}` : "",
+        toolListing,
+        config.systemPromptSuffix ?? ""
+      ].filter(Boolean).join("\n");
+      const messages = [{ role: "user", content: prompt }];
+      let finalOutput = "";
+      let totalInput = 0;
+      let totalOutput = 0;
+      const systemField = config.cacheSystemPrompt ? [
+        {
+          type: "text",
+          text: systemPrompt,
+          cache_control: { type: "ephemeral" }
+        }
+      ] : systemPrompt;
+      for (let i = 0; i < maxIterations; i++) {
+        const createParams = {
+          model: taskModel,
+          max_tokens: 4096,
+          system: systemField,
+          messages
+        };
+        if (toolDefs.length > 0) {
+          createParams.tools = toolDefs;
+          createParams.tool_choice = i === 0 ? { type: "any" } : { type: "auto" };
+        }
+        const response = await config.client.messages.create(createParams);
+        totalInput += response.usage.input_tokens;
+        totalOutput += response.usage.output_tokens;
+        const textBlocks = response.content.filter((b) => b.type === "text").map((b) => b.text ?? "");
+        if (textBlocks.length > 0) finalOutput += textBlocks.join("");
+        if (response.stop_reason !== "tool_use") break;
+        const toolUseBlocks = response.content.filter((b) => b.type === "tool_use");
+        const toolResults = [];
+        for (const toolUse of toolUseBlocks) {
+          const handler = toolHandlers.get(toolUse.name);
+          if (handler) {
+            try {
+              const result = await handler(
+                toolUse.input,
+                { taskId, agentId: assigneeId, hooks, db, resolveFilePath: config.resolveFilePath }
+              );
+              toolResults.push({ type: "tool_result", tool_use_id: toolUse.id, content: result });
+            } catch (err) {
+              toolResults.push({
+                type: "tool_result",
+                tool_use_id: toolUse.id,
+                content: `Error: ${err instanceof Error ? err.message : String(err)}`
+              });
+            }
+          }
+        }
+        messages.push({ role: "assistant", content: response.content });
+        messages.push({ role: "user", content: toolResults });
+      }
+      const costCents = Math.round((totalInput * 0.3 + totalOutput * 1.5) / 100);
+      await runs.finishRun(runId, {
+        exitCode: 0,
+        output: finalOutput,
+        costCents,
+        usage: { inputTokens: totalInput, outputTokens: totalOutput },
+        model: taskModel,
+        provider: "anthropic"
+      });
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      await runs.finishRun(runId, { exitCode: 1, output: `Execution error: ${msg}` });
+    }
+  }
+  hooks.register("task.created", async (ctx) => {
+    const taskId = ctx.id ?? ctx.taskId;
+    if (!taskId) return;
+    await tryExecuteTask(taskId);
+  });
+  hooks.register("agent.wakeup", async (ctx) => {
+    const taskId = ctx.taskId;
+    const agentId = ctx.agentId;
+    if (!taskId) return;
+    await tryExecuteTask(taskId, agentId);
+  });
+  hooks.register("run.completed", async (ctx) => {
+    const agentId = ctx.agentId;
+    if (!agentId) return;
+    const pendingTasks = (await db.query("tasks", { where: { status: "todo" } })).filter((t) => t["assignee_id"] === agentId).sort((a, b) => a["priority"] - b["priority"]);
+    if (pendingTasks.length > 0) {
+      await tryExecuteTask(pendingTasks[0]["id"], agentId);
+    }
+  });
+}
+
 // src/core/chat/chat-pipeline-v2.ts
 var DEFAULT_DEDUP_WINDOW_MS2 = 5 * 60 * 1e3;
 var DEFAULT_MAX_ITERATIONS = 5;
@@ -2193,6 +2331,19 @@ var ChatPipelineV2 = class {
           if (ctx2) systemPrompt += `
 
 ${ctx2}`;
+        }
+        if (this.config.resolveContextFiles) {
+          const contextFiles = await this.config.resolveContextFiles({
+            channelId,
+            threadId: threadTs,
+            userId: msg.from,
+            messageText: msg.body,
+            channel: this.channel
+          });
+          const contextFilesBlock = formatContextFilesBlock(contextFiles);
+          if (contextFilesBlock) systemPrompt += `
+
+${contextFilesBlock}`;
         }
         const { text, tasksDispatched } = await this.think(
           systemPrompt,
@@ -6592,144 +6743,6 @@ var GateRunner = class {
   }
 };
 
-// src/core/orchestrator/execution-engine.ts
-function formatContextFilesBlock(files) {
-  if (!files || files.length === 0) return "";
-  return files.map((f) => `<file path="${f.path}">
-${f.content}
-</file>`).join("\n\n");
-}
-async function registerExecutionEngine(opts) {
-  const { db, hooks, runs, config } = opts;
-  const model = config.model ?? "claude-sonnet-4-20250514";
-  const maxIterations = config.maxIterations ?? 5;
-  const includeContext = config.includeSystemContext ?? true;
-  const systemContext = includeContext ? await buildSystemContext(db) : "";
-  const toolDefs = (config.tools ?? []).map((t) => t.definition);
-  const toolHandlers = new Map(
-    (config.tools ?? []).map((t) => [t.definition.name, t.handler])
-  );
-  async function tryExecuteTask(taskId, hintAgentId) {
-    const task = await db.get("tasks", { id: taskId });
-    if (!task || task.status !== "todo") return;
-    const nextRetryAt = task["next_retry_at"];
-    if (nextRetryAt && new Date(nextRetryAt) > /* @__PURE__ */ new Date()) return;
-    const assigneeId = hintAgentId ?? task.assignee_id;
-    if (!assigneeId) return;
-    if (runs.isLocked(assigneeId)) return;
-    const agent = await db.get("agents", { id: assigneeId });
-    if (!agent) return;
-    let runId;
-    try {
-      runId = await runs.startRun(assigneeId, taskId, "api");
-    } catch {
-      return;
-    }
-    const prompt = task.description ?? task.title ?? "";
-    try {
-      const taskModel = config.resolveModel ? config.resolveModel({ agent, task }) ?? model : model;
-      const contextFiles = config.resolveContextFiles ? await config.resolveContextFiles({ agent, task }) : [];
-      const contextFilesBlock = formatContextFilesBlock(contextFiles);
-      const toolListing = toolDefs.length > 0 ? `
-## Available Tools
-${toolDefs.map((t) => `- **${t.name}**: ${t.description}`).join("\n")}
-
-Use your tools to take action. Do NOT describe what you would do \u2014 call the tool.` : "";
-      const systemPrompt = [
-        `You are ${agent.name}, an AI agent with role: ${agent.role}.`,
-        systemContext ? `
-${systemContext}` : "",
-        contextFilesBlock ? `
-${contextFilesBlock}` : "",
-        toolListing,
-        config.systemPromptSuffix ?? ""
-      ].filter(Boolean).join("\n");
-      const messages = [{ role: "user", content: prompt }];
-      let finalOutput = "";
-      let totalInput = 0;
-      let totalOutput = 0;
-      const systemField = config.cacheSystemPrompt ? [
-        {
-          type: "text",
-          text: systemPrompt,
-          cache_control: { type: "ephemeral" }
-        }
-      ] : systemPrompt;
-      for (let i = 0; i < maxIterations; i++) {
-        const createParams = {
-          model: taskModel,
-          max_tokens: 4096,
-          system: systemField,
-          messages
-        };
-        if (toolDefs.length > 0) {
-          createParams.tools = toolDefs;
-          createParams.tool_choice = i === 0 ? { type: "any" } : { type: "auto" };
-        }
-        const response = await config.client.messages.create(createParams);
-        totalInput += response.usage.input_tokens;
-        totalOutput += response.usage.output_tokens;
-        const textBlocks = response.content.filter((b) => b.type === "text").map((b) => b.text ?? "");
-        if (textBlocks.length > 0) finalOutput += textBlocks.join("");
-        if (response.stop_reason !== "tool_use") break;
-        const toolUseBlocks = response.content.filter((b) => b.type === "tool_use");
-        const toolResults = [];
-        for (const toolUse of toolUseBlocks) {
-          const handler = toolHandlers.get(toolUse.name);
-          if (handler) {
-            try {
-              const result = await handler(
-                toolUse.input,
-                { taskId, agentId: assigneeId, hooks, db, resolveFilePath: config.resolveFilePath }
-              );
-              toolResults.push({ type: "tool_result", tool_use_id: toolUse.id, content: result });
-            } catch (err) {
-              toolResults.push({
-                type: "tool_result",
-                tool_use_id: toolUse.id,
-                content: `Error: ${err instanceof Error ? err.message : String(err)}`
-              });
-            }
-          }
-        }
-        messages.push({ role: "assistant", content: response.content });
-        messages.push({ role: "user", content: toolResults });
-      }
-      const costCents = Math.round((totalInput * 0.3 + totalOutput * 1.5) / 100);
-      await runs.finishRun(runId, {
-        exitCode: 0,
-        output: finalOutput,
-        costCents,
-        usage: { inputTokens: totalInput, outputTokens: totalOutput },
-        model: taskModel,
-        provider: "anthropic"
-      });
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      await runs.finishRun(runId, { exitCode: 1, output: `Execution error: ${msg}` });
-    }
-  }
-  hooks.register("task.created", async (ctx) => {
-    const taskId = ctx.id ?? ctx.taskId;
-    if (!taskId) return;
-    await tryExecuteTask(taskId);
-  });
-  hooks.register("agent.wakeup", async (ctx) => {
-    const taskId = ctx.taskId;
-    const agentId = ctx.agentId;
-    if (!taskId) return;
-    await tryExecuteTask(taskId, agentId);
-  });
-  hooks.register("run.completed", async (ctx) => {
-    const agentId = ctx.agentId;
-    if (!agentId) return;
-    const pendingTasks = (await db.query("tasks", { where: { status: "todo" } })).filter((t) => t["assignee_id"] === agentId).sort((a, b) => a["priority"] - b["priority"]);
-    if (pendingTasks.length > 0) {
-      await tryExecuteTask(pendingTasks[0]["id"], agentId);
-    }
-  });
-}
-
 // src/core/orchestrator/tools/send-file.ts
 import { existsSync as existsSync3 } from "fs";
 import { basename } from "path";

package/package.json

@@ -1,100 +1,100 @@
-{
-  "name": "botinabox",
-  "version": "2.16.5",
-  "description": "Bot in a Box — framework for building multi-agent bots",
-  "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    },
-    "./anthropic": {
-      "import": "./dist/providers/anthropic/index.js",
-      "types": "./dist/providers/anthropic/index.d.ts"
-    },
-    "./openai": {
-      "import": "./dist/providers/openai/index.js",
-      "types": "./dist/providers/openai/index.d.ts"
-    },
-    "./ollama": {
-      "import": "./dist/providers/ollama/index.js",
-      "types": "./dist/providers/ollama/index.d.ts"
-    },
-    "./slack": {
-      "import": "./dist/channels/slack/index.js",
-      "types": "./dist/channels/slack/index.d.ts"
-    },
-    "./discord": {
-      "import": "./dist/channels/discord/index.js",
-      "types": "./dist/channels/discord/index.d.ts"
-    },
-    "./webhook": {
-      "import": "./dist/channels/webhook/index.js",
-      "types": "./dist/channels/webhook/index.d.ts"
-    },
-    "./google": {
-      "import": "./dist/connectors/google/index.js",
-      "types": "./dist/connectors/google/index.d.ts"
-    }
-  },
-  "bin": {
-    "botinabox": "./bin/botinabox.mjs"
-  },
-  "files": [
-    "dist",
-    "bin"
-  ],
-  "engines": {
-    "node": ">=18"
-  },
-  "scripts": {
-    "build": "tsup && tsc --emitDeclarationOnly",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit",
-    "check-docs": "echo 'Documentation check passed'",
-    "prepublishOnly": "npm run build && npm run typecheck && npm test"
-  },
-  "dependencies": {
-    "@types/uuid": "^10.0.0",
-    "ajv": "^8.17.1",
-    "cron-parser": "^4.9.0",
-    "latticesql": "^1.13.9",
-    "uuid": "^13.0.0",
-    "yaml": "^2.7.0"
-  },
-  "optionalDependencies": {
-    "whisper-node": "^1.1.1"
-  },
-  "peerDependencies": {
-    "@anthropic-ai/sdk": "^0.52.0",
-    "googleapis": ">=140.0.0 <200.0.0",
-    "openai": "^4.104.0"
-  },
-  "peerDependenciesMeta": {
-    "@anthropic-ai/sdk": {
-      "optional": true
-    },
-    "openai": {
-      "optional": true
-    },
-    "googleapis": {
-      "optional": true
-    }
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/automated-industries/botinabox.git"
-  },
-  "devDependencies": {
-    "@anthropic-ai/sdk": "^0.52.0",
-    "@types/better-sqlite3": "^7.6.12",
-    "@types/node": "^22.10.0",
-    "googleapis": "^171.4.0",
-    "openai": "^4.104.0",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2",
-    "vitest": "^3.0.0"
-  }
-}
+{
+  "name": "botinabox",
+  "version": "2.16.6",
+  "description": "Bot in a Box — framework for building multi-agent bots",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./anthropic": {
+      "import": "./dist/providers/anthropic/index.js",
+      "types": "./dist/providers/anthropic/index.d.ts"
+    },
+    "./openai": {
+      "import": "./dist/providers/openai/index.js",
+      "types": "./dist/providers/openai/index.d.ts"
+    },
+    "./ollama": {
+      "import": "./dist/providers/ollama/index.js",
+      "types": "./dist/providers/ollama/index.d.ts"
+    },
+    "./slack": {
+      "import": "./dist/channels/slack/index.js",
+      "types": "./dist/channels/slack/index.d.ts"
+    },
+    "./discord": {
+      "import": "./dist/channels/discord/index.js",
+      "types": "./dist/channels/discord/index.d.ts"
+    },
+    "./webhook": {
+      "import": "./dist/channels/webhook/index.js",
+      "types": "./dist/channels/webhook/index.d.ts"
+    },
+    "./google": {
+      "import": "./dist/connectors/google/index.js",
+      "types": "./dist/connectors/google/index.d.ts"
+    }
+  },
+  "bin": {
+    "botinabox": "./bin/botinabox.mjs"
+  },
+  "files": [
+    "dist",
+    "bin"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "scripts": {
+    "build": "tsup && tsc --emitDeclarationOnly",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit",
+    "check-docs": "echo 'Documentation check passed'",
+    "prepublishOnly": "npm run build && npm run typecheck && npm test"
+  },
+  "dependencies": {
+    "@types/uuid": "^10.0.0",
+    "ajv": "^8.17.1",
+    "cron-parser": "^4.9.0",
+    "latticesql": "^1.13.9",
+    "uuid": "^13.0.0",
+    "yaml": "^2.7.0"
+  },
+  "optionalDependencies": {
+    "whisper-node": "^1.1.1"
+  },
+  "peerDependencies": {
+    "@anthropic-ai/sdk": "^0.52.0",
+    "googleapis": ">=140.0.0 <200.0.0",
+    "openai": "^4.104.0"
+  },
+  "peerDependenciesMeta": {
+    "@anthropic-ai/sdk": {
+      "optional": true
+    },
+    "openai": {
+      "optional": true
+    },
+    "googleapis": {
+      "optional": true
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/automated-industries/botinabox.git"
+  },
+  "devDependencies": {
+    "@anthropic-ai/sdk": "^0.52.0",
+    "@types/better-sqlite3": "^7.6.12",
+    "@types/node": "^22.10.0",
+    "googleapis": "^171.4.0",
+    "openai": "^4.104.0",
+    "tsup": "^8.3.5",
+    "typescript": "^5.7.2",
+    "vitest": "^3.0.0"
+  }
+}