@chat-js/cli 0.6.1 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@chat-js/cli",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"description": "CLI for creating and extending ChatJS apps",
 	"license": "Apache-2.0",
 	"repository": {

package/templates/chat-app/app/(auth)/login/page.tsx

@@ -1,8 +1,8 @@
 import { ChevronLeft } from "lucide-react";
 import type { Metadata } from "next";
 import { headers } from "next/headers";
-import Link from "next/link";
 import { ElectronTransferUser } from "@/components/electron-auth-ui";
+import { InternalLink } from "@/components/internal-link";
 import { LoginForm } from "@/components/login-form";
 import { buttonVariants } from "@/components/ui/button";
 import { auth } from "@/lib/auth";
@@ -33,7 +33,7 @@ export default async function LoginPage({
 
   return (
     <div className="container mx-auto flex h-dvh w-screen flex-col items-center justify-center">
-      <Link
+      <InternalLink
         className={cn(
           buttonVariants({ variant: "ghost" }),
           "absolute top-4 left-4 md:top-8 md:left-8"
@@ -42,7 +42,7 @@ export default async function LoginPage({
       >
         <ChevronLeft className="mr-2 h-4 w-4" />
         Back
-      </Link>
+      </InternalLink>
       <div className="mx-auto flex w-full flex-col items-center justify-center sm:w-[420px]">
         {session?.user && isElectronTransfer ? (
           <ElectronTransferUser query={query} session={session} />

package/templates/chat-app/app/(chat)/api/chat/route.ts

@@ -27,7 +27,6 @@ import {
 import { systemPrompt } from "@/lib/ai/prompts";
 import { getStreamErrorMessage } from "@/lib/ai/stream-errors";
 import { calculateMessagesTokens } from "@/lib/ai/token-utils";
-import { allTools } from "@/lib/ai/tools/tools-definitions";
 import {
   type ChatMessage,
   getPrimarySelectedModelId,
@@ -275,39 +274,6 @@ async function handleUserValidationAndCredits({
   return { isNewChat: validationResult.isNewChat };
 }
 
-/**
- * Determines which built-in tools are allowed based on model capabilities.
- * MCP tools are handled separately in core-chat-agent.
- */
-function determineAllowedTools({
-  isAnonymous,
-  modelDefinition,
-  explicitlyRequestedTools,
-}: {
-  isAnonymous: boolean;
-  modelDefinition: AppModelDefinition;
-  explicitlyRequestedTools: ToolName[] | null;
-}): ToolName[] {
-  // Start with all tools or anonymous-limited tools
-  const allowedTools: ToolName[] = isAnonymous
-    ? [...ANONYMOUS_LIMITS.AVAILABLE_TOOLS]
-    : [...allTools];
-
-  // Disable all tools for models with unspecified features
-  if (!modelDefinition?.input) {
-    return [];
-  }
-
-  // If specific tools were requested, filter them against allowed tools
-  if (explicitlyRequestedTools && explicitlyRequestedTools.length > 0) {
-    return explicitlyRequestedTools.filter((tool) =>
-      allowedTools.includes(tool)
-    );
-  }
-
-  return allowedTools;
-}
-
 async function getSystemPrompt({
   isAnonymous,
   chatId,
@@ -339,7 +305,6 @@ async function createChatStream({
   isPrimaryParallel,
   explicitlyRequestedTools,
   userId,
-  allowedTools,
   abortController,
   isAnonymous,
   isNewChat,
@@ -358,7 +323,6 @@ async function createChatStream({
   isPrimaryParallel: boolean | null;
   explicitlyRequestedTools: ToolName[] | null;
   userId: string | null;
-  allowedTools: ToolName[];
   abortController: AbortController;
   isAnonymous: boolean;
   isNewChat: boolean;
@@ -393,7 +357,7 @@ async function createChatStream({
         selectedModelId,
         explicitlyRequestedTools,
         userId,
-        budgetAllowedTools: allowedTools,
+        isAnonymous,
         abortSignal: abortController.signal,
         messageId,
         dataStream,
@@ -517,7 +481,6 @@ async function executeChatRequest({
   userId,
   isAnonymous,
   isNewChat,
-  allowedTools,
   abortController,
   timeoutId,
   mcpConnectors,
@@ -534,7 +497,6 @@ async function executeChatRequest({
   userId: string | null;
   isAnonymous: boolean;
   isNewChat: boolean;
-  allowedTools: ToolName[];
   abortController: AbortController;
   timeoutId: NodeJS.Timeout;
   mcpConnectors: McpConnector[];
@@ -589,7 +551,6 @@ async function executeChatRequest({
     isPrimaryParallel,
     explicitlyRequestedTools,
     userId,
-    allowedTools,
     abortController,
     isAnonymous,
     isNewChat,
@@ -708,28 +669,17 @@ async function prepareRequestContext({
   chatId,
   isAnonymous,
   anonymousPreviousMessages,
-  modelDefinition,
-  explicitlyRequestedTools,
 }: {
   userMessage: ChatMessage;
   chatId: string;
   isAnonymous: boolean;
   anonymousPreviousMessages: ChatMessage[];
-  modelDefinition: AppModelDefinition;
-  explicitlyRequestedTools: ToolName[] | null;
 }): Promise<{
   previousMessages: ChatMessage[];
-  allowedTools: ToolName[];
   error: Response | null;
 }> {
   const log = createModuleLogger("api:chat:prepare");
 
-  const allowedTools = determineAllowedTools({
-    isAnonymous,
-    modelDefinition,
-    explicitlyRequestedTools,
-  });
-
   // Validate input token limit (50k tokens for user message)
   const totalTokens = calculateMessagesTokens(
     await convertToModelMessages([userMessage])
@@ -743,7 +693,6 @@ async function prepareRequestContext({
     );
     return {
       previousMessages: [],
-      allowedTools: [],
       error: error.toResponse(),
     };
   }
@@ -756,9 +705,8 @@ async function prepareRequestContext({
       );
 
   const previousMessages = messageThreadToParent.slice(-5);
-  log.debug({ allowedTools }, "allowed tools");
 
-  return { previousMessages, allowedTools, error: null };
+  return { previousMessages, error: null };
 }
 
 async function finalizeMessageAndCredits({
@@ -883,8 +831,7 @@ export async function POST(request: NextRequest) {
       return sessionSetup.error;
     }
 
-    const { userId, isAnonymous, anonymousSession, modelDefinition } =
-      sessionSetup;
+    const { userId, isAnonymous, anonymousSession } = sessionSetup;
 
     const selectedTool = userMessage.metadata.selectedTool ?? null;
     let isNewChat = false;
@@ -918,8 +865,6 @@ export async function POST(request: NextRequest) {
         chatId,
         isAnonymous,
         anonymousPreviousMessages,
-        modelDefinition,
-        explicitlyRequestedTools,
       }),
       config.ai.tools.mcp.enabled && userId && !isAnonymous
         ? getMcpConnectorsByUserId({ userId })
@@ -930,7 +875,7 @@ export async function POST(request: NextRequest) {
       return contextResult.error;
     }
 
-    const { previousMessages, allowedTools } = contextResult;
+    const { previousMessages } = contextResult;
 
     // Create AbortController with timeout
     const abortController = new AbortController();
@@ -952,7 +897,6 @@ export async function POST(request: NextRequest) {
       userId,
       isAnonymous,
       isNewChat,
-      allowedTools,
       abortController,
       timeoutId,
       mcpConnectors,

package/templates/chat-app/app/not-found.tsx

@@ -1,4 +1,4 @@
-import Link from "next/link";
+import { InternalLink } from "@/components/internal-link";
 import { Button } from "@/components/ui/button";
 
 export default function NotFound() {
@@ -13,7 +13,7 @@ export default function NotFound() {
               The page you are looking for does not exist or has been moved.
             </p>
             <Button asChild>
-              <Link href="/">Return Home</Link>
+              <InternalLink href="/">Return Home</InternalLink>
             </Button>
           </div>
         </div>

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

@@ -136,6 +136,9 @@ const config = defineConfig({
       },
     },
   },
+  paths: {
+    tools: "@/tools/chatjs",
+  },
   anonymous: {
     credits: isProd ? 10 : 1000,
     availableTools: [],

package/templates/chat-app/components/ai-elements/actions.tsx

@@ -3,63 +3,63 @@
 import type { ComponentProps } from "react";
 import { Button } from "@/components/ui/button";
 import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
+	Tooltip,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 
 export type ActionsProps = ComponentProps<"div">;
 
 export const Actions = ({ className, children, ...props }: ActionsProps) => (
-  <div className={cn("flex items-center gap-1", className)} {...props}>
-    {children}
-  </div>
+	<div className={cn("flex items-center gap-1", className)} {...props}>
+		{children}
+	</div>
 );
 
 export type ActionProps = ComponentProps<typeof Button> & {
-  tooltip?: string;
-  label?: string;
+	tooltip?: string;
+	label?: string;
 };
 
 export const Action = ({
-  tooltip,
-  children,
-  label,
-  className,
-  variant = "ghost",
-  size = "sm",
-  ...props
+	tooltip,
+	children,
+	label,
+	className,
+	variant = "ghost",
+	size = "sm",
+	...props
 }: ActionProps) => {
-  const button = (
-    <Button
-      className={cn(
-        "relative size-9 p-1.5 text-muted-foreground hover:text-foreground",
-        className
-      )}
-      size={size}
-      type="button"
-      variant={variant}
-      {...props}
-    >
-      {children}
-      <span className="sr-only">{label || tooltip}</span>
-    </Button>
-  );
+	const button = (
+		<Button
+			className={cn(
+				"relative size-9 p-1.5 text-muted-foreground hover:text-foreground",
+				className,
+			)}
+			size={size}
+			type="button"
+			variant={variant}
+			{...props}
+		>
+			{children}
+			<span className="sr-only">{label || tooltip}</span>
+		</Button>
+	);
 
-  if (tooltip) {
-    return (
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>{button}</TooltipTrigger>
-          <TooltipContent>
-            <p>{tooltip}</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    );
-  }
+	if (tooltip) {
+		return (
+			<TooltipProvider>
+				<Tooltip>
+					<TooltipTrigger asChild>{button}</TooltipTrigger>
+					<TooltipContent>
+						<p>{tooltip}</p>
+					</TooltipContent>
+				</Tooltip>
+			</TooltipProvider>
+		);
+	}
 
-  return button;
+	return button;
 };

package/templates/chat-app/components/ai-elements/artifact.tsx

@@ -4,144 +4,144 @@ import { type LucideIcon, XIcon } from "lucide-react";
 import type { ComponentProps, HTMLAttributes } from "react";
 import { Button } from "@/components/ui/button";
 import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
+	Tooltip,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 
 export type ArtifactProps = HTMLAttributes<HTMLDivElement>;
 
 export const Artifact = ({ className, ...props }: ArtifactProps) => (
-  <div
-    className={cn(
-      "flex flex-col overflow-hidden rounded-lg border bg-background shadow-sm",
-      className
-    )}
-    {...props}
-  />
+	<div
+		className={cn(
+			"flex flex-col overflow-hidden rounded-lg border bg-background shadow-sm",
+			className,
+		)}
+		{...props}
+	/>
 );
 
 export type ArtifactHeaderProps = HTMLAttributes<HTMLDivElement>;
 
 export const ArtifactHeader = ({
-  className,
-  ...props
+	className,
+	...props
 }: ArtifactHeaderProps) => (
-  <div
-    className={cn(
-      "flex items-center justify-between border-b bg-muted/50 px-4 py-3",
-      className
-    )}
-    {...props}
-  />
+	<div
+		className={cn(
+			"flex items-center justify-between border-b bg-muted/50 px-4 py-3",
+			className,
+		)}
+		{...props}
+	/>
 );
 
 export type ArtifactCloseProps = ComponentProps<typeof Button>;
 
 export const ArtifactClose = ({
-  className,
-  children,
-  size = "sm",
-  variant = "ghost",
-  ...props
+	className,
+	children,
+	size = "sm",
+	variant = "ghost",
+	...props
 }: ArtifactCloseProps) => (
-  <Button
-    className={cn(
-      "size-8 p-0 text-muted-foreground hover:text-foreground",
-      className
-    )}
-    size={size}
-    type="button"
-    variant={variant}
-    {...props}
-  >
-    {children ?? <XIcon className="size-4" />}
-    <span className="sr-only">Close</span>
-  </Button>
+	<Button
+		className={cn(
+			"size-8 p-0 text-muted-foreground hover:text-foreground",
+			className,
+		)}
+		size={size}
+		type="button"
+		variant={variant}
+		{...props}
+	>
+		{children ?? <XIcon className="size-4" />}
+		<span className="sr-only">Close</span>
+	</Button>
 );
 
 export type ArtifactTitleProps = HTMLAttributes<HTMLParagraphElement>;
 
 export const ArtifactTitle = ({ className, ...props }: ArtifactTitleProps) => (
-  <p
-    className={cn("font-medium text-foreground text-sm", className)}
-    {...props}
-  />
+	<p
+		className={cn("font-medium text-foreground text-sm", className)}
+		{...props}
+	/>
 );
 
 export type ArtifactDescriptionProps = HTMLAttributes<HTMLParagraphElement>;
 
 export const ArtifactDescription = ({
-  className,
-  ...props
+	className,
+	...props
 }: ArtifactDescriptionProps) => (
-  <p className={cn("text-muted-foreground text-sm", className)} {...props} />
+	<p className={cn("text-muted-foreground text-sm", className)} {...props} />
 );
 
 export type ArtifactActionsProps = HTMLAttributes<HTMLDivElement>;
 
 export const ArtifactActions = ({
-  className,
-  ...props
+	className,
+	...props
 }: ArtifactActionsProps) => (
-  <div className={cn("flex items-center gap-1", className)} {...props} />
+	<div className={cn("flex items-center gap-1", className)} {...props} />
 );
 
 export type ArtifactActionProps = ComponentProps<typeof Button> & {
-  tooltip?: string;
-  label?: string;
-  icon?: LucideIcon;
+	tooltip?: string;
+	label?: string;
+	icon?: LucideIcon;
 };
 
 export const ArtifactAction = ({
-  tooltip,
-  label,
-  icon: Icon,
-  children,
-  className,
-  size = "sm",
-  variant = "ghost",
-  ...props
+	tooltip,
+	label,
+	icon: Icon,
+	children,
+	className,
+	size = "sm",
+	variant = "ghost",
+	...props
 }: ArtifactActionProps) => {
-  const button = (
-    <Button
-      className={cn(
-        "size-8 p-0 text-muted-foreground hover:text-foreground",
-        className
-      )}
-      size={size}
-      type="button"
-      variant={variant}
-      {...props}
-    >
-      {Icon ? <Icon className="size-4" /> : children}
-      <span className="sr-only">{label || tooltip}</span>
-    </Button>
-  );
-
-  if (tooltip) {
-    return (
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>{button}</TooltipTrigger>
-          <TooltipContent>
-            <p>{tooltip}</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    );
-  }
-
-  return button;
+	const button = (
+		<Button
+			className={cn(
+				"size-8 p-0 text-muted-foreground hover:text-foreground",
+				className,
+			)}
+			size={size}
+			type="button"
+			variant={variant}
+			{...props}
+		>
+			{Icon ? <Icon className="size-4" /> : children}
+			<span className="sr-only">{label || tooltip}</span>
+		</Button>
+	);
+
+	if (tooltip) {
+		return (
+			<TooltipProvider>
+				<Tooltip>
+					<TooltipTrigger asChild>{button}</TooltipTrigger>
+					<TooltipContent>
+						<p>{tooltip}</p>
+					</TooltipContent>
+				</Tooltip>
+			</TooltipProvider>
+		);
+	}
+
+	return button;
 };
 
 export type ArtifactContentProps = HTMLAttributes<HTMLDivElement>;
 
 export const ArtifactContent = ({
-  className,
-  ...props
+	className,
+	...props
 }: ArtifactContentProps) => (
-  <div className={cn("flex-1 overflow-auto p-4", className)} {...props} />
+	<div className={cn("flex-1 overflow-auto p-4", className)} {...props} />
 );