@y1x1n/dsh-prompt-optimizer 0.3.16 → 0.6.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/lib/index.js CHANGED
@@ -7,8 +7,8 @@ var MARKERS = {
7
7
  optimized: "<<<OPTIMIZED>>>",
8
8
  end: "<<<END>>>"
9
9
  };
10
- var ROLE_FULL_ZH = "\u4F60\u662F\u4E00\u4F4D\u8D44\u6DF1\u63D0\u793A\u8BCD\u5DE5\u7A0B\u4E13\u5BB6\u3002\u7528\u6237\u4F1A\u7ED9\u4F60\u4E00\u6BB5\u300C\u63D0\u793A\u8BCD\u8349\u7A3F\u300D,\u4F60\u8981\u5B8C\u6210\u4E24\u4EF6\u4E8B:\u8BCA\u65AD\u5206\u6790 + \u4F18\u5316\u6539\u5199\u3002";
11
- var ROLE_FULL_EN = 'You are a senior prompt engineering expert. Given a "prompt draft" from the user, do two things: diagnose it, then rewrite an optimized version.';
10
+ var ROLE_FULL_ZH = "\u4F60\u662F\u4E00\u4F4D\u8D44\u6DF1\u63D0\u793A\u8BCD\u5DE5\u7A0B\u4E13\u5BB6\u3002\u7528\u6237\u4F1A\u7ED9\u4F60\u4E00\u6BB5\u300C\u63D0\u793A\u8BCD\u8349\u7A3F\u300D,\u4F60\u8981\u8F93\u51FA\u4E24\u6BB5\u5185\u5BB9:\u5148\u8F93\u51FA\u4F18\u5316\u6539\u5199\u7A3F,\u518D\u8F93\u51FA\u8BCA\u65AD\u5206\u6790\u3002";
11
+ var ROLE_FULL_EN = 'You are a senior prompt engineering expert. Given a "prompt draft" from the user, output the optimized rewrite first, then the diagnosis.';
12
12
  var ROLE_FAST_ZH = "\u4F60\u662F\u4E00\u4F4D\u8D44\u6DF1\u63D0\u793A\u8BCD\u5DE5\u7A0B\u4E13\u5BB6\u3002\u7528\u6237\u4F1A\u7ED9\u4F60\u4E00\u6BB5\u300C\u63D0\u793A\u8BCD\u8349\u7A3F\u300D,\u8BF7\u76F4\u63A5\u8F93\u51FA\u4F18\u5316\u540E\u7684\u5B8C\u6574\u63D0\u793A\u8BCD,\u4E0D\u8981\u505A\u4EFB\u4F55\u8BCA\u65AD\u5206\u6790\u3002";
13
13
  var ROLE_FAST_EN = 'You are a senior prompt engineering expert. Given a "prompt draft" from the user, output an optimized version directly \u2014 no diagnosis.';
14
14
  var ANALYSIS_ZH = `# \u5206\u6790\u7EF4\u5EA6
@@ -56,14 +56,14 @@ var RULES_ZH = `# \u4FDD\u771F\u4E0E\u660E\u786E\u5316\u539F\u5219(\u5168\u7A0B\
56
56
  - \u8BED\u4E49\u7B49\u4EF7\u662F\u5E95\u7EBF:\u5DF2\u660E\u786E\u7684\u5BF9\u8C61\u3001\u65B9\u5411\u3001\u6570\u91CF\u3001\u8303\u56F4\u3001\u7981\u6B62\u9879\u3001\u672F\u8BED\u5FC5\u987B\u4E0E\u8349\u7A3F\u4E00\u81F4,\u4E0D\u5F97\u66FF\u6362\u3001\u6269\u5927\u3001\u7F29\u5C0F\u6216\u98A0\u5012
57
57
  - \u6765\u6E90\u53EF\u56DE\u6EAF:\u4EFB\u4F55\u5177\u4F53\u5316\u7684\u5185\u5BB9\u90FD\u5FC5\u987B\u80FD\u4ECE\u8349\u7A3F\u6216\u4E0A\u4E0B\u6587\u5DF2\u786E\u8BA4\u4FE1\u606F\u627E\u5230\u4F9D\u636E;\u63A8\u65AD\u5904\u7528\u300C\u5982\u65E0\u7279\u522B\u8BF4\u660E/\u9ED8\u8BA4\u300D\u63AA\u8F9E\u4FDD\u7559\u9009\u62E9\u6743,\u65E0\u4F9D\u636E\u7684\u5B81\u53EF\u4E0D\u8865
58
58
  - \u4FDD\u771F\u81EA\u68C0:\u8F93\u51FA\u524D\u9010\u8981\u7D20\u6838\u5BF9\u2014\u2014\u8349\u7A3F\u7684\u6BCF\u4E2A\u539F\u5B50\u4FE1\u606F\u90FD\u8981\u5728\u4F18\u5316\u7A3F\u4E2D\u627E\u5230\u5BF9\u5E94,\u627E\u4E0D\u5230\u5373\u4E3A\u8BED\u4E49\u6F02\u79FB,\u5FC5\u987B\u4FEE\u6B63
