@chatcode/cco-better-sidebar 0.18.0-alpha.1 → 0.18.0-alpha.2

package/lib/types/client/chatcode-login-route.d.ts

@@ -0,0 +1,4 @@
+/** Build the local ChatCode login gate URL while preserving the current page. */
+export declare function chatcodeLoginRoute(location: Pick<Location, 'pathname' | 'search' | 'hash'>): string;
+/** Enter the existing local login flow after account state cannot be read. */
+export declare function redirectToChatcodeLogin(location?: Location): void;

package/lib/types/client/current-session.d.ts

@@ -0,0 +1,11 @@
+import type { Context } from '../context-types.ts';
+/**
+ * Read the session selected by the host's scoped-session adapter.
+ *
+ * Newer hosts deliberately removed `sessions.list.current`: selection is UI
+ * scope state, not catalog state. The adapter is authoritative on both old
+ * and new hosts and tracks main-view retain/release transitions.
+ */
+export declare function currentSessionId(ctx: Context): string | undefined;
+/** React subscription to the same authoritative current-session source. */
+export declare function useCurrentSessionId(ctx: Context): string | undefined;

package/lib/types/context-types.d.ts

@@ -289,7 +289,8 @@ export interface SidebarSessionPersistenceService {
 }
 /** The client session list snapshot the sidebar subscribes to. */
 export interface SidebarSessionList {
-    current: string | undefined;
+    /** @deprecated Selection moved to `uiSession.adapter.current`; old hosts may still expose this field. */
+    current?: string;
     byId: Record<string, SidebarSessionSummary>;
     /** Direct durable catalogs keyed by their selected parent address. */
     subagentsByParent?: Readonly<Record<string, SidebarSubagentCatalog>>;
@@ -356,6 +357,17 @@ export interface SidebarSessionsService {
      */
     refreshSubagents?(parentSessionId: string): Promise<void>;
 }
+/** The host's authoritative current Session scope binding. */
+export interface SidebarUiSessionService {
+    adapter: {
+        current: {
+            getSnapshot(): {
+                readonly key: string | undefined;
+            };
+            subscribe(fn: () => void): () => void;
+        };
+    };
+}
 /**
  * The client locale service face (mirror of @deepseek-ai/dsh-client-locale's
  * LocaleRuntime — only the slices the sidebar touches). The sidebar follows
@@ -475,6 +487,8 @@ export interface SidebarContextShape {
     webServer: SidebarWebServer;
     /** The session store (host `.get`) and the client list feed (`.list`) faces. */
     sessions: SidebarSessionStore & SidebarSessionsService;
+    /** Current UI Session scope; selection no longer belongs to the Session list catalog. */
+    uiSession: SidebarUiSessionService;
     /** The web runtime trust list (bind-derived). */
     webRuntime: SidebarWebRuntime;
     /** The client slot registry (register/inject). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatcode/cco-better-sidebar",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-alpha.2",
   "description": "ChatCode CLI Web plugin: a VS Code-like right sidebar (explorer / editor / terminal / git / browser), isolated per conversation session. Exposes a service for other plugins to register sidebar tabs and file viewers.",
   "type": "module",
   "repository": {

package/src/client/AccountMenu.tsx

@@ -10,6 +10,7 @@
 import { useEffect, useRef, useState } from 'react'
 import { api } from './api.ts'
 import { useChatcodeAccount } from './useChatcodeAccount.ts'
+import { redirectToChatcodeLogin } from './chatcode-login-route.ts'
 import { t } from './locales.ts'
 import css from './sidebar.module.css'
 
@@ -93,6 +94,10 @@ export function AccountMenu(): JSX.Element {
     return () => { document.removeEventListener('pointerdown', onPointerDown) }
   }, [])
 
+  useEffect(() => {
+    if (error === 'status') redirectToChatcodeLogin()
+  }, [error])
+
   // The host has no slot for replacing this one closed-shell control. Keep
   // the original fully recoverable: its inline style is restored on disposal
   // and it remains the target invoked by our Settings menu item.
@@ -127,7 +132,8 @@ export function AccountMenu(): JSX.Element {
   const signedIn = chatcode?.validation === 'valid' && chatcode.expired !== true
   // A saved credential remains usable for the next check when the company
   // network is unavailable. Do not turn that transient state into a login CTA.
-  const canStartChatcodeLogin = chatcode?.available === true && !signedIn
+  const hasChatcodeAccount = chatcode?.available === true && chatcode.configured === true
+  const canStartChatcodeLogin = chatcode?.available === true && !hasChatcodeAccount
     && !(chatcode.configured === true && chatcode.validation === 'unavailable')
 
   return (
@@ -144,15 +150,15 @@ export function AccountMenu(): JSX.Element {
             <SettingsIcon />
             {t('accountMenuSettings')}
           </button>
-          {error && <div role="alert" className={css.accountItem}>{t(error === 'status' ? 'accountMenuChatcodeStatusError' : 'accountMenuChatcodeError')}</div>}
+          {error === 'operation' && <div role="alert" className={css.accountItem}>{t('accountMenuChatcodeError')}</div>}
           {(chatcode?.login?.state === 'failed' || chatcode?.login?.state === 'timed-out') && <div role="alert" className={css.accountItem}>{t('accountMenuChatcodeRetry')}</div>}
           {loginUrl && <a data-dsh-external="true" className={css.accountItem} href={loginUrl} target="_blank" rel="noopener noreferrer" onClick={event => { event.stopPropagation() }}>{t('accountMenuChatcodeOpen')}</a>}
           {chatcode?.available === true && <>
             {canStartChatcodeLogin && <button type="button" role="menuitem" className={css.accountItem} disabled={busy} onClick={startLogin}>
               <LogoutIcon />{busy ? t('accountMenuChatcodeStarting') : t('accountMenuChatcodeLogin')}
             </button>}
-            {chatcode.configured && <button type="button" role="menuitem" className={css.accountItem} disabled={busy} onClick={logoutChatcode}>
-              <LogoutIcon />{t('accountMenuChatcodeLogout')}
+            {hasChatcodeAccount && <button type="button" role="menuitem" className={css.accountItem} disabled={busy} onClick={logoutChatcode}>
+              <LogoutIcon />{t('accountMenuLogout')}
             </button>}
           </>}
           {chatcode?.available === false && <button type="button" role="menuitem" className={css.accountItem} onClick={logout}>

package/src/client/ChatcodeGate.tsx

@@ -2,6 +2,7 @@
 import { useEffect, useRef } from 'react'
 import type { ChatCodeAuthState } from './api.ts'
 import { useChatcodeAccount } from './useChatcodeAccount.ts'
+import { redirectToChatcodeLogin } from './chatcode-login-route.ts'
 
 type GateDecision = 'allow' | 'login' | 'wait'
 
@@ -28,8 +29,7 @@ export function ChatcodeGate(): JSX.Element | null {
     // this visit has passed that check, a later company-network outage does
     // not interrupt ongoing work.
     if (chatcodeGateDecision(chatcode, verifiedThisVisit.current) !== 'login') return
-    const back = `${window.location.pathname}${window.location.search}${window.location.hash}`
-    window.location.replace(`/sidebar/login?return=${encodeURIComponent(back)}`)
+    redirectToChatcodeLogin()
   }, [chatcode])
   return null
 }

package/src/client/Sidebar.tsx

@@ -64,6 +64,7 @@ import { OrphanedTab } from './OrphanedTab.tsx'
 import { RenderBoundary } from './RenderBoundary.tsx'
 import { tabContentCompare, type TabContentMemoKey } from './tab-content-memo.ts'
 import { t } from './locales.ts'
+import { useCurrentSessionId } from './current-session.ts'
 import { api, type SessionScope } from './api.ts'
 import { AccountMenu } from './AccountMenu.tsx'
 import css from './sidebar.module.css'
@@ -322,7 +323,7 @@ export function Sidebar(props: { ctx: Context; store: SidebarStore }) {
     useMemo(() => (callback: () => void) => ctx.sessions.list.subscribe(callback), [ctx]),
     useCallback(() => ctx.sessions.list.getSnapshot(), [ctx]),
   )
-  const current = sessionList.current
+  const current = useCurrentSessionId(ctx)
 
   // Per-session sidebar state.
   const snapshot = useSyncExternalStore(
@@ -1385,6 +1386,7 @@ export function Sidebar(props: { ctx: Context; store: SidebarStore }) {
     // focus is the only way the existing Tooltip can explain what is missing.
     return (
       <div data-dsh-panel-host {...osFileDragShield}>
+        <AccountMenu />
         {nativeToolbarHost !== null ? createPortal(
           <div className={clsx(css.toggleCluster, css.toggleClusterNative)} data-dsh-toggle-cluster data-dsh-native-toolbar-cluster>
             {!narrow && (

package/src/client/chatcode-login-route.ts

@@ -0,0 +1,11 @@
+/** Build the local ChatCode login gate URL while preserving the current page. */
+export function chatcodeLoginRoute(location: Pick<Location, 'pathname' | 'search' | 'hash'>): string {
+  const back = `${location.pathname}${location.search}${location.hash}`
+  return `/sidebar/login?return=${encodeURIComponent(back)}`
+}
+
+/** Enter the existing local login flow after account state cannot be read. */
+export function redirectToChatcodeLogin(location: Location = window.location): void {
+  if (location.pathname === '/sidebar/login') return
+  location.replace(chatcodeLoginRoute(location))
+}

package/src/client/current-session.ts

@@ -0,0 +1,22 @@
+import { useCallback, useSyncExternalStore } from 'react'
+import type { Context } from '../context-types.ts'
+
+/**
+ * Read the session selected by the host's scoped-session adapter.
+ *
+ * Newer hosts deliberately removed `sessions.list.current`: selection is UI
+ * scope state, not catalog state. The adapter is authoritative on both old
+ * and new hosts and tracks main-view retain/release transitions.
+ */
+export function currentSessionId(ctx: Context): string | undefined {
+  return ctx.uiSession.adapter.current.getSnapshot().key
+}
+
+/** React subscription to the same authoritative current-session source. */
+export function useCurrentSessionId(ctx: Context): string | undefined {
+  const source = ctx.uiSession.adapter.current
+  return useSyncExternalStore(
+    useCallback(listener => source.subscribe(listener), [source]),
+    useCallback(() => source.getSnapshot().key, [source]),
+  )
+}

package/src/client/index.tsx

@@ -43,7 +43,7 @@ import { apply as applyUiTweaksClient } from './ui-tweaks/index.tsx'
  *  locale service backs the sidebar's copy — see locales.ts). `modules`
  *  (rc.8+) is the client module system the chunk loader resolves its
  *  externals through — Cordis guards service access without inject. */
-export const inject = ['slots', 'sessions', 'workspaces', 'locale', 'modules', 'commandUi', 'conversation']
+export const inject = ['slots', 'sessions', 'uiSession', 'workspaces', 'locale', 'modules', 'commandUi', 'conversation']
 
 /**
  * Error boundary over the sidebar tree (root scope): a render error in the

package/src/client/intercept.tsx

@@ -11,6 +11,7 @@ import { firstLeaf, revealPaths, togglePanel, type SidebarStore } from './state.
 import { t } from './locales.ts'
 import { resolveSidebarPath, selectProducedFiles } from './produced-files.ts'
 import { wrapOpenPath } from './openpath-intercept.ts'
+import { currentSessionId } from './current-session.ts'
 import css from './sidebar.module.css'
 
 /** Open a file in the sidebar's editor (used by the intercepted row and the explorer). */
@@ -190,7 +191,7 @@ export function registerOpenPathInterception(ctx: Context, store: SidebarStore):
     takeoverEnabled: () => !store.getSuspended()
       && store.getPrefs().interceptOpenPath !== false
       && store.getPrefs().tabsEnabled['editor'] !== false,
-    currentSessionId: () => ctx.sessions.list.getSnapshot().current,
+    currentSessionId: () => currentSessionId(ctx),
     openInSidebar: (path, sessionId) => { openSidebarFile(ctx, store, sessionId, path) },
     revealInExplorer: (_path, sessionId) => { revealInExplorer(ctx, store, sessionId, lastProduced) },
   })

