dsh-coding-sidebar 1.0.2 → 1.0.4

package/src/client/native-avoid.ts

@@ -0,0 +1,155 @@
+/**
+ * Native-sidebar avoidance: when the DSH shell's own sidebar expands to its
+ * wide form, an expanded sidebar panel would crowd the page into several
+ * columns — so the panel yields (collapses; the fact that WE collapsed it
+ * is remembered) and restores when the native sidebar returns to its rail.
+ *
+ * Detection: the host exposes no programmable open/close event — the
+ * `settings.trigger` slot's `{ wide }` owner prop is pushed only to the
+ * slot's occupant, and that slot is single-masked (occupying it would take
+ * over the settings button). But the shell stamps every slot outlet with
+ * `data-slot="<key>"` (the conversation package's own CSS targets
+ * `[data-slot=conversation\.session]`), and the native sidebar hosts the
+ * `sidebar.*` slots — its documented collapsed form is a 56px icon rail,
+ * the expanded form a full column. So: watch the first
+ * `[data-slot^="sidebar."]` element with a ResizeObserver; width > 80px
+ * means expanded. No anchor (older host, attribute renamed) → the feature
+ * stays inert.
+ *
+ * The yield rides the regular `panelOpen` state (same contract as every
+ * other collapse: the toggle button, content-open auto-expansion and the
+ * per-session persistence all keep working). A panel transition we did not
+ * apply — the user reopening the panel, or a content open expanding it —
+ * hands ownership back (no restore on native close); a session switch
+ * re-runs the rule against the newly active session.
+ */
+import { togglePanel } from './state.ts'
+import type { SidebarStore } from './state.ts'
+
+/** The documented rail is 56px; anything wider is an expanded sidebar. */
+const RAIL_MAX_WIDTH = 80
+
+/** The native sidebar's slot outlets (sidebar.settings and siblings). */
+const ANCHOR_SELECTOR = '[data-slot^="sidebar."]'
+
+export function installNativeSidebarAvoidance(store: SidebarStore): () => void {
+  if (typeof ResizeObserver === 'undefined' || typeof MutationObserver === 'undefined'
+    || typeof document === 'undefined' || document.body === null) {
+    return () => {}
+  }
+
+  let disposed = false
+  /** null until the anchor is found and measured (unknown = never act). */
+  let nativeWide: boolean | null = null
+  /** The currently open panel was collapsed by US (restore on native close). */
+  let yielded = false
+  /** Guards the store subscription: the in-flight reduce is ours. */
+  let applying = false
+  let lastSeenOpen: boolean | null = null
+  let lastSessionId: string | undefined
+
+  const snapshotOpen = (): boolean => store.getSnapshot().state?.panelOpen === true
+
+  /** Apply the avoidance rule for the current native-sidebar state. */
+  const reevaluate = (): void => {
+    if (disposed || nativeWide === null) return
+    if (nativeWide && !yielded && snapshotOpen()) {
+      // Yield: collapse the panel, remember it was ours.
+      yielded = true
+      applying = true
+      store.reduce(togglePanel)
+    } else if (!nativeWide && yielded) {
+      // Restore: the native sidebar closed — reopen what we collapsed.
+      yielded = false
+      if (snapshotOpen()) return
+      applying = true
+      store.reduce(togglePanel)
+    }
+  }
+
+  // Store watcher: a panel transition we did not apply hands ownership back
+  // (the user or a content open owns the state now); a session switch
+  // re-runs the rule against the newly active session.
+  lastSeenOpen = snapshotOpen()
+  lastSessionId = store.getSnapshot().sessionId
+  const unsubscribe = store.subscribe(() => {
+    if (disposed) return
+    const snapshot = store.getSnapshot()
+    const open = snapshotOpen()
+    if (applying) {
+      applying = false
+      lastSeenOpen = open
+      lastSessionId = snapshot.sessionId
+      return
+    }
+    if (snapshot.sessionId !== lastSessionId) {
+      lastSessionId = snapshot.sessionId
+      lastSeenOpen = open
+      reevaluate()
+      return
+    }
+    if (open !== lastSeenOpen) {
+      lastSeenOpen = open
+      // Reopened by someone else while yielded: they own it now.
+      if (yielded && open) yielded = false
+    }
+  })
+
+  let resizeObserver: ResizeObserver | null = null
+  let finder: MutationObserver | null = null
+
+  const applyWidth = (width: number): void => {
+    const wide = width > RAIL_MAX_WIDTH
+    if (wide !== nativeWide) {
+      nativeWide = wide
+      reevaluate()
+    }
+  }
+
+  const watch = (element: Element): void => {
+    resizeObserver = new ResizeObserver(() => {
+      // SPA teardown can remove the anchor after observation started —
+      // re-arm the search instead of trusting a detached width.
+      if (!element.isConnected) {
+        resizeObserver?.disconnect()
+        resizeObserver = null
+        nativeWide = null
+        startSearch()
+        return
+      }
+      applyWidth(element.getBoundingClientRect().width)
+    })
+    resizeObserver.observe(element)
+    applyWidth(element.getBoundingClientRect().width)
+  }
+
+  const startSearch = (): void => {
+    const found = document.querySelector(ANCHOR_SELECTOR)
+    if (found !== null) {
+      watch(found)
+      return
+    }
+    // The shell renders later than us (route mount, lazy shell) — watch for
+    // the anchor's appearance (childList only; disconnected once found).
+    finder = new MutationObserver(() => {
+      const element = document.querySelector(ANCHOR_SELECTOR)
+      if (element !== null) {
+        finder?.disconnect()
+        finder = null
+        watch(element)
+      }
+    })
+    finder.observe(document.body, { childList: true, subtree: true })
+  }
+
+  startSearch()
+
+  return () => {
+    disposed = true
+    unsubscribe()
+    resizeObserver?.disconnect()
+    resizeObserver = null
+    finder?.disconnect()
+    finder = null
+  }
+}

