create-opentray 0.24.0 → 0.26.0

package/dist/{bin-BQb2Bjcu.mjs → bin-Bz16rwKs.mjs}

@@ -1,4 +1,6 @@
+import { r as __toESM$1, t as __commonJSMin$1 } from "./rolldown-runtime-DJK8HYOj.mjs";
 import { _ as assetsDirectory, a as decodeImage, c as encodeImagePng, d as rasterizeSvg, f as resizeImage, g as glyphLadderFingerprint, h as embeddedGlyphFont, i as cropImage, l as insideImage, m as GLYPH_FONT_FAMILY, n as cloneImage, o as decodeImageFile, p as trimBounds, r as containImage, s as emptyImageOf, t as brightPixelRatio, u as pasteImage } from "./raster-DeMbA2zI.mjs";
+import { i as encodeIco, n as encodeDensePng, r as encodeIcns, t as LINUX_SIZES } from "./encode-CTEluLqt.mjs";
 import { createRequire } from "node:module";
 import crypto, { createHash, randomBytes } from "node:crypto";
 import fs, { access, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, realpath, rename, rm, stat, symlink, writeFile } from "node:fs/promises";
@@ -9,42 +11,9 @@ import { execFile, spawn, spawnSync } from "node:child_process";
 import net from "node:net";
 import { fileURLToPath } from "node:url";
 import { getSvgPath } from "figma-squircle";
-import { IconIcns, IconIco } from "@shockpkg/icon-encoder";
 import { resolveDefaultDarwinAppBundlePath, sanitizeAppBundleName } from "@opentray/packaging";
 import { promisify } from "node:util";
 import { createServer } from "node:http";
