chatcc-agent 0.5.1 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatcc-agent",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "CCLink Agent - bridges Claude Code CLI with instant messaging",
   "bin": {
     "chatcc": "src/cli.js"

package/src/claude-bridge.js

@@ -7,6 +7,8 @@ const path = require('path');
 const { StreamBuffer } = require('./stream-buffer');
 const { ProcessQueue } = require('./process-queue');
 const { PERMISSION_MODES, PERMISSION_ACTIONS } = require('./constants');
+const { startTrace, getTraceId } = require('./trace');
+const logUploader = require('./log-uploader');
 
 class ClaudeBridge {
 
@@ -219,6 +221,7 @@ class ClaudeBridge {
         });
         this.imClient.sendCustomMessage(replyTo, 'agent_tool', {
           msg_id: msgID, session_id: sessionID,
+          request_id: entry.requestID || msgID,
           tool: toolName, input: toolInput,
           tool_use_id: requestId,
           state: 'denied', workspace_violation: true,
@@ -251,6 +254,7 @@ class ClaudeBridge {
 
     this.imClient.sendCustomMessage(replyTo, 'agent_tool', {
       msg_id: msgID, session_id: sessionID,
+      request_id: entry.requestID || msgID,
       tool: toolName, input: toolInput,
       tool_use_id: clientKey,
       state: 'pending', requires_approval: true,
@@ -306,13 +310,36 @@ class ClaudeBridge {
     const msgID = crypto.randomUUID();
     const replyTo = from;
     const images = imagePaths || [];
+    const requestID = options.requestId || msgID;
+    const traceID = options.traceId || getTraceId() || requestID;
+    logUploader.collect('INFO', '[ChatTrace] queued user_text', {
+      tag: 'ChatTrace',
+      request_id: requestID,
+      session_id: sessionID,
+      msg_id: msgID,
+    });
 
     // Send stream_start when the task actually starts (not on message receipt),
     // so that rapid-fire messages don't have their stream_start ignored
     // by the client's StreamManager which keys on sessionID.
     const taskFn = async () => {
-      await this.imClient.sendCustomMessage(replyTo, 'stream_start', { msg_id: msgID, session_id: sessionID });
-      return this._spawnClaude(msgID, replyTo, content, sessionID, { cwd, claudeSessionId, images, onClaudeSessionId, onResumeFailed, onSessionTitle, workspaceRestricted, permissions });
+      return startTrace(traceID, async () => {
+        logUploader.collect('INFO', '[ChatTrace] started claude', {
+          tag: 'ChatTrace',
+          request_id: requestID,
+          session_id: sessionID,
+          msg_id: msgID,
+        });
+        await this.imClient.sendCustomMessage(replyTo, 'stream_start', {
+          msg_id: msgID,
+          session_id: sessionID,
+          request_id: requestID,
+        });
+        return this._spawnClaude(msgID, replyTo, content, sessionID, {
+          cwd, claudeSessionId, images, onClaudeSessionId, onResumeFailed, onSessionTitle,
+          workspaceRestricted, permissions, requestId: requestID,
+        });
+      });
     };
 
     try {
@@ -321,6 +348,7 @@ class ClaudeBridge {
       console.error('[Bridge] Queue error:', err.message, err.stack);
       await this.imClient.sendCustomMessage(replyTo, 'stream_end', {
         msg_id: msgID,
+        request_id: requestID,
         exit_code: 1,
         session_id: sessionID,
         error: err.message,
@@ -464,7 +492,7 @@ class ClaudeBridge {
 
   _spawnClaude(msgID, replyTo, content, sessionID, options = {}) {
     return new Promise((resolve, reject) => {
-    const { cwd, claudeSessionId, images, onClaudeSessionId, onResumeFailed, onSessionTitle, workspaceRestricted = false, permissions = null } = options;
+    const { cwd, claudeSessionId, images, onClaudeSessionId, onResumeFailed, onSessionTitle, workspaceRestricted = false, permissions = null, requestId = msgID } = options;
     const usePermissionControl = permissions?.defaultMode !== PERMISSION_MODES.AUTO_ALL;
     const useStreamInput = usePermissionControl;
     const args = [
@@ -510,10 +538,10 @@ class ClaudeBridge {
     const sendStreamEnd = async (payload) => {
       if (streamEndSent) return;
       streamEndSent = true;
-      await this.imClient.sendCustomMessage(replyTo, 'stream_end', { msg_id: msgID, session_id: sessionID, ...payload });
+      await this.imClient.sendCustomMessage(replyTo, 'stream_end', { msg_id: msgID, session_id: sessionID, request_id: requestId, ...payload });
     };
 
-    this._activeProcesses.set(msgID, { proc, sessionID, cwd: cwd || process.cwd(), workspaceRestricted, usePermissionControl, sendStreamEnd });
+    this._activeProcesses.set(msgID, { proc, sessionID, requestID: requestId, cwd: cwd || process.cwd(), workspaceRestricted, usePermissionControl, sendStreamEnd });
 
     // In stream-json input mode, send the user message via stdin after spawn.
     // Build content blocks: text first, then images as image media blocks.
@@ -541,6 +569,7 @@ class ClaudeBridge {
     const streamBuffer = new StreamBuffer(async (delta) => {
       await this.imClient.sendCustomMessage(replyTo, 'stream_chunk', {
         msg_id: msgID,
+        request_id: requestId,
         delta,
         session_id: sessionID,
       });
@@ -552,7 +581,7 @@ class ClaudeBridge {
       if (!line.trim()) return;
       try {
         const event = JSON.parse(line);
-        this._handleEvent(event, replyTo, msgID, streamBuffer, sessionID, onClaudeSessionId, onSessionTitle, cwd, workspaceRestricted, permissions, sendStreamEnd);
+        this._handleEvent(event, replyTo, msgID, streamBuffer, sessionID, onClaudeSessionId, onSessionTitle, cwd, workspaceRestricted, permissions, sendStreamEnd, requestId);
       } catch (e) {}
     });
 
@@ -617,7 +646,14 @@ class ClaudeBridge {
       } catch (e) {
         console.error('[Bridge] Failed to send stream_end:', e.message, e.stack);
       }
-      console.log('[Bridge] Claude Code exited:', code);
+      logUploader.collect(code === 0 ? 'INFO' : 'WARN', '[ChatTrace] ended claude', {
+        tag: 'ChatTrace',
+        request_id: requestId,
+        session_id: sessionID,
+        msg_id: msgID,
+        exit_code: code,
+      });
+      console.log('[Bridge] Claude Code exited:', code, 'request=', requestId);
 
       for (const imgPath of images) {
         try { fs.unlinkSync(imgPath); } catch (e) {}
@@ -627,13 +663,13 @@ class ClaudeBridge {
     }); // end Promise wrapper
   }
 
-  _handleEvent(event, replyTo, msgID, streamBuffer, sessionID, onClaudeSessionId, onSessionTitle, cwd, workspaceRestricted = false, permissions = null, sendStreamEnd = null) {
+  _handleEvent(event, replyTo, msgID, streamBuffer, sessionID, onClaudeSessionId, onSessionTitle, cwd, workspaceRestricted = false, permissions = null, sendStreamEnd = null, requestId = msgID) {
     switch (event.type) {
       case 'system':
         this._handleSystemEvent(event, onClaudeSessionId);
         break;
       case 'assistant':
-        this._handleAssistantEvent(event, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, sendStreamEnd);
+        this._handleAssistantEvent(event, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, sendStreamEnd, requestId);
         break;
       case 'sdk_control_request': {
         const req = event.request;
@@ -656,13 +692,13 @@ class ClaudeBridge {
         break;
       }
       case 'user':
-        this._handleUserEvent(event, replyTo, msgID, streamBuffer, sessionID);
+        this._handleUserEvent(event, replyTo, msgID, streamBuffer, sessionID, requestId);
         break;
       case 'result':
         this._handleResultEvent(event, streamBuffer, onSessionTitle, msgID);
         break;
       case 'error':
-        this._handleErrorEvent(event, replyTo, msgID, sessionID, streamBuffer, sendStreamEnd);
+        this._handleErrorEvent(event, replyTo, msgID, sessionID, streamBuffer, sendStreamEnd, requestId);
         break;
       default:
         console.warn(`[Bridge] Unknown Claude event type: ${event.type}`, JSON.stringify(event).slice(0, 200));
@@ -676,7 +712,7 @@ class ClaudeBridge {
     }
   }
 
-  _handleAssistantEvent(event, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, sendStreamEnd = null) {
+  _handleAssistantEvent(event, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, sendStreamEnd = null, requestId = msgID) {
     const msg = event.message;
     if (!msg?.content) return;
     const entry = this._activeProcesses.get(msgID);
@@ -693,6 +729,7 @@ class ClaudeBridge {
           this.imClient.sendCustomMessage(replyTo, 'user_question', {
             msg_id: msgID,
             session_id: sessionID,
+            request_id: requestId,
             tool_use_id: block.id,
             questions: block.input?.questions || [],
           }, {
@@ -702,13 +739,13 @@ class ClaudeBridge {
             ignoreBadge: false,
           }).catch(e => console.error('[Bridge] user_question:', e.message, e.stack));
         } else {
-          this._handleToolUseBlock(block, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, useControl, sendStreamEnd);
+          this._handleToolUseBlock(block, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, useControl, sendStreamEnd, requestId);
         }
       }
     }
   }
 
-  _handleToolUseBlock(block, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, useControl, sendStreamEnd = null) {
+  _handleToolUseBlock(block, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, useControl, sendStreamEnd = null, requestId = msgID) {
     streamBuffer.flush();
 
     if (useControl) {
@@ -738,6 +775,7 @@ class ClaudeBridge {
       const payload = {
         msg_id: msgID,
         session_id: sessionID,
+        request_id: requestId,
         tool: block.name,
         input: block.input,
         tool_use_id: block.id,
@@ -800,7 +838,7 @@ class ClaudeBridge {
     return diff;
   }
 
-  _handleUserEvent(event, replyTo, msgID, streamBuffer, sessionID) {
+  _handleUserEvent(event, replyTo, msgID, streamBuffer, sessionID, requestId = msgID) {
     const msg = event.message;
     if (!msg?.content) return;
     for (const block of msg.content) {
@@ -832,6 +870,7 @@ class ClaudeBridge {
         const payload = {
           msg_id: msgID,
           session_id: sessionID,
+          request_id: requestId,
           tool_use_id: block.tool_use_id,
           state: block.is_error ? 'failed' : 'completed',
           output: output.slice(0, 4000),
@@ -878,15 +917,22 @@ class ClaudeBridge {
     }
   }
 
-  _handleErrorEvent(event, replyTo, msgID, sessionID, streamBuffer, sendStreamEnd = null) {
+  _handleErrorEvent(event, replyTo, msgID, sessionID, streamBuffer, sendStreamEnd = null, requestId = msgID) {
     streamBuffer.flush();
     streamBuffer.end();
     const payload = { exit_code: 1, error: event.error || event.message || 'Unknown error' };
     if (sendStreamEnd) {
       sendStreamEnd(payload).catch(() => {});
     } else {
-      this.imClient.sendCustomMessage(replyTo, 'stream_end', { msg_id: msgID, session_id: sessionID, ...payload }).catch(() => {});
-    }
+      this.imClient.sendCustomMessage(replyTo, 'stream_end', { msg_id: msgID, session_id: sessionID, request_id: requestId, ...payload }).catch(() => {});
+    }
+    logUploader.collect('ERROR', '[ChatTrace] claude error event', {
+      tag: 'ChatTrace',
+      request_id: requestId,
+      session_id: sessionID,
+      msg_id: msgID,
+      error: event.error || event.message || 'Unknown error',
+    });
     console.error('[Bridge] Claude error:', event.error || event.message);
   }
 }

package/src/index.js

@@ -16,6 +16,7 @@ const path = require('path');
 const os = require('os');
 const crypto = require('crypto');
 const logUploader = require('./log-uploader');
+const trace = require('./trace');
 
 const isDaemon = process.argv.includes('--daemon');
 const CHATCC_DIR = path.join(os.homedir(), '.chatcc');
@@ -295,9 +296,20 @@ async function main() {
   imClient.onMessage(async (from, data) => {
     // 建立请求级 traceId 上下文：沿用入站 trace_id（跨 hop 续链），没有则生成。
     // 后续所有出站 IM/HTTP 调用、日志都会自动带上。
-    require('./trace').enterWithTrace(data && data.trace_id);
+    trace.enterWithTrace(data && (data.trace_id || data.request_id));
     const qs = bridge.getQueueStatus();
-    console.log(`[Message] from=${from} cc_type=${data.cc_type} queue_active=${qs.activeCount} queue_waiting=${qs.queuedCount}`);
+    const requestID = data.request_id || '';
+    const traceID = trace.getTraceId() || '';
+    console.log(`[Message] from=${from} cc_type=${data.cc_type} request=${requestID} trace=${traceID} queue_active=${qs.activeCount} queue_waiting=${qs.queuedCount}`);
+    logUploader.collect('INFO', `[ChatTrace] received cc_type=${data.cc_type}`, {
+      tag: 'ChatTrace',
+      from,
+      cc_type: data.cc_type,
+      request_id: requestID,
+      session_id: data.session_id || '',
+      queue_active: qs.activeCount,
+      queue_waiting: qs.queuedCount,
+    });
 
     // All messages require authenticated sender
     if (pairedClientIDs.size === 0 || !pairedClientIDs.has(from)) {
@@ -380,7 +392,17 @@ async function main() {
           }).catch(e => console.error('[Session] Failed to send session_update:', e.message, e.stack));
         };
 
-        const bridgeOpts = { cwd, claudeSessionId: claudeSid, onClaudeSessionId, onResumeFailed, onSessionTitle, workspaceRestricted: isRestricted, permissions: sessionPermissions };
+        const bridgeOpts = {
+          cwd,
+          claudeSessionId: claudeSid,
+          onClaudeSessionId,
+          onResumeFailed,
+          onSessionTitle,
+          workspaceRestricted: isRestricted,
+          permissions: sessionPermissions,
+          requestId: data.request_id,
+          traceId: traceID,
+        };
         if (imageUrls.length > 0) {
           Promise.all(imageUrls.map(u => downloadImage(u, tempFiles).catch(e => {
             console.error('[Image] Download failed for', u, ':', e.message, e.stack);