@unlinearity/cli-wechat-bridge 1.0.4 → 1.0.6

package/dist/wechat/channel-config.js

@@ -7,22 +7,79 @@ const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PROJECT_DIR = path.resolve(MODULE_DIR, "..", "..");
 export const DEFAULT_BASE_URL = process.env.WECHAT_ILINK_BASE_URL?.trim() || "https://ilinkai.weixin.qq.com";
 export const BOT_TYPE = "3";
-export const CHANNEL_DATA_DIR = process.env.CLAUDE_WECHAT_CHANNEL_DATA_DIR?.trim()
-    ? path.resolve(process.env.CLAUDE_WECHAT_CHANNEL_DATA_DIR.trim())
-    : path.join(os.homedir(), ".claude", "channels", "wechat");
-export const GLOBAL_CHANNEL_DATA_DIR = path.join(os.homedir(), ".claude", "channels", "wechat");
+export function resolveChannelDataDir(env = process.env, homeDir = os.homedir()) {
+    const configured = env.CLI_BRIDGE_DATA_DIR?.trim();
+    return configured ? path.resolve(configured) : path.join(homeDir, ".cli-bridge");
+}
+export const CHANNEL_DATA_DIR = resolveChannelDataDir();
 export const CREDENTIALS_FILE = path.join(CHANNEL_DATA_DIR, "account.json");
 export const SYNC_BUF_FILE = path.join(CHANNEL_DATA_DIR, "sync_buf.txt");
 export const CONTEXT_CACHE_FILE = path.join(CHANNEL_DATA_DIR, "context_tokens.json");
 export const BRIDGE_STATE_FILE = path.join(CHANNEL_DATA_DIR, "bridge-state.json");
 export const BRIDGE_LOG_FILE = path.join(CHANNEL_DATA_DIR, "bridge.log");
 export const BRIDGE_LOCK_FILE = path.join(CHANNEL_DATA_DIR, "bridge.lock.json");
+export const DAEMON_ENDPOINT_FILE = path.join(CHANNEL_DATA_DIR, "daemon-endpoint.json");
 export const CODEX_PANEL_ENDPOINT_FILE = path.join(CHANNEL_DATA_DIR, "codex-panel-endpoint.json");
 export const WORKSPACES_DIR = path.join(CHANNEL_DATA_DIR, "workspaces");
-export const INBOUND_MESSAGE_CLAIMS_DIR = path.join(GLOBAL_CHANNEL_DATA_DIR, "inbound-message-claims");
-const LEGACY_CHANNEL_DATA_DIR = path.join(PROJECT_DIR, "~", ".claude", "channels", "wechat");
-const LEGACY_CREDENTIALS_FILE = path.join(LEGACY_CHANNEL_DATA_DIR, "account.json");
-const LEGACY_SYNC_BUF_FILE = path.join(LEGACY_CHANNEL_DATA_DIR, "sync_buf.txt");
+export const INBOUND_MESSAGE_CLAIMS_DIR = path.join(CHANNEL_DATA_DIR, "inbound-message-claims");
+export const INBOUND_ATTACHMENTS_DIR = path.join(CHANNEL_DATA_DIR, "inbound-attachments");
+const LEGACY_GLOBAL_CHANNEL_DATA_DIR = path.join(os.homedir(), ".claude", "channels", "wechat");
+const LEGACY_REPO_CHANNEL_DATA_DIR = path.join(PROJECT_DIR, "~", ".claude", "channels", "wechat");
+const LEGACY_ENV_CHANNEL_DATA_DIR = process.env.CLAUDE_WECHAT_CHANNEL_DATA_DIR?.trim()
+    ? path.resolve(process.env.CLAUDE_WECHAT_CHANNEL_DATA_DIR.trim())
+    : "";
+const LEGACY_CHANNEL_SOURCE_DIRS = [
+    LEGACY_ENV_CHANNEL_DATA_DIR,
+    LEGACY_GLOBAL_CHANNEL_DATA_DIR,
+    LEGACY_REPO_CHANNEL_DATA_DIR,
+].filter(Boolean);
+const LEGACY_CHANNEL_SOURCES = LEGACY_CHANNEL_SOURCE_DIRS.map((dataDir) => ({
+    dataDir,
+}));
+const LEGACY_MIGRATION_ITEMS = [
+    {
+        label: "credentials",
+        sourceName: "account.json",
+        targetName: "account.json",
+        kind: "file",
+    },
+    {
+        label: "sync state",
+        sourceName: "sync_buf.txt",
+        targetName: "sync_buf.txt",
+        kind: "file",
+    },
+    {
+        label: "context tokens",
+        sourceName: "context_tokens.json",
+        targetName: "context_tokens.json",
+        kind: "file",
+    },
+    {
+        label: "update check cache",
+        sourceName: "update-check.json",
+        targetName: "update-check.json",
+        kind: "file",
+    },
+    {
+        label: "workspace state",
+        sourceName: "workspaces",
+        targetName: "workspaces",
+        kind: "directory",
+    },
+    {
+        label: "inbound attachments",
+        sourceName: "inbound-attachments",
+        targetName: "inbound-attachments",
+        kind: "directory",
+    },
+    {
+        label: "legacy bridge log",
+        sourceName: "bridge.log",
+        targetName: "legacy-bridge.log",
+        kind: "file",
+    },
+];
 export function ensureChannelDataDir() {
     fs.mkdirSync(CHANNEL_DATA_DIR, { recursive: true });
 }
