agentworkshop 0.7.70 → 0.7.71

package/server/services/workshop/daq/storage/sqlite.adapter.ts

@@ -23,6 +23,8 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
   /** 启动清理水位(daq.tsRetentionH;env DAQ_TS_RETENTION_H 兼容) */
   private readonly retentionH = daqRuntimeSettings().tsRetentionH
   private retentionTimer: NodeJS.Timeout | null = null
+  /** 同键不同值被丢弃的帧数(C6 可观测计数,不静默) */
+  private correctionDropped = 0
 
   async init(): Promise<void> {
     this.db = new DatabaseSync(DB_PATH)
@@ -42,18 +44,23 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
         product_id TEXT,
         recipe_id  TEXT,
         run_id     TEXT,
+        ingested_at INTEGER,
         PRIMARY KEY (node_id, ts_ms)
       );
       CREATE INDEX IF NOT EXISTS idx_daq_node_ts ON daq_samples (node_id, ts_ms DESC);
     `)
     // 存量库迁移:先补打标列(幂等),再建依赖列的索引
     const cols = new Set((this.db.prepare('PRAGMA table_info(daq_samples)').all() as Array<{ name: string }>).map(c => c.name))
-    for (const [col, ddl] of [['line_id', 'ALTER TABLE daq_samples ADD COLUMN line_id TEXT'], ['product_id', 'ALTER TABLE daq_samples ADD COLUMN product_id TEXT'], ['recipe_id', 'ALTER TABLE daq_samples ADD COLUMN recipe_id TEXT'], ['run_id', 'ALTER TABLE daq_samples ADD COLUMN run_id TEXT']] as const) {
-      if (!cols.has(col)) this.db.exec(ddl)
-    }
+    if (!cols.has('line_id')) this.db.exec('ALTER TABLE daq_samples ADD COLUMN line_id TEXT')
+    if (!cols.has('product_id')) this.db.exec('ALTER TABLE daq_samples ADD COLUMN product_id TEXT')
+    if (!cols.has('recipe_id')) this.db.exec('ALTER TABLE daq_samples ADD COLUMN recipe_id TEXT')
+    if (!cols.has('run_id')) this.db.exec('ALTER TABLE daq_samples ADD COLUMN run_id TEXT')
+    // 到达时间(首次入库);旧行为 NULL = unknown,不得用于严格在线回放
+    if (!cols.has('ingested_at')) this.db.exec('ALTER TABLE daq_samples ADD COLUMN ingested_at INTEGER')
     this.db.exec(`
       CREATE INDEX IF NOT EXISTS idx_daq_tag ON daq_samples (product_id, recipe_id, ts_ms DESC);
       CREATE INDEX IF NOT EXISTS idx_daq_run ON daq_samples (run_id, ts_ms DESC);
+      CREATE INDEX IF NOT EXISTS idx_daq_page ON daq_samples (node_id, ts_ms ASC);
     `)
     // 帧表(v2:向量/图像;meta/metrics JSON 序列化 TEXT,与 Timescale 契约对齐)
     this.db.exec(`
@@ -83,7 +90,8 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
     }
   }
 
-  /** 保留期清理:分批 DELETE(单批 5000 行,避免长事务锁库) */
+  /** 保留期清理:分批 DELETE(单批 5000 行,避免长事务锁库)
+   *  C6:迟到但新鲜的点不能被事件时间误删 —— 需要 ts_ms 与 ingested_at 都过期才删。 */
   private sweepRetention(): void {
     if (!this.db) return
     const cutoff = Date.now() - this.retentionH * 3600_000
@@ -91,8 +99,12 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
       let removed = 0
       for (;;) {
         const r = this.db.prepare(
-          'DELETE FROM daq_samples WHERE rowid IN (SELECT rowid FROM daq_samples WHERE ts_ms < ? LIMIT 5000)',
-        ).run(cutoff)
+          `DELETE FROM daq_samples WHERE rowid IN (
+             SELECT rowid FROM daq_samples
+             WHERE ts_ms < ? AND (ingested_at IS NULL OR ingested_at < ?)
+             LIMIT 5000
+           )`,
+        ).run(cutoff, cutoff)
         removed += Number(r.changes)
         if (Number(r.changes) < 5000) break
       }
