Skip to content

Commit ca3b9bf

Browse files
authored
Remove dead serverToolCalls / IServerToolCall code (#310470)
Follow-up to #310343: remove dead code left behind after server-side tool search removal. - Remove IServerToolCall interface from fetch.ts - Remove serverToolCalls field from IResponseDelta - Remove logServerToolCall from IRequestLogger interface and all implementations - Remove dead consumer in toolCallingLoop.ts - Clean up unused imports
1 parent 4ab3ca5 commit ca3b9bf

File tree

7 files changed

+3
-48
lines changed

7 files changed

+3
-48
lines changed

extensions/copilot/src/extension/intents/node/toolCallingLoop.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { Mutable } from '../../../util/vs/base/common/types';
3939
import { URI } from '../../../util/vs/base/common/uri';
4040
import { generateUuid } from '../../../util/vs/base/common/uuid';
4141
import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
42-
import { ChatResponsePullRequestPart, LanguageModelDataPart2, LanguageModelPartAudience, LanguageModelTextPart, LanguageModelToolResult2, MarkdownString } from '../../../vscodeTypes';
42+
import { ChatResponsePullRequestPart, LanguageModelDataPart2, LanguageModelPartAudience, LanguageModelToolResult2, MarkdownString } from '../../../vscodeTypes';
4343
import { InteractionOutcomeComputer } from '../../inlineChat/node/promptCraftingTypes';
4444
import { ChatVariablesCollection } from '../../prompt/common/chatVariablesCollection';
4545
import { AnthropicTokenUsageMetadata, Conversation, IResultMetadata, ResponseStreamParticipant, TurnStatus } from '../../prompt/common/conversation';
@@ -1318,14 +1318,6 @@ export abstract class ToolCallingLoop<TOptions extends IToolCallingLoopOptions =
13181318
arguments: call.arguments === '' ? '{}' : call.arguments
13191319
})));
13201320
}
1321-
if (delta.serverToolCalls) {
1322-
for (const serverCall of delta.serverToolCalls) {
1323-
const result: LanguageModelToolResult2 = {
1324-
content: [new LanguageModelTextPart(JSON.stringify(serverCall.result, undefined, 2))]
1325-
};
1326-
this._requestLogger.logServerToolCall(serverCall.id, serverCall.name, serverCall.args, result);
1327-
}
1328-
}
13291321
if (delta.statefulMarker) {
13301322
statefulMarker = delta.statefulMarker;
13311323
}

extensions/copilot/src/extension/prompt/vscode-node/requestLoggerImpl.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -372,20 +372,6 @@ export class RequestLogger extends AbstractRequestLogger {
372372
));
373373
}
374374

