@theia/ai-ide 1.74.0-next.9 → 1.74.0

package/src/browser/ai-allow-all-mode-chat-banner.tsx

@@ -0,0 +1,217 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { codicon } from '@theia/core/lib/browser';
+import { DisposableCollection, Emitter, Event } from '@theia/core';
+import { nls } from '@theia/core/lib/common/nls';
+import { PreferenceService } from '@theia/core/lib/common';
+import { ChatBannerProvider } from '@theia/ai-chat-ui/lib/browser/chat-banner-provider';
+import {
+    DEFAULT_TOOL_CONFIRMATION_PREFERENCE,
+    TOOL_CONFIRMATION_PREFERENCE,
+    ToolConfirmationMode
+} from '@theia/ai-chat/lib/common/chat-tool-preferences';
+
+interface AiSessionOverride {
+    /** Human-readable label, e.g. "Default tool confirmation: always_allow". */
+    label: string;
+    /** Whether this override bypasses AI tool confirmations globally. */
+    bypass: boolean;
+}
+
+/**
+ * Persistent strip rendered above the chat content whenever an AI tool confirmation
+ * preference (`ai-features.chat.defaultToolConfirmation` or `ai-features.chat.toolConfirmation`)
+ * is active in the session scope (typically set via `--session-preference`). When the
+ * global default is forced to "Allow All" the strip is shown in error styling as the
+ * Theia AI Allow-All Mode banner; per-tool confirmation overrides use warning styling.
+ *
+ * Other AI-namespaced session overrides (e.g. forced-on AI features, default chat agent)
+ * are reported by the generic Session Preferences status bar item and intentionally not
+ * duplicated here.
+ */
+@injectable()
+export class AiAllowAllModeChatBanner implements ChatBannerProvider {
+
+    readonly priority = 1000;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    protected readonly toDispose = new DisposableCollection();
+    protected readonly onDidChangeEmitter = new Emitter<void>();
+    readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
+
+    /**
+     * Only tool confirmation preferences are watched here. Other AI session overrides
+     * (enable AI, agent mode, default chat agent, etc.) are surfaced in the generic
+     * Session Preferences status bar item to keep the banner from duplicating the list.
+     */
+    protected readonly watchedKeys: ReadonlyArray<string> = [
+        DEFAULT_TOOL_CONFIRMATION_PREFERENCE,
+        TOOL_CONFIRMATION_PREFERENCE
+    ];
+
+    /**
+     * Process-lifetime dismissal flag. Reset on the next launch so the user is
+     * always reminded once per process. Also automatically cleared when the override
+     * set changes in any way after a dismissal (see {@link init}), so a previously
+     * dismissed strip cannot silently hide new or escalated overrides.
+     */
+    protected dismissed = false;
+
+    /**
+     * Signature of the override set at the moment the user dismissed the strip.
+     * `undefined` while the strip is not dismissed.
+     */
+    protected dismissedSignature: string | undefined;
+
+    @postConstruct()
+    protected init(): void {
+        const watched = new Set(this.watchedKeys);
+        this.toDispose.push(this.preferenceService.onPreferenceChanged(e => {
+            if (!watched.has(e.preferenceName)) {
+                return;
+            }
+            if (this.dismissed && this.overrideSignature() !== this.dismissedSignature) {
+                // The override set has changed since the user dismissed the strip
+                // (new override added, existing value changed, escalation into a bypass, ...).
+                // Re-surface the strip so the change cannot hide behind the earlier dismissal.
+                this.dismissed = false;
+                this.dismissedSignature = undefined;
+            }
+            this.onDidChangeEmitter.fire();
+        }));
+    }
+
+    /**
+     * Stable snapshot of the watched preferences' current session values. Used to
+     * detect changes to the override set for the dismissal-reset logic; not for
+     * anything user-visible so the format is intentionally simple.
+     */
+    protected overrideSignature(): string {
+        return this.watchedKeys
+            .map(key => `${key}=${JSON.stringify(this.preferenceService.inspect(key)?.sessionValue ?? undefined)}`)
+            .join('|');
+    }
+
+    renderBanner(): React.ReactNode | undefined {
+        if (this.dismissed) {
+            return undefined;
+        }
+        const overrides = this.collectOverrides();
+        if (overrides.length === 0) {
+            return undefined;
+        }
+        const isAllowAll = overrides.some(override => override.bypass);
+        const className = `theia-ai-allow-all-mode-strip ${isAllowAll ? 'is-allow-all' : 'is-overrides'}`;
+        const title = isAllowAll
+            ? nls.localize('theia/ai/ide/allowAllMode/title', 'Theia AI Allow-All Mode')
+            : nls.localize('theia/ai/ide/toolConfirmationOverrides/title', 'AI Tool Confirmation Overrides');
+        const tooltipLines = [
+            isAllowAll
+                ? nls.localize('theia/ai/ide/allowAllMode/stripTooltip',
+                    'AI tool calls run without confirmation in this session. Only enable in environments you trust.')
+                : nls.localize('theia/ai/ide/toolConfirmationOverrides/stripTooltip',
+                    'One or more AI tools are auto-approved for this session via command-line flags.'),
+            '',
+            ...overrides.map(override => `• ${override.label}`),
+            '',
+            nls.localize('theia/ai/ide/allowAllMode/stripTooltipFooter',
+                'Set via --session-preference. Restart without the flag to restore your saved settings.')
+        ];
+        return <div
+            className={className}
+            title={tooltipLines.join('\n')}
+            role='status'
+            aria-live='polite'>
+            <span className={`theia-ai-allow-all-mode-strip-icon ${codicon('warning')}`}></span>
+            <span className='theia-ai-allow-all-mode-strip-title'>{title}</span>
+            <button
+                type='button'
+                className={`theia-ai-allow-all-mode-strip-dismiss ${codicon('close')}`}
+                title={nls.localizeByDefault('Hide for this session')}
+                aria-label={nls.localizeByDefault('Hide for this session')}
+                onClick={this.handleDismiss}
+            />
+        </div>;
+    }
+
+    /** AI-relevant preferences currently coming from the session scope. */
+    protected collectOverrides(): AiSessionOverride[] {
+        const overrides: AiSessionOverride[] = [];
+        for (const key of this.watchedKeys) {
+            const sessionValue = this.preferenceService.inspect(key)?.sessionValue;
+            if (sessionValue === undefined) {
+                continue;
+            }
+            overrides.push({
+                label: this.describe(key, sessionValue),
+                bypass: this.isBypassValue(key, sessionValue)
+            });
+        }
+        return overrides;
+    }
+
+    /**
+     * Returns `true` only when the global default is forced to Allow-All. Per-tool
+     * `always_allow` entries via `TOOL_CONFIRMATION_PREFERENCE` are scoped exceptions
+     * and remain in the banner as informational (warning) entries rather than escalating
+     * the whole strip to the red "Allow-All Mode" treatment.
+     */
+    protected isBypassValue(key: string, value: unknown): boolean {
+        if (key === DEFAULT_TOOL_CONFIRMATION_PREFERENCE) {
+            return value === ToolConfirmationMode.ALWAYS_ALLOW;
+        }
+        return false;
+    }
+
+    protected describe(key: string, value: unknown): string {
+        switch (key) {
+            case DEFAULT_TOOL_CONFIRMATION_PREFERENCE:
+                return nls.localize('theia/ai/ide/sessionOverride/defaultToolConfirmation',
+                    'Default tool confirmation: {0}', String(value));
+            case TOOL_CONFIRMATION_PREFERENCE: {
+                if (value && typeof value === 'object') {
+                    const entries = Object.entries(value as Record<string, unknown>)
+                        .map(([tool, mode]) => `${tool}=${mode}`)
+                        .join(', ');
+                    return nls.localize('theia/ai/ide/sessionOverride/toolConfirmation',
+                        'Per-tool confirmation overrides: {0}', entries);
+                }
+                return nls.localize('theia/ai/ide/sessionOverride/toolConfirmationGeneric',
+                    'Per-tool confirmation overrides set');
+            }
+            default:
+                return `${key} = ${JSON.stringify(value)}`;
+        }
+    }
+
+    protected handleDismiss = (e: React.MouseEvent<HTMLButtonElement>) => {
+        e.stopPropagation();
+        this.dismissed = true;
+        // Snapshot the signature so a subsequent change to the override set is detected
+        // in the preference-change listener and un-dismisses the strip automatically.
+        this.dismissedSignature = this.overrideSignature();
+        this.onDidChangeEmitter.fire();
+    };
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+}