-//#region \0rolldown/runtime.js
-var __create$1 = Object.create;
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames$1 = Object.getOwnPropertyNames;
-var __getProtoOf$1 = Object.getPrototypeOf;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __commonJSMin$1 = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
-var __exportAll$1 = (all, no_symbols) => {
-	let target = {};
-	for (var name in all) __defProp$1(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (!no_symbols) __defProp$1(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-var __copyProps$1 = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames$1(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp$1.call(to, key) && key !== except) __defProp$1(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc$1(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM$1 = (mod, isNodeMode, target) => (target = mod != null ? __create$1(__getProtoOf$1(mod)) : {}, __copyProps$1(isNodeMode || !mod || !mod.__esModule ? __defProp$1(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-//#endregion
 //#region packages/core/src/app-id.ts
 /** A token that looks like a command option, e.g. `--xx`, `-p`, or `--port=8080`. */
 const isOptionToken$1 = (token) => token.startsWith("-") && token.length > 1;
@@ -6110,167 +6079,6 @@ parse$2.Node = Node;
 parse$2.TextNode = TextNode;
 parse$2.NodeType = NodeType;
 //#endregion
-//#region ../icon/src/encode.ts
-/**
-* Platform encoders. PNG payloads carry explicit 72 DPI density: the WASM PNG
-* encoder emits no `pHYs` chunk (spike-verified), so density is injected with
-* a minimal chunk surgery (insert/replace after IHDR, CRC32 over type+data).
-* ICNS keeps the ten-tag explicit representation set; ICO and Linux PNGs keep
-* their ladders. All encoders consume PNG bytes so the density law applies to
-* every emitted pixel payload.
-*/
-var encode_exports = /* @__PURE__ */ __exportAll$1({
-	ICNS_REPRESENTATIONS: () => ICNS_REPRESENTATIONS,
-	ICO_SIZES: () => ICO_SIZES,
-	LINUX_SIZES: () => LINUX_SIZES,
-	encodeDensePng: () => encodeDensePng,
-	encodeIcns: () => encodeIcns,
-	encodeIco: () => encodeIco,
-	pngWithDensity: () => pngWithDensity
-});
-/** Pixels per metre for 72 DPI (72 × 39.3701 ≈ 2834.65, the Apple value). */
-const PIXELS_PER_METRE_72DPI = 2835;
-const ICNS_REPRESENTATIONS = [
-	{
-		tag: "ic12",
-		size: 64
-	},
-	{
-		tag: "ic07",
-		size: 128
-	},
-	{
-		tag: "ic13",
-		size: 256
-	},
-	{
-		tag: "ic08",
-		size: 256
-	},
-	{
-		tag: "ic04",
-		size: 16
-	},
-	{
-		tag: "ic14",
-		size: 512
-	},
-	{
-		tag: "ic09",
-		size: 512
-	},
-	{
-		tag: "ic05",
-		size: 32
-	},
-	{
-		tag: "ic10",
-		size: 1024
-	},
-	{
-		tag: "ic11",
-		size: 32
-	}
-];
-const ICO_SIZES = [
-	16,
-	24,
-	32,
-	48,
-	64,
-	128,
-	256
-];
-const LINUX_SIZES = [
-	16,
-	32,
-	48,
-	64,
-	128,
-	256,
-	512
-];
-const CRC_TABLE = (() => {
-	const table = new Array(256);
-	for (let n = 0; n < 256; n += 1) {
-		let c = n;
-		for (let k = 0; k < 8; k += 1) c = c & 1 ? 3988292384 ^ c >>> 1 : c >>> 1;
-		table[n] = c >>> 0;
-	}
-	return table;
-})();
-const crc32 = (bytes) => {
-	let crc = 4294967295;
-	for (let i = 0; i < bytes.length; i += 1) crc = CRC_TABLE[(crc ^ bytes[i]) & 255] ^ crc >>> 8;
-	return (crc ^ 4294967295) >>> 0;
-};
-const chunkLength = (view, offset) => view.getUint32(offset);
-const chunkType = (bytes, offset) => String.fromCharCode(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]);
-const PHYS_DATA = (() => {
-	const data = /* @__PURE__ */ new Uint8Array(9);
-	const view = new DataView(data.buffer);
-	view.setUint32(0, PIXELS_PER_METRE_72DPI);
-	view.setUint32(4, PIXELS_PER_METRE_72DPI);
-	data[8] = 1;
-	return data;
-})();
-/**
-* Ensure a PNG carries exactly one `pHYs` chunk at 72 DPI, inserted after
-* IHDR. Every pre-existing `pHYs` chunk (however many a malformed input
-* carried) is dropped so the emitted density cannot drift.
-*/
-const pngWithDensity = (png) => {
-	const view = new DataView(png.buffer, png.byteOffset, png.byteLength);
-	let offset = 8;
-	let ihdrEnd = -1;
-	const segments = [];
-	const tail = [];
-	while (offset + 12 <= png.length) {
-		const length = chunkLength(view, offset);
-		const type = chunkType(png, offset + 4);
-		const chunkEnd = offset + 12 + length;
-		if (type === "IHDR") {
-			ihdrEnd = chunkEnd;
-			segments.push(png.subarray(offset, chunkEnd));
-		} else if (type !== "pHYs") (ihdrEnd === -1 ? segments : tail).push(png.subarray(offset, chunkEnd));
-		offset = chunkEnd;
-		if (type === "IEND") break;
-	}
-	if (ihdrEnd === -1) throw new Error("pngWithDensity: IHDR chunk not found");
-	const chunk = new Uint8Array(12 + PHYS_DATA.length);
-	const chunkView = new DataView(chunk.buffer);
-	chunkView.setUint32(0, PHYS_DATA.length);
-	chunk.set(new TextEncoder().encode("pHYs"), 4);
-	chunk.set(PHYS_DATA, 8);
-	chunkView.setUint32(8 + PHYS_DATA.length, crc32(chunk.subarray(4, 8 + PHYS_DATA.length)));
-	return concat(png.subarray(0, 8), ...segments, chunk, ...tail);
-};
-const concat = (...parts) => {
-	const total = parts.reduce((sum, part) => sum + part.byteLength, 0);
-	const out = new Uint8Array(total);
-	let offset = 0;
-	for (const part of parts) {
-		out.set(part, offset);
-		offset += part.byteLength;
-	}
-	return out;
-};
-/** Encode RGBA pixels to a density-carrying PNG. */
-const encodeDensePng = async (image) => pngWithDensity(await encodeImagePng(image));
-/** Encode the ten-tag ICNS from per-size PNG payloads (macOS variant source). */
-const encodeIcns = async (pngAt) => {
-	const icns = new IconIcns();
-	icns.toc = true;
-	for (const { tag, size } of ICNS_REPRESENTATIONS) await icns.addFromPng(await pngAt(size), [tag], false);
-	return icns.encode();
-};
-/** Encode the ICO ladder from per-size PNG payloads (Windows variant source). */
-const encodeIco = async (pngAt) => {
-	const ico = new IconIco();
-	for (const size of ICO_SIZES) await ico.addFromPng(await pngAt(size), null, false);
-	return ico.encode();
-};
-//#endregion
 //#region ../icon/src/generate.ts
 const ICON_SIZE = 1024;
 const TILE_INSET = 64;
@@ -6709,7 +6517,7 @@ const composeAppIcon = async (options) => {
 	pasteImage(macOSVariant, macOSContent, macOSMargin, macOSMargin);
 	const writeVariant = async (image, suffix) => {
 		const path = join(compositionDir, `app-composited${suffix}.png`);
-		const { encodeDensePng } = await Promise.resolve().then(() => encode_exports);
+		const { encodeDensePng } = await import("./encode-CTEluLqt.mjs").then((n) => n.a);
 		await writeFile(path, await encodeDensePng(image));
 		return path;
 	};
@@ -7043,19 +6851,13 @@ const defaultFetch = {
 		if (response === void 0) return {
 			ok: false,
 			status: 0,
-			body: "",
-			headers: {}
+			body: ""
 		};
 		const body = await response.text();
-		const headers = {};
-		response.headers.forEach((value, key) => {
-			headers[key.toLowerCase()] = value;
-		});
 		return {
 			ok: response.ok,
 			status: response.status,
-			body,
-			headers
+			body
 		};
 	},
 	async bytes(url, timeoutMs = 5e3) {
@@ -7078,22 +6880,6 @@ const defaultFetch = {
 /** Cap on downloaded candidates per scrape. */
 const MAX_ICON_DOWNLOADS = 8;
 /**
-* Whether the page's response headers permit embedding by a third-party
-* origin (the toolbar wrapper): rejects on X-Frame-Options (except
-* ALLOWALL) and on CSP frame-ancestors without a wildcard. Absent both
-* policies, embedding is allowed by default — same default browsers use.
-*/
-const responseHeadersAllowEmbedding = (headers) => {
-	const xfo = (headers["x-frame-options"] ?? "").trim().toUpperCase();
-	if (xfo.length > 0 && !xfo.split(",").map((token) => token.trim()).includes("ALLOWALL")) return false;
-	const csp = (headers["content-security-policy"] ?? "").toLowerCase();
-	for (const match of csp.matchAll(/frame-ancestors\s+([^;]+)/gu)) {
-		const sources = (match[1] ?? "").trim();
-		if (sources.length === 0 || !sources.split(/\s+/u).includes("*")) return false;
-	}
-	return true;
-};
-/**
 * Scrape title and ALL icon candidates from an arbitrary http(s) URL.
 * Never throws: failures return `ok: false` with whatever partial identity
 * was found. (`scrapeService` is the loopback-port wrapper over this.)
@@ -7151,8 +6937,7 @@ const scrapeUrl = async (url, options = {}) => {
 		title,
 		iconPath: originals[0]?.path,
 		...originals[0] === void 0 ? {} : { iconUrl: originals[0].url },
-		icons,
-		frameEmbeddable: responseHeadersAllowEmbedding(page.headers)
+		icons
 	};
 };
 /**
@@ -7169,8 +6954,7 @@ const deriveUrlPresets = async (url, options = {}) => {
 	const appName = title !== void 0 && title.length > 0 ? title.length > PRESET_TITLE_MAX ? `${title.slice(0, PRESET_TITLE_MAX - 1).trimEnd()}…` : title : void 0;
 	return {
 		...appName === void 0 ? {} : { appName },
-		...scraped.iconPath === void 0 ? {} : { appIconPath: scraped.iconPath },
-		...scraped.frameEmbeddable === void 0 ? {} : { frameEmbeddable: scraped.frameEmbeddable }
+		...scraped.iconPath === void 0 ? {} : { appIconPath: scraped.iconPath }
 	};
 };
 /**
@@ -7280,8 +7064,8 @@ const isIcoContainer = (bytes) => bytes.length >= 8 && bytes[0] === 0 && bytes[1
 * from the decoder's RGBA through the shared kernel encoder.
 */
 const extractLargestIcoFrame = async (ico) => {
-	const decodeIco = (await import("./decode-ico-BHd2POHf.mjs").then((m) => /* @__PURE__ */ __toESM$1(m.default, 1))).default;
-	const { toPngBuffer } = await Promise.resolve().then(() => icon_codec_exports);
+	const decodeIco = (await import("./decode-ico-DDEIV7iZ.mjs").then((m) => /* @__PURE__ */ __toESM$1(m.default, 1))).default;
+	const { toPngBuffer } = await import("./icon-codec-Bs3XehqZ.mjs").then((n) => n.t);
 	let best;
 	for (const frame of decodeIco(ico)) {
 		const width = frame.width;
@@ -7391,21 +7175,6 @@ const writeIconTemp = async (bytes, dir) => {
 	return path;
 };
 //#endregion
-//#region packages/core/src/icon-codec.ts
-var icon_codec_exports = /* @__PURE__ */ __exportAll$1({ toPngBuffer: () => toPngBuffer });
-const toPngBuffer = async (rgba, width, height, channels) => {
-	const pixels = width * height;
-	const image = emptyImageOf(width, height);
-	if (channels === 3) for (let i = 0; i < pixels; i += 1) {
-		image.data[i * 4] = rgba[i * 3] ?? 0;
-		image.data[i * 4 + 1] = rgba[i * 3 + 1] ?? 0;
-		image.data[i * 4 + 2] = rgba[i * 3 + 2] ?? 0;
-		image.data[i * 4 + 3] = 255;
-	}
-	else image.data.set(rgba.subarray(0, pixels * 4));
-	return Buffer.from(await encodeImagePng(image));
-};
-//#endregion
 //#region packages/core/src/command-run.ts
 const SHELL_METACHARS = /[<>&|;$`"'%]/u;
 /** True when the command line needs a shell (only Windows uses cmd /c). */
@@ -7811,6 +7580,113 @@ const runExecFileCapture = (command, args) => new Promise((resolve, reject) => {
 	});
 });
 //#endregion
+//#region packages/core/src/toolbar-carrier.ts
+/**
+* The generated-entry helper source. The embedding template supplies
+* `column`/`fixed`/`grow` (imported from "@opentray/ext-webview" beside
+* `WebviewExt`) — the carrier deliberately performs no imports of its own so
+* both templates stay single-import consumers of the facade.
+*/
+const toolbarCarrierSource = () => `// Toolbar navigation carrier (add-webview-orchestration plan D12/D13):
+// composes the native navigation toolbar over one content webview and drives
+// it through the create-private message channel. Channel failure is an
+// exposed bug (D12: no fallback path) — errors land in app.log through
+// options.log instead of being silently swallowed.
+const attachToolbarCarrier = async (shell, options) => {
+  // Per-child bridge policy (D2): the toolbar page is trusted shell UI and
+  // gets exactly the channel surface; the content webview gets NO policy, so
+  // it is bridgeless regardless of what it loads.
+  await shell.createWebview({
+    id: "toolbar",
+    url: options.toolbarUrl,
+    bridge: { webviewId: true, messageChannels: true },
+  });
+  const content = await shell.createWebview({ id: "content", url: options.contentUrl });
+  // Declarative layered layout (D8 sugar): toolbar pinned at a fixed 44px
+  // height, content filling the remainder; resize is recomputed natively.
+  await shell.setLayout(column([fixed("toolbar", 44), grow("content")]));
+  const channel = await shell.createMessageChannel({ target: "toolbar" });
+  const note = (error) => {
+    const message = error instanceof Error ? error.message : String(error);
+    void options.log("toolbar carrier: " + message);
+  };
+  // Address-bar truth (D13): the content webview's urlChange events ARE the
+  // address bar's source of truth — pushed over the channel, never scraped
+  // from a wrapper document.
+  const pushUrl = async (url) => {
+    await channel.post({ kind: "url", url: String(url) });
+  };
+  content.onUrlChange((event) => {
+    void pushUrl(event.url).catch(note);
+  });
+  // Loading affordance input (D24): the content webview's loadState pushes
+  // (phase always; progress/errorCode best-effort) reach the toolbar page
+  // over the same channel. The toolbar page owns the progress-bar state
+  // machine — this carrier forwards verbatim and adds no interpretation, so
+  // a missed "failed" frame (macOS dead-port loads finish about:blank
+  // honestly) is converged by whatever terminal frame does arrive.
+  const pushLoadState = async (event) => {
+    const frame = { kind: "load-state", phase: event.phase, url: String(event.url) };
+    if (typeof event.progress === "number") frame.progress = event.progress;
+    if (typeof event.errorCode === "number") frame.errorCode = event.errorCode;
+    await channel.post(frame);
+  };
+  content.onLoadState((event) => {
+    void pushLoadState(event).catch(note);
+  });
+  if (options.titleFollows === true) {
+    // Sync defaults project onto the CONTENT document (the real target page).
+    // A windowOnly session has no primary webview for native titleSync, and
+    // the v1 frozen facade exposes no host set-title command, so the entry is
+    // the one-way projector through the native re-show title update
+    // (apply_reused_show_updates): show({title, windowOnly}) on an existing
+    // session updates the window title without touching content or
+    // visibility. Icon following stays opt-in and carries no window-level
+    // option here because a bridgeless content child is not a favicon
+    // emitter (documented v1 limitation).
+    const projectTitle = (title) => {
+      if (typeof title === "string" && title.length > 0) {
+        void shell.show({ title, windowOnly: true }).catch(note);
+      }
+    };
+    content.onTitleChange((event) => {
+      projectTitle(event.title);
+    });
+  }
+  // Command surface (D12): instructions and state queries arrive as channel
+  // payloads; back/forward drive the content webview's NATIVE history and
+  // reload re-navigates to the current URL through the native navigate
+  // command (never evaluate(location.reload()) on a wrapper).
+  channel.onMessage((payload) => {
+    const message = typeof payload === "object" && payload !== null ? payload : {};
+    const kind = message.kind;
+    if (kind === "navigate" && typeof message.url === "string" && message.url.length > 0) {
+      void content.navigate(message.url).catch(note);
+      return;
+    }
+    if (kind === "back") {
+      void content.back().catch(note);
+      return;
+    }
+    if (kind === "forward") {
+      void content.forward().catch(note);
+      return;
+    }
+    if (kind === "reload") {
+      void content.getUrl().then((state) => content.navigate(state.url)).catch(note);
+      return;
+    }
+    if (kind === "get-url") {
+      void content.getUrl().then((state) => pushUrl(state.url)).catch(note);
+    }
+  });
+  // Seed the address bar with the current truth (pre-subscription buffering
+  // on both endpoints covers the race before the toolbar page registers).
+  void content.getUrl().then((state) => pushUrl(state.url)).catch(note);
+  return { content, channel };
+};
+`;
+//#endregion
 //#region packages/core/src/entry-template.ts
 /** The generated app entry: supervises the command, owns tray + window. */
 const createEntrySource = (config) => {
@@ -7826,7 +7702,7 @@ import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { createTray } from "opentray";
-import { WebviewExt } from "@opentray/ext-webview";
+import { WebviewExt, column, fixed, grow } from "@opentray/ext-webview";
 
 const PROJECT_DIR = dirname(fileURLToPath(import.meta.url));
 
@@ -7847,11 +7723,20 @@ const config = ${JSON.stringify(config, null, 2)};
 const appLogPath = resolve(PROJECT_DIR, "app.log");
 await mkdir(dirname(appLogPath), { recursive: true });
 const logSink = appendFile.bind(undefined, appLogPath);
+const logNote = (message) => { void logSink("[create-opentray] " + message + "\\n", "utf8"); };
 const sleep = (ms) => new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
 
 const shellOptions = ${JSON.stringify(config.shell ?? null)};
 const showTerminal = shellOptions !== null && shellOptions.showTerminal === true;
-const showAddressBar = shellOptions !== null && shellOptions.showAddressBar === true;
+// Toolbar carrier (add-webview-orchestration D13): window.toolbar is the one
+// canonical toolbar fact for BOTH application forms; the retired legacy shell
+// address-bar input is deliberately not read (stale frozen occurrences are
+// ignored by loose parsing).
+const toolbarMode = config.window.toolbar === true;
+const titleFollows = config.window.titleFollowsDocument !== false;
+const iconFollows = config.window.iconFollowsDocument === true;
+
+${toolbarCarrierSource()}
 
 // Configured env overlay (advanced command options); empty by default.
 const commandEnv = ${JSON.stringify(config.command.env ?? {})};
@@ -7923,7 +7808,8 @@ const main = async () => {
   }
 
   // Shell host (D2): unconditional — the terminal window is every app's
-  // abnormal-exit surface, and the address bar consumes it too.
+  // abnormal-exit surface, and the toolbar carrier's page asset is served
+  // from the same host (its navigation surface stays channel-only, D12).
   const shellApi = await import("./app-shell-server.mjs");
   const shellPort = await shellApi.listenShell();
 
@@ -8023,11 +7909,11 @@ const main = async () => {
   const devtools = config.developerMode === true ? { devtools: true } : {};
 
   // Dedicated windows: one terminal window (always available; initially
-  // visible only under showTerminal), one window per listened port — an
-  // address-bar wrapper page when enabled, the direct service URL otherwise.
-  // Each window gets its OWN extension mount (tray.extend per window): one
-  // mount owns exactly one native webview slot, so dedicated windows never
-  // collide on content.
+  // visible only under showTerminal), one window per listened port — the
+  // native toolbar carrier when window.toolbar is on, the direct service URL
+  // otherwise. Each window gets its OWN extension mount (tray.extend per
+  // window = its own window session), so dedicated windows never collide on
+  // content.
   const serviceWindows = new Map();
   let terminalWindow = null;
 
@@ -8060,28 +7946,45 @@ const main = async () => {
   const ensureServiceWindow = async (port) => {
     if (serviceWindows.has(port)) return;
     const direct = \`http://127.0.0.1:\${port}\`;
-    const url = showAddressBar && shellPort !== null
-      ? \`http://127.0.0.1:\${shellPort}/browse.html?url=\${encodeURIComponent(direct)}\`
-      : direct;
+    // Toolbar service windows (D13): the SAME native carrier URL applications
+    // use — a windowOnly session whose toolbar webview (shell-served
+    // toolbar page) sits above a content webview loading the verified
+    // service URL directly (no iframe wrapper, no bridge on the content
+    // side, no embedding-policy consultation). Direct service windows keep
+    // the D13 native sync defaults unchanged.
+    if (toolbarMode && shellPort !== null) {
+      const win = tray.extend(WebviewExt).createWebviewWindow({
+        windowOnly: true,
+        width: config.window.width,
+        height: config.window.height,
+        title: baseTitle,
+        style: { appMode: true, autoHide: false, keepOnTop: false },
+        ...devtools,
+      });
+      await win.show().catch(() => {});
+      await attachToolbarCarrier(win, {
+        toolbarUrl: \`http://127.0.0.1:\${shellPort}/toolbar.html\`,
+        contentUrl: direct,
+        titleFollows,
+        log: logNote,
+      });
+      serviceWindows.set(port, { win, detached: false });
+      return;
+    }
     const win = tray.extend(WebviewExt).createWebviewWindow({
-      url,
+      url: direct,
       width: config.window.width,
       height: config.window.height,
       title: baseTitle,
       style: { appMode: true, autoHide: false, keepOnTop: false },
       ...devtools,
-      ...(showAddressBar || !titleFollows ? {} : { titleSync: { documentToWindow: true } }),
-      ...(showAddressBar || !iconFollows ? {} : { iconSync: { faviconToWindow: true } }),
+      ...(!titleFollows ? {} : { titleSync: { documentToWindow: true } }),
+      ...(!iconFollows ? {} : { iconSync: { faviconToWindow: true } }),
     });
     serviceWindows.set(port, { win, detached: false });
     await win.show().catch(() => {});
   };
 
-  // D13 sync defaults (address-bar-less service windows): the title follows
-  // the document one-way; runtime favicon following is opt-in only.
-  const titleFollows = config.window.titleFollowsDocument !== false;
-  const iconFollows = config.window.iconFollowsDocument === true;
-
   if (showTerminal) {
     await ensureTerminalWindow();
   }
@@ -8239,7 +8142,7 @@ main().catch(async (error) => {
 };
 //#endregion
 //#region packages/core/src/url-entry-template.ts
-/** The generated URL app entry: owns tray + one direct or wrapped window. */
+/** The generated URL app entry: owns tray + one direct or toolbar-carrier window. */
 const createUrlEntrySource = (config) => {
 	if (config.url === void 0) throw new Error("URL entry template requires a url source");
 	return `#!/usr/bin/env node
@@ -8251,7 +8154,7 @@ import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { createTray } from "opentray";
-import { WebviewExt } from "@opentray/ext-webview";
+import { WebviewExt, column, fixed, grow } from "@opentray/ext-webview";
 
 const PROJECT_DIR = dirname(fileURLToPath(import.meta.url));
 
@@ -8275,8 +8178,9 @@ const iconFollows = config.window.iconFollowsDocument === true;
 const appLogPath = resolve(PROJECT_DIR, "app.log");
 await mkdir(dirname(appLogPath), { recursive: true });
 const logSink = appendFile.bind(undefined, appLogPath);
+const logNote = (message) => { void logSink("[create-opentray] " + message + "\\n", "utf8"); };
 
-const main = async () => {
+${toolbarCarrierSource()}const main = async () => {
   let appIcon;
   try {
     const manifest = JSON.parse(await readFile(resolve(PROJECT_DIR, "app-icon", "app-icon.json"), "utf8"));
@@ -8326,42 +8230,59 @@ const main = async () => {
   // must not request devtools at all — default windows are not inspectable.
   const devtools = config.developerMode === true ? { devtools: true } : {};
 
-  // Toolbar mode (D12): the shell host serves the shared address-bar wrapper;
-  // no PTY is registered because a URL app supervises nothing. The wrapper
-  // carries neither sync option — its document metadata is not the target's.
+  // Toolbar shell host (D12): the shell server serves the toolbar page (and
+  // nothing else for a URL app — its navigation surface is channel-only);
+  // no PTY is registered because a URL app supervises nothing. This is a
+  // LOCAL transport dependency only — never an embedding-policy fallback
+  // (embedding policy is not consulted at all, D14).
   let shellPort = null;
   if (toolbarMode) {
     const shellApi = await import("./app-shell-server.mjs");
     shellPort = await shellApi.listenShell();
     if (shellPort === null) {
-      await logSink("[create-opentray] toolbar shell host failed to listen; falling back to the direct window\\n", "utf8");
+      await logSink("[create-opentray] toolbar shell host failed to listen; opening the direct window\\n", "utf8");
     }
   }
-  const toolbarUrl = toolbarMode && shellPort !== null
-    ? \`http://127.0.0.1:\${shellPort}/browse.html?url=\${encodeURIComponent(config.url)}\`
-    : null;
+  const toolbarReady = toolbarMode && shellPort !== null;
 
+  // Toolbar carrier (D12/D13): windowOnly session composed of the toolbar +
+  // content webviews through attachToolbarCarrier below. Direct mode keeps
+  // the single-webview window with the native sync defaults (D13): the title
+  // follows the document one-way; icon following is opt-in.
   const window = tray.extend(WebviewExt).createWebviewWindow({
-    url: toolbarUrl ?? config.url,
+    ...(toolbarReady ? { windowOnly: true } : { url: config.url }),
     width: config.window.width,
     height: config.window.height,
     title: config.appName,
     style: { appMode: true, autoHide: false, keepOnTop: false },
     ...devtools,
-    // D13 sync defaults project only onto the DIRECT window (toolbar windows
-    // set neither: one-way title following; icon following is opt-in).
-    ...(toolbarUrl === null
-      ? {
-          ...(titleFollows ? { titleSync: { documentToWindow: true } } : {}),
-          ...(iconFollows ? { iconSync: { faviconToWindow: true } } : {}),
-        }
-      : {}),
+    ...(toolbarReady ? {} : {
+      ...(titleFollows ? { titleSync: { documentToWindow: true } } : {}),
+      ...(iconFollows ? { iconSync: { faviconToWindow: true } } : {}),
+    }),
   });
   await window.show().catch(() => {});
 
-  // Tray reload (D11): reload the page in place through the evaluate channel.
+  let content = null;
+  if (toolbarReady) {
+    ({ content } = await attachToolbarCarrier(window, {
+      toolbarUrl: \`http://127.0.0.1:\${shellPort}/toolbar.html\`,
+      contentUrl: config.url,
+      titleFollows,
+      log: logNote,
+    }));
+  }
+
+  // Tray reload (D11): toolbar mode reloads the CONTENT webview natively
+  // (navigate to its current URL — no wrapper evaluate); direct mode reloads
+  // the page in place through the evaluate channel. The app never restarts.
   const reload = async () => {
     try {
+      if (content !== null) {
+        const { url } = await content.getUrl();
+        await content.navigate(url);
+        return;
+      }
       await window.evaluate("location.reload()");
     } catch { /* window gone */ }
   };
@@ -8594,14 +8515,14 @@ const writeScaffold = async (options) => {
 	};
 };
 /**
-* Locate the adapter-staged shell UI (terminal.html/browse.html + assets).
+* Locate the adapter-staged shell UI (terminal.html/toolbar.html + assets).
 * Layouts, in order:
 * - published create-opentray: `dist/shell` beside the package root (resolved
 *   through the package self-reference; core is bundled into that dist);
 * - source checkout: `<create root>/dist/shell` (built) or the create-webui
 *   vite output one workspace up.
 * Undefined means "no staged assets found" — the entry still runs; only the
-* optional terminal/address-bar pages would 404.
+* optional terminal/toolbar pages would 404.
 */
 const resolveBundledShellAssetsDir = async () => {
 	const moduleDir = dirname(fileURLToPath(import.meta.url));
@@ -13874,7 +13795,8 @@ const readWizardProjectConfig = async (projectDir) => {
 	const url = typeof raw.url === "string" ? raw.url : void 0;
 	const window = isRecord(raw.window) ? {
 		width: Number.isFinite(raw.window.width) ? Number(raw.window.width) : 1200,
-		height: Number.isFinite(raw.window.height) ? Number(raw.window.height) : 800
+		height: Number.isFinite(raw.window.height) ? Number(raw.window.height) : 800,
+		...raw.window.toolbar === true ? { toolbar: true } : {}
 	} : {
 		width: 1200,
 		height: 800
@@ -14793,7 +14715,6 @@ const createWizardSession = (options) => {
 	let currentTokens = [];
 	let currentCommand = "";
 	let urlSource;
-	let urlFrameEmbeddable;
 	let scrapedTitle;
 	let interactive = true;
 	let uiLocale = "zh-CN";
@@ -14820,7 +14741,7 @@ const createWizardSession = (options) => {
 		pm: false,
 		force: false,
 		showStartupTerminal: false,
-		showAddressBar: false,
+		toolbar: false,
 		imageSmoothingEnabled: false,
 		developerMode: false
 	};
@@ -14833,7 +14754,7 @@ const createWizardSession = (options) => {
 		trayIconPath: "",
 		force: options.force === true,
 		showStartupTerminal: false,
-		showAddressBar: false,
+		toolbar: false,
 		imageSmoothingEnabled: true,
 		developerMode: false,
 		pm: options.packageManager ?? detectPackageManager([], process.env.npm_config_user_agent)
@@ -15179,7 +15100,6 @@ const createWizardSession = (options) => {
 			const trimmed = url.trim();
 			if (trimmed.length === 0) {
 				urlSource = void 0;
-				urlFrameEmbeddable = void 0;
 				scrapedTitle = void 0;
 				iconCandidates = [];
 				iconPort = void 0;
@@ -15217,7 +15137,6 @@ const createWizardSession = (options) => {
 			currentIconPath = scraped.ok ? scraped.icons[0]?.path : void 0;
 			currentIconUrl = scraped.ok ? scraped.icons[0]?.url : void 0;
 			scrapedTitle = scraped.ok ? scraped.title : void 0;
-			urlFrameEmbeddable = scraped.ok ? scraped.frameEmbeddable : void 0;
 			stopTimers();
 			setState("discovered");
 			emit({
@@ -15292,7 +15211,7 @@ const createWizardSession = (options) => {
 				...touched.force ? { force: form.force } : { force: options.force === true },
 				...touched.trayIconPath ? { trayIconPath: form.trayIconPath } : { trayIconPath: "" },
 				...touched.showStartupTerminal ? { showStartupTerminal: form.showStartupTerminal } : { showStartupTerminal: false },
-				...touched.showAddressBar ? { showAddressBar: form.showAddressBar } : { showAddressBar: false },
+				...touched.toolbar ? { toolbar: form.toolbar } : { toolbar: false },
 				...touched.imageSmoothingEnabled ? { imageSmoothingEnabled: form.imageSmoothingEnabled } : { imageSmoothingEnabled: true },
 				...touched.developerMode ? { developerMode: form.developerMode } : { developerMode: false },
 				pm: options.packageManager ?? detectPackageManager([], process.env.npm_config_user_agent)
@@ -15640,7 +15559,7 @@ const createWizardSession = (options) => {
 					window: {
 						width: 1200,
 						height: 800,
-						...frozen.showAddressBar === true && urlFrameEmbeddable !== false ? { toolbar: true } : {},
+						...frozen.toolbar === true ? { toolbar: true } : {},
 						titleFollowsDocument: true,
 						iconFollowsDocument: false
 					}
@@ -15654,6 +15573,7 @@ const createWizardSession = (options) => {
 					window: {
 						width: 1200,
 						height: 800,
+						...frozen.toolbar === true ? { toolbar: true } : {},
 						titleFollowsDocument: true,
 						iconFollowsDocument: false
 					}
@@ -15727,12 +15647,6 @@ const createWizardSession = (options) => {
 				run = void 0;
 			}
 			if (urlSource !== void 0) {
-				const toolbarWanted = frozen.showAddressBar === true;
-				const toolbar = toolbarWanted && urlFrameEmbeddable !== false;
-				if (toolbarWanted && !toolbar) emit({
-					type: "materialize-log",
-					message: `warning: ${urlSource} forbids iframe embedding (X-Frame-Options / CSP frame-ancestors); the address bar falls back to the direct window`
-				});
 				try {
 					result = await materialize({
 						config: {
@@ -15744,7 +15658,7 @@ const createWizardSession = (options) => {
 							window: {
 								width: 1200,
 								height: 800,
-								...toolbar ? { toolbar: true } : {},
+								...frozen.toolbar === true ? { toolbar: true } : {},
 								titleFollowsDocument: true,
 								iconFollowsDocument: false
 							},
@@ -15818,6 +15732,7 @@ const createWizardSession = (options) => {
 						window: {
 							width: 1200,
 							height: 800,
+							...frozen.toolbar === true ? { toolbar: true } : {},
 							titleFollowsDocument: true,
 							iconFollowsDocument: false
 						},
@@ -15830,10 +15745,7 @@ const createWizardSession = (options) => {
 					...frozen.iconScale === void 0 ? {} : { iconScale: frozen.iconScale },
 					...currentTrayIconPath === void 0 ? {} : { trayIconSourcePath: currentTrayIconPath },
 					...trayIconIsSolid ? { trayIconIsSolid: true } : {},
-					shell: {
-						showTerminal: frozen.showStartupTerminal,
-						showAddressBar: frozen.showAddressBar
-					},
+					shell: { showTerminal: frozen.showStartupTerminal },
 					...frozen.imageSmoothingEnabled === false ? { imageSmoothingEnabled: false } : {},
 					...frozen.developerMode === true ? { developerMode: true } : {},
 					packageManager: frozen.pm,
@@ -16037,6 +15949,7 @@ const handleWorkbenchApi = async (request) => {
 					window: {
 						width: entry.config.window.width,
 						height: entry.config.window.height,
+						...entry.config.window.toolbar === true ? { toolbar: true } : {},
 						titleFollowsDocument: true,
 						iconFollowsDocument: false
 					},
@@ -16204,6 +16117,7 @@ const handleWorkbenchApi = async (request) => {
 				window: {
 					width: entry.config.window.width,
 					height: entry.config.window.height,
+					...entry.config.window.toolbar === true ? { toolbar: true } : {},
 					titleFollowsDocument: true,
 					iconFollowsDocument: false
 				},
@@ -16913,7 +16827,7 @@ const handleApi = async (pathname, request, response, session, preReadBody) => {
 			if (typeof body.iconScale === "number" && body.iconScale >= .5 && body.iconScale <= .95) patch.iconScale = body.iconScale;
 			for (const key of [
 				"showStartupTerminal",
-				"showAddressBar",
+				"toolbar",
 				"imageSmoothingEnabled",
 				"developerMode",
 				"force"
@@ -17516,17 +17430,11 @@ const runCreate = async (args, context) => {
 	}
 	let enrichment;
 	let presetIconPath;
-	let toolbarRequested = args.toolbar === true;
-	if (args.url !== void 0 && args.scrape !== false && (args.appName === void 0 || args.appIcon === void 0 || toolbarRequested)) {
+	if (args.url !== void 0 && args.scrape !== false && (args.appName === void 0 || args.appIcon === void 0)) {
 		const presets = await deriveUrlPresets(args.url);
 		enrichment = presets;
 		presetIconPath = presets.appIconPath;
 		if (presets.appName !== void 0 || presets.appIconPath !== void 0) emitProgress(`scraped defaults from ${args.url}: ${[presets.appName !== void 0 ? "title" : void 0, presets.appIconPath !== void 0 ? "favicon" : void 0].filter(Boolean).join(" + ")} (defaults; explicit flags win)`, context.streams, args.json === true);
-		if (toolbarRequested && presets.frameEmbeddable === false) {
-			toolbarRequested = false;
-			delete flags.toolbar;
-			emitProgress(`warning: ${args.url} forbids iframe embedding (X-Frame-Options / CSP frame-ancestors); falling back to the direct window`, context.streams, args.json === true);
-		}
 	}
 	const compiled = await compileDesiredConfig(flags, args.config, cwd, enrichment);
 	if (!compiled.ok) {
@@ -17651,7 +17559,7 @@ const createCommand = (context) => ({
 		describe: "window size <width>x<height> (default 1200x800)"
 	}).option("toolbar", {
 		type: "boolean",
-		describe: "URL applications: host the address-bar wrapper (back/forward/reload toolbar)"
+		describe: "compose the native navigation toolbar over the target/service page (URL and command applications; back/forward/reload/address bar)"
 	}).option("title-follow", {
 		type: "boolean",
 		describe: "window title follows document.title (default true; negate with --no-title-follow)"
@@ -18361,6 +18269,33 @@ const openBrowser = async (url) => {
 		windowsHide: true
 	}).unref();
 };
+/** Draft form values carry fields across versions — forward only the
+*  known-safe, type-checked subset. Retired fields (the legacy
+*  showAddressBar, replaced by `toolbar` in add-webview-orchestration D13)
+*  are ignored here: a stale draft never resurrects a removed input.
+*  Exported for tests alongside parseWizardCli. */
+const normalizeDraftForm = (raw) => {
+	if (typeof raw !== "object" || raw === null) return;
+	const source = raw;
+	const patch = {};
+	for (const key of [
+		"appId",
+		"appName",
+		"iconPath",
+		"trayIconPath"
+	]) if (typeof source[key] === "string") patch[key] = source[key];
+	if (source.pm === "npm" || source.pm === "pnpm" || source.pm === "bun") patch.pm = source.pm;
+	if (source.iconBackground === "black" || source.iconBackground === "white" || source.iconBackground === "transparent") patch.iconBackground = source.iconBackground;
+	if (typeof source.iconScale === "number" && source.iconScale >= .5 && source.iconScale <= .95) patch.iconScale = source.iconScale;
+	for (const key of [
+		"showStartupTerminal",
+		"toolbar",
+		"imageSmoothingEnabled",
+		"developerMode",
+		"force"
+	]) if (typeof source[key] === "boolean") patch[key] = source[key];
+	return Object.keys(patch).length > 0 ? patch : void 0;
+};
 const runWebAdapter = async (options) => {
 	ensureLoopbackNoProxy();
 	const invocationDir = process.env.INIT_CWD || process.cwd();
@@ -18388,9 +18323,10 @@ const runWebAdapter = async (options) => {
 			const raw = await readFile(join(tmpdir(), `create-opentray-draft-${port ?? 0}.json`), "utf8");
 			const parsed = JSON.parse(raw);
 			const commandOptions = normalizeDraftCommandOptions(parsed.commandOptions);
-			if (parsed.form === void 0 && parsed.command === void 0 && commandOptions === void 0) return;
+			const form = parsed.form === void 0 ? void 0 : normalizeDraftForm(parsed.form);
+			if (form === void 0 && parsed.command === void 0 && commandOptions === void 0) return;
 			return {
-				form: parsed.form,
+				form,
 				command: parsed.command,
 				commandOptions
 			};
@@ -18467,6 +18403,6 @@ if (isMainModule()) main(process.argv.slice(2)).then((code) => {
 	process.exitCode = code;
 });
 //#endregion
-export { resolveOnPath as A, parseNetstatPorts as C, waitForTcpPort as D, verifyHttpService as E, toProjectDirectoryName as F, __commonJSMin$1 as I, deriveDefaultAppId as M, deriveDefaultAppName as N, parseShebangInterpreter as O, isValidAppId as P, parseLsofPorts as S, serviceUrl as T, faviconCandidateSize as _, isAuthorized as a, scrapeService as b, openMaterializedApp as c, expectedDarwinBundlePath as d, isDirectoryOccupied$1 as f, extractTitle as g, extractFaviconCandidates as h, createWizardServer as i, tokenizeCommandLine as j, resolveLaunchVector as k, pinningHint as l, writeScaffold as m, openBrowser as n, isLoopbackHost as o, materialize as p, parseWizardCli as r, createWizardSession as s, main as t, detectPackageManager as u, rankFaviconCandidates as v, parsePowerShellPorts as w, createPortDiscovery as x, resolveFaviconUrl as y };
+export { resolveLaunchVector as A, parseLsofPorts as C, verifyHttpService as D, serviceUrl as E, isValidAppId as F, toProjectDirectoryName as I, tokenizeCommandLine as M, deriveDefaultAppId as N, waitForTcpPort as O, deriveDefaultAppName as P, createPortDiscovery as S, parsePowerShellPorts as T, extractTitle as _, createWizardServer as a, resolveFaviconUrl as b, createWizardSession as c, detectPackageManager as d, expectedDarwinBundlePath as f, extractFaviconCandidates as g, writeScaffold as h, parseWizardCli as i, resolveOnPath as j, parseShebangInterpreter as k, openMaterializedApp as l, materialize as m, normalizeDraftForm as n, isAuthorized as o, isDirectoryOccupied$1 as p, openBrowser as r, isLoopbackHost as s, main as t, pinningHint as u, faviconCandidateSize as v, parseNetstatPorts as w, scrapeService as x, rankFaviconCandidates as y };
 
-//# sourceMappingURL=bin-BQb2Bjcu.mjs.map
+//# sourceMappingURL=bin-Bz16rwKs.mjs.map