hunter-mate 0.1.6 → 0.1.8

package/dist/commands/ops.js

@@ -2,8 +2,9 @@ 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, resolveDataDir } from '../config.js';
 import { getCliLogger } from '../logger.js';
+import { printCommandError } from '../utils/command-error.js';
 // OpenCLI 风格的通用选项
 function withFormat(cmd) {
     return cmd.option('-f, --format <format>', '输出格式: table|json|yaml|md|csv', 'json');
@@ -76,8 +77,37 @@ withFormat(recordingsCommand.command('list').description('列出录制会话（
         printResult(r.data, opts.format);
     }
     catch (e) {
-        // server 暂未实现 recordings list 时给出空结果与提示，避免 crash
-        printResult({ note: '/api/recordings GET 未实现，HunterMate server 正在逐步补齐。先从 /api/recordings/:sessionId GET 查看单个。', sessions: [] }, opts.format);
+        // hmh#44: /api/recordings GET 早已实现,连接失败应如实报错,不再回退到假提示
+        await printCommandError('ops:recordings-list-failed', e);
+        process.exit(1);
+    }
+});
+/** hmh#44: 按会话删除录制数据(DELETE /api/recordings/:sessionId) */
+recordingsCommand
+    .command('delete <sessionId>')
+    .description('删除指定录制会话的事件与快照 (DELETE /api/recordings/:id)')
+    .action(async (sessionId) => {
+    try {
+        const r = await http().delete(`/api/recordings/${sessionId}`);
+        console.log(JSON.stringify(r.data, null, 2));
+    }
+    catch (e) {
+        await printCommandError('ops:recordings-delete-failed', e);
+        process.exit(1);
+    }
+});
+/** hmh#44: 手动 VACUUM 缩容,删除数据后让 SQLite 文件真实释放磁盘 */
+recordingsCommand
+    .command('compact')
+    .description('VACUUM 压缩录制库,释放已删除数据占用的磁盘 (POST /api/recordings/compact)')
+    .action(async () => {
+    try {
+        const r = await http().post('/api/recordings/compact', {});
+        console.log(JSON.stringify(r.data, null, 2));
+    }
+    catch (e) {
+        await printCommandError('ops:recordings-compact-failed', e);
+        process.exit(1);
     }
 });
 withFormat(recordingsCommand.command('show <sessionId>').description('查看录制详情 (/api/recordings/:id) + 可选 parse'))
@@ -91,7 +121,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);
     }
 });
