dsh-client-auto-continue 0.7.2 → 0.7.3

package/lib/index.js

@@ -49,6 +49,8 @@ var AutoContinueSchema = z.object({
   loopWindowMs: z.natural().min(1e3).default(3e4),
   /** Consecutive short sentences trip the loop guard. */
   loopShortCount: z.natural().min(2).default(12),
+  /** Consecutive identical short sentences trip the loop guard (strongest spinning signal). */
+  loopRepeatText: z.natural().min(2).default(4),
   /** Consecutive identical tool calls with identical arguments AND results trip the loop guard. */
   loopToolRepeat: z.natural().min(2).default(5),
   /** Text sent after the loop guard cancels and restarts a turn (supports {tool}). */

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

@@ -61,6 +61,8 @@ export interface AutoContinueSettings {
     loopShortCount?: number;
     /** Consecutive identical tool calls with identical arguments AND identical results trip the loop guard. */
     loopToolRepeat?: number;
+    /** Consecutive identical short sentences trip the loop guard (strongest spinning signal). */
+    loopRepeatText?: number;
     /** Text sent after the loop guard cancels and restarts a turn (supports {tool}). */
     loopText?: string;
 }

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

@@ -60,6 +60,8 @@ export declare const zh: {
     'field.loopWindowMsHint': string;
     'field.loopShortCount': string;
     'field.loopShortCountHint': string;
+    'field.loopRepeatText': string;
+    'field.loopRepeatTextHint': string;
     'field.loopToolRepeat': string;
     'field.loopToolRepeatHint': string;
     'field.loopText': string;

package/lib/types/client/settings-card.d.ts

@@ -27,6 +27,7 @@ export interface AutoContinueSettingsCardState extends CardShell {
     loopShortChars: CardFieldState;
     loopWindowMs: CardFieldState;
     loopShortCount: CardFieldState;
+    loopRepeatText: CardFieldState;
     loopToolRepeat: CardFieldState;
     loopText: CardFieldState;
 }

package/lib/types/index.d.ts

@@ -55,6 +55,8 @@ export declare const AutoContinueSchema: z<Schemastery.ObjectS<{
     loopWindowMs: z<number, number>;
     /** Consecutive short sentences trip the loop guard. */
     loopShortCount: z<number, number>;
+    /** Consecutive identical short sentences trip the loop guard (strongest spinning signal). */
+    loopRepeatText: z<number, number>;
     /** Consecutive identical tool calls with identical arguments AND results trip the loop guard. */
     loopToolRepeat: z<number, number>;
     /** Text sent after the loop guard cancels and restarts a turn (supports {tool}). */
@@ -106,6 +108,8 @@ export declare const AutoContinueSchema: z<Schemastery.ObjectS<{
     loopWindowMs: z<number, number>;
     /** Consecutive short sentences trip the loop guard. */
     loopShortCount: z<number, number>;
+    /** Consecutive identical short sentences trip the loop guard (strongest spinning signal). */
+    loopRepeatText: z<number, number>;
     /** Consecutive identical tool calls with identical arguments AND results trip the loop guard. */
     loopToolRepeat: z<number, number>;
     /** Text sent after the loop guard cancels and restarts a turn (supports {tool}). */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-client-auto-continue",
   "description": "DSH Web UI plugin: automatically sends \"继续\" (continue) when a request is interrupted by network errors or other non-human causes",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",

package/src/client/engine.ts

@@ -70,6 +70,8 @@ export interface AutoContinueSettings {
   loopShortCount?: number;
   /** Consecutive identical tool calls with identical arguments AND identical results trip the loop guard. */
   loopToolRepeat?: number;
+  /** Consecutive identical short sentences trip the loop guard (strongest spinning signal). */
+  loopRepeatText?: number;
   /** Text sent after the loop guard cancels and restarts a turn (supports {tool}). */
   loopText?: string;
 }
@@ -102,6 +104,7 @@ export const DEFAULT_CONFIG: AutoContinueConfig = {
   loopShortChars: 40,
   loopWindowMs: 30000,
   loopShortCount: 12,
+  loopRepeatText: 4,
   loopToolRepeat: 5,
   loopText: '(检测到你可能陷入循环, 请停止重复刚才的动作, 换一种方式继续)',
 };
@@ -157,6 +160,7 @@ export function resolveConfig(section: AutoContinueSettings | undefined): AutoCo
     loopShortChars: Math.max(1, numberOr(value.loopShortChars, DEFAULT_CONFIG.loopShortChars)),
     loopWindowMs: Math.max(1000, numberOr(value.loopWindowMs, DEFAULT_CONFIG.loopWindowMs)),
     loopShortCount: Math.max(2, numberOr(value.loopShortCount, DEFAULT_CONFIG.loopShortCount)),
+    loopRepeatText: Math.max(2, numberOr(value.loopRepeatText, DEFAULT_CONFIG.loopRepeatText)),
     loopToolRepeat: Math.max(2, numberOr(value.loopToolRepeat, DEFAULT_CONFIG.loopToolRepeat)),
     loopText:
       typeof value.loopText === 'string' && value.loopText.trim() !== ''
@@ -602,6 +606,10 @@ interface SessionState {
   shortRun: number;
   /** 最后一条短句的时间(时间窗判定用)。 */
   lastShortAt: number;
+  /** 最后一条模型消息的文本(相同文本重复判定用)。 */
+  lastAssistantText: string;
+  /** 连续相同文本消息数(最强空转信号, 不限长度)。 */
+  sameTextRun: number;
   /**
    * 工具重复信号(loop guard 信号 2: 死循环)。
    * 只有「同工具 + 同参数 + 同结果」的连续调用才累计; 参数或结果有变化视为有进展, 计数重置。
@@ -641,6 +649,8 @@ const freshState = (): SessionState => ({
   pendingRecoveryAt: 0,
   shortRun: 0,
   lastShortAt: 0,
+  lastAssistantText: '',
+  sameTextRun: 0,
   toolRun: undefined,
   loopFired: false,
   loopCancelled: false,
@@ -860,7 +870,17 @@ export class AutoContinueRunner {
   ): void {
     if (!this.getConfig().loopGuard) return;
     const text = this.assistantText(event);
-    if (text.trim().length < this.getConfig().loopShortChars) {
+    const trimmed = text.trim();
+    // 相同文本重复(不限长度): 模型反复输出完全相同的消息是最强的循环信号,
+    // 例如 "Let me test variants of the regex..." 连续 7 遍
+    if (trimmed !== '' && trimmed === state.lastAssistantText) {
+      state.sameTextRun += 1;
+    } else {
+      state.lastAssistantText = trimmed;
+      state.sameTextRun = 1;
+    }
+    // 短句计数(长度 < loopShortChars 且落在时间窗内): 空转信号
+    if (trimmed.length < this.getConfig().loopShortChars) {
       const now = Date.now();
       if (now - state.lastShortAt > this.getConfig().loopWindowMs) {
         state.shortRun = 0; // 超过时间窗: 上一次短句太久远, 不算连续
@@ -880,7 +900,10 @@ export class AutoContinueRunner {
     if (state.loopFired) return;
     if (!state.running) return; // 只干预运行中的回合
     const config = this.getConfig();
-    if (state.shortRun >= config.loopShortCount) {
+    if (state.sameTextRun >= config.loopRepeatText) {
+      this.log(`检测到空转循环 ${sessionId}: 连续 ${state.sameTextRun} 条相同消息`);
+      void this.interruptLoop(sessionId, state);
+    } else if (state.shortRun >= config.loopShortCount) {
       this.log(`检测到空转循环 ${sessionId}: 连续 ${state.shortRun} 条短句且无工具调用`);
       void this.interruptLoop(sessionId, state);
     } else if (state.toolRun !== undefined && state.toolRun.count >= config.loopToolRepeat) {
@@ -928,6 +951,8 @@ export class AutoContinueRunner {
         // loop guard 状态按回合重置
         state.shortRun = 0;
         state.lastShortAt = 0;
+        state.lastAssistantText = '';
+        state.sameTextRun = 0;
         state.toolRun = undefined;
         state.loopFired = false;
         state.loopCancelled = false;
@@ -952,6 +977,8 @@ export class AutoContinueRunner {
             state.pendingRecoveryAt = 0;
             state.shortRun = 0;
             state.lastShortAt = 0;
+            state.lastAssistantText = '';
+            state.sameTextRun = 0;
             state.toolRun = undefined;
             state.lastAttemptAt = 0;
             this.schedule(sessionId, 'loop:aborted');

package/src/client/locales.ts

@@ -61,6 +61,8 @@ export const zh = {
   'field.loopWindowMsHint': '连续短句必须落在这个时间窗内; 正常思考的短文本散布在长时间里不会被误判。',
   'field.loopShortCount': '连续短句阈值',
   'field.loopShortCountHint': '时间窗内连续多少条短句且期间无工具调用时判定空转循环。',
+  'field.loopRepeatText': '相同消息重复次数',
+  'field.loopRepeatTextHint': '连续输出多少条完全相同的消息时判定空转(最强信号, 不限长度, 如模型反复说同一句话)。',
   'field.loopToolRepeat': '同工具重复次数',
   'field.loopToolRepeatHint': '同工具+同参数+同结果的连续调用多少次时判定死循环; 参数或结果有变化视为有进展。',
   'field.loopText': '循环提示文本',
@@ -149,6 +151,8 @@ export const en: Record<SettingsCardKey, string> = {
   'field.loopWindowMsHint': 'Consecutive short sentences must land inside this window; normal thinking spread over time is not misjudged.',
   'field.loopShortCount': 'Short-sentence threshold',
   'field.loopShortCountHint': 'How many consecutive short sentences inside the window, with no tool call, trip the loop guard.',
+  'field.loopRepeatText': 'Identical message count',
+  'field.loopRepeatTextHint': 'How many consecutive identical messages trip the guard (strongest signal, any length, e.g. the model repeating the same line).',
   'field.loopToolRepeat': 'Same-tool repeat count',
   'field.loopToolRepeatHint': 'How many consecutive calls of the same tool with identical arguments and results trip the loop guard; a changed argument or result counts as progress.',
   'field.loopText': 'Loop text',

package/src/client/settings-card.tsx

@@ -59,6 +59,7 @@ export interface AutoContinueSettingsCardState extends CardShell {
   loopShortChars: CardFieldState;
   loopWindowMs: CardFieldState;
   loopShortCount: CardFieldState;
+  loopRepeatText: CardFieldState;
   loopToolRepeat: CardFieldState;
   loopText: CardFieldState;
 }
@@ -104,6 +105,7 @@ export class AutoContinueSettingsCardController {
       numberField('loopShortChars', 1),
       numberField('loopWindowMs', 1000),
       numberField('loopShortCount', 2),
+      numberField('loopRepeatText', 2),
       numberField('loopToolRepeat', 2),
       textField('loopText'),
     ]);
@@ -136,6 +138,7 @@ export class AutoContinueSettingsCardController {
       loopShortChars: this.form.field('loopShortChars'),
       loopWindowMs: this.form.field('loopWindowMs'),
       loopShortCount: this.form.field('loopShortCount'),
+      loopRepeatText: this.form.field('loopRepeatText'),
       loopToolRepeat: this.form.field('loopToolRepeat'),
       loopText: this.form.field('loopText'),
     };
@@ -650,6 +653,16 @@ export function AutoContinueSettingsCard(props: AutoContinueSettingsCardProps) {
         onEdit={(text) => props.edit('loopToolRepeat', text)}
         onReset={() => props.resetField('loopToolRepeat')}
       />
+      <ValueField
+        id="auto-continue-loop-repeat-text"
+        label={t('field.loopRepeatText')}
+        hint={t('field.loopRepeatTextHint')}
+        numeric
+        {...shared}
+        {...state.loopRepeatText}
+        onEdit={(text) => props.edit('loopRepeatText', text)}
+        onReset={() => props.resetField('loopRepeatText')}
+      />
       <ValueField
         id="auto-continue-loop-text"
         label={t('field.loopText')}

package/src/index.ts

@@ -64,6 +64,8 @@ export const AutoContinueSchema = z.object({
   loopWindowMs: z.natural().min(1000).default(30000),
   /** Consecutive short sentences trip the loop guard. */
   loopShortCount: z.natural().min(2).default(12),
+  /** Consecutive identical short sentences trip the loop guard (strongest spinning signal). */
+  loopRepeatText: z.natural().min(2).default(4),
   /** Consecutive identical tool calls with identical arguments AND results trip the loop guard. */
   loopToolRepeat: z.natural().min(2).default(5),
   /** Text sent after the loop guard cancels and restarts a turn (supports {tool}). */