package/src/browser/ai-configuration/tools-configuration-widget.tsx

@@ -17,8 +17,8 @@
 import { ConfirmDialog } from '@theia/core/lib/browser';
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import * as React from '@theia/core/shared/react';
-import { ToolInvocationRegistry, ToolRequest } from '@theia/ai-core';
-import { nls, PreferenceService } from '@theia/core';
+import { AiConfigurationService, ToolInvocationRegistry, ToolRequest } from '@theia/ai-core';
+import { nls } from '@theia/core';
 import { ToolConfirmationManager } from '@theia/ai-chat/lib/browser/chat-tool-preference-bindings';
 import { ShellCommandPermissionService } from '@theia/ai-terminal/lib/browser/shell-command-permission-service';
 import {
@@ -47,8 +47,8 @@ export class AIToolsConfigurationWidget extends AITableConfigurationWidget<ToolI
     @inject(ToolConfirmationManager)
     protected readonly confirmationManager: ToolConfirmationManager;
 
-    @inject(PreferenceService)
-    protected readonly preferenceService: PreferenceService;
+    @inject(AiConfigurationService)
+    protected readonly aiConfigurationService: AiConfigurationService;
 
     @inject(ToolInvocationRegistry)
     protected readonly toolInvocationRegistry: ToolInvocationRegistry;
@@ -74,18 +74,18 @@ export class AIToolsConfigurationWidget extends AITableConfigurationWidget<ToolI
 
         this.loadData().then(() => this.update());
         this.toDispose.pushAll([
-            this.preferenceService.onPreferenceChanged(async e => {
-                if (e.preferenceName === TOOL_CONFIRMATION_PREFERENCE
-                    || e.preferenceName === DEFAULT_TOOL_CONFIRMATION_PREFERENCE) {
+            this.aiConfigurationService.onDidChange(async e => {
+                if (e.affectsPreference(TOOL_CONFIRMATION_PREFERENCE)
+                    || e.affectsPreference(DEFAULT_TOOL_CONFIRMATION_PREFERENCE)) {
                     this.defaultState = await this.loadDefaultConfirmation();
                     this.toolConfirmationModes = await this.loadToolConfigurationModes();
                     this.update();
                 }
-                if (e.preferenceName === SHELL_COMMAND_ALLOWLIST_PREFERENCE) {
+                if (e.affectsPreference(SHELL_COMMAND_ALLOWLIST_PREFERENCE)) {
                     this.allowlistPatterns = this.shellCommandPermissionService.getAllowlistPatterns();
                     this.update();
                 }
-                if (e.preferenceName === SHELL_COMMAND_DENYLIST_PREFERENCE) {
+                if (e.affectsPreference(SHELL_COMMAND_DENYLIST_PREFERENCE)) {
                     this.denylistPatterns = this.shellCommandPermissionService.getDenylistPatterns();
                     this.update();
                 }
@@ -98,6 +98,7 @@ export class AIToolsConfigurationWidget extends AITableConfigurationWidget<ToolI
     }
 
     protected async loadData(): Promise<void> {
+        await this.aiConfigurationService.ready;
         await this.loadItems();
         this.defaultState = await this.loadDefaultConfirmation();
         this.toolConfirmationModes = await this.loadToolConfigurationModes();
@@ -374,7 +375,8 @@ export class AIToolsConfigurationWidget extends AITableConfigurationWidget<ToolI
     }
 
     protected handleRemoveAllowlistPattern(pattern: string): void {
-        this.shellCommandPermissionService.removeAllowlistPattern(pattern);
+        this.shellCommandPermissionService.removeAllowlistPattern(pattern)
+            .catch(error => console.error('Failed to remove allowlist pattern:', error));
     }
 
     protected handleAddDenylistPattern(): void {
@@ -388,12 +390,13 @@ export class AIToolsConfigurationWidget extends AITableConfigurationWidget<ToolI
     }
 
     protected handleRemoveDenylistPattern(pattern: string): void {
-        this.shellCommandPermissionService.removeDenylistPattern(pattern);
+        this.shellCommandPermissionService.removeDenylistPattern(pattern)
+            .catch(error => console.error('Failed to remove denylist pattern:', error));
     }
 
     protected handleAddPatternToList(
         inputRef: React.RefObject<HTMLInputElement | null>,
-        addFn: (pattern: string) => void,
+        addFn: (pattern: string) => Promise<void>,
         getFn: () => string[],
         setPatterns: (patterns: string[]) => void,
         setError: (error: string | undefined) => void
@@ -409,7 +412,11 @@ export class AIToolsConfigurationWidget extends AITableConfigurationWidget<ToolI
         }
 
         try {
-            addFn(trimmed);
+            // Validation throws synchronously; a failed write rejects the returned promise.
+            addFn(trimmed).catch(error => {
+                setError(error instanceof Error ? error.message : 'Failed to save pattern');
+                this.update();
+            });
             input.value = '';
             setError(undefined);
             setPatterns(getFn());

package/src/browser/ai-first-perspective-contribution.ts

@@ -0,0 +1,48 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { nls } from '@theia/core';
+import { PerspectiveContribution, PerspectiveChromeOptions, PerspectiveService } from '@theia/core/lib/browser/perspective-service';
+import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
+import { EXPLORER_VIEW_CONTAINER_ID } from '@theia/navigator/lib/browser';
+import { SCM_VIEW_CONTAINER_ID } from '@theia/scm/lib/browser/scm-contribution';
+import { ChatViewWidget } from '@theia/ai-chat-ui/lib/browser/chat-view-widget';
+import { AISessionsWidget } from './ai-sessions-widget';
+
+export const AI_FIRST_PERSPECTIVE_ID = 'ai-first';
+
+@injectable()
+export class AIFirstPerspectiveContribution implements PerspectiveContribution {
+
+    registerPerspectives(service: PerspectiveService): void {
+        const chromeOptions: PerspectiveChromeOptions = {
+            collapseAreas: ['bottom']
+        };
+        service.registerPerspective({
+            id: AI_FIRST_PERSPECTIVE_ID,
+            label: nls.localize('theia/ai-ide/perspective/aiFirst', 'AI First'),
+            viewPlacements: new Map<string, ApplicationShell.Area>([
+                [ChatViewWidget.ID, 'main'],
+                [EXPLORER_VIEW_CONTAINER_ID, 'right'],
+                [SCM_VIEW_CONTAINER_ID, 'right'],
+                [AISessionsWidget.ID, 'left']
+            ]),
+            primaryViews: { right: EXPLORER_VIEW_CONTAINER_ID },
+            chromeOptions
+        });
+    }
+}

package/src/browser/ai-sessions-view-contribution.ts

@@ -0,0 +1,67 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { AI_CHAT_HOME, ChatCommands } from '@theia/ai-chat-ui/lib/browser/chat-view-commands';
+import { AIViewContribution, ENABLE_AI_CONTEXT_KEY } from '@theia/ai-core/lib/browser';
+import { Command, CommandRegistry, nls } from '@theia/core';
+import { codicon } from '@theia/core/lib/browser';
+import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { AISessionsWidget } from './ai-sessions-widget';
+
+export const AI_SESSIONS_TOGGLE_COMMAND_ID = 'aiSessions:toggle';
+
+export const AI_SESSIONS_NEW_SESSION = Command.toLocalizedCommand({
+    id: 'aiSessions:newSession',
+    iconClass: codicon('add'),
+    category: ChatCommands.CHAT_CATEGORY,
+    label: 'New Chat'
+}, 'theia/ai-ide/newChat', ChatCommands.CHAT_CATEGORY_KEY);
+
+@injectable()
+export class AISessionsViewContribution extends AIViewContribution<AISessionsWidget> implements TabBarToolbarContribution {
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    constructor() {
+        super({
+            widgetId: AISessionsWidget.ID,
+            widgetName: AISessionsWidget.LABEL,
+            defaultWidgetOptions: {
+                area: 'left'
+            },
+            toggleCommandId: AI_SESSIONS_TOGGLE_COMMAND_ID
+        });
+    }
+
+    override registerCommands(commands: CommandRegistry): void {
+        super.registerCommands(commands);
+        commands.registerCommand(AI_SESSIONS_NEW_SESSION, this.commandHandlerFactory({
+            execute: () => this.commandRegistry.executeCommand(AI_CHAT_HOME.id)
+        }));
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: AI_SESSIONS_NEW_SESSION.id,
+            command: AI_SESSIONS_NEW_SESSION.id,
+            tooltip: nls.localizeByDefault('New Chat'),
+            isVisible: widget => this.activationService.isActive && widget instanceof AISessionsWidget,
+            when: ENABLE_AI_CONTEXT_KEY
+        });
+    }
+}

package/src/browser/ai-sessions-widget.tsx

@@ -0,0 +1,151 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ChatAgentService, ChatService, ChatSessionMetadata } from '@theia/ai-chat';
+import { AI_CHAT_OPEN_SESSION } from '@theia/ai-chat-ui/lib/browser/chat-view-commands';
+import { formatTimeAgo } from '@theia/ai-chat-ui/lib/browser/chat-date-utils';
+import { ChatSessionItemAction, ChatSessionItemActionContribution } from './chat-session-item-action-contribution';
+import { ChatSessionListService } from './chat-session-list-service';
+import { SessionRow, SessionsList } from './chat-session-list-components';
+import { ChatSessionItem } from './chat-session-item';
+import { CommandRegistry, ContributionProvider, nls } from '@theia/core';
+import { codicon, HoverService, ReactWidget } from '@theia/core/lib/browser';
+import { MarkdownRenderer, MarkdownRendererFactory } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
+import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+
+@injectable()
+export class AISessionsWidget extends ReactWidget {
+
+    static readonly ID = 'ai-sessions-widget';
+    static readonly LABEL = nls.localize('theia/ai-ide/sessionsView', 'AI Sessions');
+
+    @inject(ChatSessionListService)
+    protected readonly sessionListService: ChatSessionListService;
+
+    @inject(ChatService)
+    protected readonly chatService: ChatService;
+
+    @inject(ChatAgentService)
+    protected readonly chatAgentService: ChatAgentService;
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(HoverService)
+    protected readonly hoverService: HoverService;
+
+    @inject(MarkdownRendererFactory)
+    protected readonly markdownRendererFactory: MarkdownRendererFactory;
+
+    @inject(ContributionProvider) @named(ChatSessionItemActionContribution)
+    protected readonly chatSessionItemActionContributions: ContributionProvider<ChatSessionItemActionContribution>;
+
+    protected _markdownRenderer: MarkdownRenderer | undefined;
+    protected get markdownRenderer(): MarkdownRenderer {
+        if (!this._markdownRenderer) {
+            this._markdownRenderer = this.markdownRendererFactory();
+        }
+        return this._markdownRenderer;
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AISessionsWidget.ID;
+        this.title.label = AISessionsWidget.LABEL;
+        this.title.caption = AISessionsWidget.LABEL;
+        this.title.closable = true;
+        this.title.iconClass = codicon('history');
+        this.addClass('ai-sessions-view');
+
+        this.toDispose.pushAll([
+            this.sessionListService.onStateChanged(() => this.update()),
+            this.sessionListService.onUnreadChanged(() => this.update())
+        ]);
+
+        this.update();
+    }
+
+    protected render(): React.ReactNode {
+        const sections = this.sessionListService.getSections();
+        const total = sections.active.length + sections.restored.length;
+
+        if (total === 0) {
+            return (
+                <div className="ai-sessions-view-empty">
+                    <span className={codicon('comment-discussion')} />
+                    <p>{nls.localize('theia/ai-ide/noSessions', 'No chat sessions yet.')}</p>
+                </div>
+            );
+        }
+
+        const rows = this.sessionListService.buildRows(sections);
+
+        return (
+            <div className="ai-sessions-view-content">
+                <SessionsList
+                    rows={rows}
+                    renderRow={this.renderSessionRow}
+                />
+            </div>
+        );
+    }
+
+    protected getSessionActions(session: ChatSessionMetadata): ChatSessionItemAction[] {
+        return this.chatSessionItemActionContributions
+            .getContributions()
+            .flatMap(c => c.getActions(session))
+            .filter(action => this.commandRegistry.isEnabled(action.commandId, session))
+            .sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
+    }
+
+    protected renderSessionRow = (row: SessionRow): React.ReactNode => this.renderSessionRowAtDepth(row, 0);
+
+    protected renderSessionRowAtDepth(row: SessionRow, depth: number): React.ReactNode {
+        const hasChildSessions = row.childSessions.length > 0;
+        const isExpanded = hasChildSessions && this.sessionListService.isExpanded(row.session.sessionId);
+        const descendantNeedsAttention = this.sessionListService.descendantRequiresAction(row);
+
+        return (
+            <React.Fragment key={row.session.sessionId}>
+                <ChatSessionItem
+                    session={row.session}
+                    isRestored={row.isRestored}
+                    chatService={this.chatService}
+                    chatAgentService={this.chatAgentService}
+                    hoverService={this.hoverService}
+                    markdownRenderer={this.markdownRenderer}
+                    unreadState={this.sessionListService}
+                    onClick={async () => {
+                        await this.commandRegistry.executeCommand(AI_CHAT_OPEN_SESSION.id, row.session.sessionId);
+                    }}
+                    actions={this.getSessionActions(row.session)}
+                    onAction={(action: ChatSessionItemAction, s: ChatSessionMetadata) => {
+                        this.commandRegistry.executeCommand(action.commandId, s);
+                    }}
+                    formatTimeAgo={date => formatTimeAgo(date)}
+                    hasChildSessions={hasChildSessions}
+                    isChildSession={depth > 0}
+                    depth={depth}
+                    isExpanded={isExpanded}
+                    descendantNeedsAttention={descendantNeedsAttention}
+                    onToggleExpand={hasChildSessions ? () => this.sessionListService.toggleExpand(row.session.sessionId) : undefined}
+                />
+                {isExpanded && row.childSessions.map(child => this.renderSessionRowAtDepth(child, depth + 1))}
+            </React.Fragment>
+        );
+    }
+}

package/src/browser/chat-session-item-action-contribution.ts

@@ -58,13 +58,13 @@ export class DefaultChatSessionItemActionContribution implements ChatSessionItem
             {
                 commandId: ChatCommands.AI_CHAT_RENAME_SESSION.id,
                 iconClass: codicon('edit'),
-                tooltip: nls.localizeByDefault('Rename Chat'),
+                tooltip: nls.localizeByDefault('Rename chat'),
                 priority: 0,
             },
             {
                 commandId: ChatCommands.AI_CHAT_DELETE_SESSION.id,
                 iconClass: codicon('remove-close'),
-                tooltip: nls.localize('theia/ai/ide/deleteChat', 'Delete Chat'),
+                tooltip: nls.localizeByDefault('Delete Chat'),
                 priority: 10,
             },
         ];