@theia/ai-terminal 1.72.0-next.2 → 1.72.0-next.21

package/lib/browser/ai-terminal-command-block-variable.d.ts

@@ -0,0 +1,15 @@
+import { AIVariableContext, AIVariableContribution, AIVariableResolutionRequest, AIVariableResolver, AIVariableService, ResolvedAIVariable } from '@theia/ai-core';
+import { ILogger, MaybePromise, QuickInputService } from '@theia/core';
+import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
+export declare class AiTerminalCommandBlockVariableContribution implements AIVariableContribution, AIVariableResolver {
+    protected readonly terminalService: TerminalService;
+    protected readonly quickInputService: QuickInputService;
+    protected readonly logger: ILogger;
+    /** Fallback line count when command history is unavailable. 50 is a heuristic. */
+    protected static readonly FALLBACK_TERMINAL_LINE_COUNT = 50;
+    registerVariables(service: AIVariableService): void;
+    canResolve(request: AIVariableResolutionRequest, context: AIVariableContext): MaybePromise<number>;
+    resolve(request: AIVariableResolutionRequest, context: AIVariableContext): Promise<ResolvedAIVariable | undefined>;
+    protected pickCommandBlock(): Promise<string | undefined>;
+}
+//# sourceMappingURL=ai-terminal-command-block-variable.d.ts.map

package/lib/browser/ai-terminal-command-block-variable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-terminal-command-block-variable.d.ts","sourceRoot":"","sources":["../../src/browser/ai-terminal-command-block-variable.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,iBAAiB,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC/K,OAAO,EAAE,OAAO,EAAE,YAAY,EAAO,iBAAiB,EAA2C,MAAM,aAAa,CAAC;AAErH,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AAwBpF,qBACa,0CAA2C,YAAW,sBAAsB,EAAE,kBAAkB;IAGzG,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,kFAAkF;IAClF,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAA4B,MAAM;IAE5D,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAKnD,UAAU,CAAC,OAAO,EAAE,2BAA2B,EAAE,OAAO,EAAE,iBAAiB,GAAG,YAAY,CAAC,MAAM,CAAC;IAI5F,OAAO,CAAC,OAAO,EAAE,2BAA2B,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;cAyCxG,gBAAgB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAkClE"}

package/lib/browser/ai-terminal-command-block-variable.js

