@link-assistant/hive-mind 1.72.6 → 1.72.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @link-assistant/hive-mind
 
+## 1.72.7
+
+### Patch Changes
+
+- 61e2935: Fix "Failed to add .gitkeep" abort during auto-PR creation when the target repository's `.gitignore` matches the seed placeholder (issue #1825). Placeholder staging now routes through `addPlaceholderFileToGit`, which detects the ignored path with `git check-ignore` and retries with `git add -f`. Because the placeholder is created by the solver to seed the initial commit and removed once the task completes, force-adding it is safe.
+
 ## 1.72.6
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.72.6",
+  "version": "1.72.7",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/solve.auto-pr-placeholder.lib.mjs

@@ -0,0 +1,70 @@
+/**
+ * Placeholder-staging helper for auto PR creation.
+ *
+ * Extracted from solve.auto-pr.lib.mjs (issue #1825) to keep that module under
+ * the max-lines lint budget.
+ */
+
+/**
+ * Stage the temporary placeholder file (CLAUDE.md or .gitkeep) used to seed the
+ * initial auto-PR commit.
+ *
+ * The solver writes this placeholder deliberately to create the first commit so
+ * a draft PR can be opened, and removes it again once the task completes (see
+ * cleanupClaudeFile in solve.results.lib.mjs). When the target repository's
+ * .gitignore matches the placeholder — issue #1825: e.g. rumaster/tg-games
+ * ignores `.gitkeep` — a plain `git add <file>` exits non-zero with
+ * "The following paths are ignored by one of your .gitignore files", which
+ * previously aborted PR creation with a fatal "Failed to add .gitkeep".
+ *
+ * Because the placeholder belongs to us and is short-lived, we confirm the path
+ * is actually ignored with `git check-ignore` and then retry with
+ * `git add -f`. Force-adding only happens for the ignored-placeholder case;
+ * any other add failure is surfaced unchanged so genuine errors are not masked.
+ *
+ * @param {object} params
+ * @param {Function} params.$ - command-stream tagged-template runner.
+ * @param {string} params.tempDir - repository working directory.
+ * @param {string} params.fileName - placeholder file name (CLAUDE.md or .gitkeep).
+ * @param {Function} [params.log] - async logger.
+ * @param {Function} [params.formatAligned] - log line formatter.
+ * @param {boolean} [params.verbose] - emit verbose diagnostics.
+ * @returns {Promise<{code: number, forced: boolean, ignored: boolean, stderr: string}>}
+ */
+export async function addPlaceholderFileToGit({ $, tempDir, fileName, log, formatAligned, verbose = false }) {
+  // Run silently: `git add` is quiet on success and only emits the noisy
+  // "paths are ignored ... Use -f" hint on failure, which we capture in
+  // `stderr` and re-surface from the caller only when the failure is genuine.
+  const addResult = await $({ cwd: tempDir, silent: true })`git add ${fileName}`;
+  if (addResult.code === 0) {
+    return { code: 0, forced: false, ignored: false, stderr: '' };
+  }
+
+  const stderr = addResult.stderr ? addResult.stderr.toString() : '';
+
+  // Determine whether the add failed because the placeholder is git-ignored.
+  // `git check-ignore` exits 0 when the path matches a .gitignore rule.
+  const checkIgnore = await $({ cwd: tempDir, silent: true })`git check-ignore ${fileName}`;
+  const ignored = checkIgnore.code === 0;
+
+  if (!ignored) {
+    // The failure was not caused by .gitignore — surface the original error so
+    // genuine problems (permissions, corrupt index, ...) are not masked.
+    return { code: addResult.code, forced: false, ignored: false, stderr };
+  }
+
+  if (log && formatAligned) {
+    await log(formatAligned('ℹ️', `${fileName} is ignored:`, 'Force-adding placeholder (git add -f)'));
+  }
+  if (verbose && log) {
+    await log(`   ${fileName} matched a .gitignore rule; retrying with: git add -f ${fileName}`, { verbose: true });
+  }
+
+  const forcedResult = await $({ cwd: tempDir, silent: true })`git add -f ${fileName}`;
+  return {
+    code: forcedResult.code,
+    forced: true,
+    ignored: true,
+    stderr: forcedResult.stderr ? forcedResult.stderr.toString() : '',
+  };
+}

package/src/solve.auto-pr.lib.mjs

@@ -8,6 +8,7 @@ import { handleRejectedPushForAutoPr, synchronizeExistingIssueBranchBeforeAutoPr
 import { emitForkAwareDiagnostic } from './solve.auto-pr-fork-diagnostic.lib.mjs';
 
 import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry, execGhWithRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller. Issue #1756: execGhWithRetry retries on transient 5xx (504) too.
+import { addPlaceholderFileToGit } from './solve.auto-pr-placeholder.lib.mjs'; // Issue #1825: force-adds the seed placeholder when the target repo gitignores it.
 
 export async function handleAutoPrCreation({ argv, tempDir, branchName, issueNumber, owner, repo, defaultBranch, forkedRepo, isContinueMode, prNumber, log, formatAligned, $, reportError, path, fs }) {
   // Skip auto-PR creation if:
@@ -166,12 +167,13 @@ Proceed.
     // Add and commit the file
     await log(formatAligned('📦', 'Adding file:', 'To git staging'));
 
-    // Use explicit cwd option for better reliability
-    const addResult = await $({ cwd: tempDir })`git add ${fileName}`;
+    // Issue #1825: force-adds the placeholder when the target repo gitignores
+    // it (e.g. ignores `.gitkeep`), so PR creation is no longer aborted.
+    const addResult = await addPlaceholderFileToGit({ $, tempDir, fileName, log, formatAligned, verbose: argv.verbose });
 
     if (addResult.code !== 0) {
       await log(`❌ Failed to add ${fileName}`, { level: 'error' });
-      await log(`   Error: ${addResult.stderr ? addResult.stderr.toString() : 'Unknown error'}`, { level: 'error' });
+      await log(`   Error: ${addResult.stderr || 'Unknown error'}`, { level: 'error' });
       throw new Error(`Failed to add ${fileName}`);
     }
 
@@ -212,12 +214,12 @@ Proceed.
           await fs.writeFile(gitkeepPath, gitkeepContent);
           await log(formatAligned('✅', 'Created:', '.gitkeep file'));
 
-          // Try to add .gitkeep
-          const gitkeepAddResult = await $({ cwd: tempDir })`git add .gitkeep`;
+          // Try to add .gitkeep (force-added if it too is gitignored — issue #1825)
+          const gitkeepAddResult = await addPlaceholderFileToGit({ $, tempDir, fileName: '.gitkeep', log, formatAligned, verbose: argv.verbose });
 
           if (gitkeepAddResult.code !== 0) {
             await log('❌ Failed to add .gitkeep', { level: 'error' });
-            await log(`   Error: ${gitkeepAddResult.stderr ? gitkeepAddResult.stderr.toString() : 'Unknown error'}`, {
+            await log(`   Error: ${gitkeepAddResult.stderr || 'Unknown error'}`, {
               level: 'error',
             });
             throw new Error('Failed to add .gitkeep');