plugin-git-manager 1.1.10 → 1.1.12

package/dist/server/actions/review.js

@@ -26,17 +26,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var review_exports = {};
 __export(review_exports, {
+  WORKER_JOB_GIT_REVIEW_PROCESS: () => WORKER_JOB_GIT_REVIEW_PROCESS,
   branchMatches: () => branchMatches,
   pickFlowMatchingBranch: () => pickFlowMatchingBranch,
   recoverStuckReviews: () => recoverStuckReviews,
+  registerReviewQueue: () => registerReviewQueue,
   reviewApprovePost: () => reviewApprovePost,
   reviewReject: () => reviewReject,
   triggerReview: () => triggerReview,
-  triggerReviewInternal: () => triggerReviewInternal
+  triggerReviewInternal: () => triggerReviewInternal,
+  unregisterReviewQueue: () => unregisterReviewQueue
 });
 module.exports = __toCommonJS(review_exports);
 var import_gitlab_url = require("../utils/gitlab-url");
 var import_redact = require("../utils/redact");
+const WORKER_JOB_GIT_REVIEW_PROCESS = "git-review:process";
+const REVIEW_QUEUE_CHANNEL = "plugin-git-manager.review";
+const REVIEW_QUEUE_CONCURRENCY = Math.max(
+  1,
+  Number.parseInt(process.env.GIT_REVIEW_QUEUE_CONCURRENCY || process.env.GIT_REVIEW_MAX_CONCURRENCY || "3", 10) || 3
+);
+const REVIEW_QUEUE_TIMEOUT_MS = Math.max(
+  6e4,
+  Number.parseInt(process.env.GIT_REVIEW_QUEUE_TIMEOUT_MS || "", 10) || 10 * 60 * 1e3
+);
 function getActionParams(ctx) {
   var _a, _b;
   return { ...ctx.action.params, ...(_a = ctx.action.params) == null ? void 0 : _a.values, ...((_b = ctx.request) == null ? void 0 : _b.body) || {} };
@@ -142,13 +155,12 @@ async function triggerReviewInternalLocked(app, args) {
     latestSha: headSha || existingLatestSha || null,
     triggeredBy: args.triggeredBy || "manual",
     status: "pending",
-    // Stamp startedAt synchronously so `recoverStuckReviews` can sweep rows
-    // that get stuck in `pending` (process died before runReview ran).
-    // runReview's own update will refresh this on actual start.
-    startedAt: /* @__PURE__ */ new Date(),
+    // `startedAt` is stamped by the queue worker when execution actually
+    // starts. Pending rows may be legitimately waiting in Redis.
+    startedAt: null,
     finishedAt: null,
     durationMs: null,
-    postStatus: flow.get("postMode") === "disabled" ? "skipped" : "pending_approval",
+    postStatus: getInitialPostStatus(flow, args.targetType),
     error: null
   };
   let reviewId;
@@ -166,25 +178,129 @@ async function triggerReviewInternalLocked(app, args) {
     const review = await reviewsRepo.create({ values: baseValues });
     reviewId = review.get("id");
   }
-  setImmediate(
-    () => runReview(app, {
-      reviewId,
+  await enqueueReview(app, {
+    reviewId,
+    repositoryId: args.repositoryId,
+    targetType: args.targetType,
+    mrIid: args.targetType === "mr" ? args.mrIid : null,
+    commitSha: args.targetType === "commit" ? args.commitSha : null,
+    branch: args.branch || void 0,
+    headSha,
+    aiEmployeeUsername,
+    extraInstructions: args.extraInstructions,
+    userId: args.userId ?? null,
+    flowSnapshot: createFlowSnapshot(flow)
+  });
+  return reviewId;
+}
+function registerReviewQueue(app) {
+  app.eventQueue.subscribe(REVIEW_QUEUE_CHANNEL, {
+    concurrency: REVIEW_QUEUE_CONCURRENCY,
+    idle: () => isGitReviewWorker(app),
+    process: async (message) => {
+      await processQueuedReview(app, message);
+    }
+  });
+}
+function unregisterReviewQueue(app) {
+  app.eventQueue.unsubscribe(REVIEW_QUEUE_CHANNEL);
+}
+function createFlowSnapshot(flow) {
+  return {
+    id: Number(flow.get("id")),
+    name: flow.get("name"),
+    postMode: flow.get("postMode"),
+    llmService: flow.get("llmService"),
+    model: flow.get("model"),
+    instructions: flow.get("instructions")
+  };
+}
+function createFlowFromSnapshot(snapshot, fallback) {
+  return {
+    get(name) {
+      var _a;
+      if (snapshot && Object.prototype.hasOwnProperty.call(snapshot, name)) {
+        return snapshot[name];
+      }
+      return (_a = fallback == null ? void 0 : fallback.get) == null ? void 0 : _a.call(fallback, name);
+    }
+  };
+}
+function isGitReviewWorker(app) {
+  const workerMode = process.env.WORKER_MODE || "";
+  return app.serving(WORKER_JOB_GIT_REVIEW_PROCESS) || workerMode === "worker" || workerMode === "task" || process.env.APP_ROLE === "worker";
+}
+async function enqueueReview(app, message) {
+  try {
+    await app.eventQueue.publish(REVIEW_QUEUE_CHANNEL, message, {
+      timeout: REVIEW_QUEUE_TIMEOUT_MS,
+      maxRetries: 1
+    });
+  } catch (err) {
+    const safeMessage = (0, import_redact.redactPat)((err == null ? void 0 : err.message) || String(err));
+    await app.db.getRepository("gitCodeReviews").update({
+      filterByTk: message.reviewId,
+      values: {
+        status: "failed",
+        error: `Failed to enqueue review: ${safeMessage}`,
+        finishedAt: /* @__PURE__ */ new Date()
+      }
+    });
+    throw err;
+  }
+}
+async function failQueuedReview(app, reviewId, err) {
+  const safeMessage = (0, import_redact.redactPat)((err == null ? void 0 : err.message) || String(err));
+  await app.db.getRepository("gitCodeReviews").update({
+    filterByTk: reviewId,
+    values: {
+      status: "failed",
+      error: safeMessage,
+      finishedAt: /* @__PURE__ */ new Date()
+    }
+  });
+}
+async function processQueuedReview(app, message) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  const db = app.db;
+  const reviewsRepo = db.getRepository("gitCodeReviews");
+  const review = await reviewsRepo.findOne({ filterByTk: message.reviewId });
+  if (!review) {
+    (_b = (_a = app.log) == null ? void 0 : _a.warn) == null ? void 0 : _b.call(_a, `git review queue: review ${message.reviewId} not found, skipping`);
+    return;
+  }
+  if (review.get("status") !== "pending") {
+    (_d = (_c = app.log) == null ? void 0 : _c.info) == null ? void 0 : _d.call(_c, `git review queue: review ${message.reviewId} is ${review.get("status")}, skipping`);
+    return;
+  }
+  try {
+    const repo = await db.getRepository("gitRepositories").findOne({
+      filterByTk: message.repositoryId || review.get("repositoryId")
+    });
+    if (!repo) throw new Error("Repository not found");
+    const storedFlow = await db.getRepository("gitReviewFlows").findOne({
+      filterByTk: ((_e = message.flowSnapshot) == null ? void 0 : _e.id) || review.get("flowId")
+    });
+    const flow = createFlowFromSnapshot(message.flowSnapshot, storedFlow);
+    const aiEmployeeUsername = message.aiEmployeeUsername || flow.get("aiEmployeeUsername");
+    if (!aiEmployeeUsername) throw new Error("Flow has no AI employee configured");
+    await runReview(app, {
+      reviewId: message.reviewId,
       flow,
       repo,
-      targetType: args.targetType,
-      mrIid: args.targetType === "mr" ? args.mrIid : null,
-      commitSha: args.targetType === "commit" ? args.commitSha : null,
-      branch: args.branch || void 0,
-      headSha,
+      targetType: message.targetType || review.get("targetType"),
+      mrIid: message.targetType === "mr" ? message.mrIid ?? Number(review.get("mrIid")) : null,
+      commitSha: message.targetType === "commit" ? message.commitSha || review.get("commitSha") : null,
+      branch: message.branch || review.get("branch"),
+      headSha: message.headSha || review.get("headSha"),
       aiEmployeeUsername,
-      extraInstructions: args.extraInstructions,
-      userId: args.userId ?? null
-    }).catch((err) => {
-      var _a, _b;
-      (_b = (_a = app.log) == null ? void 0 : _a.error) == null ? void 0 : _b.call(_a, "runReview background error", err);
-    })
-  );
-  return reviewId;
+      extraInstructions: message.extraInstructions,
+      userId: message.userId ?? null
+    });
+  } catch (err) {
+    (_g = (_f = app.log) == null ? void 0 : _f.error) == null ? void 0 : _g.call(_f, "git review queue: failed before review execution", err);
+    await failQueuedReview(app, message.reviewId, err);
+  }
 }
 async function reviewApprovePost(ctx, next) {
   var _a, _b;
@@ -211,7 +327,8 @@ async function reviewApprovePost(ctx, next) {
       postStatus: "posted",
       postedNoteId: String(noteId),
       approvedBy: userId ? String(userId) : null,
-      approvedAt: /* @__PURE__ */ new Date()
+      approvedAt: /* @__PURE__ */ new Date(),
+      error: null
     }
   });
   ctx.body = { success: true, data: { reviewId, postedNoteId: noteId } };