@@ -0,0 +1,132 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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
+// *****************************************************************************
+var AiTerminalCommandBlockVariableContribution_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AiTerminalCommandBlockVariableContribution = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@theia/core");
+const inversify_1 = require("@theia/core/shared/inversify");
+const terminal_service_1 = require("@theia/terminal/lib/browser/base/terminal-service");
+const TERMINAL_COMMAND_BLOCK = {
+    id: 'ai-terminal:terminal-command-block',
+    description: core_1.nls.localize('theia/ai/terminal/terminalCommandBlockAIVariable/description', 'Stores an executed terminal command and its corresponding output.'),
+    name: 'terminalCommand',
+    args: [{
+            name: 'index',
+            description: core_1.nls.localize('theia/ai/terminal/terminalCommandBlockAIVariable/index/description', 'Index of the command block in the terminal history. Defaults to the last command if not specified.')
+        }]
+};
+var CommandBlockQuickPickItem;
+(function (CommandBlockQuickPickItem) {
+    function is(item) {
+        return 'blockIndex' in item;
+    }
+    CommandBlockQuickPickItem.is = is;
+})(CommandBlockQuickPickItem || (CommandBlockQuickPickItem = {}));
+let AiTerminalCommandBlockVariableContribution = class AiTerminalCommandBlockVariableContribution {
+    static { AiTerminalCommandBlockVariableContribution_1 = this; }
+    /** Fallback line count when command history is unavailable. 50 is a heuristic. */
+    static { this.FALLBACK_TERMINAL_LINE_COUNT = 50; }
+    registerVariables(service) {
+        service.registerResolver(TERMINAL_COMMAND_BLOCK, this);
+        service.registerArgumentPicker(TERMINAL_COMMAND_BLOCK, () => this.pickCommandBlock());
+    }
+    canResolve(request, context) {
+        return request.variable.name === TERMINAL_COMMAND_BLOCK.name ? 50 : 0;
+    }
+    async resolve(request, context) {
+        const terminal = this.terminalService.lastUsedTerminal;
+        if (!terminal) {
+            return undefined;
+        }
+        if (!terminal.commandHistoryState) {
+            const bufferContent = terminal.buffer.getLines(Math.max(terminal.buffer.length
+                - AiTerminalCommandBlockVariableContribution_1.FALLBACK_TERMINAL_LINE_COUNT, 0), AiTerminalCommandBlockVariableContribution_1.FALLBACK_TERMINAL_LINE_COUNT).join('\n');
+            if (!bufferContent) {
+                return undefined;
+            }
+            return {
+                variable: TERMINAL_COMMAND_BLOCK,
+                value: bufferContent
+            };
+        }
+        const commandHistory = terminal.commandHistoryState.commandHistory;
+        if (commandHistory.length === 0) {
+            return undefined;
+        }
+        const trimmedArg = request.arg?.trim();
+        const commandIndex = trimmedArg ? Number(trimmedArg) : commandHistory.length - 1;
+        if (!Number.isInteger(commandIndex) || commandIndex < 0 || commandIndex >= commandHistory.length) {
+            this.logger.warn(`Invalid terminal command index (must be an integer and between 0 and ${commandHistory.length - 1}): ${request.arg}`);
+            return undefined;
+        }
+        const block = commandHistory[commandIndex];
+        if (!block) {
+            return undefined;
+        }
+        return {
+            variable: TERMINAL_COMMAND_BLOCK,
+            value: `### Terminal Command:\n${block.command}\n\n### Terminal Output:\n${block.output}`
+        };
+    }
+    async pickCommandBlock() {
+        if (!this.terminalService.lastUsedTerminal?.commandHistoryState) {
+            return undefined;
+        }
+        const commandHistory = this.terminalService.lastUsedTerminal.commandHistoryState.commandHistory;
+        const quickPick = this.quickInputService.createQuickPick();
+        quickPick.title = core_1.nls.localize('theia/ai/terminal/terminalCommandBlockAIVariable/quickPick/title', 'Select a command and its output from the terminal history');
+        quickPick.placeholder = core_1.nls.localize('theia/ai/terminal/terminalCommandBlockAIVariable/quickPick/placeholder', 'Type to filter commands');
+        quickPick.items = commandHistory.map((block, i) => ({
+            label: block.command,
+            // replace all whitespace with a single space for better readability
+            description: block.output.replace(/\s+/g, ' ').trim().slice(0, 60),
+            blockIndex: i
+        })).toReversed();
+        quickPick.show();
+        return new Promise(resolve => {
+            quickPick.onDidAccept(() => {
+                const selected = quickPick.selectedItems[0];
+                if (CommandBlockQuickPickItem.is(selected)) {
+                    resolve(String(selected.blockIndex));
+                }
+                quickPick.dispose();
+            });
+            quickPick.onDidHide(() => {
+                resolve(undefined);
+                quickPick.dispose();
+            });
+        });
+    }
+};
+exports.AiTerminalCommandBlockVariableContribution = AiTerminalCommandBlockVariableContribution;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(terminal_service_1.TerminalService),
+    tslib_1.__metadata("design:type", Object)
+], AiTerminalCommandBlockVariableContribution.prototype, "terminalService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.QuickInputService),
+    tslib_1.__metadata("design:type", Object)
+], AiTerminalCommandBlockVariableContribution.prototype, "quickInputService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.ILogger),
+    tslib_1.__metadata("design:type", Object)
+], AiTerminalCommandBlockVariableContribution.prototype, "logger", void 0);
+exports.AiTerminalCommandBlockVariableContribution = AiTerminalCommandBlockVariableContribution = AiTerminalCommandBlockVariableContribution_1 = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], AiTerminalCommandBlockVariableContribution);
+//# sourceMappingURL=ai-terminal-command-block-variable.js.map

package/lib/browser/ai-terminal-command-block-variable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-terminal-command-block-variable.js","sourceRoot":"","sources":["../../src/browser/ai-terminal-command-block-variable.ts"],"names":[],"mappings":"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"}

package/lib/browser/ai-terminal-contribution.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ai-terminal-contribution.spec.d.ts.map

