@dbx-tools/ui-mastra 0.3.21 → 0.3.23

package/src/support/mastra-client.ts

@@ -1,4 +1,4 @@
-import { usePluginClientConfig } from "@dbx-tools/ui-appkit/react";
+import { error as errorUtil } from "@dbx-tools/shared-core";
 import {
   feedback,
   override,
@@ -17,8 +17,8 @@ import {
   type MastraUpdateThreadResponse,
   type StatementData,
 } from "@dbx-tools/shared-mastra";
-import { error as errorUtil } from "@dbx-tools/shared-core";
 import type { ServingEndpointSummary } from "@dbx-tools/shared-model";
+import { usePluginClientConfig } from "@dbx-tools/ui-appkit/react";
 import { MastraClient } from "@mastra/client-js";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { asMastraStreamResponse, type MastraStreamResponse } from "./mastra-stream";
@@ -59,8 +59,7 @@ export class MastraPluginClient extends MastraClient {
 
   constructor(config: MastraClientConfig) {
     super({
-      baseUrl:
-        typeof window !== "undefined" ? window.location.origin : "http://localhost",
+      baseUrl: typeof window !== "undefined" ? window.location.origin : "http://localhost",
       apiPrefix: config.basePath,
       credentials: "include",
       headers: {},
@@ -261,9 +260,7 @@ export class MastraPluginClient extends MastraClient {
       "DELETE",
       wire.MastraClearHistoryResponseSchema,
       {
-        ...(options.threadId
-          ? { headers: { [thread.THREAD_ID_HEADER]: options.threadId } }
-          : {}),
+        ...(options.threadId ? { headers: { [thread.THREAD_ID_HEADER]: options.threadId } } : {}),
         ...(options.signal ? { signal: options.signal } : {}),
       },
     );
@@ -551,8 +548,7 @@ export const useMastraModels = (
         // lists a vectoriser. If the server didn't tag tasks at all,
         // pass everything through so we don't show an empty list.
         const llms = endpoints.filter(
-          (e) =>
-            e.task !== "llm/v1/embeddings" && (!e.task || e.task.startsWith("llm/v1/")),
+          (e) => e.task !== "llm/v1/embeddings" && (!e.task || e.task.startsWith("llm/v1/")),
         );
         setModels(llms.length > 0 ? llms : endpoints);
       })
@@ -709,8 +705,7 @@ export const useMastraThreads = (
         setError(null);
       })
       .catch((e: unknown) => {
-        if (controller.signal.aborted || (e as { name?: string }).name === "AbortError")
-          return;
+        if (controller.signal.aborted || (e as { name?: string }).name === "AbortError") return;
         setError(errorUtil.toError(e));
         setThreads([]);
       })
@@ -766,8 +761,7 @@ export interface ByIdFetchState<T> {
  * everything. Keyed by `<type>:<id>` (e.g. `chart:abc123`).
  */
 type FetchCacheEntry<T> =
-  | { kind: "pending"; promise: Promise<T | undefined> }
-  | { kind: "ready"; data: T | undefined };
+  { kind: "pending"; promise: Promise<T | undefined> } | { kind: "ready"; data: T | undefined };
 
 const fetchCache = new Map<string, FetchCacheEntry<unknown>>();
 
@@ -902,8 +896,7 @@ function useByIdFetch<T>(
  * stays stable - inlining a fresh closure would refire the
  * effect on every render.
  */
-const chartIsTerminal = (c: Chart): boolean =>
-  c.result !== undefined || c.error !== undefined;
+const chartIsTerminal = (c: Chart): boolean => c.result !== undefined || c.error !== undefined;
 
 /**
  * `isTerminal` for {@link useStatementFetch}. A statement
@@ -955,9 +948,6 @@ export const useStatementFetch = (
 ): ByIdFetchState<StatementData> => {
   const client = useMastraClient();
   const key = statementId ? `data:${statementId}` : undefined;
-  const fetcher = useCallback(
-    () => client.statement(statementId as string),
-    [client, statementId],
-  );
+  const fetcher = useCallback(() => client.statement(statementId as string), [client, statementId]);
   return useByIdFetch<StatementData>(key, fetcher, statementIsTerminal);
 };

package/src/support/thread-sessions.ts

@@ -57,10 +57,7 @@ export function isSessionRunning(session: ThreadSession): boolean {
 }
 
 /** Append a steer to the queue (oldest first). Returns a new array. */
-export function enqueueSteer(
-  queue: QueuedSteer[],
-  steer: QueuedSteer,
-): QueuedSteer[] {
+export function enqueueSteer(queue: QueuedSteer[], steer: QueuedSteer): QueuedSteer[] {
   return [...queue, steer];
 }
 

package/test/thread-sessions.test.ts

@@ -0,0 +1,101 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import type { QueuedSteer, ToolEvent } from "../src/react/types";
+import {
+  enqueueSteer,
+  removeSteer,
+  reorderSteers,
+  terminateRunningToolEvents,
+} from "../src/support/thread-sessions";
+
+const event = (id: string, status: ToolEvent["status"]): ToolEvent => ({
+  id,
+  toolName: "ask_genie",
+  status,
+});
+
+describe("terminateRunningToolEvents", () => {
+  it("settles running pills to done", () => {
+    const next = terminateRunningToolEvents({
+      msg1: [event("a", "running"), event("b", "done")],
+      msg2: [event("c", "running")],
+    });
+    assert.deepEqual(
+      next.msg1!.map((e) => e.status),
+      ["done", "done"],
+    );
+    assert.deepEqual(
+      next.msg2!.map((e) => e.status),
+      ["done"],
+    );
+  });
+
+  it("leaves already-terminal pills untouched and returns the same ref when nothing ran", () => {
+    const input = {
+      msg1: [event("a", "done"), event("b", "error")],
+    };
+    const next = terminateRunningToolEvents(input);
+    // No running pills, so the map is returned unchanged (identity) to let
+    // callers skip a needless state update.
+    assert.equal(next, input);
+  });
+
+  it("handles an empty map", () => {
+    const input = {};
+    assert.equal(terminateRunningToolEvents(input), input);
+  });
+});
+
+describe("steer queue", () => {
+  const steer = (id: string, text: string): QueuedSteer => ({ id, text });
+
+  it("enqueues oldest-first without mutating the input", () => {
+    const q0: QueuedSteer[] = [];
+    const q1 = enqueueSteer(q0, steer("a", "first"));
+    const q2 = enqueueSteer(q1, steer("b", "second"));
+    assert.deepEqual(
+      q2.map((s) => s.id),
+      ["a", "b"],
+    );
+    assert.equal(q0.length, 0);
+    assert.equal(q1.length, 1);
+  });
+
+  it("removes by id and leaves the rest in order", () => {
+    const q = [steer("a", "1"), steer("b", "2"), steer("c", "3")];
+    assert.deepEqual(
+      removeSteer(q, "b").map((s) => s.id),
+      ["a", "c"],
+    );
+  });
+
+  it("removing an unknown id is a no-op copy", () => {
+    const q = [steer("a", "1")];
+    assert.deepEqual(removeSteer(q, "zzz"), q);
+  });
+
+  it("reorders to match the given id order", () => {
+    const q = [steer("a", "1"), steer("b", "2"), steer("c", "3")];
+    assert.deepEqual(
+      reorderSteers(q, ["c", "a", "b"]).map((s) => s.id),
+      ["c", "a", "b"],
+    );
+  });
+
+  it("appends any current steer missing from the order, and ignores unknown ids", () => {
+    const q = [steer("a", "1"), steer("b", "2"), steer("c", "3")];
+    // "b" omitted + a stale "zzz" present: zzz ignored, b appended after the rest.
+    assert.deepEqual(
+      reorderSteers(q, ["c", "zzz", "a"]).map((s) => s.id),
+      ["c", "a", "b"],
+    );
+  });
+
+  it("never duplicates when the order repeats an id", () => {
+    const q = [steer("a", "1"), steer("b", "2")];
+    assert.deepEqual(
+      reorderSteers(q, ["a", "a", "b"]).map((s) => s.id),
+      ["a", "b"],
+    );
+  });
+});

package/test/tsconfig.json

@@ -0,0 +1,14 @@
+// ~~ Generated by projen. To modify, edit .projenrc.js and run "pnpm exec projen".
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "noEmit": true,
+    "rootDir": ".."
+  },
+  "include": [
+    "**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}