Skip to content

Commit d7de773

Browse files
authored
agentHost: Adopt workingDirectory change (#310350)
1 parent 863765d commit d7de773

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7066a7b
1+
7a902e4

src/vs/platform/agentHost/common/state/protocol/state.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,6 @@ export interface ISessionState {
282282
serverTools?: IToolDefinition[];
283283
/** The client currently providing tools and interactive capabilities to this session */
284284
activeClient?: ISessionActiveClient;
285-
/** The working directory URI for this session */
286-
workingDirectory?: URI;
287285
/** Completed turns */
288286
turns: ITurn[];
289287
/** Currently in-progress turn */

src/vs/platform/agentHost/node/agentSideEffects.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export class AgentSideEffects extends Disposable {
182182

183183
// Read auto-approval: approve reads inside the session's working directory.
184184
if (e.permissionKind === 'read' && e.permissionPath) {
185-
const workDir = sessionState?.workingDirectory ?? sessionState?.summary.workingDirectory;
185+
const workDir = sessionState?.summary.workingDirectory;
186186
const workingDirectory = workDir ? URI.parse(workDir) : undefined;
187187
if (workingDirectory && extUriBiasedIgnorePathCase.isEqualOrParent(normalizePath(URI.file(e.permissionPath)), workingDirectory)) {
188188
this._logService.trace(`[AgentSideEffects] Auto-approving read of ${e.permissionPath}`);
@@ -196,7 +196,7 @@ export class AgentSideEffects extends Disposable {
196196
// Write auto-approval: only within the session's working directory,
197197
// then apply the default glob patterns for protected files.
198198
if (e.permissionKind === 'write' && e.permissionPath) {
199-
const workDir = sessionState?.workingDirectory ?? sessionState?.summary.workingDirectory;
199+
const workDir = sessionState?.summary.workingDirectory;
200200
const workingDirectory = workDir ? URI.parse(workDir) : undefined;
201201
if (workingDirectory && extUriBiasedIgnorePathCase.isEqualOrParent(normalizePath(URI.file(e.permissionPath)), workingDirectory)) {
202202
if (this._shouldAutoApproveEdit(e.permissionPath)) {

src/vs/sessions/contrib/remoteAgentHost/browser/remoteAgentHostSessionsProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { AgentSession, type IAgentConnection, type IAgentSessionMetadata } from
2222
import { RemoteAgentHostConnectionStatus } from '../../../../platform/agentHost/common/remoteAgentHostService.js';
2323
import { ActionType, isSessionAction } from '../../../../platform/agentHost/common/state/sessionActions.js';
2424
import type { IResolveSessionConfigResult, ISessionConfigValueItem } from '../../../../platform/agentHost/common/state/protocol/commands.js';
25-
import type { IRootState, ISessionFileDiff } from '../../../../platform/agentHost/common/state/protocol/state.js';
25+
import type { IRootState, ISessionFileDiff, ISessionSummary } from '../../../../platform/agentHost/common/state/protocol/state.js';
2626
import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
2727
import { INotificationService } from '../../../../platform/notification/common/notification.js';
2828
import { ChatViewPaneTarget, IChatWidgetService } from '../../../../workbench/contrib/chat/browser/chat.js';
@@ -1079,7 +1079,7 @@ export class RemoteAgentHostSessionsProvider extends Disposable implements IAgen
10791079
}
10801080
}
10811081

1082-
private _handleSessionAdded(summary: { resource: string; provider: string; title: string; createdAt: number; modifiedAt: number; project?: { uri: string; displayName: string }; model?: string; workingDirectory?: string; isRead?: boolean; isDone?: boolean }): void {
1082+
private _handleSessionAdded(summary: ISessionSummary): void {
10831083
const sessionUri = URI.parse(summary.resource);
10841084
const rawId = AgentSession.id(sessionUri);
10851085
if (this._sessionCache.has(rawId)) {

0 commit comments

Comments
 (0)