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

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/client/session-pins.d.ts

@@ -4,6 +4,8 @@ import type { SidebarStore } from './state.ts';
 export declare function pinnedSessionIdsOf(value: {
     pluginSettings: Record<string, Record<string, unknown>>;
 }): string[];
+/** Open through the Host's navigation policy, not the pure Session catalog. */
+export declare function openPinnedSession(ctx: Context, sessionId: string): void;
 /**
  * Mount the separate pinned group and append a fourth item to DSH's native
  * three-item row menu. The group is inserted beside (not inside) the host

package/lib/types/client/settings-nav-icon.d.ts

@@ -15,6 +15,11 @@ export declare const USAGE_NAV_MARKER = "data-dsh-better-sidebar-usage-nav";
 export declare const AI_RATIO_NAV_MARKER = "data-dsh-better-sidebar-ai-ratio-nav";
 /** Marker of the "更新" (update) settings nav row. */
 export declare const UPDATE_NAV_MARKER = "data-dsh-better-sidebar-update-nav";
+/** Fallback markers for host/plugin settings rows whose icons mount late. */
+export declare const GENERAL_NAV_MARKER = "data-dsh-better-sidebar-general-nav";
+export declare const PLUGIN_MARKET_NAV_MARKER = "data-dsh-better-sidebar-plugin-market-nav";
+export declare const UI_TWEAKS_NAV_MARKER = "data-dsh-better-sidebar-ui-tweaks-nav";
+export declare const SKILL_MARKET_NAV_MARKER = "data-dsh-better-sidebar-skill-market-nav";
 /**
  * Keep the marker on the settings-nav button whose visible text is this
  * plugin's current localized section label.
@@ -24,4 +29,4 @@ export declare const UPDATE_NAV_MARKER = "data-dsh-better-sidebar-update-nav";
  *  other's markers).
  * @returns disposer that disconnects observation and removes owned markers.
  */
-export declare function registerSettingsNavIcon(label: () => string, marker?: string): () => void;
+export declare function registerSettingsNavIcon(label: () => string | readonly string[], marker?: string): () => void;

package/lib/types/client/ui-tweaks/branding.d.ts

@@ -40,6 +40,6 @@ export declare function SidebarProjectLogo({ size }: {
 }): ReactNode;
 /** Expanded-sidebar wordmark supplied through the host's dedicated slot. */
 export declare function SidebarProjectName(): ReactNode;
