@deepagents/text2sql 0.12.0 → 0.13.0

package/dist/lib/adapters/groundings/index.js

@@ -226,6 +226,7 @@ import z from "zod";
 import "@deepagents/agent";
 
 // packages/context/dist/index.js
+import { mergeWith } from "lodash-es";
 import { encode } from "gpt-tokenizer";
 import { generateId } from "ai";
 import pluralize from "pluralize";
@@ -437,7 +438,7 @@ function message(content) {
   } : content;
   return {
     id: message2.id,
-    name: "message",
+    name: message2.role,
     data: "content",
     type: "message",
     persist: true,
@@ -459,6 +460,22 @@ function assistantText(content, options) {
     parts: [{ type: "text", text: content }]
   });
 }
+var LAZY_ID = Symbol("lazy-id");
+function isLazyFragment(fragment2) {
+  return LAZY_ID in fragment2;
+}
+function lastAssistantMessage(content) {
+  return {
+    name: "assistant",
+    type: "message",
+    persist: true,
+    data: "content",
+    [LAZY_ID]: {
+      type: "last-assistant",
+      content
+    }
+  };
+}
 var ContextRenderer = class {
   options;
   constructor(options = {}) {
@@ -785,6 +802,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");
@@ -796,6 +815,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.
@@ -808,6 +828,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;
   }
@@ -955,6 +984,12 @@ var ContextEngine = class {
     if (this.#pendingMessages.length === 0) {
       return;
     }
+    for (let i = 0; i < this.#pendingMessages.length; i++) {
+      const fragment2 = this.#pendingMessages[i];
+      if (isLazyFragment(fragment2)) {
+        this.#pendingMessages[i] = await this.#resolveLazyFragment(fragment2);
+      }
+    }
     let parentId = this.#branch.headMessageId;
     const now = Date.now();
     for (const fragment2 of this.#pendingMessages) {
@@ -974,6 +1009,39 @@ var ContextEngine = class {
     this.#branch.headMessageId = parentId;
     this.#pendingMessages = [];
   }
+  /**
+   * Resolve a lazy fragment by finding the appropriate ID.
+   */
+  async #resolveLazyFragment(fragment2) {
+    const lazy = fragment2[LAZY_ID];
+    if (lazy.type === "last-assistant") {
+      const lastId = await this.#getLastAssistantId();
+      return assistantText(lazy.content, { id: lastId ?? crypto.randomUUID() });
+    }
+    throw new Error(`Unknown lazy fragment type: ${lazy.type}`);
+  }
+  /**
+   * Find the most recent assistant message ID (pending or persisted).
+   */
+  async #getLastAssistantId() {
+    for (let i = this.#pendingMessages.length - 1; i >= 0; i--) {
+      const msg = this.#pendingMessages[i];
+      if (msg.name === "assistant" && !isLazyFragment(msg)) {
+        return msg.id;
+      }
+    }
+    if (this.#branch?.headMessageId) {
+      const chain = await this.#store.getMessageChain(
+        this.#branch.headMessageId
+      );
+      for (let i = chain.length - 1; i >= 0; i--) {
+        if (chain[i].name === "assistant") {
+          return chain[i].id;
+        }
+      }
+    }
+    return void 0;
+  }
   /**
    * Estimate token count and cost for the full context.
    *
@@ -1242,6 +1310,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).
    *
@@ -1253,6 +1351,35 @@ var ContextEngine = class {
   consolidate() {
     return void 0;
   }
+  /**
+   * Extract skill path mappings from available_skills fragments.
+   * Returns array of { host, sandbox } for mounting in sandbox filesystem.
+   *
+   * Reads the original `paths` configuration stored in fragment metadata
+   * by the skills() fragment helper.
+   *
+   * @example
+   * ```ts
+   * const context = new ContextEngine({ store, chatId, userId })
+   *   .set(skills({ paths: [{ host: './skills', sandbox: '/skills' }] }));
+   *
+   * const mounts = context.getSkillMounts();
+   * // [{ host: './skills', sandbox: '/skills' }]
+   * ```
+   */
+  getSkillMounts() {
+    const mounts = [];
+    for (const fragment2 of this.#fragments) {
+      if (fragment2.name === "available_skills" && fragment2.metadata && Array.isArray(fragment2.metadata.paths)) {
+        for (const mapping of fragment2.metadata.paths) {
+          if (typeof mapping === "object" && mapping !== null && typeof mapping.host === "string" && typeof mapping.sandbox === "string") {
+            mounts.push({ host: mapping.host, sandbox: mapping.sandbox });
+          }
+        }
+      }
+    }
+    return mounts;
+  }
   /**
    * Inspect the full context state for debugging.
    * Returns a JSON-serializable object with context information.
@@ -1508,12 +1635,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);
@@ -1527,6 +1662,7 @@ var SqliteContextStore = class extends ContextStore {
           c.id,
           c.userId,
           c.title,
+          c.metadata,
           c.createdAt,
           c.updatedAt,
           COUNT(DISTINCT m.id) as messageCount,
@@ -1542,6 +1678,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,
@@ -1573,9 +1710,16 @@ var SqliteContextStore = class extends ContextStore {
   async addMessage(message2) {
     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
-           parentId = excluded.parentId,
            name = excluded.name,
            type = excluded.type,
            data = excluded.data`
@@ -2050,13 +2194,9 @@ var Agent = class _Agent {
               writer.write({ type: "finish" });
               return;
             }
-            writer.write({
-              type: "text-delta",
-              id: generateId2(),
-              delta: ` ${failureFeedback}`
-            });
+            writeText(writer, failureFeedback);
             const selfCorrectionText = accumulatedText + " " + failureFeedback;
-            context.set(assistantText(selfCorrectionText));
+            context.set(lastAssistantMessage(selfCorrectionText));
             await context.save();
             currentResult = await this.#createRawStream(
               contextVariables,
@@ -2109,6 +2249,22 @@ var repairToolCall = async ({
   });
   return { ...toolCall, input: JSON.stringify(output) };
 };
+function writeText(writer, text) {
+  const feedbackPartId = generateId2();
+  writer.write({
+    id: feedbackPartId,
+    type: "text-start"
+  });
+  writer.write({
+    id: feedbackPartId,
+    type: "text-delta",
+    delta: ` ${text}`
+  });
+  writer.write({
+    id: feedbackPartId,
+    type: "text-end"
+  });
+}
 
 // packages/text2sql/src/lib/adapters/groundings/report.grounding.ts
 var ReportGrounding = class extends AbstractGrounding {