codedeck 0.6.0 → 0.7.0
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/cli/commands/open.js +94 -2
- package/dist/cli/commands/open.js.map +1 -1
- package/dist/cli/commands/usage-backfill.js +149 -0
- package/dist/cli/commands/usage-backfill.js.map +1 -0
- package/dist/cli/commands/usage.js +49 -4
- package/dist/cli/commands/usage.js.map +1 -1
- package/dist/core/claude-transcript.js +139 -0
- package/dist/core/claude-transcript.js.map +1 -0
- package/dist/core/pricing.js +14 -5
- package/dist/core/pricing.js.map +1 -1
- package/dist/core/run-usage.js +53 -10
- package/dist/core/run-usage.js.map +1 -1
- package/dist/core/usage-source.js +17 -0
- package/dist/core/usage-source.js.map +1 -0
- package/dist/daemon/daemon.js +216 -8
- package/dist/daemon/daemon.js.map +1 -1
- package/dist/daemon/ipc.js +4 -3
- package/dist/daemon/ipc.js.map +1 -1
- package/dist/drivers/session-driver.js +7 -1
- package/dist/drivers/session-driver.js.map +1 -1
- package/dist/open/launchers/claude.js +78 -2
- package/dist/open/launchers/claude.js.map +1 -1
- package/dist/open/link-watcher.js +44 -0
- package/dist/open/link-watcher.js.map +1 -0
- package/dist/open/runtime.js +15 -12
- package/dist/open/runtime.js.map +1 -1
- package/dist/plugin/hooks/register.tsx +7 -11
- package/dist/plugin/hooks/session-id.sh +1 -1
- package/dist/plugin/mods/agents/pane.ts +35 -29
- package/dist/plugin/mods/agents/types.ts +5 -1
- package/dist/plugin/statusline.sh +40 -3
- package/dist/store/database.js +44 -0
- package/dist/store/database.js.map +1 -1
- package/dist/store/native-links.js +80 -0
- package/dist/store/native-links.js.map +1 -0
- package/dist/store/sessions.js +113 -41
- package/dist/store/sessions.js.map +1 -1
- package/dist/store/usage-ledger.js +153 -0
- package/dist/store/usage-ledger.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { createReadStream, existsSync, readdirSync } from "node:fs";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { createInterface } from "node:readline";
|
|
5
|
+
import { computeSessionCost } from "./pricing.js";
|
|
6
|
+
function isRecord(value) {
|
|
7
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
8
|
+
}
|
|
9
|
+
function tokenCount(value) {
|
|
10
|
+
return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
|
|
11
|
+
}
|
|
12
|
+
function finiteNumber(value) {
|
|
13
|
+
return typeof value === "number" && Number.isFinite(value) ? value : undefined;
|
|
14
|
+
}
|
|
15
|
+
function emptyUsage() {
|
|
16
|
+
return { inputTokens: 0, outputTokens: 0, cachedTokens: 0 };
|
|
17
|
+
}
|
|
18
|
+
function usageFromCostState(value) {
|
|
19
|
+
const totals = emptyUsage();
|
|
20
|
+
const modelUsage = isRecord(value.modelUsage) ? value.modelUsage : {};
|
|
21
|
+
let model;
|
|
22
|
+
let highestModelCost = Number.NEGATIVE_INFINITY;
|
|
23
|
+
for (const [name, rawUsage] of Object.entries(modelUsage)) {
|
|
24
|
+
if (!isRecord(rawUsage))
|
|
25
|
+
continue;
|
|
26
|
+
totals.inputTokens += tokenCount(rawUsage.inputTokens);
|
|
27
|
+
totals.outputTokens += tokenCount(rawUsage.outputTokens);
|
|
28
|
+
totals.cachedTokens += tokenCount(rawUsage.cacheReadInputTokens) + tokenCount(rawUsage.cacheCreationInputTokens);
|
|
29
|
+
const modelCost = finiteNumber(rawUsage.costUSD);
|
|
30
|
+
if (modelCost !== undefined && modelCost > highestModelCost) {
|
|
31
|
+
highestModelCost = modelCost;
|
|
32
|
+
model = name;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
const cost = finiteNumber(value.totalCostUSD);
|
|
36
|
+
return {
|
|
37
|
+
state: "cost-state",
|
|
38
|
+
...(cost === undefined ? {} : { cost }),
|
|
39
|
+
...totals,
|
|
40
|
+
...(model === undefined ? {} : { model }),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
export function findTranscript(nativeId, projectsDir = path.join(os.homedir(), ".claude", "projects")) {
|
|
44
|
+
let projects;
|
|
45
|
+
try {
|
|
46
|
+
projects = readdirSync(projectsDir, { withFileTypes: true });
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
for (const project of projects) {
|
|
52
|
+
if (!project.isDirectory())
|
|
53
|
+
continue;
|
|
54
|
+
const candidate = path.join(projectsDir, project.name, `${nativeId}.jsonl`);
|
|
55
|
+
if (existsSync(candidate))
|
|
56
|
+
return candidate;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
export async function readTranscriptUsage(file) {
|
|
60
|
+
let latestCostState;
|
|
61
|
+
let endedAt;
|
|
62
|
+
let cwd;
|
|
63
|
+
const seenMessages = new Set();
|
|
64
|
+
const usageByModel = new Map();
|
|
65
|
+
const lines = createInterface({ input: createReadStream(file), crlfDelay: Infinity });
|
|
66
|
+
for await (const line of lines) {
|
|
67
|
+
let parsed;
|
|
68
|
+
try {
|
|
69
|
+
parsed = JSON.parse(line);
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
if (!isRecord(parsed))
|
|
75
|
+
continue;
|
|
76
|
+
if (typeof parsed.timestamp === "string")
|
|
77
|
+
endedAt = parsed.timestamp;
|
|
78
|
+
if (typeof parsed.cwd === "string")
|
|
79
|
+
cwd = parsed.cwd;
|
|
80
|
+
if (parsed.type === "cost-state") {
|
|
81
|
+
latestCostState = usageFromCostState(parsed);
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
if (parsed.type !== "assistant" || !isRecord(parsed.message) || !isRecord(parsed.message.usage))
|
|
85
|
+
continue;
|
|
86
|
+
const usage = parsed.message.usage;
|
|
87
|
+
const inputTokens = tokenCount(usage.input_tokens);
|
|
88
|
+
const outputTokens = tokenCount(usage.output_tokens);
|
|
89
|
+
const cacheReadTokens = tokenCount(usage.cache_read_input_tokens);
|
|
90
|
+
const cacheCreationTokens = tokenCount(usage.cache_creation_input_tokens);
|
|
91
|
+
if (inputTokens === 0 && outputTokens === 0 && cacheReadTokens === 0 && cacheCreationTokens === 0)
|
|
92
|
+
continue;
|
|
93
|
+
const messageId = parsed.message.id;
|
|
94
|
+
const requestId = parsed.requestId;
|
|
95
|
+
if (messageId != null && requestId != null) {
|
|
96
|
+
const key = JSON.stringify([messageId, requestId]);
|
|
97
|
+
if (seenMessages.has(key))
|
|
98
|
+
continue;
|
|
99
|
+
seenMessages.add(key);
|
|
100
|
+
}
|
|
101
|
+
const model = typeof parsed.message.model === "string" ? parsed.message.model : undefined;
|
|
102
|
+
const totals = usageByModel.get(model) ?? emptyUsage();
|
|
103
|
+
totals.inputTokens += inputTokens;
|
|
104
|
+
totals.outputTokens += outputTokens;
|
|
105
|
+
totals.cachedTokens += cacheReadTokens + cacheCreationTokens;
|
|
106
|
+
usageByModel.set(model, totals);
|
|
107
|
+
}
|
|
108
|
+
if (latestCostState) {
|
|
109
|
+
return {
|
|
110
|
+
...latestCostState,
|
|
111
|
+
...(endedAt === undefined ? {} : { endedAt }),
|
|
112
|
+
...(cwd === undefined ? {} : { cwd }),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
const totals = emptyUsage();
|
|
116
|
+
let cost = 0;
|
|
117
|
+
let allModelsPriced = true;
|
|
118
|
+
for (const [model, usage] of usageByModel) {
|
|
119
|
+
totals.inputTokens += usage.inputTokens;
|
|
120
|
+
totals.outputTokens += usage.outputTokens;
|
|
121
|
+
totals.cachedTokens += usage.cachedTokens;
|
|
122
|
+
const modelCost = computeSessionCost({ model, usage });
|
|
123
|
+
if (modelCost === null)
|
|
124
|
+
allModelsPriced = false;
|
|
125
|
+
else
|
|
126
|
+
cost += modelCost;
|
|
127
|
+
}
|
|
128
|
+
return {
|
|
129
|
+
state: allModelsPriced ? "tokens" : "no-price",
|
|
130
|
+
...(allModelsPriced ? { cost } : {}),
|
|
131
|
+
...totals,
|
|
132
|
+
...(usageByModel.size === 1 && usageByModel.keys().next().value !== undefined
|
|
133
|
+
? { model: usageByModel.keys().next().value }
|
|
134
|
+
: {}),
|
|
135
|
+
...(endedAt === undefined ? {} : { endedAt }),
|
|
136
|
+
...(cwd === undefined ? {} : { cwd }),
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=claude-transcript.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-transcript.js","sourceRoot":"","sources":["../../src/core/claude-transcript.ts"],"names":[],"mappings":"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"}
|
package/dist/core/pricing.js
CHANGED
|
@@ -103,7 +103,16 @@ export function resolveModelPrice(model) {
|
|
|
103
103
|
* estimate. Cached tokens use the input price unless the model declares its
|
|
104
104
|
* own cached price. Invalid or unknown data has no known cost and returns null.
|
|
105
105
|
*/
|
|
106
|
-
export function computeSessionCost({ model, usage, reportedCost, }) {
|
|
106
|
+
export function computeSessionCost({ model, usage, reportedCost, cachedInInput = false, }) {
|
|
107
|
+
const inputTokens = usage?.inputTokens ?? 0;
|
|
108
|
+
const outputTokens = usage?.outputTokens ?? 0;
|
|
109
|
+
const cachedTokens = usage?.cachedTokens ?? 0;
|
|
110
|
+
if (cachedInInput &&
|
|
111
|
+
isFiniteNumber(inputTokens) &&
|
|
112
|
+
isFiniteNumber(cachedTokens) &&
|
|
113
|
+
cachedTokens > inputTokens) {
|
|
114
|
+
return null;
|
|
115
|
+
}
|
|
107
116
|
if (isFiniteNumber(reportedCost) && reportedCost < 0)
|
|
108
117
|
return null;
|
|
109
118
|
// Zero is a valid reported cost and must win over every table entry.
|
|
@@ -112,17 +121,17 @@ export function computeSessionCost({ model, usage, reportedCost, }) {
|
|
|
112
121
|
const price = resolveModelPrice(model);
|
|
113
122
|
if (!price || !isUsablePrice(price))
|
|
114
123
|
return null;
|
|
115
|
-
const inputTokens = usage?.inputTokens ?? 0;
|
|
116
|
-
const outputTokens = usage?.outputTokens ?? 0;
|
|
117
|
-
const cachedTokens = usage?.cachedTokens ?? 0;
|
|
118
124
|
if (!isValidTokenCount(inputTokens) ||
|
|
119
125
|
!isValidTokenCount(outputTokens) ||
|
|
120
126
|
!isValidTokenCount(cachedTokens)) {
|
|
121
127
|
return null;
|
|
122
128
|
}
|
|
123
129
|
const cachedPrice = price.cached ?? price.input;
|
|
124
|
-
return (inputTokens * price.input +
|
|
130
|
+
return ((cachedInInput ? inputTokens - cachedTokens : inputTokens) * price.input +
|
|
125
131
|
outputTokens * price.output +
|
|
126
132
|
cachedTokens * cachedPrice) / 1_000_000;
|
|
127
133
|
}
|
|
134
|
+
export function cachedInInputFor(agent) {
|
|
135
|
+
return agent === "codex";
|
|
136
|
+
}
|
|
128
137
|
//# sourceMappingURL=pricing.js.map
|
package/dist/core/pricing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../../src/core/pricing.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../../src/core/pricing.ts"],"names":[],"mappings":"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"}
|
package/dist/core/run-usage.js
CHANGED
|
@@ -1,31 +1,46 @@
|
|
|
1
|
-
import { computeSessionCost } from "./pricing.js";
|
|
1
|
+
import { cachedInInputFor, computeSessionCost } from "./pricing.js";
|
|
2
2
|
import { isActiveStatus } from "./session.js";
|
|
3
3
|
/**
|
|
4
4
|
* Aggregates the last persisted usage value for each session in a run.
|
|
5
5
|
* An empty run is complete because it has no session without a known cost.
|
|
6
6
|
*/
|
|
7
|
-
export function aggregateRunUsage(runId, sessions) {
|
|
7
|
+
export function aggregateRunUsage(runId, sessions, attributions = [], linkStates = []) {
|
|
8
8
|
const uniqueSessions = new Map();
|
|
9
9
|
for (const session of sessions)
|
|
10
10
|
uniqueSessions.set(session.id, session);
|
|
11
|
+
const orchestratorSessions = new Set([...uniqueSessions.values()]
|
|
12
|
+
.filter((session) => session.origin === "open")
|
|
13
|
+
.map((session) => session.id));
|
|
11
14
|
const summary = {
|
|
12
15
|
runId,
|
|
13
16
|
inputTokens: 0,
|
|
14
17
|
outputTokens: 0,
|
|
15
18
|
cachedTokens: 0,
|
|
16
19
|
costUsd: 0,
|
|
17
|
-
sessionCount:
|
|
18
|
-
activeSessionCount:
|
|
20
|
+
sessionCount: 0,
|
|
21
|
+
activeSessionCount: 0,
|
|
19
22
|
costComplete: true,
|
|
20
23
|
sessionsWithoutCost: 0,
|
|
24
|
+
orchestrator: {
|
|
25
|
+
costUsd: 0,
|
|
26
|
+
costComplete: true,
|
|
27
|
+
inputTokens: 0,
|
|
28
|
+
outputTokens: 0,
|
|
29
|
+
cachedTokens: 0,
|
|
30
|
+
sources: [],
|
|
31
|
+
},
|
|
32
|
+
total: { costUsd: 0 },
|
|
21
33
|
};
|
|
22
34
|
for (const session of uniqueSessions.values()) {
|
|
35
|
+
const isOrchestrator = session.origin === "open";
|
|
23
36
|
const usage = session.usage;
|
|
24
|
-
summary.
|
|
25
|
-
|
|
26
|
-
|
|
37
|
+
const target = isOrchestrator ? summary.orchestrator : summary;
|
|
38
|
+
target.inputTokens += usage?.inputTokens ?? 0;
|
|
39
|
+
target.outputTokens += usage?.outputTokens ?? 0;
|
|
40
|
+
target.cachedTokens += usage?.cachedTokens ?? 0;
|
|
27
41
|
const costUsd = computeSessionCost({
|
|
28
42
|
model: session.model,
|
|
43
|
+
cachedInInput: cachedInInputFor(session.agent),
|
|
29
44
|
reportedCost: usage?.cost,
|
|
30
45
|
usage: {
|
|
31
46
|
inputTokens: usage?.inputTokens,
|
|
@@ -34,13 +49,41 @@ export function aggregateRunUsage(runId, sessions) {
|
|
|
34
49
|
},
|
|
35
50
|
});
|
|
36
51
|
if (costUsd === null) {
|
|
37
|
-
|
|
38
|
-
|
|
52
|
+
if (isOrchestrator) {
|
|
53
|
+
summary.orchestrator.costComplete = false;
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
summary.costComplete = false;
|
|
57
|
+
summary.sessionsWithoutCost += 1;
|
|
58
|
+
}
|
|
39
59
|
}
|
|
40
60
|
else {
|
|
41
|
-
|
|
61
|
+
target.costUsd += costUsd;
|
|
42
62
|
}
|
|
63
|
+
if (!isOrchestrator) {
|
|
64
|
+
summary.sessionCount++;
|
|
65
|
+
if (isActiveStatus(session.status))
|
|
66
|
+
summary.activeSessionCount++;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
for (const linkState of linkStates) {
|
|
70
|
+
if (orchestratorSessions.has(linkState.sessionId) &&
|
|
71
|
+
(linkState.state === "missing" || linkState.state === "no-price")) {
|
|
72
|
+
summary.orchestrator.costComplete = false;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
const sourceCosts = new Map();
|
|
76
|
+
for (const attribution of attributions) {
|
|
77
|
+
if (!orchestratorSessions.has(attribution.sessionId))
|
|
78
|
+
continue;
|
|
79
|
+
const cost = attribution.cost ?? 0;
|
|
80
|
+
sourceCosts.set(attribution.sourceKey, (sourceCosts.get(attribution.sourceKey) ?? 0) + cost);
|
|
43
81
|
}
|
|
82
|
+
summary.orchestrator.sources = [...sourceCosts].map(([sourceKey, costUsd]) => ({
|
|
83
|
+
nativeId: sourceKey.replace(/^claude-open:/, ""),
|
|
84
|
+
costUsd,
|
|
85
|
+
}));
|
|
86
|
+
summary.total.costUsd = summary.costUsd + summary.orchestrator.costUsd;
|
|
44
87
|
return summary;
|
|
45
88
|
}
|
|
46
89
|
//# sourceMappingURL=run-usage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-usage.js","sourceRoot":"","sources":["../../src/core/run-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"run-usage.js","sourceRoot":"","sources":["../../src/core/run-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export function workerSourceKey(session, processOrdinal) {
|
|
2
|
+
switch (session.agent) {
|
|
3
|
+
case "claude":
|
|
4
|
+
return `claude:${session.nativeSessionId ?? session.id}#${processOrdinal}`;
|
|
5
|
+
case "codex":
|
|
6
|
+
return `codex:${session.nativeSessionId ?? session.id}`;
|
|
7
|
+
case "antigravity":
|
|
8
|
+
case "omp":
|
|
9
|
+
return `session:${session.id}`;
|
|
10
|
+
case "opencode":
|
|
11
|
+
break;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
export function openSourceKey(nativeId) {
|
|
15
|
+
return `claude-open:${nativeId}`;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=usage-source.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-source.js","sourceRoot":"","sources":["../../src/core/usage-source.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe,CAC7B,OAA0D,EAC1D,cAAsB;IAEtB,QAAQ,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,UAAU,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,EAAE,IAAI,cAAc,EAAE,CAAC;QAC7E,KAAK,OAAO;YACV,OAAO,SAAS,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QAC1D,KAAK,aAAa,CAAC;QACnB,KAAK,KAAK;YACR,OAAO,WAAW,OAAO,CAAC,EAAE,EAAE,CAAC;QACjC,KAAK,UAAU;YACb,MAAM;IACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC5C,OAAO,eAAe,QAAQ,EAAE,CAAC;AACnC,CAAC"}
|