@auto-ai/agent 2.1.183 → 2.1.187

package/dist/ws-test/ws-test.js

@@ -32,6 +32,9 @@
       const promptFileSuggestions = $('promptFileSuggestions')
       const composerUploadToast = $('composerUploadToast')
       let composerUploadToastTimer = null
+      const debugNotifyStack = $('debugNotifyStack')
+      const DEBUG_NOTIFY_TTL_MS = 6000
+      const DEBUG_NOTIFY_MAX = 8
       const btnNewSession = $('btnNewSession')
       const btnSkillPackageManager = $('btnSkillPackageManager')
       const btnEditAgentEnv = $('btnEditAgentEnv')
@@ -154,6 +157,10 @@
       const mcpPackageImportInput = $('mcpPackageImportInput')
       const sessionListEl = $('sessionList')
       const sessionListMetaEl = $('sessionListMeta')
+      /** 侧栏会话列表运行时状态轮询定时器 */
+      let sessionRuntimePollTimer = null
+      /** 当前附着 session 的 turn 是否进行中（由 query.progress 驱动） */
+      let sessionTurnActive = false
       const pendingPromptsBarEl = $('pendingPromptsBar')
       const pendingPromptsListEl = $('pendingPromptsList')
       let pendingPromptsCache = []
@@ -731,6 +738,11 @@
       /** HTTP 历史回放进行中：暂存实时 conversation.delta，避免与回放竞态写乱 transcript 下标 */
       let sessionReplayInProgress = false
       const pendingConversationDeltaEnvelopes = []
+      /**
+       * 用户点击发送后、服务端 conversation.delta 到达前的本地回显。
+       * 业务语义：避免等待子进程 spawn / 路由期间聊天区无反馈。
+       */
+      let pendingUserEcho = null
 
       function sourceAgentPayloadToText(payload) {
         if (!payload || typeof payload !== 'object') return ''
@@ -883,6 +895,41 @@
         })
       }
 
+      /** 发送 prompt 后立即在聊天区展示用户输入 */
+      function setPendingUserEcho(text) {
+        const trimmed = typeof text === 'string' ? text.trim() : ''
+        if (!trimmed) return
+        pendingUserEcho = {
+          text: trimmed,
+          sourceAgent: currentAgentParam(),
+          arrivalSeq: ++chatState.eventClock,
+          ts: new Date().toISOString(),
+        }
+        requestRenderChat()
+      }
+
+      function clearPendingUserEcho() {
+        if (!pendingUserEcho) return
+        pendingUserEcho = null
+      }
+
+      /** 渲染本地 pending 用户消息气泡（与 appendRunItemsToContainer 的 user 分支一致） */
+      function appendPendingUserEchoToContainer(container) {
+        if (!pendingUserEcho || !pendingUserEcho.text) return
+        const div = document.createElement('div')
+        div.className = 'chat-msg chat-msg-user chat-msg-pending-echo'
+        const lab = document.createElement('div')
+        lab.className = 'chat-msg-label'
+        lab.textContent = 'User · agent=' + pendingUserEcho.sourceAgent
+        const bodyEl = document.createElement('div')
+        bodyEl.className = 'chat-user-body'
+        setMessageBodyEl(bodyEl, pendingUserEcho.text)
+        div.appendChild(lab)
+        div.appendChild(bodyEl)
+        container.appendChild(div)
+        attachUserMessageCollapse(bodyEl)
+      }
+
       if (typeof marked !== 'undefined' && marked.setOptions) {
         marked.setOptions({ breaks: true, gfm: true })
       }
