@huanlin/dsh-plugin-ya-workspace-sidebar 0.8.0 → 0.8.1

package/lib/types/client/contract.d.ts

@@ -71,10 +71,16 @@ export type SidebarInjected = DirectoryInjected & {
         cwd?: string;
     }) => Promise<SessionPaths>;
     revealInExplorer: (cwd: string) => Promise<void>;
+    /** Current main-view Session (dsh 0.1.7-rc.1: owned by the uiWorkspace service). */
+    hooks: {
+        currentSession: HostObservable<SessionId | undefined>;
+    };
 };
 /** Full sidebar component props. */
 export type SidebarProps = PropsRuntime<'sidebar.workspaces'> & PropsRenderSlots<'sidebar.workspaces.directoryFlow'> & Omit<SidebarInjected, 'hooks'> & {
     useDirectoryFlow: SnapshotSelectorHook<boolean>;
+} & {
+    useCurrentSession: SnapshotSelectorHook<SessionId | undefined>;
 } & PropsLocale<'ya-workspace-sidebar'>;
 /** Conversation hero picker operations. */
 export type PickerInjected = DirectoryInjected & {

package/lib/types/client/model.d.ts

@@ -4,12 +4,24 @@ import type { WorkspaceId, WorkspaceView } from '@deepseek-ai/dsh-api-workspace-
 import type { SessionId } from '@deepseek-ai/dsh-session/types';
 /** Pending-interaction kinds surfaced as a row status dot. */
 export type PendingInteractionKind = 'approval' | 'plan-review' | 'question';
-/** Renderer-visible view of ui-session's pending-interaction snapshot entries. */
+/** Renderer-visible view of ui-session's unified Session status entries. */
 export type PendingInteractionEntry = {
-    readonly kind: string;
+    readonly pendingInteraction?: {
+        readonly kind: string;
+    };
+    /** dsh 0.1.7's ui-session status: an unread completion awaiting acknowledgement. */
+    readonly completionUnread?: boolean;
 };
 /** Pending-interaction snapshot consumed by the derive functions. */
 export type PendingInteractionMap = ReadonlyMap<SessionId, PendingInteractionEntry>;
+/**
+ * Session Controller list plus the selection the sidebar filters/highlights
+ * against. dsh 0.1.7-rc.1 moved the selection out of `SessionListState` into
+ * the `uiWorkspace` service; callers merge it back in for these projections.
+ */
+export type SessionListView = SessionListState & {
+    current?: SessionId;
+};
 /** Navigation key for sessions not accounted to a real workspace. */
 export declare const UNGROUPED: "__ya_ungrouped__";
 /** One sidebar session row. */
@@ -52,7 +64,7 @@ export interface WorkspaceRow {
 /** Resolve the first/second-level destination for one session. */
 export declare function workspaceKeyForSession(sessionId: SessionId | undefined, workspaces: readonly WorkspaceView[]): WorkspaceId | typeof UNGROUPED | null;
 /** Derive global recent sessions, newest first. */
-export declare function deriveRecent(list: SessionListState, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[], pending: PendingInteractionMap, limit?: number): SessionRow[];
+export declare function deriveRecent(list: SessionListView, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[], pending: PendingInteractionMap, limit?: number): SessionRow[];
 /** Lift pinned rows (in pinned order) to the front; the rest keep their order. */
 export declare function applyPinned(rows: readonly SessionRow[], pinnedOrder: readonly SessionId[]): SessionRow[];
 /** Split date-grouped rows into a leading pinned list (pinned order) and the remaining groups (emptied groups dropped). */
@@ -77,9 +89,9 @@ export interface VirtualWindow {
  */
 export declare function virtualWindow(scrollTop: number, viewportHeight: number, count: number, stride?: number, overscan?: number): VirtualWindow;
 /** Derive first-level workspaces plus Ungrouped, newest session activity first. */
-export declare function deriveWorkspaces(list: SessionListState, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[]): WorkspaceRow[];
+export declare function deriveWorkspaces(list: SessionListView, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[]): WorkspaceRow[];
 /** Derive the selected workspace's sessions in its canonical order. */
-export declare function deriveWorkspaceSessions(key: WorkspaceId | typeof UNGROUPED, list: SessionListState, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[], pending: PendingInteractionMap): SessionRow[];
+export declare function deriveWorkspaceSessions(key: WorkspaceId | typeof UNGROUPED, list: SessionListView, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[], pending: PendingInteractionMap): SessionRow[];
 /**
  * Derive the selected real workspace's sessions grouped by local calendar date.
  *
@@ -89,7 +101,7 @@ export declare function deriveWorkspaceSessions(key: WorkspaceId | typeof UNGROU
  * - Future timestamps clamp to today's bucket (`dayOffset` 0).
  * - `now` is the reference timestamp for "today"; pass `Date.now()` in production.
  */
-export declare function deriveWorkspaceSessionGroups(key: WorkspaceId | typeof UNGROUPED, list: SessionListState, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[], pending: PendingInteractionMap, now: number): SessionDateGroup[];
+export declare function deriveWorkspaceSessionGroups(key: WorkspaceId | typeof UNGROUPED, list: SessionListView, workspaces: readonly WorkspaceView[], archivedSessionIds: readonly SessionId[], pending: PendingInteractionMap, now: number): SessionDateGroup[];
 /** Group root workspace rows by local calendar date of `lastUsedAt`; undated rows trail with empty `dateKey`. */
 export declare function deriveWorkspaceGroups(rows: readonly WorkspaceRow[], now: number): WorkspaceDateGroup[];
 /** Case-insensitive local title/workspace matching used beside Host content search. */

package/lib/types/client/navigation.d.ts

@@ -9,13 +9,24 @@
  * pre-split client runtime: reuse-or-create Workspace connection, the
  * explicit/current/recent New Session fallback, archived-current clearing,
  * boot auto-selection, and the directory-picking wire calls.
+ *
+ * dsh 0.1.7-rc.1 moved the Session selection out of the Session Controller
+ * (`SessionListState.current` / `ISessions.open` / `ISessions.clear` are gone)
+ * into this service: a retained `mainReference` plus a persisted selection
+ * store (`dsh.sessions.current`). This port mirrors the shipped
+ * `UiWorkspaceService` selection mechanics.
  */
 import { Service, type Context } from '@deepseek-ai/cordis';
-import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client';
+import type { ISessions, SessionTarget } from '@deepseek-ai/dsh-api-session-controller/client';
 import type { ClientRemote, DirectoryListing } from '@deepseek-ai/dsh-api-remotes/client';
 import type { IWorkspaces, WorkspaceId } from '@deepseek-ai/dsh-api-workspace-controller/client';
 import type { UiWorkspace } from '@deepseek-ai/dsh-client-ui-workspace/client';
 import type { SessionId } from '@deepseek-ai/dsh-session/types';
+/** One persisted selection: the current Session and its optional subagent address. */
+export interface SessionSelection {
+    readonly sessionId?: SessionId;
+    readonly subagentAddress?: SessionTarget;
+}
 /** Implements Workspace navigation and directory UI operations. */
 export declare class YaWorkspaceNavigation extends Service implements UiWorkspace {
     private readonly directoryPicker;
@@ -23,6 +34,8 @@ export declare class YaWorkspaceNavigation extends Service implements UiWorkspac
     private readonly sessions;
     private readonly connecting;
     private readonly lifetime;
+    private readonly selection;
+    private mainReference;
     /**
      * @param ctx - Client root Context.
      * @param directoryPicker - the directory-picking Remote namespace.
@@ -30,16 +43,30 @@ export declare class YaWorkspaceNavigation extends Service implements UiWorkspac
      * @param sessions - pure Session Controller.
      */
     constructor(ctx: Context, directoryPicker: ClientRemote['directoryPicker'], workspaces: IWorkspaces, sessions: ISessions);
+    /** The Session currently shown in the main view, or undefined. */
+    get currentSessionId(): SessionId | undefined;
+    /** Observe the current selection (the sidebar's blank-row filter and highlight). */
+    subscribeSelection(listener: () => void): () => void;
     connectWorkspace(workspaceId: WorkspaceId): Promise<SessionId>;
-    openSession(sessionId: SessionId): void;
+    private reuseOrCreateBlank;
+    private reuseBlank;
+    openSession(target: SessionTarget): void;
     openWorkspace(workspaceId: WorkspaceId, beforeOpen?: (sessionId: SessionId) => void): Promise<void>;
     forkSession(sessionId: SessionId): Promise<void>;
     startSession(workspaceId?: WorkspaceId): void;
-    archiveSession(sessionId: SessionId): Promise<void>;
+    archiveSession(sessionId: SessionId, options?: {
+        readonly stopActivity?: boolean;
+    }): Promise<void>;
+    unarchiveSession(sessionId: SessionId): Promise<void>;
+    pinSession(sessionId: SessionId): Promise<void>;
+    unpinSession(sessionId: SessionId): Promise<void>;
     pickDirectory(): Promise<string | null>;
     listDirectory(path?: string, signal?: AbortSignal): Promise<DirectoryListing>;
     createDirectory(path: string, name: string): Promise<string>;
     private watchNavigation;
+    private restoreSelection;
     /** @returns true when an archived current selection was cleared. */
     private clearArchivedCurrent;
+    private clearMain;
+    private replaceMain;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huanlin/dsh-plugin-ya-workspace-sidebar",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "publishConfig": {
     "access": "public"
   },
@@ -50,21 +50,22 @@
     }
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-api-workspace-controller": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-layout": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-session": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-workspace": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-typert-protocol": "^0.1.5-rc.1",
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-api-workspace-controller": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-store": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-layout": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-session": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-workspace": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-session": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "^0.1.7-rc.1",
     "react": "^18.2.0"
   },
   "peerDependenciesMeta": {
@@ -83,6 +84,9 @@
     "@deepseek-ai/dsh-client-locale": {
       "optional": true
     },
+    "@deepseek-ai/dsh-client-store": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-client-ui-conversation": {
       "optional": true
     },
@@ -124,6 +128,7 @@
     "@deepseek-ai/dsh-api-session-controller": "link:D:/Projects/deepseek-harness/dsh/packages/api/session-controller",
     "@deepseek-ai/dsh-api-workspace-controller": "link:D:/Projects/deepseek-harness/dsh/packages/api/workspace-controller",
     "@deepseek-ai/dsh-client-locale": "link:D:/Projects/deepseek-harness/dsh/packages/client/locale",
+    "@deepseek-ai/dsh-client-store": "link:D:/Projects/deepseek-harness/dsh/packages/client/store",
     "@deepseek-ai/dsh-client-ui-conversation": "link:D:/Projects/deepseek-harness/dsh/packages/client/ui-conversation",
     "@deepseek-ai/dsh-client-ui-layout": "link:D:/Projects/deepseek-harness/dsh/packages/client/ui-layout",
     "@deepseek-ai/dsh-client-ui-primitives": "link:D:/Projects/deepseek-harness/dsh/packages/client/ui-primitives",