Merge branch 'main' into alexr00/planned-rooster

Author: alexr00

package.json

@@ -3586,6 +3586,10 @@
 					"command": "pr.checkoutOnVscodeDevFromDescription",
 					"group": "checkout@1",
 					"when": "webviewId == PullRequestOverview && github:checkoutMenu"
+				},
+				{
+					"command": "pr.openSessionLogFromDescription",
+					"when": "webviewId == PullRequestOverview && github:codingAgentMenu"
 				}
 			],
 			"chat/chatSessions": [

src/commands.ts

@@ -14,12 +14,13 @@ import Logger from './common/logger';
 import { FILE_LIST_LAYOUT, HIDE_VIEWED_FILES, PR_SETTINGS_NAMESPACE } from './common/settingKeys';
 import { editQuery } from './common/settingsUtils';
 import { ITelemetry } from './common/telemetry';
+import { SessionLinkInfo } from './common/timelineEvent';
 import { asTempStorageURI, fromPRUri, fromReviewUri, Schemes, toPRUri } from './common/uri';
 import { formatError } from './common/utils';
 import { EXTENSION_ID } from './constants';
 import { ICopilotRemoteAgentCommandArgs } from './github/common';
 import { ChatSessionWithPR, CrossChatSessionWithPR } from './github/copilotApi';
-import { CopilotRemoteAgentManager } from './github/copilotRemoteAgent';
+import { CopilotRemoteAgentManager, SessionIdForPr } from './github/copilotRemoteAgent';
 import { FolderRepositoryManager } from './github/folderRepositoryManager';
 import { GitHubRepository } from './github/githubRepository';
 import { Issue } from './github/interface';
@@ -724,6 +725,14 @@ export function registerCommands(
 		return vscode.env.openExternal(vscode.Uri.parse(vscodeDevPrLink(resolved.pr)));
 	}));
 
