swallowkit 1.0.0-beta.55 → 1.0.0-beta.56

package/src/cli/commands/scaffold.ts

@@ -44,6 +44,14 @@ import {
 } from "../../types";
 import { syncProjectManifest } from "../../core/project/manifest";
 import { generateBFFCallFunctionWithAuth, generateBFFCallFunctionWithMultipleAuth, generateBFFCallFunctionWithSwaAuth, generateNamedAuthRouterCSharp, generateNamedAuthRouterPython, generateNamedAuthRouterTS } from "../../core/scaffold/auth-generator";
+import {
+  FileOperationSession,
+  getActiveFileSession,
+  hashFileIfExists,
+} from "../../core/operations/file-session";
+import { recordSessionOperations } from "../../core/project/artifacts";
+
+const SCAFFOLD_GENERATOR = "scaffold";
 
 interface ScaffoldOptions {
   model: string; // モデルファイルのパス（例: "lib/models/todo.ts" or "todo"）
@@ -79,6 +87,9 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
   const configValidation = validateConfig(getFullConfig());
   if (!configValidation.valid) throw new Error(`Invalid SwallowKit configuration:\n${configValidation.errors.map(error => `- ${error}`).join("\n")}`);
 
+  // Plan(dry-run) や Apply からセッションが供給される。単体実行時は commit セッションを生成。
+  const session = getActiveFileSession() ?? new FileOperationSession("commit");
+
   console.log("🏗️  SwallowKit Scaffold: Generating CRUD operations...\n");
 
   try {
@@ -130,32 +141,38 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
     }
 
     // 5. Generate BFF callFunction helper
-    await generateCallFunctionHelper();
+    await generateCallFunctionHelper(session);
 
     // 6. Generate Azure Functions code
     if (isConnectorModel) {
-      await generateConnectorFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage);
+      await generateConnectorFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage, session);
       // 6b. Install connector driver dependencies
-      await installConnectorDriverDependencies(modelInfo, functionsDir, backendLanguage);
+      await installConnectorDriverDependencies(modelInfo, functionsDir, backendLanguage, session);
     } else {
-      await generateFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage);
+      await generateFunctionsCode(modelInfo, functionsDir, sharedPackageName, backendLanguage, session);
 
       if (backendLanguage !== "typescript") {
-        await generateLanguageSchemaArtifacts(relatedModels, modelInfo, functionsDir, backendLanguage);
+        if (session.mode === "collect") {
+          session.addWarning(
+            `external-codegen: ${functionsDir}/openapi and ${functionsDir}/generated are regenerated by external tooling on apply and are not included in this plan.`
+          );
+        } else {
+          await generateLanguageSchemaArtifacts(relatedModels, modelInfo, functionsDir, backendLanguage);
+        }
       }
     }
 
     // 7. Generate Next.js BFF API Routes
     const apiDir = options.apiDir || "app/api";
     if (isConnectorModel) {
-      await generateConnectorBFFRoutesFiles(modelInfo, apiDir, sharedPackageName);
+      await generateConnectorBFFRoutesFiles(modelInfo, apiDir, sharedPackageName, session);
     } else {
-      await generateBFFRoutes(modelInfo, apiDir, sharedPackageName);
+      await generateBFFRoutes(modelInfo, apiDir, sharedPackageName, session);
     }
 
     // 8. Generate Cosmos DB container Bicep file (skip for connector models)
     if (!isConnectorModel) {
-      await generateCosmosContainer(modelInfo);
+      await generateCosmosContainer(modelInfo, session);
     }
 
     // 9. Generate UI components (unless --api-only)
@@ -166,14 +183,20 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
         uiAuthPolicy && uiAuthConfig && uiAuthConfig.provider !== 'none'
           ? createUIAuthOptions(uiAuthPolicy, uiAuthConfig)
           : undefined;
