@senguoyun/dsh-arkme 0.1.73 → 0.1.75

package/lib/extension-profile-restart-helper.js

@@ -1,9 +1,9 @@
-import { i as prepareProfilePackageManager, r as localExtensionPnpmArgs, t as applyArkmeProfileBundlePolicy } from "./profile-bundle-policy-DLXDyohJ.js";
-import { t as ArkmeExtensionInstallStore } from "./install-store-bnyQDtYt.js";
+import { i as prepareProfilePackageManager, r as localExtensionPnpmArgs, t as applyArkmeProfileBundlePolicy } from "./profile-bundle-policy-Cwi2iuHi.js";
+import { t as ArkmeExtensionInstallStore } from "./install-store-CAljxSo2.js";
 import { closeSync, openSync } from "node:fs";
-import { readFile, rm, unlink } from "node:fs/promises";
-import { spawn, spawnSync } from "node:child_process";
 import { join, relative, resolve } from "node:path";
+import { spawn, spawnSync } from "node:child_process";
+import { readFile, rm, unlink } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 //#region src/extensions/profile-restart-helper.ts
 const PARENT_EXIT_TIMEOUT_MS = 2e4;
@@ -224,7 +224,7 @@ async function main() {
 	if (planPath === void 0) throw new Error("extension restart plan path is required");
 	const rawPlan = JSON.parse(await readFile(planPath, "utf8"));
 	if (managed && isPluginUpdateRestartPlan(rawPlan)) {
-		const pluginUpdate = await import("./plugin-updater-helper-D43MAnTY.js");
+		const pluginUpdate = await import("./plugin-updater-helper-DVcpMGBt.js");
 		if (mode === "--managed-finalize") {
 			const healthUrl = process.argv[4];
 			if (healthUrl === void 0) throw new Error("managed plugin update health URL is required");

package/lib/harness-model-client.js

@@ -1848,6 +1848,49 @@ Arkme 用户 {v0}|Arkme user {v0}
 			return typeof location !== "undefined" && new URLSearchParams(location.search).get("arkmeConversation") === "1";
 		}
 		//#endregion
+		//#region src/dsh-remote/account-session-observer.ts
+		/** Browser/SDK receive-only invalidation adapter; disposal aborts the subscription. */
+		function observeDshAccountSession(route, fetchImpl, target, changed, options = {}) {
+			const controller = new AbortController();
+			const signal = options.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal;
+			(async () => {
+				const response = await fetchImpl(route, {
+					method: "POST",
+					credentials: "same-origin",
+					headers: { "Content-Type": "application/json" },
+					body: JSON.stringify({
+						operation: "remote.session.observe",
+						params: target
+					}),
+					signal
+				});
+				if (!response.ok || !response.headers.get("content-type")?.includes("application/x-ndjson") || !response.body) throw new Error("远程连接不可用");
+				const reader = response.body.getReader(), decoder = new TextDecoder();
+				let buffer = "";
+				try {
+					while (!signal.aborted) {
+						const { value, done } = await reader.read();
+						if (done) throw new Error("远程连接已断开");
+						buffer += decoder.decode(value, { stream: true });
+						if (buffer.length > 4096) throw new Error("远程通知格式无效");
+						let end;
+						while ((end = buffer.indexOf("\n")) >= 0) {
+							const message = JSON.parse(buffer.slice(0, end));
+							buffer = buffer.slice(end + 1);
+							if (message.error) throw new Error(message.error);
+							if (message.changed && !signal.aborted) changed();
+						}
+					}
+				} finally {
+					await reader.cancel().catch(() => void 0);
+					reader.releaseLock();
+				}
+			})().catch((error) => {
+				if (!signal.aborted) options.onError?.(error);
+			});
+			return () => controller.abort();
+		}
+		//#endregion
 		//#region src/record-owner-id.ts
 		function recordOwnerId(value) {
 			if (typeof value === "number") return Number.isSafeInteger(value) && value > 0 ? value : 0;
@@ -3236,6 +3279,25 @@ Arkme 用户 {v0}|Arkme user {v0}
 					if (timeout !== void 0) clearTimeout(timeout);
 				};
 			}
+			async listDshAccountSessions(options = {}, signal) {
+				const result = await this.call("remote.sessions.list", options, signal);
+				if (result.contractVersion !== 1) throw new Error("账号会话协议版本不受支持");
+				return result;
+			}
+			async readDshAccountSession(options, signal) {
+				return await this.call("remote.session.read", options, signal);
+			}
+			async commandDshAccountSession(options, signal) {
+				return await this.call("remote.session.command", options, signal);
+			}
+			/** Event-driven invalidation only. Abort or dispose closes the Host subscription. */
+			observeDshAccountSession(target, changed, options = {}) {
+				return observeDshAccountSession(this.route, this.fetchImpl, target, changed, options);
+			}
+			/** Account-authorized native DSH carrier. Callers retain native RPC result semantics. */
+			async nativeDshRequest(options, signal) {
+				return await this.call("remote.session.native", options, signal);
+			}
 			async currentDesktopSession(signal) {
 				return await this.call("remote.currentSession", void 0, signal);
 			}
@@ -6905,8 +6967,28 @@ Arkme 用户 {v0}|Arkme user {v0}
 		}
 		//#endregion
 		//#region src/client/harness-model-client.tsx
