claude-codex-wechat 0.1.57 → 0.1.58

package/dist/mcp/mediaServer.js

@@ -142,6 +142,12 @@ function locateDouyinScript(input) {
   return void 0;
 }
 
+// src/shared/platform.ts
+var isWindows = process.platform === "win32";
+function nodeExecutable() {
+  return process.execPath;
+}
+
 // src/mcp/tools/douyinDownload.ts
 function findDouyinScript() {
   const here = dirname(fileURLToPath(import.meta.url));
@@ -152,7 +158,7 @@ function findDouyinScript() {
 function runScript(args) {
   const script = findDouyinScript();
   return new Promise((resolve2, reject) => {
-    execFile("node", [script, ...args], { timeout: 12e4 }, (err, stdout, stderr) => {
+    execFile(nodeExecutable(), [script, ...args], { timeout: 12e4 }, (err, stdout, stderr) => {
       if (err) reject(new Error(stderr || err.message));
       else resolve2({ stdout, stderr });
     });

package/dist/server/cli.js

@@ -15,6 +15,106 @@ import { networkInterfaces } from "node:os";
 import { mkdtempSync, existsSync as existsSync10, writeFileSync as writeFileSync2 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
 import { dirname as dirname8, isAbsolute, join as join13 } from "node:path";
+
+// src/daemon/mcpConfig.ts
+import { createRequire } from "node:module";
+
+// src/shared/platform.ts
+import { access, constants } from "node:fs/promises";
+import { delimiter, join } from "node:path";
+import { tmpdir } from "node:os";
+import { spawn } from "node:child_process";
+var isWindows = process.platform === "win32";
+async function isExecutableFile(candidate) {
+  try {
+    await access(candidate, isWindows ? constants.F_OK : constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function executableExtensions() {
+  if (!isWindows) return [""];
+  const pathext = process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD";
+  return ["", ...pathext.split(";").filter(Boolean)];
+}
+function isTemporaryShim(candidate) {
+  const tempDir = tmpdir();
+  return candidate.startsWith(tempDir);
+}
+async function findExecutable(command, pathEnv) {
+  const extensions = executableExtensions();
+  if (command.includes("/") || command.includes("\\")) {
+    for (const ext of extensions) {
+      if (await isExecutableFile(command + ext)) return command + ext;
+    }
+    return void 0;
+  }
+  const dirs = (pathEnv ?? "").split(delimiter).filter(Boolean);
+  let fallback;
+  for (const dir of dirs) {
+    for (const ext of extensions) {
+      const candidate = join(dir, command + ext);
+      if (await isExecutableFile(candidate)) {
+        if (isTemporaryShim(candidate)) {
+          fallback ??= candidate;
+          continue;
+        }
+        return candidate;
+      }
+    }
+  }
+  return fallback;
+}
+function terminateChild(child, signal = "SIGTERM") {
+  if (child.pid === void 0 || child.exitCode !== null || child.signalCode !== null) {
+    return;
+  }
+  if (isWindows) {
+    try {
+      spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
+      return;
+    } catch {
+    }
+  }
+  try {
+    child.kill(signal);
+  } catch {
+  }
+}
+function defaultWorkspaceDir() {
+  return join(tmpdir(), "project");
+}
+function useShellForCli() {
+  return isWindows;
+}
+function statePath(filename) {
+  return join(tmpdir(), filename);
+}
+function nodeExecutable() {
+  return process.execPath;
+}
+
+// src/daemon/mcpConfig.ts
+function buildMcpServerCommand(input) {
+  if (input.exists(input.jsEntry)) {
+    return { command: nodeExecutable(), args: [input.jsEntry] };
+  }
+  const tsxCli = (input.resolveTsxCli ?? defaultResolveTsxCli)();
+  if (tsxCli) {
+    return { command: nodeExecutable(), args: [tsxCli, input.tsEntry] };
+  }
+  return { command: "tsx", args: [input.tsEntry] };
+}
+function defaultResolveTsxCli() {
+  try {
+    return createRequire(import.meta.url).resolve("tsx/dist/cli.mjs");
+  } catch {
+    return void 0;
+  }
+}
+
+// src/daemon/server.ts
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import Fastify from "fastify";
 
@@ -69,9 +169,9 @@ var WeixinDirectLoginClient = class {
 // src/daemon/config.ts
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { join as join2 } from "node:path";
 function defaultConfigPath() {
-  return join(homedir(), ".claude-codex-wechat", "config.json");
+  return join2(homedir(), ".claude-codex-wechat", "config.json");
 }
 function loadBridgeConfig(path = process.env.BRIDGE_CONFIG ?? defaultConfigPath()) {
   if (!existsSync(path)) return normalizeBridgeConfig({}, process.env, path);
@@ -162,10 +262,10 @@ import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:f
 import { closeSync, fsyncSync, mkdirSync, openSync, renameSync, unlinkSync, writeSync } from "node:fs";
 import { mkdir, open, readdir, rename, stat, unlink } from "node:fs/promises";
 import { randomBytes } from "node:crypto";
-import { basename, dirname, join as join2 } from "node:path";
+import { basename, dirname, join as join3 } from "node:path";
 var FILE_MODE = 384;
 function tempPathFor(path) {
-  return join2(dirname(path), `.${basename(path)}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);
+  return join3(dirname(path), `.${basename(path)}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);
 }
 var RENAME_RETRY_CODES = /* @__PURE__ */ new Set(["EPERM", "EACCES", "EBUSY"]);
 var MAX_RENAME_RETRIES = 10;
@@ -247,7 +347,7 @@ async function cleanupStaleTempFiles(targetPath, maxAgeMs = 36e5) {
   const now = Date.now();
   await Promise.all(entries.map(async (name) => {
     if (!name.startsWith(prefix) || !name.endsWith(".tmp")) return;
-    const full = join2(dir, name);
+    const full = join3(dir, name);
     try {
       const info = await stat(full);
       if (now - info.mtimeMs >= maxAgeMs) await unlink(full);
@@ -501,7 +601,7 @@ var FileWeixinStateStore = class {
 // src/providers/claude-code/nativeSessions.ts
 import { appendFile, mkdir as mkdir2, readdir as readdir2, readFile as readFile2, stat as stat2, unlink as unlink2, writeFile } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
+import { basename as basename2, dirname as dirname2, join as join4 } from "node:path";
 
 // src/session/sessionBridgeTag.ts
 function buildSessionBridgeName(input) {
@@ -528,7 +628,7 @@ function parseSessionBridgeName(value) {
 
 // src/providers/claude-code/nativeSessions.ts
 function resolveClaudeConfigDir(env = process.env) {
-  return join3(env.HOME || homedir2(), ".claude");
+  return join4(env.HOME || homedir2(), ".claude");
 }
 async function prepareClaudeSessionForResume(input) {
   const env = input.env ?? process.env;
@@ -544,20 +644,20 @@ async function prepareClaudeSessionForResume(input) {
   return { ok: true, adoptedBackground: true };
 }
 async function listRecoverableClaudeSessions(env = process.env) {
-  const projectsDir = join3(resolveClaudeConfigDir(env), "projects");
+  const projectsDir = join4(resolveClaudeConfigDir(env), "projects");
   const historyIndex = await readClaudeHistoryIndex(env);
   const candidates = [];
   try {
     const projectEntries = await readdir2(projectsDir, { withFileTypes: true });
     for (const entry of projectEntries) {
       if (!entry.isDirectory() || entry.isSymbolicLink()) continue;
-      const projectDir = join3(projectsDir, String(entry.name));
+      const projectDir = join4(projectsDir, String(entry.name));
       const sessionEntries = await readdir2(projectDir, { withFileTypes: true }).catch(() => []);
       for (const sessionEntry of sessionEntries) {
         if (!sessionEntry.isFile() || sessionEntry.isSymbolicLink()) continue;
         const fileName = String(sessionEntry.name);
         if (!fileName.endsWith(".jsonl")) continue;
-        const filePath = join3(projectDir, fileName);
+        const filePath = join4(projectDir, fileName);
         const metadata = await stat2(filePath).catch(() => null);
         const parsedMeta = await readClaudeSessionMetadata(filePath).catch(() => null);
         const historyMeta = historyIndex.get(basename2(fileName, ".jsonl"));
@@ -583,12 +683,12 @@ async function listRecoverableClaudeSessions(env = process.env) {
 async function findRecoverableClaudeSessionPath(sessionId, env = process.env) {
   const trimmed = sessionId.trim();
   if (!trimmed || trimmed.includes("/") || trimmed.includes("\\")) return null;
-  const projectsDir = join3(resolveClaudeConfigDir(env), "projects");
+  const projectsDir = join4(resolveClaudeConfigDir(env), "projects");
   try {
     const projectEntries = await readdir2(projectsDir, { withFileTypes: true });
     for (const entry of projectEntries) {
       if (!entry.isDirectory() || entry.isSymbolicLink()) continue;
-      const sessionPath = join3(projectsDir, String(entry.name), `${trimmed}.jsonl`);
+      const sessionPath = join4(projectsDir, String(entry.name), `${trimmed}.jsonl`);
       try {
         const metadata = await stat2(sessionPath);
         if (metadata.isFile()) return sessionPath;
@@ -636,7 +736,7 @@ async function hasClaudeSessionBridgeMetadata(input) {
 }
 async function hasClaudeHistoryDisplay(input) {
   const env = input.env ?? process.env;
-  const historyPath = join3(resolveClaudeConfigDir(env), "history.jsonl");
+  const historyPath = join4(resolveClaudeConfigDir(env), "history.jsonl");
   try {
     const content = await readFile2(historyPath, "utf8");
     for (const line of content.split(/\r?\n/)) {
@@ -701,13 +801,13 @@ async function readClaudeSessionMetadata(filePath) {
   return { aiTitle, lastPrompt, sessionName, cwd };
 }
 async function readClaudeRuntimeSessionIndex(env) {
-  const sessionsDir = join3(resolveClaudeConfigDir(env), "sessions");
+  const sessionsDir = join4(resolveClaudeConfigDir(env), "sessions");
   const index = /* @__PURE__ */ new Map();
   try {
     const entries = await readdir2(sessionsDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isFile() || entry.isSymbolicLink() || !String(entry.name).endsWith(".json")) continue;
-      const path = join3(sessionsDir, String(entry.name));
+      const path = join4(sessionsDir, String(entry.name));
       try {
         const raw = await readFile2(path, "utf8");
         const record = JSON.parse(raw);
@@ -725,7 +825,7 @@ async function readClaudeRuntimeSessionIndex(env) {
   return index;
 }
 async function readClaudeHistoryIndex(env) {
-  const historyPath = join3(resolveClaudeConfigDir(env), "history.jsonl");
+  const historyPath = join4(resolveClaudeConfigDir(env), "history.jsonl");
   const index = /* @__PURE__ */ new Map();
   try {
     const content = await readFile2(historyPath, "utf8");
@@ -750,7 +850,7 @@ async function readClaudeHistoryIndex(env) {
   return index;
 }
 async function upsertClaudeHistoryDisplay(input) {
-  const historyPath = join3(resolveClaudeConfigDir(input.env), "history.jsonl");
+  const historyPath = join4(resolveClaudeConfigDir(input.env), "history.jsonl");
   const lines = [];
   let replaced = false;
   let changed = false;
@@ -840,9 +940,9 @@ import Database from "better-sqlite3";
 import { readdir as readdir3, readFile as readFile3, stat as stat3 } from "node:fs/promises";
 import { existsSync as existsSync4 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { basename as basename3, join as join4 } from "node:path";
+import { basename as basename3, join as join5 } from "node:path";
 function resolveCodexSessionsRoot(env = process.env) {
-  return join4(env.CODEX_HOME || join4(env.HOME || homedir3(), ".codex"), "sessions");
+  return join5(env.CODEX_HOME || join5(env.HOME || homedir3(), ".codex"), "sessions");
 }
 function isMatchingCodexRolloutFile(name) {
   return name.startsWith("rollout-") && name.endsWith(".jsonl");
@@ -865,7 +965,7 @@ async function listRecoverableCodexSessions(env = process.env) {
     for (const entry of entries) {
       if (entry.isSymbolicLink()) continue;
       const name = String(entry.name);
-      const path = join4(currentDir, name);
+      const path = join5(currentDir, name);
       if (entry.isDirectory()) {
         await walk(path, depth + 1);
         continue;
@@ -901,7 +1001,7 @@ async function findRecoverableCodexSessionPath(sessionId, env = process.env) {
     for (const entry of entries) {
       if (entry.isSymbolicLink()) continue;
       const name = String(entry.name);
-      const path = join4(currentDir, name);
+      const path = join5(currentDir, name);
       if (entry.isDirectory()) {
         const found = await walk(path, depth + 1);
         if (found) return found;
@@ -925,7 +1025,7 @@ async function getCodexNativeVersion(input) {
   };
 }
 async function readCodexSessionIndex(env) {
-  const indexPath = join4(env.CODEX_HOME || join4(env.HOME || homedir3(), ".codex"), "session_index.jsonl");
+  const indexPath = join5(env.CODEX_HOME || join5(env.HOME || homedir3(), ".codex"), "session_index.jsonl");
   const index = /* @__PURE__ */ new Map();
   try {
     const content = await readFile3(indexPath, "utf8");
@@ -948,7 +1048,7 @@ async function readCodexSessionIndex(env) {
   return index;
 }
 function readCodexThreadMetadata(env) {
-  const dbPath = join4(env.CODEX_HOME || join4(env.HOME || homedir3(), ".codex"), "state_5.sqlite");
+  const dbPath = join5(env.CODEX_HOME || join5(env.HOME || homedir3(), ".codex"), "state_5.sqlite");
   const metadata = /* @__PURE__ */ new Map();
   if (!existsSync4(dbPath)) return metadata;
   let db = null;
@@ -1009,9 +1109,9 @@ import { nanoid } from "nanoid";
 // src/providers/codex/sessionIndex.ts
 import { mkdir as mkdir3, readFile as readFile4, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
-import { dirname as dirname3, join as join5 } from "node:path";
+import { dirname as dirname3, join as join6 } from "node:path";
 function resolveCodexIndexPath(env = process.env) {
-  return join5(env.CODEX_HOME || join5(env.HOME || homedir4(), ".codex"), "session_index.jsonl");
+  return join6(env.CODEX_HOME || join6(env.HOME || homedir4(), ".codex"), "session_index.jsonl");
 }
 async function upsertCodexSessionIndexEntry(input, env = process.env) {
   const indexPath = resolveCodexIndexPath(env);
@@ -1057,9 +1157,9 @@ import Database2 from "better-sqlite3";
 import { existsSync as existsSync5 } from "node:fs";
 import { readFile as readFile5, writeFile as writeFile3 } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 function resolveCodexStateDbPath(env = process.env) {
-  return join6(env.CODEX_HOME || join6(env.HOME || homedir5(), ".codex"), "state_5.sqlite");
+  return join7(env.CODEX_HOME || join7(env.HOME || homedir5(), ".codex"), "state_5.sqlite");
 }
 async function syncCodexThreadForResume(input) {
   const env = input.env ?? process.env;
@@ -1741,7 +1841,7 @@ function normalizeSettings(input, defaultWorkspace) {
 // src/admin/fsBrowseRoutes.ts
 import { readdir as readdir4 } from "node:fs/promises";
 import { homedir as homedir7 } from "node:os";
-import { dirname as dirname4, join as join7, resolve } from "node:path";
+import { dirname as dirname4, join as join8, resolve } from "node:path";
 
 // src/shared/expandTilde.ts
 import { homedir as homedir6 } from "node:os";
@@ -1767,7 +1867,7 @@ function registerFsBrowseRoutes(input) {
       reply.code(400);
       return { error: "cannot_read_directory", path: target };
     }
-    const entries = dirents.filter((dirent) => dirent.isDirectory()).map((dirent) => ({ name: dirent.name, path: join7(target, dirent.name), isDirectory: true })).filter((entry) => !entry.name.startsWith(".") || isOnKeepChain(entry.path)).sort((a, b) => a.name.localeCompare(b.name));
+    const entries = dirents.filter((dirent) => dirent.isDirectory()).map((dirent) => ({ name: dirent.name, path: join8(target, dirent.name), isDirectory: true })).filter((entry) => !entry.name.startsWith(".") || isOnKeepChain(entry.path)).sort((a, b) => a.name.localeCompare(b.name));
     const parent = dirname4(target);
     const isRoot = parent === target;
     const listing = {
@@ -2048,7 +2148,7 @@ var WeixinDirectApiClient = class {
 
 // src/channels/weixin-direct/adapter.ts
 import { setTimeout as delay2 } from "node:timers/promises";
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 
 // src/channels/weixin-direct/typingController.ts
 var CONFIG_CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
@@ -2344,7 +2444,7 @@ var WeixinDirectAdapter = class _WeixinDirectAdapter {
         continue;
       }
       const { ext, mimeType } = mediaExtAndMime(meta);
-      const destPath = join8(mediaDir, `${idPrefix}_${i}${ext}`);
+      const destPath = join9(mediaDir, `${idPrefix}_${i}${ext}`);
       const maxBytes = meta.kind === "video" ? VIDEO_MAX_BYTES : void 0;
       const result = await downloader.download(meta.media ?? {}, { destPath, aeskeyOverride: meta.aeskey, maxBytes });
       if (result.ok) {
@@ -2875,79 +2975,6 @@ function stamp(item) {
 import { spawn as spawn3 } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 
-// src/shared/platform.ts
-import { access, constants } from "node:fs/promises";
-import { delimiter, join as join9 } from "node:path";
-import { tmpdir } from "node:os";
-import { spawn } from "node:child_process";
-var isWindows = process.platform === "win32";
-async function isExecutableFile(candidate) {
-  try {
-    await access(candidate, isWindows ? constants.F_OK : constants.X_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function executableExtensions() {
-  if (!isWindows) return [""];
-  const pathext = process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD";
-  return ["", ...pathext.split(";").filter(Boolean)];
-}
-function isTemporaryShim(candidate) {
-  const tempDir = tmpdir();
-  return candidate.startsWith(tempDir);
-}
-async function findExecutable(command, pathEnv) {
-  const extensions = executableExtensions();
-  if (command.includes("/") || command.includes("\\")) {
-    for (const ext of extensions) {
-      if (await isExecutableFile(command + ext)) return command + ext;
-    }
-    return void 0;
-  }
-  const dirs = (pathEnv ?? "").split(delimiter).filter(Boolean);
-  let fallback;
-  for (const dir of dirs) {
-    for (const ext of extensions) {
-      const candidate = join9(dir, command + ext);
-      if (await isExecutableFile(candidate)) {
-        if (isTemporaryShim(candidate)) {
-          fallback ??= candidate;
-          continue;
-        }
-        return candidate;
-      }
-    }
-  }
-  return fallback;
-}
-function terminateChild(child, signal = "SIGTERM") {
-  if (child.pid === void 0 || child.exitCode !== null || child.signalCode !== null) {
-    return;
-  }
-  if (isWindows) {
-    try {
-      spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
-      return;
-    } catch {
-    }
-  }
-  try {
-    child.kill(signal);
-  } catch {
-  }
-}
-function defaultWorkspaceDir() {
-  return join9(tmpdir(), "project");
-}
-function useShellForCli() {
-  return isWindows;
-}
-function statePath(filename) {
-  return join9(tmpdir(), filename);
-}
-
 // src/shared/loginShellEnv.ts
 import { spawnSync } from "node:child_process";
 import { delimiter as delimiter2 } from "node:path";
@@ -5608,9 +5635,11 @@ function createDaemonServer(options = {}) {
   const serverDir = dirname8(fileURLToPath3(import.meta.url));
   const mcpMediaServerTs = join13(serverDir, "..", "mcp", "mediaServer.ts");
   const mcpMediaServerJs = join13(serverDir, "..", "mcp", "mediaServer.js");
-  const useTs = existsSync10(mcpMediaServerTs) && !existsSync10(mcpMediaServerJs);
-  const mcpCommand = useTs ? "tsx" : "node";
-  const mcpArgs = [useTs ? mcpMediaServerTs : mcpMediaServerJs];
+  const { command: mcpCommand, args: mcpArgs } = buildMcpServerCommand({
+    tsEntry: mcpMediaServerTs,
+    jsEntry: mcpMediaServerJs,
+    exists: existsSync10
+  });
   writeFileSync2(mcpConfigPath, JSON.stringify({
     mcpServers: {
       "wechat-media": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-codex-wechat",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "private": false,
   "type": "module",
   "packageManager": "pnpm@11.5.0",