@@ -357,9 +474,10 @@ async function runReview(app, args) {
     }
     const finishedAt = /* @__PURE__ */ new Date();
     const durationMs = finishedAt.getTime() - startedAt.getTime();
-    const postMode = args.flow.get("postMode");
-    let postStatus = "pending_approval";
+    const postMode = getFlowPostMode(args.flow);
+    let postStatus = getInitialPostStatus(args.flow, args.targetType);
     let postedNoteId = null;
+    let autoPostError = null;
     if (postMode === "disabled") {
       postStatus = "skipped";
     } else if (postMode === "auto" && args.targetType === "mr" && args.mrIid) {
@@ -367,6 +485,8 @@ async function runReview(app, args) {
         postedNoteId = String(await postNoteToGitLab(args.repo, args.mrIid, content));
         postStatus = "posted";
       } catch (err) {
+        autoPostError = (0, import_redact.redactPat)((err == null ? void 0 : err.message) || String(err));
+        postStatus = "post_failed";
         (_c = (_b = app.log) == null ? void 0 : _b.error) == null ? void 0 : _c.call(_b, "Auto-post review note failed", err);
       }
     }
@@ -384,11 +504,14 @@ async function runReview(app, args) {
         finishedAt,
         postStatus,
         postedNoteId,
+        error: autoPostError ? `Auto-post failed: ${autoPostError}` : null,
         metadata: {
           flowName: args.flow.get("name"),
           aiEmployeeUsername: args.aiEmployeeUsername,
           llmService,
-          model
+          model,
+          postMode,
+          autoPostError
         }
       }
     });
