pinokiod 7.5.20 → 7.5.21

package/package.json

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

package/server/views/d.ejs

@@ -1192,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) => {
@@ -1367,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/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,23 +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: {
-      message: {
-        _: [
-          "node",
-          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,29 +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(Object.prototype.hasOwnProperty.call(step.params, "conda"), false)
-    assert.equal(Object.prototype.hasOwnProperty.call(step.params, "env"), false)
-    assert.equal(step.params.message._[0], "node")
-    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
   }
 })