dsh-mobile 0.6.5 → 0.6.6

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Notable changes are recorded here. GitHub Releases provide the downloadable packages and generated commit notes.
 
+## Unreleased Android changes
+
+- Prefer the system Photo Picker on Android 13+ for supported image requests, with document selection for other requests or an unavailable picker. Preserve multi-selection, MIME filtering and selected URI results without adding storage permission or forcing a vendor gallery.
+- Bind standard file callbacks to the active WebView, Origin and document. Cancel them on navigation or teardown and prevent old results from consuming a newer request. These changes require a future App release; the published Android 0.6.3 APK is unchanged.
+
+## 0.6.6 - 2026-10-14
+
+- Fix captured images not reaching DSH's attachment draft. Supply both files and iterable file items, with compatible drag-and-drop objects for browsers whose constructed objects are incomplete.
+- Improve browser camera and extension file selection: returning to the page no longer discards a pending selection after one second. Handle explicit cancellation, late results, aborted requests and timeouts while preserving the current draft.
+- Add packed DSH regressions for multiple images, decoded previews, cancellation and superseded requests. The Android App remains independently published as 0.6.3; this plugin update does not replace its system file chooser.
+- Thanks @Void-LifeStream for the detailed report in [#205](https://github.com/saya-ch/dsh-mobile/issues/205), and @xhwxt for the document-picker proposal in [#203](https://github.com/saya-ch/dsh-mobile/pull/203).
+
 ## 0.6.5 - 2026-10-13
 
 - Make mobile module selection easier to navigate: optional extensions first, collapsed DSH and boot-required groups, name/ID search, loading filters, and exact IDs and dependencies in details. Keep close and save actions outside the scrolling list, show unsaved changes, and confirm before discarding them.

package/CONTRIBUTORS.md

@@ -1,8 +1,8 @@
 # 贡献者 / Contributors
 
-GitHub 的 [Contributors 图表](https://github.com/saya-ch/dsh-mobile/graphs/contributors) 按进入默认分支的提交自动统计，无法手动加入仅提交 issue 或 PR 提案的成员。本页按截至 2026-10-13 的实际参与方式感谢社区成员；仓库维护者与自动依赖更新仍可在 GitHub 历史记录中查看。
+GitHub 的 [Contributors 图表](https://github.com/saya-ch/dsh-mobile/graphs/contributors) 按进入默认分支的提交自动统计，无法手动加入仅提交 issue 或 PR 提案的成员。本页按截至 2026-10-14 的实际参与方式感谢社区成员；仓库维护者与自动依赖更新仍可在 GitHub 历史记录中查看。
 
-GitHub's Contributors graph counts commits on the default branch; issue reports and PR proposals cannot be manually added to it. This page credits community members by how they contributed, through 2026-10-13. The repository maintainer and automated dependency updates remain visible in GitHub's history.
+GitHub's Contributors graph counts commits on the default branch; issue reports and PR proposals cannot be manually added to it. This page credits community members by how they contributed, through 2026-10-14. The repository maintainer and automated dependency updates remain visible in GitHub's history.
 
 ## 0.6.4 代码贡献 / Code contributions in 0.6.4
 
@@ -58,6 +58,10 @@ GitHub's Contributors graph counts commits on the default branch; issue reports
 
 ## 问题反馈与建议 / Issue reports and ideas
 
+感谢 [@xhwxt](https://github.com/xhwxt) 在 [#203](https://github.com/saya-ch/dsh-mobile/pull/203) 中提出文档选择器改进方案，以及 [@Void-LifeStream](https://github.com/Void-LifeStream) 在 [#205](https://github.com/saya-ch/dsh-mobile/issues/205) 中提供附件选择与回传问题的详细反馈。
+
+Thanks [@xhwxt](https://github.com/xhwxt) for the document-picker proposal in [#203](https://github.com/saya-ch/dsh-mobile/pull/203), and [@Void-LifeStream](https://github.com/Void-LifeStream) for the detailed attachment-selection and delivery report in [#205](https://github.com/saya-ch/dsh-mobile/issues/205).
+
 以下名单包括提出问题、复现缺陷和建议功能的成员；出现在本表不表示提交过代码。 / These members opened repository issues; listing them does not imply code authorship.
 
 | 反馈贡献者 / Issue reporter | 提交的问题 / Issues |
@@ -101,6 +105,7 @@ GitHub's Contributors graph counts commits on the default branch; issue reports
 | [@sortjiajun](https://github.com/sortjiajun) | [#90](https://github.com/saya-ch/dsh-mobile/issues/90) |
 | [@StrawberryAO](https://github.com/StrawberryAO) | [#39](https://github.com/saya-ch/dsh-mobile/issues/39) |
 | [@Surpass567](https://github.com/Surpass567) | [#80](https://github.com/saya-ch/dsh-mobile/issues/80), [#81](https://github.com/saya-ch/dsh-mobile/issues/81) |
+| [@Void-LifeStream](https://github.com/Void-LifeStream) | [#205](https://github.com/saya-ch/dsh-mobile/issues/205) |
 | [@WalkerJay666](https://github.com/WalkerJay666) | [#201](https://github.com/saya-ch/dsh-mobile/issues/201) |
 | [@up-and-down-0618](https://github.com/up-and-down-0618) | [#115](https://github.com/saya-ch/dsh-mobile/issues/115) |
 | [@taki-ohh](https://github.com/taki-ohh) | [#19](https://github.com/saya-ch/dsh-mobile/issues/19) |

package/README.en.md

@@ -31,7 +31,7 @@
 
 > DSH Mobile is a DeepSeek Harness community plugin; the native app supports Android only.
 >
-> **Current stable release: 0.6.5**. Improve mobile module management, typography and settings accessibility; fix Windows cpolar extraction and blank Trajectory views caused by some skins. [Changelog](CHANGELOG.md) · [Release downloads](https://github.com/saya-ch/dsh-mobile/releases/tag/v0.6.5).
+> **Current stable release: 0.6.6**. Fix captured images not reaching the DSH attachment draft, and improve cancellation and late-result handling in browser file selection. [Changelog](CHANGELOG.md) · [Release downloads](https://github.com/saya-ch/dsh-mobile/releases/tag/v0.6.6).
 >
 > **Version policy**: since plugin **0.6.2**, the Android app and plugin use independent version numbers and releases. Their numbers do not need to match, and a plugin update does not imply an app update. [Compatibility notes](#compatibility).
 
@@ -396,6 +396,7 @@ On macOS, local network, cloudflared, self-hosted FRP and the own reverse proxy
 | `0.6.3` | `0.2.0-rc.2` and `0.2.1-alpha.2` (packed installation, isolated pairing, mobile boot and WebSocket Workspace reads); additional checks cover the composer, settings and extension Worker timeout, streaming and explicit recovery |
 | `0.6.4` | `0.2.0-rc.2` (packed installation, isolated pairing, mobile boot and WebSocket Workspace reads); additionally 72 real public-slot composer layouts, Windows Desktop directory-picker composition and cross-platform regressions. The reported remote timeout in community Desktop 2.0.17 remains unclaimed as accepted |
 | `0.6.5` | Packed module-management and mobile-settings regressions on `0.2.0-rc.2` and `0.2.1-alpha.2`; additionally Windows cpolar extraction and populated Trajectory layout with published `maid-atelier` 0.1.7. This does not establish acceptance of every third-party skin or reporter device |
+| `0.6.6` | Packed attachment intake and decoded-preview regressions on `0.2.0-rc.2` and `0.2.1-alpha.2`, covering multiple images, cancellation, late results and superseded requests. Android system-picker changes are released independently, not through the npm update |
 
 <details>
 <summary>Historical version checks</summary>

package/README.md

@@ -31,7 +31,7 @@
 
 > DSH Mobile 是 DeepSeek Harness 社区插件，原生 App 仅支持 Android。
 >
-> **当前正式版本：0.6.5**。优化移动页面模块管理与字体设置，改善设置操作可达性，修复 Windows cpolar 解包及部分皮肤造成的轨迹空白。[更新记录](CHANGELOG.md) · [版本下载](https://github.com/saya-ch/dsh-mobile/releases/tag/v0.6.5)。
+> **当前正式版本：0.6.6**。修复拍照图片无法进入 DSH 附件草稿的问题，改善浏览器文件选择的取消与迟到结果处理。[更新记录](CHANGELOG.md) · [版本下载](https://github.com/saya-ch/dsh-mobile/releases/tag/v0.6.6)。
 >
 > **版本说明**：自插件 **0.6.2** 起，Android App 与插件独立编号、独立发布，版本号无需一致；插件升级不代表 App 需要同步升级。[兼容说明](#兼容性)。
 
@@ -397,6 +397,7 @@ macOS 上局域网、cloudflared、自建 FRP 与自有反向代理可用；Funn
 | `0.6.3` | `0.2.0-rc.2`、`0.2.1-alpha.2`（打包安装、隔离配对、移动页面与 WebSocket 工作区读取）；另验证输入栏、设置与扩展 Worker 的超时、流式传输和显式恢复 |
 | `0.6.4` | `0.2.0-rc.2`（打包安装、隔离配对、移动页面与 WebSocket 工作区读取）；另验证 72 组真实公共插槽输入栏布局、Windows Desktop 目录选择器组合及跨平台回归。社区 Desktop 2.0.17 的原报告远程超时仍未宣称验收 |
 | `0.6.5` | `0.2.0-rc.2`、`0.2.1-alpha.2` 的打包模块管理与移动设置回归；另验证 Windows cpolar 解包及正式 `maid-atelier` 0.1.7 下有内容轨迹的布局修复。不代表全部第三方皮肤或报告者设备已验收 |
+| `0.6.6` | `0.2.0-rc.2`、`0.2.1-alpha.2` 的打包附件接收与图片预览回归，覆盖多图、取消、迟到结果和旧请求；Android 系统选择器改进独立发布，不包含在 npm 更新中 |
 
 <details>
 <summary>历史版本验证记录</summary>

package/apps/mobile/README.md

@@ -8,6 +8,10 @@ Android is the only supported native target. The iOS client remains an unpublish
 
 The current stable app is **0.6.3** (build 79). The app and npm plugin update independently; plugin web UI or connection fixes do not require reinstalling the APK. Install a new signed release APK for native updates or when the app reports that its version is too old. Older official APKs with the same signer retain pairing during in-place upgrades; a differently signed Debug build cannot overwrite the official app.
 
+### Attachment changes in development
+
+Unreleased App code uses the system Photo Picker on Android 13+ when the webpage requests a single supported image MIME filter. Multiple selection follows the system limit; unavailable pickers, older systems, capture requests and filters that cannot be represented exactly use the document picker instead. Document requests start directly, retain MIME and multiple settings, and do not promise a particular manufacturer's gallery. Standard callbacks are bound to the current WebView, Origin and document; obsolete results cannot complete a newer request. These native changes are not in the published 0.6.3 APK, and need a future signed App update.
+
 ## 0.6.3 update
 
 Build 79 adds per-computer recovery guidance, readable expired-CA records, duplicate-pairing protection and deduplicated status checks that leave capacity for an explicit connection. TLS still refuses expired certificates. It also improves dark-mode primary buttons and explicitly excludes encrypted pairings and WebView sessions from cloud backup and device transfer. The earlier automatic-recovery ownership corrections are included. This signed App is published independently from plugin 0.6.4.
@@ -106,7 +110,9 @@ For ordinary DSH attachments, the App forwards the webpage's multiple-selection
 
 Task reminders use Host completion events and explicit pending-input cards while the page remains alive. Enable notifications or open system settings from DSH **Settings → General** inside the app. Lock-screen text is generic and tapping opens the app. Plugin 0.6.4 distinguishes full session and turn IDs, including long and non-ASCII IDs; earlier versions can replace notifications when their tags collide. Completion reminders require SSE and have no offline event replay; Cloudflare Quick Tunnels do not support the stream. See [channel limits](../../docs/CLOUDFLARE_TUNNEL.en.md#quick-tunnel-feature-limits).
 
-Only one file-selection or camera interaction runs at a time, with a five-minute deadline. Cancellation, WebView destruction, timeout and stale-session results are cleaned up or rejected. Browsers use corresponding Web APIs and return `unsupported` when unavailable.
+Bridge file/camera actions are serialized with a five-minute deadline. Cancellation, WebView destruction, timeout and stale-session results are cleaned up or rejected. Standard WebView file inputs are a separate path. Since plugin 0.6.6, browser media selection waits for change, explicit cancellation, abort or the deadline rather than treating restored focus as cancellation. Unsupported browser capabilities return `unsupported`.
+
+For image attachment diagnosis, compare the native DSH file button and camera action using a small JPEG or PNG and check the unsent draft preview. DSH keeps images in the browser draft before submission, so no new computer-side image object does not establish picker failure. Checking the selected file count/type and the draft preview is sufficient without sending a model request; generic files can use a different storage path. File selection, webpage intake and later submission are separate stages.
 
 From App 0.4.7, its native keyboard adapter uses plain Enter for a new draft line when an inset-backed on-screen keyboard is visible, Android reports no hardware keyboard, and an active session composer is focused. The Send button still submits a multiline draft. Floating keyboards, unknown state and older Apps do not use this native rule; the plugin's touch-browser rule below can still apply. Physical keyboards can use Shift+Enter for a line break.
 

package/lib/client.js

@@ -3204,6 +3204,127 @@ window.__ModuleLoader__.load({
   [data-dsh-mobile-composer-model-label] { flex:1 1 auto !important; max-width:none !important; min-width:0 !important; overflow:hidden !important; text-overflow:ellipsis !important; white-space:nowrap !important; }
 }
 `;
+		//#endregion
+		//#region src/browser-file-picker.ts
+		/** Browser chooser lifetime shared by camera controls and the extension SDK. */
+		const BROWSER_FILE_PICKER_DEADLINE_MS = 3e5;
+		const browserEnvironment = {
+			createSource: () => {
+				const input = document.createElement("input");
+				return {
+					input,
+					open: () => {
+						document.body.append(input);
+						input.click();
+					},
+					remove: () => {
+						input.remove();
+					}
+				};
+			},
+			deadline: (callback, milliseconds) => {
+				const timer = window.setTimeout(callback, milliseconds);
+				return () => {
+					window.clearTimeout(timer);
+				};
+			}
+		};
+		/** Select files without treating focus/visibility restoration as cancellation.
+		* @param options - MIME selection, lifetime and optional camera capture mode.
+		* @param environment - Browser DOM and timer owner; tests may supply an owned source.
+		* @returns Selected files, or undefined for explicit cancellation or deadline; abort rejects.
+		*/
+		function pickBrowserFiles(options, environment = browserEnvironment) {
+			const abortReason = () => options.abortReason?.() ?? options.signal.reason ?? new DOMException("File selection aborted", "AbortError");
+			if (options.signal.aborted) return Promise.reject(abortReason());
+			return new Promise((resolve, reject) => {
+				let source;
+				let input;
+				let settled = false;
+				let cancelDeadline;
+				const cleanup = () => {
+					const errors = [];
+					const attempt = (operation) => {
+						try {
+							operation();
+						} catch (error) {
+							errors.push(error);
+						}
+					};
+					if (cancelDeadline !== void 0) attempt(cancelDeadline);
+					cancelDeadline = void 0;
+					attempt(() => {
+						input?.removeEventListener("change", onChange);
+					});
+					attempt(() => {
+						input?.removeEventListener("cancel", onCancel);
+					});
+					attempt(() => {
+						options.signal.removeEventListener("abort", onAbort);
+					});
+					attempt(() => {
+						source?.remove();
+					});
+					return errors;
+				};
+				const finish = (outcome) => {
+					if (settled) return;
+					settled = true;
+					const cleanupErrors = cleanup();
+					if (outcome.kind === "failed") reject(outcome.error);
+					else if (cleanupErrors.length > 0) reject(cleanupErrors[0]);
+					else if (outcome.kind === "cancelled") resolve(void 0);
+					else resolve(outcome.files);
+				};
+				const onChange = () => {
+					if (settled || input === void 0) return;
+					try {
+						const files = input.files === null ? [] : [...input.files];
+						finish(files.length === 0 ? { kind: "cancelled" } : {
+							kind: "files",
+							files: Object.freeze(files)
+						});
+					} catch (error) {
+						finish({
+							kind: "failed",
+							error
+						});
+					}
+				};
+				const onCancel = () => {
+					finish({ kind: "cancelled" });
+				};
+				const onAbort = () => {
+					finish({
+						kind: "failed",
+						error: abortReason()
+					});
+				};
+				try {
+					source = environment.createSource();
+					input = source.input;
+					input.type = "file";
+					input.accept = options.accept;
+					if (options.capture !== void 0) input.capture = options.capture;
+					input.multiple = options.multiple ?? false;
+					input.hidden = true;
+					input.addEventListener("change", onChange);
+					input.addEventListener("cancel", onCancel);
+					options.signal.addEventListener("abort", onAbort, { once: true });
+					cancelDeadline = environment.deadline(onCancel, BROWSER_FILE_PICKER_DEADLINE_MS);
+					if (options.signal.aborted) {
+						onAbort();
+						return;
+					}
+					source.open();
+				} catch (error) {
+					finish({
+						kind: "failed",
+						error
+					});
+				}
+			});
+		}
 		//#endregion
 		//#region src/native-mobile.ts
 		/**
@@ -3624,19 +3745,66 @@ window.__ModuleLoader__.load({
 				}
 			};
 		}
-		function controlledFileDragEvent(type, files, initialDropEffect) {
-			const event = new Event(type, {
-				bubbles: true,
-				cancelable: true
+		/** A read-only, file-only transfer for engines without usable native constructors. */
+		function controlledFileTransfer(files, initialDropEffect) {
+			const snapshot = [...files];
+			const fileList = Object.assign(snapshot, { item: (index) => snapshot[index] ?? null });
+			const items = Object.assign(snapshot.map((file) => ({
+				kind: "file",
+				type: file.type,
+				getAsFile: () => file,
+				getAsString: () => {},
+				webkitGetAsEntry: () => null
+			})), {
+				add: () => null,
+				clear: () => {},
+				remove: () => {}
 			});
-			const dataTransfer = {
+			Object.freeze(fileList);
+			Object.freeze(items);
+			return {
 				dropEffect: initialDropEffect,
 				effectAllowed: "copy",
-				files: Object.freeze([...files]),
-				types: Object.freeze(["Files"])
-			};
-			Object.defineProperty(event, "dataTransfer", { value: dataTransfer });
-			return event;
+				files: fileList,
+				items,
+				types: Object.freeze(["Files"]),
+				clearData: () => {},
+				getData: () => "",
+				setData: () => {},
+				setDragImage: () => {}
+			};
+		}
+		function nativeFileTransfer(files, initialDropEffect) {
+			const transfer = new DataTransfer();
+			for (const file of files) if (transfer.items.add(file) === null) throw new Error("file_transfer_unavailable");
+			if (transfer.files.length !== files.length) throw new Error("file_transfer_unavailable");
+			transfer.effectAllowed = "copy";
+			transfer.dropEffect = "copy";
+			if (transfer.effectAllowed !== "copy" || transfer.dropEffect !== "copy") throw new Error("file_transfer_unavailable");
+			transfer.dropEffect = initialDropEffect;
+			if (transfer.dropEffect !== initialDropEffect) throw new Error("file_transfer_unavailable");
+			return transfer;
+		}
+		function controlledFileDragEvent(type, files, initialDropEffect) {
+			let transfer;
+			if (typeof DataTransfer === "function") try {
+				transfer = nativeFileTransfer(files, initialDropEffect);
+			} catch (_error) {
+				transfer = controlledFileTransfer(files, initialDropEffect);
+			}
+			else transfer = controlledFileTransfer(files, initialDropEffect);
+			if (typeof DragEvent === "function") try {
+				const event = new DragEvent(type, {
+					bubbles: true,
+					cancelable: true,
+					dataTransfer: transfer
+				});
+				if (event.dataTransfer !== null) return event;
+			} catch (_error) {}
+			return Object.assign(new Event(type, {
+				bubbles: true,
+				cancelable: true
+			}), { dataTransfer: transfer });
 		}
 		/** Ask the official document dragover listener whether the current composer accepts files. */
 		function preflightComposerImageDrop(target, files) {
@@ -4086,7 +4254,6 @@ window.__ModuleLoader__.load({
 			const preflightFile = new File([], "dsh-mobile-preflight.png", { type: "image/png" });
 			const canAcceptComposerDrop = () => preflightComposerImageDrop(document, [preflightFile]);
 			const mediaPickerAbortController = new AbortController();
-			const browserPickerCleanups = /* @__PURE__ */ new Set();
 			let boundEnterEditor = null;
 			let boundEnterCard = null;
 			let disposeEnterBinding;
@@ -4133,63 +4300,18 @@ window.__ModuleLoader__.load({
 			};
 			const deliverImages = (files, context) => {
 				if (files.length === 0 || !mediaRequestIsCurrent(context)) return;
-				dispatchComposerImageDrop(document, files);
+				if (!dispatchComposerImageDrop(document, files)) showMediaToast(label("Allegati immagine non disponibili", "Image attachments are unavailable", "图片附件不可用"));
 			};
 			const launchBrowserCamera = (context) => {
-				const input = document.createElement("input");
-				input.type = "file";
-				input.accept = "image/*";
-				input.capture = "environment";
-				input.hidden = true;
-				const signal = mediaPickerAbortController.signal;
-				let cleanupTimer = 0;
-				let watchdogTimer = 0;
-				let cleaned = false;
-				const scheduleCleanup = () => {
-					if (!cleaned && cleanupTimer === 0) cleanupTimer = window.setTimeout(cleanup, 1e3);
-				};
-				const onVisibilityChange = () => {
-					if (document.visibilityState === "visible") scheduleCleanup();
-				};
-				const onChange = () => {
-					if (cleaned) return;
-					const files = input.files === null ? [] : [...input.files];
-					cleanup();
-					deliverImages(files, context);
-				};
-				const cleanup = () => {
-					if (cleaned) return;
-					cleaned = true;
-					if (cleanupTimer !== 0) window.clearTimeout(cleanupTimer);
-					if (watchdogTimer !== 0) window.clearTimeout(watchdogTimer);
-					cleanupTimer = 0;
-					watchdogTimer = 0;
-					input.removeEventListener("change", onChange);
-					input.removeEventListener("cancel", cleanup);
-					window.removeEventListener("focus", scheduleCleanup);
-					document.removeEventListener("visibilitychange", onVisibilityChange);
-					signal.removeEventListener("abort", cleanup);
-					browserPickerCleanups.delete(cleanup);
-					input.remove();
-				};
-				input.addEventListener("change", onChange);
-				input.addEventListener("cancel", cleanup);
-				window.addEventListener("focus", scheduleCleanup);
-				document.addEventListener("visibilitychange", onVisibilityChange);
-				signal.addEventListener("abort", cleanup, { once: true });
-				watchdogTimer = window.setTimeout(cleanup, 3e5);
-				browserPickerCleanups.add(cleanup);
-				if (signal.aborted) {
-					cleanup();
-					return;
-				}
-				try {
-					document.body.append(input);
-					input.click();
-				} catch {
-					cleanup();
-					if (mediaRequestIsCurrent(context)) showMediaToast(label("Impossibile aprire la fotocamera", "Could not open the camera", "无法打开相机"));
-				}
+				pickBrowserFiles({
+					accept: "image/*",
+					capture: "environment",
+					signal: mediaPickerAbortController.signal
+				}).then((files) => {
+					if (files !== void 0) deliverImages(files, context);
+				}).catch((_error) => {
+					if (mediaRequestIsCurrent(context)) showMediaToast(label("Impossibile aggiungere la foto", "Could not attach the photo", "无法附加照片"));
+				});
 			};
 			const dismissCommandMenu = () => {
 				(boundComposer?.querySelector("button[aria-haspopup=\"listbox\"][aria-expanded=\"true\"]"))?.click();
@@ -4647,7 +4769,6 @@ window.__ModuleLoader__.load({
 				mediaRequestGeneration += 1;
 				mediaPickerAbortController.abort();
 				restoreLanguageMarker();
-				for (const cleanup of [...browserPickerCleanups]) cleanup();
 				disposeEnterBinding?.();
 				disposeBrowserComposerSoftEnter();
 				observer.disconnect();
@@ -11326,73 +11447,12 @@ window.__ModuleLoader__.load({
 					await navigator.clipboard.writeText(typeof input === "object" && input !== null && "text" in input ? String(input.text) : "");
 					return { ok: true };
 				}
-				if (action === "files.pick" || action === "camera.capture") {
-					const inputElement = element("input");
-					inputElement.type = "file";
-					inputElement.accept = action === "camera.capture" ? "image/*" : "*/*";
-					if (action === "camera.capture") inputElement.capture = "environment";
-					inputElement.hidden = true;
-					return new Promise((resolve, reject) => {
-						let settled = false;
-						let cleaned = false;
-						let cleanupTimer = 0;
-						let watchdogTimer = 0;
-						const cleanup = () => {
-							if (cleaned) return;
-							cleaned = true;
-							if (cleanupTimer !== 0) window.clearTimeout(cleanupTimer);
-							if (watchdogTimer !== 0) window.clearTimeout(watchdogTimer);
-							window.removeEventListener("focus", scheduleCancel);
-							document.removeEventListener("visibilitychange", onVisibilityChange);
-							signal.removeEventListener("abort", onAbort);
-							inputElement.removeEventListener("change", onChange);
-							inputElement.removeEventListener("cancel", onCancel);
-							inputElement.remove();
-						};
-						const finish = (callback) => {
-							if (settled) return;
-							settled = true;
-							cleanup();
-							callback();
-						};
-						const onChange = () => {
-							const file = inputElement.files?.[0];
-							finish(() => {
-								resolve(file);
-							});
-						};
-						const onCancel = () => {
-							finish(() => {
-								resolve(void 0);
-							});
-						};
-						const onAbort = () => {
-							finish(() => {
-								reject(abortReason());
-							});
-						};
-						const scheduleCancel = () => {
-							if (!settled && cleanupTimer === 0) cleanupTimer = window.setTimeout(onCancel, 1e3);
-						};
-						const onVisibilityChange = () => {
-							if (document.visibilityState === "visible") scheduleCancel();
-						};
-						inputElement.addEventListener("change", onChange, { once: true });
-						inputElement.addEventListener("cancel", onCancel, { once: true });
-						window.addEventListener("focus", scheduleCancel);
-						document.addEventListener("visibilitychange", onVisibilityChange);
-						signal.addEventListener("abort", onAbort, { once: true });
-						watchdogTimer = window.setTimeout(onCancel, 3e5);
-						try {
-							document.body.append(inputElement);
-							inputElement.click();
-						} catch (error) {
-							finish(() => {
-								reject(error);
-							});
-						}
-					});
-				}
+				if (action === "files.pick" || action === "camera.capture") return pickBrowserFiles({
+					signal,
+					accept: action === "camera.capture" ? "image/*" : "*/*",
+					...action === "camera.capture" ? { capture: "environment" } : {},
+					abortReason
+				}).then((files) => files?.[0]);
 				throw new Error("native capability is unavailable");
 			};
 			const makeApi = (id, hostGeneration, controller, surfaces, surfaceIds) => {