@openvcs/git-plugin 0.2.0-edge.20260504.52 → 0.2.0-edge.20260506.55

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

@@ -113,14 +113,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 +135,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: [],

package/package.json

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

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

@@ -147,16 +147,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 +171,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: [],