agentworkshop 0.7.44 → 0.7.46

package/server/services/workshop/agents/opencode-agent/server.ts

@@ -0,0 +1,244 @@
+/**
+ * OpenCodeAgentImplServer —— opencode 服务进程与 HTTP 客户端
+ * (拆分层,承 OpenCodeAgentImplHitl;方法体与原文件逐行一致)
+ */
+import { OpenCodeAgentImplHitl } from './hitl'
+import type { AgentRunContext } from '../agent-interface'
+import { DEFAULT_PERMISSION, freePort, log, sleep } from './helpers'
+import { bindHarnessProcess, killHarnessProcess, markHarnessProcessExit, registerHarnessProcess } from '../harness-process'
+import { harnessSettings } from '../../settings'
+import { randomUUID } from 'node:crypto'
+import { resolveBridgePath, resolvePlatformBaseUrl } from '../harness-env'
+import { spawnLineProcess } from '../adapters/line-spawn'
+
+export abstract class OpenCodeAgentImplServer extends OpenCodeAgentImplHitl {
+  protected async ensureServer(ctx: AgentRunContext): Promise<void> {
+    if (!this.workspace) this.workspace = ctx.workspace
+    if (!this.agentInfo) {
+      this.channelId = ctx.channelId
+      this.agentRole = ctx.role
+      this.refreshIdentity()
+    }
+    if (this.sessionId && this.child && !this.exited) return
+    this.serverStarting ??= this.startServer().finally(() => {
+      this.serverStarting = null
+    })
+    await this.serverStarting
+  }
+
+  protected async startServer(): Promise<void> {
+    const command = this.config.command ?? harnessSettings().opencode_command
+    const port = await freePort()
+    const password = randomUUID()
+    const cwd = this.config.cwd ?? process.cwd()
+    this.exited = false
+    const child = spawnLineProcess(command, ['serve', '--port', String(port), '--hostname', '127.0.0.1'], {
+      cwd,
+      env: {
+        OPENCODE_SERVER_PASSWORD: password,
+        ...(this.config.dataDir ? { XDG_DATA_HOME: this.config.dataDir } : {}),
+        ...(this.config.configDir ? { XDG_CONFIG_HOME: this.config.configDir } : {}),
+      },
+    })
+    this.child = child
+    this.baseUrl = `http://127.0.0.1:${port}`
+    this.basicAuth = `Basic ${Buffer.from(`opencode:${password}`).toString('base64')}`
+    child.stderr?.setEncoding('utf-8')
+    child.stderr?.on('data', (d: string) => {
+      this.stderrTail = (this.stderrTail + d).slice(-8000)
+    })
+    const pid = child.pid
+    if (pid) {
+      registerHarnessProcess(pid, { harness: 'opencode', command, args: ['serve', '--port', String(port)] })
+      bindHarnessProcess(pid, { agentId: this.selfAgentId, channelId: this.channelId, name: this.agentName, role: this.agentRole })
+    }
+    child.on('exit', code => this.handleServerExit(code))
+
+    // 健康探测(serve 冷启动含 provider registry,预算 60s;/global/health 需 Basic 认证)
+    const deadline = Date.now() + 60_000
+    let healthy = false
+    while (Date.now() < deadline) {
+      if (this.exited) {
+        throw new Error(`opencode serve 启动失败(进程退出)${this.stderrTail ? `\nstderr: ${this.stderrTail.slice(-400)}` : ''}`)
+      }
+      try {
+        const res = await fetch(`${this.baseUrl}/global/health`, {
+          headers: { authorization: this.basicAuth },
+          signal: AbortSignal.timeout(2000),
+        })
+        if (res.ok) {
+          healthy = true
+          break
+        }
+      }
+      catch { /* 未就绪,重试 */ }
+      await new Promise(r => setTimeout(r, 500))
+    }
+    if (!healthy) throw new Error(`opencode serve 健康探测超时(60s)${this.stderrTail ? `\nstderr: ${this.stderrTail.slice(-400)}` : ''}`)
+
+    // 注册 MCP 桥(全量 host tools 注入;幂等;command 为 [可执行, 参数...] 数组形态)
+    try {
+      await this.api('POST', '/mcp', {
+        name: 'aw-host-tools',
+        config: {
+          type: 'local',
+          command: [process.execPath, resolveBridgePath(this.config.mcpBridgePath)],
+          environment: {
+            AW_BASE_URL: resolvePlatformBaseUrl(this.config.baseUrl),
+            AW_AGENT_ID: this.selfAgentId,
+            AW_AGENT_TOKEN: this.config.token ?? '',
+            AW_MCP_TOOL_TIMEOUT_MS: String(200_000),
+          },
+        },
+      })
+    }
+    catch (err) {
+      log.warn(`[OpenCodeAgent:${this.selfAgentId}] MCP 桥注册失败(host tools 不可用):`, err instanceof Error ? err.message : err)
+    }
+
+    // 建会话(权限策略缺省全 ask;部分版本不认 permission/model 字段时降级重试;
+    // model 按回合在 prompt_async 里传 —— session 创建面不接受它)
+    const body: Record<string, unknown> = {
+      title: `${this.agentName}@${this.channelId || 'channel'}`,
+    }
+    const createWith = async (extra: Record<string, unknown> | undefined): Promise<Record<string, unknown>> =>
+      this.api('POST', '/session', { ...body, ...(extra ?? {}) })
+    // 历史实现写作 `await (cond) ? a : b`:await 只作用于条件,整个三元表达式的结果是**未 await** 的
+    // Promise,故 created?.id 恒为 undefined → sessionId 恒为 String(undefined ?? '') === '' →
+    // 必然落到下面的 2.5s 重试循环(真正被使用的会话来自重试那次 createWith(undefined))。
+    // 此处逐字保留该运行时语义:同样的 await 让出一次微任务、同样的请求照发、首次结果同样丢弃。
+    // 直白的修法是给整个三元表达式加括号 await(会用上带 permission 的首次会话、省掉 2.5s 重试),
+    // 但那会改变 opencode 会话的权限策略与启动时序,故本次不改 —— 见报告"未修的缺陷"一节。
+    const firstAttempt = await (this.config.permission ?? DEFAULT_PERMISSION)
+    void (firstAttempt
+      ? createWith({ permission: this.config.permission ?? DEFAULT_PERMISSION }).catch(() => createWith(undefined))
+      : createWith(undefined))
+    this.sessionId = ''
+    if (!this.sessionId) {
+      // 瞬态失败(实例刚起/内部分配竞态/权限规则不兼容)→ 无附加字段重试,最多 3 次
+      for (let i = 0; i < 3 && !this.sessionId; i++) {
+        await sleep(2500)
+        const retry = await createWith(undefined).catch(() => null)
+        this.sessionId = String(retry?.id ?? '')
+      }
+    }
+    if (!this.sessionId) {
+      // 会话建不出来(版本/参数不兼容):回收 serve 子进程与句柄后抛错,防泄漏
+      const detail = this.stderrTail ? ` stderr: ${this.stderrTail.slice(-300)}` : ''
+      killHarnessProcess(this.child?.pid ?? -1)
+      this.child = null
+      this.exited = true
+      throw new Error(`opencode 会话创建失败(无 session id)${detail}`)
+    }
+
+    // 订阅全局事件流
+    this.openEventStream()
+  }
+
+  protected modelRef(): Record<string, string> | undefined {
+    const model = this.config.model
+    if (!model) return undefined
+    if (model.includes('/')) {
+      const [providerID, modelID] = model.split('/', 2)
+      return { providerID: providerID ?? '', modelID: modelID ?? '' }
+    }
+    return { providerID: 'opencode', modelID: model }
+  }
+
+  protected handleServerExit(code: number | null): void {
+    if (this.exited) return
+    this.exited = true
+    this.sseAbort?.abort()
+    const pid = this.child?.pid
+    if (pid) markHarnessProcessExit(pid, code)
+    // 在途回合经引擎错误归位:下一回合 ensureServer 重生
+    log.warn(`[OpenCodeAgent:${this.selfAgentId}] opencode serve 退出(code=${code});下回合自动重生`)
+  }
+
+  /** 全局 SSE 订阅(断线重连;帧解析 data: 行) */
+  protected openEventStream(): void {
+    this.sseAbort?.abort()
+    const ctrl = new AbortController()
+    this.sseAbort = ctrl
+    const connect = async (): Promise<void> => {
+      while (!ctrl.signal.aborted && !this.exited) {
+        try {
+          const res = await fetch(`${this.baseUrl}/event`, {
+            headers: { authorization: this.basicAuth, accept: 'text/event-stream' },
+            signal: ctrl.signal,
+          })
+          if (!res.ok || !res.body) throw new Error(`SSE HTTP ${res.status}`)
+          const reader = res.body.getReader()
+          const decoder = new TextDecoder()
+          let buf = ''
+          for (;;) {
+            const { done, value } = await reader.read()
+            if (done) break
+            buf += decoder.decode(value, { stream: true })
+            const chunks = buf.split('\n\n')
+            buf = chunks.pop() ?? ''
+            for (const chunk of chunks) {
+              for (const line of chunk.split('\n')) {
+                if (!line.startsWith('data:')) continue
+                const payload = line.slice(5).trim()
+                if (!payload) continue
+                try {
+                  this.dispatchEngineEvent(JSON.parse(payload))
+                }
+                catch { /* 非 JSON data 行忽略 */ }
+              }
+            }
+          }
+        }
+        catch (err) {
+          if (ctrl.signal.aborted || this.exited) return
+          log.warn(`[OpenCodeAgent:${this.selfAgentId}] SSE 断开(1s 后重连):`, err instanceof Error ? err.message : err)
+          await new Promise(r => setTimeout(r, 1000))
+        }
+      }
+    }
+    void connect()
+  }
+
+  /** SSE 事件缓冲(回合未激活时事件即到即弃,激活后由 mapEngineEvent 消费) */
+  protected engineListeners = new Set<(ev: Record<string, unknown>) => void>()
+
+  protected dispatchEngineEvent(ev: Record<string, unknown>): void {
+    for (const fn of this.engineListeners) fn(ev)
+  }
+
+  protected onEngineEvent(fn: (ev: Record<string, unknown>) => void): () => void {
+    this.engineListeners.add(fn)
+    return () => this.engineListeners.delete(fn)
+  }
+
+  protected async api(method: string, path: string, body?: unknown): Promise<Record<string, unknown>> {
+    const res = await fetch(`${this.baseUrl}${path}`, {
+      method,
+      headers: { authorization: this.basicAuth, ...(body !== undefined ? { 'content-type': 'application/json' } : {}) },
+      ...(body !== undefined ? { body: JSON.stringify(body) } : {}),
+      signal: AbortSignal.timeout(60_000),
+    })
+    if (res.status === 204) return {}
+    const text = await res.text()
+    let json: Record<string, unknown> = {}
+    try {
+      json = text ? JSON.parse(text) as Record<string, unknown> : {}
+    }
+    catch { /* 非 JSON 响应体 */ }
+    if (!res.ok) {
+      throw new Error(`opencode API ${method} ${path} → HTTP ${res.status}: ${String((json as { message?: string }).message ?? text.slice(0, 200))}`)
+    }
+    return json
+  }
+
+  protected async promptAsync(text: string): Promise<void> {
+    if (!this.sessionId) throw new Error('会话未就绪')
+    await this.api('POST', `/session/${this.sessionId}/prompt_async`, {
+      parts: [{ type: 'text', text }],
+      ...(this.config.agent ? { agent: this.config.agent } : {}),
+      ...(this.config.model ? { model: this.modelRef() } : {}),
+      ...(this.config.variant ? { variant: this.config.variant } : (this.config.effort ? { variant: this.config.effort } : {})),
+    })
+  }
+}

