Merge branch '0.34/sessions' into ben/early-sloth

Author: bpasero

.github/workflows/pr.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - 'release/*'
+      - '0.34/sessions'
 
 permissions:
   contents: read

package.json

@@ -4595,11 +4595,6 @@
 					"command": "github.copilot.cloud.sessions.proxy.closeChatSessionPullRequest",
 					"when": "chatSessionType == copilot-cloud-agent",
 					"group": "context"
-				},
-				{
-					"command": "github.copilot.cli.sessions.delete",
-					"when": "chatSessionType == copilotcli && config.chat.agentSessionsViewLocation == 'single-view'",
-					"group": "context"
 				}
 			]
 		},

src/extension/agents/copilotcli/common/copilotCLITools.ts

@@ -384,12 +384,14 @@ export function buildChatHistoryFromEvents(sessionId: string, events: readonly S
 					const editId = details?.toolIdEditMap ? details.toolIdEditMap[toolCall.toolCallId] : undefined;
 					const editedUris = getAffectedUrisForEditTool(toolCall);
 					if (isCopilotCliEditToolCall(toolCall) && editId && editedUris.length > 0) {
+						responsePart.presentation = 'hidden';
+						currentResponseParts.push(responsePart);
 						for (const uri of editedUris) {
 							currentResponseParts.push(new ChatResponseMarkdownPart('\n````\n'));
 							currentResponseParts.push(new ChatResponseCodeblockUriPart(uri, true, editId));
-							currentResponseParts.push(new ChatResponseMarkdownPart('\n````\n'));
 							currentResponseParts.push(new ChatResponseTextEditPart(uri, []));
 							currentResponseParts.push(new ChatResponseTextEditPart(uri, true));
+							currentResponseParts.push(new ChatResponseMarkdownPart('\n````\n'));
 						}
 					} else {
 						currentResponseParts.push(responsePart);

src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts

@@ -381,6 +381,20 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 			const prResults = await Promise.all(prFetches);
 			const prMap = new Map(prResults.filter(r => r.pr).map(r => [r.globalId, r.pr!]));
 
+			const validateISOTimestamp = (date: string | undefined): number | undefined => {
+				try {
+					if (!date) {
+						return;
+					}
+					const time = new Date(date)?.getTime();
+					if (time > 0) {
+						return time;
+					}
+				} catch { }
+			};
+
+			const createdAt = validateISOTimestamp(sessions[0].created_at);
+
 			// Create session items from latest sessions
 			const sessionItems = await Promise.all(Array.from(latestSessionsMap.values()).map(async sessionItem => {
 				const pr = prMap.get(sessionItem.resource_global_id);
@@ -394,10 +408,12 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
 					status: this.getSessionStatusFromSession(sessionItem),
 					description: this.getPullRequestDescription(pr),
 					tooltip: this.createPullRequestTooltip(pr),
-					timing: {
-						startTime: new Date(sessionItem.created_at).getTime(),
-						endTime: sessionItem.completed_at ? new Date(sessionItem.completed_at).getTime() : undefined
-					},
+					...(createdAt ? {
+						timing: {
+							startTime: createdAt,
+							endTime: validateISOTimestamp(sessionItem.completed_at),
+						}
+					} : {}),
 					changes: {
 						files: pr.files.totalCount,
 						insertions: pr.additions,

src/extension/inlineEdits/vscode-node/jointInlineCompletionProvider.ts

@@ -267,6 +267,14 @@ class JointCompletionsProvider extends Disposable implements vscode.InlineComple
 	}
 	//#endregion
 
+	//#region Model picker
+	public readonly onDidChangeModelInfo = this._inlineEditProvider?.onDidChangeModelInfo;
+	public readonly setCurrentModelId = this._inlineEditProvider?.setCurrentModelId?.bind(this._inlineEditProvider);
+	public get modelInfo(): InlineCompletionModelInfo | undefined {
+		return this._inlineEditProvider?.modelInfo;
+	}
+	//#endregion
+
 	constructor(
 		private readonly _completionsProvider: CopilotInlineCompletionItemProvider | undefined,
 		private readonly _inlineEditProvider: InlineCompletionProviderImpl | undefined,

src/extension/vscode.proposed.chatParticipantAdditions.d.ts

@@ -105,6 +105,7 @@ declare module 'vscode' {
 		isComplete?: boolean;
 		toolSpecificData?: ChatTerminalToolInvocationData;
 		fromSubAgent?: boolean;
+		presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
 
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
 	}

src/util/vs/editor/common/core/text/positionToOffsetImpl.ts

@@ -75,27 +75,43 @@ export function _setPositionOffsetTransformerDependencies(deps: IDeps): void {
 }
 
 export class PositionOffsetTransformer extends PositionOffsetTransformerBase {
-	private readonly lineStartOffsetByLineIdx: number[];
-	private readonly lineEndOffsetByLineIdx: number[];
+	private _lineStartOffsetByLineIdx: number[] | undefined;
+	private _lineEndOffsetByLineIdx: number[] | undefined;
 
 	constructor(public readonly text: string) {
 		super();
+	}
+
+	private get lineStartOffsetByLineIdx(): number[] {
+		if (!this._lineStartOffsetByLineIdx) {
+			this._computeLineOffsets();
+		}
+		return this._lineStartOffsetByLineIdx!;
+	}
+
+	private get lineEndOffsetByLineIdx(): number[] {
+		if (!this._lineEndOffsetByLineIdx) {
+			this._computeLineOffsets();
+		}
+		return this._lineEndOffsetByLineIdx!;
+	}
 
-		this.lineStartOffsetByLineIdx = [];
-		this.lineEndOffsetByLineIdx = [];
+	private _computeLineOffsets(): void {
+		this._lineStartOffsetByLineIdx = [];
+		this._lineEndOffsetByLineIdx = [];
 
-		this.lineStartOffsetByLineIdx.push(0);
-		for (let i = 0; i < text.length; i++) {
-			if (text.charAt(i) === '\n') {
-				this.lineStartOffsetByLineIdx.push(i + 1);
-				if (i > 0 && text.charAt(i - 1) === '\r') {
-					this.lineEndOffsetByLineIdx.push(i - 1);
+		this._lineStartOffsetByLineIdx.push(0);
+		for (let i = 0; i < this.text.length; i++) {
+			if (this.text.charAt(i) === '\n') {
+				this._lineStartOffsetByLineIdx.push(i + 1);
+				if (i > 0 && this.text.charAt(i - 1) === '\r') {
+					this._lineEndOffsetByLineIdx.push(i - 1);
 				} else {
-					this.lineEndOffsetByLineIdx.push(i);
+					this._lineEndOffsetByLineIdx.push(i);
 				}
 			}
 		}
-		this.lineEndOffsetByLineIdx.push(text.length);
+		this._lineEndOffsetByLineIdx.push(this.text.length);
 	}
 
 	override getOffset(position: Position): number {