@topogram/cli 0.3.78 → 0.3.80

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## Unreleased
 
+- No changes yet.
+
+## 0.3.79 - 2026-05-12
+
+- Add graph-native `journey` statements with ordered `step` and `alternate`
+  record blocks, resolver/query support, and canonical dogfood journey records.
+- Add `topogram init` as the primary command for starting an empty maintained
+  Topogram workspace, including optional SDLC policy initialization.
+- Replace the public creation/extraction vocabulary with `copy`, `extract`, and
+  top-level `adopt`: `topogram copy <source> <target>` copies templates or pure
+  Topogram packages, `topogram extract` reads brownfield apps into reviewable
+  candidates, and `topogram adopt` promotes selected candidates.
+- Rename public extraction provenance and guidance to extract/adopt terms,
+  including generated starter docs, agent brief output, package smoke scripts,
+  and dogfood CLI surface records.
+- Keep `generate` scoped to app/runtime output and `emit` scoped to contracts,
+  reports, snapshots, and plans.
+
+## 0.3.78 - 2026-05-12
+
 - Install package-backed generator dependencies during `topogram template check`
   before starter validation.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topogram/cli",
-  "version": "0.3.78",
+  "version": "0.3.80",
   "description": "Topogram CLI for checking Topogram workspaces and generating app bundles.",
   "license": "Apache-2.0",
   "repository": {
@@ -27,7 +27,7 @@
     "access": "public"
   },
   "scripts": {
-    "new": "node ./src/cli.js new",
+    "copy": "node ./src/cli.js copy",
     "check": "npm test",
     "fixture:check": "node ./src/cli.js check ./tests/fixtures/workspaces/app-basic",
     "fixture:check:json": "node ./src/cli.js check ./tests/fixtures/workspaces/app-basic --json",

package/src/agent-brief.js

@@ -155,11 +155,17 @@ function readImportSummary(projectRoot) {
       path: TOPOGRAM_IMPORT_FILE,
       workspaceRoot: resolveTopoRoot(projectRoot),
       source: typeof record?.source?.path === "string" ? record.source.path : null,
-      tracks: Array.isArray(record?.import?.tracks) ? record.import.tracks.map(String) : [],
-      candidateCounts: record?.import?.candidateCounts && typeof record.import.candidateCounts === "object"
+      tracks: Array.isArray(record?.extract?.tracks) ? record.extract.tracks.map(String) : Array.isArray(record?.import?.tracks) ? record.import.tracks.map(String) : [],
+      candidateCounts: record?.extract?.candidateCounts && typeof record.extract.candidateCounts === "object"
+        ? record.extract.candidateCounts
+        : record?.import?.candidateCounts && typeof record.import.candidateCounts === "object"
         ? record.import.candidateCounts
         : {},
-      ownership: typeof record?.ownership?.importedArtifacts === "string" ? record.ownership.importedArtifacts : null
+      ownership: typeof record?.ownership?.extractedArtifacts === "string"
+        ? record.ownership.extractedArtifacts
+        : typeof record?.ownership?.importedArtifacts === "string"
+        ? record.ownership.importedArtifacts
+        : null
     };
   } catch (error) {
     return {
@@ -241,16 +247,16 @@ function buildWorkflows(config, hasImportRecord) {
   }
   if (hasImportRecord) {
     workflows.push({
-      id: "brownfield-import",
-      title: "Brownfield import adoption loop",
+      id: "brownfield-extract",
+      title: "Brownfield extract/adopt loop",
       commands: [
-        "topogram import check . --json",
-        "topogram import plan . --json",
-        "topogram import adopt --list . --json",
-        "topogram import status . --json",
-        "topogram import history . --verify --json"
+        "topogram extract check . --json",
+        "topogram extract plan . --json",
+        "topogram adopt --list . --json",
+        "topogram extract status . --json",
+        "topogram extract history . --verify --json"
       ],
-      rule: "Imported Topogram files are editable after adoption; JSON automation should read workspaceRoot for the project-owned workspace path."
+      rule: "Extracted Topogram files are editable after adoption; JSON automation should read workspaceRoot for the project-owned workspace path."
     });
   }
   return workflows;
@@ -284,7 +290,7 @@ function buildWarnings(projectRoot, config, trust, importSummary, generatorPolic
     warnings.push("Generated-owned outputs are replaceable by Topogram; do not make lasting edits under generated output paths.");
   }
   if (importSummary) {
-    warnings.push(`${TOPOGRAM_IMPORT_FILE} is present. Treat imported Topogram artifacts as project-owned after adoption; hashes are import evidence.`);
+    warnings.push(`${TOPOGRAM_IMPORT_FILE} is present. Treat extracted Topogram artifacts as project-owned after adoption; hashes are extraction evidence.`);
   }
   if (!fs.existsSync(path.join(projectRoot, "AGENTS.md"))) {
     warnings.push("AGENTS.md is missing. Use this command as the current agent guidance source.");
@@ -365,7 +371,7 @@ export function buildAgentBrief(inputPath, workspaceAst) {
     readItem(projectRoot, "topogram.template-policy.json", "Template trust/update policy for attached templates.", false),
     readItem(projectRoot, GENERATOR_POLICY_FILE, "Package-backed generator policy and allowed scopes.", false),
     readItem(projectRoot, TEMPLATE_TRUST_FILE, "Executable implementation trust record, if the template copied implementation code.", Boolean(config.implementation)),
-    readItem(projectRoot, TOPOGRAM_IMPORT_FILE, "Brownfield import provenance and source evidence, if this came from import.", Boolean(importSummary)),
+    readItem(projectRoot, TOPOGRAM_IMPORT_FILE, "Brownfield extraction provenance and source evidence, if this came from extract.", Boolean(importSummary)),
     readItem(projectRoot, topogramReadPath, "Canonical Topogram graph source. Use focused query packets for implementation work.", true)
   ];
 
@@ -389,11 +395,11 @@ export function buildAgentBrief(inputPath, workspaceAst) {
     commandItem("npm run generate", "Write generated-owned runtime/app outputs after validation.", "write"),
     commandItem("npm run verify", "Run generated output verification.", "verify"),
     ...(importSummary ? [
-      commandItem("topogram import check . --json", "Validate imported workspace provenance and read workspaceRoot.", "import"),
-      commandItem("topogram import plan . --json", "Review import adoption plan and workspaceRoot.", "import"),
-      commandItem("topogram import adopt --list . --json", "List reviewable adoption selectors.", "import"),
-      commandItem("topogram import status . --json", "Check import/adoption status.", "import"),
-      commandItem("topogram import history . --verify --json", "Verify import history evidence.", "import")
+      commandItem("topogram extract check . --json", "Validate extracted workspace provenance and read workspaceRoot.", "extract"),
+      commandItem("topogram extract plan . --json", "Review extraction adoption plan and workspaceRoot.", "extract"),
+      commandItem("topogram adopt --list . --json", "List reviewable adoption selectors.", "adopt"),
+      commandItem("topogram extract status . --json", "Check extraction/adoption status.", "extract"),
+      commandItem("topogram extract history . --verify --json", "Verify adoption history evidence.", "extract")
     ] : [])
   ];
 
@@ -464,7 +470,7 @@ export function buildAgentBrief(inputPath, workspaceAst) {
       issues: trust.issues || []
     },
     generator_policy: generatorPolicy,
-    import: importSummary,
+    extract: importSummary,
     warnings: []
   };
   payload.warnings = buildWarnings(projectRoot, config, payload.trust, importSummary, generatorPolicy, sdlcPolicy);
@@ -520,11 +526,11 @@ export function formatAgentBrief(brief) {
   for (const workflow of brief.workflows || []) {
     lines.push(`  - ${workflow.title}: ${workflow.rule}`);
   }
-  if (brief.import?.workspaceRoot) {
+  if (brief.extract?.workspaceRoot) {
     lines.push("");
-    lines.push("Import:");
-    lines.push(`  - Workspace root: ${brief.import.workspaceRoot}`);
-    lines.push("  - JSON import commands expose workspaceRoot; prefer it over compatibility fields.");
+    lines.push("Extract:");
+    lines.push(`  - Workspace root: ${brief.extract.workspaceRoot}`);
+    lines.push("  - JSON extract commands expose workspaceRoot; prefer it over compatibility fields.");
   }
   lines.push("");
   lines.push("Verification gates:");

package/src/agent-ops/query-builders/change-risk/{import-plan.js → extract-plan.js}

@@ -7,7 +7,7 @@ export function buildImportPlanPayload(adoptionPlan, taskModeArtifact, maintaine
   const importNextAction = buildImportPlanNextAction(taskModeArtifact.next_action || null, workflowPresetState);
   const presetGuidanceSummary = buildPresetGuidanceSummary(workflowPresetState, null);
   return {
-    type: "import_plan_query",
+    type: "extract_plan_query",
     summary: taskModeArtifact.summary || null,
     adoption_state_vocabulary: adoptionPlan.adoption_state_vocabulary || [],
     next_action: importNextAction,

package/src/agent-ops/query-builders/change-risk/review-packets.js

@@ -13,7 +13,7 @@ import { buildPresetGuidanceSummary } from "./risk.js";
 export function buildCanonicalWritesPayloadForImportPlan(proposalSurfaces = []) {
   return {
     type: "canonical_writes_query",
-    source: "import-plan",
+    source: "extract-plan",
     canonical_writes: proposalSurfaces
       .filter((surface) => surface.canonical_rel_path)
       .map((surface) => ({
@@ -40,7 +40,7 @@ export function buildReviewPacketPayloadForImportPlan({ importPlan, risk }) {
   const presetGuidanceSummary = buildPresetGuidanceSummary(importPlan.workflow_presets || null, null);
   return {
     type: "review_packet_query",
-    source: "import-plan",
+    source: "extract-plan",
     summary: importPlan.summary || null,
     risk_summary: {
       overall_risk: risk.overall_risk,
@@ -49,7 +49,7 @@ export function buildReviewPacketPayloadForImportPlan({ importPlan, risk }) {
       maintained_risk: importPlan.maintained_risk || null
     },
     next_action: importPlan.next_action || null,
-    recommended_query_family: recommendedQueryFamilyForAction(importPlan.next_action, "import-adopt"),
+    recommended_query_family: recommendedQueryFamilyForAction(importPlan.next_action, "extract-adopt"),
     canonical_writes: (importPlan.proposal_surfaces || [])
       .filter((surface) => surface.canonical_rel_path)
       .map((surface) => ({
@@ -64,9 +64,9 @@ export function buildReviewPacketPayloadForImportPlan({ importPlan, risk }) {
     maintained_risk: importPlan.maintained_risk || null,
     maintained_seam_review_summary: importPlan.maintained_seam_review_summary || null,
     operator_loop: buildOperatorLoopSummary({
-      mode: "import-adopt",
+      mode: "extract-adopt",
       nextAction: importPlan.next_action || null,
-      primaryArtifacts: ["import-plan", "adoption-plan.agent.json"],
+      primaryArtifacts: ["extract-plan", "adoption-plan.agent.json"],
       verificationTargets: importPlan.verification_targets || null,
       currentSurface: "review-packet"
     }),

package/src/agent-ops/query-builders/change-risk.js

@@ -1,4 +1,4 @@
-export { buildImportPlanPayload } from "./change-risk/import-plan.js";
+export { buildImportPlanPayload } from "./change-risk/extract-plan.js";
 export {
   buildAlignmentRecommendations,
   buildChangePlanPayload,

package/src/agent-ops/query-builders/common.js

@@ -35,7 +35,7 @@ export function stableSortedStrings(values) {
 export const CANONICAL_TASK_MODES = new Set([
   "modeling",
   "maintained-app-edit",
-  "import-adopt",
+  "extract-adopt",
   "diff-review",
   "verification"
 ]);
@@ -59,7 +59,7 @@ export const PROVIDER_PRESET_MANUAL_DECISION_CATEGORIES = new Set([
 export const WORKFLOW_QUERY_FAMILIES_BY_MODE = {
   modeling: ["change-plan", "write-scope", "verification-targets", "risk-summary"],
   "maintained-app-edit": ["maintained-boundary", "maintained-conformance", "seam-check", "change-plan"],
-  "import-adopt": ["import-plan", "risk-summary", "proceed-decision", "review-packet"],
+  "extract-adopt": ["extract-plan", "risk-summary", "proceed-decision", "review-packet"],
   "diff-review": ["change-plan", "risk-summary", "review-packet"],
   verification: ["verification-targets", "proceed-decision", "risk-summary"]
 };

package/src/agent-ops/query-builders/multi-agent.js

@@ -518,7 +518,7 @@ export function buildMultiAgentPlanPayload({
   return {
     type: "multi_agent_plan",
     workspace: workspace || null,
-    mode: "import-adopt",
+    mode: "extract-adopt",
     source_single_agent_plan: singleAgentPlan,
     summary: buildMultiAgentSummary(lanes, parallelWorkstreams, overlapRules, handoffPackets),
     coordination_strategy: {

package/src/agent-ops/query-builders/workflow-context-shared.js

@@ -11,7 +11,7 @@ export function outputIdsForWorkflowContext(taskModeArtifact, maintainedBoundary
 
 export function integrationCategoriesForWorkflowContext(taskModeArtifact, importPlan = null) {
   const categories = [];
-  if (taskModeArtifact?.mode === "import-adopt") categories.push("provider_adoption");
+  if (taskModeArtifact?.mode === "extract-adopt") categories.push("provider_adoption");
   if (taskModeArtifact?.mode === "maintained-app-edit") categories.push("maintained_app");
   if ((taskModeArtifact?.verification_targets?.maintained_app_checks || []).length > 0) categories.push("maintained_boundary");
   if ((importPlan?.requires_human_review || []).length > 0) categories.push("human_review");
@@ -43,7 +43,7 @@ export function recommendedQueryFamilyForAction(nextAction, mode = null) {
     case "customize_workflow_preset":
     case "refresh_workflow_preset_customization":
     case "import_declared_workflow_preset":
-      return "import-plan";
+      return "extract-plan";
     case "review_diff_impact":
     case "inspect_projection":
     case "inspect_diff":
@@ -61,7 +61,7 @@ export function recommendedQueryFamilyForAction(nextAction, mode = null) {
       break;
   }
 
-  if (mode === "import-adopt") return "import-plan";
+  if (mode === "extract-adopt") return "extract-plan";
   if (mode === "maintained-app-edit") return "maintained-boundary";
   if (mode === "verification") return "verification-targets";
   return "change-plan";
@@ -268,7 +268,7 @@ export function buildGenericSequence(taskModeArtifact, {
 
 export function buildRecommendedSequence(taskModeArtifact, importPlan = null) {
   const mode = taskModeArtifact?.mode || null;
-  if (mode === "import-adopt") {
+  if (mode === "extract-adopt") {
     return buildImportAdoptSequence(taskModeArtifact, importPlan);
   }
   if (mode === "maintained-app-edit") {

package/src/catalog/provenance.js

@@ -56,7 +56,7 @@ export function buildTopogramSourceStatus(projectRoot) {
         severity: "warning",
         message: `${TOPOGRAM_SOURCE_FILE} was not found. This project may not have been copied from a catalog topogram entry.`,
         path: sourcePath,
-        suggestedFix: "Run `topogram catalog copy <id> <target>` to create a project with source provenance."
+        suggestedFix: "Run `topogram copy <id> <target>` to create a project with source provenance."
       }],
       errors: []
     };

package/src/cli/catalog-alias.d.ts

@@ -1 +1,3 @@
 export function resolveCatalogTemplateAlias(templateName: string, catalogSource?: string | null): any;
+export function formatCatalogTemplateAliasError(templateName: string, catalogSource: string | null, error: unknown, options?: { suggestions?: string[] }): string;
+export function suggestCatalogTemplateIds(catalog: any, templateName: string): string[];

package/src/cli/catalog-alias.js

@@ -93,7 +93,7 @@ export function formatCatalogTemplateAliasError(templateName, catalogSource, err
   return [
     `Catalog template alias '${templateName}' could not be resolved from '${sourceLabel}'.`,
     reason,
-    templateName === "hello-web" ? "The default starter 'hello-web' is catalog-backed. Enable catalog access, or pass --template with a local path or full package spec." : null,
+    templateName === "hello-web" ? "The default starter 'hello-web' is catalog-backed. Enable catalog access, or use `topogram copy <source> <target>` with a local path or full package spec." : null,
     suggestions.length > 0 ? `Suggested templates: ${suggestions.join(", ")}.` : null,
     catalogDisabled ? "Unset TOPOGRAM_CATALOG_SOURCE=none, pass --catalog <source>, or use an explicit local path/package spec." : null,
     "Run `topogram template list` to see available templates, or `topogram catalog show <id>` to inspect a catalog alias.",
@@ -108,7 +108,7 @@ export function formatCatalogTemplateAliasError(templateName, catalogSource, err
  * @param {string} templateName
  * @returns {string[]}
  */
-function suggestCatalogTemplateIds(catalog, templateName) {
+export function suggestCatalogTemplateIds(catalog, templateName) {
   const queryTokens = tokenizeSuggestionText(templateName);
   const templates = (catalog.entries || []).filter((entry) => entry.kind === "template");
   return templates

package/src/cli/command-parser.js

@@ -1,6 +1,7 @@
 // @ts-check
 
 import { parseCoreCommandArgs } from "./command-parsers/core.js";
+import { parseExtractorCommandArgs } from "./command-parsers/extractor.js";
 import { parseGeneratorCommandArgs } from "./command-parsers/generator.js";
 import { parseImportCommandArgs } from "./command-parsers/import.js";
 import { parseLegacyWorkflowCommandArgs } from "./command-parsers/legacy-workflow.js";
@@ -10,6 +11,7 @@ import { parseTemplateCommandArgs } from "./command-parsers/template.js";
 
 const COMMAND_PARSERS = [
   parseCoreCommandArgs,
+  parseExtractorCommandArgs,
   parseGeneratorCommandArgs,
   parseTemplateCommandArgs,
   parseProjectCommandArgs,

package/src/cli/command-parsers/core.js

@@ -18,7 +18,7 @@ const QUERY_NAMES = new Set([
   "verification-targets",
   "widget-behavior",
   "change-plan",
-  "import-plan",
+  "extract-plan",
   "risk-summary",
   "canonical-writes",
   "proceed-decision",
@@ -42,10 +42,14 @@ const QUERY_NAMES = new Set([
  * @returns {import("./shared.js").SplitCommandArgs|null}
  */
 export function parseCoreCommandArgs(args) {
-  if (args[0] === "new" || args[0] === "create") {
-    return args.includes("--list-templates")
-      ? { templateCommand: "list", inputPath: null }
-      : { newProject: true, inputPath: args[1] };
+  if (args[0] === "copy") {
+    if (args.includes("--list")) {
+      return { copyCommand: "list", inputPath: null };
+    }
+    return { copyCommand: "copy", copySource: args[1], inputPath: args[2] };
+  }
+  if (args[0] === "init") {
+    return { initProject: true, inputPath: commandPath(args, 1, ".") };
   }
   if (args[0] === "generate" && args[1] === "app") {
     return { generateTarget: "app-bundle", write: true, inputPath: commandPath(args, 2), defaultOutDir: "./app" };

package/src/cli/command-parsers/extractor.js

@@ -0,0 +1,40 @@
+// @ts-check
+
+import { commandPath } from "./shared.js";
+
+/**
+ * @param {string[]} args
+ * @returns {import("./shared.js").SplitCommandArgs|null}
+ */
+export function parseExtractorCommandArgs(args) {
+  if (args[0] === "extractor" && args[1] === "list") {
+    return { extractorCommand: "list", inputPath: null };
+  }
+  if (args[0] === "extractor" && args[1] === "show") {
+    return { extractorCommand: "show", inputPath: args[2] };
+  }
+  if (args[0] === "extractor" && args[1] === "check") {
+    return { extractorCommand: "check", inputPath: args[2] };
+  }
+  if (args[0] === "extractor" && args[1] === "policy" && args[2] === "init") {
+    return { extractorPolicyCommand: "init", inputPath: commandPath(args, 3, ".") };
+  }
+  if (args[0] === "extractor" && args[1] === "policy" && args[2] === "status") {
+    return { extractorPolicyCommand: "status", inputPath: commandPath(args, 3, ".") };
+  }
+  if (args[0] === "extractor" && args[1] === "policy" && args[2] === "check") {
+    return { extractorPolicyCommand: "check", inputPath: commandPath(args, 3, ".") };
+  }
+  if (args[0] === "extractor" && args[1] === "policy" && args[2] === "explain") {
+    return { extractorPolicyCommand: "explain", inputPath: commandPath(args, 3, ".") };
+  }
+  if (args[0] === "extractor" && args[1] === "policy" && args[2] === "pin") {
+    return {
+      extractorPolicyCommand: "pin",
+      extractorPolicyPinSpec: args[3] && !args[3].startsWith("-") ? args[3] : null,
+      inputPath: commandPath(args, 4, ".")
+    };
+  }
+  return null;
+}
+

package/src/cli/command-parsers/import.js

@@ -7,37 +7,31 @@ import { commandOperandFrom, commandPath } from "./shared.js";
  * @returns {import("./shared.js").SplitCommandArgs|null}
  */
 export function parseImportCommandArgs(args) {
-  if (args[0] === "import" && args[1] === "app") {
-    return { workflowName: "import-app", inputPath: args[2] };
-  }
-  if (args[0] === "import" && args[1] === "docs") {
-    return { workflowName: "scan-docs", inputPath: args[2] };
-  }
-  if (args[0] === "import" && args[1] === "diff") {
+  if (args[0] === "extract" && args[1] === "diff") {
     return { importCommand: "diff", inputPath: commandOperandFrom(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] === "refresh") {
+  if (args[0] === "extract" && args[1] === "refresh") {
     return { importCommand: "refresh", inputPath: commandOperandFrom(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] === "check") {
+  if (args[0] === "extract" && args[1] === "check") {
     return { importCommand: "check", inputPath: commandPath(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] === "plan") {
+  if (args[0] === "extract" && args[1] === "plan") {
     return { importCommand: "plan", inputPath: commandPath(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] === "adopt" && (args[2] === "--list" || args[2] === "list")) {
-    return { importCommand: "adopt-list", inputPath: commandPath(args, 3, ".") };
+  if (args[0] === "adopt" && (args[1] === "--list" || args[1] === "list")) {
+    return { importCommand: "adopt-list", inputPath: commandPath(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] === "adopt") {
-    return { importCommand: "adopt", importAdoptSelector: args[2], inputPath: commandPath(args, 3, ".") };
+  if (args[0] === "adopt") {
+    return { importCommand: "adopt", importAdoptSelector: args[1], inputPath: commandPath(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] === "status") {
+  if (args[0] === "extract" && args[1] === "status") {
     return { importCommand: "status", inputPath: commandPath(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] === "history") {
+  if (args[0] === "extract" && args[1] === "history") {
     return { importCommand: "history", verify: args.includes("--verify"), inputPath: commandOperandFrom(args, 2, ".") };
   }
-  if (args[0] === "import" && args[1] && !args[1].startsWith("-")) {
+  if (args[0] === "extract" && args[1] && !args[1].startsWith("-")) {
     return { importCommand: "workspace", inputPath: args[1] };
   }
   return null;

package/src/cli/command-parsers/project.js

@@ -37,9 +37,6 @@ export function parseProjectCommandArgs(args) {
   if (args[0] === "catalog" && args[1] === "check") {
     return { catalogCommand: "check", inputPath: args[2] };
   }
-  if (args[0] === "catalog" && args[1] === "copy") {
-    return { catalogCommand: "copy", catalogId: args[2], inputPath: args[3] };
-  }
   if (args[0] === "package" && args[1] === "update-cli") {
     return { packageCommand: "update-cli", inputPath: args.includes("--latest") ? "latest" : args[2] };
   }

package/src/cli/commands/catalog/copy.js

@@ -18,10 +18,10 @@ import { shellCommandArg } from "./shared.js";
  */
 export function buildCatalogCopyPayload(id, targetPath, options) {
   if (!id || id.startsWith("-")) {
-    throw new Error("topogram catalog copy requires <id>.");
+    throw new Error("topogram copy requires <source>.");
   }
   if (!targetPath || targetPath.startsWith("-")) {
-    throw new Error("topogram catalog copy requires <target>.");
+    throw new Error("topogram copy requires <target>.");
   }
   const loaded = loadCatalog(options.source || null);
   const entry = findCatalogEntry(loaded.catalog, id, "topogram");
@@ -49,7 +49,7 @@ export function printCatalogCopy(payload) {
   console.log(`Package: ${payload.packageSpec}`);
   console.log(`Source provenance: ${payload.provenancePath}`);
   console.log(`Files: ${payload.files.length}`);
-  console.log(`${TOPOGRAM_SOURCE_FILE} records catalog-copy provenance only. Local edits are allowed.`);
+  console.log(`${TOPOGRAM_SOURCE_FILE} records copy provenance only. Local edits are allowed.`);
   console.log("");
   console.log("Next steps:");
   console.log(`  cd ${shellCommandArg(path.relative(process.cwd(), payload.targetPath) || ".")}`);

package/src/cli/commands/catalog/help.js

@@ -8,7 +8,6 @@ export function printCatalogHelp() {
   console.log("   or: topogram catalog show <id> [--json] [--catalog <path-or-source>]");
   console.log("   or: topogram catalog doctor [--json] [--catalog <path-or-source>]");
   console.log("   or: topogram catalog check <path-or-url> [--json]");
-  console.log("   or: topogram catalog copy <id> <target> [--version <version>] [--json] [--catalog <path-or-source>]");
   console.log("");
   console.log("Catalog commands inspect the shared Topogram index. The catalog is an index; templates and topograms resolve to versioned packages.");
   console.log("");
@@ -17,5 +16,5 @@ export function printCatalogHelp() {
   console.log("  topogram catalog show hello-web");
   console.log("  topogram catalog doctor");
   console.log("  topogram catalog check topograms.catalog.json");
-  console.log("  topogram catalog copy hello ./hello-topogram");
+  console.log("  topogram copy hello ./hello-topogram");
 }

package/src/cli/commands/catalog/list.js

@@ -8,7 +8,7 @@ import { shellCommandArg } from "./shared.js";
 
 /**
  * @param {string|null} source
- * @returns {{ ok: boolean, source: string, catalog: any, entries: any[], diagnostics: any[], errors: string[] }}
+ * @returns {{ ok: boolean, source: string, catalog: any, entries: any[], templates: any[], topograms: any[], diagnostics: any[], errors: string[] }}
  */
 export function buildCatalogListPayload(source) {
   const loaded = loadCatalog(source || null);
@@ -16,10 +16,13 @@ export function buildCatalogListPayload(source) {
     ok: true,
     source: loaded.source,
     catalog: {
+      loaded: true,
       version: loaded.catalog.version,
       entries: loaded.catalog.entries.length
     },
     entries: loaded.catalog.entries,
+    templates: loaded.catalog.entries.filter((/** @type {any} */ entry) => entry.kind === "template"),
+    topograms: loaded.catalog.entries.filter((/** @type {any} */ entry) => entry.kind === "topogram"),
     diagnostics: loaded.diagnostics,
     errors: []
   };
@@ -31,7 +34,7 @@ export function buildCatalogListPayload(source) {
  */
 export function printCatalogList(payload) {
   console.log("Catalog entries:");
-  console.log("Template entries create starters with `topogram new`; topogram entries copy editable Topogram source.");
+  console.log("Template entries create starters with `topogram copy`; topogram entries copy editable Topogram source.");
   console.log(`Catalog: ${payload.source}`);
   console.log(`Version: ${payload.catalog.version}`);
   const catalogOption = payload.source === catalogSourceOrDefault(null)
@@ -44,9 +47,9 @@ export function printCatalogList(payload) {
     console.log(`  Trust scope: ${entry.trust.scope}`);
     console.log(`  Executable implementation: ${entry.trust.includesExecutableImplementation ? "yes" : "no"}`);
     if (entry.kind === "template") {
-      console.log(`  New: topogram new ./my-app --template ${shellCommandArg(entry.id)}${catalogOption}`);
+      console.log(`  Copy: topogram copy ${shellCommandArg(entry.id)} ./my-app${catalogOption}`);
     } else {
-      console.log(`  Copy: topogram catalog copy ${shellCommandArg(entry.id)} ./${entry.id}-topogram${catalogOption}`);
+      console.log(`  Copy: topogram copy ${shellCommandArg(entry.id)} ./${entry.id}-topogram${catalogOption}`);
     }
   }
 }

package/src/cli/commands/catalog/show.js

@@ -63,7 +63,7 @@ export function catalogShowCommands(entry, source) {
   if (entry.kind === "template") {
     const target = "./my-app";
     return {
-      primary: `topogram new ${target} --template ${shellCommandArg(entry.id)}${catalogOption}`,
+      primary: `topogram copy ${shellCommandArg(entry.id)} ${target}${catalogOption}`,
       followUp: [
         `cd ${target}`,
         "npm install",
@@ -74,7 +74,7 @@ export function catalogShowCommands(entry, source) {
   }
   const target = `./${entry.id}-topogram`;
   return {
-    primary: `topogram catalog copy ${shellCommandArg(entry.id)} ${target}${catalogOption}`,
+    primary: `topogram copy ${shellCommandArg(entry.id)} ${target}${catalogOption}`,
     followUp: [
       `cd ${target}`,
       "topogram source status --local",
@@ -102,9 +102,9 @@ export function printCatalogShow(payload) {
   console.log(`Catalog entry: ${entry.id}`);
   console.log(`Kind: ${entry.kind}`);
   if (entry.kind === "template") {
-    console.log("Action: creates a starter app workspace with `topogram new`.");
+    console.log("Action: creates a starter app workspace with `topogram copy`.");
   } else {
-    console.log("Action: copies editable Topogram source with `topogram catalog copy`.");
+    console.log("Action: copies editable Topogram source with `topogram copy`.");
     console.log("Executable implementation: no (topogram entries cannot include implementation/ in v1).");
   }
   console.log(`Catalog: ${payload.source}`);