@galda/cli 0.10.20 → 0.10.21

package/CLAUDE.md

@@ -77,8 +77,9 @@
 
 ## relay接続（`app.galda.app`）を伴う作業の掟（Masa明言 2026-07-17・全レーン必読）
 
-- **relayは1アカウント=同時1接続のみ**。同じ`MANAGER_HOME`（既定`~/.manager-for-ai`）を指す2つ目のプロセスを起動すると、実本番アカウントの接続を奪い合い、"無限ループ"（app.galda.appのリロード連打）を引き起こす。**5回繰り返した実績のあるインシデントクラス**（`docs/RUNBOOK-relay-mutual-kick.md`参照）。
+- **relayは1アカウント=同時1接続のみ**。同じ`MANAGER_HOME`（既定`~/.manager-for-ai`）を指す2つ目のプロセスを起動すると、実本番アカウントの接続を奪い合い、"無限ループ"（app.galda.appのリロード連打）を引き起こす。**6回繰り返した実績のあるインシデントクラス**（`docs/RUNBOOK-relay-mutual-kick.md`参照）。
 - `engine/relay-client.mjs`は2026-07-17からPIDロックで2つ目の起動を自動拒否するが、**手動検証で`node engine/relay-client.mjs`や`npx @galda/cli`を叩く時は、必ず隔離した`MANAGER_HOME`を使う**（本番の`~/.manager-for-ai`を素で使わない）。
+- **"無限ループ"に見えても原因は2系統ある**（プロセスが1個だけの時は相互kickではない＝**アカウント不一致**。ローカルのライセンスemailとブラウザのGoogleサインインemailが違うと、プロセスは正常なのに永遠に「未接続」に見える）。`docs/RUNBOOK-relay-mutual-kick.md`の「診断の分岐」でプロセス数を数えてから対応を選ぶ。
 - 「無限ループが起きてる」と報告されたら、コードを読みに行く前に**必ず**`docs/RUNBOOK-relay-mutual-kick.md`の診断手順（`ps aux | grep relay-client`から）に従う。
 
 ## 構成

package/app/index.html

@@ -6057,8 +6057,16 @@ function bootDisconnected(info){
     #connectGate .cg-hint a:hover{text-decoration:underline}
     #connectGate .cg-who{font-size:12px;color:var(--ink3,#6b6862);margin:0 0 4px}
     #connectGate .cg-who b{color:var(--ink2,#a3a097)}
-    #connectGate .cg-switch{font-size:12px;color:var(--ink3,#6b6862);margin:14px 0 0}
+    #connectGate .cg-switch{font-size:12px;color:var(--ink3,#6b6862);margin:14px 0 0;transition:color .2s}
     #connectGate .cg-switch a{color:var(--blue,#8fb0ff);text-decoration:none}
+    /* A long wait (15s+) almost always means an account mismatch, not a slow
+       first connect (Masa 2026-07-17: kept re-running npx, kept landing back
+       here — the always-on caption below was too easy to miss). Escalate to
+       the existing warning tone (--amber, same as failed-step/review chips)
+       — color only, no filled box, per the hover/attention convention used
+       everywhere else in this app. */
+    #connectGate .cg-switch.escalated{color:var(--amber);font-weight:600}
+    #connectGate .cg-switch.escalated a{color:var(--amber);text-decoration:underline}
     #connectGate .cg-x{position:absolute;top:14px;right:16px;width:28px;height:28px;border:0;background:transparent;color:var(--ink3,#6b6862);font-size:20px;line-height:1;cursor:pointer}
     #connectGate .cg-wait{display:inline-flex;align-items:center;gap:7px;font:500 10.5px/1 var(--mono,monospace);letter-spacing:.08em;color:var(--ink3,#6b6862);margin-top:16px}
     #connectGate .cg-wait i{width:6px;height:6px;border-radius:50%;background:var(--green,#3DDC97);animation:cgpulse 1.8s ease-in-out infinite}
@@ -6111,11 +6119,26 @@ function bootDisconnected(info){
   // `setInterval` + `if (status !== 503) reload` poll, which amplified any agent
   // flap into an infinite reload (the ~10-failure "無限ループ").
   const cgWait = ov.querySelector('.cg-wait');
+  const cgSwitch = ov.querySelector('.cg-switch');
+  // Escalate the account-mismatch hint after a long wait (2026-07-17: mirrors
+  // engine/lib.mjs shouldEscalateConnectGateHint — inlined, this file can't
+  // import engine/lib.mjs). A genuine first connect takes a few seconds; a
+  // wait that crosses 15s is almost always the local agent being signed in
+  // under a DIFFERENT email than this browser (relay identity is per-email,
+  // so re-running `npx @galda/cli` — which reconnects that SAME mismatched
+  // identity — never helps; only `--signin` does). Naming the actual signed-
+  // in email turns "I have no idea what's wrong" into "oh, wrong account".
+  const CG_ESCALATE_MS = 15000;
+  const escalateTimer = (email && cgSwitch) ? setTimeout(() => {
+    cgSwitch.classList.add('escalated');
+    cgSwitch.innerHTML = `Still waiting? Galda may already be running on this computer under a <b>different account</b> than <b>${email.replace(/[<>&]/g, (c) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;' }[c]))}</b>. Run <code>npx @galda/cli --signin</code> in that terminal and pick this account. Or <a href="/logout">switch this browser →</a>`;
+  }, CG_ESCALATE_MS) : null;
   try {
     const es = new EventSource('/presence');
     es.addEventListener('presence', (e) => {
       let d; try { d = JSON.parse(e.data); } catch { return; }
       if (d.state === 'connected') {
+        if (escalateTimer) clearTimeout(escalateTimer);
         // Confirm the engine is REALLY reachable before reloading. A stale/spurious
         // 'connected' presence otherwise reloads us into a white flash that lands
         // right back on this same connect screen — the welcome animation plays, then

package/engine/lib.mjs

@@ -3134,3 +3134,19 @@ export function shouldRefuseRelayClientStart({ existingLock, alive } = {}) {
   if (!alive) return { refuse: false, reason: 'stale-lock' };
   return { refuse: true, reason: 'already-running', holderPid: existingLock.pid };
 }
+
+// --- Connect-gate account-mismatch escalation (2026-07-17) ------------------
+// A genuinely fresh "run npx @galda/cli" wait is short — the agent connects
+// within a few seconds. A wait that runs long almost always means one thing:
+// the local agent IS running, but it's licensed under a DIFFERENT email than
+// the one signed in on this browser (relay identity is per-email, so they
+// never meet). Before this, the only guidance for that exact scenario was a
+// small always-on caption easy to miss among the first-time-setup copy — a
+// user just re-runs `npx @galda/cli` (which reconnects the SAME already-
+// mismatched identity) and waits again, forever. Escalating the hint once the
+// wait crosses a threshold — with the actual signed-in email substituted in —
+// turns "I have no idea what's wrong" into "oh, wrong account" (see
+// docs/RUNBOOK-relay-mutual-kick.md's account-mismatch entry).
+export function shouldEscalateConnectGateHint(waitedMs, email, thresholdMs = 15000) {
+  return Number(waitedMs) >= thresholdMs && Boolean(String(email ?? '').trim());
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galda/cli",
-  "version": "0.10.20",
+  "version": "0.10.21",
   "type": "module",
   "description": "Galda - hand off work to Claude Code or Codex, get proof back. Runs on your existing subscription, no extra API cost.",
   "scripts": {