@modesto_ma/dsh-channels 0.6.0 → 0.8.0-beta.1

package/src/index.ts

@@ -17,13 +17,13 @@
 
 import type { HostContext } from './dsh-types.ts'
 import { FeishuService } from './service.ts'
-import { pluginConfigSchema, resolveConfig } from './config.ts'
+import { MOVED_ANALYZE_NOTICE, movedAnalyzeKeysOf, pluginConfigSchema, resolveConfig } from './config.ts'
 import type { FeishuConfig } from './config.ts'
 import { defaultChannelFactory } from './feishu-channel.ts'
 import type { ChannelFactory } from './feishu-channel.ts'
 import { OverlayStore, defaultOverlayPath } from './settings/overlay.ts'
 import { mountSettingsRoutes } from './settings/routes.ts'
-import { mountAnalyzeRoute } from './analyze/server.ts'
+import { FEISHU_TOPICS_SERVICE } from './topics/launcher.ts'
 import { SettingsSurface } from './settings/surface.ts'
 import { createHostCatalog } from './settings/catalog.ts'
 import { createSettingsDirectoryPicker } from './settings/directory-picker.ts'
@@ -40,6 +40,7 @@ export type * from './session-export.ts'
 export type * from './stats.ts'
 export type * from './questions.ts'
 export type * from './settings/contract.ts'
+export type * from './topics/contract.ts'
 export * from './access/index.ts'
 export type { AccessGroupRecord, AccessRequestRecord, AccessUserRecord } from './domain.ts'
 export { CATALOG_ROUTE, CLEAR_CONFIG_ROUTE, CLEAR_CREDENTIAL_ROUTE, EDITABLE_KEYS, PANEL_COPY, PANEL_ROUTE, PICK_DIRECTORY_ROUTE, RECONNECT_ROUTE, RESTART_KEYS, SAVE_CONFIG_ROUTE, SAVE_CREDENTIALS_ROUTE, STATUS_ROUTE } from './settings/contract.ts'
@@ -54,7 +55,7 @@ export type { HostDirectoryPickerService, SettingsDirectoryPicker } from './sett
 export { mountSettingsRoutes, registerSettingsRoutes } from './settings/routes.ts'
 export type { HostConnection, HostFetchRoute } from './settings/routes.ts'
 export type { ApprovalOutcome, ApprovalRequest, ApprovalAnswererListener, AssistantStreamFrame, AskUserQuestionAnswer, AskUserQuestionAnswerItem, AskUserQuestionItem, AskUserQuestionRequestEvent, UserQuestionAnswererListener, AgentCancelCause, SessionStatsView, TokenUsageView, ContextPressureView, SessionProjections } from './dsh-types.ts'
-export { buildCard, buildInterruptionCard, cardJsonBytes, CARD_MAX_BYTES, CARD_TARGET_BYTES, REASONING_MAX_BYTES, INTERRUPTION_NOTICE, MAX_TABLES_PER_CARD, PANEL_TITLES, PANEL_CHEVRON_TOKEN, segmentCardContent, splitBodyForCard, stripTables, tableBlocks, TRUNCATION_SUFFIX, buildApprovalCard, buildApprovalSettledCard, buildQuestionCard, buildQuestionSettledCard, MAX_QUESTION_OPTIONS } from './cards.ts'
+export { buildCard, buildInterruptionCard, cardJsonBytes, CARD_MAX_BYTES, CARD_TARGET_BYTES, REASONING_MAX_BYTES, INTERRUPTION_NOTICE, MAX_TABLES_PER_CARD, PANEL_TITLES, PANEL_CHEVRON_TOKEN, segmentCardContent, splitBodyForCard, stripTables, tableBlocks, TRUNCATION_SUFFIX, buildApprovalCard, buildApprovalSettledCard, buildQuestionCard, buildQuestionSettledCard, buildTopicRootCard, MAX_QUESTION_OPTIONS } from './cards.ts'
 export { ApprovalAnswerer } from './approvals.ts'
 export { QuestionAnswerer } from './questions.ts'
 export { armModelCommand, buildCommandResultCard, CHANNEL_COMMAND_NAMES, commandResultCardKind, isSupportedCommand, parseSlashCommand, registerChannelCommands, registerModelCommand, RouteOperationQueue, SUPPORTED_COMMAND_NAMES, supportedCommandHelp, supportedCommandList } from './commands.ts'