package/src/client/plugins-shared.ts

@@ -1,10 +1,10 @@
 /**
- * Shared vocabulary of the recommended plugin catalogs: the entry shape and
- * the GitHub topic URL. The two catalogs live in sibling modules —
- * `plugins-tabs.ts` (tab registrations) and `plugins-viewers.ts` (file
- * previewer registrations) — and are shown in the two "add plugin" modals
- * (Side card settings → the dashed cards at the end of the 侧边栏内容 /
- * 文件预览 grids).
+ * Shared vocabulary of the recommended plugin catalog: the entry shape and
+ * the GitHub topic URL. The catalog lives in the sibling module
+ * `plugins-tabs.ts` (tab registrations) and is shown in the "add plugin"
+ * modal (Side card settings → the dashed card at the end of the 侧边栏内容
+ * grid). (v1.0.4: the file-previewer catalog was retired with the
+ * file-viewer registry.)
  */
 
 /** The GitHub topic page listing every repo tagged `dsh-coding-sidebar`. */

package/src/client/prefs.ts

@@ -101,12 +101,6 @@ export function parsePrefs(value: unknown): SidebarPrefs {
     titleBarStripPx: typeof record.titleBarStripPx === 'number' && Number.isFinite(record.titleBarStripPx)
       ? clampTitleBarStrip(record.titleBarStripPx)
       : SIDEBAR_PREFS_DEFAULTS.titleBarStripPx,
-    htmlViewerNoSandbox: typeof record.htmlViewerNoSandbox === 'boolean'
-      ? record.htmlViewerNoSandbox
-      : SIDEBAR_PREFS_DEFAULTS.htmlViewerNoSandbox,
-    htmlViewerDefaultUnsafe: typeof record.htmlViewerDefaultUnsafe === 'boolean'
-      ? record.htmlViewerDefaultUnsafe
-      : SIDEBAR_PREFS_DEFAULTS.htmlViewerDefaultUnsafe,
     browserNoSandbox: typeof record.browserNoSandbox === 'boolean'
       ? record.browserNoSandbox
       : SIDEBAR_PREFS_DEFAULTS.browserNoSandbox,
@@ -123,7 +117,6 @@ export function parsePrefs(value: unknown): SidebarPrefs {
       ? record.browserAllowedLoopback
       : SIDEBAR_PREFS_DEFAULTS.browserAllowedLoopback,
     tabsEnabled: booleanMapOf(record.tabsEnabled),
-    viewersEnabled: booleanMapOf(record.viewersEnabled),
     pluginSettings: pluginSettingsMapOf(record.pluginSettings),
   }
 }

