diff --git a/packages/create-rstack/README.md b/packages/create-rstack/README.md
index e41dc6d7..56d4f8a4 100644
--- a/packages/create-rstack/README.md
+++ b/packages/create-rstack/README.md
@@ -50,6 +50,7 @@ npx create-rstack --dir my-project --template app-vanilla-ts --no-git
 - `lib-solid-ts` - TypeScript Solid library
 - `doc` - Basic documentation site
 - `doc-i18n` - Multilingual documentation site
+- `pnpm` - pnpm workspace
 - `turborepo` - Turborepo
 - `nx` - Nx
 
diff --git a/packages/create-rstack/src/index.ts b/packages/create-rstack/src/index.ts
index a925e197..26a9a661 100644
--- a/packages/create-rstack/src/index.ts
+++ b/packages/create-rstack/src/index.ts
@@ -43,6 +43,7 @@ const templateNames = [
   'lib-solid-ts',
   'doc',
   'doc-i18n',
+  'pnpm',
   'turborepo',
   'nx',
 ];
@@ -57,7 +58,7 @@ const resolveTemplateName = (template: string): string => {
 
 const getTemplateName = async ({ template }: Argv): Promise<string> => {
   if (typeof template === 'string') {
-    if (/^(?:app|lib|doc|turborepo|nx)(?:-|$)/u.test(template)) {
+    if (/^(?:app|lib|doc|pnpm|turborepo|nx)(?:-|$)/u.test(template)) {
       return resolveTemplateName(template);
     }
 
@@ -81,6 +82,7 @@ const getTemplateName = async ({ template }: Argv): Promise<string> => {
       await select({
         message: 'Select monorepo tool',
         options: [
+          { value: 'pnpm', label: 'pnpm workspace' },
           { value: 'turborepo', label: 'Turborepo', hint: 'pnpm' },
           { value: 'nx', label: 'Nx', hint: 'pnpm' },
         ],
@@ -239,6 +241,6 @@ await create({
   builtinTools: [],
   getTemplateName,
   getPackageManager: ({ templateName }) =>
-    ['turborepo', 'nx'].includes(templateName) ? 'pnpm' : undefined,
+    ['pnpm', 'turborepo', 'nx'].includes(templateName) ? 'pnpm' : undefined,
   onGitResolved: injectStagedSetup,
 });
diff --git a/packages/create-rstack/template-pnpm/README.md b/packages/create-rstack/template-pnpm/README.md
new file mode 100644
index 00000000..7ee61969
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/README.md
@@ -0,0 +1,33 @@
+# pnpm workspace + Rstack
+
+## Setup
+
+```bash
+pnpm install
+```
+
+## Structure
+
+- `apps/web`: React application.
+- `packages/ui`: Shared UI components.
+- `tsconfig.base.json`: Shared TypeScript configuration.
+
+## Scripts
+
+Run from the repository root:
+
+- `pnpm run build`: Build all packages in dependency order.
+- `pnpm run dev`: Build shared packages, then start the web app and watch the shared UI package.
+- `pnpm run test`: Build shared packages, then run tests.
+- `pnpm run check`: Run lint, formatting, and TypeScript checks.
+- `pnpm run lint`: Lint the workspace.
+- `pnpm run format`: Format the workspace.
+
+Run `pnpm run build` before `pnpm run check`.
+
+Use `pnpm --filter <package-name> <script>` to run a script in one package.
+
+## Learn more
+
+- [Rstack CLI monorepo guide](https://rstack.rs/guide/monorepo)
+- [pnpm workspace documentation](https://pnpm.io/workspaces)
diff --git a/packages/create-rstack/template-pnpm/apps/web/package.json b/packages/create-rstack/template-pnpm/apps/web/package.json
new file mode 100644
index 00000000..b322570c
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "web",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "build": "rs build",
+    "dev": "rs dev",
+    "preview": "rs preview",
+    "test": "rs test"
+  },
+  "dependencies": {
+    "@repo/ui": "workspace:^",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0"
+  },
+  "devDependencies": {
+    "@rsbuild/plugin-react": "^2.1.1",
+    "@testing-library/dom": "^10.4.2",
+    "@testing-library/jest-dom": "^7.0.1",
+    "@testing-library/react": "^16.3.3",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
+    "happy-dom": "^21.0.1"
+  }
+}
diff --git a/packages/create-rstack/template-pnpm/apps/web/rstack.config.ts b/packages/create-rstack/template-pnpm/apps/web/rstack.config.ts
new file mode 100644
index 00000000..972b7f4c
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/rstack.config.ts
@@ -0,0 +1,13 @@
+// Configuration guide: https://rstack.rs/config
+import { define } from 'rstack';
+
+define.app(async () => {
+  const { pluginReact } = await import('@rsbuild/plugin-react');
+  return {
+    plugins: [pluginReact()],
+  };
+});
+
+define.test({
+  setupFiles: ['./tests/rstest.setup.ts'],
+});
diff --git a/packages/create-rstack/template-pnpm/apps/web/src/App.tsx b/packages/create-rstack/template-pnpm/apps/web/src/App.tsx
new file mode 100644
index 00000000..232765c2
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/src/App.tsx
@@ -0,0 +1,17 @@
+import { Button } from '@repo/ui/button';
+
+export function App() {
+  return (
+    <main>
+      <h1>Web</h1>
+      <p>pnpm workspace + Rstack CLI</p>
+      <p>Edit apps/web/src/App.tsx to get started.</p>
+      <Button onClick={() => window.alert('Hello from @repo/ui!')}>
+        Shared button
+      </Button>
+      <nav>
+        <a href="https://rstack.rs">Rstack documentation</a>
+      </nav>
+    </main>
+  );
+}
diff --git a/packages/create-rstack/template-pnpm/apps/web/src/index.css b/packages/create-rstack/template-pnpm/apps/web/src/index.css
new file mode 100644
index 00000000..6da54671
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/src/index.css
@@ -0,0 +1,27 @@
+body {
+  margin: 0;
+  font-family: system-ui, sans-serif;
+  color: #202124;
+  background: #f8f9fa;
+}
+
+main {
+  max-width: 640px;
+  margin: 15vh auto;
+  padding: 24px;
+}
+
+button {
+  padding: 10px 16px;
+  border: 0;
+  border-radius: 8px;
+  color: white;
+  background: #5755d9;
+  cursor: pointer;
+}
+
+nav {
+  display: flex;
+  gap: 20px;
+  margin-top: 24px;
+}
diff --git a/packages/create-rstack/template-pnpm/apps/web/src/index.tsx b/packages/create-rstack/template-pnpm/apps/web/src/index.tsx
new file mode 100644
index 00000000..89109467
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/src/index.tsx
@@ -0,0 +1,13 @@
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
+import { App } from './App';
+import './index.css';
+
+const root = document.getElementById('root');
+if (root) {
+  createRoot(root).render(
+    <StrictMode>
+      <App />
+    </StrictMode>,
+  );
+}
diff --git a/packages/create-rstack/template-pnpm/apps/web/tests/app.test.tsx b/packages/create-rstack/template-pnpm/apps/web/tests/app.test.tsx
new file mode 100644
index 00000000..7268227b
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/tests/app.test.tsx
@@ -0,0 +1,11 @@
+import { expect, test } from 'rstack/test';
+import { render, screen } from '@testing-library/react';
+import { App } from '../src/App';
+
+test('renders the web app with the shared UI package', () => {
+  render(<App />);
+  expect(screen.getByRole('heading', { name: 'Web' })).toBeInTheDocument();
+  expect(
+    screen.getByRole('button', { name: 'Shared button' }),
+  ).toBeInTheDocument();
+});
diff --git a/packages/create-rstack/template-pnpm/apps/web/tests/rstest.setup.ts b/packages/create-rstack/template-pnpm/apps/web/tests/rstest.setup.ts
new file mode 100644
index 00000000..93951b15
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/tests/rstest.setup.ts
@@ -0,0 +1,4 @@
+import { expect } from 'rstack/test';
+import * as jestDomMatchers from '@testing-library/jest-dom/matchers';
+
+expect.extend(jestDomMatchers);
diff --git a/packages/create-rstack/template-pnpm/apps/web/tests/tsconfig.json b/packages/create-rstack/template-pnpm/apps/web/tests/tsconfig.json
new file mode 100644
index 00000000..3eb5dc12
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/tests/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["rstack/types", "node", "@testing-library/jest-dom"]
+  },
+  "include": ["./"]
+}
diff --git a/packages/create-rstack/template-pnpm/apps/web/tsconfig.json b/packages/create-rstack/template-pnpm/apps/web/tsconfig.json
new file mode 100644
index 00000000..1ccf2b9a
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/apps/web/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["src", "rstack.config.ts"]
+}
diff --git a/packages/create-rstack/template-pnpm/gitignore b/packages/create-rstack/template-pnpm/gitignore
new file mode 100644
index 00000000..38d7344c
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/gitignore
@@ -0,0 +1,13 @@
+# Local
+.DS_Store
+*.local
+*.log*
+
+# Dist
+node_modules
+dist/
+
+# IDE
+.vscode/*
+!.vscode/extensions.json
+.idea
diff --git a/packages/create-rstack/template-pnpm/package.json b/packages/create-rstack/template-pnpm/package.json
new file mode 100644
index 00000000..1f0268ef
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "rstack-pnpm",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "build": "pnpm -r build",
+    "check": "rs check --type-check",
+    "dev": "pnpm --filter \"./packages/**\" build && pnpm -r --parallel dev",
+    "format": "rs fmt",
+    "lint": "rs lint",
+    "test": "pnpm --filter \"./packages/**\" build && pnpm -r test"
+  },
+  "devDependencies": {
+    "@types/node": "^26.6.5",
+    "rstack": "^0.8.4",
+    "typescript": "^7.0.2"
+  },
+  "packageManager": "pnpm@12.11.2"
+}
diff --git a/packages/create-rstack/template-pnpm/packages/ui/package.json b/packages/create-rstack/template-pnpm/packages/ui/package.json
new file mode 100644
index 00000000..5c6788d7
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/packages/ui/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "@repo/ui",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    "./button": {
+      "types": "./dist/button.d.ts",
+      "default": "./dist/button.js"
+    }
+  },
+  "scripts": {
+    "build": "rs lib",
+    "dev": "rs lib --watch --no-clean",
+    "test": "rs test"
+  },
+  "dependencies": {
+    "react": "^19.3.0"
+  },
+  "devDependencies": {
+    "@rsbuild/plugin-react": "^2.1.1",
+    "@testing-library/dom": "^10.4.2",
+    "@testing-library/jest-dom": "^7.0.1",
+    "@testing-library/react": "^16.3.3",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
+    "happy-dom": "^21.0.1",
+    "react-dom": "^19.3.0"
+  }
+}
diff --git a/packages/create-rstack/template-pnpm/packages/ui/rstack.config.ts b/packages/create-rstack/template-pnpm/packages/ui/rstack.config.ts
new file mode 100644
index 00000000..70438041
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/packages/ui/rstack.config.ts
@@ -0,0 +1,20 @@
+// Configuration guide: https://rstack.rs/config
+import { define } from 'rstack';
+
+define.lib(async () => {
+  const { pluginReact } = await import('@rsbuild/plugin-react');
+  return {
+    dts: true,
+    source: {
+      entry: { button: './src/button.tsx' },
+    },
+    output: {
+      target: 'web',
+    },
+    plugins: [pluginReact()],
+  };
+});
+
+define.test({
+  setupFiles: ['./tests/rstest.setup.ts'],
+});
diff --git a/packages/create-rstack/template-pnpm/packages/ui/src/button.tsx b/packages/create-rstack/template-pnpm/packages/ui/src/button.tsx
new file mode 100644
index 00000000..19db4f2a
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/packages/ui/src/button.tsx
@@ -0,0 +1,8 @@
+import type { ComponentProps } from 'react';
+
+export function Button({
+  type = 'button',
+  ...props
+}: ComponentProps<'button'>) {
+  return <button type={type} {...props} />;
+}
diff --git a/packages/create-rstack/template-pnpm/packages/ui/tests/button.test.tsx b/packages/create-rstack/template-pnpm/packages/ui/tests/button.test.tsx
new file mode 100644
index 00000000..870e5bc4
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/packages/ui/tests/button.test.tsx
@@ -0,0 +1,18 @@
+import { expect, test } from 'rstack/test';
+import { render, screen } from '@testing-library/react';
+import { Button } from '../src/button';
+
+test('defaults to a non-submitting button and forwards props', () => {
+  render(<Button disabled>Save</Button>);
+  const button = screen.getByRole('button', { name: 'Save' });
+  expect(button).toHaveAttribute('type', 'button');
+  expect(button).toBeDisabled();
+});
+
+test('allows a submit button', () => {
+  render(<Button type="submit">Submit</Button>);
+  expect(screen.getByRole('button', { name: 'Submit' })).toHaveAttribute(
+    'type',
+    'submit',
+  );
+});
diff --git a/packages/create-rstack/template-pnpm/packages/ui/tests/rstest.setup.ts b/packages/create-rstack/template-pnpm/packages/ui/tests/rstest.setup.ts
new file mode 100644
index 00000000..93951b15
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/packages/ui/tests/rstest.setup.ts
@@ -0,0 +1,4 @@
+import { expect } from 'rstack/test';
+import * as jestDomMatchers from '@testing-library/jest-dom/matchers';
+
+expect.extend(jestDomMatchers);
diff --git a/packages/create-rstack/template-pnpm/packages/ui/tests/tsconfig.json b/packages/create-rstack/template-pnpm/packages/ui/tests/tsconfig.json
new file mode 100644
index 00000000..1f0e1fcb
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/packages/ui/tests/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "types": ["rstack/types", "node", "@testing-library/jest-dom"]
+  },
+  "include": ["./", "../rstack.config.ts"]
+}
diff --git a/packages/create-rstack/template-pnpm/packages/ui/tsconfig.json b/packages/create-rstack/template-pnpm/packages/ui/tsconfig.json
new file mode 100644
index 00000000..da8829fe
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/packages/ui/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "src"
+  },
+  "include": ["src"]
+}
diff --git a/packages/create-rstack/template-pnpm/pnpm-workspace.yaml b/packages/create-rstack/template-pnpm/pnpm-workspace.yaml
new file mode 100644
index 00000000..286cf7f5
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  - apps/*
+  - packages/*
diff --git a/packages/create-rstack/template-pnpm/rstack.config.ts b/packages/create-rstack/template-pnpm/rstack.config.ts
new file mode 100644
index 00000000..930096fa
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/rstack.config.ts
@@ -0,0 +1,29 @@
+// Configuration guide: https://rstack.rs/config
+import { define } from 'rstack';
+
+define.lint(({ js, ts, reactPlugin, reactHooksPlugin, rstestPlugin }) => [
+  js.configs.recommended,
+  ts.configs.recommendedTypeChecked,
+  reactPlugin.configs.recommended,
+  reactHooksPlugin.configs.recommended,
+  {
+    files: ['**/*.{test,spec}.?(c|m)[jt]s?(x)'],
+    ...rstestPlugin.configs.recommended,
+  },
+  {
+    languageOptions: {
+      parserOptions: {
+        project: [
+          './apps/*/tsconfig.json',
+          './apps/*/tests/tsconfig.json',
+          './packages/*/tsconfig.json',
+          './packages/*/tests/tsconfig.json',
+        ],
+      },
+    },
+  },
+]);
+
+define.fmt({
+  singleQuote: true,
+});
diff --git a/packages/create-rstack/template-pnpm/tsconfig.base.json b/packages/create-rstack/template-pnpm/tsconfig.base.json
new file mode 100644
index 00000000..d57fde3b
--- /dev/null
+++ b/packages/create-rstack/template-pnpm/tsconfig.base.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "strict": true,
+    "noEmit": true,
+    "skipLibCheck": true,
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "resolveJsonModule": true,
+    "allowImportingTsExtensions": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "types": ["rstack/types", "node"]
+  }
+}
diff --git a/packages/create-rstack/tests/create.test.ts b/packages/create-rstack/tests/create.test.ts
index 9200a995..a65f7d53 100644
--- a/packages/create-rstack/tests/create.test.ts
+++ b/packages/create-rstack/tests/create.test.ts
@@ -298,7 +298,7 @@ test.each(docTemplates)(
   },
 );
 
