start-command 0.24.6 → 0.24.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # start-command
 
+## 0.24.7
+
+### Patch Changes
+
+- 1eef620: fix: display `bash -c "..."` commands with quotes in command line output (issue #91)
+
+  When a command like `bash -i -c nvm --version` was passed to Docker isolation,
+  the displayed command line was missing quotes around the `-c` script argument,
+  making the output misleading (showing `bash -i -c nvm --version` instead of
+  `bash -i -c "nvm --version"`).
+
+  A new `buildDisplayCommand()` helper is added in `shell-utils.js` that quotes
+  any space-containing `-c` script arguments so the displayed command accurately
+  reflects how it was interpreted. Shell command helpers are extracted from
+  `isolation.js` into a new `shell-utils.js` module to keep file sizes within limits.
+
 ## 0.24.6
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "start-command",
-  "version": "0.24.6",
+  "version": "0.24.7",
   "description": "Gamification of coding, execute any command with ability to auto-report issues on GitHub",
   "main": "src/bin/cli.js",
   "exports": {

package/src/lib/isolation.js

@@ -214,29 +214,12 @@ function getShellInteractiveFlag(shellPath) {
   const shellName = shellPath.split('/').pop();
   return shellName === 'bash' || shellName === 'zsh' ? '-i' : null;
 }
-const SHELL_NAMES = ['bash', 'zsh', 'sh', 'fish', 'ksh', 'csh', 'tcsh', 'dash'];
-/** True if command is a bare shell invocation (no -c); avoids bash-inside-bash (issue #84). */
-function isInteractiveShellCommand(command) {
-  const parts = command.trim().split(/\s+/);
-  return SHELL_NAMES.includes(path.basename(parts[0])) && !parts.includes('-c');
-}
-/** True if command is a shell invocation with -c (e.g. `bash -i -c "cmd"`); avoids double-wrapping (issue #91). */
-function isShellInvocationWithArgs(command) {
-  const parts = command.trim().split(/\s+/);
-  return SHELL_NAMES.includes(path.basename(parts[0])) && parts.includes('-c');
-}
-/** Build argv for shell-with-c command; everything after -c is one argument (reverses commandArgs.join(' ')). */
-function buildShellWithArgsCmdArgs(command) {
-  const parts = command.trim().split(/\s+/);
-  const cIdx = parts.indexOf('-c');
-  if (cIdx === -1) {
-    return parts;
-  }
-  const scriptArg = parts.slice(cIdx + 1).join(' ');
-  return scriptArg.length > 0
-    ? [...parts.slice(0, cIdx + 1), scriptArg]
-    : parts.slice(0, cIdx + 1);
-}
+const {
+  isInteractiveShellCommand,
+  isShellInvocationWithArgs,
+  buildShellWithArgsCmdArgs,
+  buildDisplayCommand,
+} = require('./shell-utils');
 
 /** Returns true if the current process has a TTY attached. */
 function hasTTY() {
@@ -764,7 +747,7 @@ function runInDocker(command, options = {}) {
     : detectShellInEnvironment('docker', options, options.shell);
   const shellInteractiveFlag = getShellInteractiveFlag(shellToUse);
 
-  console.log(outputBlocks.createCommandLine(command));
+  console.log(outputBlocks.createCommandLine(buildDisplayCommand(command)));
   console.log();
 
   try {
@@ -974,6 +957,7 @@ module.exports = {
   isInteractiveShellCommand,
   isShellInvocationWithArgs,
   buildShellWithArgsCmdArgs,
+  buildDisplayCommand,
   detectShellInEnvironment,
   runInScreen,
   runInTmux,

package/src/lib/shell-utils.js

@@ -0,0 +1,47 @@
+/** Shell command detection and argument-building utilities for start-command */
+
+const path = require('path');
+
+const SHELL_NAMES = ['bash', 'zsh', 'sh', 'fish', 'ksh', 'csh', 'tcsh', 'dash'];
+
+/** True if command is a bare shell invocation (no -c); avoids bash-inside-bash (issue #84). */
+function isInteractiveShellCommand(command) {
+  const parts = command.trim().split(/\s+/);
+  return SHELL_NAMES.includes(path.basename(parts[0])) && !parts.includes('-c');
+}
+
+/** True if command is a shell invocation with -c (e.g. `bash -i -c "cmd"`); avoids double-wrapping (issue #91). */
+function isShellInvocationWithArgs(command) {
+  const parts = command.trim().split(/\s+/);
+  return SHELL_NAMES.includes(path.basename(parts[0])) && parts.includes('-c');
+}
+
+/** Build argv for shell-with-c command; everything after -c is one argument (reverses commandArgs.join(' ')). */
+function buildShellWithArgsCmdArgs(command) {
+  const parts = command.trim().split(/\s+/);
+  const cIdx = parts.indexOf('-c');
+  if (cIdx === -1) {
+    return parts;
+  }
+  const scriptArg = parts.slice(cIdx + 1).join(' ');
+  return scriptArg.length > 0
+    ? [...parts.slice(0, cIdx + 1), scriptArg]
+    : parts.slice(0, cIdx + 1);
+}
+
+/** Build a display string for a command, quoting arguments that contain spaces (issue #91). */
+function buildDisplayCommand(command) {
+  if (!isShellInvocationWithArgs(command)) {
+    return command;
+  }
+  const argv = buildShellWithArgsCmdArgs(command);
+  return argv.map((arg) => (arg.includes(' ') ? `"${arg}"` : arg)).join(' ');
+}
+
+module.exports = {
+  SHELL_NAMES,
+  isInteractiveShellCommand,
+  isShellInvocationWithArgs,
+  buildShellWithArgsCmdArgs,
+  buildDisplayCommand,
+};

package/test/regression-91.test.js

@@ -34,6 +34,7 @@ const {
   isInteractiveShellCommand,
   isShellInvocationWithArgs,
   buildShellWithArgsCmdArgs,
+  buildDisplayCommand,
 } = require('../src/lib/isolation');
 
 // Helper: mirrors the attached-mode command-args construction logic in runInDocker.
@@ -258,3 +259,38 @@ describe('isShellInvocationWithArgs is mutually exclusive with isInteractiveShel
     });
   }
 });
+
+describe('buildDisplayCommand (issue #91 display fix)', () => {
+  it('should quote the -c script argument when it contains spaces', () => {
+    assert.strictEqual(
+      buildDisplayCommand('bash -i -c nvm --version'),
+      'bash -i -c "nvm --version"'
+    );
+  });
+
+  it('should quote the -c script argument for plain "bash -c echo hello"', () => {
+    assert.strictEqual(
+      buildDisplayCommand('bash -c echo hello'),
+      'bash -c "echo hello"'
+    );
+  });
+
+  it('should not double-quote if script has no spaces', () => {
+    assert.strictEqual(buildDisplayCommand('bash -c ls'), 'bash -c ls');
+  });
+
+  it('should return command unchanged for non-shell-with-args commands', () => {
+    assert.strictEqual(buildDisplayCommand('nvm --version'), 'nvm --version');
+  });
+
+  it('should return command unchanged for bare shell invocations', () => {
+    assert.strictEqual(buildDisplayCommand('bash -i'), 'bash -i');
+  });
+
+  it('should handle zsh -c with spaces', () => {
+    assert.strictEqual(
+      buildDisplayCommand('zsh -c echo hello world'),
+      'zsh -c "echo hello world"'
+    );
+  });
+});