@whaletalk/dsh-codex-collab 0.1.0 → 0.1.2

package/harness/session-target.mjs

@@ -0,0 +1,208 @@
+/**
+ * 会话目标的纯决策层。
+ *
+ * 这里不 import 任何 DSH 模块、不碰 IO，只做判定与文本提取，因此可以在
+ * node:test 里直接测。dsh-bridge.mjs 只负责把这里的结论接到真实服务上。
+ *
+ * 设计要点（对应"找到原对话"与"接通原对话"是两件事）：
+ *  - 目标显式：worker（新建，现有行为）与 session（接已有会话）是两个判别分支；
+ *  - 无歧义才动手：查询命中 0 条 / 多条都不猜，返回稳定 reason 让调用方决定；
+ *  - session 目标绝不静默降级为新建；
+ *  - 所有失败都带稳定 reason，调用方不用解析中文文案。
+ */
+
+/** 全部稳定失败码。UI/CLI/MCP 都按这些码分支，不解析文案。 */
+export const REASONS = {
+  INVALID_TARGET: 'invalid-target',
+  CONTROLLER_UNAVAILABLE: 'session-controller-unavailable',
+  QUERY_EMPTY: 'session-query-empty',
+  AMBIGUOUS: 'session-ambiguous',
+  NOT_FOUND: 'session-not-found',
+  BUSY: 'session-busy',
+  WRITER_HELD: 'session-writer-held',
+  ARCHIVED: 'session-archived',
+  NOT_ACCEPTED: 'session-not-accepted',
+  TIMEOUT: 'session-timeout',
+  CANCEL_REFUSED: 'session-cancel-refused',
+  BAD_REQUEST: 'session-bad-request',
+  GATEWAY_INTERNAL: 'session-gateway-internal',
+  DISPATCH_FAILED: 'session-dispatch-failed',
+}
+
+/** 候选列表回传给调用方时的上限，避免把整个会话库倒出去。 */
+export const MAX_CANDIDATES = 10
+
+const nonEmpty = (v) => typeof v === 'string' && v.trim() !== ''
+
+/** 把文本块树拍平成纯文本（bridge 的既有语义，抽出来以便复用与单测）。 */
+export const textOfBlocks = (blocks) => {
+  if (blocks === undefined || blocks === null) return ''
+  let out = ''
+  const list = Array.isArray(blocks) ? blocks : [blocks]
+  for (const b of list) {
+    if (b === undefined || b === null || typeof b !== 'object') continue
+    if (b.type === 'text' && typeof b.text === 'string') out += b.text
+    if (Array.isArray(b.content)) out += textOfBlocks(b.content)
+  }
+  return out
+}
+
+/** 从一条会话事件里取助手文本；非助手消息返回空串。 */
+export const assistantTextOf = (event) => {
+  if (event === undefined || event === null || event.type !== 'assistant/message') return ''
+  const data = event.data
+  const msg = data && data.message !== undefined ? data.message : data
+  const content = msg && msg.content !== undefined ? msg.content : data && data.content
+  return textOfBlocks(content)
+}
+
+/** 某会话的基线：事件条数 + 助手文本总长。派发前取一次，用来切分"这一轮的输出"。 */
+export const baselineOf = (events) => {
+  const list = Array.isArray(events) ? events : []
+  let textLen = 0
+  for (const e of list) textLen += assistantTextOf(e).length
+  return { count: list.length, textLen }
+}
+
+/**
+ * 取出基线之后新增的助手文本。
+ * 返回新的基线，调用方直接替换即可（与 bridge 里 lastSeen/seenCount 的用法一致）。
+ */
+export const extractNewAssistantText = (events, baseline) => {
+  const list = Array.isArray(events) ? events : []
+  const base = baseline === undefined || baseline === null ? { count: 0, textLen: 0 } : baseline
+  let text = ''
+  for (const e of list) text += assistantTextOf(e)
+  const fresh = text.length > base.textLen ? text.slice(base.textLen) : ''
+  return { text: fresh, total: text, baseline: { count: list.length, textLen: text.length } }
+}
+
+/**
+ * 判定一次派发的目标。
+ *
+ * 接受两种书写：显式 `target` 对象（HTTP/原生工具），或扁平的 `sessionId`/`sessionQuery`
+ * 参数（MCP 工具更好用）。两者同时给出且互相矛盾时按 `invalid-target` 拒绝，绝不猜。
+ *
+ * @returns {{ok:true, target:object, deliver:'queue'|'steer', notes:string[]}}
+ *        | {{ok:false, reason:string, message:string}}
+ */
+export const classifyTarget = (input) => {
+  const raw = input === undefined || input === null ? {} : input
+  const notes = []
+  const flatSessionId = nonEmpty(raw.sessionId) ? raw.sessionId.trim() : undefined
+  const flatQuery = nonEmpty(raw.sessionQuery) ? raw.sessionQuery.trim() : undefined
+  const t = raw.target
+
+  // ---- 显式 target 对象 ----
+  if (t !== undefined && t !== null) {
+    if (typeof t !== 'object' || Array.isArray(t)) {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: 'target must be an object' }
+    }
+    const kind = t.kind
+    if (kind === 'worker') {
+      if (nonEmpty(t.sessionId) || nonEmpty(t.query)) {
+        return { ok: false, reason: REASONS.INVALID_TARGET, message: 'worker target must not carry session fields' }
+      }
+      return { ok: true, target: { kind: 'worker', cwd: t.cwd, lane: t.lane }, deliver: 'queue', notes }
+    }
+    if (kind !== 'session') {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: 'target.kind must be worker or session' }
+    }
+    const id = nonEmpty(t.sessionId) ? t.sessionId.trim() : undefined
+    const query = nonEmpty(t.query) ? t.query.trim() : undefined
+    if (id !== undefined && query !== undefined) {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: 'session target takes sessionId or query, not both' }
+    }
+    if (id === undefined && query === undefined) {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: 'session target needs sessionId or query' }
+    }
+    // session 语义自带工作目录与模型：混用会让人以为还能控制它们。
+    for (const [field, value] of [['cwd', raw.cwd], ['lane', raw.lane], ['model', raw.model]]) {
+      if (nonEmpty(value)) {
+        return { ok: false, reason: REASONS.INVALID_TARGET, message: `${field} is not accepted with a session target` }
+      }
+    }
+    if (raw.commit === true) {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: 'commit is not accepted with a session target' }
+    }
+    const deliver = raw.deliver === undefined ? 'queue' : raw.deliver
+    if (deliver !== 'queue' && deliver !== 'steer') {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: "deliver must be 'queue' or 'steer'" }
+    }
+    if (nonEmpty(raw.history) || (Array.isArray(raw.history) && raw.history.length > 0)) {
+      notes.push('history ignored for session targets')
+    }
+    return { ok: true, target: { kind: 'session', sessionId: id, query }, deliver, notes }
+  }
+
+  // ---- 扁平写法（MCP 工具的 sessionId/sessionQuery）----
+  if (flatSessionId !== undefined || flatQuery !== undefined) {
+    if (flatSessionId !== undefined && flatQuery !== undefined) {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: 'pass sessionId or sessionQuery, not both' }
+    }
+    if (nonEmpty(raw.cwd) || nonEmpty(raw.lane)) {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: 'cwd/lane are not accepted with a session target' }
+    }
+    const deliver = raw.deliver === undefined ? 'queue' : raw.deliver
+    if (deliver !== 'queue' && deliver !== 'steer') {
+      return { ok: false, reason: REASONS.INVALID_TARGET, message: "deliver must be 'queue' or 'steer'" }
+    }
+    if (Array.isArray(raw.history) && raw.history.length > 0) notes.push('history ignored for session targets')
+    return { ok: true, target: { kind: 'session', sessionId: flatSessionId, query: flatQuery }, deliver, notes }
+  }
+
+  // ---- 默认：worker（与 0.1.1 完全一致）----
+  return { ok: true, target: { kind: 'worker', cwd: raw.cwd, lane: raw.lane }, deliver: 'queue', notes }
+}
+
+/**
+ * 从搜索结果里挑出唯一目标。0 条与多条都不猜：多条时把候选回传，由调用方指定 id。
+ * 显式 sessionId 优先，完全不查注册表。
+ */
+export const selectSession = (hits, target) => {
+  const t = target === undefined || target === null ? {} : target
+  if (nonEmpty(t.sessionId)) {
+    return { ok: true, sessionId: t.sessionId.trim(), snippet: undefined, candidates: [] }
+  }
+  const list = Array.isArray(hits) ? hits.filter((h) => h !== null && typeof h === 'object' && nonEmpty(h.sessionId)) : []
+  const candidates = list.slice(0, MAX_CANDIDATES).map((h) => ({ sessionId: h.sessionId, snippet: typeof h.snippet === 'string' ? h.snippet.slice(0, 200) : '' }))
+  if (list.length === 0) {
+    return { ok: false, reason: REASONS.QUERY_EMPTY, message: `no session matched ${JSON.stringify(t.query)}`, candidates: [] }
+  }
+  if (list.length > 1) {
+    return { ok: false, reason: REASONS.AMBIGUOUS, message: `${list.length} sessions matched ${JSON.stringify(t.query)}; pass sessionId`, candidates }
+  }
+  return { ok: true, sessionId: list[0].sessionId, snippet: candidates[0].snippet, candidates }
+}
+
+/** 把 sessionController 抛出的 RemoteError 映射成稳定 reason。 */
+export const mapControllerError = (error) => {
+  const code = (error !== null && typeof error === 'object' && typeof error.code === 'string' ? error.code : '')
+    || (error !== null && typeof error === 'object' && error.cause !== null && typeof error.cause === 'object' && typeof error.cause.code === 'string' ? error.cause.code : '')
+  switch (code) {
+    case 'session/not-found': return REASONS.NOT_FOUND
+    case 'session/agent-busy': return REASONS.BUSY
+    case 'session/writer-held': return REASONS.WRITER_HELD
+    case 'session/invalid-time-zone': return REASONS.INVALID_TARGET
+    case 'gateway/bad-request': return REASONS.BAD_REQUEST
+    case 'gateway/internal': return REASONS.GATEWAY_INTERNAL
+    default: return REASONS.DISPATCH_FAILED
+  }
+}
+
+/** 任务在 HTTP 行上的回显：调用方一眼能看出这次是"新建"还是"接进哪个会话"。 */
+export const taskResponse = (task) => {
+  const out = { taskId: task.taskId, status: task.status, kind: task.kind }
+  const target = task.target !== undefined && task.target !== null
+    ? task.target
+    // 兼容 0.1.1 之前落下的记录（如 review 任务）：没有 target 字段时按 worker 回显。
+    : { kind: 'worker', cwd: task.cwd, lane: task.lane }
+  if (target.kind === 'session') {
+    out.target = { kind: 'session', sessionId: target.sessionId, deliver: task.deliver }
+    if (target.snippet !== undefined) out.target.snippet = target.snippet
+  } else {
+    out.target = { kind: 'worker', cwd: target.cwd, lane: target.lane }
+  }
+  if (Array.isArray(task.notes) && task.notes.length > 0) out.notes = task.notes
+  return out
+}

