checkpoint

Author: tannerlinsley

ARCHITECTURE.md

@@ -1,33 +1,35 @@
 ## Nomenclature
 
-- `cta` - Create Tanstack Application
-- CTA Framework - A framework that supports the creation of a TanStack Application using a specific technology (e.g. React, Solid, Vue, etc.)
+- TanStack CLI - The command line interface for creating and managing TanStack applications
+- Framework - A framework that supports the creation of a TanStack Application using a specific technology (e.g. React, Solid)
 - `code-router` - One of two _modes_ of TanStack Application. The other is `file-router`. The code router is when the applications routes are defined in code.
 - `file-router` - One of two _modes_ of TanStack Application. The other is `code-router`. The file router is when the applications routes are defined in files (usually in the `src/routes` directory).
 - `add-on` - A plugin that extends the capabilities of a TanStack Application (e.g. the `tanstack-query` add-on integrates TanStack Query into the application).
 - custom `add-on` - An externalized `add-on` contained in a single JSON file that can integate technologies that aren't covered with the built-in add-ons.
-- `starter` - An application template that is constructed from an existing CTA created application that has been modified to the customers needs. The advantage of a starter over a cloneable git repo is that when a starter is used the add-ons and project will be created using the latest version of the CTA framework and the add-ons. This reduces the versioning burden on the customer. This does come with a risk of potential breaking changes.
+- `starter` - An application template that is constructed from an existing application that has been modified to the customers needs. The advantage of a starter over a cloneable git repo is that when a starter is used the add-ons and project will be created using the latest version of the framework and the add-ons. This reduces the versioning burden on the customer. This does come with a risk of potential breaking changes.
 
-## CLI applications
+## CLI Applications
 
-- `create-tanstack` - The CLI application for creating a TanStack Application.
-- `create-start-app` - The CLI application for creating a TanStack Start Application.
-- `create-tsrouter-app` - The CLI application for creating a TanStack Router Application.
+- `tanstack` - The main CLI application (`@tanstack/cli`)
+- `create-tanstack` - Deprecated alias for `tanstack create`
+- `create-start-app` - Deprecated alias for `tanstack create`
+- `create-tsrouter-app` - Deprecated alias for `tanstack create`
 
 ## Packages
 
-- `@tanstack/cta-cli` - The command line interface for TanStack CTA.
-- `@tanstack/cta-engine` - The core engine that powers TanStack CTA.
-- `@tanstack/cta-ui` - The UI components for TanStack CTA.
+- `@tanstack/cli` - The command line interface for TanStack
+- `@tanstack/create` - The core engine that powers app creation
+- `@tanstack/create-ui` - The UI components for the visual app creator
 
 ## Frameworks
 
-- `@tanstack/cta-frameworks-react-cra` - The React (Create React App) framework for TanStack CTA.
-- `@tanstack/cta-frameworks-solid` - The Solid framework for TanStack CTA.
+Frameworks are now bundled within `@tanstack/create`:
+- React framework (`packages/create/src/frameworks/react`)
+- Solid framework (`packages/create/src/frameworks/solid`)
 
 ## File Templates
 
-The CTA system uses EJS to render the files into the final application.
+The system uses EJS to render the files into the final application.
 
 Below are all of the variables that are available to the file templates.
 
@@ -48,4 +50,4 @@ Below are all of the variables that are available to the file templates.
 | `getPackageManagerAddScript` | A function that returns the script to add a dependency to the project.                                                                                                                               |
 | `getPackageManagerRunScript` | A function that returns the script to run a command in the project.                                                                                                                                  |
 | `relativePath`               | A function that returns the relative path from the current file to the specified target file.                                                                                                        |
-| `ignoreFile`                 | A function that if called will tell CTA to not include this file in the application.                                                                                                                 |
+| `ignoreFile`                 | A function that if called will tell the engine to not include this file in the application.                                                                                                          |

CLAUDE.md

@@ -1,93 +1,77 @@
-# TanStack Application Builders (CTA) - Claude Code Assistant
+# TanStack CLI - Claude Code Assistant
 
 ## Project Overview
 
