swallowkit 1.1.2 → 2.0.0-alpha.10

package/README.ja.md

@@ -7,11 +7,11 @@
 
 [English](./README.md) | 日本語
 
-Next.js と Azure のための、スキーマ駆動アプリケーション開発ツールキットです。
+Next.js または React を使って Azure 上にアプリを構築する、スキーマ駆動開発ツールキットです。
 
 SwallowKit は、共有された Zod スキーマを中心にして、保守しやすいフルスタックアプリケーションを Azure 上に構築するための scaffolding ツールです。1 つのスキーマ定義から、フロントエンドフォーム、BFF ルート、Azure Functions バックエンド、OpenAPI、インフラ定義、AI エージェント向けのプロジェクトメタデータなどを生成できます。
 
-フロントエンド、バックエンド、データベース、バリデーション、API 契約、デプロイ構成がばらばらになりがちな Next.js + Azure アプリケーション開発を、明示的な構成で整理することを目的としています。
+フロントエンド、バックエンド、データベース、バリデーション、API 契約、デプロイ構成がばらばらになりがちな Next.js / React + Azure アプリケーション開発を、明示的な構成で整理することを目的としています。
 
 ## 🎯 なぜ SwallowKit か
 
@@ -35,7 +35,7 @@ AI はアプリケーションコードをすばやく生成できます。フ
 ## ✨ 主な機能
 
 - **Zod スキーマを中心にした型定義** とバリデーション共有
-- **Next.js、BFF ルート、Azure Functions、UI コンポーネントの CRUD scaffolding**
+- **Next.js / React、BFF ルート、Azure Functions、UI コンポーネントの CRUD scaffolding**
 - **Bicep による Azure 向けインフラ定義**
 - **複数言語の Azure Functions バックエンド対応**（TypeScript、C#、Python）
 - **ローカル開発支援** とシードデータ
@@ -46,7 +46,7 @@ AI はアプリケーションコードをすばやく生成できます。フ
 
 SwallowKit は、次のような構成のアプリケーションを主な対象にしています。
 
-- Next.js
+- Next.js、または React + Vite + React Router
 - Azure Static Web Apps
 - Azure Functions
 - Azure Cosmos DB
@@ -58,11 +58,11 @@ SwallowKit は、次のような構成のアプリケーションを主な対象
 ```
 ブラウザー
   |
-Next.js フロントエンド
+Next.js / React フロントエンド（SWA）
   |
-Next.js BFF ルート
+Next.js API Routes / SWA マネージド Functions BFF
   |
-Azure Functions API
+独立 Azure Functions API（SWA にはリンクしない）
   |
 Azure Cosmos DB
 ```
