@topogram/cli 0.3.53 → 0.3.55

package/src/generator/context/shared.js

@@ -58,11 +58,11 @@ function summarizeProjection(projection) {
     kind: projection.kind,
     name: projection.name || projection.id,
     description: projection.description || null,
-    platform: projection.platform || null,
+    type: projection.type || null,
     realizes: refIds(projection.realizes),
     outputs: stableSortedStrings(projection.outputs || []),
     uiScreens: stableSortedStrings((projection.uiScreens || []).map((screen) => screen.id)),
-    uiComponents: stableSortedStrings((projection.uiComponents || []).map((entry) => entry.component?.id).filter(Boolean)),
+    widgetBindings: stableSortedStrings((projection.widgetBindings || []).map((entry) => entry.widget?.id).filter(Boolean)),
     dbTables: stableSortedStrings((projection.dbTables || []).map((table) => table.table || table.entity?.id)),
     httpCapabilities: stableSortedStrings((projection.http || []).map((entry) => entry.capability?.id)),
     reviewBoundary: reviewBoundaryForProjectionPolicy(projection),
@@ -397,11 +397,7 @@ export function relatedProjectionsForShape(graph, shapeId) {
 }
 
 export function widgetById(graph, widgetId) {
-  return (graph?.byKind?.widget || graph?.byKind?.component || []).find((widget) => widget.id === widgetId) || null;
-}
-
-export function componentById(graph, componentId) {
-  return widgetById(graph, componentId);
+  return (graph?.byKind?.widget || []).find((widget) => widget.id === widgetId) || null;
 }
 
 function projectionById(graph, projectionId) {
@@ -435,7 +431,7 @@ function downstreamProjectionIds(graph, projectionIds) {
 }
 
 export function relatedWidgetsForProjection(graph, projection) {
-  const directIds = (projection?.uiComponents || []).map((entry) => entry.component?.id).filter(Boolean);
+  const directIds = (projection?.widgetBindings || []).map((entry) => entry.widget?.id).filter(Boolean);
   const inheritedIds = realizedProjectionIds(projection)
     .map((projectionId) => projectionById(graph, projectionId))
     .filter(Boolean)
@@ -443,10 +439,6 @@ export function relatedWidgetsForProjection(graph, projection) {
   return stableSortedStrings([...directIds, ...inheritedIds]);
 }
 
-export function relatedComponentsForProjection(graph, projection) {
-  return relatedWidgetsForProjection(graph, projection);
-}
-
 export function relatedShapesForWidget(widget) {
   if (!widget) return [];
   const ids = [
@@ -461,15 +453,11 @@ export function relatedShapesForWidget(widget) {
   return stableSortedStrings(ids);
 }
 
-export function relatedShapesForComponent(component) {
-  return relatedShapesForWidget(component);
-}
-
 export function relatedProjectionsForWidget(graph, widgetId) {
   const widget = widgetById(graph, widgetId);
   if (!widget) return [];
   const explicitProjectionIds = stableSortedStrings((graph?.byKind?.projection || [])
-    .filter((projection) => (projection.uiComponents || []).some((entry) => entry.component?.id === widgetId))
+    .filter((projection) => (projection.widgetBindings || []).some((entry) => entry.widget?.id === widgetId))
     .map((projection) => projection.id));
   const dependencyProjectionIds = stableSortedStrings((widget.dependencies || []).flatMap((dependency) => {
     const kind = referenceKind(dependency);
@@ -499,10 +487,6 @@ export function relatedProjectionsForWidget(graph, widgetId) {
   return downstreamProjectionIds(graph, stableSortedStrings([...explicitProjectionIds, ...dependencyProjectionIds, ...viaUiRegions]));
 }
 
-export function relatedProjectionsForComponent(graph, componentId) {
-  return relatedProjectionsForWidget(graph, componentId);
-}
-
 function referenceKind(reference) {
   if (reference?.target?.kind) {
     return reference.target.kind;
@@ -555,7 +539,7 @@ export function workspaceInventory(graph) {
     journeys: stableSortedStrings((graph.docs || []).filter((doc) => doc.kind === "journey").map((doc) => doc.id)),
     entities: stableSortedStrings((graph.byKind.entity || []).map((item) => item.id)),
     projections: stableSortedStrings((graph.byKind.projection || []).map((item) => item.id)),
-    widgets: stableSortedStrings((graph.byKind.widget || graph.byKind.component || []).map((item) => item.id)),
+    widgets: stableSortedStrings((graph.byKind.widget || []).map((item) => item.id)),
     verifications: stableSortedStrings((graph.byKind.verification || []).map((item) => item.id)),
     domains: stableSortedStrings((graph.byKind.domain || []).map((item) => item.id)),
     pitches: stableSortedStrings((graph.byKind.pitch || []).map((item) => item.id)),

package/src/generator/context/slice.js

@@ -337,7 +337,7 @@ function widgetDependencyKind(dependency) {
 }
 
 function uiAgentPacketForProjection(graph, projection) {
-  const projectionType = projection.type || projection.platform || null;
+  const projectionType = projection.type || projection.type || null;
   if (projectionType !== "ui_contract" && !String(projectionType || "").endsWith("_surface")) {
     return null;
   }
@@ -368,7 +368,7 @@ function uiAgentPacketForProjection(graph, projection) {
       screenId: route.screenId,
       path: route.path
     })),
-    widgets: (ownerProjection.uiComponents || []).map((usage) => widgetUsagePacket(usage)),
+    widgets: (ownerProjection.widgetBindings || []).map((usage) => widgetUsagePacket(usage)),
     designTokens: designIntentPacket(ownerProjection),
     requiredGates: uiRequiredGates(projection.id)
   };
@@ -378,9 +378,9 @@ function uiAgentPacketForWidget(graph, widget, projectionIds) {
   const projectionSet = new Set(projectionIds);
   const sourceUsages = [];
   for (const projection of graph.byKind.projection || []) {
-    for (const usage of projection.uiComponents || []) {
-      if (usage.component?.id !== widget.id) continue;
-      const projectionType = projection.type || projection.platform || null;
+    for (const usage of projection.widgetBindings || []) {
+      if (usage.widget?.id !== widget.id) continue;
+      const projectionType = projection.type || projection.type || null;
       sourceUsages.push({
         projection: {
           id: projection.id,
@@ -406,9 +406,9 @@ function uiAgentPacketForWidget(graph, widget, projectionIds) {
       id: widget.id,
       name: widget.name || widget.id,
       category: widget.category || null,
-      patterns: widget.widgetContract?.patterns || widget.componentContract?.patterns || [],
-      regions: widget.widgetContract?.regions || widget.componentContract?.regions || [],
-      behaviors: widget.widgetContract?.behaviors || widget.componentContract?.behaviors || []
+      patterns: widget.widgetContract?.patterns || [],
+      regions: widget.widgetContract?.regions || [],
+      behaviors: widget.widgetContract?.behaviors || []
     },
     sourceUsages,
     inheritedBy: [...projectionSet]
@@ -421,7 +421,7 @@ function uiAgentPacketForWidget(graph, widget, projectionIds) {
 function sharedUiProjectionFor(graph, projection) {
   for (const reference of projection.realizes || []) {
     const candidate = (graph.byKind.projection || []).find((entry) => entry.id === reference.id);
-    if ((candidate?.type || candidate?.platform) === "ui_contract") {
+    if ((candidate?.type || candidate?.type) === "ui_contract") {
       return candidate;
     }
   }
@@ -432,7 +432,7 @@ function widgetUsagePacket(usage) {
   return {
     screenId: usage.screenId || null,
     region: usage.region || null,
-    widgetId: usage.component?.id || null,
+    widgetId: usage.widget?.id || null,
     dataBindings: (usage.dataBindings || []).map((binding) => ({
       prop: binding.prop || null,
       source: binding.source?.id || binding.source || null

package/src/generator/docs.js

@@ -229,7 +229,7 @@ export function generateDocs(graph) {
       lines.push(projection.description);
       lines.push("");
     }
-    lines.push(`Platform: \`${projection.platform}\``);
+    lines.push(`Projection type: \`${projection.type}\``);
     lines.push(`Realizes: ${refList(projection.realizes)}`);
     lines.push(`Outputs: ${symbolList(projection.outputs)}`);
     lines.push("");

package/src/generator/registry.js

@@ -490,7 +490,7 @@ export function projectionCompatibilityKey(projection) {
   if (isApiProjection(projection)) {
     return "api_contract";
   }
-  return projection?.type || projection?.platform || "";
+  return projection?.type || projection?.type || "";
 }
 
 /**

package/src/generator/runtime/app-bundle.js

@@ -23,6 +23,7 @@ import {
 } from "./shared.js";
 import { getExampleImplementation } from "../../example-implementation.js";
 import { mergeNamedBundles, renderLoadEnvScript, renderNestedBundleShellScript } from "./bundle-shared.js";
+import { generateDbLifecyclePlan } from "../surfaces/databases/lifecycle-shared.js";
 
 function runtimeReferenceFor(graph, options = {}) {
   try {
@@ -47,6 +48,7 @@ function buildAppBundlePlan(graph, options = {}) {
   const runtimeReference = runtimeReferenceFor(graph, options);
   const topology = resolveRuntimeTopology(graph, options);
   const { apiProjection, uiProjection, dbProjection } = getDefaultEnvironmentProjections(graph, options);
+  const dbLifecycle = dbProjection ? generateDbLifecyclePlan(graph, { ...options, projectionId: dbProjection.id }) : null;
   const environmentProfile = options.profileId || "local_process";
   const deployProfile = options.deployProfileId || "fly_io";
   const smokeVerification = buildVerificationSummary(graph, ["smoke", "journey"]);
@@ -63,7 +65,9 @@ function buildAppBundlePlan(graph, options = {}) {
     projections: {
       api: apiProjection?.id || null,
       ui: uiProjection?.id || null,
-      db: dbProjection?.id || null
+      db: dbProjection?.id || null,
+      dbType: dbProjection?.type || null,
+      dbEngine: dbLifecycle?.engine || null
     },
     topology: {
       runtimes: topology.runtimes.map((runtime) => ({
@@ -113,7 +117,7 @@ function renderAppBundleEnvExample(plan) {
   };
   const ports = runtimePorts(plan.runtimeReference, topology);
   const urls = runtimeUrls(plan.runtimeReference, topology);
-  if (!plan.projections.dbPlatform) {
+  if (!plan.projections.dbType) {
     return `# App bundle defaults
 TOPOGRAM_ENVIRONMENT_PROFILE=${plan.profiles.environment}
 TOPOGRAM_DEPLOY_PROFILE=${plan.profiles.deployment}
@@ -126,7 +130,7 @@ ${plan.runtimeReference.environment.envExample || ""}
 # Smoke-test defaults
 ${plan.projections.api ? `TOPOGRAM_API_BASE_URL=${urls.api}\n` : ""}${plan.projections.ui ? `TOPOGRAM_WEB_BASE_URL=${urls.web}\n` : ""}`;
   }
-  if (plan.projections.dbPlatform === "db_contract") {
+  if (plan.projections.dbEngine === "sqlite") {
     return `# App bundle defaults
 TOPOGRAM_ENVIRONMENT_PROFILE=${plan.profiles.environment}
 TOPOGRAM_DEPLOY_PROFILE=${plan.profiles.deployment}
@@ -409,8 +413,6 @@ function noopBundle(name, message) {
 export function generateAppBundle(graph, options = {}) {
   const plan = buildAppBundlePlan(graph, options);
   const topology = resolveRuntimeTopology(graph, options);
-  const projections = getDefaultEnvironmentProjections(graph, options);
-  plan.projections.dbPlatform = projections.dbProjection?.platform || null;
   const fullStack = topology.apiComponents.length > 0 && topology.webComponents.length > 0 && topology.dbComponents.length > 0;
   const envBundle = generateEnvironmentBundle(graph, { ...options, profileId: plan.profiles.environment });
   const deployBundle = fullStack

package/src/generator/runtime/compile-check.js

@@ -8,6 +8,7 @@ import {
 } from "./shared.js";
 import { getExampleImplementation } from "../../example-implementation.js";
 import { mergeBundleFiles } from "./bundle-shared.js";
+import { generateDbLifecyclePlan } from "../surfaces/databases/lifecycle-shared.js";
 
 function compileCheckName(graph, options = {}) {
   try {
@@ -72,8 +73,9 @@ function renderCompileCheckEnvExample(graph, options = {}) {
   const runtimeReference = runtimeReferenceFor(graph, options);
   const topology = resolveRuntimeTopology(graph, options);
   const { dbProjection } = getDefaultEnvironmentProjections(graph, options);
+  const dbLifecycle = dbProjection ? generateDbLifecyclePlan(graph, { ...options, projectionId: dbProjection.id }) : null;
   const urls = runtimeUrls(runtimeReference, topology);
-  if (dbProjection?.platform === "db_contract") {
+  if (dbLifecycle?.engine === "sqlite") {
     return `DATABASE_URL=./var/${runtimeReference.environment.databaseName || "topogram_app"}.sqlite
 PUBLIC_TOPOGRAM_API_BASE_URL=${urls.api}
 PUBLIC_TOPOGRAM_DEMO_USER_ID=${runtimeDemoUserId(runtimeReference)}

package/src/generator/runtime/deployment.js

@@ -8,6 +8,7 @@ import {
 import { getExampleImplementation } from "../../example-implementation.js";
 import { mergeNamedBundles, renderRootEnvFileShellScript, renderRootShellScript } from "./bundle-shared.js";
 import { generatorProfile as manifestGeneratorProfile } from "../registry.js";
+import { generateDbLifecyclePlan } from "../surfaces/databases/lifecycle-shared.js";
 
 function projectionHintProfile(projection, fallback) {
   for (const entry of projection.generatorDefaults || []) {
@@ -33,7 +34,8 @@ function buildDeploymentPlan(graph, options = {}) {
   const profile = options.profileId || "fly_io";
   const supportedProfiles = ["fly_io", "railway"];
   const webProfile = manifestGeneratorProfile(topology.primaryWeb?.generator?.id, null) || projectionHintProfile(uiProjection, "sveltekit");
-  const databaseTarget = dbProjection.platform === "db_contract"
+  const dbLifecycle = dbProjection ? generateDbLifecyclePlan(graph, { ...options, projectionId: dbProjection.id }) : null;
+  const databaseTarget = dbLifecycle?.engine === "sqlite"
     ? "sqlite_file"
     : profile === "fly_io"
       ? "managed_postgres"

package/src/generator/runtime/environment.js

@@ -43,10 +43,11 @@ function buildEnvironmentPlan(graph, options = {}) {
   const topology = resolveRuntimeTopology(graph, options);
   const { apiProjection, uiProjection, dbProjection } = getDefaultEnvironmentProjections(graph, options);
   const dbLifecycle = dbProjection ? generateDbLifecyclePlan(graph, { ...options, projectionId: dbProjection.id }) : null;
-  const profile = options.profileId || (dbProjection?.platform === "db_contract" || !dbProjection ? "local_process" : "local_docker");
+  const dbEngine = dbLifecycle?.engine || null;
+  const profile = options.profileId || (dbEngine === "sqlite" || !dbProjection ? "local_process" : "local_docker");
   const usesDocker = profile === "local_docker";
   const webProfile = manifestGeneratorProfile(topology.primaryWeb?.generator?.id, null) || projectionHintProfile(uiProjection, "sveltekit");
-  const isSqlite = dbProjection?.platform === "db_contract";
+  const isSqlite = dbEngine === "sqlite";
   const ports = runtimePorts(runtimeReference, topology);
 
   return {
@@ -71,15 +72,16 @@ function buildEnvironmentPlan(graph, options = {}) {
     projections: {
       api: {
         id: apiProjection?.id || null,
-        platform: apiProjection?.platform || null
+        type: apiProjection?.type || null
       },
       ui: {
         id: uiProjection?.id || null,
-        platform: uiProjection?.platform || null
+        type: uiProjection?.type || null
       },
       db: {
         id: dbProjection?.id || null,
-        platform: dbProjection?.platform || null,
+        type: dbProjection?.type || null,
+        engine: dbEngine,
         profile: dbProjection?.generatorDefaults?.profile || dbProjection?.profile || null
       }
     },
@@ -116,7 +118,7 @@ function buildEnvironmentPlan(graph, options = {}) {
         projection: component.projection.id,
         port: component.port || ports.server,
         dir: topology.serviceDir(component),
-        database: component.database,
+        uses_database: component.database,
         databaseEnv: component.databaseComponent
           ? dbEnvVarsForComponent(component.databaseComponent, { primary: component.databaseComponent?.id === topology.primaryDb?.id })
           : null
@@ -126,12 +128,13 @@ function buildEnvironmentPlan(graph, options = {}) {
         projection: component.projection.id,
         port: component.port || ports.web,
         dir: topology.webDir(component),
-        api: component.api
+        uses_api: component.api
       })),
       databases: topology.dbComponents.map((component) => ({
         id: component.id,
         projection: component.projection.id,
-        platform: component.projection.platform,
+        type: component.projection.type,
+        engine: component.id === topology.primaryDb?.id ? dbEngine : null,
         port: component.port,
         dir: topology.dbDir(component),
         env: dbEnvVarsForComponent(component, { primary: component.id === topology.primaryDb?.id })
@@ -169,7 +172,7 @@ function renderEnvironmentEnvExample(plan) {
     .filter((component) => component.id !== plan.runtimes.databases[0]?.id)
     .map((component) => {
       const fallbackName = `${databaseName}_${component.id}`;
-      if (component.platform === "db_contract") {
+      if (component.engine === "sqlite") {
         return `${component.env.databaseUrl}=file:./var/${component.id}.sqlite`;
       }
       return [
@@ -190,10 +193,10 @@ TOPOGRAM_DEMO_USER_ID=${demoUserId}
 ${plan.runtimeReference.environment.envExample || ""}
 TOPOGRAM_SEED_DEMO=true
 `;
-  if (!plan.projections.db.platform) {
+  if (!plan.projections.db.type) {
     return commonLines;
   }
-  if (plan.projections.db.platform === "db_contract") {
+  if (plan.projections.db.engine === "sqlite") {
     return `# Environment profile
 TOPOGRAM_ENVIRONMENT_PROFILE=${plan.environment.profile}
 
@@ -272,7 +275,7 @@ function renderEnvironmentReadme(plan) {
   const hasWeb = plan.runtimes.webs.length > 0;
   const localProcessNotes = !hasDb
     ? "- This bundle has no generated database surface."
-    : plan.projections.db.platform === "db_contract"
+    : plan.projections.db.engine === "sqlite"
     ? "- SQLite is file-backed for this bundle; no separate DB server is required."
     : `- Make sure the Postgres server is already running before \`${plan.commands.bootstrapDb}\`.\n- \`DATABASE_URL\` and \`DATABASE_ADMIN_URL\` should point at your local or managed Postgres instance.`;
   const dockerSection = plan.orchestration.usesDocker
@@ -291,13 +294,13 @@ ${localProcessNotes}
 
 This bundle packages the generated runtime into one local environment:
 
-${hasApi ? "- `services/<api-id>/`: generated API service scaffolds\n" : ""}${hasWeb ? `- \`web/<web-id>/\`: generated ${plan.runtimeProfiles.web === "react" ? "Vite + React Router" : plan.runtimeProfiles.web === "vanilla" ? "vanilla HTML/CSS/JS" : "SvelteKit"} web scaffolds\n` : ""}${hasDb ? "- `db/<db-id>/`: generated DB lifecycle bundles\n" : ""}${plan.files.dockerCompose ? `- \`${plan.files.dockerCompose}\`: local Postgres container` : hasDb ? (plan.projections.db.platform === "db_contract" ? "- local SQLite file orchestration (no Docker files generated)" : "- local-process Postgres orchestration (no Docker files generated)") : "- no DB orchestration is generated"}
+${hasApi ? "- `services/<api-id>/`: generated API service scaffolds\n" : ""}${hasWeb ? `- \`web/<web-id>/\`: generated ${plan.runtimeProfiles.web === "react" ? "Vite + React Router" : plan.runtimeProfiles.web === "vanilla" ? "vanilla HTML/CSS/JS" : "SvelteKit"} web scaffolds\n` : ""}${hasDb ? "- `db/<db-id>/`: generated DB lifecycle bundles\n" : ""}${plan.files.dockerCompose ? `- \`${plan.files.dockerCompose}\`: local Postgres container` : hasDb ? (plan.projections.db.engine === "sqlite" ? "- local SQLite file orchestration (no Docker files generated)" : "- local-process Postgres orchestration (no Docker files generated)") : "- no DB orchestration is generated"}
 
 ## Quick Start
 
 1. Copy \`.env.example\` to \`.env\` if you want to customize defaults
 2. Start the database:
-   - ${!hasDb ? "not applicable" : plan.projections.db.platform === "db_contract" ? "no separate DB service is required" : plan.orchestration.usesDocker ? `\`${plan.commands.dockerDb}\`` : "use your local Postgres service"}
+   - ${!hasDb ? "not applicable" : plan.projections.db.engine === "sqlite" ? "no separate DB service is required" : plan.orchestration.usesDocker ? `\`${plan.commands.dockerDb}\`` : "use your local Postgres service"}
 3. Bootstrap or migrate the database:
    - \`${plan.commands.bootstrapDb}\`
 4. Start the stack:
@@ -313,7 +316,7 @@ ${dockerSection}
 
 ## Notes
 
-- ${hasApi && hasDb ? `The generated server expects ${plan.projections.db.platform === "db_contract" ? "SQLite plus Prisma." : "Postgres plus Prisma."}` : hasApi ? "The generated server is stateless." : "No server surface is generated."}
+- ${hasApi && hasDb ? `The generated server expects ${plan.projections.db.engine === "sqlite" ? "SQLite plus Prisma." : "Postgres plus Prisma."}` : hasApi ? "The generated server is stateless." : "No server surface is generated."}
 - ${hasWeb && hasApi ? "The generated web app talks to `PUBLIC_TOPOGRAM_API_BASE_URL`." : hasWeb ? "The generated web app is standalone." : "No web surface is generated."}
 - If \`.env\` is missing, generated scripts fall back to \`.env.example\`.
 - The DB lifecycle scripts remain the source of truth for greenfield bootstrap and brownfield migration.
@@ -327,7 +330,7 @@ function renderEnvironmentLoadEnvScript() {
 function renderEnvironmentBootstrapDbScript(plan) {
   const dbBootstrapLines = plan.runtimes.databases.map((component) => {
     const env = component.env;
-    const runtimeApi = plan.runtimes.apis.find((apiComponent) => apiComponent.database === component.id);
+    const runtimeApi = plan.runtimes.apis.find((apiComponent) => apiComponent.uses_database === component.id);
     const assignments = [
       `DATABASE_URL="\${${env.databaseUrl}:-}"`,
       `DATABASE_ADMIN_URL="\${${env.databaseAdminUrl}:-}"`,
@@ -353,7 +356,7 @@ function renderEnvironmentBootstrapDbScript(plan) {
     ...dbBootstrapLines,
     'if [[ "${TOPOGRAM_SEED_DEMO:-true}" != "false" ]]; then',
     ...apiDatabaseExportLines(primaryApi),
-    ...(primaryApi?.database
+    ...(primaryApi?.uses_database
       ? [`(cd "$ROOT_DIR/${primaryApi.dir}" && npm install && npm exec -- prisma generate --schema prisma/schema.prisma && npm exec -- prisma db push --schema prisma/schema.prisma --skip-generate && npm run seed:demo)`]
       : ['echo "No DB-backed API component is configured; skipping demo seed."']),
     "fi"
@@ -381,7 +384,7 @@ function renderEnvironmentServerDevScript(plan, component = plan.runtimes.apis[0
     "",
     `cd "$ROOT_DIR/${component.dir}"`,
     "npm install",
-    ...(component.database ? ["npm exec -- prisma generate --schema prisma/schema.prisma"] : []),
+    ...(component.uses_database ? ["npm exec -- prisma generate --schema prisma/schema.prisma"] : []),
     "npm run dev"
   ], options.componentScript ? componentScriptOptions() : {});
 }
@@ -390,7 +393,7 @@ function renderEnvironmentWebDevScript(plan, component = plan.runtimes.webs[0],
   if (!component) {
     return renderEnvAwareShellScript(['echo "No web runtimes are configured."']);
   }
-  const apiComponent = plan.runtimes.apis.find((entry) => entry.id === component.api) || plan.runtimes.apis[0];
+  const apiComponent = plan.runtimes.apis.find((entry) => entry.id === component.uses_api) || plan.runtimes.apis[0];
   const guardPortsScript = options.componentScript ? '"$ROOT_DIR/scripts/guard-ports.mjs"' : '"$SCRIPT_DIR/guard-ports.mjs"';
   return renderEnvAwareShellScript([
     `node ${guardPortsScript} web`,

package/src/generator/runtime/shared.js

@@ -229,7 +229,7 @@ function apiProjectionCandidates(graph) {
  */
 function uiWebProjectionCandidates(graph) {
   return (graph.byKind.projection || []).filter(
-    (projection) => projection.platform === "web_surface" && (projection.uiRoutes || []).length > 0
+    (projection) => projection.type === "web_surface" && (projection.uiRoutes || []).length > 0
   );
 }
 
@@ -247,7 +247,7 @@ const DEFAULT_NATIVE_UI_PLATFORM_ORDER = ["proj_ios_surface__swiftui"];
  */
 function uiIosProjectionCandidates(graph) {
   return (graph.byKind.projection || []).filter(
-    (projection) => projection.platform === "ios_surface" && (projection.uiRoutes || []).length > 0
+    (projection) => projection.type === "ios_surface" && (projection.uiRoutes || []).length > 0
   );
 }
 
@@ -300,7 +300,7 @@ export function pickDefaultUiWebProjection(graph) {
  */
 export function getDefaultEnvironmentProjections(graph, options = {}) {
   const topology = resolveRuntimeTopology(graph, options);
-  const dbCandidates = graph.byKind.projection?.filter((projection) => ["db_contract", "db_contract"].includes(projection.platform)) || [];
+  const dbCandidates = graph.byKind.projection?.filter((projection) => ["db_contract", "db_contract"].includes(projection.type)) || [];
   const apiProjection = /** @type {RuntimeStatement|null} */ (topology.primaryApi?.projection ||
     (options.projectionId ? getProjection(graph, options.projectionId) : null) ||
     apiProjectionCandidates(graph).find((projection) => projection.id === "proj_api") ||
@@ -426,13 +426,13 @@ export function dbEnvVarsForComponent(component, options = {}) {
  */
 function decorateRuntimes(graph, config) {
   const byProjectionId = new Map((graph.byKind.projection || []).map((projection) => [projection.id, projection]));
-  const rawRuntimes = config.topology?.runtimes || config.topology?.components || [];
+  const rawRuntimes = config.topology?.runtimes || [];
   /** @type {RuntimeComponent[]} */
   const runtimes = rawRuntimes.map((runtime) => ({
     ...runtime,
-    kind: runtime.kind || runtime.type || null,
-    api: runtime.uses_api ?? runtime.api ?? null,
-    database: runtime.uses_database ?? runtime.database ?? null,
+    kind: runtime.kind || null,
+    api: runtime.uses_api ?? null,
+    database: runtime.uses_database ?? null,
     projection: byProjectionId.get(runtime.projection) || {}
   }));
   const byId = new Map(runtimes.map((runtime) => [runtime.id, runtime]));

package/src/generator/surfaces/contracts.js

@@ -17,7 +17,7 @@ export function generateUiContractDebug(graph, options = {}) {
   for (const contract of contracts) {
     lines.push(`## \`${contract.projection.id}\` - ${contract.projection.name}`);
     lines.push("");
-    lines.push(`Platform: \`${contract.projection.platform}\``);
+    lines.push(`Projection type: \`${contract.projection.type}\``);
     lines.push(`Realizes: ${refList(contract.realizes)}`);
     lines.push(`Outputs: ${symbolList(contract.outputs)}`);
     if (contract.appShell) {

package/src/generator/surfaces/databases/lifecycle-shared.js

@@ -87,7 +87,7 @@ function renderEmptySnapshotForProjection(projection) {
     projection: {
       id: projection.id,
       name: projection.name || projection.id,
-      type: projection.type || projection.platform
+      type: projection.type || projection.type
     },
     profile,
     generatorDefaults: generatorDefaultsMap(projection),

package/src/generator/surfaces/databases/postgres/drizzle.js

@@ -50,7 +50,7 @@ function drizzleColumnBuilder(column, relation, targetTableVar) {
 export function generatePostgresDrizzleSchema(graph, options = {}) {
   resolvePostgresCapabilities(options.profileId);
   const projection = getProjection(graph, options.projectionId);
-  const projectionType = projection.type || projection.platform;
+  const projectionType = projection.type || projection.type;
   if (projectionType !== "db_contract") {
     throw new Error(`Drizzle schema generation currently supports db_contract projections only, found '${projectionType}'`);
   }

package/src/generator/surfaces/databases/postgres/prisma.js

@@ -40,7 +40,7 @@ function prismaDefaultForColumn(column, byId) {
 export function generatePostgresPrismaSchema(graph, options = {}) {
   resolvePostgresCapabilities(options.profileId);
   const projection = getProjection(graph, options.projectionId);
-  const projectionType = projection.type || projection.platform;
+  const projectionType = projection.type || projection.type;
   if (projectionType !== "db_contract") {
     throw new Error(`Prisma schema generation currently supports db_contract projections only, found '${projectionType}'`);
   }

package/src/generator/surfaces/databases/shared.js

@@ -42,8 +42,8 @@ export function indexGraphStatements(graph) {
 export function dbProjectionCandidates(graph) {
   return (graph.byKind.projection || []).filter(
     (projection) =>
-      (projection.type || projection.platform) === "db_contract" ||
-      projection.platform?.startsWith("db_") ||
+      (projection.type || projection.type) === "db_contract" ||
+      projection.type?.startsWith("db_") ||
       (projection.dbTables || []).length > 0 ||
       (projection.dbColumns || []).length > 0 ||
       (projection.dbRelations || []).length > 0
@@ -278,7 +278,7 @@ export function buildDbProjectionContract(graph, projection) {
     projection: {
       id: projection.id,
       name: projection.name || projection.id,
-      type: projection.type || projection.platform
+      type: projection.type || projection.type
     },
     profile: dbProfileForProjection(projection),
     generatorDefaults: generatorDefaultsMap(projection),

package/src/generator/surfaces/databases/sqlite/prisma.js

@@ -45,7 +45,7 @@ function prismaDefaultForColumn(column) {
 export function generateSqlitePrismaSchema(graph, options = {}) {
   resolveSqliteCapabilities(options.profileId);
   const projection = getProjection(graph, options.projectionId);
-  const projectionType = projection.type || projection.platform;
+  const projectionType = projection.type || projection.type;
   if (projectionType !== "db_contract") {
     throw new Error(`Prisma schema generation currently supports db_contract projections only, found '${projectionType}'`);
   }

package/src/generator/surfaces/services/persistence-wiring.js

@@ -155,7 +155,7 @@ export function generatePersistenceScaffold(graph, options = {}) {
   const drizzleRepositoryClassName = repositoryReference.drizzleRepositoryClassName;
   const drizzleHint = repositoryReference.drizzleHint;
   const projection = getProjection(graph, options.projectionId);
-  const projectionType = projection.type || projection.platform;
+  const projectionType = projection.type || projection.type;
   if (projectionType !== "db_contract") {
     throw new Error(`Persistence scaffold generation currently supports db_contract projections only, found '${projectionType}'`);
   }

package/src/generator/surfaces/services/server-contract.js

@@ -30,7 +30,7 @@ function buildServerContract(graph, projection) {
     projection: {
       id: projection.id,
       name: projection.name || projection.id,
-      type: projection.type || projection.platform
+      type: projection.type || projection.type
     },
     routes: realizedCapabilities.map((capability) => {
       const apiContract = generateApiContractGraph(graph, { capabilityId: capability.id });

package/src/generator/surfaces/shared.js

@@ -38,7 +38,7 @@ export function uiProjectionCandidates(graph) {
       (projection.uiAppShell || []).length > 0 ||
       (projection.uiNavigation || []).length > 0 ||
       (projection.uiScreenRegions || []).length > 0 ||
-      (projection.uiComponents || []).length > 0 ||
+      (projection.widgetBindings || []).length > 0 ||
       (projection.uiDesign || []).length > 0
   );
 }

package/src/generator/surfaces/web/ui-surface-contract.js

@@ -3,7 +3,7 @@ import { buildWebRealization } from "../../../realization/ui/index.js";
 export function generateUiSurfaceContract(graph, options = {}) {
   if (!options.projectionId) {
     const output = {};
-    for (const projection of (graph.byKind.projection || []).filter((entry) => (entry.type || entry.platform) === "web_surface")) {
+    for (const projection of (graph.byKind.projection || []).filter((entry) => (entry.type || entry.type) === "web_surface")) {
       output[projection.id] = buildWebRealization(graph, { ...options, projectionId: projection.id }).contract;
     }
     return output;

package/src/generator/widget-conformance.js

@@ -22,7 +22,7 @@ function summarizeProjection(projection) {
     ? {
         id: projection.id,
         name: projection.name || projection.id,
-        type: projection.type || projection.platform || null,
+        type: projection.type || projection.type || null,
         status: projection.status || null,
         source_path: sourcePath(projection)
       }
@@ -479,14 +479,14 @@ function projectionUsageEntries(graph, projection) {
   const sharedProjection = sharedUiProjectionForWeb(graph, projection);
   const entries = [];
   if (sharedProjection) {
-    entries.push(...(sharedProjection.uiComponents || []).map((usage, index) => ({
+    entries.push(...(sharedProjection.widgetBindings || []).map((usage, index) => ({
       projection,
       sourceProjection: sharedProjection,
       usage,
       index
     })));
   }
-  entries.push(...(projection.uiComponents || []).map((usage, index) => ({
+  entries.push(...(projection.widgetBindings || []).map((usage, index) => ({
     projection,
     sourceProjection: projection,
     usage,
@@ -499,10 +499,10 @@ function candidateProjections(graph, projectionId) {
   if (projectionId) {
     return [getProjection(graph, projectionId)];
   }
-  const direct = uiProjectionCandidates(graph).filter((projection) => (projection.uiComponents || []).length > 0);
+  const direct = uiProjectionCandidates(graph).filter((projection) => (projection.widgetBindings || []).length > 0);
   const inherited = (graph.byKind.projection || []).filter((projection) => {
-    if ((projection.uiComponents || []).length > 0) return false;
-    return Boolean(sharedUiProjectionForWeb(graph, projection)?.uiComponents?.length);
+    if ((projection.widgetBindings || []).length > 0) return false;
+    return Boolean(sharedUiProjectionForWeb(graph, projection)?.widgetBindings?.length);
   });
   return [...direct, ...inherited].sort((a, b) => a.id.localeCompare(b.id));
 }

package/src/generator/widgets.js

@@ -27,7 +27,7 @@ function widgetContract(widget) {
 export function generateUiWidgetContract(graph, options = {}) {
   const widgetId = options.widgetId || options.componentId;
   if (widgetId) {
-    const widget = (graph?.byKind?.widget || graph?.byKind?.component || []).find((entry) => entry.id === widgetId);
+    const widget = (graph?.byKind?.widget || []).find((entry) => entry.id === widgetId);
     if (!widget) {
       throw new Error(`No widget found with id '${widgetId}'`);
     }