@theia/terminal 1.70.0-next.71 → 1.70.0

package/lib/node/shell-integration-injector.js

@@ -0,0 +1,97 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 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 });
+exports.ShellIntegrationInjector = void 0;
+const tslib_1 = require("tslib");
+const path = require("path");
+const fs = require("fs");
+const shell_type_1 = require("../common/shell-type");
+const shell_process_1 = require("./shell-process");
+const inversify_1 = require("@theia/core/shared/inversify");
+let ShellIntegrationInjector = class ShellIntegrationInjector {
+    constructor() {
+        this.INTEGRATION_ROOT_DIR = 'shell-integrations';
+        this.BASH_RCFILE_FLAG = '--rcfile';
+        this.BASH_INTEGRATION_SCRIPT_PATH = 'bash/bash-integration.bash';
+        this.ZSH_INTEGRATION_ENV_VAR = 'THEIA_ZSH_DIR';
+        this.ZSH_INTEGRATION_DIR = 'zsh';
+        this.ZDOTDIR_ENV_VAR = 'ZDOTDIR';
+        this.ZDOTDIR_RELATIVE_DIR = '/zsh/zdotdir/';
+        this.ZDOTDIR_ORIGINAL_ENV_VAR = 'THEIA_ORIGINAL_ZDOTDIR';
+    }
+    injectShellIntegration(options) {
+        const shellExecutable = options.shell ?? shell_process_1.ShellProcess.getShellExecutablePath();
+        const shellType = (0, shell_type_1.guessShellTypeFromExecutable)(shellExecutable);
+        if (shellType === "bash" /* GeneralShellType.Bash */) {
+            const scriptPath = this.getShellIntegrationPath(this.BASH_INTEGRATION_SCRIPT_PATH);
+            if (!scriptPath) {
+                return options;
+            }
+            // strips the login flag if present to avoid conflicts with --rcfile
+            const filteredArgs = this.stripLoginFlag(options.args);
+            return {
+                ...options,
+                args: [
+                    this.BASH_RCFILE_FLAG, scriptPath,
+                    ...(filteredArgs ?? []),
+                ],
+            };
+        }
+        else if (shellType === "zsh" /* GeneralShellType.Zsh */) {
+            const zdotdirPath = this.getShellIntegrationPath(this.ZDOTDIR_RELATIVE_DIR);
+            const zshDirPath = this.getShellIntegrationPath(this.ZSH_INTEGRATION_DIR);
+            if (!zdotdirPath || !zshDirPath) {
+                return options;
+            }
+            return {
+                ...options,
+                env: {
+                    ...options.env,
+                    [this.ZDOTDIR_ENV_VAR]: zdotdirPath,
+                    [this.ZSH_INTEGRATION_ENV_VAR]: zshDirPath,
+                    [this.ZDOTDIR_ORIGINAL_ENV_VAR]: options.env?.ZDOTDIR ?? process.env.ZDOTDIR ?? ''
+                },
+            };
+        }
+        else {
+            return options;
+        }
+    }
+    getShellIntegrationPath(relativePath) {
+        const fullPath = path.join(__dirname, this.INTEGRATION_ROOT_DIR, relativePath);
+        if (!fs.existsSync(fullPath)) {
+            console.warn(`Shell integration file not found (application may not be bundled correctly): ${fullPath}`);
+            return undefined;
+        }
+        return fullPath;
+    }
+    stripLoginFlag(args) {
+        if (args === undefined) {
+            return args;
+        }
+        if (typeof args === 'string') {
+            // split string on any amount of whitespace into an array
+            return args.trim().split(/\s+/).filter(arg => arg !== '-l' && arg !== '--login');
+        }
+        return args.filter(arg => arg !== '-l' && arg !== '--login');
+    }
+};
+exports.ShellIntegrationInjector = ShellIntegrationInjector;
+exports.ShellIntegrationInjector = ShellIntegrationInjector = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], ShellIntegrationInjector);
+//# sourceMappingURL=shell-integration-injector.js.map

package/lib/node/shell-integration-injector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-integration-injector.js","sourceRoot":"","sources":["../../src/node/shell-integration-injector.ts"],"names":[],"mappings":"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"}

package/lib/node/shell-process.d.ts

@@ -15,6 +15,12 @@ export interface ShellProcessOptions {
     };
     strictEnv?: boolean;
     isPseudo?: boolean;
