@topogram/cli 0.3.64 → 0.3.66

package/src/cli/commands/trust.js

@@ -205,7 +205,7 @@ export function runTrustDiffCommand(inputPath, options = {}) {
  * @returns {number}
  */
 export function runTrustCommand(context) {
-  const inputPath = context.inputPath || "./topogram";
+  const inputPath = context.inputPath || "./topo";
   if (context.commandArgs.trustCommand === "template") {
     return runTrustTemplateCommand(inputPath, { force: Boolean(context.commandArgs.force) });
   }

package/src/cli/commands/workflow.js

@@ -6,6 +6,7 @@ import path from "node:path";
 import { stableStringify } from "../../format.js";
 import { parsePath } from "../../parser.js";
 import { formatValidationErrors, validateWorkspace } from "../../validator.js";
+import { resolveTopoRoot } from "../../workspace-paths.js";
 import { runWorkflow } from "../../workflows.js";
 
 /**
@@ -13,7 +14,11 @@ import { runWorkflow } from "../../workflows.js";
  * @returns {number}
  */
 export function runValidateCommand(inputPath) {
-  const ast = parsePath(inputPath || ".");
+  const requestedPath = inputPath || ".";
+  const targetPath = fs.existsSync(requestedPath) && fs.statSync(requestedPath).isFile()
+    ? requestedPath
+    : resolveTopoRoot(requestedPath);
+  const ast = parsePath(targetPath);
   const result = validateWorkspace(ast);
   if (!result.ok) {
     console.error(formatValidationErrors(result));

package/src/cli/dispatcher.js

@@ -10,6 +10,7 @@ import { runGenerateAppCommand } from "./commands/generate.js";
 import { runGeneratorCommand } from "./commands/generator.js";
 import { runGeneratorPolicyCommand } from "./commands/generator-policy.js";
 import { runImportCommand } from "./commands/import-runner.js";
+import { runMigrateCommand } from "./commands/migrate.js";
 import { runNewProjectCommand } from "./commands/new.js";
 import { runPackageCommand } from "./commands/package.js";
 import { runParseCommand, runResolveCommand } from "./commands/inspect.js";
@@ -145,7 +146,7 @@ export async function runCliDispatch(context) {
     return 1;
   }
 
-  if ((shouldCheck || shouldWidgetCheck || shouldWidgetBehavior || shouldAgentBrief || shouldValidate || commandArgs?.generatorPolicyCommand || commandArgs?.trustCommand || generateTarget === "app-bundle") && inputPath) {
+  if ((shouldCheck || shouldWidgetCheck || shouldWidgetBehavior || shouldAgentBrief || shouldValidate || commandArgs?.generatorPolicyCommand || commandArgs?.trustCommand || commandArgs?.queryName || commandArgs?.workflowPresetCommand || generateTarget) && inputPath) {
     inputPath = normalizeTopogramPath(inputPath);
   }
   const effectiveInputPath = commandInputPath(inputPath);
@@ -241,6 +242,10 @@ export async function runCliDispatch(context) {
     return runPackageCommand({ commandArgs, inputPath, json: emitJson });
   }
 
+  if (commandArgs?.migrateCommand) {
+    return runMigrateCommand(inputPath, { write: shouldWrite, json: emitJson });
+  }
+
   if (commandArgs?.importCommand) {
     return runImportCommand({
       commandArgs,

package/src/cli/help.js

@@ -28,6 +28,7 @@ export function printUsage(options = {}) {
   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("   or: topogram migrate workspace-folder [path] [--dry-run|--write] [--json]");
   console.log("   or: topogram package update-cli <version|--latest> [--json]");
   console.log("   or: topogram import <app-path> --out <target> [--from <track[,track]>] [--json]");
   console.log("   or: topogram import refresh [path] [--from <app-path>] [--dry-run] [--json]");
@@ -79,9 +80,9 @@ export function printUsage(options = {}) {
   console.log("  topogram agent brief --json");
   console.log("  topogram query list");
   console.log("  topogram query show widget-behavior");
-  console.log("  topogram query widget-behavior ./topogram --projection proj_web_surface --json");
+  console.log("  topogram query widget-behavior ./topo --projection proj_web_surface --json");
   console.log("  topogram emit ui-widget-contract --widget widget_data_grid --json");
-  console.log("  topogram emit widget-conformance-report ./topogram --projection proj_web_surface --json");
+  console.log("  topogram emit widget-conformance-report ./topo --projection proj_web_surface --json");
   console.log("  topogram generator list");
   console.log("  topogram generator show @topogram/generator-react-web");
   console.log("  topogram generator check ./generator-package");
@@ -136,7 +137,7 @@ export function printUsage(options = {}) {
   console.log("  topogram template update --check");
   console.log("  topogram template update --apply");
   console.log("");
-  console.log("Defaults: check/generate use ./topogram, and generate writes ./app.");
+  console.log("Defaults: check/generate use ./topo, and generate writes ./app.");
   console.log("Default starter: hello-web from the catalog. Run `topogram template list` for catalog aliases.");
   console.log("Generated app commands are emitted into the output package.json.");
   console.log("Run `topogram help <command>` for command-specific help.");
@@ -231,13 +232,13 @@ export function printGenerateHelp() {
   console.log("Usage: topogram generate [path] [--out <path>]");
   console.log("   or: topogram generate app [path] [--out <path>]");
   console.log("");
-  console.log("Defaults: path is ./topogram and app generation writes ./app.");
+  console.log("Defaults: path is ./topo and app generation writes ./app.");
   console.log("Use `topogram emit <target>` for contracts, reports, snapshots, migration plans, and other artifacts.");
   console.log("");
   console.log("Examples:");
   console.log("  topogram generate");
-  console.log("  topogram generate ./topogram --out ./app");
-  console.log("  topogram generate app ./topogram --out ./app");
+  console.log("  topogram generate ./topo --out ./app");
+  console.log("  topogram generate app ./topo --out ./app");
 }
 
 /**
@@ -249,7 +250,7 @@ export function printEmitHelp() {
   console.log("");
   console.log("Emits named contracts, reports, snapshots, migration plans, and other artifacts.");
   console.log("");
-  console.log("Defaults: path is ./topogram. Emit prints to stdout unless --write is passed. --write writes ./artifacts unless --out-dir is supplied.");
+  console.log("Defaults: path is ./topo. Emit prints to stdout unless --write is passed. --write writes ./artifacts unless --out-dir is supplied.");
   console.log("");
   console.log("Common artifact targets:");
   console.log("  ui-widget-contract");
@@ -268,10 +269,10 @@ export function printEmitHelp() {
   console.log("");
   console.log("Examples:");
   console.log("  topogram emit ui-widget-contract --widget widget_data_grid --json");
-  console.log("  topogram emit widget-conformance-report ./topogram --projection proj_web_surface --json");
-  console.log("  topogram emit widget-behavior-report ./topogram --projection proj_web_surface --json");
-  console.log("  topogram emit db-schema-snapshot ./topogram --projection proj_db_postgres --json");
-  console.log("  topogram emit sql-migration ./topogram --projection proj_db_postgres --from-snapshot ./state/current.json");
+  console.log("  topogram emit widget-conformance-report ./topo --projection proj_web_surface --json");
+  console.log("  topogram emit widget-behavior-report ./topo --projection proj_web_surface --json");
+  console.log("  topogram emit db-schema-snapshot ./topo --projection proj_db_postgres --json");
+  console.log("  topogram emit sql-migration ./topo --projection proj_db_postgres --from-snapshot ./state/current.json");
   console.log("  topogram emit ui-widget-contract --write --out-dir ./contracts");
 }
 
@@ -284,13 +285,13 @@ export function printWidgetHelp() {
   console.log("");
   console.log("Checks projection widget_bindings usage against reusable widget contracts and behavior realizations.");
   console.log("");
-  console.log("Defaults: path is ./topogram.");
+  console.log("Defaults: path is ./topo.");
   console.log("");
   console.log("Examples:");
   console.log("  topogram widget check");
   console.log("  topogram widget check --projection proj_web_surface");
-  console.log("  topogram widget check ./topogram --widget widget_data_grid --json");
+  console.log("  topogram widget check ./topo --widget widget_data_grid --json");
   console.log("  topogram widget behavior");
   console.log("  topogram widget behavior --projection proj_web_surface");
-  console.log("  topogram widget behavior ./topogram --widget widget_data_grid --json");
+  console.log("  topogram widget behavior ./topo --widget widget_data_grid --json");
 }

package/src/cli/migration-guidance.js

@@ -17,7 +17,7 @@ const RENAMED_GENERATE_TARGETS = new Map([
  * @param {string} [fallback]
  * @returns {string}
  */
-function commandPath(args, index, fallback = "./topogram") {
+function commandPath(args, index, fallback = "./topo") {
   const value = args[index];
   return value && !value.startsWith("-") ? value : fallback;
 }

package/src/cli/output-safety.js

@@ -5,6 +5,7 @@ import os from "node:os";
 import path from "node:path";
 
 import { outputOwnershipForPath } from "../project-config.js";
+import { DEFAULT_TOPO_FOLDER_NAME } from "../workspace-paths.js";
 
 export const GENERATED_OUTPUT_SENTINEL = ".topogram-generated.json";
 
@@ -103,5 +104,5 @@ export function topogramInputPathForGeneration(inputPath) {
   if (isSameOrInside(REPO_ROOT, absolute)) {
     return `./${path.relative(REPO_ROOT, absolute).replace(/\\/g, "/")}`;
   }
-  return path.basename(absolute) === "topogram" ? "./topogram" : ".";
+  return path.basename(absolute) === DEFAULT_TOPO_FOLDER_NAME ? `./${DEFAULT_TOPO_FOLDER_NAME}` : ".";
 }

package/src/cli/path-normalization.js

@@ -1,19 +1,13 @@
 // @ts-check
 
-import fs from "node:fs";
-import path from "node:path";
+import { resolveTopoRoot, resolveWorkspaceContext } from "../workspace-paths.js";
 
 /**
  * @param {string} inputPath
  * @returns {string}
  */
 export function normalizeTopogramPath(inputPath) {
-  const absolute = path.resolve(inputPath);
-  if (path.basename(absolute) === "topogram") {
-    return absolute;
-  }
-  const candidate = path.join(absolute, "topogram");
-  return fs.existsSync(candidate) ? candidate : absolute;
+  return resolveTopoRoot(inputPath);
 }
 
 /**
@@ -21,9 +15,5 @@ export function normalizeTopogramPath(inputPath) {
  * @returns {string}
  */
 export function normalizeProjectRoot(inputPath) {
-  const absolute = path.resolve(inputPath);
-  if (path.basename(absolute) === "topogram") {
-    return path.dirname(absolute);
-  }
-  return absolute;
+  return resolveWorkspaceContext(inputPath).projectRoot;
 }