reygent-code 0.1.0 → 1.0.1

package/dist/cli.js

@@ -584,6 +584,8 @@ var claudeAdapter = {
       });
       registerChildProcess(child);
       let resultText = "";
+      let resultErrorMessage;
+      let resultApiErrorStatus;
       let resultUsage;
       const textChunks = [];
       const name = options.agentName;
@@ -606,7 +608,13 @@ var claudeAdapter = {
         if (stdoutEnded && stderrEnded && processExitCode !== null) {
           clearTimeout(timeout);
           const stdout = resultText || textChunks.join("\n");
-          resolve5({ stdout, exitCode: processExitCode, usage: resultUsage });
+          resolve5({
+            stdout,
+            exitCode: processExitCode,
+            usage: resultUsage,
+            errorMessage: resultErrorMessage,
+            apiErrorStatus: resultApiErrorStatus
+          });
         }
       };
       const stdoutRL = createInterface({ input: child.stdout });
@@ -641,6 +649,10 @@ var claudeAdapter = {
         } else if (event.type === "result") {
           const msg = event;
           resultText = msg.result;
+          if (msg.is_error) {
+            resultErrorMessage = msg.result;
+            resultApiErrorStatus = msg.api_error_status;
+          }
           const { inputTokens, outputTokens, cachedTokens, cacheWriteTokens } = extractTokenUsage(msg);
           const hasUsage = msg.total_cost_usd !== void 0 || msg.duration_ms !== void 0 || msg.num_turns !== void 0 || inputTokens !== void 0 || outputTokens !== void 0;
           if (hasUsage) {
@@ -809,14 +821,47 @@ var geminiAdapter = {
         let inputTokens;
         let outputTokens;
         let cachedTokens;
+        let errorMessage;
+        let apiErrorStatus;
         try {
           const parsed = JSON.parse(stdout);
           resultText = parsed.response ?? parsed.text ?? stdout;
           inputTokens = parsed.usage_metadata?.prompt_token_count ?? parsed.input_tokens;
           outputTokens = parsed.usage_metadata?.candidates_token_count ?? parsed.output_tokens;
           cachedTokens = parsed.usage_metadata?.cached_content_token_count;
+          if (parsed.error) {
+            errorMessage = parsed.error.message;
+            let statusCode = parsed.error.status;
+            if (parsed.error.code) {
+              if (typeof parsed.error.code === "number") {
+                statusCode = parsed.error.code;
+              } else if (typeof parsed.error.code === "string") {
+                const code2 = parsed.error.code.toLowerCase();
+                if (code2 === "not_found" || code2 === "model_not_found") {
+                  statusCode = 404;
+                } else if (code2 === "permission_denied" || code2 === "unauthenticated") {
+                  statusCode = 403;
+                } else if (code2 === "invalid_api_key" || code2 === "invalid_authentication") {
+                  statusCode = 401;
+                } else if (code2 === "resource_exhausted" || code2 === "rate_limit_exceeded") {
+                  statusCode = 429;
+                } else if (code2 === "internal" || code2 === "server_error") {
+                  statusCode = 500;
+                } else if (code2 === "invalid_argument") {
+                  statusCode = 400;
+                }
+              }
+            }
+            apiErrorStatus = statusCode;
+          }
         } catch {
         }
+        if (code !== 0 && !errorMessage && stderrChunks.length > 0) {
+          const stderr = stderrChunks.join("").trim();
+          if (stderr) {
+            errorMessage = stderr;
+          }
+        }
         resolve5({
           stdout: resultText,
           exitCode: code ?? 1,
@@ -826,7 +871,9 @@ var geminiAdapter = {
             outputTokens,
             cachedTokens,
             provider: "gemini"
-          }
+          },
+          errorMessage,
+          apiErrorStatus
         });
       });
     });
