agentworkshop 0.7.61 → 0.7.63

package/server/services/workshop/agents/host-tool-bridge/tools/industrial.ts

@@ -1,98 +1,96 @@
-/**
- * 工业工具族(my_industrial_nodes / aml_* / dcw_* / param_* / daq_* / ops_log / recipe_* / line_context / analysis_*)。
- *
- * 原 dispatchHostTool 首个 switch 的 26 个转发分支按行搬运到本模块:每个分支都只是
- * 「按 agentId 查绑定与节点后转交 industrial 模块的同名函数」,因此把闭包捕获的
- * (identity.agentId, args) 收敛为显式参数,并整理成「工具名 → 处理器」一张表。
- * 工具名集合与处理器表同源(INDUSTRIAL_TOOL_NAMES 由表键导出),不会出现有名字无处理器的分支。
- *
- * 该族**不依赖 workspace**,由 dispatch 在 workspace 门控之前分流(保持原分发顺序)。
- */
-import type { HostToolResult } from '../types'
-import { toolLineStart, toolLineStop, toolLineStatus, toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlNodeCatalog, toolAmlTrainingPlanCreate, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolDaqExport, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRead, toolDcwRollback, toolLineContext, toolMesCatalog, toolMesDatasetRead, toolMesDatasets, toolMesFetch, toolMyIndustrialNodes, toolOpsLog, toolParamControl, toolParamRead, toolRecipeApply, toolRecipeLog, toolRecipeRollback, toolRecipeTrial, toolRecipeUpdate, toolRecipeVersions, toolOptimizationExplore, toolTwinProviderCatalog, toolTwinSceneDiscover, toolTwinSceneCompile, toolTwinSceneFreeze, toolTwinSceneRead, toolTwinPhysicsSpecDraft, toolTwinPhysicsSpecValidate, toolTwinPhysicsSpecCompile, toolTwinSnapshotCreate, toolTwinTrialRun, toolMpcOptimize, toolTwinGateEvaluate, toolTwinBayesOptimize, toolTwinCalibrationRequest, toolAnalysisSave, toolAnalysisQuery } from '../../industrial'
-
-import { toolExpCollect } from '../../industrial/exp-tools'
-import { toolRecipePropose } from '../../industrial/recipe-propose-tools'
-import { toolAmlActivity } from '../../industrial/aml-activity'
-
-type IndustrialToolHandler = (agentId: string, args: Record<string, unknown>, channelId?: string) => Promise<HostToolResult>
-
-/** 工具名 → 转发处理器(顺序与原 dispatch 首个 switch 的分支顺序一致) */
-const INDUSTRIAL_HANDLERS = new Map<string, IndustrialToolHandler>([
-  ['my_industrial_nodes', agentId => toolMyIndustrialNodes(agentId)],
-  ['aml_node_catalog', agentId => toolAmlNodeCatalog(agentId)],
-  ['aml_dataset_build', (agentId, args) => toolAmlDatasetBuild(agentId, args as Parameters<typeof toolAmlDatasetBuild>[1])],
-  ['aml_dataset_stats', (agentId, args) => toolAmlDatasetStats(agentId, args as Parameters<typeof toolAmlDatasetStats>[1])],
-  ['aml_job_submit', (agentId, args) => toolAmlJobSubmit(agentId, args as Parameters<typeof toolAmlJobSubmit>[1])],
-  ['aml_job_status', (agentId, args) => toolAmlJobStatus(agentId, args as Parameters<typeof toolAmlJobStatus>[1])],
-  ['aml_job_logs', (agentId, args) => toolAmlJobLogs(agentId, args as Parameters<typeof toolAmlJobLogs>[1])],
-  ['aml_job_cancel', (agentId, args) => toolAmlJobCancel(agentId, args as Parameters<typeof toolAmlJobCancel>[1])],
-  ['aml_leaderboard', (agentId, args) => toolAmlLeaderboard(agentId, args as Parameters<typeof toolAmlLeaderboard>[1])],
-  ['aml_model_find', (agentId, args) => toolAmlModelFind(agentId, args as Parameters<typeof toolAmlModelFind>[1])],
-  ['aml_model_promote', (agentId, args) => toolAmlModelPromote(agentId, args as Parameters<typeof toolAmlModelPromote>[1])],
-  ['aml_model_reference', (agentId, args) => toolAmlModelReference(agentId, args as Parameters<typeof toolAmlModelReference>[1])],
-  ['aml_training_plan_list', (agentId, args) => toolAmlTrainingPlanList(agentId, args)],
-  ['aml_training_plan_create', (agentId, args) => toolAmlTrainingPlanCreate(agentId, args as Parameters<typeof toolAmlTrainingPlanCreate>[1])],
-  ['aml_training_plan_train', (agentId, args) => toolAmlTrainingPlanTrain(agentId, args as Parameters<typeof toolAmlTrainingPlanTrain>[1])],
-  ['twin_provider_catalog', (agentId, args) => toolTwinProviderCatalog(agentId, args)],
-  ['twin_scene_discover', (agentId, args) => toolTwinSceneDiscover(agentId, args)],
-  ['twin_scene_compile', (agentId, args) => toolTwinSceneCompile(agentId, args)],
-  ['twin_scene_freeze', (agentId, args) => toolTwinSceneFreeze(agentId, args)],
-  ['twin_physics_spec_draft', (agentId, args) => toolTwinPhysicsSpecDraft(agentId, args)],
-  ['twin_physics_spec_validate', (agentId, args) => toolTwinPhysicsSpecValidate(agentId, args)],
-  ['twin_physics_spec_compile', (agentId, args) => toolTwinPhysicsSpecCompile(agentId, args)],
-  ['twin_scene_read', (agentId, args) => toolTwinSceneRead(agentId, args)],
-  ['twin_snapshot_create', (agentId, args) => toolTwinSnapshotCreate(agentId, args)],
-  ['twin_trial_run', (agentId, args) => toolTwinTrialRun(agentId, args)],
-  ['mpc_optimize', (agentId, args) => toolMpcOptimize(agentId, args)],
-  ['twin_gate_evaluate', (agentId, args) => toolTwinGateEvaluate(agentId, args)],
-  ['twin_calibration_request', (agentId, args) => toolTwinCalibrationRequest(agentId, args)],
-  ['optimization_explore', (agentId, args, channelId) => toolOptimizationExplore(agentId, args as Parameters<typeof toolOptimizationExplore>[1], channelId)],
-  ['twin_bayes_optimize', (agentId, args) => toolTwinBayesOptimize(agentId, args)],
-  ['dcw_control', (agentId, args, channelId) => toolDcwControl(agentId, args as { node_id?: string, value?: number | string, hypothesis?: string, task_id?: string }, channelId)],
-  ['dcw_read', (agentId, args) => toolDcwRead(agentId, args as { node_id?: string })],
-  ['param_control', (agentId, args, channelId) => toolParamControl(agentId, args as { param?: string, value?: number | string, hypothesis?: string, task_id?: string, line_id?: string }, channelId)],
-  ['param_read', (agentId, args) => toolParamRead(agentId, args as { param?: string, line_id?: string })],
-  ['daq_query', (agentId, args) => toolDaqQuery(agentId, args as Parameters<typeof toolDaqQuery>[1])],
-  ['daq_export', (agentId, args) => toolDaqExport(agentId, args as Parameters<typeof toolDaqExport>[1])],
-  ['daq_frames', (agentId, args) => toolDaqFrames(agentId, args as Parameters<typeof toolDaqFrames>[1])],
-  ['dcw_judge', (agentId, args) => toolDcwJudge(agentId, args as { record_id?: string, verdict?: string, reason?: string })],
-  ['dcw_rollback', (agentId, args) => toolDcwRollback(agentId, args as { record_id?: string, node_id?: string, to?: string })],
-  ['dcw_journal', (agentId, args) => toolDcwJournal(agentId, args as { node_id?: string, recipe_id?: string, limit?: number | string })],
-  ['ops_log', (agentId, args) => toolOpsLog(agentId, args as Parameters<typeof toolOpsLog>[1])],
-  ['recipe_log', (agentId, args) => toolRecipeLog(agentId, args as Parameters<typeof toolRecipeLog>[1])],
-  ['line_context', (agentId, args) => toolLineContext(agentId, args as { line_id?: string })],
-  ['recipe_versions', (agentId, args) => toolRecipeVersions(agentId, args as { recipe_id?: string, limit?: number | string })],
-  ['recipe_update', (agentId, args) => toolRecipeUpdate(agentId, args as Parameters<typeof toolRecipeUpdate>[1])],
-  ['recipe_rollback', (agentId, args) => toolRecipeRollback(agentId, args as Parameters<typeof toolRecipeRollback>[1])],
-  ['recipe_trial', (agentId, args) => toolRecipeTrial(agentId, args as Parameters<typeof toolRecipeTrial>[1])],
-  ['recipe_apply', (agentId, args) => toolRecipeApply(agentId, args as Parameters<typeof toolRecipeApply>[1])],
-  ['mes_catalog', (agentId, args) => toolMesCatalog(agentId, args as Parameters<typeof toolMesCatalog>[1])],
-  ['mes_fetch', (agentId, args) => toolMesFetch(agentId, args as Parameters<typeof toolMesFetch>[1])],
-  ['mes_dataset_read', (agentId, args) => toolMesDatasetRead(agentId, args as Parameters<typeof toolMesDatasetRead>[1])],
-  ['mes_datasets', (agentId, args) => toolMesDatasets(agentId, args as Parameters<typeof toolMesDatasets>[1])],
-  ['exp_collect', (agentId, args) => toolExpCollect(agentId, args as { line_id?: string, lineId?: string })],
-  // 产线 Co-Pilot P2(诊断工程师下发面):整包方案审批 + AML 活动硬闸自查
-  ['recipe_propose', (agentId, args) => toolRecipePropose(agentId, args as Parameters<typeof toolRecipePropose>[1])],
-  ['line_start', (agentId, args, channelId) => toolLineStart(agentId, args as Parameters<typeof toolLineStart>[1], channelId)],
-  ['line_stop', (agentId, args, channelId) => toolLineStop(agentId, args as Parameters<typeof toolLineStop>[1], channelId)],
-  ['line_status', (agentId, args, channelId) => toolLineStatus(agentId, args as Parameters<typeof toolLineStatus>[1], channelId)],
-  ['aml_activity', (agentId, args) => toolAmlActivity(agentId, args as { line_id?: string })],
-  // 数据分析系统:分析结果留痕台账(save 可写台账(非产线写);query 查历史留痕)
-  ['analysis_save', (agentId, args, channelId) => toolAnalysisSave(agentId, args as Parameters<typeof toolAnalysisSave>[1], channelId)],
-  ['analysis_query', (agentId, args) => toolAnalysisQuery(agentId, args as Parameters<typeof toolAnalysisQuery>[1])],
-])
-
-/** 工业工具名集合(与 INDUSTRIAL_HANDLERS 同源;dispatch 据此在 workspace 门控前分流) */
-export const INDUSTRIAL_TOOL_NAMES: ReadonlySet<string> = new Set(INDUSTRIAL_HANDLERS.keys())
-
-/**
- * 工业工具族分发:按工具名转交 industrial 模块(调用参数与该族原分支逐字一致)。
- * 调用方先经 INDUSTRIAL_TOOL_NAMES 判断,故「未登记的工具名」不可达 —— 仍然显式拒绝,
- * 避免静默返回与未知工具混淆。
- */
-export function dispatchIndustrialTool(agentId: string, toolName: string, args: Record<string, unknown>, channelId?: string): Promise<HostToolResult> {
-  const handler = INDUSTRIAL_HANDLERS.get(toolName)
-  if (!handler) return Promise.reject(new Error(`未知工业工具: ${toolName}`))
-  return handler(agentId, args, channelId)
-}
+/**
+ * 工业工具族(my_industrial_nodes / aml_* / dcw_* / param_* / daq_* / ops_log / recipe_* / line_context / analysis_*)。
+ *
+ * 原 dispatchHostTool 首个 switch 的 26 个转发分支按行搬运到本模块:每个分支都只是
+ * 「按 agentId 查绑定与节点后转交 industrial 模块的同名函数」,因此把闭包捕获的
+ * (identity.agentId, args) 收敛为显式参数,并整理成「工具名 → 处理器」一张表。
+ * 工具名集合与处理器表同源(INDUSTRIAL_TOOL_NAMES 由表键导出),不会出现有名字无处理器的分支。
+ *
+ * 该族**不依赖 workspace**,由 dispatch 在 workspace 门控之前分流(保持原分发顺序)。
+ */
+import type { HostToolResult } from '../types'
+import { toolLineStart, toolLineStop, toolLineStatus, toolAmlDatasetBuild, toolAmlDatasetStats, toolAmlJobCancel, toolAmlJobLogs, toolAmlJobStatus, toolAmlJobSubmit, toolAmlLeaderboard, toolAmlModelFind, toolAmlModelPromote, toolAmlModelReference, toolAmlNodeCatalog, toolAmlTrainingPlanCreate, toolAmlTrainingPlanList, toolAmlTrainingPlanTrain, toolDaqExport, toolDaqFrames, toolDaqQuery, toolDcwControl, toolDcwJudge, toolDcwJournal, toolDcwRollback, toolLineContext, toolMesCatalog, toolMesDatasetRead, toolMesDatasets, toolMesFetch, toolMyIndustrialNodes, toolOpsLog, toolParamControl, toolRecipeApply, toolRecipeLog, toolRecipeRollback, toolRecipeTrial, toolRecipeUpdate, toolRecipeVersions, toolOptimizationExplore, toolTwinProviderCatalog, toolTwinSceneDiscover, toolTwinSceneCompile, toolTwinSceneFreeze, toolTwinSceneRead, toolTwinPhysicsSpecDraft, toolTwinPhysicsSpecValidate, toolTwinPhysicsSpecCompile, toolTwinSnapshotCreate, toolTwinTrialRun, toolMpcOptimize, toolTwinGateEvaluate, toolTwinBayesOptimize, toolTwinCalibrationRequest, toolAnalysisSave, toolAnalysisQuery } from '../../industrial'
+
+import { toolExpCollect } from '../../industrial/exp-tools'
+import { toolRecipePropose } from '../../industrial/recipe-propose-tools'
+import { toolAmlActivity } from '../../industrial/aml-activity'
+
+type IndustrialToolHandler = (agentId: string, args: Record<string, unknown>, channelId?: string) => Promise<HostToolResult>
+
+/** 工具名 → 转发处理器(顺序与原 dispatch 首个 switch 的分支顺序一致) */
+const INDUSTRIAL_HANDLERS = new Map<string, IndustrialToolHandler>([
+  ['my_industrial_nodes', agentId => toolMyIndustrialNodes(agentId)],
+  ['aml_node_catalog', agentId => toolAmlNodeCatalog(agentId)],
+  ['aml_dataset_build', (agentId, args) => toolAmlDatasetBuild(agentId, args as Parameters<typeof toolAmlDatasetBuild>[1])],
+  ['aml_dataset_stats', (agentId, args) => toolAmlDatasetStats(agentId, args as Parameters<typeof toolAmlDatasetStats>[1])],
+  ['aml_job_submit', (agentId, args) => toolAmlJobSubmit(agentId, args as Parameters<typeof toolAmlJobSubmit>[1])],
+  ['aml_job_status', (agentId, args) => toolAmlJobStatus(agentId, args as Parameters<typeof toolAmlJobStatus>[1])],
+  ['aml_job_logs', (agentId, args) => toolAmlJobLogs(agentId, args as Parameters<typeof toolAmlJobLogs>[1])],
+  ['aml_job_cancel', (agentId, args) => toolAmlJobCancel(agentId, args as Parameters<typeof toolAmlJobCancel>[1])],
+  ['aml_leaderboard', (agentId, args) => toolAmlLeaderboard(agentId, args as Parameters<typeof toolAmlLeaderboard>[1])],
+  ['aml_model_find', (agentId, args) => toolAmlModelFind(agentId, args as Parameters<typeof toolAmlModelFind>[1])],
+  ['aml_model_promote', (agentId, args) => toolAmlModelPromote(agentId, args as Parameters<typeof toolAmlModelPromote>[1])],
+  ['aml_model_reference', (agentId, args) => toolAmlModelReference(agentId, args as Parameters<typeof toolAmlModelReference>[1])],
+  ['aml_training_plan_list', (agentId, args) => toolAmlTrainingPlanList(agentId, args)],
+  ['aml_training_plan_create', (agentId, args) => toolAmlTrainingPlanCreate(agentId, args as Parameters<typeof toolAmlTrainingPlanCreate>[1])],
+  ['aml_training_plan_train', (agentId, args) => toolAmlTrainingPlanTrain(agentId, args as Parameters<typeof toolAmlTrainingPlanTrain>[1])],
+  ['twin_provider_catalog', (agentId, args) => toolTwinProviderCatalog(agentId, args)],
+  ['twin_scene_discover', (agentId, args) => toolTwinSceneDiscover(agentId, args)],
+  ['twin_scene_compile', (agentId, args) => toolTwinSceneCompile(agentId, args)],
+  ['twin_scene_freeze', (agentId, args) => toolTwinSceneFreeze(agentId, args)],
+  ['twin_physics_spec_draft', (agentId, args) => toolTwinPhysicsSpecDraft(agentId, args)],
+  ['twin_physics_spec_validate', (agentId, args) => toolTwinPhysicsSpecValidate(agentId, args)],
+  ['twin_physics_spec_compile', (agentId, args) => toolTwinPhysicsSpecCompile(agentId, args)],
+  ['twin_scene_read', (agentId, args) => toolTwinSceneRead(agentId, args)],
+  ['twin_snapshot_create', (agentId, args) => toolTwinSnapshotCreate(agentId, args)],
+  ['twin_trial_run', (agentId, args) => toolTwinTrialRun(agentId, args)],
+  ['mpc_optimize', (agentId, args) => toolMpcOptimize(agentId, args)],
+  ['twin_gate_evaluate', (agentId, args) => toolTwinGateEvaluate(agentId, args)],
+  ['twin_calibration_request', (agentId, args) => toolTwinCalibrationRequest(agentId, args)],
+  ['optimization_explore', (agentId, args, channelId) => toolOptimizationExplore(agentId, args as Parameters<typeof toolOptimizationExplore>[1], channelId)],
+  ['twin_bayes_optimize', (agentId, args) => toolTwinBayesOptimize(agentId, args)],
+  ['dcw_control', (agentId, args, channelId) => toolDcwControl(agentId, args as { node_id?: string, value?: number | string, hypothesis?: string, task_id?: string }, channelId)],
+  ['param_control', (agentId, args, channelId) => toolParamControl(agentId, args as { param?: string, value?: number | string, hypothesis?: string, task_id?: string, line_id?: string }, channelId)],
+  ['daq_query', (agentId, args) => toolDaqQuery(agentId, args as Parameters<typeof toolDaqQuery>[1])],
+  ['daq_export', (agentId, args) => toolDaqExport(agentId, args as Parameters<typeof toolDaqExport>[1])],
+  ['daq_frames', (agentId, args) => toolDaqFrames(agentId, args as Parameters<typeof toolDaqFrames>[1])],
+  ['dcw_judge', (agentId, args) => toolDcwJudge(agentId, args as { record_id?: string, verdict?: string, reason?: string })],
+  ['dcw_rollback', (agentId, args) => toolDcwRollback(agentId, args as { record_id?: string, node_id?: string, to?: string })],
+  ['dcw_journal', (agentId, args) => toolDcwJournal(agentId, args as { node_id?: string, recipe_id?: string, limit?: number | string })],
+  ['ops_log', (agentId, args) => toolOpsLog(agentId, args as Parameters<typeof toolOpsLog>[1])],
+  ['recipe_log', (agentId, args) => toolRecipeLog(agentId, args as Parameters<typeof toolRecipeLog>[1])],
+  ['line_context', (agentId, args) => toolLineContext(agentId, args as { line_id?: string })],
+  ['recipe_versions', (agentId, args) => toolRecipeVersions(agentId, args as { recipe_id?: string, limit?: number | string })],
+  ['recipe_update', (agentId, args) => toolRecipeUpdate(agentId, args as Parameters<typeof toolRecipeUpdate>[1])],
+  ['recipe_rollback', (agentId, args) => toolRecipeRollback(agentId, args as Parameters<typeof toolRecipeRollback>[1])],
+  ['recipe_trial', (agentId, args) => toolRecipeTrial(agentId, args as Parameters<typeof toolRecipeTrial>[1])],
+  ['recipe_apply', (agentId, args) => toolRecipeApply(agentId, args as Parameters<typeof toolRecipeApply>[1])],
+  ['mes_catalog', (agentId, args) => toolMesCatalog(agentId, args as Parameters<typeof toolMesCatalog>[1])],
+  ['mes_fetch', (agentId, args) => toolMesFetch(agentId, args as Parameters<typeof toolMesFetch>[1])],
+  ['mes_dataset_read', (agentId, args) => toolMesDatasetRead(agentId, args as Parameters<typeof toolMesDatasetRead>[1])],
+  ['mes_datasets', (agentId, args) => toolMesDatasets(agentId, args as Parameters<typeof toolMesDatasets>[1])],
+  ['exp_collect', (agentId, args) => toolExpCollect(agentId, args as { line_id?: string, lineId?: string })],
+  // 产线 Co-Pilot P2(诊断工程师下发面):整包方案审批 + AML 活动硬闸自查
+  ['recipe_propose', (agentId, args) => toolRecipePropose(agentId, args as Parameters<typeof toolRecipePropose>[1])],
+  ['line_start', (agentId, args, channelId) => toolLineStart(agentId, args as Parameters<typeof toolLineStart>[1], channelId)],
+  ['line_stop', (agentId, args, channelId) => toolLineStop(agentId, args as Parameters<typeof toolLineStop>[1], channelId)],
+  ['line_status', (agentId, args, channelId) => toolLineStatus(agentId, args as Parameters<typeof toolLineStatus>[1], channelId)],
+  ['aml_activity', (agentId, args) => toolAmlActivity(agentId, args as { line_id?: string })],
+  // 数据分析系统:分析结果留痕台账(save 可写台账(非产线写);query 查历史留痕)
+  ['analysis_save', (agentId, args, channelId) => toolAnalysisSave(agentId, args as Parameters<typeof toolAnalysisSave>[1], channelId)],
+  ['analysis_query', (agentId, args) => toolAnalysisQuery(agentId, args as Parameters<typeof toolAnalysisQuery>[1])],
+])
+
+/** 工业工具名集合(与 INDUSTRIAL_HANDLERS 同源;dispatch 据此在 workspace 门控前分流) */
+export const INDUSTRIAL_TOOL_NAMES: ReadonlySet<string> = new Set(INDUSTRIAL_HANDLERS.keys())
+
+/**
+ * 工业工具族分发:按工具名转交 industrial 模块(调用参数与该族原分支逐字一致)。
+ * 调用方先经 INDUSTRIAL_TOOL_NAMES 判断,故「未登记的工具名」不可达 —— 仍然显式拒绝,
+ * 避免静默返回与未知工具混淆。
+ */
+export function dispatchIndustrialTool(agentId: string, toolName: string, args: Record<string, unknown>, channelId?: string): Promise<HostToolResult> {
+  const handler = INDUSTRIAL_HANDLERS.get(toolName)
+  if (!handler) return Promise.reject(new Error(`未知工业工具: ${toolName}`))
+  return handler(agentId, args, channelId)
+}

