pinokiod 6.0.85 → 6.0.88

package/kernel/bin/cli.js

@@ -2,7 +2,7 @@ const path = require('path')
 const semver = require('semver')
 const Util = require('../util')
 class CLI {
-  version = ">=0.0.17"
+  version = ">=0.0.19"
   async install(req, ondata) {
     await this.kernel.exec({
       message: "npm install -g pterm@latest --force",

package/package.json

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

package/server/index.js

@@ -7734,6 +7734,23 @@ class Server {
       if (typeof startCommand !== "string" || startCommand.trim().length === 0) {
         failStart(500, `No start command configured for ${provider.label || provider.key || "provider"}.`)
       }
+      const managedLaunchOverrides = {
+        shell: null,
+        env: {}
+      }
+      const isWindowsPlatform = (this.kernel && typeof this.kernel.platform === "string"
+        ? this.kernel.platform
+        : process.platform) === "win32"
+      if (isWindowsPlatform && (provider.key === "codex" || provider.key === "claude")) {
+        const gitBashPath = this.kernel.path("bin/miniconda/Library/bin/bash.exe")
+        const bashExists = await fs.promises.access(gitBashPath, fs.constants.F_OK).then(() => true).catch(() => false)
+        if (bashExists) {
+          managedLaunchOverrides.shell = gitBashPath
+          if (provider.key === "claude") {
+            managedLaunchOverrides.env.CLAUDE_CODE_GIT_BASH_PATH = gitBashPath
+          }
+        }
+      }
       const now = new Date()
       const pad = (value) => String(value).padStart(2, "0")
       const timestamp = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`
@@ -7920,6 +7937,17 @@ class Server {
       params.set("terminal_id", terminalId)
       params.set("message", startCommand)
       params.set("input", "1")
+      if (managedLaunchOverrides.shell) {
+        params.set("shell", managedLaunchOverrides.shell)
+      }
+      const managedLaunchEnvEntries = Object.entries(managedLaunchOverrides.env)
+      for (let i = 0; i < managedLaunchEnvEntries.length; i++) {
+        const [key, value] = managedLaunchEnvEntries[i]
+        if (typeof key !== "string" || typeof value !== "string" || !key || !value) {
+          continue
+        }
+        params.set(`env.${key}`, value)
+      }
       const safeWorkspaceName = workspaceFolderName && workspaceFolderName.trim().length > 0
         ? workspaceFolderName.replace(/[^A-Za-z0-9._-]+/g, "-")
         : "workspace"
@@ -8993,6 +9021,14 @@ class Server {
       }
       //let message = req.query.message ? req.query.message : null
       let venv = req.query.venv ? decodeURIComponent(req.query.venv) : null
+      let launchShell = null
+      if (typeof req.query.shell === "string" && req.query.shell.length > 0) {
+        try {
+          launchShell = decodeURIComponent(req.query.shell)
+        } catch (error) {
+          launchShell = req.query.shell
+        }
+      }
       let input = req.query.input ? true : false
       let callback = req.query.callback ? decodeURIComponent(req.query.callback) : null
       let callback_target = req.query.callback_target ? decodeURIComponent(req.query.callback_target) : null
@@ -9037,6 +9073,7 @@ class Server {
         message,
         restart_message: restartMessage,
         venv,
+        launch_shell: launchShell,
         conda: (conda_exists ? conda: null),
         env,
 //        pattern,

package/server/views/shell.ejs

@@ -568,6 +568,9 @@ document.addEventListener("DOMContentLoaded", async () => {
           <% if (venv) { %>
             venv: "<%-JSON.stringify(venv).slice(1, -1)%>",
           <% } %>
+          <% if (launch_shell) { %>
+            shell: "<%-JSON.stringify(launch_shell).slice(1, -1)%>",
+          <% } %>
           <% if (kill) { %>
             on: [{
               event: "<%=kill%>",

package/server/views/terminals.ejs

@@ -9415,16 +9415,16 @@ body.dark .swal2-popup.pinokio-diff-modal .pinokio-modal-footer--commit .pinokio
         </div>
       </header>` : ""}
       <div class="terminals-chooser-content">
+        <section class="terminals-workspaces-header" aria-label="Agent workspaces intro">
+          <div class="terminals-workspace-header-actions terminals-workspaces-header-actions" data-workspaces-header-actions></div>
+        </section>
+        <section class="terminals-workspace-sessions-header hidden" aria-label="Workspace sessions intro">
+          <div class="terminals-list-intro-breadcrumb terminals-workspace-header-breadcrumb" data-workspace-header-breadcrumb aria-label="Workspace breadcrumb"></div>
+          <p data-workspace-header-path></p>
+          <div class="terminals-workspace-header-actions" data-workspace-header-actions></div>
+        </section>
         <div class="terminals-empty" data-state="loading" aria-live="polite"></div>
         <div class="terminals-list-wrap">
-          <section class="terminals-workspaces-header" aria-label="Agent workspaces intro">
-            <div class="terminals-workspace-header-actions terminals-workspaces-header-actions" data-workspaces-header-actions></div>
-          </section>
-          <section class="terminals-workspace-sessions-header hidden" aria-label="Workspace sessions intro">
-            <div class="terminals-list-intro-breadcrumb terminals-workspace-header-breadcrumb" data-workspace-header-breadcrumb aria-label="Workspace breadcrumb"></div>
-            <p data-workspace-header-path></p>
-            <div class="terminals-workspace-header-actions" data-workspace-header-actions></div>
-          </section>
           <div class="terminals-list"></div>
         </div>
       </div>