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

package/src/client/lib/model.ts

@@ -3,7 +3,7 @@
  * @module dsh-group-chat/client/model
  */
 
-import type { RoleRecord, Snapshot, ToolCallRecord } from '../../core/types.ts'
+import type { Snapshot } from '../../core/types.ts'
 
 /** 会话列表状态派生与文案（core 纯函数，供 NavPanel 渲染）。 */
 export { sessStatus, SESS_STATUS_LABEL, type SessStatus } from '../../core/status.ts'
@@ -104,16 +104,3 @@ export function draftFromRole(role: SnapshotRole): RoleDraft {
 export function blankDraft(): RoleDraft {
   return { name: '', color: null, persona: '', provider: '', model: '', temperature: undefined, reasoningEffort: 'default', enabled: true, thinking: false }
 }
-
-/** 工具调用行的展示参数。 */
-export type ToolCallView = ToolCallRecord
-
-/** 草稿是否可作为角色落库（宿主侧再校验一次）。 */
-export function draftMissing(draft: RoleDraft): string {
-  if (!draft.name.trim()) return '角色名称不能为空'
-  if (!draft.provider || !draft.model) return '请选择角色绑定的模型'
-  return ''
-}
-
-/** RoleRecord 兼容视图（快照角色行即其展示子集）。 */
-export type RoleView = RoleRecord

package/src/client/lib/styles.ts

@@ -201,8 +201,12 @@ export const CSS = [
   /* @提及芯片（输入区内原子元素）：色点 + 角色色淡底胶囊——弹层候选行同语言 */
   '.dsgc-chipin{display:inline-flex;align-items:center;gap:4px;background:color-mix(in srgb,var(--role-color,#888) 15%,transparent);border-radius:999px;padding:1px 7px 1px 5px;margin:0 1px;font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary,inherit);white-space:nowrap;user-select:all}',
   '.dsgc-card .dsgc-sendrow{padding:0 12px 10px}',
-  '.dsgc-stopbtn{background:var(--dsw-alias-state-error-primary,#e5484d);border-color:transparent;color:#fff;font-weight:600}',
-  '.dsgc-stopbtn:hover:not(:disabled){filter:brightness(1.08);color:#fff}',
+  /* 停止/清空按钮：实心红（Button primitive outline 变体的 hover 规则
+     background:interactive-bg-hover 特异度 (0,3,0) 会盖掉 (0,1,0) 的红底，
+     悬停时按钮变透明；加 button 类型选择器提为 (0,1,1)/(0,3,1)，顺序无关
+     地压过变体，hover 补回红底并经 brightness 提亮） */
+  'button.dsgc-stopbtn{background:var(--dsw-alias-state-error-primary,#e5484d);border-color:transparent;color:#fff;font-weight:600}',
+  'button.dsgc-stopbtn:hover:not(:disabled){background:var(--dsw-alias-state-error-primary,#e5484d);filter:brightness(1.08);color:#fff}',
   /* 标签固定在左；芯片在右侧独立换行，后续行与首行芯片左缘对齐（不折到「参与角色」下面）。
      单行 24px；角色过多时随内容增高，避免固定高度把后续行溢出叠到下方输入卡上 */
   '.dsgc-parts{display:flex;align-items:flex-start;gap:6px;min-height:24px}',

package/src/client/utils/utils.ts

@@ -57,10 +57,10 @@ export function serializeInput(root: HTMLElement): string {
   return Array.from(root.childNodes).map(walk).join('')
 }
 
-/** @角色芯片的 HTML（原子元素：contenteditable=false + draggable，退格整删）。 */
-export function chipHtml(role: { id: string, name: string, color?: string }): string {
+/** @角色芯片的 HTML（原子元素：contenteditable=false + draggable，退格整删；fresh=插入后需营救选区，加 data-new 标记）。 */
+export function chipHtml(role: { id: string, name: string, color?: string }, fresh = false): string {
   const c = escapeHtml(role.color || '#888')
-  return '<span class="dsgc-chipin" data-role-id="' + escapeHtml(role.id) + '" data-name="' + escapeHtml(role.name) + '" style="--role-color:' + c + '" contenteditable="false" draggable="true">' +
+  return '<span class="dsgc-chipin"' + (fresh ? ' data-new=""' : '') + ' data-role-id="' + escapeHtml(role.id) + '" data-name="' + escapeHtml(role.name) + '" style="--role-color:' + c + '" contenteditable="false" draggable="true">' +
     '<span class="dsgc-chipdot" style="background:' + c + '"></span>' + escapeHtml(role.name) + '</span>'
 }
 
@@ -81,11 +81,11 @@ function fileTypeIconMarkup(path: string, kind: 'file' | 'directory'): string {
   }
 }
 
-/** @文件芯片的 HTML（原子元素：contenteditable=false + draggable，退格整删）。 */
-export function fileChipHtml(path: string, kind: 'file' | 'directory'): string {
+/** @文件芯片的 HTML（原子元素：contenteditable=false + draggable，退格整删；fresh 同 chipHtml）。 */
+export function fileChipHtml(path: string, kind: 'file' | 'directory', fresh = false): string {
   const basename = path.split('/').pop() || path
   const dir = kind === 'directory'
-  return '<span class="dsgc-chipin dsgc-chipin-file" data-kind="file"' + (dir ? ' data-dir="1"' : '') + ' data-path="' + escapeHtml(path) + '" contenteditable="false" draggable="true">' +
+  return '<span class="dsgc-chipin dsgc-chipin-file"' + (fresh ? ' data-new=""' : '') + ' data-kind="file"' + (dir ? ' data-dir="1"' : '') + ' data-path="' + escapeHtml(path) + '" contenteditable="false" draggable="true">' +
     '<span class="dsgc-chipglyph" aria-hidden="true">' + fileTypeIconMarkup(path, kind) + '</span>' + escapeHtml(basename) + '</span>'
 }
 

package/src/core/constraints.ts

@@ -3,6 +3,7 @@
  * @module dsh-group-chat/core/constraints
  */
 
+import { looseJson } from './json.ts'
 import { TRANSCRIPT_TOOL_SUMMARY } from './tools.ts'
 import { asConstraintKind, type MessageRecord, type SessionConstraint, type SessionRecord } from './types.ts'
 
@@ -182,18 +183,11 @@ export function sanitizeConstraints(raw: unknown): SessionConstraint[] {
  * 解析折叠模型输出。null = 解析失败（水位不推）；[] = 无新结论（水位推、备忘不动）。
  */
 export function parseConstraints(raw: string): SessionConstraint[] | null {
-  const body = raw.replace(/```(?:json)?/g, '')
-  const l = body.indexOf('{')
-  const r = body.lastIndexOf('}')
-  if (l < 0 || r <= l) return null
-  try {
-    const o = JSON.parse(body.slice(l, r + 1)) as { constraints?: unknown }
-    if (!Object.prototype.hasOwnProperty.call(o, 'constraints')) return null
-    if (!Array.isArray(o.constraints)) return null
-    return sanitizeConstraints(o.constraints)
-  } catch {
-    return null
-  }
+  const o = looseJson(raw.replace(/```(?:json)?/g, ''))
+  if (o === null) return null
+  if (!Object.prototype.hasOwnProperty.call(o, 'constraints')) return null
+  if (!Array.isArray(o.constraints)) return null
+  return sanitizeConstraints(o.constraints)
 }
 
 /** 本批无用户消息时，新的已定/否决降为未决。 */

package/src/core/errors.ts

@@ -111,17 +111,7 @@ export function repairFailedMessage(
   return changed
 }
 
-function pickJsonBlob(text: string): Record<string, unknown> | null {
-  const start = text.indexOf('{')
-  const end = text.lastIndexOf('}')
-  if (start < 0 || end <= start) return null
-  try {
-    const parsed = JSON.parse(text.slice(start, end + 1)) as unknown
-    return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed as Record<string, unknown> : null
-  } catch {
-    return null
-  }
-}
+import { looseJson } from './json.ts'
 
 function httpStatus(text: string): number | null {
   const m = text.match(/\b([1-5]\d{2})\b/)
@@ -141,7 +131,7 @@ function resetHint(message: string): string | undefined {
  */
 export function classifySpeakFailure(raw: string): SpeakFailureView {
   const source = unwrapSpeakFailure(raw)
-  const blob = pickJsonBlob(source)
+  const blob = looseJson(source)
   const code = blob && typeof blob.code === 'string' ? blob.code : ''
   const type = blob && typeof blob.type === 'string' ? blob.type : ''
   const message = blob && typeof blob.message === 'string' ? blob.message : source

package/src/core/json.ts

@@ -27,3 +27,20 @@ export function roleJson(r: Partial<RoleRecord>): Record<string, unknown> {
   if (typeof r.reasoningEffort === 'string' && r.reasoningEffort && r.reasoningEffort !== 'default') o.reasoningEffort = r.reasoningEffort
   return o
 }
+
+/**
+ * 宽容 JSON 提取（模型输出/供应商错误原文的统一解析入口）：
+ * 取首个 { 至末个 } 的片段解析，仅接受普通对象；失败返回 null。
+ * 代码围栏剥离由调用方按需先行处理（供应商错误原文不剥）。
+ */
+export function looseJson(raw: string): Record<string, unknown> | null {
+  const start = raw.indexOf('{')
+  const end = raw.lastIndexOf('}')
+  if (start < 0 || end <= start) return null
+  try {
+    const parsed = JSON.parse(raw.slice(start, end + 1)) as unknown
+    return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed as Record<string, unknown> : null
+  } catch {
+    return null
+  }
+}

package/src/core/types.ts

@@ -149,7 +149,8 @@ export interface RunState {
   queue: string[]
   pendingConfirm: PendingConfirm | null
   confirmSignal: { resolve: (allowed: boolean) => void } | null
-  childProc: import('node:child_process').ChildProcess | null
+  /** 正在执行的 run_command 的中止句柄（stop/dispose 时 abort，执行器 kill 进程）。 */
+  commandAbort: AbortController | null
   /** 最近一次 run 的结束标记：会话列表「已完成/已出错」状态的数据源。 */
   finished: RunFinished | null
   /** 原地重试时被覆盖的失败消息 id；普通 send 为 null。 */
@@ -202,31 +203,39 @@ 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' | 'commandAbort'>
   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>
-  name?: string
-  topic?: string
-  path?: string
-  tier?: string
-  enabled?: boolean
-}
+/** 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 }
+  | { op: 'ackFinish' }
+  | { op: 'clearMessages', sessionId: string }
 
 /** send 动作的参数形态。 */
 export interface SendArgs {

package/src/host/api/actions.ts

@@ -36,7 +36,8 @@ export function createActions(core: HostState, deps: {
   const { touch, snapshot, schedulePersist, dropDirty, appendMessage, runLoop, wakeConfirm, killChild, browse, fileSearch, disposeFileSearch } = deps
 
   const mutate = (args: MutateArgs): Snapshot => {
-    const op = args && args.op
+    // 直接属性别名保持判别联合收窄（调用方 handleAction 已保证 body 为对象）
+    const op = args.op
     if (op === 'createGroup') {
       const g: GroupRecord = { id: core.nid('grp'), name: String(args.name || '').trim() || '群组 ' + (groups.size + 1), workspaceDir: '', permissionTier: 'view_only', roleIds: [], sessionIds: [] }
       groups.set(g.id, g)
@@ -46,14 +47,14 @@ export function createActions(core: HostState, deps: {
       schedulePersist({ ledger: true, session: sess.id })
       touch()
     } else if (op === 'renameGroup') {
-      const g = groups.get(args.groupId!)
+      const g = groups.get(args.groupId)
       if (g && String(args.name || '').trim()) {
         g.name = String(args.name).trim()
         schedulePersist({ ledger: true })
         touch()
       }
     } else if (op === 'deleteGroup') {
-      const g = groups.get(args.groupId!)
+      const g = groups.get(args.groupId)
       if (!g) return { ...snapshot(), error: '群组不存在' }
       if (groups.size <= 1) return { ...snapshot(), error: '至少保留一个群组' }
       if (run.running) {
@@ -80,7 +81,7 @@ export function createActions(core: HostState, deps: {
       schedulePersist({ ledger: true })
       touch()
     } else if (op === 'createSession') {
-      const g = groups.get(args.groupId!)
+      const g = groups.get(args.groupId)
       if (!g) return { ...snapshot(), error: '群组不存在' }
       const sess = core.newSession(g.id, String(args.name || '').trim() || undefined)
       g.sessionIds.push(sess.id)
@@ -88,7 +89,7 @@ export function createActions(core: HostState, deps: {
       schedulePersist({ ledger: true, session: sess.id })
       touch()
     } else if (op === 'renameSession') {
-      const sess = sessions.get(args.sessionId!)
+      const sess = sessions.get(args.sessionId)
       if (sess && String(args.name || '').trim()) {
         sess.name = String(args.name).trim()
         sess.namePinned = true // 手动编辑 = 隐式固定：自动命名此后跳过名称
@@ -96,7 +97,7 @@ export function createActions(core: HostState, deps: {
         touch()
       }
     } else if (op === 'deleteSession') {
-      const sess = sessions.get(args.sessionId!)
+      const sess = sessions.get(args.sessionId)
       if (!sess) return { ...snapshot(), error: '会话不存在' }
       const g = groups.get(sess.groupId)
       if (g && g.sessionIds.length <= 1) return { ...snapshot(), error: '每个群组至少保留一个会话' }
@@ -115,7 +116,7 @@ export function createActions(core: HostState, deps: {
       schedulePersist({ ledger: true })
       touch()
     } else if (op === 'setTopic') {
-      const sess = sessions.get(args.sessionId!)
+      const sess = sessions.get(args.sessionId)
       if (sess) {
         sess.topic = String(args.topic || '')
         sess.topicPinned = true // 手动编辑 = 隐式固定：自动整理此后跳过主题
@@ -123,7 +124,7 @@ export function createActions(core: HostState, deps: {
         touch()
       }
     } else if (op === 'upsertRole') {
-      const g = groups.get(args.groupId!)
+      const g = groups.get(args.groupId)
       const r = args.role || {}
       if (!g) return { ...snapshot(), error: '群组不存在' }
       if (!r.name || !String(r.name).trim()) return { ...snapshot(), error: '角色名称不能为空' }
@@ -161,7 +162,7 @@ export function createActions(core: HostState, deps: {
         touch()
       }
     } else if (op === 'deleteRole') {
-      const r = roles.get(args.roleId!)
+      const r = roles.get(args.roleId)
       if (r) {
         const gid = r.groupId
         const g = groups.get(gid)
@@ -171,14 +172,14 @@ export function createActions(core: HostState, deps: {
         touch()
       }
     } else if (op === 'setRoleEnabled') {
-      const r = roles.get(args.roleId!)
+      const r = roles.get(args.roleId)
       if (r) {
         r.enabled = !!args.enabled
         schedulePersist({ roles: r.groupId })
         touch()
       }
     } else if (op === 'setWorkspaceDir') {
-      const g = groups.get(args.groupId!)
+      const g = groups.get(args.groupId)
       if (g) {
         g.workspaceDir = String(args.path || '').trim()
         schedulePersist({ workspace: g.id })
@@ -187,7 +188,7 @@ export function createActions(core: HostState, deps: {
     } else if (op === 'setPermissionTier') {
       const tier = asPermissionTier(args.tier)
       if (!tier) return { ...snapshot(), error: '未知权限档位' }
-      const g = groups.get(args.groupId!)
+      const g = groups.get(args.groupId)
       if (g) {
         g.permissionTier = tier
         // 降到仅可查看时若该群挂着待确认命令，自动拒绝（安全侧倾斜）；
@@ -206,7 +207,7 @@ export function createActions(core: HostState, deps: {
         touch()
       }
     } else if (op === 'clearMessages') {
-      const sess = sessions.get(args.sessionId!)
+      const sess = sessions.get(args.sessionId)
       if (sess) {
         if (run.running && run.sessionId === sess.id) return { ...snapshot(), error: '对话进行中，无法清空' }
         for (const mid of sess.messageIds) messages.delete(mid)

package/src/host/engine/conversation.ts

@@ -6,12 +6,13 @@
 
 import { realpathSync } from 'node:fs'
 import type { GenerateOptions, Message } from '@deepseek-ai/dsh-llm'
-import { constraintBlock, formatTranscriptLine, prefixIds, speakerLabel, squeezedMessages, tempTranscript, WINDOW_SIZE } from '../../core/constraints.ts'
+import { constraintBlock, formatTranscriptLine, prefixIds, squeezedMessages, tempTranscript, WINDOW_SIZE } from '../../core/constraints.ts'
 import { unwrapSpeakFailure } from '../../core/errors.ts'
 import { TOOL_FLOOR_COST_CHARS, TOOL_REPEAT_LIMIT, TOOL_RESULTS_TOTAL_MAX, TRANSCRIPT_TOOL_SUMMARY } from '../../core/tools.ts'
 import type { GroupRecord, MessageRecord, RoleRecord, SessionRecord, SpeakResult, ToolCallRecord } from '../../core/types.ts'
 import { asEffort } from '../../core/types.ts'
 import type { HostState } from '../state.ts'
+import { speakerNameOf } from './defaults.ts'
 import { createFold } from './fold.ts'
 import { createRetitle } from './retitle.ts'
 import type { Materials } from '../materials/index.ts'
@@ -44,7 +45,6 @@ export function createConversation(core: HostState, deps: { touch: () => void, s
   // 标题/主题自动整理 + 窗口外约束折叠（finally 之后并列后台跑，不占用 run）
   const retitle = createRetitle(core, { touch, schedulePersist })
   const fold = createFold(core, { touch, schedulePersist })
-  const nameOf = (speaker: string): string => speakerLabel(speaker, (roles.get(speaker) || { name: undefined }).name)
 
   const appendMessage = (sess: SessionRecord, speaker: string, text: string, extra?: Partial<MessageRecord>): MessageRecord => {
     const msg: MessageRecord = { id: core.nid('msg'), sessionId: sess.id, seq: sess.messageIds.length + 1, speaker, text, reasoning: undefined, model: undefined, error: undefined, ts: Date.now() }
@@ -64,57 +64,50 @@ export function createConversation(core: HostState, deps: { touch: () => void, s
     return msg
   }
 
+  /** 原地覆盖既有消息（重试槽位）；目标不存在或不属于本会话时返回 false，由调用方走追加。 */
+  const overwriteMessage = (sess: SessionRecord, replaceId: string | undefined, patch: Partial<MessageRecord>): boolean => {
+    if (!replaceId) return false
+    const existing = messages.get(replaceId)
+    if (!existing || existing.sessionId !== sess.id) return false
+    Object.assign(existing, patch, { ts: Date.now() })
+    touch()
+    schedulePersist({ session: sess.id })
+    return true
+  }
+
   /** 把失败回合写成该角色的消息（speaker = 角色 id），不再用系统胶囊顶替。 */
   const writeFailure = (sess: SessionRecord, role: RoleRecord, err: unknown, replaceId?: string): void => {
     const raw = unwrapSpeakFailure(String((err && (err as Error).message) || err))
-    const extra: Partial<MessageRecord> = {
-      error: true,
-      failedRoleId: role.id,
-      model: role.provider + ' / ' + role.model,
-    }
-    if (replaceId) {
-      const existing = messages.get(replaceId)
-      if (existing && existing.sessionId === sess.id) {
-        existing.speaker = role.id
-        existing.text = raw
-        existing.error = true
-        existing.failedRoleId = role.id
-        existing.model = extra.model
-        existing.reasoning = undefined
-        existing.reasoningFull = undefined
-        existing.thinkingSummary = undefined
-        existing.toolCalls = undefined
-        existing.ts = Date.now()
-        touch()
-        schedulePersist({ session: sess.id })
-        return
-      }
-    }
+    const model = role.provider + ' / ' + role.model
+    const extra: Partial<MessageRecord> = { error: true, failedRoleId: role.id, model }
+    if (overwriteMessage(sess, replaceId, {
+      speaker: role.id,
+      text: raw,
+      ...extra,
+      reasoning: undefined,
+      reasoningFull: undefined,
+      thinkingSummary: undefined,
+      toolCalls: undefined,
+    })) return
     appendMessage(sess, role.id, raw, extra)
   }
 
   /** 成功发言写入：replaceId 存在则原地覆盖失败卡。 */
   const writeSuccess = (sess: SessionRecord, role: RoleRecord, out: SpeakResult, replaceId?: string): void => {
-    const extra: Partial<MessageRecord> = { model: role.provider + ' / ' + role.model, reasoning: out.reasoning, toolCalls: out.toolCalls }
-    if (replaceId) {
-      const existing = messages.get(replaceId)
-      if (existing && existing.sessionId === sess.id) {
-        existing.speaker = role.id
-        existing.text = out.text
-        existing.error = undefined
-        existing.failedRoleId = undefined
-        existing.model = extra.model
-        existing.reasoning = out.reasoning
-        existing.reasoningFull = undefined
-        existing.thinkingSummary = undefined
-        existing.toolCalls = Array.isArray(out.toolCalls) && out.toolCalls.length > 0 ? out.toolCalls : undefined
-        existing.ts = Date.now()
-        touch()
-        schedulePersist({ session: sess.id })
-        return
-      }
-    }
-    appendMessage(sess, role.id, out.text, extra)
+    const model = role.provider + ' / ' + role.model
+    const toolCalls = Array.isArray(out.toolCalls) && out.toolCalls.length > 0 ? out.toolCalls : undefined
+    if (overwriteMessage(sess, replaceId, {
+      speaker: role.id,
+      text: out.text,
+      error: undefined,
+      failedRoleId: undefined,
+      model,
+      reasoning: out.reasoning,
+      reasoningFull: undefined,
+      thinkingSummary: undefined,
+      toolCalls,
+    })) return
+    appendMessage(sess, role.id, out.text, { model, reasoning: out.reasoning, toolCalls: out.toolCalls })
   }
 
   /** 群聊记录 → 角色上下文块（最近 40 条 + 未折入临时原文）。失败卡不进上下文。重试截到该条之前。 */
@@ -123,10 +116,10 @@ export function createConversation(core: HostState, deps: { touch: () => void, s
     for (const mid of prefixIds(sess.messageIds, skipId).slice(-WINDOW_SIZE)) {
       const m = messages.get(mid)
       if (!m || m.id === skipId || m.error) continue
-      out.push(formatTranscriptLine(m, nameOf(m.speaker)))
+      out.push(formatTranscriptLine(m, speakerNameOf(roles, m.speaker)))
     }
     const live = out.join('\n\n')
-    const temp = tempTranscript(squeezedMessages(messages, sess, skipId), (m) => nameOf(m.speaker))
+    const temp = tempTranscript(squeezedMessages(messages, sess, skipId), (m) => speakerNameOf(roles, m.speaker))
     if (!temp) return live
     if (!live) return temp
     return temp + '\n\n' + live
@@ -297,7 +290,10 @@ export function createConversation(core: HostState, deps: { touch: () => void, s
       msgs.push({ id: ('g' + core.revision + '-a' + msgs.length) as Message['id'], role: 'assistant', content: assistantContent, source: { kind: 'model', provider: role.provider, model: role.model } })
       for (const tc of round.tcs) {
         if (run.stopping) break
-        const res = await tools.executeTool(g, wsRoot!, tc)
+        // wsRoot 为 null 时 toolSchemas 必为空、不会产生 tool-call；防御性跳出，
+        // 不把空根传进沙箱
+        if (wsRoot === null) break
+        const res = await tools.executeTool(g, wsRoot, tc)
         const output = String(res.output || '')
         toolCalls.push({ tool: tc.name, args: res.args, status: res.status, output, durationMs: res.durationMs })
         budgetUsed += Math.max(output.length, TOOL_FLOOR_COST_CHARS)
@@ -326,12 +322,15 @@ export function createConversation(core: HostState, deps: { touch: () => void, s
   }
 
   const runLoop = async (sess: SessionRecord, opts?: { replaceMessageId?: string }): Promise<void> => {
-    const g = groups.get(sess.groupId)
+    const g = groups.get(sess.groupId) ?? null
     const startCount = sess.messageIds.length
     let failed = false // 发言失败 → 会话列表「已出错」标记
     let replaceId = opts && opts.replaceMessageId
     run.replaceMessageId = replaceId || null
     try {
+      // 群组在 run 期间不可删（send 已校验 + deleteGroup 拦截运行中群组）；
+      // 防御性早退——置空让 finally 走统一复位路径
+      if (!g) return
       while (run.queue.length > 0 && !run.stopping) {
         const roleId = run.queue.shift()!
         const role = roles.get(roleId)
@@ -343,7 +342,7 @@ export function createConversation(core: HostState, deps: { touch: () => void, s
         const targetId = replaceId
         replaceId = undefined
         try {
-          const out = await speak(g!, sess, role, targetId)
+          const out = await speak(g, sess, role, targetId)
           // 停止后不落部分消息（已有「已停止本次对话」系统消息承接）
           if (!run.stopping && (out.text || (Array.isArray(out.toolCalls) && out.toolCalls.length > 0))) {
             writeSuccess(sess, role, out, targetId)
@@ -380,7 +379,7 @@ export function createConversation(core: HostState, deps: { touch: () => void, s
       run.queue = []
       run.pendingConfirm = null
       run.confirmSignal = null
-      run.childProc = null
+      run.commandAbort = null
       run.stopping = false
       run.replaceMessageId = null
       touch()

package/src/host/engine/defaults.ts

@@ -0,0 +1,28 @@
+/**
+ * 引擎共享小件：DSH 默认模型读取 + 发言人展示名（retitle / fold / conversation 共用）。
+ * @module dsh-group-chat/host/engine/defaults
+ */
+
+import { speakerLabel } from '../../core/constraints.ts'
+import type { RoleRecord } from '../../core/types.ts'
+import type { HostState } from '../state.ts'
+
+/** DSH 默认模型（agentDefaultModel 服务缺位或未配置时返回 null，调用方静默跳过）。 */
+export const defaultModel = (core: HostState): { provider: string, model: string } | null => {
+  try {
+    // cordis 语义：未 inject 的 ctx 属性访问会抛错（"cannot get property without
+    // inject"），`?.` 接不住——可选消费必须走 reflect.get（读全局注册表，缺位返回
+    // undefined）。直接属性访问曾致 retitle 被静默跳过（标题/主题从不生成）。
+    const svc = core.ctx.reflect.get('agentDefaultModel')
+    const sel = svc ? svc.currentSelection() : null
+    return sel && typeof sel.provider === 'string' && typeof sel.model === 'string' && sel.provider && sel.model
+      ? { provider: sel.provider, model: sel.model }
+      : null
+  } catch {
+    return null
+  }
+}
+
+/** 发言人展示名（roles 表内查角色名；user/system 固定文案，见 speakerLabel）。 */
+export const speakerNameOf = (roles: Map<string, RoleRecord>, speaker: string): string =>
+  speakerLabel(speaker, roles.get(speaker)?.name)

package/src/host/engine/fold.ts

@@ -13,24 +13,11 @@ import {
   parseConstraints,
   squeezedMaxSeq,
   squeezedMessages,
-  speakerLabel,
   takeFoldBatch,
 } from '../../core/constraints.ts'
 import type { SessionRecord } from '../../core/types.ts'
 import type { HostState } from '../state.ts'
-
-/** DSH 默认模型（与 retitle 同一读取面；缺位返回 null）。 */
-const defaultModel = (core: HostState): { provider: string, model: string } | null => {
-  try {
-    const svc = core.ctx.reflect.get('agentDefaultModel')
-    const sel = svc ? svc.currentSelection() : null
-    return sel && typeof sel.provider === 'string' && typeof sel.model === 'string' && sel.provider && sel.model
-      ? { provider: sel.provider, model: sel.model }
-      : null
-  } catch {
-    return null
-  }
-}
+import { defaultModel, speakerNameOf } from './defaults.ts'
 
 /**
  * 每轮 send 结束后折叠窗口外约束：fire-and-forget、不产生消息、静默失败。
@@ -41,13 +28,11 @@ export function createFold(core: HostState, deps: { touch: () => void, scheduleP
   const { touch, schedulePersist } = deps
   const folding = new Set<string>()
 
-  const nameOf = (speaker: string): string => speakerLabel(speaker, (roles.get(speaker) || { name: undefined }).name)
-
   return async (sess: SessionRecord): Promise<void> => {
     if (folding.has(sess.id)) return
     const squeezed = squeezedMessages(messages, sess)
     if (!squeezed.length) return
-    const input = takeFoldBatch(squeezed, (m) => nameOf(m.speaker))
+    const input = takeFoldBatch(squeezed, (m) => speakerNameOf(roles, m.speaker))
     const watermark = squeezedMaxSeq(input.consumed)
     if (watermark <= 0) return