Skip to content

feat(amazonq): env var change for JupyterLab conversation history on refresh support #2395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
Merged

feat(amazonq): env var change for JupyterLab conversation history on refresh support #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad715ec
feat(amazonq): env var change for JupyterLab conversation history on …
Oct 6, 2025
1eee974
Merge branch 'main' into jupyterlab-env-var
ruotingx Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions server/aws-lsp-codewhisperer/src/language-server/agenticChat/tabBarController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import { ChatHistoryActionType } from '../../shared/telemetry/types'
import { TelemetryService } from '../../shared/telemetry/telemetryService'
import { URI } from 'vscode-uri'

const JUPYTERLAB_APP_TYPE_VALUE = 'jupyterlab'

describe('TabBarController', () => {
let testFeatures: TestFeatures
let chatHistoryDb: ChatDatabase
Expand Down Expand Up @@ -50,7 +52,7 @@ describe('TabBarController', () => {
afterEach(() => {
sinon.restore()
clock.restore()
delete process.env.JUPYTER_LAB // Clean up JupyterLab environment variables
delete process.env.SAGEMAKER_APP_TYPE_LOWERCASE // Clean up JupyterLab environment variables
testFeatures.dispose()
})

Expand Down Expand Up @@ -563,7 +565,7 @@ describe('TabBarController', () => {

it('should allow multiple loads in JupyterLab environment', async () => {
// Set JupyterLab environment
process.env.JUPYTER_LAB = 'true'
process.env.SAGEMAKER_APP_TYPE_LOWERCASE = JUPYTERLAB_APP_TYPE_VALUE

const mockTabs = [{ historyId: 'history1', conversations: [{ messages: [] }] }] as unknown as Tab[]
;(chatHistoryDb.getOpenTabs as sinon.SinonStub).returns(mockTabs)
Expand Down
5 changes: 3 additions & 2 deletions server/aws-lsp-codewhisperer/src/language-server/agenticChat/tabBarController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { ChatHistoryActionType } from '../../shared/telemetry/types'
import { CancellationError } from '@aws/lsp-core'

const MaxRestoredHistoryMessages = 250
const JUPYTERLAB_APP_TYPE_VALUE = 'jupyterlab'

/**
* Controller for managing chat history and export functionality.
Expand Down Expand Up @@ -344,9 +345,9 @@ export class TabBarController {
*/
private isJupyterLabEnvironment(): boolean {
try {
return process.env.JUPYTER_LAB === 'true'
return process.env.SAGEMAKER_APP_TYPE_LOWERCASE === JUPYTERLAB_APP_TYPE_VALUE
} catch (error) {
this.#features.logging.error(`Failed to read JUPYTER_LAB environment variable: ${error}`)
this.#features.logging.error(`Failed to read SAGEMAKER_APP_TYPE_LOWERCASE environment variable: ${error}`)
return false
}
}
Expand Down
Loading