Monitor Copilot CLI session directory for creation of sessions outside chat editor (#1793)

Author: DonJayamanne

src/extension/agents/copilotcli/node/copilotcliSessionService.ts

@@ -3,16 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ModelProvider, Session, SessionManager, internal } from '@github/copilot/sdk';
+import type { internal, ModelProvider, Session, SessionManager } from '@github/copilot/sdk';
 import { ChatCompletionMessageParam } from 'openai/resources/chat/completions';
 import type { CancellationToken, ChatRequest } from 'vscode';
+import { INativeEnvService } from '../../../../platform/env/common/envService';
+import { IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService';
+import { RelativePattern } from '../../../../platform/filesystem/common/fileTypes';
 import { ILogService } from '../../../../platform/log/common/logService';
 import { createServiceIdentifier } from '../../../../util/common/services';
 import { coalesce } from '../../../../util/vs/base/common/arrays';
 import { raceCancellationError } from '../../../../util/vs/base/common/async';
 import { Emitter, Event } from '../../../../util/vs/base/common/event';
 import { Lazy } from '../../../../util/vs/base/common/lazy';
 import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../util/vs/base/common/lifecycle';
+import { joinPath } from '../../../../util/vs/base/common/resources';
 import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
 import { ChatSessionStatus } from '../../../../vscodeTypes';
 import { ICopilotCLISDK } from './copilotCli';
@@ -63,10 +67,12 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 	constructor(
 		@ILogService private readonly logService: ILogService,
 		@ICopilotCLISDK private readonly copilotCLISDK: ICopilotCLISDK,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@INativeEnvService private readonly nativeEnv: INativeEnvService,
+		@IFileSystemService private readonly fileSystem: IFileSystemService,
 	) {
 		super();
-
+		this.monitorSessionFiles();
 		this._sessionManager = new Lazy<Promise<internal.CLISessionManager>>(async () => {
 			const { internal } = await this.copilotCLISDK.getPackage();
 			return new internal.CLISessionManager({
@@ -75,6 +81,15 @@ export class CopilotCLISessionService extends Disposable implements ICopilotCLIS
 		});
 	}
 
+	private monitorSessionFiles() {
+		try {
+			const sessionDir = joinPath(this.nativeEnv.userHome, '.copilot', 'session-state');
+			const watcher = this._register(this.fileSystem.createFileSystemWatcher(new RelativePattern(sessionDir, '*.jsonl')));
+			this._register(watcher.onDidCreate(() => this._onDidChangeSessions.fire()));
+		} catch (error) {
+			this.logService.error(`Failed to monitor Copilot CLI session files: ${error}`);
+		}
+	}
 	async getSessionManager() {
 		return this._sessionManager.value;
 	}

src/platform/filesystem/common/fileSystemService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { FileStat, FileSystem, FileSystemWatcher, Uri } from 'vscode';
+import type { FileStat, FileSystem, FileSystemWatcher, RelativePattern, Uri } from 'vscode';
 import { LRUCache } from '../../../util/common/cache';
 import { createServiceIdentifier } from '../../../util/common/services';
 import { FileType } from './fileTypes';
@@ -29,7 +29,7 @@ export interface IFileSystemService extends FileSystem {
 	copy(source: Uri, destination: Uri, options?: { overwrite?: boolean }): Promise<void>;
 	isWritableFileSystem(scheme: string): boolean | undefined;
 
-	createFileSystemWatcher(glob: string): FileSystemWatcher;
+	createFileSystemWatcher(glob: string | RelativePattern): FileSystemWatcher;
 }
 
 /**

src/platform/filesystem/node/fileSystemServiceImpl.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import type { FileStat, FileSystemWatcher, Uri } from 'vscode';
+import type { FileStat, FileSystemWatcher, RelativePattern, Uri } from 'vscode';
 import { Event } from '../../../util/vs/base/common/event';
 import { dirname, isEqual } from '../../../util/vs/base/common/resources';
 import { URI } from '../../../util/vs/base/common/uri';
@@ -82,7 +82,7 @@ export class NodeFileSystemService implements IFileSystemService {
 		return true;
 	}
 
-	createFileSystemWatcher(_glob: string): FileSystemWatcher {
+	createFileSystemWatcher(_glob: string | RelativePattern): FileSystemWatcher {
 		return new class implements FileSystemWatcher {
 			ignoreCreateEvents = false;
 			ignoreChangeEvents = false;

src/platform/filesystem/vscode/fileSystemServiceImpl.ts

@@ -49,7 +49,7 @@ export class VSCodeFileSystemService implements IFileSystemService {
 		return !!vscode.workspace.fs.isWritableFileSystem(scheme);
 	}
 
-	createFileSystemWatcher(glob: string): vscode.FileSystemWatcher {
+	createFileSystemWatcher(glob: string | vscode.RelativePattern): vscode.FileSystemWatcher {
 		return vscode.workspace.createFileSystemWatcher(glob);
 	}
 }

src/platform/test/node/simulationWorkspaceServices.ts

@@ -235,7 +235,7 @@ export class SimulationFileSystemAdaptor implements IFileSystemService {
 		return this._delegate.isWritableFileSystem(scheme);
 	}
 
-	createFileSystemWatcher(glob: string): vscode.FileSystemWatcher {
+	createFileSystemWatcher(glob: string | vscode.RelativePattern): vscode.FileSystemWatcher {
 		return this._delegate.createFileSystemWatcher(glob);
 	}
 }