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

package/ARCHITECTURE.md

@@ -29,6 +29,14 @@ through `@openvcs/sdk/runtime` delegates and exposes a single VCS backend id:
 - For rename and copy records, the porcelain format includes two NUL-terminated
   paths: the original/source path first, then the new/destination path. The
   plugin assigns `path` to the new path and `old_path` to the original path.
+- Unmerged porcelain states such as `UU`, `AA`, and `DD` are normalized to `U`
+  in status payloads so the client opens merge-conflict UI instead of a normal
+  diff view.
+- File diffs first read worktree changes and fall back to `git diff --cached`
+  for staged-only files so selected staged changes still render textual hunks.
+- Commit history uses the current `HEAD` or requested revision instead of
+  `git log --all`, so internal refs such as `refs/stash` are not shown as normal
+  history entries.
 - Network commands (`fetch`, `push`, `pull`) omit optional arguments (remote,
   refspec, branch) when not provided, allowing Git to use its defaults instead
   of receiving empty string arguments.

package/README.md

@@ -61,12 +61,12 @@ npm pack
 
 ## Release Channels
 
-The npm package can be consumed from prerelease channels published by CI:
+CI publishes prereleases with these dist-tags:
 
-- `latest`: stable releases
+- `latest`: stable releases from `Stable`
 - `beta`: builds from the `Beta` branch
+- `nightly`: scheduled builds from `Dev` when changes exist since the last nightly
 - `edge`: working builds from `Dev` push commits
-- `nightly`: scheduled builds from `Dev` when there are changes since the last nightly
 
 Examples:
 

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. */
@@ -198,12 +198,18 @@ export class GitCommand {
         }
         this.runChecked(['add', '-A', '--', ...paths], 'git-stage-paths-failed');
     }
