pinokiod 6.0.86 → 6.0.89

package/kernel/api/index.js

@@ -28,221 +28,6 @@ class Api {
     this.child_procs = {}
     this.lproxy = new Lproxy()
   }
-  parseQueryString(query) {
-    const result = {}
-    if (typeof query !== "string" || query.length === 0) {
-      return result
-    }
-    const segments = query.split("&")
-    for (const segment of segments) {
-      if (!segment) {
-        continue
-      }
-      const equalsIndex = segment.indexOf("=")
-      const rawKey = equalsIndex >= 0 ? segment.slice(0, equalsIndex) : segment
-      if (!rawKey) {
-        continue
-      }
-      const rawValue = equalsIndex >= 0 ? segment.slice(equalsIndex + 1) : ""
-      const plusDecodedKey = rawKey.replace(/\+/g, " ")
-      const plusDecodedValue = rawValue.replace(/\+/g, " ")
-      let key
-      let value
-      try {
-        key = decodeURIComponent(plusDecodedKey)
-      } catch (_) {
-        key = plusDecodedKey
-      }
-      try {
-        value = decodeURIComponent(plusDecodedValue)
-      } catch (_) {
-        value = plusDecodedValue
-      }
-      if (Object.prototype.hasOwnProperty.call(result, key)) {
-        if (Array.isArray(result[key])) {
-          result[key].push(value)
-        } else {
-          result[key] = [result[key], value]
-        }
-      } else {
-        result[key] = value
-      }
-    }
-    return result
-  }
-  stringifyQueryParams(params) {
-    const searchParams = new URLSearchParams()
-    if (!params || typeof params !== "object") {
-      return searchParams.toString()
-    }
-    for (const [key, rawValue] of Object.entries(params)) {
-      if (typeof key !== "string" || key.length === 0) {
-        continue
-      }
-      if (Array.isArray(rawValue)) {
-        for (const value of rawValue) {
-          searchParams.append(key, String(value))
-        }
-      } else if (typeof rawValue !== "undefined") {
-        searchParams.append(key, String(rawValue))
-      }
-    }
-    return searchParams.toString()
-  }
-  splitUriQuery(uri) {
-    if (typeof uri !== "string" || uri.length === 0) {
-      return {
-        uri,
-        query: "",
-        input: {}
-      }
-    }
-    const queryIndex = uri.indexOf("?")
-    if (queryIndex === -1) {
-      return {
-        uri,
-        query: "",
-        input: {}
-      }
-    }
-    const query = uri.slice(queryIndex + 1)
-    return {
-      uri: uri.slice(0, queryIndex),
-      query,
-      input: this.parseQueryString(query)
-    }
-  }
-  mergeRequestInput(uriInput, requestInput) {
-    const merged = {}
-    const sources = [uriInput, requestInput]
-    for (const source of sources) {
-      if (!source || typeof source !== "object") {
-        continue
-      }
-      for (const [key, value] of Object.entries(source)) {
-        merged[key] = value
-      }
-    }
-    return merged
-  }
-  normalizeMenuSelector(selector) {
-    if (typeof selector !== "string") {
-      return null
-    }
-    const trimmed = selector.trim()
-    if (!trimmed) {
-      return null
-    }
-    const { uri, input } = this.splitUriQuery(trimmed)
-    return {
-      href: uri,
-      params: input
-    }
-  }
-  normalizeMenuItem(item) {
-    if (!item || typeof item.href !== "string") {
-      return null
-    }
-    const href = item.href.trim()
-    if (!href) {
-      return null
-    }
-    const { uri, input } = this.splitUriQuery(href)
-    const params = Object.assign({}, input)
-    if (item.params && typeof item.params === "object") {
-      for (const [key, value] of Object.entries(item.params)) {
-        params[key] = value
-      }
-    }
-    return {
-      item,
-      href: uri,
-      params
-    }
-  }
-  menuSelectorMatches(selector, normalizedItem) {
-    const normalizedSelector = this.normalizeMenuSelector(selector)
-    if (!normalizedSelector || !normalizedItem) {
-      return false
-    }
-    if (normalizedSelector.href !== normalizedItem.href) {
-      return false
-    }
-    for (const [key, expectedRaw] of Object.entries(normalizedSelector.params || {})) {
-      if (!Object.prototype.hasOwnProperty.call(normalizedItem.params || {}, key)) {
-        return false
-      }
-      const actualRaw = normalizedItem.params[key]
-      const expectedValues = Array.isArray(expectedRaw) ? expectedRaw.map((value) => String(value)) : [String(expectedRaw)]
-      const actualValues = Array.isArray(actualRaw) ? actualRaw.map((value) => String(value)) : [String(actualRaw)]
-      if (expectedValues.length !== actualValues.length) {
-        return false
-      }
-      for (let i = 0; i < expectedValues.length; i++) {
-        if (expectedValues[i] !== actualValues[i]) {
-          return false
-        }
-      }
-    }
-    return true
-  }
-  flattenMenuItems(menu, flattened = []) {
-    if (!Array.isArray(menu)) {
-      return flattened
-    }
-    for (const item of menu) {
-      if (!item || typeof item !== "object") {
-        continue
-      }
-      const normalized = this.normalizeMenuItem(item)
-      if (normalized) {
-        flattened.push(normalized)
-      }
-      if (Array.isArray(item.menu)) {
-        this.flattenMenuItems(item.menu, flattened)
-      }
-    }
-    return flattened
-  }
-  async launcherMenuItems(repo_path) {
-    let launcher = await this.launcher({
-      path: repo_path
-    })
-    let config = launcher.script
-    if (!config || !config.menu) {
-      return []
-    }
-    if (typeof config.menu === "function") {
-      if (config.menu.constructor.name === "AsyncFunction") {
-        config.menu = await config.menu(this.kernel, this.kernel.info)
-      } else {
-        config.menu = config.menu(this.kernel, this.kernel.info)
-      }
-    }
-    return this.flattenMenuItems(config.menu)
-  }
-  resolveMenuItemHref(repo_path, normalizedItem) {
-    if (!normalizedItem || !normalizedItem.href) {
-      return undefined
-    }
-    const query = this.stringifyQueryParams(normalizedItem.params)
-    const resolvedHref = normalizedItem.href.startsWith("http")
-      ? normalizedItem.href
-      : path.resolve(repo_path, normalizedItem.href)
-    if (query && query.length > 0) {
-      return `${resolvedHref}?${query}`
-    }
-    return resolvedHref
-  }
-  isRunningMenuScript(repo_path, normalizedItem) {
-    if (!normalizedItem || !normalizedItem.href || normalizedItem.href.startsWith("http")) {
-      return false
-    }
-    const scriptPath = path.isAbsolute(normalizedItem.href)
-      ? normalizedItem.href
-      : path.resolve(repo_path, normalizedItem.href)
-    return Boolean(this.kernel.status(scriptPath))
-  }
   async launcher_path(name) {
     let root_path = this.kernel.path("api", name)
     let primary_path = path.resolve(root_path, "pinokio.js")
@@ -810,14 +595,11 @@ class Api {
       modpath = this.resolveGitURI(uri)
     } else if (uri.startsWith("~/")) {
       // absolute path
-      let { uri: strippedUri } = this.splitUriQuery(uri)
-      modpath = path.resolve(this.kernel.homedir, strippedUri.slice(2))
+      modpath = path.resolve(this.kernel.homedir, uri.slice(2))
     } else if (path.isAbsolute(uri)) {
-      let { uri: strippedUri } = this.splitUriQuery(uri)
-      modpath = strippedUri
+      modpath = uri
     } else if (cwd) {
-      let { uri: strippedUri } = this.splitUriQuery(uri)
-      modpath = path.resolve(cwd, strippedUri)
+      modpath = path.resolve(cwd, uri)
     } else {
       throw new Error("uri must be either an http uri or start with ~/")
     }
@@ -834,16 +616,13 @@ class Api {
       modpath = this.resolveGitURI(uri)
     } else if (uri.startsWith("~/")) {
       // absolute path
-      let { uri: strippedUri } = this.splitUriQuery(uri)
-      modpath = path.resolve(this.kernel.homedir, strippedUri.slice(2))
+      modpath = path.resolve(this.kernel.homedir, uri.slice(2))
     } else if (path.isAbsolute(uri)) {
-      let { uri: strippedUri } = this.splitUriQuery(uri)
-      modpath = strippedUri
+      modpath = uri
     } else {
       if (cwd) {
         // relative path against the cwd (current execution path)
-        let { uri: strippedUri } = this.splitUriQuery(uri)
-        modpath = path.resolve(cwd, strippedUri)
+        modpath = path.resolve(cwd, uri)
       } else {
         throw new Error("resolving relative paths require an additional cwd argument")
       }
@@ -1653,38 +1432,34 @@ class Api {
       this.process(request, resolve)
     })
   }