package/mcp/dsh-mcp.mjs

@@ -6,7 +6,7 @@
 //      客户端（Secure MCP Tunnel / cloudflared）桥接给 ChatGPT 等远程产品。
 const GATEWAY = process.env.DSH_BRIDGE_URL || 'http://127.0.0.1:3080'
 const SERVER_NAME = 'dsh-bridge'
-const SERVER_VERSION = '0.2.0'
+const SERVER_VERSION = '0.1.2'
 const PROTOCOL_VERSION = '2024-11-05'
 
 const log = (...args) => console.error('[dsh-mcp]', ...args)
@@ -15,23 +15,43 @@ const tools = [
   {
     name: 'dsh_task',
     description:
-      '把编码任务交给本机 DeepSeek Harness 的编码子代理执行（DeepSeek 写代码，ChatGPT/Codex 验收）。' +
+      '把编码任务交给本机 DeepSeek Harness 执行（DeepSeek 写代码，ChatGPT/Codex 验收）。两种目标：默认新建编码子代理在 cwd 里干活；' +
+      '给出 sessionId 或 sessionQuery 时改为**投递进那一条已有会话**（保留它自己的上下文，不新建会话/工作区）。' +
       '参数: instruction(必填,完整中文指令:目标/产出目录/验收标准/约束), cwd(工作目录,默认 D:\\Harness,通常传当前项目目录), ' +
       'lane(并行通道名,默认 main), model(fast=deepseek-v4-flash 快而省 / pro=deepseek-v4-pro 质量优先), ' +
+      'sessionId(已有会话 id), sessionQuery(按标题/内容搜已有会话,需唯一命中,否则返回候选), deliver(queue=排队(默认) / steer=插入当前回合), ' +
       'wait(默认 true,阻塞至任务完成并返回 DeepSeek 汇报), timeoutSec(默认 600,最长 900)。',
     inputSchema: {
       type: 'object',
       properties: {
         instruction: { type: 'string', description: '完整中文编码指令（目标、产出目录、验收标准、约束）。' },
-        cwd: { type: 'string', description: '工作目录（绝对路径）。默认 D:\\Harness。' },
+        cwd: { type: 'string', description: '工作目录（绝对路径）。默认 D:\\Harness。与 sessionId/sessionQuery 互斥。' },
         lane: { type: 'string', description: '并行通道名（默认 main）。' },
         model: { type: 'string', enum: ['fast', 'pro'], description: '模型别名：fast=deepseek-v4-flash，pro=deepseek-v4-pro。' },
+        sessionId: { type: 'string', description: '已有会话 id：把指令投递进这条会话，而不是新建子代理。' },
+        sessionQuery: { type: 'string', description: '按标题或内容搜索已有会话；唯一命中才派发，多条会返回 candidates 让你改用 sessionId。' },
+        deliver: { type: 'string', enum: ['queue', 'steer'], description: '投递方式：queue 排队（默认），steer 插入当前回合。' },
         wait: { type: 'boolean', description: '默认 true：阻塞直到任务完成并返回汇报。' },
         timeoutSec: { type: 'number', description: '最长等待秒数（默认 600，最大 900）。' },
       },
       required: ['instruction'],
     },
   },
+  {
+    name: 'dsh_sessions',
+    description:
+      '只读查找本机 DSH 的已有会话（不创建、不投递）。用 sessionQuery 按标题/内容搜，或用 sessionId 直接解析某一条；' +
+      '拿到 sessionId 后交给 dsh_task 即可把任务投递进那条会话。参数: query, sessionId, limit(默认 10), inspect(默认 false,为 true 时探测前 5 条能否接)。',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        query: { type: 'string', description: '按标题/内容搜索（与 sessionId 二选一）。' },
+        sessionId: { type: 'string', description: '直接解析某条会话（与 query 二选一）。' },
+        limit: { type: 'number', description: '最多返回条数（默认 10，最大 50）。' },
+        inspect: { type: 'boolean', description: '为 true 时对前 5 条探测 agentAvailable / problem（默认 false）。' },
+      },
+    },
+  },
   {
     name: 'dsh_task_status',
     description: '查询 DeepSeek 协作任务的当前状态与结果。参数: taskId(必填)。',
@@ -43,10 +63,13 @@ const tools = [
   },
   {
     name: 'dsh_task_cancel',
-    description: '取消一个运行中的 DeepSeek 协作任务。参数: taskId(必填)。',
+    description: '取消一个运行中的 DeepSeek 协作任务。参数: taskId(必填), force(session 目标的任务默认拒绝取消,因为它会打断用户自己的回合;确认要打断时传 true)。',
     inputSchema: {
       type: 'object',
-      properties: { taskId: { type: 'string', description: '任务 ID。' } },
+      properties: {
+        taskId: { type: 'string', description: '任务 ID。' },
+        force: { type: 'boolean', description: '仅对投递进已有会话的任务有意义：true 才真正打断该会话。' },
+      },
       required: ['taskId'],
     },
   },
@@ -112,18 +135,36 @@ async function handleToolCall(name, args) {
       cwd: args.cwd,
       lane: args.lane,
       model: args.model,
+      sessionId: args.sessionId,
+      sessionQuery: args.sessionQuery,
+      deliver: args.deliver,
     })
