@yeaft/webchat-agent 0.0.11 → 0.0.13

package/claude.js

@@ -34,6 +34,7 @@ export async function startClaudeQuery(conversationId, workDir, resumeSessionId)
     createdAt: Date.now(),
     abortController,
     turnActive: false, // 是否有 turn 正在处理中
+    turnResultReceived: false, // 当前 turn 是否已收到 result（用于抑制重复 result）
     // Metadata from system init message
     tools: [],
     slashCommands: [],
@@ -324,6 +325,7 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
 
       // 捕获 result 消息中的 usage 信息
       if (message.type === 'result') {
+        // 累计 usage（无论是否重复，始终统计）
         if (message.usage) {
           state.usage.inputTokens += message.usage.input_tokens || 0;
           state.usage.outputTokens += message.usage.output_tokens || 0;
@@ -333,9 +335,17 @@ async function processClaudeOutput(conversationId, claudeQuery, state) {
         state.usage.totalCostUsd += message.total_cost_usd || 0;
         console.log(`[SDK] Query completed for ${conversationId}, cost: $${state.usage.totalCostUsd.toFixed(4)}`);
 
+        // ★ Guard：当前 turn 已收到过 result，抑制 SDK 发出的重复 result
+        // （长任务场景下 SDK 可能先发 result/success 再发 result/error_during_execution）
+        if (state.turnResultReceived) {
+          console.warn(`[SDK] Suppressing duplicate result for ${conversationId} (subtype: ${message.subtype || 'unknown'})`);
+          continue;
+        }
+
         // ★ Turn 完成：发送 turn_completed，进程继续运行等待下一条消息
         // stream-json 模式下 Claude 进程是持久运行的，for-await 在 result 后继续等待
         // 不清空 state.query 和 state.inputStream，下次用户消息直接通过同一个 inputStream 发送
+        state.turnResultReceived = true;
         sendOutput(conversationId, message);
 
         resultHandled = true;

package/conversation.js

@@ -360,6 +360,7 @@ export async function handleUserInput(msg) {
 
   console.log(`[${conversationId}] Sending: ${prompt.substring(0, 100)}...`);
   state.turnActive = true;
+  state.turnResultReceived = false; // 重置 per-turn 去重标志
   sendConversationList(); // 在 turnActive=true 后通知 server，确保 processing 状态正确
   state.inputStream.enqueue(userMessage);
 }

package/history.js

@@ -168,7 +168,7 @@ export function loadSessionHistory(workDir, claudeSessionId, limit = 500) {
 }
 
 export async function handleListHistorySessions(msg) {
-  const { workDir, requestId } = msg;
+  const { workDir, requestId, _requestClientId } = msg;
   const effectiveWorkDir = workDir || ctx.CONFIG.workDir;
 
   console.log(`Listing history sessions for: ${effectiveWorkDir}`);
@@ -178,6 +178,7 @@ export async function handleListHistorySessions(msg) {
     ctx.sendToServer({
       type: 'history_sessions_list',
       requestId,
+      _requestClientId,
       workDir: effectiveWorkDir,
       sessions
     });
@@ -186,6 +187,7 @@ export async function handleListHistorySessions(msg) {
     ctx.sendToServer({
       type: 'history_sessions_list',
       requestId,
+      _requestClientId,
       workDir: effectiveWorkDir,
       sessions: [],
       error: e.message
@@ -195,7 +197,7 @@ export async function handleListHistorySessions(msg) {
 
 // 列出 Claude projects 目录下的所有 folder (工作目录)
 export async function handleListFolders(msg) {
-  const { requestId } = msg;
+  const { requestId, _requestClientId } = msg;
   const projectsDir = getClaudeProjectsDir();
 
   console.log(`Listing folders from: ${projectsDir}`);
@@ -268,6 +270,7 @@ export async function handleListFolders(msg) {
     ctx.sendToServer({
       type: 'folders_list',
       requestId,
+      _requestClientId,
       folders
     });
     console.log(`folders_list sent with ${folders.length} folders`);
@@ -276,6 +279,7 @@ export async function handleListFolders(msg) {
     ctx.sendToServer({
       type: 'folders_list',
       requestId,
+      _requestClientId,
       folders: [],
       error: e.message
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",
@@ -44,7 +44,8 @@
     "workbench.js",
     "history.js",
     "encryption.js",
-    "sdk/"
+    "sdk/",
+    "scripts/agent-tray.ps1"
   ],
   "license": "MIT",
   "author": "Yeaft",

package/scripts/agent-tray.ps1

@@ -0,0 +1,134 @@
+# Claude Agent 托盘管理器
+# 右键托盘图标可以查看日志、重启、停止等
+
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+
+$PM2AppName = "yeaft-agent"
+
+# 创建托盘图标
+$notifyIcon = New-Object System.Windows.Forms.NotifyIcon
+$notifyIcon.Text = "Yeaft Agent"
+$notifyIcon.Visible = $true
+
+# 创建 Claude 风格图标（橙色圆形 + 白色 C）
+function Create-ClaudeIcon {
+    $size = 32
+    $bitmap = New-Object System.Drawing.Bitmap($size, $size)
+    $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+    $graphics.SmoothingMode = [System.Drawing.Drawing2D.SmoothingMode]::AntiAlias
+    $graphics.TextRenderingHint = [System.Drawing.Text.TextRenderingHint]::AntiAlias
+
+    # 橙色背景圆形 (Claude 的品牌色)
+    $orangeBrush = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::FromArgb(255, 204, 102, 51))
+    $graphics.FillEllipse($orangeBrush, 1, 1, $size - 2, $size - 2)
+
+    # 白色 "C" 字母
+    $whiteBrush = New-Object System.Drawing.SolidBrush([System.Drawing.Color]::White)
+    $font = New-Object System.Drawing.Font("Arial", 16, [System.Drawing.FontStyle]::Bold)
+    # 测量文字大小并精确居中
+    $textSize = $graphics.MeasureString("C", $font)
+    $x = ($size - $textSize.Width) / 2
+    $y = ($size - $textSize.Height) / 2
+    $graphics.DrawString("C", $font, $whiteBrush, $x, $y)
+
+    $graphics.Dispose()
+
+    # 转换为图标
+    $hIcon = $bitmap.GetHicon()
+    $icon = [System.Drawing.Icon]::FromHandle($hIcon)
+    return $icon
+}
+
+$notifyIcon.Icon = Create-ClaudeIcon
+
+# 创建右键菜单
+$contextMenu = New-Object System.Windows.Forms.ContextMenuStrip
+
+# 查看状态
+$menuStatus = New-Object System.Windows.Forms.ToolStripMenuItem
+$menuStatus.Text = "View Status"
+$menuStatus.Add_Click({
+    Start-Process "powershell" -ArgumentList "-NoExit -Command `"pm2 status`""
+})
+$contextMenu.Items.Add($menuStatus)
+
+# 查看日志
+$menuLogs = New-Object System.Windows.Forms.ToolStripMenuItem
+$menuLogs.Text = "View Logs"
+$menuLogs.Add_Click({
+    Start-Process "powershell" -ArgumentList "-NoExit -Command `"pm2 logs $PM2AppName --lines 100`""
+})
+$contextMenu.Items.Add($menuLogs)
+
+# 分隔线
+$contextMenu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator))
+
+# 重启
+$menuRestart = New-Object System.Windows.Forms.ToolStripMenuItem
+$menuRestart.Text = "Restart Agent"
+$menuRestart.Add_Click({
+    pm2 restart $PM2AppName
+    $notifyIcon.ShowBalloonTip(2000, "Yeaft Agent", "Agent restarted", [System.Windows.Forms.ToolTipIcon]::Info)
+})
+$contextMenu.Items.Add($menuRestart)
+
+# 停止
+$menuStop = New-Object System.Windows.Forms.ToolStripMenuItem
+$menuStop.Text = "Stop Agent"
+$menuStop.Add_Click({
+    pm2 stop $PM2AppName
+    $notifyIcon.ShowBalloonTip(2000, "Yeaft Agent", "Agent stopped", [System.Windows.Forms.ToolTipIcon]::Warning)
+})
+$contextMenu.Items.Add($menuStop)
+
+# 启动
+$menuStart = New-Object System.Windows.Forms.ToolStripMenuItem
+$menuStart.Text = "Start Agent"
+$menuStart.Add_Click({
+    pm2 start $PM2AppName
+    $notifyIcon.ShowBalloonTip(2000, "Yeaft Agent", "Agent started", [System.Windows.Forms.ToolTipIcon]::Info)
+})
+$contextMenu.Items.Add($menuStart)
+
+# 分隔线
+$contextMenu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator))
+
+# 打开日志文件夹
+$menuOpenLogs = New-Object System.Windows.Forms.ToolStripMenuItem
+$menuOpenLogs.Text = "Open Logs Folder"
+$menuOpenLogs.Add_Click({
+    $logDir = Join-Path $env:APPDATA "yeaft-agent\logs"
+    if (-not (Test-Path $logDir)) { New-Item -ItemType Directory -Path $logDir -Force | Out-Null }
+    Start-Process "explorer" -ArgumentList $logDir
+})
+$contextMenu.Items.Add($menuOpenLogs)
+
+# 分隔线
+$contextMenu.Items.Add((New-Object System.Windows.Forms.ToolStripSeparator))
+
+# 退出（停止 agent + 关闭托盘）
+$menuExit = New-Object System.Windows.Forms.ToolStripMenuItem
+$menuExit.Text = "Exit"
+$menuExit.Add_Click({
+    pm2 stop $PM2AppName 2>$null
+    $notifyIcon.ShowBalloonTip(1000, "Yeaft Agent", "Agent stopped", [System.Windows.Forms.ToolTipIcon]::Info)
+    Start-Sleep -Milliseconds 500
+    $notifyIcon.Visible = $false
+    $notifyIcon.Dispose()
+    [System.Windows.Forms.Application]::Exit()
+})
+$contextMenu.Items.Add($menuExit)
+
+$notifyIcon.ContextMenuStrip = $contextMenu
+
+# 双击打开日志
+$notifyIcon.Add_DoubleClick({
+    Start-Process "powershell" -ArgumentList "-NoExit -Command `"pm2 logs $PM2AppName`""
+})
+
+# 显示启动提示
+$notifyIcon.ShowBalloonTip(2000, "Yeaft Agent", "Tray manager started. Right-click for options.", [System.Windows.Forms.ToolTipIcon]::Info)
+
+# 保持运行
+[System.Windows.Forms.Application]::Run()

package/service.js

@@ -443,12 +443,23 @@ function winInstall(config) {
 
   // Setup auto-start: create startup script in Windows Startup folder
   // pm2-startup doesn't work well on Windows, use Startup folder approach
+  const trayScript = join(__dirname, 'scripts', 'agent-tray.ps1');
   const startupDir = join(process.env.APPDATA, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Startup');
   const startupBat = join(startupDir, `${PM2_APP_NAME}.bat`);
-  // pm2 is in PATH (ensured by ensurePm2), so just call it directly
-  const batContent = `@echo off\r\npm2 resurrect\r\n`;
+  // Resurrect pm2 processes + launch tray icon
+  let batContent = `@echo off\r\npm2 resurrect\r\n`;
+  if (existsSync(trayScript)) {
+    batContent += `start "" powershell -WindowStyle Hidden -ExecutionPolicy Bypass -File "${trayScript}"\r\n`;
+  }
   writeFileSync(startupBat, batContent);
 
+  // Launch tray now
+  if (existsSync(trayScript)) {
+    spawn('powershell', ['-WindowStyle', 'Hidden', '-ExecutionPolicy', 'Bypass', '-File', trayScript], {
+      detached: true, stdio: 'ignore'
+    }).unref();
+  }
+
   console.log(`\nService installed and started.`);
   console.log(`  Ecosystem: ${ecoPath}`);
   console.log(`  Startup:   ${startupBat}`);