@@ -63,6 +64,8 @@ export { buildCompactComparisonCard, buildRenewCard, buildSessionHistoryCard, bu
 export { createLogicalSessionExport, DSH_CHANNELS_VERSION, LOGICAL_EXPORT_FORMAT, LOGICAL_EXPORT_FORMAT_VERSION, serializeLogicalSession } from './session-export.ts'
 export { addUsage, applyProjectionViews, averageDecodeTokensPerSecond, averageTtftMs, cacheHitPct, EMPTY_TOTALS, foldAll, foldEvent, foldSessionStats, measureSessionContext, readProjectionViews, usageFromBuckets } from './stats.ts'
 export { FeishuService } from './service.ts'
+export { FEISHU_TOPICS_SERVICE, FEISHU_TOPICS_VERSION, TopicLauncher } from './topics/launcher.ts'
+export type { TopicLauncherDeps } from './topics/launcher.ts'
 export { TurnStreamer } from './streamer.ts'
 export { ensureWorkspace, stagingPathFor, stagingRoot, topicDirFor, topicTokenFor, workspacePathFor, workspaceTitleFor, worktreeBranchFor } from './workspaces.ts'
 export { accessGroupRecordSchema, accessRequestRecordSchema, accessUserRecordSchema, appendSessionHistory, chatRouteKey, expiredRouteRecordSchema, feishuDomain, normalizeRouteRecord, normalizeSessionHistory, routeRecordSchema, sessionDirOf, sessionHistoryEntrySchema, inflightSnapshotSchema, processedRecordSchema } from './domain.ts'
@@ -125,7 +128,11 @@ export function apply(ctx: HostContext, config?: unknown): void {
     createHostCatalog(ctx, warn),
     createSettingsDirectoryPicker(ctx),
   ))
