@deepagents/context 4.2.0 → 4.2.1

package/dist/index.js

@@ -2616,7 +2616,15 @@ async function evaluateFiredReminders(configs, whenCtx) {
 }
 
 // packages/context/src/lib/save/save-pipeline.ts
-var SavePipeline = class {
+var HeadConflictError = class extends Error {
+  constructor(chatId, headMessageId) {
+    super(
+      `Could not commit head "${headMessageId}" for chat "${chatId}": concurrent writers kept moving the branch head`
+    );
+    this.name = "HeadConflictError";
+  }
+};
+var SavePipeline = class _SavePipeline {
   #engine;
   #pending;
   #shouldBranch = true;
@@ -2672,9 +2680,49 @@ var SavePipeline = class {
       );
     }
     await this.#engine.store.addMessages(messages);
-    await this.#engine.commitHead(parentId);
+    await this.#commitHead(messages[0], parentId);
     return { headMessageId: parentId };
   }
+  static #maxCommitAttempts = 5;
+  /**
+   * Advance the branch head to `newHead` through the store's CAS. A stale
+   * cached head must never rewind the branch (that silently orphans turns
+   * committed in between), so a rejected CAS re-reads the store head and
+   * reconciles:
+   * - the store head already descends from `newHead` (an in-place assistant
+   *   fill whose turn was built past): content is on the chain, keep the
+   *   store head;
+   * - `newHead` descends from the store head: fast-forward, retry against it;
+   * - true fork (another turn won the same head): graft this turn onto the
+   *   winning head by re-parenting the first pending message, then retry.
+   *   Grafting applies only to messages chained off the stale head — an
+   *   in-place fill keeps its original parent and its content already landed.
+   */
+  async #commitHead(first2, newHead) {
+    let expected = this.#engine.getActiveBranch().headMessageId;
+    for (let i = 0; i < _SavePipeline.#maxCommitAttempts; i++) {
+      if (await this.#engine.commitHead(newHead, expected)) return;
+      const fresh = (await this.#engine.refreshBranch()).headMessageId;
+      if (fresh === null || fresh === expected) {
+        expected = fresh;
+        continue;
+      }
+      if (await this.#chainContains(fresh, newHead)) return;
+      if (await this.#chainContains(newHead, fresh)) {
+        expected = fresh;
+        continue;
+      }
+      if (first2.parentId !== expected) return;
+      await this.#engine.store.setMessageParent(first2.id, fresh);
+      first2.parentId = fresh;
+      expected = fresh;
+    }
+    throw new HeadConflictError(this.#engine.chatId, newHead);
+  }
+  async #chainContains(headId, messageId) {
+    const chain = await this.#engine.store.getMessageChain(headId);
+    return chain.some((message2) => message2.id === messageId);
+  }
 };
 
 // packages/context/src/lib/store/sqlite.store.ts
@@ -2942,6 +2990,17 @@ var SqliteContextStore = class extends ContextStore {
       }
     });
   }
+  async setMessageParent(messageId, parentId) {
+    if (parentId === messageId) {
+      throw new Error(`Message ${messageId} cannot be its own parent`);
+    }
+    const result = this.#stmt(
+      "UPDATE messages SET parentId = ? WHERE id = ?"
+    ).run(parentId, messageId);
+    if (result.changes === 0) {
+      throw new Error(`Message ${messageId} not found`);
+    }
+  }
   async getMessage(messageId) {
     const row = this.#stmt("SELECT * FROM messages WHERE id = ?").get(
       messageId
@@ -3048,11 +3107,11 @@ var SqliteContextStore = class extends ContextStore {
     this.#db.prepare("UPDATE branches SET isActive = 0 WHERE chatId = ?").run(chatId);
     this.#db.prepare("UPDATE branches SET isActive = 1 WHERE id = ?").run(branchId);
   }
-  async updateBranchHead(branchId, messageId) {
-    this.#stmt("UPDATE branches SET headMessageId = ? WHERE id = ?").run(
-      messageId,
-      branchId
-    );
+  async updateBranchHead(branchId, messageId, expectedHeadMessageId) {
+    const result = this.#stmt(
+      "UPDATE branches SET headMessageId = ? WHERE id = ? AND headMessageId IS ?"
+    ).run(messageId, branchId, expectedHeadMessageId);
+    return result.changes > 0;
   }
   async listBranches(chatId) {
     const rows = this.#db.prepare(
@@ -3963,12 +4022,29 @@ var ContextEngine = class _ContextEngine {
         id: this.#activeBranch.id,
         headMessageId: this.#activeBranch.headMessageId
       }),
-      commitHead: async (headMessageId) => {
-        await this.#store.updateBranchHead(
+      commitHead: async (headMessageId, expectedHeadMessageId) => {
+        const committed = await this.#store.updateBranchHead(
           this.#activeBranch.id,
-          headMessageId
+          headMessageId,
+          expectedHeadMessageId
         );
-        this.#activeBranch.headMessageId = headMessageId;
+        if (committed) {
+          this.#activeBranch.headMessageId = headMessageId;
+        }
+        return committed;
+      },
+      refreshBranch: async () => {
+        const fresh = await this.#store.getBranch(
+          this.#chatId,
+          this.#activeBranch.name
+        );
+        if (!fresh) {
+          throw new Error(
+            `Branch "${this.#activeBranch.name}" not found for chat "${this.#chatId}"`
+          );
+        }
+        this.#branch = fresh;
+        return { id: fresh.id, headMessageId: fresh.headMessageId };
       },
       rewindForUpdate: (parentId) => this.#rewindForUpdate(parentId)
     };
