dsh-sidenote 0.3.1 → 0.3.2

package/src/client/sidechat/notify.ts

@@ -0,0 +1,91 @@
+/**
+ * 完成通知（WI-03，L3 常驻监听层）：侧聊子会话 running true→false 翻转时
+ * toast 提醒——用户焦点在主对话时侧聊长任务跑完能被看见（Zed
+ * notify_when_agent_waiting 先例）。
+ *
+ * 事件源是 session.subscribe 快照推送（非轮询）；宿主 notifier 入账不依赖
+ * 订阅者——面板不可见（SideChatPanel 的 uSES 断订阅）期间事件不丢。
+ * 本层是常驻 ctx.effect：Tab 开闭由 betterSidebar.subscribeState 重扫驱动。
+ */
+import type { Context } from '../host/contracts.ts'
+import { collectSideTabs, parseSideChatMeta } from './model.ts'
+import { openSessionWindow } from './lifecycle.ts'
+import { showToast } from './toast.tsx'
+import { t } from '../locales.ts'
+
+interface Watcher {
+  unsub: () => void
+  wasRunning: boolean
+  /** 建 watcher 的时间——挂接瞬间的 running 翻转（残影）不报。 */
+  since: number
+}
+
+/** 挂接保护窗：watcher 建立后该窗口内的翻转不视为「一个真实 turn 跑完」。 */
+const ATTACH_GRACE_MS = 800
+
+/**
+ * 翻转侦测核心（抽出来纯可测）：running true→false 且距挂接超过保护窗
+ * 时返回 true。调用方持状态。
+ */
+export function shouldNotify(wasRunning: boolean, running: boolean, attachedAt: number, now: number): boolean {
+  return wasRunning && !running && now - attachedAt > ATTACH_GRACE_MS
+}
+
+export function registerCompletionNotify(ctx: Context): void {
+  ctx.effect(() => {
+    const watchers = new Map<string, Watcher>()
+
+    const rescan = (): void => {
+      let tabs: ReturnType<typeof collectSideTabs> = []
+      try {
+        tabs = collectSideTabs(ctx.betterSidebar.getSnapshot())
+      } catch {
+        return
+      }
+      const alive = new Set<string>()
+      for (const tab of tabs) {
+        const meta = parseSideChatMeta(tab.meta)
+        const childId = meta.childId
+        if (childId === undefined) continue
+        alive.add(childId)
+        if (watchers.has(childId)) continue
+        // 新侧聊：binding 可能 throw（会话还没就绪）——本轮跳过，下轮重扫补。
+        try {
+          const session = ctx.sessions.binding(childId)?.session
+          if (session === undefined) continue
+          openSessionWindow(session)
+          const title = tab.title
+          const watcher: Watcher = { unsub: () => {}, wasRunning: false, since: Date.now() }
+          watcher.unsub = session.subscribe(() => {
+            const snap = session.getSnapshot() as { running?: unknown } | null
+            const running = snap?.running === true
+            if (shouldNotify(watcher.wasRunning, running, watcher.since, Date.now())) {
+              showToast(t('sideChatDone', { title }))
+            }
+            watcher.wasRunning = running
+          })
+          // 挂接即取一次初值（正在跑的会话稍后跑完时报）。
+          watcher.wasRunning = (session.getSnapshot() as { running?: unknown } | null)?.running === true
+          watchers.set(childId, watcher)
+        } catch {
+          // 下轮重扫再试。
+        }
+      }
+      // 清理已关闭 Tab 的 watcher（× 即焚的会话不再报）。
+      for (const [id, w] of watchers) {
+        if (!alive.has(id)) {
+          w.unsub()
+          watchers.delete(id)
+        }
+      }
+    }
+
+    const offState = ctx.betterSidebar.subscribeState(rescan)
+    rescan()
+    return () => {
+      offState()
+      for (const w of watchers.values()) w.unsub()
+      watchers.clear()
+    }
+  }, 'dsh-sidenote: completion notify')
+}

package/src/client/sidechat/pending.ts

