@roaming-ai/dsh-group-chat 0.3.0 → 0.3.1

package/lib/types/core/types.d.ts

@@ -193,78 +193,72 @@ export interface FileSearchResult {
     }[];
     error?: string;
 }
-/** 发到客户端的全量快照（wire 形态）。 */
+/** 快照内的会话行（wire 形态：不含 hydrate 用的固定标记与折入水位）。 */
+export type SnapshotSession = Omit<SessionRecord, 'namePinned' | 'topicPinned' | 'constraintsUpToSeq'>;
+/** 快照内的消息行（wire 形态：思考全文与摘要不外发）。 */
+export type SnapshotMessage = Omit<MessageRecord, 'reasoningFull' | 'thinkingSummary'>;
+/** 发到客户端的全量快照（wire 形态；各表行由领域记录派生，字段增删由编译器同步）。 */
 export interface Snapshot {
     revision: number;
-    run: {
-        running: boolean;
-        sessionId: string | null;
-        currentRoleId: string | null;
-        partial: string;
-        partialReasoning: string;
-        pendingConfirm: PendingConfirm | null;
-        finished: RunFinished | null;
-        replaceMessageId: string | null;
-    };
+    run: Omit<RunState, 'stopping' | 'queue' | 'confirmSignal' | 'childProc'>;
     lastCreated: LastCreated | null;
-    groups: {
-        id: string;
-        name: string;
-        workspaceDir: string;
-        permissionTier: PermissionTier;
-        roleIds: string[];
-        sessionIds: string[];
-    }[];
-    sessions: {
-        id: string;
-        groupId: string;
-        name: string;
-        topic: string;
-        constraints?: SessionConstraint[];
-        messageIds: string[];
-        createdAt: number;
-    }[];
-    roles: {
-        id: string;
-        groupId: string;
-        name: string;
-        color?: string;
-        persona: string;
-        provider: string;
-        model: string;
-        temperature?: number;
-        reasoningEffort?: string;
-        enabled: boolean;
-        thinking: boolean;
-    }[];
-    messages: {
-        id: string;
-        sessionId: string;
-        seq: number;
-        speaker: string;
-        text: string;
-        reasoning?: string;
-        model?: string;
-        error?: boolean;
-        failedRoleId?: string;
-        toolCalls?: ToolCallRecord[];
-        ts: number;
-    }[];
+    groups: GroupRecord[];
+    sessions: SnapshotSession[];
+    roles: RoleRecord[];
+    messages: SnapshotMessage[];
     error?: string;
 }
