@aleph-alpha/chat-kit 5.4.0 → 5.6.0

package/dist/types.d.ts

@@ -89,11 +89,49 @@ export interface TreeMessage {
     status: MessageStatus;
     createdAt: Date;
     metadata?: MessageMetadata;
+    /**
+     * When set, this node's `childrenIds` are a **comparison** (a preference
+     * pair / draft set rendered side-by-side) rather than ordinary regenerate
+     * alternatives. Set when the comparison is opened and left set once voted —
+     * the comparison stays a distinct, labelled view until the user continues
+     * past the winner, at which point it collapses to linear history.
+     */
+    comparing?: boolean;
+    /**
+     * The child id chosen when a `comparing` node is voted on (mirrored to
+     * `activeChildIndex`). Absent = not yet voted. Its presence flips the
+     * comparison from the blind "awaiting vote" state to the revealed "resolved"
+     * state; once the winner branch gains children the comparison is history.
+     */
+    comparisonWinnerId?: string;
 }
 export interface ConversationTree {
     nodes: Record<string, TreeMessage>;
     rootId: string | null;
 }
+/**
+ * One side of an active comparison: the head child that defines the lane plus
+ * that lane's full active sub-path (length 1 for a fresh pair, longer once the
+ * conversation has continued inside the lane).
+ */
+export interface ComparisonLane {
+    branchId: string;
+    path: BaseMessage[];
+}
+/**
+ * The single active comparison surfaced alongside the linear `messages` path.
+ * Non-null only while the active path's tail fork is unresolved (blind) or
+ * voted-but-not-continued (revealed). Its `forkParentId` is the last item of
+ * `messages`; everything below the fork lives in `lanes`.
+ */
+export interface ActiveComparison {
+    forkParentId: string;
+    /** false = awaiting vote (blind); true = voted, not yet continued (revealed). */
+    resolved: boolean;
+    /** The chosen lane's head id once resolved. */
+    winnerBranchId: string | null;
+    lanes: ComparisonLane[];
+}
 /**
  * High-level conversation record consumed by `CkHistory`.
  *

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE1D,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;AAE1E;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,WAAW,GAAG,YAAY,CAAC;AAE9E;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,oBAAoB,CAAC;CAC9B;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,oBAAoB,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,uBAAuB,CAAC;AAE5B;;;;;;;;;;GAUG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,SAAS,EAAE,IAAI,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACnC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/{useMessageHandler-N50Yj-NU.js → useMessageHandler-Tellov3w.js}

@@ -3,47 +3,98 @@ import { reactive, ref, computed, readonly } from "vue";
 function createEmptyTree() {
   return { nodes: {}, rootId: null };
 }
-function getLinearPath(tree) {
-  const { nodes, rootId } = tree;
-  if (!rootId || !nodes[rootId]) return [];
+function toBaseMessage(nodes, node) {
+  const base = {
+    id: node.id,
+    role: node.role,
+    content: node.content,
+    createdAt: node.createdAt,
+    status: node.status,
+    ...node.metadata !== void 0 ? { metadata: node.metadata } : {}
+  };
+  if (node.parentId !== null) {
+    const parent = nodes[node.parentId];
+    if (parent && parent.childrenIds.length > 1) {
+      base.siblingIds = [...parent.childrenIds];
+      base.siblingIndex = parent.childrenIds.indexOf(node.id);
+    }
+  }
+  return base;
+}
+function isActiveComparison(nodes, node) {
+  if (!node.comparing || node.childrenIds.length < 2) return false;
+  const winnerId = node.comparisonWinnerId;
+  if (winnerId == null) return true;
+  const winner = nodes[winnerId];
+  return !winner || winner.childrenIds.length === 0;
+}
+function laneWalk(nodes, headId) {
   const path = [];
+  let current = headId;
+  while (current !== null) {
+    const node = nodes[current];
+    if (!node) break;
+    path.push(toBaseMessage(nodes, node));
+    if (node.childrenIds.length === 0) break;
+    current = node.childrenIds[node.activeChildIndex];
+  }
+  return path;
+}
+function projectActivePath(tree) {
+  const { nodes, rootId } = tree;
+  const trunk = [];
+  if (!rootId || !nodes[rootId]) return { trunk, activeComparison: null };
   let current = rootId;
   while (current !== null) {
     const node = nodes[current];
     if (!node) break;
-    const base = {
-      id: node.id,
-      role: node.role,
-      content: node.content,
-      createdAt: node.createdAt,
-      status: node.status,
-      ...node.metadata !== void 0 ? { metadata: node.metadata } : {}
-    };
-    if (node.parentId !== null) {
-      const parent = nodes[node.parentId];
-      if (parent && parent.childrenIds.length > 1) {
-        base.siblingIds = [...parent.childrenIds];
-        base.siblingIndex = parent.childrenIds.indexOf(node.id);
-      }
+    trunk.push(toBaseMessage(nodes, node));
+    if (isActiveComparison(nodes, node)) {
+      const lanes = node.childrenIds.map((branchId) => ({
+        branchId,
+        path: laneWalk(nodes, branchId)
+      }));
+      const winnerBranchId = node.comparisonWinnerId ?? null;
+      return {
+        trunk,
+        activeComparison: {
+          forkParentId: node.id,
+          resolved: winnerBranchId !== null,
+          winnerBranchId,
+          lanes
+        }
+      };
     }
-    path.push(base);
     if (node.childrenIds.length === 0) break;
     current = node.childrenIds[node.activeChildIndex];
   }
-  return path;
+  return { trunk, activeComparison: null };
 }
-function addNode(tree, node) {
+function addNode(tree, node, opts = { activate: true }) {
   tree.nodes[node.id] = node;
   if (node.parentId !== null) {
     const parent = tree.nodes[node.parentId];
     if (parent && !parent.childrenIds.includes(node.id)) {
       parent.childrenIds.push(node.id);
-      parent.activeChildIndex = parent.childrenIds.length - 1;
+      if (opts.activate)
+        parent.activeChildIndex = parent.childrenIds.length - 1;
     }
   } else if (tree.rootId === null) {
     tree.rootId = node.id;
   }
 }
+function markComparison(tree, parentId) {
+  const parent = tree.nodes[parentId];
+  if (parent) parent.comparing = true;
+}
+function voteComparison(tree, parentId, winnerBranchId) {
+  const parent = tree.nodes[parentId];
+  if (!parent) return;
+  const idx = parent.childrenIds.indexOf(winnerBranchId);
+  if (idx === -1) return;
+  parent.comparisonWinnerId = winnerBranchId;
+  parent.activeChildIndex = idx;
+}
 function updateNode(tree, id, updates) {
   const node = tree.nodes[id];
   if (!node) return;
@@ -81,12 +132,18 @@ function deleteSubtrees(tree, ids) {
     delete tree.nodes[currentId];
   }
 }
-function cutBranchAfter(tree, id) {
+function cutBranchAfter(tree, id, keepChildId) {
   const node = tree.nodes[id];
-  if (!node) return;
-  deleteSubtrees(tree, node.childrenIds);
-  node.childrenIds = [];
+  if (!node || !Object.prototype.hasOwnProperty.call(tree.nodes, id)) return;
+  const kept = keepChildId !== void 0 && node.childrenIds.includes(keepChildId) ? keepChildId : null;
+  deleteSubtrees(
+    tree,
+    kept === null ? node.childrenIds : node.childrenIds.filter((childId) => childId !== kept)
+  );
+  node.childrenIds = kept === null ? [] : [kept];
   node.activeChildIndex = 0;
+  delete node.comparing;
+  delete node.comparisonWinnerId;
 }
 function cutBranchAt(tree, id) {
   const node = tree.nodes[id];
@@ -106,6 +163,14 @@ function cutBranchAt(tree, id) {
   if (parent.activeChildIndex >= parent.childrenIds.length) {
     parent.activeChildIndex = Math.max(0, parent.childrenIds.length - 1);
   }
+  if (parent.comparing) {
+    if (parent.childrenIds.length < 2) {
+      delete parent.comparing;
+      delete parent.comparisonWinnerId;
+    } else if (parent.comparisonWinnerId === id) {
+      delete parent.comparisonWinnerId;
+    }
+  }
 }
 function navigate(tree, targetId) {
   const node = tree.nodes[targetId];
@@ -119,9 +184,14 @@ function navigate(tree, targetId) {
 const useMessageHandler = () => {
   const tree = reactive(createEmptyTree());
   const currentUserMessage = ref("");
-  const messages = computed(() => getLinearPath(tree));
+  const projection = computed(() => projectActivePath(tree));
+  const messages = computed(() => projection.value.trunk);
+  const activeComparison = computed(
+    () => projection.value.activeComparison
+  );
   const currentLeafId = computed(() => {
-    const list = messages.value;
+    if (projection.value.activeComparison) return null;
+    const list = projection.value.trunk;
     return list.length > 0 ? list[list.length - 1].id : null;
   });
   function resolveParentId(parentId) {
@@ -171,6 +241,9 @@ const useMessageHandler = () => {
   function updateMessage(message) {
     const existing = tree.nodes[message.id];
     if (existing) {
+      if (message.comparing && existing.parentId) {
+        markComparison(tree, existing.parentId);
+      }
       updateNode(tree, message.id, {
         content: message.content,
         role: message.role,
@@ -178,9 +251,13 @@ const useMessageHandler = () => {
         ...message.metadata !== void 0 ? { metadata: message.metadata } : {}
       });
     } else {
+      const parentId = resolveParentId(message.parentId);
+      if (message.comparing && parentId) {
+        markComparison(tree, parentId);
+      }
       const node = {
         id: message.id,
-        parentId: resolveParentId(message.parentId),
+        parentId,
         childrenIds: [],
         activeChildIndex: 0,
         role: message.role,
@@ -218,8 +295,8 @@ const useMessageHandler = () => {
   function navigate$1(targetId) {
     navigate(tree, targetId);
   }
-  function cutBranchAfter$1(messageId) {
-    cutBranchAfter(tree, messageId);
+  function cutBranchAfter$1(messageId, keepChildId) {
+    cutBranchAfter(tree, messageId, keepChildId);
   }
   function cutBranchAt$1(messageId) {
     cutBranchAt(tree, messageId);
@@ -227,8 +304,12 @@ const useMessageHandler = () => {
   function getTree() {
     return readonly(tree);
   }
+  function voteComparison$1(parentId, winnerBranchId) {
+    voteComparison(tree, parentId, winnerBranchId);
+  }
   return {
     messages,
+    activeComparison,
     currentUserMessage: readonly(currentUserMessage),
     currentLeafId,
     updateMessage,
@@ -242,6 +323,7 @@ const useMessageHandler = () => {
     navigate: navigate$1,
     cutBranchAfter: cutBranchAfter$1,
     cutBranchAt: cutBranchAt$1,
+    voteComparison: voteComparison$1,
     getTree
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aleph-alpha/chat-kit",
-  "version": "5.4.0",
+  "version": "5.6.0",
   "description": "Chat kit package for building chat interfaces with Vue",
   "type": "module",
   "main": "./dist/index.js",
@@ -107,7 +107,7 @@
     "wait-on": "9.0.3",
     "@aleph-alpha/eslint-config-frontend": "0.7.0",
     "@aleph-alpha/prettier-config-frontend": "2.1.0",
-    "@aleph-alpha/tsconfig-frontend": "0.7.0"
+    "@aleph-alpha/tsconfig-frontend": "0.7.1"
   },
   "scripts": {
     "build": "vite build && vue-tsc --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir dist",

package/src/adapters/arena.spec.ts

@@ -0,0 +1,86 @@
+import { describe, expect, it } from 'vitest';
+
+import { responsesToTree, type StoredResponse } from './responses-api';
+
+function arenaResponse(
+  id: string,
+  matchupId: string,
+  slot: 'a' | 'b',
+  modelId: string,
+  answer: string,
+): StoredResponse {
+  return {
+    id,
+    object: 'response',
+    created_at: 1,
+    completed_at: 2,
+    status: 'completed',
+    model: modelId,
+    previous_response_id: null,
+    request_input: [{ role: 'user', content: 'prompt' }],
+    output: [
+      {
+        type: 'message',
+        id: `msg-${id}`,
+        status: 'completed',
+        role: 'assistant',
+        content: [{ type: 'output_text', text: answer }],
+      },
+    ],
+    metadata: {
+      arena: JSON.stringify({
+        matchup_id: matchupId,
+        slot,
+        model_id: modelId,
+        variant: 'king-of-the-hill',
+      }),
+    },
+  } as StoredResponse;
+}
+
+describe('responsesToTree arena collapse', () => {
+  it('folds an unvoted pair into one comparison node with two lanes', () => {
+    const tree = responsesToTree([
+      arenaResponse('respA', 'm1', 'a', 'phoenix-latest', 'A'),
+      arenaResponse('respB', 'm1', 'b', 'kimi-k2.6', 'B'),
+    ]);
+
+    // Single root user node, marked comparing, with two assistant children.
+    const root = tree.nodes[tree.rootId!]!;
+    expect(root.role).toBe('user');
+    expect(root.comparing).toBe(true);
+    expect(root.comparisonWinnerId).toBeUndefined();
+    expect(root.childrenIds).toHaveLength(2);
+
+    const children = root.childrenIds.map((id) => tree.nodes[id]!);
+    expect(children.every((c) => c.role === 'assistant')).toBe(true);
+    // Model id stamped for lane labels; ordered slot a then b.
+    const slots = children.map(
+      (c) => (c.metadata.arena as { slot?: string }).slot,
+    );
+    expect(slots).toEqual(['a', 'b']);
+  });
+
+  it('marks the recorded winner when arenaWinners is supplied', () => {
+    const tree = responsesToTree(
+      [
+        arenaResponse('respA', 'm1', 'a', 'phoenix-latest', 'A'),
+        arenaResponse('respB', 'm1', 'b', 'kimi-k2.6', 'B'),
+      ],
+      { arenaWinners: { m1: 'respB' } },
+    );
+    const root = tree.nodes[tree.rootId!]!;
+    // Winner is respB's assistant node (its wire message id).
+    expect(root.comparisonWinnerId).toBe('msg-respB');
+    expect(root.childrenIds[root.activeChildIndex]).toBe('msg-respB');
+  });
+
+  it('leaves a single surviving response as an ordinary linear turn', () => {
+    // 7-Discard: after continue, the BE dropped the loser — one response left.
+    const tree = responsesToTree([
+      arenaResponse('respA', 'm1', 'a', 'phoenix-latest', 'A'),
+    ]);
+    const root = tree.nodes[tree.rootId!]!;
+    expect(root.comparing).toBeUndefined();
+  });
+});