agentworkshop 0.7.61 → 0.7.62

package/.output/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentworkshop-prod",
-  "version": "0.7.61",
+  "version": "0.7.62",
   "type": "module",
   "private": true,
   "dependencies": {

package/app/components/analysis/AnalysisEditModal.vue

@@ -1,192 +1,192 @@
-<script setup lang="ts">
-/**
- * 分析报告人工修订弹窗(v27 编辑面):预填当前值 → PATCH → 父级刷新。
- * 可见性由行级 canEdit(admin/产线 operate)控制;结论明细每行一条,
- * 支撑指标为 JSON 文本(留空 = 保留原值;Agent 面仍无改删,修订全程审计)。
- */
-import { reactive, watch } from 'vue'
-import { ANALYSIS_CATEGORIES } from '@/app/pages/analysis/types'
-import type { AnalysisReportView } from '@/app/pages/analysis/types'
-
-const props = defineProps<{
-  /** 待编辑报告(null = 弹窗关闭) */
-  report: AnalysisReportView | null
-  saving: boolean
-}>()
-
-const emit = defineEmits<{
-  close: []
-  save: [patch: Record<string, unknown>]
-}>()
-
-const form = reactive({
-  title: '', summary: '', category: '', recipeId: '', recipeVersion: '',
-  windowFrom: '', windowTo: '', dataSources: '', conclusions: '', report: '', metrics: '',
-})
-
-watch(() => props.report, (r) => {
-  if (!r) return
-  form.title = r.title
-  form.summary = r.summary
-  form.category = r.category
-  form.recipeId = r.recipeId
-  form.recipeVersion = r.recipeVersion
-  form.windowFrom = r.windowFrom ?? ''
-  form.windowTo = r.windowTo ?? ''
-  form.dataSources = r.dataSources
-  form.conclusions = (r.conclusions ?? []).join('\n')
-  form.report = r.report ?? ''
-  form.metrics = Object.keys(r.metrics ?? {}).length ? JSON.stringify(r.metrics, null, 1) : ''
-}, { immediate: true })
-
-function submit(): void {
-  let metrics: unknown = undefined
-  if (form.metrics.trim()) {
-    try {
-      metrics = JSON.parse(form.metrics)
-    }
-    catch {
-      // JSON 非法直接留原值并由后端校验;此处不阻断
-      metrics = form.metrics
-    }
-  }
-  emit('save', {
-    title: form.title,
-    summary: form.summary,
-    category: form.category || 'general',
-    recipe_id: form.recipeId.trim(),
-    recipe_version: form.recipeVersion.trim(),
-    window_from: form.windowFrom.trim(),
-    window_to: form.windowTo.trim(),
-    data_sources: form.dataSources,
-    conclusions: form.conclusions,
-    report: form.report,
-    ...(metrics !== undefined ? { metrics } : {}),
-  })
-}
-</script>
-
-<template>
-  <a-modal
-    :open="Boolean(report)"
-    :title="$t('analysis.editTitle')"
-    :confirm-loading="saving"
-    :ok-text="$t('analysis.save')"
-    :cancel-text="$t('analysis.cancel')"
-    width="720px"
-    @ok="submit"
-    @cancel="emit('close')"
-  >
-    <div class="edit-form">
-      <label class="fld">
-        <span>{{ $t('analysis.thTitle') }}</span>
-        <input
-          v-model="form.title"
-          class="inp-sel"
-        >
-      </label>
-      <label class="fld">
-        <span>{{ $t('analysis.thSummary') }}</span>
-        <input
-          v-model="form.summary"
-          class="inp-sel"
-        >
-      </label>
-      <div class="fld-row">
-        <label class="fld">
-          <span>{{ $t('analysis.fCat') }}</span>
-          <select
-            v-model="form.category"
-            class="inp-sel"
-          >
-            <option
-              v-for="c in ANALYSIS_CATEGORIES"
-              :key="c"
-              :value="c"
-            >
-              {{ $t(`analysis.cat.${c}`) }}
-            </option>
-          </select>
-        </label>
-        <label class="fld">
-          <span>{{ $t('analysis.kRecipe') }}</span>
-          <input
-            v-model="form.recipeId"
-            class="inp-sel"
-            placeholder="rcp-…"
-          >
-        </label>
-        <label class="fld">
-          <span>{{ $t('analysis.kVersion') }}</span>
-          <input
-            v-model="form.recipeVersion"
-            class="inp-sel"
-          >
-        </label>
-      </div>
-      <div class="fld-row">
-        <label class="fld">
-          <span>{{ $t('analysis.kWindowFrom') }}</span>
-          <input
-            v-model="form.windowFrom"
-            class="inp-sel"
-            placeholder="ISO 8601"
-          >
-        </label>
-        <label class="fld">
-          <span>{{ $t('analysis.kWindowTo') }}</span>
-          <input
-            v-model="form.windowTo"
-            class="inp-sel"
-            placeholder="ISO 8601"
-          >
-        </label>
-      </div>
-      <label class="fld">
-        <span>{{ $t('analysis.kSources') }}</span>
-        <input
-          v-model="form.dataSources"
-          class="inp-sel"
-        >
-      </label>
-      <label class="fld">
-        <span>{{ $t('analysis.kConclusions') }}({{ $t('analysis.conclusionsHint') }})</span>
-        <textarea
-          v-model="form.conclusions"
-          class="inp-sel"
-          rows="4"
-        />
-      </label>
-      <label class="fld">
-        <span>{{ $t('analysis.kReport') }}</span>
-        <textarea
-          v-model="form.report"
-          class="inp-sel mono"
-          rows="6"
-        />
-      </label>
-      <label class="fld">
-        <span>{{ $t('analysis.kMetrics') }}(JSON)</span>
-        <textarea
-          v-model="form.metrics"
-          class="inp-sel mono"
-          rows="4"
-        />
-      </label>
-    </div>
-  </a-modal>
-</template>
-
-<style scoped>
-.edit-form { display: flex; flex-direction: column; gap: 10px; max-height: 64vh; overflow: auto; padding-right: 4px; }
-.fld { display: flex; flex-direction: column; gap: 4px; font-size: 12px; color: var(--ink-faint); }
-.fld-row { display: grid; grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); gap: 10px; }
-.inp-sel {
-  min-width: 0; padding: 6px 9px; font-size: 13px; color: var(--ink);
-  background: var(--frost-bg);
-  border: 1px solid var(--glass-line); border-radius: 7px; outline: none;
-}
-.inp-sel:focus { border-color: color-mix(in srgb, var(--tone-info-dot) 55%, transparent); }
-textarea.inp-sel { resize: vertical; line-height: 1.6; }
-.mono { font-family: var(--font-mono, monospace); font-size: 11.5px; }
-</style>
+<script setup lang="ts">
+/**
+ * 分析报告人工修订弹窗(v27 编辑面):预填当前值 → PATCH → 父级刷新。
+ * 可见性由行级 canEdit(admin/产线 operate)控制;结论明细每行一条,
+ * 支撑指标为 JSON 文本(留空 = 保留原值;Agent 面仍无改删,修订全程审计)。
+ */
+import { reactive, watch } from 'vue'
+import { ANALYSIS_CATEGORIES } from '@/app/pages/analysis/types'
+import type { AnalysisReportView } from '@/app/pages/analysis/types'
+
+const props = defineProps<{
+  /** 待编辑报告(null = 弹窗关闭) */
+  report: AnalysisReportView | null
+  saving: boolean
+}>()
+
+const emit = defineEmits<{
+  close: []
+  save: [patch: Record<string, unknown>]
+}>()
+
+const form = reactive({
+  title: '', summary: '', category: '', recipeId: '', recipeVersion: '',
+  windowFrom: '', windowTo: '', dataSources: '', conclusions: '', report: '', metrics: '',
+})
+
+watch(() => props.report, (r) => {
+  if (!r) return
+  form.title = r.title
+  form.summary = r.summary
+  form.category = r.category
+  form.recipeId = r.recipeId
+  form.recipeVersion = r.recipeVersion
+  form.windowFrom = r.windowFrom ?? ''
+  form.windowTo = r.windowTo ?? ''
+  form.dataSources = r.dataSources
+  form.conclusions = (r.conclusions ?? []).join('\n')
+  form.report = r.report ?? ''
+  form.metrics = Object.keys(r.metrics ?? {}).length ? JSON.stringify(r.metrics, null, 1) : ''
+}, { immediate: true })
+
+function submit(): void {
+  let metrics: unknown = undefined
+  if (form.metrics.trim()) {
+    try {
+      metrics = JSON.parse(form.metrics)
+    }
+    catch {
+      // JSON 非法直接留原值并由后端校验;此处不阻断
+      metrics = form.metrics
+    }
+  }
+  emit('save', {
+    title: form.title,
+    summary: form.summary,
+    category: form.category || 'general',
+    recipe_id: form.recipeId.trim(),
+    recipe_version: form.recipeVersion.trim(),
+    window_from: form.windowFrom.trim(),
+    window_to: form.windowTo.trim(),
+    data_sources: form.dataSources,
+    conclusions: form.conclusions,
+    report: form.report,
+    ...(metrics !== undefined ? { metrics } : {}),
+  })
+}
+</script>
+
+<template>
+  <a-modal
+    :open="Boolean(report)"
+    :title="$t('analysis.editTitle')"
+    :confirm-loading="saving"
+    :ok-text="$t('analysis.save')"
+    :cancel-text="$t('analysis.cancel')"
+    width="720px"
+    @ok="submit"
+    @cancel="emit('close')"
+  >
+    <div class="edit-form">
+      <label class="fld">
+        <span>{{ $t('analysis.thTitle') }}</span>
+        <input
+          v-model="form.title"
+          class="inp-sel"
+        >
+      </label>
+      <label class="fld">
+        <span>{{ $t('analysis.thSummary') }}</span>
+        <input
+          v-model="form.summary"
+          class="inp-sel"
+        >
+      </label>
+      <div class="fld-row">
+        <label class="fld">
+          <span>{{ $t('analysis.fCat') }}</span>
+          <select
+            v-model="form.category"
+            class="inp-sel"
+          >
+            <option
+              v-for="c in ANALYSIS_CATEGORIES"
+              :key="c"
+              :value="c"
+            >
+              {{ $t(`analysis.cat.${c}`) }}
+            </option>
+          </select>
+        </label>
+        <label class="fld">
+          <span>{{ $t('analysis.kRecipe') }}</span>
+          <input
+            v-model="form.recipeId"
+            class="inp-sel"
+            placeholder="rcp-…"
+          >
+        </label>
+        <label class="fld">
+          <span>{{ $t('analysis.kVersion') }}</span>
+          <input
+            v-model="form.recipeVersion"
+            class="inp-sel"
+          >
+        </label>
+      </div>
+      <div class="fld-row">
+        <label class="fld">
+          <span>{{ $t('analysis.kWindowFrom') }}</span>
+          <input
+            v-model="form.windowFrom"
+            class="inp-sel"
+            placeholder="ISO 8601"
+          >
+        </label>
+        <label class="fld">
+          <span>{{ $t('analysis.kWindowTo') }}</span>
+          <input
+            v-model="form.windowTo"
+            class="inp-sel"
+            placeholder="ISO 8601"
+          >
+        </label>
+      </div>
+      <label class="fld">
+        <span>{{ $t('analysis.kSources') }}</span>
+        <input
+          v-model="form.dataSources"
+          class="inp-sel"
+        >
+      </label>
+      <label class="fld">
+        <span>{{ $t('analysis.kConclusions') }}({{ $t('analysis.conclusionsHint') }})</span>
+        <textarea
+          v-model="form.conclusions"
+          class="inp-sel"
+          rows="4"
+        />
+      </label>
+      <label class="fld">
+        <span>{{ $t('analysis.kReport') }}</span>
+        <textarea
+          v-model="form.report"
+          class="inp-sel mono"
+          rows="6"
+        />
+      </label>
+      <label class="fld">
+        <span>{{ $t('analysis.kMetrics') }}(JSON)</span>
+        <textarea
+          v-model="form.metrics"
+          class="inp-sel mono"
+          rows="4"
+        />
+      </label>
+    </div>
+  </a-modal>
+</template>
+
+<style scoped>
+.edit-form { display: flex; flex-direction: column; gap: 10px; max-height: 64vh; overflow: auto; padding-right: 4px; }
+.fld { display: flex; flex-direction: column; gap: 4px; font-size: 12px; color: var(--ink-faint); }
+.fld-row { display: grid; grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); gap: 10px; }
+.inp-sel {
+  min-width: 0; padding: 6px 9px; font-size: 13px; color: var(--ink);
+  background: var(--frost-bg);
+  border: 1px solid var(--glass-line); border-radius: 7px; outline: none;
+}
+.inp-sel:focus { border-color: color-mix(in srgb, var(--tone-info-dot) 55%, transparent); }
+textarea.inp-sel { resize: vertical; line-height: 1.6; }
+.mono { font-family: var(--font-mono, monospace); font-size: 11.5px; }
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentworkshop",
-  "version": "0.7.61",
+  "version": "0.7.62",
   "type": "module",
   "description": "AgentWorkShop 软件开发系统 - 基于 Nuxt 4 的配置驱动运行范式",
   "license": "Apache-2.0",