package/src/client/service.ts

@@ -1,10 +1,13 @@
 /**
  * The BetterSidebar client service: a registry that external plugins use
- * to contribute sidebar tab types and file previewers. The service is
- * published to the cordis context as `ctx.betterSidebar` (see
- * {@link ../context-types.ts}); consumers declare it in `inject` and call
- * `registerTab` / `registerFileViewer`, both returning a disposer that
- * cordis auto-invokes on fiber disposal (HMR-safe).
+ * to contribute sidebar tab types. The service is published to the cordis
+ * context as `ctx.betterSidebar` (see {@link ../context-types.ts});
+ * consumers declare it in `inject` and call `registerTab`, which returns a
+ * disposer that cordis auto-invokes on fiber disposal (HMR-safe).
+ *
+ * (v1.0.4: the file-viewer registry — `registerFileViewer` /
+ * `matchFileViewer` — was retired; file preview is the host's job now and
+ * the sidebar edits text only.)
  *
  * Design notes:
  * - The registry is synchronous-snapshot (Map + listener set) so React
@@ -15,9 +18,6 @@
  *   `single: true` is sugar for `dedupeKey: () => id`.
  * - `createTab` lets a descriptor own tab instantiation (the terminal
  *   builtin uses it to mint `terminal:<n>` ids and bump `nextTerminal`).
- * - `matchFileViewer` walks descriptors in priority order (desc, stable):
- *   per descriptor it tries `detect` first (when `head` bytes are given),
- *   then `exts`; `exts: []` is a catch-all that matches any path.
  */
 import type { ReactNode } from 'react'
 import type { Context } from '../context-types.ts'
@@ -65,7 +65,7 @@ export interface SidebarSettingSelectOption {
   icon?: ReactNode | ((size: number) => ReactNode)
 }
 