@@ -107,11 +119,22 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
     if (!this.db || rows.length === 0) return
     // 批内单事务:一次 fsync 落整批(逐行 run 会每行一次 WAL fsync,写放大)
     const ins = this.db.prepare(
-      'INSERT OR IGNORE INTO daq_samples (node_id, ts_ms, value, state, line_id, product_id, recipe_id, run_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+      'INSERT OR IGNORE INTO daq_samples (node_id, ts_ms, value, state, line_id, product_id, recipe_id, run_id, ingested_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
     )
+    const existing = this.db.prepare('SELECT value, state FROM daq_samples WHERE node_id = ? AND ts_ms = ?')
+    const now = Date.now()
     this.db.exec('BEGIN')
     try {
-      for (const r of rows) ins.run(r.nodeId, r.tsMs, r.value, r.state, r.lineId ?? null, r.productId ?? null, r.recipeId ?? null, r.runId ?? null)
+      for (const r of rows) {
+        const res = ins.run(r.nodeId, r.tsMs, r.value, r.state, r.lineId ?? null, r.productId ?? null, r.recipeId ?? null, r.runId ?? null, r.ingestedAt ?? now)
+        // 首写胜出:同键二次写入被忽略。若值/状态不同,计数使丢弃可观测(不静默更正)。
+        if (Number(res.changes) === 0) {
+          const prev = existing.get(r.nodeId, r.tsMs) as { value: number, state: string } | undefined
+          if (prev && (Math.abs(Number(prev.value) - Number(r.value)) > 1e-9 || String(prev.state) !== String(r.state))) {
+            this.correctionDropped++
+          }
+        }
+      }
       this.db.exec('COMMIT')
     }
     catch (err) {
@@ -123,6 +146,10 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
     }
   }
 
+  stats(): import('./tsdb-port').TsdbStats {
+    return { correctionDropped: this.correctionDropped }
+  }
+
   async query(nodeId: string, opts: DaqQueryOpts): Promise<TsdbPoint[]> {
     if (!this.db) return []
     const limit = Math.max(1, Math.min(opts.limit ?? 500, 5000))
@@ -198,26 +225,58 @@ export class SqliteTimeSeriesAdapter implements TsdbPort {
       return out
     }
     const rows = (this.db.prepare(`
-      SELECT node_id, ts_ms, value FROM daq_samples WHERE ${where.join(' AND ')}
+      SELECT node_id, ts_ms, value, state, ingested_at FROM daq_samples WHERE ${where.join(' AND ')}
       ORDER BY ts_ms ASC LIMIT ?
-    `).all(...params, limit)) as Array<{ node_id: string, ts_ms: number, value: number }>
+    `).all(...params, limit)) as Array<{ node_id: string, ts_ms: number, value: number, state: string, ingested_at: number | null }>
     for (const r of rows) {
       const list = out.get(r.node_id) ?? []
-      list.push({ at: Number(r.ts_ms), value: Number(r.value) })
+      // state 必须真实返回:C5 修复前恒 undefined,cleanPoints 的坏点过滤是空操作。
+      list.push({ at: Number(r.ts_ms), value: Number(r.value), state: String(r.state ?? 'ok'), ...(r.ingested_at == null ? {} : { ingestedAt: Number(r.ingested_at) }) })
       out.set(r.node_id, list)
     }
     return out
   }
 
+  /** 逐节点 raw 分页(新增;C7):稳定 ASC、游标严格大于、每页限额、无漏无重。 */
+  async queryTaggedPage(nodeId: string, q: import('./tsdb-port').TsdbPageQuery = {}): Promise<import('./tsdb-port').TsdbPage> {
+    if (!this.db) return { nodeId, points: [], nextCursor: null, done: true }
+    const limit = Math.max(1, Math.min(q.limit ?? 5000, 500_000))
+    const from = Math.max(q.fromMs ?? 0, (q.afterTs ?? -1) + 1)
+    const to = q.toMs ?? Date.now()
+    const withState = q.withState !== false
+    const rows = (withState
+      ? this.db.prepare(`
+          SELECT ts_ms, value, state, ingested_at FROM daq_samples
+          WHERE node_id = ? AND ts_ms >= ? AND ts_ms <= ?
+          ORDER BY ts_ms ASC LIMIT ?
+        `).all(nodeId, from, to, limit)
+      : this.db.prepare(`
+          SELECT ts_ms, value FROM daq_samples
+          WHERE node_id = ? AND ts_ms >= ? AND ts_ms <= ?
+          ORDER BY ts_ms ASC LIMIT ?
+        `).all(nodeId, from, to, limit)) as Array<{ ts_ms: number, value: number, state?: string, ingested_at?: number | null }>
+    const points = rows.map(r => ({
+      at: Number(r.ts_ms),
+      value: Number(r.value),
+      ...(withState ? { state: String(r.state ?? 'ok') } : {}),
+      ...(r.ingested_at == null ? {} : { ingestedAt: Number(r.ingested_at) }),
+    }))
+    const done = points.length < limit
+    return { nodeId, points, nextCursor: done ? null : points[points.length - 1]?.at ?? null, done }
+  }
+
   async latest(): Promise<Map<string, DaqSampleRow>> {
     const out = new Map<string, DaqSampleRow>()
     if (!this.db) return out
     // SQLite 裸列保证:GROUP BY + MAX() 时裸列取自 max 所在行(命中 idx_daq_node_ts,免相关子查询)
     const rows = this.db.prepare(`
-      SELECT node_id, MAX(ts_ms) AS ts_ms, value, state FROM daq_samples GROUP BY node_id
-    `).all() as Array<{ node_id: string, ts_ms: number, value: number, state: string }>
+      SELECT node_id, MAX(ts_ms) AS ts_ms, value, state, ingested_at FROM daq_samples GROUP BY node_id
+    `).all() as Array<{ node_id: string, ts_ms: number, value: number, state: string, ingested_at: number | null }>
     for (const r of rows) {
-      out.set(r.node_id, { nodeId: r.node_id, tsMs: Number(r.ts_ms), value: Number(r.value), state: String(r.state) })
+      out.set(r.node_id, {
+        nodeId: r.node_id, tsMs: Number(r.ts_ms), value: Number(r.value), state: String(r.state),
+        ...(r.ingested_at == null ? {} : { ingestedAt: Number(r.ingested_at) }),
+      })
     }
     return out
   }

