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

package/src/client/intercept.tsx

@@ -5,7 +5,7 @@
  * compatible across that transition. The chips open the file in the sidebar
  * instead of the host OS.
  */
-import { IconCodeOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCodeOutline16 } from './icons.tsx'
 import type { Context } from '../context-types.ts'
 import { firstLeaf, revealPaths, togglePanel, type SidebarStore } from './state.ts'
 import { t } from './locales.ts'

package/src/client/md-toc.tsx

@@ -18,7 +18,7 @@
  */
 import { useLayoutEffect, useRef, useState } from 'react'
 import type { ReactNode } from 'react'
-import { IconListPenOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconListPenOutline16 } from './icons.tsx'
 import { t } from './locales.ts'
 import css from './sidebar.module.css'
 

package/src/client/mermaid.tsx

@@ -28,7 +28,8 @@ import { useCallback, useEffect, useLayoutEffect, useRef, useState, type MouseEv
 import { createPortal } from 'react-dom'
 import { createRoot, type Root } from 'react-dom/client'
 import mermaid from 'mermaid'
-import { IconCopyOutline16, MarkdownText, writeClipboard } from '@deepseek-ai/dsh-client-ui-primitives'
+import { MarkdownText, writeClipboard } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCopyOutline16 } from './icons.tsx'
 import { isDarkScheme, subscribeColorScheme } from './theme.ts'
 import { markdownTextProps } from './markdown-labels.tsx'
 import { t } from './locales.ts'

package/src/client/open-with-settings.tsx

@@ -10,7 +10,7 @@
  * this component owns only its own section.
  */
 import { useState } from 'react'
