atris 3.68.8 → 3.68.9

package/commands/sync.js

@@ -83,6 +83,23 @@ function ensureRealDirectory(dir) {
   fs.mkdirSync(dir, { recursive: true });
 }
 
+// A hook script the project already has is never replaced. Projects harden
+// their hooks (nonce checks, queues, proof before pop); a sync must not
+// downgrade them to the shipped copy.
+function isProtectedHook(destPath) {
+  return path.basename(path.dirname(destPath)) === 'hooks' && fs.existsSync(destPath);
+}
+
+// A member retired to team/_archived/<name>-<date>/ must never come back.
+function isArchivedMember(teamDir, name) {
+  const archiveDir = path.join(teamDir, '_archived');
+  try {
+    return fs.readdirSync(archiveDir).some(entry => entry === name || (entry.startsWith(`${name}-`) && /^\d{4}-\d{2}-\d{2}$/.test(entry.slice(name.length + 1))));
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Sync the canonical skill set from atris-cli/atris/skills/* into a
  * workspace's atris/skills/* (plus ensure .claude/skills/ symlinks).
@@ -128,7 +145,9 @@ function syncPackageSkills(targetAtrisDir, opts = {}) {
         } else {
           const srcContent = fs.readFileSync(srcPath, 'utf8');
           const destContent = fs.existsSync(destPath) ? fs.readFileSync(destPath, 'utf8') : '';
-          if (srcContent !== destContent) {
+          if (srcContent !== destContent && isProtectedHook(destPath)) {
+            if (verbose) console.log(`- Kept atris/skills/${skillName}/${relPath} (differs from shipped hook, not replaced)`);
+          } else if (srcContent !== destContent) {
             if (!dryRun) {
               fs.writeFileSync(destPath, srcContent);
               if (entry.endsWith('.sh')) fs.chmodSync(destPath, 0o755);
@@ -348,6 +367,12 @@ function syncWorkspaceTemplate(targetRoot, bizMeta, options = {}) {
     try { templateContent = fs.readFileSync(templatePath, 'utf-8'); } catch { continue; }
     const finalContent = _substituteParams(templateContent, params);
 
+    const memberMatch = targetRelPath.split(path.sep).join('/').match(/^team\/([^/_][^/]*)\//);
+    if (memberMatch && isArchivedMember(path.join(targetAtrisDir, 'team'), memberMatch[1])) {
+      skipped++;
+      continue;
+    }
+
     if (!fs.existsSync(targetPath)) {
       addedList.push(targetRelPath); added++;
       if (!dryRun) {
@@ -358,7 +383,7 @@ function syncWorkspaceTemplate(targetRoot, bizMeta, options = {}) {
       const existing = fs.readFileSync(targetPath, 'utf-8');
       if (existing === finalContent) {
         skipped++;
-      } else if (force) {
+      } else if (force && !memberMatch) {
         updatedList.push(targetRelPath); updated++;
         if (!dryRun) fs.writeFileSync(targetPath, finalContent);
       } else {
@@ -565,6 +590,17 @@ function syncAtris(options = {}) {
       return;
     }
 
+    // Team members belong to the project. Update never adds a member (init
+    // does that, and a missing member may have been retired to
+    // team/_archived/) and never replaces one the project has changed.
+    if (target.startsWith('team/')) {
+      if (fs.existsSync(targetFile)) {
+        console.log(`- Kept ${target} (newer template exists in the package, yours not replaced)`);
+      }
+      skipped++;
+      return;
+    }
+
     if (!dryRun) {
       fs.mkdirSync(path.dirname(targetFile), { recursive: true });
       fs.copyFileSync(sourceFile, targetFile);
@@ -728,7 +764,9 @@ function syncRecursiveCount(src, dest, label, silent) {
     } else {
       const srcBuf = fs.readFileSync(srcPath);
       const destBuf = fs.existsSync(destPath) ? fs.readFileSync(destPath) : Buffer.alloc(0);
-      if (!srcBuf.equals(destBuf)) {
+      if (!srcBuf.equals(destBuf) && isProtectedHook(destPath)) {
+        if (!silent) console.log(`- Kept ${label}/${entry} (differs from shipped hook, not replaced)`);
+      } else if (!srcBuf.equals(destBuf)) {
         fs.writeFileSync(destPath, srcBuf);
         if (entry.endsWith('.sh')) {
           fs.chmodSync(destPath, 0o755);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.68.8",
+  "version": "3.68.9",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof.",
   "main": "bin/atris.js",
   "bin": {