-This monorepo contains the TanStack Application Builders (CTA - Create TanStack Application), a comprehensive tool for creating modern React and Solid applications with TanStack Router and TanStack Start.
+This monorepo contains the TanStack CLI (`@tanstack/cli`), a comprehensive tool for creating modern React and Solid applications with TanStack Router and TanStack Start.
 
 ## Quick Start
 
 ```bash
-# Create a new TanStack Router app
-npx create-tsrouter-app@latest my-app
+# Create a new TanStack app (recommended)
+npx @tanstack/cli@latest create my-app
 
-# Create a new TanStack Start app (SSR)
+# Legacy CLI aliases (deprecated, will show warning)
+npx create-tsrouter-app@latest my-app
 npx create-start-app@latest my-app
-
-# Alternative CLI names (all create TanStack Router apps)
 npx create-tanstack@latest my-app
 npx create-tanstack-app@latest my-app
 ```
 
+## CLI Commands
+
+```bash
+tanstack create [project-name] [options]  # Create a new TanStack app
+tanstack add [add-ons...]                 # Add add-ons to existing project
+tanstack add-on init|compile              # Manage custom add-ons
+tanstack starter init|compile             # Manage custom starters
+tanstack mcp [--sse]                      # Start MCP server
+tanstack pin-versions                     # Pin package versions
+tanstack --version                        # Show version
+```
+
 ## Monorepo Structure
 
 ```
 create-tsrouter-app/
-├── cli/                    # CLI applications
-│   ├── create-start-app/   # TanStack Start CLI
-│   ├── create-tanstack/    # TanStack Router CLI (alias)
-│   ├── create-tanstack-app/ # TanStack Router CLI (alias)
-│   └── create-tsrouter-app/ # TanStack Router CLI (main)
-├── packages/               # Core packages
-│   ├── cta-cli/           # CLI interface
-│   ├── cta-engine/        # Core engine
-│   ├── cta-ui/            # Web UI components
-│   └── cta-ui-base/       # Base UI components
-├── frameworks/             # Framework implementations
-│   ├── react-cra/         # React CRA framework
-│   └── solid/             # Solid framework
-└── examples/              # Example projects and starters
+├── packages/
+│   ├── cli/                # @tanstack/cli - Main CLI with subcommands
+│   ├── create/             # @tanstack/create - Core engine + frameworks
+│   │   └── src/
+│   │       └── frameworks/
+│   │           ├── react-cra/  # React framework
+│   │           └── solid/      # Solid framework
+│   └── create-ui/          # @tanstack/create-ui - Web UI components
+├── cli-aliases/            # Deprecated thin wrapper CLIs
+│   ├── create-tsrouter-app/
+│   ├── create-start-app/
+│   ├── create-tanstack/
+│   ├── create-tanstack-app/
+│   └── ts-create-start/
+└── examples/               # Example projects and custom CLIs
 ```
 
 ## Core Packages
 
-### @tanstack/cta-cli
+### @tanstack/cli
 
-- **Purpose**: Main CLI interface for the application builder
+- **Purpose**: Main CLI interface with subcommands
+- **Binary**: `tanstack`
 - **Key Dependencies**: `@clack/prompts`, `commander`, `express`, `chalk`
-- **Scripts**: `build`, `dev`, `test`, `test:watch`, `test:coverage`
+- **Features**: `create`, `add`, `add-on`, `starter`, `mcp`, `pin-versions` subcommands
 
-### @tanstack/cta-engine
+### @tanstack/create
 
-- **Purpose**: Core business logic and file generation engine
+- **Purpose**: Core engine, frameworks, add-ons, and starters
 - **Key Dependencies**: `ejs`, `execa`, `memfs`, `prettier`, `zod`
 - **Features**: Template processing, project generation, validation
+- **Contains**: React and Solid frameworks with all add-ons
 
-### @tanstack/cta-ui
+### @tanstack/create-ui
 
 - **Purpose**: Web interface for the application builder
 - **Key Dependencies**: `react`, `tailwindcss`, `next-themes`, `sonner`
 - **Scripts**: `build:ui`, `dev:ui` (React dev server)
 
