@zhihand/mcp 0.30.0 → 0.32.1

package/bin/zhihand

@@ -1,26 +1,36 @@
 #!/usr/bin/env node
 
 import os from "node:os";
+import fs from "node:fs";
 import { parseArgs } from "node:util";
 import { startStdioServer } from "../dist/index.js";
 import { startDaemon, stopDaemon, isAlreadyRunning } from "../dist/daemon/index.js";
 import { detectCLITools, formatDetectedTools } from "../dist/cli/detect.js";
 import {
   loadConfig,
-  listDeviceRecords,
-  removeDevice,
-  renameDevice,
-  setDefaultDevice,
+  listUsers,
+  getUserRecord,
+  removeUser,
+  removeDeviceFromUser,
+  findDeviceOwner,
+  updateDeviceLabel,
+  updateControllerToken,
   loadBackendConfig,
   saveBackendConfig,
+  addUser,
   DEFAULT_MODELS,
   resolveConfig,
+  resolveDefaultEndpoint,
 } from "../dist/core/config.js";
-import { executePairing } from "../dist/core/pair.js";
+import {
+  executePairingNewUser,
+  executePairingAddDevice,
+} from "../dist/core/pair.js";
+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.30.0";
+const VERSION = "0.32.1";
 
 const CLI_TOOL_MAP = {
   claude: "claudecode",
@@ -65,12 +75,14 @@ Usage:
   zhihand claude             Switch backend to Claude Code
   zhihand codex              Switch backend to Codex CLI
 
-  zhihand setup              Interactive setup: pair + configure + start
-  zhihand pair [--label X]   Pair with a phone device
-  zhihand list               List paired devices
-  zhihand unpair <cred_id>   Revoke + remove a device
-  zhihand rename <cred> <n>  Rename a device
-  zhihand default <cred_id>  Set default device
+  zhihand pair [--label X]   Pair new user + first device + auto-configure MCP
+  zhihand pair <user_id>     Add device to existing user
+  zhihand list [<user_id>]   List users/devices with real-time online status
+  zhihand unpair <id>        Remove user (usr_*) or device (credential)
+  zhihand rename <cred> <n>  Rename a device (server-side + local)
+  zhihand export <user_id>   Export user credentials as JSON to stdout
+  zhihand import <file>      Import user credentials from JSON file
+  zhihand rotate <user_id>   Rotate controller token
   zhihand detect             Detect available CLI tools
 
   zhihand test [cred] [ids]  Run device tests (all, specific ids, or for a credential)
@@ -202,103 +214,309 @@ switch (command) {
   }
 
   case "pair": {
-    const edgeId = `mcp-${Date.now().toString(36)}`;
+    const arg1 = positionals[1];
     const label = values.label ?? undefined;
-    await executePairing(DEFAULT_ENDPOINT, edgeId, label);
+
+    if (arg1 && arg1.startsWith("usr_")) {
+      // Add device to existing user
+      const deviceRecord = await executePairingAddDevice(arg1, label);
+      console.log(`\nDevice paired: ${deviceRecord.label} (${deviceRecord.credential_id})`);
+    } else {
+      // New user + first device
+      const { userRecord, deviceRecord } = await executePairingNewUser(label);
+      console.log(`\nUser created: ${userRecord.label} (${userRecord.user_id})`);
+      console.log(`Device paired: ${deviceRecord.label} (${deviceRecord.credential_id})`);
+      console.log(`\nAdd another device: zhihand pair ${userRecord.user_id}`);
+
+      // Auto-configure MCP hosts
+      const tools = await detectCLITools();
+      if (tools.length > 0) {
+        const best = tools.find((t) => t.loggedIn) ?? tools[0];
+        console.log(`\nAuto-configuring MCP for ${displayName(best.name)}...`);
+        const backendCfg = loadBackendConfig();
+        configureMCP(best.name, backendCfg.activeBackend);
+        saveBackendConfig({ activeBackend: best.name });
+      }
+    }
     break;
   }
 
   case "list": {
-    const records = listDeviceRecords();
-    const cfg = loadConfig();
-    if (records.length === 0) {
-      console.log("No paired devices. Run: zhihand pair");
+    const userIdFilter = positionals[1];
+    const users = listUsers();
+    const endpoint = resolveDefaultEndpoint();
+
+    if (users.length === 0) {
+      console.log("No users configured. Run: zhihand pair");
       break;
     }
-    const header = ["credential_id", "label", "platform", "default", "paired_at", "last_seen"];
-    const rows = records.map((r) => [
-      r.credential_id,
-      r.label,
-      r.platform,
-      cfg.default_credential_id === r.credential_id ? "*" : "",
-      r.paired_at,
-      r.last_seen_at,
-    ]);
-    const widths = header.map((h, i) => Math.max(h.length, ...rows.map((row) => row[i].length)));
-    const fmt = (row) => row.map((c, i) => c.padEnd(widths[i])).join("  ");
-    console.log(fmt(header));
-    console.log(widths.map((w) => "-".repeat(w)).join("  "));
-    for (const r of rows) console.log(fmt(r));
+
+    const filteredUsers = userIdFilter
+      ? users.filter((u) => u.user_id === userIdFilter)
+      : users;
+
+    if (filteredUsers.length === 0) {
+      console.error(`User '${userIdFilter}' not found.`);
+      process.exit(1);
+    }
+
+    for (const user of filteredUsers) {
+      console.log(`\nUSER: ${user.label} (${user.user_id})`);
+
+      // Fetch real-time online status from server
+      let onlineMap = new Map();
+      try {
+        const creds = await fetchUserCredentials(endpoint, user.user_id, user.controller_token);
+        for (const c of creds) {
+          onlineMap.set(c.credential_id, c.online ?? false);
+        }
+      } catch {
+        // Fallback: no online status
+      }
+
+      if (user.devices.length === 0) {
+        console.log("  (no devices)");
+        continue;
+      }
+
+      const header = ["DEVICE_ID", "LABEL", "PLATFORM", "ONLINE", "PAIRED"];
+      const rows = user.devices.map((d) => [
+        d.credential_id,
+        d.label,
+        d.platform,
+        onlineMap.has(d.credential_id)
+          ? (onlineMap.get(d.credential_id) ? "yes" : "no")
+          : "?",
+        d.paired_at,
+      ]);
+      const widths = header.map((h, i) => Math.max(h.length, ...rows.map((row) => row[i].length)));
+      const fmt = (row) => row.map((c, i) => c.padEnd(widths[i])).join("  ");
+      console.log("  " + fmt(header));
+      console.log("  " + widths.map((w) => "-".repeat(w)).join("  "));
+      for (const r of rows) console.log("  " + fmt(r));
+    }
     break;
   }
 
   case "unpair": {
+    const id = positionals[1];
+    if (!id) {
+      console.error("Usage: zhihand unpair <user_id | credential_id>");
+      process.exit(1);
+    }
+
+    const endpoint = resolveDefaultEndpoint();
+
+    if (id.startsWith("usr_")) {
+      // Delete user (cascade)
+      const user = getUserRecord(id);
+      if (!user) {
+        console.error(`User '${id}' not found.`);
+        process.exit(1);
+      }
+      // Best-effort server-side delete
+      try {
+        const res = await fetch(`${endpoint}/v1/users/${encodeURIComponent(id)}`, {
+          method: "DELETE",
+          headers: { "Authorization": `Bearer ${user.controller_token}` },
+          signal: AbortSignal.timeout(5000),
+        });
+        if (!res.ok) {
+          console.warn(`Warning: server delete returned ${res.status} (continuing to remove locally)`);
+        }
+      } catch (err) {
+        console.warn(`Warning: server delete failed: ${err.message} (continuing to remove locally)`);
+      }
+      removeUser(id);
+      console.log(`Removed user: ${id} (${user.label})`);
+    } else {
+      // Delete single credential
+      const owner = findDeviceOwner(id);
+      if (!owner) {
+        console.error(`Device '${id}' not found.`);
+        process.exit(1);
+      }
+      // Best-effort server-side delete
+      try {
+        const res = await fetch(`${endpoint}/v1/credentials/${encodeURIComponent(id)}`, {
+          method: "DELETE",
+          headers: { "Authorization": `Bearer ${owner.user.controller_token}` },
+          signal: AbortSignal.timeout(5000),
+        });
+        if (!res.ok) {
+          console.warn(`Warning: server delete returned ${res.status} (continuing to remove locally)`);
+        }
+      } catch (err) {
+        console.warn(`Warning: server delete failed: ${err.message} (continuing to remove locally)`);
+      }
+      removeDeviceFromUser(owner.user.user_id, id);
+      console.log(`Removed device: ${id}`);
+    }
+    break;
+  }
+
+  case "rename": {
     const credId = positionals[1];
-    if (!credId) {
-      console.error("Usage: zhihand unpair <credential_id>");
+    const newLabel = positionals[2];
+    if (!credId || !newLabel) {
+      console.error("Usage: zhihand rename <credential_id> <new_label>");
       process.exit(1);
     }
-    const cfg = loadConfig();
-    const record = cfg.devices[credId];
-    if (!record) {
+    const owner = findDeviceOwner(credId);
+    if (!owner) {
       console.error(`Device '${credId}' not found.`);
       process.exit(1);
     }
-    // Best-effort revoke
+    // Server-side PATCH
+    const endpoint = resolveDefaultEndpoint();
     try {
-      const url = `${record.endpoint}/v1/credentials/${encodeURIComponent(credId)}/revoke`;
-      const res = await fetch(url, {
-        method: "POST",
-        headers: { "x-zhihand-controller-token": record.controller_token },
+      const res = await fetch(`${endpoint}/v1/credentials/${encodeURIComponent(credId)}`, {
+        method: "PATCH",
+        headers: {
+          "Content-Type": "application/json",
+          "Authorization": `Bearer ${owner.user.controller_token}`,
+        },
+        body: JSON.stringify({ device_label: newLabel }),
         signal: AbortSignal.timeout(5000),
       });
       if (!res.ok) {
-        console.warn(`Warning: server revoke returned ${res.status} (continuing to remove locally)`);
+        console.warn(`Warning: server rename returned ${res.status}`);
       }
     } catch (err) {
-      console.warn(`Warning: server revoke failed: ${err.message} (continuing to remove locally)`);
+      console.warn(`Warning: server rename failed: ${err.message}`);
     }
-    removeDevice(credId);
-    console.log(`Unpaired: ${credId}`);
+    updateDeviceLabel(owner.user.user_id, credId, newLabel);
+    console.log(`Renamed ${credId} to '${newLabel}'`);
     break;
   }
 
-  case "rename": {
-    const credId = positionals[1];
-    const newLabel = positionals[2];
-    if (!credId || !newLabel) {
-      console.error("Usage: zhihand rename <credential_id> <new_label>");
+  case "export": {
+    const userId = positionals[1];
+    if (!userId) {
+      console.error("Usage: zhihand export <user_id>");
       process.exit(1);
     }
-    renameDevice(credId, newLabel);
-    console.log(`Renamed ${credId} to '${newLabel}'`);
+    const user = getUserRecord(userId);
+    if (!user) {
+      console.error(`User '${userId}' not found.`);
+      process.exit(1);
+    }
+    // Plain JSON to stdout
+    console.log(JSON.stringify({ user_id: user.user_id, controller_token: user.controller_token }, null, 2));
     break;
   }
 
-  case "default": {
-    const credId = positionals[1];
-    if (!credId) {
-      console.error("Usage: zhihand default <credential_id>");
+  case "import": {
+    const filePath = positionals[1];
+    if (!filePath) {
+      console.error("Usage: zhihand import <file>");
+      process.exit(1);
+    }
+    let data;
+    try {
+      data = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    } catch (err) {
+      console.error(`Error reading file: ${err.message}`);
+      process.exit(1);
+    }
+    if (!data.user_id || !data.controller_token) {
+      console.error("Invalid import file: must contain user_id and controller_token");
+      process.exit(1);
+    }
+    // Validate by fetching user info from server
+    const endpoint = resolveDefaultEndpoint();
+    let serverUser;
+    try {
+      const res = await fetch(`${endpoint}/v1/users/${encodeURIComponent(data.user_id)}`, {
+        headers: { "Authorization": `Bearer ${data.controller_token}` },
+        signal: AbortSignal.timeout(10000),
+      });
+      if (!res.ok) {
+        console.error(`Server validation failed: ${res.status}`);
+        process.exit(1);
+      }
+      serverUser = await res.json();
+    } catch (err) {
+      console.error(`Server validation failed: ${err.message}`);
+      process.exit(1);
+    }
+    // Fetch credentials
+    let creds = [];
+    try {
+      creds = await fetchUserCredentials(endpoint, data.user_id, data.controller_token);
+    } catch {
+      // Non-fatal
+    }
+    const devices = creds.map((c) => ({
+      credential_id: c.credential_id,
+      label: c.label ?? c.credential_id,
+      platform: c.platform ?? "unknown",
+      paired_at: c.paired_at ?? new Date().toISOString(),
+      last_seen_at: c.last_seen_at ?? new Date().toISOString(),
+    }));
+    const userRecord = {
+      user_id: data.user_id,
+      controller_token: data.controller_token,
+      label: serverUser.label ?? data.user_id,
+      created_at: serverUser.created_at ?? new Date().toISOString(),
+      devices,
+    };
+    addUser(userRecord);
+    console.log(`Imported user: ${userRecord.label} (${userRecord.user_id}) with ${devices.length} device(s)`);
+    break;
+  }
+
+  case "rotate": {
+    const userId = positionals[1];
+    if (!userId) {
+      console.error("Usage: zhihand rotate <user_id>");
+      process.exit(1);
+    }
+    const user = getUserRecord(userId);
+    if (!user) {
+      console.error(`User '${userId}' not found.`);
+      process.exit(1);
+    }
+    const endpoint = resolveDefaultEndpoint();
+    // Find current token ID (we need to pass it in the URL)
+    // The API is POST /v1/users/{id}/controller-tokens/{token}/rotate
+    try {
+      const res = await fetch(
+        `${endpoint}/v1/users/${encodeURIComponent(userId)}/controller-tokens/${encodeURIComponent(user.controller_token)}/rotate`,
+        {
+          method: "POST",
+          headers: { "Authorization": `Bearer ${user.controller_token}` },
+          signal: AbortSignal.timeout(10000),
+        },
+      );
+      if (!res.ok) {
+        console.error(`Rotate failed: ${res.status}`);
+        process.exit(1);
+      }
+      const result = await res.json();
+      updateControllerToken(userId, result.new_token);
+      console.log(`Token rotated for ${userId}. New token saved.`);
+    } catch (err) {
+      console.error(`Rotate failed: ${err.message}`);
       process.exit(1);
     }
-    setDefaultDevice(credId);
-    console.log(`Default device set to ${credId}`);
     break;
   }
 
   case "status": {
-    const records = listDeviceRecords();
-    const cfg = loadConfig();
+    const users = listUsers();
     const backend = loadBackendConfig();
     const daemonPid = isAlreadyRunning();
 
-    if (records.length === 0) {
-      console.log("No paired devices. Run: zhihand setup");
+    if (users.length === 0) {
+      console.log("No users configured. Run: zhihand pair");
     } else {
-      console.log(`Paired devices: ${records.length}`);
-      for (const r of records) {
-        const mark = cfg.default_credential_id === r.credential_id ? " *" : "";
-        console.log(`  ${r.credential_id} (${r.label}, ${r.platform})${mark}`);
+      console.log(`Users: ${users.length}`);
+      for (const u of users) {
+        console.log(`  ${u.user_id} (${u.label}) — ${u.devices.length} device(s)`);
+        for (const d of u.devices) {
+          console.log(`    ${d.credential_id} (${d.label}, ${d.platform})`);
+        }
       }
     }
     const backendLabel = backend.activeBackend ? displayName(backend.activeBackend) : "(none)";
@@ -331,44 +549,14 @@ switch (command) {
   }
 
   case "setup": {
-    const records = listDeviceRecords();
-    if (records.length === 0) {
-      console.log("No paired device found. Starting pairing...\n");
-      const edgeId = `mcp-${Date.now().toString(36)}`;
-      await executePairing(DEFAULT_ENDPOINT, edgeId, values.label);
-    }
-    const updated = listDeviceRecords();
-    if (updated.length > 0) {
-      const cfg = loadConfig();
-      const def = updated.find((r) => r.credential_id === cfg.default_credential_id) ?? updated[0];
-      console.log(`\nPaired: ${def.label} (${def.credential_id})\n`);
-    }
-
-    const tools = await detectCLITools();
-    console.log(formatDetectedTools(tools));
-
-    if (tools.length === 0) {
-      console.log("\nNo CLI tools detected. Install one of: Claude Code, Codex CLI, Gemini CLI.");
-      break;
-    }
-
-    const best = tools.find((t) => t.loggedIn) ?? tools[0];
-    const config = loadBackendConfig();
-
-    console.log(`\nAuto-selecting backend: ${displayName(best.name)}...`);
-    if (values.port) process.env.ZHIHAND_PORT = values.port;
-    configureMCP(best.name, config.activeBackend);
-    saveBackendConfig({ activeBackend: best.name });
-
-    console.log(`\nStarting daemon...\n`);
-    const port = values.port ? parseInt(values.port, 10) : undefined;
-    await startDaemon({ port });
+    console.log("'zhihand setup' has been merged into 'zhihand pair'.");
+    console.log("Run: zhihand pair");
     break;
   }
 
   case "test": {
     const { createControlCommand, createSystemCommand, enqueueCommand } = await import("../dist/core/command.js");
-    const { waitForCommandAck } = await import("../dist/core/sse.js");
+    const { waitForCommandAck } = await import("../dist/core/ws.js");
     const { fetchScreenshot, getSnapshotStaleThresholdMs } = await import("../dist/core/screenshot.js");
     const { fetchDeviceProfileOnce, extractStatic, computeCapabilities, formatDeviceStatus } = await import("../dist/core/device.js");
 
@@ -416,7 +604,7 @@ switch (command) {
       { id: 38, phase: "Media", label: "Stop", kind: "system", params: { action: "stop" } },
       { id: 39, phase: "Hardware", label: "Brightness up", kind: "system", params: { action: "brightness_up" } },
       { id: 40, phase: "Hardware", label: "Brightness down", kind: "system", params: { action: "brightness_down" } },
-      { id: 41, phase: "Hardware", label: "Power button (⚠️ may lock screen)", kind: "system", params: { action: "power" }, unsafe: true },
+      { id: 41, phase: "Hardware", label: "Power button (may lock screen)", kind: "system", params: { action: "power" }, unsafe: true },
     ];
 
     // Parse first positional: credential_id (crd_*) or test ids
@@ -464,7 +652,7 @@ switch (command) {
       }
     }
 
-    console.log("🧪 ZhiHand Device Test");
+    console.log("ZhiHand Device Test");
     console.log(`   Device: ${testConfig.credentialId}`);
     console.log(`   Endpoint: ${testConfig.controlPlaneEndpoint}\n`);
 
@@ -484,16 +672,16 @@ switch (command) {
     } catch { /* non-fatal */ }
     const getDevicePlatform = () => currentProfile?.platform ?? "unknown";
 
-    console.log("   ── Capability readiness ──");
+    console.log("   -- Capability readiness --");
     if (!currentCaps) {
-      console.log("   ⚠️  Device profile not loaded — all capability gates will allow tests through.");
+      console.log("   [!] Device profile not loaded — all capability gates will allow tests through.");
     } else {
-      const fmt = (name, cap) => `   ${cap.ready ? "✅" : "⚠️"} ${name.padEnd(14)} ${cap.ready ? "ready" : "NOT ready"}  — ${cap.reason}`;
+      const fmt = (name, cap) => `   ${cap.ready ? "[ok]" : "[!]"} ${name.padEnd(14)} ${cap.ready ? "ready" : "NOT ready"}  — ${cap.reason}`;
       console.log(fmt("screen_sharing", currentCaps.screen_sharing));
       console.log(fmt("hid", currentCaps.hid));
       console.log(fmt("live_session", currentCaps.live_session));
       const ageStr = currentCaps.profile.age_ms >= 0 ? `${(currentCaps.profile.age_ms / 1000).toFixed(1)}s` : "unknown";
-      console.log(`   ${currentCaps.profile.stale ? "⚠️" : "✅"} profile        age=${ageStr}${currentCaps.profile.stale ? " (STALE)" : ""}`);
+      console.log(`   ${currentCaps.profile.stale ? "[!]" : "[ok]"} profile        age=${ageStr}${currentCaps.profile.stale ? " (STALE)" : ""}`);
       if (forceRun) {
         console.log("   --force passed: capability gates disabled.");
       }
@@ -531,18 +719,18 @@ switch (command) {
           const ackStatus = ack.command?.ack_status ?? "ok";
           const resultInfo = ack.command?.ack_result ? ` ${JSON.stringify(ack.command.ack_result)}` : "";
           if (ackStatus === "ok") {
-            console.log(`✅ (${ms}ms)${resultInfo}`);
+            console.log(`[PASS] (${ms}ms)${resultInfo}`);
             passed++;
           } else {
-            console.log(`❌ [${ackStatus}] (${ms}ms)${resultInfo}`);
+            console.log(`[FAIL] [${ackStatus}] (${ms}ms)${resultInfo}`);
             failed++;
           }
         } else {
-          console.log(`⏱️  Timeout (${ms}ms)`);
+          console.log(`[TIMEOUT] (${ms}ms)`);
           failed++;
         }
       } catch (err) {
-        console.log(`❌ ${err.message} (${Date.now() - t0}ms)`);
+        console.log(`[FAIL] ${err.message} (${Date.now() - t0}ms)`);
         failed++;
       }
     }
@@ -551,7 +739,7 @@ switch (command) {
       const currentPlatform = getDevicePlatform();
       if (t.platform && t.platform !== currentPlatform) {
         totalSteps++; skipped++;
-        console.log(`   ${String(t.id).padStart(2)}. ${t.label}... ⏭️  Skipped (${t.platform}-only, device is ${currentPlatform})`);
+        console.log(`   ${String(t.id).padStart(2)}. ${t.label}... [SKIP] (${t.platform}-only, device is ${currentPlatform})`);
         return;
       }
       if (!forceRun && currentCaps) {
@@ -560,7 +748,7 @@ switch (command) {
           const gate = requiredCap === "screen" ? currentCaps.screen_sharing : currentCaps.hid;
           if (!gate.ready) {
             totalSteps++; skipped++;
-            console.log(`   ${String(t.id).padStart(2)}. ${t.label}... ⏭️  Skipped (${requiredCap} not ready: ${gate.reason})`);
+            console.log(`   ${String(t.id).padStart(2)}. ${t.label}... [SKIP] (${requiredCap} not ready: ${gate.reason})`);
             return;
           }
         }
@@ -580,14 +768,14 @@ switch (command) {
               currentProfile = extractStatic(currentRawAttrs);
               currentCaps = computeCapabilities(currentRawAttrs, profileReceivedAtMs);
               const s = currentProfile;
-              console.log(`✅ ${s.platform} ${s.model}, ${s.osVersion}, ${s.screenWidthPx}x${s.screenHeightPx} (${ms}ms)`);
+              console.log(`[PASS] ${s.platform} ${s.model}, ${s.osVersion}, ${s.screenWidthPx}x${s.screenHeightPx} (${ms}ms)`);
               passed++;
             } else {
-              console.log(`⚠️  Loaded but empty (${ms}ms)`);
+              console.log(`[!] Loaded but empty (${ms}ms)`);
               failed++;
             }
           } catch (err) {
-            console.log(`❌ ${err.message} (${Date.now() - t0}ms)`);
+            console.log(`[FAIL] ${err.message} (${Date.now() - t0}ms)`);
             failed++;
           }
           break;
@@ -598,6 +786,8 @@ switch (command) {
           try {
             const state = {
               credentialId: testConfig.credentialId,
+              userId: "",
+              userLabel: "",
               label: "(test)",
               platform: getDevicePlatform(),
               online: true,
@@ -606,10 +796,7 @@ switch (command) {
               capabilities: currentCaps,
               profileReceivedAtMs,
               rawAttributes: currentRawAttrs,
-              sseController: null,
-              sseConnected: false,
-              heartbeatTimer: null,
-              record: { credential_id: testConfig.credentialId, controller_token: "", endpoint: "", label: "", platform: "unknown", paired_at: "", last_seen_at: "" },
+              record: { credential_id: testConfig.credentialId, label: "", platform: "unknown", paired_at: "", last_seen_at: "" },
             };
             const status = formatDeviceStatus(state);
             const topLevel = Object.keys(status).filter((k) => k !== "raw" && k !== "capabilities");
@@ -618,12 +805,12 @@ switch (command) {
             const capReadySummary = ["screen_sharing", "hid", "live_session"]
               .map((k) => `${k}=${caps[k]?.ready ? "ready" : "not-ready"}`)
               .join(", ");
-            console.log(`✅ ${topLevel.length} curated + ${rawKeys.length} raw attributes; ${capReadySummary}`);
+            console.log(`[PASS] ${topLevel.length} curated + ${rawKeys.length} raw attributes; ${capReadySummary}`);
             console.log(`      curated: ${topLevel.join(", ")}`);
             console.log(`      raw:     ${rawKeys.join(", ")}`);
             passed++;
           } catch (err) {
-            console.log(`❌ ${err.message}`);
+            console.log(`[FAIL] ${err.message}`);
             failed++;
           }
           break;
@@ -637,7 +824,7 @@ switch (command) {
             const queued = await enqueueCommand(testConfig, cmd);
             const ack = await waitForCommandAck(testConfig, { commandId: queued.id, timeoutMs: 10_000 });
             if (!ack.acked) {
-              console.log(`⏱️  Timeout (${Date.now() - t0}ms)`);
+              console.log(`[TIMEOUT] (${Date.now() - t0}ms)`);
               failed++;
               break;
             }
@@ -646,14 +833,14 @@ switch (command) {
             const ms = Date.now() - t0;
             if (shot.stale) {
               const threshold = getSnapshotStaleThresholdMs();
-              console.log(`❌ Stale (${kb}KB, age=${(shot.ageMs / 1000).toFixed(1)}s > ${(threshold / 1000).toFixed(1)}s) ${shot.width}x${shot.height} seq=${shot.sequence} — phone may not be screen-sharing (${ms}ms)`);
+              console.log(`[FAIL] Stale (${kb}KB, age=${(shot.ageMs / 1000).toFixed(1)}s > ${(threshold / 1000).toFixed(1)}s) ${shot.width}x${shot.height} seq=${shot.sequence} — phone may not be screen-sharing (${ms}ms)`);
               failed++;
             } else {
-              console.log(`✅ ${kb}KB, ${shot.width}x${shot.height}, age=${shot.ageMs >= 0 ? `${shot.ageMs}ms` : "?"}, seq=${shot.sequence} (${ms}ms)`);
+              console.log(`[PASS] ${kb}KB, ${shot.width}x${shot.height}, age=${shot.ageMs >= 0 ? `${shot.ageMs}ms` : "?"}, seq=${shot.sequence} (${ms}ms)`);
               passed++;
             }
           } catch (err) {
-            console.log(`❌ ${err.message} (${Date.now() - t0}ms)`);
+            console.log(`[FAIL] ${err.message} (${Date.now() - t0}ms)`);
             failed++;
           }
           break;
@@ -686,14 +873,14 @@ switch (command) {
     if (selectedIds) {
       const foundIds = new Set(toRun.map((t) => t.id));
       const missing = [...selectedIds].filter((id) => !foundIds.has(id));
-      if (missing.length) console.warn(`⚠️  Unknown test IDs: ${missing.join(", ")}`);
+      if (missing.length) console.warn(`[!] Unknown test IDs: ${missing.join(", ")}`);
     }
 
     let currentPhase = "";
     for (let i = 0; i < toRun.length; i++) {
       const t = toRun[i];
       if (t.phase !== currentPhase) {
-        console.log(`   ── ${t.phase} ──`);
+        console.log(`   -- ${t.phase} --`);
         currentPhase = t.phase;
       }
       await runSingleTest(t);
@@ -701,8 +888,8 @@ switch (command) {
     }
 
     console.log(`\n   Result: ${passed}/${totalSteps} passed, ${failed} failed, ${skipped} skipped`);
-    if (failed === 0) console.log("   ✅ All tests passed! Device is fully responsive.");
-    else console.log(`   ⚠️  ${failed} test(s) failed. Check phone connectivity.`);
+    if (failed === 0) console.log("   All tests passed! Device is fully responsive.");
+    else console.log(`   ${failed} test(s) failed. Check phone connectivity.`);
     process.exit(failed > 0 ? 1 : 0);
   }