oc2token 0.1.31 → 0.1.33
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 +1 -1
- package/dist/src/cli.js +22 -2
- package/dist/src/cli.js.map +1 -1
- package/dist/src/dashboard/render/dashboard.d.ts +5 -5
- package/dist/src/dashboard/render/dashboard.js +72 -31
- package/dist/src/dashboard/render/dashboard.js.map +1 -1
- package/dist/src/dashboard/render/types.d.ts +11 -0
- package/dist/src/dashboard/render/types.js +13 -0
- package/dist/src/dashboard/render/types.js.map +1 -1
- package/dist/src/dashboard/settings/index.d.ts +10 -7
- package/dist/src/dashboard/settings/index.js +11 -7
- package/dist/src/dashboard/settings/index.js.map +1 -1
- package/dist/src/opencode/live.d.ts +7 -0
- package/dist/src/opencode/live.js +36 -2
- package/dist/src/opencode/live.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ import { promises as fs } from "node:fs";
|
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { defaultCacheDirectory } from "../../application.js";
|
|
4
4
|
import { isProviderKind } from "../../domain/records.js";
|
|
5
|
-
import { DEFAULT_VISIBLE_CARDS, DEFAULT_WIDE_CARDS, normalizeVisibleCards, } from "../render/types.js";
|
|
5
|
+
import { DEFAULT_VISIBLE_CARDS, DEFAULT_WIDE_CARDS, normalizeLiveTpsSize, normalizeVisibleCards, } from "../render/types.js";
|
|
6
6
|
export const SETTINGS_MIN_REFRESH_SECONDS = 15;
|
|
7
7
|
export const SETTINGS_MAX_REFRESH_SECONDS = 2 * 60 * 60; // 7200
|
|
8
8
|
export const SETTINGS_DEFAULT_REFRESH_SECONDS = 300;
|
|
@@ -22,8 +22,8 @@ export const ALL_PROVIDER_KINDS = [
|
|
|
22
22
|
const LEGACY_ALL_PROVIDER_KINDS = ["opencode", "codex", "antigravity"];
|
|
23
23
|
/**
|
|
24
24
|
* Settings focus rows, numbered in the order the panel *renders* them:
|
|
25
|
-
* providers (0-4) -> display toggles (5-7) ->
|
|
26
|
-
* (14) -> refresh interval (
|
|
25
|
+
* providers (0-4) -> display toggles (5-7) -> TPS size (8) -> card slots
|
|
26
|
+
* (9-14) -> card count (15) -> refresh interval (16).
|
|
27
27
|
*
|
|
28
28
|
* All six slot rows always render; slots at or past the visible count are
|
|
29
29
|
* dimmed placeholders so the indices below never shift when toggling
|
|
@@ -35,10 +35,11 @@ const LEGACY_ALL_PROVIDER_KINDS = ["opencode", "codex", "antigravity"];
|
|
|
35
35
|
export const SETTINGS_ROWS = {
|
|
36
36
|
providers: 0,
|
|
37
37
|
tables: 5,
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
liveTpsSize: 8,
|
|
39
|
+
cards: 9,
|
|
40
|
+
cardCount: 15,
|
|
41
|
+
refresh: 16,
|
|
42
|
+
count: 17,
|
|
42
43
|
};
|
|
43
44
|
export function clampRefreshIntervalSeconds(value) {
|
|
44
45
|
if (!Number.isFinite(value))
|
|
@@ -134,6 +135,7 @@ export function normalizeSettings(value) {
|
|
|
134
135
|
showProvidersTable: true,
|
|
135
136
|
showProjectsTable: true,
|
|
136
137
|
showLiveTps: true,
|
|
138
|
+
liveTpsSize: 3,
|
|
137
139
|
visibleCards: [...DEFAULT_VISIBLE_CARDS],
|
|
138
140
|
inactiveCards: [...DEFAULT_WIDE_CARDS],
|
|
139
141
|
};
|
|
@@ -155,6 +157,7 @@ export function normalizeSettings(value) {
|
|
|
155
157
|
showProvidersTable: record.showProvidersTable !== false,
|
|
156
158
|
showProjectsTable: record.showProjectsTable !== false,
|
|
157
159
|
showLiveTps: record.showLiveTps !== false,
|
|
160
|
+
liveTpsSize: normalizeLiveTpsSize(record.liveTpsSize),
|
|
158
161
|
// Missing (legacy settings.json) means the legacy hour/day/week/month layout.
|
|
159
162
|
visibleCards: active,
|
|
160
163
|
inactiveCards: inactive,
|
|
@@ -213,6 +216,7 @@ export async function saveDashboardSettings(settings, cacheDirectory) {
|
|
|
213
216
|
showProvidersTable: settings.showProvidersTable !== false,
|
|
214
217
|
showProjectsTable: settings.showProjectsTable !== false,
|
|
215
218
|
showLiveTps: settings.showLiveTps !== false,
|
|
219
|
+
liveTpsSize: normalizeLiveTpsSize(settings.liveTpsSize),
|
|
216
220
|
visibleCards: active,
|
|
217
221
|
inactiveCards: normalizeVisibleCards(settings.inactiveCards, active.length > 4 ? 4 : 6),
|
|
218
222
|
}, null, 2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/dashboard/settings/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/dashboard/settings/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ export interface LiveTpsReading {
|
|
|
9
9
|
}
|
|
10
10
|
export interface LiveTpsSnapshot extends LiveTpsReading {
|
|
11
11
|
readonly available: boolean;
|
|
12
|
+
/** Average TPS over the last 10 minutes of observed token flow. */
|
|
13
|
+
readonly averageTps: number;
|
|
12
14
|
}
|
|
13
15
|
export interface LiveTpsMeter {
|
|
14
16
|
start(): void;
|
|
@@ -21,9 +23,14 @@ export interface LiveTpsMeterOptions {
|
|
|
21
23
|
/** Heuristic live rate from streamed characters; exact counts only arrive per step. */
|
|
22
24
|
export declare class TpsAggregator {
|
|
23
25
|
private readonly sessions;
|
|
26
|
+
/** One-second token buckets for the adaptive 10-minute average. */
|
|
27
|
+
private readonly history;
|
|
24
28
|
reset(): void;
|
|
25
29
|
ingest(event: LiveTpsEvent, now: number): void;
|
|
26
30
|
snapshot(now: number): LiveTpsReading;
|
|
31
|
+
/** Average TPS over the last 10 minutes, or the observed span when shorter. */
|
|
32
|
+
averageTps(now: number): number;
|
|
33
|
+
private pruneHistory;
|
|
27
34
|
private session;
|
|
28
35
|
private addChars;
|
|
29
36
|
}
|
|
@@ -2,6 +2,7 @@ import { OpenCode } from "@opencode-ai/client";
|
|
|
2
2
|
import { headers as serviceHeaders } from "@opencode-ai/client/service";
|
|
3
3
|
import { discoverNativeEndpoint } from "./native.js";
|
|
4
4
|
const WINDOW_MS = 1_000;
|
|
5
|
+
const AVERAGE_WINDOW_MS = 10 * 60 * 1_000;
|
|
5
6
|
const PRUNE_MS = 30_000;
|
|
6
7
|
const CHARS_PER_TOKEN = 4;
|
|
7
8
|
const MIN_FACTOR = 0.5;
|
|
@@ -24,8 +25,11 @@ function clamp(value, min, max) {
|
|
|
24
25
|
/** Heuristic live rate from streamed characters; exact counts only arrive per step. */
|
|
25
26
|
export class TpsAggregator {
|
|
26
27
|
sessions = new Map();
|
|
28
|
+
/** One-second token buckets for the adaptive 10-minute average. */
|
|
29
|
+
history = new Map();
|
|
27
30
|
reset() {
|
|
28
31
|
this.sessions.clear();
|
|
32
|
+
this.history.clear();
|
|
29
33
|
}
|
|
30
34
|
ingest(event, now) {
|
|
31
35
|
const data = asRecord(event.data);
|
|
@@ -88,6 +92,7 @@ export class TpsAggregator {
|
|
|
88
92
|
}
|
|
89
93
|
}
|
|
90
94
|
snapshot(now) {
|
|
95
|
+
this.pruneHistory(now);
|
|
91
96
|
const cutoff = now - WINDOW_MS;
|
|
92
97
|
let tokens = 0;
|
|
93
98
|
let activeSessions = 0;
|
|
@@ -105,6 +110,28 @@ export class TpsAggregator {
|
|
|
105
110
|
}
|
|
106
111
|
return { tps: tokens / (WINDOW_MS / 1_000), activeSessions };
|
|
107
112
|
}
|
|
113
|
+
/** Average TPS over the last 10 minutes, or the observed span when shorter. */
|
|
114
|
+
averageTps(now) {
|
|
115
|
+
this.pruneHistory(now);
|
|
116
|
+
if (this.history.size === 0)
|
|
117
|
+
return 0;
|
|
118
|
+
let total = 0;
|
|
119
|
+
let firstSecond = Number.POSITIVE_INFINITY;
|
|
120
|
+
for (const [second, tokens] of this.history) {
|
|
121
|
+
total += tokens;
|
|
122
|
+
firstSecond = Math.min(firstSecond, second);
|
|
123
|
+
}
|
|
124
|
+
const from = Math.max(firstSecond * 1_000, now - AVERAGE_WINDOW_MS);
|
|
125
|
+
const elapsedMs = Math.max(1_000, now - from);
|
|
126
|
+
return total / (elapsedMs / 1_000);
|
|
127
|
+
}
|
|
128
|
+
pruneHistory(now) {
|
|
129
|
+
const cutoffSecond = Math.floor((now - AVERAGE_WINDOW_MS) / 1_000);
|
|
130
|
+
for (const second of this.history.keys()) {
|
|
131
|
+
if (second < cutoffSecond)
|
|
132
|
+
this.history.delete(second);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
108
135
|
session(sessionID, now) {
|
|
109
136
|
let session = this.sessions.get(sessionID);
|
|
110
137
|
if (session === undefined) {
|
|
@@ -125,8 +152,11 @@ export class TpsAggregator {
|
|
|
125
152
|
return;
|
|
126
153
|
const session = this.session(sessionID, now);
|
|
127
154
|
const rawTokens = chars / CHARS_PER_TOKEN;
|
|
155
|
+
const tokens = rawTokens * session.factor;
|
|
128
156
|
session.stepTokens += rawTokens;
|
|
129
|
-
session.samples.push({ at: now, tokens
|
|
157
|
+
session.samples.push({ at: now, tokens });
|
|
158
|
+
const second = Math.floor(now / 1_000);
|
|
159
|
+
this.history.set(second, (this.history.get(second) ?? 0) + tokens);
|
|
130
160
|
}
|
|
131
161
|
}
|
|
132
162
|
function toolKey(data) {
|
|
@@ -217,7 +247,11 @@ export function createLiveTpsMeter(options = {}) {
|
|
|
217
247
|
available = false;
|
|
218
248
|
},
|
|
219
249
|
snapshot(now = Date.now()) {
|
|
220
|
-
return {
|
|
250
|
+
return {
|
|
251
|
+
available,
|
|
252
|
+
...aggregator.snapshot(now),
|
|
253
|
+
averageTps: aggregator.averageTps(now),
|
|
254
|
+
};
|
|
221
255
|
},
|
|
222
256
|
};
|
|
223
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.js","sourceRoot":"","sources":["../../../src/opencode/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,OAAO,IAAI,cAAc,EAAiB,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"live.js","sourceRoot":"","sources":["../../../src/opencode/live.ts"],"names":[],"mappings":"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"}
|