@serviceme/devtools-cli 0.1.4 → 0.1.5

package/dist/bridgeServer.js

@@ -9600,7 +9600,7 @@ function normalizeServicemeError(error, fallbackCode = "internal_error") {
 }
 
 // src/version.ts
-var SERVICEME_CLI_VERSION = "0.1.4";
+var SERVICEME_CLI_VERSION = "0.1.5";
 
 // src/bridge/ndjson.ts
 function writeBridgeMessage(message) {
@@ -9760,6 +9760,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_MS),
+    diagnosticArgs: redactArgs(args),
+    promptLen: payload.prompt.length
+  };
+}
 var GithubCopilotCliExecutor = class {
   async execute(payload, abortSignal) {
     const authenticated = await isCopilotAuthenticated();
@@ -9782,7 +9806,7 @@ var GithubCopilotCliExecutor = class {
   }
   executeStreaming(payload, onOutput, abortSignal) {
     const p = payload;
-    const timeoutMs = resolveConfiguredTimeoutMs(p.timeout, DEFAULT_TIMEOUT_MS);
+    const execution = resolveGithubCopilotCliExecution(p);
     let resolve;
     const resultPromise = new Promise((r) => {
       resolve = r;
@@ -9804,26 +9828,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 = child_process.spawn("serviceme", args, {
-      cwd: p.workspace,
+    const child = child_process.spawn(execution.command, execution.args, {
+      cwd: execution.cwd,
       stdio: ["ignore", "pipe", "pipe"],
       windowsHide: true
     });
@@ -9833,6 +9843,7 @@ var GithubCopilotCliExecutor = class {
 `
       );
     }
+    const timeoutMs = execution.timeoutMs;
     const timer = timeoutMs != null ? setTimeout(() => {
       child.kill("SIGTERM");
       setTimeout(() => {

package/dist/cli.js

@@ -159,6 +159,7 @@ var init_env = __esm({
       "pnpm",
       "nvm",
       "nrm",
+      "rtk",
       "dotnet",
       "nuget"
     ];
@@ -585,13 +586,19 @@ var init_copilot2 = __esm({
 });
 
 // ../../packages/serviceme-core/src/env/environmentInspector.ts
-var TOOL_CHECK_TIMEOUT_MS, ERROR_CODE_NOT_FOUND, EnvironmentInspector;
+var DEFAULT_TOOL_CHECK_TIMEOUT_MS, TOOL_CHECK_TIMEOUT_MS, ERROR_CODE_NOT_FOUND, ERROR_CODE_TIMEOUT, EnvironmentInspector;
 var init_environmentInspector = __esm({
   "../../packages/serviceme-core/src/env/environmentInspector.ts"() {
     init_src();
     init_runCommand();
-    TOOL_CHECK_TIMEOUT_MS = 5e3;
+    DEFAULT_TOOL_CHECK_TIMEOUT_MS = 5e3;
+    TOOL_CHECK_TIMEOUT_MS = {
+      nuget: 12e3,
+      nvm: 8e3,
+      dotnet: 8e3
+    };
     ERROR_CODE_NOT_FOUND = 127;
+    ERROR_CODE_TIMEOUT = "ETIMEDOUT";
     EnvironmentInspector = class {
       async checkEnvironment() {
         const results = await Promise.all(
@@ -628,19 +635,18 @@ var init_environmentInspector = __esm({
           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((line2) => line2.trim()).find((line2) => line2.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);
       }
@@ -649,7 +655,7 @@ var init_environmentInspector = __esm({
           try {
             const result = await runCommand("cmd.exe", {
               args: ["/c", "nvm version"],
-              timeoutMs: TOOL_CHECK_TIMEOUT_MS
+              timeoutMs: this.getToolTimeout("nvm")
             });
             return {
               installed: true,
@@ -669,7 +675,7 @@ var init_environmentInspector = __esm({
               "-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,
@@ -694,7 +700,7 @@ var init_environmentInspector = __esm({
         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)) {
@@ -712,17 +718,28 @@ var init_environmentInspector = __esm({
           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();
@@ -749,10 +766,11 @@ var init_environmentInspector = __esm({
         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
         };
       }
     };
@@ -11939,6 +11957,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 MAX_OUTPUT_BYTES, DEFAULT_TIMEOUT_MS2, GithubCopilotCliExecutor;
 var init_GithubCopilotCliExecutor = __esm({
   "../../packages/serviceme-core/src/scheduled-tasks/executors/GithubCopilotCliExecutor.ts"() {
@@ -11968,7 +12010,7 @@ var init_GithubCopilotCliExecutor = __esm({
       }
       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;
@@ -11990,26 +12032,12 @@ var init_GithubCopilotCliExecutor = __esm({
             }
           };
         }
-        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 = child_process.spawn("serviceme", args, {
-          cwd: p.workspace,
+        const child = child_process.spawn(execution.command, execution.args, {
+          cwd: execution.cwd,
           stdio: ["ignore", "pipe", "pipe"],
           windowsHide: true
         });
@@ -12019,6 +12047,7 @@ var init_GithubCopilotCliExecutor = __esm({
 `
           );
         }
+        const timeoutMs = execution.timeoutMs;
         const timer = timeoutMs != null ? setTimeout(() => {
           child.kill("SIGTERM");
           setTimeout(() => {
@@ -13177,7 +13206,7 @@ init_src();
 
 // src/version.ts
 var SERVICEME_CLI_NAME = "serviceme";
-var SERVICEME_CLI_VERSION = "0.1.4";
+var SERVICEME_CLI_VERSION = "0.1.5";
 
 // src/bridge/ndjson.ts
 function writeBridgeMessage(message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serviceme/devtools-cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Unified SERVICEME CLI for automation, project scaffolding, and bridge-based tooling.",
   "license": "SEE LICENSE IN LICENSE.md",
   "repository": {
@@ -42,8 +42,8 @@
     "@types/node": "^24",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "@serviceme/devtools-core": "0.1.4",
-    "@serviceme/devtools-protocol": "0.1.4"
+    "@serviceme/devtools-protocol": "0.1.5",
+    "@serviceme/devtools-core": "0.1.5"
   },
   "scripts": {
     "build": "tsup --config tsup.config.ts",