@ryantest/openclaw-qqbot 0.0.3 → 1.6.6-alpha.0

package/src/reply-dispatcher.ts

@@ -3,7 +3,7 @@ import type { ResolvedQQBotAccount } from "./types.js";
 import { getAccessToken, sendC2CMessage, sendChannelMessage, sendGroupMessage, clearTokenCache, sendC2CImageMessage, sendGroupImageMessage, sendC2CVoiceMessage, sendGroupVoiceMessage, sendC2CVideoMessage, sendGroupVideoMessage, sendC2CFileMessage, sendGroupFileMessage } from "./api.js";
 import { parseQQBotPayload, encodePayloadForCron, isCronReminderPayload, isMediaPayload, type MediaPayload } from "./utils/payload.js";
 import { resolveTTSConfig, textToSilk, formatDuration } from "./utils/audio-convert.js";
-import { checkFileSize, readFileAsync, fileExistsAsync, formatFileSize } from "./utils/file-utils.js";
+import { checkFileSize, readFileAsync, fileExistsAsync, formatFileSize, getMaxUploadSize } from "./utils/file-utils.js";
 import { getQQBotDataDir, normalizePath, sanitizeFileName } from "./utils/platform.js";
 
 export interface MessageTarget {
@@ -157,7 +157,7 @@ async function handleImagePayload(ctx: ReplyContext, payload: MediaPayload): Pro
         log?.error(`[qqbot:${account.accountId}] Image not found: ${imageUrl}`);
         return;
       }
