@codingame/monaco-vscode-workbench-service-override 37.6.0 → 38.0.0

package/vscode/src/vs/sessions/contrib/accountMenu/browser/chatPetAchievementBadges.js

@@ -14,7 +14,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { CHAT_PET_ACHIEVEMENT_PREVIEW_SIZE, renderChatPetAchievementPreview } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetAchievementPreview';
-import { chatPetAchievements } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetAchievements';
+import { chatPetAchievements, getChatPetAchievementRewardLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetAchievements';
 import { IChatPetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatPetService.service';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -37,14 +37,14 @@ function getSessionsChatPetAchievementBadges(enabled, unlockedAchievements) {
 let SessionsChatPetAchievementBadges = class SessionsChatPetAchievementBadges extends Disposable {
     constructor(
         parent,
-        onOpenAchievements,
+        onOpenCustomization,
         chatPetService,
         themeService,
         hoverService,
         logService
     ) {
         super();
-        this.onOpenAchievements = onOpenAchievements;
+        this.onOpenCustomization = onOpenCustomization;
         this.chatPetService = chatPetService;
         this.themeService = themeService;
         this.hoverService = hoverService;
@@ -57,15 +57,15 @@ let SessionsChatPetAchievementBadges = class SessionsChatPetAchievementBadges ex
                 this.chatPetService.enabled.read(reader),
                 this.chatPetService.unlockedAchievements.read(reader)
             );
-            const variant = this.chatPetService.variant.read(reader);
+            const color = this.chatPetService.color.read(reader);
             const selectedAccessory = this.chatPetService.selectedAccessory.read(reader);
             themeChanged.read(reader);
-            this.render(badges, selectedAccessory, variant);
+            this.render(badges, selectedAccessory, color);
         }));
     }
