@tarcisiopgs/lisa 0.9.4 → 0.9.6

package/dist/index.js

@@ -531,6 +531,16 @@ This project uses **${testRunner}** as its test runner.
 - Do NOT skip writing tests \u2014 the PR will be blocked if tests are missing or failing.
 `;
 }
+function buildPreCommitHookInstructions() {
+  return `
+**Pre-commit hooks:**
+If \`git commit\` fails due to a pre-commit hook (e.g. husky), read the error output carefully and fix the underlying issue:
+- Linter/formatter failures \u2192 run the project's lint/format commands, then re-stage and retry the commit.
+- Code generation errors (e.g. stale Prisma client) \u2192 run the required generation command (e.g. \`npx prisma generate\`), then re-stage and retry.
+- Type errors \u2192 fix the type issues in the source files, then re-stage and retry.
+Do NOT skip or bypass hooks (no \`--no-verify\`). Fix the root cause and retry.
+`;
+}
 function buildReadmeInstructions() {
   return `
 **README.md Evaluation:**
@@ -565,6 +575,7 @@ function buildWorktreeMultiRepoPrompt(issue, config2) {
     ].join("\n");
   }).join("\n\n");
   const readmeBlock = buildReadmeInstructions();
+  const hookBlock = buildPreCommitHookInstructions();
   const manifestPath = join(workspace, ".lisa-manifest.json");
   return `You are an autonomous implementation agent working in a multi-repository workspace.
 Your job is to determine the correct repository, create an English-named branch, implement the issue, commit, and write a manifest file.
@@ -610,7 +621,7 @@ ${repoBlock}
    - Follow the implementation instructions exactly
    - Verify each acceptance criteria (if present)
    - Respect any stack or technical constraints (if present)
-${readmeBlock}
+${readmeBlock}${hookBlock}
 5. **Validate**: Run the project's linter/typecheck/tests if available:
    - Check \`package.json\` for lint, typecheck, check, or test scripts.
    - Run whichever validation scripts exist (e.g., \`npm run lint\`, \`npm run typecheck\`, \`npm run test\`).
@@ -647,6 +658,7 @@ ${readmeBlock}
 function buildWorktreePrompt(issue, testRunner) {
   const testBlock = buildTestInstructions(testRunner ?? null);
   const readmeBlock = buildReadmeInstructions();
+  const hookBlock = buildPreCommitHookInstructions();
   return `You are an autonomous implementation agent. Your job is to implement a single
 issue, validate it, commit, and push the branch.
 
@@ -670,7 +682,7 @@ ${issue.description}
    - Follow the implementation instructions exactly
    - Verify each acceptance criteria (if present)
    - Respect any stack or technical constraints (if present)
-${testBlock}${readmeBlock}
+${testBlock}${readmeBlock}${hookBlock}
 2. **Validate**: Run the project's linter/typecheck/tests if available:
    - Check \`package.json\` (or equivalent) for lint, typecheck, check, or test scripts.
    - Run whichever validation scripts exist (e.g., \`npm run lint\`, \`npm run typecheck\`).
@@ -711,6 +723,7 @@ function buildBranchPrompt(issue, config2, testRunner) {
   const baseBranchInstruction = config2.repos.length > 0 ? "From the repo's base branch (listed above)" : `From \`${config2.base_branch}\``;
   const testBlock = buildTestInstructions(testRunner ?? null);
   const readmeBlock = buildReadmeInstructions();
+  const hookBlock = buildPreCommitHookInstructions();
   const manifestPath = join(workspace, ".lisa-manifest.json");
   return `You are an autonomous implementation agent. Your job is to implement a single
 issue, validate it, commit, and push the branch.
@@ -741,7 +754,7 @@ ${repoEntries}
    - Follow the implementation instructions exactly
    - Verify each acceptance criteria (if present)
    - Respect any stack or technical constraints (if present)
-${testBlock}${readmeBlock}
+${testBlock}${readmeBlock}${hookBlock}
 4. **Validate**: Run the project's linter/typecheck/tests if available:
    - Check \`package.json\` (or equivalent) for lint, typecheck, check, or test scripts.
    - Run whichever validation scripts exist (e.g., \`npm run lint\`, \`npm run typecheck\`).
@@ -771,6 +784,32 @@ ${testBlock}${readmeBlock}
 - Do NOT create pull requests \u2014 the caller handles that.
 - Do NOT update the issue tracker \u2014 the caller handles that.`;
 }
+function buildPushRecoveryPrompt(hookErrors) {
+  return `The previous \`git push\` failed because a pre-push hook rejected the push.
+Here is the full error output:
+
+\`\`\`
+${hookErrors}
+\`\`\`
+
+## Instructions
+
+1. **Read the errors** above carefully and identify the root cause.
+2. **Fix the issue** \u2014 common fixes include:
+   - Run linters/formatters (e.g. \`npm run lint -- --fix\`, \`npm run format\`)
+   - Run code generation (e.g. \`npx prisma generate\`, \`npm run codegen\`)
+   - Fix type errors in the source files
+   - Fix failing tests
+3. **Amend the commit** so the fix is included:
+   \`\`\`
+   git add -A && git commit --amend --no-edit
+   \`\`\`
+4. **Do NOT push** \u2014 the caller handles pushing after you finish.
+5. **Do NOT create pull requests** \u2014 the caller handles that.
+6. **Do NOT update the issue tracker** \u2014 the caller handles that.
+
+Focus only on fixing the hook errors. Do not make unrelated changes.`;
+}
 
 // src/guardrails.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
@@ -1792,6 +1831,58 @@ function cleanupManifest(dir) {
   } catch {
   }
 }