59
- - \u957F\u5EA6\u7EAA\u5F8B:\u7B80\u5355\u4EFB\u52A1\u7684\u4F18\u5316\u7A3F\u63A7\u5236\u5728 800 \u5B57\u7B26\u4EE5\u5185,\u590D\u6742\u4EFB\u52A1\u53EF\u8D85\u51FA;\u4EFB\u4F55\u60C5\u51B5\u4E0B\u4FDD\u771F\u81EA\u68C0\u4F18\u5148\u4E8E\u957F\u5EA6\u2014\u2014\u8981\u7D20\u7F3A\u5931\u6BD4\u5197\u957F\u66F4\u4E25\u91CD,\u4F46\u4E5F\u4E0D\u5F97\u5197\u4F59
59
+ - \u957F\u5EA6\u7EAA\u5F8B:\u7B80\u5355\u4EFB\u52A1\u7684\u4F18\u5316\u7A3F\u63A7\u5236\u5728 500 \u5B57\u7B26\u4EE5\u5185,\u590D\u6742\u4EFB\u52A1\u53EF\u8D85\u51FA;\u4F18\u5316\u7A3F\u5C31\u662F\u63D0\u793A\u8BCD\u672C\u8EAB\u2014\u2014\u4E0D\u590D\u8FF0\u539F\u7A3F\u3001\u4E0D\u52A0\u591A\u4F59\u7684\u89E3\u91CA\u6216\u524D\u8A00;\u4EFB\u4F55\u60C5\u51B5\u4E0B\u4FDD\u771F\u81EA\u68C0\u4F18\u5148\u4E8E\u957F\u5EA6\u2014\u2014\u8981\u7D20\u7F3A\u5931\u6BD4\u5197\u957F\u66F4\u4E25\u91CD,\u4F46\u4E5F\u4E0D\u5F97\u5197\u4F59
60
60
  - \u8BED\u8A00\u5339\u914D:\u8349\u7A3F\u4EE5\u4E2D\u6587\u4E3A\u4E3B\u4F53\u5219\u8F93\u51FA\u5FC5\u987B\u4E3A\u4E2D\u6587,\u4EE5\u82F1\u6587\u4E3A\u4E3B\u4F53\u5219\u8F93\u51FA\u5FC5\u987B\u4E3A\u82F1\u6587;\u4FDD\u7559\u539F\u6587\u7684\u672F\u8BED\u4E0E\u4E13\u6709\u540D\u8BCD`;
61
61
  var RULES_EN = `# Fidelity & clarification rules (always apply)
62
62
  - Understand first: list what the draft explicitly states (subject, action, constraints, scope, terms, numbers, tone), and separate it from your guesses \u2014 guesses may shape wording only, never enter the output
63
63
  - Semantic equivalence is the floor: what the draft states (subject, direction, quantities, scope, prohibitions, terms) must survive intact \u2014 never replace, widen, narrow, or invert it
64
64
  - Traceability: every concretized detail must trace back to the draft or to information the context has confirmed; mark inferences with "unless otherwise specified / by default" phrasing; when in doubt, leave it out
65
65
  - Fidelity self-check: before output, verify every atomic element of the draft has a counterpart in your rewrite \u2014 a missing one is semantic drift and must be fixed
66
- - Length discipline: keep the rewrite under 800 characters for simple tasks; longer is allowed for complex ones. Fidelity always outranks length \u2014 a missing element is worse than verbosity, but never pad
66
+ - Length discipline: keep the rewrite under 500 characters for simple tasks; longer is allowed for complex ones. The rewrite is the prompt itself \u2014 never restate the draft or add explanations or preamble. Fidelity always outranks length \u2014 a missing element is worse than verbosity, but never pad
67
67
  - Language match: Chinese-dominant draft \u2192 Chinese output; English-dominant \u2192 English output; keep the draft's terms and proper nouns`;
