pinokiod 7.5.19 → 7.5.21

package/server/views/d.ejs

@@ -872,144 +872,44 @@ body.dark .terminal-shell-options {
 </div>
 
   <%
-    let index = 0;
-    const userTerminal = dynamic && dynamic.length ? dynamic[0] : null;
-    const cliMenu = dynamic.find((item) => item && item.title === "Terminal Apps");
-    const ideMenu = dynamic.find((item) => item && item.title === "Desktop Apps");
+    const dynamicItems = Array.isArray(dynamic) ? dynamic : [];
+    const indexState = { value: 0 };
+    const getItemDescription = (item) => {
+      if (!item || typeof item !== "object") {
+        return "";
+      }
+      const candidates = [
+        item.description,
+        item.subtitle,
+        item.summary,
+        item.metadata && item.metadata.description,
+        item.meta && item.meta.description,
+      ];
+      for (const candidate of candidates) {
+        if (typeof candidate === "string" && candidate.trim()) {
+          return candidate.trim();
+        }
+      }
+      return "";
+    };
+    const userTerminal = dynamicItems.find((item) => item && (item.title === "Terminals" || item.title === "Project Shell"));
+    const cliMenu = dynamicItems.find((item) => item && item.title === "Terminal Apps");
+    const ideMenu = dynamicItems.find((item) => item && item.title === "Desktop Apps");
     const handled = new Set();
-    const primaryColumnCount = [userTerminal, cliMenu, ideMenu].filter((item) => item && item.menu && item.menu.length).length;
     if (userTerminal) handled.add(userTerminal);
     if (cliMenu) handled.add(cliMenu);
     if (ideMenu) handled.add(ideMenu);
-    const remaining = dynamic.filter((item) => !handled.has(item));
+    const remaining = dynamicItems.filter((item) => !handled.has(item));
   %>
 
-  <div class='menu-grid <%= primaryColumnCount === 3 ? "menu-grid--triptych" : "" %>'>
-    <% if (userTerminal && userTerminal.menu && userTerminal.menu.length) { %>
-      <%- include('./partials/d_terminal_column', { userTerminal }) %>
-    <% } %>
-
-    <% if (cliMenu && cliMenu.menu && cliMenu.menu.length) { %>
-      <div class='menu-container menu-column cli-column'>
-        <div class='tab-header'>
-          <h3><i class='<%= cliMenu.icon %>'></i> <%= cliMenu.title %></h3>
-        </div>
-        <% if (cliMenu.subtitle || cliMenu.subtitle_link_href) { %>
-          <div class='column-subtitle'>
-            <% if (cliMenu.subtitle) { %>
-              <span><%= cliMenu.subtitle %></span><% if (cliMenu.subtitle_link_href && cliMenu.subtitle_link_label) { %> <% } %>
-            <% } %>
-            <% if (cliMenu.subtitle_link_href && cliMenu.subtitle_link_label) { %>
-              <a class='column-subtitle-link' href="<%= cliMenu.subtitle_link_href %>" target="_parent"><%= cliMenu.subtitle_link_label %></a>
-            <% } %>
-          </div>
-        <% } %>
-        <div class='tab-content'>
-          <% cliMenu.menu.forEach((i) => { %>
-            <div class='tab' role="button" tabindex="0" data-index="<%= index++ %>" data-target="@<%= i.href %>" data-href="<%= i.href %>">
-              <% if (i.image) { %>
-                <img src="<%= i.image %>">
-              <% } else if (i.icon) { %>
-                <i class="img <%= i.icon %>"></i>
-              <% } %>
-              <div class='tab-copy'>
-                <h2 class='tab-title'><%= i.title %></h2>
-                <% if (i.subtitle) { %>
-                  <div class='tab-subtitle subtitle'><%= i.subtitle %></div>
-                <% } %>
-              </div>
-              <div class='tab-actions'>
-                <button class="tab-action-link" type="button" data-plugin-settings="true" data-href="<%= i.href %>" title="Manage plugin" data-tippy-content="Manage plugin" aria-label="Manage plugin">
-                  <i class="fa-solid fa-gear"></i>
-                </button>
-                <div class='disclosure-indicator' aria-hidden="true">
-                  <i class="fa-solid fa-chevron-right"></i>
-                </div>
-              </div>
-            </div>
-          <% }) %>
-        </div>
-      </div>
-    <% } %>
-
-    <% if (ideMenu && ideMenu.menu && ideMenu.menu.length) { %>
-      <div class='menu-container menu-column ide-column'>
-        <div class='tab-header'>
-          <h3><i class='<%= ideMenu.icon %>'></i> <%= ideMenu.title %></h3>
-        </div>
-        <% if (ideMenu.subtitle || ideMenu.subtitle_link_href) { %>
-          <div class='column-subtitle'>
-            <% if (ideMenu.subtitle) { %>
-              <span><%= ideMenu.subtitle %></span><% if (ideMenu.subtitle_link_href && ideMenu.subtitle_link_label) { %> <% } %>
-            <% } %>
-            <% if (ideMenu.subtitle_link_href && ideMenu.subtitle_link_label) { %>
-              <a class='column-subtitle-link' href="<%= ideMenu.subtitle_link_href %>" target="_parent"><%= ideMenu.subtitle_link_label %></a>
-            <% } %>
-          </div>
-        <% } %>
-        <div class='tab-content'>
-          <% ideMenu.menu.forEach((i) => { %>
-            <div class='tab' role="button" tabindex="0" data-index="<%= index++ %>" data-target="@<%= i.href %>" data-href="<%= i.href %>">
-              <% if (i.image) { %>
-                <img src="<%= i.image %>">
-              <% } else if (i.icon) { %>
-                <i class="img <%= i.icon %>"></i>
-              <% } %>
-              <div class='tab-copy'>
-                <h2 class='tab-title'><%= i.title %></h2>
-                <% if (i.subtitle) { %>
-                  <div class='tab-subtitle subtitle'><%= i.subtitle %></div>
-                <% } %>
-              </div>
-              <div class='tab-actions'>
-                <button class="tab-action-link" type="button" data-plugin-settings="true" data-href="<%= i.href %>" title="Manage plugin" data-tippy-content="Manage plugin" aria-label="Manage plugin">
-                  <i class="fa-solid fa-gear"></i>
-                </button>
-                <div class='disclosure-indicator' aria-hidden="true">
-                  <i class="fa-solid fa-chevron-right"></i>
-                </div>
-              </div>
-            </div>
-          <% }) %>
-        </div>
-      </div>
-    <% } %>
-  </div>
-
-  <% remaining.forEach((item) => { %>
-    <% if (item.menu) { %>
-      <div class='menu-container'>
-        <div class='tab-header'>
-          <h3><i class='<%= item.icon %>'></i> <%= item.title %></h3>
-        </div>
-        <div class='tab-content'>
-          <% item.menu.forEach((i) => { %>
-            <div class='tab' role="button" tabindex="0" data-index="<%= index++ %>" data-target="@<%= i.href %>" data-href="<%= i.href %>">
-              <% if (i.image) { %>
-                <img src="<%= i.image %>">
-              <% } else if (i.icon) { %>
-                <i class="img <%= i.icon %>"></i>
-              <% } %>
-              <div class='tab-copy'>
-                <h2 class='tab-title'><%= i.title %></h2>
-                <% if (i.subtitle) { %>
-                  <div class='tab-subtitle subtitle'><%= i.subtitle %></div>
-                <% } %>
-              </div>
-              <div class='tab-actions'>
-                <button class="tab-action-link" type="button" data-plugin-settings="true" data-href="<%= i.href %>" title="Manage plugin" data-tippy-content="Manage plugin" aria-label="Manage plugin">
-                  <i class="fa-solid fa-gear"></i>
-                </button>
-                <div class='disclosure-indicator' aria-hidden="true">
-                  <i class="fa-solid fa-chevron-right"></i>
-                </div>
-              </div>
-            </div>
-          <% }) %>
-        </div>
-      </div>
-    <% } else { %>
-      <div class='tab' data-index="<%= index++ %>">
+  <div class='menu-grid'>
+    <%- include('./partials/d_menu_column', { section: cliMenu, indexState, getItemDescription, className: 'cli-column', showSettings: true }) %>
+    <%- include('./partials/d_menu_column', { section: ideMenu, indexState, getItemDescription, className: 'ide-column', showSettings: true }) %>
+    <% remaining.forEach((item) => { %>
+      <% if (item.menu) { %>
+        <%- include('./partials/d_menu_column', { section: item, indexState, getItemDescription, showSettings: true }) %>
+      <% } else { %>
+      <div class='tab' data-index="<%= indexState.value++ %>">
         <% if (item.image) { %>
           <img src="<%= item.image %>">
         <% } else if (item.icon) { %>
@@ -1017,8 +917,9 @@ body.dark .terminal-shell-options {
         <% } %>
         <div class='col'>
           <h2><%= item.title %></h2>
-          <% if (item.subtitle) { %>
-            <div class='subtitle'><%= item.subtitle %></div>
+          <% const itemDescription = getItemDescription(item); %>
+          <% if (itemDescription) { %>
+            <div class='subtitle'><%= itemDescription %></div>
           <% } %>
           <div class='btns'>
             <% if (item.link) { %>
@@ -1028,8 +929,12 @@ body.dark .terminal-shell-options {
           </div>
         </div>
       </div>
+      <% } %>
+    <% }) %>
+    <% if (userTerminal && userTerminal.menu && userTerminal.menu.length) { %>
+      <%- include('./partials/d_terminal_column', { userTerminal, indexState, getItemDescription }) %>
     <% } %>
-  <% }) %>
+  </div>
   <% if (retry) { %>
     <div class='requirements'>
       <div class='content'>
@@ -1287,12 +1192,24 @@ const getPluginInstallRedirect = async (rawHref) => {
   pluginInstallPreflightCache.set(pluginPath, redirectHref)
   return redirectHref
 }
+const navigateOutsideLauncher = (href) => {
+  if (!href) {
+    return
+  }
+  try {
+    if (window.parent && window.parent !== window && window.parent !== window.top) {
+      window.parent.location.href = href
+      return
+    }
+  } catch (_) {}
+  window.location.href = href
+}
 const redirectToPluginInstallIfNeeded = async (rawHref) => {
   const redirectHref = await getPluginInstallRedirect(rawHref)
   if (!redirectHref) {
     return false
   }
-  window.top.location.href = redirectHref
+  navigateOutsideLauncher(redirectHref)
   return true
 }
 const pluginSettingsHrefFromLaunchHref = (rawHref) => {
@@ -1462,7 +1379,7 @@ document.addEventListener("click", async (e) => {
     e.stopPropagation()
     const settingsHref = pluginSettingsHrefFromLaunchHref(settingsTarget.getAttribute('data-href') || '')
     if (settingsHref) {
-      window.top.location.href = settingsHref
+      navigateOutsideLauncher(settingsHref)
     }
     return
   }

package/server/views/index.ejs

@@ -2346,9 +2346,11 @@ const startHomeAutolaunchPolling = () => {
     updateHomeActionStatus(line, "Running")
     syncStopButtons(line, scripts)
     const runningSection = getOrCreateRunningSection()
-    if (runningSection) {
+    if (runningSection && line.parentElement !== runningSection) {
       runningSection.appendChild(line)
+      return true
     }
+    return false
   }
   const getOrCreateNotRunningSection = () => {
     let section = document.querySelector(".not-running-apps")
@@ -2374,9 +2376,11 @@ const startHomeAutolaunchPolling = () => {
     syncStopButtons(line, [])
     activeHomeAutolaunchApps.delete(line.getAttribute("data-autolaunch-app"))
     const notRunningSection = getOrCreateNotRunningSection()
-    if (notRunningSection) {
+    if (notRunningSection && line.parentElement !== notRunningSection) {
       notRunningSection.appendChild(line)
+      return true
     }
+    return false
   }
   const autolaunchDependencyLabel = (autolaunch, dependencyId) => {
     const apps = autolaunch && autolaunch.apps ? autolaunch.apps : {}
@@ -2472,18 +2476,19 @@ const startHomeAutolaunchPolling = () => {
     }
     const autolaunch = state.autolaunch || {}
     const apps = autolaunch.apps || {}
+    let shouldReorder = false
     for (const line of lines) {
       const app = line.getAttribute("data-autolaunch-app")
       const autolaunchState = apps[app]
       const runningScripts = scriptsByApp.get(app) || []
       if (autolaunchState && !shouldDisplayAutolaunchStatus(app, autolaunchState, apps, runningApps)) {
-        markAutolaunchIdle(line)
+        shouldReorder = markAutolaunchIdle(line) || shouldReorder
       } else if (isPreparingAutolaunchState(autolaunchState)) {
         updateAutolaunchWaitingVisuals(line, autolaunchState, autolaunch, runningScripts)
       } else if (runningApps.has(app)) {
-        markAutolaunchRunning(line, runningScripts)
+        shouldReorder = markAutolaunchRunning(line, runningScripts) || shouldReorder
       } else if (state.launch_complete) {
-        markAutolaunchIdle(line)
+        shouldReorder = markAutolaunchIdle(line) || shouldReorder
       } else {
         updateAutolaunchWaitingVisuals(line, autolaunchState, autolaunch, runningScripts)
       }
@@ -2491,9 +2496,12 @@ const startHomeAutolaunchPolling = () => {
     if (getStartingLines().length === 0) {
       if (hadStartingLines) {
         hadStartingLines = false
-        reorderHomeSectionsByPreference()
+        shouldReorder = true
       }
     }
+    if (shouldReorder) {
+      reorderHomeSectionsByPreference()
+    }
   }
   const requestHomeStatus = () => {
     return new Promise((resolve, reject) => {

package/server/views/partials/app_autolaunch_modal_helpers.ejs

@@ -180,6 +180,10 @@
   const setOpen = (open) => {
     root.classList.toggle("open", !!open)
     button.setAttribute("aria-expanded", open ? "true" : "false")
+    if (open && modal.parentElement !== document.body) {
+      // Avoid transformed sidebar ancestors trapping the fixed dialog.
+      document.body.appendChild(modal)
+    }
     modal.classList.toggle("hidden", !open)
     if (open) {
       if (!candidateState && !loadingCandidates) {

package/server/views/partials/d_column_subtitle.ejs

@@ -0,0 +1,10 @@
+<% if (section && (section.subtitle || section.subtitle_link_href)) { %>
+  <div class='column-subtitle'>
+    <% if (section.subtitle) { %>
+      <span><%= section.subtitle %></span><% if (section.subtitle_link_href && section.subtitle_link_label) { %> <% } %>
+    <% } %>
+    <% if (section.subtitle_link_href && section.subtitle_link_label) { %>
+      <a class='column-subtitle-link' href="<%= section.subtitle_link_href %>" target="_parent"><%= section.subtitle_link_label %></a>
+    <% } %>
+  </div>
+<% } %>

package/server/views/partials/d_menu_column.ejs

@@ -0,0 +1,18 @@
+<%
+  const rows = section && Array.isArray(section.menu) ? section.menu : [];
+  const sectionClass = typeof className === "string" ? className : "";
+  const enableSettings = typeof showSettings === "boolean" ? showSettings : true;
+%>
+<% if (section && rows.length) { %>
+  <div class='menu-container menu-column <%= sectionClass %>'>
+    <div class='tab-header'>
+      <h3><i class='<%= section.icon %>'></i> <%= section.title %></h3>
+    </div>
+    <%- include('./d_column_subtitle', { section }) %>
+    <div class='tab-content'>
+      <% rows.forEach((i) => { %>
+        <%- include('./d_tool_tab', { i, indexState, getItemDescription, showSettings: enableSettings }) %>
+      <% }) %>
+    </div>
+  </div>
+<% } %>

package/server/views/partials/d_terminal_column.ejs

@@ -2,16 +2,7 @@
   <div class='tab-header'>
     <h3><i class='<%= userTerminal.icon %>'></i> <%= userTerminal.title === "Terminals" ? "Project Shell" : userTerminal.title %></h3>
   </div>
-  <% if (userTerminal.subtitle || userTerminal.subtitle_link_href) { %>
-    <div class='column-subtitle'>
-      <% if (userTerminal.subtitle) { %>
-        <span><%= userTerminal.subtitle %></span><% if (userTerminal.subtitle_link_href && userTerminal.subtitle_link_label) { %> <% } %>
-      <% } %>
-      <% if (userTerminal.subtitle_link_href && userTerminal.subtitle_link_label) { %>
-        <a class='column-subtitle-link' href="<%= userTerminal.subtitle_link_href %>" target="_parent"><%= userTerminal.subtitle_link_label %></a>
-      <% } %>
-    </div>
-  <% } %>
+  <%- include('./d_column_subtitle', { section: userTerminal }) %>
   <div class='tab-content'>
     <% userTerminal.menu.forEach((i) => { %>
       <div class='terminal-shell-group'>
@@ -29,7 +20,7 @@
           </div>
         </div>
         <div class='terminal-shell-options'>
-          <%- include('./d_terminal_options', { options: i.menu || [] }) %>
+          <%- include('./d_terminal_options', { options: i.menu || [], indexState, getItemDescription }) %>
         </div>
       </div>
     <% }) %>

package/server/views/partials/d_terminal_options.ejs

@@ -1,20 +1,3 @@
 <% options.forEach((i) => { %>
-  <div class='tab terminal-option-tab' role="button" tabindex="0" data-terminal-option-tab="true" data-target="@<%= i.href %>" data-href="<%= i.href %>">
-    <% if (i.image) { %>
-      <img src="<%= i.image %>">
-    <% } else if (i.icon) { %>
-      <i class="img <%= i.icon %>"></i>
-    <% } %>
-    <div class='tab-copy'>
-      <h2 class='tab-title'><%= i.title %></h2>
-      <% if (i.subtitle) { %>
-        <div class='tab-subtitle subtitle'><%= i.subtitle %></div>
-      <% } %>
-    </div>
-    <div class='tab-actions'>
-      <div class='disclosure-indicator' aria-hidden="true">
-        <i class="fa-solid fa-chevron-right"></i>
-      </div>
-    </div>
-  </div>
+  <%- include('./d_tool_tab', { i, indexState, getItemDescription, showSettings: false, terminalOption: true, className: 'terminal-option-tab' }) %>
 <% }) %>

package/server/views/partials/d_tool_tab.ejs

@@ -0,0 +1,32 @@
+<%
+  const href = i && typeof i.href === "string" ? i.href : "";
+  const target = href ? `@${href}` : "";
+  const tabIndex = typeof indexState !== "undefined" && indexState && typeof indexState.value === "number" ? indexState.value++ : 0;
+  const tabClass = ["tab", typeof className === "string" ? className : ""].filter(Boolean).join(" ");
+  const description = typeof getItemDescription === "function" ? getItemDescription(i) : (i && (i.description || i.subtitle || ""));
+  const enableSettings = typeof showSettings !== "undefined" && showSettings === true && href;
+  const isTerminalOption = typeof terminalOption !== "undefined" && terminalOption === true;
+%>
+<div class='<%= tabClass %>' role="button" tabindex="0" data-index="<%= tabIndex %>"<% if (isTerminalOption) { %> data-terminal-option-tab="true"<% } %> data-target="<%= target %>" data-href="<%= href %>">
+  <% if (i.image) { %>
+    <img src="<%= i.image %>">
+  <% } else if (i.icon) { %>
+    <i class="img <%= i.icon %>"></i>
+  <% } %>
+  <div class='tab-copy'>
+    <h2 class='tab-title'><%= i.title %></h2>
+    <% if (description) { %>
+      <div class='tab-subtitle subtitle'><%= description %></div>
+    <% } %>
+  </div>
+  <div class='tab-actions'>
+    <% if (enableSettings) { %>
+      <button class="tab-action-link" type="button" data-plugin-settings="true" data-href="<%= href %>" title="Manage plugin" data-tippy-content="Manage plugin" aria-label="Manage plugin">
+        <i class="fa-solid fa-gear"></i>
+      </button>
+    <% } %>
+    <div class='disclosure-indicator' aria-hidden="true">
+      <i class="fa-solid fa-chevron-right"></i>
+    </div>
+  </div>
+</div>

package/server/views/partials/main_sidebar.ejs

@@ -193,6 +193,9 @@
       };
 
       setCollapsed(false);
+      requestAnimationFrame(() => {
+        body.classList.add("main-sidebar-motion-ready");
+      });
 
       headerToggle.addEventListener("click", (event) => {
         event.preventDefault();

package/server/views/rows.ejs

@@ -321,8 +321,20 @@ body[data-agent='electron'] {
       }
     });
     window.addEventListener('message', (event) => {
+      if (event.data && event.data.e === "layout-state-request") {
+        const closable = Array.from(document.querySelectorAll('iframe')).some((iframe) => {
+          return event.source === iframe.contentWindow;
+        });
+        if (event.source && typeof event.source.postMessage === "function") {
+          event.source.postMessage({
+            e: "layout-state",
+            closable
+          }, "*");
+        }
+        return;
+      }
       if (event.data && event.data.e === "close") {
-        // find the frame 
+        // find the frame
         // Find which iframe sent the message
         const row0 = document.getElementById('row0');
         const row1 = document.getElementById('row1');

package/system/plugin/antigravity-cli/common.js

@@ -1,5 +1,6 @@
 const fs = require("fs")
 const path = require("path")
+const installer = require("./install")
 
 const MANAGED_DIR_PARTS = ["bin", "antigravity-cli"]
 
@@ -46,24 +47,17 @@ function workspaceFor(context, kernel) {
   return args.cwd || kernel.path("home")
 }
 
-function installSteps(kernel) {
+async function installSteps(kernel) {
+  await installer.install({
+    installDir: installDir(kernel),
+    managedDir: managedDir(kernel),
+  })
   return [{
-    id: "install",
-    method: "shell.run",
+    id: "installed",
+    method: "notify",
     params: {
-      conda: { skip: true },
-      message: {
-        _: [
-          process.execPath,
-          installerPath(),
-          "--install-dir",
-          installDir(kernel),
-          "--managed-dir",
-          managedDir(kernel),
-        ]
-      },
-      path: kernel.path(),
-      buffer: 1024,
+      html: "Antigravity CLI installed in Pinokio.",
+      type: "success",
     }
   }]
 }

package/test/antigravity-cli-plugin.test.js

@@ -7,6 +7,7 @@ const test = require("node:test")
 const antigravityCli = require("../system/plugin/antigravity-cli/pinokio")
 const antigravityCliAuto = require("../system/plugin/antigravity-cli-auto/pinokio")
 const antigravityCommon = require("../system/plugin/antigravity-cli/common")
+const antigravityInstaller = require("../system/plugin/antigravity-cli/install")
 
 function createKernel(root, platform = "darwin") {
   return {
@@ -25,28 +26,34 @@ test("Antigravity CLI plugins expose managed lifecycle actions", () => {
   }
 })
 
-test("Antigravity CLI install and update install agy into Pinokio bin", () => {
+test("Antigravity CLI install and update call the bundled installer internally", async () => {
   const root = path.join(os.tmpdir(), "pinokio-antigravity-test")
   const kernel = createKernel(root)
+  const calls = []
+  const originalInstall = antigravityInstaller.install
+  antigravityInstaller.install = async (options) => {
+    calls.push(options)
+  }
 
-  const install = antigravityCli.install(kernel, {})[0]
-  const update = antigravityCli.update(kernel, {})[0]
-
-  for (const step of [install, update]) {
-    assert.equal(step.method, "shell.run")
-    assert.equal(step.params.path, root)
-    assert.equal(step.params.conda.skip, true)
-    assert.equal(step.params.message._[0], process.execPath)
-    assert.equal(step.params.message._[1], antigravityCommon.installerPath())
-    assert.deepEqual(step.params.message._.slice(2), [
-      "--install-dir",
-      path.join(root, "bin"),
-      "--managed-dir",
-      path.join(root, "bin", "antigravity-cli"),
-    ])
-    assert.doesNotMatch(step.params.message._.join(" "), / -e /)
-    assert.doesNotMatch(step.params.message._.join(" "), /api\.github\.com\/repos\/google-antigravity\/antigravity-cli\/releases\/latest/)
-    assert.equal(Object.prototype.hasOwnProperty.call(step.params, "input"), false)
+  try {
+    const install = await antigravityCli.install(kernel, {})
+    const update = await antigravityCli.update(kernel, {})
+
+    assert.deepEqual(calls, [{
+      installDir: path.join(root, "bin"),
+      managedDir: path.join(root, "bin", "antigravity-cli"),
+    }, {
+      installDir: path.join(root, "bin"),
+      managedDir: path.join(root, "bin", "antigravity-cli"),
+    }])
+
+    for (const steps of [install, update]) {
+      assert.equal(steps.length, 1)
+      assert.equal(steps[0].method, "notify")
+      assert.equal(steps[0].params.type, "success")
+    }
+  } finally {
+    antigravityInstaller.install = originalInstall
   }
 })
 

package/test/home-autolaunch-live-ui.test.js

@@ -82,6 +82,43 @@ function createHomeDomWithApps(appIds) {
   })
 }
 
+function createHomeDomForIdleOrdering() {
+  const row = (appId, name, stopButton = false) => `
+    <div
+      class="line align-top home-app-line"
+      data-name="${name}"
+      data-autolaunch-app="${appId}"
+      data-autolaunch-starting="0"
+      data-autolaunch-script="start.js"
+    >
+      <h3><span class="title"><i class="fa-solid fa-circle"></i></span></h3>
+      <div class="menu-btns">
+        <button class="open-actions-modal" data-dialog-id="actions-${appId}" type="button">menu</button>
+        ${stopButton ? `
+          <button class="btn shutdown" type="button" data-src="api/${appId}/start.js">
+            <i class="fa-solid fa-stop" aria-hidden="true"></i>
+            <span>Stop start.js</span>
+          </button>
+        ` : ""}
+      </div>
+    </div>
+    <div id="actions-${appId}"><div class="home-actions-title-row"></div></div>
+  `
+  return new JSDOM(`
+    <!doctype html>
+    <body>
+      <div class="running-apps">${row("alpha", "Alpha", true)}</div>
+      <div class="not-running-apps">
+        ${row("beta", "Beta")}
+        ${row("gamma", "Gamma")}
+      </div>
+    </body>
+  `, {
+    runScripts: "outside-only",
+    url: "http://127.0.0.1:42000/home?sort=az"
+  })
+}
+
 function installHomeStatusMocks(window, responses) {
   const timeouts = []
   const intervals = []
@@ -225,6 +262,39 @@ test("home one-shot status refresh can update a stopped app row", async () => {
   assert.equal(window.document.querySelector(".not-running-apps").contains(line), true)
 })
 
+test("home one-shot status refresh preserves idle app sort order after moving stopped row", async () => {
+  const script = await homeAutolaunchScript({ launchComplete: true })
+  const dom = createHomeDomForIdleOrdering()
+  const { window } = dom
+  const responses = [{
+    launch_complete: true,
+    running_apps: [],
+    running_scripts: [],
+    autolaunch: { apps: {} }
+  }]
+  installHomeStatusMocks(window, responses)
+  let reorderCalls = 0
+  window.reorderHomeSectionsByPreference = () => {
+    reorderCalls += 1
+    for (const selector of [".running-apps", ".not-running-apps"]) {
+      const section = window.document.querySelector(selector)
+      const lines = Array.from(section.querySelectorAll(":scope > .line"))
+      lines.sort((a, b) => (a.getAttribute("data-name") || "").localeCompare(b.getAttribute("data-name") || ""))
+      for (const line of lines) {
+        section.appendChild(line)
+      }
+    }
+  }
+
+  window.eval(script)
+  await window.refreshHomeStatusOnce("alpha")
+
+  const idleNames = Array.from(window.document.querySelectorAll(".not-running-apps > .line"))
+    .map((line) => line.getAttribute("data-name"))
+  assert.deepEqual(idleNames, ["Alpha", "Beta", "Gamma"])
+  assert.equal(reorderCalls, 1)
+})
+
 test("home live status discovers a running target even when preparation status has already cleared", async () => {
   const script = await homeAutolaunchScript()
   const dom = createHomeDom({ running: false, stopButton: false })