@openvcs/git-plugin 0.2.0-nightly.20260509.60 → 0.3.0-edge.20260511.66

package/bin/git.js

@@ -4,7 +4,7 @@ import { spawnSync } from 'node:child_process';
 import { rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { pluginError } from '@openvcs/sdk/runtime';
-import { applySubmoduleStatusHints, asString, buildFetchArgs, buildPullFfOnlyArgs, buildPushArgs, buildSubmoduleUpdateArgs, parseCommits, parseStatusOutput, } from './plugin-helpers.js';
+import { applySubmoduleStatusHints, asString, buildFetchArgs, buildPullArgs, buildPushArgs, buildSubmoduleUpdateArgs, parseCommits, parseStatusOutput, } from './plugin-helpers.js';
 export class GitCommand {
     cwd;
     constructor(cwd) {
@@ -160,7 +160,7 @@ export class GitCommand {
         return this.runChecked(args, 'git-push-failed');
     }
     pull(options = {}) {
-        const args = buildPullFfOnlyArgs(options);
+        const args = buildPullArgs(options);
         return this.runChecked(args, 'git-pull-failed');
     }
     /** Returns the current HEAD commit id. */

package/bin/plugin-helpers.js

@@ -59,9 +59,9 @@ export function buildCloneArgs(params) {
     pushOptionalArg(args, params.dest);
     return args;
 }
-/** Builds `git pull --ff-only` arguments while omitting empty optional values. */
-export function buildPullFfOnlyArgs(params) {
-    const args = ['pull', '--ff-only'];
+/** Builds `git pull --no-rebase --no-edit` arguments while omitting empty optional values. */
+export function buildPullArgs(params) {
+    const args = ['pull', '--no-rebase', '--no-edit'];
     pushOptionalArg(args, params.remote);
     pushOptionalArg(args, params.branch);
     return args;

package/bin/plugin-request-handler.js

@@ -7,6 +7,11 @@ import { GitCommand } from './git.js';
 function asOptionalBoolean(value) {
     return typeof value === 'boolean' ? value : undefined;
 }
+/** Splits Git diff stdout into lines without manufacturing a blank entry for empty output. */
+function splitDiffLines(output) {
+    const normalized = output.trimEnd();
+    return normalized.length > 0 ? normalized.split('\n') : [];
+}
 /** Reduces a file status string to the primary status code needed for discard routing. */
 function getPrimaryDiscardStatus(status) {
     const normalized = asTrimmedString(status);
@@ -260,11 +265,11 @@ export class GitVcsDelegates extends VcsDelegateBase {
     }
     diffFile(params, _context) {
         const git = this.requireGit(params.session_id);
-        return git.diffFile(asTrimmedString(params.path)).split('\n');
+        return splitDiffLines(git.diffFile(asTrimmedString(params.path)));
     }
     diffCommit(params, _context) {
         const git = this.requireGit(params.session_id);
-        return git.diffCommit(asTrimmedString(params.rev)).split('\n');
+        return splitDiffLines(git.diffCommit(asTrimmedString(params.rev)));
     }
     getConflictDetails(params, _context) {
         const git = this.requireGit(params.session_id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openvcs/git-plugin",
-  "version": "0.2.0-nightly.20260509.60",
+  "version": "0.3.0-edge.20260511.66",
   "description": "OpenVCS Git plugin - Node.js runtime",
   "license": "GPL-3.0-or-later",
   "homepage": "https://github.com/Open-VCS/OpenVCS-Plugin-Git",
@@ -18,7 +18,7 @@
   "openvcs": {
     "id": "openvcs.git",
     "name": "Git",
-    "version": "0.2.0-nightly.20260509.60",
+    "version": "0.3.0-edge.20260511.66",
     "author": "OpenVCS Contributors",
     "description": "Git VCS backend plugin for OpenVCS",
     "default_enabled": true,

package/src/git.ts

@@ -17,7 +17,7 @@ import {
   applySubmoduleStatusHints,
   asString,
   buildFetchArgs,
-  buildPullFfOnlyArgs,
+  buildPullArgs,
   buildPushArgs,
   buildSubmoduleUpdateArgs,
   parseCommits,
@@ -270,7 +270,7 @@ export class GitCommand {
   }
 
   pull(options: PullOptions = {}): GitCommandResult {
-    const args = buildPullFfOnlyArgs(options as unknown as Record<string, unknown>);
+    const args = buildPullArgs(options as unknown as Record<string, unknown>);
     return this.runChecked(args, 'git-pull-failed');
   }
 

package/src/plugin-helpers.ts

@@ -82,9 +82,9 @@ export function buildCloneArgs(params: RequestParams): string[] {
   return args;
 }
 
-/** Builds `git pull --ff-only` arguments while omitting empty optional values. */
-export function buildPullFfOnlyArgs(params: RequestParams): string[] {
-  const args = ['pull', '--ff-only'];
+/** Builds `git pull --no-rebase --no-edit` arguments while omitting empty optional values. */
+export function buildPullArgs(params: RequestParams): string[] {
+  const args = ['pull', '--no-rebase', '--no-edit'];
   pushOptionalArg(args, params.remote);
   pushOptionalArg(args, params.branch);
   return args;

package/src/plugin-request-handler.ts

@@ -35,6 +35,12 @@ function asOptionalBoolean(value: unknown): boolean | undefined {
   return typeof value === 'boolean' ? value : undefined;
 }
 
+/** Splits Git diff stdout into lines without manufacturing a blank entry for empty output. */
+function splitDiffLines(output: string): string[] {
+  const normalized = output.trimEnd();
+  return normalized.length > 0 ? normalized.split('\n') : [];
+}
+
 /** Reduces a file status string to the primary status code needed for discard routing. */
 function getPrimaryDiscardStatus(status: string): string {
   const normalized = asTrimmedString(status);
@@ -424,7 +430,7 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
     _context: PluginRuntimeContext,
   ): string[] {
     const git = this.requireGit(params.session_id);
-    return git.diffFile(asTrimmedString(params.path)).split('\n');
+    return splitDiffLines(git.diffFile(asTrimmedString(params.path)));
   }
 
   override diffCommit(
@@ -432,7 +438,7 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
     _context: PluginRuntimeContext,
   ): string[] {
     const git = this.requireGit(params.session_id);
-    return git.diffCommit(asTrimmedString(params.rev)).split('\n');
+    return splitDiffLines(git.diffCommit(asTrimmedString(params.rev)));
   }
 
   override getConflictDetails(