@alessandroraffa/tangyr 3.0.2 → 3.0.4

package/dist/index.js

@@ -17329,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"),
@@ -17524,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";
@@ -28712,6 +28767,9 @@ function syncMcp2(config, sourceRoot, paths, options, lossReport, logger, provid
   };
 }
 function writeCompiledArtifact(component, destination, content, expectedHash, config, sourceRoot, options, logger, manifest, scopePath) {
+  if (!options.force && isCompiledCurrent(destination, content, expectedHash)) {
+    return { component, status: "skipped-current", path: destination };
+  }
   const artifactClass = classifyArtifact(destination, config, sourceRoot);
   if (artifactClass === "managed-compiled" && !options.force && isCompiledCurrent(destination, content, expectedHash)) {
     return { component, status: "skipped-current", path: destination };
@@ -28791,11 +28849,9 @@ function handleConflict2(destination, config, options, logger, manifest, scopePa
   fs39.rmSync(destination, { recursive: true, force: true });
   return true;
 }
-function isCompiledCurrent(destination, expectedContent, expectedHash) {
+function isCompiledCurrent(destination, expectedContent, _expectedHash) {
   try {
-    const current = fs39.readFileSync(destination, "utf8");
-    const marker = extractProvenanceMarker(current);
-    return expectedHash ? marker?.hash === expectedHash && marker.target === "codex" && current === expectedContent : current === expectedContent;
+    return fs39.readFileSync(destination, "utf8") === expectedContent;
   } catch {
     return false;
   }
@@ -29334,6 +29390,9 @@ function syncMcp3(config, sourceRoot, paths, options, lossReport, logger) {
   );
 }
 function writeCompiledArtifact2(component, destination, content, expectedHash, config, sourceRoot, options, logger, manifest, scopePath) {
+  if (!options.force && isCompiledCurrent2(destination, content, expectedHash)) {
+    return { component, status: "skipped-current", path: destination };
+  }
   const artifactClass = classifyArtifact(destination, config, sourceRoot);
   if (artifactClass === "managed-compiled" && !options.force && isCompiledCurrent2(destination, content, expectedHash)) {
     return { component, status: "skipped-current", path: destination };
@@ -29351,11 +29410,9 @@ function writeCompiledArtifact2(component, destination, content, expectedHash, c
   fs40.writeFileSync(destination, content);
   return { component, status: "success", path: destination };
 }
-function isCompiledCurrent2(destination, expectedContent, expectedHash) {
+function isCompiledCurrent2(destination, expectedContent, _expectedHash) {
   try {
-    const current = fs40.readFileSync(destination, "utf8");
-    const marker = extractProvenanceMarker(current);
-    return expectedHash ? marker?.hash === expectedHash && marker.target === "copilot" && current === expectedContent : current === expectedContent;
+    return fs40.readFileSync(destination, "utf8") === expectedContent;
   } catch {
     return false;
   }
@@ -29984,6 +30041,9 @@ function syncProviderPin(config, sourceRoot, lossReport) {
   }
 }
 function writeCompiledArtifact3(component, destination, content, expectedHash, config, sourceRoot, options, logger, manifest, scopePath) {
+  if (!options.force && isCompiledCurrent3(destination, content, expectedHash)) {
+    return { component, status: "skipped-current", path: destination };
+  }
   const artifactClass = classifyArtifact(destination, config, sourceRoot);
   if (artifactClass === "managed-compiled" && !options.force && isCompiledCurrent3(destination, content, expectedHash)) {
     return { component, status: "skipped-current", path: destination };
@@ -30034,11 +30094,9 @@ function handleConflict4(destination, config, options, logger, manifest, scopePa
   fs41.rmSync(destination, { recursive: true, force: true });
   return true;
 }
-function isCompiledCurrent3(destination, expectedContent, expectedHash) {
+function isCompiledCurrent3(destination, expectedContent, _expectedHash) {
   try {
-    const current = fs41.readFileSync(destination, "utf8");
-    const marker = extractProvenanceMarker(current);
-    return expectedHash ? marker?.hash === expectedHash && marker.target === "cursor" && current === expectedContent : current === expectedContent;
+    return fs41.readFileSync(destination, "utf8") === expectedContent;
   } catch {
     return false;
   }
@@ -30474,6 +30532,9 @@ function syncProviderAndModel(config, sourceRoot, lossReport) {
   }
 }
 function writeCompiledArtifact4(component, destination, content, expectedHash, config, sourceRoot, options, logger, manifest, scopePath) {
+  if (!options.force && isCompiledCurrent4(destination, content, expectedHash)) {
+    return { component, status: "skipped-current", path: destination };
+  }
   const artifactClass = classifyArtifact(destination, config, sourceRoot);
   if (artifactClass === "managed-compiled" && !options.force && isCompiledCurrent4(destination, content, expectedHash)) {
     return { component, status: "skipped-current", path: destination };
@@ -30524,11 +30585,9 @@ function handleConflict5(destination, config, options, logger, manifest, scopePa
   fs42.rmSync(destination, { recursive: true, force: true });
   return true;
 }
-function isCompiledCurrent4(destination, expectedContent, expectedHash) {
+function isCompiledCurrent4(destination, expectedContent, _expectedHash) {
   try {
-    const current = fs42.readFileSync(destination, "utf8");
-    const marker = extractProvenanceMarker(current);
-    return expectedHash ? marker?.hash === expectedHash && marker.target === "cline" && current === expectedContent : current === expectedContent;
+    return fs42.readFileSync(destination, "utf8") === expectedContent;
   } catch {
     return false;
   }
@@ -30982,6 +31041,9 @@ function syncConfigDoc(paths, mcpEntries, _lossReport, permissionMap, mappings)
 `);
 }
 function writeCompiledArtifact5(component, destination, content, expectedHash, config, sourceRoot, options, logger, manifest, scopePath) {
+  if (!options.force && isCompiledCurrent5(destination, content, expectedHash)) {
+    return { component, status: "skipped-current", path: destination };
+  }
   const artifactClass = classifyArtifact(destination, config, sourceRoot);
   if (artifactClass === "managed-compiled" && !options.force && isCompiledCurrent5(destination, content, expectedHash)) {
     return { component, status: "skipped-current", path: destination };
@@ -31032,11 +31094,9 @@ function handleConflict6(destination, config, options, logger, manifest, scopePa
   fs43.rmSync(destination, { recursive: true, force: true });
   return true;
 }
-function isCompiledCurrent5(destination, expectedContent, expectedHash) {
+function isCompiledCurrent5(destination, expectedContent, _expectedHash) {
   try {
-    const current = fs43.readFileSync(destination, "utf8");
-    const marker = extractProvenanceMarker(current);
-    return expectedHash ? marker?.hash === expectedHash && marker.target === "opencode" && current === expectedContent : current === expectedContent;
+    return fs43.readFileSync(destination, "utf8") === expectedContent;
   } catch {
     return false;
   }

package/package.json

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