@topogram/cli 0.3.69 → 0.3.71

package/package.json

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

package/src/agent-brief.js

@@ -28,7 +28,7 @@ import { DEFAULT_TOPO_FOLDER_NAME, resolveTopoRoot, resolveWorkspaceContext } fr
  * @typedef {{ path: string, ownership: string, rule: string }} AgentBriefOutputBoundary
  * @typedef {{ id: string, title: string, commands: string[], rule: string }} AgentBriefWorkflow
  * @typedef {{ id: string, kind: string, projection: string|null, generator: string|null, uses_api: string|null, uses_database: string|null }} AgentBriefRuntime
- * @typedef {{ path: string, source: string|null, tracks: string[], candidateCounts: Record<string, any>, ownership: string|null }} AgentBriefImport
+ * @typedef {{ path: string, workspaceRoot: string, source: string|null, tracks: string[], candidateCounts: Record<string, any>, ownership: string|null }} AgentBriefImport
  * @typedef {{ ok: true, payload: Record<string, any> } | { ok: false, kind: "topogram", validation: any } | { ok: false, kind: "project", validation: any, configPath: string }} AgentBriefResult
  */
 
@@ -137,6 +137,7 @@ function readImportSummary(projectRoot) {
     const record = JSON.parse(fs.readFileSync(importPath, "utf8"));
     return {
       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"
@@ -147,6 +148,7 @@ function readImportSummary(projectRoot) {
   } catch (error) {
     return {
       path: TOPOGRAM_IMPORT_FILE,
+      workspaceRoot: resolveTopoRoot(projectRoot),
       source: null,
       tracks: [],
       candidateCounts: {},
@@ -215,13 +217,13 @@ function buildWorkflows(config, hasImportRecord) {
       id: "brownfield-import",
       title: "Brownfield import adoption loop",
       commands: [
-        "topogram import check .",
-        "topogram import plan .",
-        "topogram import adopt --list .",
-        "topogram import status .",
-        "topogram import history . --verify"
+        "topogram import check . --json",
+        "topogram import plan . --json",
+        "topogram import adopt --list . --json",
+        "topogram import status . --json",
+        "topogram import history . --verify --json"
       ],
-      rule: "Imported Topogram files are editable after adoption; source hashes record trusted import evidence."
+      rule: "Imported Topogram files are editable after adoption; JSON automation should read workspaceRoot for the project-owned workspace path."
     });
   }
   return workflows;
@@ -338,10 +340,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 .", "Validate imported workspace provenance.", "import"),
-      commandItem("topogram import plan .", "Review import adoption plan.", "import"),
-      commandItem("topogram import adopt --list .", "List reviewable adoption selectors.", "import"),
-      commandItem("topogram import history . --verify", "Verify import history evidence.", "import")
+      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")
     ] : [])
   ];
 