@@ -1171,8 +1218,9 @@
             }
 
             if (nonToolBlocks.length > 0) {
-              const body = contentToPlainText(nonToolBlocks).trim()
-              if (body) {
+              const rawBody = contentToPlainText(nonToolBlocks).trim()
+              const unwrapped = unwrapChannelWrappedText(rawBody)
+              if (unwrapped.body.trim()) {
                 units.push({
                   kind: 'message',
                   ev: ev,
@@ -1359,12 +1407,60 @@
         return ''
       }
 
+      /**
+       * 解析 channel 入站包裹：`<channel source="ws" ...>正文</channel>`。
+       * 业务语义：与 wrapChannelMessage / ChannelManager.parseChannelMetaFromWrappedPrompt 同源，
+       * 页面只展示正文，channel 元信息用于标签行。
+       */
+      function unwrapChannelWrappedText(text) {
+        const raw = typeof text === 'string' ? text : ''
+        const matched = raw.match(/^<channel\s+([^>]+)>\s*([\s\S]*?)\s*<\/channel>\s*$/i)
+        if (!matched) {
+          return { body: raw, meta: null }
+        }
+        const attrs = matched[1] || ''
+        const body = matched[2] != null ? String(matched[2]) : ''
+        const meta = {}
+        const attrRegex = /([a-zA-Z_][a-zA-Z0-9_]*)="([^"]*)"/g
+        let am = null
+        while ((am = attrRegex.exec(attrs)) !== null) {
+          meta[am[1]] = am[2]
+        }
+        return { body: body, meta: meta }
+      }
+
+      /** channel 入站消息标签：channel_type/source + agent */
+      function formatChannelInboundLabel(meta) {
+        if (!meta || typeof meta !== 'object') return ''
+        const parts = []
+        const channelName = meta.channel_type || meta.source || ''
+        if (channelName) parts.push(channelName)
+        if (meta.agent) parts.push('agent=' + meta.agent)
+        return parts.join(' · ')
+      }
+
+      function getRawUserMessageText(m, contentBlocks) {
+        if (contentBlocks) {
+          return contentToPlainText(contentBlocks).trim()
+        }
+        if (!m || m.type !== 'user') return ''
+        const inner = m.message
+        if (inner && inner.content !== undefined) {
+          return contentToPlainText(inner.content).trim()
+        }
+        return ''
+      }
+
       /**
        * 与 messages.shouldShowUserMessage 一致：isMeta 为系统/Skill 注入，进模型但不展示。
+       * channel 入站（正文含 <channel> 包裹）仍展示。
        */
       function shouldShowWsUserMessage(m) {
         if (!m || m.type !== 'user') return false
-        if (m.isMeta === true) return false
+        if (m.isMeta === true) {
+          const raw = getRawUserMessageText(m, null)
+          return unwrapChannelWrappedText(raw).meta != null
+        }
         return true
       }
 
@@ -1373,7 +1469,13 @@
         const t = m.type
         if (t === 'user' || t === 'assistant') {
           const inner = m.message
-          if (inner && inner.content !== undefined) return contentToPlainText(inner.content)
+          if (inner && inner.content !== undefined) {
+            const plain = contentToPlainText(inner.content)
+            if (t === 'user') {
+              return unwrapChannelWrappedText(plain).body
+            }
+            return plain
+          }
         }
         if (t === 'system' && typeof m.content === 'string') return m.content
         return ''
@@ -1442,7 +1544,11 @@
               )
             })
             if (nonTool.length > 0) {
-              return contentToPlainText(nonTool).trim()
+              const plain = contentToPlainText(nonTool).trim()
+              if (m.type === 'user') {
+                return unwrapChannelWrappedText(plain).body.trim()
+              }
+              return plain
             }
             return extractMessageBody(m).trim()
           }
@@ -1501,16 +1607,24 @@
             const t = unit.messageType
 
             if (t === 'user') {
-              const body = unit.contentBlocks
-                ? contentToPlainText(unit.contentBlocks).trim()
-                : extractMessageBody(m).trim()
+              const rawUserText = getRawUserMessageText(m, unit.contentBlocks)
+              const unwrapped = unwrapChannelWrappedText(rawUserText)
+              const body = unwrapped.body.trim()
               if (!body) continue
+              const channelLabel = formatChannelInboundLabel(unwrapped.meta)
               const div = document.createElement('div')
-              div.className = 'chat-msg chat-msg-user'
+              div.className =
+                'chat-msg chat-msg-user' +
+                (channelLabel ? ' chat-msg-channel-inbound' : '')
               applyScheduledMsgClass(div, isScheduled)
               const lab = document.createElement('div')
               lab.className = 'chat-msg-label'
-              lab.textContent = formatScheduledLabel('User · agent=' + messageAgent, isScheduled)
+              lab.textContent = formatScheduledLabel(
+                channelLabel
+                  ? 'Channel · ' + channelLabel
+                  : 'User · agent=' + messageAgent,
+                isScheduled,
+              )
               const bodyEl = document.createElement('div')
               bodyEl.className = 'chat-user-body'
               setMessageBodyEl(bodyEl, body)
@@ -1582,7 +1696,8 @@
         const sourceAgentMessages = chatState.sourceAgentMessages
         const shouldStickBottom = autoScrollState.mode === 'STICKY_BOTTOM' && isNearBottom(chatThreadEl)
         chatThreadEl.innerHTML = ''
-        const hasConversation = runs.size > 0
+        const hasConversation =
+          runs.size > 0 || !!pendingUserEcho
         if (!hasConversation && streamEntries.length === 0 && sourceAgentMessages.length === 0) {
           chatThreadEl.innerHTML =
             '<div class="chat-placeholder">连接后将在此展示对话（Markdown 渲染）</div>'
@@ -1757,6 +1872,12 @@
           }
           chatThreadEl.appendChild(groupContainer)
         }