-export declare const BRANDING_CSS = "\n/* Keep the light-theme type hierarchy in ChatCode's restrained red family,\n   while leaving every surface and interaction state (including workspace /\n   sidebar hover and selected fills, menus, the composer and shadows) owned\n   by the host theme. */\nbody:not([data-ds-dark-theme]){\n  --dsw-alias-label-primary:#301111;\n  --dsw-alias-label-secondary:#754745;\n  --dsw-alias-label-tertiary:#a77471;\n}\n/* Saturated brand red remains exclusive to explicitly marked primary actions. */\nbody:not([data-ds-dark-theme]) .dut-unicom-primary-action{background:linear-gradient(135deg,#9B0B09,#b71916) !important;border-color:#9B0B09 !important;color:#fff !important;box-shadow:0 7px 18px rgba(155,11,9,.24) !important}\nbody:not([data-ds-dark-theme]) .dut-unicom-primary-action:hover{background:linear-gradient(135deg,#b71916,#cf302c) !important;border-color:#b71916 !important;color:#fff !important;box-shadow:0 10px 24px rgba(155,11,9,.30) !important}\nbody:not([data-ds-dark-theme]) .dut-unicom-primary-action:active{transform:translateY(1px);box-shadow:0 4px 11px rgba(155,11,9,.22) !important}\n/* In dark mode, alter only the resting background of primary buttons.  Once\n   hovered, the host owns the complete interaction treatment again. */\nbody[data-ds-dark-theme] .dut-unicom-primary-action:not(:hover){background:#9B0B09 !important}\n.dut-project-logo{display:block;object-fit:contain}\n.dut-left-logo{width:44px !important;height:44px !important}\n.dut-brand-title{font-size:18px !important;font-weight:600 !important}\n.dut-sidebar-logo{width:44px !important;height:44px !important}\n/* The alpha sidebar keeps its slotted identity at 24px and clips the brand\n   button. Give only our expanded identity the full artwork height so the\n   44px knot is not cropped by that host-owned overflow boundary. */\n[class*=\"brandIdentity\"]:has(.dut-sidebar-logo){height:44px !important}\n.dut-sidebar-brand-name{font-size:18px !important;line-height:22px !important;font-weight:600 !important;letter-spacing:0 !important;white-space:nowrap}\n.dut-brand-version{display:none !important}\n.dut-hero-preview{display:none !important}\n.dut-hero-logo{width:60px !important;height:60px !important}\n[class*=\"headline\"]:has(.dut-hero-logo){grid-template-columns:60px auto !important;font-size:26px !important;line-height:34px !important}\n.dut-settings-logo{width:19px;height:19px;object-fit:contain}\n";
+export declare const BRANDING_CSS = "\n/* ChatCode CLI branding is deliberately limited to primary actions.  Every\n   other surface and interaction state (including workspace/sidebar rows,\n   menus, the composer, text and shadows) remains owned by the host theme. */\nbody:not([data-ds-dark-theme]) .dut-unicom-primary-action{background:linear-gradient(135deg,#9B0B09,#b71916) !important;border-color:#9B0B09 !important;color:#fff !important;box-shadow:0 7px 18px rgba(155,11,9,.24) !important}\nbody:not([data-ds-dark-theme]) .dut-unicom-primary-action:hover{background:linear-gradient(135deg,#b71916,#cf302c) !important;border-color:#b71916 !important;color:#fff !important;box-shadow:0 10px 24px rgba(155,11,9,.30) !important}\nbody:not([data-ds-dark-theme]) .dut-unicom-primary-action:active{transform:translateY(1px);box-shadow:0 4px 11px rgba(155,11,9,.22) !important}\n/* In dark mode, alter only the resting background of primary buttons.  Once\n   hovered, the host owns the complete interaction treatment again. */\nbody[data-ds-dark-theme] .dut-unicom-primary-action:not(:hover){background:#9B0B09 !important}\n.dut-project-logo{display:block;object-fit:contain}\n.dut-left-logo{width:44px !important;height:44px !important}\n.dut-brand-title{font-size:18px !important;font-weight:600 !important}\n.dut-sidebar-logo{width:44px !important;height:44px !important}\n/* The alpha sidebar keeps its slotted identity at 24px and clips the brand\n   button. Give only our expanded identity the full artwork height so the\n   44px knot is not cropped by that host-owned overflow boundary. */\n[class*=\"brandIdentity\"]:has(.dut-sidebar-logo){height:44px !important}\n.dut-sidebar-brand-name{font-size:18px !important;line-height:22px !important;font-weight:600 !important;letter-spacing:0 !important;white-space:nowrap}\n.dut-brand-version{display:none !important}\n.dut-hero-preview{display:none !important}\n.dut-hero-logo{width:60px !important;height:60px !important}\n.dut-hero-title{font-size:30px !important;line-height:40px !important;font-weight:600 !important;letter-spacing:.06em !important;white-space:nowrap}\n[class*=\"headline\"]:has(.dut-hero-logo){grid-template-columns:60px auto !important;font-size:30px !important;line-height:40px !important}\n.dut-settings-logo{width:19px;height:19px;object-fit:contain}\n";
 /** Install the brand theme and retain it across host navigation/rerenders. */
 export declare function installBranding(): () => void;

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>>;
@@ -306,11 +307,6 @@ export interface SidebarSessionsService {
         getSnapshot(): SidebarSessionList;
         subscribe(fn: () => void): () => void;
     };
