chatcc-agent 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatcc-agent",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "CCLink Agent - bridges Claude Code CLI with instant messaging",
   "bin": {
     "chatcc": "src/cli.js"
@@ -44,8 +44,8 @@
     "node": ">=16.0.0"
   },
   "dependencies": {
-    "@tencentcloud/chat": "^3.6.6",
-    "ws": "^8.0.0"
+    "@tencentcloud/chat": "3.6.6",
+    "ws": "8.20.1"
   },
   "devDependencies": {}
 }

package/src/claude-bridge.js

@@ -6,6 +6,7 @@ const os = require('os');
 const path = require('path');
 const { StreamBuffer } = require('./stream-buffer');
 const { ProcessQueue } = require('./process-queue');
+const { PERMISSION_MODES, PERMISSION_ACTIONS } = require('./constants');
 
 class ClaudeBridge {
 
@@ -75,7 +76,7 @@ class ClaudeBridge {
   }
 
   _requiresApproval(toolName, permissions) {
-    if (permissions?.defaultMode === '自动全部允许') return false;
+    if (permissions?.defaultMode === PERMISSION_MODES.AUTO_ALL) return false;
 
     const TOOL_CATEGORY = {
       'Read': 'fileRead', 'read': 'fileRead',
@@ -87,11 +88,11 @@ class ClaudeBridge {
 
     // Per-tool setting overrides default mode
     if (category) {
-      return (permissions?.[category] || '需要确认') !== '自动允许';
+      return (permissions?.[category] || PERMISSION_ACTIONS.CONFIRM) !== PERMISSION_ACTIONS.AUTO_ALLOW;
     }
 
-    // Unknown tools: auto-allow in "自动允许读取" mode, otherwise require approval
-    return permissions?.defaultMode !== '自动允许读取';
+    // Unknown tools: auto-allow in "auto_read" mode, otherwise require approval
+    return permissions?.defaultMode !== PERMISSION_MODES.AUTO_READ;
   }
 
   _writeToStdin(proc, msg) {
@@ -298,7 +299,7 @@ class ClaudeBridge {
 
   _spawnCompact(replyTo, sessionID, requestID, options) {
     const { cwd, claudeSessionId, workspaceRestricted, permissions } = options;
-    const usePermissionControl = permissions?.defaultMode !== '自动全部允许';
+    const usePermissionControl = permissions?.defaultMode !== PERMISSION_MODES.AUTO_ALL;
     const useStreamInput = usePermissionControl;
     const args = ['--output-format', 'stream-json', '--verbose'];
 
@@ -403,7 +404,7 @@ class ClaudeBridge {
 
   _spawnClaude(msgID, replyTo, content, sessionID, options = {}) {
     const { cwd, claudeSessionId, images, onClaudeSessionId, onResumeFailed, onSessionTitle, workspaceRestricted = false, permissions = null } = options;
-    const usePermissionControl = permissions?.defaultMode !== '自动全部允许';
+    const usePermissionControl = permissions?.defaultMode !== PERMISSION_MODES.AUTO_ALL;
     const useStreamInput = usePermissionControl;
     const args = [
       '--output-format', 'stream-json',
@@ -582,6 +583,8 @@ class ClaudeBridge {
       case 'error':
         this._handleErrorEvent(event, replyTo, msgID, sessionID, streamBuffer, sendStreamEnd);
         break;
+      default:
+        console.warn(`[Bridge] Unknown Claude event type: ${event.type}`, JSON.stringify(event).slice(0, 200));
     }
   }
 
@@ -611,6 +614,11 @@ class ClaudeBridge {
             session_id: sessionID,
             tool_use_id: block.id,
             questions: block.input?.questions || [],
+          }, {
+            title: 'Claude 有问题',
+            desc: '需要您的选择',
+            ext: JSON.stringify({ session_id: sessionID, push_type: 'agent_reply' }),
+            ignoreBadge: false,
           }).catch(e => console.error('[Bridge] user_question:', e.message));
         } else {
           this._handleToolUseBlock(block, replyTo, msgID, streamBuffer, sessionID, cwd, workspaceRestricted, permissions, useControl, sendStreamEnd);

package/src/constants.js

@@ -0,0 +1,42 @@
+/**
+ * Permission mode identifiers — used in IM protocol between Agent and iOS.
+ * Chinese display labels live on the iOS side only.
+ */
+
+// Protocol versioning — bump CURRENT when introducing breaking changes.
+// MIN is the oldest client/agent version we still support.
+const CURRENT_PROTOCOL_VERSION = 1;
+const MIN_PROTOCOL_VERSION = 1;
+
+// Default permission modes (sent as default_mode in session settings)
+const PERMISSION_MODES = {
+  CONFIRM_EVERY: 'confirm_every',     // 每次确认
+  AUTO_READ: 'auto_read',            // 自动允许读取
+  AUTO_ALL: 'auto_all',              // 自动全部允许
+};
+
+// Per-category permission actions (sent as file_read / file_edit / code_exec)
+const PERMISSION_ACTIONS = {
+  AUTO_ALLOW: 'auto_allow',          // 自动允许
+  CONFIRM: 'confirm',                // 需要确认
+};
+
+// Map legacy Chinese strings to new identifiers for backward compatibility
+const LEGACY_MODE_MAP = {
+  '每次确认': PERMISSION_MODES.CONFIRM_EVERY,
+  '自动允许读取': PERMISSION_MODES.AUTO_READ,
+  '自动全部允许': PERMISSION_MODES.AUTO_ALL,
+  '自动允许': PERMISSION_ACTIONS.AUTO_ALLOW,
+  '需要确认': PERMISSION_ACTIONS.CONFIRM,
+};
+
+/**
+ * Normalize a permission value — accepts both new identifiers and legacy Chinese strings.
+ * Passes through unknown values (already in new format or custom).
+ */
+function normalizePermission(value) {
+  if (!value) return value;
+  return LEGACY_MODE_MAP[value] || value;
+}
+
+module.exports = { CURRENT_PROTOCOL_VERSION, MIN_PROTOCOL_VERSION, PERMISSION_MODES, PERMISSION_ACTIONS, LEGACY_MODE_MAP, normalizePermission };

package/src/im-client.js

@@ -1,10 +1,8 @@
 const WebSocket = require('ws');
 global.WebSocket = WebSocket;
 
-// Save original console references at module level (never changes)
-const _origLog = console.log;
-const _origWarn = console.warn;
-const _origErr = console.error;
+const { CURRENT_PROTOCOL_VERSION, MIN_PROTOCOL_VERSION } = require('./constants');
+const PROTOCOL_VERSION = CURRENT_PROTOCOL_VERSION;
 
 class IMClient {
   constructor(sdkAppID, userID, userSig, options = {}) {
@@ -15,19 +13,10 @@ class IMClient {
     this._onFatal = options.onFatal || (() => process.exit(1));
     this._onUserSigExpired = options.onUserSigExpired || null;
 
-    // Suppress SDK noise only during require/create, restore immediately
-    console.log = () => {};
-    console.warn = () => {};
-    console.error = () => {};
-
     const TIM = require('@tencentcloud/chat');
     this.TIM = TIM;
     this.tim = TIM.create({ SDKAppID: sdkAppID });
-    this.tim.setLogLevel(4);
-
-    console.log = _origLog;
-    console.warn = _origWarn;
-    console.error = _origErr;
+    this.tim.setLogLevel(4); // Suppress all SDK noise
 
     this._messageHandlers = [];
 
@@ -48,9 +37,9 @@ class IMClient {
 
     this.tim.on(TIM.EVENT.NET_STATE_CHANGE, (event) => {
       if (event.data.state === this.TIM.NET_STATE_DISCONNECTED) {
-        _origLog('[IM] Network disconnected');
+        console.log('[IM] Network disconnected');
       } else if (event.data.state === this.TIM.NET_STATE_CONNECTED) {
-        _origLog('[IM] Network connected');
+        console.log('[IM] Network connected');
       }
     });
 
@@ -64,7 +53,7 @@ class IMClient {
       this._lastKickoutTimes = this._lastKickoutTimes.filter(t => now - t < 60000);
 
       if (reason === this.TIM.KICKED_OUT_MULTIPLE_ACCOUNT) {
-        _origLog('[IM] Kicked out: UserSig expired, requesting refresh...');
+        console.log('[IM] Kicked out: UserSig expired, requesting refresh...');
         if (this._onUserSigExpired) {
           this._onUserSigExpired().then(newSig => {
             if (newSig) {
@@ -73,7 +62,7 @@ class IMClient {
               this._reconnect();
             }
           }).catch(e => {
-            _origLog('[IM] UserSig refresh failed:', e.message);
+            console.log('[IM] UserSig refresh failed:', e.message);
           });
           return;
         }
@@ -82,7 +71,7 @@ class IMClient {
       // Detect kickout loop: 5+ kickouts in 60s means something is wrong
       if (this._lastKickoutTimes.length >= 5) {
         const backoff = 15000;
-        _origLog(`[IM] Kickout loop detected (${this._lastKickoutTimes.length} in 60s). Cooling down ${backoff/1000}s...`);
+        console.log(`[IM] Kickout loop detected (${this._lastKickoutTimes.length} in 60s). Cooling down ${backoff/1000}s...`);
         this._lastKickoutTimes = [];
         setTimeout(() => {
           this._reconnectAttempts = 0;
@@ -91,10 +80,10 @@ class IMClient {
         return;
       }
 
-      _origLog('[IM] Kicked out! Attempting reconnect...');
+      console.log('[IM] Kicked out! Attempting reconnect...');
       this._reconnectAttempts++;
       if (this._reconnectAttempts > this._maxReconnectAttempts) {
-        _origLog('[IM] Max reconnect attempts reached. Waiting before retry...');
+        console.log('[IM] Max reconnect attempts reached. Waiting before retry...');
         this._reconnectAttempts = this._maxReconnectAttempts - 3;
       }
       const delay = Math.min(2000 * this._reconnectAttempts, 30000);
@@ -122,15 +111,15 @@ class IMClient {
 
   async _reconnect() {
     try {
-      _origLog(`[IM] Reconnecting (attempt ${this._reconnectAttempts}/${this._maxReconnectAttempts})...`);
+      console.log(`[IM] Reconnecting (attempt ${this._reconnectAttempts}/${this._maxReconnectAttempts})...`);
       try { await this.tim.logout(); } catch {}
       await this.login();
-      _origLog('[IM] Reconnected successfully');
+      console.log('[IM] Reconnected successfully');
     } catch (e) {
-      _origLog('[IM] Reconnect failed:', e.message);
+      console.log('[IM] Reconnect failed:', e.message);
       this._reconnectAttempts++;
       if (this._reconnectAttempts > this._maxReconnectAttempts) {
-        _origLog('[IM] Max reconnect attempts reached. Backing off...');
+        console.log('[IM] Max reconnect attempts reached. Backing off...');
         this._reconnectAttempts = this._maxReconnectAttempts - 3;
       }
       const delay = Math.min(2000 * this._reconnectAttempts, 30000);
@@ -146,18 +135,33 @@ class IMClient {
     this._messageHandlers.push(handler);
   }
 
-  async sendCustomMessage(to, ccType, payload = {}) {
+  async sendCustomMessage(to, ccType, payload = {}, pushOptions = null) {
     const message = this.tim.createCustomMessage({
       to,
       conversationType: this.TIM.TYPES.CONV_C2C,
       payload: {
-        data: JSON.stringify({ cc_type: ccType, ...payload }),
+        data: JSON.stringify({ cc_type: ccType, v: PROTOCOL_VERSION, min_v: MIN_PROTOCOL_VERSION, ...payload }),
         description: 'CCLink',
       },
     });
-    await this.tim.sendMessage(message);
+
+    // Default: silent (disablePush). Only messages with explicit pushOptions trigger notifications.
+    const sendOpts = {};
+    if (pushOptions) {
+      sendOpts.offlinePushInfo = {
+        title: pushOptions.title || 'CCLink',
+        description: pushOptions.desc || '',
+        extension: pushOptions.ext || '',
+        disablePush: false,
+        apnsInfo: { ignoreIOSBadge: pushOptions.ignoreBadge ?? false },
+      };
+    } else {
+      sendOpts.offlinePushInfo = { disablePush: true };
+    }
+
+    await this.tim.sendMessage(message, sendOpts);
     return message.ID;
   }
 }
 
-module.exports = { IMClient };
+module.exports = { IMClient, PROTOCOL_VERSION };

package/src/index.js

@@ -133,11 +133,34 @@ async function shutdown(signal) {
 
 process.on('exit', cleanupTempFiles);
 
+async function checkForUpdates(agentID, pairedClientIDs) {
+  try {
+    const { execSync } = require('child_process');
+    const currentVersion = getVersion();
+    const latestVersion = execSync('npm view chatcc-agent version', {
+      encoding: 'utf-8', timeout: 15000,
+    }).trim();
+    if (latestVersion && latestVersion !== currentVersion) {
+      console.log(`[Update] New version available: ${currentVersion} -> ${latestVersion}`);
+      for (const clientID of pairedClientIDs) {
+        imClient.sendCustomMessage(clientID, 'update_available', {
+          current_version: currentVersion,
+          latest_version: latestVersion,
+        }).catch(() => {});
+      }
+    }
+  } catch (e) {
+    // Non-fatal: network issues, npm unavailable, etc.
+    console.log('[Update] Check failed:', e.message);
+  }
+}
+
 async function main() {
   // Pre-flight: check Claude CLI is available
   const { execFileSync } = require('child_process');
   try {
-    execFileSync('claude', ['--version'], { stdio: 'pipe' });
+    const versionOutput = execFileSync('claude', ['--version'], { encoding: 'utf-8', stdio: 'pipe' }).trim();
+    console.log('[Preflight] Claude CLI version:', versionOutput);
   } catch {
     console.error('[Fatal] Claude CLI not found. Install it first: npm install -g @anthropic-ai/claude-code');
     process.exit(1);
@@ -207,6 +230,13 @@ async function main() {
     }
   }
 
+  // Auto-update check: on startup and every 24h
+  checkForUpdates(config.agentUserID, pairedClientIDs);
+  const updateInterval = setInterval(() => {
+    checkForUpdates(config.agentUserID, pairedClientIDs);
+  }, 24 * 60 * 60 * 1000);
+  updateInterval.unref();
+
   // Setup services
   sessions = new SessionStore(path.join(CHATCC_DIR, 'sessions.json'), {
     maxSessions: MAX_SESSIONS,
@@ -231,6 +261,11 @@ async function main() {
           request_id: reqId,
           path: filePath,
           operation,
+        }, {
+          title: '权限请求',
+          desc: `${operation}: ${filePath.length > 40 ? '...' + filePath.slice(-37) : filePath}`,
+          ext: JSON.stringify({ push_type: 'tool_confirm' }),
+          ignoreBadge: false,
         }).catch(() => {});
         const timer = setTimeout(() => {
           fileService._pendingPermissions.delete(reqId);
@@ -408,6 +443,26 @@ async function main() {
         break;
       }
 
+      case 'clear_request': {
+        const sid = data.session_id;
+        const sess = sessions.get(sid) || null;
+        if (!sess || sess.clientID !== from) {
+          imClient.sendCustomMessage(from, 'clear_response', {
+            request_id: data.request_id, success: false, error: '会话不存在或无权限',
+          }).catch(() => {});
+          break;
+        }
+        // Clear Claude session so next message starts fresh
+        sess.claudeSessionId = null;
+        sess.lastActiveAt = Date.now();
+        sessions.set(sid, sess);
+        console.log(`[Session] Clear context for ${sid}, claudeSessionId reset`);
+        imClient.sendCustomMessage(from, 'clear_response', {
+          request_id: data.request_id, success: true,
+        }).catch(e => console.error('[Clear] Reply failed:', e.message));
+        break;
+      }
+
       case 'compact_request': {
         const sid = data.session_id;
         const sess = sessions.get(sid) || null;
@@ -476,7 +531,11 @@ async function main() {
       }
 
       default:
-        console.log('[Message] Unknown cc_type:', data.cc_type);
+        console.log('[Message] Unknown cc_type:', data.cc_type, 'v=', data.v || 0);
+        imClient.sendCustomMessage(from, 'unknown_type_error', {
+          original_type: data.cc_type,
+          message: `Unknown cc_type: ${data.cc_type}`,
+        }).catch(() => {});
     }
   });
 

package/src/security.js

@@ -163,11 +163,12 @@ function validateTerminalCommand(input) {
 
 function buildPermissions(data) {
   if (!data) return null;
+  const { normalizePermission, PERMISSION_MODES, PERMISSION_ACTIONS } = require('./constants');
   return {
-    defaultMode: data.default_mode || '每次确认',
-    fileRead: data.file_read || '自动允许',
-    fileEdit: data.file_edit || '需要确认',
-    codeExec: data.code_exec || '需要确认',
+    defaultMode: normalizePermission(data.default_mode || PERMISSION_MODES.CONFIRM_EVERY),
+    fileRead: normalizePermission(data.file_read || PERMISSION_ACTIONS.AUTO_ALLOW),
+    fileEdit: normalizePermission(data.file_edit || PERMISSION_ACTIONS.CONFIRM),
+    codeExec: normalizePermission(data.code_exec || PERMISSION_ACTIONS.CONFIRM),
   };
 }
 

package/src/server-info.js

@@ -2,6 +2,7 @@ const os = require('os');
 const fs = require('fs');
 const path = require('path');
 const { getVersion } = require('./version');
+const { CURRENT_PROTOCOL_VERSION, MIN_PROTOCOL_VERSION } = require('./constants');
 
 function collectServerMeta() {
   const suggestedWorkspaces = [];
@@ -23,6 +24,8 @@ function collectServerMeta() {
     cpuCount: os.cpus().length,
     memoryGB: Math.round(os.totalmem() / 1024 / 1024 / 1024),
     agentVersion: getVersion(),
+    protocol_version: CURRENT_PROTOCOL_VERSION,
+    min_protocol_version: MIN_PROTOCOL_VERSION,
     suggestedWorkspaces: suggestedWorkspaces,
   };
 }