@@ -58,46 +115,82 @@ export function getWorkspaceChannelPaths(cwd) {
         endpointFile: path.join(workspaceDir, "codex-panel-endpoint.json"),
     };
 }
+export function getWorkspaceAdapterEndpointFile(cwd, adapter) {
+    return path.join(getWorkspaceChannelPaths(cwd).workspaceDir, `${adapter}-companion-endpoint.json`);
+}
 export function ensureWorkspaceChannelDir(cwd) {
     ensureChannelDataDir();
     const paths = getWorkspaceChannelPaths(cwd);
     fs.mkdirSync(paths.workspaceDir, { recursive: true });
     return paths;
 }
-function channelDataDirHasState() {
-    try {
-        if (!fs.existsSync(CHANNEL_DATA_DIR)) {
+function isSamePath(left, right) {
+    const normalizedLeft = path.resolve(left);
+    const normalizedRight = path.resolve(right);
+    return process.platform === "win32"
+        ? normalizedLeft.toLowerCase() === normalizedRight.toLowerCase()
+        : normalizedLeft === normalizedRight;
+}
+function legacySourceHasMigratableData(source) {
+    return LEGACY_MIGRATION_ITEMS.some((item) => {
+        const sourcePath = path.join(source.dataDir, item.sourceName);
+        if (!fs.existsSync(sourcePath)) {
             return false;
         }
-        return fs.readdirSync(CHANNEL_DATA_DIR).length > 0;
-    }
-    catch {
-        return true;
-    }
+        try {
+            const stat = fs.statSync(sourcePath);
+            return item.kind === "directory" ? stat.isDirectory() : stat.isFile();
+        }
+        catch {
+            return false;
+        }
+    });
 }
-export function shouldMigrateLegacyCredentials(params) {
-    return (params.legacyCredentialsExists &&
-        !params.credentialsExists &&
-        !params.channelDataDirHadState);
+function findLegacyChannelSource(channelDataDir = CHANNEL_DATA_DIR, legacySources = LEGACY_CHANNEL_SOURCES) {
+    return (legacySources.find((source) => !isSamePath(source.dataDir, channelDataDir) &&
+        legacySourceHasMigratableData(source)) ?? null);
 }
-export function migrateLegacyChannelFiles(log) {
+export function migrateLegacyChannelFiles(log, options = {}) {
+    const channelDataDir = options.channelDataDir ?? CHANNEL_DATA_DIR;
+    const legacySources = (options.legacyDataDirs ?? LEGACY_CHANNEL_SOURCE_DIRS).map((dataDir) => ({ dataDir }));
     const migrated = [];
-    const channelDataDirHadState = channelDataDirHasState();
-    if (!fs.existsSync(LEGACY_CREDENTIALS_FILE) &&
-        !fs.existsSync(LEGACY_SYNC_BUF_FILE)) {
+    const skippedExisting = [];
+    const legacySource = findLegacyChannelSource(channelDataDir, legacySources);
+    if (!legacySource) {
         return migrated;
     }
-    ensureChannelDataDir();
-    if (shouldMigrateLegacyCredentials({
-        channelDataDirHadState,
-        credentialsExists: fs.existsSync(CREDENTIALS_FILE),
-        legacyCredentialsExists: fs.existsSync(LEGACY_CREDENTIALS_FILE),
-    })) {
-        fs.copyFileSync(LEGACY_CREDENTIALS_FILE, CREDENTIALS_FILE);
-        migrated.push("credentials");
+    fs.mkdirSync(channelDataDir, { recursive: true });
+    for (const item of LEGACY_MIGRATION_ITEMS) {
+        const sourcePath = path.join(legacySource.dataDir, item.sourceName);
+        const targetPath = path.join(channelDataDir, item.targetName);
+        if (!fs.existsSync(sourcePath)) {
+            continue;
+        }
+        if (fs.existsSync(targetPath)) {
+            skippedExisting.push(item.label);
+            continue;
+        }
+        const stat = fs.statSync(sourcePath);
+        if (item.kind === "directory") {
+            if (!stat.isDirectory()) {
+                continue;
+            }
+            fs.cpSync(sourcePath, targetPath, { recursive: true });
+        }
+        else {
+            if (!stat.isFile()) {
+                continue;
+            }
+            fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+            fs.copyFileSync(sourcePath, targetPath);
+        }
+        migrated.push(item.label);
     }
     if (migrated.length && log) {
-        log(`Migrated legacy ${migrated.join(" and ")} from ${LEGACY_CHANNEL_DATA_DIR} to ${CHANNEL_DATA_DIR}.`);
+        const skippedText = skippedExisting.length
+            ? ` Skipped existing: ${skippedExisting.join(", ")}.`
+            : "";
+        log(`Migrated legacy ${migrated.join(", ")} from ${legacySource.dataDir} to ${channelDataDir}.${skippedText}`);
     }
     return migrated;
 }

package/dist/wechat/standalone-bot.js

@@ -8,15 +8,13 @@
  * Usage:
  *   bun run src/wechat/standalone-bot.ts
  */
-import fs from "node:fs";
-import os from "node:os";
 import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
 import Anthropic from "@anthropic-ai/sdk";
+import { CHANNEL_DATA_DIR, CREDENTIALS_FILE, migrateLegacyChannelFiles, SYNC_BUF_FILE, } from "./channel-config.js";
 // Constants
-const HOME_DIR = os.homedir();
-const CREDENTIALS_FILE = `${HOME_DIR}/.claude/channels/wechat/account.json`;
-const SYNC_BUF_FILE = `${HOME_DIR}/.claude/channels/wechat/sync_buf.txt`;
-const LOG_DIR = `${HOME_DIR}/.claude/channels/wechat/logs`;
+const LOG_DIR = path.join(CHANNEL_DATA_DIR, "logs");
 const BOT_TYPE = "3";
 const CHANNEL_VERSION = "0.1.0";
 const LONG_POLL_TIMEOUT_MS = 35_000;
@@ -329,6 +327,7 @@ async function startPolling(account) {
 async function main() {
     log("=== WeChat + Claude 独立机器人 ===");
     log("");
+    migrateLegacyChannelFiles(log);
     // Load WeChat credentials
     log(`正在加载微信凭据: ${CREDENTIALS_FILE}`);
     const account = loadCredentials();

package/dist/wechat/wechat-channel.js

@@ -8,7 +8,7 @@
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
-import { WeChatTransport, } from "./wechat-transport.js";
+import { formatByteSize, WeChatTransport, } from "./wechat-transport.js";
 const SERVER_NAME = "wechat";
 const SERVER_VERSION = "0.3.0";
 const DEFAULT_POLL_TIMEOUT_MS = 1_000;
@@ -176,15 +176,26 @@ async function fetchMessages(args) {
     return formatFetchedMessages(result.messages);
 }
 function formatFetchedMessages(messages) {
-    const blocks = messages.map((message, index) => [
-        `[${index + 1}]`,
-        `sender_id: ${message.senderId}`,
-        `sender: ${message.sender}`,
-        `session_id: ${message.sessionId || "(unknown)"}`,
-        `created_at: ${message.createdAt}`,
-        "text:",
-        message.text,
-    ].join("\n"));
+    const blocks = messages.map((message, index) => {
+        const lines = [
+            `[${index + 1}]`,
+            `sender_id: ${message.senderId}`,
+            `sender: ${message.sender}`,
+            `session_id: ${message.sessionId || "(unknown)"}`,
+            `created_at: ${message.createdAt}`,
+            "text:",
+            message.text,
+        ];
+        if (message.attachments.length > 0) {
+            lines.push("attachments:", ...message.attachments.map((attachment) => [
+                `- kind: ${attachment.kind}`,
+                `  name: ${attachment.fileName}`,
+                `  size: ${formatByteSize(attachment.sizeBytes)}`,
+                `  path: ${attachment.path}`,
+            ].join("\n")));
+        }
+        return lines.join("\n");
+    });
     return [
         `Fetched ${messages.length} new WeChat message${messages.length === 1 ? "" : "s"}.`,
         "",