375-
public override logServerToolCall(id: string, name: string, args: unknown, result: LanguageModelToolResult2): void {
376-
this._addEntry(new LoggedToolCall(
377-
id,
378-
`${name} [server]`,
379-
args,
380-
result,
381-
this.currentRequest,
382-
Date.now(),
383-
undefined, // thinking
384-
undefined, // edits
385-
undefined // toolMetadata
386-
));
387-
}
388-
389375
/** Start tracking edits made to the workspace for every tool call. */
390376
public override enableWorkspaceEditTracing(): void {
391377
if (!this._workspaceEditRecorder) {

extensions/copilot/src/platform/networking/common/fetch.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,6 @@ export interface ICopilotToolCall {
8989
id: string;
9090
}
9191

92-
export interface IServerToolCall {
93-
/** Indicates this is a server-side tool call (e.g., tool_search, websearch) - not validated/executed by client */
94-
isServer: true;
95-
name: string;
96-
id: string;
97-
/** The parsed input arguments for this tool call */
98-
args?: unknown;
99-
/** The parsed result returned by the server for this tool call */
100-
result?: unknown;
101-
}
102-
10392
export interface ICopilotToolCallStreamUpdate {
10493
name: string;
10594
arguments: string;
@@ -162,8 +151,6 @@ export interface IResponseDelta {
162151
statefulMarker?: string;
163152
/** Context management information from Anthropic Messages API */
164153
contextManagement?: ContextManagementResponse | OpenAIContextManagementResponse;
165-
/** Server-side tool calls (e.g., tool_search) - reported for logging but not validated/executed */
166-
serverToolCalls?: IServerToolCall[];
167154
}
168155

169156
export function isOpenAIContextManagementResponse(value: ContextManagementResponse | OpenAIContextManagementResponse): value is OpenAIContextManagementResponse {

extensions/copilot/src/platform/requestLogger/common/requestLogger.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ export interface IRequestLogger {
153153

154154
logToolCall(id: string, name: string, args: unknown, response: LanguageModelToolResult2, thinking?: ThinkingData): void;
155155

156-
logServerToolCall(id: string, name: string, args: unknown, result: LanguageModelToolResult2): void;
157-
158156
logModelListCall(requestId: string, requestMetadata: RequestMetadata, models: IModelAPIResponse[]): void;
159157

160158
logContentExclusionRules(repos: string[], rules: { patterns: string[]; ifAnyMatch: string[]; ifNoneMatch: string[] }[], durationMs: number): void;

extensions/copilot/src/platform/requestLogger/node/nullRequestLogger.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import type { RequestMetadata } from '@vscode/copilot-api';
7-
import type { LanguageModelToolResult, LanguageModelToolResult2 } from 'vscode';
7+
import type { LanguageModelToolResult2 } from 'vscode';
88
import { ILoggedRequestInfo, LoggedRequest } from '../../../platform/requestLogger/common/requestLogger';
99
import { AbstractRequestLogger } from '../../../platform/requestLogger/node/requestLogger';
1010
import { Event } from '../../../util/vs/base/common/event';
@@ -24,9 +24,7 @@ export class NullRequestLogger extends AbstractRequestLogger {
2424
public override logModelListCall(id: string, requestMetadata: RequestMetadata, models: IModelAPIResponse[]): void {
2525

2626
}
27-
public override logToolCall(name: string | undefined, args: unknown, response: LanguageModelToolResult): void {
28-
}
29-
public override logServerToolCall(id: string, name: string, args: unknown, result: LanguageModelToolResult2): void {
27+
public override logToolCall(_id: string, _name: string | undefined, _args: unknown, _response: LanguageModelToolResult2): void {
3028
}
3129
override onDidChangeRequests: Event<void> = Event.None;
3230
}

extensions/copilot/src/platform/requestLogger/node/requestLogger.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export abstract class AbstractRequestLogger extends Disposable implements IReque
7777

7878
public abstract logModelListCall(id: string, requestMetadata: RequestMetadata, models: IModelAPIResponse[]): void;
7979
public abstract logToolCall(id: string, name: string | undefined, args: unknown, response: LanguageModelToolResult2): void;
80-
public abstract logServerToolCall(id: string, name: string, args: unknown, result: LanguageModelToolResult2): void;
8180

8281
public logContentExclusionRules(_repos: string[], _rules: { patterns: string[]; ifAnyMatch: string[]; ifNoneMatch: string[] }[], _durationMs: number): void {
8382
// no-op by default; concrete implementations can override

extensions/copilot/src/platform/requestLogger/test/node/testRequestLogger.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ export class TestRequestLogger extends AbstractRequestLogger {
5959
this._onDidChangeRequests.fire();
6060
}
6161

62-
public override logServerToolCall(id: string, name: string, args: unknown, result: LanguageModelToolResult2): void {
63-
this._entries.push(new TestLoggedToolCall(id, name, args, result, this.currentRequest, Date.now()));
64-
this._onDidChangeRequests.fire();
65-
}
66-
6762
/**
6863
* Clear all logged entries (useful between tests).
6964
*/

0 commit comments

Comments
 (0)