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

package/vscode/src/vs/sessions/contrib/sessions/browser/blockedSessionsIndicatorModel.d.ts

@@ -4,10 +4,13 @@ import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { AgentSessionApprovalModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionApprovalModel";
+import { IAgentHostFilterService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/agentHostFilter/common/agentHostFilter.service";
 import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
 import { ISession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session";
-import { BlockedSessions, IBlockedSession } from "../../blockedSessions/browser/blockedSessions.js";
+import { ISessionsManagementService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service";
+import { BlockedSessions, IBlockedSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/blockedSessions/browser/blockedSessions";
 import { BlockedSessionsCIFixModel } from "./blockedSessionsCIFixModel.js";
 import { IApprovedSession } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsList";
 /**
@@ -42,6 +45,7 @@ export declare enum RequiresInputKind {
 export declare class BlockedSessionsIndicatorModel extends Disposable {
     private readonly _sessionsService;
     private readonly _logService;
+    private readonly _storageService;
     /** Computes the raw set of blocked sessions (needs input / failing CI). */
     private readonly _blockedSessionsModel;
     /** Tracks pending tool approvals per chat; distinguishes terminal vs question. */
@@ -52,10 +56,12 @@ export declare class BlockedSessionsIndicatorModel extends Disposable {
     private readonly _ciFixModel;
     /** The CI-fix model, shared with the dropdown list so the fix action and the hide-while-fixing agree. */
     get ciFixModel(): BlockedSessionsCIFixModel;
-    /** Current blocked occurrences the user has already acknowledged, keyed by session id. */
+    /** Acknowledged occurrences by session id, in acknowledgement order; the latest 50 survive reloads. */
     private readonly _ignoredBlockOccurrences;
+    private _storedIgnoredOccurrences;
+    private _writingIgnoredOccurrences;
     /**
-     * Blocked sessions that are not visible, ignored, being fixed, or already approved.
+     * Blocked sessions in the selected host scope that are not visible, ignored, being fixed, or already approved.
      * Visible blocked occurrences stay acknowledged after the user navigates away.
      */
     readonly blockedSessions: IObservable<readonly IBlockedSession[]>;
@@ -81,7 +87,7 @@ export declare class BlockedSessionsIndicatorModel extends Disposable {
      * call {@link consumePendingBlink}.
      */
     readonly onDidRequestBlink: Event<void>;
-    constructor(approvalModel: AgentSessionApprovalModel | undefined, blockedSessions: BlockedSessions | undefined, ciFixModel: BlockedSessionsCIFixModel | undefined, _sessionsService: ISessionsService, instantiationService: IInstantiationService, productService: IProductService, _logService: ILogService);
+    constructor(approvalModel: AgentSessionApprovalModel | undefined, blockedSessions: BlockedSessions | undefined, ciFixModel: BlockedSessionsCIFixModel | undefined, _sessionsService: ISessionsService, instantiationService: IInstantiationService, productService: IProductService, _logService: ILogService, _storageService: IStorageService, sessionsManagementService: ISessionsManagementService, agentHostFilterService: IAgentHostFilterService);
     /**
      * Whether a fresh attention blink is pending. Returns `true` only when a session
      * queued as newly blocked is still in the surfaced (visible-filtered) blocked set,
@@ -105,6 +111,9 @@ export declare class BlockedSessionsIndicatorModel extends Disposable {
      * falls back to the generic "N sessions require input".
      */
     getRequiresInputLabel(count: number, kind: RequiresInputKind | undefined): string;
+    private _loadIgnoredOccurrences;
+    private _setIgnoredOccurrences;
+    private _storeIgnoredOccurrences;
     private _ignoreOccurrence;
     private _isBlockIgnored;
     private _getBlockOccurrenceId;

package/vscode/src/vs/sessions/contrib/sessions/browser/blockedSessionsIndicatorModel.js

@@ -7,16 +7,24 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { AgentSessionApprovalModel, agentSessionApprovalId, AgentSessionApprovalKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionApprovalModel';
+import { IAgentHostFilterService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/agentHostFilter/common/agentHostFilter.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
-import { BlockedSessions, BlockedSessionReason, describeBlockedSessions } from '../../blockedSessions/browser/blockedSessions.js';
+import { SessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
+import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
+import { BlockedSessions, BlockedSessionReason, describeBlockedSessions } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/blockedSessions/browser/blockedSessions';
 import { BlockedSessionsCIFixModel } from './blockedSessionsCIFixModel.js';
 import { getFirstApprovalAcrossChats } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/sessions/browser/views/sessionsList';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const LOG_PREFIX = "[BlockedSessionsIndicator]";
+const IGNORED_OCCURRENCES_STORAGE_KEY = "sessions.blockedIndicator.ignoredOccurrences";
+const MAX_STORED_IGNORED_SESSIONS = 50;
 var RequiresInputKind;
 (function(RequiresInputKind) {
     RequiresInputKind[RequiresInputKind["TerminalApproval"] = 0] = "TerminalApproval";
@@ -37,12 +45,18 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
         _sessionsService,
         instantiationService,
         productService,
-        _logService
+        _logService,
+        _storageService,
+        sessionsManagementService,
+        agentHostFilterService
     ) {
         super();
         this._sessionsService = _sessionsService;
         this._logService = _logService;
+        this._storageService = _storageService;
         this._ignoredBlockOccurrences = observableValue("ignoredBlockOccurrences", ( new Map()));
+        this._storedIgnoredOccurrences = ( new Map());
+        this._writingIgnoredOccurrences = false;
         this._lastBlockedOccurrences = ( new Map());
         this._pendingBlinkOccurrences = ( new Map());
         this._onDidRequestBlink = this._register(( new Emitter()));
@@ -51,14 +65,36 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
         this._blockedSessionsModel = blockedSessions ?? this._register(instantiationService.createInstance(BlockedSessions));
         this._ciFixModel = ciFixModel ?? this._register(instantiationService.createInstance(BlockedSessionsCIFixModel));
         const enabled = productService.quality !== "stable";
+        this._storedIgnoredOccurrences = this._loadIgnoredOccurrences();
+        this._ignoredBlockOccurrences.set(this._storedIgnoredOccurrences, undefined);
+        if (enabled) {
+            this._storeIgnoredOccurrences(this._storedIgnoredOccurrences);
+            this._register(
+                this._storageService.onDidChangeValue(StorageScope.PROFILE, IGNORED_OCCURRENCES_STORAGE_KEY, this._store)(() => {
+                    if (!this._writingIgnoredOccurrences) {
+                        this._storedIgnoredOccurrences = this._loadIgnoredOccurrences();
+                        this._ignoredBlockOccurrences.set(this._storedIgnoredOccurrences, undefined);
+                    }
+                })
+            );
+        }
+        const allSessions = observableFromEvent(
+            this,
+            sessionsManagementService.onDidChangeSessions,
+            () => sessionsManagementService.getSessions()
+        );
+        const scopedProviderIds = observableFromEvent(
+            this,
+            agentHostFilterService.onDidChange,
+            () => agentHostFilterService.selectedHost?.providerIds
+        );
         this._logService.trace(`${LOG_PREFIX} created (enabled: ${enabled})`);
-        this._register(toDisposable(() => this._logService.trace(
-            `${LOG_PREFIX} disposed, discarding ${this._ignoredBlockOccurrences.get().size} acknowledged occurrence(s)`
-        )));
+        this._register(toDisposable(() => this._logService.trace(`${LOG_PREFIX} disposed`)));
         this.blockedSessions = derived(this, reader => {
             if (!enabled) {
                 return [];
             }
+            const providerIds = scopedProviderIds.read(reader);
             const visibleSessionIds = ( new Set());
             for (const session of this._sessionsService.visibleSessions.read(reader)) {
                 if (session) {
@@ -67,7 +103,9 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
             }
             const ignoredOccurrences = this._ignoredBlockOccurrences.read(reader);
             const ciFixHidden = this._ciFixModel.hiddenSessions.read(reader);
-            return this._blockedSessionsModel.blockedSessionsWithReasons.read(reader).filter(blocked => !( visibleSessionIds.has(blocked.session.sessionId)) && !( ciFixHidden.has(blocked.session.sessionId)) && !this._isBlockIgnored(blocked, ignoredOccurrences, reader));
+            return this._blockedSessionsModel.blockedSessionsWithReasons.read(reader).filter(
+                blocked => (!providerIds || providerIds.includes(blocked.session.providerId)) && !( visibleSessionIds.has(blocked.session.sessionId)) && !( ciFixHidden.has(blocked.session.sessionId)) && !this._isBlockIgnored(blocked, ignoredOccurrences, reader)
+            );
         });
         this.requiresInputKind = derived(this, reader => {
             const blocked = this.blockedSessions.read(reader);
@@ -90,6 +128,7 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
             }
             return common;
         });
+        let observedInputSessions = ( new Map());
         this._register(autorun(reader => {
             if (!enabled) {
                 return;
@@ -100,9 +139,25 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
                 this._sessionsService.visibleSessions.read(reader).filter(session => session !== undefined).map(session => session.sessionId)
             ));
             const ignoredOccurrences = this._ignoredBlockOccurrences.read(reader);
+            const sessionsById = ( new Map(
+                ignoredOccurrences.size > 0 ? allSessions.read(reader).map(session => [session.sessionId, session]) : []
+            ));
             const next = ( new Map(ignoredOccurrences));
+            const nextObservedInputSessions = ( new Map());
             let changed = false;
             for (const [sessionId, acknowledged] of ignoredOccurrences) {
+                const session = sessionsById.get(sessionId);
+                if (session?.isArchived.read(reader)) {
+                    next.delete(sessionId);
+                    changed = true;
+                    this._logService.trace(`${LOG_PREFIX} releasing acknowledgement of ${sessionId}: archived`);
+                    continue;
+                }
+                const connectionStatus = session?.remoteConnectionStatus?.read(reader);
+                const connected = !connectionStatus || connectionStatus.kind === "connected";
+                if (session && connected && (session.status.read(reader) === SessionStatus.NeedsInput || observedInputSessions.get(sessionId) === session)) {
+                    nextObservedInputSessions.set(sessionId, session);
+                }
                 const blockedSession = blockedById.get(sessionId);
                 if (blockedSession) {
                     const occurrenceId = this._getBlockOccurrenceId(blockedSession, reader, acknowledged.occurrenceId);
@@ -115,6 +170,9 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
                     }
                     continue;
                 }
+                if (!session || !connected || nextObservedInputSessions.get(sessionId) !== session || session.status.read(reader) === SessionStatus.NeedsInput) {
+                    continue;
+                }
                 if (acknowledged.reason === BlockedSessionReason.FailingCI) {
                     this._logService.trace(
                         `${LOG_PREFIX} keeping acknowledgement of ${sessionId} (${acknowledged.occurrenceId}) while it is not reported as blocked`
@@ -134,6 +192,7 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
                 }
                 const occurrenceId = this._getBlockOccurrenceId(blockedSession, reader, next.get(sessionId)?.occurrenceId);
                 if (next.get(sessionId)?.occurrenceId !== occurrenceId) {
+                    next.delete(sessionId);
                     next.set(sessionId, {
                         occurrenceId,
                         reason: blockedSession.reason
@@ -144,8 +203,9 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
                     );
                 }
             }
+            observedInputSessions = nextObservedInputSessions;
             if (changed) {
-                this._ignoredBlockOccurrences.set(next, undefined);
+                this._setIgnoredOccurrences(next);
             }
         }));
         this._register(autorun(reader => {
@@ -163,14 +223,11 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
             ));
             const previousOccurrences = this._lastBlockedOccurrences;
             this._lastBlockedOccurrences = currentOccurrences;
-            const visibleSessionIds = ( new Set());
-            for (const session of this._sessionsService.visibleSessions.read(reader)) {
-                if (session) {
-                    visibleSessionIds.add(session.sessionId);
-                }
-            }
+            const surfacedSessionIds = ( new Set(
+                this.blockedSessions.read(reader).map(blocked => blocked.session.sessionId)
+            ));
             for (const [sessionId, occurrenceId] of this._pendingBlinkOccurrences) {
-                if (currentOccurrences.get(sessionId) !== occurrenceId || ( visibleSessionIds.has(sessionId))) {
+                if (currentOccurrences.get(sessionId) !== occurrenceId || !( surfacedSessionIds.has(sessionId))) {
                     this._pendingBlinkOccurrences.delete(sessionId);
                 }
             }
@@ -178,7 +235,7 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
             for (const blocked of modelBlocked) {
                 const sessionId = blocked.session.sessionId;
                 const occurrenceId = currentOccurrences.get(sessionId);
-                if (previousOccurrences.get(sessionId) !== occurrenceId && !( visibleSessionIds.has(sessionId))) {
+                if (previousOccurrences.get(sessionId) !== occurrenceId && ( surfacedSessionIds.has(sessionId))) {
                     this._pendingBlinkOccurrences.set(sessionId, occurrenceId);
                     queued = true;
                     this._logService.trace(`${LOG_PREFIX} queued attention blink for ${sessionId} (${occurrenceId})`);
@@ -240,13 +297,14 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
         for (const blocked of blockedSessions) {
             const sessionId = blocked.session.sessionId;
             const occurrenceId = this._getBlockOccurrenceId(blocked, undefined, next.get(sessionId)?.occurrenceId);
+            next.delete(sessionId);
             next.set(sessionId, {
                 occurrenceId,
                 reason: blocked.reason
             });
             this._logService.trace(`${LOG_PREFIX} ignoring ${sessionId} (${occurrenceId}): ignore all`);
         }
-        this._ignoredBlockOccurrences.set(next, undefined);
+        this._setIgnoredOccurrences(next);
     }
     dismissApproval(approved) {
         const blocked = this._blockedSessionsModel.blockedSessionsWithReasons.get().find(entry => entry.session.sessionId === approved.session.sessionId);
@@ -258,22 +316,97 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
     getRequiresInputLabel(count, kind) {
         switch (kind) {
         case RequiresInputKind.TerminalApproval:
-            return count === 1 ? ( localize(4617, "1 session requires terminal approval")) : ( localize(4618, "{0} sessions require terminal approval", count));
+            return count === 1 ? ( localize(5749, "1 session requires terminal approval")) : ( localize(5750, "{0} sessions require terminal approval", count));
         case RequiresInputKind.Question:
-            return count === 1 ? ( localize(4619, "1 session has a question")) : ( localize(4620, "{0} sessions have questions", count));
+            return count === 1 ? ( localize(5751, "1 session has a question")) : ( localize(5752, "{0} sessions have questions", count));
         case RequiresInputKind.FailingCI:
-            return count === 1 ? ( localize(4621, "1 session is failing CI")) : ( localize(4622, "{0} sessions are failing CI", count));
+            return count === 1 ? ( localize(5753, "1 session is failing CI")) : ( localize(5754, "{0} sessions are failing CI", count));
         default:
-            return count === 1 ? ( localize(4623, "1 session requires input")) : ( localize(4624, "{0} sessions require input", count));
+            return count === 1 ? ( localize(5755, "1 session requires input")) : ( localize(5756, "{0} sessions require input", count));
+        }
+    }
+    _loadIgnoredOccurrences() {
+        const raw = this._storageService.get(IGNORED_OCCURRENCES_STORAGE_KEY, StorageScope.PROFILE);
+        if (raw === undefined) {
+            return ( new Map());
+        }
+        try {
+            const parsed = JSON.parse(raw);
+            if (!Array.isArray(parsed)) {
+                throw ( new Error("Expected an array of ignored blocked occurrences"));
+            }
+            const occurrences = ( new Map());
+            const entries = parsed;
+            for (const entry of entries) {
+                if (!Array.isArray(entry) || entry.length !== 2 || typeof entry[0] !== "string") {
+                    throw ( new Error("Invalid ignored blocked occurrence"));
+                }
+                const occurrence = entry[1];
+                if (!occurrence || typeof occurrence !== "object" || typeof occurrence.occurrenceId !== "string" || (occurrence.reason !== BlockedSessionReason.NeedsInput && occurrence.reason !== BlockedSessionReason.FailingCI)) {
+                    throw ( new Error("Invalid ignored blocked occurrence"));
+                }
+                occurrences.delete(entry[0]);
+                occurrences.set(entry[0], {
+                    occurrenceId: occurrence.occurrenceId,
+                    reason: occurrence.reason
+                });
+            }
+            return ( new Map([...occurrences].slice(-MAX_STORED_IGNORED_SESSIONS)));
+        } catch (error) {
+            this._logService.warn(`${LOG_PREFIX} Failed to load ignored occurrences`, error);
+            return ( new Map());
+        }
+    }
+    _setIgnoredOccurrences(next) {
+        const previous = this._ignoredBlockOccurrences.get();
+        const stored = ( new Map(this._loadIgnoredOccurrences()));
+        for (const [sessionId, occurrence] of previous) {
+            if (!( next.has(sessionId)) && stored.get(sessionId)?.occurrenceId === occurrence.occurrenceId) {
+                stored.delete(sessionId);
+            }
+        }
+        for (const [sessionId, occurrence] of next) {
+            if (occurrence !== previous.get(sessionId)) {
+                stored.delete(sessionId);
+                stored.set(sessionId, occurrence);
+            }
+        }
+        const reconciled = ( new Map(next));
+        for (const sessionId of ( this._storedIgnoredOccurrences.keys())) {
+            reconciled.delete(sessionId);
+        }
+        for (const [sessionId, occurrence] of stored) {
+            reconciled.set(sessionId, occurrence);
+        }
+        this._storeIgnoredOccurrences(stored);
+        this._ignoredBlockOccurrences.set(reconciled, undefined);
+    }
+    _storeIgnoredOccurrences(occurrences) {
+        this._storedIgnoredOccurrences = ( new Map([...occurrences].slice(-MAX_STORED_IGNORED_SESSIONS)));
+        this._writingIgnoredOccurrences = true;
+        try {
+            if (this._storedIgnoredOccurrences.size === 0) {
+                this._storageService.remove(IGNORED_OCCURRENCES_STORAGE_KEY, StorageScope.PROFILE);
+            } else {
+                this._storageService.store(
+                    IGNORED_OCCURRENCES_STORAGE_KEY,
+                    JSON.stringify([...this._storedIgnoredOccurrences]),
+                    StorageScope.PROFILE,
+                    StorageTarget.MACHINE
+                );
+            }
+        } finally {
+            this._writingIgnoredOccurrences = false;
         }
     }
     _ignoreOccurrence(blocked, occurrenceId) {
         const next = ( new Map(this._ignoredBlockOccurrences.get()));
+        next.delete(blocked.session.sessionId);
         next.set(blocked.session.sessionId, {
             occurrenceId,
             reason: blocked.reason
         });
-        this._ignoredBlockOccurrences.set(next, undefined);
+        this._setIgnoredOccurrences(next);
         this._logService.trace(`${LOG_PREFIX} ignoring ${blocked.session.sessionId} (${occurrenceId})`);
     }
     _isBlockIgnored(blocked, ignoredOccurrences, reader) {
@@ -315,6 +448,6 @@ let BlockedSessionsIndicatorModel = class BlockedSessionsIndicatorModel extends
         }
     }
 };
-BlockedSessionsIndicatorModel = ( __decorate([( __param(3, ISessionsService)), ( __param(4, IInstantiationService)), ( __param(5, IProductService)), ( __param(6, ILogService))], BlockedSessionsIndicatorModel));
+BlockedSessionsIndicatorModel = ( __decorate([( __param(3, ISessionsService)), ( __param(4, IInstantiationService)), ( __param(5, IProductService)), ( __param(6, ILogService)), ( __param(7, IStorageService)), ( __param(8, ISessionsManagementService)), ( __param(9, IAgentHostFilterService))], BlockedSessionsIndicatorModel));
 
 export { BlockedSessionsIndicatorModel, RequiresInputKind };

package/vscode/src/vs/sessions/contrib/sessions/browser/blockedSessionsList.js

@@ -23,7 +23,7 @@ function registerBlockedSessionsItemActions() {
     return combinedDisposable(MenuRegistry.appendMenuItem(Menus.BlockedSessionsItem, {
         command: {
             id: IGNORE_INPUT_NEEDED_COMMAND_ID,
-            title: ( localize(4625, "Ignore Input Needed")),
+            title: ( localize(5757, "Ignore Needs Attention Alert")),
             icon: Codicon.bellSlash
         },
         group: "navigation",
@@ -32,7 +32,7 @@ function registerBlockedSessionsItemActions() {
     }), MenuRegistry.appendMenuItem(Menus.BlockedSessionsItem, {
         command: {
             id: IGNORE_CI_FAILURE_COMMAND_ID,
-            title: ( localize(4626, "Ignore CI Failure")),
+            title: ( localize(5758, "Ignore CI Failure")),
             icon: Codicon.bellSlash
         },
         group: "navigation",
@@ -54,7 +54,7 @@ let BlockedSessionsList = class BlockedSessionsList extends Disposable {
         const element = append(container, $(".agent-sessions-blocked-list"));
         const header = append(element, $(".agent-sessions-blocked-list-header"));
         const title = append(header, $(".agent-sessions-blocked-list-title"));
-        title.textContent = ( localize(4627, "Sessions requiring input"));
+        title.textContent = ( localize(5759, "Sessions needing attention"));
         const headerActions = append(header, $(".agent-sessions-blocked-list-header-actions"));
         this._register(
             instantiationService.createInstance(MenuWorkbenchToolBar, headerActions, Menus.BlockedSessionsHeader, {
@@ -64,7 +64,7 @@ let BlockedSessionsList = class BlockedSessionsList extends Disposable {
                         showAllSessions: options.onShowAllSessions,
                         ignoreAllSessions: () => {
                             options.onIgnoreAllSessions();
-                            status(( localize(4628, "All current blocked sessions were ignored.")));
+                            status(( localize(5760, "All current blocked sessions were ignored.")));
                         },
                         close: options.onClose
                     }
@@ -84,12 +84,16 @@ let BlockedSessionsList = class BlockedSessionsList extends Disposable {
                 ciFixModel: options.ciFixModel,
                 approvalRowMaxLines: BLOCKED_LIST_APPROVAL_ROW_MAX_LINES,
                 toolbarMenuId: Menus.BlockedSessionsItem,
+                toolbarTelemetrySource: "blockedSessionsList.row",
                 onToolbarAction: (action, session) => {
                     if (action.id !== IGNORE_INPUT_NEEDED_COMMAND_ID && action.id !== IGNORE_CI_FAILURE_COMMAND_ID) {
                         return false;
                     }
                     options.onIgnoreSession(session);
-                    status(action.id === IGNORE_INPUT_NEEDED_COMMAND_ID ? ( localize(4629, "Input needed ignored until this session needs input again.")) : ( localize(4630, "CI failure ignored until this session has another CI failure.")));
+                    status(action.id === IGNORE_INPUT_NEEDED_COMMAND_ID ? ( localize(
+                        5761,
+                        "Needs attention alert ignored until this session needs attention again."
+                    )) : ( localize(5762, "CI failure ignored until this session has another CI failure.")));
                     return true;
                 }
             })

package/vscode/src/vs/sessions/contrib/sessions/browser/media/automationsCards.css

@@ -69,6 +69,7 @@
 .automations-cards-state,
 .automations-cards-partial-state,
 .automations-templates,
+.automations-history-state,
 .automations-history {
 	width: 100%;
 	max-width: 900px;
@@ -130,6 +131,7 @@
 
 /* Individual Card */
 .automations-card {
+	position: relative;
 	display: flex;
 	flex-direction: row;
 	align-items: flex-start;
@@ -166,6 +168,7 @@
 	font: inherit;
 	text-align: left;
 	cursor: pointer;
+	align-self: stretch;
 }
 
 .monaco-workbench .automations-card-main:focus {
@@ -178,24 +181,25 @@
 	flex-direction: row;
 	align-items: center;
 	gap: 8px;
+	min-height: var(--vscode-spacing-size240);
+	padding-right: calc(2 * var(--vscode-spacing-size240) + var(--vscode-spacing-size40) + var(--vscode-spacing-size80));
 }
 
 .automations-card-name-text {
 	flex: 1 1 0;
 	min-width: 0;
-	font-size: 13px;
-	font-weight: 600;
+	font-size: var(--vscode-fontSize-heading3);
+	font-weight: var(--vscode-fontWeight-semiBold);
 	color: var(--vscode-foreground);
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
 
-.automations-card-disabled-badge {
-	font-size: 12px;
-	font-weight: 400;
-	font-style: italic;
-	color: var(--vscode-descriptionForeground);
+.automations-card.automation-disabled .automations-card-name-text,
+.automations-card.automation-disabled .automations-card-prompt,
+.automations-card.automation-disabled .automations-card-meta {
+	color: var(--vscode-disabledForeground);
 }
 
 /* Card Metadata */
@@ -204,12 +208,31 @@
 	flex-direction: row;
 	align-items: center;
 	gap: 6px;
-	font-size: 12px;
+	font-size: var(--vscode-fontSize-label1);
 	color: var(--vscode-descriptionForeground);
 	min-width: 0;
+	margin-top: auto;
+	padding-top: var(--vscode-spacing-size80);
+}
+
+.automations-card-meta-item {
+	display: flex;
+	align-items: center;
+	gap: var(--vscode-spacing-size60);
+	min-width: 0;
+}
+
+.automations-card-meta-item > .codicon {
+	font-size: var(--vscode-codiconFontSize);
+	color: inherit;
+	flex-shrink: 0;
 }
 
 .automations-card-folder {
+	flex: 1;
+}
+
+.automations-card-meta-label {
 	min-width: 0;
 	overflow: hidden;
 	white-space: nowrap;
@@ -218,7 +241,6 @@
 
 .automations-card-meta-item + .automations-card-meta-item::before {
 	content: '·';
-	margin-right: 6px;
 	opacity: 0.6;
 }
 
@@ -232,9 +254,10 @@
 
 /* Card Prompt */
 .automations-card-prompt {
-	font-size: 12px;
+	font-size: var(--vscode-fontSize-body1);
 	color: var(--vscode-descriptionForeground);
-	margin-top: 2px;
+	margin-top: var(--vscode-spacing-size20);
+	line-height: 1.4;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	word-break: break-word;
@@ -245,6 +268,9 @@
 
 /* Card Action Buttons (icon-only, matching native pattern) */
 .automations-card-actions {
+	position: absolute;
+	top: var(--vscode-spacing-size120);
+	right: var(--vscode-spacing-size160);
 	display: flex;
 	flex-direction: row;
 	gap: 4px;
@@ -296,8 +322,8 @@
 	align-items: center;
 	justify-content: center;
 	text-align: center;
-	padding: 48px 20px;
-	gap: 8px;
+	padding: var(--vscode-spacing-size320) var(--vscode-spacing-size200);
+	gap: var(--vscode-spacing-size80);
 	flex: 1;
 }
 
@@ -309,9 +335,9 @@
 }
 
 .automations-cards-empty-description {
-	font-size: 12px;
+	font-size: var(--vscode-fontSize-body1);
 	color: var(--vscode-descriptionForeground);
-	margin: 0 0 12px;
+	margin: 0 0 var(--vscode-spacing-size80);
 	max-width: 320px;
 	line-height: 1.4;
 }
@@ -365,11 +391,29 @@
 	max-width: 180px;
 }
 
+.automations-cards-unavailable .automations-cards-state-description,
+.automations-cards-partial-state-message {
+	white-space: pre-line;
+}
+
+.automations-unavailable-reasons {
+	margin: 0 auto;
+	padding: 0 0 0 var(--vscode-spacing-size200);
+	width: fit-content;
+	max-width: 100%;
+	box-sizing: border-box;
+	text-align: left;
+}
+
+.automations-unavailable-reasons > li + li {
+	margin-top: var(--vscode-spacing-size40);
+}
+
 .automations-cards-partial-state {
 	display: flex;
 	align-items: center;
 	gap: var(--vscode-spacing-size80);
-	margin-bottom: var(--vscode-spacing-size120);
+	margin-top: var(--vscode-spacing-size120);
 	padding: var(--vscode-spacing-size80) var(--vscode-spacing-size120);
 	border: var(--vscode-strokeThickness) solid var(--vscode-editorWidget-border);
 	border-radius: var(--vscode-cornerRadius-small);
@@ -526,8 +570,7 @@
 
 .automations-template-card-badge,
 .automations-template-card-source,
-.automations-template-card-schedule,
-.automations-template-card-prompt {
+.automations-template-card-schedule {
 	font-size: var(--vscode-fontSize-label1);
 	color: var(--vscode-descriptionForeground);
 }
@@ -543,6 +586,8 @@
 }
 
 .automations-template-card-prompt {
+	font-size: var(--vscode-fontSize-body1);
+	color: var(--vscode-descriptionForeground);
 	display: -webkit-box;
 	overflow: hidden;
 	margin-top: var(--vscode-spacing-size20);
@@ -553,6 +598,11 @@
 	-webkit-box-orient: vertical;
 }
 
+.automations-template-card-schedule {
+	margin-top: auto;
+	padding-top: var(--vscode-spacing-size80);
+}
+
 /* Run History */
 .automations-history {
 	margin-top: 32px;
@@ -601,21 +651,36 @@
 	border-radius: 0;
 }
 
-.automations-history-group-runs .automations-temporary-run:not(:first-child),
-.automations-history-group-runs .automations-run-session-list:not(:empty) .monaco-list-row:not(:first-child),
-.automations-history-group-runs .automations-temporary-runs:not(:empty) + .automations-run-session-list:not(:empty) {
+.automations-history-group-runs > :not(:first-child),
+.automations-history-group-runs .automations-run-session-list:not(:empty) .monaco-list-row:not(:first-child) {
 	border-top: var(--vscode-strokeThickness) solid var(--vscode-editorWidget-border);
 }
 
-.automations-temporary-runs:empty {
-	display: none;
-}
-
 .automations-temporary-run {
 	height: 54px;
 	width: 100%;
 }
 
+.automations-history-state {
+	margin-top: var(--vscode-spacing-size160);
+	color: var(--vscode-descriptionForeground);
+	font-size: var(--vscode-fontSize-label1);
+}
+
+.automations-temporary-run .automations-run-actions {
+	flex-shrink: 0;
+	margin-left: var(--vscode-spacing-size80);
+	opacity: 0;
+	pointer-events: none;
+}
+
+.automations-temporary-run:hover .automations-run-actions,
+.automations-temporary-run:focus-within .automations-run-actions,
+.agent-sessions-workbench.phone-layout .automations-temporary-run .automations-run-actions {
+	opacity: 1;
+	pointer-events: auto;
+}
+
 .hc-black .automations-card,
 .hc-light .automations-card,
 .hc-black .automations-template-card,