Add warning shortcut for failed git hooks

apps/web/src/components/GitActionsControl.logic.ts

@@ -481,5 +481,24 @@ export function resolveDefaultBranchActionDialogCopy(input: {
   };
 }
 
+export function buildHookFailureAgentPrompt(failure: GitActionFailure): string {
+  const sections: string[] = [
+    "A git commit hook failed and blocked my commit. Please analyze the errors and fix them so I can retry.",
+  ];
+  if (failure.command) {
+    sections.push(`**Command that failed:**\n\`\`\`\n${failure.command}\n\`\`\``);
+  }
+  if (failure.detail) {
+    sections.push(`**Error summary:**\n${failure.detail}`);
+  }
+  if (failure.rawMessage) {
+    sections.push(`**Full hook output:**\n\`\`\`\n${failure.rawMessage}\n\`\`\``);
+  }
+  sections.push(
+    "Please:\n1. Analyze each error in the hook output\n2. Fix the affected files\n3. Let me know when the fixes are ready so I can retry the commit",
+  );
+  return sections.join("\n\n");
+}
+
 // Re-export from shared for backwards compatibility in this module's exports
 export { resolveAutoFeatureBranchName } from "@okcode/shared/git";

apps/web/src/components/GitActionsControl.tsx

@@ -35,6 +35,7 @@ import {
   resolveGitFailureRetryLabel,
   resolveQuickAction,
   resolveSyncAction,
+  buildHookFailureAgentPrompt,
   formatOpenPullRequestLabel,
   summarizeGitFailure,
   summarizeGitResult,
@@ -79,7 +80,7 @@ import {
   gitStatusQueryOptions,
   invalidateGitQueries,
 } from "~/lib/gitReactQuery";
-import { randomUUID } from "~/lib/utils";
+import { newCommandId, newMessageId, randomUUID } from "~/lib/utils";
 import { resolvePathLinkTarget } from "~/terminal-links";
 import { readNativeApi } from "~/nativeApi";
 import { isWsRequestError } from "~/wsTransport";
@@ -783,6 +784,29 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
     void runGitActionWithToast(retryInput);
   }, [gitActionFailureDialog]);
 
+  const fixWithAgent = useCallback(async () => {
+    if (!gitActionFailureDialog || !activeThreadId) return;
+    const api = readNativeApi();
+    if (!api) return;
+    const promptText = buildHookFailureAgentPrompt(gitActionFailureDialog.failure);
+    setGitActionFailureDialog(null);
+    await api.orchestration.dispatchCommand({
+      type: "thread.turn.start",
+      commandId: newCommandId(),
+      threadId: activeThreadId,
+      message: {
+        messageId: newMessageId(),
+        role: "user",
+        text: promptText,
+        attachments: [],
+      },
+      assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
+      runtimeMode: "approval-required",
+      interactionMode: "code",
+      createdAt: new Date().toISOString(),
+    });
+  }, [gitActionFailureDialog, activeThreadId, settings.enableAssistantStreaming]);
+
   const checkoutFeatureBranchAndContinuePendingAction = useCallback(() => {
     if (!pendingDefaultBranchAction) return;
     const { action, commitMessage, forcePushOnlyProgress, onConfirmed, filePaths } =
@@ -1574,6 +1598,11 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
             <Button variant="outline" size="sm" onClick={() => setGitActionFailureDialog(null)}>
               Close
             </Button>
+            {gitActionFailureDialog?.failure.code === "hook_failed" && (
+              <Button variant="outline" size="sm" disabled={!activeThreadId} onClick={fixWithAgent}>
+                Fix with Agent
+              </Button>
+            )}
             <Button
               size="sm"
               disabled={!gitActionFailureDialog || isGitActionRunning}

apps/web/src/session-logic.ts

@@ -501,8 +501,14 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWo
   };
   const itemType = extractWorkLogItemType(payload);
   const requestKind = extractWorkLogRequestKind(payload);
-  if (payload && typeof payload.detail === "string" && payload.detail.length > 0) {
-    const detail = stripTrailingExitCode(payload.detail).output;
+  const rawDetail =
+    typeof payload?.detail === "string" && payload.detail.length > 0
+      ? payload.detail
+      : typeof payload?.message === "string" && payload.message.length > 0
+        ? payload.message
+        : null;
+  if (rawDetail) {
+    const detail = stripTrailingExitCode(rawDetail).output;
     if (detail) {
       entry.detail = detail;
     }