dsh-repeat-guard 0.1.2 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +20 -4
- package/lib/client.d.ts +3 -2
- package/lib/client.js +341 -44
- package/lib/config.d.ts +30 -7
- package/lib/config.js +50 -7
- package/lib/detect.d.ts +9 -5
- package/lib/detect.js +58 -12
- package/lib/index.js +4 -4
- package/lib/resume.d.ts +5 -1
- package/lib/resume.js +13 -20
- package/lib/stream-guard.d.ts +2 -1
- package/lib/stream-guard.js +7 -4
- package/lib/turn-stopping-guard.d.ts +3 -1
- package/lib/turn-stopping-guard.js +3 -2
- package/package.json +1 -1
- package/src/client.tsx +406 -66
- package/src/config.ts +78 -10
- package/src/detect.ts +60 -10
- package/src/index.ts +4 -4
- package/src/resume.ts +14 -22
- package/src/stream-guard.ts +16 -3
- package/src/turn-stopping-guard.ts +4 -2
package/src/client.tsx
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 客户端设置页:在设置窗口左侧加一项"复读打断"。
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* 版式照着官方设置页来:顶部一行"左标题 + 右保存",下面每项是一行
|
|
5
|
+
* (左标题与描述、右控件),样式全部用 dsh 的设计令牌 `--dsw-*`,
|
|
6
|
+
* 由本模块自己注入 `<style>`,与官方 feature(如 theme 的字号行)同款做法。
|
|
6
7
|
*
|
|
7
8
|
* 本文件由 scripts/build-client.mjs 用 esbuild 单独打包成单文件 bundle
|
|
8
9
|
* (`lib/client.js`),不走 tsc 的 lib 输出。
|
|
@@ -13,17 +14,397 @@ import type { Context } from '@deepseek-ai/cordis';
|
|
|
13
14
|
// slots 与 settingsScope 两个客户端服务)。
|
|
14
15
|
import type {} from '@deepseek-ai/dsh-client-ui-renderer/client';
|
|
15
16
|
import type {} from '@deepseek-ai/dsh-client-ui-settings/client';
|
|
16
|
-
import { useEffect, useState, type ReactElement } from 'react';
|
|
17
|
+
import { useEffect, useState, type KeyboardEvent, type ReactElement } from 'react';
|
|
17
18
|
|
|
18
19
|
/** settings 命名空间,必须与宿主侧 config.ts 的 SETTINGS_NS 逐字一致。 */
|
|
19
20
|
const SETTINGS_NS = 'repeat-guard';
|
|
20
21
|
|
|
21
|
-
/**
|
|
22
|
+
/** 阈值步进器的取值边界。 */
|
|
23
|
+
const THRESHOLD_MIN = 1;
|
|
24
|
+
const THRESHOLD_MAX = 9;
|
|
25
|
+
|
|
26
|
+
/** 宿主侧注册的配置。字段都带 schema 默认值,所以在这里是必有的。 */
|
|
22
27
|
interface RepeatGuardSettings {
|
|
23
28
|
/** 拦截短句表。 */
|
|
24
|
-
fragments
|
|
25
|
-
/**
|
|
26
|
-
threshold
|
|
29
|
+
fragments: string[];
|
|
30
|
+
/** 连续命中多少次才拦。 */
|
|
31
|
+
threshold: number;
|
|
32
|
+
/** 是否把"整行由多个表项拼成"也算命中。 */
|
|
33
|
+
inlineRepeat: boolean;
|
|
34
|
+
/** 截断后推给模型的指令正文。 */
|
|
35
|
+
resumeText: string;
|
|
36
|
+
/** 注入消息的折叠行摘要。 */
|
|
37
|
+
resumeSummary: string;
|
|
38
|
+
/** 累计拦截次数,由宿主侧维护。 */
|
|
39
|
+
count: number;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/** 输入框与文本域的公共外观。 */
|
|
43
|
+
const FIELD = `height:36px;box-sizing:border-box;padding:0 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:transparent;color:var(--dsw-alias-label-primary);font-family:inherit;font-size:14px;line-height:22px`;
|
|
44
|
+
|
|
45
|
+
/** 样式。令牌名取自 dsh 前端已发布的设计令牌表。 */
|
|
46
|
+
const CSS = `
|
|
47
|
+
.rg-root{display:flex;flex-direction:column;width:100%}
|
|
48
|
+
.rg-head{display:flex;align-items:center;gap:12px;padding:2px 0 14px}
|
|
49
|
+
.rg-headTitle{flex:1;min-width:0;color:var(--dsw-alias-label-primary);font-size:16px;font-weight:500;line-height:24px}
|
|
50
|
+
.rg-headNote{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;white-space:nowrap}
|
|
51
|
+
.rg-save{cursor:pointer;flex:none;height:32px;padding:0 16px;border:none;border-radius:16px;background:var(--dsw-alias-button-primary-fill);color:var(--dsw-alias-label-primary-foreground);font-family:inherit;font-size:14px;line-height:22px}
|
|
52
|
+
.rg-save:hover{background:var(--dsw-alias-button-primary-hover)}
|
|
53
|
+
.rg-row{display:flex;align-items:center;gap:8px;padding:16px 0;border-bottom:.5px solid var(--dsw-alias-border-l2)}
|
|
54
|
+
.rg-row--stack{flex-direction:column;align-items:stretch;gap:10px}
|
|
55
|
+
.rg-rowText{display:flex;flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px}
|
|
56
|
+
.rg-rowTitle{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}
|
|
57
|
+
.rg-rowDesc{color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:400;line-height:18px}
|
|
58
|
+
.rg-control{display:inline-flex;align-items:center;gap:8px}
|
|
59
|
+
.rg-stepper{position:relative;display:inline-flex;justify-content:center;align-items:center;min-width:72px;height:36px;border-radius:18px;background:var(--dsw-alias-bg-module-platform)}
|
|
60
|
+
.rg-stepperValue{min-width:18px;text-align:center;font-variant-numeric:tabular-nums;color:var(--dsw-alias-label-primary);font-size:14px;line-height:22px}
|
|
61
|
+
.rg-stepperUnit{color:var(--dsw-alias-label-secondary);font-size:14px;line-height:22px}
|
|
62
|
+
.rg-arrows{position:absolute;right:8px;display:flex;flex-direction:column;gap:2px;opacity:0}
|
|
63
|
+
.rg-stepper:hover .rg-arrows,.rg-stepper:focus-within .rg-arrows{opacity:1}
|
|
64
|
+
.rg-arrow{display:inline-flex;justify-content:center;align-items:center;width:17px;height:12px;padding:0;border:none;border-radius:3px;cursor:pointer;color:var(--dsw-alias-label-primary);background:color-mix(in srgb, var(--dsw-alias-bg-layer-1) 75%, transparent)}
|
|
65
|
+
.rg-arrow:hover:not(:disabled){background:var(--dsw-alias-bg-layer-1)}
|
|
66
|
+
.rg-arrow:disabled{color:var(--dsw-alias-label-caption);cursor:default}
|
|
67
|
+
.rg-switch{position:relative;flex:none;width:40px;height:24px;padding:0;border:none;border-radius:12px;cursor:pointer;background:var(--dsw-alias-bg-module-platform);transition:background .15s ease}
|
|
68
|
+
.rg-switch::after{content:"";position:absolute;top:3px;left:3px;width:18px;height:18px;border-radius:50%;background:var(--dsw-alias-label-primary-foreground);transition:transform .15s ease}
|
|
69
|
+
.rg-switch[aria-checked="true"]{background:var(--dsw-alias-brand-primary)}
|
|
70
|
+
.rg-switch[aria-checked="true"]::after{transform:translateX(16px)}
|
|
71
|
+
.rg-count{display:inline-flex;align-items:center;justify-content:center;min-width:72px;height:36px;padding:0 14px;box-sizing:border-box;border-radius:18px;background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);font-size:14px;line-height:22px;font-variant-numeric:tabular-nums}
|
|
72
|
+
.rg-list{display:flex;flex-direction:column;gap:2px;width:100%;max-height:300px;overflow-y:auto;padding:4px;border-radius:12px;background:var(--dsw-alias-bg-module-platform);box-sizing:border-box}
|
|
73
|
+
.rg-item{display:flex;align-items:center;gap:8px;padding:5px 6px 5px 12px;border-radius:8px;font-size:14px;line-height:22px;color:var(--dsw-alias-label-primary)}
|
|
74
|
+
.rg-item:hover{background:var(--dsw-alias-interactive-bg-hover)}
|
|
75
|
+
.rg-itemText{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
|
76
|
+
.rg-remove{flex:none;display:inline-flex;justify-content:center;align-items:center;width:24px;height:24px;padding:0;border:none;border-radius:12px;cursor:pointer;background:transparent;color:var(--dsw-alias-label-tertiary)}
|
|
77
|
+
.rg-remove:hover{background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary)}
|
|
78
|
+
.rg-empty{padding:10px 12px;color:var(--dsw-alias-label-caption);font-size:13px;line-height:20px}
|
|
79
|
+
.rg-addRow{display:flex;align-items:center;gap:8px;width:100%}
|
|
80
|
+
.rg-input{flex:1;min-width:0;${FIELD}}
|
|
81
|
+
.rg-summaryInput{flex:none;width:260px;${FIELD}}
|
|
82
|
+
.rg-textarea{width:100%;min-height:84px;box-sizing:border-box;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:transparent;color:var(--dsw-alias-label-primary);font-family:inherit;font-size:14px;line-height:22px;resize:vertical}
|
|
83
|
+
.rg-input:focus,.rg-summaryInput:focus,.rg-textarea:focus{outline:none;border-color:var(--dsw-alias-border-l4)}
|
|
84
|
+
.rg-button{cursor:pointer;flex:none;height:32px;padding:0 14px;border:none;border-radius:16px;background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary);font-family:inherit;font-size:14px;line-height:22px}
|
|
85
|
+
.rg-button:hover{background:var(--dsw-alias-interactive-bg-active)}
|
|
86
|
+
`;
|
|
87
|
+
|
|
88
|
+
const STYLE_TAG = 'dsh-repeat-guard/panel.css';
|
|
89
|
+
|
|
90
|
+
/** 注入一次本插件的样式;重复挂载不重复插。 */
|
|
91
|
+
function injectStyle(): void {
|
|
92
|
+
if (typeof document === 'undefined' || document.querySelector(`style[data-plugin-css="${STYLE_TAG}"]`) !== null) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
const tag = document.createElement('style');
|
|
96
|
+
tag.dataset.plugin = 'dsh-repeat-guard';
|
|
97
|
+
tag.dataset.pluginCss = STYLE_TAG;
|
|
98
|
+
tag.textContent = CSS;
|
|
99
|
+
document.head.appendChild(tag);
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
interface StepperProps {
|
|
103
|
+
value: number;
|
|
104
|
+
min: number;
|
|
105
|
+
max: number;
|
|
106
|
+
unit: string;
|
|
107
|
+
label: string;
|
|
108
|
+
onChange: (next: number) => void;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** 数字步进器:数值居中,悬停或聚焦时右侧浮出上下箭头。 */
|
|
112
|
+
function Stepper({ value, min, max, unit, label, onChange }: StepperProps): ReactElement {
|
|
113
|
+
return (
|
|
114
|
+
<span className="rg-control">
|
|
115
|
+
<span className="rg-stepper">
|
|
116
|
+
<span className="rg-stepperValue">{value}</span>
|
|
117
|
+
<span className="rg-arrows">
|
|
118
|
+
<button
|
|
119
|
+
type="button"
|
|
120
|
+
className="rg-arrow"
|
|
121
|
+
aria-label={`增大${label}`}
|
|
122
|
+
disabled={value >= max}
|
|
123
|
+
onClick={() => {
|
|
124
|
+
onChange(value + 1);
|
|
125
|
+
}}
|
|
126
|
+
>
|
|
127
|
+
<svg width="9" height="9" viewBox="0 0 9 9" aria-hidden="true">
|
|
128
|
+
<path
|
|
129
|
+
d="M1.4 6.2 4.5 3.1l3.1 3.1"
|
|
130
|
+
fill="none"
|
|
131
|
+
stroke="currentColor"
|
|
132
|
+
strokeWidth="1.4"
|
|
133
|
+
strokeLinecap="round"
|
|
134
|
+
strokeLinejoin="round"
|
|
135
|
+
/>
|
|
136
|
+
</svg>
|
|
137
|
+
</button>
|
|
138
|
+
<button
|
|
139
|
+
type="button"
|
|
140
|
+
className="rg-arrow"
|
|
141
|
+
aria-label={`减小${label}`}
|
|
142
|
+
disabled={value <= min}
|
|
143
|
+
onClick={() => {
|
|
144
|
+
onChange(value - 1);
|
|
145
|
+
}}
|
|
146
|
+
>
|
|
147
|
+
<svg width="9" height="9" viewBox="0 0 9 9" aria-hidden="true">
|
|
148
|
+
<path
|
|
149
|
+
d="M1.4 2.8 4.5 5.9l3.1-3.1"
|
|
150
|
+
fill="none"
|
|
151
|
+
stroke="currentColor"
|
|
152
|
+
strokeWidth="1.4"
|
|
153
|
+
strokeLinecap="round"
|
|
154
|
+
strokeLinejoin="round"
|
|
155
|
+
/>
|
|
156
|
+
</svg>
|
|
157
|
+
</button>
|
|
158
|
+
</span>
|
|
159
|
+
</span>
|
|
160
|
+
<span className="rg-stepperUnit">{unit}</span>
|
|
161
|
+
</span>
|
|
162
|
+
);
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
interface SwitchProps {
|
|
166
|
+
checked: boolean;
|
|
167
|
+
label: string;
|
|
168
|
+
onChange: (next: boolean) => void;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/** 开关。 */
|
|
172
|
+
function Switch({ checked, label, onChange }: SwitchProps): ReactElement {
|
|
173
|
+
return (
|
|
174
|
+
<button
|
|
175
|
+
type="button"
|
|
176
|
+
role="switch"
|
|
177
|
+
aria-checked={checked}
|
|
178
|
+
aria-label={label}
|
|
179
|
+
className="rg-switch"
|
|
180
|
+
onClick={() => {
|
|
181
|
+
onChange(!checked);
|
|
182
|
+
}}
|
|
183
|
+
/>
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
interface FragmentListProps {
|
|
188
|
+
items: readonly string[];
|
|
189
|
+
draft: string;
|
|
190
|
+
onDraft: (next: string) => void;
|
|
191
|
+
onAdd: () => void;
|
|
192
|
+
onRemove: (index: number) => void;
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
/** 短句表:可滚动的列表,逐条删除,底部一行新增。 */
|
|
196
|
+
function FragmentList({ items, draft, onDraft, onAdd, onRemove }: FragmentListProps): ReactElement {
|
|
197
|
+
function handleKey(event: KeyboardEvent<HTMLInputElement>): void {
|
|
198
|
+
if (event.key === 'Enter') {
|
|
199
|
+
event.preventDefault();
|
|
200
|
+
onAdd();
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
return (
|
|
205
|
+
<>
|
|
206
|
+
<div className="rg-list">
|
|
207
|
+
{items.length === 0 ? <div className="rg-empty">表是空的,不会拦截任何短句。</div> : null}
|
|
208
|
+
{items.map((item, index) => (
|
|
209
|
+
<div className="rg-item" key={`${item}#${String(index)}`}>
|
|
210
|
+
<span className="rg-itemText">{item}</span>
|
|
211
|
+
<button
|
|
212
|
+
type="button"
|
|
213
|
+
className="rg-remove"
|
|
214
|
+
aria-label={`删除 ${item}`}
|
|
215
|
+
onClick={() => {
|
|
216
|
+
onRemove(index);
|
|
217
|
+
}}
|
|
218
|
+
>
|
|
219
|
+
<svg width="12" height="12" viewBox="0 0 12 12" aria-hidden="true">
|
|
220
|
+
<path
|
|
221
|
+
d="M3 3l6 6M9 3l-6 6"
|
|
222
|
+
fill="none"
|
|
223
|
+
stroke="currentColor"
|
|
224
|
+
strokeWidth="1.4"
|
|
225
|
+
strokeLinecap="round"
|
|
226
|
+
/>
|
|
227
|
+
</svg>
|
|
228
|
+
</button>
|
|
229
|
+
</div>
|
|
230
|
+
))}
|
|
231
|
+
</div>
|
|
232
|
+
<div className="rg-addRow">
|
|
233
|
+
<input
|
|
234
|
+
className="rg-input"
|
|
235
|
+
value={draft}
|
|
236
|
+
placeholder="新增短句,连标点一起写,回车添加"
|
|
237
|
+
onChange={(event) => {
|
|
238
|
+
onDraft(event.target.value);
|
|
239
|
+
}}
|
|
240
|
+
onKeyDown={handleKey}
|
|
241
|
+
/>
|
|
242
|
+
<button type="button" className="rg-button" onClick={onAdd}>
|
|
243
|
+
添加
|
|
244
|
+
</button>
|
|
245
|
+
</div>
|
|
246
|
+
</>
|
|
247
|
+
);
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
interface FormProps {
|
|
251
|
+
initial: RepeatGuardSettings;
|
|
252
|
+
/** 宿主侧实时计数;由外层订阅刷新,不参与本地编辑。 */
|
|
253
|
+
count: number;
|
|
254
|
+
onReset: () => Promise<void>;
|
|
255
|
+
onSave: (next: RepeatGuardSettings) => Promise<void>;
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
/** 设置表单:标题行 + 五行设置;改动先留在本地,点保存才写。 */
|
|
259
|
+
function Form({ initial, count, onReset, onSave }: FormProps): ReactElement {
|
|
260
|
+
const [items, setItems] = useState<readonly string[]>(initial.fragments);
|
|
261
|
+
const [limit, setLimit] = useState(initial.threshold);
|
|
262
|
+
const [inlineRepeat, setInlineRepeat] = useState(initial.inlineRepeat);
|
|
263
|
+
const [resumeText, setResumeText] = useState(initial.resumeText);
|
|
264
|
+
const [resumeSummary, setResumeSummary] = useState(initial.resumeSummary);
|
|
265
|
+
const [draft, setDraft] = useState('');
|
|
266
|
+
const [note, setNote] = useState('');
|
|
267
|
+
|
|
268
|
+
function add(): void {
|
|
269
|
+
const value = draft.trim();
|
|
270
|
+
if (value === '') {
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
setItems([...items, value]);
|
|
274
|
+
setDraft('');
|
|
275
|
+
setNote('');
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
function remove(index: number): void {
|
|
279
|
+
setItems(items.filter((_, at) => at !== index));
|
|
280
|
+
setNote('');
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
function save(): void {
|
|
284
|
+
setNote('保存中…');
|
|
285
|
+
onSave({
|
|
286
|
+
fragments: [...items],
|
|
287
|
+
threshold: limit,
|
|
288
|
+
inlineRepeat,
|
|
289
|
+
resumeText,
|
|
290
|
+
resumeSummary,
|
|
291
|
+
count,
|
|
292
|
+
})
|
|
293
|
+
.then(() => {
|
|
294
|
+
setNote('已保存');
|
|
295
|
+
})
|
|
296
|
+
.catch((error: unknown) => {
|
|
297
|
+
setNote(`保存失败:${String(error)}`);
|
|
298
|
+
});
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
function reset(): void {
|
|
302
|
+
onReset()
|
|
303
|
+
.then(() => {
|
|
304
|
+
setNote('计数已清零');
|
|
305
|
+
})
|
|
306
|
+
.catch((error: unknown) => {
|
|
307
|
+
setNote(`清零失败:${String(error)}`);
|
|
308
|
+
});
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
return (
|
|
312
|
+
<div className="rg-root">
|
|
313
|
+
<div className="rg-head">
|
|
314
|
+
<span className="rg-headTitle">复读打断</span>
|
|
315
|
+
<span className="rg-headNote">{note}</span>
|
|
316
|
+
<button type="button" className="rg-save" onClick={save}>
|
|
317
|
+
保存
|
|
318
|
+
</button>
|
|
319
|
+
</div>
|
|
320
|
+
<div className="rg-row">
|
|
321
|
+
<div className="rg-rowText">
|
|
322
|
+
<div className="rg-rowTitle">累计拦截</div>
|
|
323
|
+
<div className="rg-rowDesc">重复打断计数</div>
|
|
324
|
+
</div>
|
|
325
|
+
<span className="rg-control">
|
|
326
|
+
<span className="rg-count">{count} 次</span>
|
|
327
|
+
<button type="button" className="rg-button" onClick={reset}>
|
|
328
|
+
清零
|
|
329
|
+
</button>
|
|
330
|
+
</span>
|
|
331
|
+
</div>
|
|
332
|
+
<div className="rg-row">
|
|
333
|
+
<div className="rg-rowText">
|
|
334
|
+
<div className="rg-rowTitle">连续命中次数</div>
|
|
335
|
+
<div className="rg-rowDesc">循环次数上限;填 1 表示发现即拦</div>
|
|
336
|
+
</div>
|
|
337
|
+
<Stepper
|
|
338
|
+
value={limit}
|
|
339
|
+
min={THRESHOLD_MIN}
|
|
340
|
+
max={THRESHOLD_MAX}
|
|
341
|
+
unit="次"
|
|
342
|
+
label="连续命中次数"
|
|
343
|
+
onChange={(next) => {
|
|
344
|
+
setLimit(next);
|
|
345
|
+
setNote('');
|
|
346
|
+
}}
|
|
347
|
+
/>
|
|
348
|
+
</div>
|
|
349
|
+
<div className="rg-row">
|
|
350
|
+
<div className="rg-rowText">
|
|
351
|
+
<div className="rg-rowTitle">行内重复检测</div>
|
|
352
|
+
<div className="rg-rowDesc">
|
|
353
|
+
拦截类似"好。好。好。"的行内循环;关闭时只检测独立段落。
|
|
354
|
+
</div>
|
|
355
|
+
</div>
|
|
356
|
+
<Switch
|
|
357
|
+
checked={inlineRepeat}
|
|
358
|
+
label="行内重复检测"
|
|
359
|
+
onChange={(next) => {
|
|
360
|
+
setInlineRepeat(next);
|
|
361
|
+
setNote('');
|
|
362
|
+
}}
|
|
363
|
+
/>
|
|
364
|
+
</div>
|
|
365
|
+
<div className="rg-row rg-row--stack">
|
|
366
|
+
<div className="rg-rowText">
|
|
367
|
+
<div className="rg-rowTitle">拦截短句</div>
|
|
368
|
+
<div className="rg-rowDesc">标点不可省略</div>
|
|
369
|
+
</div>
|
|
370
|
+
<FragmentList
|
|
371
|
+
items={items}
|
|
372
|
+
draft={draft}
|
|
373
|
+
onDraft={setDraft}
|
|
374
|
+
onAdd={add}
|
|
375
|
+
onRemove={remove}
|
|
376
|
+
/>
|
|
377
|
+
</div>
|
|
378
|
+
<div className="rg-row rg-row--stack">
|
|
379
|
+
<div className="rg-rowText">
|
|
380
|
+
<div className="rg-rowTitle">拦截提示词</div>
|
|
381
|
+
<div className="rg-rowDesc">截断后上下文注入的提示词</div>
|
|
382
|
+
</div>
|
|
383
|
+
<textarea
|
|
384
|
+
className="rg-textarea"
|
|
385
|
+
value={resumeText}
|
|
386
|
+
onChange={(event) => {
|
|
387
|
+
setResumeText(event.target.value);
|
|
388
|
+
setNote('');
|
|
389
|
+
}}
|
|
390
|
+
/>
|
|
391
|
+
</div>
|
|
392
|
+
<div className="rg-row">
|
|
393
|
+
<div className="rg-rowText">
|
|
394
|
+
<div className="rg-rowTitle">拦截摘要</div>
|
|
395
|
+
<div className="rg-rowDesc">上下文注入的简介信息,仅用户可见</div>
|
|
396
|
+
</div>
|
|
397
|
+
<input
|
|
398
|
+
className="rg-summaryInput"
|
|
399
|
+
value={resumeSummary}
|
|
400
|
+
onChange={(event) => {
|
|
401
|
+
setResumeSummary(event.target.value);
|
|
402
|
+
setNote('');
|
|
403
|
+
}}
|
|
404
|
+
/>
|
|
405
|
+
</div>
|
|
406
|
+
</div>
|
|
407
|
+
);
|
|
27
408
|
}
|
|
28
409
|
|
|
29
410
|
/** 注册设置页需要的服务;这两个是 cordis 服务名,不是包名。 */
|
|
@@ -34,65 +415,9 @@ export const inject = ['slots', 'settingsScope'];
|
|
|
34
415
|
* @param ctx - 浏览器侧 cordis 上下文。
|
|
35
416
|
*/
|
|
36
417
|
export function apply(ctx: Context): void {
|
|
418
|
+
injectStyle();
|
|
37
419
|
const scope = ctx.settingsScope.bind<RepeatGuardSettings>({ namespace: SETTINGS_NS });
|
|
38
420
|
|
|
39
|
-
function Form({ initial }: { initial: RepeatGuardSettings }): ReactElement {
|
|
40
|
-
const [fragments, setFragments] = useState(() => (initial.fragments ?? []).join('\n'));
|
|
41
|
-
const [threshold, setThreshold] = useState(() => String(initial.threshold ?? 1));
|
|
42
|
-
const [message, setMessage] = useState('');
|
|
43
|
-
|
|
44
|
-
function save(): void {
|
|
45
|
-
const list = fragments
|
|
46
|
-
.split('\n')
|
|
47
|
-
.map((line) => line.trim())
|
|
48
|
-
.filter((line) => line !== '');
|
|
49
|
-
const count = Number(threshold);
|
|
50
|
-
setMessage('保存中…');
|
|
51
|
-
scope
|
|
52
|
-
.set('fragments', list)
|
|
53
|
-
.then(() => scope.set('threshold', count))
|
|
54
|
-
.then(() => {
|
|
55
|
-
setMessage('已保存');
|
|
56
|
-
})
|
|
57
|
-
.catch((error: unknown) => {
|
|
58
|
-
setMessage(`保存失败:${String(error)}`);
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
return (
|
|
63
|
-
<div style={{ display: 'flex', flexDirection: 'column', gap: '12px' }}>
|
|
64
|
-
<label>
|
|
65
|
-
<span>连续命中次数</span>
|
|
66
|
-
<input
|
|
67
|
-
type="number"
|
|
68
|
-
value={threshold}
|
|
69
|
-
onChange={(event) => {
|
|
70
|
-
setThreshold(event.target.value);
|
|
71
|
-
}}
|
|
72
|
-
/>
|
|
73
|
-
<span>填 1 表示命中即拦;填 n 表示连着 n 行都命中才拦。</span>
|
|
74
|
-
</label>
|
|
75
|
-
<label>
|
|
76
|
-
<span>拦截短句(一行一句,连标点一起写)</span>
|
|
77
|
-
<textarea
|
|
78
|
-
rows={16}
|
|
79
|
-
style={{ width: '100%', fontFamily: 'monospace' }}
|
|
80
|
-
value={fragments}
|
|
81
|
-
onChange={(event) => {
|
|
82
|
-
setFragments(event.target.value);
|
|
83
|
-
}}
|
|
84
|
-
/>
|
|
85
|
-
</label>
|
|
86
|
-
<div>
|
|
87
|
-
<button type="button" onClick={save}>
|
|
88
|
-
保存
|
|
89
|
-
</button>
|
|
90
|
-
<span>{message}</span>
|
|
91
|
-
</div>
|
|
92
|
-
</div>
|
|
93
|
-
);
|
|
94
|
-
}
|
|
95
|
-
|
|
96
421
|
function Panel(): ReactElement {
|
|
97
422
|
const [snapshot, setSnapshot] = useState(() => scope.getSnapshot());
|
|
98
423
|
useEffect(
|
|
@@ -104,9 +429,24 @@ export function apply(ctx: Context): void {
|
|
|
104
429
|
);
|
|
105
430
|
const value = snapshot.value;
|
|
106
431
|
if (snapshot.status !== 'ready' || value === undefined) {
|
|
107
|
-
return <
|
|
432
|
+
return <div className="rg-empty">{`配置尚未就绪(${snapshot.status})`}</div>;
|
|
108
433
|
}
|
|
109
|
-
return
|
|
434
|
+
return (
|
|
435
|
+
<Form
|
|
436
|
+
initial={value}
|
|
437
|
+
count={value.count}
|
|
438
|
+
onReset={async () => {
|
|
439
|
+
await scope.set('count', 0);
|
|
440
|
+
}}
|
|
441
|
+
onSave={async (next) => {
|
|
442
|
+
await scope.set('fragments', next.fragments);
|
|
443
|
+
await scope.set('threshold', next.threshold);
|
|
444
|
+
await scope.set('inlineRepeat', next.inlineRepeat);
|
|
445
|
+
await scope.set('resumeText', next.resumeText);
|
|
446
|
+
await scope.set('resumeSummary', next.resumeSummary);
|
|
447
|
+
}}
|
|
448
|
+
/>
|
|
449
|
+
);
|
|
110
450
|
}
|
|
111
451
|
|
|
112
452
|
ctx.slots.inject('settings.section', () =>
|
package/src/config.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* 插件配置:拦截短句表、连续命中阈值、行内重复检测、续跑注入的正文与摘要,
|
|
3
|
+
* 外加一个运行时计数。
|
|
3
4
|
*
|
|
4
5
|
* 配置放在 dsh 的 settings 服务里(命名空间 repeat-guard):宿主侧在这边注册
|
|
5
|
-
* schema
|
|
6
|
+
* schema,客户端设置页写同一个命名空间。判定与续跑时现取,改完立即生效,不用重启。
|
|
7
|
+
*
|
|
8
|
+
* 计数也寄在同一个命名空间里:宿主侧每次掐断写一次,客户端读同一个值、清零就是
|
|
9
|
+
* 把它写成 0。插件加载时先把它归零,所以口径是"自本次启动或上次清零以来"。
|
|
6
10
|
*/
|
|
7
11
|
|
|
8
12
|
import type { Context } from '@deepseek-ai/cordis';
|
|
@@ -52,43 +56,107 @@ export const DEFAULT_FRAGMENTS: readonly string[] = [
|
|
|
52
56
|
/** 默认阈值:1 表示发现即拦。 */
|
|
53
57
|
export const DEFAULT_THRESHOLD = 1;
|
|
54
58
|
|
|
59
|
+
/** 默认关闭行内重复检测:只认独占一行的整句。 */
|
|
60
|
+
export const DEFAULT_INLINE_REPEAT = false;
|
|
61
|
+
|
|
62
|
+
/** 默认的续跑指令正文,截断后推给模型。 */
|
|
63
|
+
export const DEFAULT_RESUME_TEXT = [
|
|
64
|
+
'[复读拦截]',
|
|
65
|
+
'你上一段思考退化成了碎片复读(反复输出"好。"一类的空话),已被系统截断。',
|
|
66
|
+
'请直接继续执行下一步,不要再输出任何确认语、寒暄或空话。',
|
|
67
|
+
].join('\n');
|
|
68
|
+
|
|
69
|
+
/** 默认的折叠行摘要;客户端拿它渲染折叠的 context 行,不是用户气泡。 */
|
|
70
|
+
export const DEFAULT_RESUME_SUMMARY = '复读已截断:请继续执行';
|
|
71
|
+
|
|
55
72
|
const SCHEMA = z.object({
|
|
56
73
|
fragments: z.array(z.string()).default([...DEFAULT_FRAGMENTS]),
|
|
57
74
|
threshold: z.number().default(DEFAULT_THRESHOLD),
|
|
75
|
+
inlineRepeat: z.boolean().default(DEFAULT_INLINE_REPEAT),
|
|
76
|
+
resumeText: z.string().default(DEFAULT_RESUME_TEXT),
|
|
77
|
+
resumeSummary: z.string().default(DEFAULT_RESUME_SUMMARY),
|
|
78
|
+
count: z.number().default(0),
|
|
58
79
|
});
|
|
59
80
|
|
|
60
|
-
/**
|
|
81
|
+
/** 判定与续跑用得上的一份配置。 */
|
|
61
82
|
export interface RepeatGuardConfig {
|
|
62
83
|
/** 短句表,已全部小写化。 */
|
|
63
84
|
readonly fragments: ReadonlySet<string>;
|
|
64
|
-
/**
|
|
85
|
+
/** 连续命中多少次才拦。 */
|
|
65
86
|
readonly threshold: number;
|
|
87
|
+
/** 是否把"整行由多个表项拼成"也算命中。 */
|
|
88
|
+
readonly inlineRepeat: boolean;
|
|
89
|
+
/** 截断后推给模型的指令正文。 */
|
|
90
|
+
readonly resumeText: string;
|
|
91
|
+
/** 注入消息的折叠行摘要。 */
|
|
92
|
+
readonly resumeSummary: string;
|
|
66
93
|
}
|
|
67
94
|
|
|
68
95
|
/** 取当前配置。 */
|
|
69
96
|
export type ConfigSource = () => RepeatGuardConfig;
|
|
70
97
|
|
|
71
|
-
|
|
98
|
+
/** 宿主侧要用到的两件事:取配置、记一次拦截。 */
|
|
99
|
+
export interface GuardRuntime {
|
|
100
|
+
/** 取当前配置。 */
|
|
101
|
+
readonly read: ConfigSource;
|
|
102
|
+
/** 记一次拦截,把计数写回 settings。 */
|
|
103
|
+
readonly countHit: () => void;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
function compile(value: {
|
|
107
|
+
fragments: readonly string[];
|
|
108
|
+
threshold: number;
|
|
109
|
+
inlineRepeat: boolean;
|
|
110
|
+
resumeText: string;
|
|
111
|
+
resumeSummary: string;
|
|
112
|
+
}): RepeatGuardConfig {
|
|
72
113
|
return {
|
|
73
114
|
fragments: new Set(value.fragments.map((fragment) => fragment.toLowerCase())),
|
|
74
115
|
threshold: value.threshold,
|
|
116
|
+
inlineRepeat: value.inlineRepeat,
|
|
117
|
+
resumeText: value.resumeText,
|
|
118
|
+
resumeSummary: value.resumeSummary,
|
|
75
119
|
};
|
|
76
120
|
}
|
|
77
121
|
|
|
78
122
|
/**
|
|
79
|
-
*
|
|
123
|
+
* 注册配置命名空间,返回宿主侧要用的运行时句柄。
|
|
80
124
|
* @param ctx - 宿主 cordis 上下文。
|
|
81
|
-
* @returns
|
|
125
|
+
* @returns 取配置与记数两个入口。
|
|
82
126
|
*/
|
|
83
|
-
export function
|
|
84
|
-
let current = compile({
|
|
127
|
+
export function createRuntime(ctx: Context): GuardRuntime {
|
|
128
|
+
let current = compile({
|
|
129
|
+
fragments: DEFAULT_FRAGMENTS,
|
|
130
|
+
threshold: DEFAULT_THRESHOLD,
|
|
131
|
+
inlineRepeat: DEFAULT_INLINE_REPEAT,
|
|
132
|
+
resumeText: DEFAULT_RESUME_TEXT,
|
|
133
|
+
resumeSummary: DEFAULT_RESUME_SUMMARY,
|
|
134
|
+
});
|
|
135
|
+
let bump: (() => void) | undefined;
|
|
136
|
+
|
|
85
137
|
ctx.inject(['settings'], (settingsCtx) => {
|
|
86
138
|
const scope = settingsCtx.settings.register(SETTINGS_NS, SCHEMA);
|
|
87
139
|
const sync = (): void => {
|
|
88
140
|
current = compile(scope.get());
|
|
89
141
|
};
|
|
142
|
+
const write = (patch: object): void => {
|
|
143
|
+
scope.update(patch).catch((error: unknown) => {
|
|
144
|
+
console.log(`[repeat-guard] 写设置失败:${String(error)}`);
|
|
145
|
+
});
|
|
146
|
+
};
|
|
90
147
|
sync();
|
|
91
148
|
scope.watch(sync);
|
|
149
|
+
// 计数口径是"自本次启动或上次清零以来"。
|
|
150
|
+
write({ count: 0 });
|
|
151
|
+
bump = (): void => {
|
|
152
|
+
write({ count: scope.get().count + 1 });
|
|
153
|
+
};
|
|
92
154
|
});
|
|
93
|
-
|
|
155
|
+
|
|
156
|
+
return {
|
|
157
|
+
read: () => current,
|
|
158
|
+
countHit: () => {
|
|
159
|
+
bump?.();
|
|
160
|
+
},
|
|
161
|
+
};
|
|
94
162
|
}
|