@alessandroraffa/tangyr 3.0.1 → 3.0.3

package/dist/index.js

@@ -16114,6 +16114,12 @@ function addManagedLink(manifest, link) {
     manifest.managedLinks.push(link);
   }
 }
+function parkConflictingPath(destination, scopePath) {
+  const backupPath = resolveBackupPath(destination, scopePath);
+  fs6.mkdirSync(path6.dirname(backupPath), { recursive: true });
+  fs6.renameSync(destination, backupPath);
+  return backupPath;
+}
 
 // src/core/exit.ts
 var EXIT_FAILURE = 1;
@@ -17323,6 +17329,18 @@ function collectAssessFindings(scope, projectRoot, toolFilter, assessOptions) {
     scope,
     scope === "project" ? projectRoot ?? process.cwd() : void 0
   );
+  const recorded = recordedArtifactPaths(scopePath);
+  for (const finding of findings) {
+    if (finding.classification !== "conflicting") {
+      continue;
+    }
+    const resolved = path12.resolve(finding.path);
+    const ours = recorded.has(resolved) || finding.type === "directory" && holdsOnlyRecorded(resolved, recorded);
+    if (ours) {
+      finding.classification = "compatible";
+      finding.description = `${finding.description} (recorded by this installation)`;
+    }
+  }
   if (fs11.existsSync(path12.join(scopePath, "manifest.json"))) {
     findings.push({
       path: path12.join(scopePath, "manifest.json"),
@@ -17518,6 +17536,49 @@ function resolveKitPath(config, configDir) {
   });
   return resolution?.kit.path ?? null;
 }
+function recordedArtifactPaths(scopePath) {
+  const paths = /* @__PURE__ */ new Set();
+  try {
+    const manifest = readManifest(scopePath);
+    if (!manifest) {
+      return paths;
+    }
+    for (const artifact of manifest.artifacts) {
+      if (artifact.path) {
+        paths.add(path12.resolve(artifact.path));
+      }
+    }
+    for (const link of manifest.managedLinks) {
+      paths.add(path12.resolve(link.path));
+    }
+  } catch {
+  }
+  return paths;
+}
+function holdsOnlyRecorded(dir, recorded) {
+  let entries;
+  try {
+    entries = fs11.readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return false;
+  }
+  if (entries.length === 0) {
+    return [...recorded].some((p) => p.startsWith(`${dir}${path12.sep}`));
+  }
+  for (const entry of entries) {
+    const full = path12.join(dir, entry.name);
+    if (entry.isDirectory() && !entry.isSymbolicLink()) {
+      if (!holdsOnlyRecorded(full, recorded)) {
+        return false;
+      }
+      continue;
+    }
+    if (!recorded.has(full)) {
+      return false;
+    }
+  }
+  return true;
+}
 
 // src/commands/auth.ts
 import fs14 from "fs";
@@ -26858,7 +26919,16 @@ function handleConflict(destination, config, options, logger, manifest, scopePat
       writeManifest(scopePath, manifest);
       fs37.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs37.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
@@ -28760,7 +28830,16 @@ function handleConflict2(destination, config, options, logger, manifest, scopePa
       writeManifest(scopePath, manifest);
       fs39.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs39.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
@@ -29353,7 +29432,16 @@ function handleConflict3(destination, config, options, logger, manifest, scopePa
       writeManifest(scopePath, manifest);
       fs40.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs40.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
@@ -29985,7 +30073,16 @@ function handleConflict4(destination, config, options, logger, manifest, scopePa
       writeManifest(scopePath, manifest);
       fs41.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs41.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
@@ -30466,7 +30563,16 @@ function handleConflict5(destination, config, options, logger, manifest, scopePa
       writeManifest(scopePath, manifest);
       fs42.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs42.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
@@ -30965,7 +31071,16 @@ function handleConflict6(destination, config, options, logger, manifest, scopePa
       writeManifest(scopePath, manifest);
       fs43.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs43.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alessandroraffa/tangyr",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "CLI for the Tangyr discipline — install and manage operating kits for AI coding tools",
   "license": "MIT",
   "engines": {