@@ -559,6 +682,23 @@ async function postNoteToGitLab(repo, mrIid, body) {
 }
 const MAX_BRANCH_FILTER_LENGTH = 200;
 const loggedBadFilters = /* @__PURE__ */ new Set();
+function getFlowPostMode(flow) {
+  var _a;
+  const rawValue = (_a = flow == null ? void 0 : flow.get) == null ? void 0 : _a.call(flow, "postMode");
+  const value = rawValue && typeof rawValue === "object" && "value" in rawValue ? rawValue.value : rawValue;
+  const normalized = String(value || "manual").trim().toLowerCase().replace(/[\s-]+/g, "_");
+  if (["auto", "auto_post", "autopost", "auto_post_to_mr"].includes(normalized)) return "auto";
+  if (["disabled", "disable", "do_not_post", "dont_post", "none", "skip", "skipped"].includes(normalized)) {
+    return "disabled";
+  }
+  return "manual";
+}
+function getInitialPostStatus(flow, targetType) {
+  const postMode = getFlowPostMode(flow);
+  if (postMode === "disabled") return "skipped";
+  if (postMode === "auto" && targetType !== "mr") return "skipped";
+  return "pending_approval";
+}
 function warnInvalidBranchFilter(filter, reason) {
   if (loggedBadFilters.has(filter)) return;
   loggedBadFilters.add(filter);
@@ -601,7 +741,7 @@ async function recoverStuckReviews(app) {
     const cutoff = new Date(Date.now() - STUCK_REVIEW_CUTOFF_MS);
     const stuck = await reviewsRepo.find({
       filter: {
-        status: { $in: ["running", "pending"] },
+        status: "running",
         startedAt: { $lt: cutoff }
       }
     });
@@ -629,11 +769,14 @@ async function recoverStuckReviews(app) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  WORKER_JOB_GIT_REVIEW_PROCESS,
   branchMatches,
   pickFlowMatchingBranch,
   recoverStuckReviews,
+  registerReviewQueue,
   reviewApprovePost,
   reviewReject,
   triggerReview,
-  triggerReviewInternal
+  triggerReviewInternal,
+  unregisterReviewQueue
 });

