pinokiod 7.5.37 → 7.5.38

package/kernel/shell.js

@@ -351,16 +351,14 @@ class Shell {
       !(params && params.input) &&
       this.hasCondaCommand(params && params.message)
   }
-  buildCmdEchoSuppressedCommand(command) {
-    return `@echo off\r\n${command}\r\n@echo on`
-  }
   prepareCommandExecution(params, command) {
     if (!this.shouldSuppressCmdEchoForConda(params)) {
       return { command }
     }
     return {
-      command: this.buildCmdEchoSuppressedCommand(command),
+      command,
       preview: command,
+      quietCmd: true,
     }
   }
   isUnresolvedTemplate(value) {
@@ -444,6 +442,7 @@ class Shell {
     this.commandEchoPreview = null
     this.commandEchoPreviewed = false
     this.exec_cmd = null
+    this.quietCmdExecution = false
 
     /*
       params := {
@@ -1440,6 +1439,7 @@ class Shell {
     this.exec_cmd = preparedCommand.command
     this.commandEchoPreview = preparedCommand.preview || null
     this.commandEchoPreviewed = false
+    this.quietCmdExecution = !!preparedCommand.quietCmd
     let res = await new Promise((resolve, reject) => {
       this.resolve = resolve
       this.reject = reject
@@ -1459,7 +1459,10 @@ class Shell {
         if (!this.ptyProcess) {
           // ptyProcess doesn't exist => create
           this.done = false
-          this.ptyProcess = pty.spawn(this.shell, this.args, config)
+          const shellArgs = this.quietCmdExecution && this.isCmdShell()
+            ? this.args.concat(this.args.some((arg) => /^\/q$/i.test(arg)) ? [] : ["/Q"])
+            : this.args
+          this.ptyProcess = pty.spawn(this.shell, shellArgs, config)
           this.ptyProcess.onData((data) => {
             if (!this.monitor) {
               this.monitor = ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.5.37",
+  "version": "7.5.38",
   "description": "",
   "main": "index.js",
   "scripts": {

package/test/shell-conda-runtime-guard.test.js

@@ -941,7 +941,8 @@ test('Windows cmd suppresses echo only for explicit conda shell.run commands', (
     message: 'conda install -y -c conda-forge ffmpeg',
   }, command)
   assert.equal(prepared.preview, command)
-  assert.equal(prepared.command, `@echo off\r\n${command}\r\n@echo on`)
+  assert.equal(prepared.command, command)
+  assert.equal(prepared.quietCmd, true)
 
   assert.deepEqual(shell.prepareCommandExecution({
     message: 'python main.py',