@try-works/dsh-recursive-mode 0.1.9 → 0.1.11

package/lib/client/contract.d.ts

@@ -85,3 +85,32 @@ export interface LiveProjectionValue {
 export declare function isRecursivePreset(state: SessionListStateLike): boolean;
 /** The current session's cwd (the client passes it as a fallback hint; the host resolves the root). */
 export declare function currentSessionCwd(state: SessionListStateLike): string;
+/**
+ * A workspace row — the structural mirror of the REAL WorkspaceView the host
+ * injects. We consume only workspaceId/path/title/sessionIds.
+ */
+export interface WorkspaceViewLike {
+    workspaceId: string;
+    path: string;
+    title: string;
+    sessionIds: string[];
+}
+/**
+ * The workspace-list snapshot — the structural subset of the REAL
+ * WorkspaceListState we consume (items + recentWorkspaceId). The real state
+ * also carries archivedSessionIds/state/phase/error/baselinesReady; those are
+ * irrelevant here and the real value satisfies this subset.
+ */
+export interface WorkspaceListStateLike {
+    items: readonly WorkspaceViewLike[];
+    recentWorkspaceId?: string;
+}
+/**
+ * Resolve the CURRENT workspace path for a workspace-scoped board (run 14):
+ * the WORKSPACE owns the .recursive/ run-layer, not the session. Resolution:
+ *   1) recentWorkspaceId's item path (the workspace the user is viewing), else
+ *   2) the workspace whose sessionIds contains sessionList.current, else
+ *   3) the workspace whose path === currentSessionCwd(sessionList), else
+ *   4) '' (empty -> the route returns null root -> board renders nothing).
+ */
+export declare function currentWorkspacePath(list: WorkspaceListStateLike, sessionList: SessionListStateLike): string;

package/lib/client/index.d.ts

@@ -20,8 +20,8 @@ export { useLiveProjection } from './use-live.ts';
 export type { LiveProjectionSnapshot } from './use-live.ts';
 export { fetchLiveState, subscribeLiveEvents } from './host-api.ts';
 export type { LiveRecursiveState, LiveRecursiveFrame, LiveScope } from './host-api.ts';
-export { isRecursivePreset, currentSessionCwd } from './contract.ts';
-export type { SessionSummaryRow, SessionListStateLike, SnapshotSelectorHook, ClientContext } from './contract.ts';
+export { isRecursivePreset, currentSessionCwd, currentWorkspacePath } from './contract.ts';
+export type { SessionSummaryRow, SessionListStateLike, SnapshotSelectorHook, WorkspaceViewLike, WorkspaceListStateLike, ClientContext } from './contract.ts';
 /** Required services (fiber inject waiting — the runtime must be up first). */
 export declare const inject: string[];
 /** Browser-half plugin entry (R4 + SP2 R1). */

package/lib/client/slots.d.ts

@@ -17,7 +17,7 @@
  * READ-ONLY (R9): the client only GETs the live host route; no mutation.
  */
 import { type ReactNode } from 'react';
-import type { ClientContext, SessionListStateLike, SnapshotSelectorHook } from './contract.ts';
+import type { ClientContext, SessionListStateLike, SnapshotSelectorHook, WorkspaceListStateLike } from './contract.ts';
 import { isRecursivePreset, currentSessionCwd } from './contract.ts';
 export type OverlayContent = 'hidden' | 'board' | 'inspector';
 /** Gate: hidden unless open AND recursive preset; inspector when a run is selected. */
@@ -42,5 +42,24 @@ export declare function RecursiveLauncherGate({ useSessions }: {
     useSessions: SnapshotSelectorHook<SessionListStateLike>;
 }): ReactNode;
 export declare function registerSlots(ctx: ClientContext): () => void;
+/**
+ * Board overlay: subscribes to the shared board store, gates on open + recursive
+ * preset, and swaps board <-> inspector (run 08 R1/R3).
+ *
+ * Run 10: consumes the full SessionListStateLike through the identity selector
+ * (useSessions((s) => s)); no fake {list:{getSnapshot}} wrapper.
+ */
+export declare function RecursiveBoardOverlay({ useSessions, useWorkspaces }: {
+    useSessions: SnapshotSelectorHook<SessionListStateLike>;
+    useWorkspaces?: SnapshotSelectorHook<WorkspaceListStateLike>;
+}): ReactNode;
+/**
+ * Strip gate: same preset gate, session-scoped sessionId; the strip renders
+ * nothing for a non-recursive session. Run 10: useSessions((s) => s) selector.
+ */
+export declare function RecursiveStripGate({ useSessions, sessionId }: {
+    useSessions: SnapshotSelectorHook<SessionListStateLike>;
+    sessionId?: string;
+}): ReactNode;
 /** Export the gate helpers for tests. */
 export { isRecursivePreset, currentSessionCwd };

package/lib/client.js

@@ -20,6 +20,31 @@ window.__ModuleLoader__.load({
 		function currentSessionCwd(state) {
 			return state.current === void 0 ? "" : state.byId[state.current]?.cwd ?? "";
 		}
+		/**
+		* Resolve the CURRENT workspace path for a workspace-scoped board (run 14):
+		* the WORKSPACE owns the .recursive/ run-layer, not the session. Resolution:
+		*   1) recentWorkspaceId's item path (the workspace the user is viewing), else
+		*   2) the workspace whose sessionIds contains sessionList.current, else
+		*   3) the workspace whose path === currentSessionCwd(sessionList), else
+		*   4) '' (empty -> the route returns null root -> board renders nothing).
+		*/
+		function currentWorkspacePath(list, sessionList) {
+			if (list.recentWorkspaceId !== void 0) {
+				const recent = list.items.find((w) => w.workspaceId === list.recentWorkspaceId);
+				if (recent !== void 0) return recent.path;
+			}
+			const current = sessionList.current;
+			if (current !== void 0) {
+				const bySession = list.items.find((w) => w.sessionIds.includes(current));
+				if (bySession !== void 0) return bySession.path;
+			}
+			const cwd = currentSessionCwd(sessionList);
+			if (cwd !== "") {
+				const byCwd = list.items.find((w) => w.path === cwd);
+				if (byCwd !== void 0) return byCwd.path;
+			}
+			return "";
+		}
 		//#endregion
 		//#region src/client/derive.ts
 		const KANBAN_LANES = [
@@ -809,7 +834,10 @@ window.__ModuleLoader__.load({
 			}, (props) => {
 				const useSessions = props?.useSessions;
 				if (useSessions === void 0) return null;
-				return (0, react.createElement)(RecursiveBoardOverlay, { useSessions });
+				return (0, react.createElement)(RecursiveBoardOverlay, {
+					useSessions,
+					useWorkspaces: props?.useWorkspaces
+				});
 			})));
 			disposers.push(ctx.slots.inject("conversation.input.dock", () => ctx.slots.register({
 				name: "conversation.input.dock",
@@ -840,16 +868,16 @@ window.__ModuleLoader__.load({
 		* Run 10: consumes the full SessionListStateLike through the identity selector
 		* (useSessions((s) => s)); no fake {list:{getSnapshot}} wrapper.
 		*/
-		function RecursiveBoardOverlay({ useSessions }) {
+		function RecursiveBoardOverlay({ useSessions, useWorkspaces }) {
 			const board = useBoardState();
-			const list = useRecursiveSessions(useSessions);
-			const content = overlayContent(board, list);
+			const sessions = useRecursiveSessions(useSessions);
+			const workspaces = useWorkspaces !== void 0 ? useWorkspaces((s) => s) : {
+				items: [],
+				recentWorkspaceId: void 0
+			};
+			const content = overlayContent(board, sessions);
+			const snapshot = useLiveProjection({ cwd: currentWorkspacePath(workspaces, sessions) });
 			if (content === "hidden") return null;
-			const cwd = currentSessionCwd(list);
-			const snapshot = useLiveProjection({
-				sessionId: list.current,
-				cwd
-			});
 			if (content === "inspector" && board.selection !== null) return (0, react.createElement)(Inspector, {
 				runId: board.selection.runId,
 				worktreeRoot: board.selection.worktreeRoot,
@@ -869,11 +897,11 @@ window.__ModuleLoader__.load({
 		*/
 		function RecursiveStripGate({ useSessions, sessionId }) {
 			const list = useRecursiveSessions(useSessions);
-			if (!isRecursivePreset(list)) return null;
 			const snapshot = useLiveProjection({
 				sessionId,
 				cwd: currentSessionCwd(list)
 			});
+			if (!isRecursivePreset(list)) return null;
 			return (0, react.createElement)(StatusStrip, { snapshot });
 		}
 		//#endregion
@@ -910,6 +938,7 @@ window.__ModuleLoader__.load({
 		exports.StatusStrip = StatusStrip;
 		exports.apply = apply;
 		exports.currentSessionCwd = currentSessionCwd;
+		exports.currentWorkspacePath = currentWorkspacePath;
 		exports.fetchLiveState = fetchLiveState;
 		exports.inject = inject;
 		exports.isRecursivePreset = isRecursivePreset;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@try-works/dsh-recursive-mode",
   "description": "recursive-mode workflow as a DeepSeek Harness bundle: RecursiveRuntime service + recursive_status tool",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -45,10 +45,10 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.5",
-    "@deepseek-ai/dsh-system-prompt": "0.1.0-rc.5",
-    "@deepseek-ai/dsh-session-projection": "0.1.0-rc.5",
     "@deepseek-ai/dsh-session": "0.1.0-rc.5",
+    "@deepseek-ai/dsh-session-projection": "0.1.0-rc.5",
+    "@deepseek-ai/dsh-system-prompt": "0.1.0-rc.5",
+    "@deepseek-ai/dsh-tools": "0.1.0-rc.5",
     "react": "^18.2.0"
   },
   "devDependencies": {
@@ -71,7 +71,9 @@
     "@types/node": "^20.0.0",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
+    "@types/react-test-renderer": "18.3.0",
     "react": "^18.2.0",
+    "react-test-renderer": "18.3.1",
     "tsdown": "^0.22.2",
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",

package/src/client/contract.ts

@@ -101,3 +101,51 @@ export function isRecursivePreset(state: SessionListStateLike): boolean {
 export function currentSessionCwd(state: SessionListStateLike): string {
   return state.current === undefined ? '' : (state.byId[state.current]?.cwd ?? '')
 }
+
+/**
+ * A workspace row — the structural mirror of the REAL WorkspaceView the host
+ * injects. We consume only workspaceId/path/title/sessionIds.
+ */
+export interface WorkspaceViewLike {
+  workspaceId: string
+  path: string
+  title: string
+  sessionIds: string[]
+}
+
+/**
+ * The workspace-list snapshot — the structural subset of the REAL
+ * WorkspaceListState we consume (items + recentWorkspaceId). The real state
+ * also carries archivedSessionIds/state/phase/error/baselinesReady; those are
+ * irrelevant here and the real value satisfies this subset.
+ */
+export interface WorkspaceListStateLike {
+  items: readonly WorkspaceViewLike[]
+  recentWorkspaceId?: string
+}
+
+/**
+ * Resolve the CURRENT workspace path for a workspace-scoped board (run 14):
+ * the WORKSPACE owns the .recursive/ run-layer, not the session. Resolution:
+ *   1) recentWorkspaceId's item path (the workspace the user is viewing), else
+ *   2) the workspace whose sessionIds contains sessionList.current, else
+ *   3) the workspace whose path === currentSessionCwd(sessionList), else
+ *   4) '' (empty -> the route returns null root -> board renders nothing).
+ */
+export function currentWorkspacePath(list: WorkspaceListStateLike, sessionList: SessionListStateLike): string {
+  if (list.recentWorkspaceId !== undefined) {
+    const recent = list.items.find((w) => w.workspaceId === list.recentWorkspaceId)
+    if (recent !== undefined) return recent.path
+  }
+  const current = sessionList.current
+  if (current !== undefined) {
+    const bySession = list.items.find((w) => w.sessionIds.includes(current))
+    if (bySession !== undefined) return bySession.path
+  }
+  const cwd = currentSessionCwd(sessionList)
+  if (cwd !== '') {
+    const byCwd = list.items.find((w) => w.path === cwd)
+    if (byCwd !== undefined) return byCwd.path
+  }
+  return ''
+}

package/src/client/index.ts

@@ -23,8 +23,8 @@ export { useLiveProjection } from './use-live.ts'
 export type { LiveProjectionSnapshot } from './use-live.ts'
 export { fetchLiveState, subscribeLiveEvents } from './host-api.ts'
 export type { LiveRecursiveState, LiveRecursiveFrame, LiveScope } from './host-api.ts'
-export { isRecursivePreset, currentSessionCwd } from './contract.ts'
-export type { SessionSummaryRow, SessionListStateLike, SnapshotSelectorHook, ClientContext } from './contract.ts'
+export { isRecursivePreset, currentSessionCwd, currentWorkspacePath } from './contract.ts'
+export type { SessionSummaryRow, SessionListStateLike, SnapshotSelectorHook, WorkspaceViewLike, WorkspaceListStateLike, ClientContext } from './contract.ts'
 
 /** Required services (fiber inject waiting — the runtime must be up first). */
 export const inject = ['slots', 'sessions', 'workspaces', 'connection']

package/src/client/slots.ts

@@ -17,8 +17,8 @@
  * READ-ONLY (R9): the client only GETs the live host route; no mutation.
  */
 import { createElement, type ReactNode } from 'react'
-import type { ClientContext, SessionListStateLike, SnapshotSelectorHook } from './contract.ts'
-import { isRecursivePreset, currentSessionCwd } from './contract.ts'
+import type { ClientContext, SessionListStateLike, SnapshotSelectorHook, WorkspaceListStateLike } from './contract.ts'
+import { isRecursivePreset, currentSessionCwd, currentWorkspacePath } from './contract.ts'
 import { Board } from './board.tsx'
 import { Inspector } from './inspector.tsx'
 import { StatusStrip } from './strip.tsx'
@@ -29,7 +29,7 @@ import { boardState, useBoardState } from './open-state.ts'
 /** Structural standard-prop face for the root scope (useSessions/useWorkspaces). */
 interface RootSlotProps {
   useSessions?: SnapshotSelectorHook<SessionListStateLike>
-  useWorkspaces?: SnapshotSelectorHook<unknown>
+  useWorkspaces?: SnapshotSelectorHook<WorkspaceListStateLike>
 }
 
 /** Structural standard-prop face for the session scope (sessionId + useSessions). */
@@ -97,7 +97,7 @@ export function registerSlots(ctx: ClientContext): () => void {
   }, (props: RootSlotProps) => {
     const useSessions = props?.useSessions
     if (useSessions === undefined) return null
-    return createElement(RecursiveBoardOverlay, { useSessions })
+    return createElement(RecursiveBoardOverlay, { useSessions, useWorkspaces: props?.useWorkspaces })
   })))
 
   // Status strip in the composer input dock (session scope) — gated the same way.
@@ -129,14 +129,22 @@ export function registerSlots(ctx: ClientContext): () => void {
  * Run 10: consumes the full SessionListStateLike through the identity selector
  * (useSessions((s) => s)); no fake {list:{getSnapshot}} wrapper.
  */
-function RecursiveBoardOverlay({ useSessions }: { useSessions: SnapshotSelectorHook<SessionListStateLike> }): ReactNode {
+export function RecursiveBoardOverlay({ useSessions, useWorkspaces }: { useSessions: SnapshotSelectorHook<SessionListStateLike>; useWorkspaces?: SnapshotSelectorHook<WorkspaceListStateLike> }): ReactNode {
   const board = useBoardState()
-  const list = useRecursiveSessions(useSessions)
-  const content = overlayContent(board, list)
-  if (content === 'hidden') return null
-  const cwd = currentSessionCwd(list)
-  const scope = { sessionId: list.current, cwd }
+  const sessions = useRecursiveSessions(useSessions)
+  // Run 14 (USER-DIRECTED): the board keys on the WORKSPACE, not the session —
+  // the workspace owns the .recursive/ run-layer history. Hoist ALL hooks first.
+  const workspaces: WorkspaceListStateLike = useWorkspaces !== undefined
+    ? useWorkspaces((s) => s)
+    : { items: [], recentWorkspaceId: undefined }
+  const content = overlayContent(board, sessions)
+  const wsPath = currentWorkspacePath(workspaces, sessions)
+  const scope = { cwd: wsPath }
+  // Run 13 (LIVE BUG): ALWAYS call useLiveProjection — a conditional hook (after the
+  // hidden early return) changed the hook count across renders and threw
+  // 'Rendered more hooks than during the previous render'.
   const snapshot = useLiveProjection(scope)
+  if (content === 'hidden') return null
   if (content === 'inspector' && board.selection !== null) {
     return createElement(Inspector, {
       runId: board.selection.runId,
@@ -153,12 +161,13 @@ function RecursiveBoardOverlay({ useSessions }: { useSessions: SnapshotSelectorH
  * Strip gate: same preset gate, session-scoped sessionId; the strip renders
  * nothing for a non-recursive session. Run 10: useSessions((s) => s) selector.
  */
-function RecursiveStripGate({ useSessions, sessionId }: { useSessions: SnapshotSelectorHook<SessionListStateLike>; sessionId?: string }): ReactNode {
+export function RecursiveStripGate({ useSessions, sessionId }: { useSessions: SnapshotSelectorHook<SessionListStateLike>; sessionId?: string }): ReactNode {
   const list = useRecursiveSessions(useSessions)
-  if (!isRecursivePreset(list)) return null
   const cwd = currentSessionCwd(list)
   const scope = { sessionId, cwd }
+  // Run 13: ALWAYS call useLiveProjection BEFORE the preset early return.
   const snapshot = useLiveProjection(scope)
+  if (!isRecursivePreset(list)) return null
   return createElement(StatusStrip, { snapshot })
 }