@@ -922,8 +969,10 @@ var codexAdapter = {
       child.stdout.on("data", (chunk) => {
         stdout += chunk.toString();
       });
+      const stderrChunks = [];
       child.stderr.on("data", (chunk) => {
         const text = chunk.toString();
+        stderrChunks.push(text);
         if (options.onActivity) {
           const line = text.trim();
           if (line) options.onActivity({ agent: name, detail: line.slice(0, 80) });
@@ -942,14 +991,44 @@ var codexAdapter = {
         let inputTokens;
         let outputTokens;
         let cachedTokens;
+        let errorMessage;
+        let apiErrorStatus;
         try {
           const parsed = JSON.parse(stdout);
           resultText = parsed.response ?? parsed.text ?? stdout;
           inputTokens = parsed.usage?.prompt_tokens ?? parsed.input_tokens;
           outputTokens = parsed.usage?.completion_tokens ?? parsed.output_tokens;
           cachedTokens = parsed.usage?.prompt_tokens_details?.cached_tokens ?? parsed.cached_tokens;
+          if (parsed.error) {
+            errorMessage = parsed.error.message;
+            if (typeof parsed.error.code === "string") {
+              const code2 = parsed.error.code;
+              if (code2 === "model_not_found" || code2 === "invalid_model") {
+                apiErrorStatus = 404;
+              } else if (code2 === "invalid_api_key" || code2 === "invalid_request_error") {
+                apiErrorStatus = 401;
+              } else if (code2 === "rate_limit_exceeded") {
+                apiErrorStatus = 429;
+              } else if (code2 === "insufficient_quota") {
+                apiErrorStatus = 402;
+              } else if (code2 === "server_error") {
+                apiErrorStatus = 500;
+              } else if (code2.includes("not_found")) {
+                apiErrorStatus = 404;
+              } else if (code2.includes("auth") || code2.includes("unauthorized")) {
+                apiErrorStatus = 401;
+              }
+            }
+            apiErrorStatus = apiErrorStatus ?? parsed.error.status;
+          }
         } catch {
         }
+        if (code !== 0 && !errorMessage && stderrChunks.length > 0) {
+          const stderr = stderrChunks.join("").trim();
+          if (stderr) {
+            errorMessage = stderr;
+          }
+        }
         resolve5({
           stdout: resultText,
           exitCode: code ?? 1,
@@ -960,7 +1039,9 @@ var codexAdapter = {
             cachedTokens,
             // Note: cacheWriteTokens not extracted — OpenAI doesn't currently expose this field
             provider: "codex"
-          }
+          },
+          errorMessage,
+          apiErrorStatus
         });
       });
     });
@@ -2616,7 +2697,56 @@ function searchKnowledge(query) {
   return results;
 }
 
+// src/telemetry-helpers.ts
+function emitErrorTask(message, stage, options) {
+  const chesstrace = getChesstrace();
+  if (chesstrace) {
+    try {
+      chesstrace.emit(Events.ERROR_TASK, {
+        type: "TaskError",
+        message,
+        stage,
+        ...options?.agent && { agent: options.agent },
+        ...options?.errorMessage && { errorMessage: options.errorMessage },
+        ...options?.apiErrorStatus && { apiErrorStatus: options.apiErrorStatus }
+      });
+    } catch (err) {
+      if (isDebug()) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        console.error(`[DEBUG] Telemetry emit failed (ERROR_TASK): ${errMsg}`);
+      }
+    }
+  }
+}
+
 // src/spawn.ts
+function looksLikeMalformedModel(model) {
+  if (!model) return false;
+  const trimmed = model.trim();
+  if (trimmed.length === 0) return true;
+  if (/\s/.test(trimmed)) return true;
+  if (/^[^a-zA-Z0-9]|[^a-zA-Z0-9]$/.test(trimmed)) return true;
+  if (trimmed.length < 3) return true;
+  return false;
+}
+function formatExitDetail(result, model) {
+  if (result.errorMessage) {
+    const status = result.apiErrorStatus ? ` (HTTP ${result.apiErrorStatus})` : "";
+    let detail = `
+  ${result.errorMessage}${status}`;
+    if (result.apiErrorStatus === 404 && /not available/i.test(result.errorMessage) && looksLikeMalformedModel(model)) {
+      detail += `
+  Tip: edit .reygent/config.json "model" field, or run \`reygent config\` to pick a supported model.`;
+    }
+    return detail;
+  }
+  const trimmed = result.stdout.trim();
+  if (!trimmed) return "";
+  const truncated = trimmed.slice(0, 500);
+  const suffix = trimmed.length > 500 ? "..." : "";
+  return `
+  ${truncated}${suffix}`;
+}
 async function spawnAgentStream(name, prompt2, timeoutMs, options) {
   const providerName = options?.provider ?? resolveProvider();
   const adapter = getProvider(providerName);
@@ -2628,13 +2758,12 @@ async function spawnAgentStream(name, prompt2, timeoutMs, options) {
         provider: providerName,
         reason
       });
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: `Provider "${providerName}" is not available: ${reason}`,
-        stage: options?.stage ?? "spawn",
-        agent: name
-      });
     }
