sessionLogDir not set for new chats (#4416)

* sessionLogDir not set for new chats

* fix test

Author: aeschli

src/extension/chat/vscode-node/chatDebugFileLoggerService.ts

@@ -143,6 +143,10 @@ export class ChatDebugFileLoggerService extends Disposable implements IChatDebug
 		super.dispose();
 	}
 
+	public get debugLogsDir(): URI | undefined {
+		return this._getDebugLogsDir();
+	}
+
 	private _getDebugLogsDir(): URI | undefined {
 		if (this._debugLogsDirUri) {
 			return this._debugLogsDirUri;

src/extension/prompts/node/panel/promptFile.tsx

@@ -16,6 +16,7 @@ import { PromptVariable } from '../../../prompt/common/chatVariablesCollection';
 import { IPromptVariablesService } from '../../../prompt/node/promptVariablesService';
 import { EmbeddedInsideUserMessage } from '../base/promptElement';
 import { Tag } from '../base/tag';
+import { joinPath } from '../../../../util/vs/base/common/resources';
 
 export interface PromptFileProps extends BasePromptElementProps, EmbeddedInsideUserMessage {
 	readonly variable: PromptVariable;
@@ -81,9 +82,10 @@ export class PromptFile extends PromptElement<PromptFileProps, void> {
 			if (fileUri.scheme === 'copilot-skill' && fileUri.path.includes('/troubleshoot/') && bodyContent.includes('{{CURRENT_SESSION_LOG}}')) {
 				const chatSessionId = getCurrentCapturingToken()?.chatSessionId;
 				if (chatSessionId) {
-					const logDir = this.chatDebugFileLoggerService.getSessionDir(chatSessionId);
+					const logDir = this.chatDebugFileLoggerService.debugLogsDir;
 					if (logDir) {
-						bodyContent = bodyContent.replaceAll('{{CURRENT_SESSION_LOG}}', logDir.toString());
+						const sessionLogDir = joinPath(logDir, chatSessionId);
+						bodyContent = bodyContent.replaceAll('{{CURRENT_SESSION_LOG}}', () => this.promptPathRepresentationService.getFilePath(sessionLogDir));
 					}
 				}
 			}

src/extension/tools/node/readFileTool.tsx

@@ -5,7 +5,7 @@
 import * as l10n from '@vscode/l10n';
 import { BasePromptElementProps, PromptElement, PromptElementProps, PromptReference } from '@vscode/prompt-tsx';
 import type * as vscode from 'vscode';
-import { IChatDebugFileLoggerService } from '../../../platform/chat/common/chatDebugFileLoggerService';
+import { IChatDebugFileLoggerService, sessionResourceToId } from '../../../platform/chat/common/chatDebugFileLoggerService';
 import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
 import { ObjectJsonSchema } from '../../../platform/configuration/common/jsonSchema';
 import { ICustomInstructionsService } from '../../../platform/customInstructions/common/customInstructionsService';
@@ -21,7 +21,7 @@ import { ITelemetryService } from '../../../platform/telemetry/common/telemetry'
 import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
 import { getCachedSha256Hash } from '../../../util/common/crypto';
 import { clamp } from '../../../util/vs/base/common/numbers';
-import { dirname, extUriBiasedIgnorePathCase } from '../../../util/vs/base/common/resources';
+import { dirname, extUriBiasedIgnorePathCase, joinPath } from '../../../util/vs/base/common/resources';
 import { URI } from '../../../util/vs/base/common/uri';
 import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
 import { LanguageModelPromptTsxPart, LanguageModelToolResult, Location, MarkdownString, Range } from '../../../vscodeTypes';
@@ -333,9 +333,11 @@ export class ReadFileTool implements ICopilotTool<ReadFileParams> {
 		if (uri.scheme === 'copilot-skill' && uri.path.includes('/troubleshoot/')) {
 			const sessionResource = this._promptContext?.request?.sessionResource;
 			if (sessionResource) {
-				const logDir = this.chatDebugFileLoggerService.getSessionDirForResource(URI.from(sessionResource));
+				const chatSessionId = sessionResourceToId(sessionResource);
+				const logDir = this.chatDebugFileLoggerService.debugLogsDir;
 				if (logDir) {
-					const replaced = snapshot.getText().replaceAll('{{CURRENT_SESSION_LOG}}', logDir.toString());
+					const sessionLogDir = joinPath(logDir, chatSessionId);
+					const replaced = snapshot.getText().replaceAll('{{CURRENT_SESSION_LOG}}', () => this.promptPathRepresentationService.getFilePath(sessionLogDir));
 					return TextDocumentSnapshot.fromNewText(replaced, snapshot);
 				}
 			}

src/extension/tools/node/test/readFile.spec.tsx

@@ -8,12 +8,14 @@ import { IChatDebugFileLoggerService } from '../../../../platform/chat/common/ch
 import { ICustomInstructionsService } from '../../../../platform/customInstructions/common/customInstructionsService';
 import { IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService';
 import { MockFileSystemService } from '../../../../platform/filesystem/node/test/mockFileSystemService';
+import { IPromptPathRepresentationService } from '../../../../platform/prompts/common/promptPathRepresentationService';
 import { MockCustomInstructionsService } from '../../../../platform/test/common/testCustomInstructionsService';
 import { ITestingServicesAccessor } from '../../../../platform/test/node/services';
 import { TestWorkspaceService } from '../../../../platform/test/node/testWorkspaceService';
 import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
 import { createTextDocumentData } from '../../../../util/common/test/shims/textDocument';
 import { CancellationToken } from '../../../../util/vs/base/common/cancellation';
+import { dirname } from '../../../../util/vs/base/common/resources';
 import { URI } from '../../../../util/vs/base/common/uri';
 import { SyncDescriptor } from '../../../../util/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
@@ -734,10 +736,12 @@ suite('ReadFile', () => {
 				getActiveSessionIds: () => [],
 				isDebugLogUri: () => false,
 				getSessionDirForResource: () => expectedLogDir,
+				debugLogsDir: dirname(expectedLogDir),
 			} satisfies IChatDebugFileLoggerService);
 
 			const testAccessor = services.createTestingAccessor();
 			const readFileTool = testAccessor.get(IInstantiationService).createInstance(ReadFileTool);
+			const promptPathRepresentationService = testAccessor.get(IPromptPathRepresentationService);
 
 			// Set up prompt context with a sessionResource
 			await readFileTool.resolveInput(
@@ -752,7 +756,7 @@ suite('ReadFile', () => {
 			);
 
 			const text = await toolResultToString(testAccessor, result);
-			expect(text).toContain(expectedLogDir.toString());
+			expect(text).toContain(promptPathRepresentationService.getFilePath(expectedLogDir));
 			expect(text).not.toContain('{{CURRENT_SESSION_LOG}}');
 
 			testAccessor.dispose();
@@ -804,6 +808,7 @@ suite('ReadFile', () => {
 				getActiveSessionIds: () => [],
 				isDebugLogUri: () => false,
 				getSessionDirForResource: () => URI.file('/should/not/appear'),
+				debugLogsDir: URI.file('/should/not/appear'),
 			} satisfies IChatDebugFileLoggerService);
 
 			const testAccessor = services.createTestingAccessor();

src/platform/chat/common/chatDebugFileLoggerService.ts

@@ -54,6 +54,13 @@ export interface IChatDebugFileLoggerService {
 	 */
 	flush(sessionId: string): Promise<void>;
 
+	/**
+	 * Get the URI of the debug logs directory, or undefined if it cannot be
+	 * determined (e.g. no workspace, or an error occurs). The directory may
+	 * not actually exist on disk yet if no sessions have been started.
+	 */
+	readonly debugLogsDir: URI | undefined;
+
 	/**
 	 * Get the URI of the debug log file for a session, or undefined if the
 	 * session has not been started.
@@ -99,4 +106,5 @@ export class NullChatDebugFileLoggerService implements IChatDebugFileLoggerServi
 	getActiveSessionIds(): string[] { return []; }
 	isDebugLogUri(): boolean { return false; }
 	getSessionDirForResource(): URI | undefined { return undefined; }
+	readonly debugLogsDir: URI | undefined = undefined;
 }