@codingame/monaco-vscode-api 30.0.1 → 31.0.1

package/vscode/src/vs/workbench/contrib/chat/common/model/chatViewModel.js

@@ -50,10 +50,9 @@ let ChatViewModel = class ChatViewModel extends Disposable {
     get sessionResource() {
         return this._model.sessionResource;
     }
-    constructor(_model, codeBlockModelCollection, _options, instantiationService) {
+    constructor(_model, _options, instantiationService) {
         super();
         this._model = _model;
-        this.codeBlockModelCollection = codeBlockModelCollection;
         this._options = _options;
         this.instantiationService = instantiationService;
         this._onDidDisposeModel = this._register(( new Emitter()));
@@ -113,9 +112,12 @@ let ChatViewModel = class ChatViewModel extends Disposable {
         this._items.push(response);
     }
     getItems() {
-        let items = this._items.filter(
-            item => !item.shouldBeRemovedOnSend || item.shouldBeRemovedOnSend.afterUndoStop
-        );
+        let items = this._items.filter(item => {
+            if (item.shouldBeRemovedOnSend && !item.shouldBeRemovedOnSend.afterUndoStop) {
+                return false;
+            }
+            return true;
+        });
         if (this._options?.maxVisibleItems !== undefined && items.length > this._options.maxVisibleItems) {
             items = items.slice(-this._options.maxVisibleItems);
         }
@@ -124,12 +126,14 @@ let ChatViewModel = class ChatViewModel extends Disposable {
             const steeringRequests = pendingRequests.filter(p => p.kind === ChatRequestQueueKind.Steering);
             const queuedRequests = pendingRequests.filter(p => p.kind === ChatRequestQueueKind.Queued);
             if (steeringRequests.length > 0) {
+                const isSystemInitiated = steeringRequests.every(p => p.request.isSystemInitiated);
                 items.push({
                     kind: "pendingDivider",
                     id: "pending-divider-steering",
                     sessionResource: this._model.sessionResource,
                     isComplete: true,
                     dividerKind: ChatRequestQueueKind.Steering,
+                    isSystemInitiated,
                     currentRenderedHeight: undefined
                 });
                 for (const pending of steeringRequests) {
@@ -166,9 +170,10 @@ let ChatViewModel = class ChatViewModel extends Disposable {
     dispose() {
         super.dispose();
         dispose(this._items.filter(item => item instanceof ChatResponseViewModel));
+        this._items.length = 0;
     }
 };
-ChatViewModel = ( __decorate([( __param(3, IInstantiationService))], ChatViewModel));
+ChatViewModel = ( __decorate([( __param(2, IInstantiationService))], ChatViewModel));
 class ChatRequestViewModel {
     get id() {
         return this._model.id;
@@ -233,6 +238,12 @@ class ChatRequestViewModel {
     get pendingKind() {
         return this._pendingKind;
     }
+    get isSystemInitiated() {
+        return this._model.isSystemInitiated;
+    }
+    get systemInitiatedLabel() {
+        return this._model.systemInitiatedLabel;
+    }
     constructor(_model, _pendingKind) {
         this._model = _model;
         this._pendingKind = _pendingKind;
@@ -340,6 +351,15 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get contentUpdateTimings() {
         return this.liveUpdateTracker?.data;
     }
+    get confirmationAdjustedTimestamp() {
+        return this._model.confirmationAdjustedTimestamp;
+    }
+    get usageObs() {
+        return this._model.usageObs;
+    }
+    get completionTokenCountObs() {
+        return this._model.completionTokenCountObs;
+    }
     constructor(_model, session, instantiationService, chatAgentNameService) {
         super();
         this._model = _model;

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatAgents.d.ts

@@ -35,6 +35,7 @@ export interface IChatAgentAttachmentCapabilities {
     supportsTerminalAttachments?: boolean;
     supportsPromptAttachments?: boolean;
     supportsHandOffs?: boolean;
+    supportsCheckpoints?: boolean;
 }
 export interface IChatAgentData {
     id: string;
@@ -131,6 +132,7 @@ export interface IChatAgentRequest {
     locationData?: Revived<IChatLocationData>;
     acceptedConfirmationData?: unknown[];
     rejectedConfirmationData?: unknown[];
+    agentHostSessionConfig?: Record<string, string>;
     userSelectedModelId?: string;
     modelConfiguration?: IStringDictionary<unknown>;
     userSelectedTools?: UserSelectedTools;
@@ -163,6 +165,10 @@ export interface IChatAgentRequest {
      * The request ID of the parent request that invoked this subagent.
      */
     parentRequestId?: string;
+    /**
+     * When true, this request was initiated by the system rather than the user.
+     */
+    isSystemInitiated?: boolean;
 }
 export interface IChatQuestion {
     readonly prompt: string;
@@ -191,6 +197,10 @@ export interface IChatAgentCompletionItem {
     value: unknown;
     command?: Command;
 }
+export interface IChatAgentInvocationEvent {
+    readonly agentId: string;
+    readonly request: Readonly<IChatAgentRequest>;
+}
 export declare class ChatAgentService extends Disposable implements IChatAgentService {
     private readonly contextKeyService;
     private readonly configurationService;
@@ -199,6 +209,8 @@ export declare class ChatAgentService extends Disposable implements IChatAgentSe
     private _agents;
     private readonly _onDidChangeAgents;
     readonly onDidChangeAgents: Event<IChatAgent | undefined>;
+    private readonly _onWillInvokeAgent;
+    readonly onWillInvokeAgent: Event<IChatAgentInvocationEvent>;
     private readonly _agentsContextKeys;
     private readonly _hasDefaultAgent;
     private readonly _extensionAgentRegistered;

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatAgents.js

@@ -26,6 +26,8 @@ let ChatAgentService = class ChatAgentService extends Disposable {
         this._agents = ( new Map());
         this._onDidChangeAgents = this._register(( new Emitter()));
         this.onDidChangeAgents = this._onDidChangeAgents.event;
+        this._onWillInvokeAgent = this._register(( new Emitter()));
+        this.onWillInvokeAgent = this._onWillInvokeAgent.event;
         this._agentsContextKeys = ( new Set());
         this._hasToolsAgent = false;
         this._chatParticipantDetectionProviders = ( new Map());
@@ -220,6 +222,10 @@ let ChatAgentService = class ChatAgentService extends Disposable {
         if (!data?.impl) {
             throw ( new Error(`No activated agent with id "${id}"`));
         }
+        this._onWillInvokeAgent.fire({
+            agentId: id,
+            request
+        });
         const result = await data.impl.invoke(request, progress, history, token);
         markChat(request.sessionResource, ChatPerfMark.AgentDidInvoke);
         return result;

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatAgents.service.d.ts

@@ -3,7 +3,7 @@ import { Event } from "../../../../../base/common/event.js";
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { IChatFollowup, IChatProgress } from "../chatService/chatService.js";
 import { ChatAgentLocation, ChatModeKind } from "../constants.js";
-import { IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatParticipantDetectionProvider, UserSelectedTools } from "./chatAgents.js";
+import { IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentInvocationEvent, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatParticipantDetectionProvider, UserSelectedTools } from "./chatAgents.js";
 export declare const IChatAgentService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatAgentService>;
 export interface IChatAgentService {
     _serviceBrand: undefined;
@@ -11,6 +11,7 @@ export interface IChatAgentService {
     * undefined when an agent was removed
     */
     readonly onDidChangeAgents: Event<IChatAgent | undefined>;
+    readonly onWillInvokeAgent: Event<IChatAgentInvocationEvent>;
     readonly hasToolsAgent: boolean;
     registerAgent(id: string, data: IChatAgentData): IDisposable;
     registerAgentImplementation(id: string, agent: IChatAgentImplementation): IDisposable;

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginGitService.service.d.ts

@@ -0,0 +1,19 @@
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { URI } from "../../../../../base/common/uri.js";
+export declare const IPluginGitService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPluginGitService>;
+/**
+* Abstracts git operations used by the agent plugin system.
+*
+* Concrete behavior depends on the platform-specific implementation that is
+* registered for this service.
+*/
+export interface IPluginGitService {
+    readonly _serviceBrand: undefined;
+    cloneRepository(cloneUrl: string, targetDir: URI, ref?: string, token?: CancellationToken): Promise<void>;
+    pull(repoDir: URI, token?: CancellationToken): Promise<boolean>;
+    checkout(repoDir: URI, treeish: string, detached?: boolean, token?: CancellationToken): Promise<void>;
+    revParse(repoDir: URI, ref: string): Promise<string>;
+    fetch(repoDir: URI, token?: CancellationToken): Promise<void>;
+    fetchRepository(repoDir: URI, token?: CancellationToken): Promise<void>;
+    revListCount(repoDir: URI, fromRef: string, toRef: string): Promise<number>;
+}

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginGitService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+const IPluginGitService = ( createDecorator("pluginGitService"));
+
+export { IPluginGitService };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.d.ts

@@ -3,7 +3,6 @@ import { ResourceSet } from "../../../../../base/common/map.js";
 import { OperatingSystem } from "../../../../../base/common/platform.js";
 import { URI } from "../../../../../base/common/uri.js";
 import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
-import { IContextKeyService } from "../../../../../platform/contextkey/common/contextkey.service.js";
 import { IFileService } from "../../../../../platform/files/common/files.service.js";
 import { ILabelService } from "../../../../../platform/label/common/label.service.js";
 import { ILogService } from "../../../../../platform/log/common/log.service.js";
@@ -12,33 +11,31 @@ import { ITelemetryService } from "../../../../../platform/telemetry/common/tele
 import { IWorkspaceContextService } from "../../../../../platform/workspace/common/workspace.service.js";
 import { ChatRequestVariableSet } from "../attachments/chatVariableEntries.js";
 import { ILanguageModelToolsService } from "../tools/languageModelToolsService.service.js";
-import { PromptHeader } from "./promptFileParser.js";
-import { IPromptPath } from "./service/promptsService.js";
+import { IInstructionFile, type InstructionsCollectionEvent, type InstructionsCollectionDebugInfo } from "./service/promptsService.js";
 import { IPromptsService } from "./service/promptsService.service.js";
+export type { InstructionsCollectionEvent, InstructionsCollectionDebugInfo } from "./service/promptsService.js";
+export { newInstructionsCollectionEvent, newInstructionsCollectionDebugInfo } from "./service/promptsService.js";
 import { ChatModeKind } from "../constants.js";
 import { UserSelectedTools } from "../participants/chatAgents.js";
 import { IAgentPluginService } from "../plugins/agentPluginService.service.js";
-export type InstructionsCollectionEvent = {
-    applyingInstructionsCount: number;
-    referencedInstructionsCount: number;
-    agentInstructionsCount: number;
-    listedInstructionsCount: number;
-    totalInstructionsCount: number;
-    claudeRulesCount: number;
-    claudeMdCount: number;
-    claudeAgentsCount: number;
-};
-export declare function newInstructionsCollectionEvent(): InstructionsCollectionEvent;
+export interface InstructionsCollectionResult {
+    readonly telemetryEvent: InstructionsCollectionEvent;
+    readonly debugInfo: InstructionsCollectionDebugInfo;
+}
+/**
+ * The result of the most recent {@link ComputeAutomaticInstructions.collect} call.
+ * Consumed by debug contributions for logging; not sent as telemetry.
+ */
+export declare let lastInstructionsCollectionResult: InstructionsCollectionResult | undefined;
 export declare class ComputeAutomaticInstructions {
     private readonly _modeKind;
     private readonly _enabledTools;
     private readonly _enabledSubagents;
-    private readonly _sessionResource;
+    private readonly _currentSessionType;
     private readonly _promptsService;
     readonly _logService: ILogService;
     private readonly _labelService;
     private readonly _configurationService;
-    private readonly _contextKeyService;
     private readonly _workspaceService;
     private readonly _fileService;
     private readonly _remoteAgentService;
@@ -46,16 +43,16 @@ export declare class ComputeAutomaticInstructions {
     private readonly _languageModelToolsService;
     private readonly _agentPluginService;
     private _parseResults;
-    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _sessionResource: URI | undefined, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _contextKeyService: IContextKeyService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService, _agentPluginService: IAgentPluginService);
+    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _currentSessionType: string, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService, _agentPluginService: IAgentPluginService);
     private _parseInstructionsFile;
     collect(variables: ChatRequestVariableSet, token: CancellationToken): Promise<void>;
     private sendTelemetry;
     private _logSkillLoadedTelemetry;
     /** public for testing */
-    addApplyingInstructions(instructionFiles: readonly IPromptPath[], context: {
+    addApplyingInstructions(instructionFiles: readonly IInstructionFile[], context: {
         files: ResourceSet;
         instructions: ResourceSet;
-    }, variables: ChatRequestVariableSet, telemetryEvent: InstructionsCollectionEvent, token: CancellationToken): Promise<void>;
+    }, variables: ChatRequestVariableSet, telemetryEvent: InstructionsCollectionEvent, debugInfo: InstructionsCollectionDebugInfo, token: CancellationToken): Promise<void>;
     private _getContext;
     private _addAgentInstructions;
     private _matches;
@@ -64,7 +61,3 @@ export declare class ComputeAutomaticInstructions {
     private _addReferencedInstructions;
 }
 export declare function getFilePath(uri: URI, remoteOS: OperatingSystem | undefined): string;
-/**
- * Returns `applyTo` or `paths` attributes based on whether the instruction file is a Claude rules file or a regular instruction file
- */
-export declare function evaluateApplyToPattern(header: PromptHeader | undefined, isClaudeRules: boolean): string | undefined;