@topogram/cli 0.3.78 → 0.3.80

package/src/cli/commands/query/runner/change.js

@@ -14,7 +14,7 @@ import {
 } from "../../../../agent-ops/query-builders.js";
 import { parsePath } from "../../../../parser.js";
 import { buildChangePlanContext } from "../change-plan.js";
-import { buildImportPlanForContext } from "../import-adopt.js";
+import { buildImportPlanForContext } from "../extract-adopt.js";
 import {
   adoptionPlanPath,
   buildTaskMode,
@@ -57,7 +57,7 @@ export function runChangeQuery(context) {
         maintainedRisk: built.importPlan.maintained_risk || null
       });
       return printJson(buildRiskSummaryPayload({
-        source: "import-plan",
+        source: "extract-plan",
         risk,
         nextAction: built.importPlan.next_action || null,
         maintainedRisk: built.importPlan.maintained_risk || null

package/src/cli/commands/query/runner/{import-adopt.js → extract-adopt.js}

@@ -10,7 +10,7 @@ import {
   buildLaneStatusPayload,
   buildWorkPacketPayload
 } from "../../../../agent-ops/query-builders.js";
-import { buildImportAdoptAgentContext, buildImportPlanForContext } from "../import-adopt.js";
+import { buildImportAdoptAgentContext, buildImportPlanForContext } from "../extract-adopt.js";
 import { normalizeTopogramPath, printValidationFailure, readJson, resultOk } from "../workspace.js";
 import { printJson } from "./output.js";
 
@@ -25,15 +25,15 @@ import { printJson } from "./output.js";
 export function runImportAdoptQuery(context) {
   const queryName = context.commandArgs?.queryName;
 
-  if (queryName === "import-plan") {
-    const built = buildImportPlanForContext(context, "import-plan");
+  if (queryName === "extract-plan") {
+    const built = buildImportPlanForContext(context, "extract-plan");
     if (!resultOk(built)) return printValidationFailure(built);
     return printJson(built.importPlan);
   }
 
   if (queryName === "multi-agent-plan") {
-    if (context.modeId !== "import-adopt") {
-      throw new Error("query multi-agent-plan currently supports only --mode import-adopt.");
+    if (context.modeId !== "extract-adopt") {
+      throw new Error("query multi-agent-plan currently supports only --mode extract-adopt.");
     }
     const built = buildImportAdoptAgentContext(context, "multi-agent-plan");
     if (!resultOk(built)) return printValidationFailure(built);
@@ -41,8 +41,8 @@ export function runImportAdoptQuery(context) {
   }
 
   if (queryName === "work-packet") {
-    if (context.modeId !== "import-adopt") {
-      throw new Error("query work-packet currently supports only --mode import-adopt.");
+    if (context.modeId !== "extract-adopt") {
+      throw new Error("query work-packet currently supports only --mode extract-adopt.");
     }
     if (!context.laneId) {
       throw new Error("query work-packet requires --lane <id>.");
@@ -57,8 +57,8 @@ export function runImportAdoptQuery(context) {
   }
 
   if (queryName === "lane-status" || queryName === "handoff-status") {
-    if (context.modeId !== "import-adopt") {
-      throw new Error(`query ${queryName} currently supports only --mode import-adopt.`);
+    if (context.modeId !== "extract-adopt") {
+      throw new Error(`query ${queryName} currently supports only --mode extract-adopt.`);
     }
     const built = buildImportAdoptAgentContext(context, queryName);
     if (!resultOk(built)) return printValidationFailure(built);

package/src/cli/commands/query/runner/index.js

@@ -3,7 +3,7 @@
 import { runArtifactQuery } from "./artifacts.js";
 import { runBoundaryQuery } from "./boundaries.js";
 import { runChangeQuery } from "./change.js";
-import { runImportAdoptQuery } from "./import-adopt.js";
+import { runImportAdoptQuery } from "./extract-adopt.js";
 import { runWorkflowQuery } from "./workflow.js";
 
 /**

package/src/cli/commands/query/runner/workflow.js

@@ -46,7 +46,7 @@ export function runWorkflowQuery(context) {
   const selectors = selectorOptions(context);
 
   if (queryName === "next-action") {
-    const result = buildTaskMode(parsePath(context.inputPath), selectors, context.modeId || "import-adopt", context.fromTopogramPath);
+    const result = buildTaskMode(parsePath(context.inputPath), selectors, context.modeId || "extract-adopt", context.fromTopogramPath);
     if (!resultOk(result)) return printValidationFailure(result);
     return printJson({
       type: "next_action_query",
@@ -72,13 +72,13 @@ export function runWorkflowQuery(context) {
 
   if (queryName === "workflow-preset-activation") {
     if (!context.modeId) {
-      throw new Error("query workflow-preset-activation requires --mode <modeling|maintained-app-edit|import-adopt|diff-review|verification>.");
+      throw new Error("query workflow-preset-activation requires --mode <modeling|maintained-app-edit|extract-adopt|diff-review|verification>.");
     }
     const topogramRoot = normalizeTopogramPath(context.inputPath);
     const taskModeResult = buildTaskMode(parsePath(context.inputPath), selectors, context.modeId, context.fromTopogramPath);
     if (!resultOk(taskModeResult)) return printValidationFailure(taskModeResult);
     let importPlan = null;
-    if (context.modeId === "import-adopt" && fs.existsSync(adoptionPlanPath(topogramRoot))) {
+    if (context.modeId === "extract-adopt" && fs.existsSync(adoptionPlanPath(topogramRoot))) {
       const workflowPresets = buildWorkflowPresetState({
         workspace: topogramRoot,
         selectors: workflowPresetSelectors(taskModeResult.artifact, context.providerId, context.presetId, "workflow-preset-activation")
@@ -118,7 +118,7 @@ export function runWorkflowQuery(context) {
  */
 function runSingleAgentPlan(context, selectors) {
   if (!context.modeId) {
-    throw new Error("query single-agent-plan requires --mode <modeling|maintained-app-edit|import-adopt|diff-review|verification>.");
+    throw new Error("query single-agent-plan requires --mode <modeling|maintained-app-edit|extract-adopt|diff-review|verification>.");
   }
   const ast = parsePath(context.inputPath);
   const result = buildTaskMode(ast, selectors, context.modeId, context.fromTopogramPath);
@@ -134,7 +134,7 @@ function runSingleAgentPlan(context, selectors) {
   });
   const topogramRoot = normalizeTopogramPath(context.inputPath);
   let importPlan = null;
-  if (context.modeId === "import-adopt" && fs.existsSync(adoptionPlanPath(topogramRoot))) {
+  if (context.modeId === "extract-adopt" && fs.existsSync(adoptionPlanPath(topogramRoot))) {
     const workflowPresets = buildWorkflowPresetState({
       workspace: topogramRoot,
       selectors: workflowPresetSelectors(result.artifact, context.providerId, context.presetId, "single-agent-plan")
@@ -163,7 +163,7 @@ function runSingleAgentPlan(context, selectors) {
  */
 function runResolvedWorkflowContext(context, selectors) {
   if (!context.modeId) {
-    throw new Error("query resolved-workflow-context requires --mode <modeling|maintained-app-edit|import-adopt|diff-review|verification>.");
+    throw new Error("query resolved-workflow-context requires --mode <modeling|maintained-app-edit|extract-adopt|diff-review|verification>.");
   }
   const topogramRoot = normalizeTopogramPath(context.inputPath);
   const ast = parsePath(context.inputPath);
@@ -186,7 +186,7 @@ function runResolvedWorkflowContext(context, selectors) {
     maintainedBoundaryArtifact: maintainedBundleResult?.artifact?.maintained_boundary || null
   });
   let importPlan = null;
-  if (context.modeId === "import-adopt" && fs.existsSync(adoptionPlanPath(topogramRoot))) {
+  if (context.modeId === "extract-adopt" && fs.existsSync(adoptionPlanPath(topogramRoot))) {
     const workflowPresets = buildWorkflowPresetState({
       workspace: topogramRoot,
       selectors: workflowPresetSelectors(taskModeResult.artifact, context.providerId, context.presetId, "resolved-workflow-context")

package/src/cli/commands/query/workspace.js

@@ -29,7 +29,7 @@ export function normalizeTopogramPath(inputPath) {
  */
 export function workflowPresetSelectors(taskModeArtifact, providerId = null, presetId = null, queryFamily = 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");
   return {
@@ -65,7 +65,7 @@ export function generatorTargetsForWorkflowContext(options = {}) {
  * @returns {boolean}
  */
 export function importAdoptOnlyRequested(options = {}) {
-  return options.modeId === "import-adopt" && !(
+  return options.modeId === "extract-adopt" && !(
     options.capabilityId ||
     options.workflowId ||
     options.projectionId ||
@@ -267,7 +267,7 @@ export function resolveRecommendedQueryFamily(nextAction, mode) {
     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":
@@ -284,7 +284,7 @@ export function resolveRecommendedQueryFamily(nextAction, mode) {
     default:
       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";

package/src/cli/commands/release-status.js

@@ -290,7 +290,7 @@ export function renderReleaseStatusMarkdown(payload) {
     "The external Todo demo is the canonical end-to-end consumer proof for the current catalog-backed workflow:",
     "",
     "```bash",
-    "topogram new ./todo-demo --template todo",
+    "topogram copy todo ./todo-demo",
     "cd ./todo-demo",
     "npm install",
     "npm run check",
@@ -300,7 +300,7 @@ export function renderReleaseStatusMarkdown(payload) {
     "npm run app:runtime",
     "```",
     "",
-    "The demo CI also verifies `topogram new` from the default public catalog and from the repo-local catalog fixture. That prevents local fixtures from masking a broken published catalog alias."
+    "The demo CI also verifies `topogram copy` from the default public catalog and from the repo-local catalog fixture. That prevents local fixtures from masking a broken published catalog alias."
   );
   const reportDiagnostics = [...matrix.diagnostics];
   if (reportDiagnostics.length > 0) {

package/src/cli/commands/source.js

@@ -239,7 +239,7 @@ export function printTopogramSourceStatus(payload) {
     }
   }
   console.log("");
-  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("Template attachment controls update tracking. Detaching makes the project fully owned by this workspace.");
   console.log("Template baseline drift does not block `topogram check` or `topogram generate`.");
   console.log("Implementation trust is separate and can block check/generate when review is required.");
@@ -250,7 +250,7 @@ export function printTopogramSourceStatus(payload) {
   } else if (payload.project?.templateBaseline?.state === "diverged") {
     console.log("Next: local template-derived changes are owned by this project. Run `topogram template update --check` only when reviewing upstream template changes.");
   } else if (!payload.exists) {
-    console.log("Next: use `topogram catalog copy <id> <target>` for pure topogram provenance, or continue with template/project provenance above.");
+    console.log("Next: use `topogram copy <id> <target>` for pure topogram provenance, or continue with template/project provenance above.");
   } else {
     console.log("Next: run `topogram check` or `topogram generate`.");
   }

package/src/cli/commands/template/check.js

@@ -124,7 +124,7 @@ function diagnosticForTemplateCreateFailure(message, templateSpec, step) {
       code: "template_symlink_unsupported",
       message,
       path: path.isAbsolute(templateSpec) ? templateSpec : null,
-      suggestedFix: "Replace template symlinks with real files or directories, then rerun `topogram new` or `topogram template check`.",
+      suggestedFix: "Replace template symlinks with real files or directories, then rerun `topogram copy` or `topogram template check`.",
       step
     });
   }
@@ -132,7 +132,7 @@ function diagnosticForTemplateCreateFailure(message, templateSpec, step) {
     code: "template_create_failed",
     message,
     path: path.isAbsolute(templateSpec) ? templateSpec : null,
-    suggestedFix: "Fix the template pack so topogram new can create a starter from it.",
+    suggestedFix: "Fix the template pack so topogram copy can create a starter from it.",
     step
   });
 }

package/src/cli/commands/template/list-show.js

@@ -81,7 +81,7 @@ function templateListItemFromCatalogEntry(entry, source) {
  */
 export function printTemplateList(payload) {
   console.log("Template starters:");
-  console.log("Catalog aliases resolve to versioned package installs. Local paths and full package specs can also be used with `topogram new`.");
+  console.log("Catalog aliases resolve to versioned package installs. Local paths and full package specs can also be used with `topogram copy`.");
   if (payload.catalog.source) {
     console.log(`Catalog: ${payload.catalog.source} (${payload.catalog.loaded ? "loaded" : "unavailable"})`);
   } else {
@@ -93,10 +93,10 @@ export function printTemplateList(payload) {
     const surfaces = Array.isArray(template.surfaces) && template.surfaces.length > 0
       ? template.surfaces.join(", ")
       : "not declared";
-    const command = template.recommendedCommand || `topogram new ./my-app --template ${shellCommandArg(template.id)}`;
+    const command = template.recommendedCommand || `topogram copy ${shellCommandArg(template.id)} ./my-app`;
     console.log(`- ${template.id}@${template.version}${defaultLabel}`);
     console.log(`  Source: ${template.source} | Surfaces: ${surfaces} | Stack: ${stack} | Executable implementation: ${template.includesExecutableImplementation ? "yes" : "no"}`);
-    console.log(`  New: ${command}`);
+    console.log(`  Copy: ${command}`);
   }
   for (const diagnostic of payload.diagnostics) {
     console.warn(`Warning: ${diagnostic.message}`);
@@ -137,7 +137,7 @@ function templateDecisionSummary(template, sourceKind, packageSpec, commands) {
     version: template.defaultVersion || template.version || null,
     executableImplementation: executable,
     policyImpact: executable
-      ? "Copies implementation/ code into the project; topogram new does not execute it, but topogram generate may load it after local trust is recorded."
+      ? "Copies implementation/ code into the project; topogram copy does not execute it, but topogram generate may load it after local trust is recorded."
       : "No executable implementation trust is required for this template.",
     recommendedCommand: commands.primary,
     followUp: commands.followUp,

package/src/cli/dispatcher.js

@@ -5,12 +5,14 @@ import { buildVersionPayload, printVersion } from "./commands/version.js";
 import { runAgentBriefCommand } from "./commands/agent.js";
 import { runCatalogCommand } from "./commands/catalog.js";
 import { runCheckCommand } from "./commands/check.js";
+import { runCopyCommand } from "./commands/copy.js";
 import { runEmitCommand } from "./commands/emit.js";
 import { runGenerateAppCommand } from "./commands/generate.js";
+import { runExtractorCommand } from "./commands/extractor.js";
 import { runGeneratorCommand } from "./commands/generator.js";
 import { runGeneratorPolicyCommand } from "./commands/generator-policy.js";
 import { runImportCommand } from "./commands/import-runner.js";
-import { runNewProjectCommand } from "./commands/new.js";
+import { runInitProjectCommand } from "./commands/init.js";
 import { runPackageCommand } from "./commands/package.js";
 import { runParseCommand, runResolveCommand } from "./commands/inspect.js";
 import {
@@ -80,6 +82,8 @@ export async function runCliDispatch(context) {
     workflowName,
     workflowId,
     fromValue,
+    extractorSpecs,
+    extractorPolicyPath,
     adoptValue,
     reasonValue,
     modeId,
@@ -224,6 +228,15 @@ export async function runCliDispatch(context) {
     });
   }
 
+  if (commandArgs?.extractorCommand || commandArgs?.extractorPolicyCommand) {
+    return runExtractorCommand({
+      commandArgs,
+      inputPath,
+      json: emitJson,
+      cwd: process.cwd()
+    });
+  }
+
   if (commandArgs?.generatorPolicyCommand) {
     return runGeneratorPolicyCommand({ commandArgs, inputPath, json: emitJson });
   }
@@ -238,6 +251,16 @@ export async function runCliDispatch(context) {
     });
   }
 
+  if (commandArgs?.copyCommand) {
+    return runCopyCommand({
+      commandArgs,
+      catalogSource,
+      requestedVersion,
+      json: emitJson,
+      cwd: process.cwd()
+    });
+  }
+
   if (commandArgs?.packageCommand) {
     return runPackageCommand({ commandArgs, inputPath, json: emitJson });
   }
@@ -248,6 +271,8 @@ export async function runCliDispatch(context) {
       inputPath,
       outPath,
       fromValue,
+      extractorSpecs,
+      extractorPolicyPath,
       reasonValue,
       refreshAdopted,
       dryRun: args.includes("--dry-run"),
@@ -261,8 +286,12 @@ export async function runCliDispatch(context) {
     return runSourceCommand({ commandArgs, inputPath, args, json: emitJson });
   }
 
-  if (commandArgs?.newProject) {
-    return runNewProjectCommand(effectiveInputPath, { templateName, catalogSource, cwd: process.cwd() });
+  if (commandArgs?.initProject) {
+    return runInitProjectCommand(effectiveInputPath || ".", {
+      json: emitJson,
+      cwd: process.cwd(),
+      withSdlc: args.includes("--with-sdlc")
+    });
   }
 
   if (commandArgs?.templateCommand) {

package/src/cli/help-dispatch.js

@@ -12,11 +12,15 @@ import {
 import {
   printDoctorHelp
 } from "./commands/doctor.js";
+import {
+  printExtractorHelp
+} from "./commands/extractor.js";
 import {
   printGeneratorHelp
 } from "./commands/generator.js";
 import {
-  printImportHelp
+  printAdoptHelp,
+  printExtractHelp
 } from "./commands/import.js";
 import {
   printPackageHelp
@@ -42,7 +46,8 @@ import {
 import {
   printEmitHelp,
   printGenerateHelp,
-  printNewHelp,
+  printInitHelp,
+  printCopyHelp,
   printUsage,
   printWidgetHelp
 } from "./help.js";
@@ -52,8 +57,12 @@ import {
  * @returns {boolean}
  */
 export function printCommandHelp(command) {
-  if (command === "new" || command === "create") {
-    printNewHelp();
+  if (command === "copy") {
+    printCopyHelp();
+    return true;
+  }
+  if (command === "init") {
+    printInitHelp();
     return true;
   }
   if (command === "generate") {
@@ -80,6 +89,10 @@ export function printCommandHelp(command) {
     printGeneratorHelp();
     return true;
   }
+  if (command === "extractor") {
+    printExtractorHelp();
+    return true;
+  }
   if (command === "template") {
     printTemplateHelp();
     return true;
@@ -112,8 +125,12 @@ export function printCommandHelp(command) {
     printTrustHelp();
     return true;
   }
-  if (command === "import") {
-    printImportHelp();
+  if (command === "extract") {
+    printExtractHelp();
+    return true;
+  }
+  if (command === "adopt") {
+    printAdoptHelp();
     return true;
   }
   if (command === "check") {
@@ -166,12 +183,20 @@ export function handleUnparsedCommandHelp(args) {
     printGeneratorHelp();
     return args[1] ? 1 : 0;
   }
+  if (args[0] === "extractor") {
+    printExtractorHelp();
+    return args[1] ? 1 : 0;
+  }
   if (args[0] === "template") {
     printTemplateHelp();
     return args[1] ? 1 : 0;
   }
-  if (args[0] === "import") {
-    printImportHelp();
+  if (args[0] === "extract") {
+    printExtractHelp();
+    return args[1] ? 1 : 0;
+  }
+  if (args[0] === "adopt") {
+    printAdoptHelp();
     return args[1] ? 1 : 0;
   }
   if (args[0] === "query") {