dsh-client-auto-continue 0.7.4 → 0.8.0

package/src/client/engine.ts

@@ -663,7 +663,7 @@ interface SessionState {
   /** 我们上次自动发送的文本(用于识别自己的回显)。 */
   lastSentText: string;
   /** 宽限期定时器(进行中的待发送)。 */
-  pendingTimer: number | undefined;
+  pendingTimer: ReturnType<typeof setTimeout> | undefined;
   /** 宿主权威 running 位(来自 host/session-status 与回合事件)。 */
   running: boolean | undefined;
   /** 当前排队消息数(来自 session/queue 帧)。 */
@@ -709,7 +709,7 @@ interface SessionState {
   /** 本回合已触发过 loop guard(防重复打断)。 */
   loopFired: boolean;
   /** loop 重启的延迟定时器(冷却结束后再 schedule)。 */
-  loopRetryTimer: number | undefined;
+  loopRetryTimer: ReturnType<typeof setTimeout> | undefined;
   /** 我们主动 cancel 过本回合(区分用户停止)。 */
   loopCancelled: boolean;
 }
@@ -1361,6 +1361,14 @@ export class AutoContinueRunner {
         this.log(`跳过 ${sessionId}: 发送计数已达上限 ${config.maxConsecutive}, 等待用户介入或成功回合`);
         return;
       }
+      // 宿主权威兜底: 历史里最后一条事件若正是同一文本的 user 消息, 说明它还在
+      // 排队未被处理——不再叠加发送(issue #13 的 13 条排队场景)。
+      // 若最后一条是回合结束等其他事件, 说明之前的同文本消息已被处理, 正常放行
+      // (连续续跑不被误挡)。查询失败时放行(本地防线仍在)。
+      if (!force && (await this.hostHasPendingSameText(sessionId, text))) {
+        this.log(`跳过 ${sessionId}: 宿主队列里已有相同文本消息在排队`);
+        return;
+      }
       state.lastAttemptAt = Date.now(); // 先记账: 无论成败, 本次尝试都进入冷却
       try {
         const response = await this.api.sessions.prompt({
@@ -1453,8 +1461,30 @@ export class AutoContinueRunner {
     return { kind: 'failed', tool: state.lastTool };
   }
 
-  /** 会话标题缓存(来自 session.list 投影, {sessionTitle} 占位符用)。 */
-  private readonly titles = new Map<SessionId, string>();
+  /**
+   * 宿主权威兜底: 历史里最后一条事件是否就是同一文本的 user 消息。
+   * 是 = 它还在排队未被处理, 不应再叠加发送; 否(回合结束等其他事件)= 放行。
+   * 查询失败时返回 false(放行, 本地防线仍在)。
+   */
+  private async hostHasPendingSameText(sessionId: SessionId, text: string): Promise<boolean> {
+    try {
+      const response = await this.api.sessions.history({ sessionId, maxMessages: 10 });
+      if (!response.result.ok) return false;
+      const events = response.result.value.events;
+      const last = events[events.length - 1]?.event;
+      if (last === undefined || last.type !== 'user/message') return false;
+      if (last.data.source?.kind !== 'user') return false;
+      const lastText = (last.data.content ?? [])
+        .filter((part): part is { type: 'text'; text: string } => part.type === 'text')
+        .map((part) => part.text)
+        .join('');
+      return lastText === text;
+    } catch {
+      return false;
+    }
+  }
+
+  /** 会话标题缓存(来自 session.list 投影, {sessionTitle} 占位符用)。 */  private readonly titles = new Map<SessionId, string>();
 
   /** 查一次 session.list, 顺带缓存该会话的标题。 */
   private async fetchSessionInfo(

package/src/client/index.ts

@@ -1,37 +1,33 @@
 /**
- * Auto-continue plugin, browser half.
+ * Auto-continue plugin, browser half (thin shell).
  *
- * - Runs the auto-continue engine over the live mux + host event streams.
- * - Registers the `auto-continue` settings card into the plugin-configuration
- *   section (`settings.plugin.item`), editing the same namespace the engine
- *   reads — every behavior knob is configurable from the GUI.
+ * Since 0.8.0 the auto-continue ENGINE runs inside the host process (single
+ * instance — see src/host/engine.ts), so this half only:
+ * - registers the `auto-continue` settings card (`settings.plugin.item`),
+ * - subscribes to the host status bridge (SSE) and shows browser
+ *   notifications with action buttons (Resume now / Pause 1h) via the bridge
+ *   action endpoint,
+ * - feeds the card's stats / paused-sessions panels from the bridge state.
  */
 import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
-import type { ConnectionHandle } from '@deepseek-ai/dsh-client-connection/client';
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
 import type {} from '@deepseek-ai/dsh-client-locale/client';
 // Type-only: pulls the settings-surface SlotMap merge and ctx.settingsScope.
 import type {} from '@deepseek-ai/dsh-client-ui-settings/client';
 // Type-only: pulls the `settings.plugin.item` SlotMap merge.
 import type {} from '@deepseek-ai/dsh-client-ui-settings-plugins/client';
-import { AutoContinueRunner, resolveConfig, type AutoContinueSettings } from './engine.ts';
+import { type AutoContinueSettings } from './engine.ts';
 import { en, zh, type SettingsCardKey } from './locales.ts';
 import {
   AutoContinueSettingsCard,
   AutoContinueSettingsCardController,
 } from './settings-card.tsx';
-
-/** 客户端根上下文的 connection 服务(由 dsh-client-connection 挂载)。 */
-declare module '@deepseek-ai/cordis' {
-  interface Context {
-    connection: ConnectionHandle;
-  }
-}
+import { startBridge } from './bridge.ts';
 
 /** Dictionary namespace owned by this plugin. */
 const NS = 'auto-continue';
 
-/** Settings namespace the engine reads and the settings card edits. */
+/** Settings namespace the settings card edits (the host engine reads it). */
 const SETTINGS_NS = 'auto-continue';
 
 declare module '@deepseek-ai/dsh-client-ui-slots' {
@@ -42,39 +38,33 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 }
 
 /** Services required by this plugin. */
-export const inject = ['slots', 'locale', 'connection', 'settingsScope'];
+export const inject = ['slots', 'locale', 'settingsScope'];
 
-// 浏览器侧辅助(设置卡片与模拟测试共用): 暂停控制与统计读取。
+// 浏览器侧辅助(设置卡片用): 桥状态读取与暂停解除。
 export {
-  fillTemplate,
-  pauseSession,
   pausedSessions,
   readTodayStats,
   resetTodayStats,
-  sessionPauseUntil,
   unpauseSession,
-} from './engine.ts';
-
-/** 当前 runner(HMR 重载时先销毁旧的再建新的)。 */
-let current: AutoContinueRunner | null = null;
+} from './bridge.ts';
 
 /**
- * Plugin body: mount the engine and the settings card.
+ * Plugin body: settings card + host status bridge (notifications, stats,
+ * paused sessions).
  * @param ctx - client root context.
  */
 export function apply(ctx: ClientContext): void {
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'auto-continue: dictionaries');
 
-  // Engine: reads the settings scope live, so GUI changes apply immediately.
-  const scope = ctx.settingsScope.bind<AutoContinueSettings>({ namespace: SETTINGS_NS });
-  current?.dispose();
-  current = new AutoContinueRunner(ctx.connection.api, () => resolveConfig(scope.getSnapshot().value));
+  // 状态桥: 订阅 host 的通知与运行时状态, 弹浏览器通知并驱动卡片面板。
+  ctx.effect(() => startBridge(), 'auto-continue: host bridge');
 
   // Plugin configuration card: one staged form over the `auto-continue`
   // settings namespace, contributed to the plugin-configuration section
   // (Settings → Plugins). Since DSH 0.1.0-rc.7 `settings.plugin.item` is a
   // keyed slot dispatched by the settings namespace it edits, so the entry
   // registers with `key` (the namespace), like the official cards.
+  const scope = ctx.settingsScope.bind<AutoContinueSettings>({ namespace: SETTINGS_NS });
   const controller = new AutoContinueSettingsCardController(scope);
   ctx.slots.inject('settings.plugin.item', () =>
     ctx.slots.register(

package/src/client/settings-card.tsx

@@ -10,14 +10,14 @@
 import { useEffect, useState, type ReactNode } from 'react';
 import { createSnapshotStore, type SettingsScope, type SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
+import { DEFAULT_CONFIG, type AutoContinueSettings } from './engine.ts';
 import {
-  DEFAULT_CONFIG,
   pausedSessions,
   readTodayStats,
   resetTodayStats,
+  subscribeBridge,
   unpauseSession,
-  type AutoContinueSettings,
-} from './engine.ts';
+} from './bridge.ts';
 import type { SettingsCardKey } from './locales.ts';
 import {
   booleanField,
@@ -304,8 +304,13 @@ function LivePanels(props: { t: (key: SettingsCardKey) => string }) {
   const { t } = props;
   const [, refresh] = useState(0);
   useEffect(() => {
+    // host 状态桥推送时刷新; 5 秒轮询兜底(桥短暂断线时)
+    const unsubscribe = subscribeBridge(() => refresh((value) => value + 1));
     const timer = setInterval(() => refresh((value) => value + 1), 5000);
-    return () => clearInterval(timer);
+    return () => {
+      unsubscribe();
+      clearInterval(timer);
+    };
   }, []);
   const stats = readTodayStats();
   const hasStats = stats.sent + stats.skipped + stats.recovered + stats.failed + stats.gaveUp + stats.looped > 0;