-  mountAnalyzeRoute(ctx, service.analyzeHandler(), warn)
+  // Other plugins (观象's analyze API) start group-shared topics through this
+  // service; it answers `not-connected` until the Feishu connection is up.
+  ctx.provide?.(FEISHU_TOPICS_SERVICE, service.topics())
+  const moved = movedAnalyzeKeysOf(config)
+  if (moved.length > 0) warn(MOVED_ANALYZE_NOTICE, `cordis.yml 中的 ${moved.join('、')}`)
   ctx.effect(() => {
     // Boot loads the Web overlay and connects only when the Feishu application
     // credentials are complete; an incomplete configuration or a failed

package/src/routing/inbound.ts

@@ -273,7 +273,7 @@ export class InboundRouter {
    */
   private readonly firstDeliveries = new Map<string, { promise: Promise<void>; release(): void }>()
   /**
-   * topic id → reservation by an external starter (the analyze launcher) that
+   * topic id → reservation by an external starter (the `feishuTopics` launcher) that
    * opened the topic but has not published its route yet. A reply in the topic
    * waits for the release and then routes against the published record, or
    * falls through as an unbound topic when the start failed.

package/src/service.ts

@@ -52,12 +52,11 @@ import type { PermissionPresets, SessionQuery } from './dsh-types.ts'
 import { FEISHU_USER_ID_PATTERN, feishuDomain, sessionDirOf } from './domain.ts'
 import type {
   AccessGroupRecord, AccessRequestRecord, AccessUserRecord,
-  AnalyzeRequestRecord, ExpiredRouteRecord, FeishuDomainGlobal, FeishuDomainHandle, InflightSnapshot,
-  ProcessedRecord, RawDomainHandle, RouteRecord, SessionOriginRecord,
+  ExpiredRouteRecord, FeishuDomainGlobal, FeishuDomainHandle, InflightSnapshot,
+  ProcessedRecord, RawDomainHandle, RouteRecord, SessionOriginRecord, TopicLaunchRecord,
 } from './domain.ts'
 import { RouteStore } from './session/routes.ts'
-import { AnalyzeLauncher } from './analyze/launcher.ts'
-import type { AnalyzeHandler } from './analyze/server.ts'
+import { TopicLauncher } from './topics/launcher.ts'
 import { InflightRepair } from './session/repair.ts'
 import { SessionManager } from './session/manager.ts'
 import type { LiveAgent, RenewCommit } from './session/manager.ts'
@@ -168,7 +167,7 @@ async function openFeishuDomain(ctx: HostContext): Promise<FeishuDomainHandle> {
   const accessUsersRaw = domain.table('access_users')
   const accessRequestsRaw = domain.table('access_requests')
   const accessWikiUsersRaw = domain.table('access_wiki_users')
-  const analyzeRequestsRaw = domain.table('analyze_requests')
+  const topicLaunchesRaw = domain.table('analyze_requests')
   const sessionOriginsRaw = domain.table('session_origins')
   return {
     routes: {
@@ -219,10 +218,10 @@ async function openFeishuDomain(ctx: HostContext): Promise<FeishuDomainHandle> {
       delete: key => accessWikiUsersRaw.delete(key),
       entries: () => accessWikiUsersRaw.entries() as IterableIterator<[string, AccessUserRecord]>,
     },
-    analyzeRequests: {
-      get: key => analyzeRequestsRaw.get(key) as AnalyzeRequestRecord | undefined,
-      put: (key, value) => analyzeRequestsRaw.put(key, value),
-      entries: () => analyzeRequestsRaw.entries() as IterableIterator<[string, AnalyzeRequestRecord]>,
+    topicLaunches: {
+      get: key => topicLaunchesRaw.get(key) as TopicLaunchRecord | undefined,
+      put: (key, value) => topicLaunchesRaw.put(key, value),
+      entries: () => topicLaunchesRaw.entries() as IterableIterator<[string, TopicLaunchRecord]>,
     },
     sessionOrigins: {
       get: key => sessionOriginsRaw.get(key) as SessionOriginRecord | undefined,
@@ -310,8 +309,8 @@ export class FeishuService {
   private readonly messageReader = new MessageReader({ channel: () => this.channel })
   /** Inbound routing: dedup, admission, decision tree, session establishment. */
   private readonly inbound: InboundRouter
-  /** Log-platform analyze API business side (requests → shared analysis topics). */
-  private readonly analyzeLauncher: AnalyzeLauncher
+  /** The `feishuTopics` service (other plugins' launches → shared topics). */
+  private readonly topicLauncher: TopicLauncher
   /** Agent/session lifecycle: live registry, resume, presets, renew. */
   private readonly sessions: SessionManager
   /**
@@ -591,7 +590,7 @@ export class FeishuService {
         handleSlash: (msg, line) => this.handleSlashMessage(msg, line),
       },
     })
-    this.analyzeLauncher = new AnalyzeLauncher({
+    this.topicLauncher = new TopicLauncher({
       ctx: this.ctx,
       config: this.config,
       started: () => this.started,
@@ -603,8 +602,7 @@ export class FeishuService {
       streamer: () => this.streamer,
       queue: this.routeOperations,
       reserveTopic: threadId => this.inbound.reserveTopic(threadId),
-      mayAnalyzeIn: chatId => this.accessController.mayAnalyzeIn(chatId),
-      resolveToken: () => resolveCredentialRef(this.ctx, this.config.analyzeToken).catch(() => undefined),
+      mayLaunchIn: chatId => this.accessController.mayLaunchIn(chatId),
     })
   }
 
@@ -975,8 +973,8 @@ export class FeishuService {
     }
   }
 
-  /** The analyze API's business side, for the Web route. */
-  analyzeHandler(): AnalyzeHandler { return this.analyzeLauncher }
+  /** The `feishuTopics` service, provided by `apply()`. */
+  topics(): TopicLauncher { return this.topicLauncher }
   isRunning(): boolean { return this.started }
   isRestarting(): boolean { return this.restarting }
   /** True while the panel's explicit connect action is in flight. */
@@ -1475,10 +1473,8 @@ export class FeishuService {
         return { configured: false, writable: false }
       }
     }
-    const [appId, appSecret, analyzeToken] = await Promise.all([
-      read(this.config.appId), read(this.config.appSecret), read(this.config.analyzeToken),
-    ])
-    return { appId, appSecret, analyzeToken }
+    const [appId, appSecret] = await Promise.all([read(this.config.appId), read(this.config.appSecret)])
+    return { appId, appSecret }
   }
 
   /** The host credentials seam, when mounted. */
@@ -1521,7 +1517,6 @@ export class FeishuService {
     switch (field) {
       case 'appId': return this.config.appId
       case 'appSecret': return this.config.appSecret
-      case 'analyzeToken': return this.config.analyzeToken
     }
   }
 
@@ -1658,8 +1653,8 @@ export class FeishuService {
     void this.runScopeCheck(channel, appId, ownerLookup)
     if (this.config.slashCommandPanel) void this.runSlashCommandSync(channel)
     // Before admission opens, so every `running` record left is a previous instance's.
-    await this.analyzeLauncher.markInterrupted()
-    this.analyzeLauncher.open()
+    await this.topicLauncher.markInterrupted()
+    this.topicLauncher.open()
     // Repair cards a previous instance left mid-flight (best-effort, background).
     void this.repair.repairAll().catch((error: unknown) => {
       this.ctx.logger?.warn?.('dsh-channels: inflight repair failed: %s', String(error))
@@ -1723,8 +1718,8 @@ export class FeishuService {
     // before their Agent/channel/storage dependencies are disposed, while
     // already queued route operations observe `started === false` and retire.
     this.started = false
-    this.analyzeLauncher.close()
-    await this.analyzeLauncher.drain()
+    this.topicLauncher.close()
+    await this.topicLauncher.drain()
     for (const controller of this.commandControllers) controller.abort()
     await Promise.allSettled([...this.commandOperations])
     this.commandControllers.clear()

package/src/settings/contract.ts

@@ -69,13 +69,13 @@ export interface SessionOriginWire {
   chatName?: string
   /** 群头像 URL（群聊且能读取群信息时）。 */
   chatAvatarUrl?: string
-  /** 发起人 user_id（日志平台分析话题为请求人）。 */
+  /** 发起人 user_id（群共享话题为调用方指定的发起人）。 */
   senderUserId: string
   /** 发起人姓名（通讯录或群成员列表能查到时）。 */
   senderName?: string
   /** 发起人头像 URL（通讯录能查到时）。 */
   senderAvatarUrl?: string
-  /** 日志平台分析话题：群内成员都可以继续。 */
+  /** 群共享话题（经 `feishuTopics` 发起）：群内成员都可以继续。 */
   shared: boolean
   /** Epoch ms when the Session was bound to its Feishu route. */
   createdAt: number
@@ -187,8 +187,6 @@ export const EDITABLE_KEYS = [
   'feishuTools.wikiRead',
   'feishuTools.wikiWrite',
   'wikiRoots',
-  // 日志平台分析接口（访问令牌是凭据引用 analyzeToken，值写在 DSH 凭据里）
-  'analyzeEnabled',
   // 日志
   'loggerLevel',
 ] as const
@@ -242,7 +240,6 @@ export type FieldGroup =
   | 'limits'
   | 'access'
   | 'wiki'
-  | 'analyze'
   | 'logging'
 
 /** One selectable value rendered by the generic form. */
@@ -355,11 +352,8 @@ export interface CredentialRefWire {
   source?: string
 }
 
-/**
- * The credential slots the panel may write: the Feishu application pair
- * (resolved on connect) and the analyze API token (resolved per request).
- */
-export type CredentialField = 'appId' | 'appSecret' | 'analyzeToken'
+/** The credential slots the panel may write: the Feishu application pair (resolved on connect). */
+export type CredentialField = 'appId' | 'appSecret'
 
 /** Official-SDK WebSocket lifecycle snapshot (structural copy, no SDK import on the wire). */
 export interface ConnectionWire {
@@ -466,7 +460,6 @@ export interface PanelConfigWire {
   credentials: {
     appId: CredentialRefWire
     appSecret: CredentialRefWire
-    analyzeToken: CredentialRefWire
   }
 }
 
@@ -602,7 +595,6 @@ export type ClearConfigResponse =
 export interface SaveCredentialsRequest {
   appId?: string
   appSecret?: string
-  analyzeToken?: string
 }
 
 /** `POST /api/dsh-channels.clearCredential` body. */
@@ -615,8 +607,7 @@ export interface ClearCredentialRequest {
  *
  * - `auto`: the channel was stopped and connected immediately after the save.
  * - `pending`: the channel is running; reconnect for the value to take effect.
- * - `not-needed`: removed while stopped, or only the analyze API token
- *   changed (it applies to the next request), nothing to reconnect.
+ * - `not-needed`: removed while stopped, nothing to reconnect.
  * - `unconfigured`: saved, but the other credential of the pair is still
  *   missing — the plugin keeps waiting (no connection attempt) until it is
  *   configured.
@@ -666,7 +657,7 @@ export const TAB_FIELD_GROUPS: Readonly<Record<PanelTabId, readonly FieldGroup[]
   attachments: ['attachments', 'tools', 'limits'],
   access: ['access'],
   wiki: ['wiki'],
-  advanced: ['analyze', 'logging'],
+  advanced: ['logging'],
 }
 
 /** Section heading for one field group inside its tab. */
@@ -681,7 +672,6 @@ export const FIELD_GROUP_LABELS: Readonly<Record<FieldGroup, string>> = {
   limits: '限额与超时',
   access: '准入',
   wiki: '知识库工具',
-  analyze: '日志分析接口',
   logging: '日志',
 }
 
@@ -808,11 +798,6 @@ export const PANEL_COPY = {
   loading: '加载中…',
   loadFailed: '设置面板加载失败',
   // ---- advanced -----------------------------------------------------------
-  analyzeTokenLabel: '访问令牌',
-  analyzeTokenSummary: '请求头 Authorization: Bearer 的值，保存后立即生效；未配置时接口拒绝所有请求',
-  analyzeTokenPlaceholder: '填写新令牌（建议 32 位以上随机串）',
-  analyzeTokenSaved: '令牌已保存，下一次请求生效',
-  analyzeTokenRemoved: '令牌已移除，接口将拒绝所有请求',
   overlayTitle: 'Web 覆盖',
   overlayPath: '覆盖文件',
   overlayCount: '{n} 项配置由面板覆盖',

package/src/settings/overlay.ts

@@ -16,7 +16,7 @@ import { promises as fs } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 import type { z } from 'zod'
-import { configSchema } from '../config.ts'
+import { configSchema, MOVED_ANALYZE_NOTICE, movedAnalyzeKeysOf } from '../config.ts'
 import type { FeishuConfig } from '../config.ts'
 import { normalizeWorkspaceBaseDir } from '../workspaces.ts'
 import { EDITABLE_KEYS } from './contract.ts'
@@ -245,6 +245,8 @@ export class OverlayStore {
       this.logger?.warn?.('dsh-channels: Web 覆盖配置不是合法 JSON（%s），按未覆盖处理：%s', this.file, String(error))
       return {}
     }
+    const moved = movedAnalyzeKeysOf(raw)
+    if (moved.length > 0) this.logger?.warn?.(MOVED_ANALYZE_NOTICE, `${this.file} 中的 ${moved.join('、')}`)
     const parsed = parseOverlay(raw)
     if (!parsed.ok) {
       this.logger?.warn?.(

package/src/settings/routes.ts

@@ -175,13 +175,12 @@ export function registerSettingsRoutes(connection: HostConnection, surface: Sett
       const values: SaveCredentialsRequest = {}
       if (payload.appId !== undefined) values.appId = payload.appId as string
       if (payload.appSecret !== undefined) values.appSecret = payload.appSecret as string
-      if (payload.analyzeToken !== undefined) values.analyzeToken = payload.analyzeToken as string
       return result(await surface.saveCredentials(values))
     }),
     post(CLEAR_CREDENTIAL_ROUTE, async (request) => {
       const field = (await readJsonObject(request)).field
-      if (field !== 'appId' && field !== 'appSecret' && field !== 'analyzeToken') {
-        return json(400, { ok: false, error: 'field 必须是 appId、appSecret 或 analyzeToken' })
+      if (field !== 'appId' && field !== 'appSecret') {
+        return json(400, { ok: false, error: 'field 必须是 appId 或 appSecret' })
       }
       return result(await surface.clearCredential(field as CredentialField))
     }),

package/src/settings/surface.ts

@@ -135,7 +135,7 @@ export interface CredentialInfo {
 const RESTART_SET = new Set<string>(RESTART_KEYS)
 
 /** Every credential slot the panel writes, in form order. */
-const CREDENTIAL_FIELDS: readonly CredentialField[] = ['appId', 'appSecret', 'analyzeToken']
+const CREDENTIAL_FIELDS: readonly CredentialField[] = ['appId', 'appSecret']
 
 /** Optional fields: an empty string in the panel clears the override. */
 const OPTIONAL_TEXT_KEYS = new Set<EditableKey>([
@@ -160,7 +160,6 @@ const BOOLEAN_KEYS = new Set<EditableKey>([
   'feishuTools.sendFile',
   'feishuTools.wikiRead',
   'feishuTools.wikiWrite',
-  'analyzeEnabled',
 ])
 
 /** Bounds and entry format of one `string-list` field. */
@@ -438,12 +437,6 @@ const FIELD_META: Record<EditableKey, FieldMeta> = {
     placeholder: 'https://<租户>.feishu.cn/wiki/space/<space_id>',
     wide: true,
   },
-  analyzeEnabled: {
-    label: '日志分析接口',
-    group: 'analyze',
-    summary: '关闭时接口返回 404',
-    help: '接口挂在 DSH Web 端口上：POST /api/dsh-channels.logalyze，请求需带 Authorization: Bearer <访问令牌>。只有带 Web 的 profile 才有这个接口。改后立即生效，不需要重连。',
-  },
   loggerLevel: { label: 'SDK 日志级别', group: 'logging' },
 }
 
@@ -785,7 +778,6 @@ export class SettingsSurface {
     let credentialStates: Record<CredentialField, CredentialInfo> = {
       appId: { configured: false, writable: false },
       appSecret: { configured: false, writable: false },
-      analyzeToken: { configured: false, writable: false },
     }
     try {
       credentialStates = await this.target.credentialStates()
@@ -801,7 +793,6 @@ export class SettingsSurface {
     const credentials: PanelConfigWire['credentials'] = {
       appId: toWire(effective.appId, credentialStates.appId),
       appSecret: toWire(effective.appSecret, credentialStates.appSecret),
-      analyzeToken: toWire(effective.analyzeToken, credentialStates.analyzeToken),
     }
 
     // The access snapshot comes from in-memory maps, but a broken seam must
@@ -963,9 +954,6 @@ export class SettingsSurface {
     } catch (error) {
       return { ok: false, error: messageOf(error) }
     }
-    if (writes.every(write => write.field === 'analyzeToken')) {
-      return { ok: true, panel: await this.panel(), reconnect: 'not-needed' }
-    }
     return this.finishCredentialChange('save')
   }
 
@@ -981,7 +969,6 @@ export class SettingsSurface {
     } catch (error) {
       return { ok: false, error: messageOf(error) }
     }
-    if (field === 'analyzeToken') return { ok: true, panel: await this.panel(), reconnect: 'not-needed' }
     return this.finishCredentialChange('clear')
   }
 

package/src/streamer.ts

@@ -245,6 +245,14 @@ interface TurnState {
    * durable model history, so the card must drop them again.
    */
   attempts: Map<string, AttemptMark>
+  /**
+   * The model-request retry `dsh-llm-retry` scheduled for the current step
+   * (`llm/retry`), shown on the tool line until the retried request produces
+   * output. A retry stays inside the open turn: only `turn/end` settles it.
+   */
+  retry: RetryActivity | undefined
+  /** Retries scheduled during this turn (reported on a failed settled card). */
+  retries: number
   /** The owner clicked stop; the button renders disabled until the turn settles. */
   stopRequested: boolean
   /** A non-owner clicked stop; the owner-only notice renders under the button. */
@@ -253,6 +261,20 @@ interface TurnState {
   queuedDenied: boolean
 }
 
+/** One scheduled model-request retry (`llm/retry` → `llm/retry-started`). */
+interface RetryActivity {
+  /** 1-based retry number. */
+  retry: number
+  /** Normal-mode budget; undefined in always mode. */
+  maxRetries: number | undefined
+  /** Failure code of the attempt that triggered the retry. */
+  code: string
+  /** Unix ms when the backoff wait ends. */
+  until: number
+  /** Set by `llm/retry-started`: the retried request is in flight. */
+  started: boolean
+}
+
 /** Card/body lengths captured at one stream attempt's `start` frame. */
 interface AttemptMark {
   cardCount: number
@@ -426,6 +448,8 @@ export class TurnStreamer {
       toolKind: '',
       heartbeatTimer: undefined,
       attempts: new Map(),
+      retry: undefined,
+      retries: 0,
       stopRequested: false,
       stopDenied: false,
       queuedDenied: false,
@@ -638,6 +662,10 @@ export class TurnStreamer {
       }
       case 'assistant/message': {
         if (state.turn === undefined) state.turn = event.data.turn
+        if (state.retry !== undefined) {
+          state.retry = undefined
+          this.markDirty(session.id, state)
+        }
         if (event.data.usage !== undefined) {
           state.lastUsage = {
             usage: event.data.usage,
@@ -726,6 +754,28 @@ export class TurnStreamer {
         }
         break
       }
+      case 'llm/retry': {
+        // The failed attempt ended the step's request, not the turn: the loop
+        // re-runs the step after the backoff, so the card stays live.
+        if (state.turn === undefined) state.turn = event.data.turn
+        state.retry = {
+          retry: event.data.retry,
+          maxRetries: event.data.mode === 'normal' ? event.data.maxRetries : undefined,
+          code: event.data.failure.code,
+          until: Date.now() + Math.max(0, event.data.delayMs),
+          started: false,
+        }
+        state.retries++
+        this.markDirty(session.id, state)
+        break
+      }
+      case 'llm/retry-started': {
+        if (state.retry !== undefined && state.retry.retry === event.data.retry) {
+          state.retry.started = true
+          this.markDirty(session.id, state)
+        }
+        break
+      }
       case 'turn/end': {
         // The ended turn belongs to the front state: assign it if a turn was
         // rejected/emptied before any step started.
@@ -762,6 +812,12 @@ export class TurnStreamer {
       }
       case 'chunk': {
         const chunk = frame.chunk
+        if ((chunk.type === 'text-delta' || chunk.type === 'reasoning-delta')
+          && chunk.text !== '' && state.retry !== undefined) {
+          // The retried request is producing output again.
+          state.retry = undefined
+          this.markDirty(session.id, state)
+        }
         if (chunk.type === 'text-delta') {
           if (chunk.text !== '') this.closeReasoning(state)
           const last = state.cards[state.cards.length - 1]
@@ -784,7 +840,13 @@ export class TurnStreamer {
         this.closeReasoning(state)
         const mark = state.attempts.get(frame.attemptId)
         state.attempts.delete(frame.attemptId)
-        if (frame.outcome.kind === 'abandoned' && mark !== undefined) {
+        // A failed request attempt settles as `assistant/attempt`: like an
+        // abandoned one, its partial output is not model-visible history, and
+        // a retry streams the step again from scratch — keeping it would
+        // repeat the reply on the card.
+        const discarded = frame.outcome.kind === 'abandoned'
+          || frame.outcome.eventType === 'assistant/attempt'
+        if (discarded && mark !== undefined) {
           this.rollbackAttempt(state, mark)
           this.markDirty(session.id, state)
         }
@@ -812,11 +874,13 @@ export class TurnStreamer {
   }
 
   /**
-   * Drop one abandoned attempt's deltas. The attempt's text is a contiguous
+   * Drop one discarded attempt's deltas. The attempt's text is a contiguous
    * suffix of the logical body: segments created during the attempt are
    * removed, the segment that was last at `start` is truncated, and the
    * reasoning tail is cut. Already-delivered plain-text segments cannot be
-   * retracted and stop the removal.
+   * retracted and stop the removal; segment cards already sent (or being
+   * sent) cannot be withdrawn, so they are emptied and kept. The newest
+   * remaining card is reopened so a retry streams into it again.
    */
   private rollbackAttempt(state: TurnState, mark: AttemptMark): void {
     const lastIndex = mark.cardCount - 1
@@ -824,6 +888,11 @@ export class TurnStreamer {
       const card = state.cards[index]
       if (card === undefined) continue
       if (card.mode === 'text' && card.messageId !== undefined) break
+      if (card.messageId !== undefined || card.sending) {
+        card.body = ''
+        card.dirty = true
+        continue
+      }
       state.cards.splice(index, 1)
     }
     const tail = state.cards[lastIndex]
@@ -833,8 +902,16 @@ export class TurnStreamer {
       tail.body = tail.body.slice(0, length)
       tail.dirty = true
     }
+    const last = state.cards[state.cards.length - 1]
+    if (last !== undefined) {
+      if ((last.mode === 'text' && last.messageId !== undefined) || last.failed) {
+        state.cards.push(this.freshSegment(''))
+      } else {
+        last.frozen = false
+      }
+    }
     state.reasoning = state.reasoning.slice(0, mark.reasoningLength)
-    // The abandoned attempt's reasoning time is not part of the visible turn.
+    // The discarded attempt's reasoning time is not part of the visible turn.
     state.reasoningMs = mark.reasoningMs
     state.reasoningSince = mark.reasoningSince
   }
@@ -1049,6 +1126,13 @@ export class TurnStreamer {
     if (state.awaitingApproval.length > 0) {
       return clipActivity(`⏳ 等待你审批：${[...new Set(state.awaitingApproval)].join('、')}`)
     }
+    const retry = state.retry
+    if (retry !== undefined) {
+      const count = retry.maxRetries === undefined ? `${retry.retry}` : `${retry.retry}/${retry.maxRetries}`
+      if (retry.started) return clipActivity(`🔁 模型请求重试中（第 ${count} 次）`)
+      const wait = Math.max(0, Math.ceil((retry.until - now) / 1_000))
+      return clipActivity(`⚠️ 模型请求失败（${retry.code}），${wait} 秒后第 ${count} 次重试`)
+    }
     const tool = state.toolActivity
     if (tool === undefined) return ''
     const prefix = tool.name === 'subagent'
@@ -1295,7 +1379,8 @@ export class TurnStreamer {
     this.closeReasoning(state)
     if (failure !== undefined) {
       const code = failure.code === undefined ? '' : `\n\n错误码：\`${failure.code}\``
-      const notice = `❌ **本轮运行失败**\n\n${failure.message}${code}`
+      const retried = state.retries === 0 ? '' : `\n\n已自动重试 ${state.retries} 次`
+      const notice = `❌ **本轮运行失败**\n\n${failure.message}${code}${retried}`
       const tail = state.cards[state.cards.length - 1]
       if (tail !== undefined) {
         if (tail.mode === 'text' || tail.failed) {
@@ -1322,6 +1407,7 @@ export class TurnStreamer {
       state.heartbeatTimer = undefined
     }
     state.tool = ''
+    state.retry = undefined
     // Freeze the tail and spawn any remaining segment cards.
     this.splitOverflow(sessionId, state)