-## CLI Applications
-
-### create-start-app
-
-- **Purpose**: Creates TanStack Start applications (SSR)
-- **Features**: Server-side rendering, React/Solid support, Vite build system
-- **Usage**: `npx create-start-app@latest my-app`
-
-### create-tsrouter-app (and aliases)
-
-- **Purpose**: Creates TanStack Router applications (client-side routing)
-- **Features**: File-based routing, TypeScript/JavaScript, React/Solid support
-- **Usage**: `npx create-tsrouter-app@latest my-app`
-
-## Framework Support
-
-### React CRA Framework
-
-- **Location**: `frameworks/react-cra/`
-- **Add-ons**: Clerk, Shadcn, Neon, TanStack Query, tRPC, Form, Store, etc.
-- **Toolchains**: Biome, ESLint + Prettier
-- **Examples**: Blog starter, E-commerce starter, TanChat
-
-### Solid Framework
-
-- **Location**: `frameworks/solid/`
-- **Add-ons**: Solid UI, TanStack Query, Form, Store, etc.
-- **Toolchains**: Biome, ESLint + Prettier
-- **Examples**: TanChat
-
 ## Development Scripts
 
 ```bash
@@ -113,23 +97,23 @@ pnpm cleanNodeModules
 
 ```bash
 # Build with CLI (outside monorepo)
-node cli/create-tsrouter-app/dist/index.js my-app
+node packages/cli/dist/index.js create my-app
 
 # Test with local add-ons
-node cli/create-tsrouter-app/dist/index.js my-app --add-ons http://localhost:9080/add-on.json
+node packages/cli/dist/index.js create my-app --add-ons http://localhost:9080/add-on.json
 
 # Test with local starters
-node cli/create-tsrouter-app/dist/index.js my-app --starter http://localhost:9080/starter.json
+node packages/cli/dist/index.js create my-app --starter http://localhost:9080/starter.json
 ```
 
-### Developing CTA UI
+### Developing Create UI
 
 ```bash
 # Start API server
-CTA_DISABLE_UI=true node cli/create-tsrouter-app/dist/index.js --ui
+CTA_DISABLE_UI=true node packages/cli/dist/index.js create --ui
 
 # Start React dev server
-cd packages/cta-ui && pnpm dev:ui
+cd packages/create-ui && pnpm dev:ui
 
 # Run monorepo in watch mode
 pnpm dev
@@ -149,10 +133,8 @@ pnpm dev
 
 ### Example Starters
 
-- **Blog Starter**: TanStack Router blog with file-based routing
-- **E-commerce Starter**: AI-powered chat application
-- **Resume Starter**: Professional resume template
-- **TanChat**: AI chat application with Claude integration
+- **Events**: Conference/events website
+- **Resume**: Professional resume template
 
 ## EJS Template Variables
 
@@ -174,8 +156,8 @@ The system uses EJS templates with these variables:
 # Run all tests
 pnpm test
 
-# Test specific framework
-cd frameworks/react-cra && pnpm test
+# Test specific package
+cd packages/create && pnpm test
 
 # Test with coverage
 pnpm test:coverage
@@ -196,7 +178,6 @@ pnpm test:coverage
 - **Node Version**: Requires Node.js (see .nvmrc if available)
 - **Build System**: TypeScript compilation, Vite for UI
 - **Testing**: Vitest for unit tests, ESLint for linting
-- **Versioning**: All packages share the same version (currently 0.16.5)
 
 ## Important Files
 

CONTRIBUTING.md

@@ -14,7 +14,7 @@
 - Run the build
   - `pnpm build`
 - Build an example app with the builder:
-  - `node [root of the monorepo]/cli/create-tsrouter-app/dist/index.js app-js`
+  - `node [root of the monorepo]/packages/cli/dist/index.js create app-name`
   - Do not attempt to build an app within the monorepo because the dependencies will be hoisted into the monorepo.
 - Run `pnpm dev` at that top level to build everything in watch mode
 - Run `pnpm build` and `pnpm test` to make sure the changes work
@@ -27,15 +27,17 @@ When testing use `pnpm dev` at the top level of the `create-tsrouter-app` repo.
 Then from a peer directory use:
 
 ```bash
-node ../create-tsrouter-app/cli/create-start-app/dist/index.js
-```
+# Using the main CLI
+node ../create-tsrouter-app/packages/cli/dist/index.js create my-app
 
-To test `create-start-app` (or any of the CLIs).
+# Or using a deprecated alias (will show deprecation warning)
+node ../create-tsrouter-app/cli-aliases/create-start-app/dist/index.js my-app
+```
 
 You can also do:
 
 ```bash