+    // 4xx 拒绝（缺目标 / 会话不存在 / 搜索结果不唯一 / 被写锁占用）不带 taskId，绝不静默新建。
+    if (task.taskId === undefined) return { ok: false, phase: 'rejected', ...task }
     if (task.status === 'error') return { ok: false, ...task }
     if (args.wait === false) return { ok: true, phase: 'submitted', ...task }
     const done = await waitTask(task.taskId, args.timeoutSec || 600)
     return { ok: done.status === 'done', phase: 'finished', ...done }
   }
+  if (name === 'dsh_sessions') {
+    if (args.query === undefined && args.sessionId === undefined) {
+      return { ok: false, error: 'query or sessionId is required' }
+    }
+    const found = await callGateway('/api/dsh-bridge/sessions', {
+      query: args.query,
+      sessionId: args.sessionId,
+      limit: args.limit,
+      inspect: args.inspect,
+    })
+    if (Array.isArray(found.items)) return { ok: true, ...found }
+    return { ok: false, ...found }
+  }
   if (name === 'dsh_task_status') {
     const res = await fetch(GATEWAY + '/api/dsh-bridge/status?taskId=' + encodeURIComponent(args.taskId))
     return res.json()
   }
   if (name === 'dsh_task_cancel') {
-    return callGateway('/api/dsh-bridge/cancel', { taskId: args.taskId })
+    return callGateway('/api/dsh-bridge/cancel', { taskId: args.taskId, force: args.force === true })
   }
   if (name === 'dsh_review') {
     const task = await callGateway('/api/dsh-bridge/review', { cwd: args.cwd, diff: args.diff, focus: args.focus })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whaletalk/dsh-codex-collab",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Codex × DeepSeek Harness 双向编码协作：Codex 主导派活与验收，DeepSeek Harness 编码子代理在共享工作目录执行并回传，独立评审子代理实际跑通构建/测试后出具报告。提供 DSH 宿主网关插件、零依赖 MCP 服务器与 Codex 技能三件套。",
   "license": "MIT",
   "type": "module",