+	context.subscriptions.push(vscode.commands.registerCommand('pr.openSessionLogFromDescription', async (context: SessionLinkInfo | undefined) => {
+		if (!context) {
+			return vscode.window.showErrorMessage(vscode.l10n.t('No pull request context provided for checkout.'));
+		}
+		const resource = SessionIdForPr.getResource(context.pullNumber, context.sessionIndex);
+		return vscode.commands.executeCommand('vscode.open', resource);
+	}));
+
 	context.subscriptions.push(
 		vscode.commands.registerCommand('pr.exit', async (pr: PRNode | RepositoryChangesNode | PullRequestModel | undefined) => {
 			let pullRequestModel: PullRequestModel | undefined;

src/github/graphql.ts

@@ -122,12 +122,12 @@ export interface Account extends Actor {
 
 export function isAccount(x: Actor | Team | Node | undefined | null): x is Account {
 	const asAccount = x as Partial<Account>;
-	return !!asAccount && !!asAccount?.name && (asAccount?.email !== undefined);
+	return !!asAccount && (asAccount?.name !== undefined) && (asAccount?.email !== undefined);
 }
 
 export function isTeam(x: Actor | Team | Node | undefined | null): x is Team {
 	const asTeam = x as Partial<Team>;
-	return !!asTeam && !!asTeam?.slug;
+	return !!asTeam && (asTeam?.slug !== undefined);
 }
 
 export interface Team {

src/test/github/graphql.test.ts

@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { isAccount, isTeam, Actor, Account, Team, Node } from '../../github/graphql';
+
+describe('graphql type guards', () => {
+
+	describe('isAccount', () => {
+		it('returns true for a valid Account', () => {
+			const account: Account = {
+				__typename: 'User',
+				id: 'acct1',
+				login: 'alice',
+				avatarUrl: 'https://example.com/a.png',
+				url: 'https://example.com/alice',
+				name: 'Alice',
+				email: 'alice@example.com'
+			};
+			assert.strictEqual(isAccount(account), true);
+		});
+
+		it('returns false for Actor missing name/email', () => {
+			const actor: Actor = {
+				__typename: 'User',
+				id: 'act1',
+				login: 'bob',
+				avatarUrl: 'https://example.com/b.png',
+				url: 'https://example.com/bob'
+			};
+			assert.strictEqual(isAccount(actor), false);
+		});
+
+		it('returns false for Team object', () => {
+			const team: Team = {
+				avatarUrl: 'https://example.com/t.png',
+				name: 'Dev Team',
+				url: 'https://example.com/team',
+				repositories: { nodes: [] },
+				slug: 'dev-team',
+				id: 'team1'
+			};
+			assert.strictEqual(isAccount(team), false);
+		});
+
+		it('returns false for Node object', () => {
+			const node: Node = { id: 'node1' };
+			assert.strictEqual(isAccount(node), false);
+		});
+
+		it('returns false for null and undefined', () => {
+			assert.strictEqual(isAccount(null), false);
+			assert.strictEqual(isAccount(undefined), false);
+		});
+
+		it('returns true when name and email are null', () => {
+			const obj: any = {
+				__typename: 'User', id: 'null1', login: 'nullUser', avatarUrl: '', url: '', name: null, email: null
+			};
+			assert.strictEqual(isAccount(obj), true);
+		});
+
+		it('returns true when name is null but email present', () => {
+			const obj: any = {
+				__typename: 'User', id: 'null2', login: 'nullName', avatarUrl: '', url: '', name: null, email: 'e@example.com'
+			};
+			assert.strictEqual(isAccount(obj), true);
+		});
+
+		it('returns false when email or name is undefined', () => {
+			const obj: any = {
+				__typename: 'User', id: 'null3', login: 'nullEmail', avatarUrl: '', url: '', name: undefined, email: undefined
+			};
+			assert.strictEqual(isAccount(obj), false);
+		});
+	});
+
+	describe('isTeam', () => {
+		it('returns true for a valid Team', () => {
+			const team: Team = {
+				avatarUrl: 'https://example.com/t.png',
+				name: 'Engineering',
+				url: 'https://example.com/eng',
+				repositories: { nodes: [] },
+				slug: 'engineering',
+				id: 'team2'
+			};
+			assert.strictEqual(isTeam(team), true);
+		});
+
+		it('returns false for Account object', () => {
+			const account: Account = {
+				__typename: 'User',
+				id: 'acct2',
+				login: 'carol',
+				avatarUrl: 'https://example.com/c.png',
+				url: 'https://example.com/carol',
+				name: 'Carol',
+				email: 'carol@example.com'
+			};
+			assert.strictEqual(isTeam(account), false);
+		});
+
+		it('returns false for Actor without slug', () => {
+			const actor: Actor = {
+				__typename: 'User',
+				id: 'act2',
+				login: 'dave',
+				avatarUrl: 'https://example.com/d.png',
+				url: 'https://example.com/dave'
+			};
+			assert.strictEqual(isTeam(actor), false);
+		});
+
+		it('returns false for Node object', () => {
+			const node: Node = { id: 'node2' };
+			assert.strictEqual(isTeam(node), false);
+		});
+
+		it('returns false for null and undefined', () => {
+			assert.strictEqual(isTeam(null), false);
+			assert.strictEqual(isTeam(undefined), false);
+		});
+
+		it('returns false when slug is undefined', () => {
+			const obj: any = {
+				avatarUrl: '', name: 'Team', url: '', repositories: { nodes: [] }, slug: undefined, id: 'tslugnull'
+			};
+			assert.strictEqual(isTeam(obj), false);
+		});
+		it('returns true when slug is null', () => {
+			const obj: any = {
+				avatarUrl: '', name: 'Team', url: '', repositories: { nodes: [] }, slug: null, id: 'tslugnull'
+			};
+			assert.strictEqual(isTeam(obj), true);
+		});
+	});
+});
+

webviews/components/comment.tsx

@@ -5,7 +5,7 @@
 
 import React, { useCallback, useContext, useEffect, useRef, useState } from 'react';
 import { ContextDropdown } from './contextDropdown';
-import { editIcon, quoteIcon, trashIcon } from './icon';
+import { copyIcon, editIcon, quoteIcon, trashIcon } from './icon';
 import { nbsp, Spaced } from './space';
 import { Timestamp } from './timestamp';
 import { AuthorLink, Avatar } from './user';
@@ -48,6 +48,7 @@ export function CommentView(commentProps: Props) {
 	const currentDraft = pr?.pendingCommentDrafts && pr.pendingCommentDrafts[id];
 	const [inEditMode, setEditMode] = useState(!!currentDraft);
 	const [showActionBar, setShowActionBar] = useState(false);
+	const commentUrl = (comment as Partial<IComment | ReviewEvent | CommentEvent>).htmlUrl || (comment as PullRequest).url;
 
 	if (inEditMode) {
 		return React.cloneElement(headerInEditMode ? <CommentBox for={comment} /> : <></>, {}, [
@@ -96,6 +97,15 @@ export function CommentView(commentProps: Props) {
 				>
 					{quoteIcon}
 				</button>
+				{commentUrl ? (
+					<button
+						title="Copy Comment Link"
+						className="icon-button"
+						onClick={() => navigator.clipboard.writeText(commentUrl)}
+					>
+						{copyIcon}
+					</button>
+				) : null}
 				{canEdit ? (
 					<button title="Edit comment" className="icon-button" onClick={() => setEditMode(true)}>
 						{editIcon}