package/lib/browser/ai-terminal-contribution.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-terminal-contribution.spec.d.ts","sourceRoot":"","sources":["../../src/browser/ai-terminal-contribution.spec.ts"],"names":[],"mappings":""}

package/lib/browser/ai-terminal-contribution.spec.js

@@ -0,0 +1,117 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const core_1 = require("@theia/core");
+const inversify_1 = require("@theia/core/shared/inversify");
+const terminal_service_1 = require("@theia/terminal/lib/browser/base/terminal-service");
+const ai_terminal_command_block_variable_1 = require("./ai-terminal-command-block-variable");
+function createMockTerminal(overrides) {
+    const { bufferLines = [], commandHistory } = overrides;
+    return {
+        buffer: {
+            length: bufferLines.length,
+            getLines: (start, length) => bufferLines.slice(start, start + length),
+        },
+        commandHistoryState: commandHistory !== undefined
+            ? { commandHistory }
+            : undefined,
+    };
+}
+function createRequest(arg) {
+    return {
+        variable: { id: 'ai-terminal:terminal-command-block', name: 'terminalCommand', description: '' },
+        arg,
+    };
+}
+const mockContext = {};
+describe('AiTerminalCommandBlockVariableContribution.resolve()', () => {
+    let mockTerminalService;
+    let contribution;
+    beforeEach(() => {
+        const container = new inversify_1.Container();
+        mockTerminalService = {
+            lastUsedTerminal: createMockTerminal({
+                commandHistory: [
+                    { command: 'ls', output: 'file1\nfile2' },
+                    { command: 'pwd', output: '/home/user' },
+                    { command: 'echo hello world', output: 'hello world' },
+                ]
+            }),
+        };
+        container.bind(terminal_service_1.TerminalService).toConstantValue(mockTerminalService);
+        container.bind(core_1.QuickInputService).toConstantValue({});
+        container.bind(core_1.ILogger).toConstantValue({ warn: () => { } });
+        container.bind(ai_terminal_command_block_variable_1.AiTerminalCommandBlockVariableContribution).toSelf();
+        contribution = container.get(ai_terminal_command_block_variable_1.AiTerminalCommandBlockVariableContribution);
+    });
+    it('returns undefined when there is no last used terminal', async () => {
+        mockTerminalService.lastUsedTerminal = undefined;
+        const result = await contribution.resolve(createRequest(), mockContext);
+        (0, chai_1.expect)(result).to.be.undefined;
+    });
+    it('returns the last command when no parameter is passed', async () => {
+        const result = await contribution.resolve(createRequest(), mockContext);
+        (0, chai_1.expect)(result?.value).to.equal('### Terminal Command:\necho hello world\n\n### Terminal Output:\nhello world');
+    });
+    it('returns the last command when the input is an empty or white space only string', async () => {
+        const emptyStringResult = await contribution.resolve(createRequest(''), mockContext);
+        const whiteSpaceResult = await contribution.resolve(createRequest('   '), mockContext);
+        (0, chai_1.expect)(emptyStringResult?.value).to.equal('### Terminal Command:\necho hello world\n\n### Terminal Output:\nhello world');
+        (0, chai_1.expect)(whiteSpaceResult?.value).to.equal('### Terminal Command:\necho hello world\n\n### Terminal Output:\nhello world');
+    });
+    it('returns the correct command according to the argument', async () => {
+        const result = await contribution.resolve(createRequest('1'), mockContext);
+        (0, chai_1.expect)(result?.value).to.equal('### Terminal Command:\npwd\n\n### Terminal Output:\n/home/user');
+    });
+    it('returns the last 50 lines of the terminal when terminal history is not enabled', async () => {
+        mockTerminalService.lastUsedTerminal = createMockTerminal({
+            bufferLines: ['ls', 'file1\nfile2', 'pwd', '/home/user']
+        });
+        const result = await contribution.resolve(createRequest(), mockContext);
+        (0, chai_1.expect)(result?.value).to.equal('ls\nfile1\nfile2\npwd\n/home/user');
+    });
+    it('returns undefined when the terminal history is empty', async () => {
+        mockTerminalService.lastUsedTerminal = createMockTerminal({
+            commandHistory: []
+        });
+        const result = await contribution.resolve(createRequest(), mockContext);
+        (0, chai_1.expect)(result).to.be.undefined;
+    });
+    it('returns undefined when the input is not a number', async () => {
+        const result = await contribution.resolve(createRequest('one'), mockContext);
+        (0, chai_1.expect)(result).to.be.undefined;
+    });
+    it('returns undefined when the input is not an integer', async () => {
+        const result = await contribution.resolve(createRequest('1.5'), mockContext);
+        (0, chai_1.expect)(result).to.be.undefined;
+    });
+    it('returns undefined when terminal history is not enabled and the buffer is empty', async () => {
+        mockTerminalService.lastUsedTerminal = createMockTerminal({});
+        const result = await contribution.resolve(createRequest(), mockContext);
+        (0, chai_1.expect)(result).to.be.undefined;
+    });
+    it('returns undefined when the input is a negative integer', async () => {
+        const result = await contribution.resolve(createRequest('-1'), mockContext);
+        (0, chai_1.expect)(result).to.be.undefined;
+    });
+    it('returns undefined when the input index is out of bounds', async () => {
+        const result = await contribution.resolve(createRequest('10'), mockContext);
+        (0, chai_1.expect)(result).to.be.undefined;
+    });
+});
+//# sourceMappingURL=ai-terminal-contribution.spec.js.map

