swallowkit 1.1.2 → 2.0.0-alpha.10

package/src/cli/commands/scaffold.ts

@@ -1,13 +1,15 @@
 /**
  * SwallowKit Scaffold コマンド
- * Zod モデルから Azure Functions と Next.js BFF の CRUD コードを生成
+ * Zod モデルから Azure Functions、BFF、選択したフロントエンドの CRUD を生成
  */
 
 import * as fs from "fs";
 import * as path from "path";
 import { spawnSync } from "child_process";
-import { getBackendLanguage, getConnectorDefinition, getAuthConfig, getFullConfig, getNormalizedAuthConfig, ensureSwallowKitProject, normalizeAuthConfig, validateConfig } from "../../core/config";
-import { ModelInfo, parseModelFile, toKebabCase, toPascalCase, toCamelCase } from "../../core/scaffold/model-parser";
+import { getBackendLanguage, getFrontendFramework, getConnectorDefinition, getAuthConfig, getFullConfig, getNormalizedAuthConfig, ensureSwallowKitProject, normalizeAuthConfig, validateConfig } from "../../core/config";
+import { generateManagedFunctionConfig, generateReactBffHelper, generateReactBffRoute } from "../../core/scaffold/react-bff-generator";
+import { adaptReactPage, generateReactModelRoutes } from "../../core/scaffold/react-ui-generator";
+import { ModelInfo, parseModelFile, toKebabCase, toCamelCase } from "../../core/scaffold/model-parser";
 import { MachineCommandError } from "../../machine/errors";
 import {
   generateCSharpAzureFunctionsCRUD,
@@ -52,17 +54,44 @@ import {
 } from "../../core/operations/file-session";
 import { generateModelContainerMigration } from "../../core/operations/migration-generator";
 import { recordSessionOperations } from "../../core/project/artifacts";
+import { updateSharedIndex } from "../../core/operations/create-model";
 
 const SCAFFOLD_GENERATOR = "scaffold";
 
 interface ScaffoldOptions {
   model: string; // モデルファイルのパス（例: "lib/models/todo.ts" or "todo"）
   functionsDir?: string; // Azure Functions のディレクトリ（デフォルト: "functions"）
-  apiDir?: string; // Next.js API routes のディレクトリ（デフォルト: "app/api"）
+  apiDir?: string; // BFF directory (Next.js: app/api, React: bff)
   apiOnly?: boolean; // true の場合、UI を生成しない（デフォルト: false）
+  skipInfra?: boolean; // true の場合、infra/ 配下（コンテナー migration）を変更しない
   expectedSchemaAnalysis?: SchemaAnalysisSnapshot;
 }
 
+export function buildInfraSkippedWarning(modelName: string, modelArgument: string): string {
+  return `infra-skipped: The Cosmos DB container migration for ${modelName} was not generated (--skip-infra); infra/ was left unchanged. ` +
+    `Generate it later with "swallowkit migrations add-model ${modelArgument}", or re-plan scaffold without --skip-infra.`;
+}
+
+const USER_SCOPE_FIELD = /^(user|owner|learner|member|account|customer|student|author|creator|profile|person|employee|patient)Id$/i;
+
+function isAuthenticationConfigured(authConfig: AuthConfig | undefined): boolean {
+  if (!authConfig || authConfig.provider === "none") return false;
+  return Boolean(authConfig.provider) || Object.keys(authConfig.schemes ?? {}).length > 0;
+}
+
+/** Warn when a model looks per-user (partition key or owner-like id field) but no authentication is configured. */
+export function buildUserScopedDataWarning(modelInfo: ModelInfo, authConfig: AuthConfig | undefined): string | undefined {
+  if (isAuthenticationConfigured(authConfig)) return undefined;
+  const partitionField = modelInfo.partitionKey.replace(/^\//, "");
+  const fieldNames = modelInfo.fields.filter((field) => field.type === "string" && !field.isArray).map((field) => field.name);
+  const ownerField = [partitionField, ...fieldNames].find((name) => USER_SCOPE_FIELD.test(name) && fieldNames.includes(name));
+  if (!ownerField) return undefined;
+  const reason = ownerField === partitionField ? `is the partition key and looks like a per-user owner id` : `looks like a per-user owner id`;
+  return `user-scoped-data-without-auth: ${modelInfo.name}.${ownerField} ${reason}, but authentication is not configured. ` +
+    `Generated CRUD does not scope data to a principal, so any caller can read and write every ${modelInfo.name} document. ` +
+    `Add authentication with "plan auth", restrict or remove the generated write endpoints, and add ai-authored endpoints that derive ${ownerField} from the verified principal instead of the request body.`;
+}
+
 function getMachineAwareStdio(): "inherit" | "pipe" {
   return process.env.SWALLOWKIT_MACHINE_OUTPUT === "1" ? "pipe" : "inherit";
 }
@@ -130,7 +159,20 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
     session.setSchemaAnalysis(schemaAnalysis);
     console.log(`✅ Model parsed: ${modelInfo.name} (${modelInfo.schemaName})`);
 
+    // Validate policy prerequisites before any generated artifacts are written.
+    resolveAuthPolicy(modelInfo, getAuthConfig());
+    for (const configName of ["swallowkit.config.js", "swallowkit.config.json", ".swallowkitrc.json"]) {
+      session.registerInput(path.join(process.cwd(), configName));
+    }
+    const userScopeWarning = buildUserScopedDataWarning(modelInfo, getAuthConfig());
+    if (userScopeWarning) {
+      session.addWarning(userScopeWarning);
+      console.warn(`⚠️  ${userScopeWarning}`);
+    }
+
     const backendLanguage = getBackendLanguage();
+    const frontend = getFrontendFramework();
+    const apiDir = options.apiDir || (frontend === "react" ? "bff" : "app/api");
     console.log(`🧠 Backend language: ${backendLanguage}`);
     
     // コネクタモデルかどうかを判定
@@ -181,8 +223,10 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
       console.log("ℹ️  --api-only skips UI generation only; Functions, BFF routes, OpenAPI, and native schema assets are still updated.");
     }
 
+    updateSharedIndex(modelPath, modelInfo.schemaName, session);
+
     // 5. Generate BFF callFunction helper
-    await generateCallFunctionHelper(session);
+    await generateCallFunctionHelper(session, apiDir);
 
     // 6. Generate Azure Functions code
     if (isConnectorModel) {
@@ -197,17 +241,24 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
       }
     }
 