-		function ModelSeat({ sessionId, ...props }) {
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ArkmeModelSelect, { ...props }, sessionId);
+		function ReadOnlyModelSeat({ projection }) {
+			const value = (0, react.useSyncExternalStore)(projection.subscribe, projection.getSnapshot);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "arkme-model-select",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: arkme_model_select_default }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+					type: "button",
+					className: "arkme-model-trigger",
+					disabled: true,
+					title: "模型设置请在源电脑修改",
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: value?.next?.model ?? "源实例默认模型" }),
+						value?.next?.reasoningEffort && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("small", { children: [" · ", value.next.reasoningEffort] }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							"aria-hidden": true,
+							children: "⌄"
+						})
+					]
+				})]
+			});
+		}
+		function ModelSeat(props) {
+			return "projection" in props ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ReadOnlyModelSeat, { projection: props.projection }, props.sessionId) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ArkmeModelSelect, { ...props }, props.sessionId);
 		}
 		const inject = [
 			"slots",
@@ -6922,10 +7004,10 @@ Arkme 用户 {v0}|Arkme user {v0}
 				scope.slots.inject("conversation.input.model", () => scope.slots.register({
 					name: "conversation.input.model",
 					priority: -100,
-					inject: (sessionId) => ({
+					inject: (sessionId) => sessionId.startsWith("arkme:") ? { projection: sessions.binding(sessionId).session.projections.faceOf("modelSelection") } : {
 						directory: models.directoryFor(sessionId),
 						available: sessions.subagentAddress(sessionId) === void 0
-					})
+					}
 				}, ModelSeat));
 			});
 		}

package/lib/harness-native-selection-client.js

