@deepagents/text2sql 0.12.1 → 0.13.0

package/dist/lib/agents/result-tools.d.ts

@@ -19,9 +19,15 @@ export interface ResultToolsOptions {
  * The agent sees only one tool: `bash`
  * SQL is executed via: sql run "SELECT ..."
  *
- * Dual-level artifact storage:
- * - `/results/` → `./artifacts/{chatId}/{messageId}/results/` (current turn, write)
- * - `/artifacts/` → `./artifacts/{chatId}/` (all turns, browse previous)
+ * Artifact storage:
+ * - `/results/` → `./artifacts/{chatId}/{messageId}/results/` (current turn, isolated)
+ * - `/artifacts/` → `./artifacts/{chatId}/` (shared across turns)
+ *
+ * SQL results are written to both locations:
+ * 1. Isolated: `/results/{uuid}.json` for per-turn organization
+ * 2. Shared: `/artifacts/{uuid}.json` for cross-turn access
+ *
+ * The returned path is `/artifacts/{uuid}.json` which works in any turn.
  *
  * @param options - Configuration options
  * @param options.adapter - Database adapter for SQL execution

package/dist/lib/agents/result-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAwKtD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;;;;;GA4DlE"}
+{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAsKtD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;;;;;GA0DlE"}

package/dist/lib/instructions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/lib/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAarB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;CACzB;AA0ID,wBAAgB,UAAU,CAAC,OAAO,GAAE,gBAAqB,GAAG,eAAe,EAAE,CAuQ5E"}
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/lib/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAarB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;CACzB;AAgJD,wBAAgB,UAAU,CAAC,OAAO,GAAE,gBAAqB,GAAG,eAAe,EAAE,CA+R5E"}

package/dist/lib/sql.d.ts

@@ -1,6 +1,6 @@
 import { type UIMessage } from 'ai';
 import { type AgentModel } from '@deepagents/agent';
-import { type ContextFragment, type ContextStore } from '@deepagents/context';
+import { ContextEngine, type ContextFragment } from '@deepagents/context';
 import type { Adapter } from './adapters/adapter.ts';
 import { type RenderingTools } from './agents/text2sql.agent.ts';
 import { type TeachingsOptions } from './instructions.ts';
@@ -9,10 +9,9 @@ export declare class Text2Sql {
     #private;
     constructor(config: {
         adapter: Adapter;
-        store: ContextStore;
+        context: (...fragments: ContextFragment[]) => ContextEngine;
         version: string;
         tools?: RenderingTools;
-        instructions?: ContextFragment[];
         model: AgentModel;
         /**
          * Configure teachings behavior
@@ -46,17 +45,7 @@ export declare class Text2Sql {
      * );
      */
     toPairs<T extends PairProducer>(factory: (adapter: Adapter) => T): Promise<ExtractedPair[]>;
-    chat(messages: UIMessage[], params: {
-        chatId: string;
-        userId: string;
-    }): Promise<import("ai").AsyncIterableStream<import("ai").InferUIMessageChunk<UIMessage<unknown, import("ai").UIDataTypes, import("ai").UITools>>>>;
-    /**
-     * Developer chat interface - power-user mode for SQL generation.
-     * Uses db_query tool for direct SQL execution (LLM writes SQL).
-     */
-    developer(messages: UIMessage[], params: {
-        chatId: string;
-        userId: string;
-    }): Promise<import("ai").AsyncIterableStream<import("ai").InferUIMessageChunk<UIMessage<unknown, import("ai").UIDataTypes, import("ai").UITools>>>>;
+    chat(messages: UIMessage[]): Promise<import("ai").AsyncIterableStream<import("ai").InferUIMessageChunk<UIMessage<unknown, import("ai").UIDataTypes, import("ai").UITools>>>>;
+    developer(messages: UIMessage[]): Promise<import("ai").AsyncIterableStream<import("ai").InferUIMessageChunk<UIMessage<unknown, import("ai").UIDataTypes, import("ai").UITools>>>>;
 }
 //# sourceMappingURL=sql.d.ts.map

package/dist/lib/sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/lib/sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,SAAS,EAEf,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,YAAY,EASlB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAIrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7E,qBAAa,QAAQ;;gBAUP,MAAM,EAAE;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,KAAK,EAAE,YAAY,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,cAAc,CAAC;QACvB,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC;QACjC,KAAK,EAAE,UAAU,CAAC;QAClB;;;WAGG;QACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KACrC;IAgBY,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAclD;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAUhD;;;;;;;;;;;;;;;;;;OAkBG;IACU,OAAO,CAAC,CAAC,SAAS,YAAY,EACzC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAC/B,OAAO,CAAC,aAAa,EAAE,CAAC;IA6Bd,IAAI,CACf,QAAQ,EAAE,SAAS,EAAE,EACrB,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB;IAsFH;;;OAGG;IACU,SAAS,CACpB,QAAQ,EAAE,SAAS,EAAE,EACrB,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB;CA0DJ"}
+{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/lib/sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,SAAS,EAEf,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,KAAK,eAAe,EAOrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAIrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7E,qBAAa,QAAQ;;gBAUP,MAAM,EAAE;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,CAAC,GAAG,SAAS,EAAE,eAAe,EAAE,KAAK,aAAa,CAAC;QAC5D,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,cAAc,CAAC;QACvB,KAAK,EAAE,UAAU,CAAC;QAClB;;;WAGG;QACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KACrC;IAaY,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlD;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAUhD;;;;;;;;;;;;;;;;;;OAkBG;IACU,OAAO,CAAC,CAAC,SAAS,YAAY,EACzC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAC/B,OAAO,CAAC,aAAa,EAAE,CAAC;IA6Bd,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE;IAwD1B,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE;CAqD7C"}

package/dist/lib/synthesis/index.js

@@ -175,6 +175,7 @@ import dedent from "dedent";
 import z from "zod";
 
 // packages/context/dist/index.js
+import { mergeWith } from "lodash-es";
 import { encode } from "gpt-tokenizer";
 import { generateId } from "ai";
 import pluralize from "pluralize";
@@ -738,6 +739,8 @@ var ContextEngine = class {
   #branch = null;
   #chatData = null;
   #initialized = false;
+  /** Initial metadata to merge on first initialization */
+  #initialMetadata;
   constructor(options) {
     if (!options.chatId) {
       throw new Error("chatId is required");
@@ -749,6 +752,7 @@ var ContextEngine = class {
     this.#chatId = options.chatId;
     this.#userId = options.userId;
     this.#branchName = "main";
+    this.#initialMetadata = options.metadata;
   }
   /**
    * Initialize the chat and branch if they don't exist.
@@ -761,6 +765,15 @@ var ContextEngine = class {
       id: this.#chatId,
       userId: this.#userId
     });
+    if (this.#initialMetadata) {
+      this.#chatData = await this.#store.updateChat(this.#chatId, {
+        metadata: {
+          ...this.#chatData.metadata,
+          ...this.#initialMetadata
+        }
+      });
+      this.#initialMetadata = void 0;
+    }
     this.#branch = await this.#store.getActiveBranch(this.#chatId);
     this.#initialized = true;
   }
@@ -1234,6 +1247,36 @@ var ContextEngine = class {
     }
     this.#chatData = await this.#store.updateChat(this.#chatId, storeUpdates);
   }
+  /**
+   * Track token usage for the current chat.
+   * Accumulates usage metrics in chat.metadata.usage.
+   *
+   * @param usage - Token usage from AI SDK (LanguageModelUsage)
+   *
+   * @example
+   * ```ts
+   * // In onFinish callback
+   * const usage = await result.totalUsage;
+   * await context.trackUsage(usage);
+   * ```
+   */
+  async trackUsage(usage) {
+    await this.#ensureInitialized();
+    const freshChatData = await this.#store.getChat(this.#chatId);
+    const currentUsage = freshChatData?.metadata?.usage ?? {};
+    const updatedUsage = mergeWith(
+      {},
+      currentUsage,
+      usage,
+      (a, b) => typeof a === "number" || typeof b === "number" ? (a ?? 0) + (b ?? 0) : void 0
+    );
+    this.#chatData = await this.#store.updateChat(this.#chatId, {
+      metadata: {
+        ...freshChatData?.metadata,
+        usage: updatedUsage
+      }
+    });
+  }
   /**
    * Consolidate context fragments (no-op for now).
    *
@@ -1609,12 +1652,20 @@ var SqliteContextStore = class extends ContextStore {
   }
   async listChats(options) {
     const params = [];
-    let whereClause = "";
+    const whereClauses = [];
     let limitClause = "";
     if (options?.userId) {
-      whereClause = "WHERE c.userId = ?";
+      whereClauses.push("c.userId = ?");
       params.push(options.userId);
     }
+    if (options?.metadata) {
+      whereClauses.push(`json_extract(c.metadata, '$.' || ?) = ?`);
+      params.push(options.metadata.key);
+      params.push(
+        typeof options.metadata.value === "boolean" ? options.metadata.value ? 1 : 0 : options.metadata.value
+      );
+    }
+    const whereClause = whereClauses.length > 0 ? `WHERE ${whereClauses.join(" AND ")}` : "";
     if (options?.limit !== void 0) {
       limitClause = " LIMIT ?";
       params.push(options.limit);
@@ -1628,6 +1679,7 @@ var SqliteContextStore = class extends ContextStore {
           c.id,
           c.userId,
           c.title,
+          c.metadata,
           c.createdAt,
           c.updatedAt,
           COUNT(DISTINCT m.id) as messageCount,
@@ -1643,6 +1695,7 @@ var SqliteContextStore = class extends ContextStore {
       id: row.id,
       userId: row.userId,
       title: row.title ?? void 0,
+      metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
       messageCount: row.messageCount,
       branchCount: row.branchCount,
       createdAt: row.createdAt,
@@ -1672,11 +1725,17 @@ var SqliteContextStore = class extends ContextStore {
   // Message Operations (Graph Nodes)
   // ==========================================================================
   async addMessage(message2) {
-    const existingParent = message2.parentId === message2.id ? this.#db.prepare("SELECT parentId FROM messages WHERE id = ?").get(message2.id) : void 0;
-    const parentId = message2.parentId === message2.id ? existingParent?.parentId ?? null : message2.parentId;
     this.#db.prepare(
       `INSERT INTO messages (id, chatId, parentId, name, type, data, createdAt)
-         VALUES (?, ?, ?, ?, ?, ?, ?)
+         VALUES (
+           ?1,
+           ?2,
+           CASE WHEN ?3 = ?1 THEN (SELECT parentId FROM messages WHERE id = ?1) ELSE ?3 END,
+           ?4,
+           ?5,
+           ?6,
+           ?7
+         )
          ON CONFLICT(id) DO UPDATE SET
            name = excluded.name,
            type = excluded.type,
@@ -1684,7 +1743,7 @@ var SqliteContextStore = class extends ContextStore {
     ).run(
       message2.id,
       message2.chatId,
-      parentId,
+      message2.parentId,
       message2.name,
       message2.type ?? null,
       JSON.stringify(message2.data),