-    /**
-     * Select a listed session as current (mirror of the runtime ISessions.open)
-     * — used to jump back to the main agent from the topology root node.
-     */
-    open?(id: string): void;
     /**
      * Fork a session from a completed-turn prefix of the source and resolve
      * the child session id (mirror of the runtime ISessions.fork — throws on
@@ -356,6 +352,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
@@ -401,6 +408,15 @@ export interface SidebarWorkspacesService {
     /** Open a filesystem path with the Host operating system's default application. */
     openPath(path: string): Promise<void>;
 }
+/**
+ * The client Workspace navigation face. Session selection is a UI navigation
+ * operation in current DSH builds: it retains the target for the main view,
+ * updates the scoped Session adapter, and reveals the conversation panel.
+ */
+export interface SidebarUiWorkspaceService {
+    /** Select a Session and show its Conversation, including persisted history. */
+    openSession(sessionId: string): void;
+}
 /**
  * The invariant service face (mirror of @deepseek-ai/dsh-invariants'
  * InvariantRegistry). The upstream augmentation does not reach this Context
@@ -475,12 +491,16 @@ 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). */
     slots: SidebarSlotsService;
     /** The client workspaces service face (file-open funnel). */
     workspaces: SidebarWorkspacesService;
+    /** The client Workspace navigation service (session-open funnel). */
+    uiWorkspace: SidebarUiWorkspaceService;
     /** The settings service face (prefs persistence + namespace reads). */
     settings: SidebarSettingsService;
     /** The invariant registry face. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatcode/cco-better-sidebar",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-alpha.3",
   "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

@@ -22,7 +22,16 @@ import { RenderBoundary } from './RenderBoundary.tsx'
 import { registerOpenPathInterception, registerTurnTailInterception } from './intercept.tsx'
 import { registerLinkInterception } from './link-intercept.ts'
 import { registerImeGuard } from './ime-guard.ts'
-import { AI_RATIO_NAV_MARKER, registerSettingsNavIcon, UPDATE_NAV_MARKER, USAGE_NAV_MARKER } from './settings-nav-icon.ts'
+import {
+  AI_RATIO_NAV_MARKER,
+  GENERAL_NAV_MARKER,
+  PLUGIN_MARKET_NAV_MARKER,
+  registerSettingsNavIcon,
+  SKILL_MARKET_NAV_MARKER,
+  UI_TWEAKS_NAV_MARKER,
+  UPDATE_NAV_MARKER,
+  USAGE_NAV_MARKER,
+} from './settings-nav-icon.ts'
 import { installSessionPins } from './session-pins.tsx'
 import { registerChatPresentationCompatibility } from './chat-presentation.ts'
 import { loadExternalDisable, loadPrefs } from './prefs.ts'
@@ -43,7 +52,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', 'uiWorkspace', 'workspaces', 'locale', 'modules', 'commandUi', 'conversation']
 
 /**
  * Error boundary over the sidebar tree (root scope): a render error in the
@@ -455,6 +464,22 @@ export function apply(ctx: Context): void {
       () => registerSettingsNavIcon(() => t('updateNav'), UPDATE_NAV_MARKER),
       'dsh-better-sidebar: update settings navigation icon',
     )
+    ctx.effect(
+      () => registerSettingsNavIcon(() => ['通用设置', 'General'], GENERAL_NAV_MARKER),
+      'dsh-better-sidebar: general settings navigation icon fallback',
+    )
+    ctx.effect(
+      () => registerSettingsNavIcon(() => ['插件市场', 'Plugin marketplace', 'Plugin Market'], PLUGIN_MARKET_NAV_MARKER),
+      'dsh-better-sidebar: plugin market navigation icon fallback',
+    )
+    ctx.effect(
+      () => registerSettingsNavIcon(() => ['界面调整', 'UI Tweaks'], UI_TWEAKS_NAV_MARKER),
+      'dsh-better-sidebar: UI tweaks navigation icon fallback',
+    )
+    ctx.effect(
+      () => registerSettingsNavIcon(() => ['技能市场', 'Skill marketplace', 'Skill Market'], SKILL_MARKET_NAV_MARKER),
+      'dsh-better-sidebar: skill market navigation icon fallback',
+    )
 
     // The "Side card" settings section: appears in the DSH Settings shell
     // once the shell's declaration is on the ledger (slots.inject waits for

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/layout.css

@@ -94,6 +94,48 @@ body[data-dsh-sidebar-dragging] #root :has(> [data-slot="conversation"]) {
   mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M2 7v10'/%3E%3Cpath d='M6 5v14'/%3E%3Crect width='12' height='18' x='10' y='3' rx='2'/%3E%3C/svg%3E") center / contain no-repeat;
 }
 
+/* Some host/plugin settings rows receive their SVG only after the global
+   plugin group is expanded. Paint stable fallbacks immediately so the nav
+   never opens with blank icon slots; a late host SVG is hidden to avoid a
+   duplicate. */
+[data-dsh-better-sidebar-general-nav] > svg:first-child,
+[data-dsh-better-sidebar-plugin-market-nav] > svg:first-child,
+[data-dsh-better-sidebar-ui-tweaks-nav] > svg:first-child,
+[data-dsh-better-sidebar-skill-market-nav] > svg:first-child {
+  display: none;
+}
+
+[data-dsh-better-sidebar-general-nav]::before,
+[data-dsh-better-sidebar-plugin-market-nav]::before,
+[data-dsh-better-sidebar-ui-tweaks-nav]::before,
+[data-dsh-better-sidebar-skill-market-nav]::before {
+  content: '';
+  flex: none;
+  width: 16px;
+  height: 16px;
+  background: currentColor;
+}
+
+[data-dsh-better-sidebar-general-nav]::before {
+  -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round'%3E%3Ccircle cx='12' cy='12' r='3'/%3E%3Cpath d='M12 2v3M12 19v3M2 12h3M19 12h3M4.9 4.9 7 7M17 17l2.1 2.1M19.1 4.9 17 7M7 17l-2.1 2.1'/%3E%3C/svg%3E") center / contain no-repeat;
+  mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round'%3E%3Ccircle cx='12' cy='12' r='3'/%3E%3Cpath d='M12 2v3M12 19v3M2 12h3M19 12h3M4.9 4.9 7 7M17 17l2.1 2.1M19.1 4.9 17 7M7 17l-2.1 2.1'/%3E%3C/svg%3E") center / contain no-repeat;
+}
+
+[data-dsh-better-sidebar-plugin-market-nav]::before {
+  -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linejoin='round'%3E%3Crect x='3' y='3' width='7' height='7' rx='1'/%3E%3Crect x='14' y='3' width='7' height='7' rx='1'/%3E%3Crect x='3' y='14' width='7' height='7' rx='1'/%3E%3Crect x='14' y='14' width='7' height='7' rx='1'/%3E%3C/svg%3E") center / contain no-repeat;
+  mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linejoin='round'%3E%3Crect x='3' y='3' width='7' height='7' rx='1'/%3E%3Crect x='14' y='3' width='7' height='7' rx='1'/%3E%3Crect x='3' y='14' width='7' height='7' rx='1'/%3E%3Crect x='14' y='14' width='7' height='7' rx='1'/%3E%3C/svg%3E") center / contain no-repeat;
+}
+
+[data-dsh-better-sidebar-ui-tweaks-nav]::before {
+  -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round'%3E%3Cpath d='M4 21v-7M4 10V3M12 21v-9M12 8V3M20 21v-5M20 12V3M1 14h6M9 8h6M17 16h6'/%3E%3C/svg%3E") center / contain no-repeat;
+  mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round'%3E%3Cpath d='M4 21v-7M4 10V3M12 21v-9M12 8V3M20 21v-5M20 12V3M1 14h6M9 8h6M17 16h6'/%3E%3C/svg%3E") center / contain no-repeat;
+}
+
+[data-dsh-better-sidebar-skill-market-nav]::before {
+  -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m12 3-1.7 4.3L6 9l4.3 1.7L12 15l1.7-4.3L18 9l-4.3-1.7Z'/%3E%3Cpath d='m5 15-.8 2.2L2 18l2.2.8L5 21l.8-2.2L8 18l-2.2-.8Z'/%3E%3Cpath d='m19 14-1 2.5-2.5 1L18 18.5l1 2.5 1-2.5 2.5-1-2.5-1Z'/%3E%3C/svg%3E") center / contain no-repeat;
+  mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m12 3-1.7 4.3L6 9l4.3 1.7L12 15l1.7-4.3L18 9l-4.3-1.7Z'/%3E%3Cpath d='m5 15-.8 2.2L2 18l2.2.8L5 21l.8-2.2L8 18l-2.2-.8Z'/%3E%3Cpath d='m19 14-1 2.5-2.5 1L18 18.5l1 2.5 1-2.5 2.5-1-2.5-1Z'/%3E%3C/svg%3E") center / contain no-repeat;
+}
+
 /* The "Token 用量" heatmap section's nav row: same marker scheme as above,
    painting a calendar glyph (Lucide calendar-days) — a month of days is the
    section's whole subject. */

