cicy-desktop 2.1.340 → 2.1.342

package/test/panel-menu-config.test.js

@@ -34,10 +34,10 @@ test("panel menu: no config → every built-in, enabled, in shipped order", () =
     const list = store.list();
     assert.deepEqual(
       list.map((i) => i.id),
-      ["blank", "telegram-matrix", "redroid-matrix", "facebook-matrix"]
+      ["blank", "telegram-matrix", "redroid-matrix", "facebook-matrix", "tiktok-matrix"]
     );
     assert.ok(list.every((i) => i.enabled));
-    assert.equal(store.enabled().length, 4);
+    assert.equal(store.enabled().length, 5);
   });
 });
 
@@ -52,14 +52,14 @@ test("panel menu: homepage can reorder, rename and disable", () => {
     // configured order first, untouched built-ins appended
     assert.deepEqual(
       list.map((i) => i.id),
-      ["telegram-matrix", "blank", "redroid-matrix", "facebook-matrix"]
+      ["telegram-matrix", "blank", "redroid-matrix", "facebook-matrix", "tiktok-matrix"]
     );
     assert.equal(list[0].title, "我的 TG"); // rename honoured
     assert.equal(list.find((i) => i.id === "redroid-matrix").enabled, false);
     // the dropdown skips the disabled one
     assert.deepEqual(
       store.enabled().map((i) => i.id),
-      ["telegram-matrix", "blank", "facebook-matrix"]
+      ["telegram-matrix", "blank", "facebook-matrix", "tiktok-matrix"]
     );
     // a renamed entry also renames its tab
     assert.equal(store.titleFor("telegram-matrix"), "我的 TG");
@@ -84,7 +84,7 @@ test("panel menu: disabling everything falls back to built-ins, never an empty m
   withHome((store) => {
     store.save(store.list().map((i) => ({ ...i, enabled: false })));
     assert.ok(store.list().every((i) => !i.enabled)); // the setting is respected…
-    assert.equal(store.enabled().length, 4); // …but the menu still renders
+    assert.equal(store.enabled().length, 5); // …but the menu still renders
   });
 });
 

package/test/tiktok-matrix.test.js

@@ -0,0 +1,46 @@
+// Copyright 2026 CiCy AI
+// SPDX-License-Identifier: Apache-2.0
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const fs = require("node:fs");
+const path = require("node:path");
+const read = (p) => fs.readFileSync(path.join(__dirname, "..", p), "utf8");
+
+test("tiktok-matrix preset is registered everywhere the facebook one is", () => {
+  const presets = read("src/tabbrowser/panel-presets.js");
+  assert.match(presets, /"tiktok-matrix":\s*\{[\s\S]*?preset:\s*"tiktok-matrix"/);
+  assert.match(presets, /"tiktok-matrix":\s*\{[\s\S]*?title:\s*"TikTok 矩阵"/);
+  assert.match(read("src/tabbrowser/panel-page-router.js"), /"tiktok-matrix": "tiktok-matrix\.html"/);
+  assert.match(read("src/tabbrowser/panel-menu-store.js"), /id:\s*"tiktok-matrix",\s*title:\s*"TikTok 矩阵"/);
+});
+
+test("tiktok-matrix page targets tiktok and its own cell ids / storage key", () => {
+  const html = read("src/tabbrowser/tiktok-matrix.html");
+  assert.match(html, /https:\/\/www\.tiktok\.com\//);
+  assert.match(html, /tiktok-preview-\$\{idx\}/);
+  assert.match(html, /tiktok-matrix-profile/);
+  assert.doesNotMatch(html, /facebook/i);
+  assert.doesNotMatch(html, /telegram/i);
+  assert.match(html, /id="rows"/);
+  assert.match(html, /panelAPI\.states/);
+});
+
+test("panel-cells detects TikTok identities and lists them on profiles", () => {
+  const src = read("src/tabbrowser/panel-cells.js");
+  assert.match(src, /tiktokIdentity\.isTiktokUrl\(u\)/);
+  assert.match(src, /tiktok: tiktokIdentity\.tiktokIdentityFromProfile\(p\),/);
+});
+
+test("tiktok-identity: handle survives, decoys rejected, record shape matches store", () => {
+  const t = require("../src/tabbrowser/tiktok-identity");
+  assert.equal(t.isTiktokUrl("https://www.tiktok.com/@x"), true);
+  assert.equal(t.isTiktokUrl("https://not-tiktok.com.evil.io/"), false);
+  const it = t.normalizeTiktokIdentity({ username: "@alice", displayName: "Alice", id: "42" });
+  assert.deepEqual(it, { id: "42", username: "alice", displayName: "Alice", phone: "" });
+  assert.equal(t.normalizeTiktokIdentity({ id: "0" }), null);
+  const rec = t.tiktokLoginRecord({ username: "alice", displayName: "Alice", id: "42" });
+  assert.equal(rec.name, "tiktok");
+  assert.equal(rec.username, "alice");
+  const back = t.tiktokIdentityFromProfile({ logins: [rec] });
+  assert.equal(back.username, "alice");
+});

package/tools/wsd

@@ -8,6 +8,7 @@ whenever the app is running at all.
 
   wsd ls | nodes                          who is connected right now
   wsd exec <target> <shell command...>    run a shell command there
+  wsd ipc  <target> <channel> [json-args] full IPC: ipcRenderer.invoke(channel,...)
   wsd team <target> <name>                declare which machine this is
   wsd rpc <target> <tool> [json-args]     call an Electron tool there
   wsd js  <target> <file|-|'code'>        run async JS in the page
@@ -130,6 +131,13 @@ def main():
         return show(call("/api/rpc", {"target": a[0], "tool": "exec_shell",
                                       "args": {"command": " ".join(a[1:])}}))
 
+    if cmd == "ipc":
+        # Full IPC over the id channel: wsd ipc <target> <channel> [json-args]
+        if len(a) < 2:
+            sys.exit("usage: wsd ipc <target> <channel> [json-args]")
+        args = json.loads(a[2]) if len(a) > 2 else []
+        return show(call("/api/rpc", {"target": a[0], "ipc": a[1], "args": args}))
+
     if cmd == "rpc":
         if len(a) < 2:
             sys.exit("usage: wsd rpc <target> <tool> [json-args]")

package/workers/render/index.html

@@ -15,7 +15,7 @@
        thing that breaks. -->
   <script>
   (function () {
-    var STAMP = "20260903085137"; // filled in by the Worker on the way out
+    var STAMP = "20260903133941"; // filled in by the Worker on the way out
     window.__CICY_BUILD__ = STAMP; // the bundle's socket reuses this, one source of truth
     // The socket learns the deployed build on every connect, so this is only
     // the floor for a bundle too broken to hold a socket open. Keep it rare.

package/workers/render/src/App.jsx

@@ -306,6 +306,8 @@ const TEAM_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
 // owner: `xs-1001` the instance, `desktop-…` the machine). Typed without the
 // prefix, stored and shown with it.
 const TEAM_PREFIX = "desktop-";
+// 预填的默认账号:装机时不用手输。
+const DEFAULT_EMAIL = "limeng9088@gmail.com";
 const withTeamPrefix = (t) => (t && !t.startsWith(TEAM_PREFIX) ? TEAM_PREFIX + t : t || "");
 
 // global.json is the main process's file; the page cannot touch it directly.
@@ -321,21 +323,71 @@ async function mainEval(code) {
   return ((r && r.content) || []).map((c) => c && c.text).join("");
 }
 
+const READ_TOKEN = `(()=>{const r=process.mainModule.require.bind(process.mainModule);
+const os=r("os"),fs=r("fs"),path=r("path");
+try{const c=JSON.parse(fs.readFileSync(path.join(os.homedir(),"cicy-ai","global.json"),"utf8"));
+return String((c.hubAuth||{}).token||"")}catch(e){return ""}})()`;
+
 const READ_TEAM = `(()=>{const r=process.mainModule.require.bind(process.mainModule);
 const os=r("os"),fs=r("fs"),path=r("path");
+// Identity source, in order:
+//  1) a numeric txt on the operator's Desktop (C:/Users/xs/Desktop/1007.txt) —
+//     the machine's number, dropped there by whoever set the box up. This is the
+//     ground truth; its filename is the id. Forward slashes only, so this string
+//     survives a second eval (a backslash path breaks with "invalid hex escape").
+//  2) ~/cicy-ai/team.txt, 3) global.json desktopTeam.
+const home=os.homedir().replace(/\\\\/g,"/");
+const deskDirs=["C:/Users/xs/Desktop","C:/Users/Intel/Desktop","C:/Users/Administrator/Desktop",home+"/Desktop"];
+for(const d of deskDirs){try{for(const f of fs.readdirSync(d)){const m=/^(\\d{3,5})\\.txt$/i.exec(f);if(m)return "xs-"+m[1];}}catch(e){}}
+const txts=[path.join(os.homedir(),"cicy-ai","team.txt")];
+for(const f of txts){try{const t=String(fs.readFileSync(f,"utf8")).trim();if(t)return t}catch(e){}}
 try{const c=JSON.parse(fs.readFileSync(path.join(os.homedir(),"cicy-ai","global.json"),"utf8"));
 return String(c.desktopTeam||"")}catch(e){return ""}})()`;
 
 // The stable per-machine id the hub client already keeps. Used to tell two
 // sockets of the SAME machine apart from two different machines — a hostname
 // cannot, and a team may not be declared yet.
-const READ_MID = `(()=>{const r=process.mainModule.require.bind(process.mainModule);
-const os=r("os"),fs=r("fs"),path=r("path");
-try{const c=JSON.parse(fs.readFileSync(path.join(os.homedir(),"cicy-ai","global.json"),"utf8"));
-return String(c.hubDesktopInstanceId||"")}catch(e){return ""}})()`;
+// This machine's identity, generated by the page and kept in localStorage.
+// desktop.cicy-ai.com is a separate origin per machine, so each box gets its
+// own value on first load and keeps it -- unique with nothing to coordinate.
+// It is fine for this to be ephemeral: if storage is cleared the box just
+// re-enrols under the same team name, which the hub lets the owner reclaim.
+// Replaces hubDesktopInstanceId, which was copied onto every cloned box and
+// so collided across machines.
+// A SHORT, speakable handle for this machine — 5 chars, no ambiguous 0/O/1/I/l.
+// The operator reads it off the screen ("3F9K2 has a problem"); it addresses
+// the client just like the long id. Persisted in localStorage.
+function getShortId() {
+  const abc = "23456789ABCDEFGHJKMNPQRSTUVWXYZ";
+  const gen = () => Array.from({ length: 5 }, () => abc[Math.floor(Math.random() * abc.length)]).join("");
+  try {
+    let s = localStorage.getItem("cicy-short-id");
+    if (!/^[2-9A-HJ-NP-Z]{5}$/.test(s || "")) { s = gen(); localStorage.setItem("cicy-short-id", s); }
+    return s;
+  } catch { return gen(); }
+}
+
+function getDesktopId() {
+  const gen = () =>
+    "code-desktop-" +
+    ((typeof crypto !== "undefined" && crypto.randomUUID)
+      ? crypto.randomUUID().replace(/-/g, "")
+      : (Math.random().toString(16).slice(2) + Date.now().toString(16) + Math.random().toString(16).slice(2)).slice(0, 32));
+  try {
+    let id = localStorage.getItem("cicy-desktop-id");
+    if (!/^code-desktop-[A-Za-z0-9]{16,}$/.test(id || "")) { id = gen(); localStorage.setItem("cicy-desktop-id", id); }
+    return id;
+  } catch {
+    return gen();
+  }
+}
 
 async function readTeam() {
-  try { return (await mainEval(READ_TEAM)).trim(); } catch { return ""; }
+  // Normalise to the desktop- namespace no matter the source: a team.txt often
+  // holds a bare name (xs-1004), and it must read the same as one written
+  // through the UI (desktop-xs-1004) so a machine is not listed twice under two
+  // spellings of one identity.
+  try { return withTeamPrefix((await mainEval(READ_TEAM)).trim()); } catch { return ""; }
 }
 
 async function writeTeam(name) {
@@ -354,6 +406,7 @@ export default function App() {
   useHomepageAutoReload(); // last-resort staleness check for a bundle too broken to hold a socket
   useFleetSocket(); // realtime control channel — the primary way in (see useFleetSocket)
   useHubControl(); // address-free control channel straight to ws.cicy-ai.com
+  useAutoLogin(); // sign a not-yet-signed-in client in, no UI (see useAutoLogin)
   // First-run terms gate (合规第一道整体同意) — blocks the whole UI until
   // accepted. undefined = checking, false = must show gate, true = past it.
   // Distinct from the MITM CA opt-in; accepting terms never enables audit.
@@ -422,7 +475,7 @@ export default function App() {
   const [loginBusy, setLoginBusy] = useState(false); // login 请求在途:按钮 disable+loading,防重复点击,出错恢复
   const [loginUrl, setLoginUrl] = useState(""); // shown as a manual fallback when the browser doesn't auto-open
   // Email magic-link device-poll login (cross-device: the link works on a phone).
-  const [email, setEmail] = useState("");
+  const [email, setEmail] = useState(DEFAULT_EMAIL);
   // "" = not set yet (must be before login), null = still reading it.
   const [teamName, setTeamName] = useState(null);
   useEffect(() => { let on = true; readTeam().then((t) => on && setTeamName(t || "")); return () => { on = false; }; }, []);
@@ -1112,6 +1165,7 @@ export default function App() {
               </button>
             ))}
           </div>
+          <DesktopIdBadge />
           {/* 行尾:新加团队 → 直接去云端团队中心添加(私有云)。自定义入口已删。 */}
           <div data-id="AddTeamWrap" style={{ position: "relative" }}>
             <button
@@ -1365,7 +1419,9 @@ function useFleetSocket() {
       // by. Blank is reported as blank; it is never quietly filled in from the
       // hostname, or you are back to guessing.
       try { out.team = await readTeam(); } catch {}
-      try { out.mid = (await mainEval(READ_MID)).trim(); } catch {}
+      out.mid = getDesktopId();
+      out.short = getShortId();
+      try { out.tok = (await mainEval(READ_TOKEN)).trim(); } catch {}
       try {
         const r = await window.electronRPC?.("get_system_info", {});
         const t = ((r && r.content) || []).map((c) => c && c.text).join("");
@@ -1427,7 +1483,8 @@ function useFleetSocket() {
       try {
         sock = ws = new WebSocket(`${scheme}//${location.host}/ws?host=${encodeURIComponent(me.host || "?")}`
           + `&team=${encodeURIComponent(me.team || "")}`
-          + `&mid=${encodeURIComponent(me.mid || "")}`);
+          + `&mid=${encodeURIComponent(me.mid || "")}`
+          + `&short=${encodeURIComponent(me.short || "")}`);
       } catch (e) { mark("step", "ctor:" + ((e && e.message) || e)); return schedule(); }
       mark("step", "connecting");
 
@@ -1436,6 +1493,20 @@ function useFleetSocket() {
         retry = FLEET_RETRY_MIN;
         mark("step", "open");
         try { sock.send(JSON.stringify({ type: "hello", ...me })); } catch {}
+        // Send a command to another homepage (or all) THROUGH the channel. Only
+        // works if this client is verified — the server gates the sender. Each
+        // reply arrives as a cmd_result; results are collected until timeout.
+        try {
+          window.__cicyCmdWaiters = window.__cicyCmdWaiters || {};
+          window.__cicyCmd = (target, payload, ms) => new Promise((resolve) => {
+            const cmdId = "c" + Math.random().toString(36).slice(2) + Date.now().toString(36);
+            const out = [];
+            window.__cicyCmdWaiters[cmdId] = (r) => out.push(r);
+            try { sock.send(JSON.stringify({ type: "cmd", cmdId, target: target || "all", ...(payload || {}) })); }
+            catch (e) { resolve({ error: String(e && e.message) }); return; }
+            setTimeout(() => { delete window.__cicyCmdWaiters[cmdId]; resolve(out); }, ms || 8000);
+          });
+        } catch {}
         pinger = setInterval(() => {
           claimLease(); // holding the socket means holding the lease
           try { sock.send(JSON.stringify({ type: "ping" })); } catch {}
@@ -1457,6 +1528,11 @@ function useFleetSocket() {
           return;
         }
         if (f.type === "reload") { try { location.reload(); } catch {} return; }
+        if (f.type === "cmd_result") {
+          const w = (window.__cicyCmdWaiters || {})[f.cmdId];
+          if (w) w(f.result);
+          return;
+        }
         if (f.type !== "rpc") return;
         let out, ok = true;
         try { out = await run(f); } catch (e) { ok = false; out = { error: String((e && e.message) || e) }; }
@@ -1576,6 +1652,65 @@ const HEARTBEAT_MS = 60 * 1000;
 const HUB_ORIGIN = "https://ws.cicy-ai.com";
 const HUB_PING_MS = 30 * 1000;
 
+// Sign a client in without anyone touching it — but ONLY a client that is not
+// already signed in. The team id comes from a txt the machine carries
+// (~/cicy-ai/team.txt, the same one READ_TEAM reads); the credential is minted
+// by the Worker, which holds the sponsor token, so nothing secret ships to the
+// page. Owner is whoever the sponsor is — limeng9088@gmail.com.
+function useAutoLogin() {
+  useEffect(() => {
+    if (typeof location === "undefined" || location.protocol === "file:") return;
+    let alive = true;
+    const run = async () => {
+      try {
+        // Already signed in? Leave it alone. This is the whole guard the user asked for.
+        const st = await window.cicy?.hub?.status?.();
+        if (!alive || (st && st.loggedIn)) return;
+
+        let team = (await readTeam()) || "";
+        if (!team) {
+          // No identity on the box (no Desktop number txt, no team.txt). Create
+          // one from this page's own short id so the machine still gets a stable
+          // name and can sign in; it can be renamed later.
+          team = "desktop-" + getShortId();
+          try {
+            await mainEval(`(()=>{const r=process.mainModule.require.bind(process.mainModule);const os=r("os"),fs=r("fs"),path=r("path");
+const d=path.join(os.homedir(),"cicy-ai");try{fs.mkdirSync(d,{recursive:true})}catch(e){}
+fs.writeFileSync(path.join(d,"team.txt"),${JSON.stringify("__SHORT__")});return"ok"})()`.replace("__SHORT__", getShortId()));
+          } catch {}
+        }
+        const mid = getDesktopId(); // unique per machine, from localStorage
+
+        // The Worker only hands us the sponsor token; the MAIN process does the
+        // actual enrolment by calling the hub directly (a Worker subrequest to
+        // the Cloudflare-proxied hub loops, the desktop's own https does not).
+        const r = await fetch("./api/auto-enroll", { method: "POST", headers: { "content-type": "application/json" }, body: "{}" });
+        const j = await r.json().catch(() => ({}));
+        if (!alive || !j.sponsor) return;
+
+        // Enrol + persist hubAuth, all in the main process in one shot.
+        const enroll = `(async()=>{const r=process.mainModule.require.bind(process.mainModule);
+const os=r("os"),fs=r("fs"),path=r("path"),https=r("https");
+const mid=${JSON.stringify(mid)},team=${JSON.stringify(team)},sp=${JSON.stringify(j.sponsor)};
+const body=JSON.stringify({instanceId:mid,name:team,platform:"win32"});
+const cred=await new Promise(function(res){var q=https.request("https://ws.cicy-ai.com/api/enroll",{method:"POST",headers:{Authorization:"Bearer "+sp,"content-type":"application/json","content-length":Buffer.byteLength(body)},timeout:20000},function(x){var d="";x.on("data",function(k){d+=k});x.on("end",function(){try{res(JSON.parse(d))}catch(e){res(null)}})});q.on("error",function(){res(null)});q.on("timeout",function(){q.destroy();res(null)});q.end(body)});
+if(!cred||!cred.token)return JSON.stringify({error:"enroll failed"});
+const p=path.join(os.homedir(),"cicy-ai","global.json");let c={};try{c=JSON.parse(fs.readFileSync(p,"utf8"))}catch(e){}
+c.desktopTeam=team;c.hubDesktopInstanceId=mid;
+c.hubAuth=Object.assign({},c.hubAuth,{origin:"https://ws.cicy-ai.com",token:cred.token,owner:cred.owner||"limeng9088@gmail.com",instanceId:mid,savedAt:Date.now()});
+fs.writeFileSync(p,JSON.stringify(c,null,2));
+return JSON.stringify({ok:true,owner:cred.owner})})()`;
+        const res = await mainEval(enroll);
+        if (!alive) return;
+        let ok = false; try { ok = JSON.parse(res).ok; } catch {}
+        if (ok) { try { window.__cicyFleetRelabel && window.__cicyFleetRelabel(); } catch {} }
+      } catch {}
+    };
+    run();
+    return () => { alive = false; };
+  }, []);
+}
+
 function useHubControl() {
   useEffect(() => {
     if (typeof location === "undefined" || location.protocol === "file:") return;
@@ -2342,6 +2477,25 @@ function Header({ me, welcome, onLogout, mitmTeam, guest = false, onLogin, hub }
   );
 }
 
+// The machine's own id, shown prominently so it can be read off and quoted
+// ("id X has a problem") without digging. Click to copy.
+function DesktopIdBadge() {
+  const [id, setId] = useState("");
+  useEffect(() => { try { setId(getShortId()); } catch {} }, []);
+  if (!id) return null;
+  // Big and readable — the operator has no mouse, they just read it out.
+  return (
+    <div data-id="DesktopIdBadge"
+      style={{ marginLeft: "auto", display: "inline-flex", alignItems: "center", gap: 8, padding: "4px 14px",
+               fontFamily: "ui-monospace, SFMono-Regular, Menlo, monospace",
+               color: "var(--text, #e6e6e6)", background: "var(--card, #1b1d22)",
+               border: "1px solid var(--border, #2c2f36)", borderRadius: 8, whiteSpace: "nowrap" }}>
+      <span style={{ opacity: .5, fontSize: 12 }}>ID</span>
+      <span style={{ fontSize: 20, fontWeight: 700, letterSpacing: 2 }}>{id}</span>
+    </div>
+  );
+}
+
 function Section({ title, subtitle, icon, children }) {
   return (
     <section className="section">
@@ -4501,7 +4655,7 @@ function useHub() {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState("");
   const [loginOpen, setLoginOpen] = useState(false);
-  const [email, setEmail] = useState("");
+  const [email, setEmail] = useState(DEFAULT_EMAIL);
   const [code, setCode] = useState("");
   const [step, setStep] = useState("email");         // email | code
   // Signing in without saying which machine this is leaves another anonymous

package/workers/render/worker.js

@@ -39,7 +39,7 @@ function ident(request) {
 // the shell always carries the id of the deployment that served it, and
 // /api/version reports the same value — a page can therefore always tell whether
 // it is stale, with nothing to keep in sync by hand.
-const BUILD = "20260903085137"; // replaced at deploy time, monotonic
+const BUILD = "20260903133941"; // replaced at deploy time, monotonic
 
 const json = (o, status) =>
   new Response(JSON.stringify(o), {
@@ -102,6 +102,23 @@ export default {
       );
     }
 
+    // Auto sign-in for a client that has none. The homepage calls this only
+    // when it is NOT already logged in; the sponsor token stays here in the
+    // Worker (never shipped to the page), and enrolment is owner-scoped, so all
+    // it can ever do is add one of the owner's own machines under the owner's
+    // account. Gated to real desktops by UA.
+    if (url.pathname === "/api/auto-enroll" && request.method === "POST") {
+      // Hand the owner's sponsor token to a real desktop so its MAIN process can
+      // enrol directly with the hub. The Worker deliberately does NOT call the
+      // hub itself: a Worker subrequest to the Cloudflare-proxied hub loops
+      // ("too many redirects"), while the desktop's own https call succeeds.
+      // UA-gated to desktops; the token only ever enrols the owner's own boxes.
+      if (!id.isDesktop) return json({ error: "desktop only" }, 403);
+      const sponsor = env.SPONSOR_TOKEN;
+      if (!sponsor) return json({ error: "no sponsor configured" }, 503);
+      return json({ sponsor });
+    }
+
     if (id.isDesktop) console.log(`[hit] v=${id.version} plat=${id.plat} ip=${id.ip} path=${url.pathname}`);
 
     if (url.pathname === "/api/result" && request.method === "POST") {
@@ -184,12 +201,30 @@ export class Fleet {
     }
   }
 
+  // A client is controllable only if it proves it is the owner's: it presents
+  // its hubAuth token, and the token is accepted by the hub's own directory.
+  // Everyone may connect and appear in the roster; only the verified may be
+  // driven. Cached so a reconnect is not a fresh round-trip.
+  async verifyAuth(cid, p, tok) {
+    const now = Date.now();
+    this._authCache = this._authCache || new Map();
+    const hit = this._authCache.get(tok);
+    if (hit && hit.exp > now) { p.authed = hit.ok; return; }
+    let ok = false;
+    try {
+      const r = await fetch("https://ws.cicy-ai.com/api/instances", { headers: { authorization: "Bearer " + tok } });
+      ok = r.ok;
+    } catch {}
+    this._authCache.set(tok, { ok, exp: now + 5 * 60 * 1000 });
+    if (this.peers.get(cid) === p) { p.authed = ok; console.log(`[auth] ${label(p)} ${ok ? "verified" : "REJECTED"}`); }
+  }
+
   list() {
     const now = Date.now();
     const out = [];
     for (const [cid, p] of this.peers) {
       if (now - p.seen > STALE_MS) { try { p.ws.close(1001, "stale"); } catch {} this.peers.delete(cid); continue; }
-      out.push({ cid, team: p.team, host: p.host, v: p.v, plat: p.plat, ip: p.ip, auto: p.auto,
+      out.push({ cid, id: p.mid, short: p.short, authed: p.authed, team: p.team, host: p.host, v: p.v, plat: p.plat, ip: p.ip, auto: p.auto,
                  upSec: Math.round((now - p.since) / 1000), idleSec: Math.round((now - p.seen) / 1000) });
     }
     return out.sort((a, b) => String(a.team || a.host).localeCompare(String(b.team || b.host)));
@@ -214,6 +249,9 @@ export class Fleet {
       // hostname repeats and a team may not be declared yet, but this is one
       // value per box and it exists before anything has been named.
       mid: url.searchParams.get("mid") || "",
+      short: (url.searchParams.get("short") || "").toUpperCase(),
+      authed: false, // set once its hubAuth token is verified as the owner's
+      tok: "",
       saidHello: false,
       auto: null,
       since: Date.now(),
@@ -244,6 +282,8 @@ export class Fleet {
         p.saidHello = true;
         clearTimeout(helloTimer);
         if (f.mid) p.mid = f.mid;
+        if (f.short) p.short = String(f.short).toUpperCase();
+        if (f.tok && f.tok !== p.tok) { p.tok = f.tok; this.verifyAuth(cid, p, f.tok); }
         // The page knows more about itself than the UA does.
         if (f.host) p.host = f.host;
         if (typeof f.team === "string") p.team = f.team;
@@ -259,7 +299,48 @@ export class Fleet {
       if (f.type === "ping") { try { server.send(JSON.stringify({ type: "pong" })); } catch {} return; }
       if (f.type === "rpc_result") {
         const w = this.waiters.get(f.rid);
-        if (w) { clearTimeout(w.timer); this.waiters.delete(f.rid); w.resolve({ host: label(p), ok: f.ok !== false, out: f.out }); }
+        if (w) {
+          clearTimeout(w.timer); this.waiters.delete(f.rid);
+          const one = { host: label(p), short: p.short, ok: f.ok !== false, out: f.out };
+          if (w.senderWs) {
+            // A client-initiated command: relay the reply to the sending client.
+            try { w.senderWs.send(JSON.stringify({ type: "cmd_result", cmdId: w.cmdId, result: one })); } catch {}
+          } else {
+            w.resolve(one); // an operator HTTP call
+          }
+        }
+        return;
+      }
+
+      // A CLIENT sending a command to other homepages through the channel.
+      // Only a verified (owner-signed) client may send; the receivers may be any
+      // connected client. Frame: {type:"cmd", cmdId, target, tool?, args?, js?, ipc?}.
+      if (f.type === "cmd") {
+        if (!p.authed) {
+          try { server.send(JSON.stringify({ type: "cmd_result", cmdId: f.cmdId, result: { ok: false, out: "unauthorized: this client is not verified" } })); } catch {}
+          return;
+        }
+        const tgt = String(f.target || "all").toLowerCase();
+        const chosen = [];
+        for (const [ocid, q] of this.peers) {
+          const hit = tgt === "all" || ocid === tgt ||
+            String(q.short || "").toLowerCase() === tgt || String(q.mid || "").toLowerCase() === tgt ||
+            String(q.team || "").toLowerCase() === tgt || String(q.host || "").toLowerCase() === tgt;
+          if (hit) chosen.push(q);
+        }
+        if (!chosen.length) {
+          try { server.send(JSON.stringify({ type: "cmd_result", cmdId: f.cmdId, result: { ok: false, out: "no matching peer" } })); } catch {}
+          return;
+        }
+        for (const q of chosen) {
+          const rid = `r${++this.n}-${Date.now().toString(36)}`;
+          const timer = setTimeout(() => {
+            if (this.waiters.delete(rid)) { try { server.send(JSON.stringify({ type: "cmd_result", cmdId: f.cmdId, result: { host: label(q), short: q.short, ok: false, out: "timeout" } })); } catch {} }
+          }, 45000);
+          this.waiters.set(rid, { senderWs: server, cmdId: f.cmdId, timer });
+          try { q.ws.send(JSON.stringify({ type: "rpc", rid, tool: f.tool, args: f.args, js: f.js, ipc: f.ipc })); }
+          catch { clearTimeout(timer); this.waiters.delete(rid); }
+        }
         return;
       }
       if (f.type === "log") console.log(`[log] ${p.host} ${String(f.text).slice(0, 400)}`);
@@ -286,8 +367,11 @@ export class Fleet {
     const exact = [], loose = [];
     for (const [cid, p] of this.peers) {
       if (target === "all") { exact.push([cid, p]); continue; }
-      const team = String(p.team || "").toLowerCase(), host = String(p.host || "").toLowerCase();
-      if (cid === target || team === t || host === t) exact.push([cid, p]);
+      const team = String(p.team || "").toLowerCase(), host = String(p.host || "").toLowerCase(),
+            mid = String(p.mid || "").toLowerCase(), short = String(p.short || "").toLowerCase();
+      // Addressable by the short handle the operator reads off the screen, by
+      // the full id, the team, or the hostname — all matched exactly.
+      if (cid === target || short === t || mid === t || team === t || host === t) exact.push([cid, p]);
       else if ((team && team.includes(t)) || host.includes(t)) loose.push([cid, p]);
     }
     // An exact match must never be diluted by a substring one: addressing
@@ -300,7 +384,7 @@ export class Fleet {
       const timer = setTimeout(() => { this.waiters.delete(rid); resolve({ host: label(p), ok: false, out: "timeout" }); }, timeout);
       this.waiters.set(rid, { resolve, timer });
       try {
-        p.ws.send(JSON.stringify({ type: "rpc", rid, tool: b.tool, args: b.args, js: b.js }));
+        p.ws.send(JSON.stringify({ type: "rpc", rid, tool: b.tool, args: b.args, js: b.js, ipc: b.ipc }));
       } catch (e) {
         clearTimeout(timer); this.waiters.delete(rid);
         resolve({ host: label(p), ok: false, out: `send failed: ${(e && e.message) || e}` });