agentworkshop 0.7.54 → 0.7.59

package/server/repositories/user.repository.ts

@@ -28,7 +28,8 @@ CREATE TABLE IF NOT EXISTS users (
   password_hash TEXT NOT NULL,
   role          TEXT NOT NULL DEFAULT 'user',
   status        TEXT NOT NULL DEFAULT 'active',
-  created_at    TEXT NOT NULL
+  created_at    TEXT NOT NULL,
+  must_change_password INTEGER NOT NULL DEFAULT 0
 );
 CREATE TABLE IF NOT EXISTS user_tokens (
   id           TEXT PRIMARY KEY,
@@ -71,7 +72,7 @@ function getDb(): DatabaseSync {
   return db
 }
 
-/** 轻量迁移：旧库 user_tokens 补 token_plain 列（明文存档，支持随时查看）+ expires_at（R2 后端过期） */
+/** 轻量迁移：旧库 user_tokens 补 token_plain 列（明文存档，支持随时查看）+ expires_at（R2 后端过期）；users 补 must_change_password（2026-10-09 首登强制改密） */
 function migrateSchema(d: DatabaseSync): void {
   const cols = d.prepare('PRAGMA table_info(user_tokens)').all() as Array<{ name: string }>
   if (!cols.some(c => c.name === 'token_plain')) {
@@ -80,6 +81,10 @@ function migrateSchema(d: DatabaseSync): void {
   if (!cols.some(c => c.name === 'expires_at')) {
     d.exec('ALTER TABLE user_tokens ADD COLUMN expires_at TEXT')
   }
+  const ucols = d.prepare('PRAGMA table_info(users)').all() as Array<{ name: string }>
+  if (!ucols.some(c => c.name === 'must_change_password')) {
+    d.exec('ALTER TABLE users ADD COLUMN must_change_password INTEGER NOT NULL DEFAULT 0')
+  }
   // 安全迁移:清空存量明文 token——库中只保留哈希,备份/文件拷贝不再等于凭据泄漏
   d.exec('UPDATE user_tokens SET token_plain = NULL WHERE token_plain IS NOT NULL')
   // 存量 token 宽限 30 天(从部署时刻起算,避免升级即全员掉线)
@@ -210,7 +215,7 @@ export function findByToken(token: string): (User & { tokenId: string }) | null
   const d = getDb()
   const hash = hashToken(token)
   const row = d.prepare(
-    `SELECT u.id, u.name, u.email, u.role, u.status, u.created_at AS createdAt, t.id AS tokenId, t.expires_at AS expiresAt
+    `SELECT u.id, u.name, u.email, u.role, u.status, u.created_at AS createdAt, u.must_change_password AS mustChangePassword, t.id AS tokenId, t.expires_at AS expiresAt
 FROM user_tokens t JOIN users u ON u.id = t.user_id
 WHERE t.token_hash = ?`,
   ).get(hash) as (User & { tokenId: string, expiresAt: string | null }) | undefined
@@ -236,6 +241,8 @@ function toUser(row: Record<string, unknown>): User {
     role: row.role as User['role'],
     status: row.status as User['status'],
     createdAt: String(row.created_at ?? row.createdAt),
+    // 两种行形状:查询列已别名 mustChangePassword;snake 原名兜底(INSERT 返回等)
+    mustChangePassword: Number(row.mustChangePassword ?? row.must_change_password ?? 0) === 1,
   }
 }
 
@@ -253,7 +260,7 @@ export const userRepository = {
     const params = kw ? [`%${kw}%`, `%${kw}%`] : []
     const total = (d.prepare(`SELECT COUNT(*) AS n FROM users ${where}`).get(...params) as { n: number }).n
     const rows = d.prepare(
-      `SELECT id, name, email, role, status, created_at AS createdAt FROM users ${where}
+      `SELECT id, name, email, role, status, created_at AS createdAt, must_change_password AS mustChangePassword FROM users ${where}
        ORDER BY created_at DESC LIMIT ? OFFSET ?`,
     ).all(...params, safeSize, (safePage - 1) * safeSize) as Array<Record<string, unknown>>
     return { items: rows.map(toUser), total, page: safePage, pageSize: safeSize }
@@ -262,7 +269,7 @@ export const userRepository = {
   /** 全量用户(不分页;管理面授权矩阵用,避免分页截断) */
   listAll(): User[] {
     const d = getDb()
-    const rows = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt FROM users ORDER BY created_at DESC').all() as Array<Record<string, unknown>>
+    const rows = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt, must_change_password AS mustChangePassword FROM users ORDER BY created_at DESC').all() as Array<Record<string, unknown>>
     return rows.map(toUser)
   },
 
@@ -287,19 +294,19 @@ export const userRepository = {
 
   findById(id: string): User | undefined {
     const d = getDb()
-    const row = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt FROM users WHERE id = ?').get(id) as Record<string, unknown> | undefined
+    const row = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt, must_change_password AS mustChangePassword FROM users WHERE id = ?').get(id) as Record<string, unknown> | undefined
     return row ? toUser(row) : undefined
   },
 
   findByEmail(email: string): User | undefined {
     const d = getDb()
-    const row = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt FROM users WHERE LOWER(email) = LOWER(?)').get(email) as Record<string, unknown> | undefined
+    const row = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt, must_change_password AS mustChangePassword FROM users WHERE LOWER(email) = LOWER(?)').get(email) as Record<string, unknown> | undefined
     return row ? toUser(row) : undefined
   },
 
   findByName(name: string): User | undefined {
     const d = getDb()
-    const row = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt FROM users WHERE name = ?').get(name) as Record<string, unknown> | undefined
+    const row = d.prepare('SELECT id, name, email, role, status, created_at AS createdAt, must_change_password AS mustChangePassword FROM users WHERE name = ?').get(name) as Record<string, unknown> | undefined
     return row ? toUser(row) : undefined
   },
 
@@ -337,6 +344,12 @@ export const userRepository = {
     return new Map(rows.map(r => [r.lineId, r.mode]))
   },
 
+  /** 产线 → 授权用户反查(线域定向通知用:审批触达/写控错误告警;2026-10-08) */
+  usersOfLine(lineId: string): Array<{ userId: string, mode: string }> {
+    const d = getDb()
+    return d.prepare('SELECT user_id AS userId, mode FROM user_line_grants WHERE line_id = ?').all(lineId) as Array<{ userId: string, mode: string }>
+  },
+
   /** 内部：取密码哈希（仅认证路径使用，不参与领域对象外泄）。
    *  登录账号:邮箱或用户名均可(用户名注册时唯一;参数绑定防注入) */
   getPasswordHash(account: string): { id: string, hash: string } | null {
@@ -345,7 +358,7 @@ export const userRepository = {
     return row ?? null
   },
 
-  create(input: UserCreate & { password: string }): User {
+  create(input: UserCreate & { password: string, mustChangePassword?: boolean }): User {
     const d = getDb()
     const user: User = {
       id: randomUUID(),
@@ -354,9 +367,10 @@ export const userRepository = {
       role: input.role,
       status: input.status,
       createdAt: now(),
+      mustChangePassword: input.mustChangePassword ?? false,
     }
-    d.prepare('INSERT INTO users (id, name, email, password_hash, role, status, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)')
-      .run(user.id, user.name, user.email, hashPassword(input.password), user.role, user.status, user.createdAt)
+    d.prepare('INSERT INTO users (id, name, email, password_hash, role, status, created_at, must_change_password) VALUES (?, ?, ?, ?, ?, ?, ?, ?)')
+      .run(user.id, user.name, user.email, hashPassword(input.password), user.role, user.status, user.createdAt, user.mustChangePassword ? 1 : 0)
     return user
   },
 
@@ -379,7 +393,7 @@ export const userRepository = {
     }
   },
 
-  update(id: string, input: UserUpdate): User | undefined {
+  update(id: string, input: UserUpdate & { mustChangePassword?: boolean }): User | undefined {
     const d = getDb()
     const current = this.findById(id)
     if (!current) return undefined
@@ -401,6 +415,10 @@ export const userRepository = {
       fields.push('status = ?')
       params.push(input.status)
     }
+    if (input.mustChangePassword !== undefined) {
+      fields.push('must_change_password = ?')
+      params.push(input.mustChangePassword ? 1 : 0)
+    }
     if (input.password !== undefined) {
       fields.push('password_hash = ?')
       params.push(hashPassword(input.password))
@@ -475,6 +493,12 @@ export const userRepository = {
     return d.prepare('DELETE FROM user_tokens WHERE token_hash = ?').run(hashToken(token)).changes > 0
   },
 
+  /** 吊销某用户全部会话 token(管理面重置密码后强制重新登录,旧会话即死) */
+  revokeAllTokens(userId: string): number {
+    const d = getDb()
+    return d.prepare('DELETE FROM user_tokens WHERE user_id = ?').run(userId).changes
+  },
+
   /** 测试钩子：替换内部 DB（重开内存库等） */
   _resetForTest(): void {
     db?.close()

package/server/schemas/user.schema.ts

@@ -48,6 +48,12 @@ export const userLoginSchema = z.object({
   password: z.string().min(1, '密码不能为空').max(128, '密码过长'),
 })
 
+/** 修改本人密码请求体（首登强制改密走同一端点；需当前密码验证） */
+export const userChangePasswordSchema = z.object({
+  currentPassword: z.string().min(1, '密码不能为空').max(128, '密码过长'),
+  newPassword: passwordSchema,
+})
+
 /** 创建 API Token 请求体 */
 export const userTokenCreateSchema = z.object({
   label: z.string().trim().max(64, '标签最多 64 字符').default(''),
@@ -63,5 +69,6 @@ export type UserUpdate = z.infer<typeof userUpdateSchema>
 export type UserListQueryInput = z.infer<typeof userListQuerySchema>
 export type UserRegister = z.infer<typeof userRegisterSchema>
 export type UserLogin = z.infer<typeof userLoginSchema>
+export type UserChangePassword = z.infer<typeof userChangePasswordSchema>
 export type UserTokenCreate = z.infer<typeof userTokenCreateSchema>
 export type UserTokenUpdate = z.infer<typeof userTokenUpdateSchema>

package/server/services/user.service.ts

@@ -4,6 +4,7 @@ import type { UserCreate, UserUpdate, UserLogin, UserRegister } from '../schemas
 import { AppError, ErrorCodes } from '../utils/errors'
 import { useServerConfig } from '../utils/config'
 import { randomBytes } from 'node:crypto'
+import { recordOps } from './workshop/ops/ops'
 /**
  * 用户业务逻辑层（Service）
  * 职责：领域规则、认证（注册/登录/token 签发）、token 隔离（仅本人可 CRUD）、
@@ -18,7 +19,12 @@ export type UserProfile = AuthResult['user'] & { tokenId: string }
 export function resolveUserByToken(token: string): UserProfile | null {
   const user = findByToken(token)
   return user
-    ? { id: user.id, name: user.name, email: user.email, role: user.role, createdAt: user.createdAt, tokenId: user.tokenId }
+    ? {
+        id: user.id, name: user.name, email: user.email, role: user.role, createdAt: user.createdAt,
+        // findByToken 返回原生行(别名列为 0/1,非布尔):这里统一归一
+        mustChangePassword: Number((user as unknown as { mustChangePassword?: number | boolean }).mustChangePassword ?? 0) === 1,
+        tokenId: user.tokenId,
+      }
     : null
 }
 
@@ -54,7 +60,8 @@ export const userService = {
       throw new AppError(409, ErrorCodes.CONFLICT, '邮箱已被注册')
     }
     const password = input.password ?? randomPassword()
-    return userRepository.create({ ...input, password })
+    // 管理面建号一律首登强制改密:口令经管理员之手(或随机生成),不属于用户本人秘密
+    return userRepository.create({ ...input, password, mustChangePassword: true })
   },
 
   update(id: string, input: UserUpdate) {
@@ -64,10 +71,15 @@ export const userService = {
         throw new AppError(409, ErrorCodes.CONFLICT, '邮箱已被占用')
       }
     }
-    const user = userRepository.update(id, input)
+    // 管理面经 PUT 改密等同重置:置首登强制改密 + 吊销全部旧会话(旧 token 即死,
+    // 与 resetPassword 同语义;e2e M8 实证此前漏吊销)
+    const passwordChanged = input.password !== undefined
+    const patch = passwordChanged ? { ...input, mustChangePassword: true } : input
+    const user = userRepository.update(id, patch)
     if (!user) {
       throw new AppError(404, ErrorCodes.NOT_FOUND, '用户不存在')
     }
+    if (passwordChanged) userRepository.revokeAllTokens(id)
     return user
   },
 
@@ -78,13 +90,33 @@ export const userService = {
     return { id }
   },
 
-  /** 管理面：重置指定用户密码 */
+  /** 管理面：重置指定用户密码 → 首登强制改密 + 吊销全部旧会话(旧 token 即死) */
   resetPassword(id: string, password: string) {
-    const user = userRepository.update(id, { password })
+    const user = userRepository.update(id, { password, mustChangePassword: true })
     if (!user) {
       throw new AppError(404, ErrorCodes.NOT_FOUND, '用户不存在')
     }
-    return { id }
+    const revoked = userRepository.revokeAllTokens(id)
+    return { id, revokedSessions: revoked, mustChangePassword: true }
+  },
+
+  /** 本人修改密码(首登强制改密同一入口):当前密码验证 → 更新哈希并清除强制标记 */
+  changePassword(userId: string, currentPassword: string, newPassword: string) {
+    const user = userRepository.findById(userId)
+    if (!user) {
+      throw new AppError(404, ErrorCodes.NOT_FOUND, '用户不存在')
+    }
+    const { hash } = userRepository.getPasswordHash(user.email) ?? {}
+    if (!hash || !verifyPassword(currentPassword, hash)) {
+      throw new AppError(401, 'UNAUTHORIZED', '当前密码不正确')
+    }
+    userRepository.update(userId, { password: newPassword, mustChangePassword: false })
+    recordOps({
+      actor: userId, actorName: user.name, actorKind: 'user',
+      action: 'auth.password.change', kind: 'system', targetKind: 'user', targetId: userId,
+      summary: `用户 ${user.name}(${user.email})修改了密码${user.mustChangePassword ? '(完成首登强制改密)' : ''}`,
+    })
+    return { ok: true, mustChangePassword: false }
   },
 
   // ===== 认证（公开端点）=====
@@ -123,6 +155,11 @@ export const userService = {
     // 已达阈值且窗口未过 → 锁定;偶发失败(1-4 次)不锁,窗口滑过即重置
     if (rec && rec.count >= LOCK_THRESHOLD && Date.now() - rec.firstAt < FAIL_WINDOW_MS) {
       const waitMin = Math.ceil((FAIL_WINDOW_MS - (Date.now() - rec.firstAt)) / 60_000)
+      recordOps({
+        actor: input.email, actorName: input.email, actorKind: 'user',
+        action: 'auth.login.locked', kind: 'system', targetKind: 'user', targetId: input.email,
+        summary: `登录锁定:账号 ${input.email} 连续失败过多,已临时锁定(约 ${waitMin} 分钟,来源 IP ${opts.ip ?? 'local'})`,
+      })
       throw new AppError(429, 'LOGIN_LOCKED', `失败次数过多,账号已临时锁定,请约 ${waitMin} 分钟后再试`)
     }
     const { id, hash } = userRepository.getPasswordHash(input.email) ?? {}
@@ -140,6 +177,11 @@ export const userService = {
     }
     fails.delete(lockKey)
     const { raw } = userRepository.createToken(id, `session-${Date.now()}`)
+    recordOps({
+      actor: id, actorName: user.name, actorKind: 'user',
+      action: 'auth.login', kind: 'system', targetKind: 'user', targetId: id,
+      summary: `用户 ${user.name}(${user.email})登录成功(IP ${opts.ip ?? 'local'})`,
+    })
     return { user: this.publicProfile(user), token: raw }
   },
 
@@ -201,8 +243,8 @@ export const userService = {
   },
 
   /** 公开档案（不含敏感字段） */
-  publicProfile(u: { id: string, name: string, email: string, role: string, createdAt: string }): AuthResult['user'] {
-    return { id: u.id, name: u.name, email: u.email, role: u.role, createdAt: u.createdAt }
+  publicProfile(u: { id: string, name: string, email: string, role: string, createdAt: string, mustChangePassword?: boolean }): AuthResult['user'] {
+    return { id: u.id, name: u.name, email: u.email, role: u.role, createdAt: u.createdAt, mustChangePassword: u.mustChangePassword === true }
   },
 }
 

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

@@ -52,7 +52,7 @@ export interface AgentWorkspace {
    * **不**向自己投递 assign 消息(lead 正在回合内,无需自我唤醒;后续由调度器按
    * "lead 名下未规划根任务"触发 supervise 继续分解或直接作答)。
    */
-  submitTask(input: { title: string, description?: string, parts?: Part[], sourceChatMessageId?: string, sourceChatDeliveryId?: string }): Promise<WorkspaceTask>
+  submitTask(input: { title: string, description?: string, parts?: Part[], sourceChatMessageId?: string, sourceChatDeliveryId?: string, budgetMinutes?: number }): Promise<WorkspaceTask>
   /** 任务分发(仅 lead;创建子任务并指派) */
   dispatchTask(input: { parentTaskId?: string, assigneeId: string, title: string, description?: string, parts?: Part[], routeReason?: string }): Promise<WorkspaceTask>
   /** 查看同 Channel 任务列表(含同事) */

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

@@ -177,6 +177,11 @@ export abstract class BaseAgentImpl implements AgentInterface {
   async supervise(snapshot: SupervisionSnapshot, ctx: AgentRunContext, opts?: SupervisionOptions): Promise<SupervisionDecision[]> {
     if (this.supervising) return []
     if (!this.workspace) this.workspace = ctx.workspace
+    // 懒加载型 harness(如 codex)必须先确保会话进程存在:worker/peer 回合各自 ensure,
+    // supervise 是唯一不经 run() 的回合入口 —— 缺这一步,全新 lead 的每轮监督都会在
+    // streamTurn 处以"会话未就绪"瞬间失败,而异常被下方 catch 吞掉 → 根任务永远
+    // SUBMITTED 直到超时(实测 codex lead 复现)。能力探测:无 ensureClient 的实现跳过。
+    await (this as { ensureClient?: (c: AgentRunContext) => Promise<void> }).ensureClient?.(ctx)
     const prompt = supervisePrompt({
       snapshot,
       agentName: this.agentName,
@@ -197,7 +202,9 @@ export abstract class BaseAgentImpl implements AgentInterface {
       const parsed = extractJsonArray(text)
       return parsed && parsed.length > 0 ? parsed as SupervisionDecision[] : []
     }
-    catch {
+    catch (err) {
+      // 决策失败必须可见(此前静默返回 [],lead 永久失声而无任何痕迹);空决策语义不变
+      console.error(`[${this.agentName}/supervise] 决策回合失败(本轮按空决策处理):`, err instanceof Error ? err.message : err)
       return []
     }
     finally {

package/server/services/workshop/agents/binding-authz.ts

@@ -25,11 +25,13 @@ import { getDcwController } from '../dcw/dcw-controller'
 import { lineMode } from '../permissions'
 import { AppError, ErrorCodes } from '../../../utils/errors'
 
-/** 绑定 → 所属产线 id(节点不存在返回 null) */
+/** 绑定 → 所属产线 id(节点/配方不存在返回 null;recipe 绑定的 nodeId 字段 = 配方 id) */
 export function lineIdOfBinding(binding: Pick<AgentNodeBinding, 'nodeId' | 'kind'>): string | null | undefined {
-  return binding.kind === 'daq'
-    ? getDaqController().byId(binding.nodeId)?.lineId
-    : getDcwController().byId(binding.nodeId)?.lineId
+  if (binding.kind === 'daq') return getDaqController().byId(binding.nodeId)?.lineId
+  if (binding.kind === 'recipe') {
+    return getDcwController().listRecipes().find(r => r.id === binding.nodeId)?.lineId ?? null
+  }
+  return getDcwController().byId(binding.nodeId)?.lineId
 }
 
 /**
@@ -47,7 +49,8 @@ export function requireBindingAccess(
     throw new AppError(404, ErrorCodes.NOT_FOUND, `${what} ${binding.id} 指向的节点已不存在: ${binding.nodeId}`)
   }
   const mode = lineMode(user, lineId)
-  const needOperate = binding.kind === 'dcw'
+  // 写向绑定(dcw 直写存量 + recipe 配方操作)需「可操控」;daq 只读绑定「仅查看」即可
+  const needOperate = binding.kind !== 'daq'
   if (mode === 'operate' || (needOperate === false && mode === 'readonly')) return
   const need = needOperate ? '可操控' : '仅查看'
   if (mode === 'readonly') {

package/server/services/workshop/agents/binding-mode.ts

@@ -0,0 +1,51 @@
+/**
+ * 绑定控制模式(auto/manual)切换判定 —— 纯函数,无 IO。
+ *
+ * 产线 Co-Pilot P2 auto 治理(计划 §5.4 / 铁律 2):
+ *  - 无 mode 字段 / 与当前同名 → 不变更(无操作);
+ *  - auto→manual → 自由方向(恢复人工审批,永远放行);
+ *  - manual→auto → 等于**摘掉人类审批闸门**,必须携带显式 `confirm === true`
+ *    (严格全等,字符串 'true'/1 一律不算)才允许切换。
+ *
+ * 抽成纯函数供 bindings/[id].patch.ts 路由调用,便于单测(tests/binding-mode-guard.test.ts)。
+ */
+
+export type BindingControlMode = 'auto' | 'manual'
+
+/** 判定结论:ok=允许继续走 setMode;noop=无需变更(路由直接返回原绑定);否则 400 */
+export interface ModeChangeDecision {
+  ok: boolean
+  /** 仅 ok=true 时可能出现:true=目标与当前一致(或未指定),无需变更 */
+  noop?: boolean
+  /** 仅 ok=false 时出现:true=缺风险确认(路由映射 400 + MODE_CONFIRM_REQUIRED) */
+  needConfirm?: boolean
+  /** ok=false 时的中文错误文案(进响应 message) */
+  error?: string
+}
+
+/**
+ * 判定「当前 mode + 目标 mode + confirm」是否允许切换 / 是否需要确认。
+ *
+ * @param current 绑定当前 mode(repo 权威值)
+ * @param target  请求目标 mode;undefined=请求未携带 mode 字段 → 不变更
+ * @param confirm 请求携带的确认标记;仅严格 `=== true` 视为已确认
+ */
+export function resolveModeChange(
+  current: BindingControlMode,
+  target: BindingControlMode | undefined,
+  confirm: unknown,
+): ModeChangeDecision {
+  // 未携带 mode 字段:不变更(消掉旧实现 `?? 'auto'` 的静默缺省洞)
+  if (target === undefined) return { ok: true, noop: true }
+  // 同名 mode:无操作(免 confirm,也无审计必要——什么都没发生)
+  if (target === current) return { ok: true, noop: true }
+  // auto→manual:恢复人工审批,自由方向
+  if (current === 'auto' && target === 'manual') return { ok: true }
+  // manual→auto:摘审批闸门,必须显式确认
+  if (confirm === true) return { ok: true }
+  return {
+    ok: false,
+    needConfirm: true,
+    error: '切换到 auto 将摘除该节点逐次人工审批闸门,需显式风险确认:请求体须携带 confirm: true(布尔)',
+  }
+}

package/server/services/workshop/agents/hitl-decision/dispatcher.ts

@@ -6,7 +6,7 @@ import type { AepHitlQuestion } from '../../../../../shared/workshop-protocol'
 import type { HitlActingUser, HitlDecisionPayload } from './shared'
 import { AppError } from '@/server/utils/errors'
 import { encodeHitlAnswers, resolveHitlRuntime } from '../hitl-registry'
-import { getToolApprovals } from '../tool-approvals'
+import { getToolApprovals, normalizeRecipeProposeDecision } from '../tool-approvals'
 import { resolveAnswers } from './answers'
 import { respondTerminalUi } from '../harness-terminal'
 
@@ -59,13 +59,26 @@ export async function defaultDispatch(ctx: HitlNativeDispatchContext): Promise<u
     return { via: 'omp-terminal' }
   }
   if (ctx.kind === 'dcw-approval') {
-    // dcw 工具审批:与 hitl/respond 同语义(缺省视为拒绝,approved 必须显式 confirmed===true)
+    // dcw 工具审批:与 hitl/respond 同语义(缺省视为拒绝,approved 必须显式 confirmed===true)。
+    // 产线 Co-Pilot P2:结构化审批单(recipe-propose,payload.schemaVersion=1)先经 fail-closed
+    // 归一 —— 无有效 choice 的「批准」一律按拒绝收敛;legacy 审批单(无 payload)完全不干预。
+    const pending = getToolApprovals().listPending().find(a => a.id === ctx.id)
+    const normalized = normalizeRecipeProposeDecision(pending, {
+      approved: decision.confirmed === true,
+      choice: decision.choice,
+    })
+    if (decision.confirmed === true && !normalized.approved) {
+      // fail-closed 降级:把有效裁决回写进决策载荷,使 hitl 行终态/审计/落定通知
+      // 与实际裁决(拒绝)一致,不留「已批准但未执行」的假态
+      decision.confirmed = false
+    }
     const approval = getToolApprovals().decide(
       ctx.id,
-      decision.confirmed === true,
+      normalized.approved,
       String(decision.comment ?? ''),
       ctx.user.id,
       ctx.user.name ?? '',
+      normalized.choice,
     )
     return { via: 'tool-approvals', approval }
   }

package/server/services/workshop/agents/hitl-decision/index.ts

@@ -1,24 +1,24 @@
-/**
- * HITL 决策域:载荷校验 / 渠道可见性与决策权 / 启动对账 / 原生派发器 / 决策落库与通知
- *
- * 由原单文件按职责拆分而来;此处保持**原文件的公开 API 与 import 路径不变**
- * (目录 index 解析),外部调用方无需改动。
- *
- * 模块划分:
- *   shared.ts              模块头 / 领域类型 / 两个错误类 / 原生失败判别
- *   payload.ts             决策载荷校验与状态映射
- *   answers.ts             回答归一(问题 id ↔ 文本/选项)
- *   visibility.ts          渠道可见性 / 决策权断言 / 行快照
- *   reconcile.ts           启动对账(恢复悬挂的待审批)
- *   dispatcher.ts          原生派发器注册与默认派发
- *   decide.ts              决策主流程 / 一次性对账 / 问题解析 / 结果通知
- */
-export { HitlDeliveryUnknownError, HitlRetryableError } from './shared'
-export type { HitlActingUser, HitlDecisionPayload, HitlDecisionInput, HitlDecisionResult } from './shared'
-export { assertDecisionPayload, statusOfDecision } from './payload'
-export { resolveAnswers } from './answers'
-export { assertCanDecideHitlChannel, canDecideHitlChannel, snapshotOfRow } from './visibility'
-export { reconcileHitlOnStartup } from './reconcile'
-export { registerHitlNativeDispatcher } from './dispatcher'
-export type { HitlNativeDispatchContext, HitlNativeDispatcher } from './dispatcher'
-export { decideHitlRequest, ensureHitlReconciled } from './decide'
+/**
+ * HITL 决策域:载荷校验 / 渠道可见性与决策权 / 启动对账 / 原生派发器 / 决策落库与通知
+ *
+ * 由原单文件按职责拆分而来;此处保持**原文件的公开 API 与 import 路径不变**
+ * (目录 index 解析),外部调用方无需改动。
+ *
+ * 模块划分:
+ *   shared.ts              模块头 / 领域类型 / 两个错误类 / 原生失败判别
+ *   payload.ts             决策载荷校验与状态映射
+ *   answers.ts             回答归一(问题 id ↔ 文本/选项)
+ *   visibility.ts          渠道可见性 / 决策权断言 / 行快照
+ *   reconcile.ts           启动对账(恢复悬挂的待审批)
+ *   dispatcher.ts          原生派发器注册与默认派发
+ *   decide.ts              决策主流程 / 一次性对账 / 问题解析 / 结果通知
+ */
+export { HitlDeliveryUnknownError, HitlRetryableError } from './shared'
+export type { HitlActingUser, HitlDecisionPayload, HitlDecisionInput, HitlDecisionResult } from './shared'
+export { assertDecisionPayload, statusOfDecision } from './payload'
+export { resolveAnswers } from './answers'
+export { assertCanDecideHitlChannel, canDecideHitlChannel, snapshotOfRow } from './visibility'
+export { reconcileHitlOnStartup, sweepPhantomHitl } from './reconcile'
+export { registerHitlNativeDispatcher } from './dispatcher'
+export type { HitlNativeDispatchContext, HitlNativeDispatcher } from './dispatcher'
+export { decideHitlRequest, ensureHitlReconciled } from './decide'

package/server/services/workshop/agents/hitl-decision/line-of.ts

@@ -0,0 +1,38 @@
+/**
+ * line-of —— HITL 条目 → 产线锚点(权限模型 v3 / 定向推送依据)。
+ *
+ * 推导优先级:
+ *   1. 工具审批单的 nodeId 载荷:『recipe-propose:<配方id>』→ 配方所在产线;
+ *      裸节点 id(daq/dcw)→ 节点归属产线;
+ *   2. 回退 channel.line_id(绑线频道的成员审批);
+ *   3. 都没有(纯协作频道的通用 ask)→ undefined = 不做产线过滤。
+ * admin 裁决与频道审计轨迹不受本锚点影响 —— 这里只服务「定向推送/快照可见性」。
+ */
+import { getDcwController } from '../../dcw/dcw-controller'
+import { getDaqNodeRepo } from '../../daq/daq-node.repo'
+
+export interface HitlItemLike {
+  nodeId?: string
+  lineId?: string
+  kind?: string
+}
+
+export function lineOfHitlItem(item: HitlItemLike, channelLineId?: string | null): string | null | undefined {
+  if (item.lineId) return item.lineId
+  const nodeId = String(item.nodeId ?? '').trim()
+  if (nodeId) {
+    const m = /^recipe-propose:(.+)$/.exec(nodeId)
+    const recipeId = m ? m[1] : ''
+    if (recipeId) {
+      const recipe = getDcwController().listRecipes().find(r => r.id === recipeId)
+      if (recipe?.lineId) return recipe.lineId
+    }
+    else {
+      const daq = getDaqNodeRepo().byId(nodeId)
+      if (daq?.lineId) return daq.lineId
+      const dcw = getDcwController().byId(nodeId)
+      if (dcw?.lineId) return dcw.lineId
+    }
+  }
+  return channelLineId || undefined
+}