@@ -0,0 +1,238 @@
+/**
+ * R8 侧边审批/提问答复（L0/L1：双版本数据源探测链 + 视图模型归一）。
+ *
+ * 侦察依据（.vibe Delivery_04/Workitem_02 design.md）：
+ * - pending 不在 projections.faceOf 体系——0.1.1 在 Session 快照顶层
+ *   `pending: PendingWait[]`（mux 帧铸造，重连重放 rpcId 不变）；0.1.2 移入
+ *   `ctx.get('uiSession').pendingInteractions`（Map<SessionId, Pending>，
+ *   每会话至多一项，precedence 仲裁）。
+ * - 写路径都是公开对象的公开方法：0.1.1 `wait.respond({ok,value})`（审批
+ *   value={sessionId, approvalId, outcome}；提问整批 {sessionId, answer}，
+ *   取消走 {ok:false,error:{code:'cancelled',…}}）；0.1.2 域对象
+ *   `answer(outcome|answer)` / `cancel()`。
+ * - 竞答安全：先答先得，settle 幂等——后答方 throw，UI catch 吞掉并回退
+ *   按钮态（宿主同款 `.catch(() => setAnswered(false))`）。
+ *
+ * off-face 纪律：两面都 feature-check；全缺席返回 undefined（面板回退
+ * pendingBar 跳转行为，不崩）。
+ */
+
+// ── 视图模型（视图层唯一消费形状；双版本在此归一）──
+
+export interface PendingApprovalView {
+  kind: 'approval'
+  key: string
+  toolName: string
+  reason?: string | undefined
+  answer: (outcome: 'allowed-once' | 'rejected') => Promise<void>
+}
+
+export interface PendingQuestionOption {
+  label: string
+  description?: string | undefined
+}
+
+export interface PendingQuestionView {
+  kind: 'question'
+  key: string
+  /** plan-review 按通用提问流降级（提交值逐字回传 asker 原 label）。 */
+  planReview: boolean
+  questions: readonly {
+    id: string
+    question: string
+    header?: string | undefined
+    detail?: string | undefined
+    options: readonly PendingQuestionOption[]
+    multiSelect: boolean
+  }[]
+  /** 整批提交（不可拆单题）：answers = [{id, selected: label[], custom?}]。 */
+  answer: (answers: readonly { id: string; selected: readonly string[]; custom?: string }[]) => Promise<void>
+  cancel: () => Promise<void>
+}
+
+export type PendingItem = PendingApprovalView | PendingQuestionView
+
+export interface PendingStore {
+  readonly available: boolean
+  subscribe(fn: () => void): () => void
+  /** 缓存快照：底层引用不变则返回同一数组（uSES 纪律）。 */
+  getSnapshot(): readonly PendingItem[]
+}
+
+interface CtxLike {
+  get?: (key: string) => unknown
+}
+
+interface SessionLike {
+  subscribe(fn: () => void): () => void
+  getSnapshot(): unknown
+}
+
+// ── 0.1.2 适配（uiSession.pendingInteractions 域对象）──
+
+function adapt012(pending: unknown): readonly PendingItem[] {
+  if (typeof pending !== 'object' || pending === null) return []
+  const o = pending as Record<string, unknown>
+  if (o.kind === 'approval' && typeof o.answer === 'function') {
+    return [{
+      kind: 'approval',
+      key: typeof o.key === 'string' ? o.key : 'approval',
+      toolName: typeof o.toolName === 'string' ? o.toolName : '',
+      ...(typeof o.reason === 'string' ? { reason: o.reason } : {}),
+      answer: (outcome) => (o.answer as (x: string) => Promise<void>).call(o, outcome),
+    }]
+  }
+  if ((o.kind === 'question' || o.kind === 'plan-review') && typeof o.answer === 'function' && typeof o.cancel === 'function') {
+    const questions = normalizeQuestions(o.questions ?? (o.payload as { questions?: unknown } | undefined)?.questions)
+    if (questions === undefined) return []
+    return [{
+      kind: 'question',
+      key: typeof o.key === 'string' ? o.key : 'question',
+      planReview: o.kind === 'plan-review',
+      questions,
+      answer: (answers) => (o.answer as (a: unknown) => Promise<void>).call(o, { answers }),
+      cancel: () => (o.cancel as () => Promise<void>).call(o),
+    }]
+  }
+  return []
+}
+
+// ── 0.1.1 适配（Session 快照 pending: PendingWait[]）──
+
+interface PendingWaitLike {
+  kind?: unknown
+  key?: unknown
+  sessionId?: unknown
+  payload?: unknown
+  respond?: unknown
+}
+
+function adapt011(pending: readonly unknown[]): readonly PendingItem[] {
+  const items: PendingItem[] = []
+  for (const raw of pending) {
+    const w = raw as PendingWaitLike
+    if (typeof w.respond !== 'function') continue
+    const respond = w.respond as (r: unknown) => Promise<{ accepted?: boolean }>
+    const sessionId = typeof w.sessionId === 'string' ? w.sessionId : undefined
+    if (sessionId === undefined) continue
+    const payload = (w.payload ?? {}) as Record<string, unknown>
+    const key = typeof w.key === 'string' ? w.key : `pending:${items.length}`
+    if (w.kind === 'approval') {
+      const approvalId = payload.approvalId
+      if (typeof approvalId !== 'string') continue
+      items.push({
+        kind: 'approval',
+        key,
+        toolName: typeof payload.toolName === 'string' ? payload.toolName : '',
+        ...(typeof payload.reason === 'string' ? { reason: payload.reason } : {}),
+        answer: async (outcome) => {
+          const receipt = await respond({ ok: true, value: { sessionId, approvalId, outcome } })
+          if (receipt.accepted === false) throw new Error('approval response rejected (not pending)')
+        },
+      })
+    } else if (w.kind === 'question') {
+      const questions = normalizeQuestions(payload.questions)
+      if (questions === undefined) continue
+      items.push({
+        kind: 'question',
+        key,
+        planReview: false,
+        questions,
+        answer: async (answers) => {
+          const receipt = await respond({ ok: true, value: { sessionId, answer: { answers } } })
+          if (receipt.accepted === false) throw new Error('question response rejected (not pending)')
+        },
+        cancel: async () => {
+          await respond({ ok: false, error: { code: 'cancelled', message: 'the user closed this question request', details: {} } })
+        },
+      })
+    }
+  }
+  return items
+}
+
+/** questions 字段归一（选项 {label,description?} 与纯字符串两形都收）。 */
+function normalizeQuestions(raw: unknown): PendingQuestionView['questions'] | undefined {
+  if (!Array.isArray(raw)) return undefined
+  const out: PendingQuestionView['questions'][number][] = []
+  for (const rawQ of raw) {
+    if (typeof rawQ !== 'object' || rawQ === null) return undefined
+    const q = rawQ as Record<string, unknown>
+    if (typeof q.question !== 'string') return undefined
+    const options: PendingQuestionOption[] = []
+    if (Array.isArray(q.options)) {
+      for (const rawO of q.options) {
+        if (typeof rawO === 'string') options.push({ label: rawO })
+        else if (typeof rawO === 'object' && rawO !== null && typeof (rawO as { label?: unknown }).label === 'string') {
+          const oo = rawO as { label: string; description?: unknown }
+          options.push({ label: oo.label, ...(typeof oo.description === 'string' ? { description: oo.description } : {}) })
+        } else return undefined
+      }
+    }
+    out.push({
+      id: typeof q.id === 'string' ? q.id : `q${out.length}`,
+      question: q.question,
+      ...(typeof q.header === 'string' ? { header: q.header } : {}),
+      ...(typeof q.detail === 'string' ? { detail: q.detail } : {}),
+      options,
+      multiSelect: q.multiSelect === true,
+    })
+  }
+  return out
+}
+
+/**
+ * 双版本探测链（chatSourceOf 同款纪律）：0.1.2 uiSession.pendingInteractions
+ * （getSnapshot() 是 Map 才认）优先；0.1.1 Session 快照 pending 数组回退；
+ * 双缺席 undefined（面板回退 pendingBar 跳转）。
+ */
+export function createPendingStore(ctx: CtxLike, session: SessionLike | undefined, childId: string): PendingStore | undefined {
+  // 面 1（0.1.2+）：uiSession 服务的 pendingInteractions observable。
+  try {
+    const ui = typeof ctx.get === 'function' ? ctx.get('uiSession') : undefined
+    const pim = (ui as { pendingInteractions?: { subscribe?: unknown; getSnapshot?: unknown } } | undefined)?.pendingInteractions
+    if (pim !== undefined && typeof pim.subscribe === 'function' && typeof pim.getSnapshot === 'function') {
+      const obs = pim as { subscribe(fn: () => void): () => void; getSnapshot(): unknown }
+      if (obs.getSnapshot() instanceof Map) {
+        let cachedMap: unknown = null
+        let cachedItems: readonly PendingItem[] = []
+        return {
+          available: true,
+          subscribe: (fn) => obs.subscribe(fn),
+          getSnapshot: () => {
+            const map = obs.getSnapshot()
+            if (map === cachedMap) return cachedItems
+            cachedMap = map
+            cachedItems = map instanceof Map ? adapt012(map.get(childId)) : []
+            return cachedItems
+          },
+        }
+      }
+    }
+  } catch {
+    // 落面 2。
+  }
+  // 面 2（0.1.1）：Session 快照顶层 pending 数组。
+  if (session === undefined) return undefined
+  try {
+    const snap = session.getSnapshot()
+    if (Array.isArray((snap as { pending?: unknown } | null)?.pending)) {
+      let cachedArr: unknown = null
+      let cachedItems: readonly PendingItem[] = []
+      return {
+        available: true,
+        subscribe: (fn) => session.subscribe(fn),
+        getSnapshot: () => {
+          const arr = (session.getSnapshot() as { pending?: unknown } | null)?.pending
+          if (arr === cachedArr) return cachedItems
+          cachedArr = arr
+          cachedItems = Array.isArray(arr) ? adapt011(arr) : []
+          return cachedItems
+        },
+      }
+    }
+  } catch {
+    // 双缺席。
+  }
+  return undefined
+}

