plugin-git-manager 1.1.9 → 1.1.10

package/src/client/context/GitManagerContext.tsx

@@ -8,6 +8,8 @@ interface Repository {
   localPath: string;
   defaultBranch: string;
   status: string;
+  autoReview?: boolean;
+  autoReviewFlowId?: number | null;
 }
 
 interface GitManagerContextType {

package/src/client/index.tsx

@@ -1,31 +1,31 @@
-import { Plugin } from '@nocobase/client';
-import React from 'react';
-import {
-  GitRepositoryWorkContext,
-  GitMergeRequestWorkContext,
-  GitCommitWorkContext,
-} from './ai-context';
-
-const GitManagerSettings = React.lazy(() =>
-  import('./components/GitManagerSettings').then((m) => ({ default: m.GitManagerSettings })),
-);
-
-export class PluginGitManagerClient extends Plugin {
-  async load() {
-    this.app.pluginSettingsManager.add('git-manager', {
-      title: this.t('Git Manager'),
-      icon: 'BranchesOutlined',
-      Component: GitManagerSettings,
-      aclSnippet: 'pm.plugin-git-manager',
-    });
-
-    const aiManager = (this.app as any).aiManager;
-    if (aiManager?.registerWorkContext) {
-      aiManager.registerWorkContext('git-repository', GitRepositoryWorkContext);
-      aiManager.registerWorkContext('git-merge-request', GitMergeRequestWorkContext);
-      aiManager.registerWorkContext('git-commit', GitCommitWorkContext);
-    }
-  }
-}
-
-export default PluginGitManagerClient;
+import { Plugin } from '@nocobase/client';
+import React from 'react';
+import {
+  GitRepositoryWorkContext,
+  GitMergeRequestWorkContext,
+  GitCommitWorkContext,
+} from './ai-context';
+
+const GitManagerSettings = React.lazy(() =>
+  import('./components/GitManagerSettings').then((m) => ({ default: m.GitManagerSettings })),
+);
+
+export class PluginGitManagerClient extends Plugin {
+  async load() {
+    (this as any).app.pluginSettingsManager.add('git-manager', {
+      title: (this as any).t('Git Manager'),
+      icon: 'BranchesOutlined',
+      Component: GitManagerSettings,
+      aclSnippet: 'pm.plugin-git-manager',
+    });
+
+    const aiManager = ((this as any).app as any).aiManager;
+    if (aiManager?.registerWorkContext) {
+      aiManager.registerWorkContext('git-repository', GitRepositoryWorkContext);
+      aiManager.registerWorkContext('git-merge-request', GitMergeRequestWorkContext);
+      aiManager.registerWorkContext('git-commit', GitCommitWorkContext);
+    }
+  }
+}
+
+export default PluginGitManagerClient;

package/src/locale/en-US.json

@@ -177,5 +177,12 @@
   "new": "new",
   "Reviewed SHA": "Reviewed SHA",
   "Latest SHA": "Latest SHA",
-  "All triggers": "All triggers"
+  "All triggers": "All triggers",
+  "Search commit title or message": "Search commit title or message",
+  "Primary Auto Flow": "Primary Auto Flow",
+  "Primary Auto Review Flow": "Primary Auto Review Flow",
+  "Only flows with automatic trigger modes are shown": "Only flows with automatic trigger modes are shown",
+  "Fallback": "Fallback",
+  "AI employee not found": "AI employee not found",
+  "Failed to open AI chat": "Failed to open AI chat"
 }

package/src/server/actions/gitlab-api.ts

@@ -1,6 +1,10 @@
 import { Context } from '@nocobase/actions';
 import { parseGitLabProject } from '../utils/gitlab-url';
 
