From 4ef030e67b66998bfdd244e0cd2da91fc4e4c0f0 Mon Sep 17 00:00:00 2001
From: Afshin Taylor Darian <git@darian.link>
Date: Wed, 24 Jul 2024 14:06:42 +0100
Subject: [PATCH] Update notebook kernel selector (#16475)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Thread in kernel manager

* remove kernel search function

* docstring driven development

* Pass in kernel ID, etc

* Refactor dropdown

* do not await session context ready for reasons

* more clean up

* fix tests

* more tests

* Show the prefix of kernel ID in change kernel dropdown that is visible in the running kernels pane

* Update group order

* Make kernelManager optional for this version

* fix docstring and unknown kernel name

* minor type signature update

* simplify arguments

* Make kernelManager optional in the ISessionContext interface for this version

* If kernel manager is not present, default to rendering all kernels from running sessions

* Expose the ability to make a temp dir so test creators can generate their own data directories

* Expose a public API for populating a <select> tag with kernel creation – both for testing and potentially for others to use

* Add an external kernel directory and item for the apputils sessioncontext tests to test external kernels rendering in the change kernel dialog

* Notebook minimap in the virtual scrollbar (#16432)

* Notebook minimap in the virtual scrollbar

* Remove `updateOutput` in favour of making `updatePrompt` an arrow func

* Improve line breaks behaviour in markdown cell previews

* Adjust prompt positioning after c26de19036609530990bffb138bb68e7bead66bd

* Add option to dismiss "Server Connection Error" dialog for the duration of the session (#16269)

* add option to dismiss dialog

* Update packages/application/src/connectionlost.ts

Co-authored-by: Jason Weill <93281816+JasonWeill@users.noreply.github.com>

* Update packages/application/src/connectionlost.ts

Co-authored-by: Jason Weill <93281816+JasonWeill@users.noreply.github.com>

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* added types, promise cached in variable, pop-up comes back up if clicked away from or dismissed

* clean up logic

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* make variables private and move to end of file, add get and set methods

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Update packages/application/src/connectionlost.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Simplify the changeset

---------

Co-authored-by: Jason Weill <93281816+JasonWeill@users.noreply.github.com>
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Update to Playwright 1.45.0 (#16530)

* [ci skip] Publish 4.3.0a1

SHA256 hashes:

jupyterlab-4.3.0a1-py3-none-any.whl: b844cebfd717ff0bdf9b14ff682eabbf4f7ab9969609f7087452f7968a82860f

jupyterlab-4.3.0a1.tar.gz: fd33ee07649c10d2c84a141dacb7cecf709f283e8e79af248e5d69f1110c04e2

jupyterlab-application-4.3.0-alpha.1.tgz: 62275c90773b497c9ef79fe6bf7ac3e0375c2f960599c7e76e41db7f786a3026

jupyterlab-application-extension-4.3.0-alpha.1.tgz: 550308d9390a3620ee6782c548e0c336a66618d917a90026a9448284b0c09d01

jupyterlab-apputils-4.4.0-alpha.1.tgz: a4fb5a4366b6b674dd22a7145065094c4fcad7adbdc4fac2c6957ec45254d7c9

jupyterlab-apputils-extension-4.3.0-alpha.1.tgz: d2fe04543ea3ed69822a328e3742418072e81de6ad42fbc0272038e1708ddafa

jupyterlab-attachments-4.3.0-alpha.1.tgz: 506b3da0cac56e40e9ef351fbe5c9712afd4611b73a47fc9dd4988b2ee7a228e

jupyterlab-builder-4.3.0-alpha.1.tgz: 986e9653c1f264cd0899d5bc4561203bb5e2cead21d878a7faa1764753c1edb1

jupyterlab-buildutils-4.3.0-alpha.1.tgz: fc971e4f041f2380c18c84112d3f5c55a0cfb4cd2c157a938a41d527780f2458

jupyterlab-cell-toolbar-4.3.0-alpha.1.tgz: d4ac4777221e4ff7404a730ac50edfa0790115443584aee6168ad888dd71c6dd

jupyterlab-cell-toolbar-extension-4.3.0-alpha.1.tgz: 48f277f956dfb151714294f29adf031ee9beffa1526a8dbed4404cd6a81635e2

jupyterlab-cells-4.3.0-alpha.1.tgz: b99f07fd44b1f6afb8153244c0567467e43767f855bee07da6377037f71690d1

jupyterlab-celltags-extension-4.3.0-alpha.1.tgz: 91f0a008a01dde142b8a35f274f07ee31933dc0abe08608ea747920d16fa1e04

jupyterlab-codeeditor-4.3.0-alpha.1.tgz: c67086158f11096f6eac38d6cc850b528884e4de0e1965929c55ab1d17047944

jupyterlab-codemirror-4.3.0-alpha.1.tgz: a26d358465e2e586969c322e7a56956a91ab65f325c5cde0d99b3e9aaa82d2d7

jupyterlab-codemirror-extension-4.3.0-alpha.1.tgz: aacd5fa4f1ae8166859ea96a873e1751ce569cd4f4e45018a4c3d96525afd825

jupyterlab-completer-4.3.0-alpha.1.tgz: 1878233761159485d1c05ebe3028b839050207d018ff04423b9e8c740b612cf9

jupyterlab-completer-extension-4.3.0-alpha.1.tgz: 9916936c0f0dce79dc12cceb3ea6d54d501edb1e09743936008a339f05c2299f

jupyterlab-console-4.3.0-alpha.1.tgz: 80a2522012b44e5ae74590c829412b3ccf7661b83a46e813a0f1d2bf78495a80

jupyterlab-console-extension-4.3.0-alpha.1.tgz: 2d7011471df012b6bb4197d3a747b7df3bda11dcd7f0feab4625d19cee809db0

jupyterlab-coreutils-6.3.0-alpha.1.tgz: a41e1e3c83329f2311f8a98bc406601a4a2ad5eac4ed0456b9658f110bc551cd

jupyterlab-csvviewer-4.3.0-alpha.1.tgz: c0da65eafc6b83ef6d53fa297345635dce8d9eea3958d95442db34b1c5a15a2a

jupyterlab-csvviewer-extension-4.3.0-alpha.1.tgz: e09e1cbad600d8ba405ff576aeeb1f19c77d34a3c1f906387aa254532bbef8f7

jupyterlab-debugger-4.3.0-alpha.1.tgz: df54b90ce47f95a4256b8dbe3ec242a9e57ab7413790ce5f64635983e1c2638f

jupyterlab-debugger-extension-4.3.0-alpha.1.tgz: 395480113048dd903efe71b44f759651a09242dc0ca0325a3cdb6aeece93aa85

jupyterlab-docmanager-4.3.0-alpha.1.tgz: bd02316d7615b879b2e5d0a0a8eb91dbeab80e7a24ce6b32d212beb4e47fdee1

jupyterlab-docmanager-extension-4.3.0-alpha.1.tgz: b8f044c0b1a2544cd3609a80077ce63fd1e7d6f6b20c8d059d1afe7c22f9195b

jupyterlab-docregistry-4.3.0-alpha.1.tgz: c94c97f883a1f7b5ea7bfd4aa2b5e6f22dbfa20a364e35601a833a4206e22bac

jupyterlab-documentsearch-4.3.0-alpha.1.tgz: 3faac028114d5087126ba855364b64ba643fc004008d703b4357fc11c5df15cc

jupyterlab-documentsearch-extension-4.3.0-alpha.1.tgz: 6860ed3a3ca86858dd383738b2b212763cdaf560e4ab742b648610ac87221e5f

jupyterlab-extensionmanager-4.3.0-alpha.1.tgz: fc194aebb5d9ff2113e99b880b5da2164bd3d4401f4f8d237a39e3f85df8ec54

jupyterlab-extensionmanager-extension-4.3.0-alpha.1.tgz: 13c6c5d8e03ae6f1a12ef7e4fde6c8bd8dfa5638692dbb9196651d814d161af3

jupyterlab-filebrowser-4.3.0-alpha.1.tgz: f77c67e35ce0b8862780390e10597d4cc7d3cc286a434b45dc5ed7643f550db3

jupyterlab-filebrowser-extension-4.3.0-alpha.1.tgz: aabaeb0c2d168e78b0ec5f1d9dc6ff4f85b2072f4bb0ddaab2d277d8274a88a9

jupyterlab-fileeditor-4.3.0-alpha.1.tgz: ceb138e4d9dac8d2732a93d2e97839c629897c39c2dcb1d74f4e177d2198af59

jupyterlab-fileeditor-extension-4.3.0-alpha.1.tgz: 48d68926fd624e702fe7958eae6589c65a7e2ecbfbcf89430ed603d1aff5f986

jupyterlab-galata-5.3.0-alpha.1.tgz: d5803f8ff84f25a7a3f58bf672026cf524f288fd32f4bc3849d4b263e2e7605c

jupyterlab-help-extension-4.3.0-alpha.1.tgz: aa663c1bed76f1c0b7f1783a2b5e8733b80d0c9814fbeff58ff105acd6f12bf8

jupyterlab-htmlviewer-4.3.0-alpha.1.tgz: 17b7663ef309e98e838854abdf7111e8c459a29d60b3f19896afffac48b24f87

jupyterlab-htmlviewer-extension-4.3.0-alpha.1.tgz: 3dcd4a6622a78bf71491f422f6e1398fe67a225d8cdfe629ca2b28de69035516

jupyterlab-hub-extension-4.3.0-alpha.1.tgz: 613e356906de930ec90a92cfb8c12e175112b303c439b217ce56a76b0d851105

jupyterlab-imageviewer-4.3.0-alpha.1.tgz: 7530054ba05b367be77e5a3c18f9dbab83e4b5d3bfc9970efe22bc879b0deb33

jupyterlab-imageviewer-extension-4.3.0-alpha.1.tgz: 19c25b66913d4d886094e78660993c3dd8ec5534f9c52ae9729918e7aa5504ae

jupyterlab-inspector-4.3.0-alpha.1.tgz: 1a154d51a0a89c45998d2fe183277ca2ec00d4979f2428402347fde48b469b21

jupyterlab-inspector-extension-4.3.0-alpha.1.tgz: 2ad76584db27ca41c1cc4958c71037e95378f2dcbbf6ac06e519a6ee9caf75e2

jupyterlab-javascript-extension-4.3.0-alpha.1.tgz: c125af9b6273897e07e15ae1492018257c6f053ace2921faf162d36059bf1544

jupyterlab-json-extension-4.3.0-alpha.1.tgz: a6a386a9deb7cc0242a426d618465e37db312af14e9a08ba60197c1f4b996fd1

jupyterlab-launcher-4.3.0-alpha.1.tgz: df598c0f370276db77724352b3ab08efae43598f7ac7444d1cb54b0ea9f68065

jupyterlab-launcher-extension-4.3.0-alpha.1.tgz: 1798928af46911cf34a8baefcc6e81517558ad7a9bdbaa1172b0c40124ff0ba9

jupyterlab-logconsole-4.3.0-alpha.1.tgz: 943f2a4882a38ffc4f3a66a60d7462525c7eff5520273379d46752a17f4aa62a

jupyterlab-logconsole-extension-4.3.0-alpha.1.tgz: a5af8707c82a1862cc141be4fbcae07359d3ebcf136c00a708ca10ac889fc138

jupyterlab-lsp-4.3.0-alpha.1.tgz: 447fb0b815b81c8da2034bcd3ea39de69b5c8ae9c339f2ce0cf53932c53553d0

jupyterlab-lsp-extension-4.3.0-alpha.1.tgz: 3e1d5395b60b049db515a90e75025e85b83e49c6bf13193e4394465c1d6d19c2

jupyterlab-mainmenu-4.3.0-alpha.1.tgz: cb8374c43828f4a13bf87ccd1b4f2122f6877c785c1c3f8bce24d8257ae13da9

jupyterlab-mainmenu-extension-4.3.0-alpha.1.tgz: 1fa39d367aed51da40ecf73cfd3cceeea7e38561baf1078f1f36c99810702f1e

jupyterlab-markdownviewer-4.3.0-alpha.1.tgz: 2482ca1144ba0289141b200ae014fa67e80d1a95d3221e40d8fff941b9ab289d

jupyterlab-markdownviewer-extension-4.3.0-alpha.1.tgz: 0e2157d61b62c67bab090da9d3c5c1404e519bce168e24055bd32eefa1d03b32

jupyterlab-markedparser-extension-4.3.0-alpha.1.tgz: 9f9bbf952c3ab214c139815f960ceeeddb2ca1ae9d5f1f0aa574959a1054798b

jupyterlab-mathjax-extension-4.3.0-alpha.1.tgz: d35a9fb0b3fc07ef760db310a9d9b199dfdd4ac6ecbfa42dc4e27b10edd297b5

jupyterlab-mermaid-4.3.0-alpha.1.tgz: 2912f917b17be7ab2aac8d16709254f7d8f4e402e472596c624718bd9d57d6ca

jupyterlab-mermaid-extension-4.3.0-alpha.1.tgz: 92951f22f3150e8d091b72e84e263b072bff62ae093018c9f53c761508e05eaa

jupyterlab-metadataform-4.3.0-alpha.1.tgz: 9fbca9b12231b54bc179af200843155af82c1836d0c70b1bae49fc0b7ae1d261

jupyterlab-metadataform-extension-4.3.0-alpha.1.tgz: 22797754823a8c34db07789b93e81dd99a30c8de54fe0c93a6d24e7e691f7cf1

jupyterlab-metapackage-4.3.0-alpha.1.tgz: 403f3490b0cf8366b3ce021577154a95f6aaa81b1c477d1ea89e3ecd3bc255c6

jupyterlab-nbconvert-css-4.3.0-alpha.1.tgz: 81ee952eef731ef7f61db8f2222748dd668ba0ca699aced6748c2a830096ee65

jupyterlab-nbformat-4.3.0-alpha.1.tgz: 78148c6d690eaaf4627d6238ddd9eb131fb71694e8ad0f51d70bcf6c3ad9b45e

jupyterlab-notebook-4.3.0-alpha.1.tgz: f346d39ff47a778e89fd3e6ce67dce798c0f6fc9f745749dfca897fba48619fc

jupyterlab-notebook-extension-4.3.0-alpha.1.tgz: ed936232825b64382ebbcdfe90126958b7e2984a79238023c54694c925d888e1

jupyterlab-observables-5.3.0-alpha.1.tgz: af21c016c7d715d75339559bad081ef6eba755afd1df08dd27aac2820c3634c3

jupyterlab-outputarea-4.3.0-alpha.1.tgz: 25cf942b4079b7b7760c0e991de2316af7267e3f846e87ec5423730667c59ed1

jupyterlab-pdf-extension-4.3.0-alpha.1.tgz: b849e919380dbc2f113e6d49c9959c888a51cb08c64e1acabb81c3aa7e64cf0e

jupyterlab-pluginmanager-4.3.0-alpha.1.tgz: 3156470c3c98efd42b415b9ed72b4a4ad91ab9c7173a255693ba064b029680f1

jupyterlab-pluginmanager-extension-4.3.0-alpha.1.tgz: 0521ced83575412ebec42be748c92a1d5868bfb0a3f13343c695b30948437557

jupyterlab-property-inspector-4.3.0-alpha.1.tgz: 104bab2e6e6721150315150f2af87998b85614a330bc22460e7f2c1487e9934a

jupyterlab-rendermime-4.3.0-alpha.1.tgz: baf5e24e691b952edc6620038cba7962ccd0c48e888748209f4485f67244791a

jupyterlab-rendermime-extension-4.3.0-alpha.1.tgz: d7e9e1f7fe21bff8fa6c102e457bad7ae85cb496f784baec9069c696c2b75f6d

jupyterlab-rendermime-interfaces-3.11.0-alpha.1.tgz: 06e1a9ef09a65102922c3fc9c90b4f44bd2f1949b6dc37919e23700db4d4c412

jupyterlab-running-4.3.0-alpha.1.tgz: e25c4f08a96badfe0c0b91afe45d64b85648e43a787517833a85f29f225c75d6

jupyterlab-running-extension-4.3.0-alpha.1.tgz: d0d3acb5ba2db9b30a70552ea0f4199e5a30cc08fa1674f6fa7f3059b51722de

jupyterlab-services-7.3.0-alpha.1.tgz: d55a50b87073cd3fc256c41ae7dd82d84bebee1593b2bf339c67fc0d19db04de

jupyterlab-settingeditor-4.3.0-alpha.1.tgz: 0d62d1965a5ae6e8c2805b4c8e7eee377341dc7aaf348a458d3ed0ad6ebecc71

jupyterlab-settingeditor-extension-4.3.0-alpha.1.tgz: 96755d568e63e8e263967f53618eb5890189223c3fe3fc03cdeb91638644fef2

jupyterlab-settingregistry-4.3.0-alpha.1.tgz: ea6de5086f5ad656b0b3b3c94a32269996af4e0279b9c5f83d82b6bdc21ed123

jupyterlab-shortcuts-extension-5.1.0-alpha.1.tgz: 40b4af8d80365c21f7b9bffe34b14abe3f43333335691071a163a916c1430841

jupyterlab-statedb-4.3.0-alpha.1.tgz: a566c0423efc174e3dec30a3fddd706e1ceb0ee39fa30cb2767867a895d2bc27

jupyterlab-statusbar-4.3.0-alpha.1.tgz: 7e7138708c88bc54d62523e0ed44a3ffed625e6556094b277a06dc473ae6402c

jupyterlab-statusbar-extension-4.3.0-alpha.1.tgz: 0bdbc2cbc633a5032ba5e41cb481959294cc3ef3a6960a70e03ed8ead8f0ca43

jupyterlab-template-4.3.0-alpha.1.tgz: 5b4473b16933ff5985cd1511c5c79f0497f861123e8c0a47cb6d4845ebc7e730

jupyterlab-terminal-4.3.0-alpha.1.tgz: 482d57c324ab87bf874d1b7da894011911b45902be1ae02c975c126be492ad42

jupyterlab-terminal-extension-4.3.0-alpha.1.tgz: 58231169cad75f698eeced49a30c53a6d6d03425c65a5de1500d30a79eae27c9

jupyterlab-testing-4.3.0-alpha.1.tgz: 1df2fcb56b5bf71294e4c67b492eb00edf24c4090c3a0aff2a01be4332137900

jupyterlab-testutils-4.3.0-alpha.1.tgz: d57acf14166354dec2e40fc5429b0645a9df69774e4e08b39f035da219e86c85

jupyterlab-theme-dark-extension-4.3.0-alpha.1.tgz: 7411a22ba4195ef8f530015a56781bbce1b999133a0d89190613d9e66e5bbf6e

jupyterlab-theme-dark-high-contrast-extension-4.3.0-alpha.1.tgz: 25b5d024e3b99b8b982924bc66b591a9d52d4fb0abe5331ec880a26c8b675860

jupyterlab-theme-light-extension-4.3.0-alpha.1.tgz: 1c06f65fe710105b6ca91b5099c943ce5cab93dce75c438bf7d0b038a152c75c

jupyterlab-toc-6.3.0-alpha.1.tgz: cb6dc0c79f2800b0b616aabc9b2d06c9fa0cd11a333c847f9cbf25f890e94c37

jupyterlab-toc-extension-6.3.0-alpha.1.tgz: 096e485e928f031ea578b9914ca257c2b1289d96df745c020a22e04b6f0d4258

jupyterlab-tooltip-4.3.0-alpha.1.tgz: 467723d14304f905a5dae7452967792beaa80f48f4e7d5d1054b9202d83b562c

jupyterlab-tooltip-extension-4.3.0-alpha.1.tgz: 032a689a78dec5dfd9bcaf6d30fea98717762a6c6203c311fab2b76cd2040965

jupyterlab-translation-4.3.0-alpha.1.tgz: 58065a9bc36f2be1b1f2b7ad49cfaf53821e528b1f1c778855648b8522ac36ca

jupyterlab-translation-extension-4.3.0-alpha.1.tgz: 692fd0e689b138feae71b8cfe4b12880c2f263e5599b47c29cb66a0f95f92a4f

jupyterlab-ui-components-4.3.0-alpha.1.tgz: 792ac2297c2c4c281c50a09111234617f723267b416b9ad8247b777976565b60

jupyterlab-ui-components-extension-4.3.0-alpha.1.tgz: b5b7417c791431f0d78b6fd44ce70ead2dad71ced678c9ca00b6d0e6acf58bca

jupyterlab-vega5-extension-4.3.0-alpha.1.tgz: 5ee81de4122a12a77f13ea5f629c04d904ed096d28f6ae17ffa333e8aa8916a7

jupyterlab-workspaces-4.3.0-alpha.1.tgz: eced161f00029ceb049482ea5a40db10ce1c46c18a55b2326278c0c27c7a1497

jupyterlab-workspaces-extension-4.3.0-alpha.1.tgz: 64c72d2ea1b3574c5f1de0e050a0d87c469d20846ce75a0cdab82be40a7038e1

* Add checkbox to skip showing the kernel restart dialog (#16265)

* Add checkbox to skip showing the kernel restart dialog

* Swap to Setting Registry

* add ISettingRegistry to sessionDialogs

* Add null option for ISettingRegistry

* unlink checkbox with setting

* Suggested changes

* typo

* Leave the API of testing JupyterServer as it exists in main

* Refactor per Fred's suggestion

* no reify

* dedupe

* tweak

* Consolidate the types used in the kernel options function into one interface

---------

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
Co-authored-by: Rosio <rosio_reyes@yahoo.com>
Co-authored-by: Jason Weill <93281816+JasonWeill@users.noreply.github.com>
Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Co-authored-by: krassowski <krassowski@users.noreply.github.com>
Co-authored-by: Elijah McMorris <NexVeridian@gmail.com>
---
 examples/cell/src/index.ts                    |   1 +
 packages/apputils/src/sessioncontext.tsx      | 609 ++++++++++--------
 packages/apputils/src/testutils.ts            |   1 +
 packages/apputils/test/sessioncontext.spec.ts |  70 +-
 packages/console/src/panel.ts                 |   1 +
 packages/docregistry/src/context.ts           |   1 +
 6 files changed, 429 insertions(+), 254 deletions(-)

diff --git a/examples/cell/src/index.ts b/examples/cell/src/index.ts
index bb7c7afaddf0..fd0799781a09 100644
--- a/examples/cell/src/index.ts
+++ b/examples/cell/src/index.ts
@@ -63,6 +63,7 @@ function main(): void {
   const specsManager = new KernelSpecManager();
   const sessionManager = new SessionManager({ kernelManager });
   const sessionContext = new SessionContext({
+    kernelManager,
     sessionManager,
     specsManager,
     name: 'Example'
diff --git a/packages/apputils/src/sessioncontext.tsx b/packages/apputils/src/sessioncontext.tsx
index 6b0a85a802b3..3f4e23f03d16 100644
--- a/packages/apputils/src/sessioncontext.tsx
+++ b/packages/apputils/src/sessioncontext.tsx
@@ -197,6 +197,14 @@ export interface ISessionContext extends IObservableDisposable {
    */
   readonly prevKernelName: string;
 
+  /**
+   * The kernel manager
+   *
+   * #### Notes
+   * In the next major version of this interface, a kernel manager is required.
+   */
+  readonly kernelManager?: Kernel.IManager;
+
   /**
    * The session manager used by the session.
    */
@@ -347,6 +355,7 @@ export class SessionContext implements ISessionContext {
    * Construct a new session context.
    */
   constructor(options: SessionContext.IOptions) {
+    this.kernelManager = options.kernelManager;
     this.sessionManager = options.sessionManager;
     this.specsManager = options.specsManager;
     this.translator = options.translator || nullTranslator;
@@ -523,6 +532,11 @@ export class SessionContext implements ISessionContext {
     return this._isRestarting;
   }
 
+  /**
+   * The kernel manager
+   */
+  readonly kernelManager?: Kernel.IManager;
+
   /**
    * The session manager used by the session.
    */
@@ -1247,6 +1261,14 @@ export namespace SessionContext {
    * The options used to initialize a context.
    */
   export interface IOptions {
+    /**
+     * A kernel manager instance.
+     *
+     * #### Notes
+     * In the next version of this package, `kernelManager` will be required.
+     */
+    kernelManager?: Kernel.IManager;
+
     /**
      * A session manager instance.
      */
@@ -1292,6 +1314,11 @@ export namespace SessionContext {
    * An interface for populating a kernel selector.
    */
   export interface IKernelSearch {
+    /**
+     * The current running kernels.
+     */
+    kernels?: Iterable<Kernel.IModel>;
+
     /**
      * The Kernel specs.
      */
@@ -1339,18 +1366,17 @@ export class SessionContextDialogs implements ISessionContext.IDialogs {
     if (sessionContext.isDisposed) {
       return Promise.resolve();
     }
-    const trans = this._translator.load('jupyterlab');
 
-    // If there is no existing kernel, offer the option
-    // to keep no kernel.
+    const translator = this._translator;
+    const trans = translator.load('jupyterlab');
+
+    // If there is no existing kernel, offer the option to keep no kernel.
     let label = trans.__('Cancel');
     if (sessionContext.hasNoKernel) {
       label = sessionContext.kernelDisplayName;
     }
     const buttons = [
-      Dialog.cancelButton({
-        label
-      }),
+      Dialog.cancelButton({ label }),
       Dialog.okButton({
         label: trans.__('Select'),
         ariaLabel: trans.__('Select Kernel')
@@ -1362,7 +1388,7 @@ export class SessionContextDialogs implements ISessionContext.IDialogs {
 
     const dialog = new Dialog({
       title: trans.__('Select Kernel'),
-      body: new Private.KernelSelector(sessionContext, this._translator),
+      body: Private.createKernelSelector(sessionContext, translator),
       buttons,
       checkbox: hasCheckbox
         ? {
@@ -1484,21 +1510,317 @@ export class SessionContextDialogs implements ISessionContext.IDialogs {
   private _settingRegistry: ISettingRegistry | null;
 }
 
+export namespace SessionContextDialogs {
+  /**
+   * An interface that abstracts the available kernel switching choices.
+   */
+  export interface IKernelOptions {
+    /**
+     * Whether kernel options should be disabled.
+     */
+    disabled?: boolean;
+
+    /**
+     * An array of kernel option groups that correspond with `<optgroup>`.
+     */
+    groups: Array<{
+      /**
+       * The option group label.
+       */
+      label: string;
+
+      /**
+       * Individual kernel (and spec) options that correspond with `<option>`.
+       */
+      options: Array<{
+        /**
+         * Whether the option is selected.
+         */
+        selected?: boolean;
+
+        /**
+         * The display text of the option.
+         */
+        text: string;
+
+        /**
+         * The display title of the option.
+         */
+        title?: string;
+
+        /**
+         * The underlying (stringified JSON) value of the option.
+         */
+        value: string;
+      }>;
+    }>;
+  }
+
+  /**
+   * Returns available kernel options grouped based on session context.
+   *
+   * #### Notes
+   * If a language preference is set in the given session context, the options
+   * returned are grouped with the language preference at the top:
+   *
+   *  - (Start %1 Kernel, language)
+   *    - { all kernelspecs whose language matches in alphabetical order }
+   *  - (Use No Kernel)
+   *    - `No Kernel`
+   *  - (Start Kernel)
+   *    - { all other kernelspecs in alphabetical order }
+   *  - (Connect to Existing %1 Kernel, language)
+   *    - { all running kernels whose language matches in alphabetical order }
+   *  - (Connect to Kernel)
+   *    - { all other running kernels in alphabetical order }
+   *
+   * If no language preference is set, these groups and options are returned:
+   *
+   *  - (Start Kernel)
+   *    - { all kernelspecs in alphabetical order }
+   *  - (Use No Kernel)
+   *    - `No Kernel`
+   *  - (Connect to Existing Kernel)
+   *    - { all running kernels in alphabetical order  }
+   *
+   * If the session has a kernel ID and a kernel exists with that id, its
+   * corresponding option has `selected` set to `true`. Otherwise if the session
+   * context language preference is set, the first kernelspec that matches it is
+   * selected.
+   */
+  export function kernelOptions(
+    sessionContext: ISessionContext,
+    translator: ITranslator | null = null
+  ): IKernelOptions {
+    const options: IKernelOptions = { disabled: false, groups: [] };
+    // Create mapping of sessions and kernel ids.
+    const kernels = Array.from(
+      sessionContext.kernelManager?.running() ??
+        // If kernel manager is unavailable use kernels from running sessions.
+        // TODO: Remove this (next version) when kernel manager is guaranteed.
+        Array.from(sessionContext.sessionManager.running())
+          .filter(session => !!session.kernel)
+          .map(session => session.kernel!)
+    );
+    const sessions = Array.from(
+      sessionContext.sessionManager.running() ?? []
+    ).reduce(
+      (sessions, session) => {
+        if (session.kernel?.id) sessions[session.kernel.id] = session;
+        return sessions;
+      },
+      {} as { [kernel: string]: Session.IModel }
+    );
+    const preference = {
+      ...sessionContext.kernelPreference,
+      id: sessionContext.session?.kernel?.id
+    };
+    const currentKernelDisplayName = !sessionContext.hasNoKernel
+      ? sessionContext.kernelDisplayName
+      : null;
+    const specs = {
+      default: '',
+      kernelspecs: Object.create(null) as {
+        [key: string]: KernelSpec.ISpecModel;
+      },
+      ...sessionContext.specsManager.specs
+    };
+
+    // Create mapping of languages and kernel names.
+    const sorted: KernelSpec.ISpecModel[] = [];
+    const languages: { [key: string]: string } = Object.create(null);
+
+    for (const name in specs.kernelspecs) {
+      sorted.push(specs.kernelspecs[name]!);
+      languages[name] = specs.kernelspecs[name]!.language;
+    }
+    sorted.sort((a, b) => a.display_name.localeCompare(b.display_name));
+    translator = translator || nullTranslator;
+
+    const trans = translator.load('jupyterlab');
+    const language =
+      preference.language ||
+      languages[preference.name!] ||
+      (preference.id ? languages[sessions[preference.id]?.name] : '');
+    const labels = {
+      connectKernel: trans.__('Connect to Existing Kernel'),
+      startPreferred: trans.__('Start %1 Kernel', language),
+      startOther: trans.__('Start Kernel'),
+      connectToPreferred: trans.__('Connect to Existing %1 Kernel', language),
+      connectToOther: trans.__('Connect to Other Kernel'),
+      noKernel: trans.__('No Kernel'),
+      startKernel: trans.__('Start Kernel'),
+      useNoKernel: trans.__('Use No Kernel')
+    };
+    const noKernel = {
+      label: labels.useNoKernel,
+      options: [
+        {
+          text: labels.noKernel,
+          title: labels.noKernel,
+          value: JSON.stringify(null)
+        }
+      ]
+    };
+    const optionForKernel = (
+      kernel: Kernel.IModel,
+      displayName?: string,
+      session?: Session.IModel
+    ): IKernelOptions['groups'][number]['options'][number] => {
+      const sessionName = session
+        ? session.name || PathExt.basename(session.path)
+        : kernel.name || trans.__('Unknown Kernel');
+      return {
+        text: `${sessionName} (${kernel.id.split('-')[0]})`,
+        title:
+          (session ? `${trans.__('Path: %1', session.path)}\n` : ``) +
+          `${trans.__('Name: %1', sessionName)}\n` +
+          `${trans.__('Kernel Name: %1', displayName ?? kernel.name)}\n` +
+          `${trans.__('Kernel Id: %1', kernel.id)}`,
+        value: JSON.stringify({ id: kernel.id })
+      };
+    };
+    const optionForSpec = (
+      spec: KernelSpec.ISpecModel
+    ): IKernelOptions['groups'][number]['options'][number] => ({
+      text: spec.display_name,
+      value: JSON.stringify({ name: spec.name })
+    });
+
+    // If a kernel cannot be started, bail.
+    if (preference.canStart === false) {
+      options.disabled = true;
+      options.groups.push(noKernel);
+      return options;
+    }
+
+    // Create kernel option groups based on whether language preference exists.
+    if (language) {
+      // Add all kernelspecs, separating out the preferred language first.
+      const preferred: IKernelOptions['groups'][number] = {
+        label: labels.startPreferred,
+        options: []
+      };
+      const other: IKernelOptions['groups'][number] = {
+        label: labels.startOther,
+        options: []
+      };
+      const preferredRunning: IKernelOptions['groups'][number] = {
+        label: labels.connectToPreferred,
+        options: []
+      };
+      const otherRunning: IKernelOptions['groups'][number] = {
+        label: labels.connectToOther,
+        options: []
+      };
+      for (const spec of sorted) {
+        (spec.language === language ? preferred : other).options.push(
+          optionForSpec(spec)
+        );
+      }
+      options.groups.push(preferred);
+      options.groups.push(noKernel);
+      options.groups.push(other);
+      kernels
+        .map(kernel => ({
+          option: optionForKernel(
+            kernel,
+            specs.kernelspecs[kernel.name]?.display_name ?? '',
+            sessions[kernel.id]
+          ),
+          language: languages[kernel.name]
+        }))
+        .sort((a, b) => a.option.text.localeCompare(b.option.text))
+        .forEach(kernel =>
+          (language === kernel.language
+            ? preferredRunning
+            : otherRunning
+          ).options.push(kernel.option)
+        );
+      if (preferredRunning.options.length)
+        options.groups.push(preferredRunning);
+      if (otherRunning.options.length) options.groups.push(otherRunning);
+    } else {
+      // Add kernelspecs first.
+      options.groups.push({
+        label: labels.startKernel,
+        options: sorted.map(spec => optionForSpec(spec))
+      });
+
+      // Next add the no kernel option.
+      options.groups.push(noKernel);
+
+      // Add running kernels.
+      options.groups.push({
+        label: labels.connectKernel,
+        options: kernels
+          .map(kernel =>
+            optionForKernel(
+              kernel,
+              specs.kernelspecs[kernel.name]?.display_name ?? '',
+              sessions[kernel.id]
+            )
+          )
+          .sort((a, b) => a.text.localeCompare(b.text))
+      });
+    }
+    // Set the selected option.
+    if (preference.id || currentKernelDisplayName || preference.name) {
+      for (const group of options.groups) {
+        for (const option of group.options) {
+          const choice = JSON.parse(option.value) as null | Kernel.IModel;
+          if (!choice) continue;
+          if (preference.id) {
+            if (preference.id === choice.id) {
+              option.selected = true;
+              return options;
+            }
+            continue;
+          }
+          if (currentKernelDisplayName) {
+            if (
+              currentKernelDisplayName ===
+              specs.kernelspecs[choice.name]?.display_name
+            ) {
+              option.selected = true;
+              return options;
+            }
+            continue;
+          }
+          if (preference.name) {
+            if (preference.name === choice.name) {
+              option.selected = true;
+              return options;
+            }
+            continue;
+          }
+        }
+      }
+    }
+
+    return options;
+  }
+}
+
 /**
  * The namespace for module private data.
  */
 namespace Private {
   /**
-   * A widget that provides a kernel selection.
+   * Return a kernel selector widget.
    */
-  export class KernelSelector extends Widget {
-    /**
-     * Create a new kernel selector widget.
-     */
-    constructor(sessionContext: ISessionContext, translator?: ITranslator) {
-      super({ node: createSelectorNode(sessionContext, translator) });
-    }
+  export const createKernelSelector = (
+    sessionContext: ISessionContext,
+    translator?: ITranslator
+  ) =>
+    new KernelSelector({
+      node: createSelectorNode(sessionContext, translator)
+    });
 
+  /**
+   * A widget that provides a kernel selection.
+   */
+  class KernelSelector extends Widget {
     /**
      * Get the value of the kernel selector widget.
      */
@@ -1509,7 +1831,7 @@ namespace Private {
   }
 
   /**
-   * Create a node for a kernel selector widget.
+   * Create an HTML node for a kernel selector widget.
    */
   function createSelectorNode(
     sessionContext: ISessionContext,
@@ -1526,15 +1848,27 @@ namespace Private {
     }"`;
     body.appendChild(text);
 
-    const options = getKernelSearch(sessionContext);
-    const selector = document.createElement('select');
-    populateKernelSelect(
-      selector,
-      options,
-      translator,
-      !sessionContext.hasNoKernel ? sessionContext.kernelDisplayName : null
+    const select = document.createElement('select');
+    const options = SessionContextDialogs.kernelOptions(
+      sessionContext,
+      translator
     );
-    body.appendChild(selector);
+    if (options.disabled) select.disabled = true;
+    for (const group of options.groups) {
+      const { label, options } = group;
+      const optgroup = document.createElement('optgroup');
+      optgroup.label = label;
+      for (const { selected, text, title, value } of options) {
+        const option = document.createElement('option');
+        if (selected) option.selected = true;
+        if (title) option.title = title;
+        option.text = text;
+        option.value = value;
+        optgroup.appendChild(option);
+      }
+      select.appendChild(optgroup);
+    }
+    body.appendChild(select);
     return body;
   }
 
@@ -1595,231 +1929,4 @@ namespace Private {
     // No matches found.
     return defaultName;
   }
-
-  /**
-   * Populate a kernel select node for the session.
-   */
-  export function populateKernelSelect(
-    node: HTMLSelectElement,
-    options: SessionContext.IKernelSearch,
-    translator?: ITranslator,
-    currentKernelDisplayName: string | null = null
-  ): void {
-    while (node.firstChild) {
-      node.removeChild(node.firstChild);
-    }
-
-    const { preference, sessions, specs } = options;
-    const { name, id, language, canStart, shouldStart } = preference;
-
-    translator = translator || nullTranslator;
-    const trans = translator.load('jupyterlab');
-
-    if (!specs || canStart === false) {
-      node.appendChild(optionForNone(translator));
-      node.value = 'null';
-      node.disabled = true;
-      return;
-    }
-
-    node.disabled = false;
-
-    // Create mappings of display names and languages for kernel name.
-    const displayNames: { [key: string]: string } = Object.create(null);
-    const languages: { [key: string]: string } = Object.create(null);
-    for (const name in specs.kernelspecs) {
-      const spec = specs.kernelspecs[name]!;
-      displayNames[name] = spec.display_name;
-      languages[name] = spec.language;
-    }
-
-    // Handle a kernel by name.
-    const names: string[] = [];
-    if (name && name in specs.kernelspecs) {
-      names.push(name);
-    }
-
-    // Then look by language if we have a selected and existing kernel.
-    if (name && names.length > 0 && language) {
-      for (const specName in specs.kernelspecs) {
-        if (name !== specName && languages[specName] === language) {
-          names.push(specName);
-        }
-      }
-    }
-
-    // Use the default kernel if no kernels were found.
-    if (!names.length) {
-      names.push(specs.default);
-    }
-
-    // Handle a preferred kernels in order of display name.
-    const preferred = document.createElement('optgroup');
-    preferred.label = trans.__('Start Preferred Kernel');
-
-    names.sort((a, b) => displayNames[a].localeCompare(displayNames[b]));
-    for (const name of names) {
-      preferred.appendChild(optionForName(name, displayNames[name]));
-    }
-
-    if (preferred.firstChild) {
-      node.appendChild(preferred);
-    }
-
-    // Add an option for no kernel
-    node.appendChild(optionForNone(translator));
-
-    const other = document.createElement('optgroup');
-    other.label = trans.__('Start Other Kernel');
-
-    // Add the rest of the kernel names in alphabetical order.
-    const otherNames: string[] = [];
-    for (const specName in specs.kernelspecs) {
-      if (names.indexOf(specName) !== -1) {
-        continue;
-      }
-      otherNames.push(specName);
-    }
-    otherNames.sort((a, b) => displayNames[a].localeCompare(displayNames[b]));
-    for (const otherName of otherNames) {
-      other.appendChild(optionForName(otherName, displayNames[otherName]));
-    }
-    // Add a separator option if there were any other names.
-    if (otherNames.length) {
-      node.appendChild(other);
-    }
-
-    // Handle the default value.
-    if (shouldStart === false) {
-      node.value = 'null';
-    } else {
-      let selectedIndex = 0;
-      if (currentKernelDisplayName) {
-        // Select current kernel by default.
-        selectedIndex = [...node.options].findIndex(
-          option => option.text === currentKernelDisplayName
-        );
-        selectedIndex = Math.max(selectedIndex, 0);
-      }
-      node.selectedIndex = selectedIndex;
-    }
-
-    // Bail if there are no sessions.
-    if (!sessions) {
-      return;
-    }
-
-    // Add the sessions using the preferred language first.
-    const matchingSessions: Session.IModel[] = [];
-    const otherSessions: Session.IModel[] = [];
-
-    for (const session of sessions) {
-      if (
-        language &&
-        session.kernel &&
-        languages[session.kernel.name] === language &&
-        session.kernel.id !== id
-      ) {
-        matchingSessions.push(session);
-      } else if (session.kernel?.id !== id) {
-        otherSessions.push(session);
-      }
-    }
-
-    const matching = document.createElement('optgroup');
-    matching.label = trans.__('Use Kernel from Preferred Session');
-    node.appendChild(matching);
-
-    if (matchingSessions.length) {
-      matchingSessions.sort((a, b) => {
-        return a.path.localeCompare(b.path);
-      });
-
-      for (const session of matchingSessions) {
-        const name = session.kernel ? displayNames[session.kernel.name] : '';
-        matching.appendChild(optionForSession(session, name, translator));
-      }
-    }
-
-    const otherSessionsNode = document.createElement('optgroup');
-    otherSessionsNode.label = trans.__('Use Kernel from Other Session');
-    node.appendChild(otherSessionsNode);
-
-    if (otherSessions.length) {
-      otherSessions.sort((a, b) => {
-        return a.path.localeCompare(b.path);
-      });
-
-      for (const session of otherSessions) {
-        const name = session.kernel
-          ? displayNames[session.kernel.name] || session.kernel.name
-          : '';
-        otherSessionsNode.appendChild(
-          optionForSession(session, name, translator)
-        );
-      }
-    }
-  }
-
-  /**
-   * Get the kernel search options given a session context and session manager.
-   */
-  function getKernelSearch(
-    sessionContext: ISessionContext
-  ): SessionContext.IKernelSearch {
-    return {
-      specs: sessionContext.specsManager.specs,
-      sessions: sessionContext.sessionManager.running(),
-      preference: sessionContext.kernelPreference
-    };
-  }
-
-  /**
-   * Create an option element for a kernel name.
-   */
-  function optionForName(name: string, displayName: string): HTMLOptionElement {
-    const option = document.createElement('option');
-    option.text = displayName;
-    option.value = JSON.stringify({ name });
-    return option;
-  }
-
-  /**
-   * Create an option for no kernel.
-   */
-  function optionForNone(translator?: ITranslator): HTMLOptGroupElement {
-    translator = translator || nullTranslator;
-    const trans = translator.load('jupyterlab');
-
-    const group = document.createElement('optgroup');
-    group.label = trans.__('Use No Kernel');
-    const option = document.createElement('option');
-    option.text = trans.__('No Kernel');
-    option.value = 'null';
-    group.appendChild(option);
-    return group;
-  }
-
-  /**
-   * Create an option element for a session.
-   */
-  function optionForSession(
-    session: Session.IModel,
-    displayName: string,
-    translator?: ITranslator
-  ): HTMLOptionElement {
-    translator = translator || nullTranslator;
-    const trans = translator.load('jupyterlab');
-
-    const option = document.createElement('option');
-    const sessionName = session.name || PathExt.basename(session.path);
-    option.text = sessionName;
-    option.value = JSON.stringify({ id: session.kernel?.id });
-    option.title =
-      `${trans.__('Path:')} ${session.path}\n` +
-      `${trans.__('Name:')} ${sessionName}\n` +
-      `${trans.__('Kernel Name:')} ${displayName}\n` +
-      `${trans.__('Kernel Id:')} ${session.kernel?.id}`;
-    return option;
-  }
 }
diff --git a/packages/apputils/src/testutils.ts b/packages/apputils/src/testutils.ts
index 986aa071dfe8..61caf928e27d 100644
--- a/packages/apputils/src/testutils.ts
+++ b/packages/apputils/src/testutils.ts
@@ -18,6 +18,7 @@ export async function createSessionContext(
 
   await Promise.all([manager.ready, specsManager.ready]);
   return new SessionContext({
+    kernelManager: options.kernelManager ?? Private.getManager().kernels,
     sessionManager: manager,
     specsManager,
     path: options.path ?? UUID.uuid4(),
diff --git a/packages/apputils/test/sessioncontext.spec.ts b/packages/apputils/test/sessioncontext.spec.ts
index 1e1f365ccb15..538cc5072dbd 100644
--- a/packages/apputils/test/sessioncontext.spec.ts
+++ b/packages/apputils/test/sessioncontext.spec.ts
@@ -22,13 +22,59 @@ import {
   testEmission
 } from '@jupyterlab/testing';
 import { PromiseDelegate, UUID } from '@lumino/coreutils';
+import * as fs from 'fs-extra';
+
+const MOCK_KERNEL = {
+  transport: 'tcp',
+  ip: '127.0.0.1',
+  // eslint-disable-next-line camelcase
+  control_port: 63607,
+  // eslint-disable-next-line camelcase
+  shell_port: 49458,
+  // eslint-disable-next-line camelcase
+  stdin_port: 54582,
+  // eslint-disable-next-line camelcase
+  iopub_port: 50266,
+  // eslint-disable-next-line camelcase
+  hb_port: 59840,
+  // eslint-disable-next-line camelcase
+  signature_scheme: 'hmac-sha256',
+  key: '883965661293433ea9c07538beeb8451',
+  // eslint-disable-next-line camelcase
+  kernel_name: 'mock-kernel'
+};
+
+function mktempDir(suffix: string): string {
+  const pathPrefix = '/tmp/jupyterlab-apputils-sessioncontext-test';
+  if (!fs.existsSync(pathPrefix)) {
+    fs.mkdirSync(pathPrefix);
+  }
+  return fs.mkdtempSync(`${pathPrefix}/${suffix}`);
+}
 
 describe('@jupyterlab/apputils', () => {
   let server: JupyterServer;
+  let external: string;
 
   beforeAll(async () => {
     server = new JupyterServer();
-    await server.start();
+    external = mktempDir('external_kernels');
+
+    if (!(await fs.pathExists(`${external}/kernel.json`))) {
+      const data = JSON.stringify(MOCK_KERNEL);
+      await fs.writeFile(`${external}/kernel.json`, data);
+    }
+
+    await server.start({
+      configData: {
+        ServerApp: {
+          // eslint-disable-next-line camelcase
+          allow_external_kernels: true,
+          // eslint-disable-next-line camelcase
+          external_connection_dir: external
+        }
+      }
+    });
   }, 30000);
 
   afterAll(async () => {
@@ -59,6 +105,7 @@ describe('@jupyterlab/apputils', () => {
       Dialog.flush();
       path = UUID.uuid4();
       sessionContext = new SessionContext({
+        kernelManager,
         path,
         sessionManager,
         specsManager,
@@ -265,6 +312,7 @@ describe('@jupyterlab/apputils', () => {
         const kernelPreference = { id: other.kernel!.id };
 
         sessionContext = new SessionContext({
+          kernelManager,
           sessionManager,
           specsManager,
           kernelPreference
@@ -303,6 +351,7 @@ describe('@jupyterlab/apputils', () => {
         const mockManager = new SessionManager({ kernelManager });
 
         sessionContext = new SessionContext({
+          kernelManager,
           path,
           sessionManager: mockManager,
           specsManager,
@@ -569,6 +618,7 @@ describe('@jupyterlab/apputils', () => {
       Dialog.flush();
       path = UUID.uuid4();
       sessionContext = new SessionContext({
+        kernelManager,
         path,
         sessionManager,
         specsManager,
@@ -590,8 +640,22 @@ describe('@jupyterlab/apputils', () => {
       sessionContext.dispose();
     });
 
+    describe('#kernelOptions', () => {
+      it('should return externally connected kernels', async () => {
+        await sessionContext.initialize();
+        const { groups } = SessionContextDialogs.kernelOptions(sessionContext);
+        const options = groups.reduce(
+          (acc, group) => acc.concat(group.options),
+          [] as { text: string }[]
+        );
+        expect(options[options.length - 1].text).toContain(
+          MOCK_KERNEL['kernel_name']
+        );
+      });
+    });
+
     describe('#selectKernel()', () => {
-      it('should select a kernel for the session', async () => {
+      it('should select the currently running kernel by default', async () => {
         await sessionContext.initialize();
 
         const { id, name } = sessionContext!.session!.kernel!;
@@ -601,7 +665,7 @@ describe('@jupyterlab/apputils', () => {
         await accept;
 
         const session = sessionContext?.session;
-        expect(session!.kernel!.id).not.toBe(id);
+        expect(session!.kernel!.id).toBe(id);
         expect(session!.kernel!.name).toBe(name);
       });
 
diff --git a/packages/console/src/panel.ts b/packages/console/src/panel.ts
index 795d3dea09f5..ddbb20e69070 100644
--- a/packages/console/src/panel.ts
+++ b/packages/console/src/panel.ts
@@ -62,6 +62,7 @@ export class ConsolePanel extends MainAreaWidget<Panel> {
     sessionContext = this._sessionContext =
       sessionContext ??
       new SessionContext({
+        kernelManager: manager.kernels,
         sessionManager: manager.sessions,
         specsManager: manager.kernelspecs,
         path: manager.contents.localPath(path),
diff --git a/packages/docregistry/src/context.ts b/packages/docregistry/src/context.ts
index bb2556ab72b8..177305dff6c0 100644
--- a/packages/docregistry/src/context.ts
+++ b/packages/docregistry/src/context.ts
@@ -78,6 +78,7 @@ export class Context<
 
     const ext = PathExt.extname(this._path);
     this.sessionContext = new SessionContext({
+      kernelManager: manager.kernels,
       sessionManager: manager.sessions,
       specsManager: manager.kernelspecs,
       path: localPath,