-      const imgSzCheck = checkFileSize(imageUrl);
+      const imgSzCheck = checkFileSize(imageUrl, getMaxUploadSize(1)); // IMAGE = 1
       if (!imgSzCheck.ok) {
         log?.error(`[qqbot:${account.accountId}] Image size check failed: ${imgSzCheck.error}`);
         return;
@@ -259,7 +259,7 @@ async function handleVideoPayload(ctx: ReplyContext, payload: MediaPayload): Pro
           if (!(await fileExistsAsync(videoPath))) {
             throw new Error(`视频文件不存在: ${videoPath}`);
           }
-          const vPaySzCheck = checkFileSize(videoPath);
+          const vPaySzCheck = checkFileSize(videoPath, getMaxUploadSize(2)); // VIDEO = 2
           if (!vPaySzCheck.ok) {
             throw new Error(vPaySzCheck.error!);
           }
@@ -311,7 +311,7 @@ async function handleFilePayload(ctx: ReplyContext, payload: MediaPayload): Prom
           if (!(await fileExistsAsync(filePath))) {
             throw new Error(`文件不存在: ${filePath}`);
           }
-          const fPaySzCheck = checkFileSize(filePath);
+          const fPaySzCheck = checkFileSize(filePath, getMaxUploadSize(4)); // FILE = 4
           if (!fPaySzCheck.ok) {
             throw new Error(fPaySzCheck.error!);
           }

package/src/request-context.ts

@@ -0,0 +1,39 @@
+/**
+ * 请求级上下文（基于 AsyncLocalStorage）
+ *
+ * 解决并发消息下工具获取当前会话信息的竞态问题。
+ * gateway 在处理每条入站消息时通过 runWithRequestContext() 建立作用域，
+ * 作用域内的所有异步代码（包括 AI agent 调用、tool execute）
+ * 都能通过 getRequestContext() 安全地拿到当前请求的上下文。
+ */
+import { AsyncLocalStorage } from "node:async_hooks";
+
+export interface RequestContext {
+  /** 投递目标地址，如 qqbot:c2c:xxx 或 qqbot:group:xxx */
+  target: string;
+}
+
+const asyncLocalStorage = new AsyncLocalStorage<RequestContext>();
+
+/**
+ * 在请求级作用域中执行回调。
+ * 作用域内所有同步/异步代码都能通过 getRequestContext() 获取上下文。
+ */
+export function runWithRequestContext<T>(ctx: RequestContext, fn: () => T): T {
+  return asyncLocalStorage.run(ctx, fn);
+}
+
+/**
+ * 获取当前请求的上下文，不存在时返回 undefined。
+ */
+export function getRequestContext(): RequestContext | undefined {
+  return asyncLocalStorage.getStore();
+}
+
+/**
+ * 获取当前请求的投递目标地址。
+ * 便捷方法，等价于 getRequestContext()?.target。
+ */
+export function getRequestTarget(): string | undefined {
+  return asyncLocalStorage.getStore()?.target;
+}

package/src/slash-commands.ts

@@ -20,16 +20,10 @@ import { getUpdateInfo, checkVersionExists } from "./update-checker.js";
 import { getHomeDir, getQQBotDataDir, isWindows } from "./utils/platform.js";
 import { saveCredentialBackup } from "./credential-backup.js";
 import { fileURLToPath } from "node:url";
+import { getPackageVersion } from "./utils/pkg-version.js";
 const require = createRequire(import.meta.url);
 
-// 读取 package.json 中的版本号
-let PLUGIN_VERSION = "unknown";
-try {
-  const pkg = require("../package.json");
-  PLUGIN_VERSION = pkg.version ?? "unknown";
-} catch {
-  // fallback
-}
+let PLUGIN_VERSION = getPackageVersion(import.meta.url);
 
 // 获取 openclaw 框架版本（缓存结果，只执行一次）
 let _frameworkVersion: string | null = null;
@@ -333,9 +327,14 @@ registerCommand({
     `列出所有可用的 QQBot 插件内置指令及其简要说明。`,
     `使用 /指令名 ? 可查看某条指令的详细用法。`,
   ].join("\n"),
-  handler: () => {
+  handler: (ctx) => {
+    // 群聊场景排除仅限私聊的指令
+    const GROUP_EXCLUDED_COMMANDS = new Set(["bot-upgrade", "bot-clear-storage"]);
+    const isGroup = ctx.type === "group";
+
     const lines = [`### QQBot插件内置调试指令`, ``];
     for (const [name, cmd] of commands) {
+      if (isGroup && GROUP_EXCLUDED_COMMANDS.has(name)) continue;
       lines.push(`<qqbot-cmd-input text="/${name}" show="/${name}"/> ${cmd.description}`);
     }
     lines.push(``, `> 插件版本 v${PLUGIN_VERSION}`);
@@ -343,7 +342,7 @@ registerCommand({
   },
 });
 
-const DEFAULT_UPGRADE_URL = "https://doc.weixin.qq.com/doc/w3_AKEAGQaeACgCNHrh1CbHzTAKtT2gB?scode=AJEAIQdfAAozxFEnLZAKEAGQaeACg";
+const DEFAULT_UPGRADE_URL = "https://docs.qq.com/doc/DSGxOZk1oVnVKVkpq";
 
 function saveUpgradeGreetingTarget(accountId: string, appId: string, openid: string): void {
   const safeAccountId = accountId.replace(/[^a-zA-Z0-9._-]/g, "_");
@@ -666,6 +665,38 @@ function findPowerShell(): string | null {
   return null;
 }
 
+/**
+ * 将升级脚本复制到临时位置，避免升级过程中插件目录被清理后脚本丢失。
+ * 返回临时脚本路径，失败返回 null。
+ */
+function copyScriptToTemp(scriptPath: string): string | null {
+  try {
+    const ext = path.extname(scriptPath);
+    const tmpDir = path.join(getHomeDir(), ".openclaw", ".qqbot-upgrade-tmp");
+    fs.mkdirSync(tmpDir, { recursive: true });
+    const tmpScript = path.join(tmpDir, `upgrade-via-npm${ext}`);
+    fs.copyFileSync(scriptPath, tmpScript);
+    if (!isWindows()) {
+      fs.chmodSync(tmpScript, 0o755);
+    }
+    return tmpScript;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 清理临时升级脚本目录
+ */
+function cleanupTempScript(): void {
+  try {
+    const tmpDir = path.join(getHomeDir(), ".openclaw", ".qqbot-upgrade-tmp");
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  } catch {
+    // 非关键，静默忽略
+  }
+}
+
 /**
  * 执行热更新：执行脚本(--no-restart) → 立即触发 gateway restart
  *
@@ -675,10 +706,15 @@ function findPowerShell(): string | null {
  * - 新进程启动时 getStartupGreeting() 检测到版本变更，自动通知管理员
  *
  * Windows 使用 PowerShell 执行 .ps1 脚本，Mac/Linux 使用 bash 执行 .sh 脚本。
+ *
+ * 安全机制：脚本会被复制到临时目录再执行，避免升级过程中插件目录被操作导致脚本自身丢失。
  */
 function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
-  const scriptPath = getUpgradeScriptPath();
-  if (!scriptPath) return { ok: false, reason: "no-script" };
+  const originalScriptPath = getUpgradeScriptPath();
+  if (!originalScriptPath) return { ok: false, reason: "no-script" };
+
+  // 将脚本复制到临时位置，避免升级过程中脚本被删除
+  const scriptPath = copyScriptToTemp(originalScriptPath) || originalScriptPath;
 
   const cli = findCli();
   if (!cli) return { ok: false, reason: "no-cli" };
@@ -705,7 +741,7 @@ function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
     shellArgs = [scriptPath, "--no-restart", ...(targetVersion ? ["--version", targetVersion] : [])];
   }
 
-  console.log(`[qqbot] fireHotUpgrade: shell=${shell}, script=${scriptPath}, cli=${cli}, target=${targetVersion || "latest"}`);
+  console.log(`[qqbot] fireHotUpgrade: shell=${shell}, script=${scriptPath} (original: ${originalScriptPath}), cli=${cli}, target=${targetVersion || "latest"}`);
 
   // 异步执行升级脚本
   execFile(shell, shellArgs, {
@@ -717,6 +753,7 @@ function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
       console.error(`[qqbot] fireHotUpgrade: script failed: ${error.message}`);
       if (stdout) console.error(`[qqbot] fireHotUpgrade: stdout: ${stdout.slice(0, 2000)}`);
       if (_stderr) console.error(`[qqbot] fireHotUpgrade: stderr: ${_stderr.slice(0, 2000)}`);
+      cleanupTempScript();
       _upgrading = false;
       return;
     }
@@ -728,12 +765,16 @@ function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
     const newVersion = versionMatch?.[1];
     if (newVersion === "unknown") {
       console.error(`[qqbot] fireHotUpgrade: script output QQBOT_NEW_VERSION=unknown, aborting restart`);
+      cleanupTempScript();
       _upgrading = false;
       return;
     }
 
     console.log(`[qqbot] fireHotUpgrade: new version=${newVersion || "(not detected)"}, triggering restart...`);
 
+    // 脚本执行成功，清理临时脚本副本
+    cleanupTempScript();
+
     // 文件替换成功，在 restart 之前把 source 从 path 切换为 npm，
     // 确保新进程启动时读到的是 npm source，不会被本地源码覆盖。
     switchPluginSourceToNpm();
@@ -794,7 +835,11 @@ function fireHotUpgrade(targetVersion?: string): HotUpgradeStartResult {
 /**
  * /bot-upgrade — 统一升级入口
  *
- * 产品流程：
+ * upgradeMode 开关：
+ *   - "doc"（默认）：只展示升级指引文档，不执行热更新
+ *   - "hot-reload"：执行 npm 升级脚本进行热更新
+ *
+ * 热更新模式下的产品流程：
  *   /bot-upgrade              — 展示版本信息+确认按钮（不直接升级）
  *   /bot-upgrade --latest     — 确认升级到最新版本
  *   /bot-upgrade --version X  — 升级到指定版本
@@ -804,21 +849,54 @@ let _upgrading = false; // 升级锁
 
 registerCommand({
   name: "bot-upgrade",
-  description: "检查更新并自动热更",
+  description: "检查更新并查看升级指引",
   usage: [
-    `/bot-upgrade              检查是否有新版本（展示信息+确认按钮）`,
-    `/bot-upgrade --latest     确认升级到最新版本`,
-    `/bot-upgrade --version X  升级到指定版本（如 1.6.5）`,
-    `/bot-upgrade --force      强制重新安装当前版本`,
-    ``,
-    `⚠️ 仅在私聊中可用。升级过程约 30~60 秒，期间服务短暂不可用。`,
-    ``,
-    `环境要求：`,
-    `  - 操作系统：macOS / Linux / Windows`,
-    `  - OpenClaw 框架版本 ≥ ${UPGRADE_REQUIREMENTS.minFrameworkVersion}`,
-    `  - Node.js ≥ v${UPGRADE_REQUIREMENTS.minNodeVersion}`,
+    `/bot-upgrade              检查是否有新版本`,
+    `/bot-upgrade --latest     确认升级到最新版本（需 upgradeMode=hot-reload）`,
+    `/bot-upgrade --version X  升级到指定版本（需 upgradeMode=hot-reload）`,
+    `/bot-upgrade --force      强制重新安装当前版本（需 upgradeMode=hot-reload）`,
   ].join("\n"),
   handler: async (ctx) => {
+    const url = ctx.accountConfig?.upgradeUrl || DEFAULT_UPGRADE_URL;
+    const upgradeMode = ctx.accountConfig?.upgradeMode || "doc";
+    const args = ctx.args.trim();
+    const info = await getUpdateInfo();
+
+    const GITHUB_URL = "https://github.com/tencent-connect/openclaw-qqbot/";
+
+    // ── doc 模式（默认）：只展示升级指引，不执行热更新 ──
+    if (upgradeMode !== "hot-reload") {
+      if (info.checkedAt === 0) {
+        return `⏳ 版本检查中，请稍后再试`;
+      }
+      if (info.error) {
+        return [
+          `❌ 主机网络访问异常，无法检查更新`,
+          ``,
+          `查看升级指引：[点击查看](${url})`,
+        ].join("\n");
+      }
+      if (!info.hasUpdate) {
+        return [
+          `✅ 当前已是最新版本 v${PLUGIN_VERSION}`,
+          ``,
+          `项目地址：[GitHub](${GITHUB_URL})`,
+        ].join("\n");
+      }
+
+      return [
+        `🆕 发现新版本`,
+        ``,
+        `当前版本：**v${PLUGIN_VERSION}**`,
+        `最新版本：**v${info.latest}**`,
+        ``,
+        `📖 升级指引：[点击查看](${url})`,
+        `🌟 官方 GitHub 仓库：[点击前往](${GITHUB_URL})`,
+      ].join("\n");
+    }
+
+    // ── hot-reload 模式：执行热更新 ──
+
     // 升级相关指令仅在私聊中可用
     if (ctx.type !== "c2c") {
       return `💡 请在私聊中使用此指令`;
@@ -829,10 +907,6 @@ registerCommand({
       return `⏳ 正在升级中，请稍候...`;
     }
 
-    const url = ctx.accountConfig?.upgradeUrl || DEFAULT_UPGRADE_URL;
-    const args = ctx.args.trim();
-    const info = await getUpdateInfo();
-
     let isForce = false;
     let isLatest = false;
     let versionArg: string | undefined;
@@ -870,8 +944,6 @@ registerCommand({
       }
     }
 
-    const GITHUB_URL = "https://github.com/tencent-connect/openclaw-qqbot/";
-
     // ── 无参数（也没有 --latest / --version / --force）：只展示信息+确认按钮 ──
     if (!versionArg && !isLatest && !isForce) {
       if (info.checkedAt === 0) {
@@ -893,7 +965,7 @@ registerCommand({
         return lines.join("\n");
       }
 
-      // 有新版本：展示信息 + 确认按钮（同通道：alpha 只展示 alpha，正式版只展示正式版）
+      // 有新版本：展示信息 + 确认按钮
       return [
         `🆕 发现新版本`,
         ``,
@@ -1267,6 +1339,204 @@ registerCommand({
   },
 });
 
+// ============ /bot-clear-storage ============
+
+/**
+ * 扫描指定目录下的所有文件，递归统计。
+ * 返回按文件大小降序排列的文件列表。
+ */
+function scanDirectoryFiles(dirPath: string): { filePath: string; size: number }[] {
+  const files: { filePath: string; size: number }[] = [];
+  if (!fs.existsSync(dirPath)) return files;
+
+  const walk = (dir: string) => {
+    let entries: fs.Dirent[];
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(fullPath);
+      } else if (entry.isFile()) {
+        try {
+          const stat = fs.statSync(fullPath);
+          files.push({ filePath: fullPath, size: stat.size });
+        } catch {
+          // 跳过无法访问的文件
+        }
+      }
+    }
+  };
+
+  walk(dirPath);
+  // 按大小降序排列
+  files.sort((a, b) => b.size - a.size);
+  return files;
+}
+
+/** 格式化文件大小为人类可读形式 */
+function formatBytes(bytes: number): string {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+  return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)} GB`;
+}
+
+/**
+ * /bot-clear-storage — 清理通过 QQBot 对话产生的文件以及下载的资源
+ *
+ * 仅在私聊（c2c）中可用。
+ * --force 执行时删除整个 appId 目录下的所有文件（不区分用户 openid）。
+ *
+ * 产品流程：
+ *   /bot-clear-storage          — 扫描并列出当前 appId 下的文件，展示确认按钮
+ *   /bot-clear-storage --force   — 确认执行删除
+ */
+registerCommand({
+  name: "bot-clear-storage",
+  description: "清理通过QQBot对话产生的文件以及下载的资源（保存在 OpenClaw 运行环境的主机上）",
+  usage: [
+    `/bot-clear-storage`,
+    ``,
+    `扫描当前机器人产生的下载文件并列出明细。`,
+    `确认后执行删除，释放主机磁盘空间。`,
+    ``,
+    `/bot-clear-storage --force   确认执行清理`,
+    ``,
+    `⚠️ 仅在私聊中可用。`,
+  ].join("\n"),
+  handler: (ctx) => {
+    const { appId, type } = ctx;
+
+    // 仅私聊可用
+    if (type !== "c2c") {
+      return `💡 请在私聊中使用此指令`;
+    }
+
+    const isForce = ctx.args.trim() === "--force";
+
+    // 删除粒度为 appId 目录（不区分用户 openid）
+    // 路径: downloads/{appId}/
+    const targetDir = path.join(getHomeDir(), ".openclaw", "media", "qqbot", "downloads", appId);
+    const displayDir = `~/.openclaw/media/qqbot/downloads/${appId}`;
+
+    if (!isForce) {
+      // ── 第一步：扫描并展示文件列表 ──
+      const files = scanDirectoryFiles(targetDir);
+
+      if (files.length === 0) {
+        return [
+          `✅ 当前没有需要清理的文件`,
+          ``,
+          `目录 \`${displayDir}\` 为空或不存在。`,
+        ].join("\n");
+      }
+
+      const totalSize = files.reduce((sum, f) => sum + f.size, 0);
+      const MAX_DISPLAY = 10;
+
+      const lines: string[] = [
+        `即将清理 \`${displayDir}\` 目录下所有文件，总共 ${files.length} 个文件，占用磁盘存储空间 ${formatBytes(totalSize)}。`,
+        ``,
+        `目录文件概况：`,
+      ];
+
+      // 展示前 MAX_DISPLAY 个（按大小降序）
+      const displayFiles = files.slice(0, MAX_DISPLAY);
+      for (const f of displayFiles) {
+        const relativePath = path.relative(targetDir, f.filePath);
+        // 在 Windows 上统一用 / 分隔显示
+        const displayName = relativePath.replace(/\\/g, "/");
+        lines.push(`${displayName} (${formatBytes(f.size)})`, ``, ``);
+      }
+      if (files.length > MAX_DISPLAY) {
+        lines.push(`...[合计：${files.length} 个文件（${formatBytes(totalSize)}）]`, ``);
+      }
+
+      lines.push(
+        ``,
+        `---`,
+        ``,
+        `确认清理后，上述保存在 OpenClaw 运行主机磁盘上的文件将永久删除，后续对话过程中AI无法再找回相关文件。`,
+        `‼️ 点击指令确认删除`,
+        `<qqbot-cmd-enter text="/bot-clear-storage --force" />`,
+      );
+
+      return lines.join("\n");
+    }
+
+    // ── 第二步：--force 执行删除 ──
+    const files = scanDirectoryFiles(targetDir);
+
+    if (files.length === 0) {
+      return `✅ 目录已为空，无需清理`;
+    }
+
+    let deletedCount = 0;
+    let deletedSize = 0;
+    let failedCount = 0;
+
+    for (const f of files) {
+      try {
+        fs.unlinkSync(f.filePath);
+        deletedCount++;
+        deletedSize += f.size;
+      } catch {
+        failedCount++;
+      }
+    }
+
+    // 尝试清理空目录（递归删除空子目录）
+    try {
+      removeEmptyDirs(targetDir);
+    } catch {
+      // 非关键，静默忽略
+    }
+
+    if (failedCount === 0) {
+      return [
+        `✅ 清理成功`,
+        ``,
+        `已删除 ${deletedCount} 个文件，释放 ${formatBytes(deletedSize)} 磁盘空间。`,
+      ].join("\n");
+    }
+
+    return [
+      `⚠️ 部分清理完成`,
+      ``,
+      `已删除 ${deletedCount} 个文件（${formatBytes(deletedSize)}），${failedCount} 个文件删除失败。`,
+    ].join("\n");
+  },
+});
+
+/** 递归删除空目录（从叶子向上清理） */
+function removeEmptyDirs(dirPath: string): void {
+  if (!fs.existsSync(dirPath)) return;
+  let entries: fs.Dirent[];
+  try {
+    entries = fs.readdirSync(dirPath, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      removeEmptyDirs(path.join(dirPath, entry.name));
+    }
+  }
+  // 重新读取，如果目录已空则删除
+  try {
+    const remaining = fs.readdirSync(dirPath);
+    if (remaining.length === 0) {
+      fs.rmdirSync(dirPath);
+    }
+  } catch {
+    // 目录可能正在被使用，跳过
+  }
+}
+
 // ============ 匹配入口 ============
 
 /**

package/src/startup-greeting.ts

@@ -7,9 +7,20 @@ import path from "node:path";
 import { getQQBotDataDir } from "./utils/platform.js";
 import { getPluginVersion } from "./slash-commands.js";
 
-const STARTUP_MARKER_FILE = path.join(getQQBotDataDir("data"), "startup-marker.json");
 const STARTUP_GREETING_RETRY_COOLDOWN_MS = 10 * 60 * 1000;
 
+function safeName(id: string): string {
+  return id.replace(/[^a-zA-Z0-9._-]/g, "_");
+}
+
+/** 按 accountId+appId 区分的 marker 文件路径 */
+function getMarkerFile(accountId: string, appId: string): string {
+  return path.join(getQQBotDataDir("data"), `startup-marker-${safeName(accountId)}-${safeName(appId)}.json`);
+}
+
+/** 旧版全局 marker 路径（兼容迁移） */
+const LEGACY_MARKER_FILE = path.join(getQQBotDataDir("data"), "startup-marker.json");
+
 export function getFirstLaunchGreetingText(): string {
   return `Haha，我的'灵魂'已上线，随时等你吩咐。`;
 }
