@assistant-ui/core 0.3.17 → 0.3.18

package/src/runtimes/remote-thread-list/title-generation.ts

@@ -0,0 +1,329 @@
+export type ThreadTitleClaim = {
+  readonly title: string;
+  readonly order: number;
+  readonly settled: Promise<boolean>;
+  readonly settle: (renamed: boolean) => void;
+};
+
+type ThreadTitleGeneration = {
+  readonly automatic: boolean;
+  readonly order: number;
+  claim: ThreadTitleClaim | null;
+  beforeGenerationClaims: readonly ThreadTitleClaim[];
+  superseded: boolean;
+  readonly persisted: Promise<string | undefined>;
+  readonly settlePersisted: (title: string | undefined) => void;
+};
+
+export type ThreadTitleState = {
+  generations: Set<ThreadTitleGeneration>;
+  pendingClaim: ThreadTitleClaim | null;
+  inFlightClaims: Set<ThreadTitleClaim>;
+  manualTitle: string | undefined;
+  latestExplicit: ThreadTitleGeneration | null;
+  nextOrder: number;
+};
+
+export type ThreadTitleGenerationRun = {
+  states: Map<string, ThreadTitleState>;
+  threadId: string;
+  automatic: boolean;
+  generate: (
+    onTitle: (title: string | undefined) => Promise<void>,
+  ) => Promise<void>;
+  rename: (title: string) => Promise<void>;
+  applyTitle: (title: string | undefined) => Promise<void>;
+};
+
+function getThreadTitleState(
+  states: Map<string, ThreadTitleState>,
+  threadId: string,
+): ThreadTitleState {
+  let state = states.get(threadId);
+  if (state === undefined) {
+    state = {
+      generations: new Set(),
+      pendingClaim: null,
+      inFlightClaims: new Set(),
+      manualTitle: undefined,
+      latestExplicit: null,
+      nextOrder: 0,
+    };
+    states.set(threadId, state);
+  }
+  return state;
+}
+
+function pruneThreadTitleState(
+  states: Map<string, ThreadTitleState>,
+  threadId: string,
+  state: ThreadTitleState,
+): void {
+  if (
+    state.generations.size === 0 &&
+    state.pendingClaim === null &&
+    state.inFlightClaims.size === 0 &&
+    state.manualTitle === undefined &&
+    states.get(threadId) === state
+  ) {
+    states.delete(threadId);
+  }
+}
+
+function isCurrentGeneration(
+  state: ThreadTitleState,
+  generation: ThreadTitleGeneration,
+): boolean {
+  return (
+    !generation.superseded &&
+    (state.latestExplicit?.order ?? 0) <= generation.order
+  );
+}
+
+function isCurrentClaim(
+  state: ThreadTitleState,
+  claim: ThreadTitleClaim,
+): boolean {
+  return (state.latestExplicit?.order ?? 0) < claim.order;
+}
+
+export function startThreadTitleRename(
+  states: Map<string, ThreadTitleState>,
+  threadId: string,
+  title: string,
+): ThreadTitleClaim {
+  const state = getThreadTitleState(states, threadId);
+  let settle!: (renamed: boolean) => void;
+  const settled = new Promise<boolean>((resolve) => {
+    settle = resolve;
+  });
+  const claim: ThreadTitleClaim = {
+    title,
+    order: ++state.nextOrder,
+    settled,
+    settle,
+  };
+  state.pendingClaim = claim;
+  state.inFlightClaims.add(claim);
+  for (const generation of state.generations) {
+    if (generation.order < claim.order) generation.claim = claim;
+  }
+  return claim;
+}
+
+export function finishThreadTitleRename(
+  states: Map<string, ThreadTitleState>,
+  threadId: string,
+  claim: ThreadTitleClaim,
+  renamed: boolean,
+): void {
+  claim.settle(renamed);
+  const state = states.get(threadId);
+  if (state === undefined) return;
+  state.inFlightClaims.delete(claim);
+  if (state.pendingClaim === claim) {
+    state.pendingClaim = null;
+    if (renamed) {
+      state.manualTitle = claim.title;
+    }
+  }
+  pruneThreadTitleState(states, threadId, state);
+}
+
+function takeManualTitle(
+  states: Map<string, ThreadTitleState>,
+  threadId: string,
+  state: ThreadTitleState,
+): string | undefined {
+  const retained = state.manualTitle;
+  if (retained === undefined) return undefined;
+  state.manualTitle = undefined;
+  pruneThreadTitleState(states, threadId, state);
+  return retained;
+}
+
+export function clearThreadTitleState(
+  states: Map<string, ThreadTitleState>,
+  threadId: string,
+): void {
+  states.delete(threadId);
+}
+
+function startThreadTitleGeneration(
+  states: Map<string, ThreadTitleState>,
+  threadId: string,
+  automatic: boolean,
+): ThreadTitleGeneration | null {
+  const state = getThreadTitleState(states, threadId);
+  if (
+    automatic &&
+    state.pendingClaim === null &&
+    takeManualTitle(states, threadId, state) !== undefined
+  ) {
+    return null;
+  }
+
+  let settlePersisted!: (title: string | undefined) => void;
+  const persisted = new Promise<string | undefined>((resolve) => {
+    settlePersisted = resolve;
+  });
+  const generation: ThreadTitleGeneration = {
+    automatic,
+    order: ++state.nextOrder,
+    claim: automatic ? state.pendingClaim : null,
+    beforeGenerationClaims: automatic ? [] : [...state.inFlightClaims],
+    superseded: false,
+    persisted,
+    settlePersisted,
+  };
+  if (!automatic) {
+    state.pendingClaim = null;
+    state.manualTitle = undefined;
+    state.latestExplicit = generation;
+    for (const active of state.generations) {
+      if (active.automatic) active.superseded = true;
+    }
+  }
+  state.generations.add(generation);
+  return generation;
+}
+
+/**
+ * Runs one title generation under the per-thread rename claims and generation
+ * ordering, so the title that wins locally is also the title left on the
+ * server.
+ *
+ * A generated run persists the title itself, and the adapter exposes no
+ * compare-and-set, so the run that loses reasserts the winner through `rename`
+ * only after `generate` has resolved. Reasserting mid-stream would race the
+ * run's own write and lose the winning title on the server.
+ */
+export async function runThreadTitleGeneration({
+  states,
+  threadId,
+  automatic,
+  generate,
+  rename,
+  applyTitle,
+}: ThreadTitleGenerationRun): Promise<void> {
+  const state = getThreadTitleState(states, threadId);
+  const generation = startThreadTitleGeneration(states, threadId, automatic);
+  if (generation === null) return;
+
+  let persistedTitle: string | undefined;
+  let persistedOrder = generation.order;
+
+  const settleClaim = async (claim: ThreadTitleClaim) => {
+    const renamed = await claim.settled;
+    if (generation.claim !== claim) return undefined;
+    if (!renamed) {
+      generation.claim = null;
+      if (state.pendingClaim === claim) state.pendingClaim = null;
+    }
+    return renamed;
+  };
+
+  const retainManualTitle = () =>
+    automatic && takeManualTitle(states, threadId, state) !== undefined;
+
+  // `generate` resolves only once the run has persisted its title, so a run
+  // that lost the ordering race while it streamed has already overwritten the
+  // winner. It waits for the winning generation to persist its own title and
+  // writes that title back.
+  const repairLostRace = async () => {
+    if (persistedTitle === undefined) return;
+    while (true) {
+      const claim = generation.claim;
+      if (
+        claim !== null &&
+        claim.order > persistedOrder &&
+        isCurrentClaim(state, claim)
+      ) {
+        const renamed = await settleClaim(claim);
+        if (renamed === true) {
+          persistedTitle = claim.title;
+          persistedOrder = claim.order;
+          await rename(claim.title);
+        }
+        continue;
+      }
+      const winner = state.latestExplicit;
+      if (winner === null || winner.order <= persistedOrder) return;
+      const title = await winner.persisted;
+      if (state.latestExplicit !== winner) continue;
+      persistedOrder = winner.order;
+      if (title === undefined || title === persistedTitle) return;
+      persistedTitle = title;
+      await rename(title);
+    }
+  };
+
+  const runGeneration = async () => {
+    // An explicit generation waits for every earlier rename because any of
+    // those server writes may settle last.
+    if (generation.beforeGenerationClaims.length > 0) {
+      await Promise.all(
+        generation.beforeGenerationClaims.map((claim) => claim.settled),
+      );
+    }
+    if (generation.claim !== null) {
+      const renamed = await settleClaim(generation.claim);
+      if (renamed === true) {
+        generation.superseded = true;
+        return;
+      }
+      if (renamed === false && retainManualTitle()) return;
+    }
+    if (!isCurrentGeneration(state, generation)) return;
+
+    let sawTitle = false;
+    let lastTitle: string | undefined;
+    await generate(async (title) => {
+      sawTitle = true;
+      lastTitle = title;
+      if (title !== undefined) persistedTitle = title;
+      const claim = generation.claim;
+      if (claim !== null) {
+        const renamed = await settleClaim(claim);
+        if (renamed !== false) return;
+        if (retainManualTitle()) {
+          generation.superseded = true;
+          return;
+        }
+      }
+      if (isCurrentGeneration(state, generation)) await applyTitle(lastTitle);
+    });
+
+    while (true) {
+      const claim = generation.claim;
+      if (claim === null) return;
+      const renamed = await settleClaim(claim);
+      if (renamed === undefined) continue;
+      if (renamed === false) {
+        if (retainManualTitle()) return;
+        if (sawTitle && isCurrentGeneration(state, generation)) {
+          await applyTitle(lastTitle);
+        }
+        return;
+      }
+      if (!isCurrentClaim(state, claim)) return;
+      await rename(claim.title);
+      persistedTitle = claim.title;
+      persistedOrder = claim.order;
+      if (generation.claim !== claim) continue;
+      if (!isCurrentGeneration(state, generation)) return;
+      await applyTitle(claim.title);
+      generation.superseded = true;
+      return;
+    }
+  };
+
+  try {
+    await runGeneration();
+    await repairLostRace();
+  } finally {
+    generation.settlePersisted(persistedTitle);
+    state.generations.delete(generation);
+    pruneThreadTitleState(states, threadId, state);
+  }
+}

