@elizaos/app-core 2.0.3-beta.5 → 2.0.3-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elizaos/app-core",
-  "version": "2.0.3-beta.5",
+  "version": "2.0.3-beta.7",
   "description": "Shared application core for elizaOS white-label agent apps.",
   "type": "module",
   "license": "MIT",
@@ -155,22 +155,22 @@
     "three": "^0.184.0"
   },
   "optionalDependencies": {
-    "@elizaos/capacitor-appblocker": "2.0.3-beta.5",
-    "@elizaos/capacitor-bun-runtime": "2.0.3-beta.5",
-    "@elizaos/capacitor-camera": "2.0.3-beta.5",
-    "@elizaos/capacitor-canvas": "2.0.3-beta.5",
-    "@elizaos/capacitor-contacts": "2.0.3-beta.5",
-    "@elizaos/capacitor-gateway": "2.0.3-beta.5",
-    "@elizaos/capacitor-location": "2.0.3-beta.5",
-    "@elizaos/capacitor-messages": "2.0.3-beta.5",
-    "@elizaos/capacitor-mobile-agent-bridge": "2.0.3-beta.5",
-    "@elizaos/capacitor-mobile-signals": "2.0.3-beta.5",
-    "@elizaos/capacitor-phone": "2.0.3-beta.5",
-    "@elizaos/capacitor-screencapture": "2.0.3-beta.5",
-    "@elizaos/capacitor-swabble": "2.0.3-beta.5",
-    "@elizaos/capacitor-system": "2.0.3-beta.5",
-    "@elizaos/capacitor-talkmode": "2.0.3-beta.5",
-    "@elizaos/capacitor-websiteblocker": "2.0.3-beta.5",
+    "@elizaos/capacitor-appblocker": "2.0.3-beta.7",
+    "@elizaos/capacitor-bun-runtime": "2.0.3-beta.7",
+    "@elizaos/capacitor-camera": "2.0.3-beta.7",
+    "@elizaos/capacitor-canvas": "2.0.3-beta.7",
+    "@elizaos/capacitor-contacts": "2.0.3-beta.7",
+    "@elizaos/capacitor-gateway": "2.0.3-beta.7",
+    "@elizaos/capacitor-location": "2.0.3-beta.7",
+    "@elizaos/capacitor-messages": "2.0.3-beta.7",
+    "@elizaos/capacitor-mobile-agent-bridge": "2.0.3-beta.7",
+    "@elizaos/capacitor-mobile-signals": "2.0.3-beta.7",
+    "@elizaos/capacitor-phone": "2.0.3-beta.7",
+    "@elizaos/capacitor-screencapture": "2.0.3-beta.7",
+    "@elizaos/capacitor-swabble": "2.0.3-beta.7",
+    "@elizaos/capacitor-system": "2.0.3-beta.7",
+    "@elizaos/capacitor-talkmode": "2.0.3-beta.7",
+    "@elizaos/capacitor-websiteblocker": "2.0.3-beta.7",
     "sharp": "^0.34.5"
   },
   "dependencies": {
@@ -184,24 +184,25 @@
     "@capacitor/preferences": "^8.0.1",
     "@capacitor/push-notifications": "^8.0.0",
     "@clack/prompts": "^1.0.0",
-    "@elizaos/core": "2.0.3-beta.5",
-    "@elizaos/plugin-anthropic": "2.0.3-beta.5",
-    "@elizaos/plugin-browser": "2.0.3-beta.5",
-    "@elizaos/plugin-edge-tts": "2.0.3-beta.5",
-    "@elizaos/plugin-elizacloud": "2.0.3-beta.5",
-    "@elizaos/plugin-groq": "2.0.3-beta.5",
-    "@elizaos/plugin-health": "2.0.3-beta.5",
-    "@elizaos/plugin-local-inference": "2.0.3-beta.5",
-    "@elizaos/plugin-openai": "2.0.3-beta.5",
-    "@elizaos/plugin-registry": "2.0.3-beta.5",
-    "@elizaos/plugin-sql": "2.0.3-beta.5",
-    "@elizaos/plugin-wechat": "2.0.3-beta.5",
-    "@elizaos/plugin-workflow": "2.0.3-beta.5",
-    "@elizaos/registry": "2.0.3-beta.5",
-    "@elizaos/shared": "2.0.3-beta.5",
-    "@elizaos/skills": "2.0.3-beta.5",
-    "@elizaos/ui": "2.0.3-beta.5",
-    "@elizaos/vault": "2.0.3-beta.5",
+    "@elizaos/agent": "2.0.3-beta.7",
+    "@elizaos/core": "2.0.3-beta.7",
+    "@elizaos/plugin-anthropic": "2.0.3-beta.7",
+    "@elizaos/plugin-browser": "2.0.3-beta.7",
+    "@elizaos/plugin-edge-tts": "2.0.3-beta.7",
+    "@elizaos/plugin-elizacloud": "2.0.3-beta.7",
+    "@elizaos/plugin-groq": "2.0.3-beta.7",
+    "@elizaos/plugin-health": "2.0.3-beta.7",
+    "@elizaos/plugin-local-inference": "2.0.3-beta.7",
+    "@elizaos/plugin-openai": "2.0.3-beta.7",
+    "@elizaos/plugin-registry": "2.0.3-beta.7",
+    "@elizaos/plugin-sql": "2.0.3-beta.7",
+    "@elizaos/plugin-wechat": "2.0.3-beta.7",
+    "@elizaos/plugin-workflow": "2.0.3-beta.7",
+    "@elizaos/registry": "2.0.3-beta.7",
+    "@elizaos/shared": "2.0.3-beta.7",
+    "@elizaos/skills": "2.0.3-beta.7",
+    "@elizaos/ui": "2.0.3-beta.7",
+    "@elizaos/vault": "2.0.3-beta.7",
     "@node-rs/argon2": "^2.0.2",
     "@upstash/redis": "^1.37.0",
     "chalk": "^5.3.0",
@@ -222,5 +223,5 @@
   },
   "module": "./index.js",
   "types": "./index.d.ts",