@@ -27,21 +38,32 @@ export type StartupMarkerData = {
   lastFailureVersion?: string;
 };
 
-export function readStartupMarker(): StartupMarkerData {
+export function readStartupMarker(accountId: string, appId: string): StartupMarkerData {
   try {
-    if (fs.existsSync(STARTUP_MARKER_FILE)) {
-      const data = JSON.parse(fs.readFileSync(STARTUP_MARKER_FILE, "utf8")) as StartupMarkerData;
+    // 1. 新版 per-bot 路径优先
+    const file = getMarkerFile(accountId, appId);
+    if (fs.existsSync(file)) {
+      const data = JSON.parse(fs.readFileSync(file, "utf8")) as StartupMarkerData;
       return data || {};
     }
+    // 2. fallback 旧版全局 marker（兼容迁移）
+    if (fs.existsSync(LEGACY_MARKER_FILE)) {
+      const data = JSON.parse(fs.readFileSync(LEGACY_MARKER_FILE, "utf8")) as StartupMarkerData;
+      if (data) {
+        // 自动迁移：写到新路径
+        writeStartupMarker(accountId, appId, data);
+        return data;
+      }
+    }
   } catch {
     // 文件损坏或不存在，视为无 marker
   }
   return {};
 }
 
-export function writeStartupMarker(data: StartupMarkerData): void {
+export function writeStartupMarker(accountId: string, appId: string, data: StartupMarkerData): void {
   try {
-    fs.writeFileSync(STARTUP_MARKER_FILE, JSON.stringify(data) + "\n");
+    fs.writeFileSync(getMarkerFile(accountId, appId), JSON.stringify(data) + "\n");
   } catch {
     // ignore
   }
@@ -54,9 +76,9 @@ export function writeStartupMarker(data: StartupMarkerData): void {
  * - 同版本 → 不发送
  * - 同版本近期失败 → 冷却期内不重试
  */
-export function getStartupGreetingPlan(): { shouldSend: boolean; greeting?: string; version: string; reason?: string } {
+export function getStartupGreetingPlan(accountId: string, appId: string): { shouldSend: boolean; greeting?: string; version: string; reason?: string } {
   const currentVersion = getPluginVersion();
-  const marker = readStartupMarker();
+  const marker = readStartupMarker(accountId, appId);
 
   if (marker.version === currentVersion) {
     return { shouldSend: false, version: currentVersion, reason: "same-version" };
@@ -77,19 +99,19 @@ export function getStartupGreetingPlan(): { shouldSend: boolean; greeting?: stri
   return { shouldSend: true, greeting, version: currentVersion };
 }
 
-export function markStartupGreetingSent(version: string): void {
-  writeStartupMarker({
+export function markStartupGreetingSent(accountId: string, appId: string, version: string): void {
+  writeStartupMarker(accountId, appId, {
     version,
     startedAt: new Date().toISOString(),
     greetedAt: new Date().toISOString(),
   });
 }
 
-export function markStartupGreetingFailed(version: string, reason: string): void {
-  const marker = readStartupMarker();
+export function markStartupGreetingFailed(accountId: string, appId: string, version: string, reason: string): void {
+  const marker = readStartupMarker(accountId, appId);
   // 同版本已有失败记录时，不覆盖 lastFailureAt，避免冷却期被无限续期
   const shouldPreserveTimestamp = marker.lastFailureVersion === version && marker.lastFailureAt;
-  writeStartupMarker({
+  writeStartupMarker(accountId, appId, {
     ...marker,
     lastFailureVersion: version,
     lastFailureAt: shouldPreserveTimestamp ? marker.lastFailureAt! : new Date().toISOString(),