hunter-mate 0.1.6 → 0.1.8

package/dist/commands/doctor.js

@@ -9,7 +9,7 @@ import { runInstall } from './install.js';
 import { runExtensionCheck } from './extension.js';
 import { checkNativeModules } from '../native-check.js';
 import { getCliLogger } from '../logger.js';
-import { getToken } from '../keychain.js';
+import { getToken, getTokenInfo } from '../keychain.js';
 const B = {
     reset: '\x1b[0m',
     bold: '\x1b[1m',
@@ -67,6 +67,27 @@ export async function runDoctor(opts) {
         status: nodeVersionFriendly ? 'ok' : 'warn',
         detail: `Node ${process.versions.node}${nodeVersionFriendly ? '' : ' (hunter-mate 预构建包对 Node 20/22/24 支持最好,Windows 无编译器时建议切到 Node 22 LTS)'}`,
     });
+    // ── 0.5) 死代理检测(Windows 现场:npm registry 查询失败 / prebuild 下载失败
+    //        回退 7 分钟源码编译的根因是 shell 残留指向死端口的代理变量) ──
+    try {
+        const { findDeadProxies, buildUnsetHint } = await import('../utils/proxy-detect.js');
+        const dead = await findDeadProxies(800);
+        if (dead.length) {
+            checks.push({ key: 'proxy_env', status: 'warn', detail: buildUnsetHint(dead) });
+            hints.push('清除死代理环境变量后重试(见 proxy_env 检查项的各 shell 指令)');
+        }
+        else {
+            const proxyEnv = (await import('../utils/proxy-detect.js')).collectProxyEnv();
+            checks.push({
+                key: 'proxy_env',
+                status: 'ok',
+                detail: proxyEnv.length
+                    ? `代理变量已设置且端口存活: ${proxyEnv.map((p) => `${p.varName}=${p.value}`).join(', ')}`
+                    : '未设置代理环境变量(直连)',
+            });
+        }
+    }
+    catch { /* 检测失败不阻断 doctor */ }
     // ── 1) 目录 & token ──
     let initResult = null;
     try {
@@ -160,9 +181,17 @@ export async function runDoctor(opts) {
     }
     else {
         try {
-            const r = await axios.get(`${config.serverUrl}/health`, { timeout: 3000 });
+            const r = await axios.get(`${config.serverUrl}/health`, { timeout: 3000, proxy: false });
             serverUp = true;
-            checks.push({ key: 'server', status: 'ok', detail: `${config.serverUrl} (HTTP ${r.status})` });
+            const hv = r.data || {};
+            checks.push({
+                key: 'server',
+                status: 'ok',
+                detail: `${config.serverUrl} (HTTP ${r.status}` +
+                    (hv.version ? `, server v${hv.version}` : '') +
+                    (hv.buildTime ? `, built ${hv.buildTime}` : '') +
+                    ')',
+            });
         }
         catch (e) {
             checks.push({ key: 'server', status: 'warn', detail: `${config.serverUrl} unreachable (${e.code || e.message})` });
@@ -227,7 +256,28 @@ export async function runDoctor(opts) {
         if (serverUp) {
             await runExtensionCheck(5000);
             extConnected = true;
-            checks.push({ key: 'extension_ws', status: 'ok', detail: '扩展已连接, WebSocket 通道就绪' });
+            // 证据化输出:列出已连接扩展实例(id/版本/连接时间)。
+            // 现场教训:doctor 报"已连"与任务执行时"未连"曾互相矛盾,
+            // 把时间戳摆出来用户才能判断报告是否过期(12:03 连过 ≠ 16:32 还连着)。
+            let detail = '扩展已连接, WebSocket 通道就绪';
+            try {
+                const r = await axios.get(`${config.serverUrl}/extensions`, { timeout: 3000, proxy: false });
+                const clients = (Array.isArray(r.data) ? r.data : []);
+                if (clients.length) {
+                    const brief = clients
+                        .map((c) => {
+                        const at = c.connectedAt ? new Date(c.connectedAt).toLocaleString() : '?';
+                        return `${c.extensionId ?? 'unknown'}@${c.version ?? '?'} (connectedAt ${at})`;
+                    })
+                        .join(', ');
+                    detail = `扩展已连接 (${clients.length} 实例): ${brief}`;
+                }
+                else {
+                    detail = '扩展已连接,但 /extensions 注册表为空(竞态,建议重跑 doctor 确认)';
+                }
+            }
+            catch { /* 证据获取失败不阻断结论 */ }
+            checks.push({ key: 'extension_ws', status: 'ok', detail });
         }
         else {
             checks.push({ key: 'extension_ws', status: 'skip', detail: 'server 未运行, 跳过扩展连通检查' });
@@ -256,19 +306,75 @@ export async function runDoctor(opts) {
             catch { }
         }
     }
-    // ── 5) 登录态(不强制) ──
+    // ── 5) 登录态(token 存在性 + 真实探测, fix #8) ──
+    // doctor/* 路由本身豁免认证,查 token 存在性会假阳性;
+    // 带 token 调受保护端点(/job-cases)才能确认登录真的有效。
     let loggedIn = false;
     try {
-        const { getToken } = await import('../keychain.js');
         const token = await getToken();
-        loggedIn = !!token;
-        checks.push({
-            key: 'auth',
-            status: token ? 'ok' : 'warn',
-            detail: token ? `已登录 (token head=${String(token).slice(0, 6)}...)` : '未登录, 数据面 API 可能受限',
-        });
-        if (!token)
+        if (!token) {
+            checks.push({
+                key: 'auth',
+                status: 'warn',
+                detail: '未登录, 数据面 API 可能受限',
+            });
             hints.push('hunter-mate login');
+        }
+        else if (!serverUp) {
+            const issuer = (await getTokenInfo())?.issuer ?? 'unknown';
+            // hmh#43: SaaS 签发的 token 存在性 ok 但 server 起来后必 401,不能笼统报"已登录"
+            if (issuer === 'saas') {
+                checks.push({
+                    key: 'auth',
+                    status: 'warn',
+                    detail: 'token 由 SaaS 签发(server 未运行,仅验证存在性);server 启动后数据面会 401,请重新登录',
+                });
+                hints.push('启动 server 后重新登录: hunter-mate login');
+            }
+            else {
+                loggedIn = true;
+                checks.push({
+                    key: 'auth',
+                    status: 'ok',
+                    detail: '已登录 (server 未运行, 仅验证 token 存在性)',
+                });
+            }
+        }
+        else {
+            try {
+                const r = await axios.get(`${config.serverUrl}/job-cases`, {
+                    timeout: 5000,
+                    proxy: false,
+                    headers: { Authorization: `UTOKEN ${token}` },
+                });
+                loggedIn = true;
+                checks.push({ key: 'auth', status: 'ok', detail: `已登录且 token 有效 (HTTP ${r.status})` });
+            }
+            catch (e) {
+                const status = e?.response?.status;
+                if (status === 401 || status === 403) {
+                    // 真实 fail: server 明确拒绝了这个 token
+                    const issuer = (await getTokenInfo())?.issuer ?? 'unknown';
+                    if (issuer === 'saas') {
+                        // hmh#43: 定向诊断,不再笼统报"登录已过期"
+                        checks.push({
+                            key: 'auth',
+                            status: 'fail',
+                            detail: `token 由 SaaS 签发,被本地 server 拒绝 (HTTP ${status});登录时本地 server 未运行`,
+                        });
+                        hints.push('保持 server 运行后重新登录: hunter-mate login');
+                    }
+                    else {
+                        checks.push({ key: 'auth', status: 'fail', detail: `token 已被 server 拒绝 (HTTP ${status}), 登录已过期或无权访问` });
+                        hints.push('重新登录: hunter-mate login');
+                    }
+                }
+                else {
+                    // 网络/其他原因: 标 warn,不误报 fail
+                    checks.push({ key: 'auth', status: 'warn', detail: `token 存在但探测失败(网络或服务异常): ${e.message}` });
+                }
+            }
+        }
     }
     catch (e) {
         checks.push({ key: 'auth', status: 'skip', detail: `跳过(keychain 读取失败): ${e.message}` });

package/dist/commands/extension.js

@@ -6,7 +6,7 @@ import * as path from 'path';
 import { loadConfig } from '../config.js';
 import { i18n } from '../i18n/index.js';
 import { showInstallGuide, runInstall } from './install.js';
-import { getCliLogger } from '../logger.js';
+import { printCommandError } from '../utils/command-error.js';
 const B = {
     reset: '\x1b[0m', bold: '\x1b[1m',
     green: '\x1b[32m', yellow: '\x1b[33m', red: '\x1b[31m', cyan: '\x1b[36m', magenta: '\x1b[35m',
@@ -21,13 +21,15 @@ function http(baseUrl) {
         headers: { 'Content-Type': 'application/json' },
     });
 }
-/** 带鉴权的 client(server /extensions* 端点要求 UTOKEN,与 job/record/search 等模块一致)。 */
-async function httpAuth(baseUrl) {
+/** 带鉴权的 client(server /extensions* 端点要求 UTOKEN,与 job/record/search 等模块一致)。
+ *  D4(R3 定案):timeoutMs 可传 —— axios 层默认 60s,server 侧 timeoutMs(-t)更大时
+ *  HTTP 层先弃,linkedin search 等多页编排(分钟级)走 CLI 必死;+15s 缓冲覆盖 server 处理+回传。 */
+async function httpAuth(baseUrl, timeoutMs) {
     const { getToken } = await import('../keychain.js');
     const token = await getToken();
     return axios.create({
         baseURL: baseUrl,
-        timeout: 60_000,
+        timeout: timeoutMs ?? 60_000,
         headers: {
             'Content-Type': 'application/json',
             ...(token ? { Authorization: `UTOKEN ${token}` } : {}),
@@ -37,9 +39,8 @@ async function httpAuth(baseUrl) {
 function requireServerUrl() {
     const config = loadConfig();
     if (!config.serverUrl) {
-        getCliLogger().error('extension:no-server-url', {
-            hint: '请先 hunter-mate config 设置 serverUrl',
-        });
+        // 同步上下文:手工构造的 Error 无 response.status,不会触发 issuer 诊断分支
+        void printCommandError('extension:no-server-url', new Error('请先 hunter-mate config 设置 serverUrl'));
         process.exit(1);
     }
     return config.serverUrl;
@@ -128,9 +129,7 @@ export function ensureEnvReady() {
             catch { /* ignore */ }
         }
         if (!serverUp) {
-            getCliLogger().error('extension:server-start-failed', {
-                hint: '请手动执行 hunter-mate start -f',
-            });
+            await printCommandError('extension:server-start-failed', new Error('请手动执行 hunter-mate start -f'));
             process.exit(1);
         }
         // 2) 检查扩展是否安装
@@ -145,9 +144,7 @@ export function ensureEnvReady() {
             const r = runInstall(init.extensionDir);
             if (!r.source) {
                 // 内置 dist 不存在, 无法自动安装
-                getCliLogger().error('extension:auto-install-failed', {
-                    hint: '请在 hunter-mate monorepo 执行 pnpm --filter @hunter-mate/extension build,或手动 hunter-mate install',
-                });
+                await printCommandError('extension:auto-install-failed', new Error('内置 extension dist 不存在,请在 hunter-mate monorepo 执行 pnpm --filter @hunter-mate/extension build,或手动 hunter-mate install'));
                 process.exit(1);
             }
             console.log(`${B.green}✓  扩展已自动安装到 ${r.target}${B.reset}`);
@@ -189,9 +186,7 @@ export function ensureEnvReady() {
         }
         catch {
             // /extensions 端点不可达
-            getCliLogger().error('extension:check-failed', {
-                hint: 'Server 可能未正确启动, 请执行 hunter-mate start -f',
-            });
+            await printCommandError('extension:check-failed', new Error('Server 可能未正确启动, 请执行 hunter-mate start -f'));
             process.exit(1);
         }
     })();
@@ -230,7 +225,6 @@ export async function runExtensionCheck(timeoutMs = 5000) {
                     }
                     registered = true;
                     ws.close();
-                    globalThis.__extensionCount = count;
                     resolve();
                 })
                     .catch((err) => {
@@ -256,8 +250,8 @@ async function withEnvCheck(fn) {
         await fn();
     }
     catch (err) {
+        await printCommandError('extension:exec-failed', err);
         const msg = err.response?.data?.message ?? err.response?.data?.error ?? err.message;
-        getCliLogger().error('extension:exec-failed', { error: msg });
         if (msg.includes('no Hunter Mate Chrome extension registered') || msg.includes('no Hunter Mate')) {
             const init = await import('./init.js').then((m) => m.runInit());
             showInstallGuide(init.extensionDir);
@@ -284,13 +278,11 @@ async function cmdControl(command, argsJson, opts) {
                 params = JSON.parse(argsJson);
             }
             catch {
-                getCliLogger().error('extension:invalid-control-args', {
-                    hint: 'args 必须是合法 JSON 字符串',
-                });
+                console.error('✗ extension:invalid-control-args: args 必须是合法 JSON 字符串');
                 process.exit(1);
             }
         }
-        const r = await (await httpAuth(serverUrl)).post('/extensions/control', {
+        const r = await (await httpAuth(serverUrl, opts.timeout ? Number(opts.timeout) + 15_000 : undefined)).post('/extensions/control', {
             command,
             params,
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
@@ -303,7 +295,7 @@ async function cmdControl(command, argsJson, opts) {
 async function cmdGoto(url, opts) {
     return withEnvCheck(async () => {
         const serverUrl = requireServerUrl();
-        const r = await (await httpAuth(serverUrl)).post('/extensions/goto', {
+        const r = await (await httpAuth(serverUrl, opts.timeout ? Number(opts.timeout) + 15_000 : undefined)).post('/extensions/goto', {
             url,
             waitUntil: opts.waitUntil,
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
@@ -316,10 +308,11 @@ async function cmdGoto(url, opts) {
 async function cmdEval(expression, opts) {
     return withEnvCheck(async () => {
         const serverUrl = requireServerUrl();
-        const r = await (await httpAuth(serverUrl)).post('/extensions/eval', {
+        const r = await (await httpAuth(serverUrl, opts.timeout ? Number(opts.timeout) + 15_000 : undefined)).post('/extensions/eval', {
             expression,
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
             extensionId: opts.extensionId,
+            sessionId: opts.sessionId ?? opts.taskId,
         });
         printResult(r.data, opts.format);
     });
@@ -327,7 +320,7 @@ async function cmdEval(expression, opts) {
 async function cmdScreenshot(opts) {
     return withEnvCheck(async () => {
         const serverUrl = requireServerUrl();
-        const r = await (await httpAuth(serverUrl)).post('/extensions/screenshot', {
+        const r = await (await httpAuth(serverUrl, opts.timeout ? Number(opts.timeout) + 15_000 : undefined)).post('/extensions/screenshot', {
             fullPage: opts.full ? true : undefined,
             selector: opts.selector,
             format: opts.imageFormat ?? 'png',
@@ -355,9 +348,7 @@ async function cmdRun(site, command, opts) {
                 params = JSON.parse(opts.args);
             }
             catch {
-                getCliLogger().error('extension:invalid-run-args', {
-                    hint: 'args 必须是合法 JSON 字符串',
-                });
+                console.error('✗ extension:invalid-run-args: args 必须是合法 JSON 字符串');
                 process.exit(1);
             }
         }
@@ -366,7 +357,7 @@ async function cmdRun(site, command, opts) {
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
             extensionId: opts.extensionId,
         };
-        const r = await (await httpAuth(serverUrl)).post(endpoint, payload);
+        const r = await (await httpAuth(serverUrl, opts.timeout ? Number(opts.timeout) + 15_000 : undefined)).post(endpoint, payload);
         printResult(r.data, opts.format);
     });
 }
@@ -387,11 +378,14 @@ extensionCommand
     .action(async () => {
     try {
         await ensureEnvReady();
-        const count = globalThis.__extensionCount ?? 0;
+        // fix #31: 用 /extensions 真实查询的计数, 不再读 globalThis.__extensionCount(可能是 stale 0)
+        const serverUrl = requireServerUrl();
+        const r = await (await httpAuth(serverUrl)).get('/extensions', { timeout: 5000 });
+        const count = Array.isArray(r.data) ? r.data.length : 0;
         console.log(`\n${B.green}✓  Hunter Mate 扩展已连接 (${count} 个浏览器实例)${B.reset}\n`);
     }
     catch (err) {
-        getCliLogger().error('extension:check-error', { error: err.message });
+        await printCommandError('extension:check-error', err);
         process.exit(1);
     }
 });
@@ -419,6 +413,6 @@ common(extensionCommand
     .action(async (opts) => cmdScreenshot(opts));
 common(extensionCommand
     .command('run <site> <command>')
-    .description('站点适配器命令 (对应 chromepilot run): linkedin search|extract|invite 或 resume extract'))
+    .description('站点适配器命令 (对应 chromepilot run): linkedin search|extract|invite、liepin search|extract 或 resume extract'))
     .option('--args <json>', '命令参数 JSON 字符串')
     .action(async (site, command, opts) => cmdRun(site, command, opts));

package/dist/commands/extras.d.ts

@@ -1,8 +1,27 @@
 import { Command } from 'commander';
 /**
- * 通知所有已连接扩展 reload（自愈主链路）:
- * 1) 优先 HTTP POST /system/broadcast-extension（返回明确 broadcast 计数和错误）
- * 2) Fallback: 直连 WS /ws 发 {type:'broadcast', payload:{type:'reload'}}（兼容旧 server 无 HTTP 端点）
+ * FID-092:扫描扩展目录最新 mtime,等待其静止——reload 广播前确认 dist 已写完。
+ * 背景:R5 实机 reload 后 3 秒 dist 仍在写入,Chrome 重读读到写了一半的
+ * service-worker.js → SW eval 崩溃 → 无 alarm 监听/无 offscreen/零重连,
+ * 所有自愈路径全部失效,只能人工点。Windows 兼容:纯 node fs,无 shell。
+ */
+export declare function waitForExtensionDirQuiet(dir: string, opts?: {
+    quietMs?: number;
+    maxWaitMs?: number;
+    pollMs?: number;
+}): Promise<{
+    quiet: boolean;
+    waitedMs: number;
+    newestMtimeMs: number;
+}>;
+/** FID-092:轮询 server 已连接扩展数(>=1 即判定 reload 后已回连)。 */
+export declare function extensionConnectedCount(serverUrl: string, timeoutMs?: number): Promise<number>;
+/**
+ * 通知所有已连接扩展 reload（自愈主链路）,FID-092 三段式:
+ * 1) dist 静止确认(防 reload 读到写一半的扩展文件)
+ * 2) 广播(broadcastReload):优先 HTTP POST /system/broadcast-extension;
+ *    旧 server 无该端点时退回直连 WS /ws 广播
+ * 3) 健康校验 + 自动重试(广播后 12s 内未回连 → 再广播,最多 3 次)
  */
 export declare function runReload(timeoutMs?: number): Promise<{
     broadcast: number;

package/dist/commands/extras.js

@@ -1,7 +1,7 @@
 import { Command } from 'commander';
 import WebSocket from 'ws';
 import * as readline from 'readline';
-import { loadConfig } from '../config.js';
+import { loadConfig, resolveDataDir } from '../config.js';
 import axios from 'axios';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -10,12 +10,114 @@ import { runStop, tryReadPid } from './server.js';
 import { i18n } from '../i18n/index.js';
 import { getCliLogger } from '../logger.js';
 /**
- * 通知所有已连接扩展 reload（自愈主链路）:
- * 1) 优先 HTTP POST /system/broadcast-extension（返回明确 broadcast 计数和错误）
- * 2) Fallback: 直连 WS /ws 发 {type:'broadcast', payload:{type:'reload'}}（兼容旧 server 无 HTTP 端点）
+ * FID-092:扫描扩展目录最新 mtime,等待其静止——reload 广播前确认 dist 已写完。
+ * 背景:R5 实机 reload 后 3 秒 dist 仍在写入,Chrome 重读读到写了一半的
+ * service-worker.js → SW eval 崩溃 → 无 alarm 监听/无 offscreen/零重连,
+ * 所有自愈路径全部失效,只能人工点。Windows 兼容:纯 node fs,无 shell。
+ */
+export async function waitForExtensionDirQuiet(dir, opts = {}) {
+    const quietMs = opts.quietMs ?? 2500;
+    const maxWaitMs = opts.maxWaitMs ?? 15000;
+    const pollMs = opts.pollMs ?? 400;
+    const start = Date.now();
+    const newestMtime = (d) => {
+        let latest = 0;
+        let entries;
+        try {
+            entries = fs.readdirSync(d, { withFileTypes: true });
+        }
+        catch {
+            return latest; // 目录不可读(未安装/权限)时不阻塞 reload
+        }
+        for (const e of entries) {
+            const full = path.join(d, e.name);
+            try {
+                if (e.isDirectory()) {
+                    latest = Math.max(latest, newestMtime(full));
+                }
+                else {
+                    latest = Math.max(latest, fs.statSync(full).mtimeMs);
+                }
+            }
+            catch {
+                /* 单个文件竞态删除,跳过 */
+            }
+        }
+        return latest;
+    };
+    let newest = newestMtime(dir);
+    while (newest > 0 && Date.now() - newest < quietMs && Date.now() - start < maxWaitMs) {
+        await new Promise((r) => setTimeout(r, pollMs));
+        newest = newestMtime(dir);
+    }
+    return { quiet: newest === 0 || Date.now() - newest >= quietMs, waitedMs: Date.now() - start, newestMtimeMs: newest };
+}
+/** FID-092:轮询 server 已连接扩展数(>=1 即判定 reload 后已回连)。 */
+export async function extensionConnectedCount(serverUrl, timeoutMs = 3000) {
+    try {
+        const r = await axios.get(`${serverUrl}/extensions`, { timeout: timeoutMs, proxy: false });
+        return Array.isArray(r.data) ? r.data.length : 0;
+    }
+    catch {
+        return -1; // server 不可达
+    }
+}
+/**
+ * 通知所有已连接扩展 reload（自愈主链路）,FID-092 三段式:
+ * 1) dist 静止确认(防 reload 读到写一半的扩展文件)
+ * 2) 广播(broadcastReload):优先 HTTP POST /system/broadcast-extension;
+ *    旧 server 无该端点时退回直连 WS /ws 广播
+ * 3) 健康校验 + 自动重试(广播后 12s 内未回连 → 再广播,最多 3 次)
  */
 export async function runReload(timeoutMs = 5000) {
     const config = loadConfig();
+    // FID-092 步骤 1:dist 静止确认(软链/目录均可,扫描真实路径)
+    let extDir;
+    try {
+        extDir = fs.realpathSync(path.join(resolveDataDir(), 'extension'));
+    }
+    catch {
+        extDir = path.join(resolveDataDir(), 'extension');
+    }
+    const q = await waitForExtensionDirQuiet(extDir);
+    const quietNote = q.waitedMs > 500 ? `(等待 dist 写入静止 ${q.waitedMs}ms) ` : '';
+    // FID-092 步骤 2+3:广播 → 校验回连 → 失败重试
+    const VERIFY_WINDOW_MS = 12000;
+    const MAX_ATTEMPTS = 3;
+    let last = await broadcastReload(config, timeoutMs);
+    if (last.broadcast <= 0) {
+        return { ...last, msg: `${quietNote}${last.msg}` };
+    }
+    const start = Date.now();
+    while (Date.now() - start < VERIFY_WINDOW_MS) {
+        await new Promise((r) => setTimeout(r, 1000));
+        const n = await extensionConnectedCount(config.serverUrl);
+        if (n > 0) {
+            return { ...last, msg: `${quietNote}${last.msg}；已校验扩展回连(connected=${n})。` };
+        }
+        if (n === -1)
+            break; // server 挂了,重试无意义
+    }
+    // 未回连:重试广播(第一次读到的可能是写了一半的文件,重读即恢复)
+    for (let attempt = 2; attempt <= MAX_ATTEMPTS; attempt++) {
+        await new Promise((r) => setTimeout(r, 1000));
+        last = await broadcastReload(config, timeoutMs);
+        if (last.broadcast <= 0)
+            break;
+        const deadline = Date.now() + VERIFY_WINDOW_MS;
+        while (Date.now() < deadline) {
+            await new Promise((r) => setTimeout(r, 1000));
+            if ((await extensionConnectedCount(config.serverUrl)) > 0) {
+                return { ...last, msg: `${quietNote}第 ${attempt} 次广播后已校验扩展回连。` };
+            }
+        }
+    }
+    return {
+        ...last,
+        msg: `${quietNote}${MAX_ATTEMPTS} 次广播后扩展仍未回连(server /extensions=0)——扩展可能处于错误态,请到 chrome://extensions 查看 HunterMate「错误」并点「重新加载」。`,
+    };
+}
+async function broadcastReload(config, timeoutMs = 5000) {
     // ---------- 1) HTTP 优先（POST /system/broadcast-extension） ----------
     try {
         const res = await axios.post(`${config.serverUrl}/system/broadcast-extension`, { payload: { type: 'reload' } }, { timeout: timeoutMs, proxy: false });
@@ -29,6 +131,13 @@ export async function runReload(timeoutMs = 5000) {
                 msg: `reload 广播已通过 HTTP 通道发送给 ${broadcast} 个扩展实例：200ms 后每个实例会自动调 chrome.runtime.reload()，Chrome 将重新读取磁盘上的扩展文件。`,
             };
         }
+        // FID-086 deferred reload: server 已挂起意图,扩展重连(≤30s)自动下发——断连态不失败、不静默
+        if (body.queued) {
+            return {
+                broadcast: 0,
+                msg: '扩展当前未连接,重载请求已挂起:扩展重连(通常 ≤30 秒,chrome.alarms 唤醒)后将自动重新加载。无需手动干预。',
+            };
+        }
         if (errors.length) {
             return {
                 broadcast: 0,
@@ -128,7 +237,7 @@ export const reloadCommand = new Command('reload')
         console.log(r.msg);
     }
     catch (e) {
-        getCliLogger().error('extras:reload-failed', { error: e.message });
+        console.error(`✗ extras:reload-failed: ${e.message}`);
         process.exit(1);
     }
 });
@@ -143,7 +252,7 @@ export const openExtCommand = new Command('open-extension-folder')
 // ---------------------------------------------------------------------------
 // purge — 彻底清理本地 hunter-mate 数据
 // ---------------------------------------------------------------------------
-const HM_ROOT = () => path.join(process.env.HUNTER_MATE_HOME || process.env.HOME || process.env.USERPROFILE || '.', '.hunter-mate');
+const HM_ROOT = resolveDataDir;
 /** 交互式二次确认 */
 function confirmPrompt(question) {
     return new Promise((resolve) => {
@@ -241,7 +350,7 @@ export async function runPurge(opts) {
     // 3) 停止 server（先于目录删除，避免 server 还在写日志导致删不干净）
     let serverStopResult = null;
     if (livePid || exists && fs.existsSync(path.join(root, 'server.pid'))) {
-        serverStopResult = runStop();
+        serverStopResult = await runStop();
     }
     // 4) 删除目录
     let removedFiles = info.files;

package/dist/commands/init.d.ts

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-/** 对应 ChromePilot init: 创建 ~/.hunter-mate 目录、SQLite、初始 token */
+/** 对应 ChromePilot init: 创建数据目录、SQLite、初始 token(目录位置随 dataDir 配置,FID-071) */
 export declare function runInit(force?: boolean): {
     dir: string;
     extensionDir: string;

package/dist/commands/init.js

@@ -1,12 +1,11 @@
 import { Command } from 'commander';
 import * as fs from 'fs';
 import * as path from 'path';
-import { ensureConfigDir, loadConfig, saveConfig } from '../config.js';
+import { ensureConfigDir, loadConfig, saveConfig, resolveDataDir } from '../config.js';
 import { getCliLogger } from '../logger.js';
-/** 对应 ChromePilot init: 创建 ~/.hunter-mate 目录、SQLite、初始 token */
+/** 对应 ChromePilot init: 创建数据目录、SQLite、初始 token(目录位置随 dataDir 配置,FID-071) */
 export function runInit(force = false) {
-    const HOME = process.env.HUNTER_MATE_HOME || process.env.HOME || process.env.USERPROFILE || '.';
-    const ROOT = path.join(HOME, '.hunter-mate');
+    const ROOT = resolveDataDir();
     const EXT_DIR = path.join(ROOT, 'extension');
     const DB_FILE = path.join(ROOT, 'hunter-mate.db');
     const SESSIONS_DIR = path.join(ROOT, 'sessions');

package/dist/commands/issue-env.d.ts

@@ -0,0 +1,23 @@
+import { Command } from 'commander';
+export interface IssueEnvGitInfo {
+    repoRoot: string;
+    head: string | null;
+    branch: string | null;
+    /** 最近一次提交(短 hash + 时间 + subject),与 issue 模板「代码 HEAD」行对应 */
+    lastCommit: string | null;
+    /** 有未提交改动 = dist 可能滞后于 HEAD,提 issue 必须注明 */
+    dirty: boolean;
+}
+export interface IssueEnvResult {
+    cliVersion: string;
+    /** dev = CLI 位于 git 工作区(软链/shim 到源码仓);package = 发布包安装 */
+    installType: 'dev' | 'package';
+    git: IssueEnvGitInfo | null;
+    /** server 未运行时为 null */
+    serverBuildTime: string | null;
+    os: string;
+    node: string;
+    dataDir: string;
+}
+export declare function runIssueEnv(): Promise<IssueEnvResult>;
+export declare const issueEnvCommand: Command;