harness-everything 0.2.0 → 0.2.2

package/scripts/lib/gitignore.js

@@ -1,58 +1,80 @@
-const fs = require('fs');
-const path = require('path');
-
-function ensureWorkspaceGitignorePatterns(wsRoot, patterns) {
-  const gitignorePath = path.join(wsRoot, '.gitignore');
-  try {
-    let content = '';
-    if (fs.existsSync(gitignorePath)) {
-      content = fs.readFileSync(gitignorePath, 'utf8');
-    }
-
-    const lines = content.split(/\r?\n/);
-    const addedPatterns = [];
-
-    for (const pattern of patterns) {
-      const isIgnored = lines.some(line => {
-        const trimmed = line.trim();
-        return trimmed === pattern ||
-               trimmed === pattern.slice(0, -1) ||
-               (pattern === '.claude/harness-state/' && (trimmed === '.claude/' || trimmed === '.claude'));
-      });
-
-      if (!isIgnored) {
-        addedPatterns.push(pattern);
-      }
-    }
-
-    if (addedPatterns.length > 0) {
-      const separator = content.length === 0 || content.endsWith('\n') ? '' : '\n';
-      const toAppend = addedPatterns.join('\n') + '\n';
-      fs.appendFileSync(gitignorePath, `${separator}${toAppend}`, 'utf8');
-      console.log(`  ✅ Added auto-generated directories to .gitignore: ${addedPatterns.join(', ')}`);
-    }
-  } catch (err) {
-    console.warn(`  ⚠️ Failed to update .gitignore: ${err.message}`);
-  }
-}
-
-// Only ever deletes a directory that is genuinely empty, and never recurses
-// past one of `stopDirs` (workspace root / user home / filesystem root) - so
-// this can only ever tidy up directories Harness itself just emptied out,
-// never reach into a parent that still holds unrelated content.
-function cleanEmptyDirs(dir, stopDirs) {
-  if (!fs.existsSync(dir)) return;
-  if ((stopDirs || []).includes(dir) || dir === path.parse(dir).root) return;
-  try {
-    const files = fs.readdirSync(dir);
-    if (files.length === 0) {
-      fs.rmdirSync(dir);
-      console.log(`  ✅ Cleaned up empty directory: ${dir}`);
-      cleanEmptyDirs(path.dirname(dir), stopDirs);
-    }
-  } catch (e) {
-    // ignore
-  }
-}
-
-module.exports = { ensureWorkspaceGitignorePatterns, cleanEmptyDirs };
+const fs = require('fs');
+const path = require('path');
+
+function ensureWorkspaceGitignorePatterns(wsRoot, patterns) {
+  const gitignorePath = path.join(wsRoot, '.gitignore');
+  try {
+    let content = '';
+    if (fs.existsSync(gitignorePath)) {
+      content = fs.readFileSync(gitignorePath, 'utf8');
+    }
+
+    const lines = content.split(/\r?\n/);
+    const addedPatterns = [];
+
+    for (const pattern of patterns) {
+      const isIgnored = lines.some(line => {
+        const trimmed = line.trim();
+        return trimmed === pattern ||
+               trimmed === pattern.slice(0, -1) ||
+               (pattern === '.claude/harness-state/' && (trimmed === '.claude/' || trimmed === '.claude'));
+      });
+
+      if (!isIgnored) {
+        addedPatterns.push(pattern);
+      }
+    }
+
+    // Same read-then-append shape as ensureHarnessStateIgnored() in
+    // hooks/scripts/lib/harness-state.js, which runs once per hook
+    // invocation and can race across concurrent processes to leave an
+    // exact-duplicate line behind - see the comment there. Collapsing
+    // duplicates here too keeps both writers self-healing the same file.
+    const seen = new Set();
+    let sawDuplicate = false;
+    const dedupedLines = lines.filter(line => {
+      const trimmed = line.trim();
+      if (trimmed === '' || trimmed.startsWith('#')) return true;
+      if (seen.has(trimmed)) {
+        sawDuplicate = true;
+        return false;
+      }
+      seen.add(trimmed);
+      return true;
+    });
+
+    if (addedPatterns.length > 0 || sawDuplicate) {
+      while (dedupedLines.length > 0 && dedupedLines[dedupedLines.length - 1] === '') {
+        dedupedLines.pop();
+      }
+      const finalLines = dedupedLines.concat(addedPatterns);
+      fs.writeFileSync(gitignorePath, finalLines.join('\n') + '\n', 'utf8');
+      if (addedPatterns.length > 0) {
+        console.log(`  ✅ Added auto-generated directories to .gitignore: ${addedPatterns.join(', ')}`);
+      }
+    }
+  } catch (err) {
+    console.warn(`  ⚠️ Failed to update .gitignore: ${err.message}`);
+  }
+}
+
+// Only ever deletes a directory that is genuinely empty, and never recurses
+// past one of `stopDirs` (workspace root / user home / filesystem root) - so
+// this can only ever tidy up directories Harness itself just emptied out,
+// never reach into a parent that still holds unrelated content.
+function cleanEmptyDirs(dir, stopDirs) {
+  if (!fs.existsSync(dir)) return;
+  if ((stopDirs || []).includes(dir) || dir === path.parse(dir).root) return;
+  try {
+    const files = fs.readdirSync(dir);
+    if (files.length === 0) {
+      fs.rmdirSync(dir);
+      console.log(`  ✅ Cleaned up empty directory: ${dir}`);
+      cleanEmptyDirs(path.dirname(dir), stopDirs);
+    }
+  } catch (e) {
+    // ignore
+  }
+}
+
+module.exports = { ensureWorkspaceGitignorePatterns, cleanEmptyDirs };

package/scripts/lib/skills.js

@@ -110,6 +110,7 @@ function getInstalledSkills(workspaceRoot, userHome) {
     { home: path.join(workspaceRoot, '.github'), scope: 'local (Copilot)' },
     { home: path.join(workspaceRoot, '.codex'), scope: 'local (Codex)' },
     { home: path.join(workspaceRoot, '.continue'), scope: 'local (Continue)' },
+    { home: path.join(userHome, '.claude'), scope: 'global (Claude)' },
     { home: globalAgentsDir, scope: 'global' },
   ];
   for (const { home, scope } of manifestHomes) {
@@ -124,6 +125,7 @@ function getInstalledSkills(workspaceRoot, userHome) {
   // author marker - never a blind directory listing.
   const legacyDirs = [
     { path: path.join(workspaceRoot, '.harness', 'skills'), scope: 'local (legacy .harness)', manifestPath: manifest.getManifestPath(path.join(workspaceRoot, '.claude')) },
+    { path: path.join(workspaceRoot, '.claude', 'harness-everything', 'skills'), scope: 'local (Claude legacy erroneous path)', manifestPath: manifest.getManifestPath(path.join(workspaceRoot, '.claude')) },
     { path: path.join(workspaceRoot, '.cursor', 'skills'), scope: 'local (Cursor)', manifestPath: manifest.getManifestPath(path.join(workspaceRoot, '.cursor')) },
     { path: path.join(workspaceRoot, '.github', 'skills'), scope: 'local (Copilot)', manifestPath: manifest.getManifestPath(path.join(workspaceRoot, '.github')) },
     { path: path.join(workspaceRoot, '.codex', 'skills'), scope: 'local (Codex)', manifestPath: manifest.getManifestPath(path.join(workspaceRoot, '.codex')) },