package/src/runtimes/remote-thread-list/title.test.ts

@@ -0,0 +1,62 @@
+import { describe, expect, it } from "vitest";
+import { applyTitleStream } from "./title";
+
+const createTextStream = (text: string) =>
+  new ReadableStream({
+    start(controller) {
+      controller.enqueue({
+        type: "part-start",
+        path: [0],
+        part: { type: "text" },
+      });
+      controller.enqueue({
+        type: "text-delta",
+        path: [0],
+        textDelta: text,
+      });
+      controller.enqueue({ type: "part-finish", path: [0] });
+      controller.close();
+    },
+  }) as never;
+
+describe("applyTitleStream", () => {
+  it("ignores an empty stream", async () => {
+    const titles: (string | undefined)[] = [];
+
+    await applyTitleStream(
+      new ReadableStream({
+        start(controller) {
+          controller.close();
+        },
+      }) as never,
+      async (title) => {
+        titles.push(title);
+      },
+    );
+
+    expect(titles).toEqual([]);
+  });
+
+  it("ignores whitespace-only titles", async () => {
+    const titles: (string | undefined)[] = [];
+
+    await applyTitleStream(createTextStream("   "), async (title) => {
+      titles.push(title);
+    });
+
+    expect(titles).toEqual([]);
+  });
+
+  it("forwards titles containing text unchanged", async () => {
+    const titles: (string | undefined)[] = [];
+
+    await applyTitleStream(
+      createTextStream(" Generated title "),
+      async (title) => {
+        titles.push(title);
+      },
+    );
+
+    expect(titles).toContain(" Generated title ");
+  });
+});

