[pull] main from microsoft:main

build/lib/stylelint/vscode-known-variables.json

@@ -997,7 +997,8 @@
 		"--comment-thread-editor-font-weight",
 		"--comment-thread-state-color",
 		"--comment-thread-state-background-color",
-		"--inline-edit-border-radius"
+		"--inline-edit-border-radius",
+		"--chat-subagent-last-item-height"
 	],
 	"sizes": [
 		"--vscode-bodyFontSize",

eslint.config.js

@@ -899,6 +899,7 @@ export default tseslint.config(
 					],
 					'verbs': [
 						'accept',
+						'archive',
 						'change',
 						'close',
 						'collapse',

src/vs/base/common/date.ts

@@ -24,6 +24,10 @@ const year = day * 365;
  * is less than 30 seconds.
  */
 export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTimeWords?: boolean, disallowNow?: boolean): string {
+	if (typeof date === 'undefined') {
+		return localize('date.fromNow.unknown', 'unknown');
+	}
+
 	if (typeof date !== 'number') {
 		date = date.getTime();
 	}

src/vs/base/common/strings.ts

@@ -785,6 +785,53 @@ export function lcut(text: string, n: number, prefix = ''): string {
 	return prefix + trimmed.substring(i).trimStart();
 }
 
+/**
+ * Given a string and a max length returns a shortened version keeping the beginning.
+ * Shortening happens at favorable positions - such as whitespace or punctuation characters.
+ * Trailing whitespace is always trimmed.
+ */
+export function rcut(text: string, n: number, suffix = ''): string {
+	const trimmed = text.trimEnd();
+
+	if (trimmed.length <= n) {
+		return trimmed;
+	}
+
+	const re = /\b/g;
+	let lastGoodBreak = 0;
+	let foundBoundaryAfterN = false;
+	while (re.test(trimmed)) {
+		if (re.lastIndex > n) {
+			foundBoundaryAfterN = true;
+			break;
+		}
+		lastGoodBreak = re.lastIndex;
+		re.lastIndex += 1;
+	}
+
+	// If no boundary was found after n, return the full trimmed string
+	// (there's no good place to cut)
+	if (!foundBoundaryAfterN) {
+		return trimmed;
+	}
+
+	// If the only boundary <= n is at position 0 (start of string),
+	// cutting there gives empty string, so just return the suffix
+	if (lastGoodBreak === 0) {
+		return suffix;
+	}
+
+	const result = trimmed.substring(0, lastGoodBreak).trimEnd();
+
+	// If trimEnd removed more than half of what we cut (meaning we cut
+	// mostly through whitespace), return the full string instead
+	if (result.length < lastGoodBreak / 2) {
+		return trimmed;
+	}
+
+	return result + suffix;
+}
+
 // Defacto standard: https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
 const CSI_SEQUENCE = /(?:\x1b\[|\x9b)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/;
 const OSC_SEQUENCE = /(?:\x1b\]|\x9d).*?(?:\x1b\\|\x07|\x9c)/;

src/vs/base/test/common/strings.test.ts

@@ -196,6 +196,40 @@ suite('Strings', () => {
 		assert.strictEqual(strings.lcut('............a', 10, '…'), '............a');
 	});
 
+	test('rcut', () => {
+		assert.strictEqual(strings.rcut('foo bar', 0), '');
+		assert.strictEqual(strings.rcut('foo bar', 1), '');
+		assert.strictEqual(strings.rcut('foo bar', 3), 'foo');
+		assert.strictEqual(strings.rcut('foo bar', 4), 'foo'); // Trailing whitespace trimmed
+		assert.strictEqual(strings.rcut('foo bar', 5), 'foo');
+		assert.strictEqual(strings.rcut('foo bar', 7), 'foo bar');
+		assert.strictEqual(strings.rcut('foo bar', 10), 'foo bar');
+		assert.strictEqual(strings.rcut('test string 0.1.2.3', 6), 'test');
+
+		assert.strictEqual(strings.rcut('foo bar', 0, '…'), '…');
+		assert.strictEqual(strings.rcut('foo bar', 1, '…'), '…');
+		assert.strictEqual(strings.rcut('foo bar', 3, '…'), 'foo…');
+		assert.strictEqual(strings.rcut('foo bar', 4, '…'), 'foo…'); // Trailing whitespace trimmed
+		assert.strictEqual(strings.rcut('foo bar', 5, '…'), 'foo…');
+		assert.strictEqual(strings.rcut('foo bar', 7, '…'), 'foo bar');
+		assert.strictEqual(strings.rcut('foo bar', 10, '…'), 'foo bar');
+		assert.strictEqual(strings.rcut('test string 0.1.2.3', 6, '…'), 'test…');
+
+		assert.strictEqual(strings.rcut('', 10), '');
+		assert.strictEqual(strings.rcut('a', 10), 'a');
+		assert.strictEqual(strings.rcut('a ', 10), 'a');
+		assert.strictEqual(strings.rcut('a            ', 10), 'a');
+		assert.strictEqual(strings.rcut('a       bbbb ', 10), 'a       bbbb');
+		assert.strictEqual(strings.rcut('a............', 10), 'a............');
+
+		assert.strictEqual(strings.rcut('', 10, '…'), '');
+		assert.strictEqual(strings.rcut('a', 10, '…'), 'a');
+		assert.strictEqual(strings.rcut('a ', 10, '…'), 'a');
+		assert.strictEqual(strings.rcut('a            ', 10, '…'), 'a');
+		assert.strictEqual(strings.rcut('a       bbbb ', 10, '…'), 'a       bbbb');
+		assert.strictEqual(strings.rcut('a............', 10, '…'), 'a............');
+	});
+
 	test('escape', () => {
 		assert.strictEqual(strings.escape(''), '');
 		assert.strictEqual(strings.escape('foo'), 'foo');

src/vs/workbench/api/browser/mainThreadChatAgents2.ts

@@ -288,6 +288,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 					toolId: progress.toolName,
 					chatRequestId: requestId,
 					sessionResource: chatSession?.sessionResource,
+					subagentInvocationId: progress.subagentInvocationId
 				});
 				continue;
 			}

src/vs/workbench/api/browser/mainThreadChatSessions.ts

@@ -382,7 +382,6 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		));
 	}
 