package/src/client/session-pins.tsx

@@ -16,6 +16,7 @@ import { parsePrefs } from './prefs.ts'
 import { t } from './locales.ts'
 import { IconPinOutline16 } from './icons.tsx'
 import css from './sidebar.module.css'
+import { useCurrentSessionId } from './current-session.ts'
 
 const PIN_SETTINGS_KEY = 'session-pins'
 
@@ -221,6 +222,7 @@ function PinnedSessions({ ctx, store, onChange }: {
   onChange: (ids: readonly string[]) => void
 }) {
   const list = useSyncExternalStore(ctx.sessions.list.subscribe, ctx.sessions.list.getSnapshot, ctx.sessions.list.getSnapshot)
+  const currentSessionId = useCurrentSessionId(ctx)
   const prefs = useSyncExternalStore(store.subscribe.bind(store), store.getSnapshot.bind(store), store.getSnapshot.bind(store)).prefs
   const ids = pinnedSessionIdsOf(prefs)
   const pinKey = ids.join('\0')
@@ -290,7 +292,7 @@ function PinnedSessions({ ctx, store, onChange }: {
             <button
               type="button"
               className={css.pinnedSessionOpen}
-              aria-current={session.id === list.current ? 'page' : undefined}
+              aria-current={session.id === currentSessionId ? 'page' : undefined}
               onClick={() => { ctx.sessions.open?.(session.id) }}
             >
               <span className={css.pinnedSessionDot} data-running={session.running || undefined} aria-hidden="true" />

package/src/context-types.ts

@@ -306,7 +306,8 @@ export interface SidebarSessionPersistenceService {
 
 /** The client session list snapshot the sidebar subscribes to. */
 export interface SidebarSessionList {
-  current: string | undefined
+  /** @deprecated Selection moved to `uiSession.adapter.current`; old hosts may still expose this field. */
+  current?: string
   byId: Record<string, SidebarSessionSummary>
   /** Direct durable catalogs keyed by their selected parent address. */
   subagentsByParent?: Readonly<Record<string, SidebarSubagentCatalog>>
@@ -371,6 +372,16 @@ export interface SidebarSessionsService {
   refreshSubagents?(parentSessionId: string): Promise<void>
 }
 
+/** The host's authoritative current Session scope binding. */
+export interface SidebarUiSessionService {
+  adapter: {
+    current: {
+      getSnapshot(): { readonly key: string | undefined }
+      subscribe(fn: () => void): () => void
+    }
+  }
+}
+
 /**
  * The client locale service face (mirror of @deepseek-ai/dsh-client-locale's
  * LocaleRuntime — only the slices the sidebar touches). The sidebar follows
@@ -494,6 +505,8 @@ export interface SidebarContextShape {
   webServer: SidebarWebServer
   /** The session store (host `.get`) and the client list feed (`.list`) faces. */
   sessions: SidebarSessionStore & SidebarSessionsService
+  /** Current UI Session scope; selection no longer belongs to the Session list catalog. */
+  uiSession: SidebarUiSessionService
   /** The web runtime trust list (bind-derived). */
   webRuntime: SidebarWebRuntime
   /** The client slot registry (register/inject). */