on terminal reconnection, shellIntegration.cwd is undefined

[meganrogge]

discovered with terminal suggest #234671

Related: #200777

[meganrogge]

Also noticed that terminal is getting reconnected to even though there's been no input

Screen.Recording.2024-11-26.at.10.59.45.AM.mov

[meganrogge]

this doesn't get hit for the reconnected terminal

vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

Lines 456 to 459 in d7e34a7

	capabilityListeners.set(capability, cwdDetection.onDidChangeCwd(e => {
	this._cwd = e;
	this._setTitle(this.title, TitleEventSource.Config);
	}));

[meganrogge]

this doesn't either

vscode/src/vs/platform/terminal/common/capabilities/cwdDetectionCapability.ts

Line 29 in d7e34a7

updateCwd(cwd: string): void {

[meganrogge]

@Tyriar since you did most of the detached terminal and terminal capability store work, do you know where we set the capabilities for reconnected terminals?

[Tyriar]

This is where we serialize:

vscode/src/vs/platform/terminal/node/ptyService.ts

Lines 200 to 224 in 8a2a20c

	@traceRpc
	async serializeTerminalState(ids: number[]): Promise<string> {
	const promises: Promise<ISerializedTerminalState>[] = [];
	for (const [persistentProcessId, persistentProcess] of this._ptys.entries()) {
	// Only serialize persistent processes that have had data written or performed a replay
	if (persistentProcess.hasWrittenData && ids.indexOf(persistentProcessId) !== -1) {
	promises.push(Promises.withAsyncBody<ISerializedTerminalState>(async r => {
	r({
	id: persistentProcessId,
	shellLaunchConfig: persistentProcess.shellLaunchConfig,
	processDetails: await this._buildProcessDetails(persistentProcessId, persistentProcess),
	processLaunchConfig: persistentProcess.processLaunchOptions,
	unicodeVersion: persistentProcess.unicodeVersion,
	replayEvent: await persistentProcess.serializeNormalBuffer(),
	timestamp: Date.now()
	});
	}));
	}
	}
	const serialized: ICrossVersionSerializedTerminalState = {
	version: 1,
	state: await Promise.all(promises)
	};
	return JSON.stringify(serialized);
	}

Revive:

vscode/src/vs/platform/terminal/node/ptyService.ts

Lines 226 to 233 in 8a2a20c

	@traceRpc
	async reviveTerminalProcesses(workspaceId: string, state: ISerializedTerminalState[], dateTimeFormatLocale: string) {
	const promises: Promise<void>[] = [];
	for (const terminal of state) {
	promises.push(this._reviveTerminalProcess(workspaceId, terminal));
	}
	await Promise.all(promises);
	}

Reconnect:

vscode/src/vs/platform/terminal/common/terminal.ts

Lines 536 to 557 in 8a2a20c

	/**
	* This is a terminal that attaches to an already running terminal.
	*/
	attachPersistentProcess?: {
	id: number;
	findRevivedId?: boolean;
	pid: number;
	title: string;
	titleSource: TitleEventSource;
	cwd: string;
	icon?: TerminalIcon;
	color?: string;
	hasChildProcesses?: boolean;
	fixedDimensions?: IFixedTerminalDimensions;
	environmentVariableCollections?: ISerializableEnvironmentVariableCollections;
	reconnectionProperties?: IReconnectionProperties;
	type?: TerminalType;
	waitOnExit?: WaitOnExitValue;
	hideFromUser?: boolean;
	isFeatureTerminal?: boolean;
	shellIntegrationNonce: string;
	};

[meganrogge]

I see that this doesn't get hit for reconnected terminals

vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts

Line 84 in c7bd5a6

public $shellIntegrationChange(instanceId: number): void {

so, the terminal.shellIntegration object does not get set

vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts

Line 99 in c7bd5a6

terminal.shellIntegration = shellIntegration.value;

[meganrogge]

Even with that, the cwd is still undefined until I press enter, so something else needs to be tweaked

[meganrogge]

still an issue #239027 (comment)

[amunger]

I don't see that log when recovering a terminal session if that's all there is to verify