agentworkshop 0.7.24 → 0.7.27

package/server/services/workshop/agents/plugin-tools.ts

@@ -96,6 +96,14 @@ export function listPluginTools(): Map<string, OmpPluginTool> {
   return state().byName
 }
 
+/** 工具名 → 注册方插件名(团队级插件开关过滤用;非插件工具返回 null) */
+export function pluginOfTool(name: string): string | null {
+  for (const [k, tool] of state().byPlugin.entries()) {
+    if (tool.name === name) return k.slice(0, k.lastIndexOf(':')) || null
+  }
+  return null
+}
+
 /** 注册表变更订阅(omp-agent 模块加载时接管 pending 并订阅热注入) */
 export function onPluginToolsChange(fn: () => void): () => void {
   const st = state()
@@ -103,7 +111,8 @@ export function onPluginToolsChange(fn: () => void): () => void {
   return () => st.listeners.delete(fn)
 }
 
-function notifyToolChange(): void {
+/** 变更通知(团队级插件开关切换后调用,在跑 agent 热刷新工具清单) */
+export function notifyToolChange(): void {
   for (const fn of state().listeners) {
     try {
       fn()

package/server/services/workshop/db/channel-plugins.repo.ts

@@ -0,0 +1,65 @@
+/**
+ * ChannelPlugins 仓储:channel_plugins 表(channel × 插件启停,团队级独立开关)。
+ *
+ * 语义:无显式行 = 未配置 → 全部启用插件对团队可见(向后兼容,存量 channel 不受影响);
+ * 显式行(建队勾选/团队设置切换)写入后按行过滤 —— 关闭的插件其工具不注入该团队
+ * Agent,dispatch 同源拒绝,防止不需要插件的 channel 上下文被污染。
+ * 自持连接(user.repository.ts 同模式):workshop.sqlite 单文件 WAL。
+ */
+import { DatabaseSync } from 'node:sqlite'
+import { join } from 'node:path'
+import { ensureDataDir } from '@/shared/config/home.mjs'
+
+const DB_PATH = join(ensureDataDir(), 'workshop.sqlite')
+
+let db: DatabaseSync | null = null
+function getDb(): DatabaseSync {
+  if (!db) {
+    db = new DatabaseSync(DB_PATH)
+    db.exec('PRAGMA busy_timeout=4000')
+    db.exec(`CREATE TABLE IF NOT EXISTS channel_plugins (
+      channel_id TEXT NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
+      plugin     TEXT NOT NULL,
+      enabled    INTEGER NOT NULL DEFAULT 1,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (channel_id, plugin)
+    )`)
+  }
+  return db
+}
+
+export interface ChannelPluginToggle {
+  name: string
+  enabled: boolean
+}
+
+export class ChannelPluginsRepo {
+  /** 该团队的显式插件开关;无行 → null(未配置,默认全启用) */
+  explicitFor(channelId: string): Map<string, boolean> | null {
+    const rows = getDb()
+      .prepare('SELECT plugin, enabled FROM channel_plugins WHERE channel_id = ?')
+      .all(channelId) as Array<{ plugin: string, enabled: number }>
+    if (!rows.length) return null
+    return new Map(rows.map(r => [r.plugin, r.enabled === 1]))
+  }
+
+  /** 写入/更新显式开关(未知插件名由调用方过滤) */
+  setMany(channelId: string, entries: ChannelPluginToggle[]): void {
+    const d = getDb()
+    const up = d.prepare('INSERT OR REPLACE INTO channel_plugins (channel_id, plugin, enabled, updated_at) VALUES (?, ?, ?, ?)')
+    for (const e of entries) {
+      if (!e?.name) continue
+      up.run(channelId, String(e.name), e.enabled === false ? 0 : 1, new Date().toISOString())
+    }
+  }
+
+  removeForChannel(channelId: string): void {
+    getDb().prepare('DELETE FROM channel_plugins WHERE channel_id = ?').run(channelId)
+  }
+}
+
+let repo: ChannelPluginsRepo | null = null
+export function getChannelPluginsRepo(): ChannelPluginsRepo {
+  repo ??= new ChannelPluginsRepo()
+  return repo
+}

package/server/services/workshop/plugins/host.mjs

@@ -55,7 +55,11 @@ function defaultHome() {
 /** 运行模式路径(cwd 为检出根时启用 project 作用域) */
 function modePaths(cwd) {
   const isRepo = existsSync(join(cwd, 'config.yml')) && existsSync(join(cwd, 'nuxt.config.ts'))
+  // packageRoot:宿主运行时取 initPluginHost 注入值;冒烟/单测(cwd 在包根)回退 cwd
+  const packageRoot = g.__awPluginHost?.packageRoot ?? (isRepo ? cwd : null)
+  const builtinDir = packageRoot ? join(packageRoot, 'server', 'plugins-builtin') : null
   return {
+    builtinDir: builtinDir && existsSync(builtinDir) ? builtinDir : null,
     projectDir: isRepo ? join(cwd, '.AgentWorkShop', 'plugins') : null,
     userDir: join(process.env.AW_HOME && String(process.env.AW_HOME).trim() ? String(process.env.AW_HOME).trim() : defaultHome(), 'plugins'),
     homeDir: process.env.AW_HOME && String(process.env.AW_HOME).trim() ? String(process.env.AW_HOME).trim() : defaultHome(),
@@ -89,12 +93,12 @@ export function writeDisabledSet(homeDir, disabled) {
   renameSync(tmp, p)
 }
 
-/** 发现两个作用域下的插件入口(project 同名覆盖 user) */
+/** 发现插件入口,三作用域(builtin 同名被 project 覆盖,project 同名被 user 覆盖) */
 export function discoverPluginDirs(cwd = process.cwd()) {
-  const { projectDir, userDir } = modePaths(cwd)
+  const { builtinDir, projectDir, userDir } = modePaths(cwd)
   const out = []
   const seen = new Set()
-  for (const [dir, scope] of [[projectDir, 'project'], [userDir, 'user']]) {
+  for (const [dir, scope] of [[builtinDir, 'builtin'], [projectDir, 'project'], [userDir, 'user']]) {
     if (!dir || !existsSync(dir)) continue
     for (const name of readdirSync(dir)) {
       const sub = join(dir, name)
@@ -150,6 +154,20 @@ export async function initPluginHost({ cwd = process.cwd(), packageRoot } = {})
   catch (err) {
     host.logger.warn('配置引擎加载降级(插件 ctx.config 将为空):', err?.message)
   }
+  // 配置热更新:system-config 变化(设置页 PATCH / runtime-settings 文件监听)即刷新
+  // effective —— 插件 ctx.config.get 每次调用实时读到新值(插件 API 地址等改配置即生效,无需重启)
+  try {
+    const { getSystemConfigService } = await import('@/server/services/system-config')
+    getSystemConfigService().subscribe((tail) => {
+      try {
+        if (config?.effective && tail?.effective) Object.assign(config.effective, tail.effective)
+      }
+      catch { /* 刷新失败保留旧值 */ }
+    })
+  }
+  catch (err) {
+    host.logger.warn('配置热更新订阅失败(插件 ctx.config 为装载时快照):', err?.message)
+  }
   host.config = config
 
   // 自环 origin:PORT env(prod:start.mjs 注入 / dev:dev-guard 注入 CLI 显式值)权威;
@@ -201,6 +219,7 @@ async function loadAllPlugins(host, { config, paths }) {
           name: def.name,
           version: String(def.version ?? '0.0.0'),
           description: String(def.description ?? ''),
+          auth: String(def.auth ?? 'none'),
           scope,
           dir,
           entry,
@@ -217,6 +236,7 @@ async function loadAllPlugins(host, { config, paths }) {
         name: def.name,
         version: String(def.version ?? '0.0.0'),
         description: String(def.description ?? ''),
+        auth: String(def.auth ?? 'none'),
         scope,
         dir,
         entry,
@@ -320,6 +340,16 @@ async function loadAllPlugins(host, { config, paths }) {
         /** 帧消费便捷别名(= hooks.on('daq:frame') / hooks.on('daq:sample')) */
         onFrame: fn => scopedHooks.on('daq:frame', fn),
         onSample: fn => scopedHooks.on('daq:sample', fn),
+        /** 时序查询直通(queryTagged):插件免鉴权拉取产线/节点窗口样本(bucket/raw),诊断取数用 */
+        query: async (q) => {
+          const m = await import('@/server/services/workshop/daq/storage/index')
+          return m.getTsdb().queryTagged(q)
+        },
+        /** 数采节点元数据快照(含产线归属,插件定位某产线的全部节点) */
+        nodes: async () => {
+          const m = await import('@/server/services/workshop/daq/daq-node.repo')
+          return m.getDaqNodeRepo().snapshot()
+        },
       }
       // OMP 工具扩展面:插件注册自定义 host 工具 → omp 会话运行时热注入
       const ompExt = (globalThis.__ompPluginToolsBridge ??= {
@@ -396,10 +426,28 @@ async function doReload(host) {
       catch { /* 解绑失败忽略 */ }
     }
   }
+  const prevNames = [...host.plugins.keys()]
+  // 卸载即注销其注册的全部 agent 工具(否则停用插件后工具仍残留在注册表、可被继续调用)
+  const ompTools = await import('@/server/services/workshop/agents/plugin-tools').catch(() => null)
+  for (const prev of prevNames) {
+    try {
+      ompTools?.unregisterPluginTools(prev)
+    }
+    catch { /* 注销失败不阻断重载 */ }
+  }
   host.plugins.clear()
   host.routes = createRouteTable()
   host.failures = []
   await loadAllPlugins(host, { config: host.config, settingsPath: null, paths: { home: modePaths(host.cwd).homeDir, configRoot: join(host.cwd, '.AgentWorkShop'), dataDir: join(host.cwd, '.AgentWorkShop', 'data') } })
+  // 装载中途失败(setup 抛错)的插件可能留下半注册工具,兜底再清一次
+  for (const prev of prevNames) {
+    if (!host.plugins.has(prev)) {
+      try {
+        ompTools?.unregisterPluginTools(prev)
+      }
+      catch { /* 忽略 */ }
+    }
+  }
   await host.bus.emit('plugins:reloaded', { plugins: pluginManifest() })
   try {
     const m = await import('@/server/services/workshop/scene-events')
@@ -491,7 +539,7 @@ export function pluginManifest() {
     version: r.version,
     description: r.description,
     scope: r.scope,
-    builtin: r.scope === 'project',
+    builtin: r.scope === 'project' || r.scope === 'builtin',
     enabled: r.enabled !== false,
     hasClient: Boolean(r.clientPath),
     routes: host.routes.byPlugin(r.name),