-    render(badges, selectedAccessory, variant) {
+    render(badges, selectedAccessory, color) {
         const activeElement = getActiveElement();
-        const focusedAccessoryId = isHTMLElement(activeElement) ? activeElement.closest(".sessions-chat-pet-achievement-badge")?.dataset.accessoryId : undefined;
+        const focusedAchievementId = isHTMLElement(activeElement) ? activeElement.closest(".sessions-chat-pet-achievement-badge")?.dataset.achievementId : undefined;
         const restoreViewAchievementsFocus = isHTMLElement(activeElement) && activeElement.closest(".sessions-chat-pet-achievement-badges-actions") !== null;
         let focusTarget;
         this.renderDisposables.clear();
@@ -74,14 +74,14 @@ let SessionsChatPetAchievementBadges = class SessionsChatPetAchievementBadges ex
         if (!badges) {
             return;
         }
-        this.element.setAttribute("aria-label", ( localize(3232, "Pet achievement badges")));
+        this.element.setAttribute("aria-label", ( localize(3604, "Pet achievement badges")));
         const header = append(this.element, $(".sessions-chat-pet-achievement-badges-header"));
-        append(header, $("h2.sessions-chat-pet-achievement-badges-title")).textContent = ( localize(3233, "Badges"));
+        append(header, $("h2.sessions-chat-pet-achievement-badges-title")).textContent = ( localize(3605, "Badges"));
         const unlockedCount = badges.filter(badge => badge.unlocked).length;
-        append(header, $("span.sessions-chat-pet-achievement-badges-count")).textContent = ( localize(3234, "{0} of {1} unlocked", unlockedCount, badges.length));
+        append(header, $("span.sessions-chat-pet-achievement-badges-count")).textContent = ( localize(3606, "{0} of {1} unlocked", unlockedCount, badges.length));
         const list = append(this.element, $("ul.sessions-chat-pet-achievement-badges-list"));
         list.setAttribute("aria-label", ( localize(
-            3235,
+            3607,
             "Pet achievement badges, {0} of {1} unlocked",
             unlockedCount,
             badges.length
@@ -94,12 +94,17 @@ let SessionsChatPetAchievementBadges = class SessionsChatPetAchievementBadges ex
             const accessory = achievement.accessories[0];
             const item = append(list, $("li.sessions-chat-pet-achievement-badges-list-item"));
             if (!unlocked) {
-                item.setAttribute("aria-label", ( localize(3236, "Locked secret achievement badge")));
+                item.setAttribute("aria-label", ( localize(3608, "Locked secret achievement badge")));
             }
-            const badgeElement = unlocked ? this.createUnlockedBadgeButton(item, achievement, accessory.id, selectedAccessory === accessory.id) : append(item, $("span.sessions-chat-pet-achievement-badge.locked", {
+            const badgeElement = unlocked ? this.createUnlockedBadgeButton(
+                item,
+                achievement,
+                accessory?.id,
+                !!accessory && selectedAccessory === accessory.id
+            ) : append(item, $("span.sessions-chat-pet-achievement-badge.locked", {
                 "aria-hidden": "true"
             }));
-            if (accessory.id === focusedAccessoryId) {
+            if (achievement.id === focusedAchievementId) {
                 focusTarget = badgeElement;
             }
             const canvas = append(badgeElement, $("canvas.sessions-chat-pet-achievement-badge-preview"));
@@ -107,22 +112,24 @@ let SessionsChatPetAchievementBadges = class SessionsChatPetAchievementBadges ex
             canvas.height = CHAT_PET_ACHIEVEMENT_PREVIEW_SIZE;
             canvas.setAttribute("aria-hidden", "true");
             this.renderDisposables.add(
-                renderChatPetAchievementPreview(canvas, accessory, unlocked, variant, this.themeService, this.logService)
+                renderChatPetAchievementPreview(canvas, accessory, unlocked, color, this.themeService, this.logService)
             );
             this.renderDisposables.add(this.hoverService.setupManagedHover(
                 getDefaultHoverDelegate("mouse"),
                 badgeElement,
-                unlocked ? accessory.label : ( localize(3237, "Locked"))
+                unlocked ? getChatPetAchievementRewardLabels(achievement).join(", ") : ( localize(3609, "Locked"))
             ));
         }
         const actions = append(this.element, $(".sessions-chat-pet-achievement-badges-actions"));
         const viewAchievements = this.renderDisposables.add(( new Button(actions, {
             ...defaultButtonStyles,
             secondary: true,
-            ariaLabel: ( localize(3238, "View Pet Achievements"))
+            ariaLabel: ( localize(3610, "View Pet Achievements"))
         })));
-        viewAchievements.label = ( localize(3239, "View Achievements"));
-        this.renderDisposables.add(viewAchievements.onDidClick(() => this.onOpenAchievements()));
+        viewAchievements.label = ( localize(3611, "View Achievements"));
+        this.renderDisposables.add(
+            viewAchievements.onDidClick(() => this.onOpenCustomization("achievements"))
+        );
         if (restoreViewAchievementsFocus) {
             focusTarget = viewAchievements.element;
         }
@@ -135,30 +142,28 @@ let SessionsChatPetAchievementBadges = class SessionsChatPetAchievementBadges ex
         }
     }
     createUnlockedBadgeButton(parent, achievement, accessoryId, selected) {
-        const accessory = achievement.accessories[0];
+        const reward = getChatPetAchievementRewardLabels(achievement).join(", ");
         const button = this.renderDisposables.add(( new Button(parent, {
-            ariaLabel: selected ? ( localize(
-                3240,
-                "{0} achievement badge: {1}, wearing",
-                achievement.title,
-                accessory.label
-            )) : ( localize(
-                3241,
-                "{0} achievement badge: wear {1}",
-                achievement.title,
-                accessory.label
-            ))
+            ariaLabel: achievement.colorCustomization ? ( localize(3612, "{0} achievement badge: change Blobby's color", achievement.title)) : selected ? ( localize(3613, "{0} achievement badge: {1}, wearing", achievement.title, reward)) : ( localize(3614, "{0} achievement badge: wear {1}", achievement.title, reward))
         })));
         button.element.classList.add("sessions-chat-pet-achievement-badge");
         button.element.classList.toggle("wearing", selected);
-        button.element.dataset.accessoryId = accessoryId;
-        button.element.setAttribute("aria-pressed", String(selected));
+        button.element.dataset.achievementId = achievement.id;
+        if (accessoryId) {
+            button.element.dataset.accessoryId = accessoryId;
+            button.element.setAttribute("aria-pressed", String(selected));
+        }
         this.renderDisposables.add(button.onDidClick(() => {
+            if (achievement.colorCustomization) {
+                this.chatPetService.markAchievementSeen(achievement.id);
+                this.onOpenCustomization("color");
+                return;
+            }
             if (this.chatPetService.selectedAccessory.get() === accessoryId) {
                 return;
             }
             this.chatPetService.setAccessory(accessoryId);
-            status(( localize(3242, "VS Code pet is now wearing {0}", accessory.label)));
+            status(( localize(3615, "VS Code pet is now wearing {0}", reward)));
         }));
         return button.element;
     }

package/vscode/src/vs/sessions/contrib/accountMenu/browser/media/accountTitleBarWidget.css

@@ -403,6 +403,12 @@
 	justify-content: flex-end;
 }
 
+.agent-sessions-workbench .sessions-account-titlebar-panel-provider-metric-row[tabindex="0"]:focus-visible {
+	outline: var(--vscode-strokeThickness) solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+	border-radius: var(--vscode-cornerRadius-small);
+}
+
 .agent-sessions-workbench .sessions-account-titlebar-panel-provider-usage-value {
 	font-weight: var(--vscode-fontWeight-semiBold);
 }

package/vscode/src/vs/sessions/contrib/agentFeedback/browser/nullAgentFeedbackService.contribution.d.ts

@@ -32,11 +32,14 @@ export declare class NullAgentFeedbackService extends Disposable implements IAge
     setFeedbackResolved(_sessionResource: URI, _feedbackId: string, _resolved: boolean): void;
     addReply(_sessionResource: URI, _feedbackId: string, _replyText: string): void;
     getFeedback(_sessionResource: URI): readonly IAgentFeedback[];
+    isAgentHostSession(_sessionResource: URI): boolean;
     showFeedbackInEditor(_sessionResource: URI, _feedbackIds: readonly string[]): void;
     hideFeedbackInEditor(_sessionResource: URI, _feedbackId: string): void;
     getVisibleResolvedFeedbackIds(_sessionResource: URI): ReadonlySet<string>;
     hasLoadedFeedback(_sessionResource: URI): boolean;
     getSessionForFile(_resourceUri: URI): undefined;
+    getChatChanges(_sessionResource: URI): readonly [
+    ];
     getFeedbackSessionResource(_resourceUri: URI): URI | undefined;
     registerFeedbackResourceScope(_resourceUri: URI, _sessionResource: URI): IDisposable;
     getMostRecentSessionForResource(_resourceUri: URI): URI | undefined;

package/vscode/src/vs/sessions/contrib/agentFeedback/browser/nullAgentFeedbackService.contribution.js

@@ -53,6 +53,9 @@ class NullAgentFeedbackService extends Disposable {
     getFeedback(_sessionResource) {
         return [];
     }
+    isAgentHostSession(_sessionResource) {
+        return false;
+    }
     showFeedbackInEditor(_sessionResource, _feedbackIds) {}
     hideFeedbackInEditor(_sessionResource, _feedbackId) {}
     getVisibleResolvedFeedbackIds(_sessionResource) {
@@ -64,6 +67,9 @@ class NullAgentFeedbackService extends Disposable {
     getSessionForFile(_resourceUri) {
         return undefined;
     }
+    getChatChanges(_sessionResource) {
+        return [];
+    }
     getFeedbackSessionResource(_resourceUri) {
         return undefined;
     }

package/vscode/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.js

@@ -41,7 +41,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OPEN_AI_CUSTOMIZATION_FILE_ID,
-            title: ( localize2(3243, "Open")),
+            title: ( localize2(3616, "Open")),
             icon: Codicon.goToFile
         });
     }
@@ -57,7 +57,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: RUN_PROMPT_FROM_VIEW_ID,
-            title: ( localize2(3244, "Run Prompt")),
+            title: ( localize2(3617, "Run Prompt")),
             icon: Codicon.play
         });
     }
@@ -71,7 +71,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DELETE_AI_CUSTOMIZATION_FILE_ID,
-            title: ( localize2(3245, "Delete")),
+            title: ( localize2(3618, "Delete")),
             icon: Codicon.trash
         });
     }
