@topogram/cli 0.3.59 → 0.3.61

package/package.json

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

package/src/cli.js

@@ -153,6 +153,17 @@ const KNOWN_CLI_CONSUMER_WORKFLOWS = {
   "topogram-hello": "Topogram Package Verification",
   "topograms": "Catalog Verification"
 };
+const KNOWN_CLI_CONSUMER_WORKFLOW_JOBS = {
+  "topograms": [
+    "Validate catalog",
+    "Smoke native starter",
+    "Smoke starter alias (hello-web)",
+    "Smoke starter alias (hello-api)",
+    "Smoke starter alias (hello-db)",
+    "Smoke starter alias (web-api)",
+    "Smoke starter alias (web-api-db)"
+  ]
+};
 const PACKAGE_UPDATE_CLI_CHECK_SCRIPTS = [
   "cli:surface",
   "doctor",
@@ -3211,6 +3222,14 @@ function expectedConsumerWorkflowName(name) {
   return KNOWN_CLI_CONSUMER_WORKFLOWS[name] || null;
 }
 
+/**
+ * @param {string} name
+ * @returns {string[]}
+ */
+function expectedConsumerWorkflowJobs(name) {
+  return KNOWN_CLI_CONSUMER_WORKFLOW_JOBS[name] || [];
+}
+
 /**
  * @param {string[]} args
  * @param {string} cwd
@@ -3351,16 +3370,18 @@ function waitForConsumerCi(consumer, options = {}) {
 /**
  * @param {{ name: string, root?: string|null, workflow?: string|null }} consumer
  * @param {{ strict?: boolean }} [options]
- * @returns {{ checked: boolean, ok: boolean|null, expectedWorkflow: string|null, headSha: string|null, run: { databaseId?: number, workflowName?: string, status?: string, conclusion?: string, headSha?: string, url?: string }|null, diagnostics: Array<Record<string, any>> }}
+ * @returns {{ checked: boolean, ok: boolean|null, expectedWorkflow: string|null, expectedJobs: string[], headSha: string|null, run: { databaseId?: number, workflowName?: string, status?: string, conclusion?: string, headSha?: string, url?: string, jobs?: Array<Record<string, any>> }|null, diagnostics: Array<Record<string, any>> }}
  */
 function inspectConsumerCi(consumer, options = {}) {
   const diagnostics = [];
   const expectedWorkflow = consumer.workflow || expectedConsumerWorkflowName(consumer.name);
+  const expectedJobs = expectedConsumerWorkflowJobs(consumer.name);
   if (!consumer.root || !fs.existsSync(consumer.root)) {
     return {
       checked: false,
       ok: null,
       expectedWorkflow,
+      expectedJobs,
       headSha: null,
       run: null,
       diagnostics: []
@@ -3388,6 +3409,7 @@ function inspectConsumerCi(consumer, options = {}) {
       checked: true,
       ok: false,
       expectedWorkflow,
+      expectedJobs,
       headSha,
       run: null,
       diagnostics
@@ -3424,6 +3446,7 @@ function inspectConsumerCi(consumer, options = {}) {
       checked: true,
       ok: false,
       expectedWorkflow,
+      expectedJobs,
       headSha,
       run: null,
       diagnostics
@@ -3454,6 +3477,7 @@ function inspectConsumerCi(consumer, options = {}) {
       checked: true,
       ok: false,
       expectedWorkflow,
+      expectedJobs,
       headSha,
       run: null,
       diagnostics
@@ -3477,17 +3501,105 @@ function inspectConsumerCi(consumer, options = {}) {
       suggestedFix: "Wait for or fix the consumer verification workflow, then rerun release status."
     });
   }
+  if (expectedJobs.length > 0 && run.databaseId) {
+    const jobResult = inspectConsumerWorkflowJobs(consumer, run.databaseId, expectedJobs, options);
+    if (jobResult.jobs) {
+      run.jobs = jobResult.jobs;
+    }
+    diagnostics.push(...jobResult.diagnostics);
+  } else if (expectedJobs.length > 0) {
+    diagnostics.push({
+      code: "release_consumer_ci_jobs_unavailable",
+      severity: options.strict ? "error" : "warning",
+      message: `${consumer.name} ${expectedWorkflow} run did not include a database id, so expected jobs could not be inspected.`,
+      path: run.url || `attebury/${consumer.name}`,
+      suggestedFix: "Rerun release status after GitHub exposes the workflow run id."
+    });
+  }
+  const errorCount = diagnostics.filter((diagnostic) => diagnostic.severity === "error").length;
   return {
     checked: true,
-    ok: diagnostics.filter((diagnostic) => diagnostic.severity === "error").length === 0 &&
+    ok: errorCount === 0 &&
       (!options.strict || (run.status === "completed" && run.conclusion === "success" && (!headSha || !run.headSha || run.headSha === headSha))),
     expectedWorkflow,
+    expectedJobs,
     headSha,
     run,
     diagnostics
   };
 }
 
+/**
+ * @param {{ name: string, root?: string|null }} consumer
+ * @param {number|string} runId
+ * @param {string[]} expectedJobs
+ * @param {{ strict?: boolean }} [options]
+ * @returns {{ jobs: Array<Record<string, any>>|null, diagnostics: Array<Record<string, any>> }}
+ */
+function inspectConsumerWorkflowJobs(consumer, runId, expectedJobs, options = {}) {
+  const diagnostics = [];
+  const result = childProcess.spawnSync("gh", [
+    "run",
+    "view",
+    String(runId),
+    "--repo",
+    `attebury/${consumer.name}`,
+    "--json",
+    "jobs"
+  ], {
+    cwd: consumer.root || process.cwd(),
+    encoding: "utf8",
+    env: { ...process.env, PATH: process.env.PATH || "" }
+  });
+  if (result.status !== 0) {
+    diagnostics.push(commandDiagnostic({
+      code: "release_consumer_ci_jobs_unavailable",
+      severity: options.strict ? "error" : "warning",
+      message: `Could not inspect expected jobs for ${consumer.name}.`,
+      path: `attebury/${consumer.name}`,
+      suggestedFix: "Check GitHub CLI auth/network access, then rerun release status.",
+      result
+    }));
+    return { jobs: null, diagnostics };
+  }
+  let payload = {};
+  try {
+    payload = JSON.parse(String(result.stdout || "{}"));
+  } catch (error) {
+    diagnostics.push({
+      code: "release_consumer_ci_jobs_unreadable",
+      severity: options.strict ? "error" : "warning",
+      message: `Could not parse ${consumer.name} workflow job status: ${messageFromError(error)}`,
+      path: `attebury/${consumer.name}`,
+      suggestedFix: "Rerun release status after GitHub CLI output is valid JSON."
+    });
+  }
+  const jobs = Array.isArray(payload.jobs) ? payload.jobs : [];
+  for (const expectedJob of expectedJobs) {
+    const job = jobs.find((candidate) => candidate?.name === expectedJob);
+    if (!job) {
+      diagnostics.push({
+        code: "release_consumer_ci_job_missing",
+        severity: options.strict ? "error" : "warning",
+        message: `${consumer.name} workflow is missing expected job '${expectedJob}'.`,
+        path: `attebury/${consumer.name}`,
+        suggestedFix: "Update the consumer workflow or the release-status expected job list, then rerun release status."
+      });
+      continue;
+    }
+    if (job.status !== "completed" || job.conclusion !== "success") {
+      diagnostics.push({
+        code: "release_consumer_ci_job_not_successful",
+        severity: options.strict ? "error" : "warning",
+        message: `${consumer.name} job '${expectedJob}' is ${job.status || "unknown"}/${job.conclusion || "unknown"}.`,
+        path: job.url || `attebury/${consumer.name}`,
+        suggestedFix: "Wait for or fix the expected workflow job, then rerun release status."
+      });
+    }
+  }
+  return { jobs, diagnostics };
+}
+
 /**
  * @param {string} cwd
  * @returns {Array<{ name: string, root: string|null, path: string, version: string|null, found: boolean }>}

package/src/generator/adapters.js

@@ -182,7 +182,8 @@ function buildContractsForContext(context) {
   }
   if (surface === "native" || surface === "ios_surface" || surface === "android_surface") {
     return {
-      uiSurface: generateUiSurfaceContract(context.graph, { ...(context.options || {}), projectionId })
+      uiSurface: generateUiSurfaceContract(context.graph, { ...(context.options || {}), projectionId }),
+      api: generateApiContractGraph(context.graph, {})
     };
   }
   return {};

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

@@ -1,4 +1,5 @@
 import {
+  generateNativeBundle,
   generateServerBundle,
   generateWebBundle,
   getDefaultEnvironmentProjections,
@@ -49,6 +50,12 @@ function buildCompileCheckPlan(graph, options = {}) {
       command: "npm run build"
     }
   ]);
+  const nativeChecks = topology.nativeRuntimes.map((component, index) => ({
+    id: index === 0 ? "native_swift_build" : `native_swift_build_${component.id}`,
+    cwd: topology.nativeDir(component),
+    install: null,
+    command: "swift build"
+  }));
   return {
     type: "compile_check_plan",
     name: compileCheckName(graph, options),
@@ -65,7 +72,7 @@ function buildCompileCheckPlan(graph, options = {}) {
         generator: runtime.generator
       }))
     },
-    checks: [...apiChecks, ...webChecks]
+    checks: [...apiChecks, ...webChecks, ...nativeChecks]
   };
 }
 
@@ -92,13 +99,14 @@ ${runtimeReference.environment.envExample || ""}
 function renderCompileCheckReadme(graph, options = {}) {
   return `# ${compileCheckName(graph, options).replace("Plan", "Bundle")}
 
-This bundle verifies that the generated server and web projects typecheck and build.
+This bundle verifies that generated server, web, and native projects compile.
 
 ## Checks
 
 - server TypeScript check
 - web TypeScript check
 - web production build
+- native Swift build
 
 ## Usage
 
@@ -124,15 +132,17 @@ function renderCompileCheckScript(plan) {
     ""
   ];
   if (plan.checks.length === 0) {
-    lines.push('echo "No API or web runtimes are configured; compile check is a no-op."');
+    lines.push('echo "No API, web, or native runtimes are configured; compile check is a no-op."');
   }
   for (const check of plan.checks) {
     const label = check.id.includes("web")
       ? check.id.includes("build") ? "Building generated web" : "Checking generated web"
-      : "Checking generated server";
+      : check.id.includes("native") ? "Building generated native app" : "Checking generated server";
     lines.push(`echo "${label} (${check.cwd})..."`);
-    lines.push(`echo "Installing dependencies (${check.cwd})..."`);
-    lines.push(`(cd "$ROOT_DIR/${check.cwd}" && ${check.install})`);
+    if (check.install) {
+      lines.push(`echo "Installing dependencies (${check.cwd})..."`);
+      lines.push(`(cd "$ROOT_DIR/${check.cwd}" && ${check.install})`);
+    }
     lines.push(`echo "Running ${check.command} (${check.cwd})..."`);
     lines.push(`(cd "$ROOT_DIR/${check.cwd}" && ${check.command})`);
     lines.push("");
@@ -158,6 +168,10 @@ export function generateCompileCheckBundle(graph, options = {}) {
     const webBundle = generateWebBundle(graph, component.projection.id, { ...options, component });
     mergeBundleFiles(files, topology.webDir(component), webBundle);
   }
+  for (const component of topology.nativeRuntimes) {
+    const nativeBundle = generateNativeBundle(graph, component.projection.id, { ...options, component });
+    mergeBundleFiles(files, topology.nativeDir(component), nativeBundle);
+  }
   return files;
 }
 

package/src/generator/runtime/environment.js

@@ -2,6 +2,7 @@ import { generateDbLifecyclePlan } from "../surfaces/databases/lifecycle-shared.
 import { getExampleImplementation } from "../../example-implementation.js";
 import {
   generateDbBundle,
+  generateNativeBundle,
   generateServerBundle,
   generateWebBundle,
   dbEnvVarsForComponent,
@@ -110,6 +111,7 @@ function buildEnvironmentPlan(graph, options = {}) {
       server: topology.primaryApi ? topology.serviceDir(topology.primaryApi) : null,
       web: topology.primaryWeb ? topology.webDir(topology.primaryWeb) : null,
       db: topology.primaryDb ? topology.dbDir(topology.primaryDb) : null,
+      native: topology.nativeRuntimes[0] ? topology.nativeDir(topology.nativeRuntimes[0]) : null,
       scripts: "scripts"
     },
     runtimes: {
@@ -130,6 +132,12 @@ function buildEnvironmentPlan(graph, options = {}) {
         dir: topology.webDir(component),
         uses_api: component.api
       })),
+      natives: topology.nativeRuntimes.map((component) => ({
+        id: component.id,
+        projection: component.projection.id,
+        dir: topology.nativeDir(component),
+        uses_api: component.api
+      })),
       databases: topology.dbRuntimes.map((component) => ({
         id: component.id,
         projection: component.projection.id,
@@ -273,6 +281,7 @@ function renderEnvironmentReadme(plan) {
   const hasDb = plan.runtimes.databases.length > 0;
   const hasApi = plan.runtimes.apis.length > 0;
   const hasWeb = plan.runtimes.webs.length > 0;
+  const hasNative = plan.runtimes.natives.length > 0;
   const localProcessNotes = !hasDb
     ? "- This bundle has no generated database surface."
     : plan.projections.db.engine === "sqlite"
@@ -294,7 +303,7 @@ ${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.engine === "sqlite" ? "- 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` : ""}${hasNative ? "- `native/<native-id>/`: generated native app 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
 
@@ -318,6 +327,7 @@ ${dockerSection}
 
 - ${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."}
+- ${hasNative ? "Native app scaffolds use the same UI surface contracts as web surfaces." : "No native 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.
 `;
@@ -635,6 +645,12 @@ export function generateEnvironmentBundle(graph, options = {}) {
       [topology.webDir(component)]: webBundle
     });
   }
+  for (const component of topology.nativeRuntimes) {
+    const nativeBundle = generateNativeBundle(graph, component.projection.id, { ...options, component });
+    mergeNamedBundles(files, {
+      [topology.nativeDir(component)]: nativeBundle
+    });
+  }
   for (const component of topology.dbRuntimes) {
     const dbBundle = generateDbBundle(graph, component.projection.id, { ...options, component });
     mergeNamedBundles(files, {

package/src/generator/runtime/shared.js

@@ -43,16 +43,19 @@ import { defaultProjectConfigForGraph, validateProjectConfig } from "../../proje
  * @property {RuntimeComponent[]} runtimes
  * @property {RuntimeComponent[]} apiRuntimes
  * @property {RuntimeComponent[]} webRuntimes
+ * @property {RuntimeComponent[]} nativeRuntimes
  * @property {RuntimeComponent[]} dbRuntimes
  * @property {RuntimeComponent[]} components Legacy alias for runtimes.
  * @property {RuntimeComponent[]} apiComponents Legacy alias for apiRuntimes.
  * @property {RuntimeComponent[]} webComponents Legacy alias for webRuntimes.
+ * @property {RuntimeComponent[]} nativeComponents Legacy alias for nativeRuntimes.
  * @property {RuntimeComponent[]} dbComponents Legacy alias for dbRuntimes.
  * @property {RuntimeComponent|null} primaryApi
  * @property {RuntimeComponent|null} primaryWeb
  * @property {RuntimeComponent|null} primaryDb
  * @property {(component: RuntimeComponent) => string} serviceDir
  * @property {(component: RuntimeComponent) => string} webDir
+ * @property {(component: RuntimeComponent) => string} nativeDir
  * @property {(component: RuntimeComponent) => string} dbDir
  */
 
@@ -371,6 +374,29 @@ export function generateWebBundle(graph, projectionId, options = {}) {
   }).files;
 }
 
+/**
+ * @param {ResolvedGraph} graph
+ * @param {string} projectionId
+ * @param {RuntimeGenerationOptions} [options]
+ * @returns {any}
+ */
+export function generateNativeBundle(graph, projectionId, options = {}) {
+  const topology = resolveRuntimeTopology(graph, options);
+  const runtime = options.runtime || options.component || topology.nativeRuntimes.find((entry) => entry.projection.id === projectionId);
+  if (!runtime) {
+    throw new Error(`No native runtime found for projection '${projectionId}'`);
+  }
+  return generateWithComponentGenerator({
+    graph,
+    projection: runtime.projection,
+    runtime,
+    component: runtime,
+    topology,
+    implementation: options.implementation || null,
+    options: { ...options, projectionId }
+  }).files;
+}
+
 /**
  * @param {ResolvedGraph} graph
  * @param {string} projectionId
@@ -450,7 +476,7 @@ function decorateRuntimes(graph, config) {
       runtime.databaseRuntime = byId.get(runtime.database) || null;
       runtime.databaseComponent = runtime.databaseRuntime;
     }
-    if (runtime.kind === "web_surface" && runtime.api) {
+    if (["web_surface", "ios_surface", "android_surface"].includes(runtime.kind) && runtime.api) {
       runtime.apiRuntime = byId.get(runtime.api) || null;
       runtime.apiComponent = runtime.apiRuntime;
     }
@@ -475,6 +501,7 @@ export function resolveRuntimeTopology(graph, options = {}) {
   const runtimes = decorateRuntimes(graph, config);
   const apiRuntimes = runtimes.filter((runtime) => runtime.kind === "api_service");
   const webRuntimes = runtimes.filter((runtime) => runtime.kind === "web_surface");
+  const nativeRuntimes = runtimes.filter((runtime) => runtime.kind === "ios_surface" || runtime.kind === "android_surface");
   const dbRuntimes = runtimes.filter((runtime) => runtime.kind === "database");
   const primaryApi = apiRuntimes[0] || null;
   const primaryWeb = webRuntimes[0] || null;
@@ -486,9 +513,11 @@ export function resolveRuntimeTopology(graph, options = {}) {
     components: runtimes,
     apiRuntimes,
     webRuntimes,
+    nativeRuntimes,
     dbRuntimes,
     apiComponents: apiRuntimes,
     webComponents: webRuntimes,
+    nativeComponents: nativeRuntimes,
     dbComponents: dbRuntimes,
     primaryApi,
     primaryWeb,
@@ -499,6 +528,9 @@ export function resolveRuntimeTopology(graph, options = {}) {
     webDir(component) {
       return `web/${component.id}`;
     },
+    nativeDir(component) {
+      return `native/${component.id}`;
+    },
     dbDir(component) {
       return `db/${component.id}`;
     }