swallowkit 2.0.0-alpha.3 → 2.0.0-alpha.4

package/src/core/project/boundaries.ts

@@ -10,7 +10,9 @@
  * - shared:        マーカー区切りの共有領域。マーカー内は SwallowKit、外は自由。
  */
 
+import { getBackendLanguage } from "../config";
 import { ArtifactOwnership } from "../operations/file-session";
+import { BackendLanguage } from "../../types";
 import { inspectArtifacts } from "./artifacts";
 
 export type BoundaryZone = "deterministic" | "ai-authored" | "shared";
@@ -48,6 +50,8 @@ export interface BoundaryArtifact {
 export interface BoundariesContract {
   contractVersion: number;
   summary: string;
+  /** backend.language the convention rules were resolved for */
+  backendLanguage: BackendLanguage;
   ownershipPolicies: OwnershipPolicy[];
   /** 台帳に載っていないパスの既定規約 */
   conventionRules: BoundaryPathRule[];
@@ -92,7 +96,7 @@ export const OWNERSHIP_POLICIES: OwnershipPolicy[] = [
   },
 ];
 
-export const CONVENTION_RULES: BoundaryPathRule[] = [
+const COMMON_LEADING_RULES: BoundaryPathRule[] = [
   {
     pattern: ".swallowkit/",
     zone: "deterministic",
@@ -107,16 +111,25 @@ export const CONVENTION_RULES: BoundaryPathRule[] = [
       "Zod model schemas — the single source of truth. AI/developers author these freely; deterministic generation derives everything else from them.",
   },
   {
-    pattern: "infra/main.bicep",
-    zone: "shared",
-    editPolicy: "edit-outside-markers",
-    description: "SwallowKit inserts container modules; other infrastructure edits are free.",
+    pattern: "infra/migrations/manifest.json",
+    zone: "deterministic",
+    editPolicy: "never-hand-edit",
+    description:
+      "Infrastructure migration ledger with baseline checksums. Updated by scaffold, `swallowkit migrations add-model`, and `swallowkit create-migration`.",
   },
   {
-    pattern: "functions/function_app.py",
-    zone: "shared",
-    editPolicy: "edit-outside-markers",
-    description: "SwallowKit appends blueprint registrations under its marker; other edits are free.",
+    pattern: "infra/migrations/",
+    zone: "ai-authored",
+    editPolicy: "free-edit",
+    description:
+      "Versioned Bicep migrations. Edit a migration only before it is provisioned; never change an applied migration — add a new one with `swallowkit create-migration <slug>`.",
+  },
+  {
+    pattern: "infra/",
+    zone: "deterministic",
+    editPolicy: "never-hand-edit",
+    description:
+      "Baseline infrastructure (main.bicep and modules) whose checksums are recorded in infra/migrations/manifest.json. Hand edits block scaffold with baseline-drift; add resources through a new migration instead.",
   },
   {
     pattern: "shared/index.ts",
@@ -124,15 +137,40 @@ export const CONVENTION_RULES: BoundaryPathRule[] = [
     editPolicy: "edit-outside-markers",
     description: "SwallowKit appends model exports; other exports may be added freely.",
   },
-  {
-    pattern: "*",
-    zone: "ai-authored",
-    editPolicy: "free-edit",
-    description:
-      "Any path not recorded in the artifact ledger is AI/developer-authored. Business logic, custom pages, custom Functions, and tests belong here.",
-  },
 ];
 
+/** Backend files that SwallowKit appends to; C# and TypeScript discover functions without a registration file. */
+const BACKEND_EXTENSION_RULES: Record<BackendLanguage, BoundaryPathRule[]> = {
+  python: [
+    {
+      pattern: "functions/function_app.py",
+      zone: "shared",
+      editPolicy: "edit-outside-markers",
+      description: "SwallowKit appends blueprint registrations under its marker; other edits are free.",
+    },
+    {
+      pattern: "functions/requirements.txt",
+      zone: "shared",
+      editPolicy: "free-edit",
+      description: "SwallowKit appends connector driver requirements when connector models are scaffolded; keep those lines and edit other requirements freely.",
+    },
+  ],
+  csharp: [],
+  typescript: [],
+};
+
+const FALLBACK_RULE: BoundaryPathRule = {
+  pattern: "*",
+  zone: "ai-authored",
+  editPolicy: "free-edit",
+  description:
+    "Any path not recorded in the artifact ledger is AI/developer-authored. Business logic, custom pages, custom Functions, and tests belong here.",
+};
+
+export function buildConventionRules(backendLanguage: BackendLanguage): BoundaryPathRule[] {
+  return [...COMMON_LEADING_RULES, ...BACKEND_EXTENSION_RULES[backendLanguage], FALLBACK_RULE];
+}
+
 const POLICY_BY_OWNERSHIP = new Map(OWNERSHIP_POLICIES.map((policy) => [policy.ownership, policy] as const));
 
 export const BOUNDARY_GUIDANCE: string[] = [
@@ -143,7 +181,10 @@ export const BOUNDARY_GUIDANCE: string[] = [
   "Run `swallowkit machine verify project` after applying changes; use `explain failure` to get repair evidence.",
 ];
 
-export function inspectBoundaries(projectRoot: string = process.cwd()): BoundariesContract {
+export function inspectBoundaries(
+  projectRoot: string = process.cwd(),
+  backendLanguage: BackendLanguage = getBackendLanguage()
+): BoundariesContract {
   const inspected = inspectArtifacts(projectRoot);
 
   const artifacts: BoundaryArtifact[] = inspected.artifacts.map((artifact) => {
@@ -162,8 +203,9 @@ export function inspectBoundaries(projectRoot: string = process.cwd()): Boundari
     contractVersion: 1,
     summary:
       "SwallowKit separates deterministic generation (models → CRUD/BFF/UI/infra via plan/apply) from AI free-form authoring (models, business logic, custom code). This contract tells agents which files belong to which side.",
+    backendLanguage,
     ownershipPolicies: OWNERSHIP_POLICIES,
-    conventionRules: CONVENTION_RULES,
+    conventionRules: buildConventionRules(backendLanguage),
     artifacts,
     guidance: BOUNDARY_GUIDANCE,
   };

package/src/core/project/capabilities.ts

@@ -53,6 +53,7 @@ export interface CapabilitiesContract {
   sharedModels: {
     idFieldRule: string;
     buildNote: string;
+    nativeSchemaMapping: string[];
   };
   seeding: {
     createTemplates: string;
@@ -109,6 +110,14 @@ export function inspectCapabilities(): CapabilitiesContract {
         format:
           "export const authPolicy = { roles: ['admin'] };\n// or per-operation:\nexport const authPolicy = { read: ['user'], write: ['admin'] };\n// or a named policy:\nexport const authPolicy = { policy: 'adminOnly' };",
       },
+      {
+        name: "references",
+        required: false,
+        description:
+          "Explicit foreign keys used by generated UI lookups. Without it, a string field named <model>Id is treated as a foreign key only when shared/models contains that model (userId -> User only if user.ts exists). Map a field to false to disable inference. References to missing models are ignored with a reference-model-not-found warning.",
+        format: "export const references = { authorId: 'User', legacyId: false };",
+        notes: ["Only single string id fields can reference a model.", "No lookup UI, fetch, or OpenAPI reference is generated for fields that do not reference an existing model."],
+      },
       {
         name: "connectorConfig",
         required: false,
@@ -174,6 +183,7 @@ export function inspectCapabilities(): CapabilitiesContract {
       ],
       notGuaranteed: [
         "Owner scoping: generated CRUD does NOT restrict rows to the authenticated principal. Any authenticated caller passing the policy can read/write any document.",
+        "Without authentication, plan scaffold reports user-scoped-data-without-auth when the partition key or an owner-like field (userId, learnerId, ownerId, ...) suggests per-user data.",
       ],
       guidance: [
         "For multi-user data where users may only touch their own records, add ai-authored custom endpoints that derive the scoping key (e.g. learnerId) from the verified principal — never from the request body — and restrict generated write endpoints to admin roles or disable them.",
@@ -181,6 +191,14 @@ export function inspectCapabilities(): CapabilitiesContract {
     },
     sharedModels: {
       idFieldRule: "id: z.string() (required). createdAt/updatedAt: z.string().optional(). The backend owns their values.",
+      nativeSchemaMapping: [
+        "C#/Python schema assets derive types from Zod, never from field names: z.string() -> string/str (including createdAt/updatedAt).",
+        "Date types only when declared: z.iso.datetime() -> DateTime/datetime, z.iso.date() -> DateOnly/date, z.date() -> DateTime/datetime.",
+        "z.number() -> double / float|int; z.number().int() or z.int() -> long / int.",
+        "Inline z.object({...}) fields become named classes <Model><Field> (e.g. ProbeItemNested); imported model schemas keep their own class.",
+        "min/max/length/nonempty/regex/int/gt/gte/lt/lte/positive/nonnegative and array min/max are enforced by C# IValidatableObject.Validate and Python Field bounds/validators. Regexes use search semantics like Zod.",
+        "String formats (email/uuid/url), refinements, and transforms are not re-implemented natively; the BFF Zod schemas remain the authoritative validation.",
+      ],
       buildNote:
         "verify typecheck resolves the shared package from its built dist/. SwallowKit rebuilds shared automatically during verify; when typechecking manually, build the shared package first (errors like \"no exported member\" usually mean a stale dist).",
     },
@@ -193,10 +211,12 @@ export function inspectCapabilities(): CapabilitiesContract {
       "inspect project | entities | routes | artifacts | boundaries | infra | drift | capabilities",
       "validate project",
       "generate model <names...> | generate scaffold <model>",
-      "plan scaffold <models...> | plan auth --provider <p> [--scheme <name>] [--allowed-providers <csv>] | plan provision -g <rg> --location <loc> --swa-location <loc> [--adopt-existing --baseline 0 --what-if] [--reconcile --what-if]",
-      "apply scaffold [models...] --plan <id> [--approve] | apply auth --plan <id> [--approve] | apply provision --plan <id> --approve",
+      "plan scaffold <models...> [--api-only] [--skip-infra] | plan auth --provider <p> [--scheme <name>] [--allowed-providers <csv>] | plan provision -g <rg> --location <loc> --swa-location <loc> [--adopt-existing --baseline 0 --what-if] [--reconcile --what-if]",
+      "apply scaffold [models...] --plan <id> [--approve] [--skip-infra] | apply auth --plan <id> [--approve] | apply provision --plan <id> --approve",
       "verify project [--checks <ids>] [--compact]",
       "explain failure [--check <id>]",
+      "(regular CLI) migrations add-model <model> [--dry-run] — generate only the container migration after scaffold --skip-infra",
+      "(regular CLI) configure-mcp [--version auto|latest|<semver>] — re-select the MCP launcher version in .mcp.json",
     ],
     verifyChecks: {
       defaultChecks: ["structure", "drift", "typecheck"],

package/src/core/project/mcp-config.ts

@@ -0,0 +1,84 @@
+/**
+ * Project-scoped MCP launcher version management.
+ *
+ * `.mcp.json` intentionally resolves `swallowkit@latest` so that projects created
+ * with older releases still get the current stable tools. A prerelease project can
+ * be newer than `latest`; in that case the launcher is pinned to the project
+ * version until a stable release that understands project-aware delegation catches up.
+ */
+
+import { spawnSync } from "child_process";
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import { compareSemver, isPrerelease, parseSemver } from "../../utils/semver";
+
+export const MCP_CONFIG_PATH = ".mcp.json";
+export const MCP_VERSION_ENV = "SWALLOWKIT_MCP_VERSION";
+export const MCP_LATEST = "latest";
+
+export interface McpPinDecision {
+  version: string;
+  reason: string;
+}
+
+/**
+ * Decide the SWALLOWKIT_MCP_VERSION value for a project that uses `projectVersion`.
+ * Uses `latest` unless the project version is newer than the published `latest`.
+ * When the registry could not be reached, prereleases are pinned conservatively.
+ */
+export function resolveMcpPinVersion(projectVersion: string, publishedLatest: string | null): McpPinDecision {
+  if (!parseSemver(projectVersion)) {
+    return { version: MCP_LATEST, reason: `Project version ${projectVersion} is not a valid semantic version.` };
+  }
+  if (publishedLatest && parseSemver(publishedLatest)) {
+    const comparison = compareSemver(projectVersion, publishedLatest)!;
+    return comparison > 0
+      ? { version: projectVersion, reason: `Project version ${projectVersion} is newer than published latest ${publishedLatest}.` }
+      : { version: MCP_LATEST, reason: `Published latest ${publishedLatest} is the same as or newer than project version ${projectVersion}.` };
+  }
+  return isPrerelease(projectVersion)
+    ? { version: projectVersion, reason: `Published latest is unknown; prerelease ${projectVersion} is pinned so MCP matches the project.` }
+    : { version: MCP_LATEST, reason: "Published latest is unknown; stable projects keep latest." };
+}
+
+export function lookupPublishedLatestVersion(packageName: string, timeoutMs = 15000): string | null {
+  // Run outside the project so its devEngines/packageManager policy does not reject npm.
+  const result = spawnSync("npm", ["view", `${packageName}@latest`, "version"], {
+    cwd: os.tmpdir(),
+    encoding: "utf8",
+    timeout: timeoutMs,
+    shell: process.platform === "win32",
+    stdio: ["ignore", "pipe", "ignore"],
+  });
+  if (result.error || result.status !== 0) return null;
+  const version = String(result.stdout).trim().split(/\s+/).pop() ?? "";
+  return parseSemver(version) ? version : null;
+}
+
+export function readMcpConfigVersion(projectDir: string): string | null {
+  const configPath = path.join(projectDir, MCP_CONFIG_PATH);
+  if (!fs.existsSync(configPath)) return null;
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+    const value = config?.mcpServers?.swallowkit?.env?.[MCP_VERSION_ENV];
+    return typeof value === "string" ? value : null;
+  } catch {
+    return null;
+  }
+}
+
+/** Update only the SwallowKit MCP version in .mcp.json, preserving all other content. */
+export function writeMcpConfigVersion(projectDir: string, version: string): void {
+  const configPath = path.join(projectDir, MCP_CONFIG_PATH);
+  if (!fs.existsSync(configPath)) {
+    throw new Error(`${MCP_CONFIG_PATH} was not found. Run this command from a SwallowKit project root.`);
+  }
+  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  const server = config?.mcpServers?.swallowkit;
+  if (!server || typeof server !== "object") {
+    throw new Error(`${MCP_CONFIG_PATH} does not define mcpServers.swallowkit.`);
+  }
+  server.env = { ...(server.env ?? {}), [MCP_VERSION_ENV]: version };
+  fs.writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`);
+}

package/src/core/project/workflows.ts

@@ -52,9 +52,16 @@ Goal: add a data model and derive CRUD/BFF/UI/infra deterministically.
 1. Create the model file (deterministic template):
    \`${runCmd} swallowkit machine generate model <name> --overwrite never\`
 2. Edit \`shared/models/<name>.ts\` — add domain fields (free-form authoring).
+   - Native C#/Python types follow Zod, not names: \`z.iso.datetime()\` for dates, \`z.number().int()\` for integers.
+   - \`<model>Id\` fields reference a model only when it exists in \`shared/models\`; otherwise declare
+     \`export const references = { fieldId: 'Model' }\` (or \`false\` to opt out).
 3. Compute the change plan (writes nothing):
    \`${runCmd} swallowkit machine plan scaffold <name>\`
    - \`status: "requires-human"\` → review \`data.conflicts\`; only proceed with \`--approve\` if overwriting is intended.
+   - Must not change Bicep/infrastructure? Add \`--skip-infra\` to plan and apply. Nothing under \`infra/\` changes and
+     the plan warns \`infra-skipped\`; later run \`${runCmd} swallowkit migrations add-model <name>\` to add only the container migration.
+   - Read \`data.warnings\`. \`user-scoped-data-without-auth\` means generated CRUD would expose every user's documents;
+     add auth (\`swallowkit-add-auth\`) and owner-scoped ai-authored endpoints before exposing the model.
 4. Apply:
    \`${runCmd} swallowkit machine apply scaffold --plan <planId>\`
 5. Verify:
@@ -247,7 +254,8 @@ under \`.github/skills/\` so skills-aware agents load them automatically.
 
 - **ai-authored** (write freely): \`shared/models/\`, business logic, custom pages/components, tests.
 - **deterministic** (never hand-edit): artifacts generated by SwallowKit (see \`.swallowkit/artifacts.json\`) and \`.swallowkit/\` metadata. Change models/config and regenerate via plan/apply.
-- **shared** (edit outside markers): \`infra/main.bicep\`, \`functions/function_app.py\`, \`shared/index.ts\`.
+- **shared** (edit outside markers): \`shared/index.ts\`, plus backend registration files for the configured language (Python: \`functions/function_app.py\`).
+- **infrastructure**: baseline \`infra/\` files are checksum-locked by \`infra/migrations/manifest.json\`; add resources as new migrations (\`swallowkit create-migration <slug>\`, \`swallowkit migrations add-model <model>\`).
 
 Full machine-readable contract: \`${runCmd} swallowkit machine inspect boundaries\`
 `,