68
68
  var EXAMPLE_TEMPLATE_ZH = `# \u793A\u4F8B(\u4E25\u683C\u6A21\u4EFF\u5176\u300C\u8F93\u5165 \u2192 \u8F93\u51FA\u300D\u7684\u98CE\u683C)
69
69
  \u8F93\u5165:\u5E2E\u6211\u5199\u4E2A\u8BF7\u5047\u6761
@@ -78,18 +78,18 @@ var EXAMPLE_INTENT_EN = `# Example (strictly mirror its "input \u2192 output" st
78
78
  Input: (background: the user runs a 200-member neighborhood parents' swap group; the first chain-post drew only a dozen joins, blamed on weak prizes and a messy format) redesign the chain post for me
79
79
  Output: Redesign the "hidden gems" chain post for my 200-member neighborhood swap group (mostly parents): last round drew only a dozen joins because prizes were unappealing and the format confusing \u2014 provide a simple chain-post template, low-cost but attractive prize ideas, and concrete tactics to lift participation.`;
80
80
  var FORMAT_FULL_ZH = `# \u8F93\u51FA\u683C\u5F0F(\u4E25\u683C\u9075\u5B88,\u6807\u8BB0\u884C\u5355\u72EC\u6210\u884C)
81
- ${MARKERS.analysis}
82
- \u6309\u7EF4\u5EA6\u9010\u6761\u8F93\u51FA\u8BCA\u65AD,\u6BCF\u6761\u4E00\u884C,\u683C\u5F0F:\u300C\u7EF4\u5EA6 | \u95EE\u9898 | \u5EFA\u8BAE\u300D\u3002\u67D0\u7EF4\u5EA6\u65E0\u660E\u663E\u95EE\u9898\u65F6\u5199:\u300C\u7EF4\u5EA6 | \u65E0\u660E\u663E\u95EE\u9898 | -\u300D\u3002
83
81
  ${MARKERS.optimized}
84
82
  \u8F93\u51FA\u4F18\u5316\u540E\u7684\u5B8C\u6574\u63D0\u793A\u8BCD\u5168\u6587
83
+ ${MARKERS.analysis}
84
+ \u6309\u7EF4\u5EA6\u9010\u6761\u8F93\u51FA\u8BCA\u65AD,\u6BCF\u6761\u4E00\u884C,\u683C\u5F0F:\u300C\u7EF4\u5EA6 | \u95EE\u9898 | \u5EFA\u8BAE\u300D\u3002\u67D0\u7EF4\u5EA6\u65E0\u660E\u663E\u95EE\u9898\u65F6\u5199:\u300C\u7EF4\u5EA6 | \u65E0\u660E\u663E\u95EE\u9898 | -\u300D\u3002
85
85
  ${MARKERS.end}
86
86
 
87
87
  \u9664\u4E0A\u8FF0\u6807\u8BB0\u5305\u88F9\u7684\u5185\u5BB9\u5916,\u4E0D\u8981\u8F93\u51FA\u4EFB\u4F55\u5176\u4ED6\u6587\u5B57\u3002`;
88
88
  var FORMAT_FULL_EN = `# Output format (strictly follow; markers on their own lines)
89
- ${MARKERS.analysis}
90
- One finding per line: "dimension | issue | suggestion". If a dimension is fine: "dimension | no issue | -".
91
89
  ${MARKERS.optimized}
92
90
  The full optimized prompt text
91
+ ${MARKERS.analysis}
92
+ One finding per line: "dimension | issue | suggestion". If a dimension is fine: "dimension | no issue | -".
93
93
  ${MARKERS.end}
94
94
 
95
95
  Do not output anything outside these markers.`;
@@ -118,23 +118,44 @@ function buildSystemPrompt(language, mode = "full", strategy = "template") {
118
118
  var CONTEXT_MAX_TURNS = 8;
119
119
  var CONTEXT_MAX_CHARS = 1600;
120
120
  var CONTEXT_TURN_MAX_CHARS = 600;
121
+ var CONTEXT_MIN_USER_TURNS = 1;
122
+ var CONTEXT_USER_BUDGET = 800;
121
123
  function capConversationContext(turns) {
122
124
  const recent = turns.filter((t) => t.text.trim()).slice(-CONTEXT_MAX_TURNS).map((t) => ({
123
125
  role: t.role,
124
126
  text: t.text.trim().length > CONTEXT_TURN_MAX_CHARS ? `${t.text.trim().slice(0, CONTEXT_TURN_MAX_CHARS)}\u2026` : t.text.trim()
125
127
  }));
128
+ if (recent.length === 0) return [];
129
+ const indexed = recent.map((turn, index) => ({ turn, index }));
130
+ const kept = /* @__PURE__ */ new Map();
126
131
  let budget = CONTEXT_MAX_CHARS;
127
- const kept = [];
128
- for (let i = recent.length - 1; i >= 0; i--) {
129
- const turn = recent[i];
130
- if (turn.text.length > budget) {
131
- if (kept.length === 0) kept.push({ role: turn.role, text: `${turn.text.slice(0, budget)}\u2026` });
132
- break;
132
+ const users = indexed.filter((x) => x.turn.role === "user");
133
+ let userBudget = Math.min(CONTEXT_USER_BUDGET, budget);
134
+ for (let i = users.length - 1; i >= 0; i--) {
135
+ const { turn, index } = users[i];
136
+ const keptUsers = users.length - i;
137
+ const mustKeep = keptUsers <= CONTEXT_MIN_USER_TURNS && ![...kept.values()].some((t) => t.role === "user");
138
+ if (turn.text.length <= userBudget) {
139
+ kept.set(index, turn);
140
+ userBudget -= turn.text.length;
141
+ budget -= turn.text.length;
142
+ } else if (mustKeep) {
143
+ const slice = userBudget > 16 ? userBudget : Math.min(16, budget);
144
+ if (slice > 0) {
145
+ kept.set(index, { role: turn.role, text: `${turn.text.slice(0, slice)}\u2026` });
146
+ userBudget -= slice;
147
+ budget -= slice;
148
+ }
133
149
  }
134
- kept.unshift(turn);
150
+ }
151
+ const assistants = indexed.filter((x) => x.turn.role === "assistant");
152
+ for (let i = assistants.length - 1; i >= 0; i--) {
153
+ const { turn, index } = assistants[i];
154
+ if (turn.text.length > budget) continue;
155
+ kept.set(index, turn);
135
156
  budget -= turn.text.length;
136
157
  }
137
- return kept;
158
+ return [...kept.entries()].sort(([a], [b]) => a - b).map(([, turn]) => turn);
138
159
  }
139
160
  function buildUserPayload(draft, language, context, previous) {
140
161
  const sections = [];
@@ -182,12 +203,26 @@ ${draft}`
182
203
  );
183
204
  return sections.join("\n\n");
184
205
  }