package/src/client/sidechat/sidechat.module.css

@@ -626,7 +626,148 @@
   background: var(--dsw-alias-bg-layer-2);
 }
 
-/* R8 审批提示条（钉在 composer 上方）。 */
+/* R8 审批/提问答复卡（钉在 composer 上方；警示色左边条 + 圆角卡——
+   材质与胶囊 composer 同族）。 */
+.pendingCard {
+  margin: 0 10px 6px;
+  padding: 10px 12px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-left: 3px solid var(--dsw-alias-state-warning-primary, #e8a13a);
+  border-radius: 10px;
+  background: var(--dsw-alias-bg-layer-2);
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  font-size: 12px;
+}
+
+.pendingHead {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  color: var(--dsw-alias-state-warning-primary, #e8a13a);
+}
+
+.pendingTitle {
+  font-weight: 600;
+  color: var(--dsw-alias-label-primary);
+}
+
+.pendingDesc {
+  color: var(--dsw-alias-label-secondary);
+}
+
+.pendingReason {
+  color: var(--dsw-alias-label-tertiary);
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+.pendingQuestion {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 4px 0;
+}
+
+.pendingQHeader {
+  font-weight: 600;
+  color: var(--dsw-alias-label-primary);
+}
+
+.pendingQText {
+  color: var(--dsw-alias-label-secondary);
+}
+
+.pendingOption {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 2px;
+  text-align: left;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 6px;
+  background: none;
+  color: var(--dsw-alias-label-secondary);
+  padding: 5px 8px;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.pendingOption:hover {
+  background: var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05));
+}
+
+/* 选中态：与 .pendingOption 同结构（CSS 层 composes 依赖构建管道，不冒进）。 */
+.pendingOptionActive {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 2px;
+  text-align: left;
+  border: 1px solid var(--dsw-alias-state-business-primary);
+  border-radius: 6px;
+  background: var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05));
+  color: var(--dsw-alias-label-primary);
+  padding: 5px 8px;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.pendingOptionDesc {
+  color: var(--dsw-alias-label-dimmed);
+  font-size: 11px;
+}
+
+.pendingCustom {
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 6px;
+  background: transparent;
+  color: var(--dsw-alias-label-primary);
+  padding: 5px 8px;
+  font-size: 12px;
+  font: inherit;
+}
+
+.pendingCustom:focus {
+  outline: none;
+  border-color: var(--dsw-alias-state-business-primary);
+}
+
+.pendingActions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-top: 2px;
+}
+
+.pendingBtnGhost {
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 6px;
+  background: none;
+  color: var(--dsw-alias-label-secondary);
+  padding: 4px 12px;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.pendingBtnPrimary {
+  border: none;
+  border-radius: 6px;
+  background: var(--dsw-alias-button-info-fill);
+  color: #fff;
+  padding: 4px 12px;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.pendingBtnGhost:disabled,
+.pendingBtnPrimary:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+/* R8 审批提示条（钉在 composer 上方）——面缺席时的回退跳转条。 */
 .pendingBar {
   display: block;
   width: calc(100% - 16px);