package/src/client/locales-ja.ts

@@ -24,7 +24,7 @@ export const ja: Record<string, string> = {
   updateSettingsDesc: 'ChatCode の CLI 版を npm の最新版へ更新します。',
   updateChecking: 'バージョン更新を確認しています…',
   updatePerforming: '最新バージョンへ更新しています…',
-  updateUpToDate: 'すべて最新です。',
+  updateUpToDate: 'すでに最新です。',
   updateNow: '今すぐ更新',
   updateConfirm: 'これらのパッケージを最新版へ更新します。反映には再起動が必要です。',
   updateRestartHint: '更新が完了しました。ChatCode CLI を再起動してください。',

package/src/client/locales.ts

@@ -31,7 +31,7 @@ export const zh = {
   updateSettingsDesc: '将 ChatCode CLI 端升级到 npm 最新版。',
   updateChecking: '正在检查版本更新…',
   updatePerforming: '正在升级到最新版本…',
-  updateUpToDate: '全部已是最新版本。',
+  updateUpToDate: '已是最新版本。',
   updateNow: '立即更新',
   updateConfirm: '将把这些包升级到最新版本，完成后需要重启才能生效。',
   updateRestartHint: '更新成功，请重启 ChatCode CLI 以使用新版本。',
@@ -502,7 +502,7 @@ export const en: Record<keyof typeof zh, string> = {
   updateSettingsDesc: 'Upgrade the ChatCode CLI to the latest npm version.',
   updateChecking: 'Checking for version updates…',
   updatePerforming: 'Upgrading to the latest versions…',
-  updateUpToDate: 'Everything is already up to date.',
+  updateUpToDate: 'Already up to date.',
   updateNow: 'Update now',
   updateConfirm: 'These packages will be upgraded to the latest versions. A restart is required to apply them.',
   updateRestartHint: 'Update complete. Restart ChatCode CLI to use the new version.',

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'
 
@@ -35,6 +36,11 @@ function pinSettings(ids: readonly string[]): Record<string, unknown> {
   return { ids: [...ids] }
 }
 
+/** Open through the Host's navigation policy, not the pure Session catalog. */
+export function openPinnedSession(ctx: Context, sessionId: string): void {
+  ctx.uiWorkspace.openSession(sessionId)
+}
+
 /** A small current-color pin icon for the menu row injected into DSH's menu. */
 function pinIconMarkup(): string {
   return '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true"><path d="M9.5 1.5 14.5 6.5 12.5 8.5 10 6 5.5 10.5 6 12 4.5 13.5 2.5 11.5 4 10 5.5 10.5 10 6 7.5 8.5 6.5Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/></svg>'
@@ -221,6 +227,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')
@@ -256,7 +263,7 @@ function PinnedSessions({ ctx, store, onChange }: {
   const forkSession = (sessionId: string): void => {
     closeMenu()
     void ctx.sessions.fork?.({ sessionId, increaseTitle: true }).then((childId) => {
-      ctx.sessions.open?.(childId)
+      openPinnedSession(ctx, childId)
     }).catch((error: unknown) => {
       console.warn('[dsh-better-sidebar] fork pinned session failed:', error)
     })
@@ -290,8 +297,8 @@ function PinnedSessions({ ctx, store, onChange }: {
             <button
               type="button"
               className={css.pinnedSessionOpen}
-              aria-current={session.id === list.current ? 'page' : undefined}
-              onClick={() => { ctx.sessions.open?.(session.id) }}
+              aria-current={session.id === currentSessionId ? 'page' : undefined}
+              onClick={() => { openPinnedSession(ctx, session.id) }}
             >
               <span className={css.pinnedSessionDot} data-running={session.running || undefined} aria-hidden="true" />
               <span className={css.pinnedSessionTitle}>{session.displayTitle}</span>

package/src/client/settings-nav-icon.ts

@@ -19,6 +19,12 @@ export const AI_RATIO_NAV_MARKER = 'data-dsh-better-sidebar-ai-ratio-nav'
 /** Marker of the "更新" (update) settings nav row. */
 export const UPDATE_NAV_MARKER = 'data-dsh-better-sidebar-update-nav'
 
+/** Fallback markers for host/plugin settings rows whose icons mount late. */
+export const GENERAL_NAV_MARKER = 'data-dsh-better-sidebar-general-nav'
+export const PLUGIN_MARKET_NAV_MARKER = 'data-dsh-better-sidebar-plugin-market-nav'
+export const UI_TWEAKS_NAV_MARKER = 'data-dsh-better-sidebar-ui-tweaks-nav'
+export const SKILL_MARKET_NAV_MARKER = 'data-dsh-better-sidebar-skill-market-nav'
+
 /**
  * Keep the marker on the settings-nav button whose visible text is this
  * plugin's current localized section label.
@@ -28,15 +34,16 @@ export const UPDATE_NAV_MARKER = 'data-dsh-better-sidebar-update-nav'
  *  other's markers).
  * @returns disposer that disconnects observation and removes owned markers.
  */
-export function registerSettingsNavIcon(label: () => string, marker: string = SETTINGS_NAV_MARKER): () => void {
+export function registerSettingsNavIcon(label: () => string | readonly string[], marker: string = SETTINGS_NAV_MARKER): () => void {
   let disposed = false
 
   const sync = (): void => {
     if (disposed) return
-    const currentLabel = label().trim()
+    const resolved = label()
+    const currentLabels = new Set((typeof resolved === 'string' ? [resolved] : resolved).map(value => value.trim()).filter(Boolean))
     const buttons = document.querySelectorAll<HTMLButtonElement>('[role="dialog"] nav button')
     for (const button of buttons) {
-      const matches = currentLabel.length > 0 && button.textContent?.trim() === currentLabel
+      const matches = currentLabels.has(button.textContent?.trim() ?? '')
       if (matches) button.setAttribute(marker, '')
       else button.removeAttribute(marker)
     }

package/src/client/ui-tweaks/branding.tsx

@@ -27,6 +27,7 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 /** Browser URL for the project-owned `assets/logo.svg` file. */
 export const PROJECT_LOGO_URL = '/_dsh/ui-tweaks/assets/logo.svg'
 const PROJECT_NAME = 'ChatCode CLI'
+const HERO_TITLE = '与世界，深一度对话'
 const LEGACY_HOST_BRAND_TEXT = /DSH\s*(?:Local\s*Build|本地构建)|ChatCode\s*CLI/giu
 const HOST_BRAND_LABEL_TEXT = /^(?:DSH\s*(?:Local\s*Build|本地构建)|ChatCode\s*CLI)$/iu
 const HOST_BUILD_VERSION_TEXT = /^v?\d+\.\d+\.\d+(?:[-+][0-9a-z.-]+)*$/iu
@@ -57,16 +58,9 @@ export function SidebarProjectName(): ReactNode {
 }
 
 export const BRANDING_CSS = `
-/* Keep the light-theme type hierarchy in ChatCode's restrained red family,
-   while leaving every surface and interaction state (including workspace /
-   sidebar hover and selected fills, menus, the composer and shadows) owned
-   by the host theme. */
-body:not([data-ds-dark-theme]){
-  --dsw-alias-label-primary:#301111;
-  --dsw-alias-label-secondary:#754745;
-  --dsw-alias-label-tertiary:#a77471;
-}
-/* Saturated brand red remains exclusive to explicitly marked primary actions. */
+/* ChatCode CLI branding is deliberately limited to primary actions.  Every
+   other surface and interaction state (including workspace/sidebar rows,
+   menus, the composer, text and shadows) remains owned by the host theme. */
 body:not([data-ds-dark-theme]) .dut-unicom-primary-action{background:linear-gradient(135deg,#9B0B09,#b71916) !important;border-color:#9B0B09 !important;color:#fff !important;box-shadow:0 7px 18px rgba(155,11,9,.24) !important}
 body:not([data-ds-dark-theme]) .dut-unicom-primary-action:hover{background:linear-gradient(135deg,#b71916,#cf302c) !important;border-color:#b71916 !important;color:#fff !important;box-shadow:0 10px 24px rgba(155,11,9,.30) !important}
 body:not([data-ds-dark-theme]) .dut-unicom-primary-action:active{transform:translateY(1px);box-shadow:0 4px 11px rgba(155,11,9,.22) !important}
@@ -85,7 +79,8 @@ body[data-ds-dark-theme] .dut-unicom-primary-action:not(:hover){background:#9B0B
 .dut-brand-version{display:none !important}
 .dut-hero-preview{display:none !important}
 .dut-hero-logo{width:60px !important;height:60px !important}
-[class*="headline"]:has(.dut-hero-logo){grid-template-columns:60px auto !important;font-size:26px !important;line-height:34px !important}
+.dut-hero-title{font-size:30px !important;line-height:40px !important;font-weight:600 !important;letter-spacing:.06em !important;white-space:nowrap}
+[class*="headline"]:has(.dut-hero-logo){grid-template-columns:60px auto !important;font-size:30px !important;line-height:40px !important}
 .dut-settings-logo{width:19px;height:19px;object-fit:contain}
 `
 
@@ -176,6 +171,17 @@ function syncBranding(): void {
     if (HERO_HEADLINE.test(node.data)) node.data = node.data.replace(HERO_HEADLINE, PROJECT_NAME)
   }
 
+  // Keep the product name in the sidebar, but use a more expressive headline
+  // above the new-session composer.
+  document.querySelectorAll<HTMLElement>('.dut-hero-logo').forEach((logo) => {
+    const headline = logo.closest<HTMLElement>('[class*="headline"]')
+    const title = Array.from(headline?.querySelectorAll<HTMLElement>('*') ?? [])
+      .find(element => element.childElementCount === 0 && element.textContent?.trim() === PROJECT_NAME)
+    if (title === undefined) return
+    title.textContent = HERO_TITLE
+    title.classList.add('dut-hero-title')
+  })
+
   // Older host builds expose a brand-mark wrapper but no text-bearing sibling.
   document.querySelectorAll<HTMLElement>('[class*="brandMark"]').forEach((host) => {
     const svg = host.matches('svg') ? host : host.querySelector('svg')