-/** mutate 动作的参数形态（op 分发见 host/service）。 */
-export interface MutateArgs {
-    op: string;
-    groupId?: string;
-    sessionId?: string;
-    roleId?: string;
-    role?: Partial<RoleRecord>;
+/** mutate 动作的参数形态（判别联合：按 op 收窄各分支字段；wire 上字段可缺，消费方各自守卫）。 */
+export type MutateArgs = {
+    op: 'createGroup';
     name?: string;
+} | {
+    op: 'renameGroup';
+    groupId: string;
+    name?: string;
+} | {
+    op: 'deleteGroup';
+    groupId: string;
+} | {
+    op: 'createSession';
+    groupId: string;
+    name?: string;
+} | {
+    op: 'renameSession';
+    sessionId: string;
+    name?: string;
+} | {
+    op: 'deleteSession';
+    sessionId: string;
+} | {
+    op: 'setTopic';
+    sessionId: string;
     topic?: string;
+} | {
+    op: 'upsertRole';
+    groupId: string;
+    role?: Partial<RoleRecord>;
+} | {
+    op: 'deleteRole';
+    roleId: string;
+} | {
+    op: 'setRoleEnabled';
+    roleId: string;
+    enabled?: boolean;
+} | {
+    op: 'setWorkspaceDir';
+    groupId: string;
     path?: string;
+} | {
+    op: 'setPermissionTier';
+    groupId: string;
     tier?: string;
-    enabled?: boolean;
-}
+} | {
+    op: 'ackFinish';
+} | {
+    op: 'clearMessages';
+    sessionId: string;
+};
 /** send 动作的参数形态。 */
 export interface SendArgs {
     sessionId: string;

package/lib/types/host/engine/defaults.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 引擎共享小件：DSH 默认模型读取 + 发言人展示名（retitle / fold / conversation 共用）。
+ * @module dsh-group-chat/host/engine/defaults
+ */
+import type { RoleRecord } from '../../core/types.ts';
+import type { HostState } from '../state.ts';
+/** DSH 默认模型（agentDefaultModel 服务缺位或未配置时返回 null，调用方静默跳过）。 */
+export declare const defaultModel: (core: HostState) => {
+    provider: string;
+    model: string;
+} | null;
+/** 发言人展示名（roles 表内查角色名；user/system 固定文案，见 speakerLabel）。 */
+export declare const speakerNameOf: (roles: Map<string, RoleRecord>, speaker: string) => string;

package/lib/types/shared/file-mention-grammar.d.ts

@@ -4,6 +4,9 @@
  * Sourced from @deepseek-ai/dsh-file-reference/lib/types/grammar.js
  * Cannot import directly due to client bundle purity gate (dsh-client-bundle-purity).
  *
+ * 只保留输入侧的 @token 识别（activeAtToken）；候选的文本化（formatFileMention）
+ * 未被本插件采用——目录钻入走「插入整颗芯片」语义，见 docs/DESIGN.md Composer 契约。
+ *
  * @module dsh-group-chat/shared
  */
 export interface AtToken {
@@ -14,10 +17,6 @@ export interface AtToken {
     /** Whether the token uses quoted form @"..." */
     quoted: boolean;
 }
-export interface FileCandidate {
-    kind: 'file' | 'directory';
-    path: string;
-}
 /**
  * Extract active @token at cursor position.
  * Matches @ at word boundary (line start or after whitespace).
@@ -27,11 +26,3 @@ export interface FileCandidate {
  * @returns Token or undefined if no active @token at cursor
  */
 export declare function activeAtToken(line: string, cursor: number): AtToken | undefined;
-/**
- * Format file/directory candidate as @mention text.
- *
- * @param candidate - File or directory to format
- * @param preserveQuote - Keep quotes even when unnecessary (for drill-down continuity)
- * @returns Formatted @path or undefined for invalid paths
- */
-export declare function formatFileMention(candidate: FileCandidate, preserveQuote: boolean): string | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@roaming-ai/dsh-group-chat",
   "description": "DSH 模型群聊：多模型角色群组对话面板。角色绑定不同 provider/model，群内共享对话记录；设置页支持启用/停用。",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"

package/src/client/GroupChatPanel.tsx

@@ -41,16 +41,10 @@ export function GroupChatPanel(): ReactNode {
     setConfirmClear,
     roleDraft,
     setRoleDraft,
-    roleFormError,
-    setRoleFormError,
     models,
     setModels,
     modelsError,
     setModelsError,
-    fileBrowser,
-    setFileBrowser,
-    wsDraft,
-    setWsDraft,
     partsSel,
     setPartsSel,
     rounds,
@@ -129,11 +123,11 @@ export function GroupChatPanel(): ReactNode {
     if (busyNow || !sess || sendingRef.current) return
     sendingRef.current = true
     try {
-      const parts = mentionedRoles.length ? mentionedRoles.map((r) => r.id) : participants
-      if (!parts.length) {
-        setErr(mentionedRoles.length ? '' : '请至少选择一个参与角色（或在消息中 @成员）')
-        if (!mentionedRoles.length) return
+      if (!participants.length && !mentionedRoles.length) {
+        setErr('请至少选择一个参与角色（或在消息中 @成员）')
+        return
       }
+      const parts = mentionedRoles.length ? mentionedRoles.map((r) => r.id) : participants
       const res = await action({ kind: 'send', sessionId: sess.id, text: input, participantRoleIds: parts, rounds }) as ActionOk | null
       if (res && !res.ok && res.error) setErr(res.error)
       else if (res && res.ok) {
@@ -220,51 +214,14 @@ export function GroupChatPanel(): ReactNode {
 
   const openRoleEditor = async (role: SnapshotRole | null): Promise<void> => {
     setErr('')
-    setRoleFormError('')
     if (!models || modelsError) await fetchModels()
     setRoleDraft(role ? draftFromRole(role) : blankDraft())
   }
 
-  const saveRole = async (): Promise<void> => {
-    if (!roleDraft) return
-    if (!roleDraft.name.trim()) {
-      setRoleFormError('角色名称不能为空')
-      return
-    }
-    if (!roleDraft.provider || !roleDraft.model) {
-      setRoleFormError('请选择角色绑定的模型')
-      return
-    }
-    const res = await mutate({ op: 'upsertRole', groupId: group.id, role: roleDraft })
-    if (res && res.ok && res.snapshot && !res.snapshot.error) {
-      setRoleDraft(null)
-      setRoleFormError('')
-    }
-  }
-
   const stopRun = async (): Promise<void> => {
     await action({ kind: 'stop', sessionId: sess!.id })
   }
 
-  const openBrowser = async (path: string | undefined): Promise<void> => {
-    setFileBrowser({ open: true, loading: true, list: null, error: '' })
-    try {
-      const res = await api.action({ kind: 'browse', path: path || '' }) as import('../core/types.ts').BrowseResult
-      if (res && res.ok) setFileBrowser({ open: true, loading: false, list: res, error: '' })
-      else setFileBrowser({ open: true, loading: false, list: null, error: (res && res.error) || '浏览失败' })
-    } catch (e) {
-      setFileBrowser({ open: true, loading: false, list: null, error: String((e && (e as Error).message) || e) })
-    }
-  }
-
-  const selectCurrentDir = (): void => {
-    if (!fileBrowser || !fileBrowser.list || !group) return
-    const path = fileBrowser.list.path!
-    void mutate({ op: 'setWorkspaceDir', groupId: group.id, path })
-    setWsDraft(null)
-    setFileBrowser(null)
-  }
-
   return (
     <div className="dsgc-root">
       <NavPanel
@@ -338,14 +295,8 @@ export function GroupChatPanel(): ReactNode {
         snap={snap}
         group={group}
         asideOpen={asideOpen}
-        wsDraft={wsDraft}
-        setWsDraft={setWsDraft}
-        fileBrowser={fileBrowser}
-        setFileBrowser={setFileBrowser}
         mutate={mutate}
         openRoleEditor={openRoleEditor}
-        openBrowser={openBrowser}
-        selectCurrentDir={selectCurrentDir}
       />
       {sess && confirmClear
         ? (
@@ -386,12 +337,12 @@ export function GroupChatPanel(): ReactNode {
           <RoleDrawer
             draft={roleDraft}
             set={setRoleDraft}
+            groupId={group.id}
             models={models}
             modelsError={modelsError}
             onRetryModels={() => { void fetchModels() }}
-            onSave={() => { void saveRole() }}
-            onCancel={() => { setRoleDraft(null); setRoleFormError('') }}
-            formError={roleFormError}
+            mutate={mutate}
+            onCancel={() => { setRoleDraft(null) }}
           />
           )
         : null}

package/src/client/components/AsidePanel.tsx

@@ -1,28 +1,34 @@
 /**
- * 右侧成员与工作区栏组件
+ * 右侧成员与工作区栏组件。工作区目录编辑态（草稿、文件浏览器）为栏内自有状态。
  * @module dsh-group-chat/client/components
  */
 
-import type { ReactNode } from 'react'
+import { useState, type ReactNode } from 'react'
 import { Icon, P } from '../lib/ui.ts'
-import { roleById, type ClientSnapshot, type ModelsResponse, type RoleDraft, type SnapshotRole } from '../lib/model.ts'
+import { api } from '../lib/api.ts'
+import { roleById, type ClientSnapshot, type SnapshotRole } from '../lib/model.ts'
+import type { BrowseResult } from '../../core/types.ts'
 
 interface AsidePanelProps {
   snap: ClientSnapshot
   group: ClientSnapshot['groups'][number]
   asideOpen: boolean
-  wsDraft: string | null
-  setWsDraft: (val: string | null) => void
-  fileBrowser: { open: boolean, loading: boolean, list: import('../../core/types.ts').BrowseResult | null, error: string } | null
-  setFileBrowser: (val: { open: boolean, loading: boolean, list: import('../../core/types.ts').BrowseResult | null, error: string } | null) => void
   mutate: (args: Record<string, unknown>) => Promise<unknown>
-  openRoleEditor: (role: SnapshotRole | null) => Promise<void>
-  openBrowser: (path: string | undefined) => Promise<void>
-  selectCurrentDir: () => void
+  openRoleEditor: (role: SnapshotRole | null) => void
+}
+
+/** 文件浏览器态（栏内自有）。 */
+interface FileBrowserState {
+  open: boolean
+  loading: boolean
+  list: BrowseResult | null
+  error: string
 }
 
 export function AsidePanel(props: AsidePanelProps): ReactNode {
-  const { snap, group, asideOpen, wsDraft, setWsDraft, fileBrowser, setFileBrowser, mutate, openRoleEditor, openBrowser, selectCurrentDir } = props
+  const { snap, group, asideOpen, mutate, openRoleEditor } = props
+  const [wsDraft, setWsDraft] = useState<string | null>(null)
+  const [fileBrowser, setFileBrowser] = useState<FileBrowserState | null>(null)
 
   const commitWsDir = (): void => {
     if (wsDraft !== null && group && wsDraft !== (group.workspaceDir || '')) {
@@ -31,6 +37,25 @@ export function AsidePanel(props: AsidePanelProps): ReactNode {
     setWsDraft(null)
   }
 
+  const openBrowser = async (path: string | undefined): Promise<void> => {
+    setFileBrowser({ open: true, loading: true, list: null, error: '' })
+    try {
+      const res = await api.action({ kind: 'browse', path: path || '' }) as BrowseResult
+      if (res && res.ok) setFileBrowser({ open: true, loading: false, list: res, error: '' })
+      else setFileBrowser({ open: true, loading: false, list: null, error: (res && res.error) || '浏览失败' })
+    } catch (e) {
+      setFileBrowser({ open: true, loading: false, list: null, error: String((e && (e as Error).message) || e) })
+    }
+  }
+
+  const selectCurrentDir = (): void => {
+    if (!fileBrowser || !fileBrowser.list || !group) return
+    const path = fileBrowser.list.path!
+    void mutate({ op: 'setWorkspaceDir', groupId: group.id, path })
+    setWsDraft(null)
+    setFileBrowser(null)
+  }
+
   return (
     <div className={'dsgc-aside' + (asideOpen ? '' : ' closed')} aria-hidden={asideOpen ? undefined : 'true'}>
       <div className="dsgc-sec">
@@ -38,7 +63,7 @@ export function AsidePanel(props: AsidePanelProps): ReactNode {
           群成员
           <span className="dsgc-secspacer" />
           <span className="dsgc-seccount">{group.roleIds.length ? group.roleIds.length + ' 个' : ''}</span>
-          <P.Button variant="ghost" size="sm" onClick={() => { void openRoleEditor(null) }} aria-label="添加角色">
+          <P.Button variant="ghost" size="sm" onClick={() => { openRoleEditor(null) }} aria-label="添加角色">
             {Icon(P.IconPlusOutline16, 14)}添加
           </P.Button>
         </div>
@@ -54,8 +79,8 @@ export function AsidePanel(props: AsidePanelProps): ReactNode {
                     className={'dsgc-role' + (r.enabled ? '' : ' off')}
                     role="button"
                     tabIndex={0}
-                    onClick={() => { void openRoleEditor(r) }}
-                    onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); void openRoleEditor(r) } }}
+                    onClick={() => { openRoleEditor(r) }}
+                    onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); openRoleEditor(r) } }}
                     title="点击编辑角色"
                   >
                     <div className="dsgc-rolehead">
@@ -94,7 +119,7 @@ export function AsidePanel(props: AsidePanelProps): ReactNode {
                           className="dsgc-opbtn"
                           title="编辑角色"
                           aria-label="编辑角色"
-                          onClick={(e) => { e.stopPropagation(); void openRoleEditor(r) }}
+                          onClick={(e) => { e.stopPropagation(); openRoleEditor(r) }}
                         >
                           {Icon(P.IconEditOutline16, 14)}
                         </button>

package/src/client/components/ConstraintList.tsx

@@ -5,14 +5,9 @@
 
 import { useState, type ReactNode } from 'react'
 import type { SessionConstraint } from '../../core/types.ts'
+import { KIND_LABEL } from '../../core/constraints.ts'
 import { ClipWell, Fold } from './Fold.tsx'
 
-const KIND_LABEL: Record<SessionConstraint['kind'], string> = {
-  decided: '已定',
-  rejected: '否决',
-  open: '未决',
-}
-
 interface ConstraintListProps {
   items: SessionConstraint[]
 }

package/src/client/components/MessageFlow.tsx

@@ -87,6 +87,8 @@ export function MessageFlow(props: MessageFlowProps): ReactNode {
   let livePlaced = false
 
   if (sess) {
+    // 循环不变量：本群角色表只过滤一次（流式期间每帧执行的热路径）
+    const groupRoles = snap.roles.filter((r) => r.groupId === sess.groupId)
     const ids = sess.messageIds
     const memo = sess.constraints && sess.constraints.length
       ? <ConstraintList key={sess.id + '-constraints'} items={sess.constraints} />
@@ -100,7 +102,6 @@ export function MessageFlow(props: MessageFlowProps): ReactNode {
       if (!m) continue
       // 角色在父级解析：Bubble 按值 memo（不依赖 snap identity），流式帧
       // 不再触发已完成消息的全量重渲（每帧仅 live 行与派生列表变化）
-      const groupRoles = snap.roles.filter((r) => r.groupId === sess.groupId)
       const role = resolveFailedRole(m, groupRoles) || (m.speaker !== 'user' && m.speaker !== 'system' ? roleById(snap, m.speaker) : null)
       // 原地重试：该槽位换成 live（确认卡紧随其后），不要钉在列表末尾
       if (replaceId && m.id === replaceId) {