* feat(sidebar): 桌面兼容三方案——自动检测(WCO 标准几何)/壳预设/自定义 CSS 核心只保留 Web 标准机制,壳专属适配全部下沉到用户空间(KISS): - prefs 新增 titleBarScheme(默认 auto)/titleBarPresetId/customCss,旧 titleBarCompat 布尔自动迁移(true→custom 保留 stripPx,false/缺失→auto) - wco.ts:navigator.windowControlsOverlay 反应式几何(geometrychange 实时更新; visible=false 的幽灵 API 视为缺失),实现 #257 - titlebar-strip.ts 唯一 strip 取值链:WCO → dsh-desktop-titlebar-inset 契约参数 → 预设 stripFor → 手动 px → 0;desktop-env.ts 移除 win32 32px 硬编码 - shell-presets.ts 数据驱动预设(准入:issue/PR 提及 + 100+ star;v1 仅 anywhere-labs DSH Desktop:darwin 20px / win32 无 WCO 时 32px),opt-in 手动 - 预设/自定义 CSS 注入(data-dsh-preset-css / data-dsh-custom-css 标签), chrome 补稳定寻址面 data-dsh-toggle-cluster / data-dsh-panel - 交互 chrome 统一 -webkit-app-region: no-drag(吸收 #111/#153) - layout.css 底栏推挤复合锚点([data-pane] 与 :has(> [data-slot]) 双保险, rc.8 实测前者失效、后者命中,吸收 #226 思路) - 设置 UI:位置兼容模式齿轮弹窗改三方案(自动检测/壳兼容方案/自定义方案) - 测试:wco/titlebar-strip/shell-presets 单测 + prefs 迁移 + e2e 5 场景 (保守 auto/WCO 反应式/预设/自定义 CSS/复合锚点),挂载门禁 12/12 全绿 核心 grep 无壳专属类名;为某壳做的兼容在另一壳会再坏——预设与自定义 CSS 是唯一出路(AGENTS.md §8 契约已更新)。 * refine(sidebar): 位置兼容模式改主行下拉四选项——自动检测/DSH官方Web/壳预设/自定义 按用户反馈定稿 UI: - 主行下拉:自动检测(默认)/ DSH官方Web(显式零适配,连 WCO 也强制 0)/ 各壳预设(命中环境带「已检测」后缀,仅提示)/ 自定义方案(保留齿轮弹窗: 下移距离 + 自定义 CSS) - 旧文档迁移:titleBarCompat=true 或 titleBarStripPx 非默认值(此前已有配置) → 默认落到 custom 方案保留用户数值;干净文档 → auto - prefs 新增 'web' 方案;strip 取值链最优先处理 web→0 - 测试:prefs 迁移(stripPx 48→custom / 40→auto)、web 强制 0、下拉渲染断言 - 单测 693 通过,挂载 e2e 12/12 全绿 * refine(sidebar): 方案下拉复用 SelectMenu 组件,不用原生 <select> - 抽出可复用 SelectMenu(primitives Menu:锚点按钮 + 下拉选项卡,支持 icon/desc/多选),SelectRow 改为其薄壳 - 位置兼容模式方案下拉改用 SelectMenu;选项带描述(自动检测/DSH官方Web/ 各壳预设(命中带「已检测」后缀)/自定义方案) - 移除原生 select 样式;单测 693 通过,挂载 e2e 12/12 全绿
208 lines
9.4 KiB
TypeScript
208 lines
9.4 KiB
TypeScript
/**
|
|
* Client-side read of the user-facing "Side card" preferences. The host owns
|
|
* the namespace through the settings seam (in-process); the DSH settings RPC
|
|
* domain only serves allowlisted namespaces to configuration clients, so the
|
|
* client reads and writes THIS namespace through the plugin's own fenced
|
|
* /sidebar routes instead (api.settingsGet/settingsUpdate). Any failure
|
|
* (route rejected, namespace absent, a field of the wrong type, a value out
|
|
* of the contract range) falls back to the schema defaults — the side card
|
|
* must keep working exactly as composed when the settings surface is missing.
|
|
*/
|
|
import type { api } from './api.ts'
|
|
import {
|
|
clampTerminalFontSize,
|
|
clampTitleBarStrip,
|
|
clampWidthPercent,
|
|
SIDEBAR_PREFS_DEFAULTS,
|
|
TITLE_BAR_SCHEMES,
|
|
TITLE_BAR_STRIP_DEFAULT,
|
|
type SidebarPrefs,
|
|
type TitleBarScheme,
|
|
} from '../prefs-shared.ts'
|
|
|
|
export {
|
|
SIDEBAR_PREFS_DEFAULTS,
|
|
TITLE_BAR_SCHEMES,
|
|
TITLE_BAR_STRIP_DEFAULT,
|
|
clampTerminalFontSize,
|
|
clampTitleBarStrip,
|
|
clampWidthPercent,
|
|
}
|
|
export type { SidebarPrefs, TitleBarScheme }
|
|
|
|
/** The settings wire face the preferences need (a subset of the plugin api). */
|
|
export type SidebarSettingsClient = Pick<typeof api, 'settingsGet' | 'settingsUpdate'>
|
|
|
|
/** Validate one raw resolved value into {@link SidebarPrefs}. Used for the
|
|
* settings.get payload AND the settings.update response (both carry the
|
|
* layered resolved value); any malformed field falls back to its default.
|
|
* @param value - the raw resolved section from the settings wire.
|
|
* @returns validated prefs (always well-formed).
|
|
*/
|
|
export function parsePrefs(value: unknown): SidebarPrefs {
|
|
if (value === null || typeof value !== 'object') return { ...SIDEBAR_PREFS_DEFAULTS }
|
|
const record = value as Record<string, unknown>
|
|
return {
|
|
openByDefault: typeof record.openByDefault === 'boolean'
|
|
? record.openByDefault
|
|
: SIDEBAR_PREFS_DEFAULTS.openByDefault,
|
|
defaultWidthPercent: typeof record.defaultWidthPercent === 'number' && Number.isFinite(record.defaultWidthPercent)
|
|
? clampWidthPercent(record.defaultWidthPercent)
|
|
: SIDEBAR_PREFS_DEFAULTS.defaultWidthPercent,
|
|
autoOpenSubagent: typeof record.autoOpenSubagent === 'boolean'
|
|
? record.autoOpenSubagent
|
|
: SIDEBAR_PREFS_DEFAULTS.autoOpenSubagent,
|
|
autoOpenJobs: typeof record.autoOpenJobs === 'boolean'
|
|
? record.autoOpenJobs
|
|
: SIDEBAR_PREFS_DEFAULTS.autoOpenJobs,
|
|
agentTerminalTools: typeof record.agentTerminalTools === 'boolean'
|
|
? record.agentTerminalTools
|
|
: SIDEBAR_PREFS_DEFAULTS.agentTerminalTools,
|
|
bottomPanelAutoTerminal: typeof record.bottomPanelAutoTerminal === 'boolean'
|
|
? record.bottomPanelAutoTerminal
|
|
: SIDEBAR_PREFS_DEFAULTS.bottomPanelAutoTerminal,
|
|
terminalFontFamily: typeof record.terminalFontFamily === 'string'
|
|
? record.terminalFontFamily
|
|
: SIDEBAR_PREFS_DEFAULTS.terminalFontFamily,
|
|
terminalShell: typeof record.terminalShell === 'string'
|
|
? record.terminalShell
|
|
: SIDEBAR_PREFS_DEFAULTS.terminalShell,
|
|
terminalShellArgs: typeof record.terminalShellArgs === 'string'
|
|
? record.terminalShellArgs
|
|
: SIDEBAR_PREFS_DEFAULTS.terminalShellArgs,
|
|
terminalFontSize: typeof record.terminalFontSize === 'number' && Number.isFinite(record.terminalFontSize)
|
|
? clampTerminalFontSize(record.terminalFontSize)
|
|
: SIDEBAR_PREFS_DEFAULTS.terminalFontSize,
|
|
interceptOpenPath: typeof record.interceptOpenPath === 'boolean'
|
|
? record.interceptOpenPath
|
|
: SIDEBAR_PREFS_DEFAULTS.interceptOpenPath,
|
|
editorExplorer: typeof record.editorExplorer === 'boolean'
|
|
? record.editorExplorer
|
|
: SIDEBAR_PREFS_DEFAULTS.editorExplorer,
|
|
// The title-bar scheme (auto | web | preset | custom). The schema
|
|
// declares the field WITHOUT a default, so documents written by older
|
|
// plugin versions resolve without it — migrate from the legacy fields:
|
|
// a document that ALREADY HAS VALUES (the manual compat flag on, or a
|
|
// non-default strip px — both only reachable through the old gear
|
|
// popup) maps to the `custom` scheme so the user's numbers keep
|
|
// working; a pristine document keeps the conservative `auto` scheme.
|
|
titleBarScheme: isTitleBarScheme(record.titleBarScheme)
|
|
? record.titleBarScheme
|
|
: (record.titleBarCompat === true || hasLegacyStripValue(record.titleBarStripPx) ? 'custom' : 'auto'),
|
|
titleBarPresetId: typeof record.titleBarPresetId === 'string'
|
|
? record.titleBarPresetId
|
|
: SIDEBAR_PREFS_DEFAULTS.titleBarPresetId,
|
|
customCss: typeof record.customCss === 'string'
|
|
? record.customCss
|
|
: SIDEBAR_PREFS_DEFAULTS.customCss,
|
|
titleBarCompat: typeof record.titleBarCompat === 'boolean'
|
|
? record.titleBarCompat
|
|
: SIDEBAR_PREFS_DEFAULTS.titleBarCompat,
|
|
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,
|
|
browserInterceptLinks: typeof record.browserInterceptLinks === 'boolean'
|
|
? record.browserInterceptLinks
|
|
: SIDEBAR_PREFS_DEFAULTS.browserInterceptLinks,
|
|
browserInterceptHttp: typeof record.browserInterceptHttp === 'boolean'
|
|
? record.browserInterceptHttp
|
|
: SIDEBAR_PREFS_DEFAULTS.browserInterceptHttp,
|
|
browserInterceptHttps: typeof record.browserInterceptHttps === 'boolean'
|
|
? record.browserInterceptHttps
|
|
: SIDEBAR_PREFS_DEFAULTS.browserInterceptHttps,
|
|
tabsEnabled: booleanMapOf(record.tabsEnabled),
|
|
viewersEnabled: booleanMapOf(record.viewersEnabled),
|
|
pluginSettings: pluginSettingsMapOf(record.pluginSettings),
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Validate the plugin-owned settings map (v0.12.0+): `{ descriptorId: { key:
|
|
* value } }`, nested open maps. Any non-object value (or a malformed whole)
|
|
* falls back to the empty map — the schema defaults already guard the wire
|
|
* shape, this is the client's second line.
|
|
*/
|
|
function pluginSettingsMapOf(value: unknown): Record<string, Record<string, unknown>> {
|
|
if (value === null || typeof value !== 'object' || Array.isArray(value)) return {}
|
|
const out: Record<string, Record<string, unknown>> = {}
|
|
for (const [id, blob] of Object.entries(value as Record<string, unknown>)) {
|
|
if (blob !== null && typeof blob === 'object' && !Array.isArray(blob)) {
|
|
out[id] = blob as Record<string, unknown>
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
/**
|
|
* Validate one enable-switch map (per-tab / per-viewer). Only boolean values
|
|
* survive; a non-object or a non-boolean entry falls back to the empty map /
|
|
* drops the entry — an absent key means the feature stays enabled.
|
|
*/
|
|
function booleanMapOf(value: unknown): Record<string, boolean> {
|
|
if (value === null || typeof value !== 'object' || Array.isArray(value)) return {}
|
|
const out: Record<string, boolean> = {}
|
|
for (const [key, item] of Object.entries(value as Record<string, unknown>)) {
|
|
if (typeof item === 'boolean') out[key] = item
|
|
}
|
|
return out
|
|
}
|
|
|
|
/** Type guard for the title-bar scheme union (anything else falls back). */
|
|
function isTitleBarScheme(value: unknown): value is TitleBarScheme {
|
|
return typeof value === 'string' && (TITLE_BAR_SCHEMES as readonly string[]).includes(value)
|
|
}
|
|
|
|
/**
|
|
* Whether the legacy document carries an explicit strip value (only
|
|
* reachable through the old gear popup): a stored number different from the
|
|
* default counts as "the user already configured something" and migrates to
|
|
* the `custom` scheme.
|
|
*/
|
|
function hasLegacyStripValue(value: unknown): boolean {
|
|
return typeof value === 'number' && Number.isFinite(value) && value !== TITLE_BAR_STRIP_DEFAULT
|
|
}
|
|
|
|
/**
|
|
* Read the resolved side card preferences through the plugin's settings route.
|
|
* @param settings - the settings wire face (the plugin api by default).
|
|
* @returns validated prefs, or the schema defaults when the route rejects,
|
|
* the namespace is absent, or a stored value violates the contract.
|
|
*/
|
|
export async function loadPrefs(settings: SidebarSettingsClient): Promise<SidebarPrefs> {
|
|
try {
|
|
const view = await settings.settingsGet()
|
|
return parsePrefs(view.value)
|
|
} catch {
|
|
// Transport/fence rejection or a malformed response: keep the defaults.
|
|
return { ...SIDEBAR_PREFS_DEFAULTS }
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Read the external-disable flag from the same settings route: the
|
|
* dsh-web-ui family's aionui-panel provider choice. True only when the host
|
|
* resolved `aionui-panel.rightPanel` to 'aionui-panel' — while true the
|
|
* sidebar must not mount (the two right panels are mutually exclusive). Any
|
|
* failure (route rejected, aionui absent, malformed response) reads false,
|
|
* so a missing family never hides the sidebar.
|
|
* @param settings - the settings wire face (the plugin api by default).
|
|
* @returns the external-disable flag (false on any failure).
|
|
*/
|
|
export async function loadExternalDisable(settings: SidebarSettingsClient): Promise<boolean> {
|
|
try {
|
|
const view = await settings.settingsGet()
|
|
return view.externalDisable === true
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|