pinokiod 7.5.37 → 7.5.39

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.39",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/index.ejs

@@ -865,7 +865,7 @@ body.dark .menu-btns .toggle-star.is-starred {
   padding: 0;
   border: 1px solid rgba(15, 23, 42, 0.14);
   border-radius: 8px;
-  background: rgba(255, 255, 255, 0.98);
+  background: var(--home-page-nav-bg, #ffffff);
   color: rgba(15, 23, 42, 0.94);
   box-shadow: 0 24px 70px rgba(15, 23, 42, 0.24);
 }
@@ -886,7 +886,7 @@ body.dark .menu-btns .toggle-star.is-starred {
 }
 body.dark .home-actions-dialog {
   border-color: rgba(255, 255, 255, 0.12);
-  background: rgba(18, 20, 25, 0.98);
+  background: var(--home-page-nav-bg, #1b1c1d);
   color: rgba(248, 250, 252, 0.94);
   box-shadow: 0 24px 80px rgba(0, 0, 0, 0.55);
 }
@@ -1125,6 +1125,35 @@ body.dark .home-mode-command {
   font-size: 10px;
   opacity: 0.6;
 }
+.home-run-command.has-block-label,
+.home-run-menu-summary.has-block-label {
+  min-height: 52px;
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
+.home-run-menu-label {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+}
+.home-run-menu-label.has-block-content {
+  align-items: flex-start;
+  white-space: normal;
+  line-height: 1.18;
+}
+.home-run-menu-label.has-block-content > i:first-child {
+  margin-top: 1px;
+}
+.home-run-menu-label.has-block-content > div {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+.home-run-menu-label.has-block-content > div > strong,
+.home-run-menu-label.has-block-content > div > div {
+  line-height: 1.18;
+}
 .home-run-stop {
   width: 38px;
   min-height: 38px;

package/server/views/partials/home_action_modal.ejs

@@ -1,3 +1,15 @@
+<%
+const homeActionsAppId = item && (item.uri || item.path || item.name) ? String(item.uri || item.path || item.name) : ""
+const homeActionsSettingsHref = homeActionsAppId
+  ? `/v/${encodeURIComponent(homeActionsAppId)}?${new URLSearchParams({
+    pinokio_home_select: JSON.stringify({
+      target: "env-settings",
+      hrefAttr: `/env/api/${homeActionsAppId}?host=app`,
+      textValue: "Settings"
+    })
+  }).toString()}`
+  : ""
+%>
 <dialog id='<%= id %>' class='home-actions-dialog' aria-labelledby='<%= id %>-title'>
   <div class='home-actions-shell'>
     <div class='home-actions-header'>
@@ -49,6 +61,12 @@
               <span class='home-actions-count'><%= item.terminal_online_count %> online</span>
             <% } %>
           </button>
+          <% if (homeActionsSettingsHref) { %>
+            <a class='home-mode-command' href='<%= homeActionsSettingsHref %>'>
+              <i class='fa-solid fa-gear' aria-hidden='true'></i>
+              <span>Settings</span>
+            </a>
+          <% } %>
           <button type='button' class='home-mode-command' data-filepath='<%= item.filepath %>'>
             <i class='fa-solid fa-folder-open' aria-hidden='true'></i>
             <span>Open in file explorer</span>

package/server/views/partials/home_run_menu.ejs

@@ -9,6 +9,7 @@ const stripHtml = (value) => String(value ?? "")
   .replace(/<[^>]*>/g, " ")
   .replace(/\s+/g, " ")
   .trim()
+const hasBlockContent = (value) => /<\s*(div|p|section|article|ul|ol|li|h[1-6])(?:\s|>)/i.test(String(value ?? ""))
 const buildHomeSelectionPayload = (menuItem, index) => {
   const dataFilepath = (menuItem.fs || menuItem.command) ? (menuItem.href || "") : ""
   const payload = {
@@ -49,9 +50,10 @@ const buildHomeSelectionUrl = (menuItem, index) => {
 %>
 <% menu.forEach((item, index) => { %>
   <% if (item && item.menu) { %>
+    <% const itemBtnHasBlock = hasBlockContent(item.btn) %>
     <details class='home-run-menu-group' open>
-      <summary class='home-run-menu-summary'>
-        <span class='home-run-menu-label'><%- item.btn %></span>
+      <summary class='home-run-menu-summary <%= itemBtnHasBlock ? "has-block-label" : "" %>'>
+        <div class='home-run-menu-label <%= itemBtnHasBlock ? "has-block-content" : "" %>'><%- item.btn %></div>
         <i class='fa-solid fa-chevron-down' aria-hidden='true'></i>
       </summary>
       <div class='home-run-menu-children'>
@@ -60,13 +62,14 @@ const buildHomeSelectionUrl = (menuItem, index) => {
     </details>
   <% } else if (item && item.btn) { %>
     <% const openUrl = buildHomeSelectionUrl(item, index) %>
+    <% const itemBtnHasBlock = hasBlockContent(item.btn) %>
     <div class='home-run-menu-row <%= item.running ? "is-running" : "" %>'>
       <a
-        class='home-run-command'
+        class='home-run-command <%= itemBtnHasBlock ? "has-block-label" : "" %>'
         href='<%= openUrl %>'
         <% if (item.confirm) { %>data-confirm="<%- escapeAttr(item.confirm) %>"<% } %>
       >
-        <span class='home-run-menu-label'><%- item.btn %></span>
+        <div class='home-run-menu-label <%= itemBtnHasBlock ? "has-block-content" : "" %>'><%- item.btn %></div>
         <% if (item.running) { %><span class='home-run-menu-status'>Running</span><% } %>
         <i class='fa-solid fa-chevron-right' aria-hidden='true'></i>
       </a>

package/test/launch-settings-ui.test.js

@@ -2,6 +2,7 @@ const assert = require("node:assert/strict")
 const fs = require("node:fs/promises")
 const path = require("node:path")
 const test = require("node:test")
+const ejs = require("ejs")
 
 const root = path.resolve(__dirname, "..")
 
@@ -370,6 +371,11 @@ test("static guard: open without launching is not wired to launch requirement st
   assert.match(homeActionModal, /Open without launching/)
   assert.match(homeActionModal, /class='home-mode-command home-browse' data-src='<%= item\.view_url %>'/)
   assert.match(homeActionModal, /Open dev mode/)
+  assert.match(homeActionModal, /const homeActionsAppId = item && \(item\.uri \|\| item\.path \|\| item\.name\)/)
+  assert.match(homeActionModal, /pinokio_home_select: JSON\.stringify/)
+  assert.match(homeActionModal, /target: "env-settings"/)
+  assert.match(homeActionModal, /href='<%= homeActionsSettingsHref %>'/)
+  assert.match(homeActionModal, /Settings/)
   assert.doesNotMatch(homeActionModal, /home-actions-tabs|home-actions-tab|role='tab'|role='tabpanel'/)
   assert.doesNotMatch(homeActionModal, /Open files mode/)
   assert.doesNotMatch(homeActionModal, /launch.requirements|data-launch-requirements|frame-link/)
@@ -378,6 +384,66 @@ test("static guard: open without launching is not wired to launch requirement st
   assert.doesNotMatch(statusClient, /saved requirement/)
 })
 
+test("home actions modal renders an app settings link", async () => {
+  const html = await ejs.renderFile(path.resolve(root, "server/views/partials/home_action_modal.ejs"), {
+    id: "home-actions-test",
+    item: {
+      icon: "",
+      name: "Test App",
+      filepath: "/tmp/pinokio/api/test app.git",
+      uri: "test app.git",
+      menu: [],
+      view_url: "/v/test%20app.git",
+      dev_url: "/p/test%20app.git/dev",
+      url: "/p/test%20app.git",
+      terminal_online_count: 0,
+      running: false
+    }
+  })
+
+  const hrefMatch = html.match(/href='([^']+)'/)
+  assert.ok(hrefMatch)
+  const href = new URL(hrefMatch[1], "http://127.0.0.1")
+  assert.equal(href.pathname, "/v/test%20app.git")
+  const payload = JSON.parse(href.searchParams.get("pinokio_home_select"))
+  assert.deepEqual(payload, {
+    target: "env-settings",
+    hrefAttr: "/env/api/test app.git?host=app",
+    textValue: "Settings"
+  })
+  assert.match(html, />\s*Settings\s*</)
+})
+
+test("home actions drawer background follows the home page surface", async () => {
+  const homeView = await fs.readFile(path.resolve(root, "server/views/index.ejs"), "utf8")
+
+  assert.match(homeView, /body\.is-home \{[\s\S]*--home-page-nav-bg: #ffffff;[\s\S]*background: #ffffff;/)
+  assert.match(homeView, /body\.dark\.is-home \{[\s\S]*--home-page-nav-bg: #1b1c1d;[\s\S]*background: #1b1c1d;/)
+  assert.match(homeView, /\.home-actions-dialog \{[\s\S]*background: var\(--home-page-nav-bg, #ffffff\);/)
+  assert.match(homeView, /body\.dark \.home-actions-dialog \{[\s\S]*background: var\(--home-page-nav-bg, #1b1c1d\);/)
+  assert.doesNotMatch(homeView, /body\.dark \.home-actions-dialog \{[\s\S]*background: rgba\(18, 20, 25, 0\.98\);/)
+})
+
+test("home run menu gives block labels valid padded layout", async () => {
+  const homeView = await fs.readFile(path.resolve(root, "server/views/index.ejs"), "utf8")
+  const html = await ejs.renderFile(path.resolve(root, "server/views/partials/home_run_menu.ejs"), {
+    app: {
+      view_url: "/v/test-app"
+    },
+    menu: [{
+      icon: "fa-regular fa-circle-xmark",
+      btn: '<i class="fa-regular fa-circle-xmark"></i><div><strong>Reset</strong><div>Revert to pre-install state</div></div>',
+      href: "reset.js"
+    }]
+  })
+
+  assert.match(html, /class='home-run-command has-block-label'/)
+  assert.match(html, /<div class='home-run-menu-label has-block-content'>/)
+  assert.doesNotMatch(html, /<span class='home-run-menu-label/)
+  assert.match(homeView, /\.home-run-command\.has-block-label,[\s\S]*\.home-run-menu-summary\.has-block-label \{[\s\S]*padding-top: 8px;[\s\S]*padding-bottom: 8px;/)
+  assert.match(homeView, /\.home-run-menu-label\.has-block-content \{[\s\S]*white-space: normal;/)
+})
+
 test("static guard: open without launching disables page-load script frame selection", async () => {
   const appView = await fs.readFile(path.resolve(root, "server/views/app.ejs"), "utf8")
 

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

@@ -941,13 +941,89 @@ 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',
   }, command), { command })
 })
 
+test('Windows cmd array shell.run marks only the conda launch quiet', async () => {
+  const { context, root } = createContext('win32')
+  const records = []
+  const originalPrompt = Shell.prototype.prompt
+  const originalExec = Shell.prototype.exec
+  Shell.prototype.prompt = async () => 'PINOKIO_PROMPT'
+  Shell.prototype.exec = async function (params) {
+    this.platform = 'win32'
+    this.shell = 'cmd.exe'
+    const originalParams = {
+      input: params && params.input,
+      message: params && params.message,
+    }
+    const activatedParams = await this.activate(params)
+    const command = this.build(activatedParams)
+    records.push({
+      message: originalParams.message,
+      prepared: this.prepareCommandExecution(originalParams, command),
+    })
+    return command
+  }
+
+  try {
+    const kernel = {
+      homedir: root,
+      platform: 'win32',
+      bracketedPasteSupport: { 'cmd.exe': false },
+      envs: {},
+      exists: async () => false,
+      which: () => null,
+      path: (...parts) => path.join(root, ...parts),
+      bin: {
+        envs: (env = {}) => env,
+        path: (...parts) => path.join(root, 'bin', ...parts),
+        activationCommands: () => [],
+      },
+      api: {
+        resolvePath: (_cwd, target) => target,
+        running: {},
+      },
+      git: {
+        repos: async () => [],
+        restoreNewReposForActiveSnapshot: async () => {},
+      },
+      template: {
+        render: (value) => value,
+      },
+    }
+    kernel.shell = new Shells(kernel)
+
+    await kernel.shell.run({
+      path: context.appPath,
+      message: [
+        'echo before',
+        'conda install -y -c conda-forge ffmpeg',
+        'python main.py',
+      ],
+    }, {}, () => {})
+
+    assert.deepEqual(records.map((record) => record.message), [
+      'echo before',
+      'conda install -y -c conda-forge ffmpeg',
+      'python main.py',
+    ])
+    assert.deepEqual(records.map((record) => !!record.prepared.quietCmd), [
+      false,
+      true,
+      false,
+    ])
+  } finally {
+    Shell.prototype.prompt = originalPrompt
+    Shell.prototype.exec = originalExec
+  }
+})
+
 test('rewrite warning is scoped to each user-visible shell flow', async () => {
   CondaRuntimeGuard.resetNoticeSessionsForTest()
   const { context, events, root } = createContext()