@openvcs/git-plugin 0.1.0-nightly.20260412.10 → 0.1.0-nightly.20260421.19

package/bin/plugin-request-handler.js

@@ -1,8 +1,63 @@
 // Copyright © 2025-2026 OpenVCS Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 import { VcsDelegateBase, pluginError, } from '@openvcs/sdk/runtime';
-import { asNumber, asRecord, asString, asStringArray, asTrimmedString, buildCloneArgs, } from './plugin-helpers.js';
+import { asNumber, asRecord, asString, asStringArray, asTrimmedString, buildCloneArgs, parseStatusOutput, } from './plugin-helpers.js';
 import { GitCommand } from './git.js';
+/** Reduces a file status string to the primary status code needed for discard routing. */
+function getPrimaryDiscardStatus(status) {
+    const normalized = asTrimmedString(status);
+    if (!normalized) {
+        return 'M';
+    }
+    for (const candidate of ['?', 'R', 'C', 'A', 'D', 'U', 'T', 'S', 'M']) {
+        if (normalized.includes(candidate)) {
+            return candidate;
+        }
+    }
+    return normalized[0] ?? 'M';
+}
+/** Builds a discard plan that handles tracked, added, copied, and renamed paths. */
+export function planDiscardPaths(statusOutput) {
+    const restore = new Set();
+    const unstageThenRemove = new Set();
+    const clean = new Set();
+    const parsed = parseStatusOutput(statusOutput);
+    for (const file of parsed.payload.files) {
+        const path = asTrimmedString(file.path);
+        const oldPath = asTrimmedString(file.old_path);
+        const primaryStatus = getPrimaryDiscardStatus(file.status);
+        if (!path) {
+            continue;
+        }
+        if (primaryStatus === '?') {
+            clean.add(path);
+            continue;
+        }
+        if (primaryStatus === 'R') {
+            if (oldPath) {
+                restore.add(oldPath);
+            }
+            if (file.staged) {
+                unstageThenRemove.add(path);
+            }
+            clean.add(path);
+            continue;
+        }
+        if (primaryStatus === 'C' || primaryStatus === 'A') {
+            if (file.staged) {
+                unstageThenRemove.add(path);
+            }
+            clean.add(path);
+            continue;
+        }
+        restore.add(path);
+    }
+    return {
+        restore: Array.from(restore),
+        unstageThenRemove: Array.from(unstageThenRemove),
+        clean: Array.from(clean),
+    };
+}
 /** Implements the Git-backed `vcs.*` delegate surface for the SDK runtime. */
 export class GitVcsDelegates extends VcsDelegateBase {
     /** Returns the required repository worktree path for a session id. */
@@ -231,7 +286,17 @@ export class GitVcsDelegates extends VcsDelegateBase {
         if (paths.length === 0) {
             return null;
         }
-        git.runChecked(['checkout', '--', ...paths], 'git-discard-paths-failed');
+        const status = git.runChecked(['status', '--porcelain=1', '-z', '-uall', '--', ...paths], 'git-discard-paths-failed');
+        const discardPlan = planDiscardPaths(status.stdout);
+        if (discardPlan.unstageThenRemove.length > 0) {
+            git.runChecked(['rm', '-f', '--cached', '--', ...discardPlan.unstageThenRemove], 'git-discard-paths-failed');
+        }
+        if (discardPlan.restore.length > 0) {
+            git.runChecked(['restore', '--source=HEAD', '--staged', '--worktree', '--', ...discardPlan.restore], 'git-discard-paths-failed');
+        }
+        if (discardPlan.clean.length > 0) {
+            git.runChecked(['clean', '-f', '--', ...discardPlan.clean], 'git-discard-paths-failed');
+        }
         return null;
     }
     applyReversePatch(params, _context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openvcs/git-plugin",
-  "version": "0.1.0-nightly.20260412.10",
+  "version": "0.1.0-nightly.20260421.19",
   "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.1.0-nightly.20260412.10",
+    "version": "0.1.0-nightly.20260421.19",
     "author": "OpenVCS Contributors",
     "description": "Git VCS backend plugin for OpenVCS",
     "default_enabled": true,
@@ -37,7 +37,7 @@
     "build": "node ./node_modules/@openvcs/sdk/bin/openvcs.js build"
   },
   "dependencies": {
-    "@openvcs/sdk": "^0.2.18-edge.20260411.9"
+    "@openvcs/sdk": "edge"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",

package/src/plugin-request-handler.ts

@@ -15,10 +15,87 @@ import {
   asStringArray,
   asTrimmedString,
   buildCloneArgs,
+  parseStatusOutput,
 } from './plugin-helpers.js';
 import { GitCommand } from './git.js';
 import type { GitSession } from './plugin-types.js';
 
+/** Describes the Git operations needed to discard a set of paths safely. */
+export interface DiscardPathPlan {
+  /** Restores tracked paths from HEAD in both the index and worktree. */
+  restore: string[];
+  /** Removes newly added index entries before deleting their worktree files. */
+  unstageThenRemove: string[];
+  /** Deletes untracked worktree paths after index state has been corrected. */
+  clean: string[];
+}
+
+/** Reduces a file status string to the primary status code needed for discard routing. */
+function getPrimaryDiscardStatus(status: string): string {
+  const normalized = asTrimmedString(status);
+  if (!normalized) {
+    return 'M';
+  }
+
+  for (const candidate of ['?', 'R', 'C', 'A', 'D', 'U', 'T', 'S', 'M']) {
+    if (normalized.includes(candidate)) {
+      return candidate;
+    }
+  }
+
+  return normalized[0] ?? 'M';
+}
+
+/** Builds a discard plan that handles tracked, added, copied, and renamed paths. */
+export function planDiscardPaths(statusOutput: string): DiscardPathPlan {
+  const restore = new Set<string>();
+  const unstageThenRemove = new Set<string>();
+  const clean = new Set<string>();
+  const parsed = parseStatusOutput(statusOutput);
+
+  for (const file of parsed.payload.files) {
+    const path = asTrimmedString(file.path);
+    const oldPath = asTrimmedString(file.old_path);
+    const primaryStatus = getPrimaryDiscardStatus(file.status);
+
+    if (!path) {
+      continue;
+    }
+
+    if (primaryStatus === '?') {
+      clean.add(path);
+      continue;
+    }
+
+    if (primaryStatus === 'R') {
+      if (oldPath) {
+        restore.add(oldPath);
+      }
+      if (file.staged) {
+        unstageThenRemove.add(path);
+      }
+      clean.add(path);
+      continue;
+    }
+
+    if (primaryStatus === 'C' || primaryStatus === 'A') {
+      if (file.staged) {
+        unstageThenRemove.add(path);
+      }
+      clean.add(path);
+      continue;
+    }
+
+    restore.add(path);
+  }
+
+  return {
+    restore: Array.from(restore),
+    unstageThenRemove: Array.from(unstageThenRemove),
+    clean: Array.from(clean),
+  };
+}
+
 /** Describes the Git runtime services consumed by the VCS delegates. */
 export interface GitRuntimeDependencies {
   /** Allocates a new repository session and returns its id. */
@@ -396,7 +473,29 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
       return null;
     }
 
-    git.runChecked(['checkout', '--', ...paths], 'git-discard-paths-failed');
+    const status = git.runChecked(
+      ['status', '--porcelain=1', '-z', '-uall', '--', ...paths],
+      'git-discard-paths-failed',
+    );
+    const discardPlan = planDiscardPaths(status.stdout);
+
+    if (discardPlan.unstageThenRemove.length > 0) {
+      git.runChecked(
+        ['rm', '-f', '--cached', '--', ...discardPlan.unstageThenRemove],
+        'git-discard-paths-failed',
+      );
+    }
+
+    if (discardPlan.restore.length > 0) {
+      git.runChecked(
+        ['restore', '--source=HEAD', '--staged', '--worktree', '--', ...discardPlan.restore],
+        'git-discard-paths-failed',
+      );
+    }
+
+    if (discardPlan.clean.length > 0) {
+      git.runChecked(['clean', '-f', '--', ...discardPlan.clean], 'git-discard-paths-failed');
+    }
     return null;
   }