@haus-tech/haus-workflow 1.5.3 → 1.5.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.5.4](https://github.com/WeAreHausTech/haus-workflow/compare/v1.5.3...v1.5.4) (2026-08-11)
+
+### Bug Fixes
+
+- **workspace:** stop setup from clobbering CLAUDE.md imports and dropping manual lock includes ([#213](https://github.com/WeAreHausTech/haus-workflow/issues/213)) ([b29ad06](https://github.com/WeAreHausTech/haus-workflow/commit/b29ad06c6e5c58e9381c7da300a02e8b486c6ceb))
+
 ## [1.5.3](https://github.com/WeAreHausTech/haus-workflow/compare/v1.5.2...v1.5.3) (2026-08-10)
 
 ### Performance

package/dist/cli.js

@@ -2479,6 +2479,9 @@ import path16 from "node:path";
 import fs14 from "fs-extra";
 var BLOCK_BEGIN = "<!-- HAUS:BEGIN haus-imports v=1 -->";
 var BLOCK_END = "<!-- HAUS:END haus-imports -->";
+var WORKSPACE_BLOCK_BEGIN = "<!-- HAUS:BEGIN haus-workspace-imports v=1 -->";
+var WORKSPACE_BLOCK_END = "<!-- HAUS:END haus-workspace-imports -->";
+var DEFAULT_SENTINELS = { begin: BLOCK_BEGIN, end: BLOCK_END };
 var IMPORT_CONTENT = `@.haus-workflow/WORKFLOW.md
 @.haus-workflow/workflow-config.md
 @docs/decisions/README.md`;
@@ -2498,15 +2501,15 @@ function findLineMarker2(content2, marker, from = 0) {
   }
   return null;
 }
-function findImportBlockRange(content2) {
-  const begin = findLineMarker2(content2, BLOCK_BEGIN);
+function findImportBlockRange(content2, sentinels = DEFAULT_SENTINELS) {
+  const begin = findLineMarker2(content2, sentinels.begin);
   if (!begin) return null;
-  const end = findLineMarker2(content2, BLOCK_END, begin.end);
+  const end = findLineMarker2(content2, sentinels.end, begin.end);
   if (!end) return null;
   return { beginStart: begin.start, beginEnd: begin.end, endStart: end.start, endEnd: end.end };
 }
-function stripHausBlock(existing) {
-  const range = findImportBlockRange(existing);
+function stripHausBlock(existing, sentinels = DEFAULT_SENTINELS) {
+  const range = findImportBlockRange(existing, sentinels);
   if (range) {
     const before = existing.slice(0, range.beginStart);
     const after = existing.slice(range.endEnd);
@@ -2514,7 +2517,7 @@ function stripHausBlock(existing) {
     return merged.length > 0 ? `${merged}
 ` : "";
   }
-  const loneBegin = findLineMarker2(existing, BLOCK_BEGIN);
+  const loneBegin = findLineMarker2(existing, sentinels.begin);
   if (loneBegin) {
     const before = existing.slice(0, loneBegin.start).trimEnd();
     return before.length > 0 ? `${before}
@@ -2522,14 +2525,14 @@ function stripHausBlock(existing) {
   }
   return existing;
 }
-function injectHausBlock(existing, block) {
-  const range = findImportBlockRange(existing);
+function injectHausBlock(existing, block, sentinels = DEFAULT_SENTINELS) {
+  const range = findImportBlockRange(existing, sentinels);
   if (range) {
     const before = existing.slice(0, range.beginStart);
     const after = existing.slice(range.endEnd);
     return `${before}${block}${after}`;
   }
-  const loneBegin = findLineMarker2(existing, BLOCK_BEGIN);
+  const loneBegin = findLineMarker2(existing, sentinels.begin);
   if (loneBegin) {
     const before = existing.slice(0, loneBegin.start).trimEnd();
     if (before.length === 0) return `${block}
@@ -3144,8 +3147,18 @@ async function writeClaudeFiles(root, dryRun, selectedIds, opts = {}) {
     }
     await pruneOrphanedCatalogItems(root, prevLock, notOrphaned, dryRun, opts.quiet);
   }
-  if (dryRun) return [...new Set(files)];
   const installedItems = catalogItems.filter((r) => installedIds.has(r.id));
+  if (dryRun) {
+    const prevIds = new Set(
+      prevLock.map((e) => e.id ? migrationByOldId.get(e.id) ?? e.id : void 0).filter((id) => Boolean(id))
+    );
+    const nextIds = new Set(installedItems.map((r) => r.id));
+    const added = [...nextIds].filter((id) => !prevIds.has(id)).sort();
+    const removed = [...prevIds].filter((id) => !nextIds.has(id)).sort();
+    for (const id of added) say(`[dry-run] haus.lock.json would add: ${id}`);
+    for (const id of removed) say(`[dry-run] haus.lock.json would remove: ${id}`);
+    return [...new Set(files)];
+  }
   const prevRefById = new Map(
     prevLock.filter((e) => e.id && e.catalogRef).map((e) => [migrationByOldId.get(e.id) ?? e.id, e.catalogRef])
   );
@@ -5479,13 +5492,31 @@ async function runDoctor(options) {
         "haus apply --write"
       );
     } else {
-      ok("- CLAUDE.md: import block present");
       const block = rootClaudeMdContent.slice(beginIdx, endIdx + BLOCK_END.length);
-      const importTargets = [...block.matchAll(/@\.haus-workflow\/(\S+)/g)].map((m) => m[1]);
-      for (const target of importTargets) {
-        if (!await fs29.pathExists(hausPath(root, target))) {
+      const importLinePattern = /^@(\S+)\s*$/gm;
+      const actualTargets = [...block.matchAll(importLinePattern)].map((m) => m[1]);
+      const expectedTargets = [...IMPORT_CONTENT.matchAll(importLinePattern)].map((m) => m[1]);
+      const missingTargets = expectedTargets.filter((t) => !actualTargets.includes(t));
+      const foreignTargets = actualTargets.filter((t) => !expectedTargets.includes(t));
+      if (missingTargets.length > 0 || foreignTargets.length > 0) {
+        const parts = [];
+        if (missingTargets.length > 0) parts.push(`missing @${missingTargets.join(", @")}`);
+        if (foreignTargets.length > 0) parts.push(`unexpected @${foreignTargets.join(", @")}`);
+        flag(
+          `- CLAUDE.md: haus import block content does not match expected imports (${parts.join("; ")}) (run \`haus apply --write\` to repair)`,
+          "The haus import block in CLAUDE.md has been altered and no longer imports the expected files",
+          "haus apply --write"
+        );
+      } else {
+        ok("- CLAUDE.md: import block present");
+      }
+      for (const target of actualTargets) {
+        const resolved = path38.resolve(root, target);
+        const relFromRoot = path38.relative(root, resolved);
+        const escapesRoot = relFromRoot === ".." || relFromRoot.startsWith(`..${path38.sep}`) || path38.isAbsolute(relFromRoot);
+        if (escapesRoot || !await fs29.pathExists(resolved)) {
           flag(
-            `- CLAUDE.md import: @.haus-workflow/${target} does not resolve (run \`haus apply --write\`)`,
+            `- CLAUDE.md import: @${target} does not resolve (run \`haus apply --write\`)`,
             `A file CLAUDE.md links to (${target}) is missing, so part of the guidance won't load`,
             "haus apply --write"
           );
@@ -5493,6 +5524,13 @@ async function runDoctor(options) {
       }
     }
   }
+  if (rootClaudeMdContent && rootClaudeMdContent.includes(WORKSPACE_BLOCK_BEGIN) && !rootClaudeMdContent.includes(BLOCK_BEGIN)) {
+    flag(
+      "- CLAUDE.md: haus-workspace-imports block present but the per-repo haus-imports block is missing (run `haus apply --write`)",
+      "The workspace CLAUDE.md has the workspace import block but not the per-repo one alongside it",
+      "haus apply --write"
+    );
+  }
   const workflowPath = hausPath(root, "WORKFLOW.md");
   const workflowExists = await fs29.pathExists(workflowPath);
   if (!workflowExists) {
@@ -7459,6 +7497,11 @@ async function hasMultipleSiblingRepos(root) {
 }
 
 // src/claude/setup-core.ts
+async function readPriorManualIncludes(root) {
+  const prior = await readJson(hausPath(root, "recommendation.json"));
+  if (!prior?.recommended) return [];
+  return prior.recommended.filter((entry) => entry.selectionMode === "manual").map((entry) => entry.id);
+}
 async function runSetupCore(root, opts) {
   const { json, apply, dryRun, quiet, confirm: confirm2, force } = opts;
   const say = quiet ? () => {
@@ -7473,7 +7516,8 @@ async function runSetupCore(root, opts) {
   }
   const siblingWarning = await hasMultipleSiblingRepos(root) ? [SIBLING_REPO_WARNING] : [];
   const context = await readContextOrScan(root);
-  const recommendation = await recommend(root, context);
+  const priorManualIncludes = await readPriorManualIncludes(root);
+  const recommendation = await recommend(root, context, { include: priorManualIncludes });
   if (recommendation.recommended.length === 0 && !force) {
     const warningLines2 = [
       .../* @__PURE__ */ new Set([...context.warnings, ...recommendation.warnings ?? [], ...siblingWarning])
@@ -10012,6 +10056,7 @@ import path68 from "node:path";
 // src/claude/write-workspace-claude-md.ts
 import path67 from "node:path";
 import fs46 from "fs-extra";
+var WORKSPACE_SENTINELS = { begin: WORKSPACE_BLOCK_BEGIN, end: WORKSPACE_BLOCK_END };
 function buildWorkspaceImportBlock(client, members) {
   const memberLines = members.map((m) => `- ${m.name} (${m.path})`);
   const body = [
@@ -10022,9 +10067,9 @@ function buildWorkspaceImportBlock(client, members) {
     "Member repos:",
     ...memberLines
   ].join("\n");
-  return `${BLOCK_BEGIN}
+  return `${WORKSPACE_BLOCK_BEGIN}
 ${body}
-${BLOCK_END}`;
+${WORKSPACE_BLOCK_END}`;
 }
 async function writeWorkspaceClaudeMd(workspaceRoot, opts) {
   const block = buildWorkspaceImportBlock(opts.client, opts.members);
@@ -10035,7 +10080,7 @@ async function writeWorkspaceClaudeMd(workspaceRoot, opts) {
   const existed = await fs46.pathExists(filePath);
   const prev = existed ? await fs46.readFile(filePath, "utf8") : "";
   const next = opts.collision ? `${block}
-` : injectHausBlock(prev, block);
+` : injectHausBlock(prev, block, WORKSPACE_SENTINELS);
   const printable = displayPath(workspaceRoot, filePath);
   if (dryRun) {
     if (!existed) {
@@ -10147,6 +10192,17 @@ async function runWorkspaceSetup(workspaceRoot, options = {}) {
         config.relationships
       );
       written.push(...artifacts);
+    } else {
+      const sayAggregate = options.json ? () => {
+      } : log;
+      for (const rel of [
+        "workspace-summary.json",
+        "dependency-ownership-map.json",
+        "cross-repo-summary.md",
+        "workspace-context-map.json"
+      ]) {
+        sayAggregate(`[dry-run] would write .haus-workflow/${rel}`);
+      }
     }
     const docPath = await writeWorkspaceClaudeMd(workspaceRoot, {
       client: config.client,
@@ -10267,6 +10323,14 @@ var WORKSPACE_AGGREGATE_FILES = [
   "cross-repo-summary.md",
   "workspace-context-map.json"
 ];
+function hasLegacyWorkspaceBlock(content2) {
+  const beginIdx = content2.indexOf(BLOCK_BEGIN);
+  if (beginIdx < 0) return false;
+  const endIdx = content2.indexOf(BLOCK_END, beginIdx + BLOCK_BEGIN.length);
+  if (endIdx < 0) return false;
+  const block = content2.slice(beginIdx, endIdx + BLOCK_END.length);
+  return block.includes("@.haus-workflow/cross-repo-summary.md") && block.includes("Member repos:");
+}
 async function runWorkspaceUndo(workspaceRoot, options = {}) {
   const config = await readWorkspaceConfig(workspaceRoot);
   if (!config) {
@@ -10329,8 +10393,11 @@ async function runWorkspaceUndo(workspaceRoot, options = {}) {
     const claudeMdPath = path69.join(workspaceRoot, "CLAUDE.md");
     if (existsSync9(claudeMdPath)) {
       const prev = await readText(claudeMdPath);
-      if (prev?.includes(BLOCK_BEGIN)) {
-        const next = stripHausBlock(prev);
+      if (prev?.includes(WORKSPACE_BLOCK_BEGIN)) {
+        const next = stripHausBlock(prev, {
+          begin: WORKSPACE_BLOCK_BEGIN,
+          end: WORKSPACE_BLOCK_END
+        });
         if (next.length === 0) {
           await fs47.remove(claudeMdPath);
           log("Removed CLAUDE.md (only contained the workspace haus import block).");
@@ -10338,6 +10405,17 @@ async function runWorkspaceUndo(workspaceRoot, options = {}) {
           await fs47.writeFile(claudeMdPath, next, "utf8");
           log("Removed haus import block from CLAUDE.md (user content preserved).");
         }
+      } else if (prev && hasLegacyWorkspaceBlock(prev)) {
+        const next = stripHausBlock(prev, { begin: BLOCK_BEGIN, end: BLOCK_END });
+        if (next.length === 0) {
+          await fs47.remove(claudeMdPath);
+          log("Removed CLAUDE.md (only contained the pre-upgrade workspace haus import block).");
+        } else {
+          await fs47.writeFile(claudeMdPath, next, "utf8");
+          log(
+            "Removed pre-upgrade workspace haus import block from CLAUDE.md (user content preserved)."
+          );
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haus-tech/haus-workflow",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Haus AI workflow CLI for Claude Code.",
   "type": "module",
   "bin": {