-/** One declarative setting of a tab/viewer, rendered as a nested row in the
+/** One declarative setting of a registered tab, rendered as a nested row in the
  *  Side card settings page (e.g. the Subagent page's "auto-open when a
  *  subagent appears" switch, or the terminal's custom font rows). `type`
  *  selects the control: 'switch' (default) renders the custom switch,
@@ -110,7 +110,7 @@ export interface SidebarSettingsRenderProps {
   close(): void
 }
 
-/** Declarative settings of one registered tab or file viewer. */
+/** Declarative settings of one registered tab. */
 export interface SidebarSettingsDeclaration {
   /**
    * Extra settings rows rendered under the feature's own row in the
@@ -240,88 +240,19 @@ export interface TabDescriptor {
   component: (props: TabComponentProps) => ReactNode
 }
 
-/** How the host loads a file's bytes for one viewer. */
-export type FileFetchStrategy =
-  | 'none'               // no bytes needed (image/pdf/office fetch through mediaUrl themselves)
-  | 'fsRead'             // text read through /sidebar/api fs.read
-  | 'mediaUrl'           // the viewer gets a media URL string
-  | 'custom'             // the viewer's load() fetches its own bytes
-  | 'binary-download'    // show a download button (no client-side renderer)
-
-/** Props every file viewer component receives. */
-export interface FileViewerProps {
-  ctx: Context
-  store: SidebarStore
-  scope: SessionScope
-  path: string
-  title: string
-  /** The matching descriptor's id (`'code'`, `'my-plugin:csv'`). */
-  viewerId: string
-  /** fsRead text content (fetchStrategy='fsRead'). */
-  content?: string
-  truncated?: boolean
-  /** mediaUrl for the path (fetchStrategy='mediaUrl'). */
-  mediaUrl?: string
-  /** custom load() return value (fetchStrategy='custom'). */
-  customData?: unknown
-  /** Internal (built-in text editor): 'host' asks the viewer to skip its own
-   *  toolbar row — the editor host's merged-mode header renders it instead,
-   *  fed through the two callbacks below. Viewers that ignore these fields
-   *  render exactly as before. */
-  toolbar?: 'self' | 'host'
-  /** Internal: the viewer reports its toolbar state (mode/dirty/save). */
-  onToolbarState?: (state: EditorToolbarState) => void
-  /** Internal: the viewer registers its toolbar commands on mount (null on
-   *  unmount). */
-  onToolbarControls?: (controls: EditorToolbarControls | null) => void
-}
-
-/** The toolbar state a text editor reports to the host's merged-mode header. */
+/** The toolbar state the text editor reports to the host's merged-mode header. */
 export interface EditorToolbarState {
-  /** Whether the preview/edit mode toggle applies (markdown/html). */
-  modes: boolean
-  mode: 'preview' | 'edit'
   dirty: boolean
   /** Whether saving applies (text content loaded). */
   editable: boolean
   saveState: 'idle' | 'saving' | 'saved' | 'failed'
 }
 
-/** The commands the host's merged-mode header sends back to the viewer. */
+/** The commands the host's merged-mode header sends back to the editor. */
 export interface EditorToolbarControls {
-  setMode(mode: 'preview' | 'edit'): void
   save(): void
 }
 
-/** Describes one file previewer (builtins register themselves too). */
-export interface FileViewerDescriptor {
-  /** Unique id (`'image'`, `'pdf'`, `'my-plugin:csv'`). */
-  id: string
-  /** Display name for the settings inventory (falls back to `id` when absent). */
-  title?: string | (() => string)
-  /** Icon shown in the settings inventory. */
-  icon?: ReactNode | ((size: number) => ReactNode)
-  /** Lowercase extensions without leading dot (`['png','jpg']`). `[]` = match any (catch-all). */
-  exts: readonly string[]
-  /** Higher wins; default 0. Builtins use 0; the catch-all `code` viewer uses -100. */
-  priority?: number
-  fetchStrategy: FileFetchStrategy
-  /**
-   * Content sniff: when `head` bytes are available the descriptor's `detect`
-   * is consulted before its `exts` (per-descriptor, in priority order).
-   */
-  detect?: (path: string, head: Uint8Array) => boolean
-  /** fetchStrategy='custom' loader. `signal` (v0.12.0+) aborts on viewer
-   *  teardown / re-match; loaders that ignore it keep working. */
-  load?: (path: string, scope: SessionScope, signal?: AbortSignal) => Promise<unknown>
-  /**
-   * Declarative settings shown in the Side card settings page: every
-   * registered viewer gets an enable/disable switch (icon + title + exts).
-   */
-  settings?: SidebarSettingsDeclaration
-  component: (props: FileViewerProps) => ReactNode
-}
-
 /** One `openTab` request. */
 export interface OpenTabSeed {
   type: string
@@ -344,9 +275,7 @@ export interface OpenTabSeed {
  */
 export interface BetterSidebarService {
   registerTab(descriptor: TabDescriptor): () => void
-  registerFileViewer(descriptor: FileViewerDescriptor): () => void
   getTabs(): readonly TabDescriptor[]
-  getFileViewers(): readonly FileViewerDescriptor[]
   /** Find a tab descriptor by id (undefined if not registered). */
   getTab(id: string): TabDescriptor | undefined
   /**
@@ -356,13 +285,6 @@ export interface BetterSidebarService {
    * derived flows gate on it).
    */
   isTabEnabled(id: string): boolean
-  /** Whether a file viewer is enabled (absent `viewersEnabled[id]` = enabled). */
-  isViewerEnabled(id: string): boolean
-  /**
-   * Find a file viewer for a path (priority desc; detect first, then exts).
-   * Disabled viewers are skipped, so files fall through to the next match.
-   */
-  matchFileViewer(path: string, head?: Uint8Array): FileViewerDescriptor | undefined
   /**
    * Open a tab (used by external tabs and the + menu). `title` overrides
    * the descriptor's title when given (the editor tab shows the file name);
@@ -424,14 +346,6 @@ export interface BetterSidebarService {
   openFile(scope: SessionScope, path: string, title?: string): void
 }
 
-/** Extract the lowercase extension without leading dot from a path. */
-function extOfPath(path: string): string {
-  const at = path.lastIndexOf('.')
-  if (at === -1) return ''
-  const base = path.slice(at + 1).toLowerCase()
-  return base.includes('/') || base.includes('\\') ? '' : base
-}
-
 /** The file name of a path (both separators). */
 function baseNameOf(path: string): string {
   const at = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'))
@@ -517,12 +431,11 @@ function safeCall(fn: () => void): void {
 
 /**
  * Create one BetterSidebar service bound to a store. The service owns the
- * tab/viewer registries (Map + listener set) and proxies openTab/closeTab
+ * tab registry (Map + listener set) and proxies openTab/closeTab
  * to the store's reducer. One instance per client plugin activation.
  */
 export function createBetterSidebarService(store: SidebarStore): BetterSidebarService {
   const tabs = new Map<string, TabDescriptor>()
-  const viewers = new Map<string, FileViewerDescriptor>()
   const listeners = new Set<() => void>()
 
   const notify = (): void => {
@@ -548,58 +461,12 @@ export function createBetterSidebarService(store: SidebarStore): BetterSidebarSe
     }
   }
 
-  const registerFileViewer = (descriptor: FileViewerDescriptor): (() => void) => {
-    if (viewers.has(descriptor.id)) {
-      throw new Error(`[dsh-coding-sidebar] file viewer "${descriptor.id}" already registered`)
-    }
-    viewers.set(descriptor.id, descriptor)
-    notify()
-    return () => {
-      if (viewers.get(descriptor.id) === descriptor) {
-        viewers.delete(descriptor.id)
-        notify()
-      }
-    }
-  }
-
   const getTabs = (): readonly TabDescriptor[] => Array.from(tabs.values())
-  const getFileViewers = (): readonly FileViewerDescriptor[] => Array.from(viewers.values())
   const getTab = (id: string): TabDescriptor | undefined => tabs.get(id)
 
   // The enable switches come from the user's side card prefs (the shared
   // store the service is bound to): an absent key means enabled.
   const isTabEnabled = (id: string): boolean => store.getPrefs().tabsEnabled[id] !== false
-  const isViewerEnabled = (id: string): boolean => store.getPrefs().viewersEnabled[id] !== false
-
-  const matchFileViewer = (path: string, head?: Uint8Array): FileViewerDescriptor | undefined => {
-    const ext = extOfPath(path)
-    // Single pass in priority order (descending; stable for equal
-    // priorities — insertion order). Each descriptor gets first refusal in
-    // its own turn: `detect` (when head bytes are available) beats its own
-    // `exts`, and `exts: []` is a catch-all matching any path — so the
-    // catch-all `code` viewer (-100) only sees paths no higher-priority
-    // descriptor claimed. Disabled viewers are skipped entirely.
-    for (const v of Array.from(viewers.values()).sort(
-      (a, b) => (b.priority ?? 0) - (a.priority ?? 0),
-    )) {
-      if (!isViewerEnabled(v.id)) continue
-      // Content sniff first (only when head bytes are available).
-      if (head !== undefined && v.detect !== undefined) {
-        if (v.detect(path, head)) return v
-        // A catch-all with detect is SNIFF-ONLY: it must not blind-claim
-        // paths it never sniffed (a magic-number viewer must not swallow
-        // every file before the real viewers get their turn).
-        if (v.exts.length === 0) continue
-      } else if (v.exts.length === 0) {
-        // Blind catch-all (no detect) claims anything; a sniff-only
-        // catch-all (detect defined, no head yet) yields this round.
-        if (v.detect === undefined) return v
-        continue
-      }
-      if (v.exts.includes(ext)) return v
-    }
-    return undefined
-  }
 
   const openTab = (seed: OpenTabSeed, scope?: SessionScope): void => {
     // A type the user disabled in settings never opens — neither from the
@@ -807,13 +674,9 @@ export function createBetterSidebarService(store: SidebarStore): BetterSidebarSe
 
   return {
     registerTab,
-    registerFileViewer,
     getTabs,
-    getFileViewers,
     getTab,
     isTabEnabled,
-    isViewerEnabled,
-    matchFileViewer,
     openTab,
     closeTab,
     subscribe,