hunter-mate 0.1.5 → 0.1.7

package/dist/commands/cache.js

@@ -4,6 +4,7 @@ import { loadConfig } from '../config.js';
 import { getToken } from '../keychain.js';
 import { ensureCacheDir, saveJobCase, saveCommunicationRecord, getDb } from '../cache/db.js';
 import { getCliLogger } from '../logger.js';
+import { printCommandError } from '../utils/command-error.js';
 export async function runCacheSync() {
     const config = loadConfig();
     const token = await getToken();
@@ -43,10 +44,8 @@ cacheCommand
     }
     catch (err) {
         // patchConsole 已统一转发,但 logger-kit 提供结构化字段,
-        // 业务错误统一走 getCliLogger().error
-        getCliLogger().error('cache:sync-failed', {
-            error: err.response?.data?.message || err.message,
-        });
+        // 业务错误统一走 getCliLogger().error;终端可见性由 printCommandError 保证
+        printCommandError('cache:sync-failed', err);
         process.exit(1);
     }
 });

package/dist/commands/config.d.ts

@@ -4,5 +4,10 @@ export interface ConfigOptions {
     watchFolder?: string;
     lang?: string;
 }
-export declare function runConfig(options: ConfigOptions): import("../config.js").HunterMateConfig;
+export declare function runConfig(options: ConfigOptions): {
+    serverUrl: string;
+    saasUrl: string;
+    lang: string;
+    watchFolder?: string;
+};
 export declare const configCommand: Command;

package/dist/commands/doctor.js

@@ -2,7 +2,7 @@ import { Command } from 'commander';
 import axios from 'axios';
 import * as fs from 'fs';
 import * as path from 'path';
-import { loadConfig } from '../config.js';
+import { loadConfig, saveConfig, normalizeConfig, CONFIG_FILE } from '../config.js';
 import { runInit } from './init.js';
 import { runStart } from './server.js';
 import { runInstall } from './install.js';
