@chat-js/cli 0.6.1 → 0.6.2

package/templates/chat-app/components/ui/tooltip.tsx

@@ -6,67 +6,67 @@ import type * as React from "react";
 import { cn } from "@/lib/utils";
 
 function TooltipProvider({
-  delayDuration = 0,
-  ...props
+	delayDuration = 0,
+	...props
 }: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
-  return (
-    <TooltipPrimitive.Provider
-      data-slot="tooltip-provider"
-      delayDuration={delayDuration}
-      {...props}
-    />
-  );
+	return (
+		<TooltipPrimitive.Provider
+			data-slot="tooltip-provider"
+			delayDuration={delayDuration}
+			{...props}
+		/>
+	);
 }
 
 function Tooltip({
-  ...props
+	...props
 }: React.ComponentProps<typeof TooltipPrimitive.Root>) {
-  return (
-    <TooltipProvider>
-      <TooltipPrimitive.Root data-slot="tooltip" {...props} />
-    </TooltipProvider>
-  );
+	return (
+		<TooltipProvider>
+			<TooltipPrimitive.Root data-slot="tooltip" {...props} />
+		</TooltipProvider>
+	);
 }
 
 function TooltipTrigger({
-  ...props
+	...props
 }: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
-  return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
+	return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
 }
 
 function TooltipContent({
-  className,
-  sideOffset = 0,
-  children,
-  variant = "primary",
-  ...props
+	className,
+	sideOffset = 0,
+	children,
+	variant = "primary",
+	...props
 }: React.ComponentProps<typeof TooltipPrimitive.Content> & {
-  variant?: "base" | "primary";
+	variant?: "base" | "primary";
 }) {
-  return (
-    <TooltipPrimitive.Portal>
-      <TooltipPrimitive.Content
-        className={cn(
-          "fade-in-0 zoom-in-95 data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) animate-in text-balance rounded-md px-3 py-1.5 text-xs data-[state=closed]:animate-out",
-          variant === "primary" && "bg-primary text-primary-foreground",
-          variant === "base" && "bg-popover text-popover-foreground",
-          className
-        )}
-        data-slot="tooltip-content"
-        sideOffset={sideOffset}
-        {...props}
-      >
-        {children}
-        <TooltipPrimitive.Arrow
-          className={cn(
-            "z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]",
-            variant === "primary" && "bg-primary fill-primary",
-            variant === "base" && "bg-popover fill-popover"
-          )}
-        />
-      </TooltipPrimitive.Content>
-    </TooltipPrimitive.Portal>
-  );
+	return (
+		<TooltipPrimitive.Portal>
+			<TooltipPrimitive.Content
+				className={cn(
+					"fade-in-0 zoom-in-95 data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) animate-in text-balance rounded-md px-3 py-1.5 text-xs data-[state=closed]:animate-out",
+					variant === "primary" && "bg-primary text-primary-foreground",
+					variant === "base" && "bg-popover text-popover-foreground",
+					className,
+				)}
+				data-slot="tooltip-content"
+				sideOffset={sideOffset}
+				{...props}
+			>
+				{children}
+				<TooltipPrimitive.Arrow
+					className={cn(
+						"z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]",
+						variant === "primary" && "bg-primary fill-primary",
+						variant === "base" && "bg-popover fill-popover",
+					)}
+				/>
+			</TooltipPrimitive.Content>
+		</TooltipPrimitive.Portal>
+	);
 }
 
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
+export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };

package/templates/chat-app/components/upgrade-cta/limit-display.tsx

@@ -2,8 +2,8 @@
 
 import { X } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
-import Link from "next/link";
 import { useState } from "react";
+import { InternalLink } from "@/components/internal-link";
 import { useGetCredits } from "@/hooks/chat-sync-hooks";
 import { cn } from "@/lib/utils";
 import { useSession } from "@/providers/session-provider";
@@ -29,12 +29,12 @@ const VARIANT_CONFIG: Record<
       isAtLimit ? (
         <span>
           You&apos;ve reached your credit limit.{" "}
-          <Link
+          <InternalLink
             className="font-medium text-red-700 underline hover:no-underline dark:text-red-300"
             href="/login"
           >
             Sign in to reset your limits
-          </Link>
+          </InternalLink>
         </span>
       ) : (
         <span>
@@ -43,12 +43,12 @@ const VARIANT_CONFIG: Record<
             {remaining} credit{remaining === 1 ? "" : "s"}
           </strong>{" "}
           left.{" "}
-          <Link
+          <InternalLink
             className="font-medium text-amber-700 underline hover:no-underline dark:text-amber-300"
             href="/login"
           >
             Sign in to reset your limits
-          </Link>
+          </InternalLink>
         </span>
       ),
     getClasses: ({ isAtLimit }) =>
