tidy git ai integration

Author: svarlamov

extensions/cli/src/services/GitAiIntegrationService.ts

@@ -3,6 +3,7 @@ import { exec, spawn } from "child_process";
 import { getCurrentSession, getSessionFilePath } from "../session.js";
 import { logger } from "../util/logger.js";
 
+import { PreprocessedToolCall } from "src/tools/types.js";
 import { BaseService } from "./BaseService.js";
 import { serviceContainer } from "./ServiceContainer.js";
 import type { ModelServiceState } from "./types.js";
@@ -110,6 +111,25 @@ export class GitAiIntegrationService extends BaseService<GitAiIntegrationService
     });
   }
 
+  async trackToolUse(toolCall: PreprocessedToolCall, hookEventName: "PreToolUse" | "PostToolUse"): Promise<void> {
+    if (!this.currentState.isEnabled) {
+      return;
+    }
+    const isFileEdit = ["Edit", "MultiEdit", "Write"].includes(toolCall.name);
+    if (!isFileEdit) {
+      return;
+    }
+
+    const filePath = this.extractFilePathFromToolCall(toolCall);
+    if (filePath) {
+      if (hookEventName === "PreToolUse") {
+        await this.beforeFileEdit(filePath);
+      } else if (hookEventName === "PostToolUse") {
+        await this.afterFileEdit(filePath);
+      }
+    }
+  }
+
   async beforeFileEdit(filePath: string): Promise<void> {
     if (!this.currentState.isEnabled) {
       return;
@@ -199,4 +219,24 @@ export class GitAiIntegrationService extends BaseService<GitAiIntegrationService
   setEnabled(enabled: boolean): void {
     this.setState({ isEnabled: enabled });
   }
+
+  extractFilePathFromToolCall(
+    toolCall: PreprocessedToolCall,
+  ): string | null {
+    const preprocessed = toolCall.preprocessResult;
+    if (!preprocessed?.args) return null;
+  
+    const args = preprocessed.args;
+  
+    // Extract file path based on tool type
+    if (toolCall.name === "Edit" && args.resolvedPath) {
+      return args.resolvedPath;
+    } else if (toolCall.name === "MultiEdit" && args.file_path) {
+      return args.file_path;
+    } else if (toolCall.name === "Write" && args.filepath) {
+      return args.filepath;
+    }
+  
+    return null;
+  }
 }

extensions/cli/src/tools/index.tsx

@@ -189,46 +189,19 @@ export function convertMcpToolToContinueTool(mcpTool: MCPTool): Tool {
   };
 }
 
-function extractFilePathFromToolCall(
-  toolCall: PreprocessedToolCall,
-): string | null {
-  const preprocessed = toolCall.preprocessResult;
-  if (!preprocessed?.args) return null;
-
-  const args = preprocessed.args;
-
-  // Extract file path based on tool type
-  if (toolCall.name === "Edit" && args.resolvedPath) {
-    return args.resolvedPath;
-  } else if (toolCall.name === "MultiEdit" && args.file_path) {
-    return args.file_path;
-  } else if (toolCall.name === "Write" && args.filepath) {
-    return args.filepath;
-  }
-
-  return null;
-}
-
 export async function executeToolCall(
   toolCall: PreprocessedToolCall,
 ): Promise<string> {
   const startTime = Date.now();
-  const FILE_EDIT_TOOLS = ["Edit", "MultiEdit", "Write"];
-  const isFileEdit = FILE_EDIT_TOOLS.includes(toolCall.name);
 
   try {
     logger.debug("Executing tool", {
       toolName: toolCall.name,
       arguments: toolCall.arguments,
     });
 
-    // GIT-AI CHECKPOINT: Call before file editing (BLOCKING)
-    if (isFileEdit) {
-      const filePath = extractFilePathFromToolCall(toolCall);
-      if (filePath) {
-        await services.gitAiIntegration.beforeFileEdit(filePath);
-      }
-    }
+    // Track edits if Git AI is enabled (no-op if not enabled)
+    await services.gitAiIntegration.trackToolUse(toolCall, "PreToolUse");
 
     // IMPORTANT: if preprocessed args are present, uses preprocessed args instead of original args
     // Preprocessed arg names may be different
@@ -237,14 +210,8 @@ export async function executeToolCall(
     );
     const duration = Date.now() - startTime;
 
-    // GIT-AI CHECKPOINT: Call after file editing (NON-BLOCKING)
-    if (isFileEdit) {
-      const filePath = extractFilePathFromToolCall(toolCall);
-      if (filePath) {
-        // Don't await - run in background to avoid blocking
-        void services.gitAiIntegration.afterFileEdit(filePath);
-      }
-    }
+    // Track edits if Git AI is enabled (no-op if not enabled)
+    await services.gitAiIntegration.trackToolUse(toolCall, "PostToolUse");
 
     telemetryService.logToolResult({
       toolName: toolCall.name,