@chat-js/cli 0.3.0 → 0.6.0

package/templates/chat-app/lib/stores/with-threads.ts

@@ -19,6 +19,12 @@ export interface MessageSiblingInfo<UM> {
   siblings: UM[];
 }
 
+export interface ParallelGroupInfo<UM> {
+  messages: UM[];
+  parallelGroupId: string;
+  selectedMessageId: string | null;
+}
+
 export type ThreadAugmentedState<UM extends UIMessage> =
   BaseChatStoreState<UM> & {
     threadEpoch: number;
@@ -41,6 +47,7 @@ export type ThreadAugmentedState<UM extends UIMessage> =
     addMessageToTree: (message: UM) => void;
     /** Look up sibling info for a message. */
     getMessageSiblingInfo: (messageId: string) => MessageSiblingInfo<UM> | null;
+    getParallelGroupInfo: (messageId: string) => ParallelGroupInfo<UM> | null;
     /**
      * Switch to a sibling thread. Returns the new thread array,
      * or null if no switch was possible.
@@ -49,6 +56,7 @@ export type ThreadAugmentedState<UM extends UIMessage> =
       messageId: string,
       direction: "prev" | "next"
     ) => UM[] | null;
+    switchToMessage: (messageId: string) => UM[] | null;
   };
 
 export const withThreads =
@@ -64,6 +72,33 @@ export const withThreads =
     const rebuildMap = (msgs: UI_MESSAGE[]) =>
       buildChildrenMap(msgs as (UI_MESSAGE & MessageNode)[]);
 
+    const mergeTreeMessages = (
+      serverMessages: UI_MESSAGE[],
+      existingTreeMessages: UI_MESSAGE[],
+      currentVisibleMessages: UI_MESSAGE[]
+    ): UI_MESSAGE[] => {
+      const merged = new Map<string, UI_MESSAGE>();
+
+      for (const message of serverMessages) {
+        merged.set(message.id, message);
+      }
+
+      // Preserve every local-only tree node until the server returns a message with
+      // the same id. Restricting this to pending assistant shells orphaned optimistic
+      // user messages when switching away from an in-flight branch mid-stream.
+      for (const message of existingTreeMessages) {
+        if (!merged.has(message.id)) {
+          merged.set(message.id, message);
+        }
+      }
+
+      for (const message of currentVisibleMessages) {
+        merged.set(message.id, message);
+      }
+
+      return Array.from(merged.values());
+    };
+
     return {
       ...base,
       threadEpoch: 0,
@@ -96,10 +131,45 @@ export const withThreads =
       },
 
       setAllMessages: (messages: UI_MESSAGE[]) => {
-        set((state) => ({
-          ...state,
-          allMessages: messages,
-          childrenMap: rebuildMap(messages),
+        const state = get();
+        const currentVisibleMessages = state.messages;
+        const existingTreeMessages = state.allMessages;
+        const mergedMessages = mergeTreeMessages(
+          messages,
+          existingTreeMessages,
+          currentVisibleMessages
+        );
+
+        // While the SDK is actively streaming, updating the visible thread with
+        // server data would mix the SDK's client-generated message ID with the
+        // server's assistantMessageId. The mismatch causes the SDK to push a
+        // second assistant message on the next chunk, bumping the epoch and
+        // remounting ChatSync mid-stream. Only update the tree index here and
+        // let the normal post-stream invalidation apply the full visible update.
+        if (state.status === "streaming" || state.status === "submitted") {
+          set((prev) => ({
+            ...prev,
+            allMessages: mergedMessages,
+            childrenMap: rebuildMap(mergedMessages),
+          }));
+          return;
+        }
+
+        const currentLeafId = currentVisibleMessages.at(-1)?.id;
+        const nextVisibleThread = currentLeafId
+          ? (buildThreadFromLeaf(
+              mergedMessages as (UI_MESSAGE & MessageNode)[],
+              currentLeafId
+            ) as UI_MESSAGE[])
+          : currentVisibleMessages;
+
+        originalSetMessages(nextVisibleThread);
+        set((prev) => ({
+          ...prev,
+          messages: nextVisibleThread,
+          threadInitialMessages: nextVisibleThread,
+          allMessages: mergedMessages,
+          childrenMap: rebuildMap(mergedMessages),
         }));
       },
 
@@ -107,11 +177,11 @@ export const withThreads =
         set((state) => {
           const idx = state.allMessages.findIndex((m) => m.id === message.id);
           let next: UI_MESSAGE[];
-          if (idx !== -1) {
+          if (idx === -1) {
+            next = [...state.allMessages, message];
+          } else {
             next = [...state.allMessages];
             next[idx] = message;
-          } else {
-            next = [...state.allMessages, message];
           }
           return { ...state, allMessages: next, childrenMap: rebuildMap(next) };
         });
@@ -135,6 +205,65 @@ export const withThreads =
         return { siblings, siblingIndex };
       },
 
+      getParallelGroupInfo: (
+        messageId: string
+      ): ParallelGroupInfo<UI_MESSAGE> | null => {
+        const state = get();
+        const message = state.allMessages.find((item) => item.id === messageId);
+        if (!message) {
+          return null;
+        }
+
+        const metadata = (message as UI_MESSAGE & MessageNode).metadata;
+        const parallelGroupId = metadata?.parallelGroupId || null;
+        const parentId =
+          message.role === "user"
+            ? message.id
+            : metadata?.parentMessageId || null;
+
+        if (!(parentId && parallelGroupId)) {
+          return null;
+        }
+
+        const groupMessages = (
+          (state.childrenMap.get(parentId) ?? []) as UI_MESSAGE[]
+        )
+          .filter(
+            (candidate) =>
+              (candidate as UI_MESSAGE & MessageNode).metadata
+                ?.parallelGroupId === parallelGroupId
+          )
+          .sort((a, b) => {
+            const aIndex =
+              (a as UI_MESSAGE & MessageNode).metadata?.parallelIndex ??
+              Number.MAX_SAFE_INTEGER;
+            const bIndex =
+              (b as UI_MESSAGE & MessageNode).metadata?.parallelIndex ??
+              Number.MAX_SAFE_INTEGER;
+
+            if (aIndex !== bIndex) {
+              return aIndex - bIndex;
+            }
+
+            return 0;
+          });
+
+        if (groupMessages.length <= 1) {
+          return null;
+        }
+
+        const visibleMessageIds = new Set(state.messages.map((m) => m.id));
+        const selectedMessageId =
+          groupMessages.find((candidate) => visibleMessageIds.has(candidate.id))
+            ?.id ?? null;
+
+        return {
+          messages: groupMessages,
+          parallelGroupId,
+          selectedMessageId,
+        };
+      },
+
       switchToSibling: (
         messageId: string,
         direction: "prev" | "next"
@@ -170,6 +299,29 @@ export const withThreads =
         return newThread;
       },
 
+      switchToMessage: (messageId: string): UI_MESSAGE[] | null => {
+        const state = get();
+        const { allMessages, childrenMap } = state;
+        const message = allMessages.find(
+          (candidate) => candidate.id === messageId
+        );
+        if (!message) {
+          return null;
+        }
+
+        const leaf = findLeafDfsToRightFromMessageId(
+          childrenMap as Map<string | null, (UI_MESSAGE & MessageNode)[]>,
+          messageId
+        );
+        const newThread = buildThreadFromLeaf(
+          allMessages as (UI_MESSAGE & MessageNode)[],
+          leaf ? leaf.id : messageId
+        ) as UI_MESSAGE[];
+
+        state.setMessagesWithEpoch(newThread);
+        return newThread;
+      },
+
       // Override setMessages to auto-bump epoch when thread changes
       setMessages: (messages: UI_MESSAGE[]) => {
         const currentMessages = get().messages;

package/templates/chat-app/lib/stores/with-tracing.ts

@@ -2,7 +2,7 @@
 
 import type { StateCreator } from "zustand";
 
-type AnyFn = (...args: any[]) => any;
+type AnyFn = (...args: unknown[]) => unknown;
 
 function safeStringifyArgs(args: unknown[]) {
   try {

package/templates/chat-app/lib/thread-utils.ts

@@ -3,6 +3,9 @@ export interface MessageNode {
   id: string;
   metadata?: {
     parentMessageId: string | null;
+    parallelGroupId?: string | null;
+    parallelIndex?: number | null;
+    activeStreamId?: string | null;
     createdAt: Date;
   };
 }
@@ -101,10 +104,26 @@ export function buildChildrenMap<T extends MessageNode>(
     map.get(parentId)?.push(message);
   }
   for (const siblings of map.values()) {
-    siblings.sort(
-      (a, b) =>
+    siblings.sort((a, b) => {
+      const aParallelIndex = a.metadata?.parallelIndex;
+      const bParallelIndex = b.metadata?.parallelIndex;
+      const sameParallelGroup =
+        a.metadata?.parallelGroupId &&
+        a.metadata?.parallelGroupId === b.metadata?.parallelGroupId;
+
+      if (
+        sameParallelGroup &&
+        typeof aParallelIndex === "number" &&
+        typeof bParallelIndex === "number" &&
+        aParallelIndex !== bParallelIndex
+      ) {
+        return aParallelIndex - bParallelIndex;
+      }
+
+      return (
         toTimestamp(a.metadata?.createdAt) - toTimestamp(b.metadata?.createdAt)
-    );
+      );
+    });
   }
   return map;
 }

package/templates/chat-app/lib/utils/download-assets.ts

@@ -135,8 +135,8 @@ export async function replaceFilePartUrlByBinaryDataInMessages(
   );
 
   const mapPart = (
-    part: TextPart | ImagePart | FilePart | any
-  ): TextPart | ImagePart | FilePart | any => {
+    part: TextPart | ImagePart | FilePart
+  ): TextPart | ImagePart | FilePart => {
     if (part.type === "file") {
       return mapFilePart(part as FilePart, downloaded);
     }
@@ -148,14 +148,13 @@ export async function replaceFilePartUrlByBinaryDataInMessages(
   };
 
   return messages.map((message) => {
-    if (typeof message.content === "string") {
+    if (message.role !== "user" || typeof message.content === "string") {
       return message;
     }
+
     return {
       ...message,
-      content: (
-        message.content as Array<TextPart | ImagePart | FilePart | any>
-      ).map(mapPart),
-    } as ModelMessage;
+      content: message.content.map(mapPart),
+    };
   });
 }

package/templates/chat-app/lib/utils/rate-limit.ts

@@ -2,6 +2,12 @@ import "server-only";
 import { config } from "@/lib/config";
 import { ANONYMOUS_LIMITS } from "@/lib/types/anonymous";
 
+interface RedisClient {
+  expire(key: string, seconds: number): Promise<unknown>;
+  get(key: string): Promise<string | null>;
+  incr(key: string): Promise<number>;
+}
+
 interface RateLimitResult {
   error?: string;
   remaining: number;
@@ -13,7 +19,7 @@ interface RateLimitOptions {
   identifier: string;
   keyPrefix: string;
   limit: number;
-  redisClient: any;
+  redisClient: RedisClient | null;
   windowSize: number;
 }
 
@@ -82,7 +88,7 @@ const WINDOW_SIZE_MONTH = 30 * 24 * 60 * 60;
 
 export async function checkAnonymousRateLimit(
   ip: string,
-  redisClient: any
+  redisClient: RedisClient | null
 ): Promise<{
   success: boolean;
   error?: string;
@@ -126,7 +132,7 @@ export async function checkAnonymousRateLimit(
     );
     return {
       success: false,
-      error: `Monthly message limit exceeded. You can make ${RATE_LIMIT.REQUESTS_PER_MONTH} requests per month. You've made ${RATE_LIMIT.REQUESTS_PER_MONTH - monthResult.remaining} requests this month. Try again in ${daysUntilReset} day${daysUntilReset !== 1 ? "s" : ""}.`,
+      error: `Monthly message limit exceeded. You can make ${RATE_LIMIT.REQUESTS_PER_MONTH} requests per month. You've made ${RATE_LIMIT.REQUESTS_PER_MONTH - monthResult.remaining} requests this month. Try again in ${daysUntilReset} day${daysUntilReset === 1 ? "" : "s"}.`,
       headers: {
         "X-RateLimit-Limit": RATE_LIMIT.REQUESTS_PER_MONTH.toString(),
         "X-RateLimit-Remaining": monthResult.remaining.toString(),

package/templates/chat-app/package.json

@@ -11,8 +11,8 @@
     "analyze": "next experimental-analyze",
     "start": "next start",
     "prod": "bun run build && bun run start",
-    "lint": "bunx ultracite@7.2.3 check",
-    "format": "bunx ultracite@7.2.3 fix",
+    "lint": "bunx ultracite@7.4.3 check",
+    "format": "bunx ultracite@7.4.3 fix",
     "check-env": "bun scripts/check-env.ts",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "export VERCEL_ENV=production && bash scripts/with-db.sh bunx tsx lib/db/migrate.ts",
@@ -40,15 +40,17 @@
   },
   "dependencies": {
     "@ai-sdk-tools/store": "1.2.0",
-    "@ai-sdk/anthropic": "^3.0.46",
+    "@ai-sdk/anthropic": "^3.0.67",
     "@ai-sdk/devtools": "^0.0.15",
-    "@ai-sdk/gateway": "3.0.53",
-    "@ai-sdk/google": "^3.0.30",
-    "@ai-sdk/mcp": "^1.0.21",
-    "@ai-sdk/openai": "^3.0.30",
-    "@ai-sdk/openai-compatible": "^2.0.30",
-    "@ai-sdk/provider": "3.0.8",
-    "@ai-sdk/react": "^3.0.99",
+    "@ai-sdk/gateway": "^3.0.92",
+    "@ai-sdk/google": "^3.0.59",
+    "@ai-sdk/mcp": "^1.0.35",
+    "@ai-sdk/openai": "^3.0.51",
+    "@ai-sdk/openai-compatible": "^2.0.40",
+    "@ai-sdk/provider": "^3.0.8",
+    "@ai-sdk/react": "^3.0.152",
+    "@better-auth/core": "1.5.6",
+    "@better-auth/electron": "^1.5.6",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-python": "^6.1.6",
     "@codemirror/state": "^6.5.0",
@@ -88,7 +90,7 @@
     "@radix-ui/react-toggle": "^1.1.10",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@radix-ui/react-use-controllable-state": "^1.2.2",
-    "@streamdown/code": "^1.0.3",
+    "@streamdown/code": "^1.1.1",
     "@streamdown/math": "^1.0.2",
     "@streamdown/mermaid": "^1.0.2",
     "@t3-oss/env-nextjs": "^0.13.8",
@@ -104,8 +106,8 @@
     "@vercel/otel": "^2.1.0",
     "@vercel/sandbox": "^1.0.2",
     "@vercel/speed-insights": "^1.3.1",
-    "ai": "6.0.97",
-    "better-auth": "^1.4.3",
+    "ai": "^6.0.150",
+    "better-auth": "^1.5.6",
     "browser-image-compression": "^2.0.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -124,7 +126,7 @@
     "lucide-react": "0.553.0",
     "motion": "^12.23.24",
     "nanoid": "^5.0.8",
-    "next": "16.1.6",
+    "next": "16.2.0",
     "next-themes": "^0.4.6",
     "nuqs": "^2.8.5",
     "papaparse": "^5.5.2",
@@ -142,7 +144,7 @@
     "server-only": "^0.0.1",
     "shiki": "^3.19.0",
     "sonner": "^2.0.7",
-    "streamdown": "^2.2.0",
+    "streamdown": "^2.5.0",
     "superjson": "^2.2.2",
     "tailwind-merge": "^3.3.1",
     "throttleit": "^2.1.0",
@@ -162,7 +164,7 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.2.4",
+    "@biomejs/biome": "2.4.10",
     "@playwright/test": "^1.50.1",
     "@tailwindcss/postcss": "^4.1.12",
     "@tailwindcss/typography": "^0.5.19",
@@ -178,8 +180,8 @@
     "tailwindcss": "^4.1.12",
     "tsx": "^4.19.1",
     "tw-animate-css": "^1.3.7",
-    "typescript": "5.8.3",
-    "ultracite": "7.2.3",
+    "typescript": "6.0.2",
+    "ultracite": "7.4.3",
     "vite-tsconfig-paths": "^6.1.1",
     "vitest": "^4.0.0"
   }

package/templates/chat-app/playwright.config.ts

@@ -51,44 +51,25 @@ export default defineConfig({
 
   /* Configure projects */
   projects: [
-    {
-      name: "setup:auth",
-      testMatch: /auth.setup.e2e.ts/,
-    },
-    {
-      name: "setup:reasoning",
-      testMatch: /reasoning.setup.e2e.ts/,
-      dependencies: ["setup:auth"],
-      use: {
-        ...devices["Desktop Chrome"],
-        storageState: "playwright/.auth/session.json",
-      },
-    },
     {
       name: "chat",
       testMatch: /chat.e2e.ts/,
-      dependencies: ["setup:auth"],
       use: {
         ...devices["Desktop Chrome"],
-        storageState: "playwright/.auth/session.json",
       },
     },
     {
       name: "reasoning",
       testMatch: /reasoning.e2e.ts/,
-      dependencies: ["setup:reasoning"],
       use: {
         ...devices["Desktop Chrome"],
-        storageState: "playwright/.reasoning/session.json",
       },
     },
     {
       name: "artifacts",
       testMatch: /artifacts.e2e.ts/,
-      dependencies: ["setup:auth"],
       use: {
         ...devices["Desktop Chrome"],
-        storageState: "playwright/.auth/session.json",
       },
     },
 

package/templates/chat-app/providers/chat-input-provider.tsx

@@ -13,7 +13,12 @@ import React, {
 } from "react";
 import type { LexicalChatInputRef } from "@/components/lexical-chat-input";
 import type { AppModelId } from "@/lib/ai/app-models";
-import type { Attachment, UiToolName } from "@/lib/ai/types";
+import {
+  type Attachment,
+  getPrimarySelectedModelId,
+  type SelectedModelValue,
+  type UiToolName,
+} from "@/lib/ai/types";
 import { useChatModels } from "./chat-models-provider";
 import { useDefaultModel, useModelChange } from "./default-model-provider";
 
@@ -24,10 +29,12 @@ interface ChatInputContextType {
   getInputValue: () => string;
   handleInputChange: (value: string) => void;
   handleModelChange: (modelId: AppModelId) => Promise<void>;
+  handleModelSelectionChange: (selection: SelectedModelValue) => Promise<void>;
   handleSubmit: (submitFn: () => void, isEditMode?: boolean) => void;
   isEmpty: boolean;
   isProjectContext: boolean;
   selectedModelId: AppModelId;
+  selectedModelSelection: SelectedModelValue;
   selectedTool: UiToolName | null;
   setAttachments: Dispatch<SetStateAction<Attachment[]>>;
   setSelectedTool: Dispatch<SetStateAction<UiToolName | null>>;
@@ -45,6 +52,7 @@ interface ChatInputProviderProps {
   isProjectContext?: boolean;
   localStorageEnabled?: boolean;
   overrideModelId?: AppModelId; // For message editing where we want to use the original model
+  overrideModelSelection?: SelectedModelValue; // For message editing with multi-model selection
 }
 
 export function ChatInputProvider({
@@ -53,6 +61,7 @@ export function ChatInputProvider({
   initialTool = null,
   initialAttachments = [],
   overrideModelId,
+  overrideModelSelection,
   localStorageEnabled = true,
   isProjectContext = false,
 }: ChatInputProviderProps) {
@@ -95,6 +104,10 @@ export function ChatInputProvider({
   const [selectedModelId, setSelectedModelId] = useState<AppModelId>(
     overrideModelId || defaultModel
   );
+  const [selectedModelSelection, setSelectedModelSelection] =
+    useState<SelectedModelValue>(
+      overrideModelSelection ?? overrideModelId ?? defaultModel
+    );
 
   // IMPORTANT: do not read localStorage during initial render.
   // Next SSRs client components; localStorage is client-only and will cause hydration mismatches
@@ -128,7 +141,7 @@ export function ChatInputProvider({
 
   const { getModelById } = useChatModels();
 
-  const handleModelChange = useCallback(
+  const persistPrimaryModelChange = useCallback(
     async (modelId: AppModelId) => {
       const modelDef = getModelById(modelId);
 
@@ -146,6 +159,29 @@ export function ChatInputProvider({
     [selectedTool, changeModel, getModelById]
   );
 
+  const handleModelChange = useCallback(
+    async (modelId: AppModelId) => {
+      setSelectedModelSelection(modelId);
+      await persistPrimaryModelChange(modelId);
+    },
+    [persistPrimaryModelChange]
+  );
+
+  const handleModelSelectionChange = useCallback(
+    async (selection: SelectedModelValue) => {
+      setSelectedModelSelection(selection);
+
+      const primaryModelId = getPrimarySelectedModelId(selection);
+
+      if (!primaryModelId) {
+        return;
+      }
+
+      await persistPrimaryModelChange(primaryModelId);
+    },
+    [persistPrimaryModelChange]
+  );
+
   const clearInput = useCallback(() => {
     editorRef.current?.clear();
     setLocalStorageInput("");
@@ -207,7 +243,9 @@ export function ChatInputProvider({
         attachments,
         setAttachments,
         selectedModelId,
+        selectedModelSelection,
         handleModelChange,
+        handleModelSelectionChange,
         getInputValue,
         handleInputChange,
         getInitialInput,

package/templates/chat-app/proxy.ts

@@ -1,6 +1,8 @@
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 import { auth } from "@/lib/auth";
+import { config as appConfig } from "@/lib/config";
+import { isPlaywrightTestEnvironment } from "@/lib/constants";
 
 function isPublicApiRoute(pathname: string): boolean {
   return (
@@ -33,7 +35,23 @@ function isPublicPage(pathname: string): boolean {
 }
 
 function isAuthPage(pathname: string): boolean {
-  return pathname.startsWith("/login") || pathname.startsWith("/register");
+  return (
+    pathname.startsWith("/login") ||
+    pathname.startsWith("/register") ||
+    isDeviceLoginPage(pathname)
+  );
+}
+
+function isDeviceLoginPage(pathname: string): boolean {
+  return appConfig.desktopApp.enabled && pathname.startsWith("/device-login");
+}
+
+function getSafeReturnTo(url: URL): string | null {
+  const returnTo = url.searchParams.get("returnTo");
+  if (!returnTo?.startsWith("/") || returnTo.startsWith("//")) {
+    return null;
+  }
+  return returnTo;
 }
 
 export async function proxy(req: NextRequest) {
@@ -44,11 +62,18 @@ export async function proxy(req: NextRequest) {
     return;
   }
 
+  if (isPlaywrightTestEnvironment) {
+    // Playwright CI runs the app anonymously and should never reach session I/O.
+    return;
+  }
+
   const session = await auth.api.getSession({ headers: req.headers });
   const isLoggedIn = !!session?.user;
+  const isDeviceLoginRoute = isDeviceLoginPage(pathname);
+  const returnTo = getSafeReturnTo(url);
 
-  if (isLoggedIn && isAuthPage(pathname)) {
-    return NextResponse.redirect(new URL("/", url));
+  if (isLoggedIn && isAuthPage(pathname) && !isDeviceLoginRoute) {
+    return NextResponse.redirect(new URL(returnTo ?? "/", url));
   }
 
   if (isAuthPage(pathname) || isPublicPage(pathname)) {

package/templates/chat-app/scripts/check-env.ts

@@ -16,6 +16,7 @@ import {
   getMissingRequirement,
   isRequirementSatisfied,
 } from "../lib/config-requirements";
+import { isPlaywrightTestEnvironment } from "../lib/playwright-test-environment";
 
 interface ValidationError {
   feature: string;
@@ -158,6 +159,15 @@ function checkGatewaySnapshot(): string | null {
 
 function checkEnv(): void {
   const env = process.env;
+  if (isPlaywrightTestEnvironment(env)) {
+    console.log(
+      "✅ Skipping optional environment validation in Playwright test mode"
+    );
+    // Playwright CI only exercises anonymous flows, so optional feature checks
+    // and the gateway snapshot warning stay enforced in non-Playwright builds.
+    return;
+  }
+
   const baseUrlError = validateBaseUrl(env);
   const errors = [
     ...(baseUrlError ? [baseUrlError] : []),

package/templates/chat-app/scripts/db-branch-delete.sh

@@ -2,7 +2,13 @@
 set -e
 
 BRANCH_NAME="${1:-dev-local}"
-BRANCH_FILE=".neon-branch"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+MONOREPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+if [ -f "$MONOREPO_ROOT/turbo.json" ]; then
+  BRANCH_FILE="$MONOREPO_ROOT/.neon-branch"
+else
+  BRANCH_FILE="$(cd "$SCRIPT_DIR/.." && pwd)/.neon-branch"
+fi
 
 # Check if we're currently on this branch
 if [ -f "$BRANCH_FILE" ] && [ "$(cat "$BRANCH_FILE")" = "$BRANCH_NAME" ]; then