+        if (pendingUserEcho) {
+          const echoWrap = document.createElement('div')
+          echoWrap.className = 'chat-run-group chat-run-group--pending-echo'
+          appendPendingUserEchoToContainer(echoWrap)
+          chatThreadEl.appendChild(echoWrap)
+        }
         if (streamEntries.length > 0) {
           for (let i = 0; i < streamEntries.length; i++) {
             const streamItem = streamEntries[i]
@@ -1798,6 +1919,7 @@
         chatState.seenEventIds.clear()
         sessionReplayInProgress = false
         pendingConversationDeltaEnvelopes.length = 0
+        pendingUserEcho = null
         autoScrollState.mode = 'STICKY_BOTTOM'
         if (logEl) logEl.textContent = ''
         requestRenderChat()
@@ -1907,6 +2029,13 @@
             arrivalSeq: ++chatState.eventClock,
           }
           applyConversationDeltaToRunBuffer(runBuffer, action, index, runMessage)
+          if (
+            msg &&
+            msg.type === 'user' &&
+            shouldShowWsUserMessage(msg)
+          ) {
+            clearPendingUserEcho()
+          }
           requestRenderChat()
           return true
         }
@@ -1968,6 +2097,17 @@
             // 回放边界控制事件：仅用于内部流程标记，不进入聊天消息区。
             return true
           }
+          if (type === 'run.lifecycle' && payload.state === 'console') {
+            const consoleMsg =
+              typeof payload.message === 'string' ? payload.message.trim() : ''
+            if (consoleMsg) {
+              showDebugNotify(
+                consoleMsg,
+                typeof payload.level === 'string' ? payload.level : 'log',
+              )
+            }
+            return true
+          }
           if (
             type === 'run.lifecycle' &&
             payload.state === 'teammateExit' &&
@@ -2027,12 +2167,15 @@
         }
         if (type === 'query.progress') {
           const phase = typeof payload.phase === 'string' ? payload.phase : ''
+          sessionTurnActive = !!(phase && phase !== 'idle')
+          kickSessionRuntimePoll()
           if (phase === 'idle') {
             if (serverReady) setStatus('已就绪', 'ready')
             // 一轮 prompt 收尾后 transcript 已落盘，刷新列表以更新页签 firstPrompt/summary
-            void loadSessions()
+            void loadSessions({ silent: true })
           } else if (phase) {
             setStatus('查询阶段: ' + phase + '…', '')
+            void loadSessions({ silent: true })
           }
           return true
         }
@@ -2124,10 +2267,36 @@
         return null
       }
 
+      /**
+       * 右上角通知：仅展示 warn（黄）、error（红）；info/log 等蓝色类不弹窗。
+       */
+      function showDebugNotify(message, level) {
+        if (!debugNotifyStack) return
+        const text = typeof message === 'string' ? message.trim() : ''
+        if (!text) return
+        const lvlRaw = typeof level === 'string' ? level.trim().toLowerCase() : 'log'
+        if (lvlRaw !== 'warn' && lvlRaw !== 'error') return
+        const lvl = lvlRaw === 'error' ? 'error' : 'warn'
+        const item = document.createElement('div')
+        item.className = 'debug-notify debug-notify--' + lvl
+        item.setAttribute('role', 'status')
+        item.textContent = text
+        debugNotifyStack.appendChild(item)
+        while (debugNotifyStack.children.length > DEBUG_NOTIFY_MAX) {
+          debugNotifyStack.removeChild(debugNotifyStack.firstChild)
+        }
+        setTimeout(function () {
+          if (item.parentNode === debugNotifyStack) {
+            debugNotifyStack.removeChild(item)
+          }
+        }, DEBUG_NOTIFY_TTL_MS)
+      }
+
       function logLine(type, obj) {
-        if (!logEl) return
         const t = new Date().toISOString().slice(11, 23)
-        const line = '[' + t + '] ' + type + ' ' + (typeof obj === 'string' ? obj : JSON.stringify(obj, null, 0))
+        const line =
+          '[' + t + '] ' + type + ' ' + (typeof obj === 'string' ? obj : JSON.stringify(obj, null, 0))
+        if (!logEl) return
         logEl.textContent += line + '\n'
         logEl.scrollTop = logEl.scrollHeight
       }
