safeword 0.78.2 → 0.78.3

package/dist/{chunk-NOTBZCKG.js → chunk-2XR7J5WL.js}

@@ -1,11 +1,11 @@
 import {
   WORKSPACE_ROOTS,
   getWorkspacePackageNames
-} from "./chunk-Q5KLE6ZF.js";
+} from "./chunk-OKPRQGFG.js";
 import {
   parse,
   setupPythonTooling
-} from "./chunk-BSOUMHMQ.js";
+} from "./chunk-JSR3HXFT.js";
 import {
   SAFEWORD_PRIMARY_LINT_SCRIPT,
   detect
@@ -14,7 +14,7 @@ import {
   NAMESPACE_ROOT_LEGACY,
   readConfiguredPath,
   resolveNamespaceRoot
-} from "./chunk-GKR44BCH.js";
+} from "./chunk-RVDXBHUG.js";
 import {
   ensureDirectory,
   exists,
@@ -28,10 +28,10 @@ import {
   removeIfEmpty,
   writeFile,
   writeJson
-} from "./chunk-S2T356DA.js";
+} from "./chunk-HF3DXZEA.js";
 
 // src/reconcile.ts
-import { lstatSync, readlinkSync, unlinkSync } from "fs";
+import { lstatSync, readdirSync, readlinkSync, unlinkSync } from "fs";
 import nodePath from "path";
 var HUSKY_DIR = ".husky";
 var CHMOD_PATHS = [".safeword/hooks", ".safeword/hooks/cursor", ".safeword/scripts"];
@@ -108,10 +108,7 @@ function passesTextPatchContentGuard(cwd, filePath, definition) {
   return content !== void 0 && definition.applyWhenContentIncludes.every((required) => content.includes(required));
 }
 function planTextUnpatches(patches, ctx) {
-  const hasLegacyPreamble = (content, definition) => {
-    const firstLine = content.split("\n", 1)[0] ?? "";
-    return containsTextPatchContent(content, definition) || firstLine.includes(definition.marker);
-  };
+  const hasLegacyPreamble = (content, definition) => containsTextPatchContent(content, definition);
   const actions = [];
   for (const [filePath, entry] of Object.entries(patches)) {
     if (shouldSkipForNonGit(filePath, ctx.isGitRepo)) continue;
@@ -161,15 +158,19 @@ function planManagedFileWrites(files, ctx) {
     return exists(nodePath.join(c.cwd, filePath));
   });
 }