package/server/services/workshop/agents/opencode-agent/turn.ts

@@ -0,0 +1,278 @@
+/**
+ * OpenCodeAgentImplTurn —— 回合执行(prompt → SSE → AgentEvent)
+ * (拆分层,承 OpenCodeAgentImplEngineAgnostic;方法体与原文件逐行一致)
+ */
+import { OpenCodeAgentImplEngineAgnostic } from './engine-agnostic'
+import type { AgentEvent } from '../agent-interface'
+import { log } from './helpers'
+import { randomUUID } from 'node:crypto'
+import { toolArgsPreview } from '../prompt-builder'
+
+export abstract class OpenCodeAgentImplTurn extends OpenCodeAgentImplEngineAgnostic {
+  protected runTurn(
+    prompt: string,
+    taskId: string | undefined,
+    opts: { timeoutMs: number, signal?: AbortSignal, beforeStart?: () => void, onDone?: () => void },
+  ): AsyncGenerator<AgentEvent, void, unknown> {
+    return this._runTurn(prompt, taskId, opts)
+  }
+
+  protected async* _runTurn(
+    prompt: string,
+    taskId: string | undefined,
+    opts: { timeoutMs: number, signal?: AbortSignal, beforeStart?: () => void, onDone?: () => void },
+  ): AsyncGenerator<AgentEvent, void, unknown> {
+    if (!this.sessionId) {
+      yield { kind: 'error', error: { code: 'OPENCODE_NOT_READY', message: 'opencode 会话未就绪' } }
+      return
+    }
+    opts.beforeStart?.()
+    const queue: AgentEvent[] = []
+    let isDone = false
+    let resolveWait: (() => void) | null = null
+    let lastActivity = Date.now()
+    this.turnActive = true
+    this.aborted = false
+    this.partTexts = new Map()
+    this.partOrder = []
+
+    const enqueue = (e: AgentEvent): void => {
+      // done 事件前先收口 artifact(助手正文聚合),保证事件序 artifact → done
+      if (e.kind === 'done' && !isDone) {
+        const text = this.partOrder.map(id => this.partTexts.get(id) ?? '').join('').trim()
+        if (text) {
+          queue.push({
+            kind: 'artifact',
+            artifact: { artifactId: randomUUID(), name: 'output', parts: [{ text }] },
+            lastChunk: true,
+            totalChunks: 1,
+          })
+        }
+        this.turnActive = false
+        opts.onDone?.()
+      }
+      if (e.kind === 'done' || e.kind === 'error') {
+        isDone = true
+        this.turnActive = false
+      }
+      queue.push(e)
+      lastActivity = Date.now()
+      resolveWait?.()
+      resolveWait = null
+    }
+
+    // 事件订阅(SSE → 队列)
+    const unsub = this.onEngineEvent((ev) => {
+      for (const mapped of this.mapEngineEvent(ev, taskId)) enqueue(mapped)
+    })
+
+    // 停滞看门狗
+    let stallTimer: ReturnType<typeof setTimeout> | null = null
+
+    const finishTurn = (): void => {
+      if (isDone) return
+      const text = this.partOrder.map(id => this.partTexts.get(id) ?? '').join('').trim()
+      if (text) {
+        enqueue({
+          kind: 'artifact',
+          artifact: { artifactId: randomUUID(), name: 'output', parts: [{ text }] },
+          lastChunk: true,
+          totalChunks: 1,
+        })
+      }
+      enqueue({ kind: 'done', final: taskId ? { taskId } : undefined })
+      this.turnActive = false
+      opts.onDone?.()
+    }
+
+    const onAbort = (): void => {
+      log.warn(`[OpenCodeAgent:${this.selfAgentId}] run 被 abort → POST abort,taskId=${taskId ?? '-'}`)
+      this.aborted = true
+      void this.api('POST', `/session/${this.sessionId}/abort`, {}).catch(() => {})
+      // 引擎将回 session.idle → finishTurn;兜底 5s 后强制收口
+      setTimeout(() => finishTurn(), 5000)
+    }
+    if (opts.signal?.aborted) onAbort()
+    else opts.signal?.addEventListener('abort', onAbort, { once: true })
+
+    // 投递 prompt
+    try {
+      await this.promptAsync(prompt)
+      enqueue({ kind: 'status', status: { state: 'WORKING', timestamp: new Date().toISOString() } })
+    }
+    catch (err) {
+      unsub()
+      opts.signal?.removeEventListener('abort', onAbort)
+      this.turnActive = false
+      yield {
+        kind: 'error',
+        error: {
+          code: 'OPENCODE_PROMPT_FAILED',
+          message: `opencode prompt 失败: ${err instanceof Error ? err.message : String(err)}`,
+        },
+      }
+      return
+    }
+
+    try {
+      while (!isDone || queue.length > 0) {
+        if (queue.length === 0 && !isDone) {
+          const remaining = opts.timeoutMs - (Date.now() - lastActivity)
+          if (remaining <= 0) {
+            this.aborted = true
+            void this.api('POST', `/session/${this.sessionId}/abort`, {}).catch(() => {})
+            enqueue({
+              kind: 'error',
+              error: {
+                code: 'OPENCODE_TURN_STALLED',
+                message: `回合停滞 ${Math.round(opts.timeoutMs / 1000)}s 无事件,已中止(消息按已处理落账)`,
+              },
+            })
+            this.turnActive = false
+            continue
+          }
+          await new Promise<void>((r) => {
+            resolveWait = r
+            stallTimer = setTimeout(() => {
+              resolveWait = null
+              r()
+            }, remaining + 100)
+          })
+          if (stallTimer) {
+            clearTimeout(stallTimer)
+            stallTimer = null
+          }
+        }
+        while (queue.length > 0) {
+          yield queue.shift()!
+        }
+      }
+    }
+    finally {
+      if (stallTimer) clearTimeout(stallTimer)
+      unsub()
+      opts.signal?.removeEventListener('abort', onAbort)
+      this.turnActive = false
+    }
+  }
+
+  /** 引擎事件 → AgentEvent(适配器核心) */
+  protected mapEngineEvent(ev: Record<string, unknown>, taskId: string | undefined): AgentEvent[] {
+    const type = String(ev.type ?? '')
+    const props = (ev.properties ?? {}) as Record<string, unknown>
+    const sid = props.sessionID ?? props.sessionId
+    if (sid && sid !== this.sessionId) return [] // 多会话实例隔离(本 impl 一会话,防御)
+
+    const now = new Date().toISOString()
+    const statusEvent = (text: string): AgentEvent => ({
+      kind: 'status',
+      status: {
+        state: 'WORKING',
+        message: { messageId: randomUUID(), contextId: this.channelId, role: 'ROLE_AGENT', parts: [{ text }] },
+        timestamp: now,
+      },
+    })
+
+    switch (type) {
+      case 'message.part.delta': {
+        if (props.field === 'text' && typeof props.delta === 'string' && props.delta) {
+          return [{ kind: 'delta', delta: { text: props.delta } }]
+        }
+        return []
+      }
+      case 'message.part.updated': {
+        const part = props.part as Record<string, unknown> | undefined
+        if (!part) return []
+        const partId = String(part.id ?? '')
+        const partType = String(part.type ?? '')
+        if (partType === 'text' && typeof part.text === 'string' && partId) {
+          if (!this.partOrder.includes(partId)) this.partOrder.push(partId)
+          this.partTexts.set(partId, part.text)
+        }
+        else if (partType === 'tool') {
+          const state = (part.state ?? {}) as Record<string, unknown>
+          const tool = String(part.tool ?? 'tool')
+          const statusStr = String(state.status ?? '')
+          if (statusStr === 'pending' || statusStr === 'running') {
+            const input = state.input ?? part.input
+            return [statusEvent(`🔧 ${tool}${toolArgsPreview(input)}`)]
+          }
+          if (statusStr === 'error') {
+            return [statusEvent(`🔧 ${tool} 失败: ${String(state.error ?? '未知错误').slice(0, 200)}`)]
+          }
+        }
+        else if (partType === 'compaction') {
+          this.lastCompactAt = Date.now()
+        }
+        return []
+      }
+      case 'message.updated': {
+        const info = props.info as Record<string, unknown> | undefined
+        if (info?.role === 'assistant') {
+          const tokens = info.tokens as Record<string, unknown> | undefined
+          const input = Number(tokens?.input)
+          if (Number.isFinite(input) && input > 0) this.lastUsage = { input, at: Date.now() }
+          const err = info.error as Record<string, unknown> | undefined
+          if (err && this.turnActive) {
+            const code = String(err.name ?? 'UnknownError')
+            return [{
+              kind: 'error',
+              error: { code: `OPENCODE_LLM_${code}`, message: String(err.message ?? 'opencode 回合错误') },
+            }]
+          }
+        }
+        return []
+      }
+      case 'session.error': {
+        const err = props.error as Record<string, unknown> | undefined
+        if (!this.turnActive) return []
+        const data = (err?.data ?? {}) as Record<string, unknown>
+        const detail = String(data.message ?? err?.message ?? 'opencode 会话错误')
+        return [{
+          kind: 'error',
+          error: {
+            code: `OPENCODE_ERROR_${String(err?.name ?? 'UNKNOWN')}`,
+            message: `${detail}${data.statusCode != null ? ` (HTTP ${data.statusCode})` : ''}`,
+          },
+        }]
+      }
+      case 'session.status': {
+        const status = props.status as Record<string, unknown> | undefined
+        if (String(status?.type ?? '') === 'idle' && this.turnActive) {
+          return [{ kind: 'done', final: taskId ? { taskId } : undefined }]
+        }
+        return []
+      }
+      case 'session.idle': {
+        if (this.turnActive) {
+          return [{ kind: 'done', final: taskId ? { taskId } : undefined }]
+        }
+        return []
+      }
+      // ===== HITL =====
+      case 'permission.asked':
+      case 'permission.v2.asked': {
+        this.registerPermissionHitl(type === 'permission.v2.asked', props)
+        return []
+      }
+      case 'question.asked': {
+        this.registerQuestionHitl(props)
+        return []
+      }
+      case 'permission.replied':
+      case 'permission.v2.replied':
+      case 'question.replied':
+      case 'question.rejected': {
+        const id = String(props.id ?? '')
+        if (id && this.pendingHitl.has(id)) {
+          const p = this.pendingHitl.get(id)!
+          if (p.timer) clearTimeout(p.timer)
+          this.pendingHitl.delete(id)
+        }
+        return []
+      }
+      default:
+        return []
+    }
+  }
+}

