agentworkshop 0.7.3 → 0.7.5

package/app/components/AppHeader.vue

@@ -1,7 +1,10 @@
 <script setup lang="ts">
 import type { MenuProps, SelectProps } from 'ant-design-vue'
+import type { AepHitlItem } from '#shared/workshop-protocol'
 import { useUserStore } from '@/app/stores/workshop/user'
 import { useWsConnectionStore } from '@/app/stores/workshop/connection'
+import { useHitlStore } from '@/app/stores/workshop/hitl'
+import { useWorkshopWs } from '@/app/composables/workshop/useWorkshopWs'
 
 const { t, locale, locales, setLocale } = useI18n()
 const store = useAppStore()
@@ -10,6 +13,26 @@ const trail = useRouteTrailStore()
 const userStore = useUserStore()
 const { metaFor } = useRouteMeta()
 
+// ── HITL 全局待办(omp ask 对话框 + dcw 审批统一徽标;页头保底建连 ——
+//    hitl 全员直推帧只达已连 peer,不建连的页面收不到提醒;快照兜底刷新前待办) ──
+const hitl = useHitlStore()
+const wsSession = useWorkshopWs()
+const ensureHitlLive = () => {
+  if (userStore.isLoggedIn) wsSession.ensureConnected()
+}
+watch(() => userStore.token, (t2) => {
+  if (t2) {
+    ensureHitlLive()
+    void hitl.loadSnapshot()
+  }
+  else hitl.clear()
+}, { immediate: true })
+const hitlKindLabel = (kind: AepHitlItem['kind']) =>
+  kind === 'omp-dialog' ? t('appHeader.hitlKindOmp') : t('appHeader.hitlKindDcw')
+const hitlGo = (item: AepHitlItem) => {
+  navigateTo({ path: '/monitor', query: { agentId: item.agentId, channelId: item.channelId } })
+}
+
 const localeOptions = computed(() =>
   (locales.value as Array<{ code: string, name: string }>).map(l => ({
     label: l.name,
@@ -205,6 +228,40 @@ const onAvatarMenu: MenuProps['onClick'] = async ({ key }) => {
 
     <!-- 右侧:功能集群 -->
     <div class="header-right">
+      <!-- HITL 待办铃标(有待办才出现;点击下拉 → 进入对应 agent 终端处理) -->
+      <ClientOnly>
+        <a-dropdown
+          v-if="hitl.count > 0"
+          placement="bottomRight"
+        >
+          <button
+            class="icon-btn hitl-bell"
+            :title="t('appHeader.hitlBadge')"
+          >
+            <span class="i-tabler-bell-ringing" />
+            <span class="hitl-count">{{ hitl.count }}</span>
+          </button>
+          <template #overlay>
+            <div class="hitl-menu">
+              <div class="hitl-menu-title">
+                {{ t('appHeader.hitlBadge') }} · {{ hitl.count }}
+              </div>
+              <button
+                v-for="item in hitl.items"
+                :key="`${item.kind}:${item.id}`"
+                class="hitl-item"
+                @click="hitlGo(item)"
+              >
+                <span class="hitl-item-top">
+                  <span class="hitl-item-agent">{{ item.agentName }}</span>
+                  <span class="hitl-item-kind">{{ hitlKindLabel(item.kind) }}</span>
+                </span>
+                <span class="hitl-item-title">{{ item.title }}</span>
+              </button>
+            </div>
+          </template>
+        </a-dropdown>
+      </ClientOnly>
       <!-- 实时连接状态点(WS 会话全局单例;未用过 WS 的会话不显示) -->
       <span
         v-if="wsVisible"
@@ -660,6 +717,87 @@ const onAvatarMenu: MenuProps['onClick'] = async ({ key }) => {
   50% { opacity: 0.45; }
 }
 
+/* ── HITL 待办铃标(琥珀警示;角标数字极简,无装饰堆砌) ── */
+.hitl-bell {
+  position: relative;
+  color: var(--tone-warning-dot, #d4a017);
+}
+.hitl-count {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  min-width: 15px;
+  height: 15px;
+  padding: 0 4px;
+  font-family: var(--font-mono);
+  font-size: 9.5px;
+  font-weight: 700;
+  line-height: 15px;
+  color: var(--on-accent, #fff);
+  text-align: center;
+  background: var(--tone-danger-dot, #e05252);
+  border-radius: 8px;
+}
+.hitl-menu {
+  min-width: 260px;
+  max-width: 340px;
+  padding: 6px;
+  background: var(--paper, #fff);
+  border: 1px solid var(--line);
+  border-radius: var(--radius-panel-sm, 10px);
+  box-shadow: 0 10px 32px rgba(0, 0, 0, 0.14);
+}
+.hitl-menu-title {
+  padding: 6px 10px;
+  font-size: 11px;
+  font-weight: 600;
+  letter-spacing: 0.08em;
+  color: var(--ink-faint);
+  border-bottom: 1px solid var(--line);
+}
+.hitl-item {
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+  width: 100%;
+  margin-top: 4px;
+  padding: 8px 10px;
+  text-align: left;
+  cursor: pointer;
+  background: transparent;
+  border: 1px solid transparent;
+  border-radius: var(--radius-panel-sm, 8px);
+  transition: background var(--transition-fast), border-color var(--transition-fast);
+}
+.hitl-item:hover {
+  background: var(--paper-deep);
+  border-color: var(--line);
+}
+.hitl-item-top {
+  display: flex;
+  gap: 8px;
+  align-items: baseline;
+  justify-content: space-between;
+}
+.hitl-item-agent {
+  font-size: 12.5px;
+  font-weight: 600;
+  color: var(--ink);
+}
+.hitl-item-kind {
+  font-family: var(--font-mono);
+  font-size: 9.5px;
+  letter-spacing: 0.1em;
+  color: var(--tone-warning-dot, #d4a017);
+}
+.hitl-item-title {
+  overflow: hidden;
+  font-size: 12px;
+  color: var(--ink-soft);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 @media (prefers-reduced-motion: reduce) {
   .plotter-line.run {
     animation: none;

package/app/composables/workshop/useWorkshopWs.ts

@@ -8,6 +8,7 @@ import { useUserStore } from '../../stores/workshop/user'
 import { WorkshopWsSession, useWsConnectionStore } from '../../stores/workshop/connection'
 import { useEventsStore } from '../../stores/workshop/events'
 import { useEntitiesStore } from '../../stores/workshop/entities'
+import { useHitlStore } from '../../stores/workshop/hitl'
 import { useTownBus } from './useTownBus'
 import type { AepEnvelope, AepSnapshot } from '#shared/workshop-protocol'
 
@@ -16,6 +17,7 @@ export function useWorkshopWs() {
   const userStore = useUserStore()
   const events = useEventsStore()
   const entities = useEntitiesStore()
+  const hitl = useHitlStore()
   const townBus = useTownBus()
 
   // 模块级单例:多组件共享一条连接
@@ -48,6 +50,8 @@ export function useWorkshopWs() {
           events.ingest(e)
           entities.applyEvent(e)
         }
+        // HITL 全局待办(频道帧 + channelId='' 全员直推各到一次,store 内 kind+id 幂等)
+        if (e.type === 'hitl.request' || e.type === 'hitl.resolved') hitl.applyEnvelope(e)
         if (typeof e.seq === 'number' && e.seq > 0 && e.channelId) {
           conn.cursors[e.channelId] = e.seq
           s.updateCursor(e.channelId, e.seq) // 推进重连续传游标

package/app/pages/monitor.vue

@@ -67,6 +67,7 @@ interface MonitorSnapshot {
 interface ApiEnvelope<T> { code: number | string, message: string, data: T | null }
 
 const { t } = useI18n()
+const route = useRoute()
 const userStore = useUserStore()
 const isAdmin = computed(() => userStore.isAdmin)
 
@@ -112,7 +113,9 @@ watch(() => userStore.token, () => {
 })
 
 onMounted(() => {
-  if (userStore.token) void poll()
+  if (userStore.token) {
+    void poll().then(() => openFromQuery())
+  }
   applyTimer()
 })
 onBeforeUnmount(() => {
@@ -169,6 +172,19 @@ const openTerminal = (pid: number, name: string | null, role: string | null): vo
   terminalOpen.value = true
 }
 
+// HITL 徽标跳转定位:?agentId=&channelId= → 自动打开该 agent 的终端面板(omp 未
+// spawn 时无进程行,保持关闭;用后即清 query,刷新/再进不重复弹开)
+const openFromQuery = (): void => {
+  const agentId = route.query.agentId
+  if (typeof agentId !== 'string' || !agentId) return
+  const channelId = typeof route.query.channelId === 'string' ? route.query.channelId : ''
+  const proc = snapshot.value?.processes.find(p => p.agentId === agentId && (!channelId || p.channelId === channelId))
+  if (proc?.pid) {
+    openTerminal(proc.pid, proc.name, proc.role)
+    void navigateTo({ path: '/monitor' }, { replace: true })
+  }
+}
+
 // ===== 展示辅助 =====
 const shortId = (id: string | null | undefined): string => (id && id.length > 8 ? `${id.slice(0, 8)}…` : (id ?? '-'))
 const stateColor: Record<string, string> = { idle: 'success', busy: 'processing', stopped: 'error' }

package/app/stores/workshop/hitl.ts

@@ -0,0 +1,80 @@
+/**
+ * HITL 全局待办 store:omp ask 对话框 + dcw 工具审批的统一待答视图。
+ *
+ * 数据源:
+ *  - AEP hitl.request/hitl.resolved 帧(频道流 seq 帧与 channelId='' 全员直推
+ *    会各到一次,upsert 按 kind+id 幂等去重;徽标不依赖 channel 订阅)
+ *  - GET /api/workshop/hitl/pending 快照(页面挂载/重连后的基线对齐)
+ */
+import { defineStore } from 'pinia'
+import type { AepEnvelope, AepHitlItem } from '#shared/workshop-protocol'
+import { useUserStore } from './user'
+
+const keyOf = (i: Pick<AepHitlItem, 'kind' | 'id'>) => `${i.kind}:${i.id}`
+
+interface HitlPendingRes {
+  code: number | string
+  data?: { items: AepHitlItem[] }
+}
+
+export const useHitlStore = defineStore('workshop.hitl', {
+  state: () => ({
+    /** 当前待人工处理条目(kind+id 幂等) */
+    items: [] as AepHitlItem[],
+    /** 快照已加载(防重复拉取;WS 掉线重连后由 ensureBaseline 重置) */
+    snapshotLoaded: false,
+  }),
+  getters: {
+    count: state => state.items.length,
+    /** 按 agent 分组(徽标下拉/跳转用) */
+    byAgent: (state) => {
+      const map = new Map<string, AepHitlItem[]>()
+      for (const i of state.items) {
+        const list = map.get(i.agentId) ?? []
+        list.push(i)
+        map.set(i.agentId, list)
+      }
+      return map
+    },
+  },
+  actions: {
+    /** AEP 帧消费(hitl.request / hitl.resolved;幂等 upsert/remove) */
+    applyEnvelope(e: AepEnvelope): void {
+      if (e.type === 'hitl.request') {
+        const item = e.payload as AepHitlItem
+        const key = keyOf(item)
+        const idx = this.items.findIndex(i => keyOf(i) === key)
+        if (idx >= 0) this.items[idx] = item
+        else this.items.push(item)
+      }
+      else if (e.type === 'hitl.resolved') {
+        const r = e.payload as { kind: AepHitlItem['kind'], id: string }
+        this.items = this.items.filter(i => keyOf(i) !== keyOf(r))
+      }
+    },
+    /** 快照对齐(挂载/重连;替换式 —— 以 REST 为准收敛 WS 期间的可能漂移) */
+    async loadSnapshot(): Promise<void> {
+      if (typeof window === 'undefined') return
+      const token = useUserStore().token
+      if (!token) return
+      try {
+        const res = await $fetch<HitlPendingRes>('/api/workshop/hitl/pending', {
+          headers: { authorization: `Bearer ${token}` },
+        })
+        if (res.code === 0 && res.data) {
+          this.items = res.data.items
+          this.snapshotLoaded = true
+        }
+      }
+      catch { /* 快照失败不阻塞实时帧 */ }
+    },
+    /** WS 断线重连后重新对齐 */
+    invalidate(): void {
+      this.snapshotLoaded = false
+    },
+    clear(): void {
+      this.items = []
+      this.snapshotLoaded = false
+    },
+  },
+})

package/cli/commands/stop.mjs

@@ -0,0 +1,108 @@
+// ============================================================
+// 指令:stop —— 终止当前配置根下运行中的 aw 实例(读单实例锁 → 终止进程树)。
+// 用法:aw stop [--home]   (--home 强制以 home 配置根为目标;默认随 cwd 解析)
+// ============================================================
+import { existsSync, readFileSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { color } from '../core/logger.mjs'
+
+export const meta = {
+  name: 'stop',
+  aliases: [],
+  group: '服务',
+  summary: '终止运行中的 aw 服务实例(读单实例锁)',
+  usage: 'aw stop [--home]',
+  needsProject: false,
+}
+
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0)
+    return true
+  }
+  catch (err) {
+    return err?.code === 'EPERM'
+  }
+}
+
+/** 终止进程树:Windows taskkill /T /F;POSIX 先 SIGTERM 宽限 5s 再 SIGKILL */
+function killTree(pid) {
+  if (process.platform === 'win32') {
+    const r = spawnSync('taskkill', ['/PID', String(pid), '/T', '/F'], { encoding: 'utf8' })
+    if (r.status !== 0) throw new Error((r.stderr || r.stdout || 'taskkill 失败').trim().split(/\r?\n/)[0])
+    return
+  }
+  try {
+    process.kill(pid, 'SIGTERM')
+  }
+  catch { /* 已死 */ }
+  const deadline = Date.now() + 5000
+  while (Date.now() < deadline && pidAlive(pid)) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200)
+  }
+  if (pidAlive(pid)) {
+    try {
+      process.kill(pid, 'SIGKILL')
+    }
+    catch { /* 已死 */ }
+  }
+}
+
+export async function run(argv, ctx) {
+  // argv 为 parseArgs 结果({ flags, positionals, unknown });兼容裸数组调用
+  const flags = argv?.flags ?? {}
+  const positionals = Array.isArray(argv?.positionals) ? argv.positionals : (Array.isArray(argv) ? argv : [])
+  const forceHome = flags.home === true || positionals.includes('--home')
+
+  const configRoot = forceHome
+    ? ctx.home
+    : (ctx.mode === 'repo' ? join(ctx.root, '.AgentWorkShop') : ctx.home)
+  const lockPath = join(configRoot, '.runtime', 'aw.lock')
+
+  if (!existsSync(lockPath)) {
+    console.log(`${color.blue('ℹ')} 未发现运行中的实例(无锁文件:${lockPath})`)
+    return 0
+  }
+  let holder
+  try {
+    holder = JSON.parse(readFileSync(lockPath, 'utf8'))
+  }
+  catch {
+    rmSync(lockPath, { force: true })
+    console.log(`${color.blue('ℹ')} 锁文件损坏,已清除:${lockPath}`)
+    return 0
+  }
+
+  const pid = Number(holder?.pid)
+  if (!Number.isInteger(pid) || pid <= 0) {
+    rmSync(lockPath, { force: true })
+    console.log(`${color.blue('ℹ')} 锁内 PID 无效,已清除锁文件`)
+    return 0
+  }
+  if (!pidAlive(pid)) {
+    rmSync(lockPath, { force: true })
+    console.log(`${color.blue('ℹ')} 持锁进程已不存在(pid=${pid},残留锁),已清除锁文件`)
+    return 0
+  }
+
+  console.log(`› 终止实例 pid=${pid}(mode=${holder.mode ?? '?'}${holder.port ? `,端口=${holder.port}` : ''},启动于 ${holder.startedAt ?? '?'})`)
+  try {
+    killTree(pid)
+  }
+  catch (err) {
+    console.error(`${color.red('✖')} 终止失败:${err.message}`)
+    console.error(`  可手动执行:taskkill /PID ${pid} /T /F(Windows)`)
+    return 1
+  }
+  // 锁文件由退出钩子自清;残留则手动兜底
+  for (let i = 0; i < 20 && existsSync(lockPath); i++) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200)
+  }
+  try {
+    if (existsSync(lockPath)) rmSync(lockPath, { force: true })
+  }
+  catch { /* ignore */ }
+  console.log(`${color.green('✔')} 实例已停止(pid=${pid})`)
+  return 0
+}

package/cli/commands/tui.mjs

@@ -0,0 +1,19 @@
+// ============================================================
+// 指令:tui —— 终端工作台(与 AgentTeam 交互作业;实现在 tui/)。
+// 用法:aw tui [--url http://127.0.0.1:3000] [--token ut-*] [--channel <名>]
+// ============================================================
+
+export const meta = {
+  name: 'tui',
+  aliases: ['tui'],
+  group: '交互',
+  summary: '终端工作台 TUI:频道管理/发任务/实时监控/HITL 作答',
+  usage: 'aw tui [--url <baseUrl>] [--token <ut-*>] [--channel <名>]',
+  needsProject: false,
+}
+
+export async function run(argv) {
+  const { main } = await import('../../tui/aw-tui.mjs')
+  await main(argv)
+  return 0
+}