@@ -4616,16 +4785,29 @@
           const title = sessionTitle(s)
           if (isActive) activeTitle = title
 
+          const isRunning = s.running === true
           const row = document.createElement('div')
-          row.className = 'sidebar-session-item' + (isActive ? ' active' : '')
+          row.className =
+            'sidebar-session-item' +
+            (isActive ? ' active' : '') +
+            (isRunning ? ' running' : '')
           row.setAttribute('role', 'tab')
           row.setAttribute('aria-selected', isActive ? 'true' : 'false')
-          row.title = s.sessionId
+          row.title = s.sessionId + (isRunning ? '（运行中）' : '')
 
           const mainBtn = document.createElement('button')
           mainBtn.type = 'button'
           mainBtn.className = 'sidebar-session-main'
-          mainBtn.textContent = title
+          if (isRunning) {
+            const runBadge = document.createElement('span')
+            runBadge.className = 'sidebar-session-running-badge'
+            runBadge.textContent = '运行中'
+            mainBtn.appendChild(runBadge)
+          }
+          const titleSpan = document.createElement('span')
+          titleSpan.className = 'sidebar-session-title'
+          titleSpan.textContent = title
+          mainBtn.appendChild(titleSpan)
           mainBtn.addEventListener('click', function (ev) {
             ev.stopPropagation()
             switchToSession(s.sessionId)
@@ -4704,8 +4886,62 @@
         return u.toString()
       }
 
+      /** 列表里是否存在运行中 session（子进程存活） */
+      function sessionListHasRunning(sessions) {
+        if (!Array.isArray(sessions)) return false
+        return sessions.some(function (s) {
+          return s && s.running === true
+        })
+      }
+
+      /** 轮询间隔：有运行中或本页 turn 时 1.5s，否则 4s */
+      function sessionRuntimePollDelayMs() {
+        if (sessionTurnActive || sessionListHasRunning(window.__lastSessions)) {
+          return 1500
+        }
+        return 4000
+      }
+
+      function stopSessionRuntimePoll() {
+        if (sessionRuntimePollTimer != null) {
+          clearTimeout(sessionRuntimePollTimer)
+          sessionRuntimePollTimer = null
+        }
+      }
+
+      /**
+       * 调度下一次会话列表运行时状态拉取。
+       * 业务语义：侧栏「运行中」依赖主进程 RPC，不能仅靠当前 WS 事件；后台定时静默刷新。
+       */
+      function scheduleSessionRuntimePoll() {
+        stopSessionRuntimePoll()
+        sessionRuntimePollTimer = setTimeout(function () {
+          sessionRuntimePollTimer = null
+          if (document.visibilityState === 'hidden') {
+            scheduleSessionRuntimePoll()
+            return
+          }
+          void loadSessions({ silent: true }).then(
+            function () {
+              scheduleSessionRuntimePoll()
+            },
+            function () {
+              scheduleSessionRuntimePoll()
+            },
+          )
+        }, sessionRuntimePollDelayMs())
+      }
+
+      /** 立即按最新状态重置轮询节奏（例如 turn 开始/结束） */
+      function kickSessionRuntimePoll() {
+        scheduleSessionRuntimePoll()
+      }
+
       async function loadSessions(options) {
-        sessionListMetaEl.textContent = '加载中…'
+        const silent = !!(options && options.silent)
+        if (!silent) {
+          sessionListMetaEl.textContent = '加载中…'
+        }
         let data
         try {
           const r = await fetch(buildSessionsListUrl())
@@ -4713,12 +4949,14 @@
           if (!r.ok) throw new Error(data.message || r.statusText)
         } catch (e) {
           const urlTried = buildSessionsListUrl()
-          const hint =
-            '（https 页请求 http API 会被拦截。请求: ' + urlTried + '）'
-          sessionListMetaEl.textContent = '加载失败: ' + e + hint
-          sessionListEl.textContent = ''
+          if (!silent) {
+            const hint =
+              '（https 页请求 http API 会被拦截。请求: ' + urlTried + '）'
+            sessionListMetaEl.textContent = '加载失败: ' + e + hint
+            sessionListEl.textContent = ''
+          }
           logLine('sessions', String(e) + ' url=' + urlTried)
-          return
+          throw e
         }
         const sessions = data.sessions || []
         const dir =
@@ -4749,6 +4987,8 @@
           socket = null
         }
         serverReady = false
+        sessionTurnActive = false
+        kickSessionRuntimePoll()
         updateButtons()
       }
 
