@tracemarketplace/cli 0.0.19 → 0.0.20
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/dist/cli.js +3 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/history.d.ts.map +1 -1
- package/dist/commands/history.js +26 -8
- package/dist/commands/history.js.map +1 -1
- package/dist/commands/status.d.ts +14 -2
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +43 -13
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/status.test.d.ts +2 -0
- package/dist/commands/status.test.d.ts.map +1 -0
- package/dist/commands/status.test.js +54 -0
- package/dist/commands/status.test.js.map +1 -0
- package/dist/submission-status.d.ts +14 -0
- package/dist/submission-status.d.ts.map +1 -0
- package/dist/submission-status.js +31 -0
- package/dist/submission-status.js.map +1 -0
- package/dist/submission-status.test.d.ts +2 -0
- package/dist/submission-status.test.d.ts.map +1 -0
- package/dist/submission-status.test.js +33 -0
- package/dist/submission-status.test.js.map +1 -0
- package/package.json +2 -2
- package/src/cli.ts +3 -2
- package/src/commands/history.ts +29 -10
- package/src/commands/status.test.ts +57 -0
- package/src/commands/status.ts +72 -15
- package/src/submission-status.test.ts +35 -0
- package/src/submission-status.ts +48 -0
package/dist/cli.js
CHANGED
|
@@ -56,9 +56,10 @@ program
|
|
|
56
56
|
.action((opts) => submitWorkerCommand({ profile: opts.profile, manifest: opts.manifest }).catch(handleError));
|
|
57
57
|
program
|
|
58
58
|
.command("status")
|
|
59
|
-
.description("Show
|
|
59
|
+
.description("Show local submit state; add --remote for server ingest status")
|
|
60
60
|
.option("--profile <name>", profileOptionDescription)
|
|
61
|
-
.
|
|
61
|
+
.option("--remote", "Also fetch remote account/submission status from the API")
|
|
62
|
+
.action((opts) => statusCommand({ profile: opts.profile, remote: opts.remote }).catch(handleError));
|
|
62
63
|
program
|
|
63
64
|
.command("history")
|
|
64
65
|
.description("Show submission history")
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAE5E,MAAM,wBAAwB,GAAG,4BAA4B,eAAe,GAAG,CAAC;AAChF,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAC/B,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,CACxF,CAAC,OAAO,CAAC;AAEV,OAAO;KACJ,IAAI,CAAC,QAAQ,CAAC;KACd,WAAW,CAAC,6DAA6D,CAAC;KAC1E,OAAO,CAAC,cAAc,CAAC,CAAC;AAE3B,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,2CAA2C,CAAC;KACxD,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;KACpD,MAAM,CAAC,oBAAoB,EAAE,6BAA6B,eAAe,GAAG,CAAC;KAC7E,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAE3G,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,oCAAoC,CAAC;KACjD,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;KACpD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAEjF,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,uEAAuE,CAAC;KACpF,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;KACpD,MAAM,CAAC,eAAe,EAAE,2DAA2D,CAAC;KACpF,MAAM,CAAC,gBAAgB,EAAE,mCAAmC,CAAC;KAC7D,MAAM,CAAC,WAAW,EAAE,4BAA4B,CAAC;KACjD,MAAM,CAAC,QAAQ,EAAE,wEAAwE,CAAC;KAC1F,MAAM,CAAC,4BAA4B,EAAE,oEAAoE,EAAE,KAAK,CAAC;KACjH,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACf,aAAa,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC,OAAO;IACrB,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,OAAO,EAAE,IAAI,CAAC,OAAO;IACrB,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,KAAK,EAAE,IAAI,CAAC,YAAY;CACzB,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CACtB,CAAC;AAEJ,OAAO;KACJ,OAAO,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;KAC1C,WAAW,CAAC,qCAAqC,CAAC;KAClD,cAAc,CAAC,mBAAmB,EAAE,6BAA6B,CAAC;KAClE,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;KACpD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAEhH,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/commands/history.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/commands/history.ts"],"names":[],"mappings":"AAMA,wBAAsB,cAAc,CAAC,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDnF"}
|
package/dist/commands/history.js
CHANGED
|
@@ -2,6 +2,7 @@ import chalk from "chalk";
|
|
|
2
2
|
import { loadConfig, resolveProfile } from "../config.js";
|
|
3
3
|
import { ApiClient } from "../api-client.js";
|
|
4
4
|
import { loginCommandForProfile } from "../constants.js";
|
|
5
|
+
import { formatRemoteSubmissionDisplay } from "../submission-status.js";
|
|
5
6
|
export async function historyCommand(opts = {}) {
|
|
6
7
|
const profile = resolveProfile(opts.profile);
|
|
7
8
|
const config = loadConfig(profile);
|
|
@@ -10,7 +11,7 @@ export async function historyCommand(opts = {}) {
|
|
|
10
11
|
process.exit(1);
|
|
11
12
|
}
|
|
12
13
|
const client = new ApiClient(config.serverUrl, config.apiKey);
|
|
13
|
-
const subs = (await client.get("/api/v1/submissions"));
|
|
14
|
+
const subs = (await client.get("/api/v1/submissions")).sort((a, b) => Date.parse(String(b.submittedAt)) - Date.parse(String(a.submittedAt)));
|
|
14
15
|
if (subs.length === 0) {
|
|
15
16
|
console.log(chalk.gray("No submissions yet."));
|
|
16
17
|
return;
|
|
@@ -19,18 +20,35 @@ export async function historyCommand(opts = {}) {
|
|
|
19
20
|
console.log(chalk.gray(`Server: ${config.serverUrl}\n`));
|
|
20
21
|
console.log(chalk.gray("Date".padEnd(14) +
|
|
21
22
|
"Tool".padEnd(16) +
|
|
22
|
-
"
|
|
23
|
+
"Ingested".padEnd(12) +
|
|
24
|
+
"Status".padEnd(26) +
|
|
23
25
|
"Payout"));
|
|
24
|
-
console.log(chalk.gray("─".repeat(
|
|
26
|
+
console.log(chalk.gray("─".repeat(76)));
|
|
25
27
|
for (const s of subs) {
|
|
26
28
|
const date = new Date(s.submittedAt).toLocaleDateString();
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
: "pending";
|
|
29
|
+
const display = formatRemoteSubmissionDisplay(s);
|
|
30
|
+
const status = colorSubmissionStatus(display.statusLabel, display.pendingPipeline);
|
|
30
31
|
console.log(date.padEnd(14) +
|
|
31
32
|
s.sourceTool.padEnd(16) +
|
|
32
|
-
|
|
33
|
-
|
|
33
|
+
display.ingestedLabel.padEnd(12) +
|
|
34
|
+
status +
|
|
35
|
+
colorPayout(display.payoutLabel, display.pendingPipeline));
|
|
34
36
|
}
|
|
35
37
|
}
|
|
38
|
+
function colorSubmissionStatus(label, pendingPipeline) {
|
|
39
|
+
const padded = label.padEnd(26);
|
|
40
|
+
if (pendingPipeline) {
|
|
41
|
+
return chalk.yellow(padded);
|
|
42
|
+
}
|
|
43
|
+
if (label === "ingested successfully") {
|
|
44
|
+
return chalk.green(padded);
|
|
45
|
+
}
|
|
46
|
+
return chalk.gray(padded);
|
|
47
|
+
}
|
|
48
|
+
function colorPayout(label, pendingPipeline) {
|
|
49
|
+
if (pendingPipeline || label === "pending") {
|
|
50
|
+
return chalk.yellow(label);
|
|
51
|
+
}
|
|
52
|
+
return chalk.green(label);
|
|
53
|
+
}
|
|
36
54
|
//# sourceMappingURL=history.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/commands/history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/commands/history.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,16 @@
|
|
|
1
|
-
|
|
1
|
+
import { type SubmitState } from "../config.js";
|
|
2
|
+
import { type SubmitWorkerState } from "../submit-worker-state.js";
|
|
3
|
+
interface StatusOptions {
|
|
2
4
|
profile?: string;
|
|
3
|
-
|
|
5
|
+
remote?: boolean;
|
|
6
|
+
}
|
|
7
|
+
interface LocalSubmitStatusSummary {
|
|
8
|
+
trackedSessions: number;
|
|
9
|
+
pendingSessions: number;
|
|
10
|
+
awaitingConfirmationSessions: number;
|
|
11
|
+
awaitingConfirmationChunks: number;
|
|
12
|
+
}
|
|
13
|
+
export declare function statusCommand(opts?: StatusOptions): Promise<void>;
|
|
14
|
+
export declare function summarizeLocalSubmitState(state: SubmitState, _activeWorkers: SubmitWorkerState[]): LocalSubmitStatusSummary;
|
|
15
|
+
export {};
|
|
4
16
|
//# sourceMappingURL=status.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AACA,OAAO,EAAoE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAGlH,OAAO,EAA2B,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG5F,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,wBAAwB;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,4BAA4B,EAAE,MAAM,CAAC;IACrC,0BAA0B,EAAE,MAAM,CAAC;CACpC;AAED,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqE3E;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,iBAAiB,EAAE,GAClC,wBAAwB,CAe1B"}
|
package/dist/commands/status.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
|
-
import { loadConfig, resolveProfile } from "../config.js";
|
|
2
|
+
import { loadConfig, loadState, migrateSessionUploadState, resolveProfile } from "../config.js";
|
|
3
3
|
import { ApiClient } from "../api-client.js";
|
|
4
4
|
import { loginCommandForProfile } from "../constants.js";
|
|
5
5
|
import { listActiveSubmitWorkers } from "../submit-worker-state.js";
|
|
6
|
+
import { formatRemoteSubmissionDisplay, isSubmissionPipelinePending } from "../submission-status.js";
|
|
6
7
|
export async function statusCommand(opts = {}) {
|
|
7
8
|
const profile = resolveProfile(opts.profile);
|
|
8
9
|
const config = loadConfig(profile);
|
|
@@ -10,20 +11,16 @@ export async function statusCommand(opts = {}) {
|
|
|
10
11
|
console.error(chalk.red(`Not authenticated for profile '${profile}'. Run: ${loginCommandForProfile(profile)}`));
|
|
11
12
|
process.exit(1);
|
|
12
13
|
}
|
|
13
|
-
const
|
|
14
|
-
const [me, subs] = await Promise.all([
|
|
15
|
-
client.get("/api/v1/me"),
|
|
16
|
-
client.get("/api/v1/submissions"),
|
|
17
|
-
]);
|
|
14
|
+
const localState = loadState(config.profile);
|
|
18
15
|
const activeWorkers = listActiveSubmitWorkers(config.profile);
|
|
19
|
-
const
|
|
16
|
+
const summary = summarizeLocalSubmitState(localState, activeWorkers);
|
|
20
17
|
console.log(chalk.gray("Profile:"), config.profile);
|
|
21
|
-
console.log(chalk.
|
|
22
|
-
console.log(chalk.bold("Background submit:"), activeWorkers.length > 0
|
|
18
|
+
console.log(chalk.bold("Local upload worker:"), activeWorkers.length > 0
|
|
23
19
|
? chalk.yellow(`running (${activeWorkers.length})`)
|
|
24
20
|
: chalk.gray("idle"));
|
|
25
|
-
console.log(chalk.bold("
|
|
26
|
-
console.log(chalk.bold("
|
|
21
|
+
console.log(chalk.bold("Tracked sessions:"), summary.trackedSessions);
|
|
22
|
+
console.log(chalk.bold("Sessions still in progress:"), summary.pendingSessions);
|
|
23
|
+
console.log(chalk.bold("Queued uploads awaiting server confirmation:"), `${summary.awaitingConfirmationChunks} chunk(s) across ${summary.awaitingConfirmationSessions} session(s)`);
|
|
27
24
|
if (activeWorkers.length > 0) {
|
|
28
25
|
activeWorkers.slice(0, 3).forEach((worker) => {
|
|
29
26
|
console.log(chalk.gray(` pid ${worker.pid} started ${worker.startedAt} ready ${worker.readyChunkCount} chunk(s) from ${worker.readySessionCount} session(s)`));
|
|
@@ -33,9 +30,42 @@ export async function statusCommand(opts = {}) {
|
|
|
33
30
|
}
|
|
34
31
|
console.log(chalk.gray(` Log: ${activeWorkers[0].logPath}`));
|
|
35
32
|
}
|
|
36
|
-
|
|
33
|
+
if (!opts.remote) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const client = new ApiClient(config.serverUrl, config.apiKey);
|
|
37
|
+
const [me, subs] = await Promise.all([
|
|
38
|
+
client.get("/api/v1/me"),
|
|
39
|
+
client.get("/api/v1/submissions"),
|
|
40
|
+
]);
|
|
41
|
+
const sortedSubs = [...subs].sort((a, b) => Date.parse(String(b.submittedAt)) - Date.parse(String(a.submittedAt)));
|
|
42
|
+
const balance = (me.balanceCents ?? me.balance_cents ?? 0) / 100;
|
|
43
|
+
const pending = sortedSubs.filter((s) => isSubmissionPipelinePending(s));
|
|
44
|
+
console.log();
|
|
45
|
+
console.log(chalk.gray("Remote server:"), config.serverUrl);
|
|
46
|
+
console.log(chalk.bold("Balance:"), chalk.green(`$${balance.toFixed(2)}`));
|
|
47
|
+
console.log(chalk.bold("Submission batches:"), sortedSubs.length);
|
|
37
48
|
if (pending.length > 0) {
|
|
38
|
-
console.log(chalk.yellow(
|
|
49
|
+
console.log(chalk.yellow(`Server data pipeline: processing ${pending.length} submission batch(es)`));
|
|
50
|
+
}
|
|
51
|
+
else if (sortedSubs.length > 0) {
|
|
52
|
+
console.log(chalk.green("Server data pipeline: idle"));
|
|
39
53
|
}
|
|
54
|
+
if (sortedSubs.length > 0) {
|
|
55
|
+
const latest = formatRemoteSubmissionDisplay(sortedSubs[0]);
|
|
56
|
+
console.log(chalk.gray(`Latest batch: ${latest.statusLabel} (${latest.ingestedLabel})`));
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
export function summarizeLocalSubmitState(state, _activeWorkers) {
|
|
60
|
+
const sessions = Object.values(state.sessions).map((session) => migrateSessionUploadState(session));
|
|
61
|
+
const pendingSessions = sessions.filter((session) => session.openChunkStartTurn < session.lastSeenTurnCount).length;
|
|
62
|
+
const awaitingConfirmationSessions = sessions.filter((session) => session.confirmedChunkIndex < session.nextChunkIndex).length;
|
|
63
|
+
const awaitingConfirmationChunks = sessions.reduce((sum, session) => sum + Math.max(0, session.nextChunkIndex - session.confirmedChunkIndex), 0);
|
|
64
|
+
return {
|
|
65
|
+
trackedSessions: sessions.length,
|
|
66
|
+
pendingSessions,
|
|
67
|
+
awaitingConfirmationSessions,
|
|
68
|
+
awaitingConfirmationChunks,
|
|
69
|
+
};
|
|
40
70
|
}
|
|
41
71
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.test.d.ts","sourceRoot":"","sources":["../../src/commands/status.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { summarizeLocalSubmitState } from "./status.js";
|
|
3
|
+
describe("summarizeLocalSubmitState", () => {
|
|
4
|
+
it("summarizes pending tails and unconfirmed chunks from local state", () => {
|
|
5
|
+
const state = {
|
|
6
|
+
version: 2,
|
|
7
|
+
chunks: {},
|
|
8
|
+
sessions: {
|
|
9
|
+
"codex_cli:s1": {
|
|
10
|
+
sourceTool: "codex_cli",
|
|
11
|
+
sourceSessionId: "s1",
|
|
12
|
+
locator: "/tmp/s1.jsonl",
|
|
13
|
+
nextChunkIndex: 3,
|
|
14
|
+
openChunkStartTurn: 8,
|
|
15
|
+
lastSeenTurnCount: 10,
|
|
16
|
+
lastActivityAt: "2026-03-21T00:00:00.000Z",
|
|
17
|
+
lastFlushedTurnId: "a1",
|
|
18
|
+
confirmedChunkIndex: 1,
|
|
19
|
+
confirmedOpenChunkStartTurn: 4,
|
|
20
|
+
unconfirmedSince: "2026-03-21T00:00:00.000Z",
|
|
21
|
+
},
|
|
22
|
+
"codex_cli:s2": {
|
|
23
|
+
sourceTool: "codex_cli",
|
|
24
|
+
sourceSessionId: "s2",
|
|
25
|
+
locator: "/tmp/s2.jsonl",
|
|
26
|
+
nextChunkIndex: 1,
|
|
27
|
+
openChunkStartTurn: 4,
|
|
28
|
+
lastSeenTurnCount: 4,
|
|
29
|
+
lastActivityAt: "2026-03-21T01:00:00.000Z",
|
|
30
|
+
lastFlushedTurnId: "a2",
|
|
31
|
+
confirmedChunkIndex: 1,
|
|
32
|
+
confirmedOpenChunkStartTurn: 4,
|
|
33
|
+
unconfirmedSince: null,
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
const workers = [
|
|
38
|
+
{
|
|
39
|
+
pid: 123,
|
|
40
|
+
startedAt: "2026-03-21T02:00:00.000Z",
|
|
41
|
+
readyChunkCount: 2,
|
|
42
|
+
readySessionCount: 1,
|
|
43
|
+
logPath: "/tmp/submit.log",
|
|
44
|
+
},
|
|
45
|
+
];
|
|
46
|
+
expect(summarizeLocalSubmitState(state, workers)).toEqual({
|
|
47
|
+
trackedSessions: 2,
|
|
48
|
+
pendingSessions: 1,
|
|
49
|
+
awaitingConfirmationSessions: 1,
|
|
50
|
+
awaitingConfirmationChunks: 2,
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
//# sourceMappingURL=status.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.test.js","sourceRoot":"","sources":["../../src/commands/status.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAIxD,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,KAAK,GAAgB;YACzB,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE;gBACR,cAAc,EAAE;oBACd,UAAU,EAAE,WAAW;oBACvB,eAAe,EAAE,IAAI;oBACrB,OAAO,EAAE,eAAe;oBACxB,cAAc,EAAE,CAAC;oBACjB,kBAAkB,EAAE,CAAC;oBACrB,iBAAiB,EAAE,EAAE;oBACrB,cAAc,EAAE,0BAA0B;oBAC1C,iBAAiB,EAAE,IAAI;oBACvB,mBAAmB,EAAE,CAAC;oBACtB,2BAA2B,EAAE,CAAC;oBAC9B,gBAAgB,EAAE,0BAA0B;iBAC7C;gBACD,cAAc,EAAE;oBACd,UAAU,EAAE,WAAW;oBACvB,eAAe,EAAE,IAAI;oBACrB,OAAO,EAAE,eAAe;oBACxB,cAAc,EAAE,CAAC;oBACjB,kBAAkB,EAAE,CAAC;oBACrB,iBAAiB,EAAE,CAAC;oBACpB,cAAc,EAAE,0BAA0B;oBAC1C,iBAAiB,EAAE,IAAI;oBACvB,mBAAmB,EAAE,CAAC;oBACtB,2BAA2B,EAAE,CAAC;oBAC9B,gBAAgB,EAAE,IAAI;iBACvB;aACF;SACF,CAAC;QACF,MAAM,OAAO,GAAwB;YACnC;gBACE,GAAG,EAAE,GAAG;gBACR,SAAS,EAAE,0BAA0B;gBACrC,eAAe,EAAE,CAAC;gBAClB,iBAAiB,EAAE,CAAC;gBACpB,OAAO,EAAE,iBAAiB;aAC3B;SACF,CAAC;QAEF,MAAM,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;YACxD,eAAe,EAAE,CAAC;YAClB,eAAe,EAAE,CAAC;YAClB,4BAA4B,EAAE,CAAC;YAC/B,0BAA0B,EAAE,CAAC;SAC9B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export interface RemoteSubmissionLike {
|
|
2
|
+
sessionCount: number;
|
|
3
|
+
acceptedCount: number | null;
|
|
4
|
+
totalPayoutCents: number | null;
|
|
5
|
+
}
|
|
6
|
+
export interface RemoteSubmissionDisplay {
|
|
7
|
+
ingestedLabel: string;
|
|
8
|
+
statusLabel: string;
|
|
9
|
+
payoutLabel: string;
|
|
10
|
+
pendingPipeline: boolean;
|
|
11
|
+
}
|
|
12
|
+
export declare function isSubmissionPipelinePending(submission: RemoteSubmissionLike): boolean;
|
|
13
|
+
export declare function formatRemoteSubmissionDisplay(submission: RemoteSubmissionLike): RemoteSubmissionDisplay;
|
|
14
|
+
//# sourceMappingURL=submission-status.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"submission-status.d.ts","sourceRoot":"","sources":["../src/submission-status.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAErF;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,oBAAoB,GAAG,uBAAuB,CA8BvG"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export function isSubmissionPipelinePending(submission) {
|
|
2
|
+
return submission.acceptedCount === null;
|
|
3
|
+
}
|
|
4
|
+
export function formatRemoteSubmissionDisplay(submission) {
|
|
5
|
+
if (submission.acceptedCount === null) {
|
|
6
|
+
return {
|
|
7
|
+
ingestedLabel: `—/${submission.sessionCount}`,
|
|
8
|
+
statusLabel: "pending data pipeline",
|
|
9
|
+
payoutLabel: "processing",
|
|
10
|
+
pendingPipeline: true,
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
const payoutLabel = submission.totalPayoutCents !== null
|
|
14
|
+
? "$" + (submission.totalPayoutCents / 100).toFixed(2)
|
|
15
|
+
: "pending";
|
|
16
|
+
if (submission.acceptedCount === submission.sessionCount) {
|
|
17
|
+
return {
|
|
18
|
+
ingestedLabel: `${submission.acceptedCount}/${submission.sessionCount}`,
|
|
19
|
+
statusLabel: "ingested successfully",
|
|
20
|
+
payoutLabel,
|
|
21
|
+
pendingPipeline: false,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
return {
|
|
25
|
+
ingestedLabel: `${submission.acceptedCount}/${submission.sessionCount}`,
|
|
26
|
+
statusLabel: "completed",
|
|
27
|
+
payoutLabel,
|
|
28
|
+
pendingPipeline: false,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=submission-status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"submission-status.js","sourceRoot":"","sources":["../src/submission-status.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,2BAA2B,CAAC,UAAgC;IAC1E,OAAO,UAAU,CAAC,aAAa,KAAK,IAAI,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,UAAgC;IAC5E,IAAI,UAAU,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;QACtC,OAAO;YACL,aAAa,EAAE,KAAK,UAAU,CAAC,YAAY,EAAE;YAC7C,WAAW,EAAE,uBAAuB;YACpC,WAAW,EAAE,YAAY;YACzB,eAAe,EAAE,IAAI;SACtB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GACf,UAAU,CAAC,gBAAgB,KAAK,IAAI;QAClC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,gBAAgB,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,UAAU,CAAC,aAAa,KAAK,UAAU,CAAC,YAAY,EAAE,CAAC;QACzD,OAAO;YACL,aAAa,EAAE,GAAG,UAAU,CAAC,aAAa,IAAI,UAAU,CAAC,YAAY,EAAE;YACvE,WAAW,EAAE,uBAAuB;YACpC,WAAW;YACX,eAAe,EAAE,KAAK;SACvB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,aAAa,EAAE,GAAG,UAAU,CAAC,aAAa,IAAI,UAAU,CAAC,YAAY,EAAE;QACvE,WAAW,EAAE,WAAW;QACxB,WAAW;QACX,eAAe,EAAE,KAAK;KACvB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"submission-status.test.d.ts","sourceRoot":"","sources":["../src/submission-status.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { formatRemoteSubmissionDisplay, isSubmissionPipelinePending } from "./submission-status.js";
|
|
3
|
+
describe("submission status display", () => {
|
|
4
|
+
it("describes pipeline-pending submissions clearly", () => {
|
|
5
|
+
expect(formatRemoteSubmissionDisplay({
|
|
6
|
+
sessionCount: 5,
|
|
7
|
+
acceptedCount: null,
|
|
8
|
+
totalPayoutCents: null,
|
|
9
|
+
})).toEqual({
|
|
10
|
+
ingestedLabel: "—/5",
|
|
11
|
+
statusLabel: "pending data pipeline",
|
|
12
|
+
payoutLabel: "processing",
|
|
13
|
+
pendingPipeline: true,
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
it("describes fully ingested submissions clearly", () => {
|
|
17
|
+
expect(formatRemoteSubmissionDisplay({
|
|
18
|
+
sessionCount: 5,
|
|
19
|
+
acceptedCount: 5,
|
|
20
|
+
totalPayoutCents: 125,
|
|
21
|
+
})).toEqual({
|
|
22
|
+
ingestedLabel: "5/5",
|
|
23
|
+
statusLabel: "ingested successfully",
|
|
24
|
+
payoutLabel: "$1.25",
|
|
25
|
+
pendingPipeline: false,
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
it("detects whether a remote submission is still in the pipeline", () => {
|
|
29
|
+
expect(isSubmissionPipelinePending({ sessionCount: 1, acceptedCount: null, totalPayoutCents: null })).toBe(true);
|
|
30
|
+
expect(isSubmissionPipelinePending({ sessionCount: 1, acceptedCount: 1, totalPayoutCents: 0 })).toBe(false);
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
//# sourceMappingURL=submission-status.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"submission-status.test.js","sourceRoot":"","sources":["../src/submission-status.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAEpG,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,CAAC,6BAA6B,CAAC;YACnC,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,IAAI;YACnB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC,CAAC,OAAO,CAAC;YACV,aAAa,EAAE,KAAK;YACpB,WAAW,EAAE,uBAAuB;YACpC,WAAW,EAAE,YAAY;YACzB,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CAAC,6BAA6B,CAAC;YACnC,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,CAAC;YAChB,gBAAgB,EAAE,GAAG;SACtB,CAAC,CAAC,CAAC,OAAO,CAAC;YACV,aAAa,EAAE,KAAK;YACpB,WAAW,EAAE,uBAAuB;YACpC,WAAW,EAAE,OAAO;YACpB,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,CAAC,2BAA2B,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjH,MAAM,CAAC,2BAA2B,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9G,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tracemarketplace/cli",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.20",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"bin": {
|
|
6
6
|
"tracemp": "dist/cli.js"
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"test:watch": "vitest"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@tracemarketplace/shared": "^0.0.
|
|
16
|
+
"@tracemarketplace/shared": "^0.0.15",
|
|
17
17
|
"better-sqlite3": "^12.8.0",
|
|
18
18
|
"chalk": "^5.3.0",
|
|
19
19
|
"commander": "^12.0.0",
|
package/src/cli.ts
CHANGED
|
@@ -67,9 +67,10 @@ program
|
|
|
67
67
|
|
|
68
68
|
program
|
|
69
69
|
.command("status")
|
|
70
|
-
.description("Show
|
|
70
|
+
.description("Show local submit state; add --remote for server ingest status")
|
|
71
71
|
.option("--profile <name>", profileOptionDescription)
|
|
72
|
-
.
|
|
72
|
+
.option("--remote", "Also fetch remote account/submission status from the API")
|
|
73
|
+
.action((opts) => statusCommand({ profile: opts.profile, remote: opts.remote }).catch(handleError));
|
|
73
74
|
|
|
74
75
|
program
|
|
75
76
|
.command("history")
|
package/src/commands/history.ts
CHANGED
|
@@ -2,6 +2,7 @@ import chalk from "chalk";
|
|
|
2
2
|
import { loadConfig, resolveProfile } from "../config.js";
|
|
3
3
|
import { ApiClient } from "../api-client.js";
|
|
4
4
|
import { loginCommandForProfile } from "../constants.js";
|
|
5
|
+
import { formatRemoteSubmissionDisplay } from "../submission-status.js";
|
|
5
6
|
|
|
6
7
|
export async function historyCommand(opts: { profile?: string } = {}): Promise<void> {
|
|
7
8
|
const profile = resolveProfile(opts.profile);
|
|
@@ -12,14 +13,14 @@ export async function historyCommand(opts: { profile?: string } = {}): Promise<v
|
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
const client = new ApiClient(config.serverUrl, config.apiKey);
|
|
15
|
-
const subs = (await client.get("/api/v1/submissions")) as Array<{
|
|
16
|
+
const subs = ((await client.get("/api/v1/submissions")) as Array<{
|
|
16
17
|
id: string;
|
|
17
18
|
sourceTool: string;
|
|
18
19
|
submittedAt: string | number;
|
|
19
20
|
sessionCount: number;
|
|
20
21
|
acceptedCount: number | null;
|
|
21
22
|
totalPayoutCents: number | null;
|
|
22
|
-
}
|
|
23
|
+
}>).sort((a, b) => Date.parse(String(b.submittedAt)) - Date.parse(String(a.submittedAt)));
|
|
23
24
|
|
|
24
25
|
if (subs.length === 0) {
|
|
25
26
|
console.log(chalk.gray("No submissions yet."));
|
|
@@ -33,23 +34,41 @@ export async function historyCommand(opts: { profile?: string } = {}): Promise<v
|
|
|
33
34
|
chalk.gray(
|
|
34
35
|
"Date".padEnd(14) +
|
|
35
36
|
"Tool".padEnd(16) +
|
|
36
|
-
"
|
|
37
|
+
"Ingested".padEnd(12) +
|
|
38
|
+
"Status".padEnd(26) +
|
|
37
39
|
"Payout"
|
|
38
40
|
)
|
|
39
41
|
);
|
|
40
|
-
console.log(chalk.gray("─".repeat(
|
|
42
|
+
console.log(chalk.gray("─".repeat(76)));
|
|
41
43
|
|
|
42
44
|
for (const s of subs) {
|
|
43
45
|
const date = new Date(s.submittedAt).toLocaleDateString();
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
? "$" + (s.totalPayoutCents / 100).toFixed(2)
|
|
47
|
-
: "pending";
|
|
46
|
+
const display = formatRemoteSubmissionDisplay(s);
|
|
47
|
+
const status = colorSubmissionStatus(display.statusLabel, display.pendingPipeline);
|
|
48
48
|
console.log(
|
|
49
49
|
date.padEnd(14) +
|
|
50
50
|
s.sourceTool.padEnd(16) +
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
display.ingestedLabel.padEnd(12) +
|
|
52
|
+
status +
|
|
53
|
+
colorPayout(display.payoutLabel, display.pendingPipeline)
|
|
53
54
|
);
|
|
54
55
|
}
|
|
55
56
|
}
|
|
57
|
+
|
|
58
|
+
function colorSubmissionStatus(label: string, pendingPipeline: boolean): string {
|
|
59
|
+
const padded = label.padEnd(26);
|
|
60
|
+
if (pendingPipeline) {
|
|
61
|
+
return chalk.yellow(padded);
|
|
62
|
+
}
|
|
63
|
+
if (label === "ingested successfully") {
|
|
64
|
+
return chalk.green(padded);
|
|
65
|
+
}
|
|
66
|
+
return chalk.gray(padded);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
function colorPayout(label: string, pendingPipeline: boolean): string {
|
|
70
|
+
if (pendingPipeline || label === "pending") {
|
|
71
|
+
return chalk.yellow(label);
|
|
72
|
+
}
|
|
73
|
+
return chalk.green(label);
|
|
74
|
+
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { summarizeLocalSubmitState } from "./status.js";
|
|
3
|
+
import type { SubmitState } from "../config.js";
|
|
4
|
+
import type { SubmitWorkerState } from "../submit-worker-state.js";
|
|
5
|
+
|
|
6
|
+
describe("summarizeLocalSubmitState", () => {
|
|
7
|
+
it("summarizes pending tails and unconfirmed chunks from local state", () => {
|
|
8
|
+
const state: SubmitState = {
|
|
9
|
+
version: 2,
|
|
10
|
+
chunks: {},
|
|
11
|
+
sessions: {
|
|
12
|
+
"codex_cli:s1": {
|
|
13
|
+
sourceTool: "codex_cli",
|
|
14
|
+
sourceSessionId: "s1",
|
|
15
|
+
locator: "/tmp/s1.jsonl",
|
|
16
|
+
nextChunkIndex: 3,
|
|
17
|
+
openChunkStartTurn: 8,
|
|
18
|
+
lastSeenTurnCount: 10,
|
|
19
|
+
lastActivityAt: "2026-03-21T00:00:00.000Z",
|
|
20
|
+
lastFlushedTurnId: "a1",
|
|
21
|
+
confirmedChunkIndex: 1,
|
|
22
|
+
confirmedOpenChunkStartTurn: 4,
|
|
23
|
+
unconfirmedSince: "2026-03-21T00:00:00.000Z",
|
|
24
|
+
},
|
|
25
|
+
"codex_cli:s2": {
|
|
26
|
+
sourceTool: "codex_cli",
|
|
27
|
+
sourceSessionId: "s2",
|
|
28
|
+
locator: "/tmp/s2.jsonl",
|
|
29
|
+
nextChunkIndex: 1,
|
|
30
|
+
openChunkStartTurn: 4,
|
|
31
|
+
lastSeenTurnCount: 4,
|
|
32
|
+
lastActivityAt: "2026-03-21T01:00:00.000Z",
|
|
33
|
+
lastFlushedTurnId: "a2",
|
|
34
|
+
confirmedChunkIndex: 1,
|
|
35
|
+
confirmedOpenChunkStartTurn: 4,
|
|
36
|
+
unconfirmedSince: null,
|
|
37
|
+
},
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
const workers: SubmitWorkerState[] = [
|
|
41
|
+
{
|
|
42
|
+
pid: 123,
|
|
43
|
+
startedAt: "2026-03-21T02:00:00.000Z",
|
|
44
|
+
readyChunkCount: 2,
|
|
45
|
+
readySessionCount: 1,
|
|
46
|
+
logPath: "/tmp/submit.log",
|
|
47
|
+
},
|
|
48
|
+
];
|
|
49
|
+
|
|
50
|
+
expect(summarizeLocalSubmitState(state, workers)).toEqual({
|
|
51
|
+
trackedSessions: 2,
|
|
52
|
+
pendingSessions: 1,
|
|
53
|
+
awaitingConfirmationSessions: 1,
|
|
54
|
+
awaitingConfirmationChunks: 2,
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
});
|
package/src/commands/status.ts
CHANGED
|
@@ -1,10 +1,23 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
|
-
import { loadConfig, resolveProfile } from "../config.js";
|
|
2
|
+
import { loadConfig, loadState, migrateSessionUploadState, resolveProfile, type SubmitState } from "../config.js";
|
|
3
3
|
import { ApiClient } from "../api-client.js";
|
|
4
4
|
import { loginCommandForProfile } from "../constants.js";
|
|
5
|
-
import { listActiveSubmitWorkers } from "../submit-worker-state.js";
|
|
5
|
+
import { listActiveSubmitWorkers, type SubmitWorkerState } from "../submit-worker-state.js";
|
|
6
|
+
import { formatRemoteSubmissionDisplay, isSubmissionPipelinePending } from "../submission-status.js";
|
|
6
7
|
|
|
7
|
-
|
|
8
|
+
interface StatusOptions {
|
|
9
|
+
profile?: string;
|
|
10
|
+
remote?: boolean;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
interface LocalSubmitStatusSummary {
|
|
14
|
+
trackedSessions: number;
|
|
15
|
+
pendingSessions: number;
|
|
16
|
+
awaitingConfirmationSessions: number;
|
|
17
|
+
awaitingConfirmationChunks: number;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export async function statusCommand(opts: StatusOptions = {}): Promise<void> {
|
|
8
21
|
const profile = resolveProfile(opts.profile);
|
|
9
22
|
const config = loadConfig(profile);
|
|
10
23
|
if (!config) {
|
|
@@ -12,24 +25,23 @@ export async function statusCommand(opts: { profile?: string } = {}): Promise<vo
|
|
|
12
25
|
process.exit(1);
|
|
13
26
|
}
|
|
14
27
|
|
|
15
|
-
const
|
|
16
|
-
const [me, subs] = await Promise.all([
|
|
17
|
-
client.get("/api/v1/me") as Promise<{ email: string; balanceCents?: number; balance_cents?: number }>,
|
|
18
|
-
client.get("/api/v1/submissions") as Promise<any[]>,
|
|
19
|
-
]);
|
|
28
|
+
const localState = loadState(config.profile);
|
|
20
29
|
const activeWorkers = listActiveSubmitWorkers(config.profile);
|
|
30
|
+
const summary = summarizeLocalSubmitState(localState, activeWorkers);
|
|
21
31
|
|
|
22
|
-
const balance = ((me as any).balanceCents ?? (me as any).balance_cents ?? 0) / 100;
|
|
23
32
|
console.log(chalk.gray("Profile:"), config.profile);
|
|
24
|
-
console.log(chalk.gray("Server:"), config.serverUrl);
|
|
25
33
|
console.log(
|
|
26
|
-
chalk.bold("
|
|
34
|
+
chalk.bold("Local upload worker:"),
|
|
27
35
|
activeWorkers.length > 0
|
|
28
36
|
? chalk.yellow(`running (${activeWorkers.length})`)
|
|
29
37
|
: chalk.gray("idle"),
|
|
30
38
|
);
|
|
31
|
-
console.log(chalk.bold("
|
|
32
|
-
console.log(chalk.bold("
|
|
39
|
+
console.log(chalk.bold("Tracked sessions:"), summary.trackedSessions);
|
|
40
|
+
console.log(chalk.bold("Sessions still in progress:"), summary.pendingSessions);
|
|
41
|
+
console.log(
|
|
42
|
+
chalk.bold("Queued uploads awaiting server confirmation:"),
|
|
43
|
+
`${summary.awaitingConfirmationChunks} chunk(s) across ${summary.awaitingConfirmationSessions} session(s)`,
|
|
44
|
+
);
|
|
33
45
|
|
|
34
46
|
if (activeWorkers.length > 0) {
|
|
35
47
|
activeWorkers.slice(0, 3).forEach((worker) => {
|
|
@@ -45,8 +57,53 @@ export async function statusCommand(opts: { profile?: string } = {}): Promise<vo
|
|
|
45
57
|
console.log(chalk.gray(` Log: ${activeWorkers[0]!.logPath}`));
|
|
46
58
|
}
|
|
47
59
|
|
|
48
|
-
|
|
60
|
+
if (!opts.remote) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
const client = new ApiClient(config.serverUrl, config.apiKey);
|
|
65
|
+
const [me, subs] = await Promise.all([
|
|
66
|
+
client.get("/api/v1/me") as Promise<{ email: string; balanceCents?: number; balance_cents?: number }>,
|
|
67
|
+
client.get("/api/v1/submissions") as Promise<any[]>,
|
|
68
|
+
]);
|
|
69
|
+
const sortedSubs = [...(subs as any[])].sort(
|
|
70
|
+
(a, b) => Date.parse(String(b.submittedAt)) - Date.parse(String(a.submittedAt)),
|
|
71
|
+
);
|
|
72
|
+
const balance = ((me as any).balanceCents ?? (me as any).balance_cents ?? 0) / 100;
|
|
73
|
+
const pending = sortedSubs.filter((s) => isSubmissionPipelinePending(s));
|
|
74
|
+
|
|
75
|
+
console.log();
|
|
76
|
+
console.log(chalk.gray("Remote server:"), config.serverUrl);
|
|
77
|
+
console.log(chalk.bold("Balance:"), chalk.green(`$${balance.toFixed(2)}`));
|
|
78
|
+
console.log(chalk.bold("Submission batches:"), sortedSubs.length);
|
|
49
79
|
if (pending.length > 0) {
|
|
50
|
-
console.log(chalk.yellow(
|
|
80
|
+
console.log(chalk.yellow(`Server data pipeline: processing ${pending.length} submission batch(es)`));
|
|
81
|
+
} else if (sortedSubs.length > 0) {
|
|
82
|
+
console.log(chalk.green("Server data pipeline: idle"));
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
if (sortedSubs.length > 0) {
|
|
86
|
+
const latest = formatRemoteSubmissionDisplay(sortedSubs[0]);
|
|
87
|
+
console.log(chalk.gray(`Latest batch: ${latest.statusLabel} (${latest.ingestedLabel})`));
|
|
51
88
|
}
|
|
52
89
|
}
|
|
90
|
+
|
|
91
|
+
export function summarizeLocalSubmitState(
|
|
92
|
+
state: SubmitState,
|
|
93
|
+
_activeWorkers: SubmitWorkerState[],
|
|
94
|
+
): LocalSubmitStatusSummary {
|
|
95
|
+
const sessions = Object.values(state.sessions).map((session) => migrateSessionUploadState(session));
|
|
96
|
+
const pendingSessions = sessions.filter((session) => session.openChunkStartTurn < session.lastSeenTurnCount).length;
|
|
97
|
+
const awaitingConfirmationSessions = sessions.filter((session) => session.confirmedChunkIndex < session.nextChunkIndex).length;
|
|
98
|
+
const awaitingConfirmationChunks = sessions.reduce(
|
|
99
|
+
(sum, session) => sum + Math.max(0, session.nextChunkIndex - session.confirmedChunkIndex),
|
|
100
|
+
0,
|
|
101
|
+
);
|
|
102
|
+
|
|
103
|
+
return {
|
|
104
|
+
trackedSessions: sessions.length,
|
|
105
|
+
pendingSessions,
|
|
106
|
+
awaitingConfirmationSessions,
|
|
107
|
+
awaitingConfirmationChunks,
|
|
108
|
+
};
|
|
109
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { formatRemoteSubmissionDisplay, isSubmissionPipelinePending } from "./submission-status.js";
|
|
3
|
+
|
|
4
|
+
describe("submission status display", () => {
|
|
5
|
+
it("describes pipeline-pending submissions clearly", () => {
|
|
6
|
+
expect(formatRemoteSubmissionDisplay({
|
|
7
|
+
sessionCount: 5,
|
|
8
|
+
acceptedCount: null,
|
|
9
|
+
totalPayoutCents: null,
|
|
10
|
+
})).toEqual({
|
|
11
|
+
ingestedLabel: "—/5",
|
|
12
|
+
statusLabel: "pending data pipeline",
|
|
13
|
+
payoutLabel: "processing",
|
|
14
|
+
pendingPipeline: true,
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it("describes fully ingested submissions clearly", () => {
|
|
19
|
+
expect(formatRemoteSubmissionDisplay({
|
|
20
|
+
sessionCount: 5,
|
|
21
|
+
acceptedCount: 5,
|
|
22
|
+
totalPayoutCents: 125,
|
|
23
|
+
})).toEqual({
|
|
24
|
+
ingestedLabel: "5/5",
|
|
25
|
+
statusLabel: "ingested successfully",
|
|
26
|
+
payoutLabel: "$1.25",
|
|
27
|
+
pendingPipeline: false,
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
it("detects whether a remote submission is still in the pipeline", () => {
|
|
32
|
+
expect(isSubmissionPipelinePending({ sessionCount: 1, acceptedCount: null, totalPayoutCents: null })).toBe(true);
|
|
33
|
+
expect(isSubmissionPipelinePending({ sessionCount: 1, acceptedCount: 1, totalPayoutCents: 0 })).toBe(false);
|
|
34
|
+
});
|
|
35
|
+
});
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
export interface RemoteSubmissionLike {
|
|
2
|
+
sessionCount: number;
|
|
3
|
+
acceptedCount: number | null;
|
|
4
|
+
totalPayoutCents: number | null;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
export interface RemoteSubmissionDisplay {
|
|
8
|
+
ingestedLabel: string;
|
|
9
|
+
statusLabel: string;
|
|
10
|
+
payoutLabel: string;
|
|
11
|
+
pendingPipeline: boolean;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export function isSubmissionPipelinePending(submission: RemoteSubmissionLike): boolean {
|
|
15
|
+
return submission.acceptedCount === null;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export function formatRemoteSubmissionDisplay(submission: RemoteSubmissionLike): RemoteSubmissionDisplay {
|
|
19
|
+
if (submission.acceptedCount === null) {
|
|
20
|
+
return {
|
|
21
|
+
ingestedLabel: `—/${submission.sessionCount}`,
|
|
22
|
+
statusLabel: "pending data pipeline",
|
|
23
|
+
payoutLabel: "processing",
|
|
24
|
+
pendingPipeline: true,
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const payoutLabel =
|
|
29
|
+
submission.totalPayoutCents !== null
|
|
30
|
+
? "$" + (submission.totalPayoutCents / 100).toFixed(2)
|
|
31
|
+
: "pending";
|
|
32
|
+
|
|
33
|
+
if (submission.acceptedCount === submission.sessionCount) {
|
|
34
|
+
return {
|
|
35
|
+
ingestedLabel: `${submission.acceptedCount}/${submission.sessionCount}`,
|
|
36
|
+
statusLabel: "ingested successfully",
|
|
37
|
+
payoutLabel,
|
|
38
|
+
pendingPipeline: false,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
return {
|
|
43
|
+
ingestedLabel: `${submission.acceptedCount}/${submission.sessionCount}`,
|
|
44
|
+
statusLabel: "completed",
|
|
45
|
+
payoutLabel,
|
|
46
|
+
pendingPipeline: false,
|
|
47
|
+
};
|
|
48
|
+
}
|