@prohost/cli 0.10.3 → 0.10.4

package/CHANGELOG.md

@@ -4,6 +4,14 @@ Versions follow [semver](https://semver.org/). Publishing is automated: merging
 a version bump to `main` triggers `.github/workflows/npm-publish-cli.yml`, which
 builds via `prepack`, runs the suite, publishes, and tags `cli-v<version>`.
 
+## 0.10.4
+
+- **A day's rebuilt totals wait for its 0.10.1 rows to land.** If the server
+  takes the rows 0.10.1 never uploaded only in part (a throttle, or a partial
+  acceptance), the rebuilt rows for that (day, login) are held back until those
+  rows are accepted or permanently skipped. Sending the rebuild first could let
+  the stale rows, retried on a later tick, overwrite the right total.
+
 ## 0.10.3
 
 Two fixes to the 0.10.2 repository attribution.

package/dist/usage/scanner.d.ts

@@ -147,6 +147,8 @@ export declare function scanUsage(accounts: ScanAccount[], state: ScanState, opt
 export declare function rowsForDays(state: ScanState, days: Iterable<string>): TokenRow[];
 /** The version-1 rows not yet uploaded ({@link ScanState.legacyUnsent}), in upload shape. */
 export declare function legacyUnsentRows(state: ScanState): TokenRow[];
+/** The day/account pairs ({@link pendingKey}) that still have version-1 rows to upload, zero-token ones aside. */
+export declare function legacyUnsentPairs(state: ScanState): Set<string>;
 /** The rows for the given `day|accountKey` pairs, in upload shape. */
 export declare function rowsForPending(state: ScanState, pairs: Iterable<string>): TokenRow[];
 /** One `POST /v1/usage/token-totals` body's rows, and what it says about each (day, account) pair. */

package/dist/usage/scanner.js

@@ -495,6 +495,10 @@ export function rowsForDays(state, days) {
 export function legacyUnsentRows(state) {
     return bucketRows(state.legacyUnsent, () => true);
 }
+/** The day/account pairs ({@link pendingKey}) that still have version-1 rows to upload, zero-token ones aside. */
+export function legacyUnsentPairs(state) {
+    return new Set(legacyUnsentRows(state).map((r) => pendingKey(r.day, r.accountKey)));
+}
 function bucketRows(buckets, include) {
     const rows = [];
     for (const [key, totals] of Object.entries(buckets)) {

package/dist/usage/service.js

@@ -17,7 +17,7 @@ import { Backoff } from './backoff.js';
 import { resolveUsageKey, usageStateDir, writePrivateFile } from './config.js';
 import { accountConfigDir } from './discovery.js';
 import { buildReportFrame, defaultProber, probeAccounts } from './quota.js';
-import { loadScanState, pendingAccount, pendingDay, legacyUnsentRows, pendingKey, rebuildFellShort, rowsForPending, saveScanState, scanUsage, uploadBatches, } from './scanner.js';
+import { loadScanState, pendingAccount, pendingDay, legacyUnsentPairs, legacyUnsentRows, pendingKey, rebuildFellShort, rowsForPending, saveScanState, scanUsage, uploadBatches, } from './scanner.js';
 export const REPORTS_PATH = '/v1/usage/reports';
 export const TOKEN_TOTALS_PATH = '/v1/usage/token-totals';
 /** Tick cadence. */
@@ -257,6 +257,12 @@ export class UsageService {
             saveScanState(scanStatePath(this.env), scan);
             return 0;
         }
+        // A pair whose version-1 rows are still pending (throttled, partly accepted, or waiting for a
+        // report) holds its rebuilt rows back: sent now, they could be overwritten by those stale rows
+        // landing on a later tick. They stay dirty and go once the legacy rows settle.
+        const heldByLegacy = legacyUnsentPairs(scan);
+        if (heldByLegacy.size > 0)
+            ready = ready.filter((r) => !heldByLegacy.has(pendingKey(r.day, r.accountKey)));
         const legacyReady = new Set(ready.map((r) => pendingKey(r.day, r.accountKey)).filter((pair) => scan.legacy[pair] !== undefined));
         if (legacyReady.size > 0) {
             if (!(await this.serverReplacesDays(api, machineId, machine))) {

package/dist/version.d.ts

@@ -7,6 +7,6 @@
  * `package.json`, so a release bump that forgets this file fails the suite
  * instead of shipping a `User-Agent` that lies about which build is calling.
  */
-export declare const CLI_VERSION = "0.10.3";
+export declare const CLI_VERSION = "0.10.4";
 /** Sent on every HTTP request the CLI makes back into ProhostAI. */
-export declare const USER_AGENT = "prohost-cli/0.10.3";
+export declare const USER_AGENT = "prohost-cli/0.10.4";

package/dist/version.js

@@ -7,6 +7,6 @@
  * `package.json`, so a release bump that forgets this file fails the suite
  * instead of shipping a `User-Agent` that lies about which build is calling.
  */
-export const CLI_VERSION = '0.10.3';
+export const CLI_VERSION = '0.10.4';
 /** Sent on every HTTP request the CLI makes back into ProhostAI. */
 export const USER_AGENT = `prohost-cli/${CLI_VERSION}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prohost/cli",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Run your own AI agent as a ProhostAI teammate, and stream your account's webhooks to your laptop.",
   "type": "module",
   "license": "MIT",