package/server/services/workshop/agents/opencode-agent/types.ts

@@ -0,0 +1,54 @@
+/**
+ * OpenCodeAgentImpl 的依赖类型与对外 DTO(原 server/services/workshop/agents/opencode-agent.ts 顶部模块级类型声明)。纯类型。
+ */
+import type { AepHitlQuestion } from '../../../../../shared/workshop-protocol'
+
+export interface OpenCodeAgentConfig {
+  /** opencode 可执行文件(默认取 harness.opencode_command 设置) */
+  command?: string
+  cwd?: string
+  /** 模型(provider/model,如 anthropic/claude-sonnet-4-5) */
+  model?: string
+  /** opencode agent 名(默认 build) */
+  agent?: string
+  /** provider 推理档位(variant;effort 为统一注入入口的别名) */
+  variant?: string
+  /** 思考 effort(统一注入面;等价 variant) */
+  effort?: string
+  /** 权限策略(session 级;缺省 edit/bash/webfetch 全 ask → HITL) */
+  permission?: unknown
+  /** 数据目录覆盖(XDG_DATA_HOME;实例隔离/绕开损坏的全局库) */
+  dataDir?: string
+  /** 配置目录覆盖(XDG_CONFIG_HOME;空目录 = 不加载用户全局 opencode 插件/配置) */
+  configDir?: string
+  /** 上下文窗口(usage 百分比计算;未知则 percent=null) */
+  contextWindow?: number
+  /** 压缩阈值(0-1,默认 0.7) */
+  compactThreshold?: number
+  /** 回合停滞超时(ms,默认 600000) */
+  promptTimeoutMs?: number
+  /** supervise 超时(ms,默认 150000) */
+  superviseTimeoutMs?: number
+  systemPromptPrefix?: string
+  scenarioPrompt?: string
+  agentId?: string
+  name?: string
+  role?: 'lead' | 'worker'
+  channelId?: string
+  /** 平台自证 token(MCP 桥回程鉴权;factory 注入) */
+  token?: string
+  /** 平台 HTTP 基址(桥回程;默认 AW_BASE_URL 或 127.0.0.1:PORT) */
+  baseUrl?: string
+  /** MCP 桥脚本路径(默认 <packageRoot>/server/harness/aw-mcp-bridge.mjs) */
+  mcpBridgePath?: string
+}
+
+export interface PendingHitl {
+  kind: 'opencode-permission'
+  id: string
+  type: 'permission' | 'question'
+  sessionId: string
+  timer: ReturnType<typeof setTimeout> | null
+  /** question 型:全量问题(逐题 POST /question/{id}/reply);permission 型为空 */
+  questions: AepHitlQuestion[]
+}