-  async get_default(repo_path, preferred = []) {
-    const menuItems = await this.launcherMenuItems(repo_path)
-    if (menuItems.length === 0) {
-      return undefined
-    }
-    const defaultItem = menuItems.find((item) => {
-      return item.item && item.item.default
-    })
-    if (defaultItem) {
-      return this.resolveMenuItemHref(repo_path, defaultItem)
-    }
-    const preferredSelectors = Array.isArray(preferred)
-      ? preferred.filter((value) => typeof value === "string" && value.trim().length > 0)
-      : (typeof preferred === "string" && preferred.trim().length > 0 ? [preferred] : [])
-    if (preferredSelectors.length === 0) {
-      return undefined
-    }
-    const readyUrl = menuItems.find((item) => {
-      return item.href && item.href.startsWith("http")
+  async get_default(repo_path) {
+    let launcher = await this.launcher({
+      path: repo_path
     })
-    for (const selector of preferredSelectors) {
-      for (const item of menuItems) {
-        if (!this.menuSelectorMatches(selector, item)) {
-          continue
+    let config = launcher.script
+    if (config && config.menu) {
+      if (typeof config.menu === "function") {
+        if (config.menu.constructor.name === "AsyncFunction") {
+          config.menu = await config.menu(this.kernel, this.kernel.info)
+        } else {
+          config.menu = config.menu(this.kernel, this.kernel.info)
         }
-        if (readyUrl && this.isRunningMenuScript(repo_path, item)) {
-          return this.resolveMenuItemHref(repo_path, readyUrl)
+      }
+      let running = config.menu.filter((item) => {
+        return item.default
+      })
+      if (running.length > 0) {
+        let r = running[0]
+        if (r.href) {
+          if (r.href.startsWith("http")) {
+            return r.href
+          } else {
+            let href = path.resolve(repo_path, r.href)
+            return href
+          }
         }
-        return this.resolveMenuItemHref(repo_path, item)
       }
     }
-    return undefined
   }
   async process(request, done) {
     /**************************************************************
@@ -1740,13 +1515,6 @@ class Api {
       this.counter++;
       // API Call
 
-      const uriInput = request.uri.startsWith("http")
-        ? {}
-        : this.splitUriQuery(request.uri).input
-      if (Object.keys(uriInput).length > 0) {
-        request.input = this.mergeRequestInput(uriInput, request.input)
-      }
-
       request.path = this.resolvePath(this.userdir, request.uri)
 
 

package/kernel/api/launcher_target.js

@@ -0,0 +1,150 @@
+const path = require("path")
+
+const filterSelectors = (preferred) => {
+  if (Array.isArray(preferred)) {
+    return preferred.filter((value) => typeof value === "string" && value.trim().length > 0)
+  }
+  if (typeof preferred === "string" && preferred.trim().length > 0) {
+    return [preferred]
+  }
+  return []
+}
+
+const appendInputValue = (input, key, value) => {
+  if (Object.prototype.hasOwnProperty.call(input, key)) {
+    if (Array.isArray(input[key])) {
+      input[key].push(value)
+    } else {
+      input[key] = [input[key], value]
+    }
+  } else {
+    input[key] = value
+  }
+}
+
+const menuTarget = (item) => {
+  if (!item || typeof item.href !== "string") {
+    return null
+  }
+  let href = item.href.trim()
+  if (!href) {
+    return null
+  }
+  let queryIndex = href.indexOf("?")
+  let uri = queryIndex >= 0 ? href.slice(0, queryIndex) : href
+  let searchParams = new URLSearchParams(queryIndex >= 0 ? href.slice(queryIndex + 1) : "")
+  if (item.params && typeof item.params === "object") {
+    for (let [key, rawValue] of Object.entries(item.params)) {
+      if (Array.isArray(rawValue)) {
+        for (let value of rawValue) {
+          searchParams.append(key, String(value))
+        }
+      } else if (typeof rawValue !== "undefined") {
+        searchParams.append(key, String(rawValue))
+      }
+    }
+  }
+  let input = {}
+  for (let [key, value] of searchParams.entries()) {
+    appendInputValue(input, key, value)
+  }
+  return {
+    uri,
+    href: searchParams.toString() ? `${uri}?${searchParams.toString()}` : uri,
+    input,
+  }
+}
+
+const selectorMatches = (selector, target) => {
+  if (typeof selector !== "string" || !target) {
+    return false
+  }
+  let candidate = selector.trim()
+  if (!candidate) {
+    return false
+  }
+  let queryIndex = candidate.indexOf("?")
+  let candidateUri = queryIndex >= 0 ? candidate.slice(0, queryIndex) : candidate
+  if (candidateUri !== target.uri) {
+    return false
+  }
+  if (queryIndex === -1) {
+    return true
+  }
+  let selectorParams = new URLSearchParams(candidate.slice(queryIndex + 1))
+  for (let key of new Set(selectorParams.keys())) {
+    if (!Object.prototype.hasOwnProperty.call(target.input, key)) {
+      return false
+    }
+    let expected = selectorParams.getAll(key)
+    let actual = Array.isArray(target.input[key]) ? target.input[key] : [target.input[key]]
+    if (expected.length !== actual.length) {
+      return false
+    }
+    for (let i = 0; i < expected.length; i++) {
+      if (expected[i] !== actual[i]) {
+        return false
+      }
+    }
+  }
+  return true
+}
+
+const loadMenu = async (api, repoPath) => {
+  let launcher = await api.launcher({
+    path: repoPath
+  })
+  let config = launcher.script
+  if (!config || !config.menu) {
+    return []
+  }
+  if (typeof config.menu === "function") {
+    if (config.menu.constructor.name === "AsyncFunction") {
+      config.menu = await config.menu(api.kernel, api.kernel.info)
+    } else {
+      config.menu = config.menu(api.kernel, api.kernel.info)
+    }
+  }
+  return Array.isArray(config.menu) ? config.menu : []
+}
+
+module.exports = async (api, repoPath, preferred = []) => {
+  let defaultTarget = await api.get_default(repoPath)
+  if (defaultTarget) {
+    return {
+      uri: defaultTarget
+    }
+  }
+  let selectors = filterSelectors(preferred)
+  if (selectors.length === 0) {
+    return undefined
+  }
+  let stack = [...(await loadMenu(api, repoPath))]
+  while (stack.length > 0) {
+    let item = stack.shift()
+    if (!item || typeof item !== "object") {
+      continue
+    }
+    if (Array.isArray(item.menu)) {
+      stack.unshift(...item.menu)
+    }
+    let target = menuTarget(item)
+    if (!target) {
+      continue
+    }
+    for (let selector of selectors) {
+      if (!selectorMatches(selector, target)) {
+        continue
+      }
+      if (target.uri.startsWith("http")) {
+        return {
+          uri: target.href
+        }
+      }
+      return {
+        uri: path.resolve(repoPath, target.uri),
+        input: Object.keys(target.input).length > 0 ? target.input : undefined
+      }
+    }
+  }
+}

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.19"
+  version = ">=0.0.21"
   async install(req, ondata) {
     await this.kernel.exec({
       message: "npm install -g pterm@latest --force",
@@ -21,7 +21,8 @@ class CLI {
           ? this.kernel.path("bin/npm/node_modules")
           : this.kernel.path("bin/npm/lib/node_modules")
         const pkgPath = require.resolve("pterm/package.json", { paths: [moduleRoot] })
-        const { version } = require(pkgPath)
+        const { resolved } = await this.kernel.loader.load(pkgPath)
+        const { version } = resolved || {}
         const coerced = semver.coerce(version)
         if (coerced && semver.satisfies(coerced, this.version)) {
           return true

package/package.json

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

package/server/index.js

@@ -7734,6 +7734,22 @@ 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) {
+          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 +7936,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 +9020,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 +9072,7 @@ class Server {
         message,
         restart_message: restartMessage,
         venv,
+        launch_shell: launchShell,
         conda: (conda_exists ? conda: null),
         env,
 //        pattern,

package/server/socket.js

@@ -5,6 +5,7 @@ const os = require('os')
 const fs = require('fs')
 const Util = require("../kernel/util")
 const Environment = require("../kernel/environment")
+const getLaunchTarget = require("../kernel/api/launcher_target")
 const NOTIFICATION_CHANNEL = 'kernel.notifications'
 class Socket {
   normalizeLaunchSource(source = "") {
@@ -196,10 +197,11 @@ class Socket {
               // get the default script and respond
               let id = this.parent.kernel.api.filePath(req.uri)
               try {
-                let default_url = await this.parent.kernel.api.get_default(id, req.default)
+                let defaultTarget = await getLaunchTarget(this.parent.kernel.api, id, req.default)
                 ws.send(JSON.stringify({
                   data: {
-                    uri: default_url 
+                    uri: defaultTarget ? defaultTarget.uri : undefined,
+                    input: defaultTarget ? defaultTarget.input : undefined
                   }
                 }))
               } catch (e) {

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>