-function planExistingDirectoriesRemoval(directories, cwd) {
+function planExistingDirectoriesRemoval(directories, cwd, scheduledRemovals = /* @__PURE__ */ new Set()) {
   const actions = [];
   const removed = [];
   for (const dir of directories) {
-    if (!exists(nodePath.join(cwd, dir))) {
-      continue;
-    }
+    const fullPath = nodePath.join(cwd, dir);
+    if (!exists(fullPath)) continue;
     actions.push({ type: "rmdir", path: dir });
-    removed.push(dir);
+    const plannedBeforeThisDirectory = /* @__PURE__ */ new Set([...scheduledRemovals, ...removed]);
+    const entries = readdirSync(fullPath);
+    const willBeEmpty = entries.every(
+      (entry) => plannedBeforeThisDirectory.has(nodePath.posix.join(dir, entry))
+    );
+    if (willBeEmpty) removed.push(dir);
   }
   return { actions, removed };
 }
@@ -179,16 +180,24 @@ function matchesUnmodifiedScaffold(definition, ctx, installed) {
   const normalize = definition.normalizeForUnmodifiedComparison;
   return normalize === void 0 ? installed === expected : normalize(installed) === normalize(expected);
 }
-function planConditionalManagedRemoval(managedFiles, ctx) {
+function matchesManagedScaffold(definition, ctx, installed) {
+  if (installed === void 0) return false;
+  if (definition.removeIfUnmodified !== void 0) {
+    return matchesUnmodifiedScaffold(definition, ctx, installed);
+  }
+  const expected = resolveFileContent(definition, ctx);
+  return expected !== void 0 && installed === expected;
+}
+function planConditionalManagedRemoval(managedFiles, ctx, includeAllUnmodified = false) {
   const actions = [];
   const removed = [];
   for (const [filePath, definition] of Object.entries(managedFiles)) {
-    if (definition.removeIfUnmodified === void 0) continue;
+    if (!includeAllUnmodified && definition.removeIfUnmodified === void 0) continue;
     if (isConfigOverridden(definition, ctx.cwd)) continue;
     const fullPath = nodePath.join(ctx.cwd, filePath);
     if (!exists(fullPath)) continue;
     const installed = readFileSafe(fullPath);
-    if (installed !== void 0 && matchesUnmodifiedScaffold(definition, ctx, installed)) {
+    if (matchesManagedScaffold(definition, ctx, installed)) {
       actions.push({ type: "rm", path: filePath });
       removed.push(filePath);
     }
@@ -249,7 +258,8 @@ function getClaudeParentDirectoryForCleanup(filePath) {
 function resolveTextPatch(definition, ctx) {
   return {
     ...definition,
-    content: typeof definition.content === "function" ? definition.content(ctx) : definition.content
+    content: typeof definition.content === "function" ? definition.content(ctx) : definition.content,
+    replacementAfterUnpatch: typeof definition.replacementAfterUnpatch === "function" ? definition.replacementAfterUnpatch(ctx) : definition.replacementAfterUnpatch
   };
 }
 function withResolvedNamespaceRoot(schema, ctx) {
@@ -265,6 +275,7 @@ function withResolvedNamespaceRoot(schema, ctx) {
   };
   return {
     ...schema,
+    sharedDirs: schema.sharedDirs.map((path) => translate(path)),
     preservedDirs: schema.preservedDirs.map((path) => translate(path)),
     managedFiles: Object.fromEntries(
       Object.entries(schema.managedFiles).map(([path, definition]) => [translate(path), definition]).filter(([translatedPath]) => translatedPath !== ".gitignore")
@@ -421,7 +432,11 @@ function computeUpgradePlan(schema, ctx) {
   const deprecatedFiles = planExistingFilesRemoval(schema.deprecatedFiles, ctx.cwd);
   actions.push(...deprecatedFiles.actions);
   wouldRemove.push(...deprecatedFiles.removed);
-  const deprecatedDirectories = planExistingDirectoriesRemoval(schema.deprecatedDirs, ctx.cwd);
+  const deprecatedDirectories = planExistingDirectoriesRemoval(
+    schema.deprecatedDirs,
+    ctx.cwd,
+    new Set(wouldRemove)
+  );
   actions.push(...deprecatedDirectories.actions);
   wouldRemove.push(...deprecatedDirectories.removed);
   actions.push({ type: "chmod", paths: CHMOD_PATHS });
@@ -468,7 +483,11 @@ function computeUninstallPlan(schema, ctx, full) {
     const parentDirectory = getClaudeParentDirectoryForCleanup(filePath);
     if (parentDirectory) directoriesToCleanup.add(parentDirectory);
   }
-  const cleanupDirectories = planExistingDirectoriesRemoval([...directoriesToCleanup], ctx.cwd);
+  const cleanupDirectories = planExistingDirectoriesRemoval(
+    [...directoriesToCleanup],
+    ctx.cwd,
+    new Set(wouldRemove)
+  );
   actions.push(...cleanupDirectories.actions);
   wouldRemove.push(...cleanupDirectories.removed);
   for (const [filePath, definition] of Object.entries(schema.jsonMerges)) {
@@ -480,15 +499,22 @@ function computeUninstallPlan(schema, ctx, full) {
   );
   const dynamicChanges = planDynamicFileChanges(actions, ctx);
   wouldRemove.push(...dynamicChanges.removed);
-  const preserved = planExistingDirectoriesRemoval(schema.preservedDirs.toReversed(), ctx.cwd);
+  const preserved = planExistingDirectoriesRemoval(
+    schema.preservedDirs.toReversed(),
+    ctx.cwd,
+    new Set(wouldRemove)
+  );
   actions.push(...preserved.actions);
   wouldRemove.push(...preserved.removed);
-  const owned = planExistingDirectoriesRemoval(schema.ownedDirs.toReversed(), ctx.cwd);
+  const owned = planExistingDirectoriesRemoval(
+    schema.ownedDirs.toReversed(),
+    ctx.cwd,
+    new Set(wouldRemove)
+  );
   actions.push(...owned.actions);
   wouldRemove.push(...owned.removed);
   if (full) {
-    const removable = Object.entries(schema.managedFiles).filter(([, definition]) => definition.configKey === void 0).map(([filePath]) => filePath);
-    const managed = planExistingFilesRemoval(removable, ctx.cwd);
+    const managed = planConditionalManagedRemoval(schema.managedFiles, ctx, true);
     actions.push(...managed.actions);
     wouldRemove.push(...managed.removed);
   } else {
@@ -496,7 +522,12 @@ function computeUninstallPlan(schema, ctx, full) {
     actions.push(...conditional.actions);
     wouldRemove.push(...conditional.removed);
   }
-  const packagesToRemove = full ? computePackagesToRemove(schema, ctx.projectType, ctx.developmentDeps) : [];
+  let packagesToRemove = [];
+  if (full) {
+    packagesToRemove = computePackagesToRemove(schema, ctx.projectType, ctx.developmentDeps);
+  } else if (Object.hasOwn(ctx.developmentDeps, "safeword")) {
+    packagesToRemove = ["safeword"];
+  }
   return {
     actions,
     wouldCreate: dynamicChanges.created,
@@ -791,6 +822,9 @@ function executeJsonUnmerge(cwd, path, definition, ctx) {
 function rerenderBlockLines(definition) {
   return definition.content.split("\n").filter((line) => line !== "" && !line.includes(definition.marker));
 }
+function isOwnedRerenderLine(line, expectedLine, definition) {
+  return line === expectedLine || expectedLine !== void 0 && definition.rerenderOwnedLinePattern?.test(line) === true;
+}
 function stripRerenderBlock(content, definition) {
   const lines = content.split("\n");
   const startIndex = lines.findIndex((line) => line.includes(definition.marker));
@@ -798,7 +832,10 @@ function stripRerenderBlock(content, definition) {
   const blockLines = rerenderBlockLines(definition);
   let endIndex = startIndex;
   let expected = 0;
-  while (endIndex + 1 < lines.length && expected < blockLines.length && lines[endIndex + 1] === blockLines[expected]) {
+  while (endIndex + 1 < lines.length) {
+    const nextLine = lines[endIndex + 1] ?? "";
+    const expectedLine = blockLines[expected];
+    if (!isOwnedRerenderLine(nextLine, expectedLine, definition)) break;
     endIndex += 1;
     expected += 1;
   }
@@ -806,6 +843,15 @@ function stripRerenderBlock(content, definition) {
   lines.splice(blockStart, endIndex - blockStart + 1);
   return lines.join("\n").replaceAll(/\n{3,}/g, "\n\n");
 }
+function stripRerenderBlocks(content, definition) {
+  let stripped = content;
+  while (stripped.includes(definition.marker)) {
+    const next = stripRerenderBlock(stripped, definition);
+    if (next === stripped) break;
+    stripped = next;
+  }
+  return stripped;
+}
 function executeTextPatch(cwd, path, definition) {
   if (definition.rerender && definition.operation !== "append") {
     throw new Error(`rerender text patch ${path} must use operation: 'append'`);
@@ -820,11 +866,13 @@ function computePatchedContent(original, definition) {
   if (content.includes(definition.marker)) {
     return healAlreadyPatchedContent(content, definition);
   }
-  return definition.operation === "prepend" ? definition.content + content : content + definition.content;
+  if (definition.operation === "prepend") return definition.content + content;
+  const separator = content !== "" && !content.endsWith("\n") && !definition.content.startsWith("\n") ? "\n" : "";
+  return content + separator + definition.content;
 }
 function healAlreadyPatchedContent(content, definition) {
   if (definition.rerender && !content.includes(definition.content)) {
-    return stripRerenderBlock(content, definition) + definition.content;
+    return stripRerenderBlocks(content, definition) + definition.content;
   }
   let healed = content;
   if (healed.includes("\n\n---#")) {
@@ -834,8 +882,8 @@ function healAlreadyPatchedContent(content, definition) {
 }
 function computeUnpatchedContent(content, definition) {
   let unpatched = removeExactTextPatchContent(content, definition);
-  if (unpatched === content && definition.rerender) {
-    unpatched = stripRerenderBlock(content, definition);
+  if (definition.rerender && unpatched.includes(definition.marker)) {
+    unpatched = stripRerenderBlocks(unpatched, definition);
   }
   if (unpatched === content && content.startsWith(definition.marker)) {
     const separatorIndex = content.indexOf("\n---");
@@ -848,7 +896,10 @@ function computeUnpatchedContent(content, definition) {
     unpatched = content.split("\n").slice(1).join("\n").replace(/^\n+/, "");
     unpatched = stripLeadingSafewordSeparator(unpatched);
   }
-  return unpatched;
+  return appendReplacementAfterUnpatch(content, unpatched, definition.replacementAfterUnpatch);
+}
+function appendReplacementAfterUnpatch(original, unpatched, replacement) {
+  return unpatched === original || replacement === void 0 ? unpatched : unpatched + replacement;
 }
 function executeTextUnpatch(cwd, path, definition) {
   const fullPath = nodePath.join(cwd, path);
@@ -881,7 +932,7 @@ function shouldRemoveTextPatchTarget(content, definition) {
 import {
   existsSync,
   lstatSync as lstatSync2,
-  readdirSync,
+  readdirSync as readdirSync2,
   readFileSync,
   realpathSync,
   writeFileSync
@@ -1008,7 +1059,7 @@ function expandMemberPattern(cwd, pattern) {
     const fullPath = nodePath2.join(cwd, baseDirectory);
     if (!existsSync(fullPath)) return [];
     try {
-      const entries = readdirSync(fullPath, { withFileTypes: true });
+      const entries = readdirSync2(fullPath, { withFileTypes: true });
       return entries.filter((entry) => {
         if (!entry.isDirectory()) return false;
         const cargoPath = nodePath2.join(fullPath, entry.name, "Cargo.toml");
@@ -1125,7 +1176,7 @@ var pythonPack = {
   name: "Python",
   extensions: [".py", ".pyi"],
   detect(cwd) {
-    return existsInTree(cwd, "pyproject.toml") || existsInTree(cwd, "requirements.txt");
+    return existsInTree(cwd, "pyproject.toml") || existsInTree(cwd, "requirements.txt") || existsInTree(cwd, "Pipfile") || existsInTree(cwd, "setup.py") || existsInTree(cwd, "setup.cfg");
   },
   setup(_cwd, _ctx) {
     return setupPythonTooling();
@@ -1146,7 +1197,7 @@ var rustPack = {
 };
 
 // src/packs/sql/index.ts
-import { existsSync as existsSync2, readdirSync as readdirSync2 } from "fs";
+import { existsSync as existsSync2, readdirSync as readdirSync3 } from "fs";
 import nodePath4 from "path";
 var TIER1_MARKERS = [
   "dbt_project.yml",
@@ -1164,13 +1215,13 @@ var TIER2_DIRECTORIES = ["prisma/migrations", "drizzle", "db/migrations"];
 function directoryHasSqlFiles(directory) {
   if (!existsSync2(directory)) return false;
   try {
-    const entries = readdirSync2(directory, { withFileTypes: true });
+    const entries = readdirSync3(directory, { withFileTypes: true });
     if (entries.some((entry) => entry.isFile() && entry.name.endsWith(".sql"))) return true;
     for (const entry of entries) {
       if (!entry.isDirectory()) {
         continue;
       }
-      const subEntries = readdirSync2(nodePath4.join(directory, entry.name));
+      const subEntries = readdirSync3(nodePath4.join(directory, entry.name));
       if (subEntries.some((f) => f.endsWith(".sql"))) return true;
     }
     return false;
@@ -1305,7 +1356,7 @@ function detectHookManagerWorld(cwd, allDependencies) {
 }
 
 // src/utils/project-detector.ts
-import { existsSync as existsSync3, readdirSync as readdirSync3, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync3, readdirSync as readdirSync4, readFileSync as readFileSync2 } from "fs";
 import nodePath8 from "path";
 
 // src/utils/cucumber-template-revisions.ts
@@ -1381,7 +1432,7 @@ function hasShellScripts(cwd, maxDepth = 4) {
   function scan(dir, depth) {
     if (depth > maxDepth) return false;
     try {
-      const entries = readdirSync3(dir, { withFileTypes: true });
+      const entries = readdirSync4(dir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isFile() && entry.name.endsWith(".sh")) {
           return true;
@@ -1508,7 +1559,7 @@ function isJsSourceFile(name, depth) {
 function scanForJsSource(directory, depth, maxDepth) {
   let entries;
   try {
-    entries = readdirSync3(directory, { withFileTypes: true });
+    entries = readdirSync4(directory, { withFileTypes: true });
   } catch {
     return false;
   }
@@ -1559,7 +1610,7 @@ function findCucumberEvidenceInPackage(cwd, packagePath) {
 function findCucumberEvidenceUnderRoot(cwd, root) {
   let entries;
   try {
-    entries = readdirSync3(nodePath8.join(cwd, root), { withFileTypes: true });
+    entries = readdirSync4(nodePath8.join(cwd, root), { withFileTypes: true });
   } catch {
     return void 0;
   }
@@ -1646,4 +1697,4 @@ export {
   LEFTHOOK_CONFIGS,
   createProjectContext
 };
-//# sourceMappingURL=chunk-NOTBZCKG.js.map
+//# sourceMappingURL=chunk-2XR7J5WL.js.map