@openvcs/git-plugin 0.1.0-edge.20260422.23 → 0.1.0-edge.20260423.25

package/bin/plugin-request-handler.js

@@ -3,6 +3,10 @@
 import { VcsDelegateBase, pluginError, } from '@openvcs/sdk/runtime';
 import { asNumber, asRecord, asString, asStringArray, asTrimmedString, buildCloneArgs, parseStatusOutput, } from './plugin-helpers.js';
 import { GitCommand } from './git.js';
+/** Returns an optional boolean only when the input is already a boolean. */
+function asOptionalBoolean(value) {
+    return typeof value === 'boolean' ? value : undefined;
+}
 /** Reduces a file status string to the primary status code needed for discard routing. */
 function getPrimaryDiscardStatus(status) {
     const normalized = asTrimmedString(status);
@@ -237,8 +241,8 @@ export class GitVcsDelegates extends VcsDelegateBase {
             branch: asTrimmedString(query.rev) || undefined,
             skip: asNumber(query.skip, 0) || undefined,
             limit: asNumber(query.limit, 0),
-            topo_order: query.topo_order ?? undefined,
-            include_merges: query.include_merges ?? undefined,
+            topo_order: asOptionalBoolean(query.topo_order),
+            include_merges: asOptionalBoolean(query.include_merges),
             author_contains: asTrimmedString(query.author_contains) || undefined,
             since_utc: asTrimmedString(query.since_utc) || undefined,
             until_utc: asTrimmedString(query.until_utc) || undefined,
@@ -291,15 +295,29 @@ export class GitVcsDelegates extends VcsDelegateBase {
         }
         const status = git.runChecked(['status', '--porcelain=1', '-z', '-uall', '--', ...paths], 'git-discard-paths-failed');
         const discardPlan = planDiscardPaths(status.stdout);
+        let failure;
         if (discardPlan.unstageThenRemove.length > 0) {
-            git.runChecked(['rm', '-f', '--cached', '--', ...discardPlan.unstageThenRemove], 'git-discard-paths-failed');
+            try {
+                git.runChecked(['rm', '-f', '--cached', '--', ...discardPlan.unstageThenRemove], 'git-discard-paths-failed');
+            }
+            catch (error) {
+                failure = error;
+            }
         }
-        if (discardPlan.restore.length > 0) {
-            git.runChecked(['restore', '--source=HEAD', '--staged', '--worktree', '--', ...discardPlan.restore], 'git-discard-paths-failed');
+        if (!failure && discardPlan.restore.length > 0) {
+            try {
+                git.runChecked(['restore', '--source=HEAD', '--staged', '--worktree', '--', ...discardPlan.restore], 'git-discard-paths-failed');
+            }
+            catch (error) {
+                failure = error;
+            }
         }
-        if (discardPlan.clean.length > 0) {
+        if (!failure && discardPlan.clean.length > 0) {
             git.runChecked(['clean', '-f', '--', ...discardPlan.clean], 'git-discard-paths-failed');
         }
+        if (failure) {
+            throw failure;
+        }
         return null;
     }
     applyReversePatch(params, _context) {

package/bin/submodules.js

@@ -18,7 +18,7 @@ function payloadString(payload, key) {
     return String(payload[key] ?? '').trim();
 }
 /** Builds one modal row for a submodule entry. */
-function buildSubmoduleRow(entry) {
+export function buildSubmoduleRow(entry) {
     const metaBits = [entry.commit ? `commit ${entry.commit}` : '', entry.branch ? `branch ${entry.branch}` : '']
         .map((part) => String(part || '').trim())
         .filter(Boolean);
@@ -51,12 +51,44 @@ function buildSubmoduleRow(entry) {
         ],
     };
 }
+/** Builds an error fallback modal with a descriptive message. */
+function buildErrorModal(message) {
+    return new ModalBuilder('Error').text(message).text('Please try again or check the Git repository state.');
+}
+/** Opens a fallback modal for a submodule UI failure and preserves the original error on fallback failure. */
+export async function handleSubmoduleModalError(prefix, error, openFallback = (message) => buildErrorModal(message).open()) {
+    const message = error instanceof Error ? error.message : String(error);
+    const fullMessage = `${prefix}: ${message}`;
+    console.error(`Git submodules: ${fullMessage}`);
+    try {
+        return await openFallback(fullMessage);
+    }
+    catch {
+        throw error;
+    }
+}
 /** Builds and opens the submodule manager modal. */
 async function openSubmodulesModal() {
     const git = createGitCommand();
-    const entries = git.listSubmodules();
+    let entries;
+    try {
+        entries = git.listSubmodules();
+    }
+    catch (error) {
+        return handleSubmoduleModalError('failed to list submodules', error);
+    }
     console.log('Git submodules: building modal', { count: entries.length });
-    const modal = new ModalBuilder('Manage Submodules')
+    const modal = buildSubmodulesModal(entries);
+    try {
+        return await modal.open();
+    }
+    catch (error) {
+        return handleSubmoduleModalError('failed to open modal', error);
+    }
+}
+/** Builds the submodule manager modal with given entries. */
+function buildSubmodulesModal(entries) {
+    return new ModalBuilder('Manage Submodules')
         .text('Review, add, update, sync, and remove submodules without leaving Git.')
         .text('Use Update Remote to follow each submodule branch configured in .gitmodules.')
         .separator()
@@ -109,7 +141,6 @@ async function openSubmodulesModal() {
         emptyText: 'This repository has no submodules yet.',
         items: entries.map((entry) => buildSubmoduleRow(entry)),
     });
-    return modal.open();
 }
 /** Builds and opens the remove confirmation modal for one submodule. */
 async function openRemoveConfirmationModal(path, name) {
@@ -129,7 +160,12 @@ async function openRemoveConfirmationModal(path, name) {
             payload: { path: submodulePath, name: String(name || '').trim() || undefined },
         },
     ], { gap: '.5rem', align: 'centered', wrap: true });
-    return modal.open();
+    try {
+        return await modal.open();
+    }
+    catch (error) {
+        return handleSubmoduleModalError('failed to open remove confirmation modal', error);
+    }
 }
 /** Removes one submodule and refreshes the toolkit modal. */
 async function removeSubmodule(payload) {

package/package.json

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

package/src/plugin-request-handler.ts

@@ -30,6 +30,11 @@ export interface DiscardPathPlan {
   clean: string[];
 }
 
+/** Returns an optional boolean only when the input is already a boolean. */
+function asOptionalBoolean(value: unknown): boolean | undefined {
+  return typeof value === 'boolean' ? value : undefined;
+}
+
 /** Reduces a file status string to the primary status code needed for discard routing. */
 function getPrimaryDiscardStatus(status: string): string {
   const normalized = asTrimmedString(status);
@@ -396,8 +401,8 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
       branch: asTrimmedString(query.rev) || undefined,
       skip: asNumber(query.skip, 0) || undefined,
       limit: asNumber(query.limit, 0),
-      topo_order: query.topo_order as boolean ?? undefined,
-      include_merges: query.include_merges as boolean ?? undefined,
+      topo_order: asOptionalBoolean(query.topo_order),
+      include_merges: asOptionalBoolean(query.include_merges),
       author_contains: asTrimmedString(query.author_contains) || undefined,
       since_utc: asTrimmedString(query.since_utc) || undefined,
       until_utc: asTrimmedString(query.until_utc) || undefined,
@@ -490,23 +495,38 @@ export class GitVcsDelegates extends VcsDelegateBase<GitRuntimeDependencies> {
     );
     const discardPlan = planDiscardPaths(status.stdout);
 
+    let failure: unknown;
+
     if (discardPlan.unstageThenRemove.length > 0) {
-      git.runChecked(
-        ['rm', '-f', '--cached', '--', ...discardPlan.unstageThenRemove],
-        'git-discard-paths-failed',
-      );
+      try {
+        git.runChecked(
+          ['rm', '-f', '--cached', '--', ...discardPlan.unstageThenRemove],
+          'git-discard-paths-failed',
+        );
+      } catch (error) {
+        failure = error;
+      }
     }
 
-    if (discardPlan.restore.length > 0) {
-      git.runChecked(
-        ['restore', '--source=HEAD', '--staged', '--worktree', '--', ...discardPlan.restore],
-        'git-discard-paths-failed',
-      );
+    if (!failure && discardPlan.restore.length > 0) {
+      try {
+        git.runChecked(
+          ['restore', '--source=HEAD', '--staged', '--worktree', '--', ...discardPlan.restore],
+          'git-discard-paths-failed',
+        );
+      } catch (error) {
+        failure = error;
+      }
     }
 
-    if (discardPlan.clean.length > 0) {
+    if (!failure && discardPlan.clean.length > 0) {
       git.runChecked(['clean', '-f', '--', ...discardPlan.clean], 'git-discard-paths-failed');
     }
+
+    if (failure) {
+      throw failure;
+    }
+
     return null;
   }
 

package/src/submodules.ts

@@ -26,7 +26,7 @@ function payloadString(payload: ModalActionPayload, key: string): string {
 }
 
 /** Builds one modal row for a submodule entry. */
-function buildSubmoduleRow(entry: SubmoduleEntry) {
+export function buildSubmoduleRow(entry: SubmoduleEntry) {
   const metaBits = [entry.commit ? `commit ${entry.commit}` : '', entry.branch ? `branch ${entry.branch}` : '']
     .map((part) => String(part || '').trim())
     .filter(Boolean);
@@ -62,13 +62,52 @@ function buildSubmoduleRow(entry: SubmoduleEntry) {
   };
 }
 
+/** Builds an error fallback modal with a descriptive message. */
+function buildErrorModal(message: string): ModalBuilder {
+  return new ModalBuilder('Error').text(message).text('Please try again or check the Git repository state.');
+}
+
+/** Opens a fallback modal for a submodule UI failure and preserves the original error on fallback failure. */
+export async function handleSubmoduleModalError(
+  prefix: string,
+  error: unknown,
+  openFallback: (message: string) => Promise<unknown> = (message) => buildErrorModal(message).open(),
+): Promise<unknown> {
+  const message = error instanceof Error ? error.message : String(error);
+  const fullMessage = `${prefix}: ${message}`;
+  console.error(`Git submodules: ${fullMessage}`);
+
+  try {
+    return await openFallback(fullMessage);
+  } catch {
+    throw error;
+  }
+}
+
 /** Builds and opens the submodule manager modal. */
 async function openSubmodulesModal(): Promise<unknown> {
   const git = createGitCommand();
-  const entries = git.listSubmodules();
+
+  let entries: SubmoduleEntry[];
+  try {
+    entries = git.listSubmodules();
+  } catch (error) {
+    return handleSubmoduleModalError('failed to list submodules', error);
+  }
+
   console.log('Git submodules: building modal', { count: entries.length });
 
-  const modal = new ModalBuilder('Manage Submodules')
+  const modal = buildSubmodulesModal(entries);
+  try {
+    return await modal.open();
+  } catch (error) {
+    return handleSubmoduleModalError('failed to open modal', error);
+  }
+}
+
+/** Builds the submodule manager modal with given entries. */
+function buildSubmodulesModal(entries: SubmoduleEntry[]): ModalBuilder {
+  return new ModalBuilder('Manage Submodules')
     .text('Review, add, update, sync, and remove submodules without leaving Git.')
     .text('Use Update Remote to follow each submodule branch configured in .gitmodules.')
     .separator()
@@ -130,14 +169,13 @@ async function openSubmodulesModal(): Promise<unknown> {
       emptyText: 'This repository has no submodules yet.',
       items: entries.map((entry) => buildSubmoduleRow(entry)),
     });
-
-  return modal.open();
 }
 
 /** Builds and opens the remove confirmation modal for one submodule. */
 async function openRemoveConfirmationModal(path: string, name?: string): Promise<unknown> {
   const submodulePath = String(path || '').trim();
   if (!submodulePath) return;
+
   console.log('Git submodules: building remove confirmation', { path: submodulePath, name });
 
   const modal = new ModalBuilder('Confirm Submodule Removal')
@@ -156,7 +194,11 @@ async function openRemoveConfirmationModal(path: string, name?: string): Promise
       { gap: '.5rem', align: 'centered', wrap: true },
     );
 
-  return modal.open();
+  try {
+    return await modal.open();
+  } catch (error) {
+    return handleSubmoduleModalError('failed to open remove confirmation modal', error);
+  }
 }
 
 /** Removes one submodule and refreshes the toolkit modal. */