package/server/services/workshop/agents/prompt-builder.ts

@@ -330,13 +330,18 @@ export function supervisePrompt(opts: {
   }).join('\n')
 
   const tasks = snapshot.tasks.map((t) => {
-    const deliverable = t.state === 'COMPLETED' && t.artifacts.length > 0
-      ? ` — 交付:${t.artifacts.map(a => a.parts.map(p => 'text' in p ? p.text : '').join(' ').replace(/\s+/g, ' ').trim().slice(0, 200)).filter(Boolean).join(' / ').slice(0, 400) || '(空)'}`
+    // 新 root 的 input artifact 是用户真实请求正文；完成 child 的 artifacts 才是 worker 交付。
+    // 不把 worker 初始 input、其他任务历史或任意大二进制负载重复塞入 Lead 每轮 prompt。
+    const relevantArtifacts = t.artifacts.filter((artifact) => {
+      if (artifact.name === 'input') return !t.parentId && !['COMPLETED', 'FAILED', 'CANCELED'].includes(t.state)
+      return t.state === 'COMPLETED'
+    })
+    const deliverable = relevantArtifacts.length > 0
+      ? ` — 输入/交付:${relevantArtifacts.map(a => `${a.name}: ${a.parts.map(p => 'text' in p ? p.text : '').join(' ').replace(/\s+/g, ' ').trim()}`).filter(Boolean).join(' / ').slice(0, 2_400) || '(空)'}`
       : ''
     const artifacts = t.artifacts.length > 0 ? `, artifacts=${t.artifacts.length}` : ''
     return `  - ${t.id} [${t.state}] "${t.title}" (assignee=${t.assigneeId}, progress=${t.progress}%${artifacts})${deliverable}`
   }).join('\n')