+function getActionParams(ctx: Context) {
+  return { ...ctx.action.params, ...ctx.action.params?.values, ...((ctx as any).request?.body || {}) };
+}
+
 async function gitlabFetch(apiBase: string, endpoint: string, pat: string, params?: Record<string, any>) {
   const url = new URL(`${apiBase}${endpoint}`);
   if (params) {
@@ -33,7 +37,7 @@ async function gitlabFetch(apiBase: string, endpoint: string, pat: string, param
 
 async function getRepoApiContext(ctx: Context) {
   // Fix for POST requests where data might be in ctx.request.body
-  const params = { ...ctx.action.params, ...ctx.action.params?.values, ...( (ctx.request.body as any) || {} ) };
+  const params = getActionParams(ctx);
   const { repositoryId } = params;
   
   const repo = await ctx.db.getRepository('gitRepositories').findOne({
@@ -90,7 +94,7 @@ async function githubFetch(endpoint: string, pat: string, params?: Record<string
 export async function mergeRequests(ctx: Context, next: () => Promise<void>) {
   const { pat, apiBase, encodedProject, projectPath, isGitHub } = await getRepoApiContext(ctx);
   // Merge params from query and body
-  const params = { ...ctx.action.params, ...ctx.action.params?.values, ...( (ctx.request.body as any) || {} ) };
+  const params = getActionParams(ctx);
   const {
     state = 'opened',
     search,
@@ -207,7 +211,7 @@ export async function mergeRequests(ctx: Context, next: () => Promise<void>) {
 
 export async function mergeRequestDetail(ctx: Context, next: () => Promise<void>) {
   const { pat, apiBase, encodedProject, projectPath, isGitHub } = await getRepoApiContext(ctx);
-  const params = { ...ctx.action.params, ...ctx.action.params?.values, ...( (ctx.request.body as any) || {} ) };
+  const params = getActionParams(ctx);
   const { mrIid } = params;
 
   if (!mrIid) {
@@ -321,7 +325,7 @@ export async function mergeRequestDetail(ctx: Context, next: () => Promise<void>
 
 export async function mergeRequestNotes(ctx: Context, next: () => Promise<void>) {
   const { pat, apiBase, encodedProject, projectPath, isGitHub } = await getRepoApiContext(ctx);
-  const params = { ...ctx.action.params, ...ctx.action.params?.values, ...( (ctx.request.body as any) || {} ) };
+  const params = getActionParams(ctx);
   const { mrIid, page = 1, perPage = 50 } = params;
 
   if (!mrIid) {

package/src/server/actions/review.ts

@@ -16,6 +16,10 @@ interface TriggerArgs {
   userId?: number | string | null;
 }
 
+function getActionParams(ctx: Context) {
+  return { ...ctx.action.params, ...ctx.action.params?.values, ...((ctx as any).request?.body || {}) };
+}
+
 /**
  * Per-target mutex to prevent two concurrent calls to
  * `triggerReviewInternal` for the same MR / commit / branch from racing
@@ -47,7 +51,7 @@ async function withTriggerLock<T>(app: Application, key: string, fn: () => Promi
  * the background. The action returns immediately with the reviewId.
  */
 export async function triggerReview(ctx: Context, next: () => Promise<void>) {
-  const params = { ...ctx.action.params, ...ctx.action.params?.values, ...( (ctx.request.body as any) || {} ) };
+  const params = getActionParams(ctx);
   const {
     flowId,
     repositoryId,
@@ -215,7 +219,7 @@ async function triggerReviewInternalLocked(app: Application, args: TriggerArgs):
  * Mark a review as approved and post its content to GitLab as an MR note.
  */
 export async function reviewApprovePost(ctx: Context, next: () => Promise<void>) {
-  const params = { ...ctx.action.params, ...ctx.action.params?.values, ...( (ctx.request.body as any) || {} ) };
+  const params = getActionParams(ctx);
   const { reviewId, editedMarkdown } = params;
   if (!reviewId) ctx.throw(400, 'reviewId is required');
 
@@ -255,7 +259,7 @@ export async function reviewApprovePost(ctx: Context, next: () => Promise<void>)
  * Reject a pending review (do not post to GitLab).
  */
 export async function reviewReject(ctx: Context, next: () => Promise<void>) {
-  const params = { ...ctx.action.params, ...ctx.action.params?.values, ...( (ctx.request.body as any) || {} ) };
+  const params = getActionParams(ctx);
   const { reviewId, reason } = params;
   if (!reviewId) ctx.throw(400, 'reviewId is required');
 

package/src/server/ai-tools.ts

@@ -90,6 +90,7 @@ export function registerGitReviewAiTools(app: Application) {
       app: ctx.app,
       db: ctx.db,
       action: { params },
+      request: { ...(ctx.request || {}), body: ctx.request?.body || {} },
       throw: (status: number, message: string) => {
         const err: any = new Error(message);
         err.status = status;

package/src/server/collections/gitRepositories.ts

@@ -57,6 +57,18 @@ export default defineCollection({
       interface: 'checkbox',
       uiSchema: { title: 'Auto Review', type: 'boolean', 'x-component': 'Checkbox' },
     },
+    {
+      type: 'belongsTo',
+      name: 'autoReviewFlow',
+      target: 'gitReviewFlows',
+      foreignKey: 'autoReviewFlowId',
+      interface: 'm2o',
+      uiSchema: {
+        title: 'Primary Auto Review Flow',
+        'x-component': 'AssociationField',
+        'x-component-props': { fieldNames: { label: 'name', value: 'id' } },
+      },
+    },
     {
       type: 'date',
       name: 'lastPolledAt',

package/src/server/migrations/20260508000000-add-auto-review-flow-id.ts

@@ -0,0 +1,29 @@
+import { Migration } from '@nocobase/server';
+import { DataTypes } from 'sequelize';
+
+export default class AddAutoReviewFlowIdMigration extends Migration {
+  on = 'afterLoad';
+
+  async up() {
+    const queryInterface = (this as any).db.sequelize.getQueryInterface();
+    const tablePrefix = (this as any).db.options?.tablePrefix || '';
+    const tableName = `${tablePrefix}gitRepositories`;
+    const tableInfo = await queryInterface.describeTable(tableName).catch(() => null);
+    if (!tableInfo || tableInfo.autoReviewFlowId) return;
+
+    await queryInterface.addColumn(tableName, 'autoReviewFlowId', {
+      type: DataTypes.INTEGER,
+      allowNull: true,
+    });
+  }
+
+  async down() {
+    const queryInterface = (this as any).db.sequelize.getQueryInterface();
+    const tablePrefix = (this as any).db.options?.tablePrefix || '';
+    const tableName = `${tablePrefix}gitRepositories`;
+    const tableInfo = await queryInterface.describeTable(tableName).catch(() => null);
+    if (!tableInfo?.autoReviewFlowId) return;
+
+    await queryInterface.removeColumn(tableName, 'autoReviewFlowId');
+  }
+}

package/src/server/plugin.ts

@@ -1,180 +1,216 @@
-import { Plugin } from '@nocobase/server';
-import { resolve } from 'path';
-import * as gitActions from './actions/git-actions';
-import * as gitlabApi from './actions/gitlab-api';
-import * as reviewActions from './actions/review';
-import * as pollerActions from './actions/poller';
-import { recoverStuckReviews } from './actions/review';
-import { registerGitReviewAiTools } from './ai-tools';
-import { startPoller, stopPoller } from './poller';
-
-
-export class PluginGitManagerServer extends Plugin {
-  async load() {
-    // Ensure dayjs timezone + utc plugins are loaded globally to prevent 'm.startOf is not a function' errors
-    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: resolve(__dirname, 'collections'),
-    });
-
-    this.app.resourceManager.define({
-      name: 'gitManager',
-      actions: {
-        clone: gitActions.clone,
-        pull: gitActions.pull,
-        push: gitActions.push,
-        fetch: gitActions.fetch,
-        diff: gitActions.diff,
-        status: gitActions.status,
-        log: gitActions.log,
-        branches: gitActions.branches,
-        checkout: gitActions.checkout,
-        fileTree: gitActions.fileTree,
-        fileContent: gitActions.fileContent,
-        commitDetail: gitActions.commitDetail,
-        mergeRequests: gitlabApi.mergeRequests,
-        mergeRequestDetail: gitlabApi.mergeRequestDetail,
-        mergeRequestNotes: gitlabApi.mergeRequestNotes,
-        triggerReview: reviewActions.triggerReview,
-        reviewApprovePost: reviewActions.reviewApprovePost,
-        reviewReject: reviewActions.reviewReject,
-        pollNow: pollerActions.pollNow,
-        pollerStatus: pollerActions.pollerStatus,
-      },
-    });
-
-    // Suppress noisy workflow pre-action/post-action warnings for custom resources
-    this.app.use(async (ctx, next) => {
-      if (ctx.logger && ctx.logger.warn) {
-        const originalWarn = ctx.logger.warn.bind(ctx.logger);
-        ctx.logger.warn = (message: any, ...args: any[]) => {
-          if (
-            typeof message === 'string' &&
-            message.includes('[Workflow') &&
-            message.includes('collection') &&
-            message.includes('not found')
-          ) {
-            return ctx.logger;
-          }
-          return originalWarn(message, ...args);
-        };
-      }
-      return next();
-    });
-
-    registerGitReviewAiTools(this.app);
-
-    this.app.on('afterStart', () => {
-      // Sweep any review left in `running` state from a previous process.
-      recoverStuckReviews(this.app).catch((err) =>
-        this.app.log?.error?.('plugin-git-manager: recoverStuckReviews error', err),
-      );
-      startPoller(this.app);
-    });
-    this.app.on('beforeStop', () => {
-      stopPoller();
-    });
-    this.app.on('beforeDestroy', () => {
-      stopPoller();
-    });
-
-    // Read-only operations available to all plugin users
-    this.app.acl.registerSnippet({
-      name: `pm.${this.name}.read`,
-      actions: [
-        'gitRepositories:list',
-        'gitRepositories:get',
-        'gitReviewFlows:list',
-        'gitReviewFlows:get',
-        'gitCodeReviews:list',
-        'gitCodeReviews:get',
-        'gitManager:status',
-        'gitManager:log',
-        'gitManager:branches',
-        'gitManager:diff',
-        'gitManager:fileTree',
-        'gitManager:fileContent',
-        'gitManager:commitDetail',
-        'gitManager:mergeRequests',
-        'gitManager:mergeRequestDetail',
-        'gitManager:mergeRequestNotes',
-        'gitManager:pollerStatus',
-      ],
-    });
-
-    // Write operations require separate permission
-    this.app.acl.registerSnippet({
-      name: `pm.${this.name}.write`,
-      actions: [
-        'gitRepositories:create',
-        'gitRepositories:update',
-        'gitRepositories:destroy',
-        'gitReviewFlows:create',
-        'gitReviewFlows:update',
-        'gitReviewFlows:destroy',
-        'gitCodeReviews:create',
-        'gitCodeReviews:update',
-        'gitCodeReviews:destroy',
-        'gitManager:clone',
-        'gitManager:pull',
-        'gitManager:push',
-        'gitManager:fetch',
-        'gitManager:checkout',
-        'gitManager:triggerReview',
-        'gitManager:reviewApprovePost',
-        'gitManager:reviewReject',
-        'gitManager:pollNow',
-      ],
-    });
-
-    // Prevent overwriting PAT with obfuscated value on updates
-    this.app.resourceManager.use(async (ctx, next) => {
-      if (
-        ctx.action?.resourceName === 'gitRepositories' &&
-        ['create', 'update'].includes(ctx.action?.actionName)
-      ) {
-        if (ctx.action.params?.values?.pat === '••••••••') {
-          delete ctx.action.params.values.pat;
-        }
-        if (ctx.request.body?.pat === '••••••••') {
-          delete ctx.request.body.pat;
-        }
-      }
-      return next();
-    });
-
-    // Strip PAT from API responses — scoped to gitRepositories only
-    this.app.resourceManager.use(async (ctx, next) => {
-      if (ctx.action?.resourceName !== 'gitRepositories') {
-        return next();
-      }
-      await next();
-      if (ctx.body) {
-        const items = Array.isArray(ctx.body) ? ctx.body : ctx.body?.data ? (Array.isArray(ctx.body.data) ? ctx.body.data : [ctx.body.data]) : [ctx.body];
-        items.forEach((item) => {
-          if (item && typeof item === 'object') {
-            if (item.pat) item.pat = '••••••••';
-            if (item.dataValues?.pat) item.dataValues.pat = '••••••••';
-          }
-        });
-      }
-    });
-  }
-
-  async install() {}
-
-  async beforeDisable() {
-    stopPoller();
-  }
-
-  async beforeUnload() {
-    stopPoller();
-  }
-}
-
-export default PluginGitManagerServer;
+import { Plugin } from '@nocobase/server';
+import { resolve } from 'path';
+import { DataTypes } from 'sequelize';
+import * as gitActions from './actions/git-actions';
+import * as gitlabApi from './actions/gitlab-api';
+import * as reviewActions from './actions/review';
+import * as pollerActions from './actions/poller';
+import { recoverStuckReviews } from './actions/review';
+import { registerGitReviewAiTools } from './ai-tools';
+import { startPoller, stopPoller } from './poller';
+
+export class PluginGitManagerServer extends Plugin {
+  // @ts-ignore
+  declare app: any;
+  // @ts-ignore
+  declare db: any;
+  async beforeLoad() {
+    await (this as any).app.db.import({
+      directory: resolve(__dirname, 'collections'),
+    });
+
+    (this as any).app.db.addMigrations({
+      namespace: (this as any).name,
+      directory: resolve(__dirname, 'migrations'),
+      context: { plugin: this },
+    });
+  }
+
+  async load() {
+    // Ensure dayjs timezone + utc plugins are loaded globally to prevent 'm.startOf is not a function' errors
+    const dayjsLib = require('dayjs');
+    const utcPlugin = require('dayjs/plugin/utc');
+    const timezonePlugin = require('dayjs/plugin/timezone');
+    dayjsLib.extend(utcPlugin);
+    dayjsLib.extend(timezonePlugin);
+
+    (this as any).app.resourceManager.define({
+      name: 'gitManager',
+      actions: {
+        clone: gitActions.clone,
+        pull: gitActions.pull,
+        push: gitActions.push,
+        fetch: gitActions.fetch,
+        diff: gitActions.diff,
+        status: gitActions.status,
+        log: gitActions.log,
+        branches: gitActions.branches,
+        checkout: gitActions.checkout,
+        fileTree: gitActions.fileTree,
+        fileContent: gitActions.fileContent,
+        commitDetail: gitActions.commitDetail,
+        mergeRequests: gitlabApi.mergeRequests,
+        mergeRequestDetail: gitlabApi.mergeRequestDetail,
+        mergeRequestNotes: gitlabApi.mergeRequestNotes,
+        triggerReview: reviewActions.triggerReview,
+        reviewApprovePost: reviewActions.reviewApprovePost,
+        reviewReject: reviewActions.reviewReject,
+        pollNow: pollerActions.pollNow,
+        pollerStatus: pollerActions.pollerStatus,
+      },
+    });
+
+    // Suppress noisy workflow pre-action/post-action warnings for custom resources
+    (this as any).app.use(async (ctx, next) => {
+      if (ctx.logger && ctx.logger.warn) {
+        const originalWarn = ctx.logger.warn.bind(ctx.logger);
+        ctx.logger.warn = (message: any, ...args: any[]) => {
+          if (
+            typeof message === 'string' &&
+            message.includes('[Workflow') &&
+            message.includes('collection') &&
+            message.includes('not found')
+          ) {
+            return ctx.logger;
+          }
+          return originalWarn(message, ...args);
+        };
+      }
+      return next();
+    });
+
+    registerGitReviewAiTools((this as any).app);
+
+    (this as any).app.on('afterStart', async () => {
+      await ensureAutoReviewFlowSchema((this as any).app).catch(
+        (err) => (this as any).app.log?.error?.('plugin-git-manager: ensure schema error', err),
+      );
+      // Sweep any review left in `running` state from a previous process.
+      recoverStuckReviews((this as any).app).catch(
+        (err) => (this as any).app.log?.error?.('plugin-git-manager: recoverStuckReviews error', err),
+      );
+      startPoller((this as any).app);
+    });
+    (this as any).app.on('beforeStop', () => {
+      stopPoller();
+    });
+    (this as any).app.on('beforeDestroy', () => {
+      stopPoller();
+    });
+
+    // Read-only operations available to all plugin users
+    (this as any).app.acl.registerSnippet({
+      name: `pm.${(this as any).name}.read`,
+      actions: [
+        'gitRepositories:list',
+        'gitRepositories:get',
+        'gitReviewFlows:list',
+        'gitReviewFlows:get',
+        'gitCodeReviews:list',
+        'gitCodeReviews:get',
+        'gitManager:status',
+        'gitManager:log',
+        'gitManager:branches',
+        'gitManager:diff',
+        'gitManager:fileTree',
+        'gitManager:fileContent',
+        'gitManager:commitDetail',
+        'gitManager:mergeRequests',
+        'gitManager:mergeRequestDetail',
+        'gitManager:mergeRequestNotes',
+        'gitManager:pollerStatus',
+      ],
+    });
+
+    // Write operations require separate permission
+    (this as any).app.acl.registerSnippet({
+      name: `pm.${(this as any).name}.write`,
+      actions: [
+        'gitRepositories:create',
+        'gitRepositories:update',
+        'gitRepositories:destroy',
+        'gitReviewFlows:create',
+        'gitReviewFlows:update',
+        'gitReviewFlows:destroy',
+        'gitCodeReviews:create',
+        'gitCodeReviews:update',
+        'gitCodeReviews:destroy',
+        'gitManager:clone',
+        'gitManager:pull',
+        'gitManager:push',
+        'gitManager:fetch',
+        'gitManager:checkout',
+        'gitManager:triggerReview',
+        'gitManager:reviewApprovePost',
+        'gitManager:reviewReject',
+        'gitManager:pollNow',
+      ],
+    });
+
+    // Prevent overwriting PAT with obfuscated value on updates
+    (this as any).app.resourceManager.use(async (ctx, next) => {
+      if (ctx.action?.resourceName === 'gitRepositories' && ['create', 'update'].includes(ctx.action?.actionName)) {
+        if (ctx.action.params?.values?.pat === '••••••••') {
+          delete ctx.action.params.values.pat;
+        }
+        if (ctx.request.body?.pat === '••••••••') {
+          delete ctx.request.body.pat;
+        }
+      }
+      return next();
+    });
+
+    // Strip PAT from API responses — scoped to gitRepositories only
+    (this as any).app.resourceManager.use(async (ctx, next) => {
+      if (ctx.action?.resourceName !== 'gitRepositories') {
+        return next();
+      }
+      await next();
+      if (ctx.body) {
+        const items = Array.isArray(ctx.body)
+          ? ctx.body
+          : ctx.body?.data
+            ? Array.isArray(ctx.body.data)
+              ? ctx.body.data
+              : [ctx.body.data]
+            : [ctx.body];
+        items.forEach((item) => {
+          if (item && typeof item === 'object') {
+            if (item.pat) item.pat = '••••••••';
+            if (item.dataValues?.pat) item.dataValues.pat = '••••••••';
+          }
+        });
+      }
+    });
+  }
+
+  async install() {
+    await (this as any).app.db.getCollection('gitRepositories')?.sync();
+  }
+
+  async beforeDisable() {
+    stopPoller();
+  }
+
+  async beforeUnload() {
+    stopPoller();
+  }
+}
+
+export async function ensureAutoReviewFlowSchema(app: any) {
+  const sequelize = app.db?.sequelize;
+  const queryInterface = sequelize?.getQueryInterface?.();
+  if (!queryInterface) return;
+
+  const tablePrefix = app.db.options?.tablePrefix || '';
+  const tableName = `${tablePrefix}gitRepositories`;
+  const tableInfo = await queryInterface.describeTable(tableName).catch(() => null);
+  if (!tableInfo || tableInfo.autoReviewFlowId) return;
+
+  await queryInterface.addColumn(tableName, 'autoReviewFlowId', {
+    type: DataTypes.INTEGER,
+    allowNull: true,
+  });
+}
+
+export default PluginGitManagerServer;