@zhihand/mcp 0.32.3 → 0.32.4

package/bin/zhihand

@@ -30,7 +30,7 @@ import { fetchUserCredentials } from "../dist/core/ws.js";
 import { configureMCP, displayName } from "../dist/cli/mcp-config.js";
 
 const DEFAULT_ENDPOINT = "https://api.zhihand.com";
-const VERSION = "0.32.3";
+const VERSION = "0.32.4";
 
 const CLI_TOOL_MAP = {
   claude: "claudecode",

package/dist/cli/mcp-config.js

@@ -59,10 +59,11 @@ export function configureMCP(backend, previousBackend) {
     }
     else {
         const cmds = MCP_COMMANDS[backend];
-        const addCmd = cmds.add();
         console.log(`  Configuring MCP for ${DISPLAY_NAMES[backend]} (HTTP transport)...`);
+        // Remove existing entry first to avoid "already exists" error on re-pair
+        tryRun(cmds.remove());
         try {
-            execSync(addCmd, { stdio: "inherit", timeout: 10_000 });
+            execSync(cmds.add(), { stdio: "inherit", timeout: 10_000 });
             configured = true;
         }
         catch (err) {

package/dist/core/config.d.ts

@@ -43,6 +43,11 @@ export declare function loadConfig(): ZhihandConfigV3;
  * when the daemon and CLI write concurrently (Gemini code review v0.31).
  */
 export declare function saveConfig(cfg: ZhihandConfigV3): void;
+/**
+ * Clean up legacy config files (v2 schema, credentials.json) before re-pairing.
+ * Replaces old config with empty v3 so loadConfig() won't warn.
+ */
+export declare function cleanupLegacyConfig(): void;
 export declare function addUser(user: UserRecord): void;
 export declare function removeUser(userId: string): void;
 export declare function addDeviceToUser(userId: string, device: DeviceRecord): void;

package/dist/core/config.js

@@ -27,11 +27,11 @@ function emptyConfig() {
 }
 export function loadConfig() {
     if (!fs.existsSync(CONFIG_PATH)) {
-        // Check for v2 or legacy credentials
+        // Check for legacy credentials.json (pre-v3)
         const legacyCredentials = path.join(ZHIHAND_DIR, "credentials.json");
-        if (!legacyWarningPrinted && (fs.existsSync(legacyCredentials) || checkForV2Config())) {
+        if (!legacyWarningPrinted && fs.existsSync(legacyCredentials)) {
             legacyWarningPrinted = true;
-            process.stderr.write("[zhihand] old config detected (v2 or legacy) — run 'zhihand pair' to re-pair on v0.31 schema\n");
+            process.stderr.write("[zhihand] old config detected (legacy credentials) — run 'zhihand pair' to re-pair on v0.31 schema\n");
         }
         return emptyConfig();
     }
@@ -43,7 +43,7 @@ export function loadConfig() {
                 users: raw.users ?? {},
             };
         }
-        // Old schema version detected
+        // Old schema version (v2 or unknown) in config.json
         if (!legacyWarningPrinted) {
             legacyWarningPrinted = true;
             process.stderr.write("[zhihand] old config detected (schema v" + (raw.schema_version ?? "?") + ") — run 'zhihand pair' to re-pair on v0.31 schema\n");
@@ -54,17 +54,6 @@ export function loadConfig() {
     }
     return emptyConfig();
 }
-function checkForV2Config() {
-    if (!fs.existsSync(CONFIG_PATH))
-        return false;
-    try {
-        const raw = JSON.parse(fs.readFileSync(CONFIG_PATH, "utf8"));
-        return raw && raw.schema_version === 2;
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Atomically write config: write to .tmp, then rename. Prevents corruption
  * when the daemon and CLI write concurrently (Gemini code review v0.31).
@@ -75,6 +64,27 @@ export function saveConfig(cfg) {
     fs.writeFileSync(tmpPath, JSON.stringify(cfg, null, 2), { mode: 0o600 });
     fs.renameSync(tmpPath, CONFIG_PATH);
 }
+/**
+ * Clean up legacy config files (v2 schema, credentials.json) before re-pairing.
+ * Replaces old config with empty v3 so loadConfig() won't warn.
+ */
+export function cleanupLegacyConfig() {
+    const legacyCredentials = path.join(ZHIHAND_DIR, "credentials.json");
+    if (fs.existsSync(legacyCredentials)) {
+        fs.unlinkSync(legacyCredentials);
+    }
+    if (fs.existsSync(CONFIG_PATH)) {
+        try {
+            const raw = JSON.parse(fs.readFileSync(CONFIG_PATH, "utf8"));
+            if (!raw || raw.schema_version !== 3) {
+                saveConfig(emptyConfig());
+            }
+        }
+        catch {
+            saveConfig(emptyConfig());
+        }
+    }
+}
 // ── User helpers ──────────────────────────────────────────
 export function addUser(user) {
     const cfg = loadConfig();

package/dist/core/pair.js

@@ -1,5 +1,5 @@
 import QRCode from "qrcode";
-import { addUser, addDeviceToUser, ensureZhiHandDir, saveState, resolveDefaultEndpoint, getUserRecord, } from "./config.js";
+import { addUser, addDeviceToUser, ensureZhiHandDir, saveState, resolveDefaultEndpoint, getUserRecord, cleanupLegacyConfig, } from "./config.js";
 import { fetchDeviceProfileOnce, extractStatic } from "./device.js";
 import { fetchUserCredentials } from "./ws.js";
 // ── Server API helpers ─────────────────────────────────────
@@ -93,6 +93,8 @@ export async function executePairingNewUser(preferredLabel) {
     const label = preferredLabel ?? `User-${Date.now().toString(36)}`;
     // 1. Create user
     const userResp = await createUser(endpoint, label);
+    // Clean up v2/legacy config after network call succeeds (avoids data loss on failure)
+    cleanupLegacyConfig();
     const userId = userResp.user_id;
     const controllerToken = userResp.controller_token;
     // 2. Register plugin (get edge_id)

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-export declare const PACKAGE_VERSION = "0.32.3";
+export declare const PACKAGE_VERSION = "0.32.4";
 export declare function createServer(): McpServer;
 export declare function startStdioServer(): Promise<void>;

package/dist/index.js

@@ -8,7 +8,7 @@ import { handlePair } from "./tools/pair.js";
 import { resolveTargetDevice } from "./tools/resolve.js";
 import { buildControlToolDescription, buildSystemToolDescription, buildScreenshotToolDescription, formatDeviceStatus, extractDynamic, } from "./core/device.js";
 import { registry } from "./core/registry.js";
-export const PACKAGE_VERSION = "0.32.3";
+export const PACKAGE_VERSION = "0.32.4";
 function errorResult(message) {
     return { content: [{ type: "text", text: message }], isError: true };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhihand/mcp",
-  "version": "0.32.3",
+  "version": "0.32.4",
   "private": false,
   "type": "module",
   "description": "ZhiHand MCP Server — phone control tools for Claude Code, Codex, Gemini CLI, and OpenClaw",