@codingame/monaco-vscode-katex-common 34.1.3 → 35.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatTurnPills.css

@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Pills reflecting a single turn's status (changes + preview). Shared between
+	the floating widget above the chat input and the completed chat response. This
+	file styles the pills themselves; callers position the `.chat-turn-pills`
+	toolbar element. */
+
+.chat-turn-pills,
+.chat-turn-pills .monaco-toolbar,
+.chat-turn-pills .monaco-action-bar,
+.chat-turn-pills .monaco-action-bar .actions-container {
+	display: flex;
+	align-items: center;
+	min-width: 0;
+}
+
+.chat-turn-pills.hidden {
+	display: none;
+}
+
+/* Space the pills evenly next to each other. */
+.chat-turn-pills .monaco-action-bar .actions-container {
+	gap: 6px;
+}
+
+/* Changes pill: <icon> N Files +x -y, rendered as a compact secondary button.
+	Its sizing/colors come from the standard `.monaco-text-button.small.secondary`
+	styles; only inline layout is set here. */
+.chat-turn-pill-changes {
+	display: inline-flex;
+	align-items: center;
+	flex-shrink: 0;
+}
+
+.chat-turn-pill-changes .monaco-button.chat-turn-pill-changes-button {
+	display: inline-flex;
+	width: auto;
+	gap: 4px;
+	font-variant-numeric: tabular-nums;
+	white-space: nowrap;
+	touch-action: manipulation;
+}
+
+/* Hug the border with the focus ring instead of the base `outline-offset: 2px`,
+	which reads as a bloated ring on such a small pill. */
+.chat-turn-pill-changes .monaco-button.chat-turn-pill-changes-button:focus {
+	outline-offset: 0 !important;
+}
+
+.monaco-workbench .chat-turn-pill-meta-icon.codicon[class*='codicon-'] {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	width: var(--vscode-codiconFontSize-compact, 12px);
+	height: var(--vscode-codiconFontSize-compact, 12px);
+	margin: 0;
+	font-size: var(--vscode-codiconFontSize-compact, 12px);
+	flex-shrink: 0;
+}
+
+.chat-turn-pill-meta-added {
+	color: var(--vscode-chat-linesAddedForeground);
+}
+
+.chat-turn-pill-meta-removed {
+	color: var(--vscode-chat-linesRemovedForeground);
+}
+
+/* Preview pill: a single unified control — a resource label (file icon + name +
+	"preview" description), an in-pill separator, and a dropdown chevron. The pill
+	background/border live on the container so the inner (transparent) buttons read
+	as one pill; each inner button is an independent, tab-focusable click zone. The
+	3-class selector beats `.monaco-action-bar .action-item { display: block }`. */
+.chat-turn-pills .monaco-action-bar .chat-turn-pill-preview {
+	display: inline-flex;
+	align-items: stretch;
+	flex-shrink: 0;
+	/* Match the height of the changes pill (a small secondary button). */
+	height: 22px;
+	max-width: 280px;
+	border-radius: 4px;
+	color: var(--vscode-button-secondaryForeground);
+	background-color: var(--vscode-button-secondaryBackground);
+	border: 1px solid var(--vscode-button-secondaryBorder, transparent);
+	overflow: hidden;
+}
+
+.chat-turn-pill-preview .monaco-button {
+	touch-action: manipulation;
+}
+
+/* Left zone: the resource label (file icon + name + "preview"). The height is
+	set by the pill, so no vertical padding here. */
+.chat-turn-pill-preview .monaco-button.chat-turn-pill-preview-primary {
+	display: inline-flex;
+	align-items: center;
+	width: auto;
+	min-width: 0;
+	padding: 0 8px;
+	overflow: hidden;
+}
+
+.chat-turn-pill-preview-primary .monaco-icon-label {
+	/* Center the icon and the name/description together — the label is a flex
+		row whose file icon `::before` is a fixed 22px tall, so without this the
+		shorter text sits at the top of the stretched row rather than on the icon's
+		vertical center. */
+	align-items: center;
+	min-width: 0;
+	overflow: hidden;
+	/* Match the changes pill, which uses the `.monaco-text-button.small` size. */
+	font-size: 11px;
+}
+
+.chat-turn-pill-preview .monaco-button.chat-turn-pill-preview-primary:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+/* In-pill separator between the label and the chevron. A 2px vertical margin
+	keeps it centered with a small gap at the top and bottom rather than spanning
+	the full pill height. */
+.chat-turn-pill-preview-separator {
+	width: 1px;
+	flex-shrink: 0;
+	margin: 2px 0;
+	background-color: var(--vscode-button-secondaryBorder, var(--vscode-menu-separatorBackground));
+	opacity: 0.6;
+}
+
+.chat-turn-pill-preview-separator.hidden {
+	display: none;
+}
+
+/* Right zone: the dropdown chevron. The button stretches to the pill's full
+	height so its hover background spans top to bottom; the icon child stays
+	centered. */
+.chat-turn-pill-preview .monaco-button.chat-turn-pill-preview-chevron {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	width: auto;
+	padding: 0 5px;
+}
+
+.chat-turn-pill-preview .monaco-button.chat-turn-pill-preview-chevron:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.chat-turn-pill-preview .monaco-button.chat-turn-pill-preview-chevron.hidden {
+	display: none;
+}
+
+/* Keyboard focus indicator: an inset ring so it stays visible inside the pill's
+	`overflow: hidden` rounded corners. */
+.chat-turn-pill-preview .monaco-button:focus,
+.chat-turn-pill-preview .monaco-button:focus-visible {
+	outline: none;
+	box-shadow: inset 0 0 0 1px var(--vscode-focusBorder);
+}