+    emitErrorTask(
+      `Provider "${providerName}" is not available: ${reason}`,
+      options?.stage ?? "spawn",
+      { agent: name }
+    );
     throw new TaskError(`Provider "${providerName}" is not available: ${reason}`);
   }
   const modelId = options?.model ?? await resolveModel(providerName);
@@ -2818,18 +2947,16 @@ async function runPlanner(spec, previousAnswers, options) {
   const agents = getAgents();
   const plannerAgent = agents.find((a) => a.name === "planner");
   const prompt2 = buildPrompt(spec, previousAnswers, options);
-  const { stdout: raw, exitCode, usage } = await spawnAgentStream("planner", prompt2, 3e5, { quiet: true, onActivity: options?.onActivity, provider: plannerAgent?.provider, model: plannerAgent?.model });
+  const spawnResult = await spawnAgentStream("planner", prompt2, 3e5, { quiet: true, onActivity: options?.onActivity, provider: plannerAgent?.provider, model: plannerAgent?.model });
+  const { stdout: raw, exitCode, usage, errorMessage, apiErrorStatus } = spawnResult;
   if (exitCode !== 0) {
-    const chesstrace2 = getChesstrace();
-    if (chesstrace2) {
-      chesstrace2.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: `Planner: agent exited with code ${exitCode}`,
-        stage: "plan",
-        agent: "planner"
-      });
-    }
-    throw new TaskError(`Planner: agent exited with code ${exitCode}`);
+    const detail = formatExitDetail(spawnResult, plannerAgent?.model);
+    emitErrorTask(
+      `Planner: agent exited with code ${exitCode}${detail}`,
+      "plan",
+      { agent: "planner", errorMessage, apiErrorStatus }
+    );
+    throw new TaskError(`Planner: agent exited with code ${exitCode}${detail}`);
   }
   let parsed;
   try {
@@ -2857,31 +2984,23 @@ async function runPlanner(spec, previousAnswers, options) {
       }
     }
     const errors = Array.isArray(obj.errors) ? obj.errors.join("\n  - ") : "unknown validation error";
