agentworkshop 0.7.47 → 0.7.49

package/server/services/workshop/runtime/manager/state.ts

@@ -221,12 +221,18 @@ export abstract class ManagerState extends ManagerContracts {
     }
   }
 
+  /**
+   * 按需装配频道(lead 运行时 + SchedulerLoop,幂等)。实现位于装配层
+   * `ManagerRuntimeWiring.ensureChannelActive`;基类只声明,调用点在任务事件钩子里。
+   */
+  protected abstract ensureChannelActive(channelId: string): void
+
   protected getTaskEngine(): TaskEngine {
     if (!this.taskEngine) {
       const factory = this.deps.taskEngineFactory ?? (r => new TaskEngineImpl(r, {
         onTaskChange: (e) => {
-          // 全字段转发(含 progress):TaskEngine 内部进度变化(applyEvent 分块折算 /
-          // complete 置 100)须经总线 → WS task.progress 实时同步,否则前端实体进度滞后
+        // 全字段转发(含 progress):TaskEngine 内部进度变化(applyEvent 分块折算 /
+        // complete 置 100)须经总线 → WS task.progress 实时同步,否则前端实体进度滞后
           this.buses.get(e.channelId)?.notifyTask({
             taskId: e.taskId,
             state: e.state,
@@ -237,8 +243,19 @@ export abstract class ManagerState extends ManagerContracts {
             reassignFrom: e.reassignFrom,
             reason: e.reason,
           })
-          // 事件驱动调度:任务状态变化即唤醒该频道调度循环(空闲退避即刻恢复快节奏)
-          this.channels.get(e.channelId)?.scheduler?.wake()
+          // 事件驱动调度:任务状态变化即唤醒该频道调度循环(空闲退避即刻恢复快节奏)。
+          //
+          // ⚠️ 只 wake 不够:lead 运行时因空闲被清扫卸载后 `cr.scheduler` 会被置空
+          // (见 runtime-wiring.attachScheduler 注释),此后新建的根任务只落库,
+          // `scheduler?.wake()` 变成空操作 —— 任务永久停在 SUBMITTED,直到
+          // ROOT_TIMEOUT(~18 分钟)被判 FAILED(实测复现:mock Channel 第一条根任务
+          // COMPLETED,后续两条一直 SUBMITTED;omp Channel 同样如此)。
+          // `reviveScheduler` 只在"lead 正在被装配"的窗口里被调用,没有别的事件会重建
+          // 调度循环,所以这里补上**重新挂载**的分支:没有 scheduler 就按需装配 lead +
+          // 调度循环(ensureChannelActive 幂等;频道停用/无 lead 时内部直接返回)。
+          const cr = this.channels.get(e.channelId)
+          if (cr?.scheduler) cr.scheduler.wake()
+          else if (e.state === 'SUBMITTED' || e.state === 'ASSIGNED') ((this as unknown) as { ensureChannelActive: (channelId: string) => void }).ensureChannelActive(e.channelId)
         },
       }))
       this.taskEngine = factory({ tasks: this.deps.repos.tasks, messages: this.deps.repos.messages })

package/.output/public/_nuxt/builds/meta/1b18aaf2-ccbc-45e0-b9c3-107655b226f9.json

@@ -1 +0,0 @@
-{"id":"1b18aaf2-ccbc-45e0-b9c3-107655b226f9","timestamp":1790321904277,"prerendered":[]}

package/scripts/_probe-density.cjs

@@ -1,15 +0,0 @@
-/** 临时:探测 daq_samples 采样密度(评估 AML beatMs 可下调空间) */
-const { Client } = require('pg')
-;(async () => {
-  const c = new Client({ host: '127.0.0.1', port: 5432, user: 'postgres', password: 'awshop', database: 'awshop' })
-  await c.connect()
-  const q = (sql) => c.query(sql).then(r => r.rows)
-  const rows = await q(`select node_id, count(*)::int n, min(ts) a, max(ts) b,
-      round(extract(epoch from (max(ts)-min(ts)))/greatest(count(*)-1,1),2) avg_gap_s
-    from daq_samples where ts > now() - interval '45 minutes'
-    group by node_id order by n desc limit 12`)
-  console.table(rows)
-  const t = await q(`select count(*)::int total, count(distinct node_id)::int nodes from daq_samples where ts > now() - interval '45 minutes'`)
-  console.log('total', t)
-  await c.end()
-})().catch(e => { console.error(e.message); process.exit(1) })

package/scripts/_probe-gate-model.mjs

@@ -1,34 +0,0 @@
-/** 临时:看 twin_gate_evaluate 的 modelUpdate 尾部 + 最近作业来源 */
-import { DatabaseSync } from 'node:sqlite'
-const BASE = 'http://127.0.0.1:3001'
-const ADMIN = { email: 'admin@awshop.local', password: 'Awshop@123!' }
-
-const j = async (method, path, body, token) => {
-  const r = await fetch(BASE + path, { method, headers: { 'content-type': 'application/json', ...(token ? { authorization: `Bearer ${token}` } : {}) }, body: body === undefined ? undefined : JSON.stringify(body) })
-  return { status: r.status, ...(await r.json().catch(() => ({}))) }
-}
-const token = (await j('POST', '/api/users/login', ADMIN)).data?.token
-const chans = (await j('GET', '/api/workshop/channels', undefined, token)).data ?? []
-const twin = chans.find(c => /闭环优化-hybridtwin/.test(c.name))
-const members = (await j('GET', `/api/workshop/channels/${twin.id}/agents`, undefined, token)).data ?? []
-const lead = members.find(m => m.role === 'lead')
-const models = ((await j('GET', '/api/workshop/aml/models', undefined, token)).data?.models ?? [])
-const prod = models.find(m => m.stage === 'production')
-console.log('production model =', prod?.id, 'ds =', prod?.datasetId)
-
-const res = await j('POST', '/api/workshop/agent-tools/invoke', {
-  agentId: lead.id,
-  tool: 'twin_gate_evaluate',
-  args: { rows: 1724, runs: 10, one_step_nrmse: 0.0763, rollout_nrmse: 0.0964, val_test_gap: 0.1072, calibration_rows: 1724, coverage: 1, candidate_trials: [], physics_failure_rate: 0, model_id: prod?.id ?? '' },
-}, token)
-const text = String(res.data?.result?.text ?? '')
-const tail = text.slice(-700)
-console.log('--- gate tail ---')
-console.log(tail)
-console.log('--- parsed keys ---', Object.keys(JSON.parse(text)).join(','))
-
-const db = new DatabaseSync('D:/codes/ABO/AgentWorkShop/.aw0746-home/data/workshop.sqlite', { readOnly: true })
-const cols = db.prepare('pragma table_info(aml_jobs)').all().map(c => c.name)
-console.log('\naml_jobs columns:', cols.join(','))
-const pick = ['id', 'status', 'kind', 'created_by', 'change_note', 'created_at'].filter(c => cols.includes(c))
-for (const r of db.prepare(`select ${pick.join(',')} from aml_jobs order by created_at desc limit 6`).all()) console.log('  ', JSON.stringify(r).slice(0, 220))

package/scripts/_probe-model-eligibility.cjs

@@ -1,13 +0,0 @@
-/** 临时:检查 AML 模型 metrics_json 里的 twinEligibility 是否回写 */
-const { DatabaseSync } = require('node:sqlite')
-const db = new DatabaseSync('D:/codes/ABO/AgentWorkShop/.aw0746-home/data/workshop.sqlite', { readOnly: true })
-const rows = db.prepare('select id, stage, dataset_id, experiment_id, metrics_json from aml_models order by created_at desc limit 4').all()
-for (const r of rows) {
-  let m = {}
-  try { m = JSON.parse(r.metrics_json || '{}') } catch { m = { parse: 'fail' } }
-  console.log(`${r.id} stage=${r.stage} ds=${r.dataset_id} exp=${r.experiment_id}`)
-  console.log(`   twinEligibility=${JSON.stringify(m.twinEligibility ?? null)} oneStep=${m.oneStepTest?.nrmse}`)
-}
-const jobs = db.prepare('select id, status, created_by_kind, created_by, substr(change_note,1,60) note, created_at from aml_jobs order by created_at desc limit 6').all()
-console.log('\njobs:')
-for (const j of jobs) console.log(`  ${j.id} ${j.status} by=${j.created_by_kind}/${j.created_by} ${j.created_at} ${j.note}`)