swallowkit 2.0.0-alpha.3 → 2.0.0-alpha.5

package/src/core/scaffold/ui-generator.ts

@@ -3,7 +3,7 @@
  * CRUD 画面（一覧、詳細、新規作成、編集）を生成する
  */
 
-import { ModelInfo, toCamelCase, toKebabCase } from "./model-parser";
+import { FieldInfo, ModelInfo, toCamelCase, toKebabCase } from "./model-parser";
 import { ModelAuthPolicy } from "../../types";
 
 /** auth が有効かつ authPolicy が存在する場合に渡されるオプション */
@@ -18,6 +18,21 @@ export interface UIAuthOptions {
 /**
  * 認証付きCRUDルートを、ページ側のuseAuthと同じAuthProviderで囲むレイアウトを生成する。
  */
+/** Lookup state and fetches are per referenced model; several fields may reference the same model. */
+function uniqueByReferencedModel(fields: FieldInfo[]): FieldInfo[] {
+  const seen = new Set<string>();
+  return fields.filter((field) => {
+    if (!field.referencedModel || seen.has(field.referencedModel)) return false;
+    seen.add(field.referencedModel);
+    return true;
+  });
+}
+
+/** Untyped or inline z.object fields (not references to another model) are edited and shown as JSON. */
+function isJsonField(f: FieldInfo): boolean {
+  return f.type === "object" && !f.isNestedSchema;
+}
+
 export function generateAuthLayout(model: ModelInfo, authOptions?: UIAuthOptions): string | undefined {
   if (!authOptions) return undefined;
 
@@ -59,14 +74,14 @@ export function generateListPage(model: ModelInfo, sharedPackageName: string, au
   const hasForeignKeys = foreignKeyFields.length > 0;
   
   // 外部キー用のstate定義を生成
-  const foreignKeyStates = foreignKeyFields.map(f => {
+  const foreignKeyStates = uniqueByReferencedModel(foreignKeyFields).map(f => {
     const refModel = f.referencedModel!;
     const refModelCamel = toCamelCase(refModel);
     return `  const [${refModelCamel}Map, set${refModel}Map] = useState<Record<string, string>>({});`;
   }).join('\n');
   
   // 外部キーデータのフェッチロジックを生成
-  const foreignKeyFetches = foreignKeyFields.map(f => {
+  const foreignKeyFetches = uniqueByReferencedModel(foreignKeyFields).map(f => {
     const refModel = f.referencedModel!;
     const refModelCamel = toCamelCase(refModel);
     return `    fetch('/api/${refModelCamel}')
@@ -234,6 +249,10 @@ ${displayFields.map(f => {
     return `                  <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-gray-100">
                     {${refModelCamel}Map[item.${f.name}] || item.${f.name}}
                   </td>`;
+  } else if (isJsonField(f)) {
+    return `                  <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-gray-100">
+                    {item.${f.name} === undefined ? '-' : JSON.stringify(item.${f.name})}
+                  </td>`;
   } else {
     return `                  <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-gray-100">
                     {String(item.${f.name})}
@@ -305,14 +324,14 @@ export function generateDetailPage(model: ModelInfo, sharedPackageName: string,
   const hasForeignKeys = foreignKeyFields.length > 0;
   
   // 外部キー用のstate定義を生成
-  const foreignKeyStates = foreignKeyFields.map(f => {
+  const foreignKeyStates = uniqueByReferencedModel(foreignKeyFields).map(f => {
     const refModel = f.referencedModel!;
     const refModelCamel = toCamelCase(refModel);
     return `  const [${refModelCamel}Map, set${refModel}Map] = useState<Record<string, string>>({});`;
   }).join('\n');
   
   // 外部キーデータのフェッチロジックを生成
-  const foreignKeyFetches = foreignKeyFields.map(f => {
+  const foreignKeyFetches = uniqueByReferencedModel(foreignKeyFields).map(f => {
     const refModel = f.referencedModel!;
     const refModelCamel = toCamelCase(refModel);
     return `    fetch('/api/${refModelCamel}')
@@ -476,6 +495,11 @@ ${model.fields.map(f => {
               <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">${refModel}</dt>
               <dd className="mt-1 text-sm text-gray-900 dark:text-gray-100">{${refModelCamel}Map[${modelCamel}.${f.name}] || ${modelCamel}.${f.name}}</dd>
             </div>`;
+  } else if (isJsonField(f)) {
+    return `            <div>
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">${f.name}</dt>
+              <dd className="mt-1 text-sm text-gray-900 dark:text-gray-100"><pre className="whitespace-pre-wrap">{${modelCamel}.${f.name} === undefined ? '-' : JSON.stringify(${modelCamel}.${f.name}, null, 2)}</pre></dd>
+            </div>`;
   } else {
     return `            <div>
               <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">${f.name}</dt>
@@ -573,7 +597,7 @@ export default function ${modelName}Form({ initialData, isEdit = false }: ${mode
   const router = useRouter();
   const [loading, setLoading] = useState(false);
   const [errors, setErrors] = useState<Record<string, string>>({});
-${hasForignKeys ? foreignKeyFields.map(f => `  const [${toCamelCase(f.referencedModel!)}Options, set${f.referencedModel}Options] = useState<Array<{ id: string; name: string }>>([]);`).join('\n') : ''}
+${hasForignKeys ? uniqueByReferencedModel(foreignKeyFields).map(f => `  const [${toCamelCase(f.referencedModel!)}Options, set${f.referencedModel}Options] = useState<Array<{ id: string; name: string }>>([]);`).join('\n') : ''}
 ${hasNestedSchemas ? nestedSchemaStates : ''}
   
   const [formData, setFormData] = useState({
@@ -587,6 +611,11 @@ ${formFields.map(f => {
     }
   }
   
+  // インラインオブジェクトは JSON テキストとして編集する
+  if (isJsonField(f)) {
+    return `    ${f.name}: initialData?.${f.name} !== undefined ? JSON.stringify(initialData.${f.name}, null, 2) : '',`;
+  }
+
   let defaultValue = "''";
   if (f.isArray) {
     // Array の場合は空文字列（カンマ区切りで入力するため）
@@ -612,7 +641,7 @@ ${formFields.map(f => {
 ${needsUseEffect ? `
   // 参照データの選択肢を取得
   useEffect(() => {
-${hasForignKeys ? foreignKeyFields.map(f => `    // ${f.referencedModel} の一覧を取得
+${hasForignKeys ? uniqueByReferencedModel(foreignKeyFields).map(f => `    // ${f.referencedModel} の一覧を取得
     fetch('/api/${toKebabCase(f.referencedModel!)}')
       .then(res => res.json())
       .then(data => set${f.referencedModel}Options(data.map((item: Record<string, string>) => ({ id: item.id, name: item.name || item.title || item.id }))))
@@ -628,7 +657,19 @@ ${hasNestedSchemas ? nestedSchemaFetches : ''}
     try {
       // Array フィールドをカンマ区切りから配列に変換
       const submitData: Record<string, unknown> = { ...formData };
-${formFields.filter(f => f.isArray && !f.isNestedSchema).map(f => `      if (typeof submitData.${f.name} === 'string') {
+${formFields.filter(isJsonField).length > 0 ? `      // JSON フィールド（インラインオブジェクト）を解析
+${formFields.filter(isJsonField).map(f => `      if (submitData.${f.name} === '') {
+        submitData.${f.name} = undefined;
+      } else if (typeof submitData.${f.name} === 'string') {
+        try {
+          submitData.${f.name} = JSON.parse(submitData.${f.name});
+        } catch {
+          setErrors({ ${f.name}: 'Invalid JSON' });
+          setLoading(false);
+          return;
+        }
+      }`).join('\n')}
+` : ''}${formFields.filter(f => f.isArray && !f.isNestedSchema && !isJsonField(f)).map(f => `      if (typeof submitData.${f.name} === 'string') {
         submitData.${f.name} = submitData.${f.name}.split(',').map((s: string) => s.trim()).filter((s: string) => s.length > 0);
       }`).join('\n')}
 ${formFields.filter(f => f.enumValues && f.enumValues.length > 0).length > 0 ? `
@@ -833,6 +874,27 @@ ${f.enumValues.map(v => `          <option value="${v}">${v}</option>`).join('\n
       </div>`;
   }
   
+  // インラインオブジェクトは JSON テキストエリア
+  if (isJsonField(f)) {
+    return `      <div>
+        <label htmlFor="${f.name}" className="block text-sm font-medium text-gray-700 dark:text-gray-300">
+          ${f.name}${!f.isOptional ? ' *' : ''} <span className="text-xs text-gray-500">(JSON)</span>
+        </label>
+        <textarea
+          id="${f.name}"
+          name="${f.name}"
+          rows={4}
+          value={formData.${f.name}}
+          onChange={(e) => setFormData({ ...formData, ${f.name}: e.target.value })}
+          className="mt-1 block w-full rounded-md border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 shadow-sm px-3 py-2 font-mono focus:border-blue-500 focus:ring-blue-500 dark:focus:border-blue-400 dark:focus:ring-blue-400"
+          ${!f.isOptional ? 'required' : ''}
+        />
+        {errors.${f.name} && (
+          <p className="mt-1 text-sm text-red-600 dark:text-red-400">{errors.${f.name}}</p>
+        )}
+      </div>`;
+  }
+
   // Array の場合はカンマ区切りテキスト
   if (f.isArray) {
     return `      <div>

package/src/core/verify/index.ts

@@ -5,16 +5,17 @@
  * - structure:  プロジェクト構造規約 (validateProject)
  * - drift:      生成物と現在状態の乖離 (detectDrift)
  * - typecheck:  TypeScript 型チェック (tsc --noEmit / typecheck script)
+ * - backend-build: standalone Functions のコンパイル (C#/TypeScript) または構文検証 (Python)
  * - build/lint/test: package.json scripts に同名 script がある場合のみ実行 (なければ skip)
  * - custom:     swallowkit.config の verify.checks で定義されたプロジェクト固有チェック
  *
- * 既定実行セットは structure/drift/typecheck + custom。build/lint/test は --checks で明示指定。
+ * 既定実行セットは structure/drift/typecheck/backend-build + custom。build/lint/test は --checks で明示指定。
  */
 
 import * as fs from "fs";
 import * as path from "path";
 import { spawnSync } from "child_process";
-import { loadConfig } from "../config";
+import { loadConfig, loadConfigFromEnv } from "../config";
 import { detectDrift, DriftFinding } from "../project/drift";
 import { saveLastVerifyState } from "../project/state";
 import { ProjectViolation, validateProject } from "../project/validation";
@@ -60,11 +61,11 @@ export interface VerifyResult {
   verifiedAt: string;
 }
 
-export const AVAILABLE_VERIFY_CHECKS = ["structure", "drift", "typecheck", "build", "lint", "test"] as const;
+export const AVAILABLE_VERIFY_CHECKS = ["structure", "drift", "typecheck", "backend-build", "build", "lint", "test"] as const;
 export type VerifyCheckId = (typeof AVAILABLE_VERIFY_CHECKS)[number];
 
 /** 既定で実行される built-in チェック。build/lint/test は明示指定時のみ。 */
-export const DEFAULT_VERIFY_CHECKS = ["structure", "drift", "typecheck"] as const;
+export const DEFAULT_VERIFY_CHECKS = ["structure", "drift", "typecheck", "backend-build"] as const;
 
 async function runStructureCheck(projectRoot: string): Promise<VerifyCheckResult> {
   const startedAt = Date.now();
@@ -137,6 +138,7 @@ interface CommandCheckSpec {
   args: string[];
   timeoutMs?: number;
   failAction: string;
+  shell?: boolean;
 }
 
 function runCommandCheck(projectRoot: string, spec: CommandCheckSpec): VerifyCheckResult {
@@ -145,9 +147,10 @@ function runCommandCheck(projectRoot: string, spec: CommandCheckSpec): VerifyChe
   try {
     const result = spawnSync(spec.command, spec.args, {
       cwd: projectRoot,
-      shell: true,
+      shell: spec.shell ?? true,
       encoding: "utf-8",
       timeout: spec.timeoutMs ?? 5 * 60 * 1000,
+      maxBuffer: 10 * 1024 * 1024,
     });
 
     const output = `${result.stdout ?? ""}\n${result.stderr ?? ""}`;
@@ -180,6 +183,11 @@ function runCommandCheck(projectRoot: string, spec: CommandCheckSpec): VerifyChe
         command: commandLabel,
         exitCode,
         logTail: tailLines(output, 50),
+        ...(spec.id === "backend-build" ? {
+          diagnostics: [...new Set(output.split(/\r?\n/).filter((line) =>
+            /\(\d+,\d+\):\s*error\s+\w+/.test(line) ||
+            /^\s*(File ".+", line \d+|(?:Sorry: )?(?:Syntax|Indentation|Tab)Error:|\*\*\* Error compiling)/.test(line)))],
+        } : {}),
       },
       suggestedActions: exitCode === 0 ? [] : [spec.failAction],
     };
@@ -201,6 +209,86 @@ function runCommandCheck(projectRoot: string, spec: CommandCheckSpec): VerifyChe
   }
 }
 
+function backendUnavailable(reason: string): VerifyCheckResult {
+  return {
+    id: "backend-build",
+    title: "Standalone Functions compilation",
+    status: "skip",
+    durationMs: 0,
+    fixable: false,
+    evidence: { logTail: [reason], diagnostics: [reason] },
+    suggestedActions: ["Install or restore the backend toolchain, then re-run verify with --checks \"backend-build\". A skipped check is not backend validation."],
+  };
+}
+
+function runBackendBuildCheck(projectRoot: string): VerifyCheckResult {
+  const functionsRoot = path.join(projectRoot, "functions");
+  if (!fs.existsSync(functionsRoot)) return backendUnavailable("functions/ not found; no standalone backend was checked.");
+  const configPath = ["swallowkit.config.json", "swallowkit.config.js", ".swallowkitrc.json"]
+    .map((name) => path.join(projectRoot, name)).find((file) => fs.existsSync(file));
+  if (!configPath) return backendUnavailable("SwallowKit configuration not found; backend language is unknown.");
+  // Same effective language as generation (getBackendLanguage): env override, then file, invalid -> typescript.
+  const configured = loadConfigFromEnv().backend?.language ?? loadConfig(configPath, true, true).backend?.language;
+  const language = configured && ["typescript", "csharp", "python"].includes(configured) ? configured : "typescript";
+  let command: string;
+  let args: string[];
+  if (language === "csharp") {
+    command = "dotnet";
+    args = ["build", "--nologo"];
+    const probe = spawnSync(command, ["--version"], { cwd: functionsRoot, encoding: "utf-8", timeout: 30_000 });
+    if (probe.error && "code" in probe.error && probe.error.code === "ENOENT") return backendUnavailable("dotnet SDK is not installed or is not on PATH; C# compilation was skipped.");
+  } else if (language === "python") {
+    const venvPython = process.platform === "win32"
+      ? path.join(functionsRoot, ".venv", "Scripts", "python.exe")
+      : path.join(functionsRoot, ".venv", "bin", "python");
+    const candidates = fs.existsSync(venvPython)
+      ? [{ command: venvPython, args: [] as string[] }]
+      : process.platform === "win32"
+        ? [{ command: "python", args: [] }, { command: "python3", args: [] }, { command: "py", args: ["-3"] }]
+        : [{ command: "python3", args: [] }, { command: "python", args: [] }];
+    const python = candidates.find((candidate) => {
+      const probe = spawnSync(candidate.command, [...candidate.args, "-c", "import sys; sys.exit(0 if sys.version_info.major == 3 else 1)"], {
+        cwd: functionsRoot, encoding: "utf-8", timeout: 30_000,
+      });
+      // Preserve execution errors for an installed interpreter instead of silently falling back.
+      return probe.status === 0 || (probe.error && (!("code" in probe.error) || probe.error.code !== "ENOENT"));
+    });
+    if (!python) return backendUnavailable("Python 3 is not available in functions/.venv or on PATH; Python syntax compilation was skipped.");
+    command = python.command;
+    // -f: never trust cached bytecode, which can survive same-size edits within one mtime second.
+    args = [...python.args, "-m", "compileall", "-q", "-f", "-x", "[/\\\\](?:\\.venv|\\.codegen-venv|node_modules|__pycache__)(?:[/\\\\]|$)", "."];
+  } else {
+    let tscPath: string;
+    try {
+      tscPath = require.resolve("typescript/bin/tsc", { paths: [functionsRoot] });
+    } catch (error) {
+      if (error instanceof Error && "code" in error && error.code === "MODULE_NOT_FOUND") {
+        return backendUnavailable("The project's TypeScript compiler is not installed; restore dependencies before verifying functions/.");
+      }
+      throw error;
+    }
+    const sharedBuild = runSharedBuildIfPresent(projectRoot);
+    if (sharedBuild.ran && !sharedBuild.ok) {
+      return {
+        id: "backend-build", title: "Standalone Functions compilation", status: sharedBuild.unavailable ? "error" : "fail",
+        durationMs: 0, fixable: !sharedBuild.unavailable,
+        evidence: { command: sharedBuild.command, logTail: sharedBuild.logTail,
+          ...(sharedBuild.unavailable ? { errorCode: "verification-command-unavailable" as const } : {}) },
+        suggestedActions: ["Fix the shared package build before compiling the TypeScript backend."],
+      };
+    }
+    command = process.execPath;
+    args = [tscPath, "--project", "tsconfig.json", "--noEmit"];
+  }
+  const result = runCommandCheck(functionsRoot, {
+    id: "backend-build", title: "Standalone Functions compilation", command, args, shell: false,
+    timeoutMs: 10 * 60 * 1000,
+    failAction: "Fix the backend compilation errors in evidence.diagnostics / evidence.logTail, then re-run verify.",
+  });
+  result.evidence.command = `${result.evidence.command} (in functions/)`;
+  return result;
+}
+
 function readPackageScripts(projectRoot: string): Record<string, string> {
   const packageJsonPath = path.join(projectRoot, "package.json");
   if (!fs.existsSync(packageJsonPath)) return {};
@@ -253,6 +341,8 @@ function runTypecheckCheck(projectRoot: string): VerifyCheckResult {
 
   const scripts = readPackageScripts(projectRoot);
   const pm = detectFromProject(projectRoot);
+  // Next.js App Router templates use generated route types (e.g. LayoutProps); create them before tsc.
+  const typegenNotes = runNextTypegenIfPresent(projectRoot, pm);
   let command: string;
   let args: string[];
   if (typeof scripts.typecheck === "string") {
@@ -263,13 +353,33 @@ function runTypecheckCheck(projectRoot: string): VerifyCheckResult {
     args = pm === "pnpm" ? ["exec", "tsc", "--noEmit"] : ["exec", "tsc", "--", "--noEmit"];
   }
 
-  return runCommandCheck(projectRoot, {
+  const result = runCommandCheck(projectRoot, {
     id: "typecheck",
     title: "TypeScript type check",
     command,
     args,
     failAction: "Fix the TypeScript errors listed in evidence.logTail, then re-run verify.",
   });
+  if (result.status !== "pass" && typegenNotes.length > 0) {
+    result.evidence.logTail = [...typegenNotes, ...(result.evidence.logTail ?? [])];
+  }
+  return result;
+}
+
+const NEXT_CONFIG_FILES = ["next.config.ts", "next.config.js", "next.config.mjs", "next.config.cjs"];
+
+function runNextTypegenIfPresent(projectRoot: string, pm: ReturnType<typeof detectFromProject>): string[] {
+  if (!NEXT_CONFIG_FILES.some((file) => fs.existsSync(path.join(projectRoot, file)))) return [];
+  if (!fs.existsSync(path.join(projectRoot, "node_modules", "next", "package.json"))) return [];
+  const args = pm === "pnpm" ? ["exec", "next", "typegen"] : ["exec", "--", "next", "typegen"];
+  const result = spawnSync(getCommands(pm).name, args, {
+    cwd: projectRoot,
+    shell: true,
+    encoding: "utf-8",
+    timeout: 2 * 60 * 1000,
+  });
+  if (!result.error && result.status === 0) return [];
+  return [`next typegen did not complete (${result.error?.message ?? `exit ${result.status}`}); route types such as LayoutProps may be missing.`];
 }
 
 const SCRIPT_CHECK_TITLES: Record<string, string> = {
@@ -408,6 +518,8 @@ export async function runVerify(
       checks.push(await runDriftCheck(projectRoot));
     } else if (id === "typecheck") {
       checks.push(runTypecheckCheck(projectRoot));
+    } else if (id === "backend-build") {
+      checks.push(runBackendBuildCheck(projectRoot));
     } else if (id === "build" || id === "lint" || id === "test") {
       checks.push(runScriptCheck(projectRoot, id));
     } else {

package/src/machine/contracts.ts

@@ -23,6 +23,7 @@ export interface MachineErrorResponse {
   ok: false;
   command: string;
   status?: MachineOperationStatus;
+  nextActions?: MachineNextAction[];
   error: {
     code: string;
     message: string;

package/src/machine/errors.ts

@@ -1,16 +1,18 @@
-import type { MachineOperationStatus } from "./contracts";
+import type { MachineNextAction, MachineOperationStatus } from "./contracts";
 
 export class MachineCommandError extends Error {
   readonly code: string;
   readonly details?: unknown;
   readonly status?: MachineOperationStatus;
+  readonly nextActions?: MachineNextAction[];
 
-  constructor(code: string, message: string, details?: unknown, status?: MachineOperationStatus) {
+  constructor(code: string, message: string, details?: unknown, status?: MachineOperationStatus, nextActions?: MachineNextAction[]) {
     super(message);
     this.name = "MachineCommandError";
     this.code = code;
     this.details = details;
     this.status = status;
+    this.nextActions = nextActions;
   }
 }
 

package/src/machine/index.ts

@@ -58,6 +58,7 @@ function writeMachineError(command: string, error: unknown): void {
     ok: false,
     command,
     status: resolveMachineErrorStatus(error),
+    ...(error instanceof MachineCommandError && error.nextActions?.length ? { nextActions: error.nextActions } : {}),
     error: toMachineError(error),
   };
   writeMachineResponse(response);
@@ -274,7 +275,8 @@ function createMachineProgram(): Command {
     .option("--functions-dir <dir>", "Functions directory", "functions")
     .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)
-    .action(async (model: string, options: { functionsDir?: string; apiDir?: string; apiOnly?: boolean }) => {
+    .option("--skip-infra", "Do not create or update anything under infra/ (container migration is reported as pending)", false)
+    .action(async (model: string, options: { functionsDir?: string; apiDir?: string; apiOnly?: boolean; skipInfra?: boolean }) => {
       await handleMachineAction("generate-scaffold", async () => {
         ensureProjectForMachine();
         return runMachineScaffoldOperation({
@@ -282,6 +284,7 @@ function createMachineProgram(): Command {
         functionsDir: options.functionsDir,
         apiDir: options.apiDir,
         apiOnly: options.apiOnly,
+        skipInfra: options.skipInfra,
       });
       });
     });
@@ -294,7 +297,8 @@ function createMachineProgram(): Command {
     .option("--functions-dir <dir>", "Functions directory", "functions")
     .option("--api-dir <dir>", "BFF routes directory (Next.js: app/api; React: bff)")
     .option("--api-only", "Skip UI components in the plan", false)
-    .action(async (models: string[], options: { functionsDir?: string; apiDir?: string; apiOnly?: boolean }) => {
+    .option("--skip-infra", "Exclude all infra/ changes (container migration) from the plan", false)
+    .action(async (models: string[], options: { functionsDir?: string; apiDir?: string; apiOnly?: boolean; skipInfra?: boolean }) => {
       await handleMachineAction(
         "plan-scaffold",
         async () => {
@@ -307,6 +311,7 @@ function createMachineProgram(): Command {
                 functionsDir: options.functionsDir,
                 apiDir: options.apiDir,
                 apiOnly: options.apiOnly,
+                skipInfra: options.skipInfra,
               })
             );
           }
@@ -316,12 +321,20 @@ function createMachineProgram(): Command {
           const plans = "plans" in data ? data.plans : [data];
           return {
             status: plans.some((planData) => planData.requiresApproval) ? "requires-human" : "complete",
-            nextActions: plans.map((planData) => ({
-              command: `swallowkit machine apply scaffold --plan ${planData.planId}${planData.requiresApproval ? " --approve" : ""}`,
-              description: planData.requiresApproval
-                ? `Apply the plan for ${planData.model} after reviewing the listed conflicts (requires --approve).`
-                : `Apply the plan for ${planData.model}.`,
-            })),
+            nextActions: [
+              ...plans.map((planData) => ({
+                command: `swallowkit machine apply scaffold --plan ${planData.planId}${planData.requiresApproval ? " --approve" : ""}`,
+                description: planData.requiresApproval
+                  ? `Apply the plan for ${planData.model} after reviewing the listed conflicts (requires --approve).`
+                  : `Apply the plan for ${planData.model}.`,
+              })),
+              ...plans
+                .filter((planData) => planData.warnings.some((warning) => warning.startsWith("infra-skipped:")))
+                .map((planData) => ({
+                  command: `swallowkit migrations add-model ${planData.model}`,
+                  description: `Later, when infrastructure changes are allowed, generate only the Cosmos DB container migration for ${planData.model}.`,
+                })),
+            ],
           };
         }
       );
@@ -408,10 +421,11 @@ function createMachineProgram(): Command {
     .option("--functions-dir <dir>", "Functions directory")
     .option("--api-dir <dir>", "API routes directory")
     .option("--api-only", "Skip UI components; still update Functions, BFF routes, OpenAPI, and native schema assets")
+    .option("--skip-infra", "Do not create or update anything under infra/ (container migration is reported as pending)")
     .action(
       async (
         models: string[],
-        options: { plan?: string; approve?: boolean; functionsDir?: string; apiDir?: string; apiOnly?: boolean }
+        options: { plan?: string; approve?: boolean; functionsDir?: string; apiDir?: string; apiOnly?: boolean; skipInfra?: boolean }
       ) => {
         await handleMachineAction(
           "apply-scaffold",
@@ -433,6 +447,7 @@ function createMachineProgram(): Command {
                 functionsDir: options.functionsDir,
                 apiDir: options.apiDir,
                 apiOnly: options.apiOnly,
+                skipInfra: options.skipInfra,
               });
             }
             const results = [];
@@ -444,20 +459,30 @@ function createMachineProgram(): Command {
                   functionsDir: options.functionsDir,
                   apiDir: options.apiDir,
                   apiOnly: options.apiOnly,
+                  skipInfra: options.skipInfra,
                 })
               );
             }
             return { applyType: "scaffold-batch" as const, results };
           },
-          () => ({
-            status: "complete",
-            nextActions: [
-              {
-                command: "swallowkit machine verify project",
-                description: "Verify the project after applying scaffold changes.",
-              },
-            ],
-          })
+          (data) => {
+            const results = "results" in data ? data.results : [data];
+            return {
+              status: "complete",
+              nextActions: [
+                {
+                  command: "swallowkit machine verify project",
+                  description: "Verify the project after applying scaffold changes.",
+                },
+                ...results
+                  .filter((result) => result.warnings.some((warning) => warning.startsWith("infra-skipped:")))
+                  .map((result) => ({
+                    command: `swallowkit migrations add-model ${result.model}`,
+                    description: `The Cosmos DB container migration for ${result.model} is still pending; generate it when infrastructure changes are allowed.`,
+                  })),
+              ],
+            };
+          }
         );
       }
     );
@@ -543,10 +568,10 @@ function createMachineProgram(): Command {
   const verify = new Command("verify");
   verify
     .command("project")
-    .description("Run verification checks (structure, drift, typecheck) with machine-readable evidence")
+    .description("Run verification checks (structure, drift, typecheck, backend-build) with machine-readable evidence")
     .option(
       "--checks <ids>",
-      "Comma-separated check ids to run (structure,drift,typecheck,build,lint,test, plus custom ids from swallowkit.config verify.checks)"
+      "Comma-separated check ids to run (structure,drift,typecheck,backend-build,build,lint,test, plus custom ids from swallowkit.config verify.checks); quote CSV values in PowerShell"
     )
     .option("--compact", "Suppress info-severity findings/violations from evidence to keep agent-facing output small", false)
     .action(async (options: { checks?: string; compact?: boolean }) => {