@@ -99,11 +145,12 @@ withFormat(recordingsCommand.command('show <sessionId>').description('查看录
 // adapter (OpenCLI 风格)
 // ---------------------------------------------------------------------------
 export const adapterCommand = withFormat(new Command('adapter')
-    .description('站点适配器（对应 chromepilot adapter）: list | extract <url>')
-    .argument('[action]', '操作: list | extract', 'list')
+    .description('站点适配器（对应 chromepilot adapter）: list | extract <url> | sync')
+    .argument('[action]', '操作: list | extract | sync', 'list')
     .argument('[target]', 'list: 站点名过滤;extract: 页面 URL', '')
     .option('--tab <pageId>', 'extract: 指定目标 tab(page id;默认复用同站点 tab 或新建后台 tab,不抢焦点)')
-    .option('--settle-ms <n>', 'extract: 导航后首查等待 ms(默认 1200)', '1200')).action(async (action, target, opts) => {
+    .option('--settle-ms <n>', 'extract: 导航后首查等待 ms(默认 1200)', '1200')
+    .option('--dry-run', 'sync: 只统计差异不写库', false)).action(async (action, target, opts) => {
     if (action === 'list' || !action) {
         try {
             const r = await http().get('/adapters');
@@ -116,6 +163,7 @@ export const adapterCommand = withFormat(new Command('adapter')
             // server 暂未实现 /adapters 时退回内置清单
             printResult({ note: `GET /adapters failed (${e.message}),fallback 内置清单`, adapters: [
                     { platform: 'linkedin', host: 'linkedin.com', command: 'hm.linkedin.extract' },
+                    { platform: 'liepin', host: 'h.liepin.com', command: 'hm.liepin.extract' },
                 ] }, opts.format);
         }
         return;
@@ -147,12 +195,34 @@ 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;
+    }
+    if (action === 'sync') {
+        // hunter-mate-harness adapters/ overlay 同步 @fid FID-081-adapter-overlay-suite
+        // 路径优先级: env HUNTER_MATE_HARNESS_PATH > config.json harnessPath
+        const cfg = loadConfig();
+        const harnessPath = process.env.HUNTER_MATE_HARNESS_PATH || cfg?.harnessPath;
+        if (!harnessPath || !harnessPath.trim()) {
+            getCliLogger().error('ops:adapter-sync-missing-harness-path', {
+                hint: '先配置: hunter-mate config --harness-path <hunter-mate-harness 仓绝对路径>(或设 env HUNTER_MATE_HARNESS_PATH)',
+            });
+            process.exit(1);
+        }
+        try {
+            const r = await http().post('/adapters/sync', { harnessPath, dryRun: !!opts.dryRun });
+            printResult(r.data, opts.format);
+        }
+        catch (e) {
+            const detail = e.response?.data?.message || e.message;
+            console.error(`✗ ops:adapter-sync-failed: ${detail}`);
             process.exit(1);
         }
         return;
     }
-    printResult({ error: `unknown action: ${action}`, supported: ['list', 'extract'] }, opts.format);
+    printResult({ error: `unknown action: ${action}`, supported: ['list', 'extract', 'sync'] }, opts.format);
 });
 // ---------------------------------------------------------------------------
 // memory (站点记忆: 基于 selector/流程建议 的持久化 KV)
@@ -162,8 +232,7 @@ export const memoryCommand = withFormat(new Command('memory')
     .argument('[action]', '操作 (默认 list)', 'list')
     .argument('[site]', '站点名', '')
     .argument('[ref]', 'suggest/delete 的元素引用', '')).action((action, site, ref, opts) => {
-    const HOME = process.env.HUNTER_MATE_HOME || process.env.HOME || process.env.USERPROFILE || '.';
-    const STORE = path.join(HOME, '.hunter-mate', 'memory.json');
+    const STORE = path.join(resolveDataDir(), 'memory.json');
     let store = {};
     try {
         store = JSON.parse(fs.readFileSync(STORE, 'utf-8'));
@@ -288,8 +357,7 @@ export const traceCommand = withFormat(new Command('trace')
             }
             catch (e) {
                 // server 未就绪时: 本地追加 fallbacks 到 session JSONL 文件
-                const HOME = process.env.HUNTER_MATE_HOME || process.env.HOME || process.env.USERPROFILE || '.';
-                const f = path.join(HOME, '.hunter-mate', 'sessions', `${sessionId}.trace.jsonl`);
+                const f = path.join(resolveDataDir(), 'sessions', `${sessionId}.trace.jsonl`);
                 fs.appendFileSync(f, JSON.stringify({ type: opts.type, payload, ts: Date.now() }) + '\n');
                 printResult({ ok: true, stored: 'local', file: f }, opts.format);
             }
@@ -302,8 +370,7 @@ export const traceCommand = withFormat(new Command('trace')
             }
             printResult({ ok: true, sessionId, note: '本地 trace 文件删除（server 侧请通过 api/recordings/* 管理）' }, opts.format);
             try {
-                const HOME = process.env.HUNTER_MATE_HOME || process.env.HOME || process.env.USERPROFILE || '.';
-                const f = path.join(HOME, '.hunter-mate', 'sessions', `${sessionId}.trace.jsonl`);
+                const f = path.join(resolveDataDir(), 'sessions', `${sessionId}.trace.jsonl`);
                 if (fs.existsSync(f))
                     fs.unlinkSync(f);
             }

package/dist/commands/preference.d.ts

@@ -0,0 +1,6 @@
+import { Command } from 'commander';
+/**
+ * 三层偏好:scope=user(顾问本人)/ customer(用人单位)/ case(具体职位)。
+ * 查询 case 层时自动按 case → customer → user 逐层 merge,按 weight 降序。
+ */
+export declare const preferenceCommand: Command;

package/dist/commands/preference.js

@@ -0,0 +1,80 @@
+import { Command } from 'commander';
+import axios from 'axios';
+import { loadConfig } from '../config.js';
+import { getToken } from '../keychain.js';
+import { printCommandError } from '../utils/command-error.js';
+const SCOPES = ['user', 'customer', 'case'];
+async function authedHeaders() {
+    const token = await getToken().catch(() => undefined);
+    return token ? { Authorization: `UTOKEN ${token}` } : {};
+}
+/**
+ * 三层偏好:scope=user(顾问本人)/ customer(用人单位)/ case(具体职位)。
+ * 查询 case 层时自动按 case → customer → user 逐层 merge,按 weight 降序。
+ */
+export const preferenceCommand = new Command('preference').description('三层偏好沉淀(user/customer/case),用于人才推荐筛选');
+preferenceCommand
+    .command('set')
+    .requiredOption('--scope <scope>', `范围: ${SCOPES.join('|')}`)
+    .requiredOption('--id <scopeId>', '范围 id(user id / customer id / job case id)')
+    .requiredOption('--dimension <dim>', '维度,如 industry/comp_size/school_tier/reject_reason/must_have')
+    .requiredOption('--value <json>', '偏好值(JSON 字符串,如 \'"electronics"\' 或 \'{"min":5}\')')
+    .option('--weight <w>', '权重(默认 1)', parseFloat)
+    .option('--evidence <text>', '证据来源:哪次推荐/哪条反馈')
+    .option('--json', 'JSON 输出')
+    .action(async (opts) => {
+    try {
+        if (!SCOPES.includes(opts.scope)) {
+            throw new Error(`--scope 必须是: ${SCOPES.join('|')}`);
+        }
+        let value;
+        try {
+            value = JSON.parse(opts.value);
+        }
+        catch {
+            throw new Error(`--value 必须是合法 JSON 字符串: ${opts.value}`);
+        }
+        const config = loadConfig();
+        const res = await axios.put(`${config.serverUrl}/preferences`, {
+            scope: opts.scope,
+            scopeId: parseInt(opts.id, 10),
+            items: [{ dimension: opts.dimension, value, weight: opts.weight, evidence: opts.evidence }],
+        }, { headers: await authedHeaders(), proxy: false });
+        if (opts.json)
+            console.log(JSON.stringify(res.data, null, 2));
+        else
+            console.log(`✓ 偏好已写入 (${opts.scope}#${opts.id}, ${opts.dimension}=${opts.value})`);
+    }
+    catch (err) {
+        printCommandError('preference:set-failed', err);
+        process.exit(1);
+    }
+});
+preferenceCommand
+    .command('get')
+    .requiredOption('--scope <scope>', `范围: ${SCOPES.join('|')}`)
+    .requiredOption('--id <scopeId>', '范围 id')
+    .option('--customer-id <id>', 'scope=case 时传客户 id,一并带出 customer/user 两层')
+    .option('--json', 'JSON 输出(默认 JSON:三层 merge 结构)')
+    .action(async (opts) => {
+    try {
+        if (!SCOPES.includes(opts.scope)) {
+            throw new Error(`--scope 必须是: ${SCOPES.join('|')}`);
+        }
+        const config = loadConfig();
+        const res = await axios.get(`${config.serverUrl}/preferences`, {
+            params: {
+                scope: opts.scope,
+                scopeId: parseInt(opts.id, 10),
+                ...(opts.customerId ? { customerId: parseInt(opts.customerId, 10) } : {}),
+            },
+            headers: await authedHeaders(),
+            proxy: false,
+        });
+        console.log(JSON.stringify(res.data, null, 2));
+    }
+    catch (err) {
+        printCommandError('preference:get-failed', err);
+        process.exit(1);
+    }
+});

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,
-        });
+        await 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,
-        });
+        await printCommandError('report:generate-failed', err);
         process.exit(1);
     }
 });

