@codingame/monaco-vscode-workbench-service-override 37.3.3 → 37.3.4

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

@@ -0,0 +1,149 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, MenuId, registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { SessionIsArchivedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+
+const hasWorktreeAndRepositoryContextKey = new RawContextKey("agentSessionHasWorktreeAndRepository", false, {
+    type: "boolean",
+    description: ( localize(
+        3262,
+        "True when the active agent session has both a worktree and a parent repository."
+    ))
+});
+let ApplyChangesToParentRepoContribution = class ApplyChangesToParentRepoContribution extends Disposable {
+    static {
+        this.ID = "sessions.contrib.applyChangesToParentRepo";
+    }
+    constructor(contextKeyService, sessionsService) {
+        super();
+        const worktreeAndRepoKey = hasWorktreeAndRepositoryContextKey.bindTo(contextKeyService);
+        this._register(autorun(reader => {
+            const activeSession = sessionsService.activeSession.read(reader);
+            const folder = activeSession?.workspace.read(reader)?.folders[0];
+            const hasWorktreeAndRepo = !!folder?.gitRepository?.workTreeUri;
+            worktreeAndRepoKey.set(hasWorktreeAndRepo);
+        }));
+    }
+};
+ApplyChangesToParentRepoContribution = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, ISessionsService))], ApplyChangesToParentRepoContribution));
+class ApplyChangesToParentRepoAction extends Action2 {
+    static {
+        this.ID = "chatEditing.applyChangesToParentRepo";
+    }
+    constructor() {
+        super({
+            id: ApplyChangesToParentRepoAction.ID,
+            title: ( localize2(3263, "Apply Changes to Parent Repository")),
+            icon: Codicon.desktopDownload,
+            category: CHAT_CATEGORY,
+            precondition: ( ContextKeyExpr.and(IsSessionsWindowContext, hasWorktreeAndRepositoryContextKey)),
+            menu: [{
+                id: MenuId.AgentsChangesPrimaryActionSubMenu,
+                group: "navigation",
+                order: 2,
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.false()), IsSessionsWindowContext, hasWorktreeAndRepositoryContextKey))
+            }]
+        });
+    }
+    async run(accessor) {
+        const sessionsService = accessor.get(ISessionsService);
+        const commandService = accessor.get(ICommandService);
+        const notificationService = accessor.get(INotificationService);
+        const logService = accessor.get(ILogService);
+        const openerService = accessor.get(IOpenerService);
+        const productService = accessor.get(IProductService);
+        const activeSession = sessionsService.activeSession.get();
+        const folder = activeSession?.workspace.get()?.folders[0];
+        if (!activeSession || !folder?.gitRepository?.workTreeUri) {
+            return;
+        }
+        const worktreeRoot = folder.gitRepository.workTreeUri;
+        const repoRoot = folder.root;
+        const openFolderAction = toAction({
+            id: "applyChangesToParentRepo.openFolder",
+            label: ( localize(3264, "Open in VS Code")),
+            run: () => {
+                const scheme = productService.quality === "stable" ? "vscode" : productService.quality === "exploration" ? "vscode-exploration" : "vscode-insiders";
+                const params = ( new URLSearchParams());
+                params.set("windowId", "_blank");
+                params.set("session", ( activeSession.resource.toString()));
+                openerService.open(( URI.from({
+                    scheme,
+                    authority: Schemas.file,
+                    path: repoRoot.path,
+                    query: ( params.toString())
+                })), {
+                    openExternal: true
+                });
+            }
+        });
+        try {
+            const worktreeBranch = await commandService.executeCommand("_git.revParseAbbrevRef", worktreeRoot.fsPath);
+            if (!worktreeBranch) {
+                notificationService.notify({
+                    severity: Severity.Warning,
+                    message: ( localize(3265, "Could not determine worktree branch name."))
+                });
+                return;
+            }
+            const result = await commandService.executeCommand("_git.mergeBranch", repoRoot.fsPath, worktreeBranch);
+            if (!result) {
+                logService.warn("[ApplyChangesToParentRepo] No result from merge command");
+            } else {
+                notificationService.notify({
+                    severity: Severity.Info,
+                    message: typeof result === "string" && result.startsWith("Already up to date") ? ( localize(3266, "Parent repository is up to date with worktree.")) : ( localize(3267, "Applied changes to parent repository.")),
+                    actions: {
+                        primary: [openFolderAction]
+                    }
+                });
+            }
+        } catch (err) {
+            logService.error("[ApplyChangesToParentRepo] Failed to apply changes", err);
+            notificationService.notify({
+                severity: Severity.Warning,
+                message: ( localize(
+                    3268,
+                    "Failed to apply changes to parent repo. The parent repo may have diverged — resolve conflicts manually."
+                )),
+                actions: {
+                    primary: [openFolderAction]
+                }
+            });
+        }
+    }
+}
+registerAction2(ApplyChangesToParentRepoAction);
+registerWorkbenchContribution2(
+    ApplyChangesToParentRepoContribution.ID,
+    ApplyChangesToParentRepoContribution,
+    WorkbenchPhase.AfterRestored
+);
+MenuRegistry.appendMenuItem(MenuId.AgentsChangesToolbar, {
+    submenu: MenuId.AgentsChangesPrimaryActionSubMenu,
+    title: ( localize2(3269, "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(3247, "Adds an easter egg to the Agents window.")),
+            description: ( localize(3270, "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(3248, "Simulate Fish Feeding Streak")),
+            title: ( localize2(3271, "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(3249, "Alive streak")),
-            detail: ( localize(3250, "Show a live feeding streak in the toggle tooltip."))
+            label: ( localize(3272, "Alive streak")),
+            detail: ( localize(3273, "Show a live feeding streak in the toggle tooltip."))
         };
         const diedItem = {
             id: "died",
-            label: ( localize(3251, "Died streak (revivable)")),
-            detail: ( localize(3252, "Park a died streak and offer the revival prompt."))
+            label: ( localize(3274, "Died streak (revivable)")),
+            detail: ( localize(3275, "Park a died streak and offer the revival prompt."))
         };
         const clearItem = {
             id: "clear",
-            label: ( localize(3253, "Clear streak")),
-            detail: ( localize(3254, "Remove all streak state."))
+            label: ( localize(3276, "Clear streak")),
+            detail: ( localize(3277, "Remove all streak state."))
         };
         const scenario = await quickInputService.pick([aliveItem, diedItem, clearItem], {
-            placeHolder: ( localize(3255, "Pick a streak scenario to simulate"))
+            placeHolder: ( localize(3278, "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(3256, "How many days should the streak be?")),
+            prompt: ( localize(3279, "How many days should the streak be?")),
             validateInput: async value => {
                 const n = Number(value);
-                return (!Number.isInteger(n) || n <= 0) ? ( localize(3257, "Enter a whole number greater than 0.")) : undefined;
+                return (!Number.isInteger(n) || n <= 0) ? ( localize(3280, "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(3258, "Toggle Aquarium Action Visibility")),
+            title: ( localize2(3281, "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(3259, "Aquarium action shown")) : ( localize(3260, "Aquarium action hidden")));
+        this.accessibilityService.status(visible ? ( localize(3282, "Aquarium action shown")) : ( localize(3283, "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(3261, "{0} · Feed again to revive", revivable)));
+                streakSpan.append(( localize(3284, "{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(3262, "Hide Aquarium")) : ( localize(3263, "Show Aquarium"));
+        const base = active ? ( localize(3285, "Hide Aquarium")) : ( localize(3286, "Show Aquarium"));
         const streak = this.streak.count;
         if (streak > 0) {
             const hungerDescription = getFishHungerDescription(this.streak.hungerState);
             return (streak === 1 ? localize(
-                3264,
+                3287,
                 "{0} — {1} — {2} day feeding streak",
                 base,
                 hungerDescription,
                 streak
             ) : localize(
-                3265,
+                3288,
                 "{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(3266, "{0} — feed a fish to revive your {1} day streak", base, revivable)) : ( localize(3267, "{0} — feed a fish to revive your {1} day streak", base, revivable));
+            return revivable === 1 ? ( localize(3289, "{0} — feed a fish to revive your {1} day streak", base, revivable)) : ( localize(3290, "{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(3268, "fish is happy");
+        return localize(3291, "fish is happy");
     case "neutral":
-        return localize(3269, "fish is getting hungry");
+        return localize(3292, "fish is getting hungry");
     case "sad":
-        return localize(3270, "fish is hungry");
+        return localize(3293, "fish is hungry");
     case "verySad":
-        return localize(3271, "fish is starving");
+        return localize(3294, "fish is starving");
     }
 }
 function computeWallAvoidAngle(centerX, centerY, width, height) {