agentworkshop 0.7.70 → 0.7.71

package/server/services/workshop/aml/retention.ts

@@ -1,98 +1,104 @@
-/**
- * AML GC/保留策略(挂 24h 循环;防冗余堆积 —— 计划 §14.1):
- *  1. 无引用且超过 retentionDays 的数据集:删快照目录 + 注册表行;
- *  2. retired 模型工件超过 retiredKeepDays:删工件目录(注册表行保留,标 artifacts_pruned);
- *  3. 失败作业目录(无任何实验成功)超过 7 天:删目录(注册表行保留)。
- */
-import { existsSync, rmSync } from 'node:fs'
-import { join } from 'node:path'
-import { createLogger } from '../logger'
-import { amlSettings } from '../settings'
-import { getAmlRuntime } from './runtime'
-
-const log = createLogger('aml.retention')
-const DAY_MS = 24 * 3600_000
-const FAILED_JOB_KEEP_DAYS = 7
-
-export function sweepAmlRetention(now = Date.now()): { datasets: number, models: number, jobs: number } {
-  const rt = getAmlRuntime()
-  const s = amlSettings()
-  let removedDatasets = 0
-  let removedModels = 0
-  let removedJobs = 0
-
-  // 1. 无引用数据集
-  for (const ds of rt.repo.dataset.list({ limit: 500 })) {
-    const age = now - Date.parse(ds.createdAt)
-    if (age < s.dataset.retentionDays * DAY_MS) continue
-    const refs = rt.repo.dataset.referenceCount(ds.id)
-    if (refs.experiments > 0 || refs.models > 0) continue
-    try {
-      if (existsSync(ds.path)) rmSync(ds.path, { recursive: true, force: true })
-      rt.repo.dataset.remove(ds.id)
-      removedDatasets++
-    }
-    catch (err) {
-      log.warn(`[aml-retention] 数据集 ${ds.id} 清理失败:${err instanceof Error ? err.message : String(err)}`)
-    }
-  }
-
-  // 2. retired 模型工件
-  for (const m of rt.repo.model.list({ stage: 'retired', limit: 500 })) {
-    if (m.artifactsPruned) continue
-    const age = now - Date.parse(m.promotedAt ?? m.createdAt)
-    if (age < s.model.retiredKeepDays * DAY_MS) continue
-    try {
-      if (existsSync(m.path)) rmSync(m.path, { recursive: true, force: true })
-      rt.repo.model.markPruned(m.id)
-      removedModels++
-    }
-    catch (err) {
-      log.warn(`[aml-retention] 模型 ${m.id} 工件清理失败:${err instanceof Error ? err.message : String(err)}`)
-    }
-  }
-
-  // 3. 失败/取消且终态超过 7 天的作业目录
-  for (const status of ['failed', 'cancelled', 'timeout', 'interrupted'] as const) {
-    for (const j of rt.repo.job.list({ status, limit: 200 })) {
-      if (!j.endedAt) continue
-      if (now - Date.parse(j.endedAt) < FAILED_JOB_KEEP_DAYS * DAY_MS) continue
-      const dir = join(rt.jobsDir, j.id)
-      try {
-        if (existsSync(dir)) rmSync(dir, { recursive: true, force: true })
-        removedJobs++
-      }
-      catch (err) {
-        log.warn(`[aml-retention] 作业 ${j.id} 目录清理失败:${err instanceof Error ? err.message : String(err)}`)
-      }
-    }
-  }
-
-  if (removedDatasets || removedModels || removedJobs) {
-    log.info(`[aml-retention] 清理完成:数据集 ${removedDatasets} / 模型工件 ${removedModels} / 作业目录 ${removedJobs}`)
-  }
-  return { datasets: removedDatasets, models: removedModels, jobs: removedJobs }
-}
-
-const g = globalThis as typeof globalThis & { __amlRetentionTimer?: ReturnType<typeof setInterval> }
-
-/** 启动 24h 循环(unref;HMR 幂等) */
-export function startAmlRetentionTimer(): void {
-  if (g.__amlRetentionTimer) return
-  g.__amlRetentionTimer = setInterval(() => {
-    try {
-      sweepAmlRetention()
-    }
-    catch (err) {
-      log.warn(`[aml-retention] 扫描失败(不阻断):${err instanceof Error ? err.message : String(err)}`)
-    }
-  }, 24 * 3600_000)
-  g.__amlRetentionTimer.unref()
-}
-
-export function stopAmlRetentionTimer(): void {
-  if (g.__amlRetentionTimer) {
-    clearInterval(g.__amlRetentionTimer)
-    g.__amlRetentionTimer = undefined
-  }
-}
+/**
+ * AML GC/保留策略(挂 24h 循环;防冗余堆积 —— 计划 §14.1):
+ *  1. 无引用且超过 retentionDays 的数据集:删快照目录 + 注册表行;
+ *  2. retired 模型工件超过 retiredKeepDays:删工件目录(注册表行保留,标 artifacts_pruned);
+ *  3. 失败作业目录(无任何实验成功)超过 7 天:删目录(注册表行保留)。
+ */
+import { existsSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { createLogger } from '../logger'
+import { amlSettings } from '../settings'
+import { getAmlRuntime } from './runtime'
+import { modelReferences } from './model-references'
+
+const log = createLogger('aml.retention')
+const DAY_MS = 24 * 3600_000
+const FAILED_JOB_KEEP_DAYS = 7
+
+export function sweepAmlRetention(now = Date.now()): { datasets: number, models: number, jobs: number } {
+  const rt = getAmlRuntime()
+  const s = amlSettings()
+  let removedDatasets = 0
+  let removedModels = 0
+  let removedJobs = 0
+
+  // 1. 无引用数据集
+  for (const ds of rt.repo.dataset.list({ limit: 500 })) {
+    const age = now - Date.parse(ds.createdAt)
+    if (age < s.dataset.retentionDays * DAY_MS) continue
+    const refs = rt.repo.dataset.referenceCount(ds.id)
+    if (refs.experiments > 0 || refs.models > 0) continue
+    try {
+      if (existsSync(ds.path)) rmSync(ds.path, { recursive: true, force: true })
+      rt.repo.dataset.remove(ds.id)
+      removedDatasets++
+    }
+    catch (err) {
+      log.warn(`[aml-retention] 数据集 ${ds.id} 清理失败:${err instanceof Error ? err.message : String(err)}`)
+    }
+  }
+
+  // 2. retired 模型工件
+  for (const m of rt.repo.model.list({ stage: 'retired', limit: 500 })) {
+    if (m.artifactsPruned) continue
+    const age = now - Date.parse(m.promotedAt ?? m.createdAt)
+    if (age < s.model.retiredKeepDays * DAY_MS) continue
+    // C13/A19:仍被 Channel profile / 训练计划 / Optimizer Profile / 在途租约引用 → 跳过
+    try {
+      if (modelReferences(rt.db, m.id).length > 0) continue
+    }
+    catch { continue }
+    try {
+      if (existsSync(m.path)) rmSync(m.path, { recursive: true, force: true })
+      rt.repo.model.markPruned(m.id)
+      removedModels++
+    }
+    catch (err) {
+      log.warn(`[aml-retention] 模型 ${m.id} 工件清理失败:${err instanceof Error ? err.message : String(err)}`)
+    }
+  }
+
+  // 3. 失败/取消且终态超过 7 天的作业目录
+  for (const status of ['failed', 'cancelled', 'timeout', 'interrupted'] as const) {
+    for (const j of rt.repo.job.list({ status, limit: 200 })) {
+      if (!j.endedAt) continue
+      if (now - Date.parse(j.endedAt) < FAILED_JOB_KEEP_DAYS * DAY_MS) continue
+      const dir = join(rt.jobsDir, j.id)
+      try {
+        if (existsSync(dir)) rmSync(dir, { recursive: true, force: true })
+        removedJobs++
+      }
+      catch (err) {
+        log.warn(`[aml-retention] 作业 ${j.id} 目录清理失败:${err instanceof Error ? err.message : String(err)}`)
+      }
+    }
+  }
+
+  if (removedDatasets || removedModels || removedJobs) {
+    log.info(`[aml-retention] 清理完成:数据集 ${removedDatasets} / 模型工件 ${removedModels} / 作业目录 ${removedJobs}`)
+  }
+  return { datasets: removedDatasets, models: removedModels, jobs: removedJobs }
+}
+
+const g = globalThis as typeof globalThis & { __amlRetentionTimer?: ReturnType<typeof setInterval> }
+
+/** 启动 24h 循环(unref;HMR 幂等) */
+export function startAmlRetentionTimer(): void {
+  if (g.__amlRetentionTimer) return
+  g.__amlRetentionTimer = setInterval(() => {
+    try {
+      sweepAmlRetention()
+    }
+    catch (err) {
+      log.warn(`[aml-retention] 扫描失败(不阻断):${err instanceof Error ? err.message : String(err)}`)
+    }
+  }, 24 * 3600_000)
+  g.__amlRetentionTimer.unref()
+}
+
+export function stopAmlRetentionTimer(): void {
+  if (g.__amlRetentionTimer) {
+    clearInterval(g.__amlRetentionTimer)
+    g.__amlRetentionTimer = undefined
+  }
+}

package/server/services/workshop/aml/twin/provider-contracts.ts

@@ -56,7 +56,51 @@ export interface TwinScenePack extends ScenePack { scenePackId?: string, version
 export interface SolverAdapterManifest { adapterId: string, version: string, backend?: string, capabilities?: Record<string, unknown>, inputSchema?: Record<string, unknown>, outputSchema?: Record<string, unknown>, metadata?: Record<string, unknown> }
 export interface SolverAdapter { manifest: SolverAdapterManifest, solve(input: unknown, limits?: Record<string, unknown>): Promise<unknown> | unknown, cancel?(runId: string): Promise<void>, health?(): Promise<ProviderHealth> | ProviderHealth }
 export interface TwinSolverAdapter extends SolverAdapter { solverId?: string }
-export interface TwinPluginContribution { providers?: TwinPhysicsProvider[], scenePacks?: ScenePack[], objectiveProfiles?: ObjectiveProfile[], solverAdapters?: SolverAdapter[] }
+
+/**
+ * 训练适配器:配置驱动的模型家族实现(plan G1.4)。
+ * 注册后 `registry.resolveTrainingAdapter('linear_arx@1')` 返回实现;未注册返回 null
+ * —— 不再"恒 accepted",避免配置能提交但没有执行者。
+ */
+export interface TrainingAdapterManifest {
+  adapterRef: string
+  version: string
+  /** 该训练器产出的工件类型(linear_state_space@1 / static_response@1 …) */
+  artifactKind: string
+  displayName?: string
+  description?: string
+  capabilities?: Record<string, unknown>
+}
+export interface TrainingAdapter {
+  manifest: TrainingAdapterManifest
+  train(input: unknown): Promise<unknown> | unknown
+}
+
+/** 目标/问题模板注册:ProblemTemplate 的编译实现(发布时真实解析,非 accepted 占位)。 */
+export interface ObjectiveAdapterManifest {
+  ref: string
+  version: string
+  /** 适用求解器族 */
+  solverFamilies?: string[]
+  displayName?: string
+  description?: string
+}
+export interface ObjectiveAdapter {
+  manifest: ObjectiveAdapterManifest
+  compile(input: unknown): Promise<unknown> | unknown
+}
+
+export interface SolverAdapterLease {
+  refId: string
+  adapterId: string
+  version: string
+  adapter: SolverAdapter
+  generation?: number
+  released: boolean
+  release(): void
+}
+
+export interface TwinPluginContribution { providers?: TwinPhysicsProvider[], physicsProviders?: TwinPhysicsProvider[], scenePacks?: ScenePack[], objectiveProfiles?: ObjectiveAdapter[], solverAdapters?: SolverAdapter[], trainingAdapters?: TrainingAdapter[] }
 export type TwinRegistrationSource = string | { pluginName: string, pluginVersion?: string, source?: string, scope?: string, version?: string, plugin?: string, name?: string, [key: string]: unknown }
 export interface TwinProviderFilter { providerId?: string, version?: string, pluginName?: string, generation?: number, states?: ProviderLifecycleState[], includeDraining?: boolean, includeRetired?: boolean, includeFailed?: boolean, sceneKind?: string, [key: string]: unknown }
 export interface TwinProviderSummary { providerId: string, version: string, providerHash: string, pluginName: string, pluginVersion?: string, generation: number, state: ProviderLifecycleState, health: ProviderHealth, inFlight: number, registeredAt: string, drainingAt?: string, retiredAt?: string, manifest: PhysicsProviderManifest }

package/server/services/workshop/aml/twin/provider-loader.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any, @stylistic/max-statements-per-line, @typescript-eslint/no-unused-expressions */
 import { getTwinProviderRegistry, type TwinProviderRegistry } from './provider-registry'
-import type { TwinPluginContribution, TwinPluginExtBridge, TwinPluginBridgeOperation, TwinProviderFilter, TwinProviderSummary, TwinRegistrationSource, TwinPhysicsProvider, ScenePack, SolverAdapter } from './provider-contracts'
+import type { TwinPluginContribution, TwinPluginExtBridge, TwinPluginBridgeOperation, TwinProviderFilter, TwinProviderSummary, TwinRegistrationSource, TwinPhysicsProvider, ScenePack, SolverAdapter, TrainingAdapter, ObjectiveAdapter } from './provider-contracts'
 
 export interface TwinPluginBridgeGlobal { __twinPluginExt?: any }
 function sourceName(source: TwinRegistrationSource | string | undefined): { pluginName: string, pluginVersion?: string, source?: string } { if (typeof source === 'string') return { pluginName: source }; return { pluginName: String(source?.pluginName ?? source?.plugin ?? source?.name ?? 'external-twin-plugin'), pluginVersion: source?.pluginVersion ?? source?.version, source: source?.source ?? source?.scope } }
@@ -12,7 +12,8 @@ function registryApi(registry: TwinProviderRegistry) {
       if (kind === 'registerPhysicsProvider') return registry.registerPhysicsProvider(payload as TwinPhysicsProvider, s)
       if (kind === 'registerScenePack') return registry.registerScenePack(normalizePack(payload as Record<string, unknown>), s)
       if (kind === 'registerSolverAdapter') return registry.registerSolverAdapter(payload as SolverAdapter, s)
-      if (kind === 'registerObjectiveProfile' || kind === 'registerTrainingAdapter') return { ok: true, accepted: true, capability: kind }
+      if (kind === 'registerObjectiveProfile') return registry.registerTwinPluginContribution(s.pluginName, { objectiveProfiles: [payload as ObjectiveAdapter] }, undefined)
+      if (kind === 'registerTrainingAdapter') return registry.registerTwinPluginContribution(s.pluginName, { trainingAdapters: [payload as TrainingAdapter] }, undefined)
       throw new Error(`Unknown Twin registration kind: ${kind}`)
     },
     registerEntry(entry: { kind: string, payload: unknown, source?: TwinRegistrationSource }) { return this.register(entry.kind, entry.payload, entry.source) },
@@ -20,11 +21,17 @@ function registryApi(registry: TwinProviderRegistry) {
     unregisterTwinPluginContribution(pluginName: string, generation?: number) { return registry.unregisterTwinPluginContribution(pluginName, generation) },
     registerPhysicsProvider(payload: TwinPhysicsProvider, source?: TwinRegistrationSource) { const s = sourceName(source); return registry.registerTwinPluginContribution(s.pluginName, { providers: [payload] }, undefined) },
     registerScenePack(payload: any, source?: TwinRegistrationSource) { const s = sourceName(source); return registry.registerTwinPluginContribution(s.pluginName, { scenePacks: [normalizePack(payload)] }, undefined) },
-    registerObjectiveProfile(_payload: unknown, _source?: TwinRegistrationSource) { return { ok: true, accepted: true, capability: 'objective-profile' } },
-    registerTrainingAdapter(_payload: unknown, _source?: TwinRegistrationSource) { return { ok: true, accepted: true, capability: 'training-adapter' } },
+    registerObjectiveProfile(payload: unknown, source?: TwinRegistrationSource) { const s = sourceName(source); return registry.registerTwinPluginContribution(s.pluginName, { objectiveProfiles: [payload as ObjectiveAdapter] }, undefined) },
+    registerTrainingAdapter(payload: unknown, source?: TwinRegistrationSource) { const s = sourceName(source); return registry.registerTwinPluginContribution(s.pluginName, { trainingAdapters: [payload as TrainingAdapter] }, undefined) },
     registerSolverAdapter(payload: SolverAdapter, source?: TwinRegistrationSource) { const s = sourceName(source); return registry.registerTwinPluginContribution(s.pluginName, { solverAdapters: [payload] }, undefined) },
     listProviders(filter?: TwinProviderFilter): TwinProviderSummary[] { return registry.listProviders(filter) },
     listTwinProviders(filter?: TwinProviderFilter): TwinProviderSummary[] { return registry.listProviders(filter) },
+    resolveTrainingAdapter(ref: string, version?: string) { return registry.resolveTrainingAdapter(ref, version) },
+    listTrainingAdapters() { return registry.listTrainingAdapters() },
+    resolveObjectiveProfile(ref: string, version?: string) { return registry.resolveObjectiveAdapter(ref, version) },
+    listObjectiveProfiles() { return registry.listObjectiveAdapters() },
+    acquireSolverAdapter(adapterId: string, version?: string) { return registry.acquireSolverAdapter(adapterId, version) },
+    drainSolverAdapter(adapterId: string, version?: string) { return registry.drainSolverAdapter(adapterId, version) },
     getProviderHealth(providerId: string, version?: string) { return registry.getProviderHealth(providerId, version) },
     resolveProvider(providerId: string, version?: string) { return registry.resolveProvider(providerId, version) },
     validateProvider(providerId: string, version?: string) { return registry.validateProvider(providerId, version) },
@@ -52,6 +59,8 @@ export function createTwinPluginBridge(): TwinPluginExtBridge {
       if (kind === 'registerPhysicsProvider') return this.registerTwinPluginContribution(pluginName, { providers: [payload] })
       if (kind === 'registerScenePack') return this.registerTwinPluginContribution(pluginName, { scenePacks: [normalizePack(payload)] })
       if (kind === 'registerSolverAdapter') return this.registerTwinPluginContribution(pluginName, { solverAdapters: [payload] })
+      if (kind === 'registerTrainingAdapter') return this.registerTwinPluginContribution(pluginName, { trainingAdapters: [payload as TrainingAdapter] })
+      if (kind === 'registerObjectiveProfile') return this.registerTwinPluginContribution(pluginName, { objectiveProfiles: [payload as ObjectiveAdapter] })
       return { ok: true, accepted: true, capability: kind }
     },
     registerEntry(entry: any) { return this.register(entry.kind, entry.payload, entry.source) },

package/server/services/workshop/aml/twin/provider-registry.ts

@@ -4,6 +4,7 @@ import { TWIN_PROVIDER_API_VERSION } from './provider-contracts'
 import type {
   ArtifactContract,
   LegacyPhysicsProvider,
+  ObjectiveAdapter,
   ParameterPriorMap,
   PhysicsProviderManifest,
   ProviderHealth,
@@ -11,7 +12,9 @@ import type {
   ProviderValidationResult,
   ScenePack,
   SolverAdapter,
+  SolverAdapterLease,
   SolverAdapterManifest,
+  TrainingAdapter,
   TwinPhysicsProvider,
   TwinPluginContribution,
   TwinProviderDrainResult,
@@ -81,6 +84,8 @@ interface GenerationRecord {
   providers: Map<string, ProviderRecord>
   scenePacks: Map<string, ScenePack>
   solverAdapters: Map<string, SolverAdapter>
+  trainingAdapters: Map<string, TrainingAdapter>
+  objectiveAdapters: Map<string, ObjectiveAdapter>
 }
 
 interface NormalizedSource { pluginName: string, pluginVersion?: string, source?: string }
@@ -89,6 +94,8 @@ interface StagedContribution {
   providers: StagedProvider[]
   scenePacks: Array<{ pack: ScenePack, key: string }>
   solverAdapters: Array<{ adapter: SolverAdapter, manifest: SolverAdapterManifest, key: string }>
+  trainingAdapters: Array<{ adapter: TrainingAdapter, key: string }>
+  objectiveAdapters: Array<{ adapter: ObjectiveAdapter, key: string }>
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -304,13 +311,46 @@ function stageContribution(contribution: TwinPluginContribution): StagedContribu
       solverAdapters.push({ adapter, manifest, key: solverKey })
     }
   }
-  return { providers: stagedProviders, scenePacks, solverAdapters }
+  const trainingAdapters: StagedContribution['trainingAdapters'] = []
+  const trainingKeys = new Set<string>()
+  for (const adapter of contribution.trainingAdapters ?? []) {
+    const raw = readAccessor((adapter as unknown as { manifest?: unknown }).manifest)
+    if (!isRecord(raw)) throw new TwinProviderRegistryError('TRAINING_ADAPTER_INVALID', 'Training adapter manifest must be an object')
+    const adapterRef = text(raw.adapterRef ?? raw.adapterId ?? raw.ref)
+    const version = text(raw.version, '1')
+    const artifactKind = text(raw.artifactKind)
+    if (!adapterRef || !artifactKind) throw new TwinProviderRegistryError('TRAINING_ADAPTER_INVALID', 'Training adapter requires adapterRef and artifactKind')
+    if (typeof adapter.train !== 'function') throw new TwinProviderRegistryError('TRAINING_ADAPTER_INVALID', `Training adapter ${adapterRef} must expose train()`)
+    const trainingKey = key(adapterRef, version)
+    if (!trainingKeys.has(trainingKey)) {
+      trainingKeys.add(trainingKey)
+      trainingAdapters.push({ adapter: { ...adapter, manifest: { ...raw, adapterRef, version, artifactKind } as TrainingAdapter['manifest'] }, key: trainingKey })
+    }
+  }
+  const objectiveAdapters: StagedContribution['objectiveAdapters'] = []
+  const objectiveKeys = new Set<string>()
+  for (const adapter of contribution.objectiveProfiles ?? []) {
+    const raw = readAccessor((adapter as unknown as { manifest?: unknown }).manifest)
+    if (!isRecord(raw)) throw new TwinProviderRegistryError('OBJECTIVE_ADAPTER_INVALID', 'Objective adapter manifest must be an object')
+    const ref = text(raw.ref ?? raw.adapterRef ?? raw.id)
+    const version = text(raw.version, '1')
+    if (!ref) throw new TwinProviderRegistryError('OBJECTIVE_ADAPTER_INVALID', 'Objective adapter requires ref')
+    if (typeof adapter.compile !== 'function') throw new TwinProviderRegistryError('OBJECTIVE_ADAPTER_INVALID', `Objective adapter ${ref} must expose compile()`)
+    const objectiveKey = key(ref, version)
+    if (!objectiveKeys.has(objectiveKey)) {
+      objectiveKeys.add(objectiveKey)
+      objectiveAdapters.push({ adapter: { ...adapter, manifest: { ...raw, ref, version } as ObjectiveAdapter['manifest'] }, key: objectiveKey })
+    }
+  }
+  return { providers: stagedProviders, scenePacks, solverAdapters, trainingAdapters, objectiveAdapters }
 }
 
 export class TwinProviderRegistry {
   private readonly generations = new Map<string, GenerationRecord>()
   private readonly nextGenerationByPlugin = new Map<string, number>()
+  private readonly solverLeaseState = new Map<string, { inFlight: number, draining: boolean }>()
   private leaseSequence = 0
+  private solverLeaseSeq = 0
 
   registerTwinPluginContribution(pluginName: string, contribution: TwinPluginContribution, generation?: number): TwinProviderRegistrationResult {
     const source = sourceOf(pluginName)
@@ -327,6 +367,7 @@ export class TwinProviderRegistry {
     const target = existing ?? {
       pluginName: source.pluginName, pluginVersion: source.pluginVersion, generation: requested, state: 'VALIDATED' as ProviderLifecycleState,
       registeredAt: new Date().toISOString(), providers: new Map<string, ProviderRecord>(), scenePacks: new Map<string, ScenePack>(), solverAdapters: new Map<string, SolverAdapter>(),
+      trainingAdapters: new Map<string, TrainingAdapter>(), objectiveAdapters: new Map<string, ObjectiveAdapter>(),
     } satisfies GenerationRecord
     let added = 0
     for (const item of staged.providers) {
@@ -344,8 +385,10 @@ export class TwinProviderRegistry {
     }
     for (const item of staged.scenePacks) target.scenePacks.set(item.key, item.pack)
     for (const item of staged.solverAdapters) target.solverAdapters.set(item.key, item.adapter)
+    for (const item of staged.trainingAdapters) target.trainingAdapters.set(item.key, item.adapter)
+    for (const item of staged.objectiveAdapters) target.objectiveAdapters.set(item.key, item.adapter)
     target.pluginVersion = source.pluginVersion ?? target.pluginVersion
-    target.state = target.providers.size || target.scenePacks.size || target.solverAdapters.size ? 'READY' : 'REGISTERED'
+    target.state = target.providers.size || target.scenePacks.size || target.solverAdapters.size || target.trainingAdapters.size || target.objectiveAdapters.size ? 'READY' : 'REGISTERED'
     this.generations.set(targetKey, target)
     for (const record of this.generations.values()) {
       if (record.pluginName === source.pluginName && record.generation !== requested && record.state !== 'RETIRED' && record.state !== 'FAILED') this.markGenerationDraining(record)
@@ -450,6 +493,106 @@ export class TwinProviderRegistry {
     return [...this.generations.values()].filter(record => (!pluginName || record.pluginName === pluginName) && record.state !== 'RETIRED').flatMap(record => [...record.solverAdapters.values()])
   }
 
+  /** 训练适配器解析:未注册返回 null(配置校验据此拒绝,不再"恒 accepted")。 */
+  resolveTrainingAdapter(adapterRef: string, _version?: string): { adapter: TrainingAdapter, manifest: TrainingAdapter['manifest'], pluginName: string, generation: number } | null {
+    for (const record of this.sortedGenerations()) {
+      if (record.state === 'RETIRED') continue
+      for (const adapter of record.trainingAdapters.values()) {
+        if (adapter.manifest.adapterRef !== adapterRef) continue
+        return { adapter, manifest: adapter.manifest, pluginName: record.pluginName, generation: record.generation }
+      }
+    }
+    return null
+  }
+
+  listTrainingAdapters(): Array<{ adapterRef: string, version: string, artifactKind: string, pluginName: string, generation: number }> {
+    return [...this.generations.values()].filter(record => record.state !== 'RETIRED').flatMap(record =>
+      [...record.trainingAdapters.values()].map(adapter => ({
+        adapterRef: adapter.manifest.adapterRef, version: adapter.manifest.version, artifactKind: adapter.manifest.artifactKind,
+        pluginName: record.pluginName, generation: record.generation,
+      })),
+    )
+  }
+
+  /** 目标/问题模板解析:未注册返回 null。 */
+  resolveObjectiveAdapter(ref: string, _version?: string): { adapter: ObjectiveAdapter, manifest: ObjectiveAdapter['manifest'], pluginName: string, generation: number } | null {
+    for (const record of this.sortedGenerations()) {
+      if (record.state === 'RETIRED') continue
+      for (const adapter of record.objectiveAdapters.values()) {
+        if (adapter.manifest.ref !== ref) continue
+        return { adapter, manifest: adapter.manifest, pluginName: record.pluginName, generation: record.generation }
+      }
+    }
+    return null
+  }
+
+  listObjectiveAdapters(): Array<{ ref: string, version: string, pluginName: string, generation: number }> {
+    return [...this.generations.values()].filter(record => record.state !== 'RETIRED').flatMap(record =>
+      [...record.objectiveAdapters.values()].map(adapter => ({ ref: adapter.manifest.ref, version: adapter.manifest.version, pluginName: record.pluginName, generation: record.generation })),
+    )
+  }
+
+  /**
+   * Solver 租约(G1.5):acquire → inFlight+1 → release 归零;
+   * drain 后新 acquire 被拒(SOLVER_DRAINING),在途任务不被版本热更新替换。
+   */
+  acquireSolverAdapter(adapterId: string, version?: string): SolverAdapterLease {
+    const found = this.findSolverAdapter(adapterId, version)
+    if (!found) throw new TwinProviderRegistryError('SOLVER_NOT_FOUND', `Solver ${adapterId}${version ? `@${version}` : ''} 未注册`)
+    const state = this.solverLeaseStateOf(found.key)
+    if (state.draining) throw new TwinProviderRegistryError('SOLVER_DRAINING', `Solver ${found.adapterId}@${found.version} 正在 drain,拒绝新租约`)
+    state.inFlight++
+    const refId = `solver-lease-${++this.solverLeaseSeq}`
+    let released = false
+    return {
+      refId, adapterId: found.adapterId, version: found.version, adapter: found.adapter, generation: found.generation,
+      get released() { return released },
+      release: () => {
+        if (released) return
+        released = true
+        state.inFlight = Math.max(0, state.inFlight - 1)
+      },
+    }
+  }
+
+  solverLeaseCount(adapterId: string, version?: string): number {
+    const found = this.findSolverAdapter(adapterId, version)
+    return found ? (this.solverLeaseState.get(found.key)?.inFlight ?? 0) : 0
+  }
+
+  drainSolverAdapter(adapterId: string, version?: string): { ok: boolean, adapterId: string, version: string, inFlight: number, draining: boolean } {
+    const found = this.findSolverAdapter(adapterId, version)
+    if (!found) throw new TwinProviderRegistryError('SOLVER_NOT_FOUND', `Solver ${adapterId}${version ? `@${version}` : ''} 未注册`)
+    const state = this.solverLeaseStateOf(found.key)
+    state.draining = true
+    return { ok: true, adapterId: found.adapterId, version: found.version, inFlight: state.inFlight, draining: true }
+  }
+
+  private solverLeaseStateOf(key: string): { inFlight: number, draining: boolean } {
+    let state = this.solverLeaseState.get(key)
+    if (!state) {
+      state = { inFlight: 0, draining: false }
+      this.solverLeaseState.set(key, state)
+    }
+    return state
+  }
+
+  private findSolverAdapter(adapterId: string, version?: string): { adapter: SolverAdapter, adapterId: string, version: string, generation: number, key: string } | undefined {
+    for (const record of this.sortedGenerations()) {
+      if (record.state === 'RETIRED') continue
+      for (const [adapterKey, adapter] of record.solverAdapters) {
+        const [id, ver] = adapterKey.split('@')
+        if (id !== adapterId || (version && ver !== version)) continue
+        return { adapter, adapterId: id ?? adapterId, version: ver ?? '0.0.0', generation: record.generation, key: generationKey(record.pluginName, record.generation) + '\u0000' + adapterKey }
+      }
+    }
+    return undefined
+  }
+
+  private sortedGenerations(): GenerationRecord[] {
+    return [...this.generations.values()].sort((a, b) => b.generation - a.generation)
+  }
+
   getProviderHealth(providerId: string, version?: string, generation?: number): ProviderHealth | undefined {
     return this.findProviderRecords(providerId, version, { generation, allowDraining: true, includeFailed: true })[0]?.health
   }

package/server/services/workshop/daq/ingest-policy.ts

@@ -0,0 +1,43 @@
+/**
+ * 数采推送(ingest)鉴权与回填窗策略 —— 纯函数单点(WP2)。
+ *
+ * 背景:ingest 历史行为是「配置了 AW_DAQ_INGEST_TOKEN 就校验头,否则退回仪表盘会话」,
+ * 兜底路径**不查产线权限**且 `at` 允许 ±7 天回填 —— 任意注册用户可向任意启用节点
+ * 注入(含回填)伪造样本,污染 AML 训练链。此处把判定收敛为可单测的纯函数:
+ *  - 兜底路径必须过 requireLineMode(operate):无产线操控权 → 403;
+ *  - 回填窗默认 ±1h(env AW_DAQ_INGEST_BACKFILL_MS 可调,上限仍 7 天);
+ *  - 配置超宽(>1h)时启动期告警(安全开关回归可见性)。
+ *
+ * token 路径(AW_DAQ_INGEST_TOKEN)语义不变:全局推送凭据,用于边缘系统无会话接入。
+ */
+
+export const DEFAULT_BACKFILL_MS = 3600_000
+export const MAX_BACKFILL_MS = 7 * 24 * 3600_000
+export const WIDE_WINDOW_THRESHOLD_MS = 3600_000
+
+/** 回填窗(ms):缺省 1h;env 可调,钳制到 [0, 7d] */
+export function ingestBackfillWindowMs(env: Record<string, string | undefined> = process.env): number {
+  const rawEnv = env.AW_DAQ_INGEST_BACKFILL_MS
+  if (rawEnv === undefined || String(rawEnv).trim() === '') return DEFAULT_BACKFILL_MS
+  const raw = Number(rawEnv)
+  if (!Number.isFinite(raw) || raw < 0) return DEFAULT_BACKFILL_MS
+  return Math.min(raw, MAX_BACKFILL_MS)
+}
+
+/** 是否处于「超宽回填窗」配置(安全开关打开态;启动/首请求告警) */
+export function isWideBackfillWindow(env: Record<string, string | undefined> = process.env): boolean {
+  return ingestBackfillWindowMs(env) > WIDE_WINDOW_THRESHOLD_MS
+}
+
+/** 时间点是否在允许窗内 */
+export function withinBackfillWindow(atMs: number, now: number, windowMs: number): boolean {
+  return Number.isFinite(atMs) && Math.abs(atMs - now) <= windowMs
+}
+
+/** 推送鉴权模式判定(纯函数便于单测):token 已配置 → 校验头;未配置 → 会话+产线权限 */
+export function ingestAuthMode(input: { configuredToken?: string, providedToken?: string }): 'token' | 'token-mismatch' | 'session' {
+  if (input.configuredToken) {
+    return input.providedToken === input.configuredToken ? 'token' : 'token-mismatch'
+  }
+  return 'session'
+}