package/dist/commands/search.js

@@ -3,6 +3,7 @@ import axios from 'axios';
 import { loadConfig } from '../config.js';
 import { getToken } from '../keychain.js';
 import { i18n } from '../i18n/index.js';
+import { printCommandError } from '../utils/command-error.js';
 export async function runSearch(options) {
     const config = loadConfig();
     const token = await getToken();
@@ -34,6 +35,12 @@ export const searchCommand = new Command('search')
     .option('--source <sources>', i18n.t('search.source'), 'u_person')
     .option('--top <n>', i18n.t('search.top'), '10')
     .action(async (options) => {
-    const data = await runSearch(options);
-    console.log(JSON.stringify(data, null, 2));
+    try {
+        const data = await runSearch(options);
+        console.log(JSON.stringify(data, null, 2));
+    }
+    catch (err) {
+        await printCommandError('search:failed', err);
+        process.exit(1);
+    }
 });

package/dist/commands/server.d.ts

@@ -1,4 +1,11 @@
 import { Command } from 'commander';
+/**
+ * server.log 无界增长曾达 800M+ 挤占用户磁盘(FID-068)。
+ * 后台 daemon 启动前按大小轮转:超过 HM_LOG_MAX_BYTES(默认 50MB)时
+ * server.log → server.log.1 → …保留最近 LOG_KEEP_FILES 份,最旧丢弃。
+ * 纯 fs 实现,Windows 兼容(rename 前先清目标,Windows 不允许覆盖已有文件)。
+ */
+export declare function rotateLogIfNeeded(logFile: string, maxBytes?: number, keep?: number): boolean;
 declare function tryReadPid(): number | null;
 export { tryReadPid };
 /** 定位 server 包根（dist 优先，ts-node 开发模式兜底）；找不到返回 null */
@@ -14,10 +21,10 @@ export declare function runStart(opts: {
     url: string;
     msg: string;
 }>;
-export declare function runStop(): {
+export declare function runStop(): Promise<{
     stopped: boolean;
     pid: number | null;
     msg: string;
-};
+}>;
 export declare const startCommand: Command;
 export declare const stopCommand: Command;

package/dist/commands/server.js

@@ -3,11 +3,12 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'child_process';
-import { loadConfig, saveConfig } from '../config.js';
+import { loadConfig, saveConfig, resolveDataDir } from '../config.js';
 import { killGracefullySync } from '../utils/proc.js';
 import { findBundledAssets } from '../bundled-assets.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const PID_FILE = () => path.join(process.env.HUNTER_MATE_HOME || process.env.HOME || process.env.USERPROFILE || '.', '.hunter-mate', 'server.pid');
+/** server.pid 等运行时文件随数据目录走(FID-071:dataDir 可配置后 server 状态文件一并迁移) */
+const PID_FILE = () => path.join(resolveDataDir(), 'server.pid');
 const LOG_FILE = () => PID_FILE().replace(/server\.pid$/, 'server.log');
 const WATCHDOG_PID_FILE = () => PID_FILE().replace(/server\.pid$/, 'watchdog.pid');
 function tryReadPidFile(file) {
@@ -29,6 +30,38 @@ function cleanPidFile(file) {
     }
     catch { /* ignore */ }
 }
+const LOG_MAX_BYTES = () => Number(process.env.HM_LOG_MAX_BYTES || 50 * 1024 * 1024);
+const LOG_KEEP_FILES = 3;
+/**
+ * server.log 无界增长曾达 800M+ 挤占用户磁盘(FID-068)。
+ * 后台 daemon 启动前按大小轮转:超过 HM_LOG_MAX_BYTES(默认 50MB)时
+ * server.log → server.log.1 → …保留最近 LOG_KEEP_FILES 份,最旧丢弃。
+ * 纯 fs 实现,Windows 兼容(rename 前先清目标,Windows 不允许覆盖已有文件)。
+ */
+export function rotateLogIfNeeded(logFile, maxBytes = LOG_MAX_BYTES(), keep = LOG_KEEP_FILES) {
+    try {
+        if (!fs.existsSync(logFile))
+            return false;
+        if (fs.statSync(logFile).size <= maxBytes)
+            return false;
+        for (let i = keep - 1; i >= 1; i--) {
+            const src = `${logFile}.${i}`;
+            const dest = `${logFile}.${i + 1}`;
+            if (!fs.existsSync(src))
+                continue;
+            try {
+                fs.unlinkSync(dest);
+            }
+            catch { /* dest 不存在时忽略 */ }
+            fs.renameSync(src, dest);
+        }
+        fs.renameSync(logFile, `${logFile}.1`);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function tryReadPid() {
     const pid = tryReadPidFile(PID_FILE());
     if (pid)
@@ -55,25 +88,50 @@ export function findServerRoot() {
     }
     return null;
 }
+/** 探活:server /health 是否可访问(短超时,永不 throw) */
+async function probeServerHealth(url, timeoutMs = 1500) {
+    try {
+        const res = await fetch(`${url}/health`, { signal: AbortSignal.timeout(timeoutMs) });
+        return res.ok;
+    }
+    catch {
+        return false;
+    }
+}
+/** 从 config.serverUrl 解析默认端口(与 runStart 逻辑一致) */
+function defaultPortFromConfig(serverUrl) {
+    return new URL(serverUrl).port ? Number(new URL(serverUrl).port) : 34570;
+}
 /** 对应 ChromePilot start: 启动本地 NestJS Server（提供 REST + WebSocket + SPA） */
 export async function runStart(opts) {
     const config = loadConfig();
-    const defaultPort = new URL(config.serverUrl).port
-        ? Number(new URL(config.serverUrl).port)
-        : 34570;
+    const defaultPort = defaultPortFromConfig(config.serverUrl);
     const port = opts.port ?? defaultPort;
     const host = opts.host ?? '127.0.0.1';
     const url = `http://${host}:${port}`;
+    // 启动过程中的告警说明(会拼进最终返回 msg,保证用户看得见)
+    const notes = [];
     const existing = tryReadPid();
     if (existing) {
-        // 已在运行: 先做版本一致性检测（磁盘版本 vs 运行版本，server 不一致则自动重启）
-        // 动态 import 避免与 version.ts 的循环依赖（version.ts 静态引入本文件的 runStart/runStop）
-        const { ensureRuntimeConsistency } = await import('../version.js');
-        const report = await ensureRuntimeConsistency({ force: true });
-        if (report.actions.serverRestart && report.performed.length) {
-            return { started: true, pid: null, url, msg: report.performed.join('; ') };
+        // pid 文件存在 ≠ server 存活。pid 可能被系统中其他进程复用
+        // (Windows 现场:残留 node.exe 复用了 pid → 误判 already running,
+        //  server 实际从未被拉起,日志停在旧时间戳,用户无任何感知)。
+        // 因此必须先 /health 探活再决定是否走"已在运行"分支。
+        if (await probeServerHealth(url)) {
+            // 已在运行: 先做版本一致性检测（磁盘版本 vs 运行版本，server 不一致则自动重启）
+            // 动态 import 避免与 version.ts 的循环依赖（version.ts 静态引入本文件的 runStart/runStop）
+            const { ensureRuntimeConsistency } = await import('../version.js');
+            const report = await ensureRuntimeConsistency({ force: true });
+            if (report.actions.serverRestart && report.performed.length) {
+                return { started: true, pid: null, url, msg: report.performed.join('; ') };
+            }
+            return { started: false, pid: existing, url, msg: `server already running (pid=${existing})` };
         }
-        return { started: false, pid: existing, url, msg: `server already running (pid=${existing})` };
+        // stale pid:进程号存活但不是我们的 server(或 server 已僵死)。清理后继续启动,
+        // 不 kill —— 那个进程可能属于别的程序(误杀 foreign 进程红线)。
+        notes.push(`⚠ 检测到 stale server.pid (pid=${existing}):该进程存活但 ${url}/health 无响应,` +
+            `疑似 pid 被其他进程复用,已忽略并继续启动`);
+        cleanPidFile(PID_FILE());
     }
     // server 入口: bundled 模式下 <cli>/dist/assets/server/main.js；monorepo 下 packages/server/dist/main.js 或 src/main.ts(开发模式 ts-node)
     const serverRoot = findServerRoot();
@@ -106,6 +164,8 @@ export async function runStart(opts) {
         ...process.env,
         PORT: String(port),
         HOST: host,
+        // FID-071: server 所有数据落点(db/备份/runtime.json/artifacts)由 CLI 的数据目录决定
+        HM_DATA_DIR: resolveDataDir(),
     };
     const nodeArgs = [];
     if (entry.endsWith('.ts')) {
@@ -123,6 +183,8 @@ export async function runStart(opts) {
     const logDir = path.dirname(LOG_FILE());
     if (!fs.existsSync(logDir))
         fs.mkdirSync(logDir, { recursive: true });
+    // 后台 daemon 启动前轮转 server.log(超 50MB 保留 3 份),防止无界增长挤占磁盘
+    rotateLogIfNeeded(LOG_FILE());
     // 后台模式由独立 watchdog 进程托管 server,实现崩溃后自动重启
     const watchdogEntry = path.resolve(__dirname, '../watchdog.js');
     if (!fs.existsSync(watchdogEntry)) {
@@ -138,6 +200,7 @@ export async function runStart(opts) {
         HM_SERVER_ENTRY: entry,
         HM_SERVER_LOG: LOG_FILE(),
         HM_SERVER_NODE_ARGS: nodeArgs.join(','),
+        HM_DATA_DIR: resolveDataDir(),
         PORT: String(port),
         HOST: host,
     };
@@ -150,8 +213,11 @@ export async function runStart(opts) {
     wd.unref();
     if (wd.pid)
         fs.writeFileSync(WATCHDOG_PID_FILE(), String(wd.pid));
-    // 等待 server health 就绪(最多 8s)
-    const deadline = Date.now() + 8000;
+    // 等待 server health 就绪。窗口给足:NestJS 全量路由映射 + TypeORM schema 同步
+    // 在慢机/Windows 上实测 10-15s,原 8s 会在 route mapping 阶段误报"未就绪"
+    // (server 实际 3 秒后就绪,watchdog 会保活,误报只会误导用户)。
+    const probeDeadlineMs = 30_000;
+    const deadline = Date.now() + probeDeadlineMs;
     let ready = false;
     while (Date.now() < deadline) {
         await new Promise((r) => setTimeout(r, 500));
@@ -179,7 +245,8 @@ export async function runStart(opts) {
             started: false,
             pid: wd.pid ?? null,
             url,
-            msg: `✗ server watchdog 启动后未就绪(pid=${wd.pid}),日志尾部:\n${tail || '(server.log 为空)'}\n` +
+            msg: (notes.length ? notes.join('\n') + '\n' : '') +
+                `✗ server watchdog 启动后 ${probeDeadlineMs / 1000}s 内未就绪(pid=${wd.pid}),日志尾部:\n${tail || '(server.log 为空)'}\n` +
                 `排障: hunter-mate doctor 或 TROUBLESHOOTING.md#server-启动即崩abi`,
         };
     }
@@ -193,12 +260,34 @@ export async function runStart(opts) {
         }
     }
     catch { /* ignore */ }
-    return { started: true, pid: wd.pid ?? null, url, msg: `server watchdog started (pid=${wd.pid}) on ${url} — logs: ${LOG_FILE()}` };
+    return {
+        started: true,
+        pid: wd.pid ?? null,
+        url,
+        msg: (notes.length ? notes.join('\n') + '\n' : '') +
+            `server watchdog started (pid=${wd.pid}) on ${url} — logs: ${LOG_FILE()}`,
+    };
 }
-export function runStop() {
+export async function runStop() {
+    const config = loadConfig();
+    const url = `http://127.0.0.1:${defaultPortFromConfig(config.serverUrl)}`;
+    // kill 任何进程前先 /health 确认它真的是我们的 server。
+    // pid 文件可能被复用(Windows 现场:残留 node.exe 占用 pid),误杀 foreign 进程不可接受。
+    const healthy = await probeServerHealth(url);
     // 优先停止 watchdog,让它去停止子 server
     const wdPid = tryReadPidFile(WATCHDOG_PID_FILE());
     if (wdPid) {
+        if (!healthy) {
+            // server 不响应时不杀 watchdog pid(可能已被其他进程复用),只清理 pid 文件
+            cleanPidFile(WATCHDOG_PID_FILE());
+            cleanPidFile(PID_FILE());
+            return {
+                stopped: false,
+                pid: wdPid,
+                msg: `✗ server 无响应(${url}/health 不可达),watchdog pid=${wdPid} 未杀(疑似 stale pid,` +
+                    `可能已被其他进程复用)。已清理 pid 文件;如确有残留进程请手工确认后 kill`,
+            };
+        }
         const ok = killGracefullySync(wdPid);
         cleanPidFile(WATCHDOG_PID_FILE());
         if (ok) {
@@ -218,6 +307,16 @@ export function runStop() {
     const pid = tryReadPid();
     if (!pid)
         return { stopped: false, pid: null, msg: 'no server.pid found or process dead' };
+    if (!healthy) {
+        // pid 存活但 server 不响应:不 kill(可能复用了别人的 pid),只清 pid 文件
+        cleanPidFile(PID_FILE());
+        return {
+            stopped: false,
+            pid,
+            msg: `✗ pid=${pid} 存活但 server 无响应,未发送 kill 信号(疑似 stale pid,` +
+                `可能属于其他进程)。已清理 pid 文件;如确认是僵死 server 请手工 kill`,
+        };
+    }
     const ok = killGracefullySync(pid);
     if (!ok) {
         return { stopped: false, pid, msg: `failed to signal ${pid}` };
@@ -238,8 +337,8 @@ export const startCommand = new Command('start')
 });
 export const stopCommand = new Command('stop')
     .description('停止本地 server（读 ~/.hunter-mate/server.pid 并 SIGTERM）')
-    .action(() => {
-    const r = runStop();
+    .action(async () => {
+    const r = await runStop();
     console.log(r.msg);
     if (!r.stopped && r.pid)
         process.exit(1);

package/dist/commands/status.d.ts

@@ -1,8 +1,11 @@
 import { Command } from 'commander';
+import { TokenIssuer } from '../keychain.js';
 import { InstalledVersions, SystemVersions } from '@hunter-mate/shared';
 export interface StatusResult {
     version: string;
     loggedIn: boolean;
+    /** token 签发方(hmh#43):saas 签发的 token 会被本地 server 拒绝 */
+    tokenIssuer?: TokenIssuer;
     server: 'running' | 'not running' | 'unknown';
     serverUrl: string;
     extensionCount: number;
@@ -15,6 +18,7 @@ export interface StatusResult {
     }>;
     installed?: InstalledVersions;
     live?: SystemVersions | null;
+    dataDir: string;
 }
 export declare function runStatus(): Promise<StatusResult>;
 export declare const statusCommand: Command;

package/dist/commands/status.js

@@ -1,13 +1,14 @@
 import { Command } from 'commander';
 import axios from 'axios';
 import { i18n } from '../i18n/index.js';
-import { loadConfig } from '../config.js';
-import { getToken } from '../keychain.js';
+import { loadConfig, resolveDataDir } from '../config.js';
+import { getTokenInfo } from '../keychain.js';
 import { readInstalledVersions, fetchLiveVersions } from '../version.js';
 import { getCliLogger } from '../logger.js';
 export async function runStatus() {
     const config = loadConfig();
-    const token = await getToken();
+    const tokenInfo = await getTokenInfo();
+    const token = tokenInfo?.token ?? null;
     let serverStatus = 'unknown';
     let extensions = [];
     let live = null;
@@ -28,15 +29,18 @@ export async function runStatus() {
         serverStatus = 'not running';
         getCliLogger().warn('status:server-not-running', { serverUrl: config.serverUrl });
     }
+    const installed = readInstalledVersions();
     return {
-        version: '0.1.0',
+        version: installed.cli ?? '0.0.0',
         loggedIn: !!token,
+        tokenIssuer: tokenInfo?.issuer,
         server: serverStatus,
         serverUrl: config.serverUrl,
         extensionCount: extensions.length,
         extensions,
-        installed: readInstalledVersions(),
+        installed,
         live,
+        dataDir: resolveDataDir(),
     };
 }
 export const statusCommand = new Command('status')
@@ -49,8 +53,14 @@ export const statusCommand = new Command('status')
         return;
     }
     console.log(`${i18n.t('status.cli')}: ${status.version}`);
-    console.log(`${i18n.t('status.loggedIn')}: ${status.loggedIn ? 'yes' : 'no'}`);
+    const loggedInText = status.loggedIn
+        ? status.tokenIssuer === 'saas'
+            ? 'yes (SaaS 签发 — 本地 server 会拒绝,启动 server 后请重新登录)'
+            : 'yes'
+        : 'no';
+    console.log(`${i18n.t('status.loggedIn')}: ${loggedInText}`);
     console.log(`${i18n.t('status.server')}: ${status.server} (${status.serverUrl})`);
+    console.log(`dataDir: ${status.dataDir}`);
     // 版本一致性: 磁盘(期望) vs 运行中
     if (status.installed) {
         const inst = status.installed;