@@ -84,8 +84,8 @@ registerAction2(class extends Action2 {
             return;
         }
         const confirmation = await dialogService.confirm({
-            message: ( localize(3246, "Are you sure you want to delete '{0}'?", name || uri.path)),
-            primaryButton: ( localize(3245, "Delete"))
+            message: ( localize(3619, "Are you sure you want to delete '{0}'?", name || uri.path)),
+            primaryButton: ( localize(3618, "Delete"))
         });
         if (confirmation.confirmed) {
             const useTrash = fileService.hasCapability(uri, FileSystemProviderCapabilities.Trash);
@@ -101,7 +101,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: COPY_AI_CUSTOMIZATION_PATH_ID,
-            title: ( localize2(3247, "Copy Path")),
+            title: ( localize2(3620, "Copy Path")),
             icon: Codicon.clippy
         });
     }
@@ -115,7 +115,7 @@ registerAction2(class extends Action2 {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: DELETE_AI_CUSTOMIZATION_FILE_ID,
-        title: ( localize(3245, "Delete")),
+        title: ( localize(3618, "Delete")),
         icon: Codicon.trash
     },
     group: "inline",
@@ -124,7 +124,7 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: OPEN_AI_CUSTOMIZATION_FILE_ID,
-        title: ( localize(3243, "Open"))
+        title: ( localize(3616, "Open"))
     },
     group: "1_open",
     order: 1
