@modesto_ma/dsh-channels 0.2.0 → 0.4.0

package/src/session-commands.ts

@@ -61,8 +61,8 @@ export interface SessionStatusCardInput {
 export interface SessionStatusExtras {
   /** Effective permission preset of this Session (`ctx.permissionPresets`). */
   permissionPreset?: string
-  /** Workspace directory bound to this route. */
-  workspacePath?: string
+  /** Effective working directory of this Session (its topic directory). */
+  sessionDir?: string
   /** Plugin uptime in milliseconds. */
   uptimeMs?: number
   /** Live agent entries this channel owns/borrows. */
@@ -123,7 +123,7 @@ function statusExtrasElements(extras: SessionStatusExtras | undefined): object[]
   if (extras === undefined) return []
   const lines: string[] = []
   if (extras.permissionPreset !== undefined) lines.push(`**权限预设**：\`${escapeInlineCode(extras.permissionPreset)}\``)
-  if (extras.workspacePath !== undefined) lines.push(`**工作区**：\`${escapeInlineCode(extras.workspacePath)}\``)
+  if (extras.sessionDir !== undefined) lines.push(`**会话目录**：\`${escapeInlineCode(extras.sessionDir)}\``)
   if (extras.uptimeMs !== undefined) lines.push(`**插件运行时长**：${fmtUptime(extras.uptimeMs)}`)
   if (extras.liveAgents !== undefined || extras.routeCount !== undefined) {
     const parts: string[] = []
@@ -148,33 +148,59 @@ export type WorkDirResolution =
   | { kind: 'missing'; text: string }
   | { kind: 'mismatch'; text: string }
 
-/** Validate the Session header cwd against the plugin's durable route. */
-export function resolveWorkDir(headerCwd: string | undefined, routeWorkspacePath: string): WorkDirResolution {
+/** The durable route facts needed to verify a Session's working directory. */
+export interface WorkDirRoute {
+  /** Workspace root owning the Session (its header cwd when grouped). */
+  readonly workspacePath: string
+  /** Effective working directory (topic directory / worktree); absent on v1 routes. */
+  readonly sessionDir?: string
+}
+
+/**
+ * Validate the Session header cwd against the plugin's durable route and
+ * return the Session's effective working directory.
+ *
+ * The header cwd is normally the workspace root (the Session stays grouped
+ * under the user's project while working in a per-topic directory). In the
+ * degraded placement used when the host exposes no `workingDirectory` service,
+ * the header cwd is the topic directory itself.
+ */
+export function resolveWorkDir(
+  headerCwd: string | undefined,
+  route: WorkDirRoute,
+): WorkDirResolution {
   if (headerCwd === undefined || headerCwd === '' || !path.isAbsolute(headerCwd)) {
     return {
       kind: 'missing',
       text: '当前 Session header 未记录可用的绝对工作目录；请检查 Session 创建或恢复配置。',
     }
   }
-  if (!path.isAbsolute(routeWorkspacePath)) {
+  if (!path.isAbsolute(route.workspacePath)) {
+    return {
+      kind: 'missing',
+      text: '当前飞书路由未记录可用的工作区目录；请检查路由持久化状态。',
+    }
+  }
+  if (route.sessionDir !== undefined && !path.isAbsolute(route.sessionDir)) {
     return {
       kind: 'missing',
-      text: '当前飞书路由未记录可用的绝对工作目录；请检查路由持久化状态。',
+      text: '当前飞书路由未记录可用的会话目录；请检查路由持久化状态。',
     }
   }
-  if (headerCwd !== routeWorkspacePath) {
+  const expected = route.sessionDir ?? route.workspacePath
+  if (headerCwd !== route.workspacePath && headerCwd !== expected) {
     return {
       kind: 'mismatch',
       text: 'Session header 与飞书路由记录的工作目录不一致；为避免返回错误目录，已拒绝显示。',
     }
   }
-  return { kind: 'success', path: headerCwd }
+  return { kind: 'success', path: expected }
 }
 
-/** Render one verified absolute workspace path. */
-export function buildWorkDirCard(sessionId: string, workspacePath: string): object {
+/** Render one verified absolute working directory. */
+export function buildWorkDirCard(sessionId: string, sessionDir: string): object {
   return standaloneCard('**📁 当前工作目录**', [
-    { tag: 'markdown', content: `\`${escapeInlineCode(workspacePath)}\`` },
+    { tag: 'markdown', content: `\`${escapeInlineCode(sessionDir)}\`` },
     { tag: 'markdown', content: sessionId, text_size: 'notation' },
   ])
 }
@@ -182,7 +208,8 @@ export function buildWorkDirCard(sessionId: string, workspacePath: string): obje
 export interface RenewCardInput {
   previousSessionId: string
   currentSessionId: string
-  workspacePath: string
+  /** Topic directory that the renewed Session reuses. */
+  sessionDir: string
 }
 
 /** Render the committed route switch without implying that the old log was deleted. */
@@ -192,7 +219,7 @@ export function buildRenewCard(input: RenewCardInput): object {
       tag: 'markdown',
       content: `**旧 Session**：${input.previousSessionId}\n`
         + `**新 Session**：${input.currentSessionId}\n`
-        + `**复用工作区**：\`${escapeInlineCode(input.workspacePath)}\``,
+        + `**复用目录**：\`${escapeInlineCode(input.sessionDir)}\``,
     },
     { tag: 'markdown', content: '旧 Session 及其日志仍由 Harness 保留。', text_size: 'notation' },
   ])

package/src/settings/contract.ts

@@ -20,7 +20,7 @@ export const CREDENTIALS_ROUTE = '/dsh-channels/credentials'
 export const RECONNECT_ROUTE = '/dsh-channels/reconnect'
 /** 模型/推理档位/预设选择器的宿主目录（provider → model → effort 级联刷新）。 */
 export const CATALOG_ROUTE = '/dsh-channels/catalog'
-/** 手动执行一次过期工作区清理（POST，无请求体）。 */
+/** 手动执行一次过期目录清理（POST，无请求体）。 */
 export const CLEANUP_ROUTE = '/dsh-channels/cleanup'
 /** 访问与授权只读快照（GET/HEAD）：准入模式、管理员、群/用户白名单、待处理申请。 */
 export const ACCESS_ROUTE = '/dsh-channels/access'
@@ -40,16 +40,17 @@ export const ACCESS_REQUESTS_ROUTE = '/dsh-channels/access/requests'
 export const PICK_DIRECTORY_ROUTE = '/dsh-channels/pick-directory'
 
 /**
- * 可由 Web 面板覆盖的配置项。全部是 `src/config.ts` 里已存在的字段；
- * 覆盖值写进 `$DSH_HOME/dsh-channels/settings.json`，优先级高于 profile
- * 的 `cordis.patch.yml`（见 README「Web 设置面板」）。
+ * 可由 Web 面板覆盖的配置项。顶层键对应 `src/config.ts` 的字段；`feishuTools.*`
+ * 是嵌套字段（覆盖层里仍写成 `{ "feishuTools": { ... } }` 对象）。覆盖值写进
+ * `$DSH_HOME/dsh-channels/settings.json`，优先级高于 profile 的
+ * `cordis.patch.yml`（见 README「Web 设置面板」）。
  *
  * 刻意不包含 `appId` / `appSecret`：它们是**凭据引用名**，面板改为直接
  * 编辑引用背后的值（`PUT /dsh-channels/credentials`，经 DSH 凭据服务写入），
  * 因此不会落进覆盖层文件。
  *
  * `baseDir`（工作区根目录 = 模型/工具产生文件的落点）可覆盖，但面板只接受
- * **绝对路径**（`~` 会展开）；已有 Session / 工作区不迁移，只影响之后新建的
+ * **绝对路径**（`~` 会展开）；已有 Session / 目录不迁移，只影响之后新建的
  * 会话。校验与保存时建目录见 `src/workspaces.ts`。
  */
 export const EDITABLE_KEYS = [
@@ -67,8 +68,24 @@ export const EDITABLE_KEYS = [
   'adminOpenId',
   'accessMode',
   'authRequestTtlDays',
-  // 内容
+  // 内容与附件（v2 管线；`feishuTools.*` 是嵌套配置，覆盖层仍写成嵌套对象）
   'acceptAttachments',
+  'attachmentStore',
+  'prefetchImages',
+  'prefetchTimeoutMs',
+  'prefetchImageMaxBytes',
+  'prefetchTotalMaxBytes',
+  'historyBootstrapLimit',
+  'pendingAttachmentTtlMs',
+  'pendingAttachmentLimit',
+  // 模型工具（feishuTools 子项）
+  'feishuTools.attachmentFetch',
+  'feishuTools.attachmentFetchMaxResources',
+  'feishuTools.attachmentFetchMaxBytes',
+  'feishuTools.attachmentFetchTimeoutMs',
+  'feishuTools.topicMessages',
+  'feishuTools.topicMessagesTimeoutMs',
+  'promptContextTimeoutMs',
   // 模型
   'provider',
   'model',
@@ -104,7 +121,7 @@ export type FieldKind = 'boolean' | 'number' | 'text' | 'select'
  * panel tab (see {@link TAB_FIELD_GROUPS}); the Host is the source of truth for
  * which key belongs to which group.
  */
-export type FieldGroup = 'workspace' | 'behavior' | 'content' | 'model' | 'streaming' | 'access'
+export type FieldGroup = 'workspace' | 'behavior' | 'content' | 'tools' | 'model' | 'streaming' | 'access'
 
 /** One selectable value rendered by the generic form. */
 export interface FieldOptionWire {
@@ -361,9 +378,9 @@ export interface CleanupPreviewWire {
   thresholdMs?: number
   /** Periodic cleanup runs at startup and once per day. */
   auto: boolean
-  /** Plugin-created workspaces under the current baseDir. */
+  /** Plugin-created workspaces under the current baseDir (user projects). */
   workspaces: number
-  /** Workspaces older than the threshold (the deletable set). */
+  /** Directories older than the threshold (legacy topic workspaces + per-topic dirs). */
   candidates: number
   /** Total bytes currently occupied by the candidates. */
   candidateBytes: number
@@ -375,9 +392,11 @@ export interface CleanupPreviewWire {
 export interface CleanupRunWire {
   ok: boolean
   deletedWorkspaces: number
+  /** Per-topic working directories removed (current layout). */
+  deletedSessionDirs: number
   retiredRoutes: number
   freedBytes: number
-  /** One `path: message` line per workspace that could not be deleted. */
+  /** One `path: message` line per directory that could not be deleted. */
   failures: string[]
   error?: string
 }
@@ -484,7 +503,7 @@ export type PanelTabId = (typeof PANEL_TABS)[number]['id']
 /** Which editable field groups each tab renders (the tabs own one or two). */
 export const TAB_FIELD_GROUPS: Readonly<Record<PanelTabId, readonly FieldGroup[]>> = {
   connection: [],
-  sessions: ['behavior', 'content'],
+  sessions: ['behavior', 'content', 'tools'],
   model: ['model'],
   workspace: ['workspace'],
   access: ['access'],
@@ -496,6 +515,7 @@ export const FIELD_GROUP_LABELS: Readonly<Record<FieldGroup, string>> = {
   workspace: '工作区与文件',
   behavior: '行为',
   content: '内容与附件',
+  tools: '模型工具',
   model: '模型与推理',
   streaming: '流式卡片与日志',
   access: '准入与授权',
@@ -568,9 +588,9 @@ export const PANEL_COPY = {
   credentialsPendingHint: '填写后点「保存凭据」；两项齐全时插件会自动连接飞书。',
   // ---- tabs / forms -------------------------------------------------------
   connectionTabHelp: '连接状态与飞书应用凭据。凭据不完整时不会连接飞书。',
-  sessionsTabHelp: '私聊、群聊触发方式与入站内容；「需重连」项在下次连接时读取。',
+  sessionsTabHelp: '私聊、群聊触发方式与入站内容：附件存储/预取、静默登记保留、模型工具开关与读取预算；「需重连」项在下次连接时读取。',
   modelTabHelp: '飞书会话使用的模型服务商、模型、推理档位与 Agent 预设；下拉选项来自宿主机实时目录，保存后对新会话生效。',
-  workspaceTabHelp: '每个飞书话题一个独立工作区（模型/工具产生文件的落点）；只影响之后新建的话题。',
+  workspaceTabHelp: '每个用户一个工作区（模型/工具产生文件的落点），每个话题在其中拥有独立工作目录；只影响之后新建的话题。入站附件默认存于 DSH 原生附件库，不占用话题目录，也不会被这里的目录清理删除。',
   accessTabHelp: '准入采用 fail-closed：管理员不受白名单限制，非管理员私聊会被拒绝，群聊需要「群已授权 + 用户在白名单」两层同时命中。',
   advancedTabHelp: '流式刷新等低层参数、Web 覆盖文件与只读信息。',
   save: '保存更改',
@@ -618,11 +638,12 @@ export const PANEL_COPY = {
   readOnlyCard: '部署级参数',
   // ---- model --------------------------------------------------------------
   // ---- cleanup ------------------------------------------------------------
-  cleanupCard: '工作区清理',
-  cleanupCardHelp: '删除超过保留期且不再活跃的飞书工作区目录；只会删除本插件在「工作区根目录」下创建的目录，DSH 会话日志不删除。删除不可恢复：相关旧话题会失效并提示已过期，工作区列表记录同步移除。',
+  cleanupCard: '目录清理',
+  cleanupCardHelp: '只清理工作区与 Agent 产物：删除超过保留期且不再活跃的飞书话题目录、旧版本按话题建立的工作区目录，以及这些目录内 Agent 产生的文件；不影响 Session 附件——入站图片/文件默认存于 DSH 原生附件库，不随目录清理删除。用户工作区本身与 DSH 会话日志也不会删除。删除不可恢复：相关旧话题会失效并提示已过期。',
   cleanupRetention: '保留期',
   cleanupAutoLabel: '自动清理',
-  cleanupCandidates: '可清理工作区',
+  cleanupCandidates: '可清理目录',
+  cleanupWorkspaces: '插件工作区',
   cleanupCandidateBytes: '预计释放空间',
   cleanupRetentionOff: '关闭（不删除）',
   cleanupAutoOn: '已开启（启动时 + 每天一次）',
@@ -630,17 +651,18 @@ export const PANEL_COPY = {
   cleanupAutoInactive: '未执行（保留期为关闭）',
   cleanupNow: '立即清理',
   cleanupRunning: '清理中…',
-  cleanupConfirm: '确定清理过期工作区吗？该操作不可恢复，会删除这些工作区内的全部文件（包括 attachments/ 附件）。',
-  cleanupConfirmHint: '删除前会再次确认；保留期为「关闭」或没有过期工作区时按钮不可用。',
-  cleanupDisabledOff: '保留策略为「关闭」：请先在上方「过期工作区保留期」中选择保留天数。',
-  cleanupDisabledEmpty: '没有超过保留期的过期工作区。',
+  cleanupConfirm: '确定清理过期目录吗？只清理工作区与 Agent 产物，不影响 Session 附件；但这些目录内未提交的文件会被删除，且操作不可恢复。',
+  cleanupConfirmHint: '删除前会再次确认；保留期为「关闭」或没有过期目录时按钮不可用。',
+  cleanupDisabledOff: '保留策略为「关闭」：请先在上方「过期目录保留期」中选择保留天数。',
+  cleanupDisabledEmpty: '没有超过保留期的过期目录。',
   cleanupPreviewFailed: '无法读取清理预览',
   cleanupDone: '清理完成',
   cleanupFailed: '清理失败',
   cleanupDeleted: '已删除工作区',
+  cleanupDeletedDirs: '话题目录',
   cleanupRetired: '已清理话题路由',
   cleanupFreed: '释放空间',
-  cleanupFailures: '以下工作区未能删除：',
+  cleanupFailures: '以下目录未能删除：',
   // ---- access -------------------------------------------------------------
   accessCard: '访问与授权',
   accessCardHelp: '准入采用 fail-closed：管理员不受白名单限制（私聊、任意群聊都可直接对话）；非管理员私聊会被拒绝，群聊需要「群已授权 + 用户在白名单」两层同时命中。管理员与准入模式在上方「准入与授权」中编辑；私聊机器人发送 /userid 获取自己的 open_id。',

package/src/settings/overlay.ts

@@ -20,10 +20,89 @@ import { configSchema } from '../config.ts'
 import type { FeishuConfig } from '../config.ts'
 import { normalizeWorkspaceBaseDir } from '../workspaces.ts'
 import { EDITABLE_KEYS } from './contract.ts'
-import type { ConfigValue, EditableKey } from './contract.ts'
+import type { ConfigValue, EditableKey, EditableValues } from './contract.ts'
 
-/** The subset of `FeishuConfig` the Web panel may override. */
-export type OverlayPatch = Partial<Pick<FeishuConfig, EditableKey>>
+/** Prefix of a nested panel key that addresses one `feishuTools` field. */
+const FEISHU_TOOLS_PREFIX = 'feishuTools.'
+
+/** Panel keys that address a nested `feishuTools` field (e.g. `feishuTools.topicMessages`). */
+export type NestedEditableKey = Extract<EditableKey, `feishuTools.${string}`>
+
+/** Panel keys that address a top-level config field. */
+export type TopLevelEditableKey = Exclude<EditableKey, NestedEditableKey>
+
+/** One partial `feishuTools` object inside the overlay layer. */
+export type FeishuToolsOverlay = Partial<FeishuConfig['feishuTools']>
+
+/**
+ * The subset of `FeishuConfig` the Web panel may override. `feishuTools` stays
+ * partial: the overlay only records the sub-fields the operator actually
+ * changed, and the merge keeps every other value from the profile layer.
+ */
+export type OverlayPatch = Partial<Pick<FeishuConfig, TopLevelEditableKey>> & {
+  feishuTools?: FeishuToolsOverlay
+}
+
+/** Whether one editable key addresses a nested `feishuTools` field. */
+export function isNestedEditableKey(key: EditableKey): key is NestedEditableKey {
+  return key.startsWith(FEISHU_TOOLS_PREFIX)
+}
+
+/** `attachmentFetch` for the panel key `feishuTools.attachmentFetch`. */
+function nestedFieldOf(key: NestedEditableKey): keyof FeishuConfig['feishuTools'] {
+  return key.slice(FEISHU_TOOLS_PREFIX.length) as keyof FeishuConfig['feishuTools']
+}
+
+/** The `feishuTools` object of an untyped overlay/config record, when usable. */
+function toolsRecordOf(container: Record<string, unknown>): Record<string, unknown> | undefined {
+  const tools = container.feishuTools
+  if (typeof tools !== 'object' || tools === null || Array.isArray(tools)) return undefined
+  return tools as Record<string, unknown>
+}
+
+/** Read one editable value out of an untyped overlay record (nested-aware). */
+export function overlayValueOf(source: Record<string, unknown>, key: EditableKey): unknown {
+  if (!isNestedEditableKey(key)) return source[key]
+  return toolsRecordOf(source)?.[nestedFieldOf(key)]
+}
+
+/** Write one editable value into an untyped overlay record (nested-aware). */
+export function setOverlayValue(target: Record<string, unknown>, key: EditableKey, value: unknown): void {
+  if (!isNestedEditableKey(key)) {
+    target[key] = value
+    return
+  }
+  const tools = toolsRecordOf(target) ?? {}
+  tools[nestedFieldOf(key)] = value
+  target.feishuTools = tools
+}
+
+/** Read one editable value out of a resolved config (nested-aware). */
+export function configValueOf(config: FeishuConfig, key: EditableKey): ConfigValue | undefined {
+  if (!isNestedEditableKey(key)) return config[key] as ConfigValue | undefined
+  return config.feishuTools[nestedFieldOf(key)] as ConfigValue | undefined
+}
+
+/** Deep-merge one overlay patch over another (only `feishuTools` is nested). */
+export function mergeOverlayPatch(base: OverlayPatch, addition: OverlayPatch): OverlayPatch {
+  const merged: OverlayPatch = { ...base, ...addition }
+  if (base.feishuTools !== undefined || addition.feishuTools !== undefined) {
+    merged.feishuTools = { ...base.feishuTools, ...addition.feishuTools }
+  }
+  return merged
+}
+
+/** Remove one editable key from an overlay patch (nested-aware). */
+export function deleteOverlayKey(patch: OverlayPatch, key: EditableKey): void {
+  if (!isNestedEditableKey(key)) {
+    delete patch[key as TopLevelEditableKey]
+    return
+  }
+  const tools = patch.feishuTools
+  if (tools === undefined) return
+  delete tools[nestedFieldOf(key)]
+  if (Object.keys(tools).length === 0) delete patch.feishuTools
+}
 
 /** Fields whose empty string means "clear the override" (optional text config). */
 const OPTIONAL_TEXT_KEYS = new Set<EditableKey>(['provider', 'model', 'reasoningEffort', 'agentPreset'])
@@ -43,24 +122,38 @@ export function parseOverlay(raw: unknown): { ok: true; patch: OverlayPatch } |
   const issues: Array<{ path: string; message: string }> = []
   const patch: Record<string, unknown> = {}
   const shape = configSchema.shape as unknown as Record<string, z.ZodType>
+  const toolsShape = configSchema.shape.feishuTools
+  if (Object.hasOwn(source, 'feishuTools') && source.feishuTools !== undefined
+    && toolsRecordOf(source) === undefined) {
+    issues.push({ path: 'feishuTools', message: '必须是 JSON 对象' })
+  }
   for (const key of EDITABLE_KEYS) {
-    if (!Object.hasOwn(source, key)) continue
-    const value = source[key]
+    // Nested keys have no own property on the root object, so read through the
+    // shared accessor instead of `Object.hasOwn`.
+    const value = overlayValueOf(source, key)
     if (value === undefined) continue
     // `baseDir` needs location semantics the shared string schema cannot
     // express (absolute only, `~` expansion, no filesystem root).
     if (key === 'baseDir') {
       const checked = normalizeWorkspaceBaseDir(value)
       if (!checked.ok) issues.push({ path: key, message: checked.message })
-      else patch[key] = checked.value
+      else setOverlayValue(patch, key, checked.value)
       continue
     }
-    const parsed = shape[key]!.safeParse(value)
+    // Nested `feishuTools` values validate against the canonical sub-object
+    // schema; only the edited sub-field is copied out of the parsed result so
+    // schema defaults never leak into the overlay.
+    const parsed = isNestedEditableKey(key)
+      ? toolsShape.safeParse({ [nestedFieldOf(key)]: value })
+      : shape[key]!.safeParse(value)
     if (!parsed.success) {
       issues.push({ path: key, message: parsed.error.issues[0]?.message ?? '非法值' })
       continue
     }
-    patch[key] = parsed.data
+    const normalizedValue = isNestedEditableKey(key)
+      ? (parsed.data as FeishuConfig['feishuTools'])[nestedFieldOf(key)]
+      : parsed.data
+    setOverlayValue(patch, key, normalizedValue)
   }
   if (issues.length > 0) return { ok: false, issues }
   return { ok: true, patch: normalizeOverlay(patch) }
@@ -86,26 +179,44 @@ export interface OverlayLogger {
 export function normalizeOverlay(patch: Record<string, unknown>): OverlayPatch {
   const normalized: Record<string, unknown> = {}
   for (const key of EDITABLE_KEYS) {
-    const value = patch[key]
+    const value = overlayValueOf(patch, key)
     if (value === undefined) continue
     if (OPTIONAL_TEXT_KEYS.has(key) && value === '') continue
-    normalized[key] = value
+    setOverlayValue(normalized, key, value)
   }
   return normalized as OverlayPatch
 }
 
 /** Merge the Web overlay over the profile-provided base config. */
 export function mergeOverlay(base: FeishuConfig, overlay: OverlayPatch): FeishuConfig {
-  return { ...base, ...overlay }
+  const { feishuTools, ...topLevel } = overlay
+  const merged: FeishuConfig = { ...base, ...topLevel }
+  if (feishuTools !== undefined) merged.feishuTools = { ...base.feishuTools, ...feishuTools }
+  return merged
 }
 
-/** Project one config onto the editable-key subset (wire shape). */
+/** Project one config onto the editable-key subset (wire shape, nested keys dotted). */
 export function pickEditable(config: FeishuConfig): Record<EditableKey, ConfigValue | undefined> {
   const picked: Record<string, ConfigValue | undefined> = {}
-  for (const key of EDITABLE_KEYS) picked[key] = config[key] as ConfigValue | undefined
+  for (const key of EDITABLE_KEYS) picked[key] = configValueOf(config, key)
   return picked as Record<EditableKey, ConfigValue | undefined>
 }
 
+/**
+ * Project an overlay patch onto flat editable keys (nested `feishuTools.*`
+ * values become dotted keys). The panel wire uses the same key space as
+ * `fields` / `overriddenKeys`, so the client never has to know the nested
+ * storage layout.
+ */
+export function overlayValues(patch: OverlayPatch): EditableValues {
+  const values: Record<string, ConfigValue> = {}
+  for (const key of EDITABLE_KEYS) {
+    const value = overlayValueOf(patch as Record<string, unknown>, key)
+    if (value !== undefined) values[key] = value as ConfigValue
+  }
+  return values as EditableValues
+}
+
 /**
  * One JSON overlay file. Reads degrade to `{}` with a warning; writes are
  * atomic and owner-readable only.