@hirey/hi-mcp-server 0.1.12 → 0.1.13

package/README.md

@@ -86,6 +86,8 @@ npm install -g @hirey/hi-mcp-server
 }
 ```
 
+这里的 `HI_MCP_STATE_DIR` 必须直接指向 profile 对应的叶子目录；不要只写父目录 `/Users/you/.openclaw/hi-mcp`，否则虽然 `openclaw-main.json` 还能落盘，但 receiver config 和 doctor 会把它识别成非 canonical OpenClaw 布局。
+
 普通用户首次接入后的典型顺序：
 
 1. 用宿主把 `hi-mcp-server` 作为 `stdio` MCP server 挂上
@@ -124,11 +126,18 @@ npm install -g @hirey/hi-mcp-server
 - `HI_MCP_STATE_DIR`
   - 本地 state 目录。未显式指定时，默认落到稳定 home 目录：`~/.hirey/hi-mcp/<profile>`。
   - OpenClaw 普通用户建议显式固定到 canonical 目录，例如 `/Users/you/.openclaw/hi-mcp/openclaw-main`，方便后续 `hi-agent-receiver` 直接复用同一份身份 state。
+  - 不要把它设置成 bare parent dir `/Users/you/.openclaw/hi-mcp`；OpenClaw 场景下必须把 profile 叶子目录也包含进去。
 
 ### 本地 state
 
 state 会按 profile 落到 `HI_MCP_STATE_DIR/<profile>.json`。
 
+对 OpenClaw 而言，推荐的 canonical 形态就是：
+
+- `HI_MCP_PROFILE=openclaw-main`
+- `HI_MCP_STATE_DIR=/Users/you/.openclaw/hi-mcp/openclaw-main`
+- 最终 state file = `/Users/you/.openclaw/hi-mcp/openclaw-main/openclaw-main.json`
+
 文件内部明确分成两块：
 
 - `identity`

package/dist/server.js

@@ -11,7 +11,7 @@ import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/
 import { CallToolRequestSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { AGENT_GATEWAY_EVENT_TOPICS, normalizeAgentEndpointList, normalizeAgentInstallationDeliveryDeclaration, normalizeAgentSubscriptionList, normalizeText, } from '@hirey/hi-agent-contracts';
 import { createHiAgentClients, exchangeHiAgentClientCredentialsToken, HiAgentGatewayClient, HiAgentPlatformClient, } from '@hirey/hi-agent-sdk';
-import { readState, resolveCanonicalOpenClawStateDir, resolveDefaultStateDir, resolveLegacyStateFiles, resolveStateFile, updateState, normalizeStateProfile, } from './state.js';
+import { readState, resolveCanonicalOpenClawStateDir, resolveDefaultStateDir, resolveLegacyStateFiles, resolveStateFile, validateOpenClawStateDir, updateState, normalizeStateProfile, } from './state.js';
 import { looksLikeOpenClawSessionKey, validateOpenClawSessionKey, } from './openclaw-session-key.js';
 import { buildInstallReceiverCommandArgv, } from './receiver-command.js';
 import { applyReceiverRuntimeSnapshot, receiverConfigMaterialEquals, } from './receiver-config-material.js';
@@ -836,6 +836,7 @@ function buildDoctorSummary(args) {
         route_missing_policy: routeMissingPolicy,
         default_reply_route: defaultReplyRoute,
         default_reply_route_validation: args.defaultReplyRouteValidation,
+        openclaw_state_dir_validation: args.openClawStateDirValidation,
         delivery_probe: args.deliveryProbe,
         delivery_probe_diagnostics: args.deliveryProbeDiagnostics,
     };
@@ -1087,11 +1088,23 @@ async function handleDoctor(args) {
         reason: null,
         session_key: null,
     };
+    let openClawStateDirValidation = null;
     if (!state.identity) {
         blockers.push('missing_agent_identity');
     }
-    if (installState.host_kind === 'openclaw' && config.stateDir !== resolveCanonicalOpenClawStateDir(config.profile)) {
-        warnings.push('openclaw_state_dir_not_canonical');
+    if (installState.host_kind === 'openclaw') {
+        const validation = validateOpenClawStateDir(config.stateDir, config.profile);
+        openClawStateDirValidation = {
+            configured_state_dir: validation.configured_state_dir,
+            canonical_state_dir: validation.canonical_state_dir,
+            reason: validation.reason,
+        };
+        if (!validation.is_canonical) {
+            warnings.push('openclaw_state_dir_not_canonical');
+            if (validation.reason === 'missing_profile_leaf') {
+                warnings.push('openclaw_state_dir_missing_profile_leaf');
+            }
+        }
     }
     if (includeRemote && state.identity) {
         try {
@@ -1198,6 +1211,7 @@ async function handleDoctor(args) {
         deliveryProbe,
         deliveryProbeDiagnostics,
         defaultReplyRouteValidation,
+        openClawStateDirValidation,
     }));
 }
 async function handleInstall(args) {

package/dist/state.d.ts

@@ -40,6 +40,13 @@ export declare const DEFAULT_HI_MCP_PROFILE = "default";
 export declare function normalizeStateProfile(raw: unknown): string;
 export declare function resolveDefaultStateDir(profileRaw: unknown): string;
 export declare function resolveCanonicalOpenClawStateDir(profileRaw?: unknown): string;
+export type OpenClawStateDirValidation = {
+    configured_state_dir: string;
+    canonical_state_dir: string;
+    is_canonical: boolean;
+    reason: 'canonical' | 'missing_profile_leaf' | 'non_canonical';
+};
+export declare function validateOpenClawStateDir(stateDirRaw: unknown, profileRaw?: unknown): OpenClawStateDirValidation;
 export declare function resolveLegacyStateFiles(profileRaw: unknown): string[];
 export declare function buildDefaultState(profile: string): HiAgentPersistedState;
 export declare function resolveStateFile(args: {

package/dist/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../src/state.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,wBAAwB,EAAE,MAAM,CAAC;IACjC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,OAAO,EAAE;QACP,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;QACpC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAC;QACxC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;KACpC,CAAC;IACF,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACtC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACtC,OAAO,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAeF,eAAO,MAAM,sBAAsB,YAAY,CAAC;AAEhD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAE1D;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,CAIlE;AAED,wBAAgB,gCAAgC,CAAC,UAAU,GAAE,OAAyB,GAAG,MAAM,CAG9F;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,EAAE,CAMrE;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,qBAAqB,CAOxE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,UAG3E;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAoCjC;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,qBAAqB,CAAC;CAC9B,iBAIA;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,qBAAqB,CAAC;CACpE,kCASA"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../src/state.ts"],"names":[],"mappings":"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"}

package/dist/state.js

@@ -17,6 +17,10 @@ export const DEFAULT_HI_MCP_PROFILE = 'default';
 export function normalizeStateProfile(raw) {
     return String(raw || '').trim() || DEFAULT_HI_MCP_PROFILE;
 }
+function normalizeStateDirPath(raw) {
+    const text = typeof raw === 'string' ? String(raw).trim() : '';
+    return text ? path.resolve(text) : '';
+}
 export function resolveDefaultStateDir(profileRaw) {
     const profile = normalizeStateProfile(profileRaw);
     // 本地 installation state 必须落到稳定 home 目录，不能继续跟着 cwd 漂。
@@ -26,6 +30,34 @@ export function resolveCanonicalOpenClawStateDir(profileRaw = 'openclaw-main') {
     const profile = normalizeStateProfile(profileRaw);
     return path.join(os.homedir(), '.openclaw', 'hi-mcp', profile);
 }
+export function validateOpenClawStateDir(stateDirRaw, profileRaw = 'openclaw-main') {
+    const canonicalStateDir = resolveCanonicalOpenClawStateDir(profileRaw);
+    const configuredStateDir = normalizeStateDirPath(stateDirRaw) || canonicalStateDir;
+    if (configuredStateDir === canonicalStateDir) {
+        return {
+            configured_state_dir: configuredStateDir,
+            canonical_state_dir: canonicalStateDir,
+            is_canonical: true,
+            reason: 'canonical',
+        };
+    }
+    const bareOpenClawStateDir = path.join(os.homedir(), '.openclaw', 'hi-mcp');
+    if (configuredStateDir === bareOpenClawStateDir) {
+        // OpenClaw 的 canonical 布局要求 stateDir 自己就是 profile 叶子目录，不能只指向父目录。
+        return {
+            configured_state_dir: configuredStateDir,
+            canonical_state_dir: canonicalStateDir,
+            is_canonical: false,
+            reason: 'missing_profile_leaf',
+        };
+    }
+    return {
+        configured_state_dir: configuredStateDir,
+        canonical_state_dir: canonicalStateDir,
+        is_canonical: false,
+        reason: 'non_canonical',
+    };
+}
 export function resolveLegacyStateFiles(profileRaw) {
     const profile = normalizeStateProfile(profileRaw);
     return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirey/hi-mcp-server",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "private": false,
   "type": "module",
   "main": "dist/server.js",