package/server/services/workshop/daq/storage/timescale.adapter.ts

@@ -22,6 +22,8 @@ export class TimescaleAdapter implements TsdbPort {
   private readonly retentionH = daqRuntimeSettings().tsRetentionH
   /** 帧保留期(daq.frameRetentionH;env DAQ_FRAME_RETENTION_H 兼容) */
   private readonly frameRetentionH = daqRuntimeSettings().frameRetentionH
+  /** 同键不同值被丢弃的帧数(C6 可观测计数,不静默) */
+  private correctionDropped = 0
 
   constructor(private readonly url: string) {}
 
@@ -48,10 +50,13 @@ export class TimescaleAdapter implements TsdbPort {
       'ALTER TABLE daq_samples ADD COLUMN IF NOT EXISTS product_id text',
       'ALTER TABLE daq_samples ADD COLUMN IF NOT EXISTS recipe_id text',
       'ALTER TABLE daq_samples ADD COLUMN IF NOT EXISTS run_id text',
+      // 到达时间(首次入库;旧行为 NULL = unknown)
+      'ALTER TABLE daq_samples ADD COLUMN IF NOT EXISTS ingested_at bigint',
     ]) {
       await this.pool.query(ddl).catch(() => {})
     }
     await this.pool.query(`CREATE INDEX IF NOT EXISTS idx_daq_samples_tag ON daq_samples (product_id, recipe_id, ts DESC)`).catch(() => {})
+    await this.pool.query(`CREATE INDEX IF NOT EXISTS idx_daq_samples_page ON daq_samples (node_id, ts ASC)`).catch(() => {})
     // 帧表(v2:向量/图像元数据;像素 blob 在对象存储,JSONB 承载点列与派生指标;
     // DDL 为静态字面量,零外部输入)
     await this.pool.query('CREATE TABLE IF NOT EXISTS daq_frames (node_id text NOT NULL, ts timestamptz NOT NULL, kind text NOT NULL, template_key text, device_binding_id text, line_id text, product_id text, recipe_id text, run_id text, points integer NOT NULL DEFAULT 0, meta jsonb NOT NULL DEFAULT \'{}\'::jsonb, metrics jsonb NOT NULL DEFAULT \'{}\'::jsonb, PRIMARY KEY (node_id, ts))').catch(() => {})
