@openvcs/git-plugin 0.2.0-nightly.20260505.53 → 0.2.0-nightly.20260508.58

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/bin/git.js

@@ -205,7 +205,7 @@ export class GitCommand {
      * history without hard-capping the result set.
      */
     listCommits(options = {}) {
-        const args = ['log', '--all'];
+        const args = ['log'];
         if (options.topo_order) {
             args.push('--topo-order');
         }
@@ -356,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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openvcs/git-plugin",
-  "version": "0.2.0-nightly.20260505.53",
+  "version": "0.2.0-nightly.20260508.58",
   "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.20260505.53",
+    "version": "0.2.0-nightly.20260508.58",
     "author": "OpenVCS Contributors",
     "description": "Git VCS backend plugin for OpenVCS",
     "default_enabled": true,
@@ -46,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

@@ -324,7 +324,7 @@ export class GitCommand {
    * 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');
@@ -502,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

@@ -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,
     },
   };
 }