-  "gitHead": "ff6157011c9459670021cc28a6797592a78b8817"
+  "gitHead": "61094f10458d11055c75b3dd0bae374e3f66bac5"
 }

package/platforms/electrobun/electrobun.config.ts

@@ -1,3 +1,4 @@
+import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -178,6 +179,13 @@ const workspacePackagesRoot = fs.existsSync(
 )
   ? path.join(repoRoot, "packages")
   : path.join(repoRoot, "eliza", "packages");
+const elizaWorkspaceRoot = path.dirname(workspacePackagesRoot);
+const rmPathRecursiveScript = path.join(
+  elizaWorkspaceRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
 const sharedSourceDir = path.join(workspacePackagesRoot, "shared", "src");
 const coreNodeEntry = fs.existsSync(
   path.join(workspacePackagesRoot, "core", "dist", "node", "index.node.js"),
@@ -216,7 +224,7 @@ function resolveRuntimeBundleSourcePath(rootDir: string): string {
     ".generated",
     "runtime-dist",
   );
-  fs.rmSync(sanitizedDistPath, { recursive: true, force: true });
+  rmRecursive(sanitizedDistPath);
   fs.mkdirSync(sanitizedDistPath, { recursive: true });
   for (const entry of fs.readdirSync(runtimeDistPath)) {
     if (entry === "node_modules") continue;
@@ -232,6 +240,28 @@ function resolveRuntimeBundleSourcePath(rootDir: string): string {
   return sanitizedDistPath;
 }
 
+function rmRecursive(pathToRemove: string): void {
+  const result = spawnSync(
+    process.execPath,
+    [rmPathRecursiveScript, path.resolve(pathToRemove)],
+    {
+      cwd: elizaWorkspaceRoot,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+    },
+  );
+  if (result.status !== 0) {
+    const reason =
+      result.stderr?.trim() ||
+      result.stdout?.trim() ||
+      result.error?.message ||
+      `exit status ${String(result.status)}`;
+    throw new Error(
+      `Failed to recursively remove sanitized Electrobun runtime dist ${pathToRemove}: ${reason}`,
+    );
+  }
+}
+
 const runtimeBundleSourcePath = resolveRuntimeBundleSourcePath(repoRoot);
 const runtimeBundleDistDir = path.relative(
   electrobunDir,

package/platforms/electrobun/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elizaos/electrobun",
-  "version": "2.0.3-beta.5",
+  "version": "2.0.3-beta.7",
   "type": "module",
   "files": [
     "assets",
@@ -25,14 +25,14 @@
     "build:native-effects": "bash scripts/build-macos-effects.sh"
   },
   "dependencies": {
-    "@elizaos/agent": "2.0.3-beta.5",
-    "@elizaos/app-core": "2.0.3-beta.5",
-    "@elizaos/plugin-browser": "2.0.3-beta.5",
-    "@elizaos/plugin-capacitor-bridge": "2.0.3-beta.5",
-    "@elizaos/plugin-registry": "2.0.3-beta.5",
-    "@elizaos/plugin-remote-manifest": "2.0.3-beta.5",
-    "@elizaos/plugin-streaming": "2.0.3-beta.5",
-    "@elizaos/shared": "2.0.3-beta.5",
+    "@elizaos/agent": "2.0.3-beta.7",
+    "@elizaos/app-core": "2.0.3-beta.7",
+    "@elizaos/plugin-browser": "2.0.3-beta.7",
+    "@elizaos/plugin-capacitor-bridge": "2.0.3-beta.7",
+    "@elizaos/plugin-registry": "2.0.3-beta.7",
+    "@elizaos/plugin-remote-manifest": "2.0.3-beta.7",
+    "@elizaos/plugin-streaming": "2.0.3-beta.7",
+    "@elizaos/shared": "2.0.3-beta.7",
     "bonjour-service": "1.4.2",
     "electrobun": "^1.18.1"
   },
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff6157011c9459670021cc28a6797592a78b8817"
+  "gitHead": "61094f10458d11055c75b3dd0bae374e3f66bac5"
 }

package/platforms/electrobun/remotes/fs/README.md

@@ -61,7 +61,6 @@ Environment overrides:
 ## Commands
 
 ```sh
-bun run --cwd elizalaunch/remotes/fs build
 bun run --cwd elizalaunch/remotes/fs smoke
 bun run --cwd elizalaunch/remotes/fs smoke:phase5
 bun run --cwd elizalaunch/remotes/fs typecheck

package/platforms/electrobun/remotes/fs/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "bun build src/bun/worker.ts src/dev/phase5-smoke.ts --outdir dist --target bun",
     "smoke": "bun run src/dev/phase5-smoke.ts",
     "smoke:phase5": "bun run src/dev/phase5-smoke.ts",
     "typecheck": "tsc --ignoreConfig --noEmit --target ES2022 --module ESNext --moduleResolution Bundler --lib ES2022,DOM --types bun-types --allowImportingTsExtensions src/bun/protocol.ts src/bun/errors.ts src/bun/file-limits.ts src/bun/path-guard.ts src/bun/fs-service.ts src/bun/worker.ts src/dev/phase5-smoke.ts"

package/platforms/electrobun/remotes/git/README.md

@@ -57,11 +57,10 @@ Each operation includes:
 - `ELIZA_GIT_COMMAND_TIMEOUT_MS` defaults to `120000`
 - `ELIZA_GIT_MAX_OPERATIONS` defaults to `200`
 
-## Build And Smoke
+## Typecheck And Smoke
 
 ```sh
 bun run --cwd elizalaunch/remotes/git typecheck
-bun run --cwd elizalaunch/remotes/git build
 bun run --cwd elizalaunch/remotes/git smoke
 bun run --cwd elizalaunch/remotes/git smoke:phase7
 ```

package/platforms/electrobun/remotes/git/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "bun build src/bun/worker.ts src/dev/phase7-smoke.ts --outdir dist --target bun",
     "smoke": "bun run src/dev/phase7-smoke.ts",
     "smoke:phase7": "bun run src/dev/phase7-smoke.ts",
     "typecheck": "tsc --ignoreConfig --noEmit --target ES2022 --module ESNext --moduleResolution Bundler --lib ES2022,DOM --types bun-types --allowImportingTsExtensions src/bun/protocol.ts src/bun/errors.ts src/bun/operation-history.ts src/bun/git-command.ts src/bun/git-service.ts src/bun/worker.ts src/dev/phase7-smoke.ts"

package/platforms/electrobun/remotes/local-model/README.md

@@ -94,7 +94,6 @@ The current route file does not expose direct local generation or direct embeddi
 
 ```sh
 bun run --cwd elizalaunch/remotes/local-model typecheck
-bun run --cwd elizalaunch/remotes/local-model build
 bun run --cwd elizalaunch/remotes/local-model smoke
 bun run --cwd elizalaunch/remotes/local-model smoke:phase8
 ```

package/platforms/electrobun/remotes/local-model/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "bun build src/bun/worker.ts src/dev/phase8-smoke.ts --outdir dist --target bun",
     "smoke": "bun run src/dev/phase8-smoke.ts",
     "smoke:phase8": "bun run src/dev/phase8-smoke.ts",
     "typecheck": "tsc --ignoreConfig --noEmit --target ES2022 --module ESNext --moduleResolution Bundler --lib ES2022,DOM --types bun-types --allowImportingTsExtensions src/bun/protocol.ts src/bun/errors.ts src/bun/eliza1-catalog.ts src/bun/hf-eliza1-client.ts src/bun/local-inference-api-client.ts src/bun/download-state.ts src/bun/model-service.ts src/bun/worker.ts src/dev/phase8-smoke.ts"

package/platforms/electrobun/remotes/pty/README.md

@@ -52,10 +52,9 @@ Output polling through `pty.session.output.tail` is sufficient for Phase 6 when
 
 Session environment inherits `process.env` and merges per-session env overrides.
 
-## Build And Smoke
+## Smoke
 
 ```sh
-bun run --cwd elizalaunch/remotes/pty build
 bun run --cwd elizalaunch/remotes/pty smoke
 bun run --cwd elizalaunch/remotes/pty smoke:phase6
 ```

package/platforms/electrobun/remotes/pty/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "bun build src/bun/worker.ts src/dev/phase6-smoke.ts --outdir dist --target bun",
     "smoke": "bun run src/dev/phase6-smoke.ts",
     "smoke:phase6": "bun run src/dev/phase6-smoke.ts",
     "typecheck": "tsc --ignoreConfig --noEmit --target ES2022 --module ESNext --moduleResolution Bundler --lib ES2022,DOM --types bun-types --allowImportingTsExtensions src/bun/protocol.ts src/bun/errors.ts src/bun/output-buffer.ts src/bun/pty-service.ts src/bun/worker.ts src/dev/phase6-smoke.ts"

package/platforms/electrobun/remotes/runtime/README.md

@@ -206,11 +206,7 @@ Git:
 
 ## Run
 
-Build:
-
-```sh
-bun run --cwd elizalaunch/remotes/runtime build
-```
+Remotes run from source (the runtime loads `src/bun/worker.ts` / `src/web/index.html` directly); there is no build step.
 
 Phase 1 smoke:
 

package/platforms/electrobun/remotes/runtime/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "bun build src/bun/worker.ts src/dev/phase1-smoke.ts src/dev/phase2-smoke.ts src/dev/phase3-smoke.ts --outdir dist --target bun",
     "smoke": "bun src/dev/phase1-smoke.ts",
     "smoke:phase1": "bun src/dev/phase1-smoke.ts",
     "smoke:phase2": "bun src/dev/phase2-smoke.ts",

package/platforms/electrobun/remotes/surface/README.md

@@ -106,10 +106,9 @@ It consumes:
 - `agent.message.stream.done`
 - `agent.message.stream.cancelled`
 
-## Build and Smoke
+## Smoke
 
 ```sh
-bun run --cwd elizalaunch/remotes/surface build
 bun run --cwd elizalaunch/remotes/surface smoke
 bun run --cwd elizalaunch/remotes/surface smoke:phase4
 ```

package/platforms/electrobun/remotes/surface/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "bun build src/bun/worker.ts src/dev/phase4-smoke.ts --outdir dist --target bun && bun build src/web/index.ts --outdir dist/web --target browser",
     "smoke": "bun run src/dev/phase4-smoke.ts",
     "smoke:phase4": "bun run src/dev/phase4-smoke.ts",
     "typecheck": "tsc --ignoreConfig --noEmit --target ES2022 --module ESNext --moduleResolution Bundler --lib ES2022,DOM,DOM.Iterable --types bun-types --allowImportingTsExtensions src/protocol/event-types.ts src/protocol/runtime-client.ts src/web/state.ts src/web/render.ts src/web/app.ts src/web/index.ts src/bun/worker.ts src/dev/phase4-smoke.ts"

package/platforms/electrobun/scripts/sync-web-assets.mjs

@@ -9,7 +9,8 @@
  * Resolves the host app via the standard elizaOS layout; run after
  * `bun run build:web` (or equivalent).
  */
-import { cp, mkdir, rm, stat } from "node:fs/promises";
+import { spawnSync } from "node:child_process";
+import { cp, mkdir, stat } from "node:fs/promises";
 import path from "node:path";
 import {
   resolveElectrobunDir,
@@ -22,6 +23,12 @@ const appRoot = resolveMainAppDir(repoRoot, "app");
 const electrobunRoot = resolveElectrobunDir(repoRoot);
 const sourceDir = path.join(appRoot, "dist");
 const targetDir = path.join(electrobunRoot, "app");
+const rmPathRecursiveScript = path.join(
+  repoRoot,
+  "packages",
+  "scripts",
+  "rm-path-recursive.mjs",
+);
 const LOG_PREFIX = "[Electrobun]";
 
 async function ensureDirExists(dir) {
@@ -33,6 +40,28 @@ async function ensureDirExists(dir) {
   }
 }
 
+function rmRecursive(pathToRemove) {
+  const result = spawnSync(
+    process.execPath,
+    [rmPathRecursiveScript, path.resolve(pathToRemove)],
+    {
+      cwd: repoRoot,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+    },
+  );
+  if (result.status !== 0) {
+    const reason =
+      result.stderr?.trim() ||
+      result.stdout?.trim() ||
+      result.error?.message ||
+      `exit status ${String(result.status)}`;
+    throw new Error(
+      `${LOG_PREFIX} failed to recursively remove ${pathToRemove}: ${reason}`,
+    );
+  }
+}
+
 if (!(await ensureDirExists(sourceDir))) {
   console.error(`${LOG_PREFIX} Web build output not found: ${sourceDir}`);
   console.error(
@@ -41,7 +70,7 @@ if (!(await ensureDirExists(sourceDir))) {
   process.exit(1);
 }
 
-await rm(targetDir, { recursive: true, force: true });
+rmRecursive(targetDir);
 await mkdir(targetDir, { recursive: true });
 await cp(sourceDir, targetDir, { recursive: true, force: true });
 

package/platforms/electrobun/src/api-base.ts

@@ -256,7 +256,11 @@ export function resolveRendererFacingApiBase(
  */
 type ApiBaseUpdateRpc = {
   send?: {
-    apiBaseUpdate?: (payload: { base: string; token?: string }) => void;
+    apiBaseUpdate?: (payload: {
+      base: string;
+      token?: string;
+      externalApiBase?: string | null;
+    }) => void;
   };
 };
 
@@ -264,9 +268,14 @@ export function pushApiBaseToRenderer(
   win: { webview: { rpc?: unknown } },
   base: string,
   apiToken?: string,
+  externalApiBase?: string | null,
 ): void {
   const trimmedToken = apiToken?.trim();
-  const payload = { base, token: trimmedToken || undefined };
+  const payload = {
+    base,
+    token: trimmedToken || undefined,
+    externalApiBase: externalApiBase ?? null,
+  };
   try {
     const rpcSend = (win.webview.rpc as ApiBaseUpdateRpc | undefined)?.send;
     rpcSend?.apiBaseUpdate?.(payload);

package/platforms/electrobun/src/bridge/electrobun-direct-rpc.ts

@@ -63,8 +63,21 @@ ensureElectrobunGlobal();
 
 function dispatchMessage(messageName: string, payload: unknown): void {
   if (messageName === "apiBaseUpdate") {
-    const apiBaseUpdate = payload as { base: string; token?: string };
+    const apiBaseUpdate = payload as {
+      base: string;
+      token?: string;
+      externalApiBase?: string | null;
+    };
     window.__ELIZA_API_BASE__ = apiBaseUpdate.base;
+    if (
+      typeof apiBaseUpdate.externalApiBase === "string" &&
+      apiBaseUpdate.externalApiBase.trim()
+    ) {
+      window.__ELIZA_DESKTOP_EXTERNAL_API_BASE__ =
+        apiBaseUpdate.externalApiBase.trim();
+    } else {
+      Reflect.deleteProperty(window, "__ELIZA_DESKTOP_EXTERNAL_API_BASE__");
+    }
     if (apiBaseUpdate.token) {
       Object.defineProperty(window, "__ELIZA_API_TOKEN__", {
         value: apiBaseUpdate.token,
@@ -196,6 +209,7 @@ declare global {
   interface Window {
     __ELIZA_API_BASE__?: string;
     __ELIZA_API_TOKEN__: string;
+    __ELIZA_DESKTOP_EXTERNAL_API_BASE__?: string;
     __ELIZA_ELECTROBUN_RPC__?: typeof electrobunRpc;
   }
 }

package/platforms/electrobun/src/index.ts

@@ -34,7 +34,6 @@ import { getBrandConfig } from "./brand-config";
 import { startBrowserWorkspaceBridgeServer } from "./browser-workspace-bridge-server";
 import { readNavigationEventUrl } from "./cloud-auth-window";
 import { readOpenUrlEventUrl } from "./desktop-deep-link-events";
-import { shouldCreateDesktopPill } from "./desktop-pill-config";
 import { startDesktopTestBridgeServer } from "./desktop-test-bridge-server";
 import {
   shouldCreateDesktopTray,
@@ -96,7 +95,6 @@ import {
   getOnboardingOverlayWindow,
 } from "./onboarding-overlay-window";
 import { getPersistedDeployment } from "./persisted-deployment";
-import { createPillWindow, getPillWindow } from "./pill-window";
 import { printElectrobunDevSettingsBanner } from "./print-electrobun-dev-settings-banner";
 import {
   createRendererApiProxyRequestInit,
@@ -944,11 +942,32 @@ async function resolveRendererUrl(): Promise<string> {
   return rendererUrl;
 }
 
+function appendApiBaseParam(rendererUrl: string, apiBase: string): string {
+  try {
+    const url = new URL(rendererUrl);
+    if (!url.searchParams.has("apiBase")) {
+      url.searchParams.set("apiBase", apiBase);
+    }
+    return url.toString();
+  } catch {
+    return rendererUrl;
+  }
+}
+
+async function resolveRendererUrlForCurrentRuntime(): Promise<string> {
+  const rendererUrl = await resolveRendererUrl();
+  const runtime = resolveDesktopRuntime();
+  if (runtime.mode === "external" && runtime.externalApi.base) {
+    return appendApiBaseParam(rendererUrl, runtime.externalApi.base);
+  }
+  return rendererUrl;
+}
+
 async function createMainWindow(rpc: ElizaDesktopRpc): Promise<BrowserWindow> {
   const kiosk = isKioskShellMode();
   const rendererUrl = kiosk
-    ? appendKioskShellModeParam(await resolveRendererUrl())
-    : await resolveRendererUrl();
+    ? appendKioskShellModeParam(await resolveRendererUrlForCurrentRuntime())
+    : await resolveRendererUrlForCurrentRuntime();
   const buildInfo = await BuildConfig.get();
   const mainWindowPartition = resolveMainWindowPartition(process.env, {
     platform: process.platform,
@@ -1251,7 +1270,7 @@ async function openOnboardingOverlayWindow(): Promise<BrowserWindow> {
     return existing;
   }
   const { rpc } = createDesktopRpc("onboarding-overlay");
-  const rendererUrl = await resolveRendererUrl();
+  const rendererUrl = await resolveRendererUrlForCurrentRuntime();
   let preload = "";
   try {
     preload = readResolvedPreloadScript(import.meta.dir);
@@ -1692,11 +1711,6 @@ function injectApiBaseIntoOpenRendererWindows(): void {
     injectApiBase(currentWindow);
   }
 
-  const pillWindow = getPillWindow();
-  if (pillWindow && pillWindow !== currentWindow) {
-    injectApiBase(pillWindow);
-  }
-
   surfaceWindowManager?.forEachWindow((w) => {
     injectApiBase(w as BrowserWindow);
   });
@@ -1712,10 +1726,6 @@ function collectOpenRendererWindows(): BrowserWindow[] {
   if (currentWindow) {
     windows.push(currentWindow);
   }
-  const pillWindow = getPillWindow();
-  if (pillWindow && pillWindow !== currentWindow) {
-    windows.push(pillWindow);
-  }
   surfaceWindowManager?.forEachWindow((w) => {
     windows.push(w as BrowserWindow);
   });
@@ -2479,7 +2489,7 @@ async function main(): Promise<void> {
         // The agent rebound to a different loopback port (or recovered from a
         // crash) — the cookies we installed during _startAgent were scoped to
         // the old origin. Re-prime so every renderer's next /api request stays
-        // authenticated, including the OS-level pill window.
+        // authenticated, including any open secondary renderer windows.
         markDesktopSessionStale();
         const apiBase = `http://127.0.0.1:${status.port}`;
         const rendererBase = resolveRendererFacingApiBase(
@@ -2617,19 +2627,6 @@ async function main(): Promise<void> {
       /* non-fatal */
     }
     getFloatingChatManager().configure(url, preload);
-    // In kiosk mode the chat pill lives in-canvas on the KioskShell, so we
-    // never spawn the separate native pill toplevel. Outside kiosk, the pill
-    // loads the same renderer in chat-overlay shell mode so the assistant
-    // lives in its own OS-level window instead of inside the app.
-    if (!isKioskShellMode() && shouldCreateDesktopPill()) {
-      try {
-        createPillWindow({ rendererUrl: url, preload });
-      } catch (err) {
-        logger.warn(
-          `[Main] Failed to spawn pill window: ${err instanceof Error ? err.message : String(err)}`,
-        );
-      }
-    }
   });
 
   // Per-window RPC tracking: surface windows each get their own typed

package/platforms/electrobun/src/lifecycle/api-base-owner.test.ts

@@ -1,10 +1,23 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { getCurrent, injectIntoHtml, setCurrent } from "./api-base-owner";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  getCurrent,
+  injectIntoHtml,
+  pushToWindow,
+  setCurrent,
+} from "./api-base-owner";
 
 const ENV_KEYS = [
+  "ELIZA_API_BASE",
+  "ELIZA_API_BASE_URL",
+  "ELIZA_DESKTOP_API_BASE",
+  "ELIZA_DESKTOP_CLOUD_AGENT_BASE",
+  "ELIZA_DESKTOP_CLOUD_ONLY",
+  "ELIZA_DESKTOP_RUNTIME_MODE",
+  "ELIZA_DESKTOP_SKIP_EMBEDDED_AGENT",
+  "ELIZA_DESKTOP_TEST_API_BASE",
   "ELIZA_STARTUP_SESSION_ID",
   "ELIZA_STARTUP_STATE_FILE",
   "ELIZA_STARTUP_EVENTS_FILE",
@@ -17,12 +30,10 @@ let tempHome: string | null = null;
 beforeEach(() => {
   for (const key of ENV_KEYS) {
     originalEnv.set(key, process.env[key]);
+    if (key !== "HOME") delete process.env[key];
   }
   tempHome = fs.mkdtempSync(path.join(os.tmpdir(), "eliza-api-base-owner-"));
   process.env.HOME = tempHome;
-  delete process.env.ELIZA_STARTUP_SESSION_ID;
-  delete process.env.ELIZA_STARTUP_STATE_FILE;
-  delete process.env.ELIZA_STARTUP_EVENTS_FILE;
   setCurrent(null);
 });
 
@@ -80,4 +91,55 @@ describe("api-base-owner", () => {
     expect(injected).toContain('"__ELIZA_API_TOKEN__"');
     expect(injected).toContain("elizaos.app.boot-config");
   });
+
+  it("marks a non-loopback current API base as an external desktop API base", () => {
+    setCurrent("https://agent.example.com", "cloud-token");
+
+    const injected = injectIntoHtml("<html><head></head><body></body></html>");
+
+    expect(injected).toContain(
+      'window.__ELIZA_API_BASE__="https://agent.example.com";',
+    );
+    expect(injected).toContain(
+      'window.__ELIZA_DESKTOP_EXTERNAL_API_BASE__="https://agent.example.com";',
+    );
+  });
+
+  it("pushes the external desktop API base to already-open renderer windows", () => {
+    setCurrent("https://agent.example.com", "cloud-token");
+    const apiBaseUpdate = vi.fn();
+
+    pushToWindow({
+      webview: {
+        rpc: {
+          send: { apiBaseUpdate },
+        },
+      },
+    });
+
+    expect(apiBaseUpdate).toHaveBeenCalledWith({
+      base: "https://agent.example.com",
+      token: "cloud-token",
+      externalApiBase: "https://agent.example.com",
+    });
+  });
+
+  it("does not mark loopback API bases as external", () => {
+    setCurrent("http://127.0.0.1:31337", "dev-token");
+    const apiBaseUpdate = vi.fn();
+
+    pushToWindow({
+      webview: {
+        rpc: {
+          send: { apiBaseUpdate },
+        },
+      },
+    });
+
+    expect(apiBaseUpdate).toHaveBeenCalledWith({
+      base: "http://127.0.0.1:31337",
+      token: "dev-token",
+      externalApiBase: null,
+    });
+  });
 });