@@ -122,17 +127,35 @@ export class TimescaleAdapter implements TsdbPort {
 
   async writeSamples(rows: DaqSampleRow[]): Promise<void> {
     if (!this.pool || rows.length === 0) return
-    const values: unknown[] = []
-    const tuples = rows.map((r, i) => {
-      values.push(r.nodeId, new Date(r.tsMs).toISOString(), r.value, r.state, r.lineId ?? null, r.productId ?? null, r.recipeId ?? null, r.runId ?? null)
-      const b = i * 8
-      return `($${b + 1}, $${b + 2}, $${b + 3}, $${b + 4}, $${b + 5}, $${b + 6}, $${b + 7}, $${b + 8})`
-    })
-    await this.pool.query(
-      `INSERT INTO daq_samples (node_id, ts, value, state, line_id, product_id, recipe_id, run_id) VALUES ${tuples.join(',')}
-       ON CONFLICT (node_id, ts) DO NOTHING`,
-      values,
-    )
+    const now = Date.now()
+    // 数组化参数(unnest):纯占位符,不拼接任何值,也不拼接占位符串。
+    const col = {
+      node: rows.map(r => r.nodeId),
+      ts: rows.map(r => new Date(r.tsMs).toISOString()),
+      value: rows.map(r => r.value),
+      state: rows.map(r => r.state),
+      line: rows.map(r => r.lineId ?? null),
+      product: rows.map(r => r.productId ?? null),
+      recipe: rows.map(r => r.recipeId ?? null),
+      run: rows.map(r => r.runId ?? null),
+      ingested: rows.map(r => r.ingestedAt ?? now),
+    }
+    const inserted = await this.pool.query(
+      `INSERT INTO daq_samples (node_id, ts, value, state, line_id, product_id, recipe_id, run_id, ingested_at)
+       SELECT * FROM unnest($1::text[], $2::timestamptz[], $3::float8[], $4::text[], $5::text[], $6::text[], $7::text[], $8::text[], $9::bigint[])
+       ON CONFLICT (node_id, ts) DO NOTHING
+       RETURNING node_id, ts`,
+      [col.node, col.ts, col.value, col.state, col.line, col.product, col.recipe, col.run, col.ingested],
+    ) as { rows: Array<{ node_id: string, ts: string }> }
+    // 首写胜出:被忽略的键里,值/状态不同则计数(可观测,不静默更正)
+    const insertedKeys = new Set(inserted.rows.map(r => `${r.node_id}\u0000${r.ts}`))
+    for (const r of rows) {
+      const key = `${r.nodeId}\u0000${new Date(r.tsMs).toISOString()}`
+      if (insertedKeys.has(key)) continue
+      const prev = await this.pool.query('SELECT value, state FROM daq_samples WHERE node_id = $1 AND ts = $2', [r.nodeId, new Date(r.tsMs).toISOString()]) as { rows: Array<{ value: number, state: string }> }
+      const row = prev.rows[0]
+      if (row && (Math.abs(Number(row.value) - Number(r.value)) > 1e-9 || String(row.state) !== String(r.state))) this.correctionDropped++
+    }
   }
 
   async query(nodeId: string, opts: DaqQueryOpts): Promise<TsdbPoint[]> {

package/server/services/workshop/daq/storage/tsdb-port.ts

@@ -18,6 +18,8 @@ export interface DaqSampleRow {
   tsMs: number
   value: number
   state: string
+  /** 平台首次入库时间(epoch ms;首写胜出,同键更正帧本期不支持 → C6) */
+  ingestedAt?: number | null
   /** 产线批次打标(活动 LineRun 窗口内的样本逐条携带;null = 线体空闲段) */
   lineId?: string | null
   productId?: string | null
@@ -43,6 +45,8 @@ export interface TsdbPoint {
   max?: number
   cnt?: number
   state?: string
+  /** 首次入库时间(仅逐节点分页/raw 返回;旧数据为 undefined = unknown) */
+  ingestedAt?: number
 }
 
 /** 跨通道打标查询(产线数据隔离:产品/配方/批次/通道/时间/桶) */
@@ -59,6 +63,33 @@ export interface TsdbTagQuery {
   limit?: number
 }
 
+/**
+ * 逐节点 raw 分页(C7):单节点、稳定 ASC、游标严格 ts_ms > afterTs。
+ * 与 queryTagged 的"nodeIds 集合总量 limit"语义**并存而不改**旧语义。
+ */
+export interface TsdbPageQuery {
+  afterTs?: number
+  fromMs?: number
+  toMs?: number
+  /** 每页上限(默认 5000,最大 50 万) */
+  limit?: number
+  /** 置 false 可省 state 列(默认 true) */
+  withState?: boolean
+}
+
+export interface TsdbPage {
+  nodeId: string
+  points: TsdbPoint[]
+  /** 下一页游标(= 本页最后 at);done=true 时为 null */
+  nextCursor: number | null
+  done: boolean
+}
+
+export interface TsdbStats {
+  /** 同 (node,ts) 二次写入不同值时被丢弃的帧数(可观测,不静默) */
+  correctionDropped: number
+}
+
 export interface TsdbPort {
   /** 后端标识(sqlite-emulated | timescale)——REST meta 直报前端 */
   readonly backend: string
@@ -67,8 +98,13 @@ export interface TsdbPort {
   query(nodeId: string, opts: DaqQueryOpts): Promise<TsdbPoint[]>
   /** 按产线打标跨通道查询(产品/配方隔离) */
   queryTagged(q: TsdbTagQuery): Promise<Map<string, TsdbPoint[]>>
+  /** 逐节点分页 raw(新增;旧 queryTagged 零改动)。
+   *  可选实现:后端不支持时调用方退化为逐节点 query()(见 dataset-builder)。 */
+  queryTaggedPage?(nodeId: string, q?: TsdbPageQuery): Promise<TsdbPage>
   /** 各节点最近一个样本(列表页值列兜底) */
   latest(): Promise<Map<string, DaqSampleRow>>
+  /** 运行观测(更正丢弃计数等;可选) */
+  stats?(): TsdbStats
   // ===== 多形态帧(v2:向量/图像;像素 blob 在对象存储,这里只存元数据+派生指标)=====
   writeFrames(rows: DaqFrameRow[]): Promise<void>
   queryFrames(nodeId: string, opts: DaqFrameQueryOpts): Promise<DaqFrameRecord[]>

package/server/services/workshop/db/channel-agent.repo.ts

@@ -4,10 +4,27 @@
  * name/harness/config + 独立 role + token。
  * 工厂接收 DatabaseSync(依赖注入),不持有任何单例。
  */
-import { randomUUID } from 'node:crypto'
+import { randomUUID, timingSafeEqual } from 'node:crypto'
 import type { DatabaseSync } from 'node:sqlite'
 import type { ChannelAgentRow } from './database'
 
+/**
+ * token 比对(定长归一 + 常量时间):长度不同直接 false,不抛异常。
+ * WP3 单点:所有 JS 侧 token 比较必须走本函数(或在 repo.findByToken 内同口径)。
+ */
+export function safeTokenEqual(a: string, b: string): boolean {
+  if (!a || !b) return false
+  const ab = Buffer.from(a, 'utf8')
+  const bb = Buffer.from(b, 'utf8')
+  if (ab.length !== bb.length) return false
+  try {
+    return timingSafeEqual(ab, bb)
+  }
+  catch {
+    return false
+  }
+}
+
 export interface ChannelAgentCreateInput {
   channelId: string
   templateId: string | null
@@ -40,6 +57,10 @@ export function createChannelAgentRepo(db: DatabaseSync) {
   const selectById = db.prepare(`SELECT ${COLS} FROM channel_agents WHERE id = ?`)
   const selectByChannelAgent = db.prepare(`SELECT ${COLS} FROM channel_agents WHERE channel_id = ? AND id = ?`)
   const selectByToken = db.prepare(`SELECT ${COLS} FROM channel_agents WHERE token = ?`)
+  /** WP3 宽限窗:旧 token 在 prev_token_until 之前仍然有效(桥进程重连过渡) */
+  const selectByPrevToken = db.prepare(`SELECT ${COLS} FROM channel_agents WHERE prev_token = ? AND prev_token_until > ?`)
+  const selectGrace = db.prepare(`SELECT prev_token AS prevToken, prev_token_until AS prevTokenUntil FROM channel_agents WHERE id = ?`)
+  const rotateStmt = db.prepare(`UPDATE channel_agents SET prev_token = token, prev_token_until = ?, token = ?, updated_at = ? WHERE id = ?`)
   const selectByTemplate = db.prepare(`SELECT ${COLS} FROM channel_agents WHERE template_id = ? ORDER BY created_at ASC`)
   const updateStmt = db.prepare(
     `UPDATE channel_agents SET name = ?, harness = ?, config_json = ?, role = ?, enabled = ?, updated_at = ? WHERE id = ?`,
@@ -84,9 +105,43 @@ export function createChannelAgentRepo(db: DatabaseSync) {
       return selectByChannelAgent.get(channelId, id) as unknown as ChannelAgentRow | undefined
     },
 
-    /** 实例级 token → 实例(MCP/REST caller 解析) */
+    /**
+     * 实例级 token → 实例(MCP/REST caller 解析)。
+     * WP3:宽限窗内旧 token 同样命中 —— 四路调用点(invoke/list/面A/manager)共用本方法,
+     * 因此「轮换后桥 60s 内可用」在全部路径成立,而不是只改某一处比较。
+     */
     findByToken(token: string): ChannelAgentRow | undefined {
-      return selectByToken.get(token) as unknown as ChannelAgentRow | undefined
+      if (!token) return undefined
+      const current = selectByToken.get(token) as unknown as ChannelAgentRow | undefined
+      if (current) return current
+      return selectByPrevToken.get(token, new Date().toISOString()) as unknown as ChannelAgentRow | undefined
+    },
+
+    /**
+     * 单点 token 校验(常量时间):当前 token 命中,或旧 token 仍在宽限窗内。
+     * 供已持有行对象、不想再查一次库的调用点使用(host-tools 等)。
+     */
+    isTokenValid(row: ChannelAgentRow, token: string): boolean {
+      if (!token) return false
+      if (safeTokenEqual(row.token, token)) return true
+      const grace = selectGrace.get(row.id) as { prevToken: string, prevTokenUntil: string } | undefined
+      if (!grace?.prevToken || !grace.prevTokenUntil) return false
+      if (grace.prevTokenUntil <= new Date().toISOString()) return false
+      return safeTokenEqual(grace.prevToken, token)
+    },
+
+    /**
+     * 轮换 token(WP3):旧 token 写入宽限列,新 token 立即生效。
+     * 未命中返回 undefined;宽限窗缺省 60s(env AW_TOKEN_GRACE_MS 可调,上限 1h)。
+     */
+    rotateToken(id: string, graceMs?: number): { id: string, token: string, prevTokenUntil: string } | undefined {
+      const row = selectById.get(id) as unknown as ChannelAgentRow | undefined
+      if (!row) return undefined
+      const window = Math.min(Math.max(Number(graceMs ?? process.env.AW_TOKEN_GRACE_MS ?? 60_000), 0), 3600_000)
+      const until = new Date(Date.now() + window).toISOString()
+      const next = randomUUID()
+      rotateStmt.run(until, next, new Date().toISOString(), id)
+      return { id, token: next, prevTokenUntil: until }
     },
 
     /** 某模板克隆出的全部实例(跨 channel) */

package/server/services/workshop/db/database/migrations.ts

@@ -46,6 +46,17 @@ export function migrateAddColumn(db: DatabaseSync, table: string, column: string
   }
 }
 
+/**
+ * v31(2026-10-24 WP3):agent token 轮换宽限列。
+ * 轮换时把旧 token 与其失效时刻写入 prev_token/prev_token_until,宽限窗内双接受
+ * (桥进程 60s 内自动重连);过期后旧 token 彻底 401。
+ * 加列式迁移:既有库安全,历史行 prev_token 为空 = 无宽限。
+ */
+export function migrateAgentTokenGraceColumns(db: DatabaseSync): void {
+  migrateAddColumn(db, 'channel_agents', 'prev_token', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'channel_agents', 'prev_token_until', 'TEXT NOT NULL DEFAULT \'\'')
+}
+
 /**
  * 产线 Co-Pilot P2:审批历史结构化载荷列(加列式迁移,既有行安全 —— 历史行
  * payload_json 为 NULL、choice 为 NULL,读取层按「空则文本降级」处理,不回填改史)。
@@ -454,3 +465,67 @@ export function migrateAnalysisEditColumns(db: DatabaseSync): void {
   migrateAddColumn(db, 'analysis_reports', 'updated_by', 'TEXT NOT NULL DEFAULT \'\'')
   migrateAddColumn(db, 'analysis_reports', 'updated_by_name', 'TEXT NOT NULL DEFAULT \'\'')
 }
+
+/**
+ * v29:Optimizer Manager + Process Model Service 的地基列(2026-10-22 计划 G1.3)。
+ *
+ * 新表由 SCHEMA_SQL 幂等建表覆盖;这里只补**既有表**的新列(加列式迁移,既有行安全):
+ *  - aml_datasets/aml_jobs/aml_models:工件类型判别与谱系引用(历史行空串 = legacy,
+ *    由 model-registry 的 resolveArtifactKindOfModel 从 metrics 推断,不伪造新语义);
+ *  - twin_recommendations:legacy 标记,旧证书不追溯重算;
+ *  - optimizer_bindings:channel_agents 删除时级联由 DDL 保证(FK),无需补。
+ */
+export function migrateOptimizerFoundationColumns(db: DatabaseSync): void {
+  migrateAddColumn(db, 'aml_datasets', 'spec_ref', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'aml_datasets', 'spec_version', 'INTEGER')
+  migrateAddColumn(db, 'aml_datasets', 'recipe_version', 'INTEGER')
+  migrateAddColumn(db, 'aml_datasets', 'manifest_version', 'INTEGER NOT NULL DEFAULT 1')
+  migrateAddColumn(db, 'aml_datasets', 'content_hash', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'aml_datasets', 'trainer_ref', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'aml_datasets', 'evidence_source', 'TEXT NOT NULL DEFAULT \'real\'')
+
+  migrateAddColumn(db, 'aml_jobs', 'model_id', 'TEXT')
+  migrateAddColumn(db, 'aml_jobs', 'trainer_ref', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'aml_jobs', 'artifact_kind', 'TEXT NOT NULL DEFAULT \'\'')
+
+  migrateAddColumn(db, 'aml_models', 'artifact_kind', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'aml_models', 'schema_version', 'INTEGER NOT NULL DEFAULT 1')
+  migrateAddColumn(db, 'aml_models', 'model_interface', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'aml_models', 'artifact_hash', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'aml_models', 'legacy', 'TEXT NOT NULL DEFAULT \'\'')
+  db.exec('CREATE INDEX IF NOT EXISTS idx_aml_models_artifact ON aml_models(artifact_kind, stage)')
+
+  migrateAddColumn(db, 'twin_recommendations', 'legacy', 'TEXT NOT NULL DEFAULT \'\'')
+  // 旧证书一次性打标:历史行签发口径是末拍代价(旧 twin_v1),不重算不发新证书。
+  db.exec('UPDATE twin_recommendations SET legacy = \'twin_v1\' WHERE legacy = \'\'')
+  // Optimizer Profile 内容 hash(发布不可变校验);新表可能由旧版本创建,补列幂等。
+  migrateAddColumn(db, 'optimizer_profiles', 'content_hash', 'TEXT NOT NULL DEFAULT \'\'')
+  // 新表引用保护需要的反向索引(删除模型前按 model_ref 扫描)
+  db.exec('CREATE INDEX IF NOT EXISTS idx_optimizer_profiles_model_ref ON optimizer_profiles(model_ref, status)')
+  db.exec('CREATE INDEX IF NOT EXISTS idx_optimizer_bindings_agent ON optimizer_bindings(channel_agent_id, profile_id)')
+}
+
+/**
+ * v30:双驱动收敛列(总计划 SW2–SW5;expand/contract —— 只加可空/带默认列,只前滚)。
+ * - aml_datasets.lineage_verified:D18 数据谱系(0=未核验禁优化资格;新 builder 每 run 有 confirmed segment 才置 1)
+ * - optimizer_recommendations 下发状态机(D14):dispatch_state idle→dispatched→committed→executed|failed|cancelled|denied|expired;
+ *   旧行回填 idle(历史建议从未建卡,dispatched_at 派生仅供对账)
+ * - optimizer_profiles.problem_ir_hashes_json:D21 多工况按 condition 冻结 hash(空 = 单 hash 旧形态)
+ * - process_model_eligibility.dataset_id/dataset_hash:D20 精确资格谱系
+ */
+export function migrateDualDriveColumns(db: DatabaseSync): void {
+  migrateAddColumn(db, 'aml_datasets', 'lineage_verified', 'INTEGER NOT NULL DEFAULT 0')
+
+  migrateAddColumn(db, 'optimizer_recommendations', 'dispatched_at', 'TEXT')
+  migrateAddColumn(db, 'optimizer_recommendations', 'approval_id', 'TEXT')
+  migrateAddColumn(db, 'optimizer_recommendations', 'initiator_user_id', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'optimizer_recommendations', 'dispatch_state', 'TEXT NOT NULL DEFAULT \'idle\'')
+  // 旧库可能曾被写入过 dispatched 状态(防重):按幂等锚派生,未建卡的一律 idle
+  db.exec('UPDATE optimizer_recommendations SET dispatch_state = \'idle\' WHERE dispatch_state = \'dispatched\' AND dispatched_at IS NULL')
+  // 候选行携带求解模型(SW4 互校锚;旧行为空 → 互校回退 run.profile 解析)
+  migrateAddColumn(db, 'optimizer_candidates', 'model_id', 'TEXT NOT NULL DEFAULT \'\'')
+
+  migrateAddColumn(db, 'optimizer_profiles', 'problem_ir_hashes_json', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'process_model_eligibility', 'dataset_id', 'TEXT NOT NULL DEFAULT \'\'')
+  migrateAddColumn(db, 'process_model_eligibility', 'dataset_hash', 'TEXT NOT NULL DEFAULT \'\'')
+}

package/server/services/workshop/db/database/open.ts

@@ -6,7 +6,7 @@ import type * as sqliteVec from 'sqlite-vec'
 import { DatabaseSync } from 'node:sqlite'
 import { SCHEMA_SQL } from './schema'
 import { createRequire } from 'node:module'
-import { migrateAddColumn, migrateAgentTeamExecutionLeaseColumns, migrateAgentTeamTaskGuardrailColumns, migrateAgentTeamTaskGuardrails, migrateAgentTeamTaskQueueColumns, migrateAmlChannelOptimizationColumns, migrateAmlModelIdentityColumns, migrateAnalysisEditColumns, migrateApprovalPayloadColumns, migrateAuditQueryIndexes, migrateAuditScopeColumn, migrateDropOwnerFks, migrateGroupChatV17, migrateLegacySchema, migrateMissingForeignKeys, migrateAmlTwinProviderColumns } from './migrations'
+import { migrateAddColumn, migrateAgentTeamExecutionLeaseColumns, migrateAgentTeamTaskGuardrailColumns, migrateAgentTeamTaskGuardrails, migrateAgentTeamTaskQueueColumns, migrateAmlChannelOptimizationColumns, migrateAmlModelIdentityColumns, migrateAnalysisEditColumns, migrateApprovalPayloadColumns, migrateAuditQueryIndexes, migrateAuditScopeColumn, migrateDropOwnerFks, migrateDualDriveColumns, migrateGroupChatV17, migrateLegacySchema, migrateMissingForeignKeys, migrateAmlTwinProviderColumns, migrateOptimizerFoundationColumns, migrateAgentTokenGraceColumns } from './migrations'
 import { seedDefaultWorkshopData } from './seed'
 
 export const require = createRequire(import.meta.url)
@@ -74,6 +74,12 @@ export function initWorkshopDb(db: DatabaseSync): void {
   migrateApprovalPayloadColumns(db)
   // v27:数据分析报告人工修订列(updated_*;既有库补列,新库 DDL 已含)
   migrateAnalysisEditColumns(db)
+  // v29:Optimizer/Process Model 地基列(工件类型判别、谱系引用、legacy 标记)
+  migrateOptimizerFoundationColumns(db)
+  // v30:双驱动收敛列(下发状态机/谱系/多工况 hash/资格谱系;总计划 SW2–SW5)
+  migrateDualDriveColumns(db)
+  // v31(WP3):agent token 轮换宽限列(prev_token/prev_token_until;既有库补列)
+  migrateAgentTokenGraceColumns(db)
   seedDefaultWorkshopData(db)
 }