-npm_config_user_agent=pnpm node ../create-tsrouter-app/cli/create-start-app/dist/index.js
+npm_config_user_agent=pnpm node ../create-tsrouter-app/packages/cli/dist/index.js create my-app
 ```
 
 If you want to specify a package manager.
@@ -49,7 +51,7 @@ The `--dev-watch` command provides real-time feedback while developing framework
 To start developing a framework with live rebuilding:
 
 ```bash
-node [root of the monorepo]/cli/create-tsrouter-app/dist/index.js --dev-watch ./frameworks/react-cra test-app --template typescript --package-manager bun --tailwind --add-ons shadcn
+node [root of the monorepo]/packages/cli/dist/index.js create --dev-watch ./packages/create/src/frameworks/react-cra test-app --template typescript --package-manager bun --tailwind --add-ons shadcn
 ```
 
 This command will:
@@ -64,7 +66,7 @@ This command will:
 
    ```bash
    pnpm dev # Build in watch mode
-   rm -rf test-app && node cli/create-tsrouter-app/dist/index.js --dev-watch ./frameworks/react-cra test-app --template typescript --package-manager bun --tailwind --add-ons shadcn
+   rm -rf test-app && node packages/cli/dist/index.js create --dev-watch ./packages/create/src/frameworks/react-cra test-app --template typescript --package-manager bun --tailwind --add-ons shadcn
    cd my-test-app && pnpm run dev # run the tsrouter vite app
    ```
 
@@ -79,25 +81,25 @@ Create the add-on or starter using the CLI. Then serve it locally from the proje
 Then, when creating apps with add-ons:
 
 ```bash
-node [root of the monorepo]/cli/create-tsrouter-app/dist/index.js app-js --add-ons http://localhost:9080/add-on.json
+node [root of the monorepo]/packages/cli/dist/index.js create app-name --add-ons http://localhost:9080/add-on.json
 ```
 
 And when creating apps with a starter:
 
 ```bash
-node [root of the monorepo]/cli/create-tsrouter-app/dist/index.js app-js --starter http://localhost:9080/starter.json
+node [root of the monorepo]/packages/cli/dist/index.js create app-name --starter http://localhost:9080/starter.json
 ```
 
-# Developing on the CTA UI
+# Developing on the Create UI
 
-The CTA UI is somewhat tricky to develop on because it's both a web server and a React app. You need to run the CLI in "API" model and then the React app in dev mode, as well as the whole monorepo in watch mode.
+The Create UI is somewhat tricky to develop on because it's both a web server and a React app. You need to run the CLI in "API" model and then the React app in dev mode, as well as the whole monorepo in watch mode.
 
 ## Starting the API Server
 
 Let's start off with how to run the CLI in "API" mode. Here we are running the CLI in an empty directory in app creation mode.
 
 ```bash
-CTA_DISABLE_UI=true node ../create-tsrouter-app/cli/create-tsrouter-app/dist/index.js --ui
+CTA_DISABLE_UI=true node ../create-tsrouter-app/packages/cli/dist/index.js create --ui
 ```
 
 If this is working you will see the following output:
@@ -111,15 +113,15 @@ Note that it say "Create TanStack **API**" and not "Create TanStack **App**". Th
 Here is the same command for the `add` mode:
 
 ```bash
-CTA_DISABLE_UI=true node ../create-tsrouter-app/cli/create-tsrouter-app/dist/index.js add --ui
+CTA_DISABLE_UI=true node ../create-tsrouter-app/packages/cli/dist/index.js add --ui
 ```
 
 ## Starting the React App
 
 Now that we have the API server running, we can start the React app in dev mode.
 
 ```bash
-cd packages/cta-ui
+cd packages/create-ui
 pnpm dev:ui
 ```
 
@@ -133,6 +135,6 @@ At the top level of the monorepo, run the following command to start the build i
 pnpm dev
 ```
 
-This will build the monorepo and watch for changes in any of the libraries. (It will **not** build changes for the React app within the `cta-ui` package.)
+This will build the monorepo and watch for changes in any of the libraries. (It will **not** build changes for the React app within the `create-ui` package.)
 
-This is important because you might need to change API endpoints in the CTA library, or in the engine. If you do make those kinds of changes then the you will need to re-run the CLI in "API" mode to pick up the changes.
+This is important because you might need to change API endpoints in the CLI library, or in the engine. If you do make those kinds of changes then the you will need to re-run the CLI in "API" mode to pick up the changes.