@myagentroam/node 0.9.66 → 0.9.67

package/dist/git-execution-helper.js

@@ -54,10 +54,24 @@ async function credential(operation) {
     });
 }
 async function invoke(args) {
+    const cwd = gitWorkingDirectory(args);
     const remote = await currentRemote(args);
-    const repositorySshCommand = process.env.GIT_SSH_COMMAND === undefined
-        ? undefined
-        : await gitOutput(['config', '--get', 'core.sshCommand'], gitWorkingDirectory(args));
+    const managedSshCommand = process.env.MAR_GIT_SSH_COMMAND;
+    const requestedSshCommand = process.env.GIT_SSH_COMMAND;
+    const invocationSshCommand = gitCommandLineConfig(args, 'core.sshCommand');
+    const originalSshCommand = managedSshCommand !== undefined && requestedSshCommand === managedSshCommand
+        ? (await originalGitEnvironment()).GIT_SSH_COMMAND
+        : undefined;
+    const fallbackSshCommand = managedSshCommand !== undefined &&
+        requestedSshCommand !== undefined &&
+        requestedSshCommand !== managedSshCommand
+        ? requestedSshCommand
+        : managedSshCommand === undefined
+            ? undefined
+            : (originalSshCommand ??
+                (invocationSshCommand.found
+                    ? invocationSshCommand.value
+                    : await gitOutput(['config', '--get', 'core.sshCommand'], cwd)));
     const matched = remote === undefined ? { matched: false } : await gitCredentialRequest('/identity', { remote });
     const identity = matched.matched === true &&
         typeof matched.name === 'string' &&
@@ -65,24 +79,65 @@ async function invoke(args) {
         !/[\r\n\0]/u.test(matched.name + matched.email)
         ? { name: matched.name, email: matched.email }
         : undefined;
-    const environment = identity === undefined
-        ? process.env
-        : {
-            ...process.env,
-            ...(repositorySshCommand === undefined
-                ? {}
-                : { MAR_GIT_ORIGINAL_SSH_COMMAND: repositorySshCommand }),
-            GIT_AUTHOR_NAME: identity.name,
-            GIT_COMMITTER_NAME: identity.name,
-            GIT_AUTHOR_EMAIL: identity.email,
-            GIT_COMMITTER_EMAIL: identity.email
-        };
-    if (identity === undefined && repositorySshCommand !== undefined)
-        environment.MAR_GIT_ORIGINAL_SSH_COMMAND = repositorySshCommand;
+    const environment = {
+        ...process.env,
+        ...(managedSshCommand === undefined
+            ? {}
+            : { GIT_SSH_COMMAND: managedSshCommand, GIT_SSH_VARIANT: 'ssh' }),
+        ...(fallbackSshCommand === undefined
+            ? {}
+            : { MAR_GIT_ORIGINAL_SSH_COMMAND: fallbackSshCommand }),
+        ...(identity === undefined
+            ? {}
+            : {
+                GIT_AUTHOR_NAME: identity.name,
+                GIT_COMMITTER_NAME: identity.name,
+                GIT_AUTHOR_EMAIL: identity.email,
+                GIT_COMMITTER_EMAIL: identity.email
+            })
+    };
     return run(gitExecutable(), identity === undefined
         ? args
         : ['-c', `user.name=${identity.name}`, '-c', `user.email=${identity.email}`, ...args], { environment });
 }
+function gitCommandLineConfig(args, requestedName) {
+    let result = { found: false };
+    for (let index = 0; index < args.length; index++) {
+        const argument = args[index];
+        if (argument === '--')
+            break;
+        if (!argument.startsWith('-'))
+            break;
+        let assignment;
+        if (argument === '-c')
+            assignment = args[++index];
+        else if (argument.startsWith('-c') && argument.length > 2)
+            assignment = argument.slice(2);
+        else if (argument === '--config-env') {
+            const reference = args[++index];
+            if (reference !== undefined)
+                assignment = configEnvironmentAssignment(reference);
+        }
+        else if (argument.startsWith('--config-env='))
+            assignment = configEnvironmentAssignment(argument.slice('--config-env='.length));
+        else if (['-C', '--git-dir', '--work-tree', '--namespace', '--super-prefix'].includes(argument))
+            index++;
+        if (assignment === undefined)
+            continue;
+        const equals = assignment.indexOf('=');
+        if (equals < 1 || assignment.slice(0, equals).toLowerCase() !== requestedName.toLowerCase())
+            continue;
+        result = { found: true, value: assignment.slice(equals + 1) };
+    }
+    return result;
+}
+function configEnvironmentAssignment(reference) {
+    const equals = reference.indexOf('=');
+    if (equals < 1)
+        return undefined;
+    const value = process.env[reference.slice(equals + 1)];
+    return value === undefined ? undefined : `${reference.slice(0, equals)}=${value}`;
+}
 async function currentRemote(args) {
     const cwd = gitWorkingDirectory(args);
     const branch = await gitOutput(['branch', '--show-current'], cwd);

package/dist/service/git-execution-service.js

@@ -68,8 +68,10 @@ export class GitExecutionService {
                 environment[`GIT_CONFIG_VALUE_${count + index}`] = value;
             }
             if (parsed.data.credentials.some((entry) => entry.protocol === 'SSH')) {
-                environment.GIT_SSH_COMMAND = `${helperCommand('git-execution-helper')} ssh`;
+                const sshCommand = `${helperCommand('git-execution-helper')} ssh`;
+                environment.GIT_SSH_COMMAND = sshCommand;
                 environment.GIT_SSH_VARIANT = 'ssh';
+                environment.MAR_GIT_SSH_COMMAND = sshCommand;
             }
             const pathKey = process.platform === 'win32' && original.Path !== undefined ? 'Path' : 'PATH';
             environment[pathKey] =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.66",
+  "version": "0.9.67",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0",
   "type": "module",
@@ -27,8 +27,8 @@
     "node-pty": "1.1.0",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.9.66",
-    "@myagentroam/protocol": "0.9.66"
+    "@myagentroam/agent": "0.9.67",
+    "@myagentroam/protocol": "0.9.67"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"