-
 	$onDidChangeChatSessionItems(handle: number): void {
 		this._itemProvidersRegistrations.get(handle)?.onDidChangeItems.fire();
 	}
@@ -491,6 +490,7 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 					resource: uri,
 					iconPath: session.iconPath,
 					tooltip: session.tooltip ? this._reviveTooltip(session.tooltip) : undefined,
+					archived: session.archived,
 				} satisfies IChatSessionItem;
 			}));
 		} catch (error) {

src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts

@@ -78,7 +78,7 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 		return fn.countTokens(input, token);
 	}
 
-	$registerTool(id: string): void {
+	$registerTool(id: string, hasHandleToolStream: boolean): void {
 		const disposable = this._languageModelToolsService.registerToolImplementation(
 			id,
 			{
@@ -93,7 +93,7 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 					}
 				},
 				prepareToolInvocation: (context, token) => this._proxy.$prepareToolInvocation(id, context, token),
-				handleToolStream: (context, token) => this._proxy.$handleToolStream(id, context, token),
+				handleToolStream: hasHandleToolStream ? (context, token) => this._proxy.$handleToolStream(id, context, token) : undefined,
 			});
 		this._tools.set(id, disposable);
 	}

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -1530,6 +1530,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatSessionsProvider');
 				return extHostChatSessions.registerChatSessionItemProvider(extension, chatSessionType, provider);
 			},
+			createChatSessionItemController: (chatSessionType: string, refreshHandler: () => Thenable<void>) => {
+				checkProposedApiEnabled(extension, 'chatSessionsProvider');
+				return extHostChatSessions.createChatSessionItemController(extension, chatSessionType, refreshHandler);
+			},
 			registerChatSessionContentProvider(scheme: string, provider: vscode.ChatSessionContentProvider, chatParticipant: vscode.ChatParticipant, capabilities?: vscode.ChatSessionCapabilities) {
 				checkProposedApiEnabled(extension, 'chatSessionsProvider');
 				return extHostChatSessions.registerChatSessionContentProvider(extension, scheme, chatParticipant, provider, capabilities);

src/vs/workbench/api/common/extHost.protocol.ts

@@ -1498,7 +1498,7 @@ export interface MainThreadLanguageModelToolsShape extends IDisposable {
 	$acceptToolProgress(callId: string, progress: IToolProgressStep): void;
 	$invokeTool(dto: Dto<IToolInvocation>, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
 	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
-	$registerTool(id: string): void;
+	$registerTool(id: string, hasHandleToolStream: boolean): void;
 	$unregisterTool(name: string): void;
 }
 
@@ -2330,6 +2330,7 @@ export interface IChatBeginToolInvocationDto {
 	streamData?: {
 		partialInput?: unknown;
 	};
+	subagentInvocationId?: string;
 }
 
 export interface IChatUpdateToolInvocationDto {

src/vs/workbench/api/common/extHostChatAgents2.ts

@@ -311,7 +311,8 @@ export class ChatAgentResponseStream {
 						toolName,
 						streamData: streamData ? {
 							partialInput: streamData.partialInput
-						} : undefined
+						} : undefined,
+						subagentInvocationId: streamData?.subagentInvocationId
 					};
 					_report(dto);
 					return this;
@@ -559,6 +560,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				return await (provider as vscode.InstructionsProvider).provideInstructions(context, token) ?? undefined;
 			case PromptsType.prompt:
 				return await (provider as vscode.PromptFileProvider).providePromptFiles(context, token) ?? undefined;
+			case PromptsType.skill:
+				throw new Error('Skills prompt file provider not implemented yet');
 		}
 	}