@@ -132,7 +132,7 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: RUN_PROMPT_FROM_VIEW_ID,
-        title: ( localize(3244, "Run Prompt")),
+        title: ( localize(3617, "Run Prompt")),
         icon: Codicon.play
     },
     group: "2_run",
@@ -142,7 +142,7 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: COPY_AI_CUSTOMIZATION_PATH_ID,
-        title: ( localize(3247, "Copy Path"))
+        title: ( localize(3620, "Copy Path"))
     },
     group: "3_modify",
     order: 1
@@ -150,7 +150,7 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: DELETE_AI_CUSTOMIZATION_FILE_ID,
-        title: ( localize(3245, "Delete"))
+        title: ( localize(3618, "Delete"))
     },
     group: "3_modify",
     order: 10
@@ -160,7 +160,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DISABLE_AI_CUSTOMIZATION_ITEM_ID,
-            title: ( localize2(3248, "Disable")),
+            title: ( localize2(3621, "Disable")),
             icon: Codicon.eyeClosed
         });
     }
@@ -187,7 +187,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ENABLE_AI_CUSTOMIZATION_ITEM_ID,
-            title: ( localize2(3249, "Enable")),
+            title: ( localize2(3622, "Enable")),
             icon: Codicon.eye
         });
     }
@@ -212,7 +212,7 @@ registerAction2(class extends Action2 {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: DISABLE_AI_CUSTOMIZATION_ITEM_ID,
-        title: ( localize(3248, "Disable"))
+        title: ( localize(3621, "Disable"))
     },
     group: "4_toggle",
     order: 1,
@@ -221,7 +221,7 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: ENABLE_AI_CUSTOMIZATION_ITEM_ID,
-        title: ( localize(3249, "Enable"))
+        title: ( localize(3622, "Enable"))
     },
     group: "4_toggle",
     order: 1,
@@ -230,7 +230,7 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: DISABLE_AI_CUSTOMIZATION_ITEM_ID,
-        title: ( localize(3248, "Disable")),
+        title: ( localize(3621, "Disable")),
         icon: Codicon.eyeClosed
     },
     group: "inline",
