agentworkshop 0.5.6 → 0.5.8

package/.output/server/chunks/routes/api/workshop/agent-tools/invoke.post.mjs

@@ -1,4 +1,4 @@
-import { c as defineApiHandler, o as readBody, n as createError, X as toolMyIndustrialNodes, Y as toolDcwControl, Z as toolDaqQuery, _ as toolDcwJudge, $ as toolDcwRollback, a0 as toolDcwJournal } from '../../../../_/nitro.mjs';
+import { c as defineApiHandler, o as readBody, n as createError, g as getWorkshopManager, X as toolMyIndustrialNodes, Y as toolDcwControl, Z as toolDaqQuery, _ as toolDcwJudge, $ as toolDcwRollback, a0 as toolDcwJournal } from '../../../../_/nitro.mjs';
 import { resolveUser } from '../caller.mjs';
 import 'node:crypto';
 import 'node:http';
@@ -15,6 +15,7 @@ import 'node:net';
 import 'node:util';
 import 'node:module';
 
+const COLLAB_TOOLS = /* @__PURE__ */ new Set(["list_other_teams", "search_other_teams_memory", "send_cross_channel_message"]);
 const invoke_post = defineApiHandler(async (event) => {
   var _a, _b, _c, _d;
   resolveUser(event);
@@ -24,7 +25,9 @@ const invoke_post = defineApiHandler(async (event) => {
   const args = (_d = body.args) != null ? _d : {};
   if (!agentId) throw createError({ statusCode: 400, statusMessage: "agentId required" });
   let result;
-  if (tool === "my_industrial_nodes") result = await toolMyIndustrialNodes(agentId);
+  if (COLLAB_TOOLS.has(tool)) {
+    result = getWorkshopManager().invokeAgentWorkspaceTool(agentId, tool, args);
+  } else if (tool === "my_industrial_nodes") result = await toolMyIndustrialNodes(agentId);
   else if (tool === "dcw_control") result = await toolDcwControl(agentId, args);
   else if (tool === "daq_query") result = await toolDaqQuery(agentId, args);
   else if (tool === "dcw_judge") result = await toolDcwJudge(agentId, args);

package/.output/server/chunks/routes/api/workshop/agent-tools/invoke.post.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"invoke.post.mjs","sources":["../../../../../../../server/api/workshop/agent-tools/invoke.post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAiBA,oBAAA,gBAAA,CAAA,OAAA,KAAA,KAAA;;AACA,EAAA,WAAA,CAAA,KAAA,CAAA;AACA,EAAA,MAAA,QAAA,EAAA,GAAA,MAAA,QAAA,CAAA,KAAA,CAAA,KAAA,YAAA,EAAA;AACA,EAAA,MAAA,OAAA,GAAA,MAAA,CAAA,CAAA,EAAA,GAAA,IAAA,CAAA,OAAA,KAAA,YAAA,EAAA,CAAA;AACA,EAAA,MAAA,IAAA,GAAA,MAAA,CAAA,CAAA,EAAA,GAAA,IAAA,CAAA,IAAA,KAAA,YAAA,EAAA,CAAA;AACA,EAAA,MAAA,IAAA,GAAA,CAAA,EAAA,GAAA,IAAA,CAAA,IAAA,KAAA,IAAA,GAAA,EAAA,GAAA,EAAA;AACA,EAAA,IAAA,CAAA,SAAA,MAAA,WAAA,CAAA,EAAA,UAAA,EAAA,GAAA,EAAA,aAAA,EAAA,kBAAA,EAAA,CAAA;AACA,EAAA,IAAA,MAAA;AACA,EAAA,IAAA,IAAA,KAAA,qBAAA,EAAA,MAAA,GAAA,MAAA,sBAAA,OAAA,CAAA;AAAA,OAAA,IACA,SAAA,aAAA,EAAA,MAAA,GAAA,MAAA,cAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,WAAA,EAAA,MAAA,GAAA,MAAA,YAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,WAAA,EAAA,MAAA,GAAA,MAAA,YAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,cAAA,EAAA,MAAA,GAAA,MAAA,eAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,aAAA,EAAA,MAAA,GAAA,MAAA,cAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OACA,MAAA,YAAA,EAAA,UAAA,EAAA,KAAA,aAAA,EAAA,CAAA,cAAA,EAAA,IAAA,CAAA,CAAA,EAAA,CAAA;AACA,EAAA,OAAA,EAAA,MAAA,EAAA;AACA,CAAA,CAAA;;;;"}
+{"version":3,"file":"invoke.post.mjs","sources":["../../../../../../../server/api/workshop/agent-tools/invoke.post.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAmBA,MAAA,+BAAA,IAAA,GAAA,CAAA,CAAA,kBAAA,EAAA,2BAAA,EAAA,4BAAA,CAAA,CAAA;AAEA,oBAAA,gBAAA,CAAA,OAAA,KAAA,KAAA;;AACA,EAAA,WAAA,CAAA,KAAA,CAAA;AACA,EAAA,MAAA,QAAA,EAAA,GAAA,MAAA,QAAA,CAAA,KAAA,CAAA,KAAA,YAAA,EAAA;AACA,EAAA,MAAA,OAAA,GAAA,MAAA,CAAA,CAAA,EAAA,GAAA,IAAA,CAAA,OAAA,KAAA,YAAA,EAAA,CAAA;AACA,EAAA,MAAA,IAAA,GAAA,MAAA,CAAA,CAAA,EAAA,GAAA,IAAA,CAAA,IAAA,KAAA,YAAA,EAAA,CAAA;AACA,EAAA,MAAA,IAAA,GAAA,CAAA,EAAA,GAAA,IAAA,CAAA,IAAA,KAAA,IAAA,GAAA,EAAA,GAAA,EAAA;AACA,EAAA,IAAA,CAAA,SAAA,MAAA,WAAA,CAAA,EAAA,UAAA,EAAA,GAAA,EAAA,aAAA,EAAA,kBAAA,EAAA,CAAA;AACA,EAAA,IAAA,MAAA;AACA,EAAA,IAAA,YAAA,CAAA,GAAA,CAAA,IAAA,CAAA,EAAA;AACA,IAAA,MAAA,GAAA,kBAAA,EAAA,CAAA,wBAAA,CAAA,OAAA,EAAA,MAAA,IAAA,CAAA;AAAA,EACA,WACA,IAAA,KAAA,qBAAA,EAAA,MAAA,GAAA,MAAA,sBAAA,OAAA,CAAA;AAAA,OAAA,IACA,SAAA,aAAA,EAAA,MAAA,GAAA,MAAA,cAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,WAAA,EAAA,MAAA,GAAA,MAAA,YAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,WAAA,EAAA,MAAA,GAAA,MAAA,YAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,cAAA,EAAA,MAAA,GAAA,MAAA,eAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OAAA,IACA,SAAA,aAAA,EAAA,MAAA,GAAA,MAAA,cAAA,CAAA,SAAA,IAAA,CAAA;AAAA,OACA,MAAA,YAAA,EAAA,UAAA,EAAA,KAAA,aAAA,EAAA,CAAA,cAAA,EAAA,IAAA,CAAA,CAAA,EAAA,CAAA;AACA,EAAA,OAAA,EAAA,MAAA,EAAA;AACA,CAAA,CAAA;;;;"}

package/.output/server/package.json

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

package/package.json

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

package/scripts/_dbg-cross-team-visibility-e2e.mjs

@@ -0,0 +1,129 @@
+/**
+ * 跨团队可见性端到端验证:leader 看其他团队任务场景(list_other_teams)、
+ * 全员查其他团队共享记忆(search_other_teams_memory)、权限反证(worker 查概览被拒)。
+ * 前置:运行中的环境(默认 3000)。运行: node scripts/_dbg-cross-team-visibility-e2e.mjs
+ */
+const ROOT = process.env.AW_BASE ?? 'http://127.0.0.1:3000'
+let TOKEN = ''
+const H = () => ({ authorization: `Bearer ${TOKEN}`, 'content-type': 'application/json' })
+const sleep = (ms) => new Promise(r => setTimeout(r, ms))
+let failures = 0
+const check = (name, ok, detail = '') => {
+  console.log(`  ${ok ? 'PASS' : 'FAIL'}  ${name}${detail ? ` — ${detail}` : ''}`)
+  if (!ok) failures++
+}
+const fail = (m) => { console.error('FATAL:', m); process.exit(1) }
+
+async function api(method, path, body) {
+  const res = await fetch(ROOT + path, { method, headers: H(), body: body !== undefined ? JSON.stringify(body) : undefined })
+  const json = await res.json().catch(() => ({}))
+  return { status: res.status, ...json }
+}
+const jpost = (u, b) => api('POST', u, b ?? {})
+const jget = (u) => api('GET', u)
+const invoke = async (agentId, tool, args = {}) => {
+  const r = await jpost('/api/workshop/agent-tools/invoke', { agentId, tool, args })
+  const result = r.data?.result
+  return { status: r.status, text: String(result?.text ?? JSON.stringify(r).slice(0, 200)), isError: result?.isError === true }
+}
+const cleanup = []
+const tag = Math.random().toString(36).slice(2, 8)
+
+async function deployTeam(name, withWorker) {
+  const chRes = (await jpost('/api/workshop/channels', { name, description: '跨团队可见性验证' })).data
+  cleanup.push(['channel', chRes.channelId])
+  const team = (await jpost('/api/workshop/teams', { name: name + '-组', description: '跨团队可见性验证' })).data
+  cleanup.push(['team', team.id])
+  await jpost(`/api/workshop/teams/${team.id}/members`, { agentId: 'tpl-default-lead', role: 'lead' })
+  let worker = null
+  if (withWorker) {
+    const tpl = (await jpost('/api/workshop/agents', { name: name + '-worker', harness: 'mock', config: {} })).data
+    cleanup.push(['agent-tpl', tpl.id])
+    await jpost(`/api/workshop/teams/${team.id}/members`, { agentId: tpl.id, role: 'worker' })
+  }
+  await jpost(`/api/workshop/teams/${team.id}/deploy`, { channelId: chRes.channelId })
+  const agents = (await jget(`/api/workshop/channels/${chRes.channelId}/agents`)).data
+  const lead = agents.find(a => a.role === 'lead')
+  worker = agents.find(a => a.role === 'worker') ?? null
+  if (lead) cleanup.push(['channel-agent', `${chRes.channelId}:${lead.id}`])
+  if (worker) cleanup.push(['channel-agent', `${chRes.channelId}:${worker.id}`])
+  return { channelId: chRes.channelId, lead, worker }
+}
+
+async function main() {
+  console.log('━━━ 0. 注册与双团队部署 ━━━')
+  const reg = await jpost('/api/workshop/users/register', { name: 'xvis-' + tag })
+  TOKEN = reg.data?.token
+  if (!TOKEN) fail('注册失败: ' + JSON.stringify(reg).slice(0, 120))
+  check('注册并取得 token', !!TOKEN)
+  const east = await deployTeam('东线团队-' + tag, false)
+  const west = await deployTeam('西线团队-' + tag, true)
+  check('东线(无 worker)+ 西线(含 worker)就绪', !!east.lead?.id && !!west.lead?.id && !!west.worker?.id,
+    `eastLead=${String(east.lead?.id ?? '').slice(0, 8)} westLead=${String(west.lead?.id ?? '').slice(0, 8)}`)
+
+  // ===== 1. 东线沉淀共享记忆(他人将检索的知识)=====
+  console.log('\n━━━ 1. 东线共享记忆沉淀 ━━━')
+  const mem = await jpost(`/api/workshop/channels/${east.channelId}/memories`, {
+    title: '淬火工艺结论-' + tag,
+    content: `东线团队完成淬火工序验证:淬火温度 182℃ 保温 30 分钟后硬度达标 HRC58,温度超过 190℃ 会出现过回火软化。结论可用于西线同类工件工艺制定(${tag})。`,
+    importance: 0.9,
+  })
+  check('东线共享记忆写入', mem.status === 200, `status=${mem.status}`)
+
+  // ===== 2. 东线创建进行中场景任务 =====
+  console.log('\n━━━ 2. 东线进行中任务 ━━━')
+  const task = await jpost(`/api/workshop/channels/${east.channelId}/tasks`, {
+    title: '东线批次复检-' + tag,
+    parts: [{ text: '对当前批次做复检并记录结论' }],
+  })
+  const taskId = task.data?.task?.id ?? task.data?.id
+  cleanup.push(['task', taskId])
+  check('东线任务创建(进行中)', !!taskId, `id=${String(taskId ?? '').slice(0, 8)}`)
+
+  // ===== 3. 西线 lead:list_other_teams 看到东线的任务场景 =====
+  console.log('\n━━━ 3. Leader 跨团队观察面 ━━━')
+  const ov = await invoke(west.lead.id, 'list_other_teams')
+  const ovText = String(ov.text ?? '')
+  check('lead 查看其他团队概览', ov.status === 200 && ovText.includes('东线团队-' + tag), `status=${ov.status}`)
+  check('概览包含东线进行中任务标题', ovText.includes('东线批次复检-' + tag))
+  check('概览包含东线近期完成记录', ovText.includes('近期完成'))
+
+  // ===== 4. 西线 worker:search_other_teams_memory 查到东线共享知识 =====
+  console.log('\n━━━ 4. Worker 跨团队记忆检索 ━━━')
+  const hit = await invoke(west.worker.id, 'search_other_teams_memory', { query: '淬火 温度 硬度', limit: 5 })
+  const hitText = String(hit.text ?? '')
+  check('worker 检索到东线共享记忆', hit.status === 200 && hitText.includes('淬火工艺结论-' + tag),
+    `status=${hit.status} text=${hitText.slice(0, 60)}`)
+  check('检索结果带团队归属', hitText.includes('东线团队-' + tag))
+
+  // ===== 5. 权限反证:worker 查任务概览被拒(仅 lead)=====
+  const denied = await invoke(west.worker.id, 'list_other_teams')
+  check('worker 查任务概览被拒(仅 lead)', denied.isError === true || denied.status === 403 || String(denied.text ?? '').includes('Leader'),
+    `status=${denied.status} text=${String(denied.text ?? '').slice(0, 60)}`)
+
+  // ===== 6. 工作流语义:知识已存在 → lead 直接复用,无需发信 =====
+  const reuse = hitText.includes('182') && hitText.includes('HRC58')
+  check('跨团队知识可复用(检索内容含结论数值)', reuse)
+  console.log('  (工作流:命中知识 → 直接复用;未命中但有相关任务 → lead 用 send_cross_channel_message 发信请求协作)')
+
+  // ===== 清理 =====
+  console.log('\n━━━ 清理 ━━━')
+  for (const [kind, id] of [...cleanup].reverse()) {
+    try {
+      if (kind === 'channel') await api('DELETE', `/api/workshop/channels/${id}`)
+      else if (kind === 'team') await api('DELETE', `/api/workshop/teams/${id}`)
+      else if (kind === 'agent-tpl') await api('DELETE', `/api/workshop/agents/${id}`)
+      else if (kind === 'channel-agent') {
+        const [cid, aid] = String(id).split(':')
+        if (cid && aid) await api('DELETE', `/api/workshop/channels/${cid}/agents/${aid}`)
+      }
+    }
+    catch { /* 清理失败不阻断 */ }
+  }
+  console.log('清理完成')
+
+  console.log(failures === 0 ? '\nE2E ALL PASS' : `\nE2E ${failures} FAILED`)
+  if (failures > 0) process.exit(1)
+}
+
+main().catch((e) => { console.error(e); process.exit(1) })

package/scripts/_dbg-overview-probe.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# 自包含探针(同主两团队):东线(含共享记忆)+ 西线 → 西线 lead 的 list_other_teams
+set -e
+B=http://127.0.0.1:3000/api/workshop
+STAMP=$(date +%s)
+TA=$(curl -s --noproxy 127.0.0.1 -X POST $B/users/register -H "content-type: application/json" -d "{\"name\":\"ovw2-a-$STAMP\"}" | python -c "import json,sys;print(json.load(sys.stdin)['data']['token'])")
+AA="authorization: Bearer $TA"
+
+# 东线团队(含共享记忆)
+CHA=$(curl -s --noproxy 127.0.0.1 -X POST $B/channels -H "$AA" -H "content-type: application/json" -d "{\"name\":\"东线团队-$STAMP\"}" | python -c "import json,sys;print(json.load(sys.stdin)['data']['channelId'])")
+TEA=$(curl -s --noproxy 127.0.0.1 -X POST $B/teams -H "$AA" -H "content-type: application/json" -d "{\"name\":\"东线组-$STAMP\"}" | python -c "import json,sys;print(json.load(sys.stdin)['data']['id'])")
+curl -s --noproxy 127.0.0.1 -X POST "$B/teams/$TEA/members" -H "$AA" -H "content-type: application/json" -d '{"agentId":"tpl-default-lead","role":"lead"}' > /dev/null
+curl -s --noproxy 127.0.0.1 -X POST "$B/teams/$TEA/deploy" -H "$AA" -H "content-type: application/json" -d "{\"channelId\":\"$CHA\"}" > /dev/null
+curl -s --noproxy 127.0.0.1 -X POST "$B/channels/$CHA/memories" -H "$AA" -H "content-type: application/json" -d '{"title":"东线工艺结论","content":"淬火 182℃ 保温 30 分钟硬度达标 HRC58","importance":0.9}' > /dev/null
+
+# 西线团队(观察视角)
+CHB=$(curl -s --noproxy 127.0.0.1 -X POST $B/channels -H "$AA" -H "content-type: application/json" -d "{\"name\":\"西线团队-$STAMP\"}" | python -c "import json,sys;print(json.load(sys.stdin)['data']['channelId'])")
+TEB=$(curl -s --noproxy 127.0.0.1 -X POST $B/teams -H "$AA" -H "content-type: application/json" -d "{\"name\":\"西线组-$STAMP\"}" | python -c "import json,sys;print(json.load(sys.stdin)['data']['id'])")
+curl -s --noproxy 127.0.0.1 -X POST "$B/teams/$TEB/members" -H "$AA" -H "content-type: application/json" -d '{"agentId":"tpl-default-lead","role":"lead"}' > /dev/null
+curl -s --noproxy 127.0.0.1 -X POST "$B/teams/$TEB/deploy" -H "$AA" -H "content-type: application/json" -d "{\"channelId\":\"$CHB\"}" > /dev/null
+LEADB=$(curl -s --noproxy 127.0.0.1 "$B/channels/$CHB/agents" -H "$AA" | python -c "import json,sys;print([a['id'] for a in json.load(sys.stdin)['data'] if a['role']=='lead'][0])")
+
+echo "--- 西线 lead 视角 list_other_teams ---"
+curl -s --noproxy 127.0.0.1 -X POST $B/agent-tools/invoke -H "$AA" -H "content-type: application/json" \
+  -d "{\"agentId\":\"$LEADB\",\"tool\":\"list_other_teams\",\"args\":{}}" \
+  | python -c "import json,sys;print(json.load(sys.stdin)['data']['result']['text'])"
+echo "--- 东线 lead 视角 search_other_teams_memory(本例只有东线,预期空)---"
+LEADA=$(curl -s --noproxy 127.0.0.1 "$B/channels/$CHA/agents" -H "$AA" | python -c "import json,sys;print([a['id'] for a in json.load(sys.stdin)['data'] if a['role']=='lead'][0])")
+curl -s --noproxy 127.0.0.1 -X POST $B/agent-tools/invoke -H "$AA" -H "content-type: application/json" \
+  -d "{\"agentId\":\"$LEADA\",\"tool\":\"search_other_teams_memory\",\"args\":{\"query\":\"淬火\"}}" \
+  | python -c "import json,sys;print(json.load(sys.stdin)['data']['result']['text'])"

package/server/api/workshop/agent-tools/invoke.post.ts

@@ -6,6 +6,7 @@
 import { readBody } from 'h3'
 import { resolveUser } from '@/server/api/workshop/caller'
 import { defineApiHandler } from '@/server/utils/response'
+import { getWorkshopManager } from '@/server/plugins/workshop'
 import {
   toolDaqQuery,
   toolDcwControl,
@@ -15,6 +16,9 @@ import {
   toolMyIndustrialNodes,
 } from '@/server/services/workshop/agents/industrial-tools'
 
+/** 协作工具族:经 manager 工具桥落到 agent workspace(跨团队可见性/跨 Channel 通信) */
+const COLLAB_TOOLS = new Set(['list_other_teams', 'search_other_teams_memory', 'send_cross_channel_message'])
+
 export default defineApiHandler(async (event) => {
   resolveUser(event)
   const body = await readBody<{ agentId?: string, tool?: string, args?: Record<string, unknown> }>(event) ?? {}
@@ -23,7 +27,10 @@ export default defineApiHandler(async (event) => {
   const args = body.args ?? {}
   if (!agentId) throw createError({ statusCode: 400, statusMessage: 'agentId required' })
   let result: { text: string, isError?: boolean }
-  if (tool === 'my_industrial_nodes') result = await toolMyIndustrialNodes(agentId)
+  if (COLLAB_TOOLS.has(tool)) {
+    result = getWorkshopManager().invokeAgentWorkspaceTool(agentId, tool, args)
+  }
+  else if (tool === 'my_industrial_nodes') result = await toolMyIndustrialNodes(agentId)
   else if (tool === 'dcw_control') result = await toolDcwControl(agentId, args as { node_id?: string, value?: number, hypothesis?: string, task_id?: string })
   else if (tool === 'daq_query') result = await toolDaqQuery(agentId, args as Parameters<typeof toolDaqQuery>[1])
   else if (tool === 'dcw_judge') result = await toolDcwJudge(agentId, args as { record_id?: string, verdict?: string, reason?: string })