dsh-sidenote 0.3.0 → 0.3.2

package/lib/types/client/chat/ToolCard.d.ts

@@ -5,4 +5,5 @@ export declare function ToolCard(props: {
     rowKey: string;
     fold: FoldStore;
     streaming?: boolean;
+    error?: boolean;
 }): import("react").JSX.Element;

package/lib/types/client/chat/cards.d.ts

@@ -42,13 +42,24 @@ export type ToolCardModel = {
     locations?: readonly FileLocation[];
 } | {
     kind: 'terminal';
+    /** 标题（有人话 description 时 = 「Bash · description」，否则 = 命令原文）。 */
     title: string;
+    /** 命令原文（TerminalBlock 的 command——标题让位给 description 后命令仍随行）。 */
+    command: string;
     description?: string;
     /** 已解析的 cwd（相对路径已按 cwdBase 折成绝对；无 base 时原样）。 */
     cwd?: string;
     output?: string;
     exitCode?: number;
     signal?: string;
+} | {
+    kind: 'todo';
+    /** 标题（任务 · N 已完成 · N 进行中 · N 待处理，非零组才出现）。 */
+    title: string;
+    items: readonly {
+        content: string;
+        status: string;
+    }[];
 } | {
     kind: 'diff';
     title: string;
@@ -95,6 +106,16 @@ export type ToolCardModel = {
     statusCode?: number;
     truncated?: boolean;
 };
+/**
+ * 展示态路径缩短：>3 段的绝对路径只保末 3 段（≈仓库相对形态，与主区
+ * 「Read · dsh-sidenote/scripts/x.sh」同款）。窄栏标题位只够放语义尾部。
+ */
+export declare function shortPath(p: string): string;
+/**
+ * 标题整形：「Tool /abs/path」→「Tool · 末3段」（主区同名同款）；
+ * 裸绝对路径标题 → 末 3 段；不含路径的标题原样。
+ */
+export declare function displayTitle(title: string): string;
 export interface CardModelInput {
     /** 工具名兜底（callView 缺失时的标题）。 */
     toolName: string;
@@ -119,6 +140,10 @@ export interface NodeCardInput {
     meta?: unknown;
     /** 结果正文（已拼 text 块）。 */
     rawText: string;
+    /** 失败标记（0.1.2 节点 isError）——失败结果无 meta（presentationMeta 只投
+     *  影成功路径），但 write 的空-meta 回退必须先判它，否则失败的 write 也
+     *  会被渲染成 diff 卡（官方 diffCardModel 显式 isError → null）。 */
+    isError?: boolean | undefined;
     cwdBase?: string | undefined;
 }
 /**

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

@@ -26,6 +26,10 @@ export declare const en: {
     stopped: string;
     toolLabel: string;
     failed: string;
+    todoTitle: string;
+    todoDone: string;
+    todoDoing: string;
+    todoPending: string;
     running: string;
     inputPlaceholder: string;
     modelLabel: string;
@@ -34,8 +38,18 @@ export declare const en: {
     permFullAccess: string;
     pendingNotice: string;
     writeNotice: string;
+    pendingApprovalTitle: string;
+    pendingApprovalDesc: string;
+    pendingReject: string;
+    pendingAllowOnce: string;
+    pendingQuestionTitle: string;
+    pendingPlanReview: string;
+    pendingQuestionSubmit: string;
+    pendingQuestionCancel: string;
+    pendingCustomPlaceholder: string;
     modelFollowsMain: string;
     stopReply: string;
+    sideChatDone: string;
     stopReplyTitle: string;
     send: string;
     attachTitle: string;
@@ -112,6 +126,7 @@ export declare const en: {
     reflowAllDone: string;
     promote: string;
     promoteTitle: string;
+    promoteDone: string;
     readWindow: string;
     searchPathsSummary: string;
     searchMatchesSummary: string;

package/lib/types/client/sidechat/PendingCard.d.ts

@@ -0,0 +1,4 @@
+import type { PendingItem } from './pending.ts';
+export declare function PendingCardList({ items }: {
+    items: readonly PendingItem[];
+}): import("react").JSX.Element;

package/lib/types/client/sidechat/notify.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 完成通知（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';
+/**
+ * 翻转侦测核心（抽出来纯可测）：running true→false 且距挂接超过保护窗
+ * 时返回 true。调用方持状态。
+ */
+export declare function shouldNotify(wasRunning: boolean, running: boolean, attachedAt: number, now: number): boolean;
+export declare function registerCompletionNotify(ctx: Context): void;

package/lib/types/client/sidechat/pending.d.ts

@@ -0,0 +1,71 @@
+/**
+ * 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;
+}
+/**
+ * 双版本探测链（chatSourceOf 同款纪律）：0.1.2 uiSession.pendingInteractions
+ * （getSnapshot() 是 Map 才认）优先；0.1.1 Session 快照 pending 数组回退；
+ * 双缺席 undefined（面板回退 pendingBar 跳转）。
+ */
+export declare function createPendingStore(ctx: CtxLike, session: SessionLike | undefined, childId: string): PendingStore | undefined;
+export {};

package/lib/types/client/sidechat/toast.d.ts

@@ -0,0 +1,5 @@
+import type { Context } from '../host/contracts.ts';
+/** 全局瞬态通知入口（任何模块可调；未挂载宿主时静默丢弃）。 */
+export declare function showToast(text: string): void;
+/** 挂载全局 toast 宿主（registerSideChat 里调用一次）。 */
+export declare function registerToastHost(ctx: Context): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidenote",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "DSH web plugin: Codex-style side chat (fork the current session into a persistent side panel) + selection annotations with numbered badges and a composer chip. A thin consumer of dsh-better-sidebar. / Codex 风格侧边聊天 + 划选注释的 DSH 插件。",
   "type": "module",
   "license": "MIT",

package/src/client/chat/FoldCard.tsx

@@ -16,13 +16,14 @@ export function FoldCard(props: { count: number; rowKey: string; fold: FoldStore
   const { rowKey, fold } = props
   const open = useSyncExternalStore((fn) => fold.subscribe(fn), () => fold.isOpen(rowKey))
   return (
-    <div className={css.toolCardV2}>
+    <div className={css.flowRow}>
       <DisclosureRow
         icon={<IconBranchOutline16 size={14} />}
         title={t('inheritedLabel', { n: props.count })}
         open={open}
         expandable
         expandOnRowClick
+        previewChevron
         onToggle={() => { fold.toggle(rowKey) }}
       >
         <div className={css.inheritedBody}>{props.children}</div>

package/src/client/chat/ReasoningRow.tsx

@@ -10,20 +10,32 @@ import type { FoldStore } from './viewState.ts'
 import { t } from '../locales.ts'
 import css from '../sidechat/sidechat.module.css'
 
+/** 首行非空文本（折叠态预览——主区「Think · 首行摘要」同款）。 */
+function firstLineOf(text: string): string {
+  for (const line of text.split('\n')) {
+    const s = line.trim()
+    if (s !== '') return s
+  }
+  return ''
+}
+
 export function ReasoningRow(props: { text: string; rowKey: string; fold: FoldStore; streaming?: boolean }) {
   const { rowKey, fold } = props
   const touched = useSyncExternalStore((fn) => fold.subscribe(fn), () => fold.has(rowKey))
   const stored = useSyncExternalStore((fn) => fold.subscribe(fn), () => fold.isOpen(rowKey))
   // 流式中且用户未触碰 → 默认展开；其余听 store。
   const open = stored || (props.streaming === true && !touched)
+  const preview = firstLineOf(props.text)
   return (
-    <div className={css.toolCardV2}>
+    <div className={css.flowRow}>
       <DisclosureRow
         icon={<IconThinkOutline16 size={14} />}
         title={t('thinking')}
         open={open}
         expandable
         expandOnRowClick
+        previewChevron
+        {...(preview !== '' ? { collapsedContent: <span className={css.rowPreview}>{preview}</span> } : {})}
         onToggle={() => { fold.toggle(rowKey) }}
       >
         <div className={css.reasoningBody}>{props.text}</div>

package/src/client/chat/ToolCard.tsx

@@ -10,6 +10,7 @@ import { useSyncExternalStore, type ReactNode } from 'react'
 import {
   DisclosureRow,
   DiffBlock,
+  IconChecklistOutline14,
   IconCodeOutline16,
   IconCordisPluginOutline14,
   IconEditOutline16,
@@ -53,7 +54,7 @@ function useFoldOpen(fold: FoldStore, rowKey: string): boolean {
   )
 }
 
-export function ToolCard(props: { model: ToolCardModel; rowKey: string; fold: FoldStore; streaming?: boolean }) {
+export function ToolCard(props: { model: ToolCardModel; rowKey: string; fold: FoldStore; streaming?: boolean; error?: boolean }) {
   const { model, rowKey, fold } = props
   const open = useFoldOpen(fold, rowKey)
   const icon = model.kind === 'terminal'
@@ -62,16 +63,20 @@ export function ToolCard(props: { model: ToolCardModel; rowKey: string; fold: Fo
       ? <IconEditOutline16 size={14} />
       : model.kind === 'read'
         ? <IconCodeOutline16 size={14} />
-        : model.kind === 'generic' ? kindIcon(model.icon) : <IconCordisPluginOutline14 size={14} />
+        : model.kind === 'todo'
+          ? <IconChecklistOutline14 size={14} />
+          : model.kind === 'generic' ? kindIcon(model.icon) : <IconCordisPluginOutline14 size={14} />
 
   return (
-    <div className={css.toolCardV2}>
+    <div className={css.flowRow}>
       <DisclosureRow
         icon={icon}
         title={model.title}
         open={open}
         expandable
         expandOnRowClick
+        previewChevron
+        {...(props.error === true ? { titleClassName: css.flowRowError } : {})}
         onToggle={() => { fold.toggle(rowKey) }}
       >
         <ToolCardBody model={model} streaming={props.streaming} />
@@ -85,7 +90,7 @@ function ToolCardBody({ model, streaming }: { model: ToolCardModel; streaming?:
     case 'terminal':
       return (
         <TerminalBlock
-          command={model.title}
+          command={model.command}
           labels={terminalLabels()}
           {...(model.cwd !== undefined ? { cwd: model.cwd } : {})}
           {...(model.output !== undefined ? { output: model.output } : {})}
@@ -94,6 +99,17 @@ function ToolCardBody({ model, streaming }: { model: ToolCardModel; streaming?:
           {...(streaming === true ? { running: true } : {})}
         />
       )
+    case 'todo':
+      return (
+        <div className={css.todoBody}>
+          {model.items.map((item, i) => (
+            <div key={i} className={css.todoItem}>
+              <span className={css.todoDot} data-status={item.status} />
+              <span className={css.todoText} data-status={item.status}>{item.content}</span>
+            </div>
+          ))}
+        </div>
+      )
     case 'diff':
       return <DiffBlock {...({ labels: diffLabels() } as object)} diffs={model.diffs.map(d => ({ path: d.path, oldText: d.oldText, newText: d.newText }))} />
     case 'read':