package/server/api/workshop/analysis/[id].patch.ts

@@ -1,100 +1,100 @@
-/**
- * PATCH /api/workshop/analysis/:id —— 人工修订分析报告(v27 编辑面)。
- * 权限:admin,或对该报告产线有「可操控」(operate)的用户;readonly/无授权 403。
- * 可编辑字段:title/category/summary/conclusions/report/metrics/recipe_id/recipe_version/
- * window_from/window_to/data_sources(缺省 = 保留原值);修订归因固化进 updated_*。
- * Agent 面仍无改删 —— 编辑是带审计的人类管理操作(recordOps analysis.update)。
- */
-import { getQuery, getRouterParam, readBody } from 'h3'
-import { resolveUser } from '@/server/api/workshop/caller'
-import { defineApiHandler } from '@/server/utils/response'
-import { AppError } from '@/server/utils/errors'
-import { lineMode } from '@/server/services/workshop/permissions'
-import { getAnalysisRepo } from '@/server/services/workshop/analysis/analysis.repo'
-import { getDcwRecipeRepo } from '@/server/services/workshop/dcw/dcw-recipe.repo'
-import { recordOps } from '@/server/services/workshop/ops/ops'
-
-export default defineApiHandler(async (event) => {
-  const user = resolveUser(event)
-  const id = getRouterParam(event, 'id')!
-  const repo = getAnalysisRepo()
-  const report = repo.get(id)
-  if (!report) throw new AppError(404, 'NOT_FOUND', `分析报告不存在: ${id}`)
-
-  // 编辑权限:admin 或产线 operate(readonly/无授权不可改)
-  const isAdmin = user.role === 'admin'
-  if (!isAdmin && (!report.lineId || lineMode(user, report.lineId) !== 'operate')) {
-    throw new AppError(403, 'ANALYSIS_FORBIDDEN', `无权修订该分析报告:需要产线「可操控」权限或 admin(报告产线 ${report.lineName || report.lineId || '-'})`)
-  }
-
-  const body = (await readBody<Record<string, unknown>>(event)) ?? {}
-  const str = (k: string): string | undefined => (body[k] === undefined ? undefined : String(body[k] ?? '').trim())
-  const title = str('title')
-  const summary = str('summary')
-  if (title !== undefined && !title) throw new AppError(400, 'VALIDATION_ERROR', 'title 不能为空')
-  if (summary !== undefined && !summary) throw new AppError(400, 'VALIDATION_ERROR', 'summary 不能为空')
-
-  // 配方校验(与保存面同口径:存在且归属该产线)
-  const recipeId = str('recipe_id')
-  if (recipeId) {
-    const recipe = getDcwRecipeRepo().list().find(r => r.id === recipeId)
-    if (!recipe) throw new AppError(404, 'NOT_FOUND', `配方不存在: ${recipeId}`)
-    if (recipe.lineId && report.lineId && recipe.lineId !== report.lineId) {
-      throw new AppError(400, 'VALIDATION_ERROR', `配方「${recipe.name}」不属于该报告的产线`)
-    }
-  }
-
-  // 时间窗归一:列内为本地 ISO(平台 toISOString 补丁),外部 Z 格式/epoch ms 归一后入库
-  const timeArg = (k: string): string | null | undefined => {
-    if (body[k] === undefined) return undefined
-    const raw = String(body[k] ?? '').trim()
-    if (!raw) return null
-    const ms = /^\d{10,}$/.test(raw) ? Number(raw) : Date.parse(raw)
-    if (!Number.isFinite(ms)) throw new AppError(400, 'VALIDATION_ERROR', `${k} 时间格式无效(ISO 8601 或 epoch ms)`)
-    return new Date(ms).toISOString()
-  }
-
-  const conclusions = body.conclusions === undefined
-    ? undefined
-    : (Array.isArray(body.conclusions) ? body.conclusions : String(body.conclusions ?? '').split('\n'))
-        .map((x: unknown) => String(x).replace(/^[-*\d.\s]+/, '').trim())
-        .filter(Boolean)
-  let metrics: Record<string, unknown> | undefined
-  if (body.metrics !== undefined && body.metrics !== null && String(body.metrics).trim() !== '') {
-    try {
-      metrics = typeof body.metrics === 'object' && !Array.isArray(body.metrics)
-        ? (body.metrics as Record<string, unknown>)
-        : JSON.parse(String(body.metrics))
-    }
-    catch {
-      throw new AppError(400, 'VALIDATION_ERROR', 'metrics 需为 JSON 对象(或留空保留原值)')
-    }
-  }
-
-  const updated = repo.update(id, {
-    title: title ?? undefined,
-    category: str('category') ?? undefined,
-    summary: summary ?? undefined,
-    conclusions,
-    report: body.report === undefined ? undefined : String(body.report ?? ''),
-    metrics,
-    recipeId,
-    recipeVersion: str('recipe_version'),
-    windowFrom: timeArg('window_from'),
-    windowTo: timeArg('window_to'),
-    dataSources: str('data_sources'),
-  }, { id: user.id, name: user.name })
-  if (!updated) throw new AppError(404, 'NOT_FOUND', `分析报告不存在: ${id}`)
-
-  try {
-    recordOps({
-      actor: user.id, actorName: user.name, actorKind: 'user',
-      action: 'analysis.update', kind: 'analysis', targetKind: 'analysis', targetId: id,
-      lineId: updated.lineId, recipeId: updated.recipeId,
-      summary: `人工修订分析报告「${updated.title}」(产线「${updated.lineName || updated.lineId || '-'}」)`,
-    })
-  }
-  catch { /* 审计失败不阻断 */ }
-
-  return { report: updated }
-})
+/**
+ * PATCH /api/workshop/analysis/:id —— 人工修订分析报告(v27 编辑面)。
+ * 权限:admin,或对该报告产线有「可操控」(operate)的用户;readonly/无授权 403。
+ * 可编辑字段:title/category/summary/conclusions/report/metrics/recipe_id/recipe_version/
+ * window_from/window_to/data_sources(缺省 = 保留原值);修订归因固化进 updated_*。
+ * Agent 面仍无改删 —— 编辑是带审计的人类管理操作(recordOps analysis.update)。
+ */
+import { getRouterParam, readBody } from 'h3'
+import { resolveUser } from '@/server/api/workshop/caller'
+import { defineApiHandler } from '@/server/utils/response'
+import { AppError } from '@/server/utils/errors'
+import { lineMode } from '@/server/services/workshop/permissions'
+import { getAnalysisRepo } from '@/server/services/workshop/analysis/analysis.repo'
+import { getDcwRecipeRepo } from '@/server/services/workshop/dcw/dcw-recipe.repo'
+import { recordOps } from '@/server/services/workshop/ops/ops'
+
+export default defineApiHandler(async (event) => {
+  const user = resolveUser(event)
+  const id = getRouterParam(event, 'id')!
+  const repo = getAnalysisRepo()
+  const report = repo.get(id)
+  if (!report) throw new AppError(404, 'NOT_FOUND', `分析报告不存在: ${id}`)
+
+  // 编辑权限:admin 或产线 operate(readonly/无授权不可改)
+  const isAdmin = user.role === 'admin'
+  if (!isAdmin && (!report.lineId || lineMode(user, report.lineId) !== 'operate')) {
+    throw new AppError(403, 'ANALYSIS_FORBIDDEN', `无权修订该分析报告:需要产线「可操控」权限或 admin(报告产线 ${report.lineName || report.lineId || '-'})`)
+  }
+
+  const body = (await readBody<Record<string, unknown>>(event)) ?? {}
+  const str = (k: string): string | undefined => (body[k] === undefined ? undefined : String(body[k] ?? '').trim())
+  const title = str('title')
+  const summary = str('summary')
+  if (title !== undefined && !title) throw new AppError(400, 'VALIDATION_ERROR', 'title 不能为空')
+  if (summary !== undefined && !summary) throw new AppError(400, 'VALIDATION_ERROR', 'summary 不能为空')
+
+  // 配方校验(与保存面同口径:存在且归属该产线)
+  const recipeId = str('recipe_id')
+  if (recipeId) {
+    const recipe = getDcwRecipeRepo().list().find(r => r.id === recipeId)
+    if (!recipe) throw new AppError(404, 'NOT_FOUND', `配方不存在: ${recipeId}`)
+    if (recipe.lineId && report.lineId && recipe.lineId !== report.lineId) {
+      throw new AppError(400, 'VALIDATION_ERROR', `配方「${recipe.name}」不属于该报告的产线`)
+    }
+  }
+
+  // 时间窗归一:列内为本地 ISO(平台 toISOString 补丁),外部 Z 格式/epoch ms 归一后入库
+  const timeArg = (k: string): string | null | undefined => {
+    if (body[k] === undefined) return undefined
+    const raw = String(body[k] ?? '').trim()
+    if (!raw) return null
+    const ms = /^\d{10,}$/.test(raw) ? Number(raw) : Date.parse(raw)
+    if (!Number.isFinite(ms)) throw new AppError(400, 'VALIDATION_ERROR', `${k} 时间格式无效(ISO 8601 或 epoch ms)`)
+    return new Date(ms).toISOString()
+  }
+
+  const conclusions = body.conclusions === undefined
+    ? undefined
+    : (Array.isArray(body.conclusions) ? body.conclusions : String(body.conclusions ?? '').split('\n'))
+        .map((x: unknown) => String(x).replace(/^[-*\d.\s]+/, '').trim())
+        .filter(Boolean)
+  let metrics: Record<string, unknown> | undefined
+  if (body.metrics !== undefined && body.metrics !== null && String(body.metrics).trim() !== '') {
+    try {
+      metrics = typeof body.metrics === 'object' && !Array.isArray(body.metrics)
+        ? (body.metrics as Record<string, unknown>)
+        : JSON.parse(String(body.metrics))
+    }
+    catch {
+      throw new AppError(400, 'VALIDATION_ERROR', 'metrics 需为 JSON 对象(或留空保留原值)')
+    }
+  }
+
+  const updated = repo.update(id, {
+    title: title ?? undefined,
+    category: str('category') ?? undefined,
+    summary: summary ?? undefined,
+    conclusions,
+    report: body.report === undefined ? undefined : String(body.report ?? ''),
+    metrics,
+    recipeId,
+    recipeVersion: str('recipe_version'),
+    windowFrom: timeArg('window_from'),
+    windowTo: timeArg('window_to'),
+    dataSources: str('data_sources'),
+  }, { id: user.id, name: user.name })
+  if (!updated) throw new AppError(404, 'NOT_FOUND', `分析报告不存在: ${id}`)
+
+  try {
+    recordOps({
+      actor: user.id, actorName: user.name, actorKind: 'user',
+      action: 'analysis.update', kind: 'analysis', targetKind: 'analysis', targetId: id,
+      lineId: updated.lineId, recipeId: updated.recipeId,
+      summary: `人工修订分析报告「${updated.title}」(产线「${updated.lineName || updated.lineId || '-'}」)`,
+    })
+  }
+  catch { /* 审计失败不阻断 */ }
+
+  return { report: updated }
+})

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
   }