@@ -4069,8 +4145,14 @@ var ContextEngine = class _ContextEngine {
    *
    * @example
    * ```ts
-   * context.set(user('What is 2 + 2?', { id: 'q1' }));
-   * context.set(assistant('The answer is 5.', { id: 'wrong' })); // Oops!
+   * context.set(
+   *   user({
+   *     id: 'q1',
+   *     role: 'user',
+   *     parts: [{ type: 'text', text: 'What is 2 + 2?' }],
+   *   }),
+   * );
+   * context.set(assistantText('The answer is 5.', { id: 'wrong' })); // Oops!
    * await context.save();
    *
    * // Rewind to the question, creates new branch
@@ -4908,7 +4990,7 @@ async function chat(agent2, options = {}) {
     execute: async ({ writer }) => {
       writer.merge(uiStream);
       if (title) {
-        writer.write({ type: "data-chat-title", data: title });
+        writer.write({ type: "data-chat-title", data: title, transient: true });
       }
     }
   });
@@ -7168,7 +7250,6 @@ var appleEngine = {
   inspectArgs(containerId) {
     return ["inspect", containerId];
   },
-  mountArg: buildMountArg,
   parseStatus(stdout) {
     const entries = safeParseArray(stdout);
     if (entries.length === 0) return "absent";
@@ -8428,7 +8509,6 @@ var dockerEngine = {
       containerId
     ];
   },
-  mountArg: dockerMountArg,
   parseStatus(status) {
     return status === "running" ? "running" : "stopped";
   },
@@ -10204,6 +10284,18 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
       );
     });
   }
+  async setMessageParent(messageId, parentId) {
+    if (parentId === messageId) {
+      throw new Error(`Message ${messageId} cannot be its own parent`);
+    }
+    const rows = await this.#query(
+      `UPDATE ${this.#t("messages")} SET parentId = $1 WHERE id = $2 RETURNING id`,
+      [parentId, messageId]
+    );
+    if (rows.length === 0) {
+      throw new Error(`Message ${messageId} not found`);
+    }
+  }
   async getMessage(messageId) {
     const rows = await this.#query(`SELECT * FROM ${this.#t("messages")} WHERE id = $1`, [messageId]);
     if (rows.length === 0) {
@@ -10326,11 +10418,14 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
       );
     });
   }
-  async updateBranchHead(branchId, messageId) {
-    await this.#query(
-      `UPDATE ${this.#t("branches")} SET headMessageId = $1 WHERE id = $2`,
-      [messageId, branchId]
+  async updateBranchHead(branchId, messageId, expectedHeadMessageId) {
+    const rows = await this.#query(
+      `UPDATE ${this.#t("branches")} SET headMessageId = $1
+       WHERE id = $2 AND headMessageId IS NOT DISTINCT FROM $3
+       RETURNING id`,
+      [messageId, branchId, expectedHeadMessageId]
     );
+    return rows.length > 0;
   }
   async listBranches(chatId) {
     const branches = await this.#query(
@@ -10993,6 +11088,20 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       `);
     });
   }
+  async setMessageParent(messageId, parentId) {
+    if (parentId === messageId) {
+      throw new Error(`Message ${messageId} cannot be its own parent`);
+    }
+    const rows = await this.#query(
+      `UPDATE ${this.#t("messages")} SET parentId = @p0
+       OUTPUT INSERTED.id
+       WHERE id = @p1`,
+      [parentId, messageId]
+    );
+    if (rows.length === 0) {
+      throw new Error(`Message ${messageId} not found`);
+    }
+  }
   async getMessage(messageId) {
     const rows = await this.#query(`SELECT * FROM ${this.#t("messages")} WHERE id = @p0`, [messageId]);
     if (rows.length === 0) {
@@ -11118,11 +11227,15 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       );
     });
   }
-  async updateBranchHead(branchId, messageId) {
-    await this.#query(
-      `UPDATE ${this.#t("branches")} SET headMessageId = @p0 WHERE id = @p1`,
-      [messageId, branchId]
+  async updateBranchHead(branchId, messageId, expectedHeadMessageId) {
+    const rows = await this.#query(
+      `UPDATE ${this.#t("branches")} SET headMessageId = @p0
+       OUTPUT INSERTED.id
+       WHERE id = @p1
+         AND (headMessageId = @p2 OR (headMessageId IS NULL AND @p2 IS NULL))`,
+      [messageId, branchId, expectedHeadMessageId]
     );
+    return rows.length > 0;
   }
   async listBranches(chatId) {
     const branches = await this.#query(
@@ -12974,6 +13087,7 @@ export {
   FunctionResolver,
   GeneratorResolver,
   GithubReleaseInstaller,
+  HeadConflictError,
   InMemoryContextStore,
   InstallError,
   Installer,