@aleph-alpha/chat-kit 3.3.0 → 4.0.0

package/src/helpers/conversationTree.spec.ts

@@ -8,6 +8,7 @@ import {
   addNode,
   createEmptyTree,
   cutBranchAfter,
+  cutBranchAt,
   getLinearPath,
   navigate,
   updateNode,
@@ -519,6 +520,125 @@ describe('cutBranchAfter', () => {
   });
 });
 
+describe('cutBranchAt', () => {
+  it('removes the target node and its entire subtree', () => {
+    const tree = makeBranchingTree();
+
+    cutBranchAt(tree, 'a1');
+
+    expect(tree.nodes.a1).toBeUndefined();
+    expect(tree.nodes.u2).toBeUndefined();
+    expect(tree.nodes.a2).toBeUndefined();
+    expect(tree.nodes.a3).toBeUndefined();
+  });
+
+  it('leaves sibling branches intact and unlinks from the parent', () => {
+    const tree = makeBranchingTree();
+
+    cutBranchAt(tree, 'a1');
+
+    expect(tree.nodes.a1b).toBeDefined();
+    expect(tree.nodes.u3).toBeDefined();
+    expect(tree.nodes.u1.childrenIds).toEqual(['a1b']);
+  });
+
+  it('clamps the parent activeChildIndex to a surviving sibling', () => {
+    const tree = makeBranchingTree();
+    // u2 → [a2, a3] with a3 active; removing a3 must not leave a dangling index.
+    tree.nodes.u2.activeChildIndex = 1;
+
+    cutBranchAt(tree, 'a3');
+
+    expect(tree.nodes.u2.childrenIds).toEqual(['a2']);
+    expect(tree.nodes.u2.activeChildIndex).toBe(0);
+    expect(getLinearPath(tree).map((m) => m.id)).toEqual([
+      'u1',
+      'a1',
+      'u2',
+      'a2',
+    ]);
+  });
+
+  // Parent with three sibling branches; needs ≥3 so removing an earlier
+  // sibling leaves the active index in-bounds (the clamp alone wouldn't catch
+  // a stale index, only an out-of-range one).
+  function makeThreeSiblingTree(): ConversationTree {
+    return makeTree(
+      {
+        p: makeTreeMessage({ id: 'p', role: 'user', content: [text('Q')] }),
+        cA: makeTreeMessage({
+          id: 'cA',
+          parentId: 'p',
+          role: 'assistant',
+          content: [text('A')],
+        }),
+        cB: makeTreeMessage({
+          id: 'cB',
+          parentId: 'p',
+          role: 'assistant',
+          content: [text('B')],
+        }),
+        cC: makeTreeMessage({
+          id: 'cC',
+          parentId: 'p',
+          role: 'assistant',
+          content: [text('C')],
+        }),
+      },
+      'p',
+    );
+  }
+
+  it('keeps the active branch on the same child when an earlier sibling is removed', () => {
+    const tree = makeThreeSiblingTree();
+    tree.nodes.p.activeChildIndex = 1; // cB active
+    // Removing cA shifts cB/cC down one slot; the active pointer must follow.
+    cutBranchAt(tree, 'cA');
+
+    expect(tree.nodes.p.childrenIds).toEqual(['cB', 'cC']);
+    expect(tree.nodes.p.activeChildIndex).toBe(0);
+    expect(getLinearPath(tree).map((m) => m.id)).toEqual(['p', 'cB']);
+  });
+
+  it('leaves the active index unchanged when a later sibling is removed', () => {
+    const tree = makeThreeSiblingTree();
+    tree.nodes.p.activeChildIndex = 0; // cA active
+    cutBranchAt(tree, 'cC');
+
+    expect(tree.nodes.p.childrenIds).toEqual(['cA', 'cB']);
+    expect(tree.nodes.p.activeChildIndex).toBe(0);
+    expect(getLinearPath(tree).map((m) => m.id)).toEqual(['p', 'cA']);
+  });
+
+  it('falls through to the next sibling when the active child itself is removed', () => {
+    const tree = makeThreeSiblingTree();
+    tree.nodes.p.activeChildIndex = 0; // cA active
+    cutBranchAt(tree, 'cA');
+
+    expect(tree.nodes.p.childrenIds).toEqual(['cB', 'cC']);
+    expect(tree.nodes.p.activeChildIndex).toBe(0);
+    expect(getLinearPath(tree).map((m) => m.id)).toEqual(['p', 'cB']);
+  });
+
+  it('clears the tree when the root is removed', () => {
+    const tree = makeBranchingTree();
+
+    cutBranchAt(tree, 'u1');
+
+    expect(tree.nodes).toEqual({});
+    expect(tree.rootId).toBeNull();
+  });
+
+  it('is a no-op for a nonexistent id', () => {
+    const tree = makeBranchingTree();
+    const before = Object.keys(tree.nodes).sort();
+
+    cutBranchAt(tree, 'nonexistent');
+
+    expect(Object.keys(tree.nodes).sort()).toEqual(before);
+  });
+});
+
 describe('integration: full branching scenario', () => {
   it('simulates send → regenerate → navigate workflow', () => {
     const tree = createEmptyTree();

package/src/helpers/conversationTree.ts

@@ -105,6 +105,21 @@ export function updateNodeId(
   if (tree.rootId === oldId) tree.rootId = newId;
 }
 
+/**
+ * Delete the given node ids and every descendant beneath them from
+ * `tree.nodes`. Does not touch parent links — callers fix those up.
+ */
+function deleteSubtrees(tree: ConversationTree, ids: readonly string[]): void {
+  const stack: string[] = [...ids];
+  while (stack.length > 0) {
+    const currentId = stack.pop() as string;
+    const current = tree.nodes[currentId];
+    if (!current) continue;
+    stack.push(...current.childrenIds);
+    delete tree.nodes[currentId];
+  }
+}
+
 /**
  * Remove every descendant of the node with the given id, keeping the node
  * itself intact. The node's `childrenIds` is cleared and `activeChildIndex`
@@ -117,19 +132,53 @@ export function cutBranchAfter(tree: ConversationTree, id: string): void {
   const node = tree.nodes[id];
   if (!node) return;
 
-  const stack: string[] = [...node.childrenIds];
-  while (stack.length > 0) {
-    const currentId = stack.pop() as string;
-    const current = tree.nodes[currentId];
-    if (!current) continue;
-    stack.push(...current.childrenIds);
-    delete tree.nodes[currentId];
-  }
+  deleteSubtrees(tree, node.childrenIds);
 
   node.childrenIds = [];
   node.activeChildIndex = 0;
 }
 
+/**
+ * Remove the node with the given id *and* its entire subtree, then unlink it
+ * from its parent. Unlike {@link cutBranchAfter} (which keeps the target and
+ * drops only its descendants), this drops the target branch as a whole while
+ * leaving sibling branches intact — use it to discard one answer among several
+ * (e.g. an interrupted regenerate) without cropping the others.
+ *
+ * The parent's `activeChildIndex` is clamped to a remaining sibling so the
+ * active path stays valid. Removing the root clears the tree.
+ *
+ * Prefer {@link cutBranchAfter} when it fits the case: unlinking here scans
+ * and splices the parent's `childrenIds` (O(siblings)), whereas
+ * `cutBranchAfter` only clears the target's own `childrenIds`.
+ */
+export function cutBranchAt(tree: ConversationTree, id: string): void {
+  const node = tree.nodes[id];
+  if (!node) return;
+
+  deleteSubtrees(tree, [id]);
+
+  if (node.parentId === null) {
+    if (tree.rootId === id) tree.rootId = null;
+    return;
+  }
+
+  const parent = tree.nodes[node.parentId];
+  if (!parent) return;
+
+  const idx = parent.childrenIds.indexOf(id);
+  if (idx !== -1) {
+    parent.childrenIds.splice(idx, 1);
+    // Removing a sibling positioned before the active one shifts every later
+    // child's index down by one; decrement so the active branch keeps pointing
+    // at the same child rather than silently jumping to its neighbour.
+    if (idx < parent.activeChildIndex) parent.activeChildIndex -= 1;
+  }
+  if (parent.activeChildIndex >= parent.childrenIds.length) {
+    parent.activeChildIndex = Math.max(0, parent.childrenIds.length - 1);
+  }
+}
+
 /**
  * Navigate to a different branch by updating the parent's activeChildIndex
  * to point at the target sibling.

package/src/index.ts

@@ -67,7 +67,7 @@ export {
   CkCitationCard,
   CkConversation,
   CkConversationLayout,
-  CkCopyMessageActionButton,
+  CkCopyMessageButton,
   CkDropZoneOverlay,
   CkFeedbackButton,
   CkFeedbackDialog,
@@ -77,13 +77,14 @@ export {
   CkHistoryWrapper,
   CkInput,
   CkMarkdownRenderer,
-  CkMessageActionButton,
+  CkMessageButton,
   CkModelSelector,
   CkPromptSendButton,
   CkPromptMenuButton,
   CkPromptStopButton,
   CkPromptInput,
   CkPromptInputDisclaimer,
+  CkRegenerateMessageButton,
   CkSendIcon,
   CkStopIcon,
   CkUserMessage,

package/dist/components/base/CkCopyMessageActionButton/CkCopyMessageActionButton.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CkCopyMessageActionButton.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/base/CkCopyMessageActionButton/CkCopyMessageActionButton.stories.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE3D,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,yBAAyB,CAwBhD,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAkBnC;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,KAKrB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,KAMtB,CAAC"}

package/dist/components/base/CkCopyMessageActionButton/CkCopyMessageActionButton.vue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CkCopyMessageActionButton.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/base/CkCopyMessageActionButton/CkCopyMessageActionButton.vue"],"names":[],"mappings":"AAkHA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,SAAS,CAAC;AA+M9D,QAAA,MAAM,YAAY;;iBA7LW,OAAO;;;;iBAAP,OAAO;;;;;;;;6EAiMlC,CAAC;wBACkB,OAAO,YAAY;AAAxC,wBAAyC"}

package/dist/components/base/CkCopyMessageActionButton/index.d.ts

@@ -1,3 +0,0 @@
-export { default as CkCopyMessageActionButton } from './CkCopyMessageActionButton.vue';
-export type * from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/components/base/CkCopyMessageActionButton/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/base/CkCopyMessageActionButton/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,MAAM,WAAW,8BAA8B;IAC7C,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,8BAA8B;IAC7C,2EAA2E;IAC3E,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CAClD"}

package/dist/components/base/CkMessageActionButton/CkMessageActionButton.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CkMessageActionButton.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/base/CkMessageActionButton/CkMessageActionButton.stories.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAG3D,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,OAAO,qBAAqB,CAqB5C,CAAC;AAEF,eAAe,IAAI,CAAC;AACpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAanC;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,KAUrB,CAAC"}

package/dist/components/base/CkMessageActionButton/CkMessageActionButton.vue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CkMessageActionButton.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/base/CkMessageActionButton/CkMessageActionButton.vue"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAC;AAwD1D,QAAA,IAAI,OAAO,IAAW,CAAE;AACxB,KAAK,WAAW,GAAG,EAAE,GACnB;IAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,OAAO,KAAK,GAAG,CAAA;CAAE,CAAC;AAK/C,QAAA,MAAM,UAAU;;6EAGd,CAAC;AACH,QAAA,MAAM,YAAY,EAAS,eAAe,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC,CAAC;wBACtD,OAAO,YAAY;AAAxC,wBAAyC;AAWzC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}

package/dist/components/base/CkMessageActionButton/index.d.ts

@@ -1,3 +0,0 @@
-export { default as CkMessageActionButton } from './CkMessageActionButton.vue';
-export type * from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/components/base/CkMessageActionButton/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/base/CkMessageActionButton/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAC/E,mBAAmB,SAAS,CAAC"}

package/dist/components/base/CkMessageActionButton/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/components/base/CkMessageActionButton/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}

package/src/components/base/CkCopyMessageActionButton/index.ts

@@ -1,2 +0,0 @@
-export { default as CkCopyMessageActionButton } from './CkCopyMessageActionButton.vue';
-export type * from './types';

package/src/components/base/CkMessageActionButton/index.ts

@@ -1,2 +0,0 @@
-export { default as CkMessageActionButton } from './CkMessageActionButton.vue';
-export type * from './types';