assistant-ui 0.0.121 → 0.0.122

package/src/lib/agent-skill.ts

@@ -1,13 +1,8 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { downloadTemplate } from "giget";
-import {
-  DOWNLOAD_TIMEOUT_MS,
-  dlxCommand,
-  resolveGitHubAuthToken,
-} from "./create-project";
-import { type PackageManagerName } from "./utils/package-manager";
+import { withStagedDownload } from "./utils/download";
+import { dlxCommand, type PackageManagerName } from "./utils/package-manager";
 
 export const SKILLS_PACKAGE = "assistant-ui/skills";
 export const SKILLS_COMMIT = "139674dc888ee076982b6726e8e6f5d0fe0b5f67";
@@ -70,42 +65,21 @@ export async function ensureSkillsPlugin(): Promise<string> {
   process.once("SIGINT", removeStagingOnSignal);
   process.once("SIGTERM", removeStagingOnSignal);
 
-  // giget logs to console.debug whenever DEBUG is set, which the `debug`
-  // package does at module load for an unrelated namespace.
-  const origDebug = process.env.DEBUG;
-  delete process.env.DEBUG;
-  let timer: ReturnType<typeof setTimeout> | undefined;
-  let downloadSettled = false;
-  let download: Promise<unknown> | undefined;
-  try {
-    const authToken = resolveGitHubAuthToken();
-    download = downloadTemplate(SKILLS_PLUGIN_SOURCE, {
-      dir: staging,
-      preferOffline: true,
-      silent: true,
-      ...(authToken ? { auth: authToken } : {}),
-    }).finally(() => {
-      downloadSettled = true;
-    });
-    const timeout = new Promise<never>((_, reject) => {
-      timer = setTimeout(
-        () => reject(new Error("Download timed out.")),
-        DOWNLOAD_TIMEOUT_MS,
-      );
-    });
-    await Promise.race([download, timeout]).catch((error: unknown) => {
-      throw new Error(
-        "Could not fetch the assistant-ui skills from GitHub. Check your network, or set GITHUB_TOKEN if you are rate limited.",
-        { cause: error },
-      );
-    });
-    await publish(staging, dir, marker);
-  } finally {
-    clearTimeout(timer);
-    if (origDebug !== undefined) process.env.DEBUG = origDebug;
-    if (!download || downloadSettled) removeStaging();
-    else void download.then(removeStaging, removeStaging);
-  }
+  await withStagedDownload(
+    SKILLS_PLUGIN_SOURCE,
+    { dir: staging, preferOffline: true, silent: true },
+    "Download timed out.",
+    removeStaging,
+    async (download) => {
+      await download.catch((error: unknown) => {
+        throw new Error(
+          "Could not fetch the assistant-ui skills from GitHub. Check your network, or set GITHUB_TOKEN if you are rate limited.",
+          { cause: error },
+        );
+      });
+      await publish(staging, dir, marker);
+    },
+  );
 
   return dir;
 }

package/src/lib/create-project.test.ts

