@topogram/cli 0.3.44 → 0.3.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topogram/cli",
-  "version": "0.3.44",
+  "version": "0.3.46",
   "description": "Topogram CLI for checking Topogram workspaces and generating app bundles.",
   "license": "Apache-2.0",
   "repository": {

package/src/adoption/review-groups.js

@@ -172,6 +172,7 @@ export function buildBundleAdoptionPriorities(report, confidenceRank) {
         enums: bundle.enums.length,
         capabilities: bundle.capabilities.length,
         shapes: bundle.shapes.length,
+        components: bundle.components?.length || 0,
         screens: bundle.screens.length,
         workflows: bundle.workflows.length,
         docs: bundle.docs.length

package/src/cli.js

@@ -595,9 +595,9 @@ function printGeneratorHelp() {
   console.log("Inspects generator manifests and checks generator pack conformance.");
   console.log("");
   console.log("Notes:");
-  console.log("  - list shows bundled generators plus installed package-backed generators declared in package.json.");
-  console.log("  - show accepts an installed package name or a bundled fallback generator id.");
-  console.log("  - check validates a local generator package path or an already installed package.");
+  console.log("  - list shows bundled generators plus installed package-backed generators declared in package.json; it reads manifests only.");
+  console.log("  - show accepts an installed package name or a bundled fallback generator id; it does not load adapter code.");
+  console.log("  - check validates a local generator package path or an already installed package by loading the adapter and running smoke generation.");
   console.log("  - Topogram does not install generator packages during show or check.");
   console.log(`  - package-backed project generators are governed by ${GENERATOR_POLICY_FILE}; bundled topogram/* generators are allowed.`);
   console.log("");
@@ -1250,6 +1250,7 @@ function printGeneratorCheck(payload) {
     console.log(`Projection platforms: ${payload.manifest.projectionPlatforms.join(", ")}`);
     console.log(`Source mode: ${payload.manifest.source}`);
   }
+  console.log("Executes package code: yes (loads adapter and runs smoke generate)");
   console.log("");
   console.log("Checks:");
   for (const check of payload.checks || []) {
@@ -1285,6 +1286,8 @@ function generatorManifestSummary(manifest, metadata = {}) {
     stack: manifest.stack || {},
     capabilities: manifest.capabilities || {},
     source: manifest.source,
+    loadsAdapter: false,
+    executesPackageCode: false,
     ...(manifest.profile ? { profile: manifest.profile } : {}),
     ...(manifest.package ? { package: manifest.package } : {}),
     ...(installCommand ? { installCommand } : {}),
@@ -1496,6 +1499,8 @@ function printGeneratorList(payload) {
     const stack = Object.values(generator.stack || {}).join(" + ") || "not declared";
     console.log(`- ${id}${generator.version ? `@${generator.version}` : ""} (${generator.surface || "unknown"}, ${status})`);
     console.log(`  Source: ${generator.source}`);
+    console.log("  Adapter loaded: no");
+    console.log("  Executes package code: no");
     if (generator.source === "package") {
       console.log(`  Installed: ${generator.installed ? "yes" : "no"}`);
     }
@@ -1529,6 +1534,8 @@ function printGeneratorShow(payload) {
   console.log(`Generator: ${generator.id}@${generator.version}`);
   console.log(`Surface: ${generator.surface}`);
   console.log(`Source: ${generator.source}${generator.planned ? " (planned)" : ""}`);
+  console.log("Adapter loaded: no");
+  console.log("Executes package code: no");
   if (generator.source === "package") {
     console.log(`Installed: ${generator.installed ? "yes" : "no"}`);
   }
@@ -5558,6 +5565,32 @@ function importAdoptCommand(projectRoot, selector, write = false) {
   return `topogram import adopt ${selector} ${importProjectCommandPath(projectRoot)} ${write ? "--write" : "--dry-run"}`;
 }
 
+const BROWNFIELD_BROAD_ADOPT_SELECTORS = [
+  {
+    selector: "from-plan",
+    kind: "plan",
+    label: "approved or pending plan items",
+    matches: (item) => item.current_state === "stage" || item.current_state === "accept"
+  },
+  { selector: "actors", kind: "kind", label: "actors", matches: (item) => item.kind === "actor" },
+  { selector: "roles", kind: "kind", label: "roles", matches: (item) => item.kind === "role" },
+  { selector: "enums", kind: "kind", label: "enums", matches: (item) => item.kind === "enum" },
+  { selector: "shapes", kind: "kind", label: "shapes", matches: (item) => item.kind === "shape" },
+  { selector: "entities", kind: "kind", label: "entities", matches: (item) => item.kind === "entity" },
+  { selector: "capabilities", kind: "kind", label: "capabilities", matches: (item) => item.kind === "capability" },
+  { selector: "components", kind: "kind", label: "components", matches: (item) => item.kind === "component" },
+  { selector: "docs", kind: "track", label: "docs", matches: (item) => item.track === "docs" },
+  {
+    selector: "journeys",
+    kind: "track",
+    label: "journey docs",
+    matches: (item) => item.track === "docs" && String(item.canonical_rel_path || "").startsWith("docs/journeys/")
+  },
+  { selector: "workflows", kind: "track", label: "workflows", matches: (item) => item.track === "workflows" || item.kind === "decision" },
+  { selector: "verification", kind: "kind", label: "verification", matches: (item) => item.kind === "verification" },
+  { selector: "ui", kind: "track", label: "UI reports and components", matches: (item) => item.track === "ui" }
+];
+
 function readImportAdoptionArtifacts(inputPath) {
   const projectRoot = normalizeProjectRoot(inputPath);
   const topogramRoot = normalizeTopogramPath(inputPath);
@@ -5582,6 +5615,27 @@ function readImportAdoptionArtifacts(inputPath) {
   };
 }
 
+function buildBrownfieldBroadAdoptSelectors(projectRoot, adoptionPlan) {
+  const surfaces = adoptionPlan.imported_proposal_surfaces || [];
+  return BROWNFIELD_BROAD_ADOPT_SELECTORS.map((definition) => {
+    const items = surfaces.filter(definition.matches);
+    const pendingItems = items.filter((item) => !["accept", "accepted", "applied"].includes(item.current_state));
+    const appliedItems = items.filter((item) => ["accept", "accepted", "applied"].includes(item.current_state));
+    const blockedItems = items.filter((item) => item.human_review_required);
+    return {
+      selector: definition.selector,
+      kind: definition.kind,
+      label: definition.label,
+      itemCount: items.length,
+      pendingItemCount: pendingItems.length,
+      appliedItemCount: appliedItems.length,
+      blockedItemCount: blockedItems.length,
+      previewCommand: importAdoptCommand(projectRoot, definition.selector, false),
+      writeCommand: importAdoptCommand(projectRoot, definition.selector, true)
+    };
+  }).filter((selector) => selector.itemCount > 0);
+}
+
 function summarizeImportAdoption(adoptionPlan, adoptionStatus, projectRoot) {
   const surfaces = adoptionPlan.imported_proposal_surfaces || [];
   const slugs = [];
@@ -5693,6 +5747,7 @@ function printBrownfieldImportPlan(payload) {
 }
 
 function buildBrownfieldImportAdoptListPayload(inputPath) {
+  const artifacts = readImportAdoptionArtifacts(inputPath);
   const plan = buildBrownfieldImportPlanPayload(inputPath);
   const selectors = plan.bundles.map((bundle) => ({
     selector: `bundle:${bundle.bundle}`,
@@ -5706,12 +5761,15 @@ function buildBrownfieldImportAdoptListPayload(inputPath) {
     previewCommand: importAdoptCommand(plan.projectRoot, `bundle:${bundle.bundle}`, false),
     writeCommand: importAdoptCommand(plan.projectRoot, `bundle:${bundle.bundle}`, true)
   }));
+  const broadSelectors = buildBrownfieldBroadAdoptSelectors(plan.projectRoot, artifacts.adoptionPlan);
   return {
     ok: true,
     projectRoot: plan.projectRoot,
     topogramRoot: plan.topogramRoot,
     selectorCount: selectors.length,
     selectors,
+    broadSelectorCount: broadSelectors.length,
+    broadSelectors,
     nextCommand: selectors.find((selector) => !selector.complete)?.previewCommand || plan.commands.status
   };
 }
@@ -5727,6 +5785,15 @@ function printBrownfieldImportAdoptList(payload) {
     console.log(`  Preview: ${selector.previewCommand}`);
     console.log(`  Write: ${selector.writeCommand}`);
   }
+  if (payload.broadSelectors.length > 0) {
+    console.log("");
+    console.log("Broad selectors:");
+    for (const selector of payload.broadSelectors) {
+      console.log(`- ${selector.selector}: ${selector.itemCount} ${selector.label}`);
+      console.log(`  Preview: ${selector.previewCommand}`);
+      console.log(`  Write: ${selector.writeCommand}`);
+    }
+  }
   console.log("");
   console.log(`Next: ${payload.nextCommand}`);
 }

package/src/generator/adapters.js

@@ -10,6 +10,10 @@ import {
   resolveGeneratorManifestForBinding,
   validateGeneratorManifest
 } from "./registry.js";
+import {
+  generatorPolicyDiagnosticsForBindings,
+  loadGeneratorPolicy
+} from "../generator-policy.js";
 import { generateDbContractGraph } from "./surfaces/databases/contract.js";
 import { generateDbLifecyclePlan } from "./surfaces/databases/lifecycle-shared.js";
 import {
@@ -252,6 +256,26 @@ function loadPackageGeneratorAdapter(manifest, component, options = {}) {
     throw new Error(`Component '${component?.id || "unknown"}' generator '${manifest.id}@${manifest.version}' is package-backed but does not declare a package.`);
   }
   const rootDir = options.configDir || options.rootDir || process.cwd();
+  const diagnostics = generatorPolicyDiagnosticsForBindings(
+    loadGeneratorPolicy(rootDir),
+    [{
+      componentId: String(component?.id || "unknown"),
+      componentType: String(component?.type || manifest.surface || "unknown"),
+      projection: String(component?.projection?.id || component?.projection || "unknown"),
+      generatorId: String(component?.generator?.id || manifest.id),
+      version: String(component?.generator?.version || manifest.version),
+      packageName
+    }],
+    "generator-adapter"
+  );
+  const errors = diagnostics.filter((diagnostic) => diagnostic.severity === "error");
+  if (errors.length > 0) {
+    throw new Error(errors.map((diagnostic) =>
+      diagnostic.suggestedFix
+        ? `${diagnostic.message} Suggested fix: ${diagnostic.suggestedFix}`
+        : diagnostic.message
+    ).join("\n"));
+  }
   let moduleValue;
   try {
     moduleValue = requireFromProject(rootDir)(packageName);

package/src/generator/check.js

@@ -25,6 +25,7 @@ import {
  * @property {Array<{ name: string, ok: boolean, message: string }>} checks
  * @property {string[]} errors
  * @property {{ files: number, artifacts: number, diagnostics: number }|null} smoke
+ * @property {boolean} executesPackageCode
  */
 
 /**
@@ -238,7 +239,8 @@ export function checkGeneratorPack(sourceSpec, options = {}) {
     manifest: null,
     checks: [],
     errors: [],
-    smoke: null
+    smoke: null,
+    executesPackageCode: true
   };
 
   /** @type {any|null} */

package/src/generator/surfaces/services/stateless.js

@@ -1,6 +1,7 @@
 // @ts-check
 
 import { getProjection } from "../shared.js";
+import { generateServerContract } from "./server-contract.js";
 
 function renderPackageJson(profile) {
   const dependencies = profile === "express"
@@ -41,10 +42,10 @@ function routePath(path) {
   return String(path || "/").replace(/:([A-Za-z0-9_]+)/g, ":$1");
 }
 
-function renderHonoIndex(projection) {
-  const routes = (projection.http || []).map((route) => {
+function renderHonoIndex(projection, contract) {
+  const routes = (contract.routes || []).map((route) => {
     const method = String(route.method || "GET").toLowerCase();
-    return `app.${method}("${routePath(route.path)}", (c) => c.json({ ok: true, capability: "${route.capabilityId}", input: { params: c.req.param(), query: c.req.query() } }, ${route.success || 200} as any));`;
+    return `app.${method}("${routePath(route.path)}", (c) => c.json({ ok: true, capability: "${route.capabilityId}", input: { params: c.req.param(), query: c.req.query() } }, ${route.successStatus || 200} as any));`;
   }).join("\n");
   return `import { serve } from "@hono/node-server";
 import { Hono } from "hono";
@@ -65,10 +66,10 @@ function expressPath(path) {
   return routePath(path);
 }
 
-function renderExpressIndex(projection) {
-  const routes = (projection.http || []).map((route) => {
+function renderExpressIndex(projection, contract) {
+  const routes = (contract.routes || []).map((route) => {
     const method = String(route.method || "GET").toLowerCase();
-    return `app.${method}("${expressPath(route.path)}", (req, res) => res.status(${route.success || 200}).json({ ok: true, capability: "${route.capabilityId}", input: { params: req.params, query: req.query } }));`;
+    return `app.${method}("${expressPath(route.path)}", (req, res) => res.status(${route.successStatus || 200}).json({ ok: true, capability: "${route.capabilityId}", input: { params: req.params, query: req.query } }));`;
   }).join("\n");
   return `import express from "express";
 
@@ -88,10 +89,11 @@ app.listen(port, () => {
 
 export function generateStatelessServer(graph, options = {}) {
   const projection = getProjection(graph, options.projectionId);
+  const contract = generateServerContract(graph, { ...options, projectionId: projection.id });
   const profile = options.profile === "express" ? "express" : "hono";
   return {
     "package.json": renderPackageJson(profile),
     "tsconfig.json": renderTsconfig(),
-    "src/index.ts": profile === "express" ? renderExpressIndex(projection) : renderHonoIndex(projection)
+    "src/index.ts": profile === "express" ? renderExpressIndex(projection, contract) : renderHonoIndex(projection, contract)
   };
 }

package/src/workflows.js

@@ -1679,7 +1679,8 @@ function summarizeBundleParticipants(bundle) {
 }
 
 function summarizeBundleSurface(bundle, values, empty = "_none_") {
-  return values.length ? values.map((item) => `\`${item}\``).join(", ") : empty;
+  const list = Array.isArray(values) ? values : [];
+  return list.length ? list.map((item) => `\`${item}\``).join(", ") : empty;
 }
 
 function buildBundleOperatorSummary(bundle) {
@@ -1693,6 +1694,7 @@ function buildBundleOperatorSummary(bundle) {
     bundle.id;
   const participants = summarizeBundleParticipants(bundle);
   const capabilityIds = [...new Set((bundle.capabilities || []).map((entry) => entry.id_hint))].slice(0, 4);
+  const componentIds = [...new Set((bundle.components || []).map((entry) => entry.id_hint))].slice(0, 4);
   const screenIds = [...new Set((bundle.screens || []).map((entry) => entry.id_hint))].slice(0, 4);
   const routePaths = [...new Set((bundle.uiRoutes || []).map((entry) => entry.path).filter(Boolean))].slice(0, 4);
   const workflowIds = [...new Set((bundle.workflows || []).map((entry) => entry.id_hint))].slice(0, 4);
@@ -1708,6 +1710,7 @@ function buildBundleOperatorSummary(bundle) {
   const evidenceKinds = [
     (bundle.entities || []).length > 0 ? "entity evidence" : null,
     (bundle.capabilities || []).length > 0 ? "API capability evidence" : null,
+    (bundle.components || []).length > 0 ? "UI component evidence" : null,
     (bundle.screens || []).length > 0 || (bundle.uiRoutes || []).length > 0 ? "UI screen/route evidence" : null,
     (bundle.workflows || []).length > 0 ? "workflow evidence" : null,
     (bundle.docs || []).length > 0 ? "doc evidence" : null,
@@ -1723,6 +1726,7 @@ function buildBundleOperatorSummary(bundle) {
     primaryEntityId,
     participants,
     capabilityIds,
+    componentIds,
     screenIds,
     routePaths,
     workflowIds,
@@ -2711,6 +2715,7 @@ function renderCandidateBundleReadme(bundle, proposalSurfaces = []) {
     `Enums: ${bundle.enums.length}`,
     `Capabilities: ${bundle.capabilities.length}`,
     `Shapes: ${bundle.shapes.length}`,
+    `Components: ${bundle.components.length}`,
     `Screens: ${bundle.screens.length}`,
     `UI routes: ${bundle.uiRoutes.length}`,
     `UI actions: ${bundle.uiActions.length}`,
@@ -2728,6 +2733,7 @@ function renderCandidateBundleReadme(bundle, proposalSurfaces = []) {
     `- Primary entity: ${summary.primaryEntityId ? `\`${summary.primaryEntityId}\`` : "_none_"}`,
     `- Participants: ${summary.participants.label}`,
     `- Main capabilities: ${summarizeBundleSurface(bundle, summary.capabilityIds)}`,
+    `- Main components: ${summarizeBundleSurface(bundle, summary.componentIds)}`,
     `- Main screens: ${summarizeBundleSurface(bundle, summary.screenIds)}`,
     `- Main routes: ${summarizeBundleSurface(bundle, summary.routePaths)}`,
     `- Main workflows: ${summarizeBundleSurface(bundle, summary.workflowIds)}`,
@@ -7581,6 +7587,7 @@ function reconcileWorkflow(inputPath, options = {}) {
       enums: bundle.enums.map((entry) => entry.id_hint),
       capabilities: bundle.capabilities.map((entry) => entry.id_hint),
       shapes: bundle.shapes.map((entry) => entry.id),
+      components: bundle.components.map((entry) => entry.id_hint),
       screens: bundle.screens.map((entry) => entry.id_hint),
       workflows: bundle.workflows.map((entry) => entry.id_hint),
       docs: bundle.docs.map((entry) => entry.id),
@@ -7604,10 +7611,11 @@ function reconcileWorkflow(inputPath, options = {}) {
     : "## Promoted Canonical Items";
   files["candidates/reconcile/report.json"] = `${stableStringify(report)}\n`;
   const candidateModelBundlesMarkdown = report.candidate_model_bundles.length
-    ? report.candidate_model_bundles.map((bundle) => `- \`${bundle.slug}\` (${bundle.actors.length} actors, ${bundle.roles.length} roles, ${bundle.entities.length} entities, ${bundle.enums.length} enums, ${bundle.capabilities.length} capabilities, ${bundle.shapes.length} shapes, ${bundle.screens.length} screens, ${bundle.workflows.length} workflows, ${bundle.docs.length} docs)
+    ? report.candidate_model_bundles.map((bundle) => `- \`${bundle.slug}\` (${bundle.actors.length} actors, ${bundle.roles.length} roles, ${bundle.entities.length} entities, ${bundle.enums.length} enums, ${bundle.capabilities.length} capabilities, ${bundle.shapes.length} shapes, ${bundle.components.length} components, ${bundle.screens.length} screens, ${bundle.workflows.length} workflows, ${bundle.docs.length} docs)
   - primary concept \`${bundle.operator_summary.primaryConcept}\`${bundle.operator_summary.primaryEntityId ? `, primary entity \`${bundle.operator_summary.primaryEntityId}\`` : ""}
   - participants ${bundle.operator_summary.participants.label}
   - main capabilities ${summarizeBundleSurface(bundle, bundle.operator_summary.capabilityIds)}
+  - main components ${summarizeBundleSurface(bundle, bundle.operator_summary.componentIds)}
   - main routes ${summarizeBundleSurface(bundle, bundle.operator_summary.routePaths)}
   - candidate maintained seam mappings ${renderMaintainedSeamCandidatesInline(bundle)}
   - permission hints ${bundle.auth_permission_hints?.length ? bundle.auth_permission_hints.map((entry) => formatAuthPermissionHintInline(entry)).join(", ") : "_none_"}