package/vscode/src/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.d.ts

@@ -13,6 +13,11 @@ export interface IToolRiskAssessment {
     /** One-sentence natural-language explanation, <= 140 chars. */
     readonly explanation: string;
 }
+/**
+ * Which rubric the model uses to assess a tool call: `terminal` for a shell command, `generic`
+ * for file edits, reads, fetches, and everything else. When omitted, auto-detected from the tool id.
+ */
+export type ToolRiskPromptKind = "terminal" | "generic";
 export declare class ChatToolRiskAssessmentService implements IChatToolRiskAssessmentService {
     private readonly _configurationService;
     private readonly _languageModelsService;
@@ -21,8 +26,10 @@ export declare class ChatToolRiskAssessmentService implements IChatToolRiskAsses
     private readonly _inFlight;
     constructor(_configurationService: IConfigurationService, _languageModelsService: ILanguageModelsService);
     isEnabled(): boolean;
-    getCached(tool: IToolData, parameters: unknown): IToolRiskAssessment | undefined;
-    assess(tool: IToolData, parameters: unknown, token: CancellationToken): Promise<IToolRiskAssessment | undefined>;
+    getCached(tool: IToolData, parameters: unknown, kind?: ToolRiskPromptKind): IToolRiskAssessment | undefined;
+    assess(tool: IToolData, parameters: unknown, token: CancellationToken, kind?: ToolRiskPromptKind, options?: {
+        ignoreEnablement?: boolean;
+    }): Promise<IToolRiskAssessment | undefined>;
     private _cacheKey;
     private _invokeModel;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.js

@@ -27,14 +27,15 @@ let ChatToolRiskAssessmentService = class ChatToolRiskAssessmentService {
     isEnabled() {
         return this._configurationService.getValue(ChatConfiguration.ToolRiskAssessmentEnabled) !== false;
     }
-    getCached(tool, parameters) {
-        return this._cache.get(this._cacheKey(tool, parameters))?.assessment;
+    getCached(tool, parameters, kind) {
+        return this._cache.get(this._cacheKey(tool, parameters, resolveRiskPromptKind(tool, kind)))?.assessment;
     }
-    async assess(tool, parameters, token) {
-        if (!this.isEnabled()) {
+    async assess(tool, parameters, token, kind, options) {
+        if (!options?.ignoreEnablement && !this.isEnabled()) {
             return undefined;
         }
-        const key = this._cacheKey(tool, parameters);
+        const resolvedKind = resolveRiskPromptKind(tool, kind);
+        const key = this._cacheKey(tool, parameters, resolvedKind);
         const cached = this._cache.get(key);
         if (cached) {
             return cached.assessment;
@@ -45,7 +46,7 @@ let ChatToolRiskAssessmentService = class ChatToolRiskAssessmentService {
         }
         const promise = (async () => {
             try {
-                const assessment = await this._invokeModel(tool, parameters, token);
+                const assessment = await this._invokeModel(tool, parameters, resolvedKind, token);
                 if (token.isCancellationRequested) {
                     return undefined;
                 }
@@ -62,10 +63,10 @@ let ChatToolRiskAssessmentService = class ChatToolRiskAssessmentService {
         this._inFlight.set(key, promise);
         return promise;
     }
-    _cacheKey(tool, parameters) {
-        return tool.id + "::" + stableStringify(normalizeRiskCacheParameters(tool, parameters));
+    _cacheKey(tool, parameters, kind) {
+        return kind + "::" + tool.id + "::" + stableStringify(normalizeRiskCacheParameters(parameters, kind));
     }
-    async _invokeModel(tool, parameters, token) {
+    async _invokeModel(tool, parameters, kind, token) {
         const modelId = this._configurationService.getValue(ChatConfiguration.ToolRiskAssessmentModel) || "copilot-utility-small";
         const models = await this._languageModelsService.selectLanguageModels({
             vendor: "copilot",
@@ -74,7 +75,7 @@ let ChatToolRiskAssessmentService = class ChatToolRiskAssessmentService {
         if (!models.length || token.isCancellationRequested) {
             return undefined;
         }
-        const prompt = buildPrompt(tool, parameters);
+        const prompt = buildPrompt(tool, parameters, kind);
         const response = await this._languageModelsService.sendChatRequest(models[0], undefined, [{
             role: ChatMessageRole.User,
             content: [{
@@ -105,8 +106,11 @@ let ChatToolRiskAssessmentService = class ChatToolRiskAssessmentService {
     }
 };
 ChatToolRiskAssessmentService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, ILanguageModelsService))], ChatToolRiskAssessmentService));
-function normalizeRiskCacheParameters(tool, parameters) {
-    if (tool.id === TerminalToolId.RunInTerminal && parameters && typeof parameters === "object") {
+function resolveRiskPromptKind(tool, kind) {
+    return kind ?? (tool.id === TerminalToolId.RunInTerminal ? "terminal" : "generic");
+}
+function normalizeRiskCacheParameters(parameters, kind) {
+    if (kind === "terminal" && parameters && typeof parameters === "object") {
         const p = parameters;
         return {
             command: p.command
@@ -114,7 +118,11 @@ function normalizeRiskCacheParameters(tool, parameters) {
     }
     return parameters;
 }
-function buildPrompt(tool, parameters) {
+function buildPrompt(tool, parameters, kind) {
+    const argsJson = serializeParameters(parameters);
+    return kind === "terminal" ? buildTerminalPrompt(tool, argsJson) : buildGenericToolPrompt(tool, argsJson);
+}
+function serializeParameters(parameters) {
     let argsJson;
     try {
         argsJson = JSON.stringify(parameters ?? {});
@@ -124,6 +132,9 @@ function buildPrompt(tool, parameters) {
     if (argsJson.length > MAX_PARAM_BYTES) {
         argsJson = argsJson.slice(0, MAX_PARAM_BYTES) + "...[truncated]";
     }
+    return argsJson;
+}
+function buildTerminalPrompt(tool, argsJson) {
     return [
         `You assess what one terminal command does for a code-editing AI agent, and how risky it is.`,
         `Reply with STRICT JSON only (no prose, no markdown fences):`,
@@ -136,14 +147,19 @@ function buildPrompt(tool, parameters) {
         `  1. irreversible deletion of source code or user data (rm -rf on $HOME / source paths,`,
         `     find ... -delete on source globs), force-push, drop, format, npm publish        -> red`,
         `  2. arbitrary code execution from a remote source (curl ... | bash)                  -> red`,
-        `  3. modifies remote state (git push, deploy, post)                                   -> orange`,
-        `  4. modifies local files or installs packages, including recoverable deletions`,
-        `     such as rm -rf of build output, caches, or node_modules                          -> orange`,
-        `  5. otherwise (read-only, listing, status, diagnostics, GET requests)                -> green`,
+        `  3. installs a package or dependency from a registry (npm/yarn/pnpm install, pip`,
+        `     install, cargo add, gem install, go get, brew install, etc.) — pulls untrusted`,
+        `     third-party code that may run install scripts, a common supply-chain vector      -> red`,
+        `  4. modifies remote state (git push, deploy, post)                                   -> orange`,
+        `  5. modifies local files, including recoverable deletions such as rm -rf of build`,
+        `     output, caches, or node_modules                                                  -> orange`,
+        `  6. otherwise (read-only, listing, status, diagnostics, GET requests)                -> green`,
         ``,
         `Read-only commands are always GREEN. "rm -rf" is RED only when the target is`,
         `source code or user data; deleting recoverable build artifacts (node_modules,`,
-        `dist, .cache) is ORANGE.`,
+        `dist, .cache) is ORANGE. Installing a package is RED even from a major registry,`,
+        `because it pulls untrusted third-party code onto this machine — a supply-chain`,
+        `risk regardless of whether the package manager runs install scripts.`,
         ``,
         `Examples:`,
         `  ls -lh                              -> green`,
@@ -153,10 +169,11 @@ function buildPrompt(tool, parameters) {
         `  npm ls                              -> green`,
         `  az vm list                          -> green`,
         `  kubectl get pods --all-namespaces   -> green`,
-        `  npm install lodash                  -> orange`,
         `  rm -rf node_modules                 -> orange  (recoverable: reinstall)`,
         `  rm -rf dist                         -> orange  (recoverable: rebuild)`,
         `  git push origin feature             -> orange`,
+        `  npm install lodash                  -> red     (pulls untrusted third-party code)`,
+        `  pip install requests                -> red     (pulls untrusted third-party code)`,
         `  rm -rf $HOME                        -> red`,
         `  rm -rf src                          -> red     (irreplaceable source code)`,
         `  find . -name '*.test.ts' -delete    -> red`,
@@ -166,8 +183,8 @@ function buildPrompt(tool, parameters) {
         ``,
         `Write "explanation" in this exact shape:`,
         `  - green : "<verb> <target>."  e.g. "Lists running VMs in the current Azure subscription."`,
-        `  - orange: "<verb> <target> — <consequence>."  e.g. "Installs lodash into node_modules."`,
-        `  - red   : "<verb> <target> — <irreversible consequence>."  e.g. "Force-pushes main — overwrites public history."`,
+        `  - orange: "<verb> <target> — <consequence>."  e.g. "Pushes the feature branch to origin."`,
+        `  - red   : "<verb> <target> — <irreversible or untrusted-code consequence>."  e.g. "Force-pushes main — overwrites public history." or "Installs lodash — pulls untrusted third-party code."`,
         ``,
         `Strict explanation rules:`,
         `  - Cite the ACTUAL paths, commands, URLs, branches, globs from the arguments below.`,
@@ -180,6 +197,60 @@ function buildPrompt(tool, parameters) {
         `Arguments (JSON): ${argsJson}`
     ].join("\n");
 }
+function buildGenericToolPrompt(tool, argsJson) {
+    return [
+        `You assess what one tool call does for a code-editing AI agent, and how risky it is.`,
+        `The tool may edit files, read files, fetch data, or perform some other action.`,
+        `Reply with STRICT JSON only (no prose, no markdown fences):`,
+        `{`,
+        `  "risk": "green" | "orange" | "red",`,
+        `  "explanation": "<one short sentence, <=18 words>"`,
+        `}`,
+        ``,
+        `Rules for "risk" — apply in order; take the FIRST match:`,
+        `  1. permanently destroys source code or user data with no recovery`,
+        `     (irrecoverable deletion, wiping a database, unrecoverable overwrite)             -> red`,
+        `  2. executes code downloaded on the fly from an arbitrary or untrusted URL           -> red`,
+        `  3. installs a package or dependency from a registry (npm/pip/cargo/gem/etc.) —`,
+        `     pulls untrusted third-party code, a common supply-chain attack vector            -> red`,
+        `  4. sends data to a remote server or changes remote state (POST/PUT, upload, deploy) -> orange`,
+        `  5. modifies local files or workspace state (edits, creates, reversible deletes)      -> orange`,
+        `  6. otherwise (reads files, lists, searches, fetches public read-only data)          -> green`,
+        ``,
+        `Read-only operations are always GREEN. Editing or creating a workspace file is`,
+        `ORANGE (reversible via undo or version control), never red. RED is reserved for`,
+        `actions whose effects cannot be undone OR that execute untrusted third-party code.`,
+        `Installing a package is RED even from a normal registry, because it pulls`,
+        `untrusted third-party code onto this machine — a supply-chain risk regardless of`,
+        `whether the package manager runs install scripts.`,
+        ``,
+        `Examples:`,
+        `  read a file's contents              -> green`,
+        `  list files in a directory           -> green`,
+        `  search the workspace for a symbol   -> green`,
+        `  fetch a public web page (GET)       -> green`,
+        `  edit an existing source file        -> orange`,
+        `  create a new file in the workspace  -> orange`,
+        `  POST data to an external API        -> orange`,
+        `  install a package                   -> red     (pulls untrusted third-party code)`,
+        `  wipe a database table               -> red`,
+        `  run code from an untrusted URL      -> red`,
+        ``,
+        `Write "explanation" in this exact shape:`,
+        `  - green : "<verb> <target>."  e.g. "Reads the contents of package.json."`,
+        `  - orange: "<verb> <target> — <consequence>."  e.g. "Edits src/app.ts — changes workspace source."`,
+        `  - red   : "<verb> <target> — <irreversible or untrusted-code consequence>."  e.g. "Deletes src/app.ts — permanently removes source." or "Installs lodash — pulls untrusted third-party code."`,
+        ``,
+        `Strict explanation rules:`,
+        `  - Cite the ACTUAL files, paths, URLs, or values from the arguments below.`,
+        `  - Never use generic phrases like "may have side effects". Always name WHAT is read or changed.`,
+        `  - Plain prose. No quotes around the sentence. No markdown fences.`,
+        ``,
+        `Tool: ${tool.displayName} (id: ${tool.id})`,
+        `Description: ${tool.modelDescription || tool.userDescription || ""}`,
+        `Arguments (JSON): ${argsJson}`
+    ].join("\n");
+}
 function parseAssessment(rawText, tool) {
     let text = rawText.trim();
     if (text.startsWith("```")) {
@@ -235,15 +306,15 @@ function truncate(s, max) {
 function defaultExplanationFor(risk, tool) {
     switch (risk) {
     case ToolRiskLevel.Green:
-        return localize(7145, "{0} appears to have no observable side effects.", tool.displayName);
+        return localize(7653, "{0} appears to have no observable side effects.", tool.displayName);
     case ToolRiskLevel.Orange:
         return localize(
-            7146,
+            7654,
             "{0} may modify your workspace or send data over the network.",
             tool.displayName
         );
     case ToolRiskLevel.Red:
-        return localize(7147, "{0} performs an action that is hard to undo.", tool.displayName);
+        return localize(7655, "{0} performs an action that is hard to undo.", tool.displayName);
     }
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.d.ts

@@ -1,4 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -7,7 +8,18 @@ import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
+import { ToolAndToolSetEnablementMap } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+import { IRawToolSetContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution";
+export declare abstract class RawToolSetsShape {
+    static readonly suffix = ".toolsets.jsonc";
+    static isToolSetFileName(uri: URI): boolean;
+    static from(data: unknown, logService: ILogService): {
+        entries: ReadonlyMap<string, Exclude<IRawToolSetContribution, "name">>;
+    };
+    entries: ReadonlyMap<string, Exclude<IRawToolSetContribution, "name">>;
+    private constructor();
+}
 export declare class UserToolSetsContributions extends Disposable implements IWorkbenchContribution {
     private readonly _languageModelToolsService;
     private readonly _userDataProfileService;
@@ -17,8 +29,17 @@ export declare class UserToolSetsContributions extends Disposable implements IWo
     constructor(extensionService: IExtensionService, lifecycleService: ILifecycleService, _languageModelToolsService: ILanguageModelToolsService, _userDataProfileService: IUserDataProfileService, _fileService: IFileService, _logService: ILogService);
     private _initToolSets;
 }
+export interface IConfigureToolSetsOptions {
+    readonly selection?: ToolAndToolSetEnablementMap;
+}
+export declare function getEnabledSelectionReferences(selection: ToolAndToolSetEnablementMap, toolsService: ILanguageModelToolsService): string[];
+export declare function createToolSetFileContents(toolSetName: string, toolReferences: readonly string[]): string;
+export declare function deleteToolSetFromFileContents(rawContents: string, toolSetName: string): {
+    contents: string;
+    isEmpty: boolean;
+} | undefined;
 export declare class ConfigureToolSets extends Action2 {
     static readonly ID = "chat.configureToolSets";
     constructor();
-    run(accessor: ServicesAccessor): Promise<void>;
+    run(accessor: ServicesAccessor, options?: IConfigureToolSetsOptions): Promise<void>;
 }