package/dist/server/collections/gitCodeReviews.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/collections/gitCodeReviews.js

@@ -166,6 +166,7 @@ var gitCodeReviews_default = (0, import_database.defineCollection)({
           { value: "pending_approval", label: "Pending Approval" },
           { value: "approved", label: "Approved" },
           { value: "posted", label: "Posted" },
+          { value: "post_failed", label: "Post Failed" },
           { value: "skipped", label: "Skipped" },
           { value: "rejected", label: "Rejected" }
         ]

package/dist/server/collections/gitRepositories.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/collections/gitReviewFlows.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/plugin.js

@@ -105,6 +105,7 @@ class PluginGitManagerServer extends import_server.Plugin {
       }
       return next();
     });
+    (0, import_review.registerReviewQueue)(this.app);
     (0, import_ai_tools.registerGitReviewAiTools)(this.app);
     this.app.on("afterStart", async () => {
       await ensureAutoReviewFlowSchema(this.app).catch(
@@ -122,9 +123,11 @@ class PluginGitManagerServer extends import_server.Plugin {
       (0, import_poller.startPoller)(this.app);
     });
     this.app.on("beforeStop", () => {
+      (0, import_review.unregisterReviewQueue)(this.app);
       (0, import_poller.stopPoller)();
     });
     this.app.on("beforeDestroy", () => {
+      (0, import_review.unregisterReviewQueue)(this.app);
       (0, import_poller.stopPoller)();
     });
     this.app.acl.registerSnippet({
@@ -207,9 +210,11 @@ class PluginGitManagerServer extends import_server.Plugin {
     await ((_a = this.app.db.getCollection("gitRepositories")) == null ? void 0 : _a.sync());
   }
   async beforeDisable() {
+    (0, import_review.unregisterReviewQueue)(this.app);
     (0, import_poller.stopPoller)();
   }
   async beforeUnload() {
+    (0, import_review.unregisterReviewQueue)(this.app);
     (0, import_poller.stopPoller)();
   }
 }

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Git Manager",
   "displayName.zh-CN": "Git 管理器",
   "description": "Manage Git repositories with PAT authentication - pull, push, fetch, diff, file browsing",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "license": "Apache-2.0",
   "main": "dist/server/index.js",
   "files": [

package/src/client/components/CommitHistory.tsx

@@ -49,6 +49,9 @@ export const CommitHistory: React.FC = () => {
       });
       const responseData = data?.data?.data || data?.data;
       setCommits(responseData?.all || []);
+    } catch (error) {
+      console.warn('Failed to load commit history:', error);
+      setCommits([]);
     } finally {
       setLoading(false);
     }

package/src/client/components/FileExplorer.tsx

@@ -75,30 +75,35 @@ export const FileExplorer: React.FC = () => {
   const loadTree = useCallback(
     async (treePath = '', ref = currentRef) => {
       if (!selectedRepo) return [];
-      const { data } = await api.request({
-        url: 'gitManager:fileTree',
-        params: { repositoryId: selectedRepo.id, ref, treePath },
-      });
-      const responseData = data?.data || data || [];
-      const list = Array.isArray(responseData) ? responseData : (Array.isArray(responseData?.data) ? responseData.data : []);
-      
-      return list.map((item: any) => ({
-        key: item.path,
-        title: (
-          <Text style={{ fontSize: 13 }}>
-            {item.name}
-            {item.type === 'blob' && item.size > 0 && (
-              <Text type="secondary" style={{ fontSize: 11, marginLeft: 8 }}>
-                {item.size > 1024 ? `${(item.size / 1024).toFixed(1)}KB` : `${item.size}B`}
-              </Text>
-            )}
-          </Text>
-        ),
-        icon: getFileIcon(item.name, item.type),
-        isLeaf: item.type === 'blob',
-        filePath: item.path,
-        fileType: item.type,
-      }));
+      try {
+        const { data } = await api.request({
+          url: 'gitManager:fileTree',
+          params: { repositoryId: selectedRepo.id, ref, treePath },
+        });
+        const responseData = data?.data || data || [];
+        const list = Array.isArray(responseData) ? responseData : (Array.isArray(responseData?.data) ? responseData.data : []);
+        
+        return list.map((item: any) => ({
+          key: item.path,
+          title: (
+            <Text style={{ fontSize: 13 }}>
+              {item.name}
+              {item.type === 'blob' && item.size > 0 && (
+                <Text type="secondary" style={{ fontSize: 11, marginLeft: 8 }}>
+                  {item.size > 1024 ? `${(item.size / 1024).toFixed(1)}KB` : `${item.size}B`}
+                </Text>
+              )}
+            </Text>
+          ),
+          icon: getFileIcon(item.name, item.type),
+          isLeaf: item.type === 'blob',
+          filePath: item.path,
+          fileType: item.type,
+        }));
+      } catch (error) {
+        console.warn('Failed to load file tree:', error);
+        return [];
+      }
     },
     [api, selectedRepo, currentRef],
   );

package/src/client/components/GitOperations.tsx

@@ -50,6 +50,9 @@ export const GitOperations: React.FC = () => {
       });
       const responseData = data?.data?.data || data?.data;
       setStatusData(responseData);
+    } catch (error) {
+      console.warn('Failed to load git status:', error);
+      setStatusData(null);
     } finally {
       setActionLoading(null);
     }

package/src/client/components/ReviewFlows.tsx

@@ -22,6 +22,15 @@ const POST_LABELS: Record<string, string> = {
   disabled: 'Disabled',
 };
 
+const DEFAULT_INSTRUCTION = `Please review the code changes with a focus on:
+1. Best Practices & Style:
+   - C#/VB.NET: Follow standard naming conventions (PascalCase for methods/properties, camelCase for fields). Ensure proper use of async/await (avoid .Result/.Wait()). Use LINQ efficiently.
+   - JS/TS: Use strict equality (===), prefer const/let. Ensure TypeScript types are explicit and avoid 'any'.
+2. Performance: Watch out for N+1 queries, unnecessary loops, and memory leaks.
+3. Security: Identify potential SQL injections, XSS vulnerabilities, and improper data validation.
+4. Maintainability: Check for readability, SOLID principles, and DRY. Ensure meaningful naming.
+5. Error Handling: Verify that exceptions are properly caught, handled, and logged.`;
+
 export const ReviewFlows: React.FC = () => {
   const t = useT();
   const api = useAPIClient();
@@ -92,6 +101,7 @@ export const ReviewFlows: React.FC = () => {
       enabled: true,
       triggerMode: 'manual',
       postMode: 'manual',
+      instructions: DEFAULT_INSTRUCTION,
     });
     setOpen(true);
   };
