ccdeck 3.43.0 → 3.43.3

package/dist/web/assets/{index-Bkx27-wy.js → index-DqxnkNs2.js}

@@ -1 +1 @@
-import"./app-9p127oSR.js";(function(){const t=document.createElement("link").relList;if(t&&t.supports&&t.supports("modulepreload"))return;for(const e of document.querySelectorAll('link[rel="modulepreload"]'))i(e);new MutationObserver(e=>{for(const r of e)if(r.type==="childList")for(const o of r.addedNodes)o.tagName==="LINK"&&o.rel==="modulepreload"&&i(o)}).observe(document,{childList:!0,subtree:!0});function s(e){const r={};return e.integrity&&(r.integrity=e.integrity),e.referrerPolicy&&(r.referrerPolicy=e.referrerPolicy),e.crossOrigin==="use-credentials"?r.credentials="include":e.crossOrigin==="anonymous"?r.credentials="omit":r.credentials="same-origin",r}function i(e){if(e.ep)return;e.ep=!0;const r=s(e);fetch(e.href,r)}})();
+import"./app-HpFVXK_g.js";(function(){const t=document.createElement("link").relList;if(t&&t.supports&&t.supports("modulepreload"))return;for(const e of document.querySelectorAll('link[rel="modulepreload"]'))i(e);new MutationObserver(e=>{for(const r of e)if(r.type==="childList")for(const o of r.addedNodes)o.tagName==="LINK"&&o.rel==="modulepreload"&&i(o)}).observe(document,{childList:!0,subtree:!0});function s(e){const r={};return e.integrity&&(r.integrity=e.integrity),e.referrerPolicy&&(r.referrerPolicy=e.referrerPolicy),e.crossOrigin==="use-credentials"?r.credentials="include":e.crossOrigin==="anonymous"?r.credentials="omit":r.credentials="same-origin",r}function i(e){if(e.ep)return;e.ep=!0;const r=s(e);fetch(e.href,r)}})();

package/dist/web/index.html

@@ -77,8 +77,8 @@
         document.documentElement.setAttribute("data-density", density === "tightest" || density === "tighter" || density === "compact" || density === "comfortable" ? density : "default");
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-Bkx27-wy.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/app-9p127oSR.js">
+    <script type="module" crossorigin src="/assets/index-DqxnkNs2.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/app-HpFVXK_g.js">
     <link rel="stylesheet" crossorigin href="/assets/app-DsHSufBt.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccdeck",