@@ -240,7 +240,7 @@ MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
 MenuRegistry.appendMenuItem(AICustomizationItemMenuId, {
     command: {
         id: ENABLE_AI_CUSTOMIZATION_ITEM_ID,
-        title: ( localize(3249, "Enable")),
+        title: ( localize(3622, "Enable")),
         icon: Codicon.eye
     },
     group: "inline",
@@ -251,7 +251,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FOCUS_AI_CUSTOMIZATION_VIEW_ID,
-            title: ( localize2(3250, "Focus Chat Customizations")),
+            title: ( localize2(3623, "Focus Chat Customizations")),
             category: AI_CUSTOMIZATION_CATEGORY,
             precondition: ( ContextKeyExpr.and(IsSessionsWindowContext, ChatContextKeys.enabled, ( IsPhoneLayoutContext.negate()))),
             f1: true,

package/vscode/src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeViewViews.js

@@ -215,26 +215,26 @@ class UnifiedAICustomizationDataSource {
         const items = [{
             type: "category",
             id: "category-agents",
-            label: ( localize(3252, "Custom Agents")),
+            label: ( localize(3625, "Custom Agents")),
             promptType: PromptsType.agent,
             icon: agentIcon
         }, {
             type: "category",
             id: "category-skills",
-            label: ( localize(3253, "Skills")),
+            label: ( localize(3626, "Skills")),
             promptType: PromptsType.skill,
             icon: skillIcon
         }, {
             type: "category",
             id: "category-instructions",
-            label: ( localize(3254, "Instructions")),
+            label: ( localize(3627, "Instructions")),
             promptType: PromptsType.instructions,
             icon: instructionsIcon
         }];
         items.push({
             type: "link",
             id: "link-mcp-servers",
-            label: ( localize(3255, "MCP Servers")),
+            label: ( localize(3628, "MCP Servers")),
             icon: mcpServerIcon,
             section: AICustomizationManagementSection.McpServers
         });
@@ -337,11 +337,11 @@ class UnifiedAICustomizationDataSource {
     }
     createGroupItem(promptType, storage, count) {
         const storageLabels = {
-            [AICustomizationSources.local]: ( localize(3256, "Workspace ({0})", count)),
-            [AICustomizationSources.user]: ( localize(3257, "User ({0})", count)),
-            [AICustomizationSources.extension]: ( localize(3258, "Extensions ({0})", count)),
-            [AICustomizationSources.plugin]: ( localize(3259, "Plugins ({0})", count)),
-            [AICustomizationSources.builtin]: ( localize(3260, "Built-in ({0})", count))
+            [AICustomizationSources.local]: ( localize(3629, "Workspace ({0})", count)),
+            [AICustomizationSources.user]: ( localize(3630, "User ({0})", count)),
+            [AICustomizationSources.extension]: ( localize(3631, "Extensions ({0})", count)),
+            [AICustomizationSources.plugin]: ( localize(3632, "Plugins ({0})", count)),
+            [AICustomizationSources.builtin]: ( localize(3633, "Built-in ({0})", count))
         };
         const storageIcons = {
             [AICustomizationSources.local]: workspaceIcon,
@@ -508,10 +508,10 @@ class UnifiedAICustomizationDataSource {
                         if (element.type === "group") {
                             return element.label;
                         }
-                        const nameAndDesc = element.description ? ( localize(3261, "{0}, {1}", element.name, element.description)) : element.name;
-                        return element.disabled ? ( localize(3262, "{0}, disabled", nameAndDesc)) : nameAndDesc;
+                        const nameAndDesc = element.description ? ( localize(3634, "{0}, {1}", element.name, element.description)) : element.name;
+                        return element.disabled ? ( localize(3635, "{0}, disabled", nameAndDesc)) : nameAndDesc;
                     },
-                    getWidgetAriaLabel: () => ( localize(3263, "Chat Customization Items"))
+                    getWidgetAriaLabel: () => ( localize(3636, "Chat Customization Items"))
                 },
                 keyboardNavigationLabelProvider: {
                     getKeyboardNavigationLabel: element => {

package/vscode/src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.js

@@ -27,7 +27,7 @@ import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severit
 const hasWorktreeAndRepositoryContextKey = new RawContextKey("agentSessionHasWorktreeAndRepository", false, {
     type: "boolean",
     description: ( localize(
-        3264,
+        3637,
         "True when the active agent session has both a worktree and a parent repository."
     ))
 });
@@ -54,7 +54,7 @@ class ApplyChangesToParentRepoAction extends Action2 {
     constructor() {
         super({
             id: ApplyChangesToParentRepoAction.ID,
-            title: ( localize2(3265, "Apply Changes to Parent Repository")),
+            title: ( localize2(3638, "Apply Changes to Parent Repository")),
             icon: Codicon.desktopDownload,
             category: CHAT_CATEGORY,
             precondition: ( ContextKeyExpr.and(IsSessionsWindowContext, hasWorktreeAndRepositoryContextKey)),
@@ -82,7 +82,7 @@ class ApplyChangesToParentRepoAction extends Action2 {
         const repoRoot = folder.root;
         const openFolderAction = toAction({
             id: "applyChangesToParentRepo.openFolder",
-            label: ( localize(3266, "Open in VS Code")),
+            label: ( localize(3639, "Open in VS Code")),
             run: () => {
                 const scheme = productService.quality === "stable" ? "vscode" : productService.quality === "exploration" ? "vscode-exploration" : "vscode-insiders";
                 const params = ( new URLSearchParams());
@@ -103,7 +103,7 @@ class ApplyChangesToParentRepoAction extends Action2 {
             if (!worktreeBranch) {
                 notificationService.notify({
                     severity: Severity.Warning,
-                    message: ( localize(3267, "Could not determine worktree branch name."))
+                    message: ( localize(3640, "Could not determine worktree branch name."))
                 });
                 return;
             }
@@ -113,7 +113,7 @@ class ApplyChangesToParentRepoAction extends Action2 {
             } else {
                 notificationService.notify({
                     severity: Severity.Info,
-                    message: typeof result === "string" && result.startsWith("Already up to date") ? ( localize(3268, "Parent repository is up to date with worktree.")) : ( localize(3269, "Applied changes to parent repository.")),
+                    message: typeof result === "string" && result.startsWith("Already up to date") ? ( localize(3641, "Parent repository is up to date with worktree.")) : ( localize(3642, "Applied changes to parent repository.")),
                     actions: {
                         primary: [openFolderAction]
                     }
@@ -124,7 +124,7 @@ class ApplyChangesToParentRepoAction extends Action2 {
             notificationService.notify({
                 severity: Severity.Warning,
                 message: ( localize(
-                    3270,
+                    3643,
                     "Failed to apply changes to parent repo. The parent repo may have diverged — resolve conflicts manually."
                 )),
                 actions: {
@@ -142,7 +142,7 @@ registerWorkbenchContribution2(
 );
 MenuRegistry.appendMenuItem(MenuId.AgentsChangesToolbar, {
     submenu: MenuId.AgentsChangesPrimaryActionSubMenu,
-    title: ( localize2(3271, "Apply Actions")),
+    title: ( localize2(3644, "Apply Actions")),
     group: "navigation",
     order: 1,
     when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( SessionIsArchivedContext.isEqualTo(false))))

package/vscode/src/vs/sessions/contrib/aquarium/browser/aquarium.contribution.js

@@ -18,7 +18,7 @@ registerCss(aquarium, 1);
         [SESSIONS_DEVELOPER_JOY_ENABLED_SETTING]: {
             type: "boolean",
             default: true,
-            description: ( localize(3272, "Adds an easter egg to the Agents window.")),
+            description: ( localize(3645, "Adds an easter egg to the Agents window.")),
             tags: ["experimental"]
         }
     }
@@ -30,7 +30,7 @@ class SimulateFishFeedingStreakAction extends Action2 {
     constructor() {
         super({
             id: SimulateFishFeedingStreakAction.ID,
-            title: ( localize2(3273, "Simulate Fish Feeding Streak")),
+            title: ( localize2(3646, "Simulate Fish Feeding Streak")),
             f1: true,
             category: Categories.Developer
         });
@@ -40,21 +40,21 @@ class SimulateFishFeedingStreakAction extends Action2 {
         const aquariumService = accessor.get(IAquariumService);
         const aliveItem = {
             id: "alive",
-            label: ( localize(3274, "Alive streak")),
-            detail: ( localize(3275, "Show a live feeding streak in the toggle tooltip."))
+            label: ( localize(3647, "Alive streak")),
+            detail: ( localize(3648, "Show a live feeding streak in the toggle tooltip."))
         };
         const diedItem = {
             id: "died",
-            label: ( localize(3276, "Died streak (revivable)")),
-            detail: ( localize(3277, "Park a died streak and offer the revival prompt."))
+            label: ( localize(3649, "Died streak (revivable)")),
+            detail: ( localize(3650, "Park a died streak and offer the revival prompt."))
         };
         const clearItem = {
             id: "clear",
-            label: ( localize(3278, "Clear streak")),
-            detail: ( localize(3279, "Remove all streak state."))
+            label: ( localize(3651, "Clear streak")),
+            detail: ( localize(3652, "Remove all streak state."))
         };
         const scenario = await quickInputService.pick([aliveItem, diedItem, clearItem], {
-            placeHolder: ( localize(3280, "Pick a streak scenario to simulate"))
+            placeHolder: ( localize(3653, "Pick a streak scenario to simulate"))
         });
         if (!scenario) {
             return;
@@ -65,10 +65,10 @@ class SimulateFishFeedingStreakAction extends Action2 {
         }
         const raw = await quickInputService.input({
             value: "30",
-            prompt: ( localize(3281, "How many days should the streak be?")),
+            prompt: ( localize(3654, "How many days should the streak be?")),
             validateInput: async value => {
                 const n = Number(value);
-                return (!Number.isInteger(n) || n <= 0) ? ( localize(3282, "Enter a whole number greater than 0.")) : undefined;
+                return (!Number.isInteger(n) || n <= 0) ? ( localize(3655, "Enter a whole number greater than 0.")) : undefined;
             }
         });
         if (raw === undefined) {
@@ -85,7 +85,7 @@ class ToggleAquariumActionVisibilityAction extends Action2 {
     constructor() {
         super({
             id: ToggleAquariumActionVisibilityAction.ID,
-            title: ( localize2(3283, "Toggle Aquarium Action Visibility")),
+            title: ( localize2(3656, "Toggle Aquarium Action Visibility")),
             f1: true,
             category: Categories.Developer
         });

package/vscode/src/vs/sessions/contrib/aquarium/browser/aquariumOverlay.js

@@ -148,7 +148,7 @@ let AquariumService = class AquariumService extends Disposable {
             StorageScope.APPLICATION,
             StorageTarget.USER
         );
-        this.accessibilityService.status(visible ? ( localize(3284, "Aquarium action shown")) : ( localize(3285, "Aquarium action hidden")));
+        this.accessibilityService.status(visible ? ( localize(3657, "Aquarium action shown")) : ( localize(3658, "Aquarium action hidden")));
         return visible;
     }
     simulateStreak(count, alive) {
@@ -231,7 +231,7 @@ let AquariumService = class AquariumService extends Disposable {
                 streakSpan.append(String(streak));
             } else {
                 streakSpan.classList.add("revivable");
-                streakSpan.append(( localize(3286, "{0} · Feed again to revive", revivable)));
+                streakSpan.append(( localize(3659, "{0} · Feed again to revive", revivable)));
             }
             button.appendChild(streakSpan);
         }
@@ -243,18 +243,18 @@ let AquariumService = class AquariumService extends Disposable {
         button.setAttribute("aria-label", label);
     }
     getToggleLabel(active) {
-        const base = active ? ( localize(3287, "Hide Aquarium")) : ( localize(3288, "Show Aquarium"));
+        const base = active ? ( localize(3660, "Hide Aquarium")) : ( localize(3661, "Show Aquarium"));
         const streak = this.streak.count;
         if (streak > 0) {
             const hungerDescription = getFishHungerDescription(this.streak.hungerState);
             return (streak === 1 ? localize(
-                3289,
+                3662,
                 "{0} — {1} — {2} day feeding streak",
                 base,
                 hungerDescription,
                 streak
             ) : localize(
-                3290,
+                3663,
                 "{0} — {1} — {2} days feeding streak",
                 base,
                 hungerDescription,
@@ -263,7 +263,7 @@ let AquariumService = class AquariumService extends Disposable {
         }
         const revivable = this.streak.revivableCount;
         if (revivable > 0) {
-            return revivable === 1 ? ( localize(3291, "{0} — feed a fish to revive your {1} day streak", base, revivable)) : ( localize(3292, "{0} — feed a fish to revive your {1} day streak", base, revivable));
+            return revivable === 1 ? ( localize(3664, "{0} — feed a fish to revive your {1} day streak", base, revivable)) : ( localize(3665, "{0} — feed a fish to revive your {1} day streak", base, revivable));
         }
         return base;
     }
@@ -736,13 +736,13 @@ function addIconClasses(element, icon) {
 function getFishHungerDescription(state) {
     switch (state) {
     case "happy":
-        return localize(3293, "fish is happy");
+        return localize(3666, "fish is happy");
     case "neutral":
-        return localize(3294, "fish is getting hungry");
+        return localize(3667, "fish is getting hungry");
     case "sad":
-        return localize(3295, "fish is hungry");
+        return localize(3668, "fish is hungry");
     case "verySad":
-        return localize(3296, "fish is starving");
+        return localize(3669, "fish is starving");
     }
 }
 function computeWallAvoidAngle(centerX, centerY, width, height) {