@serviceme/devtools-core 0.3.3 → 0.3.4

package/dist/{index-BmxS1A9G.d.ts → index-CR1hbAnO.d.ts}

@@ -184,6 +184,24 @@ declare class StubGitSpawner implements GitSpawner {
  * RepoManager's `localSeed` use case.
  */
 declare function toFileUrl(absolutePath: string): string;
+/** Path suffix appended to a server base URL to reach its git-proxy route. */
+declare const GIT_PROXY_PATH_SUFFIX = "/git-proxy";
+/**
+ * Single source of truth for deriving a {@link GitClientOptions.serverProxyBase}
+ * from an already-resolved, non-empty server base URL (e.g. the extension's
+ * verified marketplace server). Callers that derive `serverProxyBase` from a
+ * known server base URL — extension bootstrap, the sync scheduler, the CLI
+ * bridge subprocess env — should go through this helper instead of
+ * re-deriving the `/git-proxy` suffix locally, so the route contract only
+ * lives in one place. (Standalone CLI defaults such as
+ * `http://127.0.0.1:3000/git-proxy`, used when no server base URL is known
+ * at all, are a separate concern and don't go through this helper.)
+ *
+ * Callers MUST guard against an empty/falsy `serverBaseUrl` before calling —
+ * this function does not validate its input and will happily return the
+ * non-URL `"/git-proxy"` for an empty string.
+ */
+declare function buildGitProxyBase(serverBaseUrl: string): string;
 
 /**
  * Skill & Agent v2 — SubmitClient Types (M4)
@@ -288,4 +306,4 @@ declare class SubmitClient {
     submit(repoId: string, skillName: string, files: SkillFile[], opts?: SubmitOptions): Promise<SubmitResult>;
 }
 
-export { GitClient as G, NodeGitSpawner as N, type PullResult as P, StubGitSpawner as S, GitError as a, SubmitClient as b, type SubmitClientOptions as c, SubmitError as d, type SubmitOptions as e, type SubmitResult as f, toFileUrl as t };
+export { GitClient as G, NodeGitSpawner as N, type PullResult as P, StubGitSpawner as S, GIT_PROXY_PATH_SUFFIX as a, GitError as b, SubmitClient as c, type SubmitClientOptions as d, SubmitError as e, type SubmitOptions as f, type SubmitResult as g, buildGitProxyBase as h, toFileUrl as t };

package/dist/{index-GAigCT0j.d.mts → index-CXvNx2fp.d.mts}

@@ -184,6 +184,24 @@ declare class StubGitSpawner implements GitSpawner {
  * RepoManager's `localSeed` use case.
  */
 declare function toFileUrl(absolutePath: string): string;
+/** Path suffix appended to a server base URL to reach its git-proxy route. */
+declare const GIT_PROXY_PATH_SUFFIX = "/git-proxy";
+/**
+ * Single source of truth for deriving a {@link GitClientOptions.serverProxyBase}
+ * from an already-resolved, non-empty server base URL (e.g. the extension's
+ * verified marketplace server). Callers that derive `serverProxyBase` from a
+ * known server base URL — extension bootstrap, the sync scheduler, the CLI
+ * bridge subprocess env — should go through this helper instead of
+ * re-deriving the `/git-proxy` suffix locally, so the route contract only
+ * lives in one place. (Standalone CLI defaults such as
+ * `http://127.0.0.1:3000/git-proxy`, used when no server base URL is known
+ * at all, are a separate concern and don't go through this helper.)
+ *
+ * Callers MUST guard against an empty/falsy `serverBaseUrl` before calling —
+ * this function does not validate its input and will happily return the
+ * non-URL `"/git-proxy"` for an empty string.
+ */
+declare function buildGitProxyBase(serverBaseUrl: string): string;
 
 /**
  * Skill & Agent v2 — SubmitClient Types (M4)
@@ -288,4 +306,4 @@ declare class SubmitClient {
     submit(repoId: string, skillName: string, files: SkillFile[], opts?: SubmitOptions): Promise<SubmitResult>;
 }
 
-export { GitClient as G, NodeGitSpawner as N, type PullResult as P, StubGitSpawner as S, GitError as a, SubmitClient as b, type SubmitClientOptions as c, SubmitError as d, type SubmitOptions as e, type SubmitResult as f, toFileUrl as t };
+export { GitClient as G, NodeGitSpawner as N, type PullResult as P, StubGitSpawner as S, GIT_PROXY_PATH_SUFFIX as a, GitError as b, SubmitClient as c, type SubmitClientOptions as d, SubmitError as e, type SubmitOptions as f, type SubmitResult as g, buildGitProxyBase as h, toFileUrl as t };

package/dist/index.d.mts

@@ -4,8 +4,8 @@ import * as fs from 'node:fs/promises';
 export { A as AccessCheckResult, a as AccessControl, b as AccessControlOptions, c as AuthCore, d as AuthCoreOptions, e as AuthStateManager, f as AuthStateManagerOptions, C as CancellationCheck, D as DeviceFlowUiCallback, G as GitHubAuthProvider, g as GitHubAuthProviderConfig, I as IAuthProvider, h as IAuthProviderSession, i as IAuthProviderUserInfo, j as InMemoryKeychainAuthTokenStore, K as KeyValueStore, k as KeychainAccountKey, l as KeychainAuthTokenStore, m as KeychainTokenEnvelope, n as KeychainTokenMetadata, o as KeychainUnavailableError, M as MicrosoftAuthProvider, p as MicrosoftProviderNotHostedError, O as OrgMembershipFetcher, P as ProviderRegistry, S as ServiceMeLogger, q as buildGitHubLocalEmail, r as createConsoleLogger, s as isGitHubLocalEmail, t as noopLogger, u as resolvePrimaryEmail } from './index-87-_JvQi.mjs';
 export { AtomicWriteResult, BuildSignedHeadersParams, DEVICE_JSON_SCHEMA_VERSION, DeviceAuthHeaders, DeviceCore, DeviceCoreOptions, DeviceReenrollRequiresAuthError, DeviceRequestSignatureParams, DeviceSecretVersionMismatchError, DeviceSignedHeaders, EnrollRequestFn, EnrollResponse, Enroller, EnrollerOptions, FsIdentityFileBackend, IdentityFileBackend, IdentityStore, IdentityStoreHooks, IdentityStoreOptions, PersistedDeviceIdentity, buildSignedHeaders, createDeviceRequestSignature, deriveInstallationId, fingerprintSource, randomInstallationId } from './device.mjs';
 import { c as SkillKind, b as SkillFile } from './types-B9gk3dXH.mjs';
-import { G as GitClient, P as PullResult } from './index-GAigCT0j.mjs';
-export { a as GitError, N as NodeGitSpawner, S as StubGitSpawner, b as SubmitClient, c as SubmitClientOptions, d as SubmitError, e as SubmitOptions, f as SubmitResult, t as toFileUrl } from './index-GAigCT0j.mjs';
+import { G as GitClient, P as PullResult } from './index-CXvNx2fp.mjs';
+export { a as GIT_PROXY_PATH_SUFFIX, b as GitError, N as NodeGitSpawner, S as StubGitSpawner, c as SubmitClient, d as SubmitClientOptions, e as SubmitError, f as SubmitOptions, g as SubmitResult, h as buildGitProxyBase, t as toFileUrl } from './index-CXvNx2fp.mjs';
 import * as fs$1 from 'node:fs';
 import { z } from 'zod';
 export { BUILTIN_DEFAULT_TOOLS, DefaultToolImmutableError, DefaultToolSeed, FsToolboxFileBackend, PersistedToolbox, ResolvedToolbox, TOOLBOX_JSON_SCHEMA_VERSION, ToolboxCore, ToolboxCoreOptions, ToolboxFileBackend, ToolboxPatch, ToolboxStore, ToolboxStoreHooks, ToolboxStoreOptions, WORKSPACE_TOOLBOX_RELATIVE_PATH, mergeWithDefaults, reindexOrder, sortByRecentFirst, sortByUserOrder, touchLastUsedAt } from './toolbox.mjs';
@@ -254,10 +254,18 @@ interface EnvironmentInspectorOptions {
      * use this to exercise the Windows-specific branches of the inspector.
      */
     platform?: NodeJS.Platform;
+    /**
+     * Override the value returned by `$SHELL` for POSIX login-shell
+     * fallbacks. Defaults to `process.env.SHELL`. Tests pin this so the
+     * fallback chain stays deterministic regardless of the developer's
+     * host machine.
+     */
+    shell?: string;
 }
 declare class EnvironmentInspector {
     private readonly runCommandFn;
     private readonly platform;
+    private readonly shell;
     constructor(options?: EnvironmentInspectorOptions);
     checkEnvironment(): Promise<EnvironmentCheckResult>;
     checkTool(toolName: KnownEnvironmentTool): Promise<ToolCheckResult>;

package/dist/index.d.ts

@@ -4,8 +4,8 @@ import * as fs from 'node:fs/promises';
 export { A as AccessCheckResult, a as AccessControl, b as AccessControlOptions, c as AuthCore, d as AuthCoreOptions, e as AuthStateManager, f as AuthStateManagerOptions, C as CancellationCheck, D as DeviceFlowUiCallback, G as GitHubAuthProvider, g as GitHubAuthProviderConfig, I as IAuthProvider, h as IAuthProviderSession, i as IAuthProviderUserInfo, j as InMemoryKeychainAuthTokenStore, K as KeyValueStore, k as KeychainAccountKey, l as KeychainAuthTokenStore, m as KeychainTokenEnvelope, n as KeychainTokenMetadata, o as KeychainUnavailableError, M as MicrosoftAuthProvider, p as MicrosoftProviderNotHostedError, O as OrgMembershipFetcher, P as ProviderRegistry, S as ServiceMeLogger, q as buildGitHubLocalEmail, r as createConsoleLogger, s as isGitHubLocalEmail, t as noopLogger, u as resolvePrimaryEmail } from './index-87-_JvQi.js';
 export { AtomicWriteResult, BuildSignedHeadersParams, DEVICE_JSON_SCHEMA_VERSION, DeviceAuthHeaders, DeviceCore, DeviceCoreOptions, DeviceReenrollRequiresAuthError, DeviceRequestSignatureParams, DeviceSecretVersionMismatchError, DeviceSignedHeaders, EnrollRequestFn, EnrollResponse, Enroller, EnrollerOptions, FsIdentityFileBackend, IdentityFileBackend, IdentityStore, IdentityStoreHooks, IdentityStoreOptions, PersistedDeviceIdentity, buildSignedHeaders, createDeviceRequestSignature, deriveInstallationId, fingerprintSource, randomInstallationId } from './device.js';
 import { c as SkillKind, b as SkillFile } from './types-B9gk3dXH.js';
-import { G as GitClient, P as PullResult } from './index-BmxS1A9G.js';
-export { a as GitError, N as NodeGitSpawner, S as StubGitSpawner, b as SubmitClient, c as SubmitClientOptions, d as SubmitError, e as SubmitOptions, f as SubmitResult, t as toFileUrl } from './index-BmxS1A9G.js';
+import { G as GitClient, P as PullResult } from './index-CR1hbAnO.js';
+export { a as GIT_PROXY_PATH_SUFFIX, b as GitError, N as NodeGitSpawner, S as StubGitSpawner, c as SubmitClient, d as SubmitClientOptions, e as SubmitError, f as SubmitOptions, g as SubmitResult, h as buildGitProxyBase, t as toFileUrl } from './index-CR1hbAnO.js';
 import * as fs$1 from 'node:fs';
 import { z } from 'zod';
 export { BUILTIN_DEFAULT_TOOLS, DefaultToolImmutableError, DefaultToolSeed, FsToolboxFileBackend, PersistedToolbox, ResolvedToolbox, TOOLBOX_JSON_SCHEMA_VERSION, ToolboxCore, ToolboxCoreOptions, ToolboxFileBackend, ToolboxPatch, ToolboxStore, ToolboxStoreHooks, ToolboxStoreOptions, WORKSPACE_TOOLBOX_RELATIVE_PATH, mergeWithDefaults, reindexOrder, sortByRecentFirst, sortByUserOrder, touchLastUsedAt } from './toolbox.js';
@@ -254,10 +254,18 @@ interface EnvironmentInspectorOptions {
      * use this to exercise the Windows-specific branches of the inspector.
      */
     platform?: NodeJS.Platform;
+    /**
+     * Override the value returned by `$SHELL` for POSIX login-shell
+     * fallbacks. Defaults to `process.env.SHELL`. Tests pin this so the
+     * fallback chain stays deterministic regardless of the developer's
+     * host machine.
+     */
+    shell?: string;
 }
 declare class EnvironmentInspector {
     private readonly runCommandFn;
     private readonly platform;
+    private readonly shell;
     constructor(options?: EnvironmentInspectorOptions);
     checkEnvironment(): Promise<EnvironmentCheckResult>;
     checkTool(toolName: KnownEnvironmentTool): Promise<ToolCheckResult>;

package/dist/index.js

@@ -59,6 +59,7 @@ __export(src_exports, {
   EnvironmentInspector: () => EnvironmentInspector,
   FsIdentityFileBackend: () => FsIdentityFileBackend,
   FsToolboxFileBackend: () => FsToolboxFileBackend,
+  GIT_PROXY_PATH_SUFFIX: () => GIT_PROXY_PATH_SUFFIX,
   GitClient: () => GitClient,
   GitError: () => GitError,
   GitHubAuthProvider: () => GitHubAuthProvider,
@@ -125,6 +126,7 @@ __export(src_exports, {
   bootstrapPhase5Placeholders: () => bootstrapPhase5Placeholders,
   buildDefaultReposFile: () => buildDefaultReposFile,
   buildGitHubLocalEmail: () => buildGitHubLocalEmail,
+  buildGitProxyBase: () => buildGitProxyBase,
   buildSignedHeaders: () => buildSignedHeaders,
   copilotDoctor: () => copilotDoctor,
   copilotPrompt: () => copilotPrompt,
@@ -2733,10 +2735,33 @@ var POSIX_LOGIN_SHELL_FALLBACK_TOOLS = /* @__PURE__ */ new Set([
 ]);
 var ERROR_CODE_NOT_FOUND = 127;
 var ERROR_CODE_TIMEOUT = "ETIMEDOUT";
+var NVM_FALLBACK_DIRS = [
+  "/opt/homebrew/opt/nvm",
+  "/usr/local/opt/nvm",
+  "$HOME/.nvm"
+];
+function resolveUserLoginShell(platform3, envShell) {
+  const shell = envShell?.trim();
+  if (shell && shell.length > 0) {
+    return shell;
+  }
+  return platform3 === "darwin" ? "/bin/zsh" : "/bin/bash";
+}
+function buildNvmSourcingSnippet() {
+  const fallbackList = NVM_FALLBACK_DIRS.map((dir) => `"${dir}"`).join(" ");
+  return `for d in $NVM_DIR ${fallbackList}; do [ -n "$d" ] && [ -s "$d/nvm.sh" ] && export NVM_DIR="$d" && . "$d/nvm.sh" && break; done`;
+}
+function posixLoginShellArgs(platform3, envShell, command) {
+  return {
+    command: resolveUserLoginShell(platform3, envShell),
+    args: ["-lc", `${buildNvmSourcingSnippet()}; ${command}`]
+  };
+}
 var EnvironmentInspector = class {
   constructor(options = {}) {
     this.runCommandFn = options.runCommand ?? runCommand;
     this.platform = options.platform ?? process.platform;
+    this.shell = options.shell ?? process.env.SHELL;
   }
   async checkEnvironment() {
     const results = await Promise.all(
@@ -2783,11 +2808,9 @@ var EnvironmentInspector = class {
   }
   async getToolPathFromLoginShell(toolName) {
     try {
-      const result = await this.runCommandFn("/bin/bash", {
-        args: [
-          "-lc",
-          'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; command -v ' + toolName
-        ],
+      const spawnArgs = posixLoginShellArgs(this.platform, this.shell, `command -v ${toolName}`);
+      const result = await this.runCommandFn(spawnArgs.command, {
+        args: spawnArgs.args,
         timeoutMs: this.getToolTimeout(toolName)
       });
       return result.stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
@@ -2826,11 +2849,9 @@ var EnvironmentInspector = class {
       if (!this.shouldUsePosixLoginShellFallback(toolName)) {
         throw error;
       }
-      const fallbackResult = await this.runCommandFn("/bin/bash", {
-        args: [
-          "-lc",
-          `export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; ${toolName} --version`
-        ],
+      const fallbackArgs = posixLoginShellArgs(this.platform, this.shell, `${toolName} --version`);
+      const fallbackResult = await this.runCommandFn(fallbackArgs.command, {
+        args: fallbackArgs.args,
         timeoutMs: this.getToolTimeout(toolName)
       });
       const fallbackOutput = (fallbackResult.stdout || fallbackResult.stderr).trim();
@@ -2863,11 +2884,9 @@ var EnvironmentInspector = class {
       }
     }
     try {
-      const result = await this.runCommandFn("/bin/bash", {
-        args: [
-          "-lc",
-          'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; nvm --version'
-        ],
+      const nvmArgs = posixLoginShellArgs(this.platform, this.shell, "nvm --version");
+      const result = await this.runCommandFn(nvmArgs.command, {
+        args: nvmArgs.args,
         timeoutMs: this.getToolTimeout("nvm")
       });
       return {
@@ -3054,7 +3073,9 @@ var GitClient = class {
     }
     const targetUrl = useProxy ? remoteUrl : originalUrl ?? remoteUrl;
     const proxyUrl = this.rewriteRemoteUrl(repoId, targetUrl, useProxy);
-    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], { cwd: localPath });
+    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], {
+      cwd: localPath
+    });
     const before = await this.safeRevParse(localPath);
     await this.runOrThrow(["fetch", "origin"], { cwd: localPath });
     const after = await this.safeRevParse(localPath);
@@ -3090,7 +3111,9 @@ var GitClient = class {
       throw new Error(`no 'origin' remote configured at ${localPath}`);
     }
     const proxyUrl = this.rewriteRemoteUrl(repoId, remoteUrl, useProxy);
-    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], { cwd: localPath });
+    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], {
+      cwd: localPath
+    });
     const result = await this.spawner.spawn(
       ["push", "origin", `refs/heads/${branch}:refs/heads/${branch}`],
       { cwd: localPath }
@@ -3144,7 +3167,9 @@ var GitClient = class {
     return { commitSha: sha };
   }
   async runOrThrow(args, opts) {
-    const result = await this.spawner.spawn(args, { cwd: opts.cwd ?? process.cwd() });
+    const result = await this.spawner.spawn(args, {
+      cwd: opts.cwd ?? process.cwd()
+    });
     if (result.code !== 0) {
       throw new GitError(args, result);
     }
@@ -3159,7 +3184,9 @@ var GitClient = class {
     return url.length > 0 ? url : void 0;
   }
   async safeRevParse(localPath) {
-    const result = await this.spawner.spawn(["rev-parse", "HEAD"], { cwd: localPath });
+    const result = await this.spawner.spawn(["rev-parse", "HEAD"], {
+      cwd: localPath
+    });
     if (result.code !== 0) return "";
     return result.stdout.trim();
   }
@@ -3206,7 +3233,11 @@ var StubGitSpawner = class {
     this.calls.push({ args, cwd: opts.cwd });
     const next = this.script.shift();
     if (!next) {
-      return { stdout: "", stderr: `stub: no scripted response for ${args.join(" ")}`, code: 1 };
+      return {
+        stdout: "",
+        stderr: `stub: no scripted response for ${args.join(" ")}`,
+        code: 1
+      };
     }
     return next;
   }
@@ -3218,6 +3249,10 @@ function toFileUrl(absolutePath) {
   }
   return `file://${normalized}`;
 }
+var GIT_PROXY_PATH_SUFFIX = "/git-proxy";
+function buildGitProxyBase(serverBaseUrl) {
+  return `${serverBaseUrl.replace(/\/+$/, "")}${GIT_PROXY_PATH_SUFFIX}`;
+}
 
 // src/image/imageTools.ts
 var fs5 = __toESM(require("fs/promises"));
@@ -7398,6 +7433,7 @@ var ToolboxCore = class {
   EnvironmentInspector,
   FsIdentityFileBackend,
   FsToolboxFileBackend,
+  GIT_PROXY_PATH_SUFFIX,
   GitClient,
   GitError,
   GitHubAuthProvider,
@@ -7464,6 +7500,7 @@ var ToolboxCore = class {
   bootstrapPhase5Placeholders,
   buildDefaultReposFile,
   buildGitHubLocalEmail,
+  buildGitProxyBase,
   buildSignedHeaders,
   copilotDoctor,
   copilotPrompt,