+var MAX_PUSH_RETRIES = 2;
+var HOOK_ERROR_PATTERNS = [
+  /husky - pre-push/i,
+  /husky - pre-commit/i,
+  /pre-push hook/i,
+  /pre-commit hook/i,
+  /hook declined/i,
+  /hook.*failed/i,
+  /hook.*exited with/i,
+  /hook.*returned.*exit code/i
+];
+function isHookError(errorMessage) {
+  return HOOK_ERROR_PATTERNS.some((pattern) => pattern.test(errorMessage));
+}
+async function pushWithRecovery(opts) {
+  for (let attempt = 0; attempt <= MAX_PUSH_RETRIES; attempt++) {
+    try {
+      await execa3("git", ["push", "-u", "origin", opts.branch], { cwd: opts.cwd });
+      return { success: true };
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      if (!isHookError(errorMessage)) {
+        return { success: false, error: errorMessage };
+      }
+      if (attempt >= MAX_PUSH_RETRIES) {
+        return {
+          success: false,
+          error: `Push hook failed after ${MAX_PUSH_RETRIES} recovery attempts: ${errorMessage}`
+        };
+      }
+      warn(
+        `Push hook failed (attempt ${attempt + 1}/${MAX_PUSH_RETRIES}). Re-invoking provider to fix...`
+      );
+      const recoveryPrompt = buildPushRecoveryPrompt(errorMessage);
+      const result = await runWithFallback(opts.models, recoveryPrompt, {
+        logFile: opts.logFile,
+        cwd: opts.cwd,
+        guardrailsDir: opts.guardrailsDir,
+        issueId: opts.issueId,
+        overseer: opts.overseer
+      });
+      if (!result.success) {
+        return {
+          success: false,
+          error: `Provider failed to fix push hook errors: ${result.output}`
+        };
+      }
+      ok("Provider finished recovery. Retrying push...");
+    }
+  }
+  return { success: false, error: "Push recovery exhausted retries" };
+}
 function installSignalHandlers() {
   const cleanup = async (signal) => {
     if (shuttingDown) {
@@ -2158,12 +2249,17 @@ ${result.output}
       );
     }
   }
-  try {
-    await execa3("git", ["push", "-u", "origin", effectiveBranch], { cwd: worktreePath });
-  } catch (err) {
-    error(
-      `Failed to push branch to remote: ${err instanceof Error ? err.message : String(err)}`
-    );
+  const pushResult = await pushWithRecovery({
+    branch: effectiveBranch,
+    cwd: worktreePath,
+    models,
+    logFile,
+    guardrailsDir: repoPath,
+    issueId: issue.id,
+    overseer: config2.overseer
+  });
+  if (!pushResult.success) {
+    error(`Failed to push branch to remote: ${pushResult.error}`);
     cleanupManifest(worktreePath);
     await cleanupWorktree(repoPath, worktreePath);
     return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
@@ -2236,27 +2332,37 @@ ${result.output}
   ok(`Provider chose repo: ${manifest.repoPath}, branch: ${manifest.branch}`);
   const worktreePath = join7(manifest.repoPath, ".worktrees", manifest.branch);
   const baseBranch = resolveBaseBranch(config2, manifest.repoPath);
-  const testsPassed = await runTestValidation(worktreePath);
+  const hasWorktree = existsSync6(worktreePath);
+  const effectiveCwd = hasWorktree ? worktreePath : manifest.repoPath;
+  if (!hasWorktree) {
+    warn(`Worktree not found at ${worktreePath} \u2014 using repo root for git operations`);
+  }
+  const testsPassed = await runTestValidation(effectiveCwd);
   if (!testsPassed) {
     error(`Tests failed for ${issue.id}. Blocking PR creation.`);
-    await cleanupWorktree(manifest.repoPath, worktreePath);
+    if (hasWorktree) await cleanupWorktree(manifest.repoPath, worktreePath);
     cleanupManifest(workspace);
     return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
   }
-  try {
-    await execa3("git", ["push", "-u", "origin", manifest.branch], { cwd: worktreePath });
-  } catch (err) {
-    error(
-      `Failed to push branch to remote: ${err instanceof Error ? err.message : String(err)}`
-    );
-    await cleanupWorktree(manifest.repoPath, worktreePath);
+  const pushResult = await pushWithRecovery({
+    branch: manifest.branch,
+    cwd: effectiveCwd,
+    models,
+    logFile,
+    guardrailsDir: manifest.repoPath,
+    issueId: issue.id,
+    overseer: config2.overseer
+  });
+  if (!pushResult.success) {
+    error(`Failed to push branch to remote: ${pushResult.error}`);
+    if (hasWorktree) await cleanupWorktree(manifest.repoPath, worktreePath);
     cleanupManifest(workspace);
     return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
   }
   const prTitle = manifest.prTitle ?? issue.title;
   const prUrls = [];
   try {
-    const repoInfo = await getRepoInfo(worktreePath);
+    const repoInfo = await getRepoInfo(effectiveCwd);
     const pr = await createPullRequest(
       {
         owner: repoInfo.owner,
@@ -2274,7 +2380,7 @@ ${result.output}
     error(`Failed to create PR: ${err instanceof Error ? err.message : String(err)}`);
   }
   cleanupManifest(workspace);
-  await cleanupWorktree(manifest.repoPath, worktreePath);
+  if (hasWorktree) await cleanupWorktree(manifest.repoPath, worktreePath);
   ok(`Session ${session} complete for ${issue.id}`);
   return { success: true, providerUsed: result.providerUsed, prUrls, fallback: result };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tarcisiopgs/lisa",
-	"version": "0.9.4",
+	"version": "0.9.6",
 	"description": "Deterministic autonomous issue resolver — structured AI agent loop for Linear/Trello",
 	"license": "MIT",
 	"type": "module",