+    /**
+     * Whether to inject shell integration scripts for command tracking.
+     * When enabled, shell integration scripts are injected to emit OSC 133 sequences.
+     * @default false
+     */
+    enableShellIntegration?: boolean;
 }
 export declare function getRootPath(rootURI?: string): string;
 export declare class ShellProcess extends TerminalProcess {

package/lib/node/shell-process.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-process.d.ts","sourceRoot":"","sources":["../../src/node/shell-process.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,eAAe,EAA0B,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAInH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAG1E,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,YAAY,CAAC;AAEjF,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,MAAM,WAAW,mBAAmB;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAOpD;AAED,qBACa,YAAa,SAAQ,eAAe;IAE7C,SAAS,CAAC,MAAM,CAAC,WAAW,SAAM;IAClC,SAAS,CAAC,MAAM,CAAC,WAAW,SAAM;gBAErB,qDAAqD;IACjC,OAAO,EAAE,mBAAmB,EACjC,cAAc,EAAE,cAAc,EAC7B,UAAU,EAAE,eAAe,EAChB,MAAM,EAAE,OAAO,EACzB,gBAAgB,EAAE,gBAAgB;WAiBlD,sBAAsB,IAAI,MAAM;WAYhC,sBAAsB,IAAI,MAAM,EAAE;CAWnD"}
+{"version":3,"file":"shell-process.d.ts","sourceRoot":"","sources":["../../src/node/shell-process.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,eAAe,EAA0B,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAInH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAG1E,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,YAAY,CAAC;AAEjF,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,MAAM,WAAW,mBAAmB;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACvC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,wBAAgB,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAOpD;AAED,qBACa,YAAa,SAAQ,eAAe;IAE7C,SAAS,CAAC,MAAM,CAAC,WAAW,SAAM;IAClC,SAAS,CAAC,MAAM,CAAC,WAAW,SAAM;gBAErB,qDAAqD;IACjC,OAAO,EAAE,mBAAmB,EACjC,cAAc,EAAE,cAAc,EAC7B,UAAU,EAAE,eAAe,EAChB,MAAM,EAAE,OAAO,EACzB,gBAAgB,EAAE,gBAAgB;WAiBlD,sBAAsB,IAAI,MAAM;WAYhC,sBAAsB,IAAI,MAAM,EAAE;CAWnD"}

package/lib/node/shell-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell-process.js","sourceRoot":"","sources":["../../src/node/shell-process.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shell-process.js","sourceRoot":"","sources":["../../src/node/shell-process.ts"],"names":[],"mappings":"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"}

package/lib/node/terminal-backend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/terminal-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAKtF,OAAO,EAAsD,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAQ3H,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE;IACzF,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,UAAU,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;IAC9D,WAAW,EAAE;QAET,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,mBAAmB,CAAC;KAC5C,CAAA;CACJ,GAAG,IAAI,CAiBP;;AAED,wBAyBG"}
+{"version":3,"file":"terminal-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/terminal-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAKtF,OAAO,EAAsD,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAS3H,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE;IACzF,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,UAAU,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;IAC9D,WAAW,EAAE;QAET,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,mBAAmB,CAAC;KAC5C,CAAA;CACJ,GAAG,IAAI,CAiBP;;AAED,wBAgCG"}

package/lib/node/terminal-backend-module.js

@@ -28,6 +28,7 @@ const shell_terminal_server_1 = require("../node/shell-terminal-server");
 const terminal_watcher_1 = require("../common/terminal-watcher");
 const messaging_service_1 = require("@theia/core/lib/node/messaging/messaging-service");
 const terminal_preferences_1 = require("../common/terminal-preferences");
+const shell_integration_injector_1 = require("./shell-integration-injector");
 function bindTerminalServer(bind, { path, identifier, constructor }) {
     const dispatchingClient = new base_terminal_protocol_1.DispatchingBaseTerminalClient();
     bind(identifier).to(constructor).inSingletonScope().onActivation((context, terminalServer) => {
@@ -47,10 +48,15 @@ function bindTerminalServer(bind, { path, identifier, constructor }) {
 exports.default = new inversify_1.ContainerModule(bind => {
     bind(messaging_service_1.MessagingService.Contribution).to(terminal_backend_contribution_1.TerminalBackendContribution).inSingletonScope();
     bind(shell_process_1.ShellProcess).toSelf().inTransientScope();
+    bind(shell_integration_injector_1.ShellIntegrationInjector).toSelf().inSingletonScope();
     bind(shell_process_1.ShellProcessFactory).toFactory(ctx => (options) => {
         const child = new inversify_1.Container({ defaultScope: 'Singleton' });
         child.parent = ctx.container;
-        child.bind(shell_process_1.ShellProcessOptions).toConstantValue(options);
+        // inject shell integration scripts and env vars only if the terminal command history is enabled
+        const injectedOptions = (options.enableShellIntegration ?? false)
+            ? ctx.container.get(shell_integration_injector_1.ShellIntegrationInjector).injectShellIntegration(options)
+            : options;
+        child.bind(shell_process_1.ShellProcessOptions).toConstantValue(injectedOptions);
         return child.get(shell_process_1.ShellProcess);
     });
     bind(terminal_watcher_1.TerminalWatcher).toSelf().inSingletonScope();

package/lib/node/terminal-backend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-backend-module.js","sourceRoot":"","sources":["../../src/node/terminal-backend-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-backend-module.js","sourceRoot":"","sources":["../../src/node/terminal-backend-module.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/terminal",
-  "version": "1.70.0-next.71+7ece9ea62",
+  "version": "1.70.0",
   "description": "Theia - Terminal Extension",
   "dependencies": {
-    "@theia/core": "1.70.0-next.71+7ece9ea62",
-    "@theia/editor": "1.70.0-next.71+7ece9ea62",
-    "@theia/file-search": "1.70.0-next.71+7ece9ea62",
-    "@theia/filesystem": "1.70.0-next.71+7ece9ea62",
-    "@theia/process": "1.70.0-next.71+7ece9ea62",
-    "@theia/variable-resolver": "1.70.0-next.71+7ece9ea62",
-    "@theia/workspace": "1.70.0-next.71+7ece9ea62",
+    "@theia/core": "1.70.0",
+    "@theia/editor": "1.70.0",
+    "@theia/file-search": "1.70.0",
+    "@theia/filesystem": "1.70.0",
+    "@theia/process": "1.70.0",
+    "@theia/variable-resolver": "1.70.0",
+    "@theia/workspace": "1.70.0",
     "tslib": "^2.6.2",
     "xterm": "^5.3.0",
     "xterm-addon-fit": "^0.8.0",
@@ -51,10 +51,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.69.0"
+    "@theia/ext-scripts": "1.70.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "7ece9ea6295b73ee1ac962e29d416cebf578d380"
+  "gitHead": "d2e3d1ecaa9b1df7992eeaa1ad4584f436a83e67"
 }

package/src/browser/base/terminal-widget.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Event, ViewColumn } from '@theia/core';
+import { Disposable, Event, ViewColumn } from '@theia/core';
 import { BaseWidget } from '@theia/core/lib/browser';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering/markdown-string';
 import { ThemeIcon } from '@theia/core/lib/common/theme';
@@ -59,6 +59,11 @@ export interface TerminalBuffer {
     getLines(start: number, length: number, trimRight?: boolean): string[];
 }
 
+export interface TerminalBlock {
+    readonly command: string;
+    readonly output: string;
+}
+
 /**
  * Terminal UI widget.
  */
@@ -184,6 +189,52 @@ export abstract class TerminalWidget extends BaseWidget {
     abstract setTitle(title: string): void;
 
     abstract waitOnExit(waitOnExit?: boolean | string): void;
+
+    abstract get commandHistoryState(): TerminalCommandHistoryState | undefined;
+
+}
+
+/**
+ * State of command history in terminal.
+ */
+export interface TerminalCommandHistoryState extends Disposable {
+
+    /**
+     * Array of executed commands and their output in the terminal.
+     */
+    readonly commandHistory: TerminalBlock[];
+
+    /**
+     * The hex-decoded command currently being executed, or empty string if idle.
+     */
+    readonly currentCommand: string;
+
+    /**
+     * Marks the start of a new command execution.
+     * @param command the hexencoded command string
+     */
+    startCommand(command: string): void;
+
+    /**
+     * Records the finished command and its output as a new history block.
+     */
+    finishCommand(block: TerminalBlock): void;
+
+    /**
+     * Clears the current in-progress command state.
+     */
+    clearCommandCollectionState(): void;
+
+    /**
+     * Event which fires when terminal command starts executing.
+     */
+    onTerminalCommandStart: Event<void>;
+
+    /**
+     * Event which fires when terminal prompt is shown.
+     */
+    onTerminalPromptShown: Event<void>;
+
 }
 
 /**

package/src/browser/style/terminal.css

@@ -30,3 +30,10 @@
   /* fix secondary cursor-like issue. See https://github.com/eclipse-theia/theia/issues/8158 */
   opacity: 0 !important;
 }
+
+.terminal-command-separator {
+  border-top: var(--theia-border-width) solid var(--theia-sideBarSectionHeader-border);
+  left: 0 !important;
+  right: 0 !important;
+  width: 100% !important;
+}

package/src/browser/terminal-command-history.ts

@@ -0,0 +1,83 @@
+// *****************************************************************************
+// 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 { DisposableCollection, Event, Emitter } from '@theia/core';
+import { TerminalBlock, TerminalCommandHistoryState } from './base/terminal-widget';
+import { injectable } from '@theia/core/shared/inversify';
+
+export const TerminalCommandHistoryStateFactory = Symbol('TerminalCommandHistoryStateFactory');
+export type TerminalCommandHistoryStateFactory = () => TerminalCommandHistoryState;
+
+@injectable()
+export class TerminalCommandHistoryStateImpl implements TerminalCommandHistoryState {
+    static readonly MAX_CAPACITY = 200;
+
+    private _commandHistory: TerminalBlock[] = [];
+    get commandHistory(): TerminalBlock[] { return this._commandHistory; }
+
+    private _currentCommand: string = '';
+    get currentCommand(): string { return this._currentCommand; }
+
+    private readonly toDispose = new DisposableCollection();
+    private readonly onCommandStartEmitter = new Emitter<void>();
+    private readonly onPromptShownEmitter = new Emitter<void>();
+    protected readonly _maxCapacity: number;
+    readonly onTerminalCommandStart: Event<void> = this.onCommandStartEmitter.event;
+    readonly onTerminalPromptShown: Event<void> = this.onPromptShownEmitter.event;
+
+    constructor() {
+        this.toDispose.push(this.onCommandStartEmitter);
+        this.toDispose.push(this.onPromptShownEmitter);
+        this._maxCapacity = TerminalCommandHistoryStateImpl.MAX_CAPACITY;
+    }
+
+    startCommand(command: string): void {
+        this._currentCommand = this.decodeHexString(command);
+        this.onCommandStartEmitter.fire();
+    }
+
+    finishCommand(block: TerminalBlock): void {
+        this._commandHistory.push(block);
+        if (this._commandHistory.length > this._maxCapacity) {
+            this._commandHistory.shift();
+        }
+        this._currentCommand = '';
+        this.onPromptShownEmitter.fire();
+    }
+
+    clearCommandCollectionState(): void {
+        this._currentCommand = '';
+    }
+
+    dispose(): void {
+        this._commandHistory = [];
+        this.toDispose.dispose();
+    }
+
+    /**
+     * Decodes a hex-encoded string to UTF-8 using browser-compatible APIs.
+     */
+    protected decodeHexString(hexString: string): string {
+        if (!hexString) {
+            return '';
+        }
+        const hexBytes = new Uint8Array(
+            (hexString.match(/.{1,2}/g) || []).map(byte => parseInt(byte, 16))
+        );
+        return new TextDecoder('utf-8').decode(hexBytes);
+    }
+
+}

package/src/browser/terminal-frontend-contribution.ts

@@ -302,6 +302,26 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
         });
     }
 
+    async initializeLayout(): Promise<void> {
+        await this.preferenceService.ready;
+        // `terminal.grouping.mode` is defined in @theia/terminal-manager, which this package
+        // cannot depend on. Reading via generic PreferenceService; undefined safely
+        // falls through to standard terminal behavior.
+        const groupingMode = this.preferenceService.get('terminal.grouping.mode');
+        if (groupingMode === 'tree') {
+            return;
+        }
+        try {
+            const termWidget = await this.newTerminal({});
+            await termWidget.start();
+            // Use shell.addWidget directly (not this.open()) to add the terminal
+            // to the bottom panel without expanding it on startup.
+            this.shell.addWidget(termWidget, { area: 'bottom' });
+        } catch (error) {
+            console.error('Failed to initialize terminal in default layout', error);
+        }
+    }
+
     async contributeDefaultProfiles(): Promise<void> {
         if (OS.backend.isWindows) {
             this.contributedProfileStore.registerTerminalProfile('cmd', new ShellTerminalProfile(this, {

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

@@ -45,6 +45,7 @@ import {
     ContributedTerminalProfileStore, DefaultProfileStore, DefaultTerminalProfileService,
     TerminalProfileService, TerminalProfileStore, UserTerminalProfileStore
 } from './terminal-profile-service';
+import { TerminalCommandHistoryStateFactory, TerminalCommandHistoryStateImpl } from './terminal-command-history';
 
 export default new ContainerModule(bind => {
     bindTerminalPreferences(bind);
@@ -132,4 +133,9 @@ export default new ContainerModule(bind => {
     }).inSingletonScope();
 
     bind(FrontendApplicationContribution).toService(TerminalFrontendContribution);
+
+    bind(TerminalCommandHistoryStateImpl).toSelf().inTransientScope();
+    bind(TerminalCommandHistoryStateFactory).toFactory(ctx =>
+        () => ctx.container.get(TerminalCommandHistoryStateImpl)
+    );
 });