@@ -259,7 +269,7 @@ export const ReviewFlows: React.FC = () => {
             <Input placeholder="^(feature|hotfix)/.*$" />
           </Form.Item>
           <Form.Item name="instructions" label={t('Additional Instructions (optional)')}>
-            <Input.TextArea rows={4} placeholder={t('Extra guidance appended to every review prompt')} />
+            <Input.TextArea rows={8} placeholder={t('Extra guidance appended to every review prompt')} />
           </Form.Item>
           <Form.Item name="enabled" label={t('Enabled')} valuePropName="checked">
             <Switch />

package/src/client/components/ReviewHistory.tsx

@@ -25,6 +25,7 @@ const POST_STATUS_COLOR: Record<string, string> = {
   pending_approval: 'orange',
   approved: 'cyan',
   posted: 'green',
+  post_failed: 'red',
   skipped: 'default',
   rejected: 'red',
 };
@@ -278,6 +279,7 @@ export const ReviewHistory: React.FC<{ initialFilter?: 'all' | 'pending_approval
             { value: 'pending_approval', label: t('pending_approval') },
             { value: 'approved', label: t('approved') },
             { value: 'posted', label: t('posted') },
+            { value: 'post_failed', label: t('post_failed') },
             { value: 'skipped', label: t('skipped') },
             { value: 'rejected', label: t('rejected') },
           ]}