-      await generateUIComponents(modelInfo, sharedPackageName, uiAuthOptions);
+      await generateUIComponents(modelInfo, sharedPackageName, uiAuthOptions, session);
       if (uiAuthOptions?.authenticatedFetchImport) {
-        applyExternalTokenFetchToGeneratedUi(modelInfo, uiAuthOptions.authenticatedFetchImport);
+        applyExternalTokenFetchToGeneratedUi(modelInfo, session, uiAuthOptions.authenticatedFetchImport);
       }
-      await updateNavigationMenu(modelInfo);
+      await updateNavigationMenu(modelInfo, session);
     }
 
-    await syncProjectManifest();
+    if (session.mode === "commit") {
+      recordSessionOperations(session.operations, {
+        schemaHash: hashFileIfExists(modelPath) ?? undefined,
+        sourceModel: modelInfo.name,
+      });
+      await syncProjectManifest();
+    }
 
     console.log("\n✅ Scaffold completed successfully!");
     console.log("\n📝 Next steps:");
@@ -198,29 +221,27 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
   }
 }
 
-function applyExternalTokenFetchToGeneratedUi(modelInfo: ModelInfo, importPath = '@/lib/auth/authenticated-fetch'): void {
-  const uiRoot = path.join(process.cwd(), 'app', toKebabCase(modelInfo.name));
-  if (!fs.existsSync(uiRoot)) return;
-  const visit = (dir: string): void => {
-    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-      const target = path.join(dir, entry.name);
-      if (entry.isDirectory()) { visit(target); continue; }
-      if (!entry.name.endsWith('.tsx')) continue;
-      let content = fs.readFileSync(target, 'utf-8');
-      if (!content.includes('fetch(')) continue;
-      content = content.replace(/\bfetch\(/g, 'authenticatedFetch(');
-      content = content.replace(
-        /(if \(!res\.ok\) throw new Error\([^\n]+\);)/g,
-        `if (res.status === 401) throw new Error('Authentication required');\n        $1`
-      );
-      if (!content.includes(importPath)) {
-        const directive = content.match(/^'use client';\s*\r?\n/)?.[0] ?? '';
-        content = `${directive}import { authenticatedFetch } from '${importPath}';\n${content.slice(directive.length)}`;
-      }
-      fs.writeFileSync(target, content, 'utf-8');
+function applyExternalTokenFetchToGeneratedUi(modelInfo: ModelInfo, session: FileOperationSession, importPath = '@/lib/auth/authenticated-fetch'): void {
+  const uiPrefix = `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);
+    if (!content.includes('fetch(')) continue;
+    content = content.replace(/\bfetch\(/g, 'authenticatedFetch(');
+    content = content.replace(
+      /(if \(!res\.ok\) throw new Error\([^\n]+\);)/g,
+      `if (res.status === 401) throw new Error('Authentication required');\n        $1`
+    );
+    if (!content.includes(importPath)) {
+      const directive = content.match(/^'use client';\s*\r?\n/)?.[0] ?? '';
+      content = `${directive}import { authenticatedFetch } from '${importPath}';\n${content.slice(directive.length)}`;
     }
-  };
-  visit(uiRoot);
+    session.writeFile(operation.absolutePath, content, {
+      ownership: 'managed',
+      generator: SCAFFOLD_GENERATOR,
+      sourceModel: modelInfo.name,
+    });
+  }
 }
 
 /**
@@ -259,7 +280,7 @@ export function resolveAuthPolicy(modelInfo: ModelInfo, authConfig: AuthConfig |
 /**
  * モデルファイルのパスを解決
  */
-function resolveModelPath(modelInput: string): string {
+export function resolveModelPath(modelInput: string): string {
   const cwd = process.cwd();
 
   // 絶対パスの場合
@@ -327,7 +348,7 @@ function readSharedPackageName(): string {
 /**
  * Generate BFF callFunction helper (lib/api/call-function.ts)
  */
-async function generateCallFunctionHelper(): Promise<void> {
+async function generateCallFunctionHelper(session: FileOperationSession): Promise<void> {
   console.log("\n📦 Generating BFF callFunction helper...");
 
   const cwd = process.cwd();
@@ -335,10 +356,6 @@ async function generateCallFunctionHelper(): Promise<void> {
   const helperDir = path.join(cwd, "lib", "api");
   const helperPath = path.join(helperDir, "call-function.ts");
 
-  if (!fs.existsSync(helperDir)) {
-    fs.mkdirSync(helperDir, { recursive: true });
-  }
-
   // auth 設定がある場合は Authorization ヘッダー転送版を生成
   const authConfig = getAuthConfig();
   const normalizedAuth = normalizeAuthConfig(authConfig);
@@ -353,7 +370,7 @@ async function generateCallFunctionHelper(): Promise<void> {
     helperCode = generateBFFCallFunction();
   }
 
-  fs.writeFileSync(helperPath, helperCode, "utf-8");
+  session.writeFile(helperPath, helperCode, { ownership: "managed", generator: SCAFFOLD_GENERATOR });
   console.log(`✅ Created: ${helperPath}`);
 }
 
@@ -364,7 +381,8 @@ async function generateFunctionsCode(
   modelInfo: ModelInfo,
   functionsDir: string,
   sharedPackageName: string,
-  backendLanguage: BackendLanguage
+  backendLanguage: BackendLanguage,
+  session: FileOperationSession
 ): Promise<void> {
   console.log("\n🔨 Generating Azure Functions CRUD code...");
 
@@ -376,12 +394,12 @@ async function generateFunctionsCode(
   }
 
   const modelKebab = toKebabCase(modelInfo.name);
+  const managedMeta = { ownership: "managed" as const, generator: SCAFFOLD_GENERATOR, sourceModel: modelInfo.name };
   if (backendLanguage === "typescript") {
     const normalizedAuth = getNormalizedAuthConfig();
     if (normalizedAuth && Object.keys(normalizedAuth.schemes).some(name => name !== "default")) {
       const routerPath = path.join(process.cwd(), functionsDir, "src", "auth", "auth-router.ts");
-      fs.mkdirSync(path.dirname(routerPath), { recursive: true });
-      fs.writeFileSync(routerPath, generateNamedAuthRouterTS(normalizedAuth), "utf-8");
+      session.writeFile(routerPath, generateNamedAuthRouterTS(normalizedAuth), { ownership: "managed", generator: SCAFFOLD_GENERATOR });
     }
     const functionFilePath = path.join(
       process.cwd(),
@@ -390,13 +408,8 @@ async function generateFunctionsCode(
       `${modelKebab}.ts`
     );
 
-    const functionDir = path.dirname(functionFilePath);
-    if (!fs.existsSync(functionDir)) {
-      fs.mkdirSync(functionDir, { recursive: true });
-    }
-
     const code = generateCompactAzureFunctionsCRUD(modelInfo, sharedPackageName, authPolicy, authConfig?.provider);
-    fs.writeFileSync(functionFilePath, code, "utf-8");
+    session.writeFile(functionFilePath, code, managedMeta);
     console.log(`✅ Created: ${functionFilePath}`);
     return;
   }
@@ -405,21 +418,19 @@ async function generateFunctionsCode(
     const normalizedAuth = getNormalizedAuthConfig();
     if (normalizedAuth && Object.keys(normalizedAuth.schemes).some(name => name !== "default")) {
       const routerPath = path.join(process.cwd(), functionsDir, "Auth", "AuthRouter.cs");
-      fs.mkdirSync(path.dirname(routerPath), { recursive: true });
-      fs.writeFileSync(routerPath, generateNamedAuthRouterCSharp(normalizedAuth), "utf-8");
+      session.writeFile(routerPath, generateNamedAuthRouterCSharp(normalizedAuth), { ownership: "managed", generator: SCAFFOLD_GENERATOR });
     }
     const crudDir = path.join(process.cwd(), functionsDir, "Crud");
     const functionFilePath = path.join(crudDir, `${modelInfo.name}CrudFunctions.cs`);
-    fs.mkdirSync(crudDir, { recursive: true });
 
     // Remove init-generated template (singular) to avoid route conflicts
     const templatePath = path.join(crudDir, `${modelInfo.name}Function.cs`);
-    if (fs.existsSync(templatePath)) {
-      fs.unlinkSync(templatePath);
+    if (session.fileExists(templatePath)) {
+      session.deleteFile(templatePath, managedMeta);
       console.log(`🗑️  Removed template: ${templatePath}`);
     }
 
-    fs.writeFileSync(functionFilePath, generateCSharpAzureFunctionsCRUD(modelInfo, authPolicy), "utf-8");
+    session.writeFile(functionFilePath, generateCSharpAzureFunctionsCRUD(modelInfo, authPolicy), managedMeta);
     console.log(`✅ Created: ${functionFilePath}`);
     return;
   }
@@ -427,17 +438,15 @@ async function generateFunctionsCode(
   const normalizedAuth = getNormalizedAuthConfig();
   if (normalizedAuth && Object.keys(normalizedAuth.schemes).some(name => name !== "default")) {
     const routerPath = path.join(process.cwd(), functionsDir, "auth", "auth_router.py");
-    fs.mkdirSync(path.dirname(routerPath), { recursive: true });
-    fs.writeFileSync(routerPath, generateNamedAuthRouterPython(normalizedAuth), "utf-8");
+    session.writeFile(routerPath, generateNamedAuthRouterPython(normalizedAuth), { ownership: "managed", generator: SCAFFOLD_GENERATOR });
   }
 
   const blueprintsDir = path.join(process.cwd(), functionsDir, "blueprints");
   const blueprintPath = path.join(blueprintsDir, `${modelKebab.replace(/-/g, "_")}.py`);
-  fs.mkdirSync(blueprintsDir, { recursive: true });
 
   const { blueprint, registration } = generatePythonAzureFunctionsCRUD(modelInfo, authPolicy);
-  fs.writeFileSync(blueprintPath, blueprint, "utf-8");
-  updatePythonFunctionRegistrations(path.join(process.cwd(), functionsDir, "function_app.py"), registration);
+  session.writeFile(blueprintPath, blueprint, managedMeta);
+  updatePythonFunctionRegistrations(path.join(process.cwd(), functionsDir, "function_app.py"), registration, session);
   console.log(`✅ Created: ${blueprintPath}`);
 }
 
@@ -462,7 +471,8 @@ async function generateConnectorFunctionsCode(
   modelInfo: ModelInfo,
   functionsDir: string,
   sharedPackageName: string,
-  backendLanguage: BackendLanguage
+  backendLanguage: BackendLanguage,
+  session: FileOperationSession
 ): Promise<void> {
   console.log("\n🔌 Generating Connector Azure Functions code...");
 
@@ -484,6 +494,7 @@ async function generateConnectorFunctionsCode(
   }
 
   const modelKebab = toKebabCase(modelInfo.name);
+  const connectorManagedMeta = { ownership: "managed" as const, generator: SCAFFOLD_GENERATOR, sourceModel: modelInfo.name };
 
   if (backendLanguage === "typescript") {
     const functionFilePath = path.join(
@@ -492,7 +503,6 @@ async function generateConnectorFunctionsCode(
       "src",
       `${modelKebab}.ts`
     );
-    fs.mkdirSync(path.dirname(functionFilePath), { recursive: true });
 
     let code: string;
     if (connectorDef.type === "rdb") {
@@ -513,7 +523,7 @@ async function generateConnectorFunctionsCode(
       );
     }
 
-    fs.writeFileSync(functionFilePath, code, "utf-8");
+    session.writeFile(functionFilePath, code, connectorManagedMeta);
     console.log(`✅ Created: ${functionFilePath}`);
     return;
   }
@@ -525,7 +535,6 @@ async function generateConnectorFunctionsCode(
       "Connectors",
       `${modelInfo.name}ConnectorFunctions.cs`
     );
-    fs.mkdirSync(path.dirname(functionFilePath), { recursive: true });
 
     let code: string;
     if (connectorDef.type === "rdb") {
@@ -542,7 +551,7 @@ async function generateConnectorFunctionsCode(
       );
     }
 
-    fs.writeFileSync(functionFilePath, code, "utf-8");
+    session.writeFile(functionFilePath, code, connectorManagedMeta);
     console.log(`✅ Created: ${functionFilePath}`);
     return;
   }
@@ -550,7 +559,6 @@ async function generateConnectorFunctionsCode(
   // Python
   const blueprintsDir = path.join(process.cwd(), functionsDir, "blueprints");
   const blueprintPath = path.join(blueprintsDir, `${modelKebab.replace(/-/g, "_")}.py`);
-  fs.mkdirSync(blueprintsDir, { recursive: true });
 
   let result: { blueprint: string; registration: string };
   if (connectorDef.type === "rdb") {
@@ -567,8 +575,8 @@ async function generateConnectorFunctionsCode(
     );
   }
 
-  fs.writeFileSync(blueprintPath, result.blueprint, "utf-8");
-  updatePythonFunctionRegistrations(path.join(process.cwd(), functionsDir, "function_app.py"), result.registration);
+  session.writeFile(blueprintPath, result.blueprint, connectorManagedMeta);
+  updatePythonFunctionRegistrations(path.join(process.cwd(), functionsDir, "function_app.py"), result.registration, session);
   console.log(`✅ Created: ${blueprintPath}`);
 }
 
@@ -579,7 +587,8 @@ async function generateConnectorFunctionsCode(
 async function installConnectorDriverDependencies(
   modelInfo: ModelInfo,
   functionsDir: string,
-  backendLanguage: BackendLanguage
+  backendLanguage: BackendLanguage,
+  session: FileOperationSession
 ): Promise<void> {
   const connectorConfig = modelInfo.connectorConfig!;
   const connectorDef = getConnectorDefinition(connectorConfig.connector);
@@ -607,6 +616,13 @@ async function installConnectorDriverDependencies(
       if (missingDeps.length === 0 && missingDevDeps.length === 0) return;
     }
 
+    if (session.mode === "collect") {
+      session.addWarning(
+        `external-install: ${rdbDef.provider} driver dependencies (${[...entry.deps, ...entry.devDeps].join(", ")}) will be installed into ${functionsDir}/ on apply.`
+      );
+      return;
+    }
+
     console.log(`\n📦 Installing ${rdbDef.provider} driver dependencies...`);
     const pm = detectFromProject(functionsPath);
     const cmds = getCommands(pm);
@@ -629,6 +645,10 @@ async function installConnectorDriverDependencies(
     };
     const pkg = nugetMap[rdbDef.provider];
     if (!pkg) return;
+    if (session.mode === "collect") {
+      session.addWarning(`external-install: NuGet package ${pkg} will be added to ${functionsDir}/functions.csproj on apply.`);
+      return;
+    }
     console.log(`\n📦 Installing ${rdbDef.provider} NuGet package...`);
     runSpawnSyncCommand("dotnet", ["add", path.join(functionsPath, "functions.csproj"), "package", pkg], functionsPath);
     console.log(`✅ ${pkg} installed`);
@@ -644,11 +664,11 @@ async function installConnectorDriverDependencies(
   const pipPkg = pipMap[rdbDef.provider];
   if (!pipPkg) return;
   const reqPath = path.join(functionsPath, "requirements.txt");
-  if (fs.existsSync(reqPath)) {
-    const existing = fs.readFileSync(reqPath, "utf-8");
+  if (session.fileExists(reqPath)) {
+    const existing = session.readFile(reqPath);
     if (!existing.includes(pipPkg)) {
       console.log(`\n📦 Adding ${pipPkg} to requirements.txt...`);
-      fs.appendFileSync(reqPath, `\n${pipPkg}\n`);
+      session.writeFile(reqPath, `${existing}\n${pipPkg}\n`, { ownership: "extension-point", generator: SCAFFOLD_GENERATOR });
       console.log(`✅ ${pipPkg} added`);
     }
   }
@@ -660,7 +680,8 @@ async function installConnectorDriverDependencies(
 async function generateConnectorBFFRoutesFiles(
   modelInfo: ModelInfo,
   apiDir: string,
-  sharedPackageName: string
+  sharedPackageName: string,
+  session: FileOperationSession
 ): Promise<void> {
   console.log("\n🔌 Generating Connector BFF API routes...");
 
@@ -670,13 +691,11 @@ async function generateConnectorBFFRoutesFiles(
   const listRoutePath = path.join(process.cwd(), apiDir, modelCamel, "route.ts");
   const detailRoutePath = path.join(process.cwd(), apiDir, modelCamel, "[id]", "route.ts");
 
-  fs.mkdirSync(path.dirname(listRoutePath), { recursive: true });
-  fs.mkdirSync(path.dirname(detailRoutePath), { recursive: true });
-
   const routes = generateConnectorBFFRoutes(modelInfo, sharedPackageName, operations);
 
-  fs.writeFileSync(listRoutePath, routes.listRoute, "utf-8");
-  fs.writeFileSync(detailRoutePath, routes.detailRoute, "utf-8");
+  const meta = { ownership: "managed" as const, generator: SCAFFOLD_GENERATOR, sourceModel: modelInfo.name };
+  session.writeFile(listRoutePath, routes.listRoute, meta);
+  session.writeFile(detailRoutePath, routes.detailRoute, meta);
 
   console.log(`✅ Created: ${listRoutePath}`);
   console.log(`✅ Created: ${detailRoutePath}`);
@@ -717,12 +736,12 @@ function describeFunctionsOutputPath(functionsDir: string, backendLanguage: Back
   return `${functionsDir}/blueprints/`;
 }
 
-function updatePythonFunctionRegistrations(functionAppPath: string, registration: string): void {
-  if (!fs.existsSync(functionAppPath)) {
+function updatePythonFunctionRegistrations(functionAppPath: string, registration: string, session: FileOperationSession): void {
+  if (!session.fileExists(functionAppPath)) {
     throw new Error(`Python Functions entrypoint not found: ${functionAppPath}`);
   }
 
-  const content = fs.readFileSync(functionAppPath, "utf-8");
+  const content = session.readFile(functionAppPath);
 
   // Check if import line already exists (handles init-generated layout)
   const importLine = registration.split("\n").find((l) => l.startsWith("from ") || l.startsWith("import "));
@@ -739,7 +758,7 @@ function updatePythonFunctionRegistrations(functionAppPath: string, registration
   }
 
   const updated = content.replace(marker, `${registration}\n${marker}`);
-  fs.writeFileSync(functionAppPath, updated, "utf-8");
+  session.writeFile(functionAppPath, updated, { ownership: "extension-point", generator: SCAFFOLD_GENERATOR });
 }
 
 /**
@@ -748,7 +767,8 @@ function updatePythonFunctionRegistrations(functionAppPath: string, registration
 async function generateBFFRoutes(
   modelInfo: any,
   apiDir: string,
-  sharedPackageName: string
+  sharedPackageName: string,
+  session: FileOperationSession
 ): Promise<void> {
   console.log("\n🔨 Generating Next.js BFF API routes...");
 
@@ -771,24 +791,13 @@ async function generateBFFRoutes(
     "route.ts"
   );
 
-  // ディレクトリを作成
-  const listRouteDir = path.dirname(listRoutePath);
-  const detailRouteDir = path.dirname(detailRoutePath);
-
-  if (!fs.existsSync(listRouteDir)) {
-    fs.mkdirSync(listRouteDir, { recursive: true });
-  }
-
-  if (!fs.existsSync(detailRouteDir)) {
-    fs.mkdirSync(detailRouteDir, { recursive: true });
-  }
-
   // コードを生成
   const routes = generateCompactBFFRoutes(modelInfo, sharedPackageName);
 
   // ファイルに書き込み
-  fs.writeFileSync(listRoutePath, routes.listRoute, "utf-8");
-  fs.writeFileSync(detailRoutePath, routes.detailRoute, "utf-8");
+  const meta = { ownership: "managed" as const, generator: SCAFFOLD_GENERATOR, sourceModel: modelInfo.name };
+  session.writeFile(listRoutePath, routes.listRoute, meta);
+  session.writeFile(detailRoutePath, routes.detailRoute, meta);
 
   console.log(`✅ Created: ${listRoutePath}`);
   console.log(`✅ Created: ${detailRoutePath}`);
@@ -797,7 +806,7 @@ async function generateBFFRoutes(
 /**
  * Generate Cosmos DB container Bicep file
  */
-export async function generateCosmosContainer(modelInfo: any): Promise<void> {
+export async function generateCosmosContainer(modelInfo: any, session: FileOperationSession = new FileOperationSession("commit")): Promise<void> {
   console.log("\n🗄️  Generating Cosmos DB container Bicep file...");
 
   const modelKebab = toKebabCase(modelInfo.name);
@@ -811,13 +820,8 @@ export async function generateCosmosContainer(modelInfo: any): Promise<void> {
     return;
   }
 
-  // Check if containers directory exists, if not create it
-  const containersDir = path.join(infraDir, "containers");
-  if (!fs.existsSync(containersDir)) {
-    fs.mkdirSync(containersDir, { recursive: true });
-  }
-
   // Generate container Bicep file
+  const containersDir = path.join(infraDir, "containers");
   const containerFileName = `${modelKebab}-container.bicep`;
   const containerFilePath = path.join(containersDir, containerFileName);
 
@@ -879,26 +883,26 @@ output containerName string = container.name
 `;
 
   // Write Bicep file (overwrite if exists)
-  fs.writeFileSync(containerFilePath, bicepContent, "utf-8");
+  session.writeFile(containerFilePath, bicepContent, { ownership: "managed", generator: SCAFFOLD_GENERATOR, sourceModel: modelInfo.name });
   console.log(`✅ Created: ${containerFilePath}`);
 
   // Update main.bicep to include this container module
-  await updateMainBicepWithContainer(modelKebab, modelPascal);
+  await updateMainBicepWithContainer(modelKebab, modelPascal, session);
 }
 
 /**
  * Update main.bicep to include new container module
  */
-async function updateMainBicepWithContainer(modelKebab: string, modelPascal: string): Promise<void> {
+async function updateMainBicepWithContainer(modelKebab: string, modelPascal: string, session: FileOperationSession): Promise<void> {
   const cwd = process.cwd();
   const mainBicepPath = path.join(cwd, "infra", "main.bicep");
 
-  if (!fs.existsSync(mainBicepPath)) {
+  if (!session.fileExists(mainBicepPath)) {
     console.log("ℹ️  main.bicep not found. Please manually add the container module.");
     return;
   }
 
-  let mainBicepContent = fs.readFileSync(mainBicepPath, "utf-8");
+  let mainBicepContent = session.readFile(mainBicepPath);
 
   // Check if container module already exists
   const containerModuleName = `${modelPascal.charAt(0).toLowerCase()}${modelPascal.slice(1)}Container`;
@@ -950,14 +954,14 @@ module ${containerModuleName} 'containers/${modelKebab}-container.bicep' = {
     containerModule +
     mainBicepContent.slice(insertPosition);
 
-  fs.writeFileSync(mainBicepPath, mainBicepContent, "utf-8");
+  session.writeFile(mainBicepPath, mainBicepContent, { ownership: "extension-point", generator: SCAFFOLD_GENERATOR });
   console.log(`✅ Added container module to main.bicep`);
 }
 
 /**
  * Generate UI components (list, detail, form, create, edit pages)
  */
-export async function generateUIComponents(modelInfo: ModelInfo, sharedPackageName: string, authOptions?: UIAuthOptions): Promise<void> {
+export async function generateUIComponents(modelInfo: ModelInfo, sharedPackageName: string, authOptions?: UIAuthOptions, session: FileOperationSession = new FileOperationSession("commit")): Promise<void> {
   console.log("\n🎨 Generating UI components...");
 
   const modelKebab = toKebabCase(modelInfo.name);
@@ -971,13 +975,6 @@ export async function generateUIComponents(modelInfo: ModelInfo, sharedPackageNa
   const idDir = path.join(modelDir, "[id]");
   const editDir = path.join(idDir, "edit");
 
-  // Create directories
-  [componentsDir, newDir, editDir].forEach(dir => {
-    if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true });
-    }
-  });
-
   // Generate and write files
   const listPage = generateListPage(modelInfo, sharedPackageName, authOptions);
   const detailPage = generateDetailPage(modelInfo, sharedPackageName, authOptions);
@@ -986,13 +983,14 @@ export async function generateUIComponents(modelInfo: ModelInfo, sharedPackageNa
   const editPage = generateEditPage(modelInfo, sharedPackageName, authOptions);
   const authLayout = generateAuthLayout(modelInfo, authOptions);
 
-  fs.writeFileSync(path.join(modelDir, "page.tsx"), listPage, "utf-8");
-  fs.writeFileSync(path.join(idDir, "page.tsx"), detailPage, "utf-8");
-  fs.writeFileSync(path.join(componentsDir, `${modelName}Form.tsx`), formComponent, "utf-8");
-  fs.writeFileSync(path.join(newDir, "page.tsx"), newPage, "utf-8");
-  fs.writeFileSync(path.join(editDir, "page.tsx"), editPage, "utf-8");
+  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);
   if (authLayout) {
-    fs.writeFileSync(path.join(modelDir, "layout.tsx"), authLayout, "utf-8");
+    session.writeFile(path.join(modelDir, "layout.tsx"), authLayout, meta);
   }
 
   console.log(`✅ Created: ${path.join(modelDir, "page.tsx")}`);
@@ -1008,7 +1006,7 @@ export async function generateUIComponents(modelInfo: ModelInfo, sharedPackageNa
 /**
  * Update navigation menu on the homepage
  */
-async function updateNavigationMenu(modelInfo: any): Promise<void> {
+async function updateNavigationMenu(modelInfo: any, session: FileOperationSession): Promise<void> {
   console.log("\n📋 Updating navigation menu...");
 
   const modelKebab = toKebabCase(modelInfo.name);
@@ -1017,13 +1015,13 @@ async function updateNavigationMenu(modelInfo: any): Promise<void> {
   // Update scaffold config
   const configPath = path.join(cwd, "lib", "scaffold-config.ts");
   
-  if (!fs.existsSync(configPath)) {
+  if (!session.fileExists(configPath)) {
     console.log("⚠️  scaffold-config.ts not found. Skipping navigation menu update.");
     return;
   }
 
   // Read existing config
-  const configContent = fs.readFileSync(configPath, "utf-8");
+  const configContent = session.readFile(configPath);
   
   // Parse models array - extract each model entry
   const models: Array<{ name: string; path: string; label: string }> = [];
@@ -1070,6 +1068,7 @@ ${models.map(m => `    { name: '${m.name}', path: '${m.path}', label: '${m.label
 };
 `;
 
-  fs.writeFileSync(configPath, newConfigContent, "utf-8");
+  session.writeFile(configPath, newConfigContent, { ownership: "extension-point", generator: SCAFFOLD_GENERATOR });
   console.log(`✅ Added ${modelInfo.name} to navigation menu`);
 }
+