@elizaos/agent 2.0.3-beta.2 → 2.0.3-beta.4

package/runtime/web-search-tools.js

@@ -18,15 +18,29 @@
  * OpenAI, which is what makes the `openai.responses` branch fire.
  *
  * Controlled by:
- *   ELIZA_WEB_SEARCH=0|false|off  — disable (default: enabled)
+ *   ELIZA_WEB_SEARCH=0|false|off         — disable every web-search surface
+ *   ELIZA_SERVER_WEB_SEARCH=1|true|on    — enable provider-native injection
  */
 import { createRequire } from "node:module";
 import { logger } from "@elizaos/core";
 const require = createRequire(import.meta.url);
-const ENABLED = (() => {
-    const raw = process.env.ELIZA_WEB_SEARCH?.toLowerCase();
-    return !(raw === "0" || raw === "false" || raw === "off");
-})();
+function readBooleanEnv(name) {
+    const raw = process.env[name]?.trim().toLowerCase();
+    if (raw === undefined || raw.length === 0)
+        return undefined;
+    if (raw === "0" || raw === "false" || raw === "off" || raw === "no") {
+        return false;
+    }
+    if (raw === "1" || raw === "true" || raw === "on" || raw === "yes") {
+        return true;
+    }
+    return undefined;
+}
+export function isServerSideWebSearchEnabled() {
+    if (readBooleanEnv("ELIZA_WEB_SEARCH") === false)
+        return false;
+    return readBooleanEnv("ELIZA_SERVER_WEB_SEARCH") === true;
+}
 const PROVIDERS = [
     {
         label: "anthropic",
@@ -102,6 +116,9 @@ function shouldSkip(params) {
         return true;
     return false;
 }
+export function __shouldSkipServerSideWebSearchForTests(params) {
+    return shouldSkip(params);
+}
 function wrapFn(original, name) {
     const wrapped = function patchedAiFn(...args) {
         if (args.length > 0 && args[0] && typeof args[0] === "object") {
@@ -143,12 +160,23 @@ function patchAiSdk() {
         logger.warn("[web-search] Could not require('ai') — skipping patch");
         return;
     }
-    patched = true;
+    let patchedAny = false;
     for (const name of ["generateText", "streamText"]) {
         if (typeof aiModule[name] === "function") {
-            aiModule[name] = wrapFn(aiModule[name], name);
+            try {
+                aiModule[name] = wrapFn(aiModule[name], name);
+                patchedAny = true;
+            }
+            catch (err) {
+                logger.warn(`[web-search] Could not patch ai.${name}: ${err instanceof Error ? err.message : String(err)}`);
+            }
         }
     }
+    if (!patchedAny) {
+        logger.warn("[web-search] No AI SDK text functions were patched");
+        return;
+    }
+    patched = true;
     logger.info("[web-search] Patched ai.generateText/streamText for server-side web search auto-injection");
 }
 // ---------------------------------------------------------------------------
@@ -162,8 +190,8 @@ function patchAiSdk() {
  * and every provider on the runtime. Call after plugins are registered.
  */
 export function installServerSideWebSearch() {
-    if (!ENABLED) {
-        logger.info("[web-search] Disabled via ELIZA_WEB_SEARCH env var");
+    if (!isServerSideWebSearchEnabled()) {
+        logger.info("[web-search] Provider-native server search disabled; set ELIZA_SERVER_WEB_SEARCH=1 to enable");
         return;
     }
     patchAiSdk();

package/security/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./access.ts";
-export * from "./audit-log.ts";
-export * from "./network-policy.ts";
+export * from "./access.js";
+export * from "./audit-log.js";
+export * from "./network-policy.js";
 //# sourceMappingURL=index.d.ts.map

package/services/approval/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Runtime owner-approval queue: enqueue/list/resolve outbound-action approvals
+ * over the `approval_requests` table (owned by `@elizaos/plugin-sql`, public
+ * schema), surfaced through the registered {@link ApprovalService}.
+ */
+export { APPROVAL_SERVICE, ApprovalService, resolveApprovalService, } from "./service.js";
+export { createApprovalQueue, PgApprovalQueue } from "./store.js";
+export { type ApprovalAction, type ApprovalChannel, type ApprovalEnqueueInput, type ApprovalListFilter, ApprovalNotFoundError, type ApprovalPayload, type ApprovalQueue, type ApprovalQueueOptions, type ApprovalRequest, type ApprovalRequestState, type ApprovalResolution, ApprovalStateTransitionError, type ApprovalTravelCalendarSync, type ApprovalTravelPassenger, } from "./types.js";
+//# sourceMappingURL=index.d.ts.map

package/services/approval/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/approval/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,sBAAsB,GACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,4BAA4B,EAC5B,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,GAC7B,MAAM,YAAY,CAAC"}

package/services/approval/index.js

@@ -0,0 +1,8 @@
+/**
+ * Runtime owner-approval queue: enqueue/list/resolve outbound-action approvals
+ * over the `approval_requests` table (owned by `@elizaos/plugin-sql`, public
+ * schema), surfaced through the registered {@link ApprovalService}.
+ */
+export { APPROVAL_SERVICE, ApprovalService, resolveApprovalService, } from "./service.js";
+export { createApprovalQueue, PgApprovalQueue } from "./store.js";
+export { ApprovalNotFoundError, ApprovalStateTransitionError, } from "./types.js";

package/services/approval/service.d.ts

@@ -0,0 +1,35 @@
+/**
+ * ApprovalService — the runtime-owned owner-approval queue, exposed as a
+ * registered runtime service.
+ *
+ * The approval queue is a runtime primitive: any plugin (LifeOps outbound
+ * sends, document signatures, travel booking, …) consumes it via
+ * `runtime.getService(...)` rather than constructing the DB-backed queue
+ * itself. The service is a thin factory over {@link PgApprovalQueue}, backed by
+ * the `approval_requests` table owned by `@elizaos/plugin-sql` (public schema);
+ * the `agentId` is the multi-tenant partition key and defaults to
+ * `runtime.agentId`.
+ *
+ * Mirrors `KnowledgeGraphService` (lifecycle + getService accessor).
+ */
+import { type IAgentRuntime, Service } from "@elizaos/core";
+import type { ApprovalQueue } from "./types.js";
+export declare const APPROVAL_SERVICE = "eliza_approval";
+export declare class ApprovalService extends Service {
+    static serviceType: string;
+    capabilityDescription: string;
+    static start(runtime: IAgentRuntime): Promise<ApprovalService>;
+    stop(): Promise<void>;
+    /**
+     * Per-agent approval queue. `agentId` partitions the queue; it defaults to
+     * the runtime's agent id and may be overridden for admin/multi-tenant
+     * access.
+     */
+    getQueue(agentId?: string): ApprovalQueue;
+}
+/**
+ * Resolve the registered {@link ApprovalService}. Returns `null` when the
+ * runtime has not registered it (e.g. the "eliza" plugin is absent).
+ */
+export declare function resolveApprovalService(runtime: IAgentRuntime): ApprovalService | null;
+//# sourceMappingURL=service.d.ts.map

package/services/approval/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/services/approval/service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,KAAK,aAAa,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,eAAO,MAAM,gBAAgB,mBAAmB,CAAC;AAEjD,qBAAa,eAAgB,SAAQ,OAAO;IAC1C,OAAgB,WAAW,SAAoB;IAEtC,qBAAqB,SAC+F;WAEhH,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAI9D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAE3B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,GAAE,MAA6B,GAAG,aAAa;CAGhE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,aAAa,GACrB,eAAe,GAAG,IAAI,CAExB"}

package/services/approval/service.js

@@ -0,0 +1,40 @@
+/**
+ * ApprovalService — the runtime-owned owner-approval queue, exposed as a
+ * registered runtime service.
+ *
+ * The approval queue is a runtime primitive: any plugin (LifeOps outbound
+ * sends, document signatures, travel booking, …) consumes it via
+ * `runtime.getService(...)` rather than constructing the DB-backed queue
+ * itself. The service is a thin factory over {@link PgApprovalQueue}, backed by
+ * the `approval_requests` table owned by `@elizaos/plugin-sql` (public schema);
+ * the `agentId` is the multi-tenant partition key and defaults to
+ * `runtime.agentId`.
+ *
+ * Mirrors `KnowledgeGraphService` (lifecycle + getService accessor).
+ */
+import { Service } from "@elizaos/core";
+import { createApprovalQueue } from "./store.js";
+export const APPROVAL_SERVICE = "eliza_approval";
+export class ApprovalService extends Service {
+    static serviceType = APPROVAL_SERVICE;
+    capabilityDescription = "Runtime owner-approval queue: enqueue/list/resolve outbound-action approvals over the plugin-sql approval_requests table";
+    static async start(runtime) {
+        return new ApprovalService(runtime);
+    }
+    async stop() { }
+    /**
+     * Per-agent approval queue. `agentId` partitions the queue; it defaults to
+     * the runtime's agent id and may be overridden for admin/multi-tenant
+     * access.
+     */
+    getQueue(agentId = this.runtime.agentId) {
+        return createApprovalQueue(this.runtime, { agentId });
+    }
+}
+/**
+ * Resolve the registered {@link ApprovalService}. Returns `null` when the
+ * runtime has not registered it (e.g. the "eliza" plugin is absent).
+ */
+export function resolveApprovalService(runtime) {
+    return runtime.getService(APPROVAL_SERVICE);
+}

package/services/approval/sql.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Self-contained raw-SQL helpers for the runtime approval queue.
+ *
+ * The approval store issues raw SQL against the agent's database adapter over
+ * the `approval_requests` table owned by `@elizaos/plugin-sql` (public schema).
+ * This is the minimal subset of encoders/parsers/runners the store needs; it is
+ * intentionally local to `@elizaos/agent` so the runtime approval queue carries
+ * no dependency on plugin-side SQL glue. Mirrors `knowledge-graph/sql.ts`.
+ */
+import type { IAgentRuntime } from "@elizaos/core";
+export declare function toText(value: unknown, fallback?: string): string;
+export declare function parseJsonRecord(value: unknown): Record<string, unknown>;
+export declare function executeRawSql(runtime: IAgentRuntime, sqlText: string): Promise<Array<Record<string, unknown>>>;
+export declare function sqlQuote(value: string): string;
+export declare function sqlText(value: string | null | undefined): string;
+export declare function sqlInteger(value: number | null | undefined): string;
+export declare function sqlJson(value: unknown): string;
+//# sourceMappingURL=sql.d.ts.map

package/services/approval/sql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../../src/services/approval/sql.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiBnD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,SAAK,GAAG,MAAM,CAI5D;AAsBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMvE;AAkCD,wBAAsB,aAAa,CACjC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAKzC;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAGhE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAInE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE9C"}

package/services/approval/sql.js

@@ -0,0 +1,104 @@
+/**
+ * Self-contained raw-SQL helpers for the runtime approval queue.
+ *
+ * The approval store issues raw SQL against the agent's database adapter over
+ * the `approval_requests` table owned by `@elizaos/plugin-sql` (public schema).
+ * This is the minimal subset of encoders/parsers/runners the store needs; it is
+ * intentionally local to `@elizaos/agent` so the runtime approval queue carries
+ * no dependency on plugin-side SQL glue. Mirrors `knowledge-graph/sql.ts`.
+ */
+let cachedSqlRaw = null;
+function asObject(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    return value;
+}
+export function toText(value, fallback = "") {
+    if (typeof value === "string")
+        return value;
+    if (value === null || value === undefined)
+        return fallback;
+    return String(value);
+}
+function isMissingJsonValue(value) {
+    return value === null || value === undefined || value === "";
+}
+function parseJsonValue(value, fallback) {
+    if (isMissingJsonValue(value))
+        return fallback;
+    if (typeof value !== "string") {
+        if (typeof value === "object")
+            return value;
+        throw new Error(`[ApprovalSql] Expected JSON string or object, received ${typeof value}`);
+    }
+    try {
+        return JSON.parse(value);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`[ApprovalSql] Invalid JSON value: ${message}`);
+    }
+}
+export function parseJsonRecord(value) {
+    if (isMissingJsonValue(value))
+        return {};
+    const parsed = parseJsonValue(value, null);
+    const object = asObject(parsed);
+    if (object)
+        return object;
+    throw new Error("[ApprovalSql] Expected JSON object");
+}
+function extractRows(result) {
+    if (Array.isArray(result)) {
+        return result
+            .map((row) => asObject(row))
+            .filter((row) => row !== null);
+    }
+    const object = asObject(result);
+    if (!object)
+        return [];
+    const rows = object.rows;
+    if (!Array.isArray(rows))
+        return [];
+    return rows
+        .map((row) => asObject(row))
+        .filter((row) => row !== null);
+}
+async function getSqlRaw() {
+    if (cachedSqlRaw)
+        return cachedSqlRaw;
+    const drizzle = (await import("drizzle-orm"));
+    cachedSqlRaw = drizzle.sql.raw;
+    return cachedSqlRaw;
+}
+function getRuntimeDb(runtime) {
+    const db = runtime.adapter.db;
+    if (!db || typeof db.execute !== "function") {
+        throw new Error("runtime database adapter unavailable");
+    }
+    return db;
+}
+export async function executeRawSql(runtime, sqlText) {
+    const raw = await getSqlRaw();
+    const db = getRuntimeDb(runtime);
+    const result = await db.execute(raw(sqlText));
+    return extractRows(result);
+}
+export function sqlQuote(value) {
+    return `'${value.replace(/'/g, "''")}'`;
+}
+export function sqlText(value) {
+    if (value === null || value === undefined)
+        return "NULL";
+    return sqlQuote(value);
+}
+export function sqlInteger(value) {
+    if (value === null || value === undefined)
+        return "NULL";
+    if (!Number.isFinite(value))
+        throw new Error("invalid numeric SQL literal");
+    return String(Math.trunc(value));
+}
+export function sqlJson(value) {
+    return sqlQuote(JSON.stringify(value ?? null));
+}

package/services/approval/store.d.ts

@@ -0,0 +1,39 @@
+/**
+ * `PgApprovalQueue` — concrete approval queue backed by the `approval_requests`
+ * table from `@elizaos/plugin-sql` (public schema, no schema prefix).
+ *
+ * Promoted from `@elizaos/plugin-personal-assistant`'s `lifeops/approval-queue.ts`
+ * into a first-class `@elizaos/agent` runtime store (LifeOps Slice 4). The raw
+ * SQL is unchanged — it has no schema prefix, so it targets plugin-sql's public
+ * `approval_requests` table exactly as before. There is no data migration.
+ *
+ * Design notes:
+ *  - The state-transition table below is the single source of truth for
+ *    legal moves. Anything not enumerated throws
+ *    `ApprovalStateTransitionError` — there is no fallback, no auto-retry,
+ *    no silent normalization (Commandment 8).
+ *  - All logging goes through the structured logger only (Commandment 9).
+ *  - Each row is scoped to an agent via `agentId`. Cross-agent access is
+ *    not supported.
+ */
+import { type IAgentRuntime } from "@elizaos/core";
+import { type ApprovalEnqueueInput, type ApprovalListFilter, type ApprovalQueue, type ApprovalQueueOptions, type ApprovalRequest, type ApprovalResolution } from "./types.js";
+export declare class PgApprovalQueue implements ApprovalQueue {
+    private readonly runtime;
+    private readonly agentId;
+    constructor(runtime: IAgentRuntime, options: ApprovalQueueOptions);
+    enqueue(input: ApprovalEnqueueInput): Promise<ApprovalRequest>;
+    list(filter: ApprovalListFilter): Promise<ReadonlyArray<ApprovalRequest>>;
+    byId(id: string): Promise<ApprovalRequest | null>;
+    approve(id: string, resolution: ApprovalResolution): Promise<ApprovalRequest>;
+    reject(id: string, resolution: ApprovalResolution): Promise<ApprovalRequest>;
+    markExecuting(id: string): Promise<ApprovalRequest>;
+    markDone(id: string): Promise<ApprovalRequest>;
+    markExpired(id: string): Promise<ApprovalRequest>;
+    purgeExpired(now: Date): Promise<ReadonlyArray<string>>;
+    private fetchById;
+    private transitionWithResolution;
+    private transitionWithoutResolution;
+}
+export declare function createApprovalQueue(runtime: IAgentRuntime, options: ApprovalQueueOptions): ApprovalQueue;
+//# sourceMappingURL=store.d.ts.map

package/services/approval/store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/services/approval/store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,KAAK,aAAa,EAAuB,MAAM,eAAe,CAAC;AASxE,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EAGvB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EAEpB,KAAK,kBAAkB,EAExB,MAAM,YAAY,CAAC;AA8gBpB,qBAAa,eAAgB,YAAW,aAAa;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,oBAAoB;IAK3D,OAAO,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;IAqD9D,IAAI,CACR,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IAmBpC,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAKjD,OAAO,CACX,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAIrB,MAAM,CACV,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAIrB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAInD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAI9C,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAIjD,YAAY,CAAC,GAAG,EAAE,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAe/C,SAAS;YAST,wBAAwB;YA2BxB,2BAA2B;CAoB1C;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,oBAAoB,GAC5B,aAAa,CAEf"}