@@ -395,7 +397,9 @@ const ReviewDetailView: React.FC<{
   const canApprove =
     review.status === 'completed' &&
     review.targetType === 'mr' &&
-    (review.postStatus === 'pending_approval' || review.postStatus === 'approved');
+    (review.postStatus === 'pending_approval' ||
+      review.postStatus === 'approved' ||
+      review.postStatus === 'post_failed');
 
   return (
     <div>
@@ -417,6 +421,15 @@ const ReviewDetailView: React.FC<{
           style={{ marginBottom: 16 }}
         />
       )}
+      {review.status === 'completed' && review.postStatus === 'post_failed' && review.error && (
+        <Alert
+          type="error"
+          showIcon
+          message={t('Post Failed')}
+          description={<pre style={{ whiteSpace: 'pre-wrap', margin: 0 }}>{review.error}</pre>}
+          style={{ marginBottom: 16 }}
+        />
+      )}
 
       {/* Action bar */}
       {canApprove && (

package/src/locale/en-US.json

@@ -125,6 +125,8 @@
   "Posted": "Posted",
   "Pending Approval": "Pending Approval",
   "Approved": "Approved",
+  "Post Failed": "Post Failed",
+  "post_failed": "Post failed",
   "Rejected": "Rejected",
   "Skipped": "Skipped",
   "Running": "Running",

package/src/locale/vi-VN.json

@@ -125,6 +125,8 @@
   "Posted": "Đã đăng",
   "Pending Approval": "Chờ duyệt",
   "Approved": "Đã duyệt",
+  "Post Failed": "Đăng thất bại",
+  "post_failed": "Đăng thất bại",
   "Rejected": "Đã từ chối",
   "Skipped": "Đã bỏ qua",
   "Running": "Đang chạy",

package/src/server/actions/git-actions.ts

@@ -91,7 +91,10 @@ function getAuthUrl(repoUrl: string, pat: string, username?: string): string {
   return url.toString();
 }
 
-function getGit(localPath: string): SimpleGit {
+function getGit(ctx: Context, localPath: string): SimpleGit {
+  if (!fs.existsSync(localPath)) {
+    ctx.throw(400, 'Repository directory does not exist. Please clone the repository first.');
+  }
   return simpleGit(localPath);
 }
 
@@ -170,7 +173,7 @@ export async function pull(ctx: Context, next: () => Promise<void>) {
   const repoUrl = (repo.get('repoUrl') as string || '').trim();
   const username = (repo.get('username') as string || '').trim();
 
-  const git = getGit(localPath);
+  const git = getGit(ctx, localPath);
   const result = await withAuth(git, localPath, repoUrl, pat, () => git.pull(), username);
 
   ctx.body = { success: true, data: result };
@@ -184,7 +187,7 @@ export async function push(ctx: Context, next: () => Promise<void>) {
   const repoUrl = (repo.get('repoUrl') as string || '').trim();
   const username = (repo.get('username') as string || '').trim();
 
-  const git = getGit(localPath);
+  const git = getGit(ctx, localPath);
   const result = await withAuth(git, localPath, repoUrl, pat, () => git.push(), username);
 
   ctx.body = { success: true, data: result };
@@ -198,7 +201,7 @@ export async function fetch(ctx: Context, next: () => Promise<void>) {
   const repoUrl = (repo.get('repoUrl') as string || '').trim();
   const username = (repo.get('username') as string || '').trim();
 
-  const git = getGit(localPath);
+  const git = getGit(ctx, localPath);
   const result = await withAuth(git, localPath, repoUrl, pat, () => git.fetch(), username);
 
   ctx.body = { success: true, data: result };
@@ -210,7 +213,7 @@ export async function diff(ctx: Context, next: () => Promise<void>) {
   const localPath = validateLocalPath(repo.get('localPath'));
   const { file, commitHash, compareHash } = ctx.action.params;
 
-  const git = getGit(localPath);
+  const git = getGit(ctx, localPath);
   const args: string[] = [];
   if (commitHash && compareHash) {
     args.push(validateRef(commitHash), validateRef(compareHash));
@@ -230,7 +233,7 @@ export async function diff(ctx: Context, next: () => Promise<void>) {
 export async function status(ctx: Context, next: () => Promise<void>) {
   const repo = await getRepo(ctx);
   const localPath = validateLocalPath(repo.get('localPath'));
-  const result = await getGit(localPath).status();
+  const result = await getGit(ctx, localPath).status();
   ctx.body = { success: true, data: result };
   await next();
 }
@@ -247,7 +250,7 @@ export async function log(ctx: Context, next: () => Promise<void>) {
     options.file = file;
   }
 
-  const result = await getGit(localPath).log(options);
+  const result = await getGit(ctx, localPath).log(options);
   ctx.body = { success: true, data: result };
   await next();
 }
@@ -255,7 +258,7 @@ export async function log(ctx: Context, next: () => Promise<void>) {
 export async function branches(ctx: Context, next: () => Promise<void>) {
   const repo = await getRepo(ctx);
   const localPath = validateLocalPath(repo.get('localPath'));
-  const result = await getGit(localPath).branch();
+  const result = await getGit(ctx, localPath).branch();
   ctx.body = { success: true, data: result };
   await next();
 }
@@ -265,7 +268,7 @@ export async function checkout(ctx: Context, next: () => Promise<void>) {
   const localPath = validateLocalPath(repo.get('localPath'));
   const { branch } = ctx.action.params;
   validateBranch(branch);
-  await getGit(localPath).checkout(branch);
+  await getGit(ctx, localPath).checkout(branch);
   ctx.body = { success: true, message: `Switched to branch ${branch}` };
   await next();
 }
@@ -275,7 +278,7 @@ export async function fileTree(ctx: Context, next: () => Promise<void>) {
   const localPath = validateLocalPath(repo.get('localPath'));
   const { ref = 'HEAD', treePath = '' } = ctx.action.params;
 
-  const git = getGit(localPath);
+  const git = getGit(ctx, localPath);
   validateRef(ref);
   if (treePath && treePath.includes('..')) {
     ctx.throw(400, 'Invalid tree path');
@@ -324,7 +327,7 @@ export async function fileContent(ctx: Context, next: () => Promise<void>) {
   }
 
   validateRef(ref);
-  const git = getGit(localPath);
+  const git = getGit(ctx, localPath);
   const content = await git.show([`${ref}:${filePath}`]);
   ctx.body = { success: true, data: { content, filePath, ref } };
   await next();
@@ -339,7 +342,7 @@ export async function commitDetail(ctx: Context, next: () => Promise<void>) {
     ctx.throw(400, 'commitHash is required');
   }
 
-  const git = getGit(localPath);
+  const git = getGit(ctx, localPath);
   validateRef(commitHash);
 
   // Use %x00 in format string to tell git to output null bytes, avoiding null bytes in args