@@ -61,12 +61,12 @@ const VARIANT_CONFIG: Record<
     getMessage: () => (
       <span>
         This model isn&apos;t available for anonymous users.{" "}
-        <Link
+        <InternalLink
           className="font-medium text-amber-700 underline hover:no-underline dark:text-amber-300"
           href="/login"
         >
           Log in to use this model
-        </Link>
+        </InternalLink>
       </span>
     ),
     getClasses: () =>

package/templates/chat-app/components/upgrade-cta/login-cta-banner.tsx

@@ -2,8 +2,8 @@
 
 import { LogIn, X } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
-import Link from "next/link";
 import { useState } from "react";
+import { InternalLink } from "@/components/internal-link";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
@@ -73,7 +73,7 @@ export function LoginCtaBanner({
             )}
             <span className={cn("text-sm", textStyles[variant])}>
               {message}{" "}
-              <Link
+              <InternalLink
                 className={cn(
                   "font-medium underline hover:no-underline",
                   linkStyles[variant]
@@ -81,7 +81,7 @@ export function LoginCtaBanner({
                 href="/login"
               >
                 Sign in
-              </Link>
+              </InternalLink>
             </span>
           </div>
           {dismissible && (

package/templates/chat-app/components/upgrade-cta/login-prompt.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { ArrowRight } from "lucide-react";
-import Link from "next/link";
+import { InternalLink } from "@/components/internal-link";
 import { cn } from "@/lib/utils";
 
 interface LoginPromptProps {
@@ -22,12 +22,12 @@ export function LoginPrompt({
         <h4 className="font-medium text-sm">{title}</h4>
       </div>
       <p className="ml-6 text-muted-foreground text-sm">{description}</p>
-      <Link
+      <InternalLink
         className="ml-6 block font-medium text-blue-500 text-sm hover:underline"
         href="/login"
       >
         Sign in
-      </Link>
+      </InternalLink>
     </div>
   );
 }

package/templates/chat-app/hooks/use-mobile.ts

@@ -3,19 +3,19 @@ import * as React from "react";
 const MOBILE_BREAKPOINT = 768;
 
 export function useIsMobile() {
-  const [isMobile, setIsMobile] = React.useState<boolean | undefined>(
-    undefined
-  );
+	const [isMobile, setIsMobile] = React.useState<boolean | undefined>(
+		undefined,
+	);
 
-  React.useEffect(() => {
-    const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
-    const onChange = () => {
-      setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
-    };
-    mql.addEventListener("change", onChange);
-    setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
-    return () => mql.removeEventListener("change", onChange);
-  }, []);
+	React.useEffect(() => {
+		const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
+		const onChange = () => {
+			setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+		};
+		mql.addEventListener("change", onChange);
+		setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+		return () => mql.removeEventListener("change", onChange);
+	}, []);
 
-  return !!isMobile;
+	return !!isMobile;
 }

package/templates/chat-app/lib/ai/core-chat-agent.ts

@@ -5,11 +5,12 @@ import { getRecentGeneratedImage } from "@/app/(chat)/api/chat/get-recent-genera
 import { type AppModelId, getAppModelDefinition } from "@/lib/ai/app-models";
 import { markdownJoinerTransform } from "@/lib/ai/markdown-joiner-transform";
 import { getLanguageModel, getModelProviderOptions } from "@/lib/ai/providers";
-import { getMcpTools, getTools } from "@/lib/ai/tools/tools";
 import type { ChatMessage, StreamWriter, ToolName } from "@/lib/ai/types";
 import type { CostAccumulator } from "@/lib/credits/cost-accumulator";
 import type { McpConnector } from "@/lib/db/schema";
+import { ANONYMOUS_LIMITS } from "@/lib/types/anonymous";
 import { replaceFilePartUrlByBinaryDataInMessages } from "@/lib/utils/download-assets";
+import { getMcpTools, getTools } from "@/tools/platform/tools";
 
 export async function createCoreChatAgent({
   system,
@@ -18,7 +19,7 @@ export async function createCoreChatAgent({
   selectedModelId,
   explicitlyRequestedTools,
   userId,
-  budgetAllowedTools,
+  isAnonymous = false,
   abortSignal,
   messageId,
   dataStream,
@@ -33,8 +34,7 @@ export async function createCoreChatAgent({
   selectedModelId: AppModelId;
   explicitlyRequestedTools: ToolName[] | null;
   userId: string | null;
-  /** Budget-allowed base tools from route.ts (static ToolNames only) */
-  budgetAllowedTools: ToolName[];
+  isAnonymous?: boolean;
   abortSignal?: AbortSignal;
   messageId: string;
   dataStream: StreamWriter;
@@ -90,16 +90,28 @@ export async function createCoreChatAgent({
     ...mcpTools,
   };
 
-  // Compute final activeTools for streamText:
-  // 1. Filter budget-allowed base tools to only those that actually exist in baseTools
-  const existingBaseActiveTools = budgetAllowedTools.filter(
-    (toolName) => toolName in baseTools
-  );
-  // 2. Always allow all MCP tools that exist at runtime
-  const mcpToolNames = Object.keys(mcpTools);
-  // 3. Build the final activeTools list (cast needed because MCP tools are dynamic)
+  // Compute final activeTools for streamText
+  let activeBaseTools = Object.keys(baseTools) as ToolName[];
+  let activeMcpTools = Object.keys(mcpTools) as ToolName[];
+  if (!modelDefinition?.input) {
+    activeBaseTools = [];
+    activeMcpTools = [];
+  } else if (isAnonymous) {
+    activeBaseTools = activeBaseTools.filter((k) =>
+      (ANONYMOUS_LIMITS.AVAILABLE_TOOLS as ToolName[]).includes(k)
+    );
+    activeMcpTools = [];
+  }
+  if (explicitlyRequestedTools !== null) {
+    activeBaseTools = explicitlyRequestedTools.filter((k) =>
+      activeBaseTools.includes(k)
+    );
+    activeMcpTools = explicitlyRequestedTools.filter((k) =>
+      activeMcpTools.includes(k)
+    );
+  }
   const activeTools = [
-    ...new Set([...existingBaseActiveTools, ...mcpToolNames]),
+    ...new Set([...activeBaseTools, ...activeMcpTools]),
   ] as (keyof typeof allTools)[];
 
   // Resolve async model config before streamText to ensure cleanup on failure
@@ -115,7 +127,6 @@ export async function createCoreChatAgent({
     throw error;
   }
 
-  // Create the streamText result
   const result = streamText({
     model,
     system,

package/templates/chat-app/lib/ai/eval-agent.ts

@@ -38,7 +38,6 @@ async function executeAgentAndGetOutput({
   selectedModelId,
   explicitlyRequestedTools,
   userId,
-  activeTools,
   abortSignal,
   messageId,
 }: {
@@ -47,7 +46,6 @@ async function executeAgentAndGetOutput({
   selectedModelId: AppModelId;
   explicitlyRequestedTools: ToolName[] | null;
   userId: string | null;
-  activeTools: ToolName[];
   abortSignal: AbortSignal | undefined;
   messageId: string;
 }): Promise<{
@@ -69,7 +67,6 @@ async function executeAgentAndGetOutput({
     selectedModelId,
     explicitlyRequestedTools,
     userId,
-    budgetAllowedTools: activeTools,
     abortSignal,
     messageId,
     dataStream: noOpStreamWriter,
@@ -253,8 +250,11 @@ export async function runCoreChatAgentEval({
   abortSignal?: AbortSignal;
 }): Promise<EvalAgentResult> {
   const messageId = generateUUID();
+  const requestedTools = determineExplicitlyRequestedTools(selectedTool);
   const explicitlyRequestedTools =
-    determineExplicitlyRequestedTools(selectedTool);
+    requestedTools === null
+      ? activeTools
+      : requestedTools.filter((tool) => activeTools.includes(tool));
 
   const { result, contextForLLM, output, response } =
     await executeAgentAndGetOutput({
@@ -263,7 +263,6 @@ export async function runCoreChatAgentEval({
       selectedModelId,
       explicitlyRequestedTools,
       userId,
-      activeTools,
       abortSignal,
       messageId,
     });

package/templates/chat-app/lib/ai/installed-tools.ts

@@ -0,0 +1,12 @@
+import type { InferUITool } from "ai";
+import { tools } from "@/tools/chatjs/tools";
+
+export const installedTools = tools;
+
+// Derive UI tool types automatically from the registered tools.
+// When the CLI adds an entry to tools in tools/chatjs/tools.ts, its typed
+// input/output automatically flows into ChatTools via the InstalledTools
+// intersection.
+export type InstalledTools = {
+  [K in keyof typeof installedTools]: InferUITool<(typeof installedTools)[K]>;
+};

package/templates/chat-app/lib/ai/mcp/mcp-client.ts

@@ -6,7 +6,7 @@ import type {
   ListPromptsResult,
   ListResourcesResult,
 } from "@modelcontextprotocol/sdk/types.js";
-import type { Tool } from "ai";
+import type { Tool, ToolSet } from "ai";
 import { config } from "@/lib/config";
 import { createModuleLogger } from "@/lib/logger";
 import { getBaseUrl } from "@/lib/url";
@@ -217,7 +217,7 @@ export class MCPClient {
       throw new Error("Client not connected");
     }
     try {
-      return await this.client.tools();
+      return (await this.client.tools()) as ToolSet as Record<string, Tool>;
     } catch (error) {
       this.handlePotentialAuthError(error);
       throw error;