swallowkit 1.0.0-beta.60 → 1.0.0-beta.61

package/src/cli/commands/scaffold.ts

@@ -221,7 +221,7 @@ export async function scaffoldCommand(options: ScaffoldOptions) {
     console.log(
       `  ${options.apiOnly ? (backendLanguage === "typescript" ? "3" : "4") : (backendLanguage === "typescript" ? "5" : "6")}. Configure CosmosDBConnection in functions/local.settings.json`
     );
-    console.log(`  ${options.apiOnly ? (backendLanguage === "typescript" ? "4" : "5") : (backendLanguage === "typescript" ? "6" : "7")}. Run '${getCommands(detectFromProject()).dlx} swallowkit dev' to test the generated code`);
+    console.log(`  ${options.apiOnly ? (backendLanguage === "typescript" ? "4" : "5") : (backendLanguage === "typescript" ? "6" : "7")}. Run '${getCommands(detectFromProject()).exec} swallowkit dev' to test the generated code`);
   } catch (error: any) {
     console.error("\n❌ Scaffold failed:", error.message);
     process.exit(1);

package/src/cli/index.ts

@@ -109,6 +109,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
     .description("Initialize a new SwallowKit project")
     .option("--template <template>", "Template to use", "default")
     .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")
     .option("--backend-language <language>", "Azure Functions backend language: typescript | csharp | python")
     .option("--cosmos-db-mode <mode>", "Cosmos DB mode: freetier | serverless")
@@ -119,6 +120,7 @@ export function createProgram(devCommandOverride: Command = devCommand): Command
         name: projectName || "swallowkit-app",
         template: options.template,
         nextVersion: options.nextVersion,
+        packageManager: options.packageManager,
         cicd: options.cicd,
         backendLanguage: options.backendLanguage,
         cosmosDbMode: options.cosmosDbMode,

package/src/core/project/agent-instructions.ts

@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import { BackendLanguage } from "../../types";
-import { PackageManager } from "../../utils/package-manager";
+import { PackageManager, getCommands } from "../../utils/package-manager";
 
 export interface AgentInstructionContext {
   projectName: string;
@@ -74,7 +74,7 @@ function getBackendRules(backendLanguage: BackendLanguage): string {
 }
 
 function interpolateTemplate(template: string, context: AgentInstructionContext): string {
-  const runCmd = context.packageManager === "pnpm" ? "pnpm" : "npx";
+  const runCmd = getCommands(context.packageManager).exec;
   const replacements: Record<string, string> = {
     projectName: context.projectName,
     backendLanguageLabel: BACKEND_LANGUAGE_LABELS[context.backendLanguage],

package/src/core/project/agent-templates/AGENTS.md

@@ -500,3 +500,5 @@ Do:
 - keep specifications focused on intent and observable behavior
 - prefer vertical, independently verifiable slices
 - verify before final semantic review
+
+Use `{{pm}}`, the package manager selected for this project. Do not introduce another package manager or lockfile. Use `{{runCmd}} swallowkit` for the project-local CLI. The MCP launcher intentionally resolves `latest` independently.

package/src/core/scaffold/model-parser.ts

@@ -5,6 +5,7 @@
 import * as fs from "fs";
 import { execFileSync } from "child_process";
 import * as path from "path";
+import * as ts from "typescript";
 
 import { ModelConnectorConfig, ModelAuthPolicy } from "../../types";
 
@@ -324,61 +325,36 @@ function mergeNestedSchemaInfo(fields: FieldInfo[], nestedRefs: NestedSchemaRef[
   }
 }
 
-/**
- * ローカル依存ファイルを再帰的にインライン化する（動的インポート用一時スクリプト生成用）。
- * seen によって循環依存を防ぐ。
- * importedNames が指定された場合はその名前の const だけを残し、他を除去する。
- */
-function inlineLocalDeps(
-  filePath: string,
-  importedNames: Set<string> | null,
-  seen: Set<string>
-): string {
-  const resolvedPath = path.resolve(filePath);
-  if (seen.has(resolvedPath)) return '';
-  seen.add(resolvedPath);
-
-  if (!fs.existsSync(resolvedPath)) return '';
-
-  let content = fs.readFileSync(resolvedPath, 'utf8');
-  const fileDir = path.dirname(resolvedPath);
-  const transitiveParts: string[] = [];
-
-  // ローカル（相対）インポートを再帰的にインライン化
-  content = content.replace(
-    /import\s*\{([^}]+)\}\s*from\s*['"](\.[^'"]+)['"]\s*;?/g,
-    (_match: string, _imports: string, importPath: string) => {
-      let depPath = path.resolve(fileDir, importPath);
-      if (!depPath.endsWith('.ts') && !depPath.endsWith('.js')) depPath += '.ts';
-      const inlined = inlineLocalDeps(depPath, null, seen);
-      if (inlined) transitiveParts.push(inlined);
-      return '';
-    }
-  );
-
-  // 外部パッケージのインポートを除去
-  content = content.replace(/import\s+.*?\s+from\s+['"](?!\.).*?['"];?\s*/g, '');
-  // export キーワードを除去
-  content = content.replace(/export\s+(const|type|interface|class|function)\s+/g, '$1 ');
-  // 型宣言を除去（ランタイムでは不要）
-  content = content.replace(/^type\s+\w+\s*=\s*[^;]+;/gm, '');
-  content = content.replace(/^interface\s+\w+\s*\{[\s\S]*?\}/gm, '');
-  // コメントを除去
-  content = content.replace(/\/\*[\s\S]*?\*\//g, '');
-  content = content.replace(/\/\/.*/g, '');
-
-  // 直接インポートされていない const 宣言を除去（displayName 等の重複を防ぐ）
-  if (importedNames) {
-    content = content.replace(/^const\s+(\w+)\s*=\s*[^;]+;/gm, (constMatch: string, varName: string) => {
-      return importedNames.has(varName) ? constMatch : '';
-    });
-  }
-
-  return [...transitiveParts, content.trim()].filter(Boolean).join('\n\n');
-}
-
-function resolveBundledTsxCliPath(): string {
-  return require.resolve("tsx/cli");
+function compileModelModule(modelPath: string, directory: string, modules = new Map<string, string>()): string {
+  const sourcePath = path.resolve(modelPath);
+  const existing = modules.get(sourcePath);
+  if (existing) return existing;
+  const outputPath = path.join(directory, `model-${modules.size}.mjs`);
+  modules.set(sourcePath, outputPath);
+  const output = ts.transpileModule(fs.readFileSync(sourcePath, "utf8"), {
+    fileName: sourcePath,
+    compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.ESNext },
+    transformers: {
+      after: [context => source => {
+        const visit: ts.Visitor = node => {
+          if (ts.isStringLiteral(node) &&
+              (ts.isImportDeclaration(node.parent) || ts.isExportDeclaration(node.parent)) &&
+              node.text.startsWith(".")) {
+            const base = path.resolve(path.dirname(sourcePath), node.text);
+            const candidates = [base.replace(/\.js$/, ".ts"), `${base}.ts`, path.join(base, "index.ts"), base];
+            const dependency = candidates.find(candidate => fs.existsSync(candidate) && fs.statSync(candidate).isFile());
+            if (!dependency) throw new Error(`Cannot resolve ${node.text} from ${sourcePath}`);
+            const compiled = compileModelModule(dependency, directory, modules);
+            return context.factory.createStringLiteral(`./${path.basename(compiled)}`);
+          }
+          return ts.visitEachChild(node, visit, context);
+        };
+        return ts.visitNode(source, visit) as ts.SourceFile;
+      }],
+    },
+  });
+  fs.writeFileSync(outputPath, output.outputText);
+  return outputPath;
 }
 
 /**
@@ -386,53 +362,9 @@ function resolveBundledTsxCliPath(): string {
  */
 async function extractFieldsFromSchema(modelPath: string, schemaName: string): Promise<FieldInfo[]> {
   const fields: FieldInfo[] = [];
+  let tempDirectory: string | undefined;
   
   try {
-    // モデルファイルの内容を読み込む
-    let modelContent = fs.readFileSync(modelPath, 'utf8');
-    const modelDir = path.dirname(path.resolve(modelPath));
-    
-    // ローカル相対インポートを再帰的にインライン化して保持
-    // パターン: import { categorySchema } from './category'
-    const seenPaths = new Set<string>([path.resolve(modelPath)]);
-    const localImports: string[] = [];
-    modelContent = modelContent.replace(
-      /import\s*\{([^}]+)\}\s*from\s*['"](\.[^'"]+)['"]\s*;?/g,
-      (_match: string, imports: string, importPath: string) => {
-        // インポートされた変数名を取得
-        const importedNames = new Set(
-          imports.split(',').map(s => s.trim().split(/\s+as\s+/).pop()!.trim()).filter(s => s.length > 0)
-        );
-
-        // 相対パスを絶対パスに解決
-        let resolvedPath = path.resolve(modelDir, importPath);
-        if (!resolvedPath.endsWith('.ts') && !resolvedPath.endsWith('.js')) {
-          resolvedPath += '.ts';
-        }
-
-        // 推移的なローカル依存を含めて再帰的にインライン化
-        const inlined = inlineLocalDeps(resolvedPath, importedNames, seenPaths);
-        if (inlined) localImports.push(inlined);
-        return ''; // 元のインポート文は除去
-      }
-    );
-    
-    // zod 以外のパッケージインポートを除去
-    modelContent = modelContent.replace(/import\s+.*?\s+from\s+['"].*?['"];?\s*/g, '');
-    modelContent = modelContent.replace(/export\s+(const|type|interface|class|function)\s+/g, '$1 ');
-    // type宣言を削除（ランタイムでは不要）
-    modelContent = modelContent.replace(/^type\s+\w+\s*=\s*[^;]+;/gm, '');
-    // interface宣言を削除（ランタイムでは不要、複数行対応）
-    modelContent = modelContent.replace(/^interface\s+\w+\s*\{[\s\S]*?\}/gm, '');
-    // コメントを削除
-    modelContent = modelContent.replace(/\/\*[\s\S]*?\*\//g, '');
-    modelContent = modelContent.replace(/\/\/.*/g, '');
-    // TypeScript の `as const` アサーションを削除（.mjs では構文エラーになる）
-    modelContent = modelContent.replace(/\s+as\s+const\b/g, '');
-    
-    // インライン化したローカルインポートを先頭に追加
-    const inlinedDeps = localImports.length > 0 ? localImports.join('\n\n') + '\n\n' : '';
-    
     // プロジェクトルートを探す（package.jsonがある場所）
     let projectRoot = path.dirname(modelPath);
     while (projectRoot !== path.dirname(projectRoot)) {
@@ -443,16 +375,11 @@ async function extractFieldsFromSchema(modelPath: string, schemaName: string): P
     }
     
     // プロジェクトルート内に一時スクリプトファイルを作成
-    const tempScript = path.join(projectRoot, `.swallowkit-parser-${Date.now()}.mjs`);
+    tempDirectory = fs.mkdtempSync(path.join(projectRoot, '.swallowkit-parser-'));
+    const compiledModel = compileModelModule(modelPath, tempDirectory);
+    const tempScript = path.join(tempDirectory, 'inspect.mjs');
     const scriptCode = `
-import { z } from 'zod/v4';
-
-// インライン化した依存スキーマ
-${inlinedDeps}
-// モデルファイルの内容を評価
-${modelContent}
-
-const schema = ${schemaName};
+  import { ${schemaName} as schema } from './${path.basename(compiledModel)}';
 
 // Zod v3とv4の両方に対応
 const isObject = (schema && schema._def && 
@@ -501,7 +428,7 @@ if (isObject) {
     // ZodArray をチェック
     if (getTypeName(fieldDef) === 'ZodArray') {
       isArray = true;
-      fieldDef = fieldDef._def.type || fieldDef._def.element;
+      fieldDef = fieldDef._def.element || fieldDef._def.type;
     }
     
     // 基本型を判定
@@ -552,8 +479,7 @@ if (isObject) {
     fs.writeFileSync(tempScript, scriptCode, 'utf8');
     
     try {
-      const tsxCliPath = resolveBundledTsxCliPath();
-      const result = execFileSync(process.execPath, [tsxCliPath, tempScript], {
+      const result = execFileSync(process.execPath, [tempScript], {
         encoding: 'utf8',
         cwd: projectRoot,
       });
@@ -573,10 +499,11 @@ if (isObject) {
       }
     }
   } catch (error) {
-    // tsxが使えない場合は正規表現フォールバック
     console.warn('Failed to use dynamic import, falling back to regex parsing');
     console.warn('Error:', error);
     return extractFieldsWithRegex(modelPath, schemaName);
+  } finally {
+    if (tempDirectory) fs.rmSync(tempDirectory, { recursive: true, force: true });
   }
   
   return fields;

package/src/utils/package-manager.ts

@@ -30,13 +30,13 @@ export interface PackageManagerCommands {
   dlx: string;
   /** Run a script: "pnpm run" / "npm run" */
   run: string;
-  /** Run a script with filter: "pnpm run --filter <ws>" / "npm run --workspace=<ws>" */
+  /** Run a script with filter: "pnpm --filter <ws> run" / "npm run --workspace=<ws>" */
   runFilter: (workspace: string) => string;
   /** Start script: "pnpm start" / "npm start" */
   start: string;
   /** Install production only (in temp dir for CI): "pnpm install --prod" / "npm install --omit=dev" */
   installProd: string;
-  /** create-next-app flag: "--use-pnpm" / (none for npm) */
+  /** create-next-app flag: "--use-pnpm" / "--use-npm" */
   createNextAppFlag: string | null;
 }
 
@@ -55,9 +55,9 @@ export function getCommands(pm: PackageManager): PackageManagerCommands {
       exec: "pnpm exec",
       dlx: "pnpm dlx",
       run: "pnpm run",
-      runFilter: (ws) => `pnpm run --filter ${ws}`,
+      runFilter: (ws) => `pnpm --filter ${ws} run`,
       start: "pnpm start",
-      installProd: "pnpm install --prod",
+      installProd: "pnpm install --prod --no-frozen-lockfile",
       createNextAppFlag: "--use-pnpm",
     };
   }
@@ -76,22 +76,19 @@ export function getCommands(pm: PackageManager): PackageManagerCommands {
     runFilter: (ws) => `npm run --workspace=${ws}`,
     start: "npm start",
     installProd: "npm install --omit=dev",
-    createNextAppFlag: null,
+    createNextAppFlag: "--use-npm",
   };
 }
 
 /**
  * Detect the preferred package manager for new project initialisation.
  *
- * Strategy (pnpm-preferred):
- *   1. If pnpm is installed on the system → always use pnpm
- *      (even when invoked via `npx`, since `npx` is often used out of habit)
- *   2. Otherwise → npm
- *
- * This is intentionally independent of `npm_config_user_agent` so that
- * `npx swallowkit init` still creates a pnpm project when pnpm is available.
+ * Honor the invoking package manager before falling back to available binaries.
  */
 export function detectFromUserAgent(pnpmIsInstalled: () => boolean = isPnpmInstalled): PackageManager {
+  const agent = process.env.npm_config_user_agent || "";
+  if (agent.startsWith("pnpm/")) return "pnpm";
+  if (agent.startsWith("npm/")) return "npm";
   return pnpmIsInstalled() ? "pnpm" : "npm";
 }
 
@@ -111,11 +108,18 @@ function isPnpmInstalled(): boolean {
  * Detect the package manager used in an existing project directory
  * by checking for lockfiles.
  *
- * Priority: pnpm-lock.yaml > package-lock.json > fallback to detectFromUserAgent()
+ * Priority: explicit project metadata > lockfiles > workspace config > invocation/binaries
  */
 export function detectFromProject(projectDir?: string): PackageManager {
   const dir = projectDir || process.cwd();
 
+  const manifestPath = path.join(dir, "package.json");
+  if (fs.existsSync(manifestPath)) {
+    const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
+    const manager = manifest.devEngines?.packageManager?.name || manifest.packageManager?.split("@")[0];
+    if (manager === "npm" || manager === "pnpm") return manager;
+  }
+
   if (fs.existsSync(path.join(dir, "pnpm-lock.yaml"))) {
     return "pnpm";
   }
@@ -124,6 +128,7 @@ export function detectFromProject(projectDir?: string): PackageManager {
   }
 
   // No lockfile found — fall back to user agent detection
+  if (fs.existsSync(path.join(dir, "pnpm-workspace.yaml"))) return "pnpm";
   return detectFromUserAgent();
 }
 
@@ -151,7 +156,7 @@ export function getWorkspaceConfig(pm: PackageManager, workspaces: string[]) {
       /** pnpm uses pnpm-workspace.yaml */
       type: "file" as const,
       filename: "pnpm-workspace.yaml",
-      content: `packages:\n${workspaces.map((w) => `  - ${w}`).join("\n")}\n`,
+      content: `packages:\n${workspaces.map((w) => `  - ${w}`).join("\n")}\nallowBuilds:\n  protobufjs: false\n  unrs-resolver: false\n`,
     };
   }
 
@@ -171,7 +176,7 @@ export function getCiSetupStep(pm: PackageManager): string {
     return `      - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: latest`;
+          version: 11`;
   }
   // npm: no extra setup needed (comes with Node.js)
   return "";
@@ -199,7 +204,7 @@ export function getAzurePipelinesSetup(pm: PackageManager): string {
   if (pm === "pnpm") {
     return `  - script: |
       corepack enable
-      corepack prepare pnpm@latest --activate
+      corepack prepare pnpm@11 --activate
     displayName: 'Setup pnpm'`;
   }
   // npm: no extra step needed
@@ -213,7 +218,7 @@ export function getBuildScript(pm: PackageManager): string {
   const copyStandaloneAssets = `node -e "const fs=require('fs');fs.mkdirSync('.next/standalone/.next',{recursive:true});if(fs.existsSync('.next/static'))fs.cpSync('.next/static','.next/standalone/.next/static',{recursive:true});if(fs.existsSync('public'))fs.cpSync('public','.next/standalone/public',{recursive:true});"`;
 
   if (pm === "pnpm") {
-    return `pnpm run --filter shared build && next build --webpack && ${copyStandaloneAssets}`;
+    return `pnpm --filter shared run build && next build --webpack && ${copyStandaloneAssets}`;
   }
   return `npm run --workspace=shared build && next build --webpack && ${copyStandaloneAssets}`;
 }