npm - @galda/cli - Versions diffs - 0.10.11 → 0.10.12 - Mend

@galda/cli 0.10.11 → 0.10.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/app/index.html CHANGED Viewed

@@ -971,7 +971,7 @@
   .gearbtn{display:grid;place-items:center;width:30px;height:28px;border:1px solid var(--hair2);border-radius:8px;background:transparent;color:var(--ink2);cursor:pointer}
   .gearbtn:hover{background:var(--surface2);color:var(--ink)}
   .gearbtn svg{width:15px;height:15px;fill:none;stroke:currentColor;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round}
-  .gearpop{display:none;position:absolute;top:36px;right:0;z-index:80;background:var(--panel);border-radius:12px;box-shadow:0 10px 30px rgba(20,23,31,.18),0 0 0 1px var(--hair);padding:12px 13px;width:250px;
+  .gearpop{display:none;position:absolute;top:36px;right:0;z-index:80;background:var(--panel);border-radius:12px;box-shadow:0 10px 30px rgba(20,23,31,.18),0 0 0 1px var(--hair);padding:12px 13px;width:320px;
     max-height:78vh;overflow-y:auto;scrollbar-width:thin; /* TB edge + colour sections made it taller than the viewport */
     /* opaque chip fill (HANDOFF-v45 §9): a translucent --canvas would let the wallpaper
        bleed through and colour each row differently — this token mixes off the OPAQUE
@@ -1008,7 +1008,7 @@
      the rail (left is set on open from the measured rail edge), max-height = viewport −
      margins, internal scroll. White-translucent per §3: color-mix 74% + blur28 (theme-tinted).
      The node is adopted to <body> in flagship (positionLayout) — .top is display:none there. */
-  body[data-layout="flagship"] .gearpop{position:fixed;top:120px;right:auto;width:300px;max-height:calc(100vh - 160px);border-radius:14px;
+  body[data-layout="flagship"] .gearpop{position:fixed;top:120px;right:auto;width:380px;max-height:calc(100vh - 160px);border-radius:14px;
     background:color-mix(in srgb,var(--panel) 74%,transparent);
     -webkit-backdrop-filter:blur(28px) saturate(1.35);backdrop-filter:blur(28px) saturate(1.35)}
   /* settings = EDIT SESSION (HANDOFF-v45 §3, flagship .cfoot/.mcpbox port): sticky footer,
@@ -2183,9 +2183,8 @@
       <div class="lbrow"><span class="lb">Projects</span>
         <button class="ghostbtn morebtn" id="fsMoreBtn" title="Settings"><svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="3.2"/><path d="M19.4 15a1.7 1.7 0 00.34 1.87l.06.06a2 2 0 11-2.83 2.83l-.06-.06a1.7 1.7 0 00-1.87-.34 1.7 1.7 0 00-1 1.56V21a2 2 0 11-4 0v-.09a1.7 1.7 0 00-1-1.56 1.7 1.7 0 00-1.87.34l-.06.06a2 2 0 11-2.83-2.83l.06-.06a1.7 1.7 0 00.34-1.87 1.7 1.7 0 00-1.56-1H3a2 2 0 110-4h.09a1.7 1.7 0 001.56-1 1.7 1.7 0 00-.34-1.87l-.06-.06a2 2 0 112.83-2.83l.06.06a1.7 1.7 0 001.87.34h.09a1.7 1.7 0 001-1.56V3a2 2 0 114 0v.09a1.7 1.7 0 001 1.56h.09a1.7 1.7 0 001.87-.34l.06-.06a2 2 0 112.83 2.83l-.06.06a1.7 1.7 0 00-.34 1.87v.09a1.7 1.7 0 001.56 1H21a2 2 0 110 4h-.09a1.7 1.7 0 00-1.56 1z"/></svg></button>
         <div class="moremenu" id="fsMoreMenu">
-          <button class="ghostbtn" id="fsCust">Customize…</button>
+          <button class="ghostbtn" id="fsCust">Theme Color…</button>
           <button class="ghostbtn" id="fsConn">Connect MCP</button>
-          <button class="ghostbtn" id="fsTodoBd">To Do board</button>
           <button class="ghostbtn" id="fsHist">History</button>
           <button class="ghostbtn" id="fsSet">Settings</button>
         </div>
@@ -5401,6 +5400,19 @@ function renderClawdHero(){
   tgUpdate();
   $('fsMoreBtn').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.toggle('open'); };
   document.addEventListener('click', (e) => { if (!e.target.closest('#fsRoot .lbrow')) $('fsMoreMenu').classList.remove('open'); });
+  // Hover-first (Masa指示 2026-07-16): on a real pointer, aligning the cursor over
+  // the gear reveals the menu with no click, and resting on a menu row previews
+  // its panel straight away — click still works underneath for touch. A short
+  // hover-intent delay (120ms) stops a mouse just passing through from flashing
+  // every panel open.
+  if (matchMedia('(hover:hover)').matches) {
+    const lbrow = $('fsMoreBtn').closest('.lbrow');
+    let closeT = null;
+    if (lbrow) {
+      lbrow.addEventListener('mouseenter', () => { clearTimeout(closeT); $('fsMoreMenu').classList.add('open'); });
+      lbrow.addEventListener('mouseleave', () => { closeT = setTimeout(() => $('fsMoreMenu').classList.remove('open'), 150); });
+    }
+  }
   const closeMobilePanels = () => {
     document.body.classList.remove('laneopen', 'projectsopen');
   };
@@ -5422,11 +5434,21 @@ function renderClawdHero(){
   // v46 (HANDOFF-v45 §3): the menu entries deep-link into the 4-tab settings panel —
   // Customize…→THEME / Connect MCP→MCP / History→HISTORY / Settings→SETTINGS.
   // stopPropagation: the document click-away handler otherwise closes it in the same event.
-  $('fsCust').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('theme'); };
-  $('fsConn').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('mcp'); };
-  $('fsTodoBd').onclick = () => { $('fsMoreMenu').classList.remove('open'); $('toggle').click(); }; // To Do board stays reachable from the menu; ⌘K itself now opens the project switcher (HANDOFF-v45 §11)
-  $('fsHist').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('history'); };
-  $('fsSet').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('settings'); };
+  // Each row also opens on hover-intent (120ms), so resting the cursor on a row is
+  // enough to see its panel — click still fires the same action underneath.
+  const menuItem = (btn, tab) => {
+    const open = (e) => { e && e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen(tab); };
+    btn.onclick = open;
+    if (matchMedia('(hover:hover)').matches) {
+      let t = null;
+      btn.addEventListener('mouseenter', () => { t = setTimeout(open, 120); });
+      btn.addEventListener('mouseleave', () => clearTimeout(t));
+    }
+  };
+  menuItem($('fsCust'), 'theme');
+  menuItem($('fsConn'), 'mcp');
+  menuItem($('fsHist'), 'history');
+  menuItem($('fsSet'), 'settings');
   // parallel-runs switcher (§1.5-1/-7): same toggle+click-away shape as fsMoreMenu above.
   // Row content is rebuilt by renderFsFeed() (running list changes live); the open/closed
   // class here is left alone by that rebuild so the popover doesn't snap shut mid-render.
@@ -7451,11 +7473,11 @@ function gearSetHTML(){
         <button class="optchip" data-gsignin="1">Sign in with Google</button></div>
        <div class="srow dis" id="licKeyMsg" style="display:none"></div>`;
   } else if (bill.plan === 'paid') {
-    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google</span></div><span class="bx-sval">${esc(bill.email)}</span></div>
+    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google · ${esc(bill.email)}</span></div><button class="optchip" data-gsignout="1">Log out</button></div>
        <div class="srow"><div class="sl">Plan</div><span class="bx-pdot"><i></i>Paid</span></div>
        <div class="srow"><div class="sl">Billing<span class="sd">manage or cancel in Stripe</span></div><button class="bx-cchip" data-gportal="1">Manage</button></div>`;
   } else {
-    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google</span></div><span class="bx-sval">${esc(bill.email)}</span></div>
+    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google · ${esc(bill.email)}</span></div><button class="optchip" data-gsignout="1">Log out</button></div>
        <div class="srow"><div class="sl">Plan</div><span class="bx-sval">Free</span></div>
        <div class="srow"><div class="sl">To Dos<span class="sd">pending, this install</span></div><span class="bx-sval bx-num">${u.pending ?? 0} / ${lim.pending ?? 5}</span></div>
        <div class="srow"><div class="sl">Lifetime</div><span class="bx-sval bx-num">${u.cumulative ?? 0} / ${lim.cumulative ?? 19}</span></div>
@@ -7517,6 +7539,12 @@ function buildGearPop(){
     if (upBtn) upBtn.onclick = () => startCheckout();
     const portalBtn = pop.querySelector('[data-gportal]');
     if (portalBtn) portalBtn.onclick = () => openBillingPortal();
+    const signOutBtn = pop.querySelector('[data-gsignout]');
+    if (signOutBtn) signOutBtn.onclick = async () => {
+      signOutBtn.disabled = true;
+      try { await fetch(withKey('/api/signout'), { method: 'POST' }); }
+      finally { await refresh(); if ($('gearPop')) buildGearPop(); }
+    };
     return;
   }
   if (custTab === 'mcp') {

package/engine/relay-client.mjs CHANGED Viewed

@@ -100,8 +100,19 @@ function connect(retryMs = 1000) {
       live.delete(m.id);
     }
   };
-  ws.onclose = () => {
+  ws.onclose = (ev) => {
     if (ws !== currentWs) return; // a superseded socket (we already moved on) — don't reconnect
+    // Close 4000 = the relay evicted us because a NEWER agent for the SAME account
+    // connected (server.mjs "replaced by a newer connection"). If we reconnect we
+    // evict THAT one → the two instances mutual-kick forever, which surfaces to the
+    // user as app.galda.app reload-looping. Stand down: the newest instance is
+    // authoritative. (A normal network drop uses a different code and still
+    // reconnects; sign-in via the watcher below can still retake.)
+    if (ev && ev.code === 4000) {
+      console.log('[agent] relay: superseded by a newer instance of this account — standing down (run only one manager per account)');
+      currentWs = null;
+      return;
+    }
     console.log(`[agent] relay connection lost — retrying in ${retryMs}ms`);
     scheduleReconnect(retryMs);
   };

package/engine/server.mjs CHANGED Viewed

@@ -13,7 +13,7 @@
 import { createServer } from 'node:http';
 import { spawn, execFile, spawnSync } from 'node:child_process';
-import { readFileSync, writeFileSync, appendFileSync, existsSync, mkdirSync, statSync, readdirSync } from 'node:fs';
+import { readFileSync, writeFileSync, appendFileSync, existsSync, mkdirSync, statSync, readdirSync, unlinkSync } from 'node:fs';
 import { emitEvent } from './analytics-client.mjs';
 import { randomBytes, createHash } from 'node:crypto';
 import { resolve, dirname, join, basename } from 'node:path';
@@ -2556,6 +2556,16 @@ const server = createServer(async (req, res) => {
     return;
   }
+  // POST /api/signout — forget the local license so the settings panel can
+  // offer a plain "Log out" instead of requiring the `--signin` CLI flag to
+  // switch Google accounts. Clears the on-disk token and the in-memory cache;
+  // idempotent when already signed out.
+  if (url.pathname === '/api/signout' && req.method === 'POST') {
+    if (existsSync(licenseFile)) unlinkSync(licenseFile);
+    licenseState = { email: null, isPaying: false, verifiedAt: 0 };
+    return json(res, 200, { ok: true });
+  }
   // GET /api/signin-url — mints a one-time nonce and returns the billing
   // Worker's /connect URL for "Sign in with Google". The app opens this in the
   // browser; Google bounces back to /oauth/callback (below) with a token.

package/package.json CHANGED Viewed

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