+    /**
+     * Lists commits from Git with an optional cap.
+     *
+     * A non-positive limit skips the `-n` flag so callers can request the full
+     * history without hard-capping the result set.
+     */
     listCommits(options = {}) {
-        const args = ['log', '--all'];
+        const args = ['log'];
         if (options.topo_order) {
             args.push('--topo-order');
         }
-        if (options.limit !== undefined) {
+        if (options.limit !== undefined && options.limit > 0) {
             args.push(`-${options.limit}`);
         }
         if (options.skip !== undefined) {
@@ -350,7 +356,12 @@ export class GitCommand {
         }
     }
     diffFile(path) {
-        return this.runChecked(['diff', '--no-ext-diff', '--', path], 'git-diff-failed').stdout;
+        const worktreeDiff = this.runChecked(['diff', '--no-ext-diff', '--', path], 'git-diff-failed')
+            .stdout;
+        if (worktreeDiff.trim().length > 0)
+            return worktreeDiff;
+        return this.runChecked(['diff', '--cached', '--no-ext-diff', '--', path], 'git-diff-failed')
+            .stdout;
     }
     diffCommit(commit) {
         return this.runChecked(['diff', `${commit}^`, commit], 'git-diff-failed').stdout;

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;
@@ -83,6 +83,7 @@ export function parseStatusOutput(output) {
     const records = output.split('\0').filter(Boolean);
     let ahead = 0;
     let behind = 0;
+    let branchOnRemote = false;
     const files = [];
     const summary = {
         untracked: 0,
@@ -97,6 +98,8 @@ export function parseStatusOutput(output) {
             const behindMatch = record.match(/behind\s+(\d+)/);
             ahead = aheadMatch ? Number(aheadMatch[1]) : 0;
             behind = behindMatch ? Number(behindMatch[1]) : 0;
+            const trackingMatch = record.match(/^## [^ ]+\.\.\.\S+/);
+            branchOnRemote = !!trackingMatch;
             continue;
         }
         if (record.length < 4) {
@@ -113,14 +116,15 @@ export function parseStatusOutput(output) {
             oldPath = payloadPath;
             index += 1;
         }
+        const conflicted = x === 'U' ||
+            y === 'U' ||
+            (x === 'A' && y === 'A') ||
+            (x === 'D' && y === 'D');
         const staged = x !== ' ' && x !== '?';
         if (x === '?' || y === '?') {
             summary.untracked += 1;
         }
-        else if (x === 'U' ||
-            y === 'U' ||
-            (x === 'A' && y === 'A') ||
-            (x === 'D' && y === 'D')) {
+        else if (conflicted) {
             summary.conflicted += 1;
         }
         else {
@@ -134,7 +138,7 @@ export function parseStatusOutput(output) {
         files.push({
             path,
             old_path: oldPath,
-            status: `${x}${y}`.trim() || 'M',
+            status: conflicted ? 'U' : `${x}${y}`.trim() || 'M',
             staged,
             resolved_conflict: false,
             hunks: [],
@@ -146,6 +150,7 @@ export function parseStatusOutput(output) {
             files,
             ahead,
             behind,
+            branch_on_remote: branchOnRemote,
         },
     };
 }

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);
@@ -159,7 +164,15 @@ export class GitVcsDelegates extends VcsDelegateBase {
     }
     createBranch(params, _context) {
         const git = this.requireGit(params.session_id);
-        git.createBranch(asTrimmedString(params.name));
+        const name = asTrimmedString(params.name);
+        const checkout = params.checkout === true;
+        if (checkout) {
+            git.createBranch(name);
+            git.checkoutBranch(name);
+        }
+        else {
+            git.createBranch(name);
+        }
         return null;
     }
     checkoutBranch(params, _context) {
@@ -252,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",
+  "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,14 +18,23 @@
   "openvcs": {
     "id": "openvcs.git",
     "name": "Git",
-    "version": "0.2.0",
+    "version": "0.3.0-edge.20260511.66",
     "author": "OpenVCS Contributors",
     "description": "Git VCS backend plugin for OpenVCS",
     "default_enabled": true,
     "module": {
       "exec": "openvcs-git-plugin.js",
       "vcs_backends": [
-        "git"
+        {
+          "id": "git",
+          "name": "Git",
+          "action_labels": {
+            "VCS.Commit": "Commit",
+            "VCS.Fetch": "Fetch",
+            "VCS.Pull": "Pull",
+            "VCS.Push": "Push"
+          }
+        }
       ]
     }
   },
@@ -37,7 +46,7 @@
     "build": "node ./node_modules/@openvcs/sdk/bin/openvcs.js build"
   },
   "dependencies": {
-    "@openvcs/sdk": "edge"
+    "@openvcs/sdk": "^0.3.0-edge.20260506.51"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",

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');
   }
 
@@ -317,14 +317,20 @@ export class GitCommand {
     this.runChecked(['add', '-A', '--', ...paths], 'git-stage-paths-failed');
   }
 
+  /**
+   * Lists commits from Git with an optional cap.
+   *
+   * A non-positive limit skips the `-n` flag so callers can request the full
+   * history without hard-capping the result set.
+   */
   listCommits(options: ListCommitsOptions = {}): { commits: CommitEntry[]; exitCode: number } {
-    const args = ['log', '--all'];
+    const args = ['log'];
 
     if (options.topo_order) {
       args.push('--topo-order');
     }
 
-    if (options.limit !== undefined) {
+    if (options.limit !== undefined && options.limit > 0) {
       args.push(`-${options.limit}`);
     }
 
@@ -496,7 +502,12 @@ export class GitCommand {
   }
 
   diffFile(path: string): string {
-    return this.runChecked(['diff', '--no-ext-diff', '--', path], 'git-diff-failed').stdout;
+    const worktreeDiff = this.runChecked(['diff', '--no-ext-diff', '--', path], 'git-diff-failed')
+      .stdout;
+    if (worktreeDiff.trim().length > 0) return worktreeDiff;
+
+    return this.runChecked(['diff', '--cached', '--no-ext-diff', '--', path], 'git-diff-failed')
+      .stdout;
   }
 
   diffCommit(commit: string): string {

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;
@@ -111,6 +111,7 @@ export function parseStatusOutput(output: string): StatusParseResult {
   const records = output.split('\0').filter(Boolean);
   let ahead = 0;
   let behind = 0;
+  let branchOnRemote = false;
   const files: StatusFileEntry[] = [];
   const summary: StatusSummary = {
     untracked: 0,
@@ -127,6 +128,8 @@ export function parseStatusOutput(output: string): StatusParseResult {
       const behindMatch = record.match(/behind\s+(\d+)/);
       ahead = aheadMatch ? Number(aheadMatch[1]) : 0;
       behind = behindMatch ? Number(behindMatch[1]) : 0;
+      const trackingMatch = record.match(/^## [^ ]+\.\.\.\S+/);
+      branchOnRemote = !!trackingMatch;
       continue;
     }
 
@@ -147,16 +150,16 @@ export function parseStatusOutput(output: string): StatusParseResult {
       index += 1;
     }
 
+    const conflicted =
+      x === 'U' ||
+      y === 'U' ||
+      (x === 'A' && y === 'A') ||
+      (x === 'D' && y === 'D');
     const staged = x !== ' ' && x !== '?';
 
     if (x === '?' || y === '?') {
       summary.untracked += 1;
-    } else if (
-      x === 'U' ||
-      y === 'U' ||
-      (x === 'A' && y === 'A') ||
-      (x === 'D' && y === 'D')
-    ) {
+    } else if (conflicted) {
       summary.conflicted += 1;
     } else {
       if (staged) {
@@ -171,7 +174,7 @@ export function parseStatusOutput(output: string): StatusParseResult {
     files.push({
       path,
       old_path: oldPath,
-      status: `${x}${y}`.trim() || 'M',
+      status: conflicted ? 'U' : `${x}${y}`.trim() || 'M',
       staged,
       resolved_conflict: false,
       hunks: [],
@@ -184,6 +187,7 @@ export function parseStatusOutput(output: string): StatusParseResult {
       files,
       ahead,
       behind,
+      branch_on_remote: branchOnRemote,
     },
   };
 }

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);
@@ -261,7 +267,15 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
     _context: PluginRuntimeContext,
   ): null {
     const git = this.requireGit(params.session_id);
-    git.createBranch(asTrimmedString(params.name));
+    const name = asTrimmedString(params.name);
+    const checkout = params.checkout === true;
+
+    if (checkout) {
+      git.createBranch(name);
+      git.checkoutBranch(name);
+    } else {
+      git.createBranch(name);
+    }
     return null;
   }
 
@@ -416,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(
@@ -424,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(