@modesto_ma/dsh-channels 0.2.0 → 0.3.0

package/src/session/manager.ts

@@ -25,12 +25,14 @@ import type {
 } from '../dsh-types.ts'
 import type { FeishuConfig } from '../config.ts'
 import { mountChannelCommands } from '../commands.ts'
-import { appendSessionHistory } from '../domain.ts'
+import { appendSessionHistory, sessionDirOf } from '../domain.ts'
 import type { RouteRecord } from '../domain.ts'
 import { mountChannelGuidance } from '../feishu/agent-context.ts'
 import { attachmentsDir } from '../feishu/inbound-attachments.ts'
 import { installRequestPolicy } from './request-policy.ts'
 import type { RequestPolicyController } from './request-policy.ts'
+import { placementServices, restoreTopicDir } from './isolation.ts'
+import type { PlacementServices, TopicPlacement } from './isolation.ts'
 import { workspaceTitleFor } from '../workspaces.ts'
 
 /** One live agent plus this plugin's ownership handle. */
@@ -105,14 +107,16 @@ export class SessionManager {
 
   /**
    * Create the root agent for one freshly routed session and register it live.
-   * The caller owns the workspace attachment and the failure card.
+   * `cwd` is the Session header cwd (the user workspace when the deployment can
+   * switch directories). The caller owns placement, the workspace attachment,
+   * the attachment guidance, and the failure card.
    */
   async createSession(
     sessionId: SessionId,
     cwd: string,
     agentOptions: Record<string, unknown> = this.agentOptions(),
   ): Promise<AgentHandle> {
-    const composition = await this.presetComposition(undefined, true, attachmentsDir(cwd))
+    const composition = await this.presetComposition(undefined, true)
     const handle = await this.deps.ctx.agents.create({
       sessionId,
       meta: {
@@ -127,6 +131,24 @@ export class SessionManager {
     return handle
   }
 
+  /**
+   * Register the attachment-directory guidance for one Session. Called after
+   * the effective working directory is known (a worktree checkout path is
+   * only returned once the worktree exists), so the prompt section can name
+   * the absolute directory. Best-effort: a missing system-prompt service
+   * (headless) is a no-op and a late registration never blocks the turn.
+   */
+  async mountGuidance(agent: Agent, directory: string): Promise<void> {
+    try {
+      await mountChannelGuidance(agent.ctx, attachmentsDir(directory))
+    } catch (error) {
+      this.deps.warn(
+        'dsh-channels: mounting attachment guidance for session %s failed: %s',
+        agent.id, String(error),
+      )
+    }
+  }
+
   /**
    * Live agent for a route: this plugin's own → a foreign live agent (borrow)
    * → a serialized cold resume.
@@ -171,9 +193,7 @@ export class SessionManager {
       // (config override or roster default). A session persisted before the
       // preset fix has no preset recorded on its header; re-resolving here is
       // what repairs it on the first resume after a restart.
-      const composition = await this.presetComposition(
-        undefined, true, attachmentsDir(record.workspacePath),
-      )
+      const composition = await this.presetComposition(undefined, true)
       const handle = await this.deps.ctx.agents.resume({
         resumeSessionId: sessionId,
         agentOptions: this.agentOptions(),
@@ -187,6 +207,7 @@ export class SessionManager {
         throw new Error('dsh-channels: session resume aborted by shutdown')
       }
       this.requestPolicy(handle.agent)
+      await this.mountGuidance(handle.agent, sessionDirOf(record))
       const liveAgent: LiveAgent = { agent: handle.agent, handle }
       this.live.set(sessionId, liveAgent)
       return liveAgent
@@ -224,17 +245,23 @@ export class SessionManager {
     return controller
   }
 
-  /** Create, workspace-attach, and atomically publish one renewed route. */
+  /**
+   * Create, place, workspace-attach, and atomically publish one renewed route.
+   *
+   * A renewal keeps the topic's working directory: the new Session is created
+   * with the user workspace as its header cwd (so it stays grouped under the
+   * project) and then re-entered into the same topic directory or worktree.
+   */
   async renew(record: RouteRecord, oldLive: LiveAgent): Promise<RenewCommit> {
     const sessionId = randomUUID() as SessionId
     const preset = this.effectivePreset(oldLive.agent.session)
-    const composition = await this.presetComposition(preset, false, attachmentsDir(record.workspacePath))
+    const composition = await this.presetComposition(preset, false)
+    const services: PlacementServices = placementServices(this.deps.ctx)
+    const switchable = services.workingDirectory !== undefined
+    const workspacePath = record.workspacePath
     const workspace = await this.deps.ctx.workspaceRegistry.create(
-      record.workspacePath,
-      workspaceTitleFor(
-        record.chatType, record.chatId, record.senderOpenId,
-        record.kind === 'thread' ? record.key : record.sessionId,
-      ),
+      workspacePath,
+      workspaceTitleFor(record.chatType, record.chatId, record.senderOpenId),
     )
 
     let newHandle: AgentHandle | undefined
@@ -243,23 +270,38 @@ export class SessionManager {
       newHandle = await this.deps.ctx.agents.create({
         sessionId,
         meta: {
-          cwd: record.workspacePath,
+          // Without an effective-directory service the Session must be born in
+          // its topic directory; otherwise the workspace root keeps it grouped.
+          cwd: switchable ? workspacePath : sessionDirOf(record),
           ...(composition.agentPreset === undefined ? {} : { agentPreset: composition.agentPreset }),
         },
         agentOptions: { ...oldLive.agent.options },
         setup: composition.setup,
       })
       this.requestPolicy(newHandle.agent)
-      await workspace.attachSession(sessionId)
-      attached = true
+      const placement: TopicPlacement = await restoreTopicDir(services, newHandle.agent, {
+        workspacePath,
+        sessionDir: sessionDirOf(record),
+        ...(record.worktreeBranch === undefined ? {} : { worktreeBranch: record.worktreeBranch }),
+      }, this.deps.warn.bind(this.deps))
+      if (switchable) {
+        await workspace.attachSession(sessionId)
+        attached = true
+      }
+      await this.mountGuidance(newHandle.agent, placement.sessionDir)
       const createdAt = newHandle.agent.session.header.createdAt
 
-      const current: RouteRecord = {
+      const base: RouteRecord = {
         ...record,
         sessionId,
         sessionHistory: appendSessionHistory(record, sessionId, createdAt),
         lastActivityAt: Date.now(),
+        sessionDir: placement.sessionDir,
       }
+      delete base.worktreeBranch
+      const current: RouteRecord = placement.worktreeBranch === undefined
+        ? base
+        : { ...base, worktreeBranch: placement.worktreeBranch }
       await this.deps.persistRoute(record.key, current)
       this.live.set(sessionId, { agent: newHandle.agent, handle: newHandle })
       return { previous: record, current, oldLive }
@@ -308,11 +350,14 @@ export class SessionManager {
    * resumes. The id resolves BEFORE the session exists because the session
    * boundary snapshots `meta` before asynchronous setup begins; mounting stays
    * inside `setup`, where a failure rolls the whole creation back.
+   *
+   * The attachment guidance is mounted later through {@link mountGuidance},
+   * because a Git worktree's checkout path only exists after the Agent (and so
+   * the worktree) has been created.
    */
   private async presetComposition(
     requestedPreset: string | undefined = this.deps.config.agentPreset,
     useRosterDefault = true,
-    attachmentsDir?: string,
   ): Promise<PresetComposition> {
     // Read through ctx.get (safe lookup): only the web profile ships a roster,
     // and direct property access on a cordis context throws for services the
@@ -324,7 +369,6 @@ export class SessionManager {
       // cannot guarantee that the explicit channel value wins.
       this.mountRequestPolicy(agentCtx)
       await mountChannelCommands(agentCtx)
-      await mountChannelGuidance(agentCtx, attachmentsDir)
     }
     if (presets === undefined || (requestedPreset === undefined && !useRosterDefault)) {
       return { setup: channelCommandsOnly }
@@ -336,7 +380,6 @@ export class SessionManager {
         this.mountRequestPolicy(agentCtx)
         await presets.mount(agentCtx, resolved.id)
         await mountChannelCommands(agentCtx)
-        await mountChannelGuidance(agentCtx, attachmentsDir)
       },
     }
   }

package/src/session/repair.ts

@@ -11,7 +11,7 @@
  * @module dsh-channels/session/repair
  */
 
-import { buildInterruptionCard } from '../cards/streaming.ts'
+import { buildInterruptionCard, segmentCardOptions } from '../cards/streaming.ts'
 import type { InflightSnapshot } from '../domain.ts'
 import type { FeishuChannel } from '../feishu-channel.ts'
 import type { FeishuDomainHandle } from '../domain.ts'
@@ -146,8 +146,7 @@ export class InflightRepair {
       if (card.mode !== 'card') continue
       // Full replacement: the interrupted card's streamed content lived only
       // in the previous process. Continuation cards keep their segment header.
-      const options = index === 0 ? {} : { panel: false, segment: index + 1 }
-      await channel.updateCard(card.messageId, buildInterruptionCard(options))
+      await channel.updateCard(card.messageId, buildInterruptionCard(segmentCardOptions(index)))
     }
     if (snapshot.reactionId !== undefined) {
       await channel.removeReaction(snapshot.triggerMessageId, snapshot.reactionId).catch(() => {})

package/src/session/routes.ts

@@ -148,6 +148,8 @@ export class RouteStore {
       senderOpenId: record.senderOpenId,
       expiredAt: now,
       workspacePath: record.workspacePath,
+      ...(record.sessionDir === undefined ? {} : { sessionDir: record.sessionDir }),
+      ...(record.worktreeBranch === undefined ? {} : { worktreeBranch: record.worktreeBranch }),
       lastActivityAt: record.lastActivityAt,
     }
     await this.deps.domain()?.expiredRoutes.put(key, tombstone)

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'
@@ -49,7 +49,7 @@ export const PICK_DIRECTORY_ROUTE = '/dsh-channels/pick-directory'
  * 因此不会落进覆盖层文件。
  *
  * `baseDir`（工作区根目录 = 模型/工具产生文件的落点）可覆盖，但面板只接受
- * **绝对路径**（`~` 会展开）；已有 Session / 工作区不迁移，只影响之后新建的
+ * **绝对路径**（`~` 会展开）；已有 Session / 目录不迁移，只影响之后新建的
  * 会话。校验与保存时建目录见 `src/workspaces.ts`。
  */
 export const EDITABLE_KEYS = [
@@ -361,9 +361,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 +375,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
 }
@@ -570,7 +572,7 @@ export const PANEL_COPY = {
   connectionTabHelp: '连接状态与飞书应用凭据。凭据不完整时不会连接飞书。',
   sessionsTabHelp: '私聊、群聊触发方式与入站内容；「需重连」项在下次连接时读取。',
   modelTabHelp: '飞书会话使用的模型服务商、模型、推理档位与 Agent 预设；下拉选项来自宿主机实时目录，保存后对新会话生效。',
-  workspaceTabHelp: '每个飞书话题一个独立工作区（模型/工具产生文件的落点）；只影响之后新建的话题。',
+  workspaceTabHelp: '每个用户一个工作区（模型/工具产生文件的落点），每个话题在其中拥有独立工作目录；只影响之后新建的话题。',
   accessTabHelp: '准入采用 fail-closed：管理员不受白名单限制，非管理员私聊会被拒绝，群聊需要「群已授权 + 用户在白名单」两层同时命中。',
   advancedTabHelp: '流式刷新等低层参数、Web 覆盖文件与只读信息。',
   save: '保存更改',
@@ -618,11 +620,12 @@ export const PANEL_COPY = {
   readOnlyCard: '部署级参数',
   // ---- model --------------------------------------------------------------
   // ---- cleanup ------------------------------------------------------------
-  cleanupCard: '工作区清理',
-  cleanupCardHelp: '删除超过保留期且不再活跃的飞书工作区目录；只会删除本插件在「工作区根目录」下创建的目录，DSH 会话日志不删除。删除不可恢复：相关旧话题会失效并提示已过期，工作区列表记录同步移除。',
+  cleanupCard: '目录清理',
+  cleanupCardHelp: '删除超过保留期且不再活跃的飞书话题目录（以及旧版本按话题建立的工作区目录）；用户工作区本身、DSH 会话日志都不会删除。删除不可恢复：相关旧话题会失效并提示已过期。',
   cleanupRetention: '保留期',
   cleanupAutoLabel: '自动清理',
-  cleanupCandidates: '可清理工作区',
+  cleanupCandidates: '可清理目录',
+  cleanupWorkspaces: '插件工作区',
   cleanupCandidateBytes: '预计释放空间',
   cleanupRetentionOff: '关闭（不删除）',
   cleanupAutoOn: '已开启（启动时 + 每天一次）',
@@ -630,17 +633,18 @@ export const PANEL_COPY = {
   cleanupAutoInactive: '未执行（保留期为关闭）',
   cleanupNow: '立即清理',
   cleanupRunning: '清理中…',
-  cleanupConfirm: '确定清理过期工作区吗？该操作不可恢复，会删除这些工作区内的全部文件（包括 attachments/ 附件）。',
-  cleanupConfirmHint: '删除前会再次确认；保留期为「关闭」或没有过期工作区时按钮不可用。',
-  cleanupDisabledOff: '保留策略为「关闭」：请先在上方「过期工作区保留期」中选择保留天数。',
-  cleanupDisabledEmpty: '没有超过保留期的过期工作区。',
+  cleanupConfirm: '确定清理过期目录吗？该操作不可恢复，会删除这些目录内的全部文件（包括 attachments/ 附件）。',
+  cleanupConfirmHint: '删除前会再次确认；保留期为「关闭」或没有过期目录时按钮不可用。',
+  cleanupDisabledOff: '保留策略为「关闭」：请先在上方「过期目录保留期」中选择保留天数。',
+  cleanupDisabledEmpty: '没有超过保留期的过期目录。',
   cleanupPreviewFailed: '无法读取清理预览',
   cleanupDone: '清理完成',
   cleanupFailed: '清理失败',
   cleanupDeleted: '已删除工作区',
+  cleanupDeletedDirs: '话题目录',
   cleanupRetired: '已清理话题路由',
   cleanupFreed: '释放空间',
-  cleanupFailures: '以下工作区未能删除：',
+  cleanupFailures: '以下目录未能删除：',
   // ---- access -------------------------------------------------------------
   accessCard: '访问与授权',
   accessCardHelp: '准入采用 fail-closed：管理员不受白名单限制（私聊、任意群聊都可直接对话）；非管理员私聊会被拒绝，群聊需要「群已授权 + 用户在白名单」两层同时命中。管理员与准入模式在上方「准入与授权」中编辑；私聊机器人发送 /userid 获取自己的 open_id。',

package/src/settings/surface.ts

@@ -160,7 +160,7 @@ const SELECT_OPTIONS: Partial<Record<EditableKey, ReadonlyArray<{ value: string;
 const FIELD_META: Record<EditableKey, { label: string; help: string; min?: number; max?: number; step?: number; placeholder?: string; wide?: boolean }> = {
   baseDir: {
     label: '工作区根目录（文件落点）',
-    help: '每个飞书话题拥有独立工作区：私聊 <baseDir>/topics/p2p/<open_id>/<topic>/，群聊 <baseDir>/topics/groups/<chat_id>/<open_id>/<topic>/（topic 来自话题 id）。必须是绝对路径（~ 开头按家目录展开），保存时会创建该目录；只影响之后新建立的工作区 —— 已有话题即使 /renew 也沿用原工作区，旧文件不会迁移。',
+    help: '每个用户/群成员一个工作区：私聊 <baseDir>/p2p/<open_id>/，群聊 <baseDir>/groups/<chat_id>/<open_id>/；每个话题在其中拥有独立工作目录 <工作区>/topics/<话题>/（Git 仓库工作区可自动改用 worktree）。必须是绝对路径（~ 开头按家目录展开），保存时会创建该目录；只影响之后新建立的会话 —— 已有话题即使 /renew 也沿用原目录，旧文件不会迁移。',
     placeholder: '/Users/you/.dsh/dsh-channels/workspaces',
     wide: true,
   },
@@ -186,8 +186,8 @@ const FIELD_META: Record<EditableKey, { label: string; help: string; min?: numbe
     step: 1,
   },
   acceptAttachments: { label: '接收并保存附件', help: '接收飞书图片、文件与合并转发记录，保存到工作区的 attachments/ 目录；模型不会自动读取，需要时用文件工具自行查看。关闭后附件消息不保存、不触发回复。' },
-  workspaceRetention: { label: '过期工作区保留期', help: '超过所选天数没有活动的飞书工作区会进入下方「工作区清理」列表；「关闭」表示永不删除。DSH 会话日志不受影响。' },
-  workspaceRetentionAuto: { label: '自动执行工作区清理', help: '开启后插件在启动时及每天执行一次过期工作区清理；关闭时只能在下方卡片手动清理。开启前请确认保留期已设置。' },
+  workspaceRetention: { label: '过期目录保留期', help: '超过所选天数没有活动的飞书话题目录（以及旧版本按话题建立的工作区目录）会进入下方清理列表；用户工作区本身永不删除。DSH 会话日志不受影响。' },
+  workspaceRetentionAuto: { label: '自动执行目录清理', help: '开启后插件在启动时及每天执行一次过期目录清理；关闭时只能在下方卡片手动清理。开启前请确认保留期已设置。' },
   provider: { label: '模型服务商', help: '留空 = 使用部署默认；例如 deepseek-official。', placeholder: '留空 = 部署默认' },
   model: { label: '模型 id', help: '留空 = 使用部署默认；例如 deepseek-v4-flash。', placeholder: '留空 = 部署默认' },
   reasoningEffort: { label: '推理档位', help: '模型声明的精确档位 id（如 high / max）；留空 = 适配器默认。', placeholder: '留空 = 适配器默认' },
@@ -403,6 +403,14 @@ export function normalizeAccessName(
 /** Build the read-only advanced card from the effective config. */
 export function readOnlyFields(config: FeishuConfig): ReadOnlyFieldWire[] {
   return [
+    {
+      key: 'topicIsolation',
+      label: '话题目录隔离',
+      value: config.topicIsolation === 'auto'
+        ? '自动（Git 仓库用 worktree，否则普通子目录）'
+        : config.topicIsolation === 'worktree' ? 'Git worktree（失败回退子目录）' : '普通子目录',
+      help: '每个话题的独立工作目录形式；在 profile 配置里用 topicIsolation 设置（auto / subdir / worktree）。',
+    },
     { key: 'routeTtlMs', label: '话题路由过期', value: formatDays(config.routeTtlMs), help: '超期话题的后续消息会被明确拒绝，而不是新建 Context-free Session。' },
     { key: 'approvalTimeoutMs', label: '审批卡片等待', value: formatSeconds(config.approvalTimeoutMs) },
     { key: 'questionTimeoutMs', label: '提问卡片等待', value: formatSeconds(config.questionTimeoutMs) },
@@ -569,7 +577,7 @@ export class SettingsSurface {
     try {
       cleanup = await this.target.cleanupPreview()
     } catch (error) {
-      this.logger?.warn?.('dsh-channels: 工作区清理预览失败：%s', messageOf(error))
+      this.logger?.warn?.('dsh-channels: 目录清理预览失败：%s', messageOf(error))
       cleanup = {
         retention: effective.workspaceRetention,
         auto: effective.workspaceRetentionAuto,