dsh-superinput 0.7.0 → 0.12.1

package/modules/prompts.js

@@ -7,6 +7,7 @@
  * 存储 ~/.dsh/storages/dsh-superinput/prompts.json（结构 { items: [...] }）。
  */
 import Schema from '@deepseek-ai/schemastery'
+import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import { readFileSync, writeFileSync, renameSync, mkdirSync, appendFileSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
 import { homedir } from 'node:os'
@@ -18,6 +19,24 @@ const STORE_DIR = join(homedir(), '.dsh', 'storages', 'dsh-superinput')
 const STORE_PATH = join(STORE_DIR, 'prompts.json')
 const CLIENT_DIAG = join(homedir(), '.dsh', 'superinput-debug.log')
 
+/* 划选上下文：客户端把「选段 + 评论」暂存到这里，下一轮 pre-step 一次性
+ * 注入成一条 sourced UserMessage，随后立即删除（只影响紧接着的一次发送）。 */
+const CONTEXT_MAX_ITEMS = 8
+const CONTEXT_TEXT_MAX = 4000
+const CONTEXT_COMMENT_MAX = 600
+const CONTEXT_TTL_MS = 10 * 60_000
+const pendingContext = new Map()
+
+function renderSelectionContext(items) {
+  const lines = [
+    '以下是我从对话中选中的上下文，按顺序附带我的评论。回答时请优先参考这些内容，并针对评论中的问题作答。',
+  ]
+  items.forEach((item, index) => {
+    lines.push(`【选段 ${index + 1}】\n${item.text}${item.comment ? `\n我的评论：${item.comment}` : ''}`)
+  })
+  return lines.join('\n\n')
+}
+
 export const Config = Schema.object({
   enabled: Schema.boolean().default(true).description('启用提示词模板库'),
   maxItems: Schema.number().default(500).description('最多保存多少条模板（收藏不计入上限）'),
@@ -209,6 +228,36 @@ export function apply(ctx, config) {
   store.load()
   ctx.effect(() => store.dispose(), 'dsh-superinput: prompts store')
 
+  // 划选上下文注入：挂在 pre-step 最前面，先让下游（含提示词增强）处理完，
+  // 再把上下文作为一条独立的 sourced 用户消息追加到本轮送模消息末尾。
+  ctx.on('agent/pre-step', async ({ agent, step, signal }, next) => {
+    const decision = await next()
+    if (decision.kind === 'reject' || signal?.aborted) return decision
+    const rawSession = agent?.session
+    const sessionId = typeof rawSession === 'string'
+      ? rawSession
+      : rawSession?.id === undefined ? '' : String(rawSession.id)
+    const pending = sessionId ? pendingContext.get(sessionId) : undefined
+    if (step !== 1 || !pending) return decision
+    pendingContext.delete(sessionId)
+    if (pending.items.length === 0 || Date.now() - pending.at > CONTEXT_TTL_MS) return decision
+    const text = renderSelectionContext(pending.items)
+    try {
+      appendFileSync(CLIENT_DIAG, `${new Date().toISOString()} context injected session=${sessionId.slice(0, 50)} items=${pending.items.length}\n`, 'utf8')
+    } catch { /* 日志失败不影响注入 */ }
+    return {
+      ...decision,
+      messages: [...decision.messages, createUserMessage({
+        content: [{ type: 'text', text }],
+        source: {
+          kind: 'dsh-superinput-selection',
+          form: 'snapshot',
+          sections: [{ name: 'selection-context', text }],
+        },
+      })],
+    }
+  }, { prepend: true })
+
   ctx.inject(['webServer'], (webCtx) => {
     webCtx.effect(() => webCtx.webServer.register({
       kind: 'prefix',
@@ -256,6 +305,22 @@ export function apply(ctx, config) {
           send(200, { ok: true })
           return
         }
+        // 划选上下文暂存：items 为空表示清除；真正的注入在 agent/pre-step。
+        if (path === '/context' && req.method === 'POST') {
+          const body = await readBody()
+          const sessionId = String(body.sessionId ?? '').trim().slice(0, 200)
+          if (!sessionId) { send(400, { error: 'missing-session' }); return }
+          const items = Array.isArray(body.items)
+            ? body.items.slice(0, CONTEXT_MAX_ITEMS).map((item) => ({
+              text: String(item?.text ?? '').replace(/\0/g, '').trim().slice(0, CONTEXT_TEXT_MAX),
+              comment: String(item?.comment ?? '').replace(/\0/g, '').trim().slice(0, CONTEXT_COMMENT_MAX),
+            })).filter((item) => item.text.length > 0)
+            : []
+          if (items.length === 0) pendingContext.delete(sessionId)
+          else pendingContext.set(sessionId, { items, at: Date.now() })
+          send(200, { ok: true, count: items.length })
+          return
+        }
         if (path === '/list' && req.method === 'GET') {
           send(200, { items: store.list() })
           return

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-superinput",
-  "version": "0.7.0",
-  "description": "Super input box suite for the DeepSeek Harness (dsh): model & effort picker, prompt enhancement, follow-up suggestions, full cost engine (billing, backfill, price sync, forecast), voice input, prompt template manager and a settings hub — one plugin, seven input-area modules with per-module failure isolation.",
+  "version": "0.12.1",
+  "description": "Super input box suite for the DeepSeek Harness (dsh): model & effort picker, prompt enhancement, follow-up suggestions, full cost engine (billing, backfill, price sync, forecast, usage heatmap, Coding Plan quotas, bilingual UI), voice input, prompt template manager, inline selection reference chips with comments, a compaction ring and a settings hub — one plugin, eight modules with per-module failure isolation.",
   "type": "module",
   "main": "index.js",
   "exports": {
@@ -31,7 +31,6 @@
     "composer",
     "cost",
     "picker",
-    "snippets",
     "suite"
   ],
   "license": "MIT",

package/scripts/build-suite.mjs

@@ -1,23 +1,25 @@
 #!/usr/bin/env node
 /**
- * dsh-superinput 套件生成器：从五个独立插件机械搬迁模块代码。
+ * dsh-superinput 套件生成器：从 upstream/ 内的六个模块源机械搬迁模块代码。
  *
  * 服务端：**单文件内联**——宿主 interception loader 对 link 包内部的相对
- * 导入没有先例（五个旧插件都是自包含单文件；套件首版因相对导入静默不被
+ * 导入没有先例（六个旧插件都是自包含单文件；套件首版因相对导入静默不被
  * import）。六个模块各包进 IIFE（作用域隔离顶层 const），import 提升到
  * 顶部去重，modules/*.js 仅作生成中间产物保留可读源。
  * 客户端：client.js 单文件闭包（宿主不拆模块），各包 __ModuleLoader__
  * 头尾改写为 `function createX(require)` 工厂按序拼入，套件 factory 里
  * 逐模块 try/catch（一个模块失败不拖垮其他）。
  *
- * 上游插件更新后重跑本脚本即可再生成；重复执行幂等。
+ * 六个模块源原本是独立 git 仓（2026-11-07 收编进本仓 upstream/，GitHub
+ * 上游仓已归档）；改上游源码直接改 upstream/<包名>/，重跑本脚本再生成。
+ * 重复执行幂等。
  */
 import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 const root = dirname(dirname(fileURLToPath(import.meta.url))) // packages/dsh-superinput
-const pkgRoot = join(root, '..')
+const pkgRoot = join(root, 'upstream')
 
 /** key → [包目录, 客户端工厂名] */
 const MODULES = [
@@ -26,6 +28,9 @@ const MODULES = [
   ['enhancer', 'dsh-prompt-enhancer', 'createEnhancerClient'],
   ['followup', 'dsh-followup', 'createFollowupClient'],
   ['voice', 'dsh-siri-voice', 'createVoiceClient'],
+  // 0.10.0 起并入套件（此前独立插件）；apply 顺序在 enhancer 之后——
+  // pre-step 瀑布里压缩落档消息在增强之后追加，不会被二次改写。
+  ['compaction', 'dsh-compaction-control', 'createCompactionClient'],
 ]
 
 function transformServer(pkg, key) {
@@ -65,6 +70,8 @@ function inlineSource(src) {
     .replace(/^export function apply\(/m, 'function apply(')
     .replace(/^export \{ inject \}\s*$/m, '')
     .replace(/^export default \{[^\n]*\}\s*$/m, '')
+    // compaction-control 尾部的离线自测导出（CI import 用，运行时无用）
+    .replace(/^export const __internals/m, 'const __internals')
   return { imports, body: body.trim() }
 }
 
@@ -151,6 +158,7 @@ const MODULES = [
   ['followup', followupModule],
   ['voice', voiceModule],
   ['prompts', promptsModule],
+  ['compaction', compactionModule],
   ['hub', hubModule],
 ]
 
@@ -165,6 +173,7 @@ export const Config = Schema.object({
   followup: followupModule.Config,
   voice: voiceModule.Config,
   prompts: promptsModule.Config,
+  compaction: compactionModule.Config,
   hub: hubModule.Config,
 })
 
@@ -263,6 +272,7 @@ window.__ModuleLoader__.load({
       ['followup', createFollowupClient],
       ['voice', createVoiceClient],
       ['prompts', createPromptsClient],
+      ['compaction', createCompactionClient],
       ['hub', createHubClient],
     ]
     // 模块异常上报：console 不落盘，失败必须走 prompts /diag 留痕。

package/scripts/smoke.mjs

@@ -18,6 +18,7 @@ const backup = hadStore ? readFileSync(STORE) : null
 let promptsHandler = null
 let enhancerHandler = null
 const webPaths = []
+const eventHandlers = {}
 const services = {
   webServer: { register(spec) { webPaths.push(spec.path); if (spec.path.endsWith('/prompts')) promptsHandler = spec.handler; if (spec.path === '/api/prompt-enhancer') enhancerHandler = spec.handler } },
   tools: { register() {} },
@@ -37,7 +38,18 @@ const ctx = {
     for (const d of deps) if (!(d in scope)) scope[d] = services[d] ?? {}
     cb(scope)
   },
-  on() { return () => {} },
+  // cordis 瀑布语义：同名事件多个监听按注册顺序链式执行（后者拿到前者
+  // 的 next 结果）。套件合并后 pre-step 有多个监听（prompts /context 注入、
+  // compaction 落档、enhancer），单槽覆盖会让测试调到错误的那个。
+  on(name, handler) {
+    (eventHandlers[name] ??= []).push(handler)
+    return () => {
+      const list = eventHandlers[name]
+      if (!Array.isArray(list)) return
+      const index = list.indexOf(handler)
+      if (index >= 0) list.splice(index, 1)
+    }
+  },
 }
 
 const assert = (cond, label) => { if (!cond) throw new Error(label); console.log('ok:', label) }
@@ -58,10 +70,10 @@ let failed = false
 try {
   const config = {}
   // enhancer 给显式 provider/model，让 configRoute 命中、不依赖 agentDefaultModel
-  for (const key of ['cost', 'picker', 'enhancer', 'followup', 'voice', 'prompts', 'hub']) config[key] = {}
+  for (const key of ['cost', 'picker', 'enhancer', 'followup', 'voice', 'prompts', 'compaction', 'hub']) config[key] = {}
   config.enhancer = { provider: 'stub', model: 'stub-model' }
   mod.apply(ctx, config)
-  for (const path of ['/api/dsh-cost', '/api/dsh-superinput/prompts', '/api/dsh-superinput/hub', '/api/prompt-enhancer']) {
+  for (const path of ['/api/dsh-cost', '/api/dsh-superinput/prompts', '/api/dsh-superinput/hub', '/api/prompt-enhancer', '/api/dsh-compaction-control']) {
     assert(webPaths.includes(path), `module apply: ${path} registered`)
   }
   assert(!!promptsHandler, 'module apply: prompts handler captured')
@@ -107,10 +119,49 @@ try {
   assert(list2.find((i) => i.id === idB).body !== 'stale-overwrite-should-skip', 'import: stale skipped')
   assert((await prompts('POST', '/import', { items: 'not-an-array' })).status === 400, 'import: invalid payload rejected')
 
+  // 划选上下文：/context 暂存 → agent/pre-step 一次性注入
+  const ctxStore = await prompts('POST', '/context', { sessionId: 'smoke-session', items: [{ text: '选中的对话内容', comment: '帮我解释这一段' }] })
+  assert(ctxStore.status === 200 && ctxStore.out?.count === 1, 'context: stored')
+  // 套件合并后 pre-step 是瀑布链（prompts /context + compaction 落档 +
+  // enhancer……），按注册顺序链式调用，断言走到全链后的结果。
+  const preHandlers = eventHandlers['agent/pre-step'] ?? []
+  assert(Array.isArray(preHandlers) && preHandlers.length >= 2, `context: pre-step waterfall registered (${preHandlers.length} listeners)`)
+  const runPreStep = async (payload) => {
+    const run = async (index) => {
+      if (index >= preHandlers.length) return { kind: 'enter', messages: [] }
+      return preHandlers[index](payload, () => run(index + 1))
+    }
+    return run(0)
+  }
+  // followup 的 pre-step 读 payload.messages（真机宿主字段）——冒烟桩也要给
+  const prePayload = () => ({ agent: { session: 'smoke-session' }, messages: [], step: 1, signal: { aborted: false } })
+  const preOnce = await runPreStep(prePayload())
+  const injected = preOnce.messages?.map((m) => m?.content?.[0]?.text ?? '').join('\n') ?? ''
+  assert(injected.includes('选中的对话内容') && injected.includes('帮我解释这一段'), 'context: text + comment injected')
+  const preTwice = await runPreStep(prePayload())
+  const twiceText = preTwice.messages?.map((m) => m?.content?.[0]?.text ?? '').join('\n') ?? ''
+  assert(!twiceText.includes('选中的对话内容'), 'context: one-shot consumed')
+
+  // 客户端草稿桥：划选「添加到对话」/模板插入/斜杠命令都依赖它；
+  // 0.4.0 移除 snippets 时整块丢失过一次，静态断言防再犯。
+  const clientSource = readFileSync(new URL('../client.js', import.meta.url), 'utf8')
+  assert(clientSource.includes('window.__dshSuperinputSetDraft ='), 'client: draft bridge setter present')
+  assert(clientSource.includes('dsh-superinput-prompts-bridge'), 'client: draft bridge registered on input.dock')
+  assert(clientSource.includes("superinput-selection"), 'client: inline selection reference source registered')
+  assert(clientSource.includes("slash/input-insert-reference"), 'client: chip inserted through the official input event')
+  assert(clientSource.includes('conversation.user.text.node'), 'client: sent-message selection chip renderer registered')
+  assert(clientSource.includes('__dshSuperinputCommentContext'), 'client: selection comment card entry present')
+  assert(clientSource.includes('dsh-si-comment-editor'), 'client: anchored comment editor present (Trae previewCommentCard)')
+  assert(clientSource.includes('__dshSuperinputDropContext'), 'client: drag-drop insert entry present (Trae dragDropMention)')
+  assert(clientSource.includes('application/x-dsh-selection'), 'client: drag payload marker present')
+  assert(clientSource.includes('__dshSuperinputInsertQuote'), 'client: official insertQuote bridge present (引用文本)')
+  assert(clientSource.includes('[class*="U4oBDW_action"]'), 'client: official floating pill hidden (menu replaces it)')
+
   console.log('SMOKE ALL PASS')
 } catch (error) {
   failed = true
   console.log('SMOKE FAIL:', error?.message ?? error)
+  if (error?.stack) console.log(error.stack.split('\n').slice(1, 6).join('\n'))
 } finally {
   try {
     if (backup) writeFileSync(STORE, backup)