206
+ function isWideTokenChar(code) {
207
+ return code >= 4352 && code <= 4607 || // 谚文字母
208
+ code >= 11904 && code <= 12255 || // CJK 部首补充 / 康熙部首
209
+ code >= 12288 && code <= 12351 || // CJK 符号与标点(全角)
210
+ code >= 12352 && code <= 12543 || // 平假名 / 片假名
211
+ code >= 12592 && code <= 12687 || // 谚文兼容字母
212
+ code >= 13312 && code <= 19903 || // CJK 扩展 A
213
+ code >= 19968 && code <= 40959 || // CJK 统一表意文字
214
+ code >= 43360 && code <= 43391 || // 谚文字母扩展 A
215
+ code >= 44032 && code <= 55215 || // 谚文音节
216
+ code >= 63744 && code <= 64255 || // CJK 兼容表意文字
217
+ code >= 65280 && code <= 65376 || // 全角 ASCII 变体
218
+ code >= 65504 && code <= 65510 || // 全角符号
219
+ code >= 131072 && code <= 262143;
220
+ }
185
221
  function estimateTokens(text) {
186
222
  let cjk = 0;
187
223
  let other = 0;
188
224
  for (const ch of text) {
189
- const code = ch.codePointAt(0) ?? 0;
190
- if (code >= 13312 && code <= 19903 || code >= 19968 && code <= 40959 || code >= 63744 && code <= 64255) {
225
+ if (isWideTokenChar(ch.codePointAt(0) ?? 0)) {
191
226
  cjk += 1;
192
227
  } else {
193
228
  other += 1;
@@ -201,27 +236,110 @@ function findMarker(text, word, fromIndex = 0) {
201
236
  const match = re.exec(text);
202
237
  return match ? { index: match.index, length: match[0].length } : null;
203
238
  }
239
+ function findLastMarker(text, word, beforeIndex = text.length) {
240
+ const re = new RegExp(`<<<\\s*${word}\\s*>>>`, "g");
241
+ let last = null;
242
+ for (const match of text.matchAll(re)) {
243
+ if (match.index >= beforeIndex) break;
244
+ last = { index: match.index, length: match[0].length };
245
+ }
246
+ return last;
247
+ }
248
+ function stripMarkers(text) {
249
+ return text.replace(/<<<\s*(?:ANALYSIS|OPTIMIZED|END)\s*>>>/g, "");
250
+ }
251
+ function findNextMarker(text, fromIndex) {
252
+ const re = /<<<\s*(?:ANALYSIS|OPTIMIZED|END)\s*>>>/g;
253
+ re.lastIndex = fromIndex;
254
+ const match = re.exec(text);
255
+ return match ? { index: match.index, length: match[0].length } : null;
256
+ }
257
+ function segmentAfter(text, marker) {
258
+ const firstEnd = findMarker(text, "END");
259
+ if (firstEnd && marker.index > firstEnd.index) return "";
260
+ const start = marker.index + marker.length;
261
+ const next = findNextMarker(text, start);
262
+ let end = next ? next.index : text.length;
263
+ if (firstEnd && firstEnd.index > start && firstEnd.index < end) end = firstEnd.index;
264
+ return text.slice(start, end).trim();
265
+ }
266
+ var THINK_OPEN = "<think>";
267
+ var THINK_CLOSE = "</think>";
268
+ function stripThinkBlocks(text) {
269
+ let out = "";
270
+ let rest = text;
271
+ for (; ; ) {
272
+ const open = rest.indexOf(THINK_OPEN);
273
+ if (open === -1) return out + rest;
274
+ out += rest.slice(0, open);
275
+ const close = rest.indexOf(THINK_CLOSE, open + THINK_OPEN.length);
276
+ if (close === -1) return out;
277
+ rest = rest.slice(close + THINK_CLOSE.length);
278
+ }
279
+ }
280
+ function createThinkFilter() {
281
+ let buf = "";
282
+ let inThink = false;
283
+ const splitSafeTail = (tagLen) => {
284
+ const lastLt = buf.lastIndexOf("<");
285
+ const keepFrom = lastLt !== -1 && buf.length - lastLt <= tagLen - 1 ? lastLt : buf.length;
286
+ return [buf.slice(0, keepFrom), buf.slice(keepFrom)];
287
+ };
288
+ const push = (chunk) => {
289
+ buf += chunk;
290
+ let out = "";
291
+ for (; ; ) {
292
+ if (inThink) {
293
+ const close = buf.indexOf(THINK_CLOSE);
294
+ if (close === -1) {
295
+ const [emit, keep] = splitSafeTail(THINK_CLOSE.length);
296
+ buf = keep;
297
+ return out;
298
+ }
299
+ buf = buf.slice(close + THINK_CLOSE.length);
300
+ inThink = false;
301
+ continue;
302
+ }
303
+ const open = buf.indexOf(THINK_OPEN);
304
+ if (open === -1) {
305
+ const [emit, keep] = splitSafeTail(THINK_OPEN.length);
306
+ out += emit;
307
+ buf = keep;
308
+ return out;
309
+ }
310
+ out += buf.slice(0, open);
311
+ buf = buf.slice(open + THINK_OPEN.length);
312
+ inThink = true;
313
+ }
314
+ };
315
+ const flush = () => {
316
+ if (inThink) {
317
+ buf = "";
318
+ return "";
319
+ }
320
+ const rest = buf;
321
+ buf = "";
322
+ return rest;
323
+ };
324
+ return { push, flush };
325
+ }
204
326
  function parseOptimizerOutput(raw, mode = "full") {
205
- const text = raw.trim();
206
- const a = findMarker(text, "ANALYSIS");
207
- const o = findMarker(text, "OPTIMIZED");
327
+ const text = stripThinkBlocks(raw).trim();
328
+ const o = findLastMarker(text, "OPTIMIZED");
329
+ const a = findLastMarker(text, "ANALYSIS");
208
330
  const wellFormed = mode === "fast" ? true : Boolean(a && o);
209
331
  if (!a && !o) {
210
- return { analysis: "", optimized: text, wellFormed };
211
- }
212
- let analysis = "";
213
- let optimized = "";
214
- if (a && (!o || a.index < o.index)) {
215
- analysis = text.slice(a.index + a.length, o ? o.index : text.length).trim();
216
- }
217
- if (o) {
218
- const e = findMarker(text, "END", o.index + o.length);
219
- optimized = text.slice(o.index + o.length, e ? e.index : text.length).trim();
332
+ const body = stripMarkers(text).trim();
333
+ return { analysis: "", optimized: body, wellFormed: wellFormed && Boolean(body) };
220
334
  }
335
+ const optimized = o ? segmentAfter(text, o) : "";
336
+ const analysis = a ? segmentAfter(text, a) : "";
221
337
  return {
338
+ // 有标记但段落为空:保持为空(可能只是模型没写内容),绝不回退到含标记的原文。
222
339
  analysis,
223
- optimized: optimized || text,
224
- wellFormed
340
+ optimized,
341
+ // 优化稿为空 = 这次输出不可用,降级展示并让客户端弹格式警示。
342
+ wellFormed: wellFormed && Boolean(optimized)
225
343
  };
226
344
  }
227
345
 
@@ -229,34 +347,53 @@ function parseOptimizerOutput(raw, mode = "full") {
229
347
  var name = "dsh-prompt-optimizer";
230
348
  var inject = ["llm"];
231
349
  var Config = Schema.object({
232
- language: Schema.string().default("zh"),
233
- model: Schema.string(),
234
- fallbackModel: Schema.string(),
235
- maxTokens: Schema.number().min(1024).max(32768).default(8192),
236
- timeoutSeconds: Schema.number().min(10).max(600).default(120),
237
- mode: Schema.string().default("full"),
238
- reasoningEffort: Schema.string().default("lowest"),
239
- temperature: Schema.number().min(0).max(2).default(0.2),
240
- autoMaxTokens: Schema.boolean().default(true),
241
- includeContext: Schema.boolean().default(true)
350
+ language: Schema.string().default("zh").volatile(),
351
+ model: Schema.string().volatile(),
352
+ fallbackModel: Schema.string().volatile(),
353
+ maxTokens: Schema.number().min(1024).max(32768).default(8192).volatile(),
354
+ timeoutSeconds: Schema.number().min(10).max(600).default(120).volatile(),
355
+ mode: Schema.string().default("fast").volatile(),
356
+ reasoningEffort: Schema.string().default("lowest").volatile(),
357
+ temperature: Schema.number().min(0).max(2).default(0.2).volatile(),
358
+ autoMaxTokens: Schema.boolean().default(true).volatile(),
359
+ includeContext: Schema.boolean().default(true).volatile()
242
360
  });
361
+ function unwrapCell(value) {
362
+ return typeof value?.get === "function" ? value.get() : value;
363
+ }
364
+ function readConfig(raw) {
365
+ return {
366
+ language: unwrapCell(raw.language),
367
+ model: unwrapCell(raw.model),
368
+ fallbackModel: unwrapCell(raw.fallbackModel),
369
+ maxTokens: unwrapCell(raw.maxTokens),
370
+ timeoutSeconds: unwrapCell(raw.timeoutSeconds),
371
+ mode: unwrapCell(raw.mode),
372
+ reasoningEffort: unwrapCell(raw.reasoningEffort),
373
+ temperature: unwrapCell(raw.temperature),
374
+ autoMaxTokens: unwrapCell(raw.autoMaxTokens),
375
+ includeContext: unwrapCell(raw.includeContext)
376
+ };
377
+ }
243
378
  var NS = "prompt-optimizer";
244
379
  var ROUTE_PATH = "/dsh-prompt-optimizer/optimize";
245
380
  var TEST_ROUTE_PATH = "/dsh-prompt-optimizer/test-model";
246
381
  var MAX_BODY_BYTES = 256 * 1024;
247
- var warnedConfigValues = /* @__PURE__ */ new Set();
248
- function warnUnknownEnum(value, allowed, label) {
382
+ var MAX_CONCURRENT_OPTIMIZES = 3;
383
+ var SSE_HEARTBEAT_MS = 15e3;
384
+ var ONESHOT_SESSION_ID = "prompt-optimizer-one-shot";
385
+ function warnUnknownEnum(warned, value, allowed, label) {
249
386
  const key = `${label}=${value}`;
250
- if (!allowed.includes(value) && !warnedConfigValues.has(key)) {
251
- warnedConfigValues.add(key);
387
+ if (!allowed.includes(value) && !warned.has(key)) {
388
+ warned.add(key);
252
389
  console.warn(`[${name}] \u914D\u7F6E ${label}="${value}" \u4E0D\u662F\u6709\u6548\u503C(\u652F\u6301:${allowed.join("/")}),\u5DF2\u6309\u9ED8\u8BA4\u5904\u7406`);
253
390
  }
254
391
  }
255
- function warnUnknownEnumConfig(cfg) {
256
- if (cfg.language !== "zh" && cfg.language !== "en") warnUnknownEnum(cfg.language, ["zh", "en"], "language");
257
- if (cfg.mode !== "full" && cfg.mode !== "fast") warnUnknownEnum(cfg.mode, ["full", "fast"], "mode");
392
+ function warnUnknownEnumConfig(warned, cfg) {
393
+ if (cfg.language !== "zh" && cfg.language !== "en") warnUnknownEnum(warned, cfg.language, ["zh", "en"], "language");
394
+ if (cfg.mode !== "full" && cfg.mode !== "fast") warnUnknownEnum(warned, cfg.mode, ["full", "fast"], "mode");
258
395
  if (cfg.reasoningEffort !== "lowest" && cfg.reasoningEffort !== "session") {
259
- warnUnknownEnum(cfg.reasoningEffort, ["lowest", "session"], "reasoningEffort");
396
+ warnUnknownEnum(warned, cfg.reasoningEffort, ["lowest", "session"], "reasoningEffort");
260
397
  }
261
398
  }
262
399
  function asOptionalString(value) {
@@ -275,6 +412,7 @@ function parseContextInput(value) {
275
412
  return turns.length ? capConversationContext(turns) : void 0;
276
413
  }
277
414
  function writeJson(res, status, body) {
415
+ if (res.headersSent || res.writableEnded) return;
278
416
  const payload = JSON.stringify(body);
279
417
  res.writeHead(status, {
280
418
  "content-type": "application/json; charset=utf-8",
@@ -320,7 +458,11 @@ async function readJsonBody(req) {
320
458
  chunks.push(buf);
321
459
  }
322
460
  if (chunks.length === 0) return {};
323
- return JSON.parse(Buffer.concat(chunks).toString("utf-8"));
461
+ const parsed = JSON.parse(Buffer.concat(chunks).toString("utf-8"));
462
+ if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
463
+ throw new Error("\u8BF7\u6C42\u4F53\u5FC5\u987B\u662F JSON \u5BF9\u8C61");
464
+ }
465
+ return parsed;
324
466
  }
325
467
  async function readBodyOrReply(req, res) {
326
468
  try {
@@ -329,7 +471,7 @@ async function readBodyOrReply(req, res) {
329
471
  if (error instanceof PayloadTooLargeError) {
330
472
  writeJson(res, 413, { ok: false, error: error.message });
331
473
  } else {
332
- writeJson(res, 400, { ok: false, error: "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON" });
474
+ writeJson(res, 400, { ok: false, error: "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON \u5BF9\u8C61" });
333
475
  }
334
476
  return void 0;
335
477
  }
@@ -365,12 +507,30 @@ async function collectText(stream, onDelta) {
365
507
  const text = deltas || [...blocks.entries()].sort(([a], [b]) => a - b).map(([, t]) => t).join("");
366
508
  return { text, truncated };
367
509
  }
510
+ var EFFORT_RANK = [
511
+ { rank: 4, re: /(?:^|[^a-z])(?:x[\s_-]?high|very[\s_-]?high|maximum|max|highest)(?:$|[^a-z])|最高/i },
512
+ { rank: 3, re: /(?:^|[^a-z])high(?:$|[^a-z])|高/i },
513
+ { rank: 2, re: /(?:^|[^a-z])(?:medium|mid(?:dle)?|standard|default)(?:$|[^a-z])|中/i },
514
+ { rank: 1, re: /(?:^|[^a-z])(?:minimal|minimum|lowest|low)(?:$|[^a-z])|最少|最低|低/i },
515
+ { rank: 0, re: /(?:^|[^a-z])(?:none|off|disabled|no[\s_-]?reasoning)(?:$|[^a-z])|^(?:0)$/i }
516
+ ];
517
+ function effortRank(id, name2) {
518
+ for (const { rank, re } of EFFORT_RANK) {
519
+ if (re.test(id) || re.test(name2)) return rank;
520
+ }
521
+ return void 0;
522
+ }
368
523
  async function resolveLowestEffort(llm, provider, model) {
369
524
  try {
370
525
  const efforts = (await llm.resolveModelInfo(provider, model)).reasoning?.efforts;
371
526
  if (!efforts?.length) return void 0;
372
- const keyworded = efforts.find((e) => /none|minimal|low|低/i.test(`${e.id} ${e.name}`));
373
- return String((keyworded ?? efforts[0]).id);
527
+ let best;
528
+ for (const effort of efforts) {
529
+ const rank = effortRank(String(effort.id), String(effort.name ?? ""));
530
+ if (rank === void 0) continue;
531
+ if (!best || rank < best.rank) best = { id: String(effort.id), rank };
532
+ }
533
+ return best?.id;
374
534
  } catch {
375
535
  return void 0;
376
536
  }
@@ -402,6 +562,8 @@ async function resolveRoute(llm, pinnedModel, bodyProvider, bodyModel) {
402
562
  return provider && model ? { provider, model } : void 0;
403
563
  }
404
564
  function apply(ctx, config) {
565
+ const warnedConfigValues = /* @__PURE__ */ new Set();
566
+ let inFlightOptimizes = 0;
405
567
  const effortCache = /* @__PURE__ */ new Map();
406
568
  const resolveLowestEffortCached = async (llm, provider, model) => {
407
569
  const key = `${provider}/${model}`;
@@ -411,32 +573,35 @@ function apply(ctx, config) {
411
573
  if (effort !== void 0) effortCache.set(key, { effort, at: Date.now() });
412
574
  return effort;
413
575
  };
414
- let current = () => config;
576
+ let current = () => readConfig(config);
415
577
  ctx.inject(["settings"], (sctx) => {
416
578
  const settings = sctx.settings;
417
579
  if (!settings) return;
418
- const hooks = {
419
- setSource: (source) => {
420
- current = source;
421
- },
422
- onChange: () => {
423
- }
424
- };
580
+ if (typeof settings.configure === "function") {
581
+ ctx.effect(() => settings.configure({ auto: false }, ctx.fiber));
582
+ }
425
583
  if (typeof settings.installSection === "function") {
426
- settings.installSection(ctx, NS, Config, config, hooks);
584
+ settings.installSection(ctx, NS, Config, config, {
585
+ setSource: (source) => {
586
+ current = () => readConfig(source());
587
+ },
588
+ onChange: () => {
589
+ }
590
+ });
427
591
  return;
428
592
  }
593
+ if (typeof settings.register !== "function") return;
429
594
  const scope = settings.register(NS, Config, { base: config });
430
- hooks.setSource(() => scope.get());
431
- hooks.onChange();
432
- const disposeWatch = scope.watch(() => hooks.onChange());
595
+ current = () => readConfig(scope.get());
596
+ const disposeWatch = scope.watch(() => {
597
+ current = () => readConfig(scope.get());
598
+ });
433
599
  ctx.effect(() => () => {
434
600
  disposeWatch();
435
- hooks.setSource(() => config);
436
- hooks.onChange();
601
+ current = () => readConfig(config);
437
602
  });
438
603
  });
439
- warnUnknownEnumConfig(config);
604
+ warnUnknownEnumConfig(warnedConfigValues, current());
440
605
  let mounted = false;
441
606
  const mount = (server) => {
442
607
  if (!server || mounted) return;
@@ -444,12 +609,13 @@ function apply(ctx, config) {
444
609
  ctx.effect(() => {
445
610
  const disposeOptimize = server.register({ kind: "exact", path: ROUTE_PATH, handler });
446
611
  const disposeTest = server.register({ kind: "exact", path: TEST_ROUTE_PATH, handler: testHandler });
612
+ console.log(`[${name}] loaded, POST ${ROUTE_PATH}`);
447
613
  return () => {
614
+ mounted = false;
448
615
  disposeOptimize();
449
616
  disposeTest();
450
617
  };
451
618
  });
452
- console.log(`[${name}] loaded, POST ${ROUTE_PATH}`);
453
619
  };
454
620
  ctx.inject(["webServer"], (sctx) => mount(sctx.webServer));
455
621
  ctx.inject(["httpServer"], (sctx) => mount(sctx.httpServer));
@@ -467,6 +633,21 @@ function apply(ctx, config) {
467
633
  return;
468
634
  }
469
635
  if (!assertTrustedOrigin(req, res)) return;
636
+ if (inFlightOptimizes >= MAX_CONCURRENT_OPTIMIZES) {
637
+ writeJson(res, 429, {
638
+ ok: false,
639
+ error: `\u540C\u65F6\u8FDB\u884C\u7684\u4F18\u5316\u5DF2\u8FBE\u4E0A\u9650(${MAX_CONCURRENT_OPTIMIZES} \u4E2A),\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002`
640
+ });
641
+ return;
642
+ }
643
+ inFlightOptimizes += 1;
644
+ try {
645
+ await handleOptimize(req, res);
646
+ } finally {
647
+ inFlightOptimizes -= 1;
648
+ }
649
+ }
650
+ async function handleOptimize(req, res) {
470
651
  const abort = new AbortController();
471
652
  res.on("close", () => {
472
653
  if (!res.writableEnded) abort.abort();
@@ -475,19 +656,20 @@ function apply(ctx, config) {
475
656
  const body = await readBodyOrReply(req, res);
476
657
  if (!body) return;
477
658
  const text = asOptionalString(body.text);
659
+ const sessionId = asOptionalString(body.sessionId) ?? ONESHOT_SESSION_ID;
478
660
  if (!text) {
479
661
  writeJson(res, 400, { ok: false, error: "\u63D0\u793A\u8BCD\u5185\u5BB9\u4E3A\u7A7A" });
480
662
  return;
481
663
  }
482
664
  const cfg = current();
483
- warnUnknownEnumConfig(cfg);
665
+ warnUnknownEnumConfig(warnedConfigValues, cfg);
484
666
  const language = cfg.language === "en" ? "en" : "zh";
485
667
  const mode = cfg.mode === "fast" ? "fast" : "full";
486
668
  const route = await resolveRoute(ctx.llm, cfg.model, asOptionalString(body.provider), asOptionalString(body.model));
487
669
  if (!route) {
488
670
  writeJson(res, 409, {
489
671
  ok: false,
490
- error: "\u672A\u627E\u5230\u53EF\u7528\u6A21\u578B:\u8BF7\u5148\u5728 \u8BBE\u7F6E \u2192 \u6A21\u578B \u4E2D\u914D\u7F6E\u63D0\u4F9B\u65B9,\u6216\u5728 \u8BBE\u7F6E \u2192 \u63D2\u4EF6\u914D\u7F6E \u2192 \u63D0\u793A\u8BCD\u4F18\u5316 \u4E2D\u56FA\u5B9A\u4E00\u4E2A\u6A21\u578B"
672
+ error: "\u672A\u627E\u5230\u53EF\u7528\u6A21\u578B:\u8BF7\u5148\u5728 \u8BBE\u7F6E \u2192 \u6A21\u578B \u4E2D\u914D\u7F6E\u63D0\u4F9B\u65B9,\u6216\u5728 \u8BBE\u7F6E\u7684\u63D2\u4EF6\u9875\u300C\u63D0\u793A\u8BCD\u4F18\u5316\u300D \u4E2D\u56FA\u5B9A\u4E00\u4E2A\u6A21\u578B"
491
673
  });
492
674
  return;
493
675
  }
@@ -523,6 +705,9 @@ function apply(ctx, config) {
523
705
 
524
706
  `);
525
707
  };
708
+ const heartbeat = setInterval(() => {
709
+ if (!res.destroyed && !res.writableEnded) res.write(": ping\n\n");
710
+ }, SSE_HEARTBEAT_MS);
526
711
  const timeoutSec = cfg.timeoutSeconds ?? 120;
527
712
  let timedOut = false;
528
713
  const timer = setTimeout(() => {
@@ -545,7 +730,13 @@ function apply(ctx, config) {
545
730
  messages: [message],
546
731
  maxTokens,
547
732
  temperature: cfg.temperature ?? 0.2,
548
- signal: abort.signal
733
+ signal: abort.signal,
734
+ // 会话标注恒存在:客户端会话 id 优先(会话级计量正确归属),
735
+ // 缺席回落合成 id。opencode 等提供方要求会话头(x-opencode-session,
736
+ // 由 pi-ai 适配器按 GenerateOptions.sessionId 注入),缺失会被
737
+ // API 以「缺少请求头」拒绝;其余适配器仅作模型不可见的传输
738
+ // 元数据处理,不外发。
739
+ sessionId
549
740
  };
550
741
  let effort = sessionEffort;
551
742
  if (!preferSessionEffort) {
@@ -554,10 +745,14 @@ function apply(ctx, config) {
554
745
  if (effort) {
555
746
  options.reasoningEffort = effort;
556
747
  }
748
+ const thinkFilter = createThinkFilter();
557
749
  raw = await collectText(ctx.llm.stream(options), (delta) => {
558
750
  sentAny = true;
559
- send({ type: "delta", text: delta });
751
+ const clean = thinkFilter.push(delta);
752
+ if (clean) send({ type: "delta", text: clean });
560
753
  });
754
+ const thinkTail = thinkFilter.flush();
755
+ if (thinkTail) send({ type: "delta", text: thinkTail });
561
756
  lastError = null;
562
757
  break;
563
758
  } catch (error) {
@@ -583,7 +778,7 @@ function apply(ctx, config) {
583
778
  } else if (timedOut) {
584
779
  send({
585
780
  type: "error",
586
- error: `\u4F18\u5316\u8D85\u65F6:${timeoutSec} \u79D2\u5185\u672A\u751F\u6210\u5B8C\u6BD5\u3002\u53EF\u5728 \u8BBE\u7F6E \u2192 \u63D2\u4EF6\u914D\u7F6E \u2192 \u63D0\u793A\u8BCD\u4F18\u5316 \u4E2D\u8C03\u9AD8\u300C\u8D85\u65F6\u65F6\u95F4\u300D\u3002`
781
+ error: `\u4F18\u5316\u8D85\u65F6:${timeoutSec} \u79D2\u5185\u672A\u751F\u6210\u5B8C\u6BD5\u3002\u53EF\u5728 \u8BBE\u7F6E\u7684\u63D2\u4EF6\u9875\u300C\u63D0\u793A\u8BCD\u4F18\u5316\u300D \u4E2D\u8C03\u9AD8\u300C\u8D85\u65F6\u65F6\u95F4\u300D\u3002`
587
782
  });
588
783
  } else if (!abort.signal.aborted && lastError) {
589
784
  const message2 = lastError instanceof Error ? lastError.message : String(lastError);
@@ -592,6 +787,7 @@ function apply(ctx, config) {
592
787
  }
593
788
  } finally {
594
789
  clearTimeout(timer);
790
+ clearInterval(heartbeat);
595
791
  }
596
792
  res.end();
597
793
  } catch (error) {
@@ -599,6 +795,7 @@ function apply(ctx, config) {
599
795
  const message = error instanceof Error ? error.message : String(error);
600
796
  console.error(`[${name}] optimize failed:`, error);
601
797
  writeJson(res, 502, { ok: false, error: message });
798
+ if (!res.writableEnded) res.end();
602
799
  }
603
800
  }
604
801
  async function testHandler(req, res) {
@@ -614,7 +811,7 @@ function apply(ctx, config) {
614
811
  if (!route) {
615
812
  writeJson(res, 409, {
616
813
  ok: false,
617
- error: "\u672A\u627E\u5230\u53EF\u7528\u6A21\u578B:\u8BF7\u5148\u5728 \u8BBE\u7F6E \u2192 \u6A21\u578B \u4E2D\u914D\u7F6E\u63D0\u4F9B\u65B9,\u6216\u5728 \u8BBE\u7F6E \u2192 \u63D2\u4EF6\u914D\u7F6E \u2192 \u63D0\u793A\u8BCD\u4F18\u5316 \u4E2D\u56FA\u5B9A\u4E00\u4E2A\u6A21\u578B"
814
+ error: "\u672A\u627E\u5230\u53EF\u7528\u6A21\u578B:\u8BF7\u5148\u5728 \u8BBE\u7F6E \u2192 \u6A21\u578B \u4E2D\u914D\u7F6E\u63D0\u4F9B\u65B9,\u6216\u5728 \u8BBE\u7F6E\u7684\u63D2\u4EF6\u9875\u300C\u63D0\u793A\u8BCD\u4F18\u5316\u300D \u4E2D\u56FA\u5B9A\u4E00\u4E2A\u6A21\u578B"
618
815
  });
619
816
  return;
620
817
  }
@@ -636,7 +833,17 @@ function apply(ctx, config) {
636
833
  source: { kind: "plugin", plugin: name }
637
834
  };
638
835
  const result = await collectText(
639
- ctx.llm.stream({ provider: route.provider, model: route.model, messages: [message], maxTokens: 32, signal: abort.signal })
836
+ ctx.llm.stream({
837
+ provider: route.provider,
838
+ model: route.model,
839
+ messages: [message],
840
+ maxTokens: 32,
841
+ signal: abort.signal,
842
+ // 探活没有真实会话,标注一个固定合成 id:opencode 等提供方要求
843
+ // 会话头(x-opencode-session,适配器按 sessionId 注入),缺失会被
844
+ // API 以「缺少请求头」拒绝;固定值让探活稳定路由到同一桶。
845
+ sessionId: "prompt-optimizer-connectivity-test"
846
+ })
640
847
  );
641
848
  writeJson(res, 200, {
642
849
  ok: true,