-  "version": "3.43.0",
+  "version": "3.43.3",
   "description": "Local dashboard for Claude Code and Codex CLI sessions: which Claude Code session needs input, every tool call and Claude Code subagent live, token cost and quota, several Claude accounts. Run npx ccdeck.",
   "type": "module",
   "bin": {

package/release-notes.json

@@ -76,7 +76,9 @@
     "3.38.6",
     "3.39.4",
     "3.40.1",
-    "3.41.3"
+    "3.41.3",
+    "3.43.1",
+    "3.43.3"
   ],
   "3.43.0": [
     {

package/src/server/account-choice.mjs

@@ -95,7 +95,7 @@ export function readingCurrent(account, models, now) {
 
 /**
  * Whether Auto-switch may land on this account: signed in, in rotation, not
- * the one another paired deck is working on, not one claude-swap has
+ * reserved by a local `cswap run` session, not one claude-swap has
  * quarantined, read recently, and comfortably under the threshold on every
  * window that counts. An account with no 5-hour or weekly window (an API key)
  * is never a target here; the engine still decides about those.
@@ -140,11 +140,12 @@ function soonestWeekly(accounts, ctx, before = null) {
  *             somebody just set a home and expects to be taken there.
  *   threshold the engine's, in percent
  *   models    countedModels(...) of the engine's model setting
- *   busy      keys of the accounts whose login is live somewhere else: on a
- *             paired deck, or in a `cswap run` session
+ *   busy      keys of accounts reserved by local `cswap run` sessions;
+ *             activity reported by other paired devices does not exclude them
  *   quarantined keys of the accounts claude-swap's engine has quarantined
  *   sinceMove ms since the last move, the engine's or this one's
- *   cooldownMs the engine's cooldown, which every move here keeps too
+ *   cooldownMs the engine's cooldown for proactive moves; fully exhausted
+ *             windows can be escaped immediately
  *   optional  whether moves below the threshold may be made at all: only
  *             while the engine itself is on `best`
  *
@@ -154,7 +155,7 @@ export function chooseAccount({ accounts, choice, threshold, models = [], busy =
   const next = choice?.next === "weekly" ? "weekly" : "room";
   const homeKey = choice?.home ?? null;
   if (next === "room" && !homeKey) return null;
-  if (sinceMove < cooldownMs || !Number.isFinite(threshold)) return null;
+  if (!Number.isFinite(threshold)) return null;
 
   const active = accounts.find(a => a.active);
   // The engine reads the account it is on every minute or so; if the store
@@ -162,6 +163,9 @@ export function chooseAccount({ accounts, choice, threshold, models = [], busy =
   if (!active || !readingCurrent(active, models, now)) return null;
   const used = usedOf(active, models);
   if (used == null) return null;
+  // Like the engine, an exhausted window must be escapable immediately.
+  // Ordinary threshold moves and optional returns still keep the cooldown.
+  if (sinceMove < cooldownMs && used < 100) return null;
 
   const ctx = { threshold, models, busy, quarantined, now };
   const home = homeKey ? accounts.find(a => a.key === homeKey) ?? null : null;

package/src/server/cswap-auto-choice.mjs

@@ -30,7 +30,7 @@ import { backupRoot, fetchClaudeAccounts, slotNumber, switchClaudeAccount } from
 import { readCswapConfig } from "./cswap-auto-readers.mjs";
 import { accountKey } from "./lan-copies.mjs";
 import { isProcessAlive } from "./deck-probe.mjs";
-import { chooseAccount, countedModels, NEXT_CHOICES } from "./account-choice.mjs";
+import { chooseAccount, countedModels, readingCurrent, NEXT_CHOICES } from "./account-choice.mjs";
 
 /** Where the choice is kept: beside prefs.json, in the deck's own data. */
 export function choicePath(home = deckDataDir()) {
@@ -146,19 +146,6 @@ async function engineState(accounts) {
   };
 }
 
-/** The accounts the decks this one is paired with say they are working on.
- *  One login live on two machines races for every renewal (README, "One login
- *  live in one place"), so a tick never moves onto one of them. */
-async function accountsOnOtherDecks() {
-  try {
-    const { lanEngine } = await import("./lan-deck.mjs");
-    const peers = lanEngine.status()?.peers ?? [];
-    return new Set(peers.map(p => p?.offers?.current?.key).filter(k => typeof k === "string"));
-  } catch {
-    return new Set();
-  }
-}
-
 /** The name claude-swap gives an account's `cswap run` profile after its
  *  slot number: the email, NFC, with anything but ASCII letters, digits and
  *  `._-` turned into `_` (claude_swap/session.py, slugify_email). */
@@ -212,7 +199,7 @@ const refOf = a => (a ? { number: a.num, email: a.email ?? null } : null);
  * roster it decided on, which noteEngineTick needs to name where the engine
  * went, and null when nothing is set.
  */
-export async function chooseBeforeEngine({ now = Date.now() } = {}) {
+export async function chooseBeforeEngine({ now = Date.now(), refreshHome = true } = {}) {
   const choice = await readChoice();
   if (choice.next === "room" && !choice.home) return { result: null, accounts: null };
   const roster = await fetchClaudeAccounts();
@@ -237,26 +224,39 @@ export async function chooseBeforeEngine({ now = Date.now() } = {}) {
   const threshold = numberOr(cfg["autoswitch.threshold"]?.value, 90);
   const models = countedModels(cfg["autoswitch.model"]?.value);
   const engine = await engineState(accounts);
+  const lastMoveAt = Math.max(choice.lastMoveAt, engine.lastSwitchAt);
+  const cooldownMs = numberOr(cfg["autoswitch.cooldownSeconds"]?.value, 300) * 1000;
+  const cooldownUntil = lastMoveAt + cooldownMs;
   const pick = chooseAccount({
     accounts,
     choice: { next: choice.next, home: choice.home?.key ?? null, manual, goHome },
     threshold,
     models,
-    busy: new Set([...await accountsOnOtherDecks(), ...await accountsInCswapRun(accounts)]),
+    busy: await accountsInCswapRun(accounts),
     quarantined: engine.quarantined,
-    sinceMove: now - Math.max(choice.lastMoveAt, engine.lastSwitchAt),
-    cooldownMs: numberOr(cfg["autoswitch.cooldownSeconds"]?.value, 300) * 1000,
+    sinceMove: now - lastMoveAt,
+    cooldownMs,
     optional: (cfg["autoswitch.strategy"]?.value ?? "best") === "best",
     now,
   });
   if (!pick) {
     await updateChoice(keep);
-    return { result: null, accounts };
+    return { result: null, accounts, cooldownUntil };
+  }
+  // Give Home one collection pass before a fresh weekly candidate can
+  // preempt it. The loop retries with refreshHome=false after its dry run:
+  // a failed/backed-off collection must not prevent leaving a full account.
+  const home = choice.home ? accounts.find(a => a.key === choice.home.key) : null;
+  if (refreshHome && pick.trigger !== "home" && home && !home.active &&
+      !home.disabled && home.alive !== false && !home.error && !home.reauth &&
+      !readingCurrent(home, models, now)) {
+    await updateChoice(keep);
+    return { result: null, accounts, cooldownUntil };
   }
   const moved = await switchClaudeAccount(pick.to.num);
   if (!moved.ok) {
     await updateChoice(keep);
-    return { result: null, accounts };
+    return { result: null, accounts, cooldownUntil };
   }
   // The move happened, so where it left the user and when are true whatever
   // was set meanwhile; a home still to be gone to is the current choice's.

package/src/server/cswap-auto-loop.mjs

@@ -102,8 +102,35 @@ async function runAutoTick() {
     if (await externalAutoRunning()) return { skipped: "external-engine" };
     // The deck's own rules first. A move they make is the tick; when they have
     // nothing to say — or cannot say it — the engine decides, as it always did.
-    const chose = await chooseBeforeEngine().catch(() => ({ result: null, accounts: null }));
+    let chose = await chooseBeforeEngine().catch(() => ({ result: null, accounts: null }));
     if (chose.result) return { chose: chose.result };
+    // The store may still have a reading from before the active account
+    // reached its limit. The engine polls before deciding; letting
+    // its real tick run now would switch by `best` before our weekly/home
+    // rules ever saw that reading. Poll without moving first, then give the
+    // configured rules the refreshed roster under this same store lock.
+    // No rule configured (accounts === null) keeps the original single run.
+    if (chose.accounts) {
+      const preview = await run(await cswapBin(), ["auto", "--once", "--json", "--dry-run"], { timeout: TICK_TIMEOUT_MS });
+      if (preview.timedOut || (!preview.ok && !preview.stdout)) return preview;
+      if (!_enabled) return { skipped: "disabled" };
+      if (await externalAutoRunning()) return { skipped: "external-engine" };
+      invalidateClaudeAccountsCache();
+      chose = await chooseBeforeEngine({ refreshHome: false }).catch(() => ({ result: null, accounts: null }));
+      if (chose.result) return { chose: chose.result };
+      // A deck-managed `cswap switch` does not advance the engine's own
+      // lastSwitchAt. Its fallback must keep our cooldown too, or a manual
+      // return to the full account can immediately escape the weekly rule
+      // through the engine's most-room choice. Still allow emergency exits.
+      const decision = summarise(preview.stdout);
+      if (Date.now() < chose.cooldownUntil && decision.trigger !== "at-limit" && decision.trigger !== "failover") {
+        return { chose: {
+          ok: true, ...decision, event: "no-switch", switched: false,
+          trigger: null, reason: "cooldown", from: null, to: null,
+          detail: "Waiting for the account-switch cooldown",
+        } };
+      }
+    }
     const out = await run(await cswapBin(), ["auto", "--once", "--json"], { timeout: TICK_TIMEOUT_MS });
     return { ...out, accounts: chose.accounts };
   });