@serviceme/devtools-core 0.1.4 → 0.1.5

package/dist/index.d.mts

@@ -19,7 +19,8 @@ declare class EnvironmentInspector {
     private getToolVersion;
     private checkNvm;
     private checkNuget;
-    private getVersionCommand;
+    private getVersionInvocation;
+    private getToolTimeout;
     private parseVersion;
     private handleToolCheckError;
 }

package/dist/index.d.ts

@@ -19,7 +19,8 @@ declare class EnvironmentInspector {
     private getToolVersion;
     private checkNvm;
     private checkNuget;
-    private getVersionCommand;
+    private getVersionInvocation;
+    private getToolTimeout;
     private parseVersion;
     private handleToolCheckError;
 }

package/dist/index.js

@@ -293,8 +293,14 @@ async function copilotPrompt(options) {
 
 // src/env/environmentInspector.ts
 var import_devtools_protocol3 = require("@serviceme/devtools-protocol");
-var TOOL_CHECK_TIMEOUT_MS = 5e3;
+var DEFAULT_TOOL_CHECK_TIMEOUT_MS = 5e3;
+var TOOL_CHECK_TIMEOUT_MS = {
+  nuget: 12e3,
+  nvm: 8e3,
+  dotnet: 8e3
+};
 var ERROR_CODE_NOT_FOUND = 127;
+var ERROR_CODE_TIMEOUT = "ETIMEDOUT";
 var EnvironmentInspector = class {
   async checkEnvironment() {
     const results = await Promise.all(
@@ -331,19 +337,18 @@ var EnvironmentInspector = class {
       const isWindows = process.platform === "win32";
       const result = await runCommand(isWindows ? "where" : "which", {
         args: [toolName],
-        timeoutMs: TOOL_CHECK_TIMEOUT_MS
+        timeoutMs: this.getToolTimeout(toolName)
       });
-      return result.stdout.trim().split("\n")[0];
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
     } catch {
       return void 0;
     }
   }
   async getToolVersion(toolName) {
-    const command = this.getVersionCommand(toolName);
-    const isWindows = process.platform === "win32";
-    const result = await runCommand(isWindows ? "cmd.exe" : "/bin/bash", {
-      args: isWindows ? ["/c", command] : ["-lc", command],
-      timeoutMs: TOOL_CHECK_TIMEOUT_MS
+    const invocation = this.getVersionInvocation(toolName);
+    const result = await runCommand(invocation.command, {
+      args: invocation.args,
+      timeoutMs: this.getToolTimeout(toolName)
     });
     return this.parseVersion(toolName, result.stdout || result.stderr);
   }
@@ -352,7 +357,7 @@ var EnvironmentInspector = class {
       try {
         const result = await runCommand("cmd.exe", {
           args: ["/c", "nvm version"],
-          timeoutMs: TOOL_CHECK_TIMEOUT_MS
+          timeoutMs: this.getToolTimeout("nvm")
         });
         return {
           installed: true,
@@ -372,7 +377,7 @@ var EnvironmentInspector = class {
           "-lc",
           'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; nvm --version'
         ],
-        timeoutMs: TOOL_CHECK_TIMEOUT_MS
+        timeoutMs: this.getToolTimeout("nvm")
       });
       return {
         installed: true,
@@ -397,7 +402,7 @@ var EnvironmentInspector = class {
     try {
       const result = await runCommand("dotnet", {
         args: ["nuget", "list", "source"],
-        timeoutMs: TOOL_CHECK_TIMEOUT_MS
+        timeoutMs: this.getToolTimeout("nuget")
       });
       const privateSourceUrl = "http://192.168.20.209:10010/nuget";
       if (result.stdout.includes(privateSourceUrl)) {
@@ -415,17 +420,28 @@ var EnvironmentInspector = class {
       return this.handleToolCheckError(error);
     }
   }
-  getVersionCommand(toolName) {
+  getVersionInvocation(toolName) {
+    const isWindows = process.platform === "win32";
+    if (isWindows && ["npm", "pnpm", "nrm"].includes(toolName)) {
+      return {
+        command: "cmd.exe",
+        args: ["/d", "/s", "/c", `${toolName} --version`]
+      };
+    }
     const commands = {
-      git: "git --version",
-      node: "node --version",
-      npm: "npm --version",
-      pnpm: "pnpm --version",
-      nvm: "nvm --version",
-      nrm: "nrm --version",
-      dotnet: "dotnet --version"
+      git: { command: "git", args: ["--version"] },
+      node: { command: "node", args: ["--version"] },
+      npm: { command: "npm", args: ["--version"] },
+      pnpm: { command: "pnpm", args: ["--version"] },
+      nvm: { command: "nvm", args: ["--version"] },
+      nrm: { command: "nrm", args: ["--version"] },
+      rtk: { command: "rtk", args: ["--version"] },
+      dotnet: { command: "dotnet", args: ["--version"] }
     };
-    return commands[toolName] || `${toolName} --version`;
+    return commands[toolName] || { command: toolName, args: ["--version"] };
+  }
+  getToolTimeout(toolName) {
+    return TOOL_CHECK_TIMEOUT_MS[toolName] ?? DEFAULT_TOOL_CHECK_TIMEOUT_MS;
   }
   parseVersion(toolName, output) {
     const cleaned = output.trim();
@@ -452,10 +468,11 @@ var EnvironmentInspector = class {
     const execError = error;
     const message = execError.message || String(error);
     const code = execError.code;
-    const isNotFound = message.includes("command not found") || message.includes("not recognized") || code === ERROR_CODE_NOT_FOUND;
+    const isNotFound = message.includes("command not found") || message.includes("not recognized") || message.includes("ENOENT") || code === "ENOENT" || code === ERROR_CODE_NOT_FOUND;
+    const isTimeout = code === ERROR_CODE_TIMEOUT || message.toLowerCase().includes("timed out");
     return {
       installed: false,
-      error: isNotFound ? "Not installed" : message
+      error: isNotFound ? "Not installed" : isTimeout ? "Check timed out" : message
     };
   }
 };
@@ -1161,6 +1178,30 @@ function writeDiagnostic(message) {
   }
   process.stderr.write(message);
 }
+function resolveGithubCopilotCliExecution(payload) {
+  const args = ["copilot", "prompt", "--prompt", payload.prompt];
+  if (payload.autopilot) {
+    args.push("--autopilot");
+  }
+  if (payload.allowTools && payload.allowTools.length > 0) {
+    args.push("--allow-tools", payload.allowTools.join(","));
+  }
+  if (payload.model) {
+    args.push("--model", payload.model);
+  }
+  if (payload.agent) {
+    args.push("--agent", payload.agent);
+  }
+  args.push("--timeout", String(payload.timeout ?? 0));
+  return {
+    command: "serviceme",
+    args,
+    cwd: payload.workspace,
+    timeoutMs: resolveConfiguredTimeoutMs(payload.timeout, DEFAULT_TIMEOUT_MS2),
+    diagnosticArgs: redactArgs(args),
+    promptLen: payload.prompt.length
+  };
+}
 var GithubCopilotCliExecutor = class {
   async execute(payload, abortSignal) {
     const authenticated = await isCopilotAuthenticated();
@@ -1183,7 +1224,7 @@ var GithubCopilotCliExecutor = class {
   }
   executeStreaming(payload, onOutput, abortSignal) {
     const p = payload;
-    const timeoutMs = resolveConfiguredTimeoutMs(p.timeout, DEFAULT_TIMEOUT_MS2);
+    const execution = resolveGithubCopilotCliExecution(p);
     let resolve;
     const resultPromise = new Promise((r) => {
       resolve = r;
@@ -1205,26 +1246,12 @@ var GithubCopilotCliExecutor = class {
         }
       };
     }
-    const args = ["copilot", "prompt", "--prompt", p.prompt];
-    if (p.autopilot) {
-      args.push("--autopilot");
-    }
-    if (p.allowTools && p.allowTools.length > 0) {
-      args.push("--allow-tools", p.allowTools.join(","));
-    }
-    if (p.model) {
-      args.push("--model", p.model);
-    }
-    if (p.agent) {
-      args.push("--agent", p.agent);
-    }
-    args.push("--timeout", String(p.timeout ?? 0));
     writeDiagnostic(
-      `[GithubCopilotCliExecutor] spawn: command=serviceme, args=${JSON.stringify(redactArgs(args))}, promptLen=${p.prompt.length}, cwd=${p.workspace ?? "(default)"}, platform=${process.platform}, windowsHide=true, pid=${process.pid}
+      `[GithubCopilotCliExecutor] spawn: command=${execution.command}, args=${JSON.stringify(execution.diagnosticArgs)}, promptLen=${execution.promptLen}, cwd=${execution.cwd ?? "(default)"}, platform=${process.platform}, windowsHide=true, pid=${process.pid}
 `
     );
-    const child = (0, import_node_child_process2.spawn)("serviceme", args, {
-      cwd: p.workspace,
+    const child = (0, import_node_child_process2.spawn)(execution.command, execution.args, {
+      cwd: execution.cwd,
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
@@ -1234,6 +1261,7 @@ var GithubCopilotCliExecutor = class {
 `
       );
     }
+    const timeoutMs = execution.timeoutMs;
     const timer = timeoutMs != null ? setTimeout(() => {
       child.kill("SIGTERM");
       setTimeout(() => {

package/dist/index.mjs

@@ -244,8 +244,14 @@ import {
   createServicemeError as createServicemeError3,
   KNOWN_ENVIRONMENT_TOOLS
 } from "@serviceme/devtools-protocol";
-var TOOL_CHECK_TIMEOUT_MS = 5e3;
+var DEFAULT_TOOL_CHECK_TIMEOUT_MS = 5e3;
+var TOOL_CHECK_TIMEOUT_MS = {
+  nuget: 12e3,
+  nvm: 8e3,
+  dotnet: 8e3
+};
 var ERROR_CODE_NOT_FOUND = 127;
+var ERROR_CODE_TIMEOUT = "ETIMEDOUT";
 var EnvironmentInspector = class {
   async checkEnvironment() {
     const results = await Promise.all(
@@ -282,19 +288,18 @@ var EnvironmentInspector = class {
       const isWindows = process.platform === "win32";
       const result = await runCommand(isWindows ? "where" : "which", {
         args: [toolName],
-        timeoutMs: TOOL_CHECK_TIMEOUT_MS
+        timeoutMs: this.getToolTimeout(toolName)
       });
-      return result.stdout.trim().split("\n")[0];
+      return result.stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
     } catch {
       return void 0;
     }
   }
   async getToolVersion(toolName) {
-    const command = this.getVersionCommand(toolName);
-    const isWindows = process.platform === "win32";
-    const result = await runCommand(isWindows ? "cmd.exe" : "/bin/bash", {
-      args: isWindows ? ["/c", command] : ["-lc", command],
-      timeoutMs: TOOL_CHECK_TIMEOUT_MS
+    const invocation = this.getVersionInvocation(toolName);
+    const result = await runCommand(invocation.command, {
+      args: invocation.args,
+      timeoutMs: this.getToolTimeout(toolName)
     });
     return this.parseVersion(toolName, result.stdout || result.stderr);
   }
@@ -303,7 +308,7 @@ var EnvironmentInspector = class {
       try {
         const result = await runCommand("cmd.exe", {
           args: ["/c", "nvm version"],
-          timeoutMs: TOOL_CHECK_TIMEOUT_MS
+          timeoutMs: this.getToolTimeout("nvm")
         });
         return {
           installed: true,
@@ -323,7 +328,7 @@ var EnvironmentInspector = class {
           "-lc",
           'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; nvm --version'
         ],
-        timeoutMs: TOOL_CHECK_TIMEOUT_MS
+        timeoutMs: this.getToolTimeout("nvm")
       });
       return {
         installed: true,
@@ -348,7 +353,7 @@ var EnvironmentInspector = class {
     try {
       const result = await runCommand("dotnet", {
         args: ["nuget", "list", "source"],
-        timeoutMs: TOOL_CHECK_TIMEOUT_MS
+        timeoutMs: this.getToolTimeout("nuget")
       });
       const privateSourceUrl = "http://192.168.20.209:10010/nuget";
       if (result.stdout.includes(privateSourceUrl)) {
@@ -366,17 +371,28 @@ var EnvironmentInspector = class {
       return this.handleToolCheckError(error);
     }
   }
-  getVersionCommand(toolName) {
+  getVersionInvocation(toolName) {
+    const isWindows = process.platform === "win32";
+    if (isWindows && ["npm", "pnpm", "nrm"].includes(toolName)) {
+      return {
+        command: "cmd.exe",
+        args: ["/d", "/s", "/c", `${toolName} --version`]
+      };
+    }
     const commands = {
-      git: "git --version",
-      node: "node --version",
-      npm: "npm --version",
-      pnpm: "pnpm --version",
-      nvm: "nvm --version",
-      nrm: "nrm --version",
-      dotnet: "dotnet --version"
+      git: { command: "git", args: ["--version"] },
+      node: { command: "node", args: ["--version"] },
+      npm: { command: "npm", args: ["--version"] },
+      pnpm: { command: "pnpm", args: ["--version"] },
+      nvm: { command: "nvm", args: ["--version"] },
+      nrm: { command: "nrm", args: ["--version"] },
+      rtk: { command: "rtk", args: ["--version"] },
+      dotnet: { command: "dotnet", args: ["--version"] }
     };
-    return commands[toolName] || `${toolName} --version`;
+    return commands[toolName] || { command: toolName, args: ["--version"] };
+  }
+  getToolTimeout(toolName) {
+    return TOOL_CHECK_TIMEOUT_MS[toolName] ?? DEFAULT_TOOL_CHECK_TIMEOUT_MS;
   }
   parseVersion(toolName, output) {
     const cleaned = output.trim();
@@ -403,10 +419,11 @@ var EnvironmentInspector = class {
     const execError = error;
     const message = execError.message || String(error);
     const code = execError.code;
-    const isNotFound = message.includes("command not found") || message.includes("not recognized") || code === ERROR_CODE_NOT_FOUND;
+    const isNotFound = message.includes("command not found") || message.includes("not recognized") || message.includes("ENOENT") || code === "ENOENT" || code === ERROR_CODE_NOT_FOUND;
+    const isTimeout = code === ERROR_CODE_TIMEOUT || message.toLowerCase().includes("timed out");
     return {
       installed: false,
-      error: isNotFound ? "Not installed" : message
+      error: isNotFound ? "Not installed" : isTimeout ? "Check timed out" : message
     };
   }
 };
@@ -1127,6 +1144,30 @@ function writeDiagnostic(message) {
   }
   process.stderr.write(message);
 }
+function resolveGithubCopilotCliExecution(payload) {
+  const args = ["copilot", "prompt", "--prompt", payload.prompt];
+  if (payload.autopilot) {
+    args.push("--autopilot");
+  }
+  if (payload.allowTools && payload.allowTools.length > 0) {
+    args.push("--allow-tools", payload.allowTools.join(","));
+  }
+  if (payload.model) {
+    args.push("--model", payload.model);
+  }
+  if (payload.agent) {
+    args.push("--agent", payload.agent);
+  }
+  args.push("--timeout", String(payload.timeout ?? 0));
+  return {
+    command: "serviceme",
+    args,
+    cwd: payload.workspace,
+    timeoutMs: resolveConfiguredTimeoutMs(payload.timeout, DEFAULT_TIMEOUT_MS2),
+    diagnosticArgs: redactArgs(args),
+    promptLen: payload.prompt.length
+  };
+}
 var GithubCopilotCliExecutor = class {
   async execute(payload, abortSignal) {
     const authenticated = await isCopilotAuthenticated();
@@ -1149,7 +1190,7 @@ var GithubCopilotCliExecutor = class {
   }
   executeStreaming(payload, onOutput, abortSignal) {
     const p = payload;
-    const timeoutMs = resolveConfiguredTimeoutMs(p.timeout, DEFAULT_TIMEOUT_MS2);
+    const execution = resolveGithubCopilotCliExecution(p);
     let resolve;
     const resultPromise = new Promise((r) => {
       resolve = r;
@@ -1171,26 +1212,12 @@ var GithubCopilotCliExecutor = class {
         }
       };
     }
-    const args = ["copilot", "prompt", "--prompt", p.prompt];
-    if (p.autopilot) {
-      args.push("--autopilot");
-    }
-    if (p.allowTools && p.allowTools.length > 0) {
-      args.push("--allow-tools", p.allowTools.join(","));
-    }
-    if (p.model) {
-      args.push("--model", p.model);
-    }
-    if (p.agent) {
-      args.push("--agent", p.agent);
-    }
-    args.push("--timeout", String(p.timeout ?? 0));
     writeDiagnostic(
-      `[GithubCopilotCliExecutor] spawn: command=serviceme, args=${JSON.stringify(redactArgs(args))}, promptLen=${p.prompt.length}, cwd=${p.workspace ?? "(default)"}, platform=${process.platform}, windowsHide=true, pid=${process.pid}
+      `[GithubCopilotCliExecutor] spawn: command=${execution.command}, args=${JSON.stringify(execution.diagnosticArgs)}, promptLen=${execution.promptLen}, cwd=${execution.cwd ?? "(default)"}, platform=${process.platform}, windowsHide=true, pid=${process.pid}
 `
     );
-    const child = spawn2("serviceme", args, {
-      cwd: p.workspace,
+    const child = spawn2(execution.command, execution.args, {
+      cwd: execution.cwd,
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
@@ -1200,6 +1227,7 @@ var GithubCopilotCliExecutor = class {
 `
       );
     }
+    const timeoutMs = execution.timeoutMs;
     const timer = timeoutMs != null ? setTimeout(() => {
       child.kill("SIGTERM");
       setTimeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serviceme/devtools-core",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Reusable Node.js core capabilities powering the SERVICEME CLI and integrations.",
   "license": "SEE LICENSE IN LICENSE.md",
   "repository": {
@@ -36,7 +36,7 @@
     "comment-json": "^4.5.1",
     "json5": "^2.2.3",
     "yauzl": "^3.2.0",
-    "@serviceme/devtools-protocol": "0.1.4"
+    "@serviceme/devtools-protocol": "0.1.5"
   },
   "devDependencies": {
     "@types/node": "^24",