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

package/lib/index.js

@@ -3,6 +3,7 @@ import { mkdir, open, opendir, readFile, readdir, realpath, rename, rm, stat, wr
 import { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { WebSocket, WebSocketServer } from "ws";
 import z from "schemastery";
+import z$1 from "@deepseek-ai/schemastery";
 import { createHash, randomUUID } from "node:crypto";
 import { once } from "node:events";
 import { chmodSync, createWriteStream, existsSync, readFileSync, realpathSync, statSync } from "node:fs";
@@ -11,9 +12,41 @@ import { execFile, spawn } from "node:child_process";
 import { SettingsConflictError } from "@deepseek-ai/dsh-settings";
 import { homedir, userInfo } from "node:os";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import z$1 from "@deepseek-ai/schemastery";
 import { workspaceDomainState } from "@deepseek-ai/dsh-workspace";
 import { YAMLMap, YAMLSeq, parse, parseDocument, stringify } from "yaml";
+//#region src/ui-tweaks/config.ts
+/**
+* dsh-ui-tweaks configuration: conversation font size (px), markdown table
+* style, and feature toggles. Every field
+* defaults at the schema boundary, so a hand-edited settings document and the
+* Settings panel stay consistent.
+* @module dsh-ui-tweaks/config
+*/
+/** Settings document namespace owned by this plugin. */
+const UI_TWEAKS_SETTINGS_NAMESPACE = "better-sidebar";
+/** Configuration schema with documented defaults. */
+const Config$1 = z$1.object({
+	fontSize: z$1.number().min(10).max(32).default(16),
+	codeFontScale: z$1.number().min(50).max(150).default(81),
+	codeFontSize: z$1.number().min(8).max(32),
+	lineHeight: z$1.number().min(0).max(64).default(16),
+	tableStyle: z$1.union(["default", "claude"]).default("default"),
+	gitBarEnabled: z$1.boolean().default(false),
+	archiveManagerEnabled: z$1.boolean().default(false),
+	mcpManagerEnabled: z$1.boolean().default(false),
+	initCommandEnabled: z$1.boolean().default(false),
+	whaleIndicatorEnabled: z$1.boolean().default(false),
+	preciseCacheHitEnabled: z$1.boolean().default(false),
+	notificationsEnabled: z$1.boolean().default(false),
+	notifyOnlyWhenHidden: z$1.boolean().default(true),
+	notifyOnComplete: z$1.boolean().default(true),
+	notifyOnInteraction: z$1.boolean().default(true),
+	notifyTitleFlash: z$1.boolean().default(true),
+	notifySystemNotification: z$1.boolean().default(true),
+	notifySound: z$1.boolean().default(false),
+	suggestModel: z$1.string()
+});
+//#endregion
 //#region src/prefs-shared.ts
 /**
 * Shared "Side card" preference vocabulary (types + constants), consumed by
@@ -23,7 +56,7 @@ import { YAMLMap, YAMLSeq, parse, parseDocument, stringify } from "yaml";
 * the browser bundle never pulls the schema runtime in.
 */
 /** The user-settings namespace holding the side card preferences. */
-const SIDEBAR_PREFS_NS = "dsh-better-sidebar";
+const SIDEBAR_PREFS_NS = "better-sidebar";
 /** Fallback prefs used whenever the settings document is unreachable or malformed. */
 const SIDEBAR_PREFS_DEFAULTS = {
 	openByDefault: false,
@@ -65,7 +98,7 @@ const SIDEBAR_PREFS_DEFAULTS = {
 * @module dsh-better-sidebar/config
 */
 /** Schemastery schema for the plugin configuration. */
-const Config = z.object({
+const HostConfig = z.object({
 	readLimit: z.number().step(1).min(1).default(524288),
 	mediaLimit: z.number().step(1).min(1).default(20971520),
 	uploadLimit: z.number().step(1).min(1).default(134217728),
@@ -148,6 +181,20 @@ const PrefsSchema = z.object({
 	viewersEnabled: z.dict(z.boolean()).default({}),
 	pluginSettings: z.dict(z.dict(z.any())).default({})
 });
+function live(schema) {
+	Reflect.set(schema.meta, "volatile", true);
+	return schema;
+}
+function liveFields(schema) {
+	if (schema.type !== "object" || schema.dict === void 0) 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. */
+const Config = z.object({
+	...HostConfig.dict,
+	...liveFields(PrefsSchema),
+	...liveFields(Config$1)
+});
 //#endregion
 //#region src/wire.ts
 /** One API failure with its wire code and HTTP status. */
@@ -1361,7 +1408,7 @@ async function cherryPick(cwd, hash, selected) {
 * agent terminal tools are simply not registered.
 *
 * Version contract: the plugin must stay in sync with DSH core —
-* `@deepseek-ai/dsh-subprocess-local` declares `"node-pty": "^1.1.0"` in
+* `@deepseek-ai/dsh-subprocess-local` declares `"node-pty": "1.2.0-beta.15"` in
 * its `dependencies`. Both sides then resolve the SAME pnpm store entry
 * (same range, same integrity → one native binding, no drift). Do NOT
 * switch to a fork (e.g. @lydell/node-pty) or a different range without
@@ -1372,7 +1419,7 @@ async function cherryPick(cwd, hash, selected) {
 * range DSH core declares (`@deepseek-ai/dsh-subprocess-local`): the same
 * range keeps pnpm resolving both to one physical package.
 */
-const DSH_NODE_PTY_RANGE = "^1.1.0";
+const DSH_NODE_PTY_RANGE = "1.2.0-beta.15";
 /**
 * The WebSocket close-code-1011 reason the host sends when node-pty is
 * unavailable. The client recognizes this exact marker and fetches the full
@@ -3225,39 +3272,6 @@ async function performAllUpdates(checks) {
 	return results;
 }
 //#endregion
-//#region src/ui-tweaks/config.ts
-/**
-* dsh-ui-tweaks configuration: conversation font size (px), markdown table
-* style, and feature toggles. Every field
-* defaults at the schema boundary, so a hand-edited settings document and the
-* Settings panel stay consistent.
-* @module dsh-ui-tweaks/config
-*/
-/** Settings document namespace owned by this plugin. */
-const UI_TWEAKS_SETTINGS_NAMESPACE = "ui-tweaks";
-/** Configuration schema with documented defaults. */
-const Config$1 = z$1.object({
-	fontSize: z$1.number().min(10).max(32).default(16),
-	codeFontScale: z$1.number().min(50).max(150).default(81),
-	codeFontSize: z$1.number().min(8).max(32),
-	lineHeight: z$1.number().min(0).max(64).default(16),
-	tableStyle: z$1.union(["default", "claude"]).default("default"),
-	gitBarEnabled: z$1.boolean().default(false),
-	archiveManagerEnabled: z$1.boolean().default(false),
-	mcpManagerEnabled: z$1.boolean().default(false),
-	initCommandEnabled: z$1.boolean().default(false),
-	whaleIndicatorEnabled: z$1.boolean().default(false),
-	preciseCacheHitEnabled: z$1.boolean().default(false),
-	notificationsEnabled: z$1.boolean().default(false),
-	notifyOnlyWhenHidden: z$1.boolean().default(true),
-	notifyOnComplete: z$1.boolean().default(true),
-	notifyOnInteraction: z$1.boolean().default(true),
-	notifyTitleFlash: z$1.boolean().default(true),
-	notifySystemNotification: z$1.boolean().default(true),
-	notifySound: z$1.boolean().default(false),
-	suggestModel: z$1.string()
-});
-//#endregion
 //#region src/ui-tweaks/turn-outcome.ts
 /** Projection key the browser notifier reads through list-row `projectionValues`. */
 const TURN_OUTCOME_PROJECTION_KEY = "dshTurnOutcome";
@@ -5857,10 +5871,11 @@ function installMcpWeb(ctx, backend) {
 //#endregion
 //#region src/ui-tweaks/index.ts
 function apply$1(ctx) {
-	ctx.settings.register(UI_TWEAKS_SETTINGS_NAMESPACE, Config$1, { applies: "live" });
 	installTurnOutcomeProjection(ctx);
 	installUITweaksWeb(ctx, new UITweaksWebBackend(ctx));
-	const readConfig = () => ctx.settings.get(UI_TWEAKS_SETTINGS_NAMESPACE);
+	const readConfig = () => {
+		return ctx.settings.describe().find((candidate) => candidate.ns === "better-sidebar")?.value ?? {};
+	};
 	installGitWeb(ctx, new GitBackend(ctx, readConfig));
 	installArchiveWeb(ctx, new ArchiveBackend(ctx));
 	installMcpWeb(ctx, new McpBackend(ctx));
@@ -6468,7 +6483,6 @@ function apply(ctx, config) {
 	};
 	ctx.inject(["settings"], (sctx) => {
 		const ns = SIDEBAR_PREFS_NS;
-		const scope = sctx.settings.register(ns, PrefsSchema);
 		const viewOf = () => {
 			const descriptor = sctx.settings.describe({ redactSecrets: true }).find((candidate) => candidate.ns === ns);
 			return descriptor === void 0 ? {
@@ -6490,6 +6504,13 @@ function apply(ctx, config) {
 				return viewOf();
 			}
 		};
+		const scope = { get: () => {
+			const value = viewOf().value;
+			return {
+				...SIDEBAR_PREFS_DEFAULTS,
+				...typeof value === "object" && value !== null ? value : {}
+			};
+		} };
 		syncToolsGate(scope);
 		const syncOpenToolsGate = () => {
 			if (scope.get().agentOpenTools) {
@@ -6504,7 +6525,7 @@ function apply(ctx, config) {
 			}
 		};
 		syncOpenToolsGate();
-		scope.watch(() => {
+		sctx.on("loader/volatile-update", () => {
 			syncToolsGate(scope);
 			syncOpenToolsGate();
 		});

package/lib/types/client/builtins/tabs.d.ts

@@ -1,3 +1,12 @@
+/**
+ * The 7 built-in tab descriptors: the plugin registers its own pages
+ * (editor / git / terminal / browser / diff) through
+ * the same {@link BetterSidebarService} external plugins use — eating its
+ * own dogfood. The terminal descriptor owns its quota (`TERMINAL_LIMIT`)
+ * and mints `terminal:<uuid>` ids through `createTab`; the browser mints
+ * `browser:<n>` the same way (no quota). The editor IS the files window
+ * (the old standalone explorer merged into it).
+ */
 import type { Context } from '../../context-types.ts';
 import type { TabDescriptor } from '../service.ts';
 /** How many UI-owned terminals may be open at once (agent-owned ones are uncapped). */

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

@@ -1,11 +1,29 @@
-/**
- * Icons the sidebar needs beyond the primitives set: a terminal glyph (the
- * icon library has none), a diff glyph, and the two panel-toggle glyphs for
- * the top-right cluster. Per-tab icons live on the tab descriptors
- * (`descriptor.icon`), not in a type-keyed switch — the icon mapping was
- * registry-ized with the tab types.
- */
-import type { IconProps } from '@deepseek-ai/dsh-client-ui-primitives';
+export interface IconProps {
+    size?: number;
+    className?: string;
+}
+export declare const IconListPenOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconRefreshOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconRefreshOutline14: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconChevronRightOutline14: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconChevronLeftOutline14: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconChevronDownOutline14: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconCodeOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconCopyOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconDownloadOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconLinkOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconLinkOutline14: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconBranchOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconTrashOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconWarningOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconCloseFill14: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconCloseOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconLoadingOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconPlusOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconSettingsOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconFolderOpen16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconPanelLeftOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
+export declare const IconCheckOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
 /** User-manual glyph: an open book in the sidebar's 1.5px outline style. */
 export declare const IconBookOutline16: ({ size, className }: IconProps) => import("react").JSX.Element;
 /**

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

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

package/lib/types/config.d.ts

@@ -5,10 +5,11 @@
  * @module dsh-better-sidebar/config
  */
 import z from 'schemastery';
+import { type UITweaksConfig } from './ui-tweaks/config.ts';
 import { type SidebarPrefs } from './prefs-shared.ts';
 export { SIDEBAR_PREFS_DEFAULTS, SIDEBAR_PREFS_NS, TERMINAL_FONT_SIZE_DEFAULT, TERMINAL_FONT_SIZE_MAX, TERMINAL_FONT_SIZE_MIN, TITLE_BAR_STRIP_DEFAULT, TITLE_BAR_STRIP_MAX, TITLE_BAR_STRIP_MIN, WIDTH_PERCENT_DEFAULT, WIDTH_PERCENT_MAX, WIDTH_PERCENT_MIN, type SidebarPrefs, } 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. */
@@ -56,8 +57,6 @@ export interface CodingPlanConfig {
     /** Catalogue request timeout in milliseconds. */
     requestTimeoutMs?: number;
 }
-/** Schemastery schema for the plugin configuration. */
-export declare const Config: z<SidebarConfig>;
 /** Fully defaulted sidebar host settings. */
 export interface ResolvedSidebarConfig {
     readLimit: number;
@@ -93,3 +92,5 @@ export interface ResolvedCodingPlanConfig {
 export declare function resolveSidebarConfig(config: SidebarConfig | undefined): ResolvedSidebarConfig;
 /** Schemastery schema for the user-facing preferences (validated by the settings service). */
 export declare const PrefsSchema: z<SidebarPrefs>;
+/** One entry schema: deployment fields stay fixed while sidebar and UI preferences are live-editable. */
+export declare const Config: z<SidebarConfig>;

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

@@ -427,21 +427,10 @@ export interface SidebarInvariantsService {
     /** Reserve one package's checks and install them in the service's child fiber. */
     register(packageName: string, installer: (ctx: Context, fail: (message: string) => never) => void | Promise<void>): () => 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;
@@ -455,6 +444,15 @@ 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>;
 }
 /**
  * The tools service face (mirror of @deepseek-ai/dsh-tools' ToolRuntime).

package/lib/types/prefs-shared.d.ts

@@ -6,7 +6,7 @@
  * the browser bundle never pulls the schema runtime in.
  */
 /** The user-settings namespace holding the side card preferences. */
-export declare const SIDEBAR_PREFS_NS = "dsh-better-sidebar";
+export declare const SIDEBAR_PREFS_NS = "better-sidebar";
 /** User-facing side card preferences (new-conversation defaults). */
 export interface SidebarPrefs {
     /** Whether a brand-new conversation opens the side card by default. */

package/lib/types/pty-deps.d.ts

@@ -6,7 +6,7 @@ export type NodePtyModule = typeof nodePtyNs;
  * range DSH core declares (`@deepseek-ai/dsh-subprocess-local`): the same
  * range keeps pnpm resolving both to one physical package.
  */
-export declare const DSH_NODE_PTY_RANGE = "^1.1.0";
+export declare const DSH_NODE_PTY_RANGE = "1.2.0-beta.15";
 /**
  * The WebSocket close-code-1011 reason the host sends when node-pty is
  * unavailable. The client recognizes this exact marker and fetches the full

package/lib/types/ui-tweaks/index.d.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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatcode/cco-better-sidebar",
-  "version": "0.18.0-alpha.4",
+  "version": "0.18.0-rc.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": {
@@ -139,7 +139,7 @@
     "clsx": "^2.1.1",
     "dompurify": "^3.4.14",
     "mermaid": "^11.16.1",
-    "node-pty": "^1.1.0",
+    "node-pty": "1.2.0-beta.15",
     "react-icons": "5.7.0",
     "rxjs": "^7.8.2",
     "schemastery": "^3.18.0",

package/src/client/BrowserView.tsx

@@ -23,7 +23,7 @@ import {
   IconLinkOutline14,
   IconRefreshOutline14,
   IconWarningOutline16,
-} from '@deepseek-ai/dsh-client-ui-primitives'
+} from './icons.tsx'
 import { VscLinkExternal } from 'react-icons/vsc'
 import { api } from './api.ts'
 import { embeddabilityOf, isAllowedLoopbackUrl, normalizeBrowserUrl } from './browser.ts'

package/src/client/DiffTab.tsx

@@ -8,7 +8,7 @@
  * very content it shows.
  */
 import { useCallback, useEffect, useState } from 'react'
-import { IconRefreshOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconRefreshOutline16 } from './icons.tsx'
 import type { SessionScope } from './api.ts'
 import { api } from './api.ts'
 import type { SidebarDiffRef } from './state.ts'

package/src/client/EditorHost.tsx

@@ -25,7 +25,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react'
 import { createElement } from 'react'
 import clsx from 'clsx'
-import { IconCheckOutline16, IconFolderOpen16, IconRefreshOutline14 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCheckOutline16, IconFolderOpen16, IconRefreshOutline14 } from './icons.tsx'
 import type { Context } from '../context-types.ts'
 import { api, isOutsideWorkspaceMessage, mediaUrl, type SessionScope } from './api.ts'
 import { BinaryDownload } from './binary-download.tsx'

package/src/client/FileTree.tsx

@@ -23,15 +23,20 @@
 import { useCallback, useEffect, useRef, useState, type DragEvent, type MouseEvent, type ReactNode } from 'react'
 import { createPortal } from 'react-dom'
 import clsx from 'clsx'
-import {
-  IconChevronRightOutline14, IconCodeOutline16, IconCopyOutline16, IconDownloadOutline16,
-  IconLinkOutline16, Menu, type MenuEntry, type MenuItem, writeClipboard,
-} from '@deepseek-ai/dsh-client-ui-primitives'
+import { Menu, type MenuEntry, type MenuItem, writeClipboard } from '@deepseek-ai/dsh-client-ui-primitives'
 import { SiCursor, SiZedindustries } from 'react-icons/si'
 import { VscFile, VscFolder, VscFolderOpened, VscLinkExternal, VscPin, VscPinned } from 'react-icons/vsc'
 import { api, downloadUrl, isOutsideWorkspaceMessage, type FsEntry } from './api.ts'
 import { FenceErrorNotice } from './FenceErrorNotice.tsx'
-import { IconUploadOutline16, IconVscode16 } from './icons.tsx'
+import {
+  IconChevronRightOutline14,
+  IconCodeOutline16,
+  IconCopyOutline16,
+  IconDownloadOutline16,
+  IconLinkOutline16,
+  IconUploadOutline16,
+  IconVscode16,
+} from './icons.tsx'
 import type { OpenWithTarget } from './open-with.ts'
 import { relativeTo } from './paths.ts'
 import { t } from './locales.ts'

package/src/client/FreeWindow.tsx

@@ -16,7 +16,8 @@
  */
 import { useEffect, useRef, useState, type ReactNode } from 'react'
 import clsx from 'clsx'
-import { IconCloseFill14, Menu } from '@deepseek-ai/dsh-client-ui-primitives'
+import { Menu } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCloseFill14 } from './icons.tsx'
 import type { FloatWindow, SidebarTab } from './state.ts'
 import { FLOAT_MIN_H, FLOAT_MIN_W } from './state.ts'
 import { t } from './locales.ts'

package/src/client/GitView.tsx

@@ -10,10 +10,14 @@
  * file changes appear without a manual refresh.
  */
 import { useCallback, useEffect, useRef, useState, type MouseEvent, type ReactNode } from 'react'
+import { Button, Input, Menu, Modal, writeClipboard } from '@deepseek-ai/dsh-client-ui-primitives'
 import {
-  Button, IconBranchOutline16, IconCodeOutline16, IconCopyOutline16, IconRefreshOutline16,
-  IconTrashOutline16, Input, Menu, Modal, writeClipboard,
-} from '@deepseek-ai/dsh-client-ui-primitives'
+  IconBranchOutline16,
+  IconCodeOutline16,
+  IconCopyOutline16,
+  IconRefreshOutline16,
+  IconTrashOutline16,
+} from './icons.tsx'
 import type { GitLogEntry, GitStatusEntry, GitStatusResult, GitWorktree, SessionScope } from './api.ts'
 import { api } from './api.ts'
 import { isWithinWorkspace, relativeTo } from './paths.ts'

package/src/client/SideCardSection.tsx

@@ -41,14 +41,7 @@
  * shell.
  */
 import { Fragment, useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
-import {
-  IconChevronDownOutline14,
-  IconPlusOutline16,
-  IconSettingsOutline16,
-  Input,
-  Menu,
-  Modal,
-} from '@deepseek-ai/dsh-client-ui-primitives'
+import { Input, Menu, Modal } from '@deepseek-ai/dsh-client-ui-primitives'
 import clsx from 'clsx'
 // Type-only: pulls the settings shell's SlotMap merges ('settings.section').
 import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
@@ -63,6 +56,7 @@ import {
   type TitleBarScheme,
 } from '../prefs-shared.ts'
 import { api } from './api.ts'
+import { IconChevronDownOutline14, IconPlusOutline16, IconSettingsOutline16 } from './icons.tsx'
 import { parsePrefs } from './prefs.ts'
 import { AddPluginModal, type PluginKind } from './add-plugin-modal.tsx'
 import {

package/src/client/Sidebar.tsx

@@ -36,7 +36,7 @@ import { createElement, memo, useCallback, useEffect, useMemo, useRef, useState,
 import { useSyncExternalStore } from 'react'
 import { createPortal } from 'react-dom'
 import clsx from 'clsx'
-import { IconCloseFill14, Tooltip } from '@deepseek-ai/dsh-client-ui-primitives'
+import { Tooltip } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { Context } from '../context-types.ts'
 import { appendToDraft } from './conversation-draft.ts'
 import {
@@ -47,7 +47,7 @@ import {
   type DropZone, type SidebarState, type SidebarStore, type SidebarTab, type SplitNode,
 } from './state.ts'
 import { collectPinnedTabs, createPinnedVirtualTab, getPinnedHomeScope, injectPinnedIntoTree, isPinnedVirtualId, isPinnedVirtualTab, parsePinnedVirtualId, type PinnedTabEntry } from './pinned.ts'
-import { IconBookOutline16, IconPinOutline16 } from './icons.tsx'
+import { IconBookOutline16, IconCloseFill14, IconPinOutline16 } from './icons.tsx'
 import { IconPanelBottomOutline16, IconPanelRightOutline16 } from './icons.tsx'
 import { Workbench, type WorkbenchActions } from './split-pane.tsx'
 import { isNarrowWidth, useViewportSize } from './breakpoints.ts'

package/src/client/TabBar.tsx

@@ -10,13 +10,11 @@
  */
 import { useEffect, useRef, useState, type ReactNode } from 'react'
 import clsx from 'clsx'
-import {
-  IconCloseFill14, IconPlusOutline16, Menu,
-} from '@deepseek-ai/dsh-client-ui-primitives'
+import { Menu } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { SidebarTab } from './state.ts'
 import { isAgentTabId } from './state.ts'
 import { isPinnedVirtualTab } from './pinned.ts'
-import { IconPinOutline16 } from './icons.tsx'
+import { IconCloseFill14, IconPinOutline16, IconPlusOutline16 } from './icons.tsx'
 import { t } from './locales.ts'
 import css from './sidebar.module.css'
 

package/src/client/TextEditor.tsx

@@ -19,7 +19,8 @@ import clsx from 'clsx'
 import { EditorState } from '@codemirror/state'
 import { EditorView as CodeMirrorView, keymap, lineNumbers } from '@codemirror/view'
 import { defaultKeymap, history, historyKeymap } from '@codemirror/commands'
-import { IconCheckOutline16, MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives'
+import { MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCheckOutline16 } from './icons.tsx'
 import { markdownTextProps } from './markdown-labels.tsx'
 import { api, htmlUrl } from './api.ts'
 import { rewriteLocalImageUrls } from './markdown-images.ts'

package/src/client/TreePanel.tsx

@@ -17,11 +17,10 @@
  */
 import { useEffect, useRef, useState, type InputHTMLAttributes } from 'react'
 import clsx from 'clsx'
-import { IconFolderOpen16, IconRefreshOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import { api } from './api.ts'
 import type { SidebarStore } from './state.ts'
 import { FileTree } from './FileTree.tsx'
-import { IconUploadOutline16 } from './icons.tsx'
+import { IconFolderOpen16, IconRefreshOutline16, IconUploadOutline16 } from './icons.tsx'
 import type { OpenWithTarget } from './open-with.ts'
 import { t } from './locales.ts'
 import { resolveSidebarPath } from './produced-files.ts'

package/src/client/UsageHeatmapSection.tsx

@@ -4,7 +4,7 @@ import {
   IconChevronRightOutline14,
   IconLoadingOutline16,
   IconRefreshOutline14,
-} from '@deepseek-ai/dsh-client-ui-primitives'
+} from './icons.tsx'
 import clsx from 'clsx'
 // Type-only: pulls the settings shell's SlotMap merges ('settings.section').
 import type {} from '@deepseek-ai/dsh-client-ui-settings/client'

package/src/client/builtins/tabs.tsx

@@ -7,7 +7,6 @@
  * `browser:<n>` the same way (no quota). The editor IS the files window
  * (the old standalone explorer merged into it).
  */
-import { IconBranchOutline16, IconCodeOutline16, IconFolderOpen16, IconPanelLeftOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { Context } from '../../context-types.ts'
 import { allLeaves, isAgentTabId, type SidebarState } from '../state.ts'
 import { t } from '../locales.ts'
@@ -18,7 +17,15 @@ import { lazyChunkComponent } from '../lazy-chunk.tsx'
 import { GitView } from '../GitView.tsx'
 import { DiffTab } from '../DiffTab.tsx'
 import { BrowserView } from '../BrowserView.tsx'
-import { IconTerminalOutline16, IconDiffOutline16, IconGlobeOutline16 } from '../icons.tsx'
+import {
+  IconBranchOutline16,
+  IconCodeOutline16,
+  IconDiffOutline16,
+  IconFolderOpen16,
+  IconGlobeOutline16,
+  IconPanelLeftOutline16,
+  IconTerminalOutline16,
+} from '../icons.tsx'
 import { TERMINAL_FONT_SIZE_MAX, TERMINAL_FONT_SIZE_MIN } from '../../prefs-shared.ts'
 import type { ComponentType } from 'react'
 import type { SessionScope } from '../api.ts'

package/src/client/builtins/viewers.tsx

@@ -22,11 +22,12 @@
  * and `icon` — so the Side card settings page can render the enable/disable
  * inventory without hardcoding (eating our own dogfood).
  */
-import { IconCodeOutline16, IconDownloadOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import { lazyChunkComponent } from '../lazy-chunk.tsx'
 import { PdfView } from '../PdfView.tsx'
 import { BinaryDownload } from '../binary-download.tsx'
 import {
+  IconCodeOutline16,
+  IconDownloadOutline16,
   IconImageOutline16,
   IconMarkdownOutline16,
   IconPdfOutline16,