package/server/services/workshop/agents/industrial/daq-tools.ts

@@ -8,9 +8,12 @@ import { getActiveLineRun } from '../../dcw/line-run'
 import { getAgentNodeBindingRepo } from '../node-bindings.repo'
 import { getDaqNodeRepo } from '../../daq/daq-node.repo'
 import { getDcwController } from '../../dcw/dcw-controller'
+import { channelBoundLineId } from './ops-tools'
 
 /**
- * 数采目标集解析(工具共用鉴权面):Agent 绑定(kind=daq)为权限边界 ——
+ * 数采目标集解析(工具共用鉴权面):
+ *   ① Agent 绑定(kind=daq);② v28 频道绑线只读扩权 —— 频道绑定产线下的数采节点
+ *   并入读取集(与 ops_log/line_context 的绑线只读扩权同族;本函数仅服务只读查询面)。
  * node_id/line_id 只能缩小范围,不能放大(越权节点一律拒绝)。
  */
 export function daqTargetsOf(agentId: string, nodeIdArg: unknown, lineIdArg: unknown):
@@ -18,23 +21,29 @@ export function daqTargetsOf(agentId: string, nodeIdArg: unknown, lineIdArg: unk
   | { error: { text: string, isError: true } } {
   const repo = getAgentNodeBindingRepo()
   const daqBindings = repo.byAgent(agentId).filter(b => b.kind === 'daq')
-  if (daqBindings.length === 0) {
-    return { error: { text: '你尚未绑定任何数采节点,无权查询采集数据。请在数字孪生界面绑定数采节点。', isError: true } }
+  // v28:频道绑线的数采节点并入可见集(只读)
+  const boundLine = channelBoundLineId(agentId)
+  const boundLineNodes = boundLine
+    ? getDaqNodeRepo().all().filter(n => n.lineId === boundLine).map(n => n.id)
+    : []
+  const readable = new Set([...daqBindings.map(b => b.nodeId), ...boundLineNodes])
+  if (readable.size === 0) {
+    return { error: { text: '你尚未绑定任何数采节点,频道也未绑定产线,无权查询采集数据。请在数字孪生界面绑定数采节点,或将频道绑定到目标产线(绑线后可只读查询该线数采数据)。', isError: true } }
   }
   const wanted = nodeIdArg ? String(nodeIdArg) : ''
-  if (wanted && !daqBindings.some(b => b.nodeId === wanted)) {
-    return { error: { text: `无权查询节点 ${wanted}。你有权访问的数采节点:${daqBindings.map(b => b.nodeId).join(', ')}`, isError: true } }
+  if (wanted && !readable.has(wanted)) {
+    return { error: { text: `无权查询节点 ${wanted}。你有权访问的数采节点:${[...readable].join(', ')}`, isError: true } }
   }
   const lineFilter = lineIdArg ? String(lineIdArg).trim() : ''
   const lineOf = (id: string): string => getDaqNodeRepo().byId(id)?.lineId ?? ''
   if (lineFilter && wanted && lineOf(wanted) !== lineFilter) {
     return { error: { text: `节点 ${wanted} 不属于产线 ${lineFilter}(实际归属:${lineOf(wanted) || '未分配'}),line_id 与 node_id 过滤冲突。`, isError: true } }
   }
-  let targets = wanted ? [wanted] : daqBindings.map(b => b.nodeId)
+  let targets = wanted ? [wanted] : [...readable]
   if (lineFilter && !wanted) {
     const onLine = targets.filter(id => lineOf(id) === lineFilter)
     if (onLine.length === 0) {
-      return { error: { text: `你绑定的数采节点中没有归属产线 ${lineFilter} 的(各节点归属:${daqBindings.map(b => `${b.nodeId}=${lineOf(b.nodeId) || '未分配'}`).join('; ')})。`, isError: true } }
+      return { error: { text: `你有权访问的数采节点中没有归属产线 ${lineFilter} 的(各节点归属:${[...readable].map(id => `${id}=${lineOf(id) || '未分配'}`).join('; ')})。`, isError: true } }
     }
     targets = onLine
   }