botinabox 2.16.16 → 2.16.18

package/dist/core/chat/chat-pipeline-v2.d.ts

@@ -117,6 +117,27 @@ export interface ChatPipelineV2Config {
         messageText: string;
         channel: string;
     }) => Promise<ContextFile[]> | ContextFile[];
+    /**
+     * Optional per-turn tool-context resolver. Called once per inbound message
+     * with the resolved conversation coordinates (the same shape passed to
+     * `resolveContextFiles`). The returned fields are merged into the
+     * `ToolContext` handed to every tool handler for that turn — letting an app
+     * thread per-turn identity (e.g. which user the primary agent is acting on
+     * behalf of) into tool execution, which the static config cannot express.
+     *
+     * The base `ToolContext` fields (`taskId`, `agentId`, `hooks`, `db`,
+     * `resolveFilePath`) are applied first and cannot be overridden by the
+     * resolver — returned keys that collide with them are ignored. If the
+     * resolver throws, the error propagates to the turn's try/catch and fails
+     * loudly; there is no silent fallback.
+     */
+    resolveToolContext?: (ctx: {
+        channelId: string;
+        threadId: string;
+        userId?: string;
+        messageText: string;
+        channel: string;
+    }) => Promise<Record<string, unknown>> | Record<string, unknown>;
 }
 export declare class ChatPipelineV2 {
     private db;

package/dist/core/orchestrator/secret-store.d.ts

@@ -41,6 +41,17 @@ export declare class SecretStore {
     set(input: SecretInput): Promise<SecretMeta>;
     get(name: string, environment?: string): Promise<string | null>;
     getMeta(name: string, environment?: string): Promise<SecretMeta | null>;
+    /**
+     * Fetch the most recently created live row for (name, environment).
+     *
+     * `set()` keeps this to a single row in steady state, but we still pick the
+     * newest in JS rather than rely on a SQL `LIMIT 1` (nondeterministic without
+     * an ORDER BY) or a dialect/version-specific `orderBy` form: legacy data
+     * written before the upsert fix can still have duplicate live rows, and JS
+     * sorting resolves them deterministically across SQLite and Postgres. (Same
+     * cross-dialect-sort rationale as the chat memory resolver.)
+     */
+    private _latestRow;
     list(): Promise<SecretMeta[]>;
     rotate(name: string, newValue: string, environment?: string): Promise<void>;
     delete(name: string, environment?: string): Promise<void>;

package/dist/index.js

@@ -2345,13 +2345,24 @@ ${ctx2}`;
 
 ${contextFilesBlock}`;
         }
+        let toolContextExtra = {};
+        if (this.config.resolveToolContext) {
+          toolContextExtra = await this.config.resolveToolContext({
+            channelId,
+            threadId: threadTs,
+            userId: msg.from,
+            messageText: msg.body,
+            channel: this.channel
+          }) ?? {};
+        }
         const { text, tasksDispatched } = await this.think(
           systemPrompt,
           history,
           msg.body,
           threadTs,
           channelId,
-          msg.attachmentBlocks
+          msg.attachmentBlocks,
+          toolContextExtra
         );
         await this.hooks.emit("typing.stop", { channel: this.channel, threadId: threadTs });
         if (text) {
@@ -2399,7 +2410,7 @@ ${contextFilesBlock}`;
   /**
    * Primary agent tool loop — adapted from ExecutionEngine pattern.
    */
-  async think(systemPrompt, history, currentMessage, threadTs, channelId, attachmentBlocks) {
+  async think(systemPrompt, history, currentMessage, threadTs, channelId, attachmentBlocks, toolContextExtra) {
     const model = this.config.model ?? "claude-sonnet-4-6";
     const maxIterations = this.config.maxIterations ?? DEFAULT_MAX_ITERATIONS;
     const maxTokens = this.config.maxTokens ?? DEFAULT_MAX_TOKENS;
@@ -2432,6 +2443,9 @@ ${contextFilesBlock}`;
         if (handler) {
           try {
             const toolCtx = {
+              // Per-turn extras first; base fields applied last so the
+              // resolver can never override taskId/agentId/hooks/db.
+              ...toolContextExtra,
               taskId: "",
               agentId: "primary",
               hooks: this.hooks,
@@ -7510,35 +7524,65 @@ var SecretStore = class {
     this.encKey = encryptionKey ? deriveEncKey(encryptionKey) : null;
   }
   async set(input) {
-    const id = uuidv42();
-    const data = { ...input, id };
-    if (this.encKey && data.value) {
-      data.value = encryptValue(data.value, this.encKey);
+    const environment = input.environment ?? "production";
+    const value = this.encKey && input.value ? encryptValue(input.value, this.encKey) : input.value;
+    const existing = await this.db.query("secrets", {
+      where: { name: input.name, environment },
+      filters: [{ col: "deleted_at", op: "isNull" }],
+      limit: 1
+    });
+    if (existing.length > 0) {
+      const id2 = existing[0].id;
+      const changes = {
+        value,
+        environment,
+        updated_at: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      if (input.type !== void 0) changes.type = input.type;
+      if (input.description !== void 0) changes.description = input.description;
+      await this.db.update("secrets", id2, changes);
+      await this.hooks.emit("secret.updated", { name: input.name });
+      const updated = await this.db.get("secrets", id2);
+      return this._toMeta(updated);
     }
-    await this.db.insert("secrets", data);
+    const id = uuidv42();
+    await this.db.insert("secrets", { ...input, id, value, environment });
     await this.hooks.emit("secret.created", { name: input.name });
     const inserted = await this.db.get("secrets", id);
     return this._toMeta(inserted);
   }
   async get(name, environment = "production") {
-    const rows = await this.db.query("secrets", {
-      where: { name, environment },
-      filters: [{ col: "deleted_at", op: "isNull" }],
-      limit: 1
-    });
-    if (rows.length === 0) return null;
+    const row = await this._latestRow(name, environment);
+    if (!row) return null;
     await this.hooks.emit("secret.accessed", { name, environment });
-    const raw = rows[0].value ?? null;
+    const raw = row.value ?? null;
     if (raw && this.encKey) return decryptValue(raw, this.encKey);
     return raw;
   }
   async getMeta(name, environment = "production") {
+    const row = await this._latestRow(name, environment);
+    return row ? this._toMeta(row) : null;
+  }
+  /**
+   * Fetch the most recently created live row for (name, environment).
+   *
+   * `set()` keeps this to a single row in steady state, but we still pick the
+   * newest in JS rather than rely on a SQL `LIMIT 1` (nondeterministic without
+   * an ORDER BY) or a dialect/version-specific `orderBy` form: legacy data
+   * written before the upsert fix can still have duplicate live rows, and JS
+   * sorting resolves them deterministically across SQLite and Postgres. (Same
+   * cross-dialect-sort rationale as the chat memory resolver.)
+   */
+  async _latestRow(name, environment) {
     const rows = await this.db.query("secrets", {
       where: { name, environment },
-      filters: [{ col: "deleted_at", op: "isNull" }],
-      limit: 1
+      filters: [{ col: "deleted_at", op: "isNull" }]
     });
-    return rows.length > 0 ? this._toMeta(rows[0]) : null;
+    if (rows.length === 0) return void 0;
+    rows.sort(
+      (a, b) => String(b.created_at ?? "").localeCompare(String(a.created_at ?? ""))
+    );
+    return rows[0];
   }
   async list() {
     const rows = await this.db.query("secrets", {

package/package.json

@@ -1,100 +1,100 @@
-{
-  "name": "botinabox",
-  "version": "2.16.16",
-  "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.16.4",
-    "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.18",
+  "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.16.4",
+    "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"
+  }
+}