-test.each(['turborepo', 'nx'])(
+test.each(['pnpm', 'turborepo', 'nx'])(
   'creates the %s template with pnpm when invoked using npm',
   async (template) => {
     const projectDirectory = await createProject(template, {
@@ -314,14 +314,16 @@ test.each(['turborepo', 'nx'])(
     expect(appPackage.dependencies?.['@repo/ui']).toBe('workspace:^');
     await expectFiles(projectDirectory, [
       'pnpm-workspace.yaml',
-      template === 'nx' ? 'nx.json' : 'turbo.json',
+      ...(template === 'pnpm'
+        ? []
+        : [template === 'nx' ? 'nx.json' : 'turbo.json']),
       'apps/web/src/index.tsx',
       'packages/ui/src/button.tsx',
     ]);
   },
 );
 
-test.each(['turborepo', 'nx'])(
+test.each(['pnpm', 'turborepo', 'nx'])(
   'configures %s when Git initialization is disabled',
   async (template) => {
     const projectDirectory = await createProject(template, {
diff --git a/website/docs/en/guide/quick-start.mdx b/website/docs/en/guide/quick-start.mdx
index 197e1b3a..4aeedd48 100644
--- a/website/docs/en/guide/quick-start.mdx
+++ b/website/docs/en/guide/quick-start.mdx
@@ -54,7 +54,7 @@ When creating a project, choose from the following templates provided by `create
 | Web application    | Vanilla JavaScript, React, Preact, Vue, Lit, Svelte, Solid |
 | Library            | Node.js, React, Vue, Svelte, Solid                         |
 | Documentation site | Single language, multilingual                              |
-| Monorepo           | Turborepo, Nx                                              |
+| Monorepo           | pnpm workspace, Turborepo, Nx                              |
 
 All application and library templates are available in both JavaScript and TypeScript.
 
@@ -102,7 +102,7 @@ Options:
   --package-name <name>     specify the package name
   --template-version <ver>  specify the npm template version
 
-Available templates: app-vanilla, app-vanilla-ts, app-react, app-react-ts, app-preact, app-preact-ts, app-vue, app-vue-ts, app-lit, app-lit-ts, app-svelte, app-svelte-ts, app-solid, app-solid-ts, lib-node, lib-node-ts, lib-react, lib-react-ts, lib-vue, lib-vue-ts, lib-svelte, lib-svelte-ts, lib-solid, lib-solid-ts, doc, doc-i18n, turborepo, nx
+Available templates: app-vanilla, app-vanilla-ts, app-react, app-react-ts, app-preact, app-preact-ts, app-vue, app-vue-ts, app-lit, app-lit-ts, app-svelte, app-svelte-ts, app-solid, app-solid-ts, lib-node, lib-node-ts, lib-react, lib-react-ts, lib-vue, lib-vue-ts, lib-svelte, lib-svelte-ts, lib-solid, lib-solid-ts, doc, doc-i18n, pnpm, turborepo, nx
 ```
 
 ## Migrate an existing project
diff --git a/website/docs/zh/guide/quick-start.mdx b/website/docs/zh/guide/quick-start.mdx
index 65053493..9fda50f3 100644
--- a/website/docs/zh/guide/quick-start.mdx
+++ b/website/docs/zh/guide/quick-start.mdx
@@ -54,7 +54,7 @@ Rstack CLI 要求 Node.js 20.19.0+ 或 22.12.0+。
 | Web 应用 | 原生 JavaScript、React、Preact、Vue、Lit、Svelte、Solid |
 | 库       | Node.js、React、Vue、Svelte、Solid                      |
 | 文档站点 | 单语言、多语言                                          |
-| Monorepo | Turborepo, Nx                                           |
+| Monorepo | pnpm workspace, Turborepo, Nx                           |
 
 所有应用和库模板均提供 JavaScript 和 TypeScript 版本。
 
@@ -102,7 +102,7 @@ Options:
   --package-name <name>     specify the package name
   --template-version <ver>  specify the npm template version
 
-Available templates: app-vanilla, app-vanilla-ts, app-react, app-react-ts, app-preact, app-preact-ts, app-vue, app-vue-ts, app-lit, app-lit-ts, app-svelte, app-svelte-ts, app-solid, app-solid-ts, lib-node, lib-node-ts, lib-react, lib-react-ts, lib-vue, lib-vue-ts, lib-svelte, lib-svelte-ts, lib-solid, lib-solid-ts, doc, doc-i18n, turborepo, nx
+Available templates: app-vanilla, app-vanilla-ts, app-react, app-react-ts, app-preact, app-preact-ts, app-vue, app-vue-ts, app-lit, app-lit-ts, app-svelte, app-svelte-ts, app-solid, app-solid-ts, lib-node, lib-node-ts, lib-react, lib-react-ts, lib-vue, lib-vue-ts, lib-svelte, lib-svelte-ts, lib-solid, lib-solid-ts, doc, doc-i18n, pnpm, turborepo, nx
 ```
 
 ## 迁移现有项目 \{#migrate-an-existing-project}