@openvcs/git-plugin 0.3.2-edge.20260531.120 → 0.3.2-edge.20260602.123

package/ARCHITECTURE.md

@@ -32,8 +32,14 @@ through `@openvcs/sdk/runtime` delegates and exposes a single VCS backend id:
 - 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.
+- Status payload entries now attach optional `binary` metadata derived from the
+  current worktree bytes when the path exists, so the client can avoid reading
+  obvious binary files as text during normal file selection.
 - 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.
+- `vcs.diff_file` returns a structured `{ lines, binary }` payload. The plugin
+  marks binary explicitly when Git emits binary patch markers, and otherwise
+  falls back to a lightweight worktree byte sniff when diff output is empty.
 - 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.

package/bin/git.js

@@ -1,7 +1,7 @@
 // Copyright © 2025-2026 OpenVCS Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 import { spawnSync } from 'node:child_process';
-import { rmSync } from 'node:fs';
+import { readFileSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { pluginError } from '@openvcs/sdk/runtime';
 import { applySubmoduleStatusHints, asString, buildFetchArgs, buildPullArgs, buildPushArgs, buildSubmoduleUpdateArgs, parseCommits, parseStatusOutput, } from './plugin-helpers.js';
@@ -63,7 +63,17 @@ export class GitCommand {
     status() {
         const result = this.run(['status', '--porcelain=1', '--branch', '-z', '-uall']);
         const parsed = applySubmoduleStatusHints(parseStatusOutput(result.stdout), this.listSubmodulePaths());
-        return { ...parsed, exitCode: result.status };
+        return {
+            ...parsed,
+            payload: {
+                ...parsed.payload,
+                files: parsed.payload.files.map((file) => ({
+                    ...file,
+                    binary: this.detectStatusFileBinary(file),
+                })),
+            },
+            exitCode: result.status,
+        };
     }
     currentBranch() {
         const result = this.runChecked(['rev-parse', '--abbrev-ref', 'HEAD'], 'git-branch-failed');
@@ -280,6 +290,55 @@ export class GitCommand {
     listSubmodulePaths() {
         return new Set(this.readSubmoduleConfig().byPath.keys());
     }
+    /** Splits diff stdout without manufacturing a blank line for empty output. */
+    splitDiffLines(output) {
+        const normalized = output.trimEnd();
+        return normalized.length > 0 ? normalized.split('\n') : [];
+    }
+    /** Returns true when Git already reported the diff target as binary. */
+    isBinaryDiffOutput(output) {
+        const lines = this.splitDiffLines(output);
+        if (lines.length === 0) {
+            return false;
+        }
+        return lines.some((line) => {
+            const candidate = String(line || '');
+            return /^binary files /i.test(candidate)
+                || /^git binary patch/i.test(candidate)
+                || /^literal /i.test(candidate);
+        });
+    }
+    /** Returns binary classification for a status entry when worktree bytes are available. */
+    detectStatusFileBinary(file) {
+        return this.readWorktreeBinaryFlag(file.path);
+    }
+    /** Reads worktree bytes and classifies likely binary content, or `null` when unavailable. */
+    readWorktreeBinaryFlag(path) {
+        const trimmedPath = String(path || '').trim();
+        if (!trimmedPath) {
+            return null;
+        }
+        try {
+            const contents = readFileSync(join(this.cwd, trimmedPath));
+            return this.isBinaryBuffer(contents);
+        }
+        catch {
+            return null;
+        }
+    }
+    /** Applies a lightweight byte sniff that keeps UTF-16 BOM text out of binary placeholders. */
+    isBinaryBuffer(contents) {
+        if (contents.length === 0) {
+            return false;
+        }
+        const hasUtf16LeBom = contents.length >= 2 && contents[0] === 0xff && contents[1] === 0xfe;
+        const hasUtf16BeBom = contents.length >= 2 && contents[0] === 0xfe && contents[1] === 0xff;
+        if (hasUtf16LeBom || hasUtf16BeBom) {
+            return false;
+        }
+        const sample = contents.subarray(0, Math.min(contents.length, 8192));
+        return sample.includes(0);
+    }
     listSubmodules() {
         const { byPath: configByPath } = this.readSubmoduleConfig();
         const statusResult = this.run(['submodule', 'status', '--recursive']);
@@ -363,7 +422,15 @@ export class GitCommand {
             .stdout;
         const worktreeDiff = this.runChecked(['diff', '--no-ext-diff', '--', path], 'git-diff-failed')
             .stdout;
-        return cachedDiff + worktreeDiff;
+        const lines = this.splitDiffLines(cachedDiff + worktreeDiff);
+        const binaryFromOutput = this.isBinaryDiffOutput(cachedDiff) || this.isBinaryDiffOutput(worktreeDiff);
+        const binary = binaryFromOutput
+            ? true
+            : (lines.length > 0 ? false : this.readWorktreeBinaryFlag(path));
+        return {
+            lines,
+            binary,
+        };
     }
     diffCommit(commit) {
         const parentCheck = this.run(['rev-parse', '--verify', `${commit}^`]);

package/bin/plugin-request-handler.js

@@ -265,7 +265,7 @@ export class GitVcsDelegates extends VcsDelegateBase {
     }
     diffFile(params, _context) {
         const git = this.requireGit(params.session_id);
-        return splitDiffLines(git.diffFile(asTrimmedString(params.path)));
+        return git.diffFile(asTrimmedString(params.path));
     }
     diffCommit(params, _context) {
         const git = this.requireGit(params.session_id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openvcs/git-plugin",
-  "version": "0.3.2-edge.20260531.120",
+  "version": "0.3.2-edge.20260602.123",
   "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.20260531.120"
+    "version": "0.3.2-edge.20260602.123"
   },
   "scripts": {
     "lint": "tsc -p tsconfig.json --noEmit",

package/src/git.ts

@@ -2,13 +2,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import { spawnSync } from 'node:child_process';
-import { rmSync } from 'node:fs';
+import { readFileSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 
 import { pluginError } from '@openvcs/sdk/runtime';
 import type {
   CommitEntry,
+  StatusFileEntry,
   StatusParseResult,
+  VcsDiffResult,
 } from '@openvcs/sdk/types';
 import type { GitCommandResult, RunGitOptions } from './plugin-types.js';
 import {
@@ -150,7 +152,17 @@ export class GitCommand {
   status(): StatusParseResult & { exitCode: number } {
     const result = this.run(['status', '--porcelain=1', '--branch', '-z', '-uall']);
     const parsed = applySubmoduleStatusHints(parseStatusOutput(result.stdout), this.listSubmodulePaths());
-    return { ...parsed, exitCode: result.status };
+    return {
+      ...parsed,
+      payload: {
+        ...parsed.payload,
+        files: parsed.payload.files.map((file) => ({
+          ...file,
+          binary: this.detectStatusFileBinary(file),
+        })),
+      },
+      exitCode: result.status,
+    };
   }
 
   currentBranch(): string {
@@ -415,6 +427,63 @@ export class GitCommand {
     return new Set(this.readSubmoduleConfig().byPath.keys());
   }
 
+  /** Splits diff stdout without manufacturing a blank line for empty output. */
+  private splitDiffLines(output: string): string[] {
+    const normalized = output.trimEnd();
+    return normalized.length > 0 ? normalized.split('\n') : [];
+  }
+
+  /** Returns true when Git already reported the diff target as binary. */
+  private isBinaryDiffOutput(output: string): boolean {
+    const lines = this.splitDiffLines(output);
+    if (lines.length === 0) {
+      return false;
+    }
+
+    return lines.some((line) => {
+      const candidate = String(line || '');
+      return /^binary files /i.test(candidate)
+        || /^git binary patch/i.test(candidate)
+        || /^literal /i.test(candidate);
+    });
+  }
+
+  /** Returns binary classification for a status entry when worktree bytes are available. */
+  private detectStatusFileBinary(file: StatusFileEntry): boolean | null {
+    return this.readWorktreeBinaryFlag(file.path);
+  }
+
+  /** Reads worktree bytes and classifies likely binary content, or `null` when unavailable. */
+  private readWorktreeBinaryFlag(path: string): boolean | null {
+    const trimmedPath = String(path || '').trim();
+    if (!trimmedPath) {
+      return null;
+    }
+
+    try {
+      const contents = readFileSync(join(this.cwd, trimmedPath));
+      return this.isBinaryBuffer(contents);
+    } catch {
+      return null;
+    }
+  }
+
+  /** Applies a lightweight byte sniff that keeps UTF-16 BOM text out of binary placeholders. */
+  private isBinaryBuffer(contents: Uint8Array): boolean {
+    if (contents.length === 0) {
+      return false;
+    }
+
+    const hasUtf16LeBom = contents.length >= 2 && contents[0] === 0xff && contents[1] === 0xfe;
+    const hasUtf16BeBom = contents.length >= 2 && contents[0] === 0xfe && contents[1] === 0xff;
+    if (hasUtf16LeBom || hasUtf16BeBom) {
+      return false;
+    }
+
+    const sample = contents.subarray(0, Math.min(contents.length, 8192));
+    return sample.includes(0);
+  }
+
   listSubmodules(): SubmoduleEntry[] {
     const { byPath: configByPath } = this.readSubmoduleConfig();
 
@@ -501,12 +570,21 @@ export class GitCommand {
     }
   }
 
-  diffFile(path: string): string {
+  diffFile(path: string): VcsDiffResult {
     const cachedDiff = this.runChecked(['diff', '--cached', '--no-ext-diff', '--', path], 'git-diff-failed')
       .stdout;
     const worktreeDiff = this.runChecked(['diff', '--no-ext-diff', '--', path], 'git-diff-failed')
       .stdout;
-    return cachedDiff + worktreeDiff;
+    const lines = this.splitDiffLines(cachedDiff + worktreeDiff);
+    const binaryFromOutput = this.isBinaryDiffOutput(cachedDiff) || this.isBinaryDiffOutput(worktreeDiff);
+    const binary = binaryFromOutput
+      ? true
+      : (lines.length > 0 ? false : this.readWorktreeBinaryFlag(path));
+
+    return {
+      lines,
+      binary,
+    };
   }
 
   diffCommit(commit: string): string {

package/src/plugin-request-handler.ts

@@ -428,9 +428,9 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
   override diffFile(
     params: OpenVcs.VcsDiffFileParams,
     _context: PluginRuntimeContext,
-  ): string[] {
+  ): OpenVcs.VcsDiffFileResponse {
     const git = this.requireGit(params.session_id);
-    return splitDiffLines(git.diffFile(asTrimmedString(params.path)));
+    return git.diffFile(asTrimmedString(params.path));
   }
 
   override diffCommit(

package/src/plugin-types.ts

@@ -10,6 +10,8 @@ export type {
   StatusParseResult,
   StatusPayload,
   StatusSummary,
+  VcsDiffFileResponse,
+  VcsDiffResult,
 } from '@openvcs/sdk/types';
 
 /** Describes one opened Git repository session. */