@@ -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 {
@@ -84,6 +105,31 @@ export async function runDoctor(opts) {
     }
     if (!initResult)
         initResult = runInit();
+    // ── 1.5) 配置 URL 兼容性(部署形态收敛自检:子路径 → 根路径等) ──
+    try {
+        if (fs.existsSync(CONFIG_FILE())) {
+            const rawCfg = JSON.parse(fs.readFileSync(CONFIG_FILE(), 'utf-8'));
+            const { changed, migrated } = normalizeConfig(rawCfg);
+            if (!changed) {
+                checks.push({ key: 'config_url_schema', status: 'ok', detail: '配置 URL 已为最新规范形态(无已知废弃路径前缀)' });
+            }
+            else {
+                const detail = migrated.map((m) => `${m.key}: ${m.from} → ${m.to}`).join('; ');
+                if (autoHeal) {
+                    saveConfig(rawCfg); // 写入规范化结果(内部也会 normalize)
+                    checks.push({ key: 'config_url_schema', status: 'ok', detail: `检测到已废弃路径并自动修复: ${detail}` });
+                    healed.push('normalize_config_urls');
+                }
+                else {
+                    checks.push({ key: 'config_url_schema', status: 'warn', detail: `配置含已废弃路径前缀: ${detail}` });
+                    hints.push('运行 hunter-mate doctor 自动修复');
+                }
+            }
+        }
+    }
+    catch (e) {
+        checks.push({ key: 'config_url_schema', status: 'skip', detail: `跳过(读取配置失败): ${e.message}` });
+    }
     // ── 2) 扩展安装检测 + 自动安装 ──
     const manifestPath = path.join(initResult.extensionDir, 'manifest.json');
     let extInstalled = fs.existsSync(manifestPath);
@@ -135,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})` });
@@ -202,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 未运行, 跳过扩展连通检查' });
@@ -231,19 +306,51 @@ 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) {
+            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
+                    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',
@@ -37,9 +37,7 @@ async function httpAuth(baseUrl) {
 function requireServerUrl() {
     const config = loadConfig();
     if (!config.serverUrl) {
-        getCliLogger().error('extension:no-server-url', {
-            hint: '请先 hunter-mate config 设置 serverUrl',
-        });
+        printCommandError('extension:no-server-url', new Error('请先 hunter-mate config 设置 serverUrl'));
         process.exit(1);
     }
     return config.serverUrl;
@@ -128,9 +126,7 @@ export function ensureEnvReady() {
             catch { /* ignore */ }
         }
         if (!serverUp) {
-            getCliLogger().error('extension:server-start-failed', {
-                hint: '请手动执行 hunter-mate start -f',
-            });
+            printCommandError('extension:server-start-failed', new Error('请手动执行 hunter-mate start -f'));
             process.exit(1);
         }
         // 2) 检查扩展是否安装
@@ -145,9 +141,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',
-                });
+                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 +183,7 @@ export function ensureEnvReady() {
         }
         catch {
             // /extensions 端点不可达
-            getCliLogger().error('extension:check-failed', {
-                hint: 'Server 可能未正确启动, 请执行 hunter-mate start -f',
-            });
+            printCommandError('extension:check-failed', new Error('Server 可能未正确启动, 请执行 hunter-mate start -f'));
             process.exit(1);
         }
     })();
@@ -230,7 +222,6 @@ export async function runExtensionCheck(timeoutMs = 5000) {
                     }
                     registered = true;
                     ws.close();
-                    globalThis.__extensionCount = count;
                     resolve();
                 })
                     .catch((err) => {
@@ -256,8 +247,8 @@ async function withEnvCheck(fn) {
         await fn();
     }
     catch (err) {
+        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,9 +275,7 @@ 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);
             }
         }
@@ -320,6 +309,7 @@ async function cmdEval(expression, opts) {
             expression,
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
             extensionId: opts.extensionId,
+            sessionId: opts.sessionId ?? opts.taskId,
         });
         printResult(r.data, opts.format);
     });
@@ -355,9 +345,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);
             }
         }
@@ -387,11 +375,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 });
+        printCommandError('extension:check-error', err);
         process.exit(1);
     }
 });

package/dist/commands/extras.js

@@ -128,7 +128,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);
     }
 });
@@ -241,7 +241,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/job.d.ts

@@ -5,5 +5,8 @@ export interface CreateJobCaseResult {
     status: string;
 }
 export declare function runJobCreate(folderPath: string): Promise<CreateJobCaseResult>;
-export declare function runJobList(): any[];
+/**
+ * 优先查 server 的 /job-cases;server 不可达或未登录时兜底本地 sqlite 缓存。
+ */
+export declare function runJobList(): Promise<any[]>;
 export declare const jobCommand: Command;

package/dist/commands/job.js

@@ -7,7 +7,23 @@ import { ensureCacheDir, saveJobCase, listJobCases } from '../cache/db.js';
 import { loadConfig } from '../config.js';
 import { getToken } from '../keychain.js';
 import { i18n } from '../i18n/index.js';
-import { getCliLogger } from '../logger.js';
+import { printCommandError } from '../utils/command-error.js';
+/** 递归收集目录下的 .md/.txt/.pdf(含 raw/jd/ 等子目录),键为相对路径(根目录文件不带前缀)。 */
+function collectJobFiles(dir, relPrefix = '', out = {}) {
+    const entries = fs.readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    // 根目录文件优先,再递归子目录,保证 keys[0] 是根目录第一个文件(用于 title)
+    for (const entry of entries) {
+        if (entry.isFile() && /\.(md|txt|pdf)$/.test(entry.name)) {
+            out[relPrefix + entry.name] = fs.readFileSync(path.join(dir, entry.name), 'utf-8');
+        }
+    }
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            collectJobFiles(path.join(dir, entry.name), relPrefix + entry.name + '/', out);
+        }
+    }
+    return out;
+}
 export async function runJobCreate(folderPath) {
     const config = loadConfig();
     const token = await getToken();
@@ -16,13 +32,14 @@ export async function runJobCreate(folderPath) {
     if (!fs.existsSync(resolved)) {
         throw new Error(`Folder not found: ${resolved}`);
     }
-    const files = fs.readdirSync(resolved).filter((f) => f.endsWith('.md') || f.endsWith('.txt') || f.endsWith('.pdf'));
-    const rawFiles = {};
-    for (const f of files) {
-        rawFiles[f] = fs.readFileSync(path.join(resolved, f), 'utf-8');
+    const rawFiles = collectJobFiles(resolved);
+    if (!Object.keys(rawFiles).length) {
+        throw new Error(`Folder 内未找到 .md/.txt/.pdf 文件: ${resolved}`);
     }
     const rawText = Object.values(rawFiles).join('\n---\n');
-    const title = Object.keys(rawFiles)[0]?.replace(/\.[^.]+$/, '') || 'Untitled JobCase';
+    const firstKey = Object.keys(rawFiles)[0];
+    const titleBase = firstKey.includes('/') ? firstKey.split('/').pop() : firstKey;
+    const title = titleBase.replace(/\.[^.]+$/, '') || 'Untitled JobCase';
     const res = await axios.post(`${config.serverUrl}/job-cases`, {
         externalId: uuidv4(),
         title,
@@ -36,7 +53,7 @@ export async function runJobCreate(folderPath) {
         externalId: serverCase.externalId,
         parsedFrom: {
             folderPath: resolved,
-            fileNames: files.join(','),
+            fileNames: Object.keys(rawFiles).join(','),
             rawText,
         },
         requirements: {},
@@ -47,8 +64,28 @@ export async function runJobCreate(folderPath) {
     saveJobCase(jobCase);
     return serverCase;
 }
-export function runJobList() {
-    return listJobCases();
+/**
+ * 优先查 server 的 /job-cases;server 不可达或未登录时兜底本地 sqlite 缓存。
+ */
+export async function runJobList() {
+    const config = loadConfig();
+    const token = await getToken().catch(() => undefined);
+    try {
+        const res = await axios.get(`${config.serverUrl}/job-cases`, {
+            headers: token ? { Authorization: `UTOKEN ${token}` } : {},
+            proxy: false,
+            timeout: 8000,
+        });
+        const list = Array.isArray(res.data) ? res.data : [];
+        // server 为空时兜底本地缓存(server 数据可能被清理)
+        return list.length ? list : listJobCases();
+    }
+    catch (err) {
+        if (err?.response?.status === 401 || err?.response?.status === 403) {
+            console.error('登录已过期或无权访问,请运行 hunter-mate login 后重试(本次展示本地缓存数据)');
+        }
+        return listJobCases();
+    }
 }
 export const jobCommand = new Command('job')
     .description(i18n.t('job.description'));
@@ -61,16 +98,14 @@ jobCommand
         console.log(`Created JobCase ${serverCase.id} (${serverCase.externalId})`);
     }
     catch (err) {
-        getCliLogger().error('job:create-failed', {
-            error: err.response?.data?.message || err.message,
-        });
+        printCommandError('job:create-failed', err);
         process.exit(1);
     }
 });
 jobCommand
     .command('list')
-    .description('List local JobCases')
-    .action(() => {
-    const cases = runJobList();
-    console.table(cases.map((c) => ({ id: c.id, folder: c.parsedFrom?.folderPath, status: c.status, createdAt: c.createdAt })));
+    .description('List JobCases (优先 server,失败兜底本地缓存)')
+    .action(async () => {
+    const cases = await runJobList();
+    console.table(cases.map((c) => ({ id: c.id, folder: c.parsedFrom?.folderPath ?? c.folderPath, status: c.status, createdAt: c.createdAt })));
 });

package/dist/commands/login.d.ts

@@ -1,3 +1,18 @@
 import { Command } from 'commander';
+export type EmailLoginSource = 'server' | 'saas';
+/**
+ * 邮箱登录第一步:发送验证码。
+ * 优先走本地 server(SaaS 代理模式,verify 后拿到的是本地自签 UTOKEN,
+ * 受保护路由立即可用);server 不可达时 fallback 直连 SaaS。
+ */
+export declare function sendEmailCode(email: string): Promise<EmailLoginSource>;
+/**
+ * 邮箱登录第二步:校验验证码并保存 token。
+ * 分支选择与 sendEmailCode 保持一致:server 在线走本地代理自签,否则直连 SaaS。
+ */
+export declare function verifyEmailCode(email: string, code: string): Promise<{
+    token: string;
+    source: EmailLoginSource;
+}>;
 export declare function runLogin(): Promise<string>;
 export declare const loginCommand: Command;

package/dist/commands/login.js

@@ -8,6 +8,51 @@ import { getCliLogger } from '../logger.js';
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+/** 探测本地 server 是否在线(参照 doctor 的 server 检测) */
+async function isLocalServerReachable(serverUrl) {
+    try {
+        await axios.get(`${serverUrl}/health`, { timeout: 2000, proxy: false });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 邮箱登录第一步:发送验证码。
+ * 优先走本地 server(SaaS 代理模式,verify 后拿到的是本地自签 UTOKEN,
+ * 受保护路由立即可用);server 不可达时 fallback 直连 SaaS。
+ */
+export async function sendEmailCode(email) {
+    const config = loadConfig();
+    if (await isLocalServerReachable(config.serverUrl)) {
+        await axios.post(`${config.serverUrl}/auth/email/send-code`, { email }, { proxy: false });
+        return 'server';
+    }
+    await axios.post(`${config.saasUrl}/hunter-mate/auth/email/send-code`, { email }, { proxy: false });
+    return 'saas';
+}
+/**
+ * 邮箱登录第二步:校验验证码并保存 token。
+ * 分支选择与 sendEmailCode 保持一致:server 在线走本地代理自签,否则直连 SaaS。
+ */
+export async function verifyEmailCode(email, code) {
+    const config = loadConfig();
+    if (await isLocalServerReachable(config.serverUrl)) {
+        const { data } = await axios.post(`${config.serverUrl}/auth/email/verify`, { email, code }, { proxy: false });
+        if (!data.access_token) {
+            throw new Error('verify returned no access_token');
+        }
+        await saveToken(data.access_token);
+        return { token: data.access_token, source: 'server' };
+    }
+    const { data } = await axios.post(`${config.saasUrl}/hunter-mate/auth/email/verify`, { email, code }, { proxy: false });
+    if (!data.access_token) {
+        throw new Error('verify returned no access_token');
+    }
+    await saveToken(data.access_token);
+    return { token: data.access_token, source: 'saas' };
+}
 export async function runLogin() {
     const config = loadConfig();
     const { data: deviceCode } = await axios.post(`${config.serverUrl}/auth/device-code`);
@@ -44,27 +89,27 @@ export const loginCommand = new Command('login')
     .option('--code <code>', 'Email verification code (6 digits, step 2)')
     .action(async (options) => {
     try {
-        const config = loadConfig();
-        // 邮箱验证码登录(两步式无状态;SaaS 服务端,不经本地 server)
+        // 邮箱验证码登录(两步式无状态):优先走本地 server(SaaS 代理,自签 UTOKEN),
+        // server 不在线时 fallback 直连 SaaS 并警告(FID-057 #8)
         if (options.email) {
             if (!options.code) {
                 // 第一步:发送验证码
-                await axios.post(`${config.saasUrl}/hunter-mate/auth/email/send-code`, {
-                    email: options.email,
-                });
-                getCliLogger().info('login:email-code-sent', { email: options.email });
+                const source = await sendEmailCode(options.email);
+                if (source === 'saas') {
+                    console.warn(i18n.t('login.serverOfflineSaasFallback'));
+                }
+                getCliLogger().info('login:email-code-sent', { email: options.email, source });
                 console.log(`${i18n.t('login.emailCodeSent')} ${options.email}`);
                 console.log(`  ${i18n.t('login.emailCodeNextStep')}`);
                 return;
             }
             // 第二步:校验验证码 → 保存 token
-            const { data } = await axios.post(`${config.saasUrl}/hunter-mate/auth/email/verify`, { email: options.email, code: options.code });
-            if (!data.access_token) {
-                getCliLogger().error('login:email-verify-no-token');
-                throw new Error('verify returned no access_token');
+            const { source } = await verifyEmailCode(options.email, options.code);
+            if (source === 'saas') {
+                console.warn(i18n.t('login.serverOfflineSaasFallback'));
+                console.warn(i18n.t('login.serverOfflineReloginHint'));
             }
-            await saveToken(data.access_token);
-            getCliLogger().info('login:token-saved', { method: 'email', email: options.email });
+            getCliLogger().info('login:token-saved', { method: 'email', email: options.email, source });
             console.log(i18n.t('login.success'));
             return;
         }

package/dist/commands/ops.js

@@ -91,7 +91,23 @@ withFormat(recordingsCommand.command('show <sessionId>').description('查看录
         printResult({ detail, parsed }, opts.format);
     }
     catch (e) {
-        getCliLogger().error('ops:recordings-show-failed', { error: e.message });
+        console.error(`✗ ops:recordings-show-failed: ${e.message}`);
+        process.exit(1);
+    }
+});
+// 手动触发保留期清理(FID-057 #17-B);server 另有每日定时清理
+recordingsCommand
+    .command('prune')
+    .description('按保留期清理录制事件与快照 (POST /api/recordings/prune)')
+    .option('--days <n>', '保留天数(默认取 server 的 RECORDING_RETENTION_DAYS,通常 30)')
+    .action(async (opts) => {
+    try {
+        const body = opts.days !== undefined ? { days: Number(opts.days) } : {};
+        const r = await http().post('/api/recordings/prune', body);
+        console.log(JSON.stringify(r.data, null, 2));
+    }
+    catch (e) {
+        console.error(`✗ ops:recordings-prune-failed: ${e.message}`);
         process.exit(1);
     }
 });
@@ -147,7 +163,7 @@ export const adapterCommand = withFormat(new Command('adapter')
         }
         catch (e) {
             const detail = e.response?.data?.message || e.message;
-            getCliLogger().error('ops:adapter-extract-failed', { error: detail });
+            console.error(`✗ ops:adapter-extract-failed: ${detail}`);
             process.exit(1);
         }
         return;

package/dist/commands/record.js

@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { loadConfig } from '../config.js';
 import { getToken } from '../keychain.js';
 import { ensureCacheDir } from '../cache/db.js';
-import { getCliLogger } from '../logger.js';
+import { printCommandError } from '../utils/command-error.js';
 export async function runRecordTranscript(filePath, options) {
     const config = loadConfig();
     const token = await getToken();
@@ -42,9 +42,7 @@ recordCommand
         console.log('请使用本地 LLM 对转写文本做 NER/摘要/实体链接后确认归档。');
     }
     catch (err) {
-        getCliLogger().error('record:upload-failed', {
-            error: err.response?.data?.message || err.message,
-        });
+        printCommandError('record:upload-failed', err);
         process.exit(1);
     }
 });

package/dist/commands/report.js

@@ -2,7 +2,7 @@ import { Command } from 'commander';
 import axios from 'axios';
 import { loadConfig } from '../config.js';
 import { getToken } from '../keychain.js';
-import { getCliLogger } from '../logger.js';
+import { printCommandError } from '../utils/command-error.js';
 export async function runReportSales(customerId, options) {
     const config = loadConfig();
     const token = await getToken();
@@ -42,9 +42,7 @@ reportCommand
         console.log('> 请使用本地 LLM 基于以上原始数据生成最终销售方案与交付节奏。');
     }
     catch (err) {
-        getCliLogger().error('report:generate-failed', {
-            error: err.response?.data?.message || err.message,
-        });
+        printCommandError('report:generate-failed', err);
         process.exit(1);
     }
 });