agentworkshop 0.7.17 → 0.7.18

package/.output/server/package.json

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

package/app/pages/dcw/[id].vue

@@ -389,6 +389,26 @@ const visibleRecipes = computed(() =>
 )
 const productName = (id: string): string => dcw.products.find(p => p.id === id)?.name ?? id
 
+// ---------- 配方参数节点失效态(已删除/已停用/已取消绑定;灰化 + 徽标) ----------
+interface StaleRef { code: 'deleted' | 'disabled' | 'unbound', label: string }
+function paramStatus(nodeId: string, lineId: string): StaleRef | null {
+  const node = dcw.nodes.find(n => n.id === nodeId)
+  if (!node) return { code: 'deleted', label: t('dcwDetail.staleDeleted') }
+  if (!node.enabled) return { code: 'disabled', label: t('dcwDetail.staleDisabled') }
+  if (lineId && node.lineId !== lineId) return { code: 'unbound', label: t('dcwDetail.staleUnbound') }
+  return null
+}
+function paramNodeName(nodeId: string): string {
+  return dcw.nodes.find(n => n.id === nodeId)?.name ?? nodeId
+}
+function daqWindowStatus(nodeId: string, lineId: string): StaleRef | null {
+  const node = daq.nodes.find(n => n.id === nodeId)
+  if (!node) return { code: 'deleted', label: t('dcwDetail.staleDeleted') }
+  if (!node.enabled) return { code: 'disabled', label: t('dcwDetail.staleDisabled') }
+  if (lineId && node.lineId !== lineId) return { code: 'unbound', label: t('dcwDetail.staleUnbound') }
+  return null
+}
+
 // ---------- 配方版本历史(整体修改变更记录;来源=用户/Agent/系统 + 操作者 + 回退) ----------
 interface RecipeVersionRow {
   version: number
@@ -493,6 +513,7 @@ const recipeOpen = ref(false)
 const recipeEditing = ref<string | null>(null)
 const recipeSaving = ref(false)
 const recipeError = ref('')
+const recipeStaleNote = ref('')
 const recipeForm = reactive({
   productId: '',
   name: '',
@@ -520,10 +541,15 @@ function openRecipeEdit(id: string): void {
   if (!r) return
   recipeEditing.value = id
   recipeError.value = ''
+  // 失效参数自动清理:节点已删除的参数行直接剔除(保存会被后端归一化拒绝);
+  // 停用/解绑节点参数保留可编辑,状态由 select 旁徽标标示
+  const live = r.params.filter(p => dcw.nodes.some(n => n.id === p.nodeId))
+  const dropped = r.params.length - live.length
+  recipeStaleNote.value = dropped > 0 ? t('dcwDetail.staleDropped', { p0: dropped }) : ''
   recipeForm.productId = r.productId
   recipeForm.name = r.name
   recipeForm.description = r.description
-  recipeForm.params = r.params.map(p => ({
+  recipeForm.params = live.map(p => ({
     nodeId: p.nodeId,
     value: p.value,
     min: p.min ?? '',
@@ -1428,16 +1454,25 @@ function fmtPoint(p: { value?: number, avg?: number } | undefined): string {
               v-for="(p, i) in r.params"
               :key="i"
               class="param-chip"
+              :class="{ stale: paramStatus(p.nodeId, r.lineId) }"
+              :title="paramStatus(p.nodeId, r.lineId)?.label ?? ''"
             >
-              {{ (dcw.templates.find(t => t.key === (p.templateRef ?? '').replace('dcw-', ''))?.ch ?? p.templateRef) }} = {{ p.value }}
+              {{ paramNodeName(p.nodeId) }} = {{ p.value }}<span
+                v-if="paramStatus(p.nodeId, r.lineId)"
+                class="chip-stale-tag"
+              >{{ paramStatus(p.nodeId, r.lineId)!.label }}</span>
             </span>
             <span
               v-for="(w, i) in r.daqWindows"
               :key="`w-${i}`"
               class="param-chip daqwin"
-              :title="$t('dcwDetail.k1l11api013')"
+              :class="{ stale: daqWindowStatus(w.nodeId, r.lineId) }"
+              :title="daqWindowStatus(w.nodeId, r.lineId)?.label ?? $t('dcwDetail.k1l11api013')"
             >
-              ◎ {{ daqNodeCh(w.nodeId) }} ∈ [{{ w.min ?? '-∞' }}, {{ w.max ?? '+∞' }}]
+              ◎ {{ daqNodeCh(w.nodeId) }} ∈ [{{ w.min ?? '-∞' }}, {{ w.max ?? '+∞' }}]<span
+                v-if="daqWindowStatus(w.nodeId, r.lineId)"
+                class="chip-stale-tag"
+              >{{ daqWindowStatus(w.nodeId, r.lineId)!.label }}</span>
             </span>
           </div>
           <div class="recipe-actions">
@@ -1733,6 +1768,10 @@ function fmtPoint(p: { value?: number, avg?: number } | undefined): string {
                 {{ n.name }}({{ dcwTemplateRefCh(n.templateRef) }} · {{ n.min }}~{{ n.max }} {{ n.unit }})
               </option>
             </select>
+            <span
+              v-if="paramStatus(p.nodeId, lineId)"
+              class="row-stale"
+            >{{ paramStatus(p.nodeId, lineId)!.label }}</span>
           </label>
           <label class="f">
             <span>{{ $t('dcwDetail.k3renp2098') }}<em>*</em></span>
@@ -1832,6 +1871,12 @@ function fmtPoint(p: { value?: number, avg?: number } | undefined): string {
         >
           {{ $t('dcwDetail.kv1de1p105') }}
         </button>
+        <p
+          v-if="recipeStaleNote"
+          class="m-note"
+        >
+          {{ recipeStaleNote }}
+        </p>
         <p
           v-if="recipeError"
           class="m-err"
@@ -1867,12 +1912,12 @@ function fmtPoint(p: { value?: number, avg?: number } | undefined): string {
         style="max-width: 760px;"
       >
         <div class="modal-head">
-          <h3>
+          <h3>
             {{ t('dcwDetail.histTitle') }}<span
               v-if="verRecipe"
               class="dim"
               style="margin-left: 8px; font-size: 12px;"
-            >{{ verRecipe.name }} · v{{ verRecipe.version }}</span>
+            >{{ verRecipe.name }} · v{{ verRecipe.version }}</span>
           </h3>
           <button
             class="mini-btn"
@@ -2471,6 +2516,11 @@ h1 { margin: 2px 0 4px; font-size: 30px; font-weight: 400; letter-spacing: -0.01
 .test-result.good { color: var(--tone-success-dot); }
 .test-result.bad { color: var(--tone-danger-dot); }
 .m-err { margin: 8px 0 0; font-size: 12px; color: var(--tone-danger-dot); }
+.m-note { margin: 8px 0 0; font-size: 12px; color: var(--ink-faint); }
+/* 失效配方参数:灰化 + 徽标 */
+.param-chip.stale { color: var(--ink-faint); background: color-mix(in srgb, var(--ink) 5%, transparent); border-color: var(--divider-hair); text-decoration: line-through; text-decoration-color: color-mix(in srgb, var(--ink-faint) 60%, transparent); }
+.chip-stale-tag { margin-left: 5px; padding: 0 5px; font-size: 9.5px; font-style: normal; color: var(--tone-danger-dot); background: color-mix(in srgb, var(--tone-danger-dot) 8%, transparent); border: 1px solid color-mix(in srgb, var(--tone-danger-dot) 30%, transparent); border-radius: var(--radius-chip); text-decoration: none; }
+.row-stale { flex: none; padding: 1px 7px; font-size: 10.5px; color: var(--tone-danger-dot); border: 1px solid color-mix(in srgb, var(--tone-danger-dot) 30%, transparent); border-radius: var(--radius-chip); }
 .m-actions { display: flex; gap: 10px; justify-content: flex-end; margin-top: 16px; }
 .aw-pill.outline { color: var(--ink); background: var(--paper-raised); border-color: var(--line-strong); }
 .err { margin-top: 14px; font-size: 13px; color: var(--tone-danger-dot); }

package/i18n/locales/en.ts

@@ -840,6 +840,10 @@ export default {
     k1bphrb3048: 'Delete failed',
   },
   dcwDetail: {
+    staleDeleted: 'deleted',
+    staleDisabled: 'disabled',
+    staleUnbound: 'unbound',
+    staleDropped: 'Removed {p0} stale param(s) (node deleted); re-add with a live node if needed',
     histBtn: 'History',
     histTitle: 'Recipe Version History',
     histLoading: 'Loading…',

package/i18n/locales/zh-CN.ts

@@ -839,6 +839,10 @@ export default {
     k1bphrb3048: '删除失败',
   },
   dcwDetail: {
+    staleDeleted: '已删除',
+    staleDisabled: '已停用',
+    staleUnbound: '已取消绑定',
+    staleDropped: '已自动移除 {p0} 条失效参数(节点已删除);如需恢复请重新添加有效节点',
     histBtn: '版本历史',
     histTitle: '配方版本历史',
     histLoading: '加载中…',

package/package.json

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

package/scripts/_dbg-recipe-stale-e2e.mjs

@@ -0,0 +1,135 @@
+/**
+ * 配方失效节点(停用/解绑/删除)一致性 E2E(隔离实例 :3021)
+ *
+ * 验证:
+ *  1) 配方一键下发:A 正常下发;B(停用)/C(解绑)/D(删除)三类失效参数逐一跳过并记明原因
+ *  2) 手动 REST 写停用节点 → 409(单点门控)
+ *  3) Agent dcw_control 停用节点 → 明确「已停用」报错
+ *  4) Agent recipe_update:触到停用/解绑节点被拒;正常参数保存时自动剪除基线中的失效参数并告知
+ *  5) recipe_rollback 回退到含失效节点的历史版本 → 剪枝成功,版本描述记录剔除
+ *  6) line_context 参数行带 [已停用/已取消绑定/已删除] 标记
+ * 用法:NO_PROXY='127.0.0.1,localhost' node scripts/_dbg-recipe-stale-e2e.mjs [base]
+ */
+const BASE = process.argv[2] ?? 'http://127.0.0.1:3021'
+const TAG = `st${Math.random().toString(36).slice(2, 6)}`
+let pass = 0
+let fail = 0
+const ok = (cond, name, extra = '') => {
+  if (cond) { pass++; console.log(`  ✓ ${name}`) }
+  else { fail++; console.log(`  ✗ ${name} ${extra}`) }
+}
+const api = async (method, path, { body, token } = {}) => {
+  const res = await fetch(`${BASE}${path}`, {
+    method,
+    headers: { 'content-type': 'application/json', ...(token ? { authorization: `Bearer ${token}` } : {}) },
+    body: body === undefined ? undefined : JSON.stringify(body),
+    signal: AbortSignal.timeout(30_000),
+  })
+  return { status: res.status, ...(await res.json().catch(() => ({}))) }
+}
+const invoke = (token, agentId, tool, args) => api('POST', '/api/workshop/agent-tools/invoke', { body: { agentId, tool, args }, token })
+
+async function main() {
+  console.log(`━━━ 配方失效节点一致性 E2E @ ${BASE} (tag=${TAG}) ━━━`)
+  const login = await api('POST', '/api/users/login', { body: { email: 'admin', password: 'admin123' } })
+  const token = login.data?.token
+  ok(Boolean(token), 'admin 登录')
+
+  // ── 夹具:产线 + 4 节点 + 产品 + 配方(4 参数)──
+  const line = (await api('POST', '/api/workshop/dcw/lines', { body: { name: `st-line-${TAG}` }, token })).data?.line
+  const mkNode = async (name) => (await api('POST', '/api/workshop/dcw', {
+    body: { name: `${name}-${TAG}`, templateRef: 'temp-sp', driver: 'mock', driverConfig: { key: `${name}-${TAG}` }, min: 0, max: 100, unit: '℃', lineId: line.id },
+    token,
+  })).data?.node
+  const na = await mkNode('st-a')
+  const nb = await mkNode('st-b')
+  const nc = await mkNode('st-c')
+  const nd = await mkNode('st-d')
+  const product = (await api('POST', '/api/workshop/dcw/products', { body: { name: `st-prod-${TAG}`, lineId: line.id }, token })).data?.product
+  const recipe = (await api('POST', '/api/workshop/dcw/recipes', {
+    body: { name: `st-recipe-${TAG}`, productId: product.id, params: [
+      { nodeId: na.id, value: 40 },
+      { nodeId: nb.id, value: 41 },
+      { nodeId: nc.id, value: 42 },
+      { nodeId: nd.id, value: 43 },
+    ] },
+    token,
+  })).data?.recipe
+  ok(Boolean(na?.id && nb?.id && nc?.id && nd?.id && recipe?.id), `夹具:4 节点 + 配方 ${recipe?.id}`)
+
+  // ── 三态变异:B 停用 / C 解绑 / D 删除 ──
+  await api('PATCH', `/api/workshop/dcw/${nb.id}`, { body: { enabled: false }, token })
+  await api('PATCH', `/api/workshop/dcw/${nc.id}`, { body: { lineId: '' }, token })
+  await api('DELETE', `/api/workshop/dcw/${nd.id}`, { token })
+
+  // ── 1. 一键下发:失效参数逐一跳过 ──
+  const apply = await api('POST', `/api/workshop/dcw/recipes/${recipe.id}/apply`, { body: {}, token })
+  ok(apply.status === 200, '一键下发执行')
+  const results = apply.data?.run?.results ?? []
+  const byNode = Object.fromEntries(results.map(r => [r.nodeId ?? 'deleted', r]))
+  ok(byNode[na.id]?.ok === true, 'A 正常节点照常下发')
+  ok((byNode[nb.id]?.message ?? '').includes('已停用') && byNode[nb.id]?.ok === false, `B 停用跳过(${byNode[nb.id]?.message ?? '∅'})`)
+  ok((byNode[nc.id]?.message ?? '').includes('已取消绑定') && byNode[nc.id]?.ok === false, `C 解绑跳过(${byNode[nc.id]?.message ?? '∅'})`)
+  ok(Object.values(byNode).some(r => (r.message ?? '').includes('已删除') && r.ok === false), `D 删除跳过(${(results.find(r => !r.nodeId)?.message) ?? '∅'})`)
+  ok((apply.data?.run?.results ?? []).every(r => results.some(x => x === r)), 'run.results 完整保留跳过原因')
+
+  // ── 2. 手动 REST 写停用节点 → 409 ──
+  const manual = await api('POST', `/api/workshop/dcw/${nb.id}/write`, { body: { value: 10 }, token })
+  ok(manual.status === 409, `手动写停用节点 409(实际 ${manual.status} ${manual.message ?? ''})`)
+
+  // ── 3. Agent 组建 + 直调 ──
+  const ch = (await api('POST', '/api/workshop/channels', {
+    body: { name: `st-${TAG}`, leadAgent: { name: `lead-${TAG}`, harness: 'mock', config: { delayMs: 60 } } },
+    token,
+  })).data
+  const tpl = await api('POST', '/api/workshop/agents', { body: { name: `stw-${TAG}`, harness: 'omp', config: { provider: 'zhipu-coding-plan', model: 'glm-5.3-flash' } }, token })
+  const join = await api('POST', `/api/workshop/channels/${ch.channelId}/agents`, { body: { agentId: tpl.data.id, role: 'worker' }, token })
+  const instId = join.data?.id
+  for (const n of [na, nb, nc]) await api('POST', '/api/workshop/agent-tools/bindings', { body: { agentId: instId, nodeId: n.id, kind: 'dcw', mode: 'auto' }, token })
+  ok(Boolean(instId), 'omp worker 建号+绑定')
+
+  const wB = await invoke(token, instId, 'dcw_control', { node_id: nb.id, value: 10 })
+  ok(wB.data?.result?.isError === true && wB.data?.result?.text.includes('已停用'), '[agent] dcw_control 停用节点明确报错', wB.data?.result?.text?.slice(0, 80))
+
+  // ── 4. recipe_update:触雷拒绝 + 自动剪枝 ──
+  const uB = await invoke(token, instId, 'recipe_update', { recipe_id: recipe.id, params: [{ node_id: nb.id, value: 70 }], reason: '触雷测试' })
+  ok(uB.data?.result?.isError === true && uB.data?.result?.text.includes('已停用'), '[agent] recipe_update 停用节点被拒', uB.data?.result?.text?.slice(0, 80))
+  const uC = await invoke(token, instId, 'recipe_update', { recipe_id: recipe.id, params: [{ node_id: nc.id, value: 70 }], reason: '触雷测试' })
+  ok(uC.data?.result?.isError === true && uC.data?.result?.text.includes('已取消绑定'), '[agent] recipe_update 解绑节点被拒', uC.data?.result?.text?.slice(0, 80))
+
+  const uA = await invoke(token, instId, 'recipe_update', { recipe_id: recipe.id, params: [{ node_id: na.id, value: 77 }], reason: '正常参数保存(应自动剔除 C/D 失效参数)' })
+  ok(uA.data?.result?.text?.includes('v2') && uA.data?.result?.text?.includes('剔除'), '[agent] 正常保存 → v2 + 剔除失效参数告知', uA.data?.result?.text?.slice(0, 120))
+  const cur = (await api('GET', '/api/workshop/dcw', { token })).data?.recipes?.find(r => r.id === recipe.id)
+  ok(cur?.params?.length === 2 && cur?.params?.some(p => p.nodeId === na.id) && cur?.params?.some(p => p.nodeId === nb.id), `基线剪枝后参数=A+B(实际 ${cur?.params?.length} 条)`)
+
+  // ── 5. 回退到含失效节点的 v1 → 剪枝成功 ──
+  const rb = await api('POST', `/api/workshop/dcw/recipes/${recipe.id}/revert`, { body: { version: 1, reason: '回退到含失效节点的初版' }, token })
+  ok(rb.status === 200 && rb.data?.recipe?.version === 3, `回退 v1 → v3 成功(实际 v${rb.data?.recipe?.version})`)
+  ok((rb.data?.recipe?.description ?? '').includes('剔除') || (rb.data?.recipe?.paramsHistory ?? []).some(h => (h.description ?? '').includes('剔除')), '回退版本描述记录剔除')
+  ok((rb.data?.recipe?.params ?? []).every(p => p.nodeId !== nd.id && p.nodeId !== nc.id), '回退后不含已删除/已解绑节点参数')
+
+  // ── 6. line_context 状态标记 ──
+  const lc = await invoke(token, instId, 'line_context', {})
+  if (lc.data?.result?.text?.includes('已停用') && lc.data?.result?.text?.includes('参数不下发')) ok(true, '[agent] line_context 标记停用参数')
+  else {
+    ok(false, '[agent] line_context 标记停用参数')
+    console.log('  ── line_context 实际输出 ──')
+    console.log(lc.data?.result?.text ?? JSON.stringify(lc))
+  }
+
+  // ── 清理 ──
+  await api('DELETE', `/api/workshop/channels/${ch.channelId}?purge=1`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/agents/${tpl.data.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/recipes/${recipe.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/products/${product.id}`, { token }).catch(() => {})
+  for (const n of [na, nb, nc]) await api('DELETE', `/api/workshop/dcw/${n.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/lines/${line.id}`, { token }).catch(() => {})
+
+  console.log(`\n━━━ StaleRef E2E: ${pass} passed / ${fail} failed ━━━`)
+  process.exit(fail === 0 ? 0 : 1)
+}
+
+main().catch((err) => {
+  console.error('E2E 异常:', err)
+  process.exit(1)
+})