-    const chesstrace2 = getChesstrace();
-    if (chesstrace2) {
-      chesstrace2.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: `Planner: spec validation failed:
+    emitErrorTask(
+      `Planner: spec validation failed:
   - ${errors}`,
-        stage: "plan",
-        agent: "planner"
-      });
-    }
+      "plan",
+      { agent: "planner" }
+    );
     throw new TaskError(
       `Planner: spec validation failed:
   - ${errors}`
     );
   }
   if (obj.valid !== true) {
-    const chesstrace2 = getChesstrace();
-    if (chesstrace2) {
-      chesstrace2.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Planner: unexpected response \u2014 missing 'valid' field",
-        stage: "plan",
-        agent: "planner"
-      });
-    }
+    emitErrorTask(
+      "Planner: unexpected response \u2014 missing 'valid' field",
+      "plan",
+      { agent: "planner" }
+    );
     throw new TaskError(
       "Planner: unexpected response \u2014 missing 'valid' field"
     );
@@ -2889,49 +3008,37 @@ async function runPlanner(spec, previousAnswers, options) {
   const { goals, tasks, constraints, dod } = obj;
   const chesstrace = getChesstrace();
   if (!isNonEmptyStringArray(goals)) {
-    if (chesstrace) {
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Planner: 'goals' must be a non-empty string array",
-        stage: "plan",
-        agent: "planner"
-      });
-    }
+    emitErrorTask(
+      "Planner: 'goals' must be a non-empty string array",
+      "plan",
+      { agent: "planner" }
+    );
     throw new TaskError("Planner: 'goals' must be a non-empty string array");
   }
   if (!isNonEmptyStringArray(tasks)) {
-    if (chesstrace) {
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Planner: 'tasks' must be a non-empty string array",
-        stage: "plan",
-        agent: "planner"
-      });
-    }
+    emitErrorTask(
+      "Planner: 'tasks' must be a non-empty string array",
+      "plan",
+      { agent: "planner" }
+    );
     throw new TaskError("Planner: 'tasks' must be a non-empty string array");
   }
   if (!isNonEmptyStringArray(constraints)) {
-    if (chesstrace) {
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Planner: 'constraints' must be a non-empty string array",
-        stage: "plan",
-        agent: "planner"
-      });
-    }
+    emitErrorTask(
+      "Planner: 'constraints' must be a non-empty string array",
+      "plan",
+      { agent: "planner" }
+    );
     throw new TaskError(
       "Planner: 'constraints' must be a non-empty string array"
     );
   }
   if (!isNonEmptyStringArray(dod)) {
-    if (chesstrace) {
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Planner: 'dod' must be a non-empty string array",
-        stage: "plan",
-        agent: "planner"
-      });
-    }
+    emitErrorTask(
+      "Planner: 'dod' must be a non-empty string array",
+      "plan",
+      { agent: "planner" }
+    );
     throw new TaskError("Planner: 'dod' must be a non-empty string array");
   }
   return { result: { goals, tasks, constraints, dod }, usage };
@@ -3017,10 +3124,19 @@ Be specific and actionable. Expand the description into concrete requirements th
 **Description:** ${description}${answersContext}`;
 }
 async function runClarification(description, previousAnswers, onActivity) {
+  const agents = getAgents();
+  const plannerAgent = agents.find((a) => a.name === "planner");
   const prompt2 = buildClarificationPrompt(description, previousAnswers);
-  const { stdout: raw, exitCode } = await spawnAgentStream("generate-spec", prompt2, 12e4, { quiet: true, onActivity });
+  const clarifyResult = await spawnAgentStream("generate-spec", prompt2, 12e4, { quiet: true, onActivity });
+  const { stdout: raw, exitCode, errorMessage, apiErrorStatus } = clarifyResult;
   if (exitCode !== 0) {
-    throw new TaskError(`generate-spec: agent exited with code ${exitCode}`);
+    const detail = formatExitDetail(clarifyResult, plannerAgent?.model);
+    emitErrorTask(
+      `generate-spec: agent exited with code ${exitCode}${detail}`,
+      "clarification",
+      { agent: "generate-spec", errorMessage, apiErrorStatus }
+    );
+    throw new TaskError(`generate-spec: agent exited with code ${exitCode}${detail}`);
   }
   let parsed;
   try {
@@ -3052,10 +3168,19 @@ async function runClarification(description, previousAnswers, onActivity) {
   return { ready: true };
 }
 async function generateSpec(description, clarificationAnswers, onActivity) {
+  const agents = getAgents();
+  const plannerAgent = agents.find((a) => a.name === "planner");
   const prompt2 = buildGeneratePrompt(description, clarificationAnswers);
-  const { stdout, exitCode } = await spawnAgentStream("generate-spec", prompt2, 12e4, { onActivity });
+  const specResult = await spawnAgentStream("generate-spec", prompt2, 12e4, { onActivity });
+  const { stdout, exitCode, errorMessage, apiErrorStatus } = specResult;
   if (exitCode !== 0) {
-    throw new TaskError(`generate-spec: agent exited with code ${exitCode}`);
+    const detail = formatExitDetail(specResult, plannerAgent?.model);
+    emitErrorTask(
+      `generate-spec: agent exited with code ${exitCode}${detail}`,
+      "generate",
+      { agent: "generate-spec", errorMessage, apiErrorStatus }
+    );
+    throw new TaskError(`generate-spec: agent exited with code ${exitCode}${detail}`);
   }
   if (!stdout) {
     throw new TaskError("generate-spec: empty result from agent");
@@ -3861,15 +3986,11 @@ async function runImplement(spec, plan, options, retryOptions) {
   const devAgent = agents.find((a) => a.name === "dev");
   const qeAgent = agents.find((a) => a.name === "qe");
   if (!devAgent || !qeAgent) {
-    const chesstrace2 = getChesstrace();
-    if (chesstrace2) {
-      chesstrace2.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Implement: missing dev or qe agent config",
-        stage: options?.stage ?? "implement",
-        agent: "implement"
-      });
-    }
+    emitErrorTask(
+      "Implement: missing dev or qe agent config",
+      options?.stage ?? "implement",
+      { agent: "implement" }
+    );
     throw new TaskError("Implement: missing dev or qe agent config");
   }
   const agentsToRun = retryOptions?.agentsToRun ?? ["dev", "qe"];
@@ -3908,9 +4029,12 @@ async function runImplement(spec, plan, options, retryOptions) {
         if (devResult.value.exitCode === 0) {
           dev = extractDevOutput(devResult.value.stdout);
         } else {
-          console.log(chalk13.red("dev agent failed:"), `exit code ${devResult.value.exitCode}`);
-          const summary = getFailureSummary(devResult.value.stdout);
-          if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          const detail = formatExitDetail(devResult.value, devAgent.model);
+          console.log(chalk13.red("dev agent failed:"), `exit code ${devResult.value.exitCode}${detail}`);
+          if (!devResult.value.errorMessage || devResult.value.errorMessage.length < 50) {
+            const summary = getFailureSummary(devResult.value.stdout);
+            if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          }
         }
       } else {
         console.log(chalk13.red("dev agent failed:"), devResult.reason);
@@ -3923,9 +4047,12 @@ async function runImplement(spec, plan, options, retryOptions) {
         if (qeResult.value.exitCode === 0) {
           qe = extractQEOutput(qeResult.value.stdout);
         } else {
-          console.log(chalk13.red("qe agent failed:"), `exit code ${qeResult.value.exitCode}`);
-          const summary = getFailureSummary(qeResult.value.stdout);
-          if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          const detail = formatExitDetail(qeResult.value, qeAgent.model);
+          console.log(chalk13.red("qe agent failed:"), `exit code ${qeResult.value.exitCode}${detail}`);
+          if (!qeResult.value.errorMessage || qeResult.value.errorMessage.length < 50) {
+            const summary = getFailureSummary(qeResult.value.stdout);
+            if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          }
         }
       } else {
         console.log(chalk13.red("qe agent failed:"), qeResult.reason);
@@ -3941,9 +4068,12 @@ async function runImplement(spec, plan, options, retryOptions) {
         }
         usages.push({ agent: "dev", usage: devResult.usage });
         if (devResult.exitCode !== 0) {
-          console.log(chalk13.red("dev agent failed:"), `exit code ${devResult.exitCode}`);
-          const summary = getFailureSummary(devResult.stdout);
-          if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          const detail = formatExitDetail(devResult);
+          console.log(chalk13.red("dev agent failed:"), `exit code ${devResult.exitCode}${detail}`);
+          if (!devResult.errorMessage) {
+            const summary = getFailureSummary(devResult.stdout);
+            if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          }
         }
       } catch (err) {
         console.log(chalk13.red("dev agent failed:"), err);
@@ -3958,9 +4088,12 @@ async function runImplement(spec, plan, options, retryOptions) {
         }
         usages.push({ agent: "qe", usage: qeResult.usage });
         if (qeResult.exitCode !== 0) {
-          console.log(chalk13.red("qe agent failed:"), `exit code ${qeResult.exitCode}`);
-          const summary = getFailureSummary(qeResult.stdout);
-          if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          const detail = formatExitDetail(qeResult);
+          console.log(chalk13.red("qe agent failed:"), `exit code ${qeResult.exitCode}${detail}`);
+          if (!qeResult.errorMessage) {
+            const summary = getFailureSummary(qeResult.stdout);
+            if (summary) console.log(chalk13.gray("  \u21B3"), chalk13.gray(summary));
+          }
         }
       } catch (err) {
         console.log(chalk13.red("qe agent failed:"), err);
@@ -3969,36 +4102,27 @@ async function runImplement(spec, plan, options, retryOptions) {
   }
   const chesstrace = getChesstrace();
   if (runDev && dev === null && (runQE && qe === null)) {
-    if (chesstrace) {
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Implement: all requested agents failed",
-        stage: options?.stage ?? "implement",
-        agent: "implement"
-      });
-    }
+    emitErrorTask(
+      "Implement: all requested agents failed",
+      options?.stage ?? "implement",
+      { agent: "implement" }
+    );
     throw new TaskError("Implement: all requested agents failed");
   }
   if (runDev && !runQE && dev === null) {
-    if (chesstrace) {
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Implement: dev agent failed",
-        stage: options?.stage ?? "implement",
-        agent: "dev"
-      });
-    }
+    emitErrorTask(
+      "Implement: dev agent failed",
+      options?.stage ?? "implement",
+      { agent: "dev" }
+    );
     throw new TaskError("Implement: dev agent failed");
   }
   if (!runDev && runQE && qe === null) {
-    if (chesstrace) {
-      chesstrace.emit(Events.ERROR_TASK, {
-        type: "TaskError",
-        message: "Implement: qe agent failed",
-        stage: options?.stage ?? "implement",
-        agent: "qe"
-      });
-    }
+    emitErrorTask(
+      "Implement: qe agent failed",
+      options?.stage ?? "implement",
+      { agent: "qe" }
+    );
     throw new TaskError("Implement: qe agent failed");
   }
   return { implement: { dev, qe }, usages };
@@ -8518,21 +8642,15 @@ ${extra.trim()}` : extra.trim();
       console.log();
       const pushSpinner = createLiveStatus("committing and pushing...");
       const trace = getChesstrace();
+      const commitMessage = "fix: address PR review comments";
+      const maxRetries = options.retryCommits ?? 3;
+      let committed = false;
       try {
         await exec4("git", ["add", "-A"]);
-        await exec4("git", ["commit", "-m", "fix: address PR review comments"]);
-        try {
-          trace.emit(Events.GIT_COMMIT, { branch, messageSubject: "fix: address PR review comments" });
-        } catch {
-        }
-        await exec4("git", ["push", "origin", branch]);
-        try {
-          trace.emit(Events.GIT_PUSH, { branch });
-        } catch {
-        }
-        pushSpinner.succeed(chalk22.green("Changes committed and pushed."));
-      } catch (pushErr) {
-        const msg = pushErr instanceof Error ? pushErr.message : String(pushErr);
+        await exec4("git", ["commit", "-m", commitMessage]);
+        committed = true;
+      } catch (commitErr) {
+        const msg = commitErr instanceof Error ? commitErr.message : String(commitErr);
         if (msg.includes("nothing to commit")) {
           try {
             const ahead = await exec4("git", [
@@ -8554,11 +8672,47 @@ ${extra.trim()}` : extra.trim();
             pushSpinner.warn(chalk22.yellow("Nothing to commit or push."));
           }
         } else {
+          let retryCount = 0;
+          while (retryCount < maxRetries) {
+            retryCount++;
+            pushSpinner.text = `pre-commit hook failed, re-staging and retrying (${retryCount}/${maxRetries})...`;
+            try {
+              await exec4("git", ["add", "-A"]);
+              await exec4("git", ["commit", "-m", commitMessage]);
+              committed = true;
+              break;
+            } catch (retryErr) {
+              const retryMsg = retryErr instanceof Error ? retryErr.message : String(retryErr);
+              if (retryCount >= maxRetries) {
+                try {
+                  trace.emit(Events.GIT_ERROR, { operation: "commit", error: retryMsg, retriesExhausted: maxRetries });
+                } catch {
+                }
+                pushSpinner.fail(chalk22.red(`Commit failed after ${maxRetries} retries: ${retryMsg}`));
+              }
+            }
+          }
+        }
+      }
+      if (committed) {
+        try {
+          trace.emit(Events.GIT_COMMIT, { branch, messageSubject: commitMessage });
+        } catch {
+        }
+        try {
+          await exec4("git", ["push", "origin", branch]);
           try {
-            trace.emit(Events.GIT_ERROR, { operation: "commit-push", error: msg });
+            trace.emit(Events.GIT_PUSH, { branch });
           } catch {
           }
-          pushSpinner.fail(chalk22.red(`Push failed: ${msg}`));
+          pushSpinner.succeed(chalk22.green("Changes committed and pushed."));
+        } catch (pushErr) {
+          const pushMsg = pushErr instanceof Error ? pushErr.message : String(pushErr);
+          try {
+            trace.emit(Events.GIT_ERROR, { operation: "push", error: pushMsg });
+          } catch {
+          }
+          pushSpinner.fail(chalk22.red(`Push failed: ${pushMsg}`));
         }
       }
       console.log();