package/src/runtimes/remote-thread-list/title.ts

@@ -1,3 +1,16 @@
+import { AssistantMessageStream } from "assistant-stream";
+
 export const isTitleSourceMessage = (message: {
   status?: { type: string } | undefined;
 }) => message.status?.type !== "running";
+
+export const applyTitleStream = async (
+  stream: Parameters<typeof AssistantMessageStream.fromAssistantStream>[0],
+  onTitle: (title: string | undefined) => Promise<void>,
+) => {
+  const messageStream = AssistantMessageStream.fromAssistantStream(stream);
+  for await (const result of messageStream) {
+    const title = result.parts.filter((part) => part.type === "text")[0]?.text;
+    if (title?.trim()) await onTitle(title);
+  }
+};

package/src/runtimes/remote-thread-list/types.ts

@@ -3,6 +3,7 @@ import type { AssistantRuntime } from "../../runtime/api/assistant-runtime";
 import type { AssistantStream } from "assistant-stream";
 import type { ThreadHistoryAdapter } from "../../adapters/thread-history";
 import type { AttachmentAdapter } from "../../adapters/attachment";
+import type { FeedbackAdapter } from "../../adapters/feedback";
 import type { ModelContextProvider } from "../../model-context/types";
 
 /* oxlint-disable typescript/no-explicit-any -- structural stand-in for ComponentType without depending on react types */
