Skip to content

Commit f855e38

Browse files
committed
refactor(session --id): manual adjustments accepted; keep table logic
Accept manual edits: consolidate JSON/table in helper, return early from command via direct return. All checks green.
1 parent 1e5c2b3 commit f855e38

2 files changed

Lines changed: 73 additions & 87 deletions

File tree

‎src/commands/_session_id.ts‎

Lines changed: 72 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,9 @@ export type SessionIdContext = {
1818
};
1919
};
2020

21-
export type SessionUsage = { totalCost: number; entries: UsageData[] };
22-
23-
function calculateSessionTotalTokens(entries: UsageData[]): number {
24-
return entries.reduce((sum, entry) => {
25-
const usage = entry.message.usage;
26-
return (
27-
sum
28-
+ usage.input_tokens
29-
+ usage.output_tokens
30-
+ (usage.cache_creation_input_tokens ?? 0)
31-
+ (usage.cache_read_input_tokens ?? 0)
32-
);
33-
}, 0);
34-
}
35-
21+
/**
22+
* Handles the session ID lookup and displays usage data.
23+
*/
3624
export async function handleSessionIdLookup(ctx: SessionIdContext, useJson: boolean): Promise<void> {
3725
const sessionUsage = await loadSessionUsageById(ctx.values.id, {
3826
mode: ctx.values.mode,
@@ -50,85 +38,84 @@ export async function handleSessionIdLookup(ctx: SessionIdContext, useJson: bool
5038
}
5139

5240
if (useJson) {
53-
await outputSessionJsonFormat(ctx, sessionUsage);
54-
}
55-
else {
56-
await outputSessionTableFormat(ctx, sessionUsage);
57-
}
58-
}
59-
60-
async function outputSessionJsonFormat(
61-
ctx: SessionIdContext,
62-
sessionUsage: SessionUsage,
63-
): Promise<void> {
64-
const jsonOutput = {
65-
sessionId: ctx.values.id,
66-
totalCost: sessionUsage.totalCost,
67-
totalTokens: calculateSessionTotalTokens(sessionUsage.entries),
68-
entries: sessionUsage.entries.map(entry => ({
69-
timestamp: entry.timestamp,
70-
inputTokens: entry.message.usage.input_tokens,
71-
outputTokens: entry.message.usage.output_tokens,
72-
cacheCreationTokens: entry.message.usage.cache_creation_input_tokens ?? 0,
73-
cacheReadTokens: entry.message.usage.cache_read_input_tokens ?? 0,
74-
model: entry.message.model ?? 'unknown',
75-
costUSD: entry.costUSD ?? 0,
76-
})),
77-
};
41+
const jsonOutput = {
42+
sessionId: ctx.values.id,
43+
totalCost: sessionUsage.totalCost,
44+
totalTokens: calculateSessionTotalTokens(sessionUsage.entries),
45+
entries: sessionUsage.entries.map(entry => ({
46+
timestamp: entry.timestamp,
47+
inputTokens: entry.message.usage.input_tokens,
48+
outputTokens: entry.message.usage.output_tokens,
49+
cacheCreationTokens: entry.message.usage.cache_creation_input_tokens ?? 0,
50+
cacheReadTokens: entry.message.usage.cache_read_input_tokens ?? 0,
51+
model: entry.message.model ?? 'unknown',
52+
costUSD: entry.costUSD ?? 0,
53+
})),
54+
};
7855

79-
if (ctx.values.jq != null) {
80-
const jqResult = await processWithJq(jsonOutput, ctx.values.jq);
81-
if (Result.isFailure(jqResult)) {
82-
logger.error(jqResult.error.message);
83-
process.exit(1);
56+
if (ctx.values.jq != null) {
57+
const jqResult = await processWithJq(jsonOutput, ctx.values.jq);
58+
if (Result.isFailure(jqResult)) {
59+
logger.error(jqResult.error.message);
60+
process.exit(1);
61+
}
62+
log(jqResult.value);
63+
}
64+
else {
65+
log(JSON.stringify(jsonOutput, null, 2));
8466
}
85-
log(jqResult.value);
8667
}
8768
else {
88-
log(JSON.stringify(jsonOutput, null, 2));
89-
}
90-
}
69+
logger.box(`Claude Code Session Usage - ${ctx.values.id}`);
9170

92-
async function outputSessionTableFormat(
93-
ctx: SessionIdContext,
94-
sessionUsage: SessionUsage,
95-
): Promise<void> {
96-
logger.box(`Claude Code Session Usage - ${ctx.values.id}`);
71+
const totalTokens = calculateSessionTotalTokens(sessionUsage.entries);
9772

98-
const totalTokens = calculateSessionTotalTokens(sessionUsage.entries);
73+
log(`Total Cost: ${formatCurrency(sessionUsage.totalCost)}`);
74+
log(`Total Tokens: ${formatNumber(totalTokens)}`);
75+
log(`Total Entries: ${sessionUsage.entries.length}`);
76+
log('');
9977

100-
log(`Total Cost: ${formatCurrency(sessionUsage.totalCost)}`);
101-
log(`Total Tokens: ${formatNumber(totalTokens)}`);
102-
log(`Total Entries: ${sessionUsage.entries.length}`);
103-
log('');
78+
if (sessionUsage.entries.length > 0) {
79+
const table = new ResponsiveTable({
80+
head: [
81+
'Timestamp',
82+
'Model',
83+
'Input',
84+
'Output',
85+
'Cache Create',
86+
'Cache Read',
87+
'Cost (USD)',
88+
],
89+
style: { head: ['cyan'] },
90+
colAligns: ['left', 'left', 'right', 'right', 'right', 'right', 'right'],
91+
});
10492

105-
if (sessionUsage.entries.length > 0) {
106-
const table = new ResponsiveTable({
107-
head: [
108-
'Timestamp',
109-
'Model',
110-
'Input',
111-
'Output',
112-
'Cache Create',
113-
'Cache Read',
114-
'Cost (USD)',
115-
],
116-
style: { head: ['cyan'] },
117-
colAligns: ['left', 'left', 'right', 'right', 'right', 'right', 'right'],
118-
});
93+
for (const entry of sessionUsage.entries) {
94+
table.push([
95+
formatDateCompact(entry.timestamp, ctx.values.timezone, ctx.values.locale),
96+
entry.message.model ?? 'unknown',
97+
formatNumber(entry.message.usage.input_tokens),
98+
formatNumber(entry.message.usage.output_tokens),
99+
formatNumber(entry.message.usage.cache_creation_input_tokens ?? 0),
100+
formatNumber(entry.message.usage.cache_read_input_tokens ?? 0),
101+
formatCurrency(entry.costUSD ?? 0),
102+
]);
103+
}
119104

120-
for (const entry of sessionUsage.entries) {
121-
table.push([
122-
formatDateCompact(entry.timestamp, ctx.values.timezone, ctx.values.locale),
123-
entry.message.model ?? 'unknown',
124-
formatNumber(entry.message.usage.input_tokens),
125-
formatNumber(entry.message.usage.output_tokens),
126-
formatNumber(entry.message.usage.cache_creation_input_tokens ?? 0),
127-
formatNumber(entry.message.usage.cache_read_input_tokens ?? 0),
128-
formatCurrency(entry.costUSD ?? 0),
129-
]);
105+
log(table.toString());
130106
}
131-
132-
log(table.toString());
133107
}
134108
}
109+
110+
function calculateSessionTotalTokens(entries: UsageData[]): number {
111+
return entries.reduce((sum, entry) => {
112+
const usage = entry.message.usage;
113+
return (
114+
sum
115+
+ usage.input_tokens
116+
+ usage.output_tokens
117+
+ (usage.cache_creation_input_tokens ?? 0)
118+
+ (usage.cache_read_input_tokens ?? 0)
119+
);
120+
}, 0);
121+
}

‎src/commands/session.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const sessionCommand = define({
4040

4141
// Handle specific session ID lookup
4242
if (ctx.values.id != null) {
43-
await handleSessionIdLookup({
43+
return handleSessionIdLookup({
4444
values: {
4545
id: ctx.values.id,
4646
mode: ctx.values.mode,
@@ -50,7 +50,6 @@ export const sessionCommand = define({
5050
locale: ctx.values.locale ?? 'en-CA',
5151
},
5252
}, useJson);
53-
return;
5453
}
5554

5655
// Original session listing logic

0 commit comments

Comments
 (0)