@@ -10517,7 +10671,13 @@ program.command("run").description("Run the reygent workflow from spec to review
   }
 }).action(runCommand);
 program.command("review-work").description("Review current branch and post summary to PR/MR").option("--spec <source>", "Spec source with provider prefix (jira:KEY, linear:ID, markdown:FILE) \u2014 file paths auto-infer markdown:").option("--insecure", "Skip SSL certificate verification for API calls", false).action(reviewWorkCommand);
-program.command("review-comments").description("Fetch PR/MR review comments and address them with an agent").option("--insecure", "Skip SSL certificate verification for API calls", false).option("--auto-approve", "Auto-approve plan and execute without prompting", false).action(reviewCommentsCommand);
+program.command("review-comments").description("Fetch PR/MR review comments and address them with an agent").option("--insecure", "Skip SSL certificate verification for API calls", false).option("--auto-approve", "Auto-approve plan and execute without prompting", false).option("--retry-commits <count>", "Max retries for pre-commit hook failures (default: 3)", (val) => {
+  const num = parseInt(val, 10);
+  if (isNaN(num) || num < 0 || num > 10) {
+    throw new Error("--retry-commits must be between 0 and 10");
+  }
+  return num;
+}).action(reviewCommentsCommand);
 program.command("config").description("Configure default provider, model, and per-agent overrides").action(configCommand);
 registerTelemetryCommand(program);
 registerAnalyzeCommand(program);