@@ -24,23 +24,6 @@ describe("reconcileAssistantUIImportLayout", () => {
   const read = (file: string) =>
     fs.readFileSync(path.join(projectDir, file), "utf8");
 
-  it("rewrites a legacy import when only the elements layout exists", async () => {
-    write(
-      "app/page.tsx",
-      'import { Thread } from "@/components/assistant-ui/thread";\n' +
-        'import { ThreadList } from "@/components/assistant-ui/thread-list";\n',
-    );
-    write("components/assistant-ui/elements/thread.aui.tsx", "export {};");
-    write("components/assistant-ui/elements/thread-list.aui.tsx", "export {};");
-
-    await reconcileAssistantUIImportLayout(projectDir);
-
-    expect(read("app/page.tsx")).toBe(
-      'import { Thread } from "@/components/assistant-ui/elements/thread.aui";\n' +
-        'import { ThreadList } from "@/components/assistant-ui/elements/thread-list.aui";\n',
-    );
-  });
-
   it("rewrites module declarations without changing import-like source text", async () => {
     write(
       "app/page.tsx",

package/src/lib/create-project.ts

@@ -1,7 +1,6 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { downloadTemplate } from "giget";
 import {
   parse as parseJsonc,
   printParseErrorCode,
@@ -9,26 +8,14 @@ import {
 } from "jsonc-parser";
 import { logger } from "./utils/logger";
 import { runSpawn, SpawnExitError, SpawnSignalError } from "./run-spawn";
-import { type PackageManagerName } from "./utils/package-manager";
+import { dlxCommand, type PackageManagerName } from "./utils/package-manager";
+import { resolveGitHubAuthToken, withStagedDownload } from "./utils/download";
 import { readProjectFiles } from "./utils/file-scanner";
 import {
   detectRegistryPlatform,
   resolveRegistryItemUrl,
 } from "./utils/registry";
 
-export function dlxCommand(pm: PackageManagerName): [string, string[]] {
-  switch (pm) {
-    case "pnpm":
-      return ["pnpm", ["dlx"]];
-    case "yarn":
-      return ["yarn", ["dlx"]];
-    case "bun":
-      return ["bunx", []];
-    case "npm":
-      return ["npx", ["--yes"]];
-  }
-}
-
 export interface TransformOptions {
   hasLocalComponents: boolean;
   skipInstall?: boolean;
@@ -56,26 +43,6 @@ const LOCAL_PROJECT_ARTIFACT_GLOB_IGNORES = LOCAL_PROJECT_ARTIFACT_DIRS.map(
   (dir) => `**/${dir}/**`,
 );
 
-export function resolvePackageManager(opts: {
-  useNpm?: boolean;
-  usePnpm?: boolean;
-  useYarn?: boolean;
-  useBun?: boolean;
-}): PackageManagerName | undefined {
-  if (opts.useNpm) return "npm";
-  if (opts.usePnpm) return "pnpm";
-  if (opts.useYarn) return "yarn";
-  if (opts.useBun) return "bun";
-  return undefined;
-}
-
-export function resolveGitHubAuthToken(): string | undefined {
-  const token =
-    process.env.GIGET_AUTH ?? process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
-  const trimmed = token?.trim();
-  return trimmed || undefined;
-}
-
 function toBearerAuthHeader(token: string): string {
   return token.toLowerCase().startsWith("bearer ") ? token : `Bearer ${token}`;
 }
@@ -97,7 +64,6 @@ export async function resolveLatestReleaseRef(): Promise<string | undefined> {
   }
 }
 
-export const DOWNLOAD_TIMEOUT_MS = 30_000;
 const pendingDownloadCleanups = new Set<() => void>();
 
 export function cleanupPendingProjectDownloads(): void {
@@ -117,16 +83,9 @@ export async function downloadProject(
     ? `gh:assistant-ui/assistant-ui/${repoPath}#${ref}`
     : `gh:assistant-ui/assistant-ui/${repoPath}`;
 
-  // Suppress giget's debug output. The `debug` package (used by the upgrade
-  // command) sets process.env.DEBUG at module-load time, and giget logs to
-  // console.debug whenever that env var is truthy — even for unrelated
-  // namespaces. Temporarily unsetting it targets the root cause.
-  const origDebug = process.env.DEBUG;
-  delete process.env.DEBUG;
   let destinationCreated = false;
   let stagingDir: string | undefined;
-  let downloadPromise: Promise<unknown> | undefined;
-  let downloadFinished = false;
+  let downloadStarted = false;
   let downloadCommitted = false;
   let cleanupRequested = false;
   const removeCleanupListeners = () => {
@@ -183,62 +142,38 @@ export async function downloadProject(
     process.once("exit", cleanupOnExit);
     pendingDownloadCleanups.add(cleanupOnExit);
 
-    const authToken = resolveGitHubAuthToken();
-    downloadPromise = downloadTemplate(source, {
-      dir: stagingDir,
-      force: true,
-      silent: true,
-      ...(authToken ? { auth: authToken } : {}),
-    }).finally(() => {
-      downloadFinished = true;
-    });
-
-    let timer: ReturnType<typeof setTimeout>;
-    const timeoutPromise = new Promise<never>((_, reject) => {
-      timer = setTimeout(
-        () =>
-          reject(
-            new Error(
-              "Download timed out. This may be due to GitHub rate limiting or a network issue. Try again in a few minutes.",
-            ),
-          ),
-        DOWNLOAD_TIMEOUT_MS,
-      );
-    });
-
-    try {
-      await Promise.race([downloadPromise, timeoutPromise]);
-      if (cleanupRequested) throw new Error("Download was interrupted.");
-      destinationCreated = !fs.existsSync(destDir);
-      await fs.promises.mkdir(destDir, { recursive: true });
-      for (const entry of await fs.promises.readdir(stagingDir)) {
-        const target = path.join(destDir, entry);
-        const sourceEntry = path.join(stagingDir, entry);
-        await fs.promises.rm(target, { recursive: true, force: true });
-        try {
-          await fs.promises.rename(sourceEntry, target);
-        } catch (error) {
-          if ((error as NodeJS.ErrnoException).code !== "EXDEV") throw error;
-          await fs.promises.cp(sourceEntry, target, {
-            recursive: true,
-            force: true,
-          });
-          await fs.promises.rm(sourceEntry, { recursive: true, force: true });
+    const currentStagingDir = stagingDir;
+    downloadStarted = true;
+    await withStagedDownload(
+      source,
+      { dir: currentStagingDir, force: true, silent: true },
+      "Download timed out. This may be due to GitHub rate limiting or a network issue. Try again in a few minutes.",
+      removeStagingDir,
+      async (download) => {
+        await download;
+        if (cleanupRequested) throw new Error("Download was interrupted.");
+        destinationCreated = !fs.existsSync(destDir);
+        await fs.promises.mkdir(destDir, { recursive: true });
+        for (const entry of await fs.promises.readdir(currentStagingDir)) {
+          const target = path.join(destDir, entry);
+          const sourceEntry = path.join(currentStagingDir, entry);
+          await fs.promises.rm(target, { recursive: true, force: true });
+          try {
+            await fs.promises.rename(sourceEntry, target);
+          } catch (error) {
+            if ((error as NodeJS.ErrnoException).code !== "EXDEV") throw error;
+            await fs.promises.cp(sourceEntry, target, {
+              recursive: true,
+              force: true,
+            });
+            await fs.promises.rm(sourceEntry, { recursive: true, force: true });
+          }
         }
-      }
-      downloadCommitted = true;
-    } finally {
-      clearTimeout(timer!);
-    }
+        downloadCommitted = true;
+      },
+    );
   } finally {
-    if (!downloadPromise || downloadFinished) {
-      await removeStagingDir();
-    } else {
-      void downloadPromise.then(removeStagingDir, removeStagingDir);
-    }
-    if (origDebug !== undefined) {
-      process.env.DEBUG = origDebug;
-    }
+    if (!downloadStarted) await removeStagingDir();
   }
 }
 

package/src/lib/transform-files.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, onTestFinished } from "vitest";
 import { mkdirSync, mkdtempSync, writeFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join, relative } from "node:path";
-import { getRelevantFiles, countFilesToProcess } from "./transform";
+import { getRelevantFiles } from "./transform";
 
 const fixture = () => {
   const directory = mkdtempSync(join(tmpdir(), "aui-transform-files-"));
@@ -26,7 +26,6 @@ describe("codemod file discovery", () => {
       const { write } = fixture();
       const file = write(`my app.${extension}`);
       expect(getRelevantFiles(file)).toEqual([file]);
-      expect(countFilesToProcess(file)).toBe(1);
       expect(getRelevantFiles(relative(process.cwd(), file))).toEqual([file]);
     },
   );
@@ -54,7 +53,6 @@ describe("codemod file discovery", () => {
     const { write } = fixture();
     const file = write("app.tsx", source);
     expect(getRelevantFiles(file)).toEqual([file]);
-    expect(countFilesToProcess(file)).toBe(1);
   });
 
   it("skips unsupported explicit files", () => {

package/src/lib/transform.ts

@@ -3,8 +3,8 @@ import path from "node:path";
 import type { TransformOptions } from "./transform-options";
 import { fileURLToPath } from "node:url";
 import * as fs from "node:fs";
-import { sync as globSync } from "glob";
 import { runSpawnCapture, SpawnExitError, SpawnSignalError } from "./run-spawn";
+import { readProjectFiles } from "./utils/file-scanner";
 
 const log = debug("codemod:transform");
 
@@ -22,7 +22,8 @@ export function getRelevantFiles(source: string): string[] {
   }
 
   const pattern = "**/*.{js,jsx,ts,tsx}";
-  const files = globSync(pattern, {
+  const relevantFiles: string[] = [];
+  for (const { fullPath, content } of readProjectFiles(pattern, {
     cwd: target,
     ignore: [
       "**/node_modules/**",
@@ -31,27 +32,12 @@ export function getRelevantFiles(source: string): string[] {
       "**/*.min.js",
       "**/*.bundle.js",
     ],
-  }).map((file) => path.join(target, file));
-
-  const relevantFiles = files.filter((file) => {
-    try {
-      const content = fs.readFileSync(file, "utf8");
-      return content.includes("assistant-ui");
-    } catch {
-      return false;
-    }
-  });
-
+  })) {
+    if (content.includes("assistant-ui")) relevantFiles.push(fullPath);
+  }
   return relevantFiles;
 }
 
-/**
- * Counts the number of files that need to be processed
- */
-export function countFilesToProcess(source: string): number {
-  return getRelevantFiles(source).length;
-}
-
 function buildCommand(
   codemodPath: string,
   targetFiles: string[],

package/src/lib/utils/download.ts

@@ -0,0 +1,57 @@
+import { downloadTemplate } from "giget";
+
+export const DOWNLOAD_TIMEOUT_MS = 30_000;
+
+export function resolveGitHubAuthToken(): string | undefined {
+  const token =
+    process.env.GIGET_AUTH ?? process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
+  const trimmed = token?.trim();
+  return trimmed || undefined;
+}
+
+export async function withStagedDownload<T>(
+  source: string,
+  options: NonNullable<Parameters<typeof downloadTemplate>[1]>,
+  timeoutMessage: string,
+  cleanup: () => void | Promise<void>,
+  consumeDownload: (download: Promise<unknown>) => Promise<T>,
+): Promise<T> {
+  // giget logs to console.debug whenever DEBUG is set, which the `debug`
+  // package does at module load for an unrelated namespace.
+  const origDebug = process.env.DEBUG;
+  delete process.env.DEBUG;
+  let download: Promise<unknown> | undefined;
+  let settled = false;
+  try {
+    const authToken = resolveGitHubAuthToken();
+    download = downloadTemplate(source, {
+      ...options,
+      ...(authToken ? { auth: authToken } : {}),
+    }).finally(() => {
+      settled = true;
+    });
+
+    let timer: ReturnType<typeof setTimeout>;
+    const timeout = new Promise<never>((_, reject) => {
+      timer = setTimeout(
+        () => reject(new Error(timeoutMessage)),
+        DOWNLOAD_TIMEOUT_MS,
+      );
+    });
+    try {
+      return await consumeDownload(Promise.race([download, timeout]));
+    } finally {
+      clearTimeout(timer!);
+    }
+  } finally {
+    try {
+      if (!download || settled) {
+        await cleanup();
+      } else {
+        void download.then(cleanup, cleanup);
+      }
+    } finally {
+      if (origDebug !== undefined) process.env.DEBUG = origDebug;
+    }
+  }
+}

package/src/lib/utils/file-scanner.ts

@@ -49,29 +49,3 @@ export function scanForImport(
 
   return false;
 }
-
-export function getFilesContaining(
-  searchString: string,
-  options: ScanOptions = {},
-): string[] {
-  const cwd = options.cwd || process.cwd();
-  const pattern = options.pattern || "**/*.{js,jsx,ts,tsx}";
-  const ignore = options.ignore || [
-    "**/node_modules/**",
-    "**/dist/**",
-    "**/build/**",
-  ];
-
-  const result: string[] = [];
-
-  for (const { fullPath, content } of readProjectFiles(pattern, {
-    cwd,
-    ignore,
-  })) {
-    if (content.includes(searchString)) {
-      result.push(fullPath);
-    }
-  }
-
-  return result;
-}

package/src/lib/utils/package-manager.ts

@@ -7,6 +7,32 @@ import { runSpawn, SpawnSignalError } from "../run-spawn";
 
 export type PackageManagerName = "npm" | "pnpm" | "yarn" | "bun";
 
+export function dlxCommand(pm: PackageManagerName): [string, string[]] {
+  switch (pm) {
+    case "pnpm":
+      return ["pnpm", ["dlx"]];
+    case "yarn":
+      return ["yarn", ["dlx"]];
+    case "bun":
+      return ["bunx", []];
+    case "npm":
+      return ["npx", ["--yes"]];
+  }
+}
+
+export function resolvePackageManager(opts: {
+  useNpm?: boolean;
+  usePnpm?: boolean;
+  useYarn?: boolean;
+  useBun?: boolean;
+}): PackageManagerName | undefined {
+  if (opts.useNpm) return "npm";
+  if (opts.usePnpm) return "pnpm";
+  if (opts.useYarn) return "yarn";
+  if (opts.useBun) return "bun";
+  return undefined;
+}
+
 export function askQuestion(query: string): Promise<string> {
   return new Promise((resolve) => {
     // A stream only reaches EOF once, so a run that already consumed stdin gets

package/src/lib/utils/registry.test.ts

@@ -144,12 +144,6 @@ describe("resolveRegistryItemUrl", () => {
     );
   });
 
-  it("uses the base URL for an explicit undefined style", () => {
-    expect(resolveRegistryItemUrl("thread", undefined)).toBe(
-      "https://r.assistant-ui.com/base/thread.json",
-    );
-  });
-
   it("keeps the style inside a single path segment", () => {
     expect(resolveRegistryItemUrl("thread", "base-nova?preview=1")).toBe(
       "https://r.assistant-ui.com/styles/base-nova%3Fpreview%3D1/thread.json",

package/templates/cloud-harness/app/api/chat/route.ts

@@ -6,6 +6,7 @@ export const maxDuration = 30;
 export const POST = async (request: Request) => {
   const { messages } = (await request.json()) as { messages: UIMessage[] };
   const result = streamText({
+    abortSignal: request.signal,
     model: openai.responses("gpt-6-luna"),
     messages: await convertToModelMessages(messages),
   });

package/templates/cloud-harness/components/assistant-ui/elements/collapsible-root.tsx

@@ -0,0 +1,19 @@
+"use client";
+
+import { Collapsible } from "@base-ui/react/collapsible";
+import { forwardRef } from "react";
+
+export const CollapsibleRoot = forwardRef<
+  React.ComponentRef<typeof Collapsible.Root>,
+  React.ComponentPropsWithoutRef<typeof Collapsible.Root>
+>(function CollapsibleRoot(props, ref) {
+  return <Collapsible.Root ref={ref} data-slot="collapsible" {...props} />;
+});
+
+export function CollapsibleTrigger({ ...props }: Collapsible.Trigger.Props) {
+  return <Collapsible.Trigger data-slot="collapsible-trigger" {...props} />;
+}
+
+export function CollapsibleContent({ ...props }: Collapsible.Panel.Props) {
+  return <Collapsible.Panel data-slot="collapsible-content" {...props} />;
+}

package/templates/cloud-harness/components/assistant-ui/elements/markdown-text.tsx

@@ -5,7 +5,7 @@ import "@assistant-ui/react-markdown/styles/dot.css";
 import {
   type CodeHeaderProps,
   MarkdownTextPrimitive,
-  unstable_memoizeMarkdownComponents as memoizeMarkdownComponents,
+  memoizeMarkdownComponents,
   useIsMarkdownCodeBlock,
 } from "@assistant-ui/react-markdown";
 import remarkGfm from "remark-gfm";