plugin-git-manager 1.1.9 → 1.1.12

package/dist/server/plugin.js

@@ -37,11 +37,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var plugin_exports = {};
 __export(plugin_exports, {
   PluginGitManagerServer: () => PluginGitManagerServer,
-  default: () => plugin_default
+  default: () => plugin_default,
+  ensureAutoReviewFlowSchema: () => ensureAutoReviewFlowSchema
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_server = require("@nocobase/server");
 var import_path = require("path");
+var import_sequelize = require("sequelize");
 var gitActions = __toESM(require("./actions/git-actions"));
 var gitlabApi = __toESM(require("./actions/gitlab-api"));
 var reviewActions = __toESM(require("./actions/review"));
@@ -50,15 +52,22 @@ var import_review = require("./actions/review");
 var import_ai_tools = require("./ai-tools");
 var import_poller = require("./poller");
 class PluginGitManagerServer extends import_server.Plugin {
+  async beforeLoad() {
+    await this.app.db.import({
+      directory: (0, import_path.resolve)(__dirname, "collections")
+    });
+    this.app.db.addMigrations({
+      namespace: this.name,
+      directory: (0, import_path.resolve)(__dirname, "migrations"),
+      context: { plugin: this }
+    });
+  }
   async load() {
     const dayjsLib = require("dayjs");
     const utcPlugin = require("dayjs/plugin/utc");
     const timezonePlugin = require("dayjs/plugin/timezone");
     dayjsLib.extend(utcPlugin);
     dayjsLib.extend(timezonePlugin);
-    await this.db.import({
-      directory: (0, import_path.resolve)(__dirname, "collections")
-    });
     this.app.resourceManager.define({
       name: "gitManager",
       actions: {
@@ -96,8 +105,15 @@ 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", () => {
+    this.app.on("afterStart", async () => {
+      await ensureAutoReviewFlowSchema(this.app).catch(
+        (err) => {
+          var _a, _b;
+          return (_b = (_a = this.app.log) == null ? void 0 : _a.error) == null ? void 0 : _b.call(_a, "plugin-git-manager: ensure schema error", err);
+        }
+      );
       (0, import_review.recoverStuckReviews)(this.app).catch(
         (err) => {
           var _a, _b;
@@ -107,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({
@@ -188,16 +206,35 @@ class PluginGitManagerServer extends import_server.Plugin {
     });
   }
   async install() {
+    var _a;
+    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)();
   }
 }
+async function ensureAutoReviewFlowSchema(app) {
+  var _a, _b, _c;
+  const sequelize = (_a = app.db) == null ? void 0 : _a.sequelize;
+  const queryInterface = (_b = sequelize == null ? void 0 : sequelize.getQueryInterface) == null ? void 0 : _b.call(sequelize);
+  if (!queryInterface) return;
+  const tablePrefix = ((_c = app.db.options) == null ? void 0 : _c.tablePrefix) || "";
+  const tableName = `${tablePrefix}gitRepositories`;
+  const tableInfo = await queryInterface.describeTable(tableName).catch(() => null);
+  if (!tableInfo || tableInfo.autoReviewFlowId) return;
+  await queryInterface.addColumn(tableName, "autoReviewFlowId", {
+    type: import_sequelize.DataTypes.INTEGER,
+    allowNull: true
+  });
+}
 var plugin_default = PluginGitManagerServer;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PluginGitManagerServer
+  PluginGitManagerServer,
+  ensureAutoReviewFlowSchema
 });

package/dist/server/poller.js

@@ -202,13 +202,15 @@ async function pollOneRepo(app, repo) {
     sort: ["-repositoryId"]
   });
   if (!(flows == null ? void 0 : flows.length)) return { scanned: 0, triggered: 0 };
+  const primaryFlowId = repo.get("autoReviewFlowId");
+  const primaryFlow = primaryFlowId ? flows.find((flow) => Number(flow.get("id")) === Number(primaryFlowId)) : null;
   const pat = repo.get("pat");
   if (!pat) return { scanned: 0, triggered: 0 };
   const lastPolledAt = repo.get("lastPolledAt");
   const mrs = await listMergeRequests(repo, lastPolledAt);
   let triggered = 0;
   for (const mr of mrs) {
-    const flow = flows.find((f) => (0, import_review.branchMatches)(f, mr.source_branch));
+    const flow = primaryFlow && (0, import_review.branchMatches)(primaryFlow, mr.source_branch) ? primaryFlow : flows.find((f) => (0, import_review.branchMatches)(f, mr.source_branch));
     if (!flow) continue;
     const existing = await reviewsRepo.findOne({
       filter: {

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.9",
+  "version": "1.1.12",
   "license": "Apache-2.0",
   "main": "dist/server/index.js",
   "files": [

package/src/client/components/CommitHistory.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useCallback, memo } from 'react';
-import { Table, Empty, Spin, Typography, Tag, Drawer, List, Button, Space, Select, theme } from 'antd';
+import { Table, Empty, Spin, Typography, Tag, Drawer, List, Button, Space, Select, Input, theme } from 'antd';
 import {
   BranchesOutlined,
   UserOutlined,
@@ -37,6 +37,7 @@ export const CommitHistory: React.FC = () => {
   const [detailLoading, setDetailLoading] = useState(false);
   const [diffContent, setDiffContent] = useState<string | null>(null);
   const [diffFile, setDiffFile] = useState<string | null>(null);
+  const [searchKeyword, setSearchKeyword] = useState('');
 
   const loadHistory = useCallback(async () => {
     if (!selectedRepo) return;
@@ -48,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);
     }
@@ -61,6 +65,12 @@ export const CommitHistory: React.FC = () => {
     }
   }, [selectedRepo]);
 
+  const filteredCommits = commits.filter((commit) => {
+    const keyword = searchKeyword.trim().toLowerCase();
+    if (!keyword) return true;
+    return String(commit.message || commit.subject || commit.body || '').toLowerCase().includes(keyword);
+  });
+
   const openCommitDetail = async (commit: any) => {
     setSelectedCommit(commit);
     setDetailLoading(true);
@@ -174,14 +184,22 @@ export const CommitHistory: React.FC = () => {
           options={branchList.map((b) => ({ label: b, value: b }))}
           disabled
         />
-        <Text type="secondary">{commits.length} commits</Text>
+        <Input.Search
+          allowClear
+          size="small"
+          style={{ width: 280 }}
+          placeholder={t('Search commit title or message')}
+          value={searchKeyword}
+          onChange={(event) => setSearchKeyword(event.target.value)}
+        />
+        <Text type="secondary">{filteredCommits.length} commits</Text>
       </div>
 
       {loading ? (
         <Spin />
       ) : (
         <Table
-          dataSource={commits}
+          dataSource={filteredCommits}
           columns={columns}
           rowKey="hash"
           size="small"

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

@@ -1,8 +1,7 @@
-import React, { useState, useCallback } from 'react';
+import React, { useState, useCallback, useEffect } from 'react';
 import { Button, Space, Card, Typography, Tag, Empty, message, Spin, Descriptions, List, Badge, theme } from 'antd';
 import {
   CloudDownloadOutlined,
-  CloudUploadOutlined,
   SyncOutlined,
   BranchesOutlined,
   CheckCircleOutlined,
@@ -37,6 +36,32 @@ export const GitOperations: React.FC = () => {
   const [statusData, setStatusData] = useState<any>(null);
   const [lastResult, setLastResult] = useState<{ action: string; success: boolean; message: string } | null>(null);
 
+  const loadStatus = useCallback(async () => {
+    if (!selectedRepo || selectedRepo.status !== 'connected') {
+      setStatusData(null);
+      return;
+    }
+    setActionLoading('status');
+    try {
+      const { data } = await api.request({
+        url: 'gitManager:status',
+        method: 'post',
+        params: { repositoryId: selectedRepo.id },
+      });
+      const responseData = data?.data?.data || data?.data;
+      setStatusData(responseData);
+    } catch (error) {
+      console.warn('Failed to load git status:', error);
+      setStatusData(null);
+    } finally {
+      setActionLoading(null);
+    }
+  }, [api, selectedRepo]);
+
+  useEffect(() => {
+    loadStatus();
+  }, [loadStatus]);
+
   const execAction = useCallback(
     async (action: string) => {
       if (!selectedRepo) return;
@@ -50,10 +75,9 @@ export const GitOperations: React.FC = () => {
         });
         setLastResult({ action, success: true, message: t('{{action}} completed successfully', { action }) });
         message.success(t('{{action}} completed', { action }));
-        if (action === 'status') {
-          const responseData = data?.data?.data || data?.data;
-          setStatusData(responseData);
-        }
+        const responseData = data?.data?.data || data?.data;
+        if (action === 'status') setStatusData(responseData);
+        if (action === 'fetch' || action === 'pull') await loadStatus();
         await refreshRepos();
       } catch (err: any) {
         const msg = err?.response?.data?.errors?.[0]?.message || t('{{action}} failed', { action });
@@ -63,7 +87,7 @@ export const GitOperations: React.FC = () => {
         setActionLoading(null);
       }
     },
-    [api, selectedRepo, refreshRepos],
+    [api, selectedRepo, refreshRepos, loadStatus],
   );
 
   if (!selectedRepo) {
@@ -104,19 +128,11 @@ export const GitOperations: React.FC = () => {
         >
           {t('Pull')}
         </Button>
-        <Button
-          size="large"
-          icon={<CloudUploadOutlined />}
-          loading={actionLoading === 'push'}
-          onClick={() => execAction('push')}
-        >
-          {t('Push')}
-        </Button>
         <Button
           size="large"
           icon={<BranchesOutlined />}
           loading={actionLoading === 'status'}
-          onClick={() => execAction('status')}
+          onClick={loadStatus}
         >
           {t('Status')}
         </Button>

package/src/client/components/PollingStatus.tsx

@@ -24,12 +24,26 @@ export const PollingStatus: React.FC = () => {
   const [status, setStatus] = useState<PollerStatus | null>(null);
   const [loading, setLoading] = useState(false);
   const [pollingId, setPollingId] = useState<number | 'all' | null>(null);
+  const [flows, setFlows] = useState<any[]>([]);
 
   const reload = useCallback(async () => {
     setLoading(true);
     try {
-      const { data } = await api.request({ url: 'gitManager:pollerStatus' });
+      const [{ data }, flowsRes] = await Promise.all([
+        api.request({ url: 'gitManager:pollerStatus' }),
+        api.request({
+          url: 'gitReviewFlows:list',
+          params: {
+            pageSize: 100,
+            filter: {
+              enabled: true,
+              triggerMode: { $in: ['onMergeRequestCreated', 'both'] },
+            },
+          },
+        }),
+      ]);
       setStatus(data?.data || null);
+      setFlows(flowsRes?.data?.data || []);
       await refreshRepos();
     } finally {
       setLoading(false);
@@ -162,6 +176,18 @@ export const PollingStatus: React.FC = () => {
             pagination={false}
             columns={[
               { title: t('Repository Name'), dataIndex: 'name' },
+              {
+                title: t('Primary Auto Flow'),
+                dataIndex: 'autoReviewFlowId',
+                width: 220,
+                render: (flowId: number | null, record: any) => {
+                  const flow = flows.find((item) => Number(item.id) === Number(flowId));
+                  const fallback = flows.find((item) => item.repositoryId === record.id || item.repositoryId == null);
+                  if (flow) return <Tag color="blue">{flow.name}</Tag>;
+                  if (fallback) return <Tag color="default">{t('Fallback')}: {fallback.name}</Tag>;
+                  return <Tag color="red">{t('No matching flow available')}</Tag>;
+                },
+              },
               {
                 title: t('Last Polled At'),
                 dataIndex: 'lastPolledAt',

package/src/client/components/RepositoryConfig.tsx

@@ -1,5 +1,5 @@
-import React, { useState } from 'react';
-import { Table, Button, Modal, Form, Input, Space, Tag, Popconfirm, Switch, Tooltip, message } from 'antd';
+import React, { useCallback, useEffect, useState } from 'react';
+import { Table, Button, Modal, Form, Input, Space, Tag, Popconfirm, Switch, Tooltip, Select, message } from 'antd';
 import { PlusOutlined, DeleteOutlined, LinkOutlined, RobotOutlined } from '@ant-design/icons';
 import { useAPIClient } from '@nocobase/client';
 import { useGitManager } from '../context/GitManagerContext';
@@ -13,6 +13,33 @@ export const RepositoryConfig: React.FC = () => {
   const [editingRepo, setEditingRepo] = useState<any>(null);
   const [form] = Form.useForm();
   const [actionLoading, setActionLoading] = useState<string | null>(null);
+  const [reviewFlows, setReviewFlows] = useState<any[]>([]);
+
+  const loadReviewFlows = useCallback(async () => {
+    const { data } = await api.request({
+      url: 'gitReviewFlows:list',
+      params: {
+        pageSize: 100,
+        filter: {
+          enabled: true,
+          triggerMode: { $in: ['onMergeRequestCreated', 'both'] },
+        },
+      },
+    });
+    setReviewFlows(data?.data || []);
+  }, [api]);
+
+  useEffect(() => {
+    loadReviewFlows().catch(() => undefined);
+  }, [loadReviewFlows]);
+
+  const getAutoFlowOptions = (repoId: number) =>
+    reviewFlows
+      .filter((flow) => flow.repositoryId === repoId || flow.repositoryId == null)
+      .map((flow) => ({
+        value: flow.id,
+        label: `${flow.name}${flow.repositoryId == null ? ` (${t('global')})` : ''}`,
+      }));
 
   const handleSave = async () => {
     const values = await form.validateFields();
@@ -100,11 +127,15 @@ export const RepositoryConfig: React.FC = () => {
           checked={!!v}
           onChange={async (checked) => {
             try {
+              const options = getAutoFlowOptions(record.id);
               await api.request({
                 url: 'gitRepositories:update',
                 method: 'post',
                 params: { filterByTk: record.id },
-                data: { autoReview: checked },
+                data: {
+                  autoReview: checked,
+                  autoReviewFlowId: checked && !record.autoReviewFlowId ? options[0]?.value ?? null : record.autoReviewFlowId,
+                },
               });
               await refreshRepos();
             } catch (err: any) {
@@ -114,6 +145,40 @@ export const RepositoryConfig: React.FC = () => {
         />
       ),
     },
+    {
+      title: t('Primary Auto Flow'),
+      dataIndex: 'autoReviewFlowId',
+      key: 'autoReviewFlowId',
+      width: 220,
+      render: (value: number | null, record: any) => {
+        const options = getAutoFlowOptions(record.id);
+        return (
+          <Select
+            allowClear
+            size="small"
+            style={{ width: '100%' }}
+            disabled={!record.autoReview}
+            placeholder={t('Select a flow')}
+            value={value || undefined}
+            options={options}
+            notFoundContent={t('No matching flow available')}
+            onChange={async (flowId) => {
+              try {
+                await api.request({
+                  url: 'gitRepositories:update',
+                  method: 'post',
+                  params: { filterByTk: record.id },
+                  data: { autoReviewFlowId: flowId || null },
+                });
+                await refreshRepos();
+              } catch (err: any) {
+                message.error(err?.message || t('Failed to save'));
+              }
+            }}
+          />
+        );
+      },
+    },
     {
       title: t('Status'),
       dataIndex: 'status',
@@ -216,6 +281,14 @@ export const RepositoryConfig: React.FC = () => {
           <Form.Item name="defaultBranch" label={t('Default Branch')}>
             <Input placeholder="main" />
           </Form.Item>
+          <Form.Item name="autoReviewFlowId" label={t('Primary Auto Review Flow')} extra={t('Only flows with automatic trigger modes are shown')}>
+            <Select
+              allowClear
+              placeholder={t('Select a flow')}
+              options={getAutoFlowOptions(editingRepo?.id)}
+              notFoundContent={t('No matching flow available')}
+            />
+          </Form.Item>
         </Form>
       </Modal>
     </div>

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 && (