@@ -76,6 +76,7 @@ BFF レイヤーを置くことで、フロントエンドをシンプルに保
 詳しい使い方はドキュメントサイトを参照してください（[English](https://himanago.github.io/swallowkit/en/) もあります）。
 
 - **[はじめる](https://himanago.github.io/swallowkit/ja/getting-started)** - 最初のプロジェクトセットアップ
+- **[React フロントエンド](docs/ja/react-guide.md)** - React SPA、マネージド BFF、開発とデプロイ
 - **[基本概念](https://himanago.github.io/swallowkit/ja/concepts)** - スキーマ中心のアーキテクチャ
 - **[Scaffold ガイド](https://himanago.github.io/swallowkit/ja/scaffold-guide)** - CRUD コード生成
 - **[ローカル開発](https://himanago.github.io/swallowkit/ja/dev-guide)** - Dev サーバー、seeds、モックコネクタ
@@ -94,6 +95,11 @@ npx swallowkit init my-app
 cd my-app
 ```
 
+対話プロンプトで Next.js / React を選択するか、`--frontend react` を指定します。
+React では静的フロントエンドと HTTP 専用のマネージド Functions BFF を SWA に配置します。
+独立 Functions は別途配置し、**SWA にはリンクしません**。
+フロントエンド指定のない既存設定は Next.js のままです。
+
 pnpm 11/12 は `pnpm dlx swallowkit init my-app` で作成し、以後 project 内で `pnpm exec swallowkit …` を使います。`npx` は npm を選択し、`--package-manager npm|pnpm` で明示指定できます。Node.js 22.14 以上が必要です。MCP は選択した manager で意図的に `latest` を参照します。[コマンド・workspace・security の詳細](docs/ja/package-managers.md)を参照してください。
 
 
@@ -146,6 +152,54 @@ SwallowKit は、AI コーディングエージェントがプロジェクト構
 └── .swallowkit/          # SwallowKit プロジェクトメタデータ
 ```
 
+## リリース公開（メンテナー向け）
+
+`v<version>` 形式の Git タグを push すると、`.github/workflows/publish.yml` が
+ビルド、テスト、パッケージ化した consumer の検証を経て公開します。
+Git タグ、`package.json`、`package-lock.json` の両方の version が一致している必要があります。
+
+| バージョンの例 | npm dist-tag |
+| --- | --- |
+| `2.0.0-alpha.1` | `alpha` |
+| `2.0.0-beta.1` | `beta` |
+| `2.0.0-rc.1` などその他のプレリリース | `next` |
+| `2.0.0` | `latest` |
+
+リリース対象の変更をコミットした後、次のようにアルファ版を準備・公開します。
+
+```sh
+npm version 2.0.0-alpha.1
+git push origin HEAD
+git push origin v2.0.0-alpha.1
+```
+
+`npm version` は両方の manifest を更新し、バージョン更新のコミットとタグを作成します。
+以降は `2.0.0-alpha.2`、`2.0.0-beta.1`、`2.0.0` など、公開するバージョンを指定します。
+プレリリースで `latest` は更新されません。
+公開には引き続きリポジトリの `NPM_TOKEN` シークレットが必要です。
+
+公開せずにパイプラインを確認する場合は、バージョンタグを push する前に、
+リリース対象のコミットで **Publish to npm** を手動実行し、**dry-run** を有効にしてください。
+サマリーにはバージョンと npm タグが表示され、公開済みとは表示されません。
+
+リリース用の consumer 検証は pnpm 11・pnpm 12・npm ごとに別のランナーで実行します。
+生成アプリやパッケージキャッシュが公開用ランナーに蓄積しない構成です。
+公開には引き続き、すべての consumer 検証・ビルド・テストの成功が必要です。
+consumer のログと依存関係の監査結果は、検証が失敗した場合もアップロードします。
+
+npm 公開前に失敗し、修正がリリースワークフローだけの場合は、既存の Git タグを
+移動・再作成しないでください。ワークフロー修正をマージした後、`main` から
+**Publish to npm** を実行し、**release-tag** に既存タグ
+（例: `v2.0.0-alpha.1`）を指定して、まず **dry-run** を有効にします。
+タグのコミットは最初に一度だけ解決され、すべての検証と公開で同じコミットを使います。
+成功後に **dry-run** を無効にして再実行すると公開できます。
+GitHub の **Re-run jobs** は古いワークフローを使うため、修正が反映されません。
+パッケージ自体に修正が必要な場合は、新しいバージョンとタグを作成してください。
+
+特定のアルファ版は `npx swallowkit@2.0.0-alpha.1 init my-app --frontend react` で試せます。
+`npx swallowkit@alpha ...` / `npx swallowkit@beta ...` は各チャネルの最新版を使います。
+通常の `npx swallowkit ...` は引き続き `latest` を使います。
+
 ## 🔗 ステータス
 
 SwallowKit は現在開発中です。API、プロジェクト構成、生成されるコードは変更される可能性があります。

package/README.md

@@ -7,11 +7,11 @@
 
 English | [日本語](./README.ja.md)
 
-Schema-driven application scaffolding for Next.js and Azure.
+Schema-driven application scaffolding for Next.js or React on Azure.
 
 SwallowKit helps you build maintainable full-stack applications on Azure by using shared Zod schemas as the source of truth. From one schema definition, it can generate frontend forms, BFF routes, Azure Functions backends, OpenAPI contracts, infrastructure templates, and AI-agent-friendly project metadata.
 
-It is designed for developers who want to build Next.js applications on Azure without letting the frontend, backend, database model, validation rules, and deployment configuration drift apart.
+It is designed for developers who want to build Next.js or React applications on Azure without letting the frontend, backend, database model, validation rules, and deployment configuration drift apart.
 
 ## 🎯 Why SwallowKit?
 
@@ -35,7 +35,7 @@ As the application grows, these layers often drift apart. SwallowKit reduces tha
 ## ✨ What it gives you
 
 - **Shared Zod schemas** as the source of truth
-- **CRUD scaffolding** for Next.js, BFF routes, Azure Functions, and UI components
+- **CRUD scaffolding** for Next.js or React, BFF routes, Azure Functions, and UI components
 - **Azure-ready infrastructure** using Bicep
 - **Multi-language Azure Functions** backends (TypeScript, C#, Python)
 - **Local development helpers** and seed data
@@ -46,7 +46,7 @@ As the application grows, these layers often drift apart. SwallowKit reduces tha
 
 SwallowKit is optimized for applications built with:
 
-- Next.js
+- Next.js, or React + Vite + React Router
 - Azure Static Web Apps
 - Azure Functions
 - Azure Cosmos DB
@@ -58,11 +58,11 @@ The default architecture follows a BFF pattern:
 ```
 Browser
   |
-Next.js frontend
+Next.js or React frontend (SWA)
   |
-Next.js BFF routes
+Next.js API routes or SWA managed Functions BFF
   |
-Azure Functions API
+Independent Azure Functions API (not linked to SWA)
   |
 Azure Cosmos DB
 ```
@@ -76,6 +76,7 @@ The BFF layer keeps frontend code simple while allowing backend services, authen
 Visit the **[SwallowKit Documentation](https://himanago.github.io/swallowkit/)** for the full docs (also available in [日本語](https://himanago.github.io/swallowkit/ja/)).
 
 - **[Getting Started](https://himanago.github.io/swallowkit/en/getting-started)** - First project setup
+- **[React frontend](docs/en/react-guide.md)** - React SPA, managed Functions BFF, development and deployment
 - **[Core Concepts](https://himanago.github.io/swallowkit/en/concepts)** - Schema-centric architecture
 - **[Scaffold Guide](https://himanago.github.io/swallowkit/en/scaffold-guide)** - CRUD code generation
 - **[Local Development](https://himanago.github.io/swallowkit/en/dev-guide)** - Dev server, seeds, mock connectors
@@ -94,6 +95,11 @@ npx swallowkit init my-app
 cd my-app
 ```
 
+Choose Next.js or React in the wizard, or pass `--frontend react`.
+React deploys static assets and an HTTP-only managed Functions BFF to SWA;
+the standalone Functions backend remains separate and **is never linked to SWA**.
+Existing configurations without a frontend setting retain Next.js.
+
 For pnpm 11/12: bootstrap with `pnpm dlx swallowkit init my-app`, then use `pnpm exec swallowkit …` inside the project. `npx` selects npm; `--package-manager npm|pnpm` overrides detection. Node.js 22.14+ is required. MCP intentionally uses `latest` with the selected package manager. See [commands, workspace setup, and security troubleshooting](docs/en/package-managers.md).
 
 
@@ -146,6 +152,54 @@ The goal is to make AI-assisted development safer by giving agents explicit arch
 └── .swallowkit/          # SwallowKit project metadata
 ```
 
+## Publishing releases (maintainers)
+
+Pushing a `v<version>` Git tag runs `.github/workflows/publish.yml`, including
+the build, tests, and packed-consumer release gate. The tag, `package.json`,
+and both version fields in `package-lock.json` must match.
+
+| Version example | npm dist-tag |
+| --- | --- |
+| `2.0.0-alpha.1` | `alpha` |
+| `2.0.0-beta.1` | `beta` |
+| `2.0.0-rc.1` or other prereleases | `next` |
+| `2.0.0` | `latest` |
+
+After committing the release changes, prepare and publish an alpha with:
+
+```sh
+npm version 2.0.0-alpha.1
+git push origin HEAD
+git push origin v2.0.0-alpha.1
+```
+
+`npm version` updates both manifests and creates the version commit and tag.
+For subsequent releases, use an explicit version such as `2.0.0-alpha.2`,
+`2.0.0-beta.1`, or `2.0.0`. Prereleases never update `latest`.
+The workflow still requires the repository's `NPM_TOKEN` secret.
+
+To check the pipeline without publishing, run **Publish to npm** manually on
+the release commit with **dry-run** enabled, before pushing the version tag.
+The summary reports the selected version and npm tag without claiming a publish.
+
+Consumer release gates run on separate runners for pnpm 11, pnpm 12, and npm.
+Their generated applications and package caches do not accumulate on the publish
+runner; publication still requires every gate, the build, and the tests to pass.
+Consumer logs and dependency audits are uploaded even when a gate fails.
+
+If a release failed before npm publication and the fix only changes the release
+workflow, do not move or recreate its Git tag. After merging the workflow fix,
+run **Publish to npm** from `main`, set **release-tag** to the existing tag
+(for example, `v2.0.0-alpha.1`), and enable **dry-run** first. The workflow resolves
+that tag once and checks out the same commit for every gate and for publication.
+After a successful dry run, repeat with **dry-run** disabled to publish.
+GitHub's **Re-run jobs** uses the old workflow revision and will not pick up the fix.
+If the package itself needs changes, create a new version and tag instead.
+
+Try the exact alpha with `npx swallowkit@2.0.0-alpha.1 init my-app --frontend react`,
+or use `npx swallowkit@alpha ...` / `npx swallowkit@beta ...` for the respective
+channel. Plain `npx swallowkit ...` continues to use `latest`.
+
 ## 🔗 Status
 
 SwallowKit is under active development. The API, project structure, and generated output may change.

package/dist/cli/commands/add-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-auth.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/add-auth.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA+CH,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AA8HD,wBAAgB,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CA0C1E;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAclE;AAwBD,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,iBAoJ3D"}
+{"version":3,"file":"add-auth.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/add-auth.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAiDH,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAsJD,wBAAgB,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CA0C1E;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAclE;AAgCD,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,iBAkJ3D"}

package/dist/cli/commands/add-auth.js

@@ -43,6 +43,8 @@ exports.addAuthCommand = addAuthCommand;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const config_1 = require("../../core/config");
+const react_bff_generator_1 = require("../../core/scaffold/react-bff-generator");
+const react_ui_generator_1 = require("../../core/scaffold/react-ui-generator");
 const auth_generator_1 = require("../../core/scaffold/auth-generator");
 const manifest_1 = require("../../core/project/manifest");
 const file_session_1 = require("../../core/operations/file-session");
@@ -87,6 +89,29 @@ function defaultCustomJwtConfig() {
         tokenExpiry: "24h",
     };
 }
+function writeCallFunction(cwd, session, nextSource, auth) {
+    if ((0, config_1.getFrontendFramework)() === "react") {
+        const name = JSON.parse(session.readFile(path.join(cwd, "package.json"))).name;
+        session.writeFile(path.join(cwd, "bff", "src", "lib", "call-function.ts"), (0, react_bff_generator_1.generateReactBffHelper)(name, auth), managedMeta);
+    }
+    else {
+        session.writeFile(path.join(cwd, "lib", "api", "call-function.ts"), nextSource, managedMeta);
+    }
+}
+function writeLoginPage(cwd, session, source) {
+    const react = (0, config_1.getFrontendFramework)() === "react";
+    const destination = react ? path.join(cwd, "src", "pages", "login.tsx") : path.join(cwd, "app", "login", "page.tsx");
+    session.writeFile(destination, react ? (0, react_ui_generator_1.adaptReactPage)(source) : source, managedMeta);
+}
+function writeAuthContext(cwd, session, source) {
+    session.writeFile(path.join(cwd, "lib", "auth", "auth-context.tsx"), (0, config_1.getFrontendFramework)() === "react" ? (0, react_ui_generator_1.adaptReactPage)(source) : source, managedMeta);
+}
+function writeManagedAuthRoute(cwd, session, customJwt) {
+    const name = JSON.parse(session.readFile(path.join(cwd, "package.json"))).name;
+    const sharedName = JSON.parse(session.readFile(path.join(cwd, "shared", "package.json"))).name;
+    session.writeFile(path.join(cwd, "bff", "src", "auth", "index.ts"), (0, react_bff_generator_1.generateReactAuthBff)(name, sharedName, customJwt), managedMeta);
+    session.writeFile(path.join(cwd, "bff", "auth", "function.json"), (0, react_bff_generator_1.generateManagedFunctionConfig)("auth/{action}", ["GET", "POST"], "auth"), managedMeta);
+}
 function setupSwaAuth(cwd, backendLanguage, session, allowedProviders) {
     const providers = normalizeSwaProviders(allowedProviders);
     const helperPath = backendLanguage === "typescript"
@@ -100,23 +125,23 @@ function setupSwaAuth(cwd, backendLanguage, session, allowedProviders) {
             ? (0, auth_generator_1.generateSwaAuthHelperCSharp)()
             : (0, auth_generator_1.generateSwaAuthHelperPython)();
     session.writeFile(helperPath, helper, managedMeta);
-    const callFnPath = path.join(cwd, "lib", "api", "call-function.ts");
-    session.writeFile(callFnPath, (0, auth_generator_1.generateBFFCallFunctionWithSwaAuth)(), managedMeta);
+    writeCallFunction(cwd, session, (0, auth_generator_1.generateBFFCallFunctionWithSwaAuth)(), { provider: "swa" });
     const authDir = path.join(cwd, "lib", "auth");
     session.writeFile(path.join(authDir, "auth-context.tsx"), generateSwaAuthContext(providers), managedMeta);
     updateRootLayoutWithAuthProvider(cwd, session);
-    const loginDir = path.join(cwd, "app", "login");
-    session.writeFile(path.join(loginDir, "page.tsx"), generateSwaLoginPage(providers), managedMeta);
+    writeLoginPage(cwd, session, generateSwaLoginPage(providers));
     updateSwaRouteConfig(cwd, session, providers);
 }
 function setupExternalTokenAuth(cwd, backendLanguage, session) {
     const authDir = path.join(cwd, "lib", "auth");
     writeIfMissing(session, path.join(authDir, "external-token-adapter.ts"), (0, auth_generator_1.generateExternalTokenAdapter)());
     session.writeFile(path.join(authDir, "authenticated-fetch.ts"), (0, auth_generator_1.generateAuthenticatedFetch)(), managedMeta);
-    session.writeFile(path.join(authDir, "auth-context.tsx"), (0, auth_generator_1.generateExternalTokenAuthContext)(), managedMeta);
-    session.writeFile(path.join(cwd, "lib", "api", "call-function.ts"), (0, auth_generator_1.generateBFFCallFunctionWithAuth)(), managedMeta);
-    const meDir = path.join(cwd, "app", "api", "auth", "me");
-    session.writeFile(path.join(meDir, "route.ts"), (0, auth_generator_1.generateExternalTokenBFFMeRoute)(), managedMeta);
+    writeAuthContext(cwd, session, (0, auth_generator_1.generateExternalTokenAuthContext)());
+    writeCallFunction(cwd, session, (0, auth_generator_1.generateBFFCallFunctionWithAuth)(), { provider: "external-token" });
+    if ((0, config_1.getFrontendFramework)() === "react")
+        writeManagedAuthRoute(cwd, session, false);
+    else
+        session.writeFile(path.join(cwd, "app", "api", "auth", "me", "route.ts"), (0, auth_generator_1.generateExternalTokenBFFMeRoute)(), managedMeta);
     updateRootLayoutWithAuthProvider(cwd, session);
     if (backendLanguage === "typescript") {
         const verifier = path.join(cwd, "functions", "src", "auth", "external-token-verifier.ts");
@@ -224,6 +249,16 @@ function addAuthProviderToRootLayout(layout) {
     return updated;
 }
 function updateRootLayoutWithAuthProvider(cwd, session) {
+    if ((0, config_1.getFrontendFramework)() === "react") {
+        const mainPath = path.join(cwd, "src", "main.tsx");
+        const main = session.readFile(mainPath);
+        if (main.includes("<AuthProvider>"))
+            return;
+        if (!main.includes("<App />"))
+            throw new Error("Could not find <App /> in src/main.tsx; cannot install AuthProvider");
+        session.writeFile(mainPath, `import { AuthProvider } from '@/lib/auth/auth-context';\n${main.replace("<App />", "<AuthProvider><App /></AuthProvider>")}`, extensionMeta);
+        return;
+    }
     const layoutPath = path.join(cwd, "app", "layout.tsx");
     if (!session.fileExists(layoutPath)) {
         throw new Error("app/layout.tsx was not found; cannot install AuthProvider");
@@ -332,24 +367,22 @@ async function addAuthCommand(options) {
     generateBFFAuth(cwd, projectName, sharedPackageName, session);
     // 4. Generate proxy
     console.log("\n  Generating proxy...");
-    const proxyPath = path.join(cwd, "proxy.ts");
-    session.writeFile(proxyPath, (0, auth_generator_1.generateProxy)(projectName), managedMeta);
-    console.log(` Created: proxy.ts`);
+    if ((0, config_1.getFrontendFramework)() === "nextjs") {
+        const proxyPath = path.join(cwd, "proxy.ts");
+        session.writeFile(proxyPath, (0, auth_generator_1.generateProxy)(projectName), managedMeta);
+        console.log(` Created: proxy.ts`);
+    }
     // 5. Generate login page
     console.log("\n Generating login page...");
-    const loginDir = path.join(cwd, "app", "login");
-    session.writeFile(path.join(loginDir, "page.tsx"), (0, auth_generator_1.generateLoginPage)(), managedMeta);
-    console.log(` Created: app/login/page.tsx`);
+    writeLoginPage(cwd, session, (0, auth_generator_1.generateLoginPage)());
     // 6. Generate auth context
     console.log("\n Generating auth context...");
-    const authLibDir = path.join(cwd, "lib", "auth");
-    session.writeFile(path.join(authLibDir, "auth-context.tsx"), (0, auth_generator_1.generateAuthContext)(), managedMeta);
+    writeAuthContext(cwd, session, (0, auth_generator_1.generateAuthContext)());
     console.log(`✅ Created: lib/auth/auth-context.tsx`);
     // 7. Update callFunction with auth support
     console.log("\n Updating callFunction with auth support...");
-    const callFnPath = path.join(cwd, "lib", "api", "call-function.ts");
-    session.writeFile(callFnPath, (0, auth_generator_1.generateBFFCallFunctionWithAuth)(), managedMeta);
-    console.log(` Updated: lib/api/call-function.ts`);
+    writeCallFunction(cwd, session, (0, auth_generator_1.generateBFFCallFunctionWithAuth)(), { provider: "custom-jwt" });
+    console.log(` Updated: ${(0, config_1.getFrontendFramework)() === "react" ? "bff/src/lib" : "lib/api"}/call-function.ts`);
     // 8. Update swallowkit.config.js
     console.log("\n Updating configuration...");
     updateConfigWithAuth(cwd, provider, customJwtConfig, session);
@@ -358,7 +391,7 @@ async function addAuthCommand(options) {
     updateEnvironmentFiles(cwd, session);
     // 10. Install dependencies
     console.log("\n Installing auth dependencies...");
-    await installAuthDependencies(cwd, backendLanguage, rdbProvider, session);
+    installAuthDependenciesSync(cwd, backendLanguage, rdbProvider, session);
     await finalize();
     console.log("\n Authentication setup complete!");
     console.log("\n Next steps:");
@@ -395,7 +428,8 @@ function updateConfigWithNamedScheme(cwd, scheme, provider, session, allowedProv
     var _a, _b;
     const jsPath = path.join(cwd, "swallowkit.config.js");
     const jsonPath = path.join(cwd, "swallowkit.config.json");
-    const configPath = session.fileExists(jsPath) ? jsPath : jsonPath;
+    // Match loadConfig precedence: swallowkit.config.json wins when both files exist.
+    const configPath = session.fileExists(jsonPath) ? jsonPath : jsPath;
     if (!session.fileExists(configPath))
         throw new Error("swallowkit.config.js or swallowkit.config.json is required");
     const swaProviders = provider === "swa" ? normalizeSwaProviders(allowedProviders) : undefined;
@@ -451,6 +485,11 @@ function addNamedScheme(cwd, scheme, provider, language, session, allowedProvide
     // Validate/update config before creating files, so duplicate names stop safely.
     updateConfigWithNamedScheme(cwd, scheme, provider, session, allowedProviders);
     const slug = scheme.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/_/g, "-").toLowerCase();
+    if (provider === "custom-jwt") {
+        // The scheme's JWT helper needs the same token/password/driver packages as single-provider custom-jwt.
+        const connector = (0, config_1.getConnectorDefinition)(defaultCustomJwtConfig().userConnector);
+        installAuthDependenciesSync(cwd, language, connector?.provider ?? "mysql", session);
+    }
     if (language === "typescript") {
         const dir = path.join(cwd, "functions", "src", "auth", "schemes", slug);
         if (provider === "external-token")
@@ -482,13 +521,21 @@ function addNamedScheme(cwd, scheme, provider, language, session, allowedProvide
     if (provider === "external-token") {
         writeIfMissing(session, path.join(clientDir, "token-adapter.ts"), (0, auth_generator_1.generateExternalTokenAdapter)());
         writeIfMissing(session, path.join(clientDir, "authenticated-fetch.ts"), (0, auth_generator_1.generateAuthenticatedFetch)().replace("'./external-token-adapter'", "'./token-adapter'"));
-        writeIfMissing(session, path.join(clientDir, "auth-context.tsx"), (0, auth_generator_1.generateExternalTokenAuthContext)().replace(/external-token-adapter/g, "token-adapter"));
+        const source = (0, auth_generator_1.generateExternalTokenAuthContext)().replace(/external-token-adapter/g, "token-adapter");
+        writeIfMissing(session, path.join(clientDir, "auth-context.tsx"), (0, config_1.getFrontendFramework)() === "react" ? (0, react_ui_generator_1.adaptReactPage)(source) : source);
     }
     else if (provider === "swa") {
         writeIfMissing(session, path.join(clientDir, "auth-context.tsx"), generateSwaAuthContext(allowedProviders));
     }
     else if (provider === "custom-jwt") {
-        writeIfMissing(session, path.join(clientDir, "auth-context.tsx"), (0, auth_generator_1.generateAuthContext)());
+        writeIfMissing(session, path.join(clientDir, "auth-context.tsx"), (0, config_1.getFrontendFramework)() === "react" ? (0, react_ui_generator_1.adaptReactPage)((0, auth_generator_1.generateAuthContext)()) : (0, auth_generator_1.generateAuthContext)());
+    }
+    if ((0, config_1.getFrontendFramework)() === "react") {
+        const existing = (0, config_1.getValidatedFullConfig)().auth;
+        writeCallFunction(cwd, session, "", {
+            ...existing, schemes: { ...existing?.schemes, [scheme]: { provider } },
+        });
+        return;
     }
     const callFunctionPath = path.join(cwd, "lib", "api", "call-function.ts");
     if (!session.fileExists(callFunctionPath))
@@ -599,9 +646,15 @@ function generateFunctionsAuth(cwd, backendLanguage, sharedPackageName, config,
         const functionAppPath = path.join(functionsDir, "function_app.py");
         if (session.fileExists(functionAppPath)) {
             const content = session.readFile(functionAppPath);
-            const authImport = "from blueprints.auth import bp as auth_bp";
+            const authImport = "from blueprints.auth import auth_bp";
             const authRegister = "app.register_blueprint(auth_bp)";
-            if (!content.includes(authImport)) {
+            // Earlier releases imported a non-existent `bp`; repair it in place when re-running.
+            const legacyImport = "from blueprints.auth import bp as auth_bp";
+            if (content.includes(legacyImport)) {
+                session.writeFile(functionAppPath, content.replace(legacyImport, authImport), extensionMeta);
+                console.log(` Updated: functions/function_app.py (fixed auth blueprint import)`);
+            }
+            else if (!content.includes(authImport)) {
                 const marker = "# SwallowKit scaffold registrations";
                 if (content.includes(marker)) {
                     const updated = content.replace(marker, `${authImport}\n${authRegister}\n${marker}`);
@@ -613,6 +666,10 @@ function generateFunctionsAuth(cwd, backendLanguage, sharedPackageName, config,
     }
 }
 function generateBFFAuth(cwd, projectName, sharedPackageName, session) {
+    if ((0, config_1.getFrontendFramework)() === "react") {
+        writeManagedAuthRoute(cwd, session, true);
+        return;
+    }
     const authApiDir = path.join(cwd, "app", "api", "auth");
     // Login route
     const loginDir = path.join(authApiDir, "login");
@@ -628,6 +685,24 @@ function generateBFFAuth(cwd, projectName, sharedPackageName, session) {
     console.log(` Created: app/api/auth/me/route.ts`);
 }
 function updateConfigWithAuth(cwd, provider, config, session, allowedProviders) {
+    const jsonPath = path.join(cwd, "swallowkit.config.json");
+    if (session.fileExists(jsonPath)) {
+        // loadConfig reads swallowkit.config.json first, so it is the effective configuration.
+        const value = JSON.parse(session.readFile(jsonPath));
+        if (value.auth) {
+            console.log("  'auth' section already exists in swallowkit.config.json");
+            return;
+        }
+        value.auth = {
+            provider,
+            ...(provider === "custom-jwt" ? { customJwt: { ...config, jwtSecretEnv: config.jwtSecretEnv || "JWT_SECRET", tokenExpiry: config.tokenExpiry || "24h" } } : {}),
+            ...(provider === "swa" ? { swa: { allowedProviders: normalizeSwaProviders(allowedProviders), roleSource: "swa-roles" } } : {}),
+            authorization: { defaultPolicy: provider === "none" ? "anonymous" : "authenticated" },
+        };
+        session.writeFile(jsonPath, JSON.stringify(value, null, 2) + "\n", extensionMeta);
+        console.log(` Updated: swallowkit.config.json`);
+        return;
+    }
     const configPath = path.join(cwd, "swallowkit.config.js");
     if (!session.fileExists(configPath)) {
         console.warn("  swallowkit.config.js not found. Please add auth config manually.");
@@ -666,7 +741,8 @@ function updateConfigWithAuth(cwd, provider, config, session, allowedProviders)
     provider: '${provider}',
 ${providerSettings}
     authorization: {
-      defaultPolicy: 'authenticated',
+      // Disabled auth has no scheme to authenticate against; 'authenticated' would fail validateConfig.
+      defaultPolicy: '${provider === "none" ? "anonymous" : "authenticated"}',
     },
   },
 `;
@@ -698,7 +774,7 @@ function updateEnvironmentFiles(cwd, session) {
         }
     }
 }
-async function installAuthDependencies(cwd, backendLanguage, provider = "mysql", session) {
+function installAuthDependenciesSync(cwd, backendLanguage, provider = "mysql", session) {
     if (backendLanguage === "typescript") {
         const funcPkgPath = path.join(cwd, "functions", "package.json");
         if (session.fileExists(funcPkgPath)) {