@@ -148,6 +148,49 @@ window.__ModuleLoader__.load({
 			return typeof location !== "undefined" && new URLSearchParams(location.search).get("arkmeConversation") === "1";
 		}
 		//#endregion
+		//#region src/dsh-remote/account-session-observer.ts
+		/** Browser/SDK receive-only invalidation adapter; disposal aborts the subscription. */
+		function observeDshAccountSession(route, fetchImpl, target, changed, options = {}) {
+			const controller = new AbortController();
+			const signal = options.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal;
+			(async () => {
+				const response = await fetchImpl(route, {
+					method: "POST",
+					credentials: "same-origin",
+					headers: { "Content-Type": "application/json" },
+					body: JSON.stringify({
+						operation: "remote.session.observe",
+						params: target
+					}),
+					signal
+				});
+				if (!response.ok || !response.headers.get("content-type")?.includes("application/x-ndjson") || !response.body) throw new Error("远程连接不可用");
+				const reader = response.body.getReader(), decoder = new TextDecoder();
+				let buffer = "";
+				try {
+					while (!signal.aborted) {
+						const { value, done } = await reader.read();
+						if (done) throw new Error("远程连接已断开");
+						buffer += decoder.decode(value, { stream: true });
+						if (buffer.length > 4096) throw new Error("远程通知格式无效");
+						let end;
+						while ((end = buffer.indexOf("\n")) >= 0) {
+							const message = JSON.parse(buffer.slice(0, end));
+							buffer = buffer.slice(end + 1);
+							if (message.error) throw new Error(message.error);
+							if (message.changed && !signal.aborted) changed();
+						}
+					}
+				} finally {
+					await reader.cancel().catch(() => void 0);
+					reader.releaseLock();
+				}
+			})().catch((error) => {
+				if (!signal.aborted) options.onError?.(error);
+			});
+			return () => controller.abort();
+		}
+		//#endregion
 		//#region src/record-owner-id.ts
 		function recordOwnerId(value) {
 			if (typeof value === "number") return Number.isSafeInteger(value) && value > 0 ? value : 0;
@@ -1536,6 +1579,25 @@ window.__ModuleLoader__.load({
 					if (timeout !== void 0) clearTimeout(timeout);
 				};
 			}
+			async listDshAccountSessions(options = {}, signal) {
+				const result = await this.call("remote.sessions.list", options, signal);
+				if (result.contractVersion !== 1) throw new Error("账号会话协议版本不受支持");
+				return result;
+			}
+			async readDshAccountSession(options, signal) {
+				return await this.call("remote.session.read", options, signal);
+			}
+			async commandDshAccountSession(options, signal) {
+				return await this.call("remote.session.command", options, signal);
+			}
+			/** Event-driven invalidation only. Abort or dispose closes the Host subscription. */
+			observeDshAccountSession(target, changed, options = {}) {
+				return observeDshAccountSession(this.route, this.fetchImpl, target, changed, options);
+			}
+			/** Account-authorized native DSH carrier. Callers retain native RPC result semantics. */
+			async nativeDshRequest(options, signal) {
+				return await this.call("remote.session.native", options, signal);
+			}
 			async currentDesktopSession(signal) {
 				return await this.call("remote.currentSession", void 0, signal);
 			}

package/lib/harness-session-client.js

@@ -8,6 +8,9 @@ window.__ModuleLoader__.load({
 		/** Same-origin bridge owned and disposed by the embedded session client. */
 		const HARNESS_SESSION_NAVIGATION_KEY = "__arkmeHarnessSessionNavigation";
 		//#endregion
+		//#region src/client/harness-session-menu-bridge.ts
+		const HARNESS_LOCAL_SESSION_OPEN = "arkme:harness-local-session-open";
+		//#endregion
 		//#region src/client/harness-session-selection.ts
 		/** The embedded runtime owns selection. Visibility/presence clears must never erase it. */
 		function observeHarnessSessionSelection(sessions, bridge) {
@@ -30,7 +33,7 @@ window.__ModuleLoader__.load({
 			};
 			const changed = () => {
 				const snapshot = sessions.list.getSnapshot();
-				if (stopped || snapshot.phase !== "ready" || !snapshot.current || !snapshot.byId[snapshot.current]) return;
+				if (stopped || snapshot.phase !== "ready" || !snapshot.current || snapshot.current.startsWith("arkme:") || !snapshot.byId[snapshot.current]) return;
 				const key = JSON.stringify([snapshot.current, snapshot.currentAddress]);
 				if (pending?.key === key) return;
 				if (retry !== void 0) {
@@ -61,8 +64,60 @@ window.__ModuleLoader__.load({
 			"remote.session"
 		];
 		const REFRESH_MS = 1e4;
+		/** Use the public native composer gate; neither draft nor editor DOM is replaced. */
+		function lockDisconnectedComposer(sessions, connection, blocksFor) {
+			const offline = { reason: "源电脑未连接" };
+			let current, blocks, stopBlock;
+			const clear = () => {
+				stopBlock?.();
+				stopBlock = void 0;
+				if (current && blocks && blocks.storeFor(current).getSnapshot() === offline) blocks.set(current, void 0);
+			};
+			const sync = () => {
+				const next = sessions.list.getSnapshot().current;
+				if (next !== current) {
+					clear();
+					current = next;
+					blocks = current ? blocksFor(current) : void 0;
+					if (current && blocks) stopBlock = blocks.storeFor(current).subscribe(sync);
+				}
+				if (!current || !blocks) return;
+				const block = blocks.storeFor(current).getSnapshot();
+				if (connection.getSnapshot() !== "connected") {
+					if (block === void 0) blocks.set(current, offline);
+				} else if (block === offline) blocks.set(current, void 0);
+			};
+			const stopConnection = connection.subscribe(sync), stopSessions = sessions.list.subscribe(sync);
+			sync();
+			return () => {
+				stopConnection();
+				stopSessions();
+				clear();
+			};
+		}
 		/** The iframe reads selection through the public DSH store; Arkme owns visibility. */
 		function apply(ctx) {
+			if (window.__ARKME_NATIVE_DIRECTORY__) ctx.inject(["connection"], (scope) => {
+				const connection = scope.get("connection");
+				const sessions = scope.sessions;
+				scope.effect(() => {
+					const surface = window.frameElement?.parentElement;
+					return lockDisconnectedComposer(sessions, {
+						getSnapshot: () => surface?.getAttribute("data-arkme-source-writable") === "true" ? connection.state.getSnapshot() : "disconnected",
+						subscribe(listener) {
+							const stop = connection.state.subscribe(listener), observer = new MutationObserver(listener);
+							if (surface) observer.observe(surface, {
+								attributes: true,
+								attributeFilter: ["data-arkme-source-writable"]
+							});
+							return () => {
+								stop();
+								observer.disconnect();
+							};
+						}
+					}, (id) => (sessions.scope(id)?.get("conversation"))?.blocks);
+				}, "arkme: remote composer follows source availability");
+			});
 			ctx.effect(() => {
 				const surface = window.frameElement?.parentElement;
 				if (surface?.getAttribute("data-arkme-owned") !== "deepseek-harness-surface") return () => void 0;
@@ -70,7 +125,35 @@ window.__ModuleLoader__.load({
 				const sessions = ctx.sessions;
 				if (sessions === void 0) return () => void 0;
 				const parent = window.parent;
+				const query = new URLSearchParams(window.location?.search);
 				const stopPersistence = observeHarnessSessionSelection(sessions, parent?.arkmeDesktop?.sessionSelection);
+				let requestedSession = null;
+				const restoreRequested = () => {
+					if (!requestedSession || !sessions.list.getSnapshot().byId[requestedSession]) return;
+					const id = requestedSession;
+					requestedSession = null;
+					sessions.open(id);
+				};
+				const selectRequested = (id) => {
+					requestedSession = id;
+					restoreRequested();
+				};
+				let observedCurrent = sessions.list.getSnapshot().current;
+				const stopRequested = sessions.list.subscribe(() => {
+					const current = sessions.list.getSnapshot().current;
+					if (current !== observedCurrent) {
+						observedCurrent = current;
+						requestedSession = null;
+					}
+					window.__ARKME_NATIVE_DIRECTORY__?.select(current);
+					restoreRequested();
+				});
+				const requested = new MutationObserver(() => selectRequested(surface.getAttribute("data-arkme-open-session")));
+				requested.observe(surface, {
+					attributes: true,
+					attributeFilter: ["data-arkme-open-session", "data-arkme-open-revision"]
+				});
+				selectRequested(surface.getAttribute("data-arkme-open-session") || query.get("arkme-session"));
 				const frameWindow = window;
 				const navigation = {
 					async has(sessionId) {
@@ -93,11 +176,15 @@ window.__ModuleLoader__.load({
 						if (typeof sessionId !== "string" || sessionId.trim() === "") throw new Error("DSH 对话标识无效");
 						if (typeof sessions.open !== "function") throw new Error("当前 DSH 版本暂不支持打开任务");
 						sessions.open(sessionId);
+						document.dispatchEvent(new Event(HARNESS_LOCAL_SESSION_OPEN));
 					}
 				};
 				frameWindow[HARNESS_SESSION_NAVIGATION_KEY] = navigation;
 				const disposeNavigation = () => {
+					requestedSession = null;
 					stopPersistence();
+					stopRequested();
+					requested.disconnect();
 					if (frameWindow["__arkmeHarnessSessionNavigation"] === navigation) delete frameWindow[HARNESS_SESSION_NAVIGATION_KEY];
 				};
 				if (apiPath === void 0 || !/^\/[A-Za-z0-9/_-]+$/.test(apiPath)) return disposeNavigation;
@@ -109,6 +196,7 @@ window.__ModuleLoader__.load({
 				let timer;
 				let fingerprint = "";
 				let renew = false;
+				let focused = false;
 				let controller;
 				const report = async () => {
 					if (stopped) return;
@@ -122,9 +210,11 @@ window.__ModuleLoader__.load({
 						dirty = false;
 						const accountId = surface.getAttribute("data-arkme-account-id") ?? "";
 						const current = sessions.list.getSnapshot().current;
-						const sessionRef = surface.getAttribute("data-arkme-follow-session") === "true" ? current ?? null : null;
+						const sessionRef = surface.getAttribute("data-arkme-follow-session") === "true" && !surface.getAttribute("data-arkme-remote-session") ? current && !current.startsWith("arkme:") ? current : null : null;
 						renew = accountId !== "" && sessionRef !== null;
 						fingerprint = JSON.stringify([accountId, sessionRef]);
+						const reportFocus = focused;
+						focused = false;
 						if (accountId !== "") {
 							controller = new AbortController();
 							const deadline = setTimeout(() => {
@@ -140,7 +230,8 @@ window.__ModuleLoader__.load({
 											accountId,
 											windowRef,
 											revision: ++revision,
-											sessionRef
+											sessionRef,
+											focused: reportFocus
 										}
 									}),
 									signal: controller.signal
@@ -157,8 +248,13 @@ window.__ModuleLoader__.load({
 				};
 				const changed = () => {
 					const accountId = surface.getAttribute("data-arkme-account-id") ?? "";
-					const current = surface.getAttribute("data-arkme-follow-session") === "true" ? sessions.list.getSnapshot().current ?? null : null;
-					if (JSON.stringify([accountId, current]) !== fingerprint) report();
+					const current = surface.getAttribute("data-arkme-follow-session") === "true" && !surface.getAttribute("data-arkme-remote-session") ? sessions.list.getSnapshot().current ?? null : null;
+					const localCurrent = current?.startsWith("arkme:") ? null : current;
+					if (JSON.stringify([accountId, localCurrent]) !== fingerprint) report();
+				};
+				const onFocus = () => {
+					focused = true;
+					report();
 				};
 				const clearSelection = () => {
 					controller?.abort();
@@ -183,10 +279,15 @@ window.__ModuleLoader__.load({
 				const observer = new MutationObserver(changed);
 				observer.observe(surface, {
 					attributes: true,
-					attributeFilter: ["data-arkme-follow-session", "data-arkme-account-id"]
+					attributeFilter: [
+						"data-arkme-follow-session",
+						"data-arkme-account-id",
+						"data-arkme-remote-session"
+					]
 				});
 				const unsubscribe = sessions.list.subscribe(changed);
 				document.addEventListener("visibilitychange", changed);
+				window.addEventListener("focus", onFocus);
 				window.addEventListener("pagehide", clearSelection);
 				window.addEventListener("pageshow", changed);
 				report();
@@ -197,6 +298,7 @@ window.__ModuleLoader__.load({
 					observer.disconnect();
 					unsubscribe();
 					document.removeEventListener("visibilitychange", changed);
+					window.removeEventListener("focus", onFocus);
 					window.removeEventListener("pagehide", clearSelection);
 					window.removeEventListener("pageshow", changed);
 				};
@@ -205,6 +307,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		exports.apply = apply;
 		exports.inject = inject;
+		exports.lockDisconnectedComposer = lockDisconnectedComposer;
 		return module.exports;
 	}
 });