@@ -4911,6 +5151,9 @@
         if (!socket || socket.readyState !== WebSocket.OPEN) return
         hidePromptFileSuggestions()
         const text = getPromptPlainText()
+        const trimmed = text.trim()
+        if (!trimmed) return
+        setPendingUserEcho(trimmed)
         const payload = { type: 'prompt', text: text }
         autoScrollState.mode = 'FORCE_ON_SEND'
         socket.send(JSON.stringify(payload))
@@ -7021,9 +7264,8 @@
                     })
                 })
                 const buttons = [toggleBtn]
-                if (!canDelete) {
-                  buttons.push(createManageRowBtn('编辑', '', function () { openSkillMdModal(id) }))
-                }
+                // 系统 skill 与 agent 导入 skill 均可编辑 SKILL.md；仅 agent 层支持保存
+                buttons.push(createManageRowBtn('编辑', '', function () { openSkillMdModal(id) }))
                 if (canDelete) {
                   buttons.push(createManageRowBtn('导出', '', function () {
                     window.open(buildRuntimeSkillExportUrl(id), '_blank', 'noopener')
@@ -8478,10 +8720,18 @@
 
       async function bootstrapSessionSelection() {
         await loadSessions({ activateFirstIfEmpty: true })
+        kickSessionRuntimePoll()
         if (!sessionIdInput || sessionIdInput.value.trim()) return
         switchToSession('')
       }
 
+      document.addEventListener('visibilitychange', function () {
+        if (document.visibilityState !== 'hidden') {
+          void loadSessions({ silent: true })
+        }
+        kickSessionRuntimePoll()
+      })
+
       function onAgentChanged() {
         updateBrandAgent()
         rewriteSameOriginNavLinks()

package/mcps-runtime/claude-ws-channel/.mcp.json

@@ -0,0 +1,18 @@
+{
+  "mcpServers": {
+    "ws": {
+      "command": "bun",
+      "args": [
+        "${AGENT_PACKAGE_ROOT}/mcps-runtime/claude-ws-channel/server/boot.mjs"
+      ],
+      "env": {
+        "WS_PORT": "${WS_PORT}",
+        "WS_MAIN_RPC_SOCKET": "${WS_MAIN_RPC_SOCKET}",
+        "WS_PROJECT_ROOT": "${WS_PROJECT_ROOT}",
+        "WS_AGENTS_ROOT": "${WS_AGENTS_ROOT}",
+        "WS_AGENT_NAME": "${WS_AGENT_NAME}",
+        "WS_STATE_DIR": "${WS_AGENTS_ROOT}/agent-runtime/${WS_AGENT_NAME}/channels/ws/.state"
+      }
+    }
+  }
+}

package/mcps-runtime/claude-ws-channel/server/boot.mjs

@@ -0,0 +1,30 @@
+import { mkdirSync, appendFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { homedir } from 'node:os'
+
+const stateDir =
+  process.env.WS_STATE_DIR ||
+  join(homedir(), '.claude', 'channels', 'ws')
+const bootLog = join(stateDir, 'boot.log')
+mkdirSync(dirname(bootLog), { recursive: true })
+
+function log(line) {
+  appendFileSync(bootLog, `${new Date().toISOString()} ${line}\n`, {
+    encoding: 'utf8',
+    mode: 0o600,
+    flag: 'a',
+  })
+}
+
+log(`[BOOT] ws-channel boot.mjs start pid=${process.pid}`)
+log(`[BOOT] WS_PORT=${process.env.WS_PORT || ''} WS_MAIN_RPC_SOCKET=${process.env.WS_MAIN_RPC_SOCKET || ''}`)
+
+process.on('uncaughtException', err => {
+  log(`[BOOT] uncaughtException ${err?.stack || err}`)
+})
+process.on('unhandledRejection', err => {
+  log(`[BOOT] unhandledRejection ${err?.stack || err}`)
+})
+
+await import('./index.mjs')
+log('[BOOT] imported index.mjs successfully')