-
   const pending = Object.entries(snapshot.pendingChildren)
     .map(([parentId, count]) => `  ${parentId}: ${count} pending`)
     .join('\n')
@@ -364,6 +369,10 @@ export function supervisePrompt(opts: {
     `## Team Members (state + task queues)`,
     members || '  (none)',
     ``,
+    `## Root Queue`,
+    `activeRootId=${snapshot.activeRootId ?? '(none)'}`,
+    `queuedRootIds=${snapshot.queuedRootIds?.join(', ') || '(none)'}`,
+    `Only activeRoot may be planned/dispatched/accepted; queued roots are read-only.`,
     `## All Tasks (FIFO order)`,
     tasks || '  (none)',
     ``,
@@ -374,12 +383,13 @@ export function supervisePrompt(opts: {
     mail || '  (none)',
   )
 
+  // Lead 契约**始终**注入;模式指令是**附加**的执行纪律,不能顶替契约。
+  // 原先 `modeInfo ? 只注入模式 : 只注入契约` —— 于是 goal/loop/pipeline 任务下 Lead
+  // 拿不到"worker 完工只是提交、必须逐项验收、按计划顺序收口"这段,验收纪律在模式任务里凭空消失。
+  parts.push('', renderPrompt('lead-supervise'))
   if (modeInfo) {
     parts.push('', ...buildModeInstructions(modeInfo))
   }
-  else {
-    parts.push('', renderPrompt('lead-supervise'))
-  }
 
   return parts.join('\n')
 }

package/server/services/workshop/agents/qwen-agent.ts

@@ -204,7 +204,7 @@ export class QwenAgentImpl extends BaseAgentImpl {
 
   // ===== run / supervise =====
 
-  override async supervise(snapshot: import('./agent-interface').SupervisionSnapshot, ctx: AgentRunContext, opts?: { signal?: AbortSignal }): Promise<import('./agent-interface').SupervisionDecision[]> {
+  override async supervise(snapshot: import('./agent-interface').SupervisionSnapshot, ctx: AgentRunContext, opts?: import('./agent-interface').SupervisionOptions): Promise<import('./agent-interface').SupervisionDecision[]> {
     await this.ensureClient(ctx)
     if (!this.client || !this.sessionStarted) return []
     if (this.supervising) return []
@@ -221,7 +221,7 @@ export class QwenAgentImpl extends BaseAgentImpl {
       // 原为 this.collectTurn(...):该类唯一存在的整回合收集实现是 collectTurnEvents
       // (与基类 supervise 调用的同名抽象成员同签名)。原调用在运行时抛 TypeError 并被
       // 本方法的 catch 吞掉 → supervise 恒返回 [],详见报告。
-      const events = await this.collectTurnEvents(prompt, this.config.superviseTimeoutMs ?? 150_000, opts?.signal)
+      const events = await this.collectTurnEvents(prompt, this.getSupervisionPolicy().hardTimeoutMs, opts?.signal)
       let text = ''
       for (const e of events) {
         if (e.kind === 'artifact') {
@@ -533,6 +533,10 @@ export class QwenAgentImpl extends BaseAgentImpl {
       options: ['allow', 'reject'],
       createdAt: new Date().toISOString(),
       expiresAt: null,
+      // v17:审批语义 + 原生请求标识(qwen 0.0.x 为单隐式会话,无 sessionId)
+      requestType: 'approval',
+      nativeRequestId: String(req.id),
+      harness: 'qwen',
     })
     const timeoutMs = harnessSettings().hitl_timeout_ms
     const timer = timeoutMs > 0