dsh-openwrite 0.2.10 → 0.2.12

package/vendor/dsh-dog/lib/client.js

@@ -2497,25 +2497,47 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/sessionNavigation.ts
 		const DEFAULT_SELECTION_TIMEOUT_MS = 2e3;
+		function selected(sessions, id) {
+			const snapshot = sessions.list.getSnapshot();
+			if ("current" in snapshot) return snapshot.current === id;
+			return ((snapshot.byId?.[id])?.retainedBy?.mainView ?? 0) > 0;
+		}
+		async function refreshInvocationCatalog(sessions, parent) {
+			if (typeof sessions.refreshSubagents === "function") await sessions.refreshSubagents(parent);
+		}
 		/**
 		* Select a persisted invocation session and confirm that DSH actually staged it.
 		* Returns false only when neither the ordinary session list nor a refreshed
 		* direct-parent catalog can address the target.
 		*/
-		async function openInvocationSession(sessions, rawSessionId, rawParentSessionId, timeoutMs = DEFAULT_SELECTION_TIMEOUT_MS) {
+		async function openInvocationSession(sessions, rawSessionId, rawParentSessionId, timeoutMs = DEFAULT_SELECTION_TIMEOUT_MS, uiWorkspace) {
 			const sessionId = rawSessionId;
-			if (sessions.list.getSnapshot().current === sessionId) return true;
+			if (selected(sessions, sessionId)) return true;
 			if (sessions.list.getSnapshot().ids.includes(sessionId)) {
-				await selectAndConfirm(sessions, sessionId, () => sessions.open(sessionId), timeoutMs);
+				await selectAndConfirm(sessions, sessionId, () => {
+					if (uiWorkspace) uiWorkspace.openSession(sessionId);
+					else if (sessions.open) sessions.open(sessionId);
+					else throw new Error("DSH exposes no session navigation API");
+				}, timeoutMs);
 				return true;
 			}
-			let address = sessions.subagentAddress(sessionId);
+			let address = sessions.subagentAddress?.(sessionId);
 			if (address === void 0 && rawParentSessionId !== void 0) {
-				await sessions.refreshSubagents(rawParentSessionId);
-				address = sessions.subagentAddress(sessionId);
+				await refreshInvocationCatalog(sessions, rawParentSessionId);
+				address = sessions.subagentAddress?.(sessionId);
+				if (!address && uiWorkspace) address = {
+					parentSessionId: rawParentSessionId,
+					childSessionId: sessionId,
+					mode: "continuable"
+				};
 			}
 			if (address === void 0) return false;
-			await selectAndConfirm(sessions, sessionId, () => sessions.openSubagent(address), timeoutMs);
+			const target = address;
+			await selectAndConfirm(sessions, sessionId, () => {
+				if (uiWorkspace) uiWorkspace.openSession(target);
+				else if (sessions.openSubagent) sessions.openSubagent(target);
+				else throw new Error("DSH exposes no subagent navigation API");
+			}, timeoutMs);
 			return true;
 		}
 		async function selectAndConfirm(sessions, sessionId, select, timeoutMs) {
@@ -2531,7 +2553,7 @@ window.__ModuleLoader__.load({
 					else reject(error);
 				};
 				const confirm = () => {
-					if (sessions.list.getSnapshot().current === sessionId) finish();
+					if (selected(sessions, sessionId)) finish();
 				};
 				const timer = setTimeout(() => {
 					finish(/* @__PURE__ */ new Error(`DSH did not select session ${sessionId} within ${timeoutMs} ms`));
@@ -2805,6 +2827,46 @@ window.__ModuleLoader__.load({
   .dog-launcher, .dog-node, .dog-backdrop, .dog-dialog, .dog-runtime-pulse { animation: none; transition: none; }
 }
 `;
+		//#endregion
+		//#region src/client/sessionState.ts
+		/** DSH 0.2 folds pending interactions into the unified session status source. */
+		function debuggerSessionState(sessions, uiSession) {
+			const status = uiSession.sessionStatus;
+			const source = status ?? uiSession.pendingInteractions;
+			if (!source || typeof source.getSnapshot !== "function" || typeof source.subscribe !== "function") throw new Error("DSH session UI exposes neither sessionStatus nor pendingInteractions");
+			let lastSessions;
+			let lastStatus;
+			let combined;
+			return {
+				getSnapshot() {
+					const next = sessions.getSnapshot();
+					const pending = source.getSnapshot();
+					if (next !== lastSessions || pending !== lastStatus) {
+						lastSessions = next;
+						lastStatus = pending;
+						const interactions = status ? new Map([...status.getSnapshot()].flatMap(([id, value]) => value.pendingInteraction === void 0 ? [] : [[id, value.pendingInteraction]])) : pending;
+						combined = {
+							...next,
+							pendingInteractions: interactions
+						};
+					}
+					return combined;
+				},
+				subscribe(listener) {
+					const stopSessions = sessions.subscribe(listener);
+					try {
+						const stopStatus = source.subscribe(listener);
+						return () => {
+							stopStatus();
+							stopSessions();
+						};
+					} catch (error) {
+						stopSessions();
+						throw error;
+					}
+				}
+			};
+		}
 		//#endregion
 		//#region src/client/index.tsx
 		/** The overlay uses the shared trusted RPC transport and canonical session navigator. */
@@ -2812,10 +2874,18 @@ window.__ModuleLoader__.load({
 			"slots",
 			"sessions",
 			"connection",
-			"uiSession"
+			"uiSession",
+			"uiWorkspace"
 		];
 		/** Register the debugger beside other frame-wide overlays without replacing shipped UI. */
 		function apply(ctx) {
+			try {
+				ctx.effect(() => install(ctx), "openwrite-dog: client activation");
+			} catch (error) {
+				console.error("[OpenWrite/DoG] Debugger disabled: client activation failed", error);
+			}
+		}
+		function* install(ctx) {
 			const connection = ctx.get("connection");
 			const sessions = ctx.get("sessions");
 			const call = async (endpoint, payload, signal) => {
@@ -2823,34 +2893,9 @@ window.__ModuleLoader__.load({
 				if (!result.ok) throw new Error(result.error.message);
 				return result.value;
 			};
-			const openSession = (sessionId, parentSessionId) => openInvocationSession(sessions, sessionId, parentSessionId);
-			let lastSessions = sessions.list.getSnapshot();
-			let lastPending = ctx.uiSession.pendingInteractions.getSnapshot();
-			let combined = {
-				...lastSessions,
-				pendingInteractions: lastPending
-			};
-			const getSessionState = () => {
-				const next = sessions.list.getSnapshot();
-				const pending = ctx.uiSession.pendingInteractions.getSnapshot();
-				if (next !== lastSessions || pending !== lastPending) {
-					lastSessions = next;
-					lastPending = pending;
-					combined = {
-						...next,
-						pendingInteractions: pending
-					};
-				}
-				return combined;
-			};
-			const subscribeSessions = (listener) => {
-				const stopSession = sessions.list.subscribe(listener);
-				const stopPending = ctx.uiSession.pendingInteractions.subscribe(listener);
-				return () => {
-					stopSession();
-					stopPending();
-				};
-			};
+			const openSession = (sessionId, parentSessionId) => openInvocationSession(sessions, sessionId, parentSessionId, void 0, typeof ctx.uiWorkspace.openSession === "function" ? ctx.uiWorkspace : void 0);
+			const state = debuggerSessionState(sessions.list, ctx.uiSession);
+			state.getSnapshot();
 			const DogDebuggerHost = () => {
 				const [request, setRequest] = (0, react.useState)(0);
 				(0, react.useEffect)(() => {
@@ -2867,17 +2912,24 @@ window.__ModuleLoader__.load({
 						goalId
 					}, signal),
 					openSession,
-					getSessionState,
-					subscribeSessions,
-					refreshAgentCatalog: (parentSessionId) => sessions.refreshSubagents(parentSessionId)
+					getSessionState: state.getSnapshot,
+					subscribeSessions: state.subscribe,
+					refreshAgentCatalog: (parentSessionId) => refreshInvocationCatalog(sessions, parentSessionId)
 				}, request);
 			};
-			ctx.effect(installStyles, "dog-debugger: styles");
-			ctx.slots.inject("shell.overlay", () => ctx.slots.register({
-				name: "shell.overlay",
-				id: "openwrite.dog-debugger",
-				order: 80
-			}, DogDebuggerHost));
+			yield ctx.effect(installStyles, "dog-debugger: styles");
+			yield ctx.slots.inject("shell.overlay", () => {
+				try {
+					return ctx.slots.register({
+						name: "shell.overlay",
+						id: "openwrite.dog-debugger",
+						order: 80
+					}, DogDebuggerHost);
+				} catch (error) {
+					console.error("[OpenWrite/DoG] Debugger disabled: overlay registration failed", error);
+					return () => {};
+				}
+			});
 		}
 		function installStyles() {
 			if (document.querySelector(`style[data-plugin-css="@dsh-external/dsh-dog/debugger"]`) !== null) return () => void 0;