package/lib/browser/ai-terminal-contribution.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ai-terminal-contribution.spec.js","sourceRoot":"","sources":["../../src/browser/ai-terminal-contribution.spec.ts"],"names":[],"mappings":"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"}

package/lib/browser/ai-terminal-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-terminal-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/ai-terminal-frontend-module.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAU/D,OAAO,yCAAyC,CAAC;AACjD,OAAO,kDAAkD,CAAC;;AAE1D,wBAuBG"}
+{"version":3,"file":"ai-terminal-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/ai-terminal-frontend-module.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAW/D,OAAO,yCAAyC,CAAC;AACjD,OAAO,kDAAkD,CAAC;;AAE1D,wBA0BG"}

package/lib/browser/ai-terminal-frontend-module.js

@@ -29,6 +29,7 @@ const shell_execution_server_1 = require("../common/shell-execution-server");
 const shell_command_permission_service_1 = require("./shell-command-permission-service");
 const shell_command_preferences_1 = require("../common/shell-command-preferences");
 const shell_command_analyzer_1 = require("../common/shell-command-analyzer");
+const ai_terminal_command_block_variable_1 = require("./ai-terminal-command-block-variable");
 require("../../src/browser/style/ai-terminal.css");
 require("../../src/browser/style/shell-execution-tool.css");
 exports.default = new inversify_1.ContainerModule(bind => {
@@ -47,5 +48,7 @@ exports.default = new inversify_1.ContainerModule(bind => {
     bind(shell_command_permission_service_1.ShellCommandPermissionService).toSelf().inSingletonScope();
     bind(core_1.PreferenceContribution).toConstantValue({ schema: shell_command_preferences_1.shellCommandPreferences });
     bind(shell_command_analyzer_1.ShellCommandAnalyzer).to(shell_command_analyzer_1.DefaultShellCommandAnalyzer).inSingletonScope();
+    bind(ai_terminal_command_block_variable_1.AiTerminalCommandBlockVariableContribution).toSelf().inSingletonScope();
+    bind(common_1.AIVariableContribution).toService(ai_terminal_command_block_variable_1.AiTerminalCommandBlockVariableContribution);
 });
 //# sourceMappingURL=ai-terminal-frontend-module.js.map

package/lib/browser/ai-terminal-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-terminal-frontend-module.js","sourceRoot":"","sources":["../../src/browser/ai-terminal-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,2GAAqG;AACrG,sDAAkD;AAClD,iGAAsF;AACtF,sCAA4F;AAC5F,qDAA8F;AAC9F,4DAA+D;AAC/D,2DAAsD;AACtD,yEAA2E;AAC3E,iEAA4D;AAC5D,mFAA6E;AAC7E,6EAA4F;AAC5F,yFAAmF;AACnF,mFAA8E;AAC9E,6EAAqG;AAErG,mDAAiD;AACjD,4DAA0D;AAE1D,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,wDAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,KAAK,MAAM,UAAU,IAAI,CAAC,0BAAmB,EAAE,uBAAgB,EAAE,gCAAsB,CAAC,EAAE,CAAC;QACvF,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,wDAA6B,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,CAAC,mCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,IAAI,CAAC,cAAK,CAAC,CAAC,SAAS,CAAC,mCAAe,CAAC,CAAC;IAEvC,IAAA,2CAAgB,EAAC,yCAAkB,EAAE,IAAI,CAAC,CAAC;IAE3C,IAAI,CAAC,6CAAoB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC5C,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,qCAA2B,CAAC,CAAC;QAClE,OAAO,UAAU,CAAC,WAAW,CAAuB,2CAAkB,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,sDAAwB,CAAC,CAAC,EAAE,CAAC,0DAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEjF,IAAI,CAAC,gEAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEhE,IAAI,CAAC,6BAAsB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,mDAAuB,EAAE,CAAC,CAAC;IAElF,IAAI,CAAC,6CAAoB,CAAC,CAAC,EAAE,CAAC,oDAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAClF,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ai-terminal-frontend-module.js","sourceRoot":"","sources":["../../src/browser/ai-terminal-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,2GAAqG;AACrG,sDAA0E;AAC1E,iGAAsF;AACtF,sCAA4F;AAC5F,qDAA8F;AAC9F,4DAA+D;AAC/D,2DAAsD;AACtD,yEAA2E;AAC3E,iEAA4D;AAC5D,mFAA6E;AAC7E,6EAA4F;AAC5F,yFAAmF;AACnF,mFAA8E;AAC9E,6EAAqG;AACrG,6FAAkG;AAElG,mDAAiD;AACjD,4DAA0D;AAE1D,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,wDAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,KAAK,MAAM,UAAU,IAAI,CAAC,0BAAmB,EAAE,uBAAgB,EAAE,gCAAsB,CAAC,EAAE,CAAC;QACvF,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,wDAA6B,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,CAAC,mCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,IAAI,CAAC,cAAK,CAAC,CAAC,SAAS,CAAC,mCAAe,CAAC,CAAC;IAEvC,IAAA,2CAAgB,EAAC,yCAAkB,EAAE,IAAI,CAAC,CAAC;IAE3C,IAAI,CAAC,6CAAoB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC5C,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,qCAA2B,CAAC,CAAC;QAClE,OAAO,UAAU,CAAC,WAAW,CAAuB,2CAAkB,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,sDAAwB,CAAC,CAAC,EAAE,CAAC,0DAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEjF,IAAI,CAAC,gEAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEhE,IAAI,CAAC,6BAAsB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,mDAAuB,EAAE,CAAC,CAAC;IAElF,IAAI,CAAC,6CAAoB,CAAC,CAAC,EAAE,CAAC,oDAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAE9E,IAAI,CAAC,+EAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,+BAAsB,CAAC,CAAC,SAAS,CAAC,+EAA0C,CAAC,CAAC;AACvF,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/ai-terminal",
-  "version": "1.72.0-next.2+c6615252d",
+  "version": "1.72.0-next.21+adeb3ebbf",
   "description": "Theia - AI Terminal Extension",
   "dependencies": {
-    "@theia/ai-chat": "1.72.0-next.2+c6615252d",
-    "@theia/ai-chat-ui": "1.72.0-next.2+c6615252d",
-    "@theia/ai-core": "1.72.0-next.2+c6615252d",
-    "@theia/core": "1.72.0-next.2+c6615252d",
-    "@theia/terminal": "1.72.0-next.2+c6615252d",
-    "@theia/workspace": "1.72.0-next.2+c6615252d",
-    "zod": "^4.3.6"
+    "@theia/ai-chat": "1.72.0-next.21+adeb3ebbf",
+    "@theia/ai-chat-ui": "1.72.0-next.21+adeb3ebbf",
+    "@theia/ai-core": "1.72.0-next.21+adeb3ebbf",
+    "@theia/core": "1.72.0-next.21+adeb3ebbf",
+    "@theia/terminal": "1.72.0-next.21+adeb3ebbf",
+    "@theia/workspace": "1.72.0-next.21+adeb3ebbf",
+    "zod": "^4.4.3"
   },
   "publishConfig": {
     "access": "public"
@@ -50,5 +50,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "c6615252d35303058e0bde98e8a3ca56b5efcd82"
+  "gitHead": "adeb3ebbf5e4b643b5438ca4f71fcfb4483498c8"
 }

package/src/browser/ai-terminal-command-block-variable.ts

@@ -0,0 +1,143 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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 { AIVariable, AIVariableContext, AIVariableContribution, AIVariableResolutionRequest, AIVariableResolver, AIVariableService, ResolvedAIVariable } from '@theia/ai-core';
+import { ILogger, MaybePromise, nls, QuickInputService, QuickPickItem, QuickPickItemOrSeparator } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
+
+const TERMINAL_COMMAND_BLOCK: AIVariable = {
+    id: 'ai-terminal:terminal-command-block',
+    description: nls.localize('theia/ai/terminal/terminalCommandBlockAIVariable/description', 'Stores an executed terminal command and its corresponding output.'),
+    name: 'terminalCommand',
+    args: [{
+        name: 'index',
+        description: nls.localize('theia/ai/terminal/terminalCommandBlockAIVariable/index/description',
+            'Index of the command block in the terminal history. Defaults to the last command if not specified.'
+        )
+    }]
+};
+
+interface CommandBlockQuickPickItem extends QuickPickItem {
+    blockIndex: number;
+}
+
+namespace CommandBlockQuickPickItem {
+    export function is(item: QuickPickItemOrSeparator): item is CommandBlockQuickPickItem {
+        return 'blockIndex' in item;
+    }
+}
+
+@injectable()
+export class AiTerminalCommandBlockVariableContribution implements AIVariableContribution, AIVariableResolver {
+
+    @inject(TerminalService)
+    protected readonly terminalService: TerminalService;
+
+    @inject(QuickInputService)
+    protected readonly quickInputService: QuickInputService;
+
+    @inject(ILogger)
+    protected readonly logger: ILogger;
+
+    /** Fallback line count when command history is unavailable. 50 is a heuristic. */
+    protected static readonly FALLBACK_TERMINAL_LINE_COUNT = 50;
+
+    registerVariables(service: AIVariableService): void {
+        service.registerResolver(TERMINAL_COMMAND_BLOCK, this);
+        service.registerArgumentPicker(TERMINAL_COMMAND_BLOCK, () => this.pickCommandBlock());
+    }
+
+    canResolve(request: AIVariableResolutionRequest, context: AIVariableContext): MaybePromise<number> {
+        return request.variable.name === TERMINAL_COMMAND_BLOCK.name ? 50 : 0;
+    }
+
+    async resolve(request: AIVariableResolutionRequest, context: AIVariableContext): Promise<ResolvedAIVariable | undefined> {
+        const terminal = this.terminalService.lastUsedTerminal;
+        if (!terminal) {
+            return undefined;
+        }
+        if (!terminal.commandHistoryState) {
+            const bufferContent = terminal.buffer.getLines(
+                Math.max(terminal.buffer.length
+                    - AiTerminalCommandBlockVariableContribution.FALLBACK_TERMINAL_LINE_COUNT, 0),
+                AiTerminalCommandBlockVariableContribution.FALLBACK_TERMINAL_LINE_COUNT
+            ).join('\n');
+            if (!bufferContent) {
+                return undefined;
+            }
+            return {
+                variable: TERMINAL_COMMAND_BLOCK,
+                value: bufferContent
+            };
+        }
+        const commandHistory = terminal.commandHistoryState.commandHistory;
+        if (commandHistory.length === 0) {
+            return undefined;
+        }
+
+        const trimmedArg = request.arg?.trim();
+        const commandIndex = trimmedArg ? Number(trimmedArg) : commandHistory.length - 1;
+
+        if (!Number.isInteger(commandIndex) || commandIndex < 0 || commandIndex >= commandHistory.length) {
+            this.logger.warn(`Invalid terminal command index (must be an integer and between 0 and ${commandHistory.length - 1}): ${request.arg}`);
+            return undefined;
+        }
+        const block = commandHistory[commandIndex];
+        if (!block) {
+            return undefined;
+        }
+        return {
+            variable: TERMINAL_COMMAND_BLOCK,
+            value: `### Terminal Command:\n${block.command}\n\n### Terminal Output:\n${block.output}`
+        };
+    }
+
+    protected async pickCommandBlock(): Promise<string | undefined> {
+        if (!this.terminalService.lastUsedTerminal?.commandHistoryState) {
+            return undefined;
+        }
+        const commandHistory = this.terminalService.lastUsedTerminal.commandHistoryState.commandHistory;
+        const quickPick = this.quickInputService.createQuickPick();
+        quickPick.title = nls.localize('theia/ai/terminal/terminalCommandBlockAIVariable/quickPick/title', 'Select a command and its output from the terminal history');
+        quickPick.placeholder = nls.localize(
+            'theia/ai/terminal/terminalCommandBlockAIVariable/quickPick/placeholder',
+            'Type to filter commands'
+        );
+        quickPick.items = commandHistory.map((block, i) => (
+            {
+                label: block.command,
+                // replace all whitespace with a single space for better readability
+                description: block.output.replace(/\s+/g, ' ').trim().slice(0, 60),
+                blockIndex: i
+            } as CommandBlockQuickPickItem
+        )).toReversed();
+        quickPick.show();
+        return new Promise(resolve => {
+            quickPick.onDidAccept(() => {
+                const selected = quickPick.selectedItems[0];
+                if (CommandBlockQuickPickItem.is(selected)) {
+                    resolve(String(selected.blockIndex));
+                }
+                quickPick.dispose();
+            });
+            quickPick.onDidHide(() => {
+                resolve(undefined);
+                quickPick.dispose();
+            });
+        });
+    }
+}

package/src/browser/ai-terminal-contribution.spec.ts

@@ -0,0 +1,139 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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 { expect } from 'chai';
+import { ILogger, QuickInputService } from '@theia/core';
+import { AIVariableContext, AIVariableResolutionRequest } from '@theia/ai-core';
+import { Container } from '@theia/core/shared/inversify';
+import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
+import { TerminalBlock, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
+import { AiTerminalCommandBlockVariableContribution } from './ai-terminal-command-block-variable';
+
+function createMockTerminal(overrides: Partial<{
+    bufferLines: string[];
+    commandHistory: TerminalBlock[];
+}>): TerminalWidget {
+    const { bufferLines = [], commandHistory } = overrides;
+    return {
+        buffer: {
+            length: bufferLines.length,
+            getLines: (start: number, length: number) => bufferLines.slice(start, start + length),
+        },
+        commandHistoryState: commandHistory !== undefined
+            ? { commandHistory }
+            : undefined,
+    } as unknown as TerminalWidget;
+}
+
+function createRequest(arg?: string): AIVariableResolutionRequest {
+    return {
+        variable: { id: 'ai-terminal:terminal-command-block', name: 'terminalCommand', description: '' },
+        arg,
+    };
+}
+
+const mockContext: AIVariableContext = {};
+
+describe('AiTerminalCommandBlockVariableContribution.resolve()', () => {
+    let mockTerminalService: { lastUsedTerminal: TerminalWidget | undefined };
+    let contribution: AiTerminalCommandBlockVariableContribution;
+
+    beforeEach(() => {
+        const container = new Container();
+
+        mockTerminalService = {
+            lastUsedTerminal: createMockTerminal({
+                commandHistory: [
+                    { command: 'ls', output: 'file1\nfile2' },
+                    { command: 'pwd', output: '/home/user' },
+                    { command: 'echo hello world', output: 'hello world' },
+                ]
+            }),
+        };
+
+        container.bind(TerminalService).toConstantValue(mockTerminalService as unknown as TerminalService);
+        container.bind(QuickInputService).toConstantValue({} as unknown as QuickInputService);
+        container.bind(ILogger).toConstantValue({ warn: () => { } } as unknown as ILogger);
+        container.bind(AiTerminalCommandBlockVariableContribution).toSelf();
+        contribution = container.get(AiTerminalCommandBlockVariableContribution);
+    });
+
+    it('returns undefined when there is no last used terminal', async () => {
+        mockTerminalService.lastUsedTerminal = undefined;
+        const result = await contribution.resolve(createRequest(), mockContext);
+        expect(result).to.be.undefined;
+    });
+
+    it('returns the last command when no parameter is passed', async () => {
+        const result = await contribution.resolve(createRequest(), mockContext);
+        expect(result?.value).to.equal('### Terminal Command:\necho hello world\n\n### Terminal Output:\nhello world');
+    });
+
+    it('returns the last command when the input is an empty or white space only string', async () => {
+        const emptyStringResult = await contribution.resolve(createRequest(''), mockContext);
+        const whiteSpaceResult = await contribution.resolve(createRequest('   '), mockContext);
+        expect(emptyStringResult?.value).to.equal('### Terminal Command:\necho hello world\n\n### Terminal Output:\nhello world');
+        expect(whiteSpaceResult?.value).to.equal('### Terminal Command:\necho hello world\n\n### Terminal Output:\nhello world');
+    });
+
+    it('returns the correct command according to the argument', async () => {
+        const result = await contribution.resolve(createRequest('1'), mockContext);
+        expect(result?.value).to.equal('### Terminal Command:\npwd\n\n### Terminal Output:\n/home/user');
+    });
+
+    it('returns the last 50 lines of the terminal when terminal history is not enabled', async () => {
+        mockTerminalService.lastUsedTerminal = createMockTerminal({
+            bufferLines: ['ls', 'file1\nfile2', 'pwd', '/home/user']
+        });
+        const result = await contribution.resolve(createRequest(), mockContext);
+        expect(result?.value).to.equal('ls\nfile1\nfile2\npwd\n/home/user');
+    });
+
+    it('returns undefined when the terminal history is empty', async () => {
+        mockTerminalService.lastUsedTerminal = createMockTerminal({
+            commandHistory: []
+        });
+        const result = await contribution.resolve(createRequest(), mockContext);
+        expect(result).to.be.undefined;
+    });
+
+    it('returns undefined when the input is not a number', async () => {
+        const result = await contribution.resolve(createRequest('one'), mockContext);
+        expect(result).to.be.undefined;
+    });
+
+    it('returns undefined when the input is not an integer', async () => {
+        const result = await contribution.resolve(createRequest('1.5'), mockContext);
+        expect(result).to.be.undefined;
+    });
+
+    it('returns undefined when terminal history is not enabled and the buffer is empty', async () => {
+        mockTerminalService.lastUsedTerminal = createMockTerminal({});
+        const result = await contribution.resolve(createRequest(), mockContext);
+        expect(result).to.be.undefined;
+    });
+
+    it('returns undefined when the input is a negative integer', async () => {
+        const result = await contribution.resolve(createRequest('-1'), mockContext);
+        expect(result).to.be.undefined;
+    });
+
+    it('returns undefined when the input index is out of bounds', async () => {
+        const result = await contribution.resolve(createRequest('10'), mockContext);
+        expect(result).to.be.undefined;
+    });
+
+});

package/src/browser/ai-terminal-frontend-module.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { ChatResponsePartRenderer } from '@theia/ai-chat-ui/lib/browser/chat-response-part-renderer';
-import { Agent } from '@theia/ai-core/lib/common';
+import { Agent, AIVariableContribution } from '@theia/ai-core/lib/common';
 import { bindToolProvider } from '@theia/ai-core/lib/common/tool-invocation-registry';
 import { CommandContribution, MenuContribution, PreferenceContribution } from '@theia/core';
 import { KeybindingContribution, WebSocketConnectionProvider } from '@theia/core/lib/browser';
@@ -28,6 +28,7 @@ import { ShellExecutionServer, shellExecutionPath } from '../common/shell-execut
 import { ShellCommandPermissionService } from './shell-command-permission-service';
 import { shellCommandPreferences } from '../common/shell-command-preferences';
 import { DefaultShellCommandAnalyzer, ShellCommandAnalyzer } from '../common/shell-command-analyzer';
+import { AiTerminalCommandBlockVariableContribution } from './ai-terminal-command-block-variable';
 
 import '../../src/browser/style/ai-terminal.css';
 import '../../src/browser/style/shell-execution-tool.css';
@@ -55,4 +56,7 @@ export default new ContainerModule(bind => {
     bind(PreferenceContribution).toConstantValue({ schema: shellCommandPreferences });
 
     bind(ShellCommandAnalyzer).to(DefaultShellCommandAnalyzer).inSingletonScope();
+
+    bind(AiTerminalCommandBlockVariableContribution).toSelf().inSingletonScope();
+    bind(AIVariableContribution).toService(AiTerminalCommandBlockVariableContribution);
 });