wip

Author: austin3dickey

extensions/positron-supervisor/src/KallichoreSession.ts

@@ -330,18 +330,21 @@ export class KallichoreSession implements JupyterLanguageRuntimeSession {
 		this._kernelSpec = kernelSpec;
 		const varActions = await this.buildEnvVarActions(false);
 
-		// Prepare the working directory; use the workspace root if available,
-		// otherwise the home directory
-		let workingDir = vscode.workspace.workspaceFolders?.[0].uri.fsPath || os.homedir();
-
-		// If we have a notebook URI, use its parent directory as the working
-		// directory instead. Note that not all notebooks have valid on-disk
-		// URIs since they may be transient or not yet saved; for these, we fall
-		// back to the workspace root or home directory.
-		if (this.metadata.notebookUri?.fsPath) {
-			const notebookPath = this.metadata.notebookUri.fsPath;
-			if (fs.existsSync(notebookPath)) {
-				workingDir = path.dirname(notebookPath);
+		let workingDir = this.metadata.workingDirectory;
+
+		if (!workingDir) {
+			// Use the workspace root if available, otherwise the home directory
+			workingDir = vscode.workspace.workspaceFolders?.[0].uri.fsPath || os.homedir();
+
+			// If we have a notebook URI, use its parent directory as the working
+			// directory instead. Note that not all notebooks have valid on-disk
+			// URIs since they may be transient or not yet saved; for these, we fall
+			// back to the workspace root or home directory.
+			if (this.metadata.notebookUri?.fsPath) {
+				const notebookPath = this.metadata.notebookUri.fsPath;
+				if (fs.existsSync(notebookPath)) {
+					workingDir = path.dirname(notebookPath);
+				}
 			}
 		}
 

src/positron-dts/positron.d.ts

@@ -540,6 +540,9 @@ declare module 'positron' {
 
 		/** The URI of the notebook document associated with the session, if any */
 		readonly notebookUri?: vscode.Uri;
+
+		/** The starting working directory of the session, if any */
+		readonly workingDirectory?: string;
 	}
 
 	/**

src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts

@@ -15,6 +15,10 @@ import { IModelService } from '../../../../editor/common/services/model.js';
 import { ILanguageSelection, ILanguageService } from '../../../../editor/common/languages/language.js';
 import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import * as nls from '../../../../nls.js';
+// --- Start Positron ---
+// eslint-disable-next-line no-duplicate-imports
+import { ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+// --- End Positron ---
 import { Extensions, IConfigurationPropertySchema, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
@@ -1311,6 +1315,12 @@ configurationRegistry.registerConfiguration({
 			type: 'string',
 			default: '',
 			tags: ['notebookLayout']
+		},
+		[NotebookSetting.workingDirectory]: {
+			markdownDescription: nls.localize('notebook.workingDirectory', "Default working directory for notebook kernels. Supports variables like `${workspaceFolder}`. When empty, uses the notebook file's directory."),
+			type: 'string',
+			default: '',
+			scope: ConfigurationScope.RESOURCE
 		}
 	}
 });

src/vs/workbench/contrib/notebook/common/notebookCommon.ts

@@ -1065,6 +1065,7 @@ export const NotebookSetting = {
 	outputBackupSizeLimit: 'notebook.backup.sizeLimit',
 	multiCursor: 'notebook.multiCursor.enabled',
 	markupFontFamily: 'notebook.markup.fontFamily',
+	workingDirectory: 'notebook.workingDirectory',
 } as const;
 
 export const enum CellStatusbarAlignment {

src/vs/workbench/services/runtimeSession/common/runtimeSession.ts

@@ -27,6 +27,9 @@ import { INotificationService, Severity } from '../../../../platform/notificatio
 import { localize } from '../../../../nls.js';
 import { UiClientInstance } from '../../languageRuntime/common/languageRuntimeUiClient.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { IConfigurationResolverService } from '../../configurationResolver/common/configurationResolver.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { NotebookSetting } from '../../../contrib/notebook/common/notebookCommon.js';
 
 /**
  * The maximum number of active sessions a user can have running at a time.
@@ -170,7 +173,9 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IStorageService private readonly _storageService: IStorageService,
 		@IUpdateService private readonly _updateService: IUpdateService,
-		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService
+		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
+		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService
 	) {
 
 		super();
@@ -387,6 +392,44 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 		return Array.from(this._activeSessionsBySessionId.values());
 	}
 
+	/**
+	 * Resolves the working directory configuration with variable substitution.
+	 *
+	 * @param notebookUri The URI of the notebook, if any, for resource-scoped configuration
+	 * @returns The resolved working directory or undefined if not configured
+	 */
+	private async resolveWorkingDirectory(notebookUri?: URI): Promise<string | undefined> {
+		// Get the working directory configuration
+		const configValue = this._configurationService.getValue<string>(
+			NotebookSetting.workingDirectory,
+			notebookUri ? { resource: notebookUri } : {}
+		);
+
+		// If no configuration value is set, return undefined
+		if (!configValue || configValue.trim() === '') {
+			return undefined;
+		}
+
+		// Get the workspace folder for variable resolution
+		const workspaceFolder = notebookUri
+			? this._workspaceContextService.getWorkspaceFolder(notebookUri)
+			: this._workspaceContextService.getWorkspace().folders[0];
+
+		try {
+			// Resolve variables in the configuration value
+			const resolvedValue = await this._configurationResolverService.resolveAsync(
+				workspaceFolder || undefined,
+				configValue
+			);
+
+			return resolvedValue;
+		} catch (error) {
+			// Log the error and return the original value as fallback
+			this._logService.warn(`Failed to resolve working directory variables in '${configValue}':`, error);
+			return configValue;
+		}
+	}
+
 	/**
 	 * Select a session for the provided runtime.
 	 *
@@ -466,6 +509,9 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 			}
 		}
 
+		// Resolve the working directory configuration
+		const workingDirectory = await this.resolveWorkingDirectory(notebookUri);
+
 		// Wait for the selected runtime to start.
 		await this.startNewRuntimeSession(
 			runtime.runtimeId,
@@ -474,7 +520,8 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 			notebookUri,
 			source,
 			startMode,
-			true
+			true,
+			workingDirectory
 		);
 	}
 
@@ -567,6 +614,7 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 	 * @param source The source of the request to start the runtime.
 	 * @param startMode The mode in which to start the runtime.
 	 * @param activate Whether to activate/focus the session after it is started.
+	 * @param workingDirectory The working directory to use for the session, if any.
 	 */
 	async startNewRuntimeSession(
 		runtimeId: string,
@@ -575,7 +623,8 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 		notebookUri: URI | undefined,
 		source: string,
 		startMode = RuntimeStartMode.Starting,
-		activate: boolean): Promise<string> {
+		activate: boolean,
+		workingDirectory?: string): Promise<string> {
 		// See if we are already starting the requested session. If we
 		// are, return the promise that resolves when the session is ready to
 		// use. This makes it possible for multiple requests to start the same
@@ -611,7 +660,7 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 		this._logService.info(
 			`Starting session for language runtime ` +
 			`${formatLanguageRuntimeMetadata(languageRuntime)} (Source: ${source})`);
-		return this.doCreateRuntimeSession(languageRuntime, sessionName, sessionMode, source, startMode, activate, notebookUri);
+		return this.doCreateRuntimeSession(languageRuntime, sessionName, sessionMode, source, startMode, activate, notebookUri, workingDirectory);
 	}
 
 	/**
@@ -1486,7 +1535,7 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 			}
 		}
 
-		return this.doCreateRuntimeSession(metadata, metadata.runtimeName, sessionMode, source, RuntimeStartMode.Starting, activate, notebookUri);
+		return this.doCreateRuntimeSession(metadata, metadata.runtimeName, sessionMode, source, RuntimeStartMode.Starting, activate, notebookUri, undefined);
 	}
 
 	/**
@@ -1499,6 +1548,7 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 	 * @param startMode The mode in which to start the runtime.
 	 * @param activate Whether to activate/focus the session after it is started.
 	 * @param notebookDocument The notebook document to attach to the session, if any.
+	 * @param workingDirectory The working directory to use for the session, if any.
 	 *
 	 * Returns a promise that resolves with the session ID when the runtime is
 	 * ready to use.
@@ -1509,7 +1559,8 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 		source: string,
 		startMode: RuntimeStartMode,
 		activate: boolean,
-		notebookUri?: URI): Promise<string> {
+		notebookUri?: URI,
+		workingDirectory?: string): Promise<string> {
 		this.setStartingSessionMaps(sessionMode, runtimeMetadata, notebookUri);
 
 		// Create a promise that resolves when the runtime is ready to use, if there isn't already one.
@@ -1539,6 +1590,7 @@ export class RuntimeSessionService extends Disposable implements IRuntimeSession
 			sessionId,
 			sessionMode,
 			notebookUri,
+			workingDirectory,
 			createdTimestamp: Date.now(),
 			startReason: source
 		};

src/vs/workbench/services/runtimeSession/common/runtimeSessionService.ts

@@ -85,6 +85,9 @@ export interface IRuntimeSessionMetadata {
 	/** The notebook associated with the session, if any */
 	readonly notebookUri: URI | undefined;
 
+	/** The starting working directory of the session, if any */
+	readonly workingDirectory?: string;
+
 	/**
 	 * A timestamp (in milliseconds since the Epoch) representing the time at
 	 * which the runtime session was created.