@topogram/cli 0.3.53 → 0.3.55

package/src/generator-policy.js

@@ -31,7 +31,7 @@ export const GENERATOR_POLICY_FILE = "topogram.generator-policy.json";
  * @property {string|null} path
  * @property {string|null} suggestedFix
  * @property {string|null} step
- * @property {string|null} [componentId]
+ * @property {string|null} [runtimeId]
  * @property {string|null} [generatorId]
  * @property {string|null} [packageName]
  * @property {string|null} [version]
@@ -39,8 +39,8 @@ export const GENERATOR_POLICY_FILE = "topogram.generator-policy.json";
 
 /**
  * @typedef {Object} PackageGeneratorBinding
- * @property {string} componentId
- * @property {string} componentType
+ * @property {string} runtimeId
+ * @property {string} runtimeKind
  * @property {string} projection
  * @property {string} generatorId
  * @property {string} version
@@ -59,7 +59,7 @@ function generatorPolicyDiagnostic(input) {
     path: typeof input.path === "string" ? input.path : null,
     suggestedFix: typeof input.suggestedFix === "string" ? input.suggestedFix : null,
     step: typeof input.step === "string" ? input.step : null,
-    componentId: typeof input.componentId === "string" ? input.componentId : null,
+    runtimeId: typeof input.runtimeId === "string" ? input.runtimeId : null,
     generatorId: typeof input.generatorId === "string" ? input.generatorId : null,
     packageName: typeof input.packageName === "string" ? input.packageName : null,
     version: typeof input.version === "string" ? input.version : null
@@ -179,8 +179,8 @@ export function packageBackedGeneratorBindings(projectConfig) {
   return runtimes
     .filter((runtime) => typeof runtime?.generator?.package === "string" && runtime.generator.package.length > 0)
     .map((runtime) => ({
-      componentId: String(runtime.id || "unknown"),
-      componentType: String(runtime.kind || runtime.type || "unknown"),
+      runtimeId: String(runtime.id || "unknown"),
+      runtimeKind: String(runtime.kind || "unknown"),
       projection: String(runtime.projection || "unknown"),
       generatorId: String(runtime.generator.id || "unknown"),
       version: String(runtime.generator.version || "unknown"),
@@ -263,11 +263,11 @@ export function generatorPolicyDiagnosticsForBindings(policyInfo, bindings, step
       const allowedPackages = policy.allowedPackages.join(", ") || "(none)";
       diagnostics.push(generatorPolicyDiagnostic({
         code: "generator_package_denied",
-        message: `Component '${binding.componentId}' generator package '${binding.packageName}' is not allowed by ${GENERATOR_POLICY_FILE}.`,
+        message: `Runtime '${binding.runtimeId}' generator package '${binding.packageName}' is not allowed by ${GENERATOR_POLICY_FILE}.`,
         path: policyInfo.path,
         suggestedFix: `Review '${binding.packageName}', then run \`topogram generator policy pin ${binding.packageName}@${binding.version}\` or add '${scope || binding.packageName}' to ${GENERATOR_POLICY_FILE}.`,
         step,
-        componentId: binding.componentId,
+        runtimeId: binding.runtimeId,
         generatorId: binding.generatorId,
         packageName: binding.packageName,
         version: binding.version
@@ -278,11 +278,11 @@ export function generatorPolicyDiagnosticsForBindings(policyInfo, bindings, step
     if (pinnedVersion && pinnedVersion !== binding.version) {
       diagnostics.push(generatorPolicyDiagnostic({
         code: "generator_version_mismatch",
-        message: `Component '${binding.componentId}' generator '${binding.generatorId}' uses version '${binding.version}', but ${GENERATOR_POLICY_FILE} pins '${binding.packageName}' to '${pinnedVersion}'.`,
+        message: `Runtime '${binding.runtimeId}' generator '${binding.generatorId}' uses version '${binding.version}', but ${GENERATOR_POLICY_FILE} pins '${binding.packageName}' to '${pinnedVersion}'.`,
         path: policyInfo.path,
         suggestedFix: `Use generator version '${pinnedVersion}', or run \`topogram generator policy pin ${binding.packageName}@${binding.version}\` after review.`,
         step,
-        componentId: binding.componentId,
+        runtimeId: binding.runtimeId,
         generatorId: binding.generatorId,
         packageName: binding.packageName,
         version: binding.version

package/src/import/core/runner.js

@@ -126,12 +126,19 @@ function capabilityHintsForScreen(screen) {
   return rawHints.map(normalizeCapabilityHint).filter(Boolean);
 }
 
-function inferredDataSourceForComponent(component, allCandidates) {
-  if (component.data_source) {
-    return component.data_source;
+function uiWidgetCandidates(candidates) {
+  return [
+    ...(Array.isArray(candidates?.widgets) ? candidates.widgets : []),
+    ...(Array.isArray(candidates?.components) ? candidates.components : [])
+  ];
+}
+
+function inferredDataSourceForWidget(widget, allCandidates) {
+  if (widget.data_source) {
+    return widget.data_source;
   }
   const capabilityIds = importedApiCapabilityIds(allCandidates);
-  const screenStem = String(component.screen_id || "")
+  const screenStem = String(widget.screen_id || "")
     .replace(/_(list|index|table|grid|results)$/, "")
     .replace(/^list_/, "");
   return capabilityIds.find((id) => /^cap_(list|get)_/.test(id) && id.includes(screenStem)) ||
@@ -139,22 +146,22 @@ function inferredDataSourceForComponent(component, allCandidates) {
     null;
 }
 
-function deriveUiComponentCandidates(candidates) {
+function deriveUiWidgetCandidates(candidates) {
   const screens = candidates.screens || [];
   const actions = candidates.actions || [];
   const presentations = [...new Set(actions
     .filter((entry) => entry.kind === "ui_presentation")
     .map((entry) => entry.presentation)
     .filter(Boolean))].sort();
-  const componentScreens = screens.filter((screen) => ["list", "dashboard", "analytics", "report", "feed", "inbox"].includes(screen.screen_kind));
+  const widgetScreens = screens.filter((screen) => ["list", "dashboard", "analytics", "report", "feed", "inbox"].includes(screen.screen_kind));
 
-  return componentScreens.map((screen) => {
+  return widgetScreens.map((screen) => {
     const pattern = collectionPatternFromPresentations(presentations);
-    const componentStem = idHintify(`${screen.id_hint}_results`);
+    const widgetStem = idHintify(`${screen.id_hint}_results`);
     const loadCapability = loadCapabilityForScreen(screen);
     return makeCandidateRecord({
       kind: "widget",
-      idHint: `widget_${componentStem}`,
+      idHint: `widget_${widgetStem}`,
       label: `${screen.label || screen.id_hint} results`,
       confidence: presentations.length > 0 ? "medium" : "low",
       sourceKind: "ui_projection_inference",
@@ -204,13 +211,13 @@ function normalizeCandidatesForTrack(track, candidates) {
     };
   }
   if (track === "ui") {
-    const explicitComponents = candidates.components || [];
-    const derivedComponents = deriveUiComponentCandidates(candidates);
+    const explicitWidgets = uiWidgetCandidates(candidates);
+    const derivedWidgets = deriveUiWidgetCandidates(candidates);
     return {
       screens: dedupeCandidateRecords(candidates.screens || [], (record) => record.id_hint),
       routes: dedupeCandidateRecords(candidates.routes || [], (record) => record.id_hint),
       actions: dedupeCandidateRecords(candidates.actions || [], (record) => record.id_hint),
-      components: dedupeCandidateRecords([...explicitComponents, ...derivedComponents], (record) => record.id_hint),
+      widgets: dedupeCandidateRecords([...explicitWidgets, ...derivedWidgets], (record) => record.id_hint),
       stacks: [...new Set(candidates.stacks || [])].sort()
     };
   }
@@ -289,11 +296,12 @@ function reportMarkdown(track, candidates) {
     );
   }
   if (track === "ui") {
-    const componentLines = (candidates.components || []).map((component) =>
-      `- \`${component.id_hint}\` confidence ${component.confidence || "unknown"} pattern \`${component.pattern || component.inferred_pattern || "unknown"}\` region \`${component.region || component.inferred_region || "unknown"}\` evidence ${(component.evidence || component.provenance || []).length} missing decisions ${(component.missing_decisions || []).length}`
+    const widgets = uiWidgetCandidates(candidates);
+    const widgetLines = widgets.map((widget) =>
+      `- \`${widget.id_hint}\` confidence ${widget.confidence || "unknown"} pattern \`${widget.pattern || widget.inferred_pattern || "unknown"}\` region \`${widget.region || widget.inferred_region || "unknown"}\` evidence ${(widget.evidence || widget.provenance || []).length} missing decisions ${(widget.missing_decisions || []).length}`
     );
     return ensureTrailingNewline(
-      `# UI Import Report\n\n- Screens: ${candidates.screens.length}\n- Routes: ${candidates.routes.length}\n- Actions: ${candidates.actions.length}\n- Widgets: ${candidates.components.length}\n- Stacks: ${candidates.stacks.length ? candidates.stacks.join(", ") : "none"}\n\n## Widget Candidates\n\n${componentLines.length ? componentLines.join("\n") : "- none"}\n\n## Next Validation\n\n- Review candidates under \`topogram/candidates/app/ui/drafts/widgets/**\`.\n- Run \`topogram import plan <path>\` before adoption.\n- After adoption, run \`topogram check <path>\`, \`topogram widget check <path>\`, and \`topogram widget behavior <path>\`.\n`
+      `# UI Import Report\n\n- Screens: ${candidates.screens.length}\n- Routes: ${candidates.routes.length}\n- Actions: ${candidates.actions.length}\n- Widgets: ${widgets.length}\n- Stacks: ${candidates.stacks.length ? candidates.stacks.join(", ") : "none"}\n\n## Widget Candidates\n\n${widgetLines.length ? widgetLines.join("\n") : "- none"}\n\n## Next Validation\n\n- Review candidates under \`topogram/candidates/app/ui/drafts/widgets/**\`.\n- Run \`topogram import plan <path>\` before adoption.\n- After adoption, run \`topogram check <path>\`, \`topogram widget check <path>\`, and \`topogram widget behavior <path>\`.\n`
     );
   }
   if (track === "verification") {
@@ -318,60 +326,62 @@ function projectionIdStem(workspaceRoot) {
     .replace(/^_+|_+$/g, "") || "imported_app";
 }
 
-function componentCandidateFileName(component) {
-  return `${String(component.id_hint || "widget")
+function widgetCandidateFileName(widget) {
+  return `${String(widget.id_hint || "widget")
     .replace(/^component_/, "")
     .replace(/_/g, "-")}.tg`;
 }
 
-function renderComponentCandidate(component) {
-  const evidenceCount = (component.evidence || component.provenance || []).length;
-  const missingDecisions = component.missing_decisions || [
+function renderWidgetCandidate(widget) {
+  const evidenceCount = (widget.evidence || widget.provenance || []).length;
+  const missingDecisions = widget.missing_decisions || [
     "confirm widget reuse boundary",
     "confirm prop names and data source",
     "confirm events and behavior"
   ];
-  return `widget ${component.id_hint} {
-  # Import metadata: confidence ${component.confidence || "unknown"}; evidence ${evidenceCount}; inferred pattern ${component.pattern || component.inferred_pattern || "search_results"}; inferred region ${component.region || component.inferred_region || "results"}.
+  return `widget ${widget.id_hint} {
+  # Import metadata: confidence ${widget.confidence || "unknown"}; evidence ${evidenceCount}; inferred pattern ${widget.pattern || widget.inferred_pattern || "search_results"}; inferred region ${widget.region || widget.inferred_region || "results"}.
   # Missing decisions: ${missingDecisions.join("; ")}.
-  name "${component.label || component.id_hint}"
+  name "${widget.label || widget.id_hint}"
   description "Candidate reusable widget inferred from imported UI evidence. Review props, behavior, events, and reuse before adoption."
   category collection
   props {
-    ${component.data_prop || "rows"} array required
+    ${widget.data_prop || "rows"} array required
   }
-  patterns [${component.pattern || "search_results"}]
-  regions [${component.region || "results"}]
+  patterns [${widget.pattern || "search_results"}]
+  regions [${widget.region || "results"}]
   status proposed
 }
 `;
 }
 
-function uiComponentLinesForCandidates(componentCandidates, allCandidates) {
-  return componentCandidates
-    .filter((component) => component.screen_id && component.region && component.id_hint)
-    .map((component) => {
-      const dataSource = inferredDataSourceForComponent(component, allCandidates);
+function uiWidgetLinesForCandidates(widgetCandidates, allCandidates) {
+  return widgetCandidates
+    .filter((widget) => widget.screen_id && widget.region && widget.id_hint)
+    .map((widget) => {
+      const dataSource = inferredDataSourceForWidget(widget, allCandidates);
       const dataBinding = dataSource
-        ? ` data ${component.data_prop || "rows"} from ${dataSource}`
+        ? ` data ${widget.data_prop || "rows"} from ${dataSource}`
         : "";
-      return `    screen ${component.screen_id} region ${component.region} widget ${component.id_hint}${dataBinding}`;
+      return `    screen ${widget.screen_id} region ${widget.region} widget ${widget.id_hint}${dataBinding}`;
     });
 }
 
-function enrichUiComponentDataSources(uiCandidates, allCandidates) {
-  if (!uiCandidates || !Array.isArray(uiCandidates.components)) {
+function enrichUiWidgetDataSources(uiCandidates, allCandidates) {
+  if (!uiCandidates) {
     return uiCandidates;
   }
+  const widgets = uiWidgetCandidates(uiCandidates);
+  const { components, ...canonicalCandidates } = uiCandidates;
   return {
-    ...uiCandidates,
-    components: uiCandidates.components.map((component) => {
-      const dataSource = inferredDataSourceForComponent(component, allCandidates);
-      const dataProp = component.data_prop || "rows";
+    ...canonicalCandidates,
+    widgets: widgets.map((widget) => {
+      const dataSource = inferredDataSourceForWidget(widget, allCandidates);
+      const dataProp = widget.data_prop || "rows";
       return {
-        ...component,
-        data_source: component.data_source || dataSource,
-        inferred_props: (component.inferred_props || []).map((prop) =>
+        ...widget,
+        data_source: widget.data_source || dataSource,
+        inferred_props: (widget.inferred_props || []).map((prop) =>
           prop.name === dataProp ? { ...prop, source: prop.source || dataSource } : prop
         )
       };
@@ -384,7 +394,7 @@ function draftUiProjectionFiles(context, candidates, allCandidates = {}) {
   const screens = [...(ui.screens || [])].sort((a, b) => String(a.route_path || "").localeCompare(String(b.route_path || "")) || a.id_hint.localeCompare(b.id_hint));
   const routes = new Map((ui.routes || []).map((route) => [route.screen_id, route.path]));
   const actions = ui.actions || [];
-  const componentCandidates = [...(ui.components || [])].sort((a, b) => a.id_hint.localeCompare(b.id_hint));
+  const widgetCandidates = [...uiWidgetCandidates(ui)].sort((a, b) => a.id_hint.localeCompare(b.id_hint));
   const shell = actions.find((entry) => entry.kind === "ui_shell")?.shell_kind || "topbar";
   const navigationPatterns = uniqueSorted(actions.filter((entry) => entry.kind === "navigation").map((entry) => entry.navigation_pattern));
   const presentations = uniqueSorted(actions.filter((entry) => entry.kind === "ui_presentation").map((entry) => entry.presentation));
@@ -486,7 +496,7 @@ function draftUiProjectionFiles(context, candidates, allCandidates = {}) {
       }
     }
   }
-  const uiComponentLines = uiComponentLinesForCandidates(componentCandidates, allCandidates);
+  const uiWidgetLines = uiWidgetLinesForCandidates(widgetCandidates, allCandidates);
 
   const uiSharedDraft = `projection proj_ui_contract_imported_${stem} {
   name "Imported UI Contract Draft"
@@ -525,7 +535,7 @@ ${uiCollectionsLines.length > 0 ? `  collection_views {\n${uiCollectionsLines.jo
 ${uiNavigationLines.join("\n")}
   }
 
-${uiScreenRegionLines.length > 0 ? `  screen_regions {\n${uiScreenRegionLines.join("\n")}\n  }\n\n` : ""}${uiComponentLines.length > 0 ? `  widget_bindings {\n${uiComponentLines.join("\n")}\n  }\n\n` : ""}  status proposed
+${uiScreenRegionLines.length > 0 ? `  screen_regions {\n${uiScreenRegionLines.join("\n")}\n  }\n\n` : ""}${uiWidgetLines.length > 0 ? `  widget_bindings {\n${uiWidgetLines.join("\n")}\n  }\n\n` : ""}  status proposed
 }
 `;
 
@@ -594,7 +604,7 @@ ${uiWebLines.length > 0 ? `  web_hints {\n${uiWebLines.join("\n")}\n  }\n\n` : "
 
 - Draft UI contract projection: \`candidates/app/ui/drafts/proj-ui-contract.tg\`
 - Draft web surface projection: \`candidates/app/ui/drafts/proj-web-surface.tg\`
-- Draft widget candidates: ${componentCandidates.length}
+- Draft widget candidates: ${widgetCandidates.length}
 - Imported screens: ${screens.length}
 - Imported routes: ${(ui.routes || []).length}
 - Imported UI actions/presentations: ${actions.length}
@@ -616,8 +626,8 @@ ${uiWebLines.length > 0 ? `  web_hints {\n${uiWebLines.join("\n")}\n  }\n\n` : "
     "candidates/app/ui/drafts/proj-web-surface.tg": ensureTrailingNewline(uiWebDraft),
     "candidates/app/ui/drafts/README.md": ensureTrailingNewline(coverage)
   };
-  for (const component of componentCandidates) {
-    files[`candidates/app/ui/drafts/widgets/${componentCandidateFileName(component)}`] = ensureTrailingNewline(renderComponentCandidate(component));
+  for (const widget of widgetCandidates) {
+    files[`candidates/app/ui/drafts/widgets/${widgetCandidateFileName(widget)}`] = ensureTrailingNewline(renderWidgetCandidate(widget));
   }
   return files;
 }
@@ -656,7 +666,7 @@ export function runImportApp(inputPath, options = {}) {
   }
 
   if (candidates.ui) {
-    candidates.ui = enrichUiComponentDataSources(candidates.ui, candidates);
+    candidates.ui = enrichUiWidgetDataSources(candidates.ui, candidates);
     files["candidates/app/ui/candidates.json"] = `${JSON.stringify(candidates.ui, null, 2)}\n`;
     files["candidates/app/ui/report.md"] = reportMarkdown("ui", candidates.ui);
     Object.assign(files, draftUiProjectionFiles(context, candidates.ui, candidates));
@@ -676,7 +686,7 @@ export function runImportApp(inputPath, options = {}) {
   files["candidates/app/findings.json"] = `${JSON.stringify(findings, null, 2)}\n`;
   files["candidates/app/candidates.json"] = `${JSON.stringify(candidates, null, 2)}\n`;
   files["candidates/app/report.md"] = ensureTrailingNewline(
-    `# App Import Report\n\nTracks: ${tracks.join(", ")}\n\n## DB\n\n- Entities: ${candidates.db?.entities?.length || 0}\n- Enums: ${candidates.db?.enums?.length || 0}\n- Relations: ${candidates.db?.relations?.length || 0}\n\n## API\n\n- Capabilities: ${candidates.api?.capabilities?.length || 0}\n- Routes: ${candidates.api?.routes?.length || 0}\n- Stacks: ${candidates.api?.stacks?.length ? candidates.api.stacks.join(", ") : "none"}\n\n## UI\n\n- Screens: ${candidates.ui?.screens?.length || 0}\n- Routes: ${candidates.ui?.routes?.length || 0}\n- Actions: ${candidates.ui?.actions?.length || 0}\n- Widgets: ${candidates.ui?.components?.length || 0}\n- Stacks: ${candidates.ui?.stacks?.length ? candidates.ui.stacks.join(", ") : "none"}\n\n## Workflows\n\n- Workflows: ${candidates.workflows?.workflows?.length || 0}\n- States: ${candidates.workflows?.workflow_states?.length || 0}\n- Transitions: ${candidates.workflows?.workflow_transitions?.length || 0}\n\n## Verification\n\n- Verifications: ${candidates.verification?.verifications?.length || 0}\n- Scenarios: ${candidates.verification?.scenarios?.length || 0}\n- Frameworks: ${candidates.verification?.frameworks?.length ? candidates.verification.frameworks.join(", ") : "none"}\n- Scripts: ${candidates.verification?.scripts?.length || 0}\n`
+    `# App Import Report\n\nTracks: ${tracks.join(", ")}\n\n## DB\n\n- Entities: ${candidates.db?.entities?.length || 0}\n- Enums: ${candidates.db?.enums?.length || 0}\n- Relations: ${candidates.db?.relations?.length || 0}\n\n## API\n\n- Capabilities: ${candidates.api?.capabilities?.length || 0}\n- Routes: ${candidates.api?.routes?.length || 0}\n- Stacks: ${candidates.api?.stacks?.length ? candidates.api.stacks.join(", ") : "none"}\n\n## UI\n\n- Screens: ${candidates.ui?.screens?.length || 0}\n- Routes: ${candidates.ui?.routes?.length || 0}\n- Actions: ${candidates.ui?.actions?.length || 0}\n- Widgets: ${uiWidgetCandidates(candidates.ui).length}\n- Stacks: ${candidates.ui?.stacks?.length ? candidates.ui.stacks.join(", ") : "none"}\n\n## Workflows\n\n- Workflows: ${candidates.workflows?.workflows?.length || 0}\n- States: ${candidates.workflows?.workflow_states?.length || 0}\n- Transitions: ${candidates.workflows?.workflow_transitions?.length || 0}\n\n## Verification\n\n- Verifications: ${candidates.verification?.verifications?.length || 0}\n- Scenarios: ${candidates.verification?.scenarios?.length || 0}\n- Frameworks: ${candidates.verification?.frameworks?.length ? candidates.verification.frameworks.join(", ") : "none"}\n- Scripts: ${candidates.verification?.scripts?.length || 0}\n`
   );
 
   return {

package/src/project-config.js

@@ -26,9 +26,6 @@ import { validateProjectGeneratorPolicy } from "./generator-policy.js";
  * @property {number|null} [port]
  * @property {string} [uses_api]
  * @property {string} [uses_database]
- * @property {string} [type] Migration diagnostic only.
- * @property {string} [api] Migration diagnostic only.
- * @property {string} [database] Migration diagnostic only.
  * @property {Record<string, string>} [env]
  */
 