@@ -461,6 +464,12 @@ export function formatAgentBrief(brief) {
   for (const workflow of brief.workflows || []) {
     lines.push(`  - ${workflow.title}: ${workflow.rule}`);
   }
+  if (brief.import?.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("");
   lines.push("Verification gates:");
   lines.push("  - npm run check");

package/src/cli/commands/import/adopt.js

@@ -50,6 +50,7 @@ export function buildImportAdoptionReceipt({ artifacts, selector, options, impor
       version: readInstalledCliPackageVersion()
     },
     projectRoot: artifacts.projectRoot,
+    workspaceRoot: artifacts.topogramRoot,
     topogramRoot: artifacts.topogramRoot,
     selector,
     mode: "write",
@@ -114,6 +115,7 @@ export function buildBrownfieldImportAdoptPayload(selector, inputPath, options =
   return {
     ok: true,
     projectRoot: artifacts.projectRoot,
+    workspaceRoot: artifacts.topogramRoot,
     topogramRoot: artifacts.topogramRoot,
     selector,
     dryRun: !options.write,

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

@@ -12,7 +12,8 @@ import { buildTopogramImportStatus } from "../../../import/provenance.js";
 import {
   checkSummaryPayload,
   combineProjectValidationResults,
-  normalizeProjectRoot
+  normalizeProjectRoot,
+  normalizeTopogramPath
 } from "./paths.js";
 
 /**
@@ -39,7 +40,7 @@ export function buildTopogramCheckPayloadForPath(inputPath) {
 
 /**
  * @param {string} projectRoot
- * @returns {{ ok: boolean, projectRoot: string, import: ReturnType<typeof buildTopogramImportStatus>, topogram: ReturnType<typeof buildTopogramCheckPayloadForPath>, errors: any[] }}
+ * @returns {{ ok: boolean, projectRoot: string, workspaceRoot: string, import: ReturnType<typeof buildTopogramImportStatus>, topogram: ReturnType<typeof buildTopogramCheckPayloadForPath>, errors: any[] }}
  */
 export function buildBrownfieldImportCheckPayload(projectRoot) {
   const resolvedRoot = normalizeProjectRoot(projectRoot);
@@ -48,6 +49,7 @@ export function buildBrownfieldImportCheckPayload(projectRoot) {
   return {
     ok: importStatus.ok && topogramCheck.ok,
     projectRoot: resolvedRoot,
+    workspaceRoot: normalizeTopogramPath(resolvedRoot),
     import: importStatus,
     topogram: topogramCheck,
     errors: [

package/src/cli/commands/import/diff.js

@@ -17,6 +17,7 @@ export function buildBrownfieldImportDiffPayload(inputPath, options = {}) {
   return {
     ok: true,
     projectRoot: analysis.projectRoot,
+    workspaceRoot: analysis.topogramRoot,
     topogramRoot: analysis.topogramRoot,
     sourcePath: analysis.sourcePath,
     provenancePath: analysis.provenancePath,

package/src/cli/commands/import/plan.js

@@ -191,6 +191,7 @@ export function buildBrownfieldImportPlanPayload(inputPath) {
   return {
     ok: true,
     projectRoot: artifacts.projectRoot,
+    workspaceRoot: artifacts.topogramRoot,
     topogramRoot: artifacts.topogramRoot,
     artifacts: {
       adoptionPlan: artifacts.paths.adoptionPlanAgent,
@@ -254,6 +255,7 @@ export function buildBrownfieldImportAdoptListPayload(inputPath) {
   return {
     ok: true,
     projectRoot: plan.projectRoot,
+    workspaceRoot: plan.topogramRoot,
     topogramRoot: plan.topogramRoot,
     selectorCount: selectors.length,
     selectors,

package/src/cli/commands/import/refresh.js

@@ -354,7 +354,7 @@ export function buildBrownfieldImportRefreshAnalysis(inputPath, options = {}) {
 /**
  * @param {string} inputPath
  * @param {{ sourcePath?: string|null, dryRun?: boolean }} [options]
- * @returns {{ ok: boolean, dryRun: boolean, projectRoot: string, topogramRoot: string, sourcePath: string, provenancePath: string, previousImportStatus: string, currentImportStatus: string, tracks: string[], sourceFiles: number, sourceDiff: Record<string, any>, removedCandidateFiles: Record<string, number>, rawCandidateFiles: number, reconcileFiles: number, writtenFiles: string[], plannedFiles: string[], candidateCounts: Record<string, number>, candidateCountDeltas: Record<string, any>, adoptionPlanDeltas: Record<string, any>, receiptVerification: Record<string, any>, refreshMetadata: Record<string, any>|null, nextCommands: string[] }}
+ * @returns {{ ok: boolean, dryRun: boolean, projectRoot: string, workspaceRoot: string, topogramRoot: string, sourcePath: string, provenancePath: string, previousImportStatus: string, currentImportStatus: string, tracks: string[], sourceFiles: number, sourceDiff: Record<string, any>, removedCandidateFiles: Record<string, number>, rawCandidateFiles: number, reconcileFiles: number, writtenFiles: string[], plannedFiles: string[], candidateCounts: Record<string, number>, candidateCountDeltas: Record<string, any>, adoptionPlanDeltas: Record<string, any>, receiptVerification: Record<string, any>, refreshMetadata: Record<string, any>|null, nextCommands: string[] }}
  */
 export function buildBrownfieldImportRefreshPayload(inputPath, options = {}) {
   const analysis = buildBrownfieldImportRefreshAnalysis(inputPath, options);
@@ -405,6 +405,7 @@ export function buildBrownfieldImportRefreshPayload(inputPath, options = {}) {
     ok: dryRun || currentImportStatus === "clean",
     dryRun,
     projectRoot: analysis.projectRoot,
+    workspaceRoot: analysis.topogramRoot,
     topogramRoot: analysis.topogramRoot,
     sourcePath: analysis.sourcePath,
     provenancePath,

package/src/cli/commands/import/status-history.js

@@ -31,6 +31,7 @@ export function buildBrownfieldImportStatusPayload(inputPath) {
   return {
     ok: importCheck.ok,
     projectRoot: artifacts.projectRoot,
+    workspaceRoot: artifacts.topogramRoot,
     topogramRoot: artifacts.topogramRoot,
     import: importCheck.import,
     topogram: importCheck.topogram,
@@ -144,6 +145,7 @@ export function verifyImportAdoptionReceipts(projectRoot, receipts) {
  */
 export function buildBrownfieldImportHistoryPayload(inputPath, options = {}) {
   const projectRoot = normalizeProjectRoot(inputPath);
+  const workspaceRoot = normalizeTopogramPath(projectRoot);
   const historyPath = importAdoptionsPath(projectRoot);
   const receipts = readImportAdoptionReceipts(projectRoot);
   const forcedWrites = receipts.filter((receipt) => receipt.forced);
@@ -151,6 +153,7 @@ export function buildBrownfieldImportHistoryPayload(inputPath, options = {}) {
   return {
     ok: true,
     projectRoot,
+    workspaceRoot,
     path: historyPath,
     exists: fs.existsSync(historyPath),
     verified: Boolean(options.verify),
@@ -162,7 +165,8 @@ export function buildBrownfieldImportHistoryPayload(inputPath, options = {}) {
       lastSelector: receipts[receipts.length - 1]?.selector || null
     },
     verification,
-    receipts
+    receipts,
+    entries: receipts
   };
 }
 

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

@@ -145,7 +145,7 @@ export function countFilesRecursive(rootPath) {
  * @param {string} sourcePath
  * @param {string} targetPath
  * @param {{ from?: string|null }} [options]
- * @returns {{ ok: boolean, sourcePath: string, targetPath: string, topogramRoot: string, projectConfigPath: string, provenancePath: string, tracks: string[], sourceFiles: number, rawCandidateFiles: number, reconcileFiles: number, writtenFiles: string[], candidateCounts: Record<string, number>, nextCommands: string[] }}
+ * @returns {{ ok: boolean, sourcePath: string, targetPath: string, workspaceRoot: string, topogramRoot: string, projectConfigPath: string, provenancePath: string, tracks: string[], sourceFiles: number, rawCandidateFiles: number, reconcileFiles: number, writtenFiles: string[], candidateCounts: Record<string, number>, nextCommands: string[] }}
  */
 export function buildBrownfieldImportWorkspacePayload(sourcePath, targetPath, options = {}) {
   const sourceRoot = path.resolve(sourcePath);
@@ -190,6 +190,7 @@ export function buildBrownfieldImportWorkspacePayload(sourcePath, targetPath, op
     ok: true,
     sourcePath: sourceRoot,
     targetPath: targetRoot,
+    workspaceRoot: topogramRoot,
     topogramRoot,
     projectConfigPath,
     provenancePath: provenance.path,

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

@@ -92,7 +92,7 @@ function diagnosticForTemplateCreateFailure(message, templateSpec, step) {
       step
     });
   }
-  if (message.includes("is missing topo/") || message.includes("is missing topogram/")) {
+  if (message.includes("is missing topo/")) {
     return templateCheckDiagnostic({
       code: "template_topogram_missing",
       message,

package/src/new-project/create.js

@@ -53,7 +53,7 @@ export function createNewProject({
   }
 
   ensureCreatableProjectRoot(projectRoot);
-  const workspaceCopy = copyTopogramWorkspace(template.root, projectRoot);
+  copyTopogramWorkspace(template.root, projectRoot);
   const projectConfig = writeProjectTemplateMetadata(projectRoot, template, templateProvenance);
   writeProjectPackage(projectRoot, engineRoot, template);
   writeExplainScript(projectRoot);
@@ -64,12 +64,6 @@ export function createNewProject({
   writeGeneratorPolicy(projectRoot, defaultGeneratorPolicy());
 
   const warnings = [];
-  if (workspaceCopy.legacyWorkspace) {
-    warnings.push(
-      `Template '${template.manifest.id}' still ships legacy topogram/ source. Copied it into this project as ${DEFAULT_TOPO_FOLDER_NAME}/. ` +
-        "This one-release package-ingress bridge will be removed after first-party packages migrate."
-    );
-  }
   if (template.manifest.includesExecutableImplementation) {
     writeTemplateTrustRecord(projectRoot, projectConfig);
     warnings.push(

package/src/new-project/project-files.js

@@ -55,7 +55,7 @@ export function ensureCreatableProjectRoot(projectRoot) {
 /**
  * @param {string} templateRoot
  * @param {string} projectRoot
- * @returns {{ legacyWorkspace: boolean }}
+ * @returns {void}
  */
 export function copyTopogramWorkspace(templateRoot, projectRoot) {
   const templateWorkspace = resolvePackageWorkspace(templateRoot);
@@ -74,7 +74,6 @@ export function copyTopogramWorkspace(templateRoot, projectRoot) {
       { recursive: true }
     );
   }
-  return { legacyWorkspace: templateWorkspace.legacy };
 }
 
 /**
@@ -336,7 +335,8 @@ npm run query:show -- widget-behavior
 ${hasImplementation ? "- This project has executable `implementation/` code. `topogram new` did not execute it. Do not refresh trust until the implementation has been reviewed.\n" : "- This template does not declare executable implementation code.\n"}
 ## Import And Adoption
 
-- If \`.topogram-import.json\` exists, run \`topogram import check .\`, \`topogram import plan .\`, \`topogram import adopt --list .\`, and \`topogram import history . --verify\`.
+- If \`.topogram-import.json\` exists, agents should run \`topogram import check . --json\`, \`topogram import plan . --json\`, \`topogram import adopt --list . --json\`, \`topogram import status . --json\`, and \`topogram import history . --verify --json\`.
+- Import JSON payloads expose \`workspaceRoot\`; prefer it as the canonical project-owned workspace path.
 - Imported Topogram files are project-owned after adoption; source hashes record trusted import evidence at the time of import.
 
 ## Verification Gates

package/src/new-project/template-resolution.js

@@ -6,7 +6,7 @@ import os from "node:os";
 import path from "node:path";
 
 import { assertSafeNpmSpec, localNpmrcEnv } from "../npm-safety.js";
-import { DEFAULT_TOPO_FOLDER_NAME, LEGACY_TOPOGRAM_FOLDER_NAME, resolvePackageWorkspace } from "../workspace-paths.js";
+import { DEFAULT_TOPO_FOLDER_NAME, resolvePackageWorkspace } from "../workspace-paths.js";
 import { GENERATOR_LABELS, SURFACE_ORDER, TEMPLATE_MANIFEST, unsupportedTemplateSymlinkMessage } from "./constants.js";
 import { isLocalTemplateSpec, packageNameFromSpec } from "./package-spec.js";
 
@@ -111,7 +111,7 @@ export function validateTemplateRoot(templateRoot) {
   const topogramRoot = workspace.root;
   const projectConfigPath = path.join(templateRoot, "topogram.project.json");
   if (fs.existsSync(topogramRoot) && fs.lstatSync(topogramRoot).isSymbolicLink()) {
-    throw new Error(unsupportedTemplateSymlinkMessage(manifest.id, workspace.legacy ? LEGACY_TOPOGRAM_FOLDER_NAME : DEFAULT_TOPO_FOLDER_NAME));
+    throw new Error(unsupportedTemplateSymlinkMessage(manifest.id, DEFAULT_TOPO_FOLDER_NAME));
   }
   if (fs.existsSync(projectConfigPath) && fs.lstatSync(projectConfigPath).isSymbolicLink()) {
     throw new Error(unsupportedTemplateSymlinkMessage(manifest.id, "topogram.project.json"));
@@ -122,7 +122,7 @@ export function validateTemplateRoot(templateRoot) {
   if (!fs.existsSync(projectConfigPath) || !fs.statSync(projectConfigPath).isFile()) {
     throw new Error(`Template '${manifest.id}' is missing topogram.project.json.`);
   }
-  assertTemplateTreeHasNoSymlinks(templateRoot, topogramRoot, workspace.legacy ? LEGACY_TOPOGRAM_FOLDER_NAME : DEFAULT_TOPO_FOLDER_NAME, manifest.id);
+  assertTemplateTreeHasNoSymlinks(templateRoot, topogramRoot, DEFAULT_TOPO_FOLDER_NAME, manifest.id);
   if (manifest.includesExecutableImplementation) {
     const implementationRoot = path.join(templateRoot, "implementation");
     if (fs.existsSync(implementationRoot) && fs.lstatSync(implementationRoot).isSymbolicLink()) {

package/src/workspace-paths.js

@@ -313,16 +313,12 @@ export function resolveTopoRoot(inputPath = ".") {
 
 /**
  * @param {string} packageRoot
- * @returns {{ root: string, legacy: boolean }}
+ * @returns {{ root: string }}
  */
 export function resolvePackageWorkspace(packageRoot) {
   const topoRoot = path.join(packageRoot, DEFAULT_TOPO_FOLDER_NAME);
   if (isDirectory(topoRoot)) {
-    return { root: topoRoot, legacy: false };
-  }
-  const legacyRoot = path.join(packageRoot, LEGACY_TOPOGRAM_FOLDER_NAME);
-  if (isDirectory(legacyRoot)) {
-    return { root: legacyRoot, legacy: true };
+    return { root: topoRoot };
   }
   throw new Error(`Package is missing ${DEFAULT_TOPO_FOLDER_NAME}/.`);
 }