Skip to content

Fix null safety in response array loops and OpenCode method reference #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rajbos merged 1 commit into from
Mar 30, 2026
Merged

Fix null safety in response array loops and OpenCode method reference #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vscode-extension/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7041,7 +7041,7 @@ export function activate(context: vscode.ExtensionContext) {
isOpenCodeSession: (sessionFile: string) =>
(tokenTracker as any).openCode.isOpenCodeSessionFile(sessionFile),
getOpenCodeSessionData: (sessionFile: string) =>
(tokenTracker as any).getOpenCodeSessionData(sessionFile),
(tokenTracker as any).openCode.getOpenCodeSessionData(sessionFile),
});

const backendHandler = new BackendCommandHandler({
Expand Down
10 changes: 8 additions & 2 deletions vscode-extension/src/usageAnalysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,7 @@ export async function trackEnhancedMetrics(deps: Pick<UsageAnalysisDeps, 'warn'>
// Track edit scope and apply usage
if (request.response && Array.isArray(request.response)) {
for (const resp of request.response) {
if (!resp) { continue; }
if (resp.kind === 'textEditGroup' && resp.uri) {
const filePath = resp.uri.path || JSON.stringify(resp.uri);
editedFiles.add(filePath);
Expand Down Expand Up @@ -866,6 +867,7 @@ export async function trackEnhancedMetrics(deps: Pick<UsageAnalysisDeps, 'warn'>
// Track edit scope and apply usage
if (request.response && Array.isArray(request.response)) {
for (const resp of request.response) {
if (!resp) { continue; }
if (resp.kind === 'textEditGroup' && resp.uri) {
const filePath = resp.uri.path || JSON.stringify(resp.uri);
editedFiles.add(filePath);
Expand Down Expand Up @@ -1258,6 +1260,7 @@ export async function analyzeSessionUsage(deps: UsageAnalysisDeps, sessionFile:
// Extract tool calls and MCP tools from request.response array
if (request.response && Array.isArray(request.response)) {
for (const responseItem of request.response) {
if (!responseItem) { continue; }
if (responseItem.kind === 'toolInvocationSerialized' || responseItem.kind === 'prepareToolInvocation') {
const toolName = responseItem.toolId || responseItem.toolName || responseItem.invocationMessage?.toolName || responseItem.toolSpecificData?.kind || 'unknown';

Expand Down Expand Up @@ -1365,6 +1368,7 @@ export async function analyzeSessionUsage(deps: UsageAnalysisDeps, sessionFile:
// Extract tool calls from request.response array (when full request is added)
if (request.response && Array.isArray(request.response)) {
for (const responseItem of request.response) {
if (!responseItem) { continue; }
if (responseItem.kind === 'toolInvocationSerialized' || responseItem.kind === 'prepareToolInvocation') {
analysis.toolCalls.total++;
const toolName = responseItem.toolId || responseItem.toolName || responseItem.invocationMessage?.toolName || responseItem.toolSpecificData?.kind || 'unknown';
Expand All @@ -1378,6 +1382,7 @@ export async function analyzeSessionUsage(deps: UsageAnalysisDeps, sessionFile:
// Handle VS Code incremental format - tool invocations in responses
if (event.kind === 2 && event.k?.includes('response') && Array.isArray(event.v)) {
for (const responseItem of event.v) {
if (!responseItem) { continue; }
if (responseItem.kind === 'toolInvocationSerialized') {
analysis.toolCalls.total++;
const toolName = responseItem.toolId || responseItem.toolName || responseItem.invocationMessage?.toolName || responseItem.toolSpecificData?.kind || 'unknown';
Expand Down Expand Up @@ -1485,6 +1490,7 @@ export async function analyzeSessionUsage(deps: UsageAnalysisDeps, sessionFile:
// Analyze response for tool calls and MCP tools
if (request.response && Array.isArray(request.response)) {
for (const responseItem of request.response) {
if (!responseItem) { continue; }
// Detect tool invocations
if (responseItem.kind === 'toolInvocationSerialized' ||
responseItem.kind === 'prepareToolInvocation') {
Expand Down Expand Up @@ -1698,7 +1704,7 @@ export async function getModelUsageFromSession(deps: Pick<UsageAnalysisDeps, 'wa
}
if (request.response && Array.isArray(request.response)) {
for (const responseItem of request.response) {
if (responseItem.value) {
if (responseItem?.value) {
modelUsage[requestModel].outputTokens += estimateTokensFromText(responseItem.value, requestModel, deps.tokenEstimators);
}
}
Expand Down Expand Up @@ -1766,7 +1772,7 @@ export async function getModelUsageFromSession(deps: Pick<UsageAnalysisDeps, 'wa
// Estimate tokens from assistant response (output)
if (request.response && Array.isArray(request.response)) {
for (const responseItem of request.response) {
if (responseItem.value) {
if (responseItem?.value) {
const tokens = estimateTokensFromText(responseItem.value, model, deps.tokenEstimators);
modelUsage[model].outputTokens += tokens;
}
Expand Down
Loading