@openvcs/git-plugin 0.3.2-edge.20260603.129 → 0.3.2-edge.20260612.143

package/bin/git.js

@@ -679,8 +679,21 @@ export class GitCommand {
         this.runChecked(['config', '--local', 'user.name', name], 'git-identity-set-failed');
         this.runChecked(['config', '--local', 'user.email', email], 'git-identity-set-failed');
     }
-    mergeIntoCurrent(branch) {
-        this.runChecked(['merge', branch], 'git-merge-failed');
+    mergeIntoCurrent(branch, strategy, message) {
+        switch (strategy) {
+            case 'squash': {
+                this.runChecked(['merge', '--squash', branch], 'git-merge-failed');
+                const commitArgs = ['commit', '-m', message ?? `Merge branch '${branch}'`];
+                this.runChecked(commitArgs, 'git-merge-failed');
+                break;
+            }
+            case 'rebase':
+                this.runChecked(['merge', '--rebase', branch], 'git-merge-failed');
+                break;
+            default:
+                this.runChecked(['merge', branch], 'git-merge-failed');
+                break;
+        }
     }
     mergeAbort() {
         this.runChecked(['merge', '--abort'], 'git-merge-abort-failed');

package/bin/plugin-request-handler.js

@@ -90,6 +90,7 @@ export class GitVcsDelegates extends VcsDelegateBase {
             staging: true,
             push_pull: true,
             fast_forward: true,
+            merge_strategies: ['merge', 'squash', 'rebase'],
         };
     }
     open(params, _context) {
@@ -362,7 +363,12 @@ export class GitVcsDelegates extends VcsDelegateBase {
     }
     mergeIntoCurrent(params, _context) {
         const git = this.requireGit(params.session_id);
-        git.mergeIntoCurrent(asTrimmedString(params.name));
+        const rawStrategy = asTrimmedString(params.strategy);
+        const strategy = rawStrategy && !['merge', 'squash', 'rebase'].includes(rawStrategy)
+            ? (() => { throw pluginError('vcs-merge-invalid-strategy', `Unknown merge strategy '${rawStrategy}'. Must be 'merge', 'squash', or 'rebase'.`); })()
+            : (rawStrategy || undefined);
+        const message = asTrimmedString(params.message) || undefined;
+        git.mergeIntoCurrent(asTrimmedString(params.name), strategy, message);
         return null;
     }
     mergeAbort(params, _context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openvcs/git-plugin",
-  "version": "0.3.2-edge.20260603.129",
+  "version": "0.3.2-edge.20260612.143",
   "description": "Git VCS backend plugin for OpenVCS",
   "author": "OpenVCS Contributors",
   "license": "GPL-3.0-or-later",
@@ -35,7 +35,7 @@
         }
       ]
     },
-    "version": "0.3.2-edge.20260603.129"
+    "version": "0.3.2-edge.20260612.143"
   },
   "scripts": {
     "lint": "tsc -p tsconfig.json --noEmit",

package/src/git.ts

@@ -870,8 +870,21 @@ export class GitCommand {
     this.runChecked(['config', '--local', 'user.email', email], 'git-identity-set-failed');
   }
 
-  mergeIntoCurrent(branch: string): void {
-    this.runChecked(['merge', branch], 'git-merge-failed');
+  mergeIntoCurrent(branch: string, strategy?: string, message?: string): void {
+    switch (strategy) {
+      case 'squash': {
+        this.runChecked(['merge', '--squash', branch], 'git-merge-failed');
+        const commitArgs = ['commit', '-m', message ?? `Merge branch '${branch}'`];
+        this.runChecked(commitArgs, 'git-merge-failed');
+        break;
+      }
+      case 'rebase':
+        this.runChecked(['merge', '--rebase', branch], 'git-merge-failed');
+        break;
+      default:
+        this.runChecked(['merge', branch], 'git-merge-failed');
+        break;
+    }
   }
 
   mergeAbort(): void {

package/src/plugin-request-handler.ts

@@ -147,6 +147,7 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
       staging: true,
       push_pull: true,
       fast_forward: true,
+      merge_strategies: ['merge', 'squash', 'rebase'],
     };
   }
 
@@ -592,7 +593,12 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
     _context: PluginRuntimeContext,
   ): null {
     const git = this.requireGit(params.session_id);
-    git.mergeIntoCurrent(asTrimmedString(params.name));
+    const rawStrategy = asTrimmedString(params.strategy);
+    const strategy = rawStrategy && !['merge', 'squash', 'rebase'].includes(rawStrategy)
+      ? (() => { throw pluginError('vcs-merge-invalid-strategy', `Unknown merge strategy '${rawStrategy}'. Must be 'merge', 'squash', or 'rebase'.`); })()
+      : (rawStrategy || undefined);
+    const message = asTrimmedString(params.message) || undefined;
+    git.mergeIntoCurrent(asTrimmedString(params.name), strategy, message);
     return null;
   }