@@ -36,7 +33,7 @@ import { validateProjectGeneratorPolicy } from "./generator-policy.js";
  * @typedef {Object} ProjectConfig
  * @property {string} version
  * @property {Record<string, { path: string, ownership: "generated"|"maintained" }>} outputs
- * @property {{ runtimes: RuntimeTopologyRuntime[], components?: any[] }} topology
+ * @property {{ runtimes: RuntimeTopologyRuntime[] }} topology
  * @property {{ id?: string, module?: string, export?: string, implementation_module?: string, implementation_export?: string }} [implementation]
  */
 
@@ -225,40 +222,6 @@ export function defaultProjectConfigForGraph(graph, implementation = null) {
   };
 }
 
-/**
- * @param {string} kind
- * @returns {string}
- */
-function legacyRuntimeType(kind) {
-  if (kind === "api_service") return "api";
-  if (kind === "web_surface") return "web";
-  if (kind === "ios_surface" || kind === "android_surface") return "native";
-  return kind;
-}
-
-/**
- * @param {any} config
- * @returns {any}
- */
-function normalizeProjectConfigRuntimeAliases(config) {
-  if (!config?.topology || !Array.isArray(config.topology.runtimes)) {
-    return config;
-  }
-  return {
-    ...config,
-    topology: {
-      ...config.topology,
-      __normalizedRuntimeAliases: true,
-      components: config.topology.runtimes.map((/** @type {RuntimeTopologyRuntime} */ runtime) => ({
-        ...runtime,
-        type: legacyRuntimeType(runtime.kind),
-        api: runtime.uses_api,
-        database: runtime.uses_database
-      }))
-    }
-  };
-}
-
 /**
  * @param {string} root
  * @returns {ProjectConfigInfo|null}
@@ -270,7 +233,7 @@ export function loadProjectConfig(root) {
   }
   return {
     ...found,
-    config: normalizeProjectConfigRuntimeAliases(found.config),
+    config: found.config,
     compatibility: false
   };
 }
@@ -290,7 +253,7 @@ export function projectConfigOrDefault(root, graph = null, implementation = null
     return null;
   }
   return {
-    config: normalizeProjectConfigRuntimeAliases(defaultProjectConfigForGraph(graph, implementation)),
+    config: defaultProjectConfigForGraph(graph, implementation),
     configPath: null,
     configDir: path.dirname(path.resolve(root)),
     compatibility: true
@@ -485,7 +448,7 @@ export function validateProjectConfig(config, graph = null, options = {}) {
     pushError(errors, "topogram.project.json version must be a non-empty string");
   }
   validateOutputConfig(errors, config);
-  if (config.topology?.components != null && config.topology.__normalizedRuntimeAliases !== true) {
+  if (config.topology?.components != null) {
     pushError(errors, `topogram.project.json ${renameDiagnostic("'topology.components'", "'topology.runtimes'", `"topology": { "runtimes": [] }`)}`);
   }
   if (!config.topology || typeof config.topology !== "object" || !Array.isArray(config.topology.runtimes)) {
@@ -495,7 +458,7 @@ export function validateProjectConfig(config, graph = null, options = {}) {
     for (const component of config.topology.runtimes) {
       validateComponentShape(errors, component, seenIds);
     }
-    const generatorPolicy = validateProjectGeneratorPolicy(normalizeProjectConfigRuntimeAliases(config), options);
+    const generatorPolicy = validateProjectGeneratorPolicy(config, options);
     for (const error of generatorPolicy.errors) {
       pushError(errors, error.message, error.loc);
     }

package/src/proofs/contract-audit.js

@@ -117,7 +117,7 @@ function normalizeServerContract(contract) {
   return {
     projection: {
       id: contract.projection?.id ?? null,
-      platform: contract.projection?.platform ?? null
+      type: contract.projection?.type ?? null
     },
     routes: (contract.routes ?? []).map(normalizeRoute).sort((a, b) => {
       const leftKey = `${a.method}:${a.path}:${a.capabilityId}`;

package/src/realization/backend/build-backend-runtime-realization.js

@@ -28,8 +28,8 @@ export function getDefaultBackendDbProjection(graph, options = {}) {
   return (
     explicit ||
     preferred ||
-    candidates.find((projection) => projection.platform === "db_contract") ||
-    candidates.find((projection) => projection.platform === "db_contract") ||
+    candidates.find((projection) => projection.type === "db_contract") ||
+    candidates.find((projection) => projection.type === "db_contract") ||
     candidates[0] ||
     null
   );
@@ -76,7 +76,7 @@ export function buildBackendRuntimeRealization(graph, options = {}) {
     repositoryReference,
     dbProjection: {
       id: dbProjection.id,
-      platform: dbProjection.platform
+      type: dbProjection.type
     }
   };
 }

package/src/realization/ui/build-ui-shared-realization.js

@@ -49,12 +49,12 @@ function ownershipFieldByCapability(graph) {
 }
 
 function widgetById(graph, widgetId) {
-  return (graph.byKind.widget || graph.byKind.component || []).find((widget) => widget.id === widgetId) || null;
+  return (graph.byKind.widget || []).find((widget) => widget.id === widgetId) || null;
 }
 
 function widgetContractFor(graph, widgetId) {
   const widget = widgetById(graph, widgetId);
-  return widget?.widgetContract || widget?.componentContract || null;
+  return widget?.widgetContract || null;
 }
 
 function summarizeWidgetRef(graph, widgetId) {
@@ -119,7 +119,7 @@ function buildDesignIntentContract(projection) {
 }
 
 export function buildWidgetUsageContract(graph, entry, options = {}) {
-  const widgetId = entry.widget?.id || entry.component?.id || null;
+  const widgetId = entry.widget?.id || null;
   const contract = widgetId ? widgetContractFor(graph, widgetId) : null;
   const region = options.region || null;
   return {
@@ -143,7 +143,7 @@ export function buildWidgetUsageContract(graph, entry, options = {}) {
 
 export function buildWidgetContractMap(graph, widgetUsages) {
   return Object.fromEntries(
-    [...new Set(widgetUsages.map((entry) => entry.widget?.id || entry.component?.id).filter(Boolean))]
+    [...new Set(widgetUsages.map((entry) => entry.widget?.id).filter(Boolean))]
       .sort()
       .map((widgetId) => [widgetId, widgetContractFor(graph, widgetId)])
       .filter(([, contract]) => contract)
@@ -202,7 +202,7 @@ function buildUiScreenContract(graph, projection, screen, ownershipFields) {
   const actionEntries = (projection.uiActions || []).filter((entry) => entry.screenId === screen.id);
   const lookupEntries = (projection.uiLookups || []).filter((entry) => entry.screenId === screen.id);
   const regionEntries = (projection.uiScreenRegions || []).filter((entry) => entry.screenId === screen.id);
-  const widgetEntries = (projection.uiComponents || []).filter((entry) => entry.screenId === screen.id);
+  const widgetEntries = (projection.widgetBindings || []).filter((entry) => entry.screenId === screen.id);
   const screenActionIds = new Set(
     [
       screen.primaryAction?.id,
@@ -305,13 +305,13 @@ export function buildUiSharedRealization(graph, options = {}) {
 
   if (options.projectionId) {
     const projection = projections[0];
-    const widgetUsages = projection.uiComponents || [];
+    const widgetUsages = projection.widgetBindings || [];
     const screens = (projection.uiScreens || []).map((screen) => buildUiScreenContract(graph, projection, screen, ownershipFields));
     return {
       projection: {
         id: projection.id,
         name: projection.name || projection.id,
-        type: projection.type || projection.platform
+        type: projection.type || projection.type
       },
       realizes: projection.realizes,
       outputs: projection.outputs,
@@ -325,13 +325,13 @@ export function buildUiSharedRealization(graph, options = {}) {
 
   const output = {};
   for (const projection of projections) {
-    const widgetUsages = projection.uiComponents || [];
+    const widgetUsages = projection.widgetBindings || [];
     const screens = (projection.uiScreens || []).map((screen) => buildUiScreenContract(graph, projection, screen, ownershipFields));
     output[projection.id] = {
       projection: {
         id: projection.id,
         name: projection.name || projection.id,
-        type: projection.type || projection.platform
+        type: projection.type || projection.type
       },
       realizes: projection.realizes,
       outputs: projection.outputs,

package/src/realization/ui/build-web-realization.js

@@ -26,7 +26,7 @@ export function buildWebRealization(graph, options = {}) {
   }
 
   const projection = getProjection(graph, options.projectionId);
-  const projectionType = projection.type || projection.platform;
+  const projectionType = projection.type || projection.type;
   const surfaceHints =
     projectionType === "ios_surface" ? projection.uiIos || [] : projection.uiWeb || [];
   const sharedProjection = sharedUiProjectionForWeb(graph, projection);
@@ -85,13 +85,13 @@ export function buildWebRealization(graph, options = {}) {
     projection: {
       id: projection.id,
       name: projection.name || projection.id,
-      type: projection.type || projection.platform
+      type: projection.type || projection.type
     },
     uiContract: sharedProjection
       ? {
           id: sharedProjection.id,
           name: sharedProjection.name || sharedProjection.id,
-          type: sharedProjection.type || sharedProjection.platform
+          type: sharedProjection.type || sharedProjection.type
         }
       : null,
     generatorDefaults: generatorDefaultsMap(projection),

package/src/reconcile/journeys.js

@@ -40,7 +40,7 @@ function collectJourneyGenerationContext(graph) {
   const rules = graph.byKind.rule || [];
   const projections = graph.byKind.projection || [];
   const uiSharedScreens = projections
-    .filter((projection) => projection.platform === "ui_contract")
+    .filter((projection) => projection.type === "ui_contract")
     .flatMap((projection) => (projection.uiScreens || []).map((screen) => ({ ...screen, projectionId: projection.id })));
   const canonicalJourneys = (graph.docs || []).filter((doc) => doc.kind === "journey");
   const coveredEntityIds = new Set(canonicalJourneys.flatMap((doc) => doc.relatedEntities || []));

package/src/resolver/enrich/widget.js

@@ -1,2 +1,2 @@
-// Component enrichment is orchestrated from ../index.js in this split.
-// The public enriched shape is `statement.componentContract`.
+// Widget enrichment is orchestrated from ../index.js in this split.
+// The public enriched shape is `statement.widgetContract`.

package/src/resolver/index.js

@@ -509,7 +509,7 @@ function buildProjectionPlan(statement) {
     designTokens: statement.uiDesign,
     navigation: statement.uiNavigation,
     screenRegions: statement.uiScreenRegions,
-    widgetBindings: statement.uiComponents,
+    widgetBindings: statement.widgetBindings,
     tables: statement.dbTables,
     columns: statement.dbColumns,
     keys: statement.dbKeys,
@@ -536,7 +536,6 @@ function buildProjectionPlan(statement) {
     uiRoutes: statement.uiRoutes,
     uiWeb: statement.uiWeb,
     uiDesign: statement.uiDesign,
-    uiComponents: statement.uiComponents,
     dbTables: statement.dbTables,
     dbColumns: statement.dbColumns,
     dbKeys: statement.dbKeys,
@@ -1361,8 +1360,7 @@ function parseProjectionUiScreenRegionsBlock(statement) {
   });
 }
 
-function parseProjectionUiComponentsBlock(statement, registry, options = {}) {
-  const includeComponentAlias = options.includeComponentAlias !== false;
+function parseProjectionUiComponentsBlock(statement, registry) {
   return blockEntries(getFieldValue(statement, "widget_bindings")).map((entry) => {
     const dataBindings = [];
     const eventBindings = [];
@@ -1421,11 +1419,6 @@ function parseProjectionUiComponentsBlock(statement, registry, options = {}) {
       raw: normalizeSequence(entry.items),
       loc: entry.loc
     };
-    if (includeComponentAlias) {
-      // Internal compatibility for existing generator adapters during the
-      // coordinated public DSL rename. Public contracts should expose widget.
-      binding.component = widgetRef;
-    }
     return binding;
   });
 }
@@ -1897,9 +1890,6 @@ export function normalizeStatement(statement, registry) {
       return {
         ...base,
         type: symbolValue(getFieldValue(statement, "type")),
-        // Internal compatibility for existing generator adapters during the
-        // coordinated public DSL rename. Public contracts should expose type.
-        platform: symbolValue(getFieldValue(statement, "type")),
         realizes: resolveReferenceList(registry, getFieldValue(statement, "realizes")),
         outputs: symbolValues(getFieldValue(statement, "outputs")),
         endpoints: parseProjectionHttpBlock(statement, registry),
@@ -1952,8 +1942,7 @@ export function normalizeStatement(statement, registry) {
         navigation: parseProjectionUiNavigationBlock(statement),
         uiScreenRegions: parseProjectionUiScreenRegionsBlock(statement),
         screenRegions: parseProjectionUiScreenRegionsBlock(statement),
-        uiComponents: parseProjectionUiComponentsBlock(statement, registry),
-        widgetBindings: parseProjectionUiComponentsBlock(statement, registry, { includeComponentAlias: false }),
+        widgetBindings: parseProjectionUiComponentsBlock(statement, registry),
         dbTables: parseProjectionDbTablesBlock(statement, registry),
         tables: parseProjectionDbTablesBlock(statement, registry),
         dbColumns: parseProjectionDbColumnsBlock(statement, registry),
@@ -2348,10 +2337,7 @@ export function resolveWorkspace(workspaceAst) {
     case "widget":
       return {
         ...statement,
-          widgetContract: buildComponentContract(statement),
-          // Internal compatibility for existing generator adapters during the
-          // coordinated public DSL rename. Public contracts should expose widgetContract.
-          componentContract: buildComponentContract(statement)
+          widgetContract: buildComponentContract(statement)
         };
       case "rule":
         return {
@@ -2497,11 +2483,6 @@ export function resolveWorkspace(workspaceAst) {
     };
   });
   const finalByKind = groupBy(finalStatements, (statement) => statement.kind);
-  if (finalByKind.widget && !finalByKind.component) {
-    // Internal compatibility for existing generator/context modules while the
-    // public DSL moves from component to widget in one coordinated release.
-    finalByKind.component = finalByKind.widget;
-  }
 
   const graph = mergeArchivedIntoGraph({
     root: workspaceAst.root,