-    // 7. Generate Next.js BFF API Routes
-    const apiDir = options.apiDir || "app/api";
-    if (isConnectorModel) {
+    // 7. Generate framework-specific BFF routes (the standalone backend is unchanged).
+    if (frontend === "react") {
+      generateManagedBffRoutes(modelInfo, apiDir, sharedPackageName, session);
+    } else if (isConnectorModel) {
       await generateConnectorBFFRoutesFiles(modelInfo, apiDir, sharedPackageName, session);
     } else {
       await generateBFFRoutes(modelInfo, apiDir, sharedPackageName, session);
     }
 
-    // 8. Generate Cosmos DB container Bicep file (skip for connector models)
+    // 8. Generate Cosmos DB container Bicep file (skip for connector models or when infra changes are excluded)
     if (!isConnectorModel) {
-      await generateCosmosContainer(modelInfo, session);
+      if (options.skipInfra) {
+        const warning = buildInfraSkippedWarning(modelInfo.name, toKebabCase(modelInfo.name));
+        session.addWarning(warning);
+        console.warn(`\n⚠️  ${warning}`);
+      } else {
+        await generateCosmosContainer(modelInfo, session);
+      }
     }
 
     // 9. Generate UI components (unless --api-only)
@@ -237,14 +288,14 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
     console.log("\n📝 Next steps:");
     console.log(`  1. Review generated files in ${describeFunctionsOutputPath(functionsDir, backendLanguage)} and ${apiDir}/`);
     if (!options.apiOnly) {
-      console.log(`  2. Check the generated UI pages in app/${toKebabCase(modelInfo.name)}/`);
+      console.log(`  2. Check the generated UI pages in ${frontend === "react" ? "src/pages" : "app"}/${toKebabCase(modelInfo.name)}/`);
       console.log("  3. Navigate to the model from the homepage menu");
     }
     if (backendLanguage !== "typescript") {
       console.log(`  ${options.apiOnly ? "2" : "4"}. Review generated OpenAPI export and native schema assets in ${functionsDir}/openapi/ and ${functionsDir}/generated/`);
     }
     console.log(
-      `  ${options.apiOnly ? (backendLanguage === "typescript" ? "2" : "3") : (backendLanguage === "typescript" ? "4" : "5")}. Ensure BACKEND_FUNCTIONS_BASE_URL is set in your .env.local file`
+      `  ${options.apiOnly ? (backendLanguage === "typescript" ? "2" : "3") : (backendLanguage === "typescript" ? "4" : "5")}. Ensure BACKEND_FUNCTIONS_BASE_URL is set in ${frontend === "react" ? `${apiDir}/local.settings.json` : "your .env.local file"}`
     );
     console.log(
       `  ${options.apiOnly ? (backendLanguage === "typescript" ? "3" : "4") : (backendLanguage === "typescript" ? "5" : "6")}. Configure CosmosDBConnection in functions/local.settings.json`
@@ -258,7 +309,7 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
 }
 
 function applyExternalTokenFetchToGeneratedUi(modelInfo: ModelInfo, session: FileOperationSession, importPath = '@/lib/auth/authenticated-fetch'): void {
-  const uiPrefix = `app/${toKebabCase(modelInfo.name)}/`;
+  const uiPrefix = `${getFrontendFramework() === "react" ? "src/pages" : "app"}/${toKebabCase(modelInfo.name)}/`;
   for (const operation of session.operations) {
     if (!operation.path.startsWith(uiPrefix) || !operation.path.endsWith('.tsx') || operation.action === 'delete') continue;
     let content = session.readFile(operation.absolutePath);
@@ -289,10 +340,43 @@ function applyExternalTokenFetchToGeneratedUi(modelInfo: ModelInfo, session: Fil
 export function resolveAuthPolicy(modelInfo: ModelInfo, authConfig: AuthConfig | undefined): ModelAuthPolicy | undefined {
   // モデルに明示的な authPolicy がある場合はそれを使用
   if (modelInfo.authPolicy) {
+    if (!isAuthenticationConfigured(authConfig)) {
+      throw new MachineCommandError(
+        "auth-policy-without-auth",
+        `Model '${modelInfo.name}' declares authPolicy, but authentication is not configured. No artifacts were written. Run plan auth and apply auth before scaffolding this model.`,
+        { model: modelInfo.name },
+        "blocked",
+        [{
+          command: "swallowkit machine plan auth --provider <custom-jwt|swa|external-token>",
+          description: "Choose an authentication provider, review and apply its plan, then re-plan scaffold.",
+        }]
+      );
+    }
     const normalized = normalizeAuthConfig(authConfig);
+    const usesNamedPolicy = Boolean(modelInfo.authPolicy.policy ||
+      typeof modelInfo.authPolicy.read === "string" || typeof modelInfo.authPolicy.write === "string");
+    // Guards resolve each operation independently: a string selects the named router, an array (or
+    // the roles fallback) selects the single-provider helper. Named schemes only have the router.
+    const operationIsNamed = (selected: string | string[] | undefined) =>
+      typeof selected === "string" || (selected === undefined && Boolean(modelInfo.authPolicy!.policy));
+    const everyOperationNamed = operationIsNamed(modelInfo.authPolicy.read) && operationIsNamed(modelInfo.authPolicy.write) &&
+      !modelInfo.authPolicy.roles;
+    if (authConfig?.schemes && !authConfig.provider && !everyOperationNamed) {
+      throw new MachineCommandError(
+        "auth-policy-requires-named-policy",
+        `Model '${modelInfo.name}' declares an authPolicy whose read or write operation does not resolve to a named policy, but authentication uses named schemes. Use authPolicy = { policy: '<name>' } or name both read and write policies (role arrays are not supported with named schemes); no artifacts were written.`,
+        { model: modelInfo.name },
+        "blocked",
+        [{
+          command: "swallowkit machine inspect capabilities",
+          description: "Define a named authorization policy selecting the required schemes/roles, reference it from the model, then re-plan scaffold.",
+        }]
+      );
+    }
     for (const policyName of [modelInfo.authPolicy.policy, typeof modelInfo.authPolicy.read === 'string' ? modelInfo.authPolicy.read : undefined, typeof modelInfo.authPolicy.write === 'string' ? modelInfo.authPolicy.write : undefined].filter((value): value is string => Boolean(value))) {
       if (!normalized?.authorization.policies[policyName]) throw new Error(`Model '${modelInfo.name}' references undefined auth policy '${policyName}'. Define auth.authorization.policies.${policyName}.`);
     }
+    if (usesNamedPolicy) assertNamedSchemesConfigured(modelInfo.name, "authPolicy", authConfig);
     return modelInfo.authPolicy;
   }
 
@@ -307,12 +391,35 @@ export function resolveAuthPolicy(modelInfo: ModelInfo, authConfig: AuthConfig |
     return {}; // 空のポリシー = 認証のみ、ロール制限なし
   }
 
-  if (defaultPolicy !== 'anonymous') return { policy: defaultPolicy };
+  if (defaultPolicy !== 'anonymous') {
+    assertNamedSchemesConfigured(modelInfo.name, `auth.authorization.defaultPolicy '${defaultPolicy}'`, authConfig);
+    return { policy: defaultPolicy };
+  }
 
   // defaultPolicy が 'anonymous' なら認証不要
   return undefined;
 }
 
+/**
+ * Named authorization policies are enforced by the generated multi-scheme router and scheme-specific
+ * client contexts, which exist only for named auth.schemes. A single-provider configuration
+ * (auth.provider) has no router, so referencing a named policy would generate code that cannot build.
+ */
+function assertNamedSchemesConfigured(modelName: string, source: string, authConfig: AuthConfig | undefined): void {
+  if (Object.keys(authConfig?.schemes ?? {}).some((name) => name !== "default")) return;
+  throw new MachineCommandError(
+    "auth-named-policy-requires-named-scheme",
+    `Model '${modelName}' uses a named authorization policy via ${source}, but authentication is configured with a single auth.provider. ` +
+      `Named policies require named auth.schemes; no artifacts were written. Use role lists (authPolicy = { roles: [...] } or read/write role arrays) with auth.provider, or add a named scheme.`,
+    { model: modelName, source },
+    "blocked",
+    [{
+      command: "swallowkit machine plan auth --provider <swa|external-token|custom-jwt> --scheme <name>",
+      description: "Add a named scheme and reference it from auth.authorization.policies, or switch the model to role lists; then re-plan scaffold.",
+    }]
+  );
+}
+
 /**
  * モデルファイルのパスを解決
  */
@@ -384,10 +491,17 @@ function readSharedPackageName(): string {
 /**
  * Generate BFF callFunction helper (lib/api/call-function.ts)
  */
-async function generateCallFunctionHelper(session: FileOperationSession): Promise<void> {
+async function generateCallFunctionHelper(session: FileOperationSession, apiDir: string): Promise<void> {
   console.log("\n📦 Generating BFF callFunction helper...");
 
   const cwd = process.cwd();
+  if (getFrontendFramework() === "react") {
+    const projectName = JSON.parse(fs.readFileSync(path.join(cwd, "package.json"), "utf8")).name;
+    session.writeFile(path.join(cwd, apiDir, "src", "lib", "call-function.ts"), generateReactBffHelper(projectName, getAuthConfig()), {
+      ownership: "managed", generator: SCAFFOLD_GENERATOR,
+    });
+    return;
+  }
 
   const helperDir = path.join(cwd, "lib", "api");
   const helperPath = path.join(helperDir, "call-function.ts");
@@ -800,6 +914,13 @@ function updatePythonFunctionRegistrations(functionAppPath: string, registration
 /**
  * Next.js BFF API Routes を生成
  */
+function generateManagedBffRoutes(modelInfo: ModelInfo, apiDir: string, sharedPackageName: string, session: FileOperationSession): void {
+  const name = toCamelCase(modelInfo.name);
+  const meta = { ownership: "managed" as const, generator: SCAFFOLD_GENERATOR, sourceModel: modelInfo.name };
+  session.writeFile(path.join(process.cwd(), apiDir, "src", name, "index.ts"), generateReactBffRoute(modelInfo, sharedPackageName), meta);
+  session.writeFile(path.join(process.cwd(), apiDir, name, "function.json"), generateManagedFunctionConfig(`${name}/{id?}`, ["GET", "POST", "PUT", "DELETE"], name), meta);
+}
+
 async function generateBFFRoutes(
   modelInfo: any,
   apiDir: string,
@@ -867,9 +988,10 @@ export async function generateUIComponents(modelInfo: ModelInfo, sharedPackageNa
   const modelKebab = toKebabCase(modelInfo.name);
   const modelName = modelInfo.name;
   const cwd = process.cwd();
+  const react = getFrontendFramework() === "react";
 
   // Create directory structure: app/[model]/
-  const modelDir = path.join(cwd, "app", modelKebab);
+  const modelDir = path.join(cwd, react ? path.join("src", "pages") : "app", modelKebab);
   const componentsDir = path.join(modelDir, "_components");
   const newDir = path.join(modelDir, "new");
   const idDir = path.join(modelDir, "[id]");
@@ -884,14 +1006,16 @@ export async function generateUIComponents(modelInfo: ModelInfo, sharedPackageNa
   const authLayout = generateAuthLayout(modelInfo, authOptions);
 
   const meta = { ownership: "managed" as const, generator: SCAFFOLD_GENERATOR, sourceModel: modelInfo.name };
-  session.writeFile(path.join(modelDir, "page.tsx"), listPage, meta);
-  session.writeFile(path.join(idDir, "page.tsx"), detailPage, meta);
-  session.writeFile(path.join(componentsDir, `${modelName}Form.tsx`), formComponent, meta);
-  session.writeFile(path.join(newDir, "page.tsx"), newPage, meta);
-  session.writeFile(path.join(editDir, "page.tsx"), editPage, meta);
+  const adapt = react ? adaptReactPage : (source: string) => source;
+  session.writeFile(path.join(modelDir, "page.tsx"), adapt(listPage), meta);
+  session.writeFile(path.join(idDir, "page.tsx"), adapt(detailPage), meta);
+  session.writeFile(path.join(componentsDir, `${modelName}Form.tsx`), adapt(formComponent), meta);
+  session.writeFile(path.join(newDir, "page.tsx"), adapt(newPage), meta);
+  session.writeFile(path.join(editDir, "page.tsx"), adapt(editPage), meta);
   if (authLayout) {
     session.writeFile(path.join(modelDir, "layout.tsx"), authLayout, meta);
   }
+  if (react) session.writeFile(path.join(modelDir, "routes.tsx"), generateReactModelRoutes(modelInfo, authOptions), meta);
 
   console.log(`✅ Created: ${path.join(modelDir, "page.tsx")}`);
   console.log(`✅ Created: ${path.join(idDir, "page.tsx")}`);
@@ -971,4 +1095,3 @@ ${models.map(m => `    { name: '${m.name}', path: '${m.path}', label: '${m.label
   session.writeFile(configPath, newConfigContent, { ownership: "extension-point", generator: SCAFFOLD_GENERATOR });
   console.log(`✅ Added ${modelInfo.name} to navigation menu`);
 }
-

package/src/cli/index.ts

@@ -5,9 +5,11 @@ import { readFileSync } from "fs";
 import * as path from "path";
 import { Command } from "commander";
 import { initCommand, devCommand, devSeedsCommand, scaffoldCommand, createModelCommand } from "./commands";
-import { provisionCommand } from "./commands/provision";
+import { createProvisionCommand } from "./commands/provision";
+import { AzureCliDiagnostic, formatAzureDiagnostic } from "../utils/azure-diagnostics";
 import { createMigrationCommand } from "./commands/create-migration";
 import { migrationsCommand } from "./commands/migrations";
+import { configureMcpCommand } from "./commands/configure-mcp";
 import { addConnectorCommand } from "./commands/add-connector";
 import { addAuthCommand } from "./commands/add-auth";
 import { planScaffoldOperation } from "../core/operations/scaffold-plan";
@@ -15,6 +17,7 @@ import { inspectArtifacts } from "../core/project/artifacts";
 import { detectDrift } from "../core/project/drift";
 import { runVerify } from "../core/verify";
 import { isMachineCommand, runMachineCli } from "../machine";
+import { MachineCommandError } from "../machine/errors";
 
 const packageJsonPath = path.resolve(__dirname, "../../package.json");
 export const CLI_VERSION = JSON.parse(readFileSync(packageJsonPath, "utf8")).version as string;
@@ -24,6 +27,7 @@ const DEV_OPTION_ARITY = new Map<string, 0 | 1>([
   ["--port", 1],
   ["-f", 1],
   ["--functions-port", 1],
+  ["--bff-port", 1],
   ["--host", 1],
   ["--seed-env", 1],
   ["-o", 0],
@@ -102,7 +106,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
 
   program
     .name("swallowkit")
-    .description("Next.js framework optimized for Azure deployment - Automatically splits SSR into individual Azure Functions")
+    .description("Schema-driven React and Next.js applications on Azure Static Web Apps and Functions")
     .version(CLI_VERSION);
 
   // Register commands
@@ -110,6 +114,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
     .command("init [project-name]")
     .description("Initialize a new SwallowKit project")
     .option("--template <template>", "Template to use", "default")
+    .option("--frontend <framework>", "Frontend framework: nextjs | react (defaults to nextjs in non-interactive mode)")
     .option("--next-version <version>", "Next.js version to install (e.g., 16.0.7, latest)", "latest")
     .option("--package-manager <manager>", "Package manager: npm | pnpm (defaults to invocation context)")
     .option("--cicd <provider>", "CI/CD provider: github | azure | skip")
@@ -121,6 +126,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
       initCommand({
         name: projectName || "swallowkit-app",
         template: options.template,
+        frontend: options.frontend,
         nextVersion: options.nextVersion,
         packageManager: options.packageManager,
         cicd: options.cicd,
@@ -134,9 +140,10 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
   program.addCommand(devCommandOverride);
   program.addCommand(devSeedsCommand);
 
-  program.addCommand(provisionCommand);
+  program.addCommand(createProvisionCommand());
   program.addCommand(migrationsCommand);
   program.addCommand(createMigrationCommand);
+  program.addCommand(configureMcpCommand);
 
   program
     .command("create-model <names...>")
@@ -153,10 +160,11 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
 
   program
     .command("scaffold <model>")
-    .description("Generate CRUD code for Azure Functions and Next.js BFF from Zod models")
+    .description("Generate CRUD code for Azure Functions, BFF, and the selected frontend from Zod models")
     .option("--functions-dir <dir>", "Azure Functions directory", "functions")
-    .option("--api-dir <dir>", "Next.js API routes directory", "app/api")
+    .option("--api-dir <dir>", "BFF routes directory (Next.js: app/api; React: bff)")
     .option("--api-only", "Skip UI components; still update Functions, BFF routes, OpenAPI, and native schema assets", false)
+    .option("--skip-infra", "Do not create or update anything under infra/ (generate the container migration later with migrations add-model)", false)
     .option("--dry-run", "Show planned file changes without writing anything", false)
     .action(async (model, options) => {
       if (options.dryRun) {
@@ -165,6 +173,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
           functionsDir: options.functionsDir,
           apiDir: options.apiDir,
           apiOnly: options.apiOnly,
+          skipInfra: options.skipInfra,
         });
         return;
       }
@@ -174,6 +183,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
         functionsDir: options.functionsDir,
         apiDir: options.apiDir,
         apiOnly: options.apiOnly,
+        skipInfra: options.skipInfra,
       });
     });
 
@@ -214,8 +224,8 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
 
   program
     .command("verify")
-    .description("Run verification checks (structure, drift, typecheck)")
-    .option("--checks <ids>", "Comma-separated check ids to run (structure,drift,typecheck)")
+    .description("Run verification checks (structure, drift, typecheck, backend-build)")
+    .option("--checks <ids>", "Comma-separated check ids (structure,drift,typecheck,backend-build,build,lint,test); quote CSV values in PowerShell")
     .action(async (options) => {
       await runVerifyCommand({ checks: options.checks });
     });
@@ -223,7 +233,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
   return program;
 }
 
-async function runScaffoldDryRun(options: { model: string; functionsDir?: string; apiDir?: string; apiOnly?: boolean }): Promise<void> {
+async function runScaffoldDryRun(options: { model: string; functionsDir?: string; apiDir?: string; apiOnly?: boolean; skipInfra?: boolean }): Promise<void> {
   console.log("🔍 Scaffold dry-run — no files will be written.\n");
 
   const plan = await planScaffoldOperation(options);
@@ -261,7 +271,7 @@ async function runScaffoldDryRun(options: { model: string; functionsDir?: string
     console.log(`⚠️  ${plan.conflicts.length} file(s) were modified after generation and would be overwritten.`);
     console.log(`   Review the conflicts, then run: swallowkit scaffold ${options.model} (or machine apply scaffold --plan ${plan.planId} --approve)`);
   } else {
-    console.log(`   Run without --dry-run to apply: swallowkit scaffold ${options.model}`);
+    console.log(`   Run without --dry-run to apply: swallowkit scaffold ${options.model}${options.skipInfra ? " --skip-infra" : ""}`);
   }
 }
 
@@ -348,9 +358,35 @@ export async function runCli(argv: string[] = process.argv): Promise<void> {
   await createProgram().parseAsync(normalizeDevCommandArgv(argv));
 }
 
+/** Human-readable error output for regular CLI commands (machine commands print JSON). */
+export function formatCliError(error: unknown): string {
+  if (error instanceof MachineCommandError) {
+    const lines = [`❌ ${error.message}`, `   (code: ${error.code})`];
+    const details = error.details as Record<string, unknown> | undefined;
+    if (details && typeof details === "object") {
+      if (typeof details.nextAction === "string") lines.push(`   Next: ${details.nextAction}`);
+      if (Array.isArray(details.changedFiles)) lines.push(`   Changed files: ${details.changedFiles.join(", ")}`);
+      if (typeof details.runId === "string") lines.push(`   Run: ${details.runId}`);
+      if (details.deployment && typeof details.deployment === "object") {
+        const deployment = details.deployment as { state?: string; reference?: { name?: string; id?: string; resourceGroup?: string; subscription?: string } };
+        lines.push(`   Deployment: ${deployment.reference?.id ?? deployment.reference?.name ?? "unknown"}; state: ${deployment.state ?? "unknown"}`);
+      }
+      if (Array.isArray(details.diagnostics)) {
+        for (const diagnostic of details.diagnostics as AzureCliDiagnostic[]) lines.push(formatAzureDiagnostic(diagnostic));
+      }
+    }
+    for (const action of error.nextActions ?? []) lines.push(`   Next: ${action.command} — ${action.description}`);
+    return lines.join("\n");
+  }
+  if (error instanceof Error) {
+    return process.env.SWALLOWKIT_DEBUG ? String(error.stack ?? error.message) : `❌ ${error.message}`;
+  }
+  return `❌ ${String(error)}`;
+}
+
 if (require.main === module) {
   void runCli().catch((error) => {
-    console.error(error);
+    console.error(formatCliError(error));
     process.exitCode = 1;
   });
 }

package/src/core/config.ts

@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import { createRequire } from "module";
 import * as path from "path";
-import { AuthConfig, AuthProvider, BackendLanguage, ConnectorDefinition, NormalizedAuthConfig, SwallowKitConfig } from "../types";
+import { AuthConfig, AuthProvider, BackendLanguage, ConnectorDefinition, FrontendFramework, NormalizedAuthConfig, SwallowKitConfig } from "../types";
 import { detectFromProject, getCommands } from "../utils/package-manager";
 
 const requireFromHere = createRequire(__filename);
@@ -21,6 +21,7 @@ const VALID_BACKEND_LANGUAGES: BackendLanguage[] = ["typescript", "csharp", "pyt
  * デフォルト設定
  */
 const DEFAULT_CONFIG: SwallowKitConfig = {
+  frontend: { framework: "nextjs" },
   database: {},
   backend: {
     language: "typescript",
@@ -78,6 +79,10 @@ export function loadConfig(configPath?: string, throwOnError = false, quiet = fa
  */
 function mergeConfig(defaultConfig: SwallowKitConfig, userConfig: Partial<SwallowKitConfig>): SwallowKitConfig {
   return {
+    frontend: {
+      ...defaultConfig.frontend,
+      ...userConfig.frontend,
+    },
     database: {
       ...defaultConfig.database,
       ...userConfig.database,
@@ -108,6 +113,9 @@ function mergeConfig(defaultConfig: SwallowKitConfig, userConfig: Partial<Swallo
 export function generateConfig(outputPath: string = "swallowkit.config.json"): void {
   const config = {
     $schema: "https://swallowkit.dev/schema.json",
+    frontend: {
+      framework: "nextjs",
+    },
     database: {
       connectionString: "your-cosmos-connection-string",
       databaseName: "SwallowKitDB",
@@ -176,6 +184,14 @@ export function getBackendLanguage(configPath?: string): BackendLanguage {
   return "typescript";
 }
 
+export function getFrontendFramework(configPath?: string): FrontendFramework {
+  const framework = getFullConfig(configPath).frontend?.framework ?? "nextjs";
+  if (framework !== "nextjs" && framework !== "react") {
+    throw new Error(`Unsupported frontend framework '${framework}'; use nextjs or react`);
+  }
+  return framework;
+}
+
 /**
  * 完全な設定を取得（ファイル + 環境変数）
  */
@@ -250,6 +266,10 @@ function hasConfiguredDatabase(config: SwallowKitConfig): boolean {
 export function validateConfig(config: SwallowKitConfig): { valid: boolean; errors: string[] } {
   const errors: string[] = [];
 
+  if (config.frontend?.framework && !["nextjs", "react"].includes(config.frontend.framework)) {
+    errors.push("Frontend framework must be one of: nextjs, react");
+  }
+
   const auth = normalizeAuthConfig(config.auth);
   if (auth) {
     for (const [name, scheme] of Object.entries(auth.schemes)) {

package/src/core/operations/create-model.ts

@@ -1,4 +1,5 @@
 import * as path from "path";
+import * as ts from "typescript";
 import { ensureSwallowKitProject, loadConfig } from "../config";
 import { toPascalCase } from "../scaffold/model-parser";
 import { syncProjectManifest } from "../project/manifest";
@@ -90,21 +91,58 @@ export const connectorConfig = {
 `;
 }
 
-function updateSharedIndex(kebabName: string, pascalName: string, session: FileOperationSession): boolean {
+export function updateSharedIndex(modelPath: string, schemaName: string, session: FileOperationSession): boolean {
   const indexPath = path.join(process.cwd(), "shared", "index.ts");
-
-  if (!session.fileExists(indexPath)) {
-    return false;
+  session.registerInput(indexPath);
+  const content = session.fileExists(indexPath) ? session.readFile(indexPath) : "";
+  const modulePath = `./${path.relative(path.dirname(indexPath), modelPath).replace(/\\/g, "/").replace(/\.ts$/, "")}`;
+  const source = ts.createSourceFile(indexPath, content, ts.ScriptTarget.Latest, true);
+  // Text edits that turn a type-only re-export of this schema into nothing (a value export of the same
+  // name also exports its type); keeping both would be a duplicate-identifier error.
+  const edits: Array<{ start: number; end: number; text: string }> = [];
+  let hasValueExport = false;
+  for (const statement of source.statements) {
+    if (!ts.isExportDeclaration(statement) || !statement.moduleSpecifier || !ts.isStringLiteral(statement.moduleSpecifier)) continue;
+    const exportedPath = statement.moduleSpecifier.text.replace(/\.(ts|js)$/, "");
+    if (exportedPath !== modulePath) continue;
+    if (!statement.exportClause) {
+      if (!statement.isTypeOnly) hasValueExport = true;
+      continue;
+    }
+    if (!ts.isNamedExports(statement.exportClause)) continue;
+    const elements = statement.exportClause.elements;
+    const matches = elements.filter((element) =>
+      element.name.text === schemaName && (element.propertyName?.text ?? element.name.text) === schemaName);
+    for (const element of matches) {
+      if (!statement.isTypeOnly && !element.isTypeOnly) {
+        hasValueExport = true;
+      } else if (!statement.isTypeOnly) {
+        // export { type Todo } -> export { Todo }
+        edits.push({ start: element.getStart(source), end: element.getEnd(), text: schemaName });
+        hasValueExport = true;
+      } else if (elements.length === 1) {
+        let end = statement.getEnd();
+        if (content.slice(end, end + 2) === "\r\n") end += 2;
+        else if (content[end] === "\n") end += 1;
+        edits.push({ start: statement.getStart(source), end, text: "" });
+      } else {
+        const index = elements.indexOf(element);
+        const start = index === 0 ? element.getStart(source) : elements[index - 1].getEnd();
+        const end = index === 0 ? elements[index + 1].getStart(source) : element.getEnd();
+        edits.push({ start, end, text: "" });
+      }
+    }
   }
-
-  const content = session.readFile(indexPath);
-  const exportLine = `export { ${pascalName} } from './models/${kebabName}';`;
-
-  if (content.includes(exportLine)) {
-    return false;
+  let updated = content;
+  for (const edit of edits.sort((left, right) => right.start - left.start)) {
+    updated = `${updated.slice(0, edit.start)}${edit.text}${updated.slice(edit.end)}`;
   }
-
-  session.writeFile(indexPath, `${content}${exportLine}\n`, {
+  if (hasValueExport && updated === content) return false;
+  if (!hasValueExport) {
+    const exportLine = `export { ${schemaName} } from '${modulePath}';`;
+    updated = `${updated}${updated && !updated.endsWith("\n") ? "\n" : ""}${exportLine}\n`;
+  }
+  session.writeFile(indexPath, updated, {
     ownership: "extension-point",
     generator: CREATE_MODEL_GENERATOR,
   });
@@ -172,7 +210,7 @@ export async function createModelOperation(options: CreateModelOperationOptions)
     });
     createdFiles.push(filePath.replace(/\\/g, "/"));
 
-    if (updateSharedIndex(kebabName, pascalName, session)) {
+    if (updateSharedIndex(resolveFromRoot(filePath), pascalName, session)) {
       updatedIndex = true;
     }
   }

package/src/core/operations/migration-generator.ts

@@ -152,6 +152,19 @@ param location string
   return migration;
 }
 
+const SUFFIXED_COSMOS_ACCOUNT_NAME = "'cosmos-${take(toLower(projectName), 30)}-${take(uniqueString(resourceGroup().id, projectName), 6)}'";
+const LEGACY_COSMOS_ACCOUNT_NAME = "'cosmos-${projectName}'";
+
+// Projects initialized before resource-group suffixes keep their original
+// account name so model migrations target the account their baseline created.
+function cosmosAccountNameExpression(session: FileOperationSession): string {
+  const mainBicep = path.join(session.rootDirectory, "infra", "main.bicep");
+  if (session.fileExists(mainBicep) && /var\s+resourceSuffix\s*=/.test(session.readFile(mainBicep))) {
+    return SUFFIXED_COSMOS_ACCOUNT_NAME;
+  }
+  return LEGACY_COSMOS_ACCOUNT_NAME;
+}
+
 export function generateModelContainerMigration(
   model: { name: string; partitionKey: string },
   session: FileOperationSession = new FileOperationSession("commit")
@@ -175,7 +188,7 @@ param projectName string
 param location string
 
 resource cosmosAccount 'Microsoft.DocumentDB/databaseAccounts@2023-11-15' existing = {
-  name: 'cosmos-\${projectName}'
+  name: ${cosmosAccountNameExpression(session)}
 }
 
 resource database 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2023-11-15' existing = {