@@ -40,6 +41,7 @@ export type RuntimeAdapters = {
   modelContext?: ModelContextProvider | undefined;
   history?: ThreadHistoryAdapter | undefined;
   attachments?: AttachmentAdapter | undefined;
+  feedback?: FeedbackAdapter | undefined;
 };
 
 export type RemoteThreadListAdapter = {
@@ -54,6 +56,14 @@ export type RemoteThreadListAdapter = {
   unarchive(remoteId: string): Promise<void>;
   delete(remoteId: string): Promise<void>;
   initialize(threadId: string): Promise<RemoteThreadInitializeResponse>;
+  /**
+   * Generates a title for the thread and streams it back.
+   *
+   * When the generation persists the title itself, the returned stream must
+   * not complete before that write has landed. Concurrent generations are
+   * ordered by stream completion, and a run whose write outlives its stream
+   * can overwrite a newer title.
+   */
   generateTitle(
     remoteId: string,
     unstable_messages: readonly ThreadMessage[],

package/src/store/clients/external-thread.ts

@@ -21,7 +21,10 @@ import type {
   CreateAttachment,
   PendingAttachment,
 } from "../../types/attachment";
-import { isCreateAttachment } from "../../types/attachment";
+import {
+  isAttachmentComplete,
+  isCreateAttachment,
+} from "../../types/attachment";
 import type {
   AddToolResultOptions,
   RespondToToolApprovalOptions,
@@ -463,6 +466,35 @@ const useLiveState = <T>(initial: T) => {
   return [state, set, ref] as const;
 };
 
+// A try/catch inside the resource makes the React Compiler bail out of the
+// whole hook, so the adapter call and its failure status live at module scope.
+const removeAttachmentThroughAdapter = async (
+  attachment: Attachment,
+  attachmentAdapter: AttachmentAdapter | undefined,
+  setAttachments: (
+    next:
+      | readonly Attachment[]
+      | ((prev: readonly Attachment[]) => readonly Attachment[]),
+  ) => void,
+) => {
+  try {
+    await attachmentAdapter?.remove(attachment);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    setAttachments((prev) =>
+      prev.map((candidate) =>
+        candidate.id === attachment.id && !isAttachmentComplete(candidate)
+          ? {
+              ...candidate,
+              status: { type: "incomplete", reason: "error", message },
+            }
+          : candidate,
+      ),
+    );
+    throw error;
+  }
+};
+
 // Composer Client - minimal implementation
 const useComposerClientResource = ({
   type,
@@ -516,7 +548,13 @@ const useComposerClientResource = ({
           attachment,
           onRemove: async () => {
             attachmentAddOperations.cancel(attachment.id);
-            await attachmentAdapter?.remove(attachment);
+            if (!isAttachmentComplete(attachment)) {
+              await removeAttachmentThroughAdapter(
+                attachment,
+                attachmentAdapter,
+                setAttachments,
+              );
+            }
             setAttachments((prev) =>
               prev.filter((a) => a.id !== attachment.id),
             );
@@ -905,7 +943,11 @@ const useExternalThread = ({
       : undefined;
   };
 
+  // `messages` changes identity on every streamed token, and this body fans out
+  // to one client per message, so pruning during render would re-run the whole
+  // fan-out per token. The effect bails out on an unchanged map instead.
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     setSubmittedFeedback((prev) => {
       const live = Object.entries(prev).filter(([id, entry]) => {
         const msg = messages.find((m) => m.id === id);
@@ -1113,7 +1155,10 @@ const useExternalThread = ({
             }
           : {
               createdAt: message.createdAt ?? new Date(),
-              parentId: message.parentId ?? messages.at(-1)?.id ?? null,
+              parentId:
+                message.parentId === undefined
+                  ? (messages.at(-1)?.id ?? null)
+                  : message.parentId,
               sourceId: message.sourceId ?? null,
               role: message.role ?? "user",
               content: message.content,

package/src/store/clients/model-context-client.ts

@@ -3,6 +3,7 @@ import { resource } from "@assistant-ui/tap";
 import type { ClientOutput } from "@assistant-ui/store";
 import { CompositeContextProvider } from "../../utils/composite-context-provider";
 import type { ModelContextState } from "../scopes/model-context";
+import { shallowEqual } from "@assistant-ui/store/internal";
 
 const EMPTY_TOOL_NAMES: readonly string[] = [];
 
@@ -12,7 +13,7 @@ const INITIAL_STATE: ModelContextState = {
 };
 
 const toolNamesEqual = (a: readonly string[], b: readonly string[]): boolean =>
-  a === b || (a.length === b.length && a.every((v, i) => v === b[i]));
+  a === b || shallowEqual(a, b);
 
 const deriveState = (
   composite: CompositeContextProvider,
@@ -36,6 +37,9 @@ const useModelContext = (): ClientOutput<"modelContext"> => {
   );
 
   useEffect(() => {
+    // The composite is an external store; this catches the snapshot up for
+    // providers registered between render and subscribe.
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     setState((prev) => deriveState(composite, prev));
     return composite.subscribe(() => {
       setState((prev) => deriveState(composite, prev));

package/src/store/clients/single-thread-list.ts

@@ -59,6 +59,7 @@ const useSingleThreadList = ({
       mainThreadId: THREAD_ID,
       newThreadId: null,
       isLoading: false,
+      loadError: undefined,
       isLoadingMore: false,
       hasMore: false,
       threadIds: [THREAD_ID],

package/src/store/clients/suggestions.test.ts

@@ -151,6 +151,46 @@ describe("ThreadSuggestions", () => {
     }
   });
 
+  it("drops sparse holes before the per-suggestion lookup", () => {
+    let setSuggestions!: (suggestions: ThreadSuggestion[]) => void;
+    const root = createTapRoot(function ThreadSuggestionsRoot() {
+      const [suggestions, setValue] = useState<ThreadSuggestion[]>([
+        { prompt: "Prompt A" },
+        { prompt: "Prompt B" },
+      ]);
+      setSuggestions = setValue;
+      return useResource(ThreadSuggestions(suggestions));
+    });
+
+    try {
+      const sparse: ThreadSuggestion[] = new Array(2);
+      sparse[1] = { prompt: "Prompt B" };
+      flushTapSync(() => setSuggestions(sparse));
+
+      const state = root.getValue().getState();
+      const expected = { title: "Prompt B", label: "", prompt: "Prompt B" };
+      expect(state.suggestions).toEqual([expected]);
+      expect(Object.keys(state.suggestions)).toEqual(["0"]);
+      const firstSuggestion = root
+        .getValue()
+        .suggestion({ index: 0 })
+        .getState();
+      expect(firstSuggestion).toEqual(expected);
+
+      // An equivalent sparse update keeps both identities stable.
+      const sparseAgain: ThreadSuggestion[] = new Array(2);
+      sparseAgain[1] = { prompt: "Prompt B" };
+      flushTapSync(() => setSuggestions(sparseAgain));
+
+      expect(root.getValue().getState()).toBe(state);
+      expect(root.getValue().suggestion({ index: 0 }).getState()).toBe(
+        firstSuggestion,
+      );
+    } finally {
+      root.unmount();
+    }
+  });
+
   it("reuses unchanged suggestion state when one entry changes", () => {
     let setSuggestions!: (suggestions: ThreadSuggestion[]) => void;
     const root = createTapRoot(function ThreadSuggestionsRoot() {

package/src/store/clients/suggestions.ts

@@ -17,18 +17,21 @@ const useStableSuggestionsState = (
   const cell = useMemo(() => ({}) as { state?: SuggestionsState }, []);
   const previous = cell.state;
 
-  const suggestions = next.suggestions.map((suggestion, index) => {
-    const previousSuggestion = previous?.suggestions[index];
-    return previousSuggestion && shallowEqual(previousSuggestion, suggestion)
-      ? previousSuggestion
-      : suggestion;
+  // forEach skips array holes, so a sparse caller array normalizes to a dense
+  // list here, before the per-suggestion resource lookup indexes every slot.
+  const suggestions: SuggestionState[] = [];
+  next.suggestions.forEach((suggestion) => {
+    // Probed at the compacted destination index, not the sparse source index,
+    // so an equivalent hole-containing update keeps reusing prior identities.
+    const previousSuggestion = previous?.suggestions[suggestions.length];
+    suggestions.push(
+      previousSuggestion && shallowEqual(previousSuggestion, suggestion)
+        ? previousSuggestion
+        : suggestion,
+    );
   });
   const state =
-    previous &&
-    previous.suggestions.length === suggestions.length &&
-    suggestions.every(
-      (suggestion, index) => suggestion === previous.suggestions[index],
-    )
+    previous && shallowEqual(suggestions, previous.suggestions)
       ? previous
       : { suggestions };