-import { IconCloseOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCloseOutline16 } from './icons.tsx'
 import {
   isValidCustomEditor,
   newCustomEditorId,

package/src/client/service.ts

@@ -472,7 +472,7 @@ export function matchUrlTarget(tabs: readonly TabDescriptor[], url: URL): TabDes
  * The plugin version this service instance reports. Keep in lockstep with
  * `package.json`'s version — `tests/service.spec.ts` asserts the pair.
  */
-export const SIDEBAR_SERVICE_VERSION = '0.18.0-alpha.0'
+export const SIDEBAR_SERVICE_VERSION = '0.18.0-alpha.4'
 
 /**
  * Monotonic capability list consumers use to gate new API usage (features

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

@@ -28,12 +28,31 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 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 LEGACY_HOST_BRAND_TEXT = /DSH\s*(?:Local\s*Build|本地构建)|DeepSeek\s*Harness|ChatCode\s*CLI/giu
+const LEGACY_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
 const HERO_HEADLINE = /探索未至之境/u
 const HERO_PREVIEW_TEXT = /^(?:预览版|Preview)$/iu
 const FAVICON_MARKER = 'data-dut-project-favicon'
+const VERSION_NOTICE_MARKER = 'data-dut-version-notice'
+const VERSION_NOTICE = {
+  en: {
+    legacyTitle: 'Internal Testing Notice',
+    title: 'Version Usage Notice',
+    paragraphs: [
+      'ChatCode CLI is currently evolving rapidly, and its features and user experience will continue to improve. If you encounter any issues or have feedback or suggestions, please join our DingTalk group to share them.',
+      'DingTalk group ID: 178730000511',
+    ],
+  },
+  zh: {
+    legacyTitle: '内测声明',
+    title: '版本使用声明',
+    paragraphs: [
+      'ChatCode CLI 当前版本处于快速迭代阶段，相关功能与使用体验将持续优化。如您在使用过程中遇到问题，或有任何意见与建议，欢迎加入钉钉交流群反馈。',
+      '钉钉群号：178730000511',
+    ],
+  },
+} as const
 
 /** Reusable rendering of the packaged project logo. */
 export function ProjectLogoIcon({ className = '' }: { className?: string }): ReactNode {
@@ -135,6 +154,30 @@ function hideVersionBesideBrandLabel(label: HTMLElement): void {
   }
 }
 
+/** Replace the registry build's older upstream notice with ChatCode product copy. */
+function syncVersionNotice(): void {
+  document.querySelectorAll<HTMLElement>(
+    `[role="dialog"][aria-label="${VERSION_NOTICE.zh.legacyTitle}"],`
+    + `[role="dialog"][aria-label="${VERSION_NOTICE.en.legacyTitle}"],`
+    + `[role="dialog"][${VERSION_NOTICE_MARKER}]`,
+  ).forEach((dialog) => {
+    const heading = dialog.querySelector<HTMLElement>('h1,h2,h3')
+    const legacyTitle = dialog.getAttribute('aria-label') ?? heading?.textContent?.trim()
+    const language = dialog.dataset.dutVersionNoticeLanguage === 'zh'
+      || legacyTitle === VERSION_NOTICE.zh.legacyTitle ? 'zh' : 'en'
+    const notice = VERSION_NOTICE[language]
+    dialog.setAttribute('aria-label', notice.title)
+    dialog.setAttribute(VERSION_NOTICE_MARKER, '')
+    dialog.dataset.dutVersionNoticeLanguage = language
+    if (heading !== null) heading.textContent = notice.title
+    const paragraphs = dialog.querySelectorAll<HTMLParagraphElement>('p')
+    notice.paragraphs.forEach((text, index) => {
+      const paragraph = paragraphs.item(index)
+      if (paragraph !== null) paragraph.textContent = text
+    })
+  })
+}
+
 function syncBranding(): void {
   document.title = document.title.replace(LEGACY_HOST_BRAND_TEXT, PROJECT_NAME)
 
@@ -151,7 +194,7 @@ function syncBranding(): void {
   // The sidebar label identifies the precise icon to its left. Process it
   // before the generic text pass so the sibling relationship is still intact.
   document.querySelectorAll<HTMLElement>('body *').forEach((element) => {
-    if (element.childElementCount !== 0 || !HOST_BRAND_LABEL_TEXT.test(element.textContent?.trim() ?? '')) return
+    if (element.childElementCount !== 0 || !LEGACY_HOST_BRAND_LABEL_TEXT.test(element.textContent?.trim() ?? '')) return
     if (element.textContent !== PROJECT_NAME) element.textContent = PROJECT_NAME
     element.classList.add('dut-brand-title')
     replaceLogoBesideBrandLabel(element)
@@ -182,6 +225,8 @@ function syncBranding(): void {
     title.classList.add('dut-hero-title')
   })
 
+  syncVersionNotice()
+
   // 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')

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

@@ -1487,7 +1487,7 @@ export function apply(ctx: UITweaksClientContext): void {
   // packaged logo there rather than restyling the host's fallback FishLogo.
   ctx.slots.inject('conversation.hero.brand.mark', () => ctx.slots.register({
     name: 'conversation.hero.brand.mark',
-    priority: 10,
+    priority: -10,
   }, HeroProjectLogo))
 
   // The sidebar renders this same slot in its expanded header and collapsed
@@ -1495,7 +1495,7 @@ export function apply(ctx: UITweaksClientContext): void {
   // from falling back to the host FishLogo after the sidebar is collapsed.
   ctx.slots.inject('sidebar.brand.mark', () => ctx.slots.register({
     name: 'sidebar.brand.mark',
-    priority: 10,
+    priority: -10,
   }, SidebarProjectLogo))
 
   // Newer DSH hosts expose the expanded wordmark as its own slot. Owning it
@@ -1504,7 +1504,7 @@ export function apply(ctx: UITweaksClientContext): void {
   // path above.
   ctx.slots.inject('sidebar.brand.name', () => ctx.slots.register({
     name: 'sidebar.brand.name',
-    priority: 10,
+    priority: -10,
   }, SidebarProjectName))
 
   // GitBar v3: the branch chip lives in the session header's action row

package/src/config.ts

@@ -6,6 +6,7 @@
  */
 
 import z from 'schemastery'
+import { Config as UITweaksSchema, type UITweaksConfig } from './ui-tweaks/config.ts'
 import {
   SIDEBAR_PREFS_DEFAULTS,
   SIDEBAR_PREFS_NS,
@@ -37,7 +38,7 @@ export {
 } from './prefs-shared.ts'
 
 /** Tunable sidebar host limits (every field optional; defaults fill in). */
-export interface SidebarConfig {
+export interface SidebarConfig extends Partial<SidebarPrefs>, UITweaksConfig {
   /** Read cap of one text file (bytes); larger files return truncated. */
   readLimit?: number
   /** Media route cap (bytes); larger binaries are refused. */
@@ -88,7 +89,7 @@ export interface CodingPlanConfig {
 }
 
 /** Schemastery schema for the plugin configuration. */
-export const Config: z<SidebarConfig> = z.object({
+const HostConfig = z.object({
   readLimit: z.number().step(1).min(1).default(512 * 1024),
   mediaLimit: z.number().step(1).min(1).default(20 * 1024 * 1024),
   uploadLimit: z.number().step(1).min(1).default(128 * 1024 * 1024),
@@ -205,3 +206,22 @@ export const PrefsSchema: z<SidebarPrefs> = z.object({
   // keys as unknown schema fields.
   pluginSettings: z.dict(z.dict(z.any())).default({}),
 })
+
+function live<T>(schema: z<T>): z<T> {
+  Reflect.set(schema.meta, 'volatile', true)
+  return schema
+}
+
+function liveFields(schema: z): Record<string, z> {
+  if (schema.type !== 'object' || schema.dict === undefined) {
+    throw new TypeError('Live settings schema must be an object')
+  }
+  return Object.fromEntries(Object.entries(schema.dict).map(([key, field]) => [key, live(field)]))
+}
+
+/** One entry schema: deployment fields stay fixed while sidebar and UI preferences are live-editable. */
+export const Config = z.object({
+  ...HostConfig.dict,
+  ...liveFields(PrefsSchema),
+  ...liveFields(UITweaksSchema),
+}) as z<SidebarConfig>

package/src/context-types.ts

@@ -446,22 +446,10 @@ export interface SidebarInvariantsService {
   ): () => void
 }
 
-/** The settings service face (mirror of @deepseek-ai/dsh-settings' SettingsProvider). */
+/** The settings service face (mirror of @deepseek-ai/dsh-settings' SettingsForms). */
 export interface SidebarSettingsService {
-  /**
-   * Register one namespace schema (the resolved value layers schema defaults,
-   * then the composition base, then the user document).
-   */
-  register<T>(
-    ns: string,
-    schema: unknown,
-    options?: { base?: Partial<T>; applies?: 'live' | 'restart' },
-  ): {
-    get(): T
-    watch(callback: (next: T, prev: T) => void | Promise<void>): () => void
-    update(patch: object): Promise<void>
-    replace(section: object): Promise<void>
-  }
+  /** Whether the active profile accepts form edits. */
+  readonly writable: boolean
   /** Redacted descriptors of every registered namespace (secrets stripped). */
   describe(options?: { redactSecrets?: boolean }): Array<{
     ns: string
@@ -473,6 +461,8 @@ export interface SidebarSettingsService {
   }>
   /** Service-level merge write with the revision guard (a stale writer is refused). */
   update(ns: string, patch: object, expectedRevision?: number): Promise<void>
+  /** Apply path edits without restating fields hidden from the caller. */
+  mutate(ns: string, ops: readonly ({ op: 'set'; path: readonly string[]; value: unknown } | { op: 'unset'; path: readonly string[] })[], expectedRevision?: number): Promise<void>
 }
 
 /**

package/src/index.ts

@@ -21,7 +21,6 @@ import { WebSocket, WebSocketServer } from 'ws'
 import type { Context, SidebarHttpRequest } from './context-types.ts'
 import {
   Config,
-  PrefsSchema,
   resolveSidebarConfig,
   SIDEBAR_PREFS_DEFAULTS,
   SIDEBAR_PREFS_NS,
@@ -829,9 +828,8 @@ function buildApi(
  * {@link resolveSidebarConfig}.
  */
 export function apply(ctx: Context, config?: SidebarConfig): void {
-  // dsh-ui-tweaks is embedded as an intact feature module. Its historical
-  // settings namespace and /_dsh/ui-tweaks routes stay unchanged so existing
-  // settings.yaml values and browser behavior carry over without migration.
+  // dsh-ui-tweaks is embedded as an intact feature module. Its routes stay
+  // unchanged while its live fields share this entry's generated settings form.
   // Cordis honours the root `inject` list in production. Keeping this guard
   // lets lightweight embedders that call apply() directly retain the sidebar
   // subset when they intentionally omit the settings service.
@@ -886,8 +884,8 @@ export function apply(ctx: Context, config?: SidebarConfig): void {
   void codingPlanCatalogue.refresh().catch(() => { /* catalogue returns a safe unavailable snapshot */ })
 
   // ── User-facing "Side card" preferences ──────────────────────────────────
-  // Register the namespace with the settings provider so the Settings page
-  // (client half) can render and persist the new-conversation defaults. The
+  // The Settings page (client half) renders and persists the
+  // new-conversation defaults from this entry's volatile Config fields. The
   // DSH settings RPC domain (api-proxy) only serves allowlisted namespaces to
   // configuration clients, so the client reaches this namespace through the
   // plugin's own fenced routes below ('settings.get'/'settings.update'),
@@ -921,17 +919,7 @@ export function apply(ctx: Context, config?: SidebarConfig): void {
     }
   }
   ctx.inject(['settings'], (sctx) => {
-    // DSH 0.1.2-alpha.2 validates namespaces at compile time
-    // (SettingsNamespaceInput); the 'dsh-better-sidebar' literal passes, so the
-    // runtime helper this used to call (settingsNamespace) is gone upstream.
     const ns = SIDEBAR_PREFS_NS
-    // The structural settings mirror types `schema` as unknown, so the
-    // generic is not inferred here; the real service resolves it from the
-    // schemastery schema (PrefsSchema) — narrow the owner scope explicitly.
-    const scope = sctx.settings.register(ns, PrefsSchema) as {
-      get(): SidebarPrefs
-      watch(callback: (next: SidebarPrefs, prev: SidebarPrefs) => void): () => void
-    }
     const viewOf = (): { value?: unknown; revision?: number } => {
       const descriptor = sctx.settings.describe({ redactSecrets: true }).find(candidate => candidate.ns === ns)
       return descriptor === undefined
@@ -957,6 +945,15 @@ export function apply(ctx: Context, config?: SidebarConfig): void {
         return viewOf()
       },
     }
+    const scope = {
+      get: (): SidebarPrefs => {
+        const value = viewOf().value
+        return {
+          ...SIDEBAR_PREFS_DEFAULTS,
+          ...(typeof value === 'object' && value !== null ? value : {}),
+        } as SidebarPrefs
+      },
+    }
     // Register (or unregister) the terminal tools from the current setting,
     // and keep them in sync with every settings commit.
     syncToolsGate(scope)
@@ -988,10 +985,15 @@ export function apply(ctx: Context, config?: SidebarConfig): void {
       }
     }
     syncOpenToolsGate()
-    // ONE watch subscription drives both gates: settings commits re-evaluate
-    // the terminal tools AND the open tool together (each gate is idempotent
-    // and owns its own disposer).
-    scope.watch(() => { syncToolsGate(scope); syncOpenToolsGate() })
+    // Volatile Config writes preserve the plugin fiber. Re-read the projected
+    // form after each Loader update so both gates track the committed values.
+    const updates = sctx as unknown as {
+      on(event: 'loader/volatile-update', listener: () => void): () => void
+    }
+    updates.on('loader/volatile-update', () => {
+      syncToolsGate(scope)
+      syncOpenToolsGate()
+    })
   })
 
   // ── JSON API ────────────────────────────────────────────────────────────

package/src/prefs-shared.ts

@@ -7,7 +7,7 @@
  */
 
 /** The user-settings namespace holding the side card preferences. */
-export const SIDEBAR_PREFS_NS = 'dsh-better-sidebar'
+export const SIDEBAR_PREFS_NS = 'better-sidebar'
 
 /** User-facing side card preferences (new-conversation defaults). */
 export interface SidebarPrefs {

package/src/ui-tweaks/config.ts

@@ -14,7 +14,7 @@ import type { SettingsNamespace } from '@deepseek-ai/dsh-settings'
 // `settingsNamespace()` was removed in DSH 0.1.2-alpha.2. Keep the opaque
 // namespace type for source compatibility with older DSH declarations, while
 // emitting the plain validated literal required by the current runtime.
-export const UI_TWEAKS_SETTINGS_NAMESPACE = 'ui-tweaks' as SettingsNamespace
+export const UI_TWEAKS_SETTINGS_NAMESPACE = 'better-sidebar' as SettingsNamespace
 
 /** Raw user-facing configuration (partial inputs receive schema defaults). */
 export interface UITweaksConfig {

package/src/ui-tweaks/index.ts

@@ -1,9 +1,8 @@
 /**
  * dsh-ui-tweaks — server half.
  *
- * Registers the `ui-tweaks` settings namespace so users can tune the
- * conversation UI either from the Settings panel or by editing the settings
- * document directly (settings.yaml `ui-tweaks:` section). All rendering work
+ * Uses the owning sidebar entry's live settings so users can tune the
+ * conversation UI from the Settings panel. All rendering work
  * happens in the browser bundle (`src/client`), which reads and writes this
  * namespace through the same-origin route mounted here — the Web settings RPC
  * only exposes a fixed allowlist of namespaces since rc.6, so a custom route is
@@ -12,11 +11,7 @@
  */
 
 import type { Context } from '@deepseek-ai/cordis'
-import {
-  UI_TWEAKS_SETTINGS_NAMESPACE,
-  Config,
-  type UITweaksConfig,
-} from './config.ts'
+import { UI_TWEAKS_SETTINGS_NAMESPACE, type UITweaksConfig } from './config.ts'
 import { installTurnOutcomeProjection } from './turn-outcome.ts'
 import { UITweaksWebBackend, installUITweaksWeb } from './web.ts'
 import { GitBackend } from './git.ts'
@@ -30,10 +25,6 @@ export const name = 'dsh-ui-tweaks'
 export const inject = ['settings']
 
 export function apply(ctx: Context): void {
-  ctx.settings.register(UI_TWEAKS_SETTINGS_NAMESPACE, Config, {
-    applies: 'live',
-  })
-
   // The task notifier classifies turn endings (completed / aborted / failed)
   // through this session projection (same registration pattern as above).
   installTurnOutcomeProjection(ctx)
@@ -44,7 +35,10 @@ export function apply(ctx: Context): void {
 
   // The GitBar runs git in the session's working directory through these
   // same-origin routes (sessions/llm are optional services, duck-typed).
-  const readConfig = (): UITweaksConfig => ctx.settings.get(UI_TWEAKS_SETTINGS_NAMESPACE) as UITweaksConfig
+  const readConfig = (): UITweaksConfig => {
+    const descriptor = ctx.settings.describe().find(candidate => candidate.ns === UI_TWEAKS_SETTINGS_NAMESPACE)
+    return descriptor?.value as UITweaksConfig | undefined ?? {}
+  }
   installGitWeb(ctx, new GitBackend(ctx, readConfig))
 
   // The Archive panel lists archived sessions and restores ("deletes") them