@linxin666/dsh-remote-web-ui 0.2.0 → 0.2.2

package/lib/index.js

@@ -868,7 +868,9 @@ function makeRoutes(deps) {
 	const ACCEPT_MAX_ATTEMPTS = 10;
 	const ACCEPT_WINDOW_MS = 3e4;
 	const rateLimitAccept = (req) => {
-		const ip = req.socket?.remoteAddress ?? "unknown";
+		const socketIp = req.socket?.remoteAddress ?? "unknown";
+		const forwarded = typeof req.headers["x-forwarded-for"] === "string" ? (req.headers["x-forwarded-for"].split(",")[0] ?? "").trim() : void 0;
+		const ip = forwarded === void 0 || forwarded === "" ? socketIp : socketIp + "|" + forwarded;
 		const nowMs = Date.now();
 		if (acceptAttempts.size > 256) {
 			for (const [key, attempt] of acceptAttempts) if (nowMs - attempt.windowStart > ACCEPT_WINDOW_MS) acceptAttempts.delete(key);
@@ -1022,10 +1024,16 @@ function makeRoutes(deps) {
 			return;
 		}
 		const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
+		const paired = deviceId !== void 0 && service.hasDevice(deviceId);
+		const snapshot = service.snapshot();
 		writeJson(res, 200, {
 			ok: true,
-			paired: deviceId !== void 0 && service.hasDevice(deviceId),
-			...service.snapshot()
+			paired,
+			...paired ? snapshot : {
+				phase: snapshot.phase,
+				lanAvailable: snapshot.lanAvailable,
+				lanAddresses: snapshot.lanAddresses
+			}
 		});
 	};
 	const handleEvents = (req, res) => {
@@ -1306,9 +1314,16 @@ function makeMobileRoutes() {
 }
 //#endregion
 //#region src/mobile-api.ts
-/** Methods the phone surface may call. Everything else is refused. */
+/**
+* Methods the phone surface may call. Everything else is refused HERE — but
+* note the paired-device cookie also passes the global api/gate for the full
+* ApiProxy surface (gate.ts), so a paired phone is a full-control credential:
+* the allowlist only constrains this /m/api proxy, not the cookie's reach.
+* stop() revokes every device; there is no per-device revocation yet.
+*/
 const MOBILE_ALLOWLIST = /* @__PURE__ */ new Set([
 	"workspace.list",
+	"agentPreset.list",
 	"session.create",
 	"session.list",
 	"session.history",
@@ -1573,6 +1588,7 @@ async function dispatch(apiProxy, method, payload, rpcId, signal) {
 		result: response.result
 	});
 	if (method === "workspace.list") return wrap(await apiProxy.workspace.list(request));
+	if (method === "agentPreset.list") return wrap(await apiProxy.agentPresets.list(request));
 	if (method === "session.create") return wrap(await apiProxy.sessions.create(request));
 	if (method === "session.history") return wrap(await apiProxy.sessions.history(request));
 	if (method === "session.search") return wrap(await apiProxy.sessions.search(request, signal ?? new AbortController().signal));
@@ -1650,6 +1666,7 @@ var TunnelManager = class {
 	urlTimer;
 	restartTimer;
 	attempts = 0;
+	generation = 0;
 	stopping = false;
 	urlListeners = /* @__PURE__ */ new Set();
 	phaseListeners = /* @__PURE__ */ new Set();
@@ -1684,6 +1701,7 @@ var TunnelManager = class {
 		this.stopping = false;
 		this.targetUrl = targetUrl;
 		this.attempts = 0;
+		this.generation += 1;
 		this.attempt();
 	}
 	/** Stop the tunnel for good: no restarts, no state. */
@@ -1713,12 +1731,13 @@ var TunnelManager = class {
 	}
 	attempt() {
 		if (this.stopping || this.targetUrl === void 0) return;
+		const gen = this.generation;
 		this.setPhase("starting");
 		this.handle = void 0;
 		this.url = void 0;
 		this.error = void 0;
 		this.ensureBinary().then(() => {
-			if (this.stopping || this.targetUrl === void 0) return;
+			if (this.stopping || this.targetUrl === void 0 || gen !== this.generation) return;
 			const handle = this.factory(this.targetUrl);
 			this.handle = handle;
 			this.urlTimer = this.timer.setTimeout(() => {
@@ -1737,7 +1756,7 @@ var TunnelManager = class {
 				this.error = value instanceof Error ? value.message : String(value);
 			});
 		}).catch((value) => {
-			if (this.stopping || this.targetUrl === void 0) return;
+			if (this.stopping || this.targetUrl === void 0 || gen !== this.generation) return;
 			const message = value instanceof Error ? value.message : String(value);
 			this.fail(`could not obtain the cloudflared binary: ${message}`);
 		});
@@ -1968,7 +1987,7 @@ async function fetchLatestVersion(name, fetchImpl, timeoutMs = 1e4) {
 			controller.abort();
 		}, timeoutMs);
 		try {
-			const response = await fetchImpl("https://registry.npmjs.org/" + name.replace("/", "%2F") + "/latest");
+			const response = await fetchImpl("https://registry.npmjs.org/" + name.replace("/", "%2F") + "/latest", { signal: controller.signal });
 			if (!response.ok) return void 0;
 			const body = await response.json();
 			if (typeof body !== "object" || body === null) return void 0;

package/lib/mobile.js

@@ -7578,6 +7578,10 @@ async function fetchMobilePreferences() {
 async function listSessions(cursor) {
 	return await callUnary("session.list", cursor === void 0 ? {} : { cursor });
 }
+/** Read the available agent compositions for a new session. */
+async function listAgentPresets() {
+	return await callUnary("agentPreset.list", {});
+}
 /**
 * Create a blank session (entity birth precedes the first message). Name a
 * workspace to attach it there, or a cwd; omitting both uses the host cwd.
@@ -13052,13 +13056,6 @@ function chunkTarget(data) {
 	if (step !== void 0) result.step = step;
 	return result;
 }
-/** Max message seq across an existing list, or -1 for an empty list. */
-function watermarkOf(existing) {
-	if (existing === void 0) return -1;
-	let maxSeq = -1;
-	for (const message of existing) if (message.seq > maxSeq) maxSeq = message.seq;
-	return maxSeq;
-}
 function createState(existing) {
 	const messages = existing === void 0 ? [] : [...existing];
 	const state = {
@@ -13067,9 +13064,11 @@ function createState(existing) {
 		pendingByTurnStep: /* @__PURE__ */ new Map(),
 		turnStepMessage: /* @__PURE__ */ new Map(),
 		messageTurn: /* @__PURE__ */ new Map(),
-		toolNames: /* @__PURE__ */ new Map()
+		toolNames: /* @__PURE__ */ new Map(),
+		maxSeq: -1
 	};
 	for (const message of messages) {
+		if (message.seq > state.maxSeq) state.maxSeq = message.seq;
 		state.byId.set(message.id, message);
 		if (message.kind !== "assistant") continue;
 		const decoded = decodePendingTurnStep(message.id);
@@ -13123,6 +13122,7 @@ function retargetTurnStep(state, key, oldMessage, next) {
 }
 /** Fold one event into the working state. Assumes the event passes the watermark. */
 function applyEvent(state, event) {
+	if (event.seq > state.maxSeq) state.maxSeq = event.seq;
 	switch (event.type) {
 		case "user/message":
 			applyUserMessage(state, event);
@@ -13417,14 +13417,58 @@ function applyTurnEnd(state, event) {
 * @returns messages sorted by seq.
 */
 function foldEvents(events, existing) {
-	const sorted = [...events].sort((a, b) => a.seq - b.seq);
-	const watermark = watermarkOf(existing);
-	const state = createState(existing);
-	for (const event of sorted) {
-		if (event.seq <= watermark) continue;
-		applyEvent(state, event);
-	}
-	const out = state.messages;
+	return new EventFolder(existing).fold(events);
+}
+/**
+* Incremental folder for one message stream. Live chat folds one event at a
+* time; rebuilding the five index maps by scanning every message per event
+* made that path O(n) per event (O(n * events) per turn). A folder keeps the
+* indexes alive across folds, applies each event in O(1) map operations, and
+* returns the previous snapshot identity unchanged when nothing applied, so
+* React skips the re-render entirely. Replayed events are no-ops: the maxSeq
+* watermark advanced by the first application skips them, which also makes a
+* double-invoked React state updater harmless.
+*/
+var EventFolder = class {
+	state;
+	snapshotList;
+	/** @param initial - seed rows (history tail load); omit for an empty stream. */
+	constructor(initial) {
+		this.state = createState(initial);
+	}
+	/** Fold one batch incrementally; returns the current snapshot list. */
+	fold(events) {
+		const sorted = [...events].sort((a, b) => a.seq - b.seq);
+		let applied = false;
+		for (const event of sorted) {
+			if (event.seq <= this.state.maxSeq) continue;
+			applyEvent(this.state, event);
+			applied = true;
+		}
+		if (!applied && this.snapshotList !== void 0) return this.snapshotList;
+		this.snapshotList = snapshotOf(this.state);
+		return this.snapshotList;
+	}
+	/** Replace the whole stream (history reload / session switch). */
+	seed(messages) {
+		this.state = createState(messages);
+		this.snapshotList = void 0;
+	}
+	/** Prepend an older history page (exact seam; no overlapping seqs). */
+	prepend(older) {
+		this.state = createState([...older, ...this.state.messages]);
+		this.snapshotList = void 0;
+	}
+	/** Current snapshot list; a fresh copy whenever the folder changed. */
+	snapshot() {
+		if (this.snapshotList !== void 0) return this.snapshotList;
+		this.snapshotList = snapshotOf(this.state);
+		return this.snapshotList;
+	}
+};
+/** Copy the folder's rows and keep them seq-ordered (skips re-sorting the common ordered case). */
+function snapshotOf(state) {
+	const out = [...state.messages];
 	let ordered = true;
 	for (let index = 1; index < out.length; index += 1) {
 		const prev = out[index - 1];
@@ -13434,7 +13478,7 @@ function foldEvents(events, existing) {
 			break;
 		}
 	}
-	return ordered ? out : [...out].sort((a, b) => a.seq - b.seq || (a.id < b.id ? -1 : 1));
+	return ordered ? out : out.sort((a, b) => a.seq - b.seq || (a.id < b.id ? -1 : 1));
 }
 //#endregion
 //#region src/mobile/markdown.ts
@@ -13911,6 +13955,8 @@ function ChatView({ session, mux, onBack }) {
 	const tailLoadingRef = (0, import_react.useRef)(true);
 	/** Live session events buffered while the initial tail page loads. */
 	const liveBufferRef = (0, import_react.useRef)([]);
+	/** Incremental folder for this session's stream (indexes stay hot across events). */
+	const folderRef = (0, import_react.useRef)(void 0);
 	/** True once the live buffer hit its cap (oldest events were dropped). */
 	const liveBufferOverflowRef = (0, import_react.useRef)(false);
 	/** The session's permission select (absent = capability not composed). */
@@ -13946,6 +13992,7 @@ function ChatView({ session, mux, onBack }) {
 		tailLoadingRef.current = true;
 		liveBufferRef.current = [];
 		liveBufferOverflowRef.current = false;
+		folderRef.current = void 0;
 		setLoading(true);
 		setError(void 0);
 		setMessages([]);
@@ -13954,14 +14001,18 @@ function ChatView({ session, mux, onBack }) {
 			const buffered = liveBufferRef.current;
 			liveBufferRef.current = [];
 			tailLoadingRef.current = false;
-			setMessages(foldEvents(buffered, foldEvents(page.events.map(eventOf))));
+			const folder = new EventFolder(foldEvents(page.events.map(eventOf)));
+			folderRef.current = folder;
+			setMessages(folder.fold(buffered));
 			setHasOlder(page.hasMore);
 			setLoading(false);
 			const projections = page.projections?.values;
 			setPermissions(parsePermissionSelect(projections?.["permissions"]));
 			if (liveBufferOverflowRef.current) loadHistory(session.sessionId, void 0, controller.signal).then((fresh) => {
 				if (cancelled) return;
-				setMessages((previous) => foldEvents(fresh.events.map(eventOf), previous));
+				const folder = folderRef.current;
+				const freshEvents = fresh.events.map(eventOf);
+				setMessages((previous) => folder === void 0 ? foldEvents(freshEvents, previous) : folder.fold(freshEvents));
 				liveBufferOverflowRef.current = false;
 			}, (reason) => {
 				if (cancelled) return;
@@ -13972,7 +14023,10 @@ function ChatView({ session, mux, onBack }) {
 			const buffered = liveBufferRef.current;
 			liveBufferRef.current = [];
 			tailLoadingRef.current = false;
-			if (buffered.length > 0) setMessages(foldEvents(buffered));
+			if (buffered.length > 0) {
+				const folder = folderRef.current;
+				setMessages(folder === void 0 ? foldEvents(buffered) : folder.fold(buffered));
+			}
 			setError(errorText(reason));
 			setLoading(false);
 		});
@@ -14002,7 +14056,10 @@ function ChatView({ session, mux, onBack }) {
 					liveBufferRef.current.push(event);
 					return;
 				}
-				setMessages((previous) => foldEvents([event], previous));
+				setMessages((previous) => {
+					const folder = folderRef.current;
+					return folder === void 0 ? foldEvents([event], previous) : folder.fold([event]);
+				});
 				return;
 			}
 			if (frame.type === "session/projection" && frame.sessionId === session.sessionId && frame.key === "permissions") setPermissions(parsePermissionSelect(frame.value));
@@ -14039,7 +14096,12 @@ function ChatView({ session, mux, onBack }) {
 			pendingRef.current = false;
 			setLoading(false);
 			const older = foldEvents(page.events.map(eventOf));
-			setMessages((previous) => [...older, ...previous]);
+			const folder = folderRef.current;
+			if (folder === void 0) setMessages((previous) => [...older, ...previous]);
+			else {
+				folder.prepend(older);
+				setMessages(folder.snapshot());
+			}
 			setHasOlder(page.hasMore);
 		}, (reason) => {
 			pendingRef.current = false;
@@ -14274,8 +14336,12 @@ function ChatView({ session, mux, onBack }) {
 		]
 	});
 }
-/** One rendered message row (user bubble or assistant bubble with folds). */
-function MessageRow({ message, showToolCalls, showSystemMessages }) {
+/**
+* One rendered message row (user bubble or assistant bubble with folds).
+* Memoized: live streaming updates exactly one message object per frame, so
+* unchanged rows skip re-rendering their markdown/sub-components.
+*/
+const MessageRow = (0, import_react.memo)(function MessageRow({ message, showToolCalls, showSystemMessages }) {
 	if (message.kind === "user" && message.sourceKind !== void 0 && message.sourceKind !== "user" && !showSystemMessages) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: `chat-msg chat-msg-${message.kind}${message.pending === true ? " chat-msg-pending" : ""}${message.failed === true ? " chat-msg-failed" : ""}`,
@@ -14296,7 +14362,7 @@ function MessageRow({ message, showToolCalls, showSystemMessages }) {
 			})
 		]
 	});
-}
+});
 /** Collapsed-by-default reasoning disclosure (web-UI Think-row parity). */
 function ReasoningDisclosure({ text, pending }) {
 	const [open, setOpen] = (0, import_react.useState)(false);
@@ -14848,6 +14914,9 @@ function SessionListView({ workspace, onBack, onPick }) {
 	const [error, setError] = (0, import_react.useState)(void 0);
 	const [creating, setCreating] = (0, import_react.useState)(false);
 	const [createError, setCreateError] = (0, import_react.useState)(void 0);
+	const [presets, setPresets] = (0, import_react.useState)([]);
+	const [selectedPreset, setSelectedPreset] = (0, import_react.useState)(void 0);
+	const [presetsLoading, setPresetsLoading] = (0, import_react.useState)(true);
 	const cursorRef = (0, import_react.useRef)(void 0);
 	const busyRef = (0, import_react.useRef)(false);
 	(0, import_react.useEffect)(() => {
@@ -14870,6 +14939,25 @@ function SessionListView({ workspace, onBack, onPick }) {
 			cancelled = true;
 		};
 	}, [workspace]);
+	(0, import_react.useEffect)(() => {
+		let cancelled = false;
+		setPresets([]);
+		setSelectedPreset(void 0);
+		setPresetsLoading(true);
+		listAgentPresets().then((roster) => {
+			if (cancelled) return;
+			const usable = roster.presets.filter((preset) => preset.broken === void 0);
+			setPresets(roster.presets);
+			setSelectedPreset((usable.find((preset) => preset.isDefault) ?? usable[0])?.id);
+			setPresetsLoading(false);
+		}, () => {
+			if (cancelled) return;
+			setPresetsLoading(false);
+		});
+		return () => {
+			cancelled = true;
+		};
+	}, [workspace]);
 	/** Pull the next page and append the rows that belong to this workspace. */
 	const loadMore = (0, import_react.useCallback)(() => {
 		if (busyRef.current) return;
@@ -14894,7 +14982,10 @@ function SessionListView({ workspace, onBack, onPick }) {
 		if (creating) return;
 		setCreating(true);
 		setCreateError(void 0);
-		createSession({ workspaceId: workspace.workspaceId }).then((created) => {
+		createSession({
+			workspaceId: workspace.workspaceId,
+			...selectedPreset !== void 0 ? { agentPreset: selectedPreset } : {}
+		}).then((created) => {
 			setCreating(false);
 			const view = {
 				sessionId: created.sessionId,
@@ -14912,9 +15003,11 @@ function SessionListView({ workspace, onBack, onPick }) {
 	}, [
 		creating,
 		workspace,
-		onPick
+		onPick,
+		selectedPreset
 	]);
 	const createHint = createError !== void 0 ? staleHostHint(createError) : void 0;
+	const selectedPresetEntry = presets.find((preset) => preset.id === selectedPreset);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "mobile",
 		children: [
@@ -14939,17 +15032,50 @@ function SessionListView({ workspace, onBack, onPick }) {
 				className: "mobile-error mobile-pad",
 				children: error
 			}),
-			/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-				className: "mobile-pad",
-				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
-					type: "button",
-					className: "mobile-new",
-					disabled: creating,
-					onClick: () => {
-						handleCreate();
-					},
-					children: creating ? "创建中…" : "+ 新建会话"
-				})
+			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
+				className: "mobile-create mobile-pad",
+				children: [
+					presets.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", {
+						className: "mobile-preset",
+						children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
+							className: "mobile-presetLabel",
+							children: "Agent 模式"
+						}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("select", {
+							className: "mobile-presetSelect",
+							value: selectedPreset ?? "",
+							disabled: selectedPreset === void 0,
+							onChange: (event) => {
+								setSelectedPreset(event.target.value);
+							},
+							children: [selectedPreset === void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", {
+								value: "",
+								children: "无可用 Agent 模式"
+							}), presets.map((preset) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("option", {
+								value: preset.id,
+								disabled: preset.broken !== void 0,
+								children: [
+									preset.name ?? preset.id,
+									preset.isDefault ? "（默认）" : "",
+									preset.trust === "user" ? "（本地）" : "",
+									preset.broken !== void 0 ? "（不可用）" : ""
+								]
+							}, preset.id))]
+						})]
+					}),
+					selectedPresetEntry?.description !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", {
+						className: "mobile-presetDescription",
+						children: selectedPresetEntry.description
+					}),
+					/* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: "mobile-new",
+						disabled: creating || presetsLoading,
+						onClick: () => {
+							handleCreate();
+						},
+						children: creating ? "创建中…" : "+ 新建会话"
+					})
+				]
 			}),
 			createError !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", {
 				className: "mobile-error mobile-pad",
@@ -15022,6 +15148,7 @@ function SessionListView({ workspace, onBack, onPick }) {
 function WorkspaceView({ initialWorkspaceId, onPick }) {
 	const [items, setItems] = (0, import_react.useState)(void 0);
 	const [error, setError] = (0, import_react.useState)(void 0);
+	const [reload, setReload] = (0, import_react.useState)(0);
 	(0, import_react.useEffect)(() => {
 		let cancelled = false;
 		listWorkspaces().then((rows) => {
@@ -15039,7 +15166,11 @@ function WorkspaceView({ initialWorkspaceId, onPick }) {
 		return () => {
 			cancelled = true;
 		};
-	}, [initialWorkspaceId, onPick]);
+	}, [
+		initialWorkspaceId,
+		onPick,
+		reload
+	]);
 	if (error !== void 0) return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "mobile",
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("header", {
@@ -15059,6 +15190,7 @@ function WorkspaceView({ initialWorkspaceId, onPick }) {
 				onClick: () => {
 					setError(void 0);
 					setItems(void 0);
+					setReload((n) => n + 1);
 				},
 				children: "重试"
 			})]
@@ -15707,6 +15839,43 @@ body {
   padding: 8px 16px;
 }
 
+.mobile-create {
+  display: grid;
+  gap: 8px;
+}
+
+.mobile-preset {
+  display: grid;
+  gap: 4px;
+}
+
+.mobile-presetLabel {
+  color: var(--m-text-secondary);
+  font-size: 13px;
+  font-weight: 600;
+}
+
+.mobile-presetSelect {
+  width: 100%;
+  height: 40px;
+  padding: 0 36px 0 12px;
+  border: 1px solid var(--m-border);
+  border-radius: 10px;
+  background: var(--m-bg-input);
+  color: var(--m-text);
+  font: inherit;
+}
+
+.mobile-presetSelect:disabled {
+  opacity: 0.6;
+}
+
+.mobile-presetDescription {
+  margin: 0;
+  color: var(--m-text-tertiary);
+  font-size: 12px;
+}
+
 /* ── buttons ─────────────────────────────────────────────────────────── */
 
 .mobile-button {
@@ -16351,6 +16520,7 @@ body {
 .mobile-row:focus-visible,
 .mobile-button:focus-visible,
 .mobile-new:focus-visible,
+.mobile-presetSelect:focus-visible,
 .chat-send:focus-visible,
 .chat-chip:focus-visible,
 .chat-msg-toggle:focus-visible,