ccdeck 3.48.1 → 3.49.1
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.
- package/README.md +20 -17
- package/dist/web/assets/{BrowserWatchModal-Dfsuy2cT.js → BrowserWatchModal-CCARqAMn.js} +1 -1
- package/dist/web/assets/{IntegrationModal-CcSR7YB-.js → IntegrationModal-B8t53aE5.js} +1 -1
- package/dist/web/assets/{RadioPanel-s7WXdS6v.js → RadioPanel-gFYxdsBg.js} +1 -1
- package/dist/web/assets/{TrafficRadar-C5GXMIwi.js → TrafficRadar-B9MfKca4.js} +2 -2
- package/dist/web/assets/{UsageHistoryModal-CiExD9wF.js → UsageHistoryModal-DvYWhsYv.js} +1 -1
- package/dist/web/assets/app-D2NP6IPl.js +321 -0
- package/dist/web/assets/app-DfGYllmZ.css +1 -0
- package/dist/web/assets/{index-ByovgZ_7.js → index-Be6Ox-74.js} +1 -1
- package/dist/web/index.html +3 -3
- package/package.json +1 -1
- package/release-notes.json +93 -12
- package/src/server/account-notify.mjs +2 -54
- package/src/server/account-watch.mjs +0 -47
- package/src/server/deck-prefs.mjs +9 -14
- package/src/server/integrations/store.mjs +21 -0
- package/src/server/lan-deck.mjs +0 -7
- package/src/server/login-service.mjs +3 -0
- package/src/server/reports.mjs +25 -2
- package/dist/web/assets/app-BFaxhiED.js +0 -321
- package/dist/web/assets/app-DjlHxWHg.css +0 -1
- package/src/server/lan-elsewhere.d.mts +0 -30
- package/src/server/lan-elsewhere.mjs +0 -137
|
@@ -1 +1 @@
|
|
|
1
|
-
import"./app-
|
|
1
|
+
import"./app-D2NP6IPl.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
CHANGED
|
@@ -77,9 +77,9 @@
|
|
|
77
77
|
document.documentElement.setAttribute("data-density", density === "tightest" || density === "tighter" || density === "compact" || density === "comfortable" ? density : "default");
|
|
78
78
|
})();
|
|
79
79
|
</script>
|
|
80
|
-
<script type="module" crossorigin src="/assets/index-
|
|
81
|
-
<link rel="modulepreload" crossorigin href="/assets/app-
|
|
82
|
-
<link rel="stylesheet" crossorigin href="/assets/app-
|
|
80
|
+
<script type="module" crossorigin src="/assets/index-Be6Ox-74.js"></script>
|
|
81
|
+
<link rel="modulepreload" crossorigin href="/assets/app-D2NP6IPl.js">
|
|
82
|
+
<link rel="stylesheet" crossorigin href="/assets/app-DfGYllmZ.css">
|
|
83
83
|
</head>
|
|
84
84
|
<body>
|
|
85
85
|
<div id="root"></div>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ccdeck",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.49.1",
|
|
4
4
|
"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.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
package/release-notes.json
CHANGED
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"fire, anything that is invisible when it is correct.",
|
|
17
17
|
"",
|
|
18
18
|
"Write it for the person running the deck, not for the person reading the",
|
|
19
|
-
"diff. `title` is the
|
|
20
|
-
"
|
|
19
|
+
"diff. `title` is the sentence they scan; `body` is what they need in order",
|
|
20
|
+
"to act on it, or to stop worrying about it.",
|
|
21
21
|
"",
|
|
22
22
|
"Keys are versions exactly as package.json spells them. A key that is not a",
|
|
23
23
|
"version, or an entry missing either field, fails the suite rather than",
|
|
@@ -36,9 +36,56 @@
|
|
|
36
36
|
"own is ambiguous — a missing key reads the same whether it was a decision",
|
|
37
37
|
"or a forgotten step, and five releases in a row were once forgotten. The list",
|
|
38
38
|
"is what tells the two apart, and release-notes-current-version.test.ts fails",
|
|
39
|
-
"the release whose version is in neither place. Any key opening with // is
|
|
40
|
-
"
|
|
41
|
-
|
|
39
|
+
"the release whose version is in neither place. Any key opening with // is",
|
|
40
|
+
"author metadata and never a release.",
|
|
41
|
+
"",
|
|
42
|
+
"Editorial metadata: optional //summaries maps a release version to one",
|
|
43
|
+
"specific, verified headline (1–120 characters). No generic marketing claims.",
|
|
44
|
+
"A note may have priority: highlight or required. Choose at most 3 highlights,",
|
|
45
|
+
"only when warranted. Unmarked notes go under More improvements when highlights",
|
|
46
|
+
"exist. Legacy notes stay unabridged; legacy upgrade notes stay visible.",
|
|
47
|
+
"Use required for breaking changes, changed settings, privacy/security impact,",
|
|
48
|
+
"compatibility requirements or mandatory actions. A highlight with any such",
|
|
49
|
+
"impact must also carry a notice with all essential qualifications: highlight",
|
|
50
|
+
"alone is editorial placement, not an instruction to surface it across upgrades.",
|
|
51
|
+
"Required notes and notices stay visible across upgrades, never in a closed section.",
|
|
52
|
+
"Write a short benefit-led title and one useful sentence where possible; keep",
|
|
53
|
+
"opt-outs and limits. Avoid inflated adjectives, filler and generic claims.",
|
|
54
|
+
"Preserve original factual meaning. Never invent capabilities or results.",
|
|
55
|
+
"Retain setup instructions and compatibility minimums. Say only what a user",
|
|
56
|
+
"sees in the app: usage reports, telemetry and environment variables are for",
|
|
57
|
+
"README to explain, not for a note.",
|
|
58
|
+
"Verify each claim against the released diff and tests. No promotion",
|
|
59
|
+
"for invisible fixes. Do not rewrite historical releases to fit the layout.",
|
|
60
|
+
"",
|
|
61
|
+
"Keep highlight titles within 72 characters (excluding a leading emoji) and",
|
|
62
|
+
"benefit descriptions within 240 characters. These limits are validated.",
|
|
63
|
+
"Put essential compatibility, privacy or configuration details in optional",
|
|
64
|
+
"notice text, outside More improvements. Current/upgrade notices stay visible and",
|
|
65
|
+
"have no truncation limit. A notice also keeps its change visible across upgrades.",
|
|
66
|
+
"Optional noticeLabel gives it a short factual heading (1–32 characters), such",
|
|
67
|
+
"as Setup change or Compatibility. It requires notice text; default is Important.",
|
|
68
|
+
"Optional details holds secondary context, shown under the same improvements",
|
|
69
|
+
"disclosure for highlights and beside other notes. Keep the body to one useful",
|
|
70
|
+
"sentence. Never move setup, safety, privacy or compatibility conditions into",
|
|
71
|
+
"details: use notice for those, so they remain visible across upgrades.",
|
|
72
|
+
"The disclosure counts other improvements, not extra details of highlights.",
|
|
73
|
+
"Mark any other mandatory action as required. The manual digest shows only the",
|
|
74
|
+
"running release; Release history opens the full changelog. Upgrade notes keep",
|
|
75
|
+
"required/noticed changes visible and disclose the other notes in that range.",
|
|
76
|
+
"Unclassified legacy upgrade notes stay visible rather than guessing safety.",
|
|
77
|
+
"Before adding editorial metadata to a release, review every note: unmarked",
|
|
78
|
+
"changes will be treated as optional in later upgrades. Never infer safety",
|
|
79
|
+
"from a title, keyword, emoji, position or a shortened description.",
|
|
80
|
+
"",
|
|
81
|
+
"Optional icon is a semantic key: plans, accounts or skills. Use it only when",
|
|
82
|
+
"it matches the change; do not infer icons from versions, titles or emoji.",
|
|
83
|
+
"The modal shows a title's leading emoji; the glyph stands in only for a title",
|
|
84
|
+
"without one."
|
|
85
|
+
],
|
|
86
|
+
"//summaries": {
|
|
87
|
+
"3.46.0": "Plans, accounts and skills at a glance"
|
|
88
|
+
},
|
|
42
89
|
"//nothing-to-say": [
|
|
43
90
|
"3.23.1",
|
|
44
91
|
"3.23.2",
|
|
@@ -79,7 +126,31 @@
|
|
|
79
126
|
"3.41.3",
|
|
80
127
|
"3.43.1",
|
|
81
128
|
"3.43.3",
|
|
82
|
-
"3.48.1"
|
|
129
|
+
"3.48.1",
|
|
130
|
+
"3.49.1"
|
|
131
|
+
],
|
|
132
|
+
"3.49.0": [
|
|
133
|
+
{
|
|
134
|
+
"title": "🗞️ What's new is shorter and easier to scan",
|
|
135
|
+
"body": "Up to three main changes come first and the rest wait under Show details; Check for updates moved to the dialog's More options menu."
|
|
136
|
+
},
|
|
137
|
+
{
|
|
138
|
+
"title": "👥 No warning when one account is in use on several decks",
|
|
139
|
+
"body": "The account row and the desktop no longer flag it, and the Login active on another deck switch is gone from Settings › Notifications; expired logins are still shown.",
|
|
140
|
+
"priority": "required"
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
"title": "📍 Auto-hidden sessions come back where they were",
|
|
144
|
+
"body": "With Hide finished sessions after on, a session that works again returns to its place, with its new subagents beside it rather than further down the board."
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
"title": "💻 Windows: About flags an outdated terminal CLI",
|
|
148
|
+
"body": "When the npm ccdeck on PATH is older than the desktop app, Settings › About shows the command that updates it."
|
|
149
|
+
},
|
|
150
|
+
{
|
|
151
|
+
"title": "✏️ Texts that fell behind are up to date",
|
|
152
|
+
"body": "Explore integrations says Jira can move issues, and the Radar and Where the time went tips match what the app does."
|
|
153
|
+
}
|
|
83
154
|
],
|
|
84
155
|
"3.48.0": [
|
|
85
156
|
{
|
|
@@ -147,20 +218,30 @@
|
|
|
147
218
|
"body": "It now sees Claude Code started from its versioned install folder, plus connection attempts that got no reply and the telemetry variables it was launched with."
|
|
148
219
|
},
|
|
149
220
|
{
|
|
150
|
-
"title": "🗺️
|
|
151
|
-
"body": "
|
|
221
|
+
"title": "🗺️ Follow plans at any zoom",
|
|
222
|
+
"body": "See plan progress on session notes and directly on the canvas.",
|
|
223
|
+
"priority": "highlight",
|
|
224
|
+
"icon": "plans",
|
|
225
|
+
"details": "Subagents stay in one column beside their parent."
|
|
152
226
|
},
|
|
153
227
|
{
|
|
154
|
-
"title": "✅
|
|
155
|
-
"body": "After
|
|
228
|
+
"title": "✅ Keep your Claude account in sync",
|
|
229
|
+
"body": "After `/login`, Accounts, Switch, Auto-switch and Usage follow your active Claude Code account.",
|
|
230
|
+
"priority": "highlight",
|
|
231
|
+
"icon": "accounts",
|
|
232
|
+
"details": "Auto-switch can also be set up while it is off."
|
|
156
233
|
},
|
|
157
234
|
{
|
|
158
235
|
"title": "📊 Account capacity and the Reset calendar have their own buttons",
|
|
159
236
|
"body": "Both open from the left stripe, under Claude accounts, instead of from the small gauge in the accounts panel's header."
|
|
160
237
|
},
|
|
161
238
|
{
|
|
162
|
-
"title": "🧩
|
|
163
|
-
"body": "
|
|
239
|
+
"title": "🧩 See which skills your agents use",
|
|
240
|
+
"body": "Review skill activity from the right sidebar, including typed slash commands.",
|
|
241
|
+
"priority": "highlight",
|
|
242
|
+
"notice": "Counting typed slash commands adds a `UserPromptExpansion` hook to Claude Code's `settings.json` on supported versions (2.1.116+). Set `AGENTS_DECK_SKILL_HOOK=0` to opt out.",
|
|
243
|
+
"icon": "skills",
|
|
244
|
+
"noticeLabel": "Setup change"
|
|
164
245
|
},
|
|
165
246
|
{
|
|
166
247
|
"title": "📈 Load history keeps the reading you click",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
//
|
|
1
|
+
// Four notifications about the accounts the deck is on, and the rules for when
|
|
2
2
|
// each is said.
|
|
3
3
|
//
|
|
4
4
|
// SWAP the deck's own auto-switch tick moved the live Claude account.
|
|
@@ -13,11 +13,6 @@
|
|
|
13
13
|
// every session on the machine shares the login, so they stop
|
|
14
14
|
// together — with how many stopped and that each needs a
|
|
15
15
|
// "continue" once a working login is active.
|
|
16
|
-
// ELSEWHERE the Claude account this deck is on is the one a paired deck says
|
|
17
|
-
// it is on too (#2192). Said once per incident — from the moment
|
|
18
|
-
// both are on it until one of them is not — because the next
|
|
19
|
-
// renewal signs one of the two machines out, and nothing on the
|
|
20
|
-
// desktop says so before it does. See lan-elsewhere.mjs.
|
|
21
16
|
//
|
|
22
17
|
// SPARSE BY CONSTRUCTION. Each window is a record keyed by provider, account
|
|
23
18
|
// and window, holding the reset instant it is about and the levels already said
|
|
@@ -47,7 +42,6 @@
|
|
|
47
42
|
// injected — the shape block-notify.mjs uses, for the reason it gives: what the
|
|
48
43
|
// suite cannot run is what drifts.
|
|
49
44
|
import { switchCanCure } from "./stop-failure.mjs";
|
|
50
|
-
import { deckList } from "./lan-elsewhere.mjs";
|
|
51
45
|
|
|
52
46
|
/** The levels a window is announced at, lowest first. */
|
|
53
47
|
export const LEVELS = Object.freeze([90, 100]);
|
|
@@ -409,23 +403,6 @@ export function stuckNotice({ fromName }) {
|
|
|
409
403
|
return { who: SWAP_WHO, body: `${from}'s login expired · no other account is ready to switch to` };
|
|
410
404
|
}
|
|
411
405
|
|
|
412
|
-
/**
|
|
413
|
-
* "Claude · work@x.com", "Also active on iMac. When one machine renews this
|
|
414
|
-
* login, the other is signed out — use a different account on one of them."
|
|
415
|
-
*
|
|
416
|
-
* The decks by the names Local network's list gives them. The reason is the
|
|
417
|
-
* sentence, because it is the whole of why this is worth a notification: the
|
|
418
|
-
* same account on two machines is ordinary, one copied login live on two is
|
|
419
|
-
* what breaks, and the remedy is one press on either machine.
|
|
420
|
-
*/
|
|
421
|
-
export function elsewhereNotice({ accountName, decks }) {
|
|
422
|
-
return {
|
|
423
|
-
who: whoFor("claude", accountName),
|
|
424
|
-
body: `Also active on ${cut(deckList(decks), NAME_MAX)}. When one machine renews this login, the other is `
|
|
425
|
-
+ "signed out — use a different account on one of them.",
|
|
426
|
-
};
|
|
427
|
-
}
|
|
428
|
-
|
|
429
406
|
/** The records, as read back from disk: anything that is not one is dropped,
|
|
430
407
|
* and so is one nobody has read for RECORD_KEEP_MS. */
|
|
431
408
|
export function normaliseRecords(raw, now) {
|
|
@@ -458,7 +435,7 @@ function laterUnref(fn, ms) {
|
|
|
458
435
|
*
|
|
459
436
|
* notify(title, body, meta) the OS call — injected, never awaited by a poll
|
|
460
437
|
* or a tick, and its failure goes to `onError`
|
|
461
|
-
* settings() `{ swap, quota, reset, stopped
|
|
438
|
+
* settings() `{ swap, quota, reset, stopped }`,
|
|
462
439
|
* asked per decision, so a switch pressed mid-run
|
|
463
440
|
* takes effect at once
|
|
464
441
|
* load() / save(records) the disk, both best effort
|
|
@@ -482,11 +459,6 @@ export function createAccountNotifier({
|
|
|
482
459
|
let policy = null;
|
|
483
460
|
/** Threshold notices held for a tick, by record key. */
|
|
484
461
|
const held = new Map();
|
|
485
|
-
/** The account whose ELSEWHERE incident is open — this deck and another on
|
|
486
|
-
* it — and therefore already said, or null. One at a time, because this
|
|
487
|
-
* deck is on one account at a time. Kept in memory: a restart in the middle
|
|
488
|
-
* of an incident says it once more, which is a restart's news as well. */
|
|
489
|
-
let elsewhereOpen = null;
|
|
490
462
|
let holdTimer = null;
|
|
491
463
|
let saving = Promise.resolve();
|
|
492
464
|
/** The stop incident being gathered or held, or the one already said while
|
|
@@ -759,35 +731,11 @@ export function createAccountNotifier({
|
|
|
759
731
|
}
|
|
760
732
|
}
|
|
761
733
|
|
|
762
|
-
/**
|
|
763
|
-
* What Local network says about the account this deck is on: `account` is
|
|
764
|
-
* `{ key, name }`, or null when this deck is on none, and `decks` the paired
|
|
765
|
-
* decks that say they are on it too, by name.
|
|
766
|
-
*
|
|
767
|
-
* ONCE PER INCIDENT. The incident opens when both are on it, is said then —
|
|
768
|
-
* if the switch is on at that moment — and closes when either moves off it
|
|
769
|
-
* or the other deck stops saying so (lan-elsewhere.mjs holds a deck's word
|
|
770
|
-
* for five minutes, which is what keeps a dropped round from closing it). A
|
|
771
|
-
* new one is news again; the same one, every minute, is not.
|
|
772
|
-
*/
|
|
773
|
-
async function elsewhere(account, decks) {
|
|
774
|
-
try {
|
|
775
|
-
await ready;
|
|
776
|
-
const key = account?.key && Array.isArray(decks) && decks.length > 0 ? account.key : null;
|
|
777
|
-
if (key === elsewhereOpen) return;
|
|
778
|
-
elsewhereOpen = key;
|
|
779
|
-
if (key && settings().elsewhere) say(elsewhereNotice({ accountName: account.name, decks }));
|
|
780
|
-
} catch (err) {
|
|
781
|
-
onError?.(err);
|
|
782
|
-
}
|
|
783
|
-
}
|
|
784
|
-
|
|
785
734
|
return {
|
|
786
735
|
ready,
|
|
787
736
|
observe,
|
|
788
737
|
tick,
|
|
789
738
|
stopped,
|
|
790
|
-
elsewhere,
|
|
791
739
|
/** The loop was switched on or off. Off, nothing will carry what is held. */
|
|
792
740
|
autoSwitch(on) {
|
|
793
741
|
autoOn = on === true;
|
|
@@ -24,10 +24,6 @@ import { writeFileAtomic } from "./atomic-write.mjs";
|
|
|
24
24
|
// What a StopFailure says, and the words a notification names a session by.
|
|
25
25
|
import { stopFailureOf, switchCanCure } from "./stop-failure.mjs";
|
|
26
26
|
import { whoOf } from "./block-notify.mjs";
|
|
27
|
-
// Which deck is on what, as Local network last heard it, and the identity rule
|
|
28
|
-
// its keys are made by (#2192).
|
|
29
|
-
import { elsewhereNow } from "./lan-elsewhere.mjs";
|
|
30
|
-
import { accountKey } from "./lan-copies.mjs";
|
|
31
27
|
|
|
32
28
|
const PKG_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..", "..");
|
|
33
29
|
|
|
@@ -46,19 +42,10 @@ export function recordsPath(home = deckDataDir()) {
|
|
|
46
42
|
*/
|
|
47
43
|
export const WATCH_MS = 2 * 60_000;
|
|
48
44
|
|
|
49
|
-
/**
|
|
50
|
-
* How often the notifier asks Local network whether the account this deck is
|
|
51
|
-
* on is live on another deck too (#2192). A round is a minute, so asking more
|
|
52
|
-
* often finds nothing new; and with no deck on any account of this one's, the
|
|
53
|
-
* look is the engine's status and nothing else — the store is not read.
|
|
54
|
-
*/
|
|
55
|
-
export const ELSEWHERE_WATCH_MS = 60_000;
|
|
56
|
-
|
|
57
45
|
let _deps = null;
|
|
58
46
|
let _notifier = null;
|
|
59
47
|
let _autoOn = false;
|
|
60
48
|
let _timer = null;
|
|
61
|
-
let _elsewhereTimer = null;
|
|
62
49
|
let _watching = null;
|
|
63
50
|
/** The auto-switch loop's "tick now", handed in by the loop as it loads
|
|
64
51
|
* (cswap-auto-loop.mjs `tickSoon`). Null until then, and on a deck that never
|
|
@@ -224,35 +211,6 @@ export function watchOnce(providers) {
|
|
|
224
211
|
return _watching;
|
|
225
212
|
}
|
|
226
213
|
|
|
227
|
-
/**
|
|
228
|
-
* One look at whether the account this deck is on is one a paired deck says it
|
|
229
|
-
* is on too, handed to the notifier, which says it once per incident.
|
|
230
|
-
*
|
|
231
|
-
* The store is read only when some deck is on some account, and through the
|
|
232
|
-
* roster's own cache, which the panel and every LAN round already keep warm. A
|
|
233
|
-
* roster that could not be read says nothing and closes nothing: not knowing
|
|
234
|
-
* which account this deck is on is not the same as being on none.
|
|
235
|
-
*/
|
|
236
|
-
export async function watchElsewhereOnce(now = Date.now()) {
|
|
237
|
-
const n = notifier();
|
|
238
|
-
if (!n) return;
|
|
239
|
-
try {
|
|
240
|
-
const on = elsewhereNow(now);
|
|
241
|
-
if (on.size === 0) return n.elsewhere(null, []);
|
|
242
|
-
const { fetchClaudeAccounts } = await import(pathToFileURL(join(PKG_ROOT, "src/server/claude-accounts.mjs")).href);
|
|
243
|
-
const got = await fetchClaudeAccounts();
|
|
244
|
-
if (!got?.ok || !Array.isArray(got.accounts)) return;
|
|
245
|
-
const live = got.accounts.find(a => a?.active === true);
|
|
246
|
-
if (!live?.email) return n.elsewhere(null, []);
|
|
247
|
-
const key = accountKey(live.email, live.orgUuid);
|
|
248
|
-
const name = typeof live.alias === "string" && live.alias.trim() ? live.alias.trim() : live.email;
|
|
249
|
-
return n.elsewhere({ key, name }, on.get(key) ?? []);
|
|
250
|
-
} catch {
|
|
251
|
-
// The roster's own failures are its panel's to say; here there is nothing
|
|
252
|
-
// to compare this time.
|
|
253
|
-
}
|
|
254
|
-
}
|
|
255
|
-
|
|
256
214
|
/**
|
|
257
215
|
* Start reading quota on a timer, from startServer once the port is bound —
|
|
258
216
|
* never at import, because a launcher imports the server module only to ask
|
|
@@ -264,9 +222,4 @@ export function startAccountWatch({ providers } = {}) {
|
|
|
264
222
|
_timer.unref?.();
|
|
265
223
|
const first = setTimeout(() => { watchOnce(providers).catch(() => {}); }, 15_000);
|
|
266
224
|
first.unref?.();
|
|
267
|
-
// And Local network's word on the account this deck is on, on its own clock:
|
|
268
|
-
// it costs nothing while no deck is on anything, and it is said whichever of
|
|
269
|
-
// the quota switches is on.
|
|
270
|
-
_elsewhereTimer = setInterval(() => { watchElsewhereOnce().catch(() => {}); }, ELSEWHERE_WATCH_MS);
|
|
271
|
-
_elsewhereTimer.unref?.();
|
|
272
225
|
}
|
|
@@ -88,10 +88,6 @@ export const DEFAULTS = Object.freeze({
|
|
|
88
88
|
// incident (account-notify.mjs). ON for the swap's reason: it is rare, every
|
|
89
89
|
// running session is stopped when it happens, and nothing else says so.
|
|
90
90
|
notifyStopped: true,
|
|
91
|
-
// A login this deck is on, live on another deck too (#2192). ON, like the
|
|
92
|
-
// swap: it is rare, it is said once per incident, and nothing else on the
|
|
93
|
-
// desktop says it before one of the two machines is signed out.
|
|
94
|
-
notifyElsewhere: true,
|
|
95
91
|
// Continue a BACKGROUND session whose turn stopped on an expired login or a
|
|
96
92
|
// usage limit, once a working login with room is active again — once per
|
|
97
93
|
// stop (stop-continue.mjs, #2193). OFF: it stops and restarts a session's
|
|
@@ -177,10 +173,10 @@ export const DEFAULTS = Object.freeze({
|
|
|
177
173
|
// read a ticked account that never arrived as sharing being broken. The
|
|
178
174
|
// cost is the one #2192 found: the two machines then hold one login, and a
|
|
179
175
|
// Claude login renews once, so whichever copy renews second is signed out.
|
|
180
|
-
//
|
|
181
|
-
// on
|
|
182
|
-
//
|
|
183
|
-
// before 3.48.1 does not count.
|
|
176
|
+
// Shared activity itself does not raise an account warning. Auto-switch
|
|
177
|
+
// may still land on a login a paired deck is on (3.43.3), and now that
|
|
178
|
+
// login reaches it. See `sendInUseSet` in
|
|
179
|
+
// normalise for why a saved false from before 3.48.1 does not count.
|
|
184
180
|
sendInUse: true,
|
|
185
181
|
sendInUseSet: false,
|
|
186
182
|
// FINDING THIS PERSON'S OTHER MACHINES OVER TAILSCALE, off until they turn
|
|
@@ -355,7 +351,6 @@ export function normalise(raw) {
|
|
|
355
351
|
notifyQuota: flagOr(src.notifyQuota, DEFAULTS.notifyQuota),
|
|
356
352
|
notifyReset: flagOr(src.notifyReset, DEFAULTS.notifyReset),
|
|
357
353
|
notifyStopped: flagOr(src.notifyStopped, DEFAULTS.notifyStopped),
|
|
358
|
-
notifyElsewhere: flagOr(src.notifyElsewhere, DEFAULTS.notifyElsewhere),
|
|
359
354
|
continueStopped: flagOr(src.continueStopped, DEFAULTS.continueStopped),
|
|
360
355
|
tourSeen: flagOr(src.tourSeen, DEFAULTS.tourSeen),
|
|
361
356
|
autoUpdate: flagOr(src.autoUpdate, DEFAULTS.autoUpdate),
|
|
@@ -742,7 +737,7 @@ export function publicPrefs(prefs) {
|
|
|
742
737
|
*/
|
|
743
738
|
export const PAGE_FIELDS = Object.freeze({
|
|
744
739
|
top: Object.freeze([
|
|
745
|
-
"notifications", "notifySwap", "notifyQuota", "notifyReset", "notifyStopped", "
|
|
740
|
+
"notifications", "notifySwap", "notifyQuota", "notifyReset", "notifyStopped", "continueStopped",
|
|
746
741
|
"tourSeen", "autoUpdate", "recoverCodexSessions", "recoverClaudeSessions",
|
|
747
742
|
]),
|
|
748
743
|
lan: Object.freeze([
|
|
@@ -781,16 +776,16 @@ export function notificationsOn(prefs, env = process.env) {
|
|
|
781
776
|
}
|
|
782
777
|
|
|
783
778
|
/**
|
|
784
|
-
* Which account notifications may go out right now: the
|
|
785
|
-
* on its own, and all
|
|
779
|
+
* Which account notifications may go out right now: the four switches, each
|
|
780
|
+
* on its own, and all four off when the machine vetoed notifications at
|
|
786
781
|
* launch — AGENTS_DECK_NO_NOTIFY=1 keeps the deck off the desktop whatever
|
|
787
782
|
* else it was told, and these are desktop notifications too.
|
|
788
783
|
*/
|
|
789
784
|
export function accountNotifySettings(prefs, env = process.env) {
|
|
790
|
-
if (notificationsVetoed(env)) return { swap: false, quota: false, reset: false, stopped: false
|
|
785
|
+
if (notificationsVetoed(env)) return { swap: false, quota: false, reset: false, stopped: false };
|
|
791
786
|
const p = normalise(prefs);
|
|
792
787
|
return {
|
|
793
|
-
swap: p.notifySwap, quota: p.notifyQuota, reset: p.notifyReset, stopped: p.notifyStopped,
|
|
788
|
+
swap: p.notifySwap, quota: p.notifyQuota, reset: p.notifyReset, stopped: p.notifyStopped,
|
|
794
789
|
};
|
|
795
790
|
}
|
|
796
791
|
|
|
@@ -146,6 +146,27 @@ export function createIntegrationsStore({ dir = () => join(deckDataDir(), STORE_
|
|
|
146
146
|
const publicOf = (conn, secrets) => ({ ...conn, tokenSaved: secrets.has(conn.id) });
|
|
147
147
|
|
|
148
148
|
return {
|
|
149
|
+
/**
|
|
150
|
+
* Only the supported provider names with a saved connection — never credentials,
|
|
151
|
+
* account identity, connection ID, address or number of connections. Metadata
|
|
152
|
+
* alone is read: the secrets file is not even opened for usage reporting.
|
|
153
|
+
* null = unavailable/unreadable; [] = successfully read, nothing connected.
|
|
154
|
+
*/
|
|
155
|
+
async connectedKinds() {
|
|
156
|
+
try {
|
|
157
|
+
const raw = await readFile(join(dir(), META_FILE), "utf8");
|
|
158
|
+
const doc = JSON.parse(raw.replace(/^\uFEFF/, ""));
|
|
159
|
+
if (!doc || !Array.isArray(doc.connections)) return null;
|
|
160
|
+
const kinds = new Set(doc.connections
|
|
161
|
+
.filter(c => c && typeof c === "object" && typeof c.kind === "string")
|
|
162
|
+
.map(c => c.kind)
|
|
163
|
+
.filter(k => k === "jira" || k === "github" || k === "gitlab"));
|
|
164
|
+
return ["jira", "github", "gitlab"].filter(k => kinds.has(k));
|
|
165
|
+
} catch (error) {
|
|
166
|
+
if (error?.code === "ENOENT") return [];
|
|
167
|
+
return null;
|
|
168
|
+
}
|
|
169
|
+
},
|
|
149
170
|
/** Every connection, as a page may see it. `own(conn, secret)`, when
|
|
150
171
|
* given, is handed each connection that has a secret, with it, and
|
|
151
172
|
* answers the connection to list: the routes take that secret out of what
|
package/src/server/lan-deck.mjs
CHANGED
|
@@ -31,9 +31,6 @@ import { run } from "./exec.mjs";
|
|
|
31
31
|
// A LAN round checks the imports it lands the way the paste box does.
|
|
32
32
|
import { CHECKS_IMPORTS } from "./account-routes.mjs";
|
|
33
33
|
import { RUNNING_VERSION } from "./running-version.mjs";
|
|
34
|
-
// Which of this deck's accounts a paired deck is working on, for the account
|
|
35
|
-
// notifier, which reaches the engine's status through it (#2192).
|
|
36
|
-
import { connectLanStatus } from "./lan-elsewhere.mjs";
|
|
37
34
|
|
|
38
35
|
// ── LAN sync ────────────────────────────────────────────────────────────────
|
|
39
36
|
//
|
|
@@ -304,10 +301,6 @@ export const lanEngine = createEngine({
|
|
|
304
301
|
},
|
|
305
302
|
});
|
|
306
303
|
|
|
307
|
-
// The status the account notifier reads "which deck is on what" from — see
|
|
308
|
-
// lan-elsewhere.mjs, which says why it does not import this file for it.
|
|
309
|
-
connectLanStatus(() => lanEngine.status());
|
|
310
|
-
|
|
311
304
|
/**
|
|
312
305
|
* What prefs is entitled to tell the LAN engine, and what it is not.
|
|
313
306
|
*
|
|
@@ -406,6 +406,9 @@ export const SETTING_VARS = Object.freeze([
|
|
|
406
406
|
// The off switch for Skill activity's typed-command hook (skill-hook.mjs). A
|
|
407
407
|
// deck started at login without it would put the entry back in.
|
|
408
408
|
"AGENTS_DECK_SKILL_HOOK",
|
|
409
|
+
// Radar's off switch (index.mjs). A deck started at login without it would
|
|
410
|
+
// look for Claude Code's collector and capture it.
|
|
411
|
+
"AGENTS_DECK_NO_RADAR",
|
|
409
412
|
]);
|
|
410
413
|
|
|
411
414
|
export function settingsEnv(env = process.env) {
|
package/src/server/reports.mjs
CHANGED
|
@@ -25,7 +25,10 @@
|
|
|
25
25
|
// events it took in, each as a bucket ("2s", "512m", "1k"), the Claude and
|
|
26
26
|
// Codex plan as its category ("max-20x", "plus") and nothing else from the
|
|
27
27
|
// credentials it is read off, and how many Claude accounts and paired
|
|
28
|
-
// machines the deck holds, as capped counts (depth-facts.mjs),
|
|
28
|
+
// machines the deck holds, as capped counts (depth-facts.mjs), and which
|
|
29
|
+
// trackers have a saved connection when it is sent: "jira", "github",
|
|
30
|
+
// "gitlab" and nothing else, never an address, an account or a token
|
|
31
|
+
// (integrations/store.mjs; left out when that list cannot be read),
|
|
29
32
|
// - an "uninstall" event when somebody runs `ccdeck --uninstall`, with the
|
|
30
33
|
// reason they picked from a short list if they picked one (bin/cli/leaving.js),
|
|
31
34
|
// - an "activated" event, once, when a new install's first session arrives:
|
|
@@ -556,6 +559,7 @@ export function createReporter({
|
|
|
556
559
|
setupKnown = () => whenSetupKnown(),
|
|
557
560
|
reference = notedRef,
|
|
558
561
|
depth = async () => ({}),
|
|
562
|
+
integrations = async () => null,
|
|
559
563
|
launchedIn = () => process.uptime() * 1000,
|
|
560
564
|
memory = () => process.memoryUsage.rss(),
|
|
561
565
|
npx = false,
|
|
@@ -686,6 +690,20 @@ export function createReporter({
|
|
|
686
690
|
}
|
|
687
691
|
}
|
|
688
692
|
|
|
693
|
+
/** A snapshot of which tracker providers have connections at report time.
|
|
694
|
+
* The provider owns the local read; only the three fixed provider tokens leave.
|
|
695
|
+
* null means unknown (store unavailable), [] means verified no connections. */
|
|
696
|
+
async function connectedProviders() {
|
|
697
|
+
try {
|
|
698
|
+
const value = await integrations();
|
|
699
|
+
if (!Array.isArray(value)) return {};
|
|
700
|
+
const providers = ["jira", "github", "gitlab"].filter(k => value.includes(k));
|
|
701
|
+
return { connectedIntegrations: providers };
|
|
702
|
+
} catch {
|
|
703
|
+
return {};
|
|
704
|
+
}
|
|
705
|
+
}
|
|
706
|
+
|
|
689
707
|
/** What the "active" says about the deck beyond its day: how long this run
|
|
690
708
|
* took to start, as a bucket, and the plans, accounts and paired machines
|
|
691
709
|
* the depth provider reads — each only as a word off its list or a capped
|
|
@@ -952,7 +970,8 @@ export function createReporter({
|
|
|
952
970
|
// deck for its counts.
|
|
953
971
|
const used = coarseUsage(today);
|
|
954
972
|
const held = await depthNow();
|
|
955
|
-
|
|
973
|
+
const connected = await connectedProviders();
|
|
974
|
+
if (settled(await call("POST", "/v1/app/events", { installId, kind: "active", ...factsNow(), ...setupNow(), ...used, ...held, ...connected }))) {
|
|
956
975
|
if (used.usageDay) usage.markSent(used.usageDay);
|
|
957
976
|
await remember(installId, { lastActiveDay: today });
|
|
958
977
|
}
|
|
@@ -1318,5 +1337,9 @@ export function ratingFile(dir) {
|
|
|
1318
1337
|
/** The deck's own reporter. */
|
|
1319
1338
|
export const reporter = createReporter({
|
|
1320
1339
|
versions: () => cliVersionCache, probe: probeCliVersions, depth: deckDepth, npx: isNpxInstall(PKG_ROOT),
|
|
1340
|
+
integrations: async () => {
|
|
1341
|
+
const { integrationsStore } = await import("./integrations/store.mjs");
|
|
1342
|
+
return integrationsStore.connectedKinds();
|
|
1343
|
+
},
|
|
1321
1344
|
ratingKept: ratingFile(),
|
|
1322
1345
|
});
|