diff --git a/build/keybindings/doc.keybindings.linux.json b/build/keybindings/doc.keybindings.linux.json
index 2204c97de..591032666 100644
--- a/build/keybindings/doc.keybindings.linux.json
+++ b/build/keybindings/doc.keybindings.linux.json
@@ -131,10 +131,6 @@
                                         "when": "inputFocus && notebookEditorFocused && !editorHasMultipleSelections && !editorHasSelection && !editorHoverVisible && !inlineChatFocused" },
 { "key": "meta+enter",            "command": "notebook.cell.quitEdit",
                                         "when": "inputFocus && notebookEditorFocused && !inlineChatFocused && notebookCellType == 'markup'" },
-{ "key": "escape",                "command": "inlineChat.cancel",
-                                        "when": "inlineChatHasProvider && inlineChatVisible && config.inlineChat.mode == 'preview'" },
-{ "key": "escape",                "command": "inlineChat.close",
-                                        "when": "inlineChatHasProvider && inlineChatVisible && !inlineChatUserDidEdit" },
 { "key": "escape",                "command": "inlineChat.discard",
                                         "when": "inlineChatHasProvider && inlineChatVisible && !inlineChatUserDidEdit" },
 { "key": "ctrl+f",                "command": "actions.find",
@@ -231,6 +227,12 @@
                                         "when": "editorTextFocus && !editorReadonly" },
 { "key": "escape",                "command": "editor.action.inlineEdit.reject",
                                         "when": "inlineEditVisible && !editorReadonly" },
+{ "key": "escape",                "command": "editor.action.inlineEdits.hide",
+                                        "when": "inlineEditsVisible" },
+{ "key": "alt+]",                 "command": "editor.action.inlineEdits.showNext",
+                                        "when": "inlineEditsVisible && !editorReadonly" },
+{ "key": "alt+[",                 "command": "editor.action.inlineEdits.showPrevious",
+                                        "when": "inlineEditsVisible && !editorReadonly" },
 { "key": "escape",                "command": "editor.action.inlineSuggest.hide",
                                         "when": "inlineSuggestionVisible" },
 { "key": "alt+]",                 "command": "editor.action.inlineSuggest.showNext",
@@ -427,6 +429,8 @@
                                         "when": "editorTextFocus && foldingEnabled" },
 { "key": "ctrl+k ctrl+l",         "command": "editor.toggleFold",
                                         "when": "editorTextFocus && foldingEnabled" },
+{ "key": "ctrl+k ctrl+shift+l",   "command": "editor.toggleFoldRecursively",
+                                        "when": "editorTextFocus && foldingEnabled" },
 { "key": "ctrl+shift+]",          "command": "editor.unfold",
                                         "when": "editorTextFocus && foldingEnabled" },
 { "key": "ctrl+k ctrl+j",         "command": "editor.unfoldAll",
@@ -441,12 +445,12 @@
                                         "when": "isReadingLineWithInlayHints" },
 { "key": "tab",                   "command": "insertSnippet",
                                         "when": "editorTextFocus && hasSnippetCompletions && !editorTabMovesFocus && !inSnippetMode" },
+{ "key": "ctrl+enter",            "command": "interactive.execute",
+                                        "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "shift+enter",           "command": "interactive.execute",
                                         "when": "config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive'" },
 { "key": "enter",                 "command": "interactive.execute",
                                         "when": "!config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive'" },
-{ "key": "meta+enter",            "command": "interactive.execute",
-                                        "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "escape",                "command": "notebook.cell.chat.discard",
                                         "when": "inlineChatFocused && notebookCellChatFocused && !notebookCellEditorFocused && !notebookChatUserDidEdit" },
 { "key": "pagedown",              "command": "notebook.cell.cursorPageDown",
@@ -765,22 +769,34 @@
                                         "when": "iconSelectBoxFocus" },
 { "key": "alt+=",                 "command": "increaseSearchEditorContextLines",
                                         "when": "inSearchEditor" },
+{ "key": "escape",                "command": "inlineChat.close",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
+{ "key": "escape",                "command": "inlineChat.discardHunkChange",
+                                        "when": "inlineChatHasProvider && inlineChatVisible && inlineChatResponseType == 'messagesAndEdits'" },
 { "key": "ctrl+i",                "command": "inlineChat.holdForSpeech",
                                         "when": "hasSpeechProvider && inlineChatHasProvider && inlineChatVisible && textInputFocus" },
 { "key": "f7",                    "command": "inlineChat.moveToNextHunk",
                                         "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "shift+f7",              "command": "inlineChat.moveToPreviousHunk",
                                         "when": "inlineChatHasProvider && inlineChatVisible" },
+{ "key": "ctrl+r",                "command": "inlineChat.regenerate",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "ctrl+k i",              "command": "inlineChat.start",
                                         "when": "editorFocus && inlineChatHasProvider && !editorReadonly" },
 { "key": "ctrl+i",                "command": "inlineChat.start",
                                         "when": "editorFocus && inlineChatHasProvider && !editorReadonly" },
 { "key": "ctrl+z",                "command": "inlineChat.unstash",
                                         "when": "inlineChatHasStashedSession && !editorReadonly" },
+{ "key": "ctrl+down",             "command": "inlineChat.viewInChat",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "down",                  "command": "interactive.history.next",
                                         "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.interactive' && interactiveInputCursorAtBoundary != 'none' && interactiveInputCursorAtBoundary != 'top'" },
+{ "key": "down",                  "command": "interactive.history.next",
+                                        "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.repl' && interactiveInputCursorAtBoundary != 'none' && interactiveInputCursorAtBoundary != 'top'" },
 { "key": "up",                    "command": "interactive.history.previous",
                                         "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.interactive' && interactiveInputCursorAtBoundary != 'bottom' && interactiveInputCursorAtBoundary != 'none'" },
+{ "key": "up",                    "command": "interactive.history.previous",
+                                        "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.repl' && interactiveInputCursorAtBoundary != 'bottom' && interactiveInputCursorAtBoundary != 'none'" },
 { "key": "ctrl+end",              "command": "interactive.scrollToBottom",
                                         "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "ctrl+home",             "command": "interactive.scrollToTop",
@@ -878,9 +894,9 @@
 { "key": "ctrl+up",               "command": "notebook.cell.chat.focusPreviousCell",
                                         "when": "inlineChatFocused && notebookCellChatFocused" },
 { "key": "ctrl+k i",              "command": "notebook.cell.chat.start",
-                                        "when": "config.notebook.experimental.cellChat && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus" },
+                                        "when": "config.notebook.experimental.cellChat && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "ctrl+i",                "command": "notebook.cell.chat.start",
-                                        "when": "config.notebook.experimental.cellChat && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus" },
+                                        "when": "config.notebook.experimental.cellChat && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "alt+delete",            "command": "notebook.cell.clearOutputs",
                                         "when": "notebookCellEditable && notebookCellHasOutputs && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "ctrl+k ctrl+c",         "command": "notebook.cell.collapseCellInput",
@@ -937,12 +953,8 @@
                                         "when": "config.notebook.navigation.allowNavigateToSurroundingCells && notebookCursorNavigationMode && notebookEditorFocused && !accessibilityModeEnabled && !isEmbeddedDiffEditor && !notebookCellMarkdownEditMode && notebookCellType == 'markup'" },
 { "key": "ctrl+down",             "command": "notebook.focusNextEditor",
                                         "when": "notebookEditorFocused && notebookOutputFocused" },
-{ "key": "ctrl+alt+pagedown",     "command": "notebook.focusNextEditor",
-                                        "when": "notebookEditorFocused" },
 { "key": "up",                    "command": "notebook.focusPreviousEditor",
                                         "when": "config.notebook.navigation.allowNavigateToSurroundingCells && notebookCursorNavigationMode && notebookEditorFocused && !accessibilityModeEnabled && !isEmbeddedDiffEditor && !notebookCellMarkdownEditMode && notebookCellType == 'markup'" },
-{ "key": "ctrl+alt+pageup",       "command": "notebook.focusPreviousEditor",
-                                        "when": "notebookEditorFocused" },
 { "key": "ctrl+home",             "command": "notebook.focusTop",
                                         "when": "notebookEditorFocused && !inputFocus" },
 { "key": "left",                  "command": "notebook.fold",
@@ -1044,6 +1056,8 @@
                                         "when": "listFocus && referenceSearchVisible && !inputFocus && !treeElementCanCollapse && !treeElementCanExpand && !treestickyScrollFocused" },
 { "key": "ctrl+enter",            "command": "scm.acceptInput",
                                         "when": "scmRepository" },
+{ "key": "escape",                "command": "scm.clearInput",
+                                        "when": "scmRepository && !suggestWidgetVisible" },
 { "key": "alt+down",              "command": "scm.forceViewNextCommit",
                                         "when": "scmRepository" },
 { "key": "alt+up",                "command": "scm.forceViewPreviousCommit",
@@ -1351,19 +1365,23 @@
 { "key": "ctrl+down",             "command": "workbench.action.terminal.chat.focusResponse",
                                         "when": "terminalChatFocus" },
 { "key": "ctrl+alt+enter",        "command": "workbench.action.terminal.chat.insertCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "alt+enter",             "command": "workbench.action.terminal.chat.insertCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "ctrl+alt+enter",        "command": "workbench.action.terminal.chat.insertFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "alt+enter",             "command": "workbench.action.terminal.chat.insertFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "enter",                 "command": "workbench.action.terminal.chat.makeRequest",
-                                        "when": "inlineChatFocused && terminalChatAgentRegistered && terminalHasBeenCreated && !inlineChatEmpty && !terminalChatActiveRequest || inlineChatFocused && terminalChatAgentRegistered && terminalProcessSupported && !inlineChatEmpty && !terminalChatActiveRequest" },
+                                        "when": "terminalChatFocus && terminalHasBeenCreated && !inlineChatEmpty && !terminalChatActiveRequest || terminalChatFocus && terminalProcessSupported && !inlineChatEmpty && !terminalChatActiveRequest" },
+{ "key": "down",                  "command": "workbench.action.terminal.chat.nextFromHistory",
+                                        "when": "terminalChatFocus" },
+{ "key": "up",                    "command": "workbench.action.terminal.chat.previousFromHistory",
+                                        "when": "terminalChatFocus" },
 { "key": "ctrl+enter",            "command": "workbench.action.terminal.chat.runCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "ctrl+enter",            "command": "workbench.action.terminal.chat.runFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "escape",                "command": "workbench.action.terminal.clearSelection",
                                         "when": "terminalFocusInAny && terminalHasBeenCreated && terminalTextSelected && !terminalFindVisible || terminalFocusInAny && terminalProcessSupported && terminalTextSelected && !terminalFindVisible" },
 { "key": "ctrl+shift+c",          "command": "workbench.action.terminal.copySelection",
@@ -1540,6 +1558,10 @@
                                         "when": "notebookOutputInputFocused" },
 { "key": "ctrl+a",                "command": "notebook.cell.output.selectAll",
                                         "when": "notebookEditorFocused && notebookOutputFocused" },
+{ "key": "ctrl+pagedown",         "command": "notebook.focusNextEditor",
+                                        "when": "accessibilityModeEnabled && notebookCellEditorFocused" },
+{ "key": "ctrl+pageup",           "command": "notebook.focusPreviousEditor",
+                                        "when": "accessibilityModeEnabled && notebookCellEditorFocused" },
 { "key": "ctrl+k down",           "command": "views.moveViewDown",
                                         "when": "focusedView != ''" },
 { "key": "ctrl+k left",           "command": "views.moveViewLeft",
@@ -1716,7 +1738,7 @@
 { "key": "ctrl+enter",            "command": "workbench.action.chat.insertCodeBlock",
                                         "when": "accessibleViewInCodeBlock && chatIsEnabled || chatIsEnabled && inChat && !inChatInput" },
 { "key": "ctrl+i",                "command": "workbench.action.terminal.chat.start",
-                                        "when": "inlineChatHasProvider && terminalFocusInAny && terminalHasBeenCreated || inlineChatHasProvider && terminalFocusInAny && terminalProcessSupported" },
+                                        "when": "terminalChatAgentRegistered && terminalFocusInAny && terminalHasBeenCreated || terminalChatAgentRegistered && terminalFocusInAny && terminalProcessSupported" },
 { "key": "ctrl+.",                "command": "acceptSelectedCodeAction",
                                         "when": "codeActionMenuVisible" },
 { "key": "enter",                 "command": "acceptSelectedCodeAction",
@@ -1736,5 +1758,7 @@
 { "key": "up",                    "command": "selectPrevCodeAction",
                                         "when": "codeActionMenuVisible" },
 { "key": "escape",                "command": "diffEditor.exitCompareMove",
-                                        "when": "comparingMovedCode" }
+                                        "when": "comparingMovedCode" },
+{ "key": "ctrl+space",            "command": "editor.action.inlineEdits.accept",
+                                        "when": "inlineEditsVisible" }
 ]
\ No newline at end of file
diff --git a/build/keybindings/doc.keybindings.osx.json b/build/keybindings/doc.keybindings.osx.json
index 1cb7dd70e..b94f171a0 100644
--- a/build/keybindings/doc.keybindings.osx.json
+++ b/build/keybindings/doc.keybindings.osx.json
@@ -181,10 +181,6 @@
                                         "when": "inputFocus && notebookEditorFocused && !editorHasMultipleSelections && !editorHasSelection && !editorHoverVisible && !inlineChatFocused" },
 { "key": "ctrl+enter",            "command": "notebook.cell.quitEdit",
                                         "when": "inputFocus && notebookEditorFocused && !inlineChatFocused && notebookCellType == 'markup'" },
-{ "key": "escape",                "command": "inlineChat.cancel",
-                                        "when": "inlineChatHasProvider && inlineChatVisible && config.inlineChat.mode == 'preview'" },
-{ "key": "escape",                "command": "inlineChat.close",
-                                        "when": "inlineChatHasProvider && inlineChatVisible && !inlineChatUserDidEdit" },
 { "key": "escape",                "command": "inlineChat.discard",
                                         "when": "inlineChatHasProvider && inlineChatVisible && !inlineChatUserDidEdit" },
 { "key": "cmd+f",                 "command": "actions.find",
@@ -194,6 +190,8 @@
                                         "when": "breakpointWidgetVisible && inBreakpointWidget" },
 { "key": "cmd+up",                "command": "chat.action.focus",
                                         "when": "chatCursorAtTop && inChatInput && chatLocation == 'panel'" },
+{ "key": "cmd+up",                "command": "chat.action.focus",
+                                        "when": "inChatInput && isLinux && chatLocation == 'panel' || inChatInput && isWindows && chatLocation == 'panel'" },
 { "key": "shift+escape",          "command": "closeBreakpointWidget",
                                         "when": "breakpointWidgetVisible && textInputFocus" },
 { "key": "escape",                "command": "closeBreakpointWidget",
@@ -297,6 +295,12 @@
                                         "when": "editorTextFocus && !editorReadonly" },
 { "key": "escape",                "command": "editor.action.inlineEdit.reject",
                                         "when": "inlineEditVisible && !editorReadonly" },
+{ "key": "escape",                "command": "editor.action.inlineEdits.hide",
+                                        "when": "inlineEditsVisible" },
+{ "key": "alt+]",                 "command": "editor.action.inlineEdits.showNext",
+                                        "when": "inlineEditsVisible && !editorReadonly" },
+{ "key": "alt+[",                 "command": "editor.action.inlineEdits.showPrevious",
+                                        "when": "inlineEditsVisible && !editorReadonly" },
 { "key": "escape",                "command": "editor.action.inlineSuggest.hide",
                                         "when": "inlineSuggestionVisible" },
 { "key": "alt+]",                 "command": "editor.action.inlineSuggest.showNext",
@@ -503,6 +507,8 @@
                                         "when": "editorTextFocus && foldingEnabled" },
 { "key": "cmd+k cmd+l",           "command": "editor.toggleFold",
                                         "when": "editorTextFocus && foldingEnabled" },
+{ "key": "cmd+k shift+cmd+l",     "command": "editor.toggleFoldRecursively",
+                                        "when": "editorTextFocus && foldingEnabled" },
 { "key": "alt+cmd+]",             "command": "editor.unfold",
                                         "when": "editorTextFocus && foldingEnabled" },
 { "key": "cmd+k cmd+j",           "command": "editor.unfoldAll",
@@ -517,12 +523,12 @@
                                         "when": "isReadingLineWithInlayHints" },
 { "key": "tab",                   "command": "insertSnippet",
                                         "when": "editorTextFocus && hasSnippetCompletions && !editorTabMovesFocus && !inSnippetMode" },
+{ "key": "cmd+enter",             "command": "interactive.execute",
+                                        "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "shift+enter",           "command": "interactive.execute",
                                         "when": "config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive'" },
 { "key": "enter",                 "command": "interactive.execute",
                                         "when": "!config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive'" },
-{ "key": "ctrl+enter",            "command": "interactive.execute",
-                                        "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "escape",                "command": "notebook.cell.chat.discard",
                                         "when": "inlineChatFocused && notebookCellChatFocused && !notebookCellEditorFocused && !notebookChatUserDidEdit" },
 { "key": "pagedown",              "command": "notebook.cell.cursorPageDown",
@@ -848,22 +854,34 @@
                                         "when": "iconSelectBoxFocus" },
 { "key": "alt+=",                 "command": "increaseSearchEditorContextLines",
                                         "when": "inSearchEditor" },
+{ "key": "escape",                "command": "inlineChat.close",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
+{ "key": "escape",                "command": "inlineChat.discardHunkChange",
+                                        "when": "inlineChatHasProvider && inlineChatVisible && inlineChatResponseType == 'messagesAndEdits'" },
 { "key": "cmd+i",                 "command": "inlineChat.holdForSpeech",
                                         "when": "hasSpeechProvider && inlineChatHasProvider && inlineChatVisible && textInputFocus" },
 { "key": "f7",                    "command": "inlineChat.moveToNextHunk",
                                         "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "shift+f7",              "command": "inlineChat.moveToPreviousHunk",
                                         "when": "inlineChatHasProvider && inlineChatVisible" },
+{ "key": "cmd+r",                 "command": "inlineChat.regenerate",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "cmd+k i",               "command": "inlineChat.start",
                                         "when": "editorFocus && inlineChatHasProvider && !editorReadonly" },
 { "key": "cmd+i",                 "command": "inlineChat.start",
                                         "when": "editorFocus && inlineChatHasProvider && !editorReadonly" },
 { "key": "cmd+z",                 "command": "inlineChat.unstash",
                                         "when": "inlineChatHasStashedSession && !editorReadonly" },
+{ "key": "cmd+down",              "command": "inlineChat.viewInChat",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "down",                  "command": "interactive.history.next",
                                         "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.interactive' && interactiveInputCursorAtBoundary != 'none' && interactiveInputCursorAtBoundary != 'top'" },
+{ "key": "down",                  "command": "interactive.history.next",
+                                        "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.repl' && interactiveInputCursorAtBoundary != 'none' && interactiveInputCursorAtBoundary != 'top'" },
 { "key": "up",                    "command": "interactive.history.previous",
                                         "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.interactive' && interactiveInputCursorAtBoundary != 'bottom' && interactiveInputCursorAtBoundary != 'none'" },
+{ "key": "up",                    "command": "interactive.history.previous",
+                                        "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.repl' && interactiveInputCursorAtBoundary != 'bottom' && interactiveInputCursorAtBoundary != 'none'" },
 { "key": "cmd+down",              "command": "interactive.scrollToBottom",
                                         "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "cmd+up",                "command": "interactive.scrollToTop",
@@ -975,9 +993,9 @@
 { "key": "cmd+up",                "command": "notebook.cell.chat.focusPreviousCell",
                                         "when": "inlineChatFocused && notebookCellChatFocused" },
 { "key": "cmd+k i",               "command": "notebook.cell.chat.start",
-                                        "when": "config.notebook.experimental.cellChat && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus" },
+                                        "when": "config.notebook.experimental.cellChat && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "cmd+i",                 "command": "notebook.cell.chat.start",
-                                        "when": "config.notebook.experimental.cellChat && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus" },
+                                        "when": "config.notebook.experimental.cellChat && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "alt+delete",            "command": "notebook.cell.clearOutputs",
                                         "when": "notebookCellEditable && notebookCellHasOutputs && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "cmd+k cmd+c",           "command": "notebook.cell.collapseCellInput",
@@ -1036,12 +1054,8 @@
                                         "when": "config.notebook.navigation.allowNavigateToSurroundingCells && notebookCursorNavigationMode && notebookEditorFocused && !accessibilityModeEnabled && !isEmbeddedDiffEditor && !notebookCellMarkdownEditMode && notebookCellType == 'markup'" },
 { "key": "ctrl+cmd+down",         "command": "notebook.focusNextEditor",
                                         "when": "notebookEditorFocused && notebookOutputFocused" },
-{ "key": "alt+cmd+pagedown",      "command": "notebook.focusNextEditor",
-                                        "when": "notebookEditorFocused" },
 { "key": "up",                    "command": "notebook.focusPreviousEditor",
                                         "when": "config.notebook.navigation.allowNavigateToSurroundingCells && notebookCursorNavigationMode && notebookEditorFocused && !accessibilityModeEnabled && !isEmbeddedDiffEditor && !notebookCellMarkdownEditMode && notebookCellType == 'markup'" },
-{ "key": "alt+cmd+pageup",        "command": "notebook.focusPreviousEditor",
-                                        "when": "notebookEditorFocused" },
 { "key": "cmd+home",              "command": "notebook.focusTop",
                                         "when": "notebookEditorFocused && !inputFocus" },
 { "key": "cmd+up",                "command": "notebook.focusTop",
@@ -1182,6 +1196,8 @@
 { "key": "alt+cmd+s",             "command": "saveAll" },
 { "key": "cmd+enter",             "command": "scm.acceptInput",
                                         "when": "scmRepository" },
+{ "key": "escape",                "command": "scm.clearInput",
+                                        "when": "scmRepository && !suggestWidgetVisible" },
 { "key": "alt+down",              "command": "scm.forceViewNextCommit",
                                         "when": "scmRepository" },
 { "key": "alt+up",                "command": "scm.forceViewPreviousCommit",
@@ -1492,19 +1508,23 @@
 { "key": "cmd+down",              "command": "workbench.action.terminal.chat.focusResponse",
                                         "when": "terminalChatFocus" },
 { "key": "alt+cmd+enter",         "command": "workbench.action.terminal.chat.insertCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "alt+enter",             "command": "workbench.action.terminal.chat.insertCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "alt+cmd+enter",         "command": "workbench.action.terminal.chat.insertFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "alt+enter",             "command": "workbench.action.terminal.chat.insertFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "enter",                 "command": "workbench.action.terminal.chat.makeRequest",
-                                        "when": "inlineChatFocused && terminalChatAgentRegistered && terminalHasBeenCreated && !inlineChatEmpty && !terminalChatActiveRequest || inlineChatFocused && terminalChatAgentRegistered && terminalProcessSupported && !inlineChatEmpty && !terminalChatActiveRequest" },
+                                        "when": "terminalChatFocus && terminalHasBeenCreated && !inlineChatEmpty && !terminalChatActiveRequest || terminalChatFocus && terminalProcessSupported && !inlineChatEmpty && !terminalChatActiveRequest" },
+{ "key": "down",                  "command": "workbench.action.terminal.chat.nextFromHistory",
+                                        "when": "terminalChatFocus" },
+{ "key": "up",                    "command": "workbench.action.terminal.chat.previousFromHistory",
+                                        "when": "terminalChatFocus" },
 { "key": "cmd+enter",             "command": "workbench.action.terminal.chat.runCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "cmd+enter",             "command": "workbench.action.terminal.chat.runFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "escape",                "command": "workbench.action.terminal.clearSelection",
                                         "when": "terminalFocusInAny && terminalHasBeenCreated && terminalTextSelected && !terminalFindVisible || terminalFocusInAny && terminalProcessSupported && terminalTextSelected && !terminalFindVisible" },
 { "key": "cmd+c",                 "command": "workbench.action.terminal.copySelection",
@@ -1696,6 +1716,10 @@
                                         "when": "notebookOutputInputFocused" },
 { "key": "cmd+a",                 "command": "notebook.cell.output.selectAll",
                                         "when": "notebookEditorFocused && notebookOutputFocused" },
+{ "key": "ctrl+pageup",           "command": "notebook.focusNextEditor",
+                                        "when": "accessibilityModeEnabled && notebookCellEditorFocused" },
+{ "key": "ctrl+pageup",           "command": "notebook.focusPreviousEditor",
+                                        "when": "accessibilityModeEnabled && notebookCellEditorFocused" },
 { "key": "cmd+k down",            "command": "views.moveViewDown",
                                         "when": "focusedView != ''" },
 { "key": "cmd+k left",            "command": "views.moveViewLeft",
@@ -1892,7 +1916,7 @@
 { "key": "ctrl+enter",            "command": "workbench.action.chat.insertCodeBlock",
                                         "when": "accessibleViewInCodeBlock && chatIsEnabled || chatIsEnabled && inChat && !inChatInput" },
 { "key": "cmd+i",                 "command": "workbench.action.terminal.chat.start",
-                                        "when": "inlineChatHasProvider && terminalFocusInAny && terminalHasBeenCreated || inlineChatHasProvider && terminalFocusInAny && terminalProcessSupported" },
+                                        "when": "terminalChatAgentRegistered && terminalFocusInAny && terminalHasBeenCreated || terminalChatAgentRegistered && terminalFocusInAny && terminalProcessSupported" },
 { "key": "cmd+.",                 "command": "acceptSelectedCodeAction",
                                         "when": "codeActionMenuVisible" },
 { "key": "enter",                 "command": "acceptSelectedCodeAction",
@@ -1916,5 +1940,7 @@
 { "key": "up",                    "command": "selectPrevCodeAction",
                                         "when": "codeActionMenuVisible" },
 { "key": "escape",                "command": "diffEditor.exitCompareMove",
-                                        "when": "comparingMovedCode" }
+                                        "when": "comparingMovedCode" },
+{ "key": "cmd+space",             "command": "editor.action.inlineEdits.accept",
+                                        "when": "inlineEditsVisible" }
 ]
\ No newline at end of file
diff --git a/build/keybindings/doc.keybindings.win.json b/build/keybindings/doc.keybindings.win.json
index 48d4b4a3d..16ba11aab 100644
--- a/build/keybindings/doc.keybindings.win.json
+++ b/build/keybindings/doc.keybindings.win.json
@@ -147,10 +147,6 @@
                                         "when": "inputFocus && notebookEditorFocused && !editorHasMultipleSelections && !editorHasSelection && !editorHoverVisible && !inlineChatFocused" },
 { "key": "ctrl+alt+enter",        "command": "notebook.cell.quitEdit",
                                         "when": "inputFocus && notebookEditorFocused && !inlineChatFocused && notebookCellType == 'markup'" },
-{ "key": "escape",                "command": "inlineChat.cancel",
-                                        "when": "inlineChatHasProvider && inlineChatVisible && config.inlineChat.mode == 'preview'" },
-{ "key": "escape",                "command": "inlineChat.close",
-                                        "when": "inlineChatHasProvider && inlineChatVisible && !inlineChatUserDidEdit" },
 { "key": "escape",                "command": "inlineChat.discard",
                                         "when": "inlineChatHasProvider && inlineChatVisible && !inlineChatUserDidEdit" },
 { "key": "ctrl+f",                "command": "actions.find",
@@ -249,6 +245,12 @@
                                         "when": "editorTextFocus && !editorReadonly" },
 { "key": "escape",                "command": "editor.action.inlineEdit.reject",
                                         "when": "inlineEditVisible && !editorReadonly" },
+{ "key": "escape",                "command": "editor.action.inlineEdits.hide",
+                                        "when": "inlineEditsVisible" },
+{ "key": "alt+]",                 "command": "editor.action.inlineEdits.showNext",
+                                        "when": "inlineEditsVisible && !editorReadonly" },
+{ "key": "alt+[",                 "command": "editor.action.inlineEdits.showPrevious",
+                                        "when": "inlineEditsVisible && !editorReadonly" },
 { "key": "escape",                "command": "editor.action.inlineSuggest.hide",
                                         "when": "inlineSuggestionVisible" },
 { "key": "alt+]",                 "command": "editor.action.inlineSuggest.showNext",
@@ -441,6 +443,8 @@
                                         "when": "editorTextFocus && foldingEnabled" },
 { "key": "ctrl+k ctrl+l",         "command": "editor.toggleFold",
                                         "when": "editorTextFocus && foldingEnabled" },
+{ "key": "ctrl+k ctrl+shift+l",   "command": "editor.toggleFoldRecursively",
+                                        "when": "editorTextFocus && foldingEnabled" },
 { "key": "ctrl+shift+]",          "command": "editor.unfold",
                                         "when": "editorTextFocus && foldingEnabled" },
 { "key": "ctrl+k ctrl+j",         "command": "editor.unfoldAll",
@@ -455,12 +459,12 @@
                                         "when": "isReadingLineWithInlayHints" },
 { "key": "tab",                   "command": "insertSnippet",
                                         "when": "editorTextFocus && hasSnippetCompletions && !editorTabMovesFocus && !inSnippetMode" },
+{ "key": "ctrl+enter",            "command": "interactive.execute",
+                                        "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "shift+enter",           "command": "interactive.execute",
                                         "when": "config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive'" },
 { "key": "enter",                 "command": "interactive.execute",
                                         "when": "!config.interactiveWindow.executeWithShiftEnter && activeEditor == 'workbench.editor.interactive'" },
-{ "key": "ctrl+enter",            "command": "interactive.execute",
-                                        "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "escape",                "command": "notebook.cell.chat.discard",
                                         "when": "inlineChatFocused && notebookCellChatFocused && !notebookCellEditorFocused && !notebookChatUserDidEdit" },
 { "key": "pagedown",              "command": "notebook.cell.cursorPageDown",
@@ -776,22 +780,34 @@
                                         "when": "iconSelectBoxFocus" },
 { "key": "alt+=",                 "command": "increaseSearchEditorContextLines",
                                         "when": "inSearchEditor" },
+{ "key": "escape",                "command": "inlineChat.close",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
+{ "key": "escape",                "command": "inlineChat.discardHunkChange",
+                                        "when": "inlineChatHasProvider && inlineChatVisible && inlineChatResponseType == 'messagesAndEdits'" },
 { "key": "ctrl+i",                "command": "inlineChat.holdForSpeech",
                                         "when": "hasSpeechProvider && inlineChatHasProvider && inlineChatVisible && textInputFocus" },
 { "key": "f7",                    "command": "inlineChat.moveToNextHunk",
                                         "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "shift+f7",              "command": "inlineChat.moveToPreviousHunk",
                                         "when": "inlineChatHasProvider && inlineChatVisible" },
+{ "key": "ctrl+r",                "command": "inlineChat.regenerate",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "ctrl+k i",              "command": "inlineChat.start",
                                         "when": "editorFocus && inlineChatHasProvider && !editorReadonly" },
 { "key": "ctrl+i",                "command": "inlineChat.start",
                                         "when": "editorFocus && inlineChatHasProvider && !editorReadonly" },
 { "key": "ctrl+z",                "command": "inlineChat.unstash",
                                         "when": "inlineChatHasStashedSession && !editorReadonly" },
+{ "key": "ctrl+down",             "command": "inlineChat.viewInChat",
+                                        "when": "inlineChatHasProvider && inlineChatVisible" },
 { "key": "down",                  "command": "interactive.history.next",
                                         "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.interactive' && interactiveInputCursorAtBoundary != 'none' && interactiveInputCursorAtBoundary != 'top'" },
+{ "key": "down",                  "command": "interactive.history.next",
+                                        "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.repl' && interactiveInputCursorAtBoundary != 'none' && interactiveInputCursorAtBoundary != 'top'" },
 { "key": "up",                    "command": "interactive.history.previous",
                                         "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.interactive' && interactiveInputCursorAtBoundary != 'bottom' && interactiveInputCursorAtBoundary != 'none'" },
+{ "key": "up",                    "command": "interactive.history.previous",
+                                        "when": "!suggestWidgetVisible && activeEditor == 'workbench.editor.repl' && interactiveInputCursorAtBoundary != 'bottom' && interactiveInputCursorAtBoundary != 'none'" },
 { "key": "ctrl+end",              "command": "interactive.scrollToBottom",
                                         "when": "activeEditor == 'workbench.editor.interactive'" },
 { "key": "ctrl+home",             "command": "interactive.scrollToTop",
@@ -889,9 +905,9 @@
 { "key": "ctrl+up",               "command": "notebook.cell.chat.focusPreviousCell",
                                         "when": "inlineChatFocused && notebookCellChatFocused" },
 { "key": "ctrl+k i",              "command": "notebook.cell.chat.start",
-                                        "when": "config.notebook.experimental.cellChat && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus" },
+                                        "when": "config.notebook.experimental.cellChat && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "ctrl+i",                "command": "notebook.cell.chat.start",
-                                        "when": "config.notebook.experimental.cellChat && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && inlineChatHasProvider && notebookEditable && notebookEditorFocused && !inputFocus" },
+                                        "when": "config.notebook.experimental.cellChat && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus || config.notebook.experimental.generate && notebookChatAgentRegistered && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "alt+delete",            "command": "notebook.cell.clearOutputs",
                                         "when": "notebookCellEditable && notebookCellHasOutputs && notebookEditable && notebookEditorFocused && !inputFocus" },
 { "key": "ctrl+k ctrl+c",         "command": "notebook.cell.collapseCellInput",
@@ -948,12 +964,8 @@
                                         "when": "config.notebook.navigation.allowNavigateToSurroundingCells && notebookCursorNavigationMode && notebookEditorFocused && !accessibilityModeEnabled && !isEmbeddedDiffEditor && !notebookCellMarkdownEditMode && notebookCellType == 'markup'" },
 { "key": "ctrl+down",             "command": "notebook.focusNextEditor",
                                         "when": "notebookEditorFocused && notebookOutputFocused" },
-{ "key": "ctrl+alt+pagedown",     "command": "notebook.focusNextEditor",
-                                        "when": "notebookEditorFocused" },
 { "key": "up",                    "command": "notebook.focusPreviousEditor",
                                         "when": "config.notebook.navigation.allowNavigateToSurroundingCells && notebookCursorNavigationMode && notebookEditorFocused && !accessibilityModeEnabled && !isEmbeddedDiffEditor && !notebookCellMarkdownEditMode && notebookCellType == 'markup'" },
-{ "key": "ctrl+alt+pageup",       "command": "notebook.focusPreviousEditor",
-                                        "when": "notebookEditorFocused" },
 { "key": "ctrl+home",             "command": "notebook.focusTop",
                                         "when": "notebookEditorFocused && !inputFocus" },
 { "key": "left",                  "command": "notebook.fold",
@@ -1056,6 +1068,8 @@
 { "key": "ctrl+k s",              "command": "saveAll" },
 { "key": "ctrl+enter",            "command": "scm.acceptInput",
                                         "when": "scmRepository" },
+{ "key": "escape",                "command": "scm.clearInput",
+                                        "when": "scmRepository && !suggestWidgetVisible" },
 { "key": "alt+down",              "command": "scm.forceViewNextCommit",
                                         "when": "scmRepository" },
 { "key": "alt+up",                "command": "scm.forceViewPreviousCommit",
@@ -1167,7 +1181,7 @@
                                         "when": "inputFocus && navigableContainerFocused || navigableContainerFocused && treestickyScrollFocused || navigableContainerFocused && !listFocus || navigableContainerFocused && listScrollAtBoundary == 'both' || navigableContainerFocused && listScrollAtBoundary == 'bottom'" },
 { "key": "ctrl+up",               "command": "widgetNavigation.focusPrevious",
                                         "when": "inputFocus && navigableContainerFocused || navigableContainerFocused && treestickyScrollFocused || navigableContainerFocused && !listFocus || navigableContainerFocused && listScrollAtBoundary == 'both' || navigableContainerFocused && listScrollAtBoundary == 'top'" },
-{ "key": "ctrl+escape",           "command": "workbench.action.chat.cancel" },
+{ "key": "alt+backspace",         "command": "workbench.action.chat.cancel" },
 { "key": "ctrl+down",             "command": "workbench.action.chat.focusInput",
                                         "when": "inChat && !inChatInput" },
 { "key": "ctrl+i",                "command": "workbench.action.chat.holdToVoiceChatInChatView",
@@ -1368,19 +1382,23 @@
 { "key": "ctrl+down",             "command": "workbench.action.terminal.chat.focusResponse",
                                         "when": "terminalChatFocus" },
 { "key": "ctrl+alt+enter",        "command": "workbench.action.terminal.chat.insertCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "alt+enter",             "command": "workbench.action.terminal.chat.insertCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "ctrl+alt+enter",        "command": "workbench.action.terminal.chat.insertFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "alt+enter",             "command": "workbench.action.terminal.chat.insertFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "enter",                 "command": "workbench.action.terminal.chat.makeRequest",
-                                        "when": "inlineChatFocused && terminalChatAgentRegistered && terminalHasBeenCreated && !inlineChatEmpty && !terminalChatActiveRequest || inlineChatFocused && terminalChatAgentRegistered && terminalProcessSupported && !inlineChatEmpty && !terminalChatActiveRequest" },
+                                        "when": "terminalChatFocus && terminalHasBeenCreated && !inlineChatEmpty && !terminalChatActiveRequest || terminalChatFocus && terminalProcessSupported && !inlineChatEmpty && !terminalChatActiveRequest" },
+{ "key": "down",                  "command": "workbench.action.terminal.chat.nextFromHistory",
+                                        "when": "terminalChatFocus" },
+{ "key": "up",                    "command": "workbench.action.terminal.chat.previousFromHistory",
+                                        "when": "terminalChatFocus" },
 { "key": "ctrl+enter",            "command": "workbench.action.terminal.chat.runCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatAgentRegistered && terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
+                                        "when": "terminalChatResponseContainsCodeBlock && terminalHasBeenCreated && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks || terminalChatResponseContainsCodeBlock && terminalProcessSupported && !terminalChatActiveRequest && !terminalChatResponseContainsMultipleCodeBlocks" },
 { "key": "ctrl+enter",            "command": "workbench.action.terminal.chat.runFirstCommand",
-                                        "when": "terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatAgentRegistered && terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
+                                        "when": "terminalChatResponseContainsMultipleCodeBlocks && terminalHasBeenCreated && !terminalChatActiveRequest || terminalChatResponseContainsMultipleCodeBlocks && terminalProcessSupported && !terminalChatActiveRequest" },
 { "key": "escape",                "command": "workbench.action.terminal.clearSelection",
                                         "when": "terminalFocusInAny && terminalHasBeenCreated && terminalTextSelected && !terminalFindVisible || terminalFocusInAny && terminalProcessSupported && terminalTextSelected && !terminalFindVisible" },
 { "key": "ctrl+c",                "command": "workbench.action.terminal.copyAndClearSelection",
@@ -1558,6 +1576,10 @@
                                         "when": "notebookOutputInputFocused" },
 { "key": "ctrl+a",                "command": "notebook.cell.output.selectAll",
                                         "when": "notebookEditorFocused && notebookOutputFocused" },
+{ "key": "ctrl+pagedown",         "command": "notebook.focusNextEditor",
+                                        "when": "accessibilityModeEnabled && notebookCellEditorFocused" },
+{ "key": "ctrl+pageup",           "command": "notebook.focusPreviousEditor",
+                                        "when": "accessibilityModeEnabled && notebookCellEditorFocused" },
 { "key": "ctrl+k down",           "command": "views.moveViewDown",
                                         "when": "focusedView != ''" },
 { "key": "ctrl+k left",           "command": "views.moveViewLeft",
@@ -1736,7 +1758,7 @@
 { "key": "ctrl+enter",            "command": "workbench.action.chat.insertCodeBlock",
                                         "when": "accessibleViewInCodeBlock && chatIsEnabled || chatIsEnabled && inChat && !inChatInput" },
 { "key": "ctrl+i",                "command": "workbench.action.terminal.chat.start",
-                                        "when": "inlineChatHasProvider && terminalFocusInAny && terminalHasBeenCreated || inlineChatHasProvider && terminalFocusInAny && terminalProcessSupported" },
+                                        "when": "terminalChatAgentRegistered && terminalFocusInAny && terminalHasBeenCreated || terminalChatAgentRegistered && terminalFocusInAny && terminalProcessSupported" },
 { "key": "ctrl+.",                "command": "acceptSelectedCodeAction",
                                         "when": "codeActionMenuVisible" },
 { "key": "enter",                 "command": "acceptSelectedCodeAction",
@@ -1756,5 +1778,7 @@
 { "key": "up",                    "command": "selectPrevCodeAction",
                                         "when": "codeActionMenuVisible" },
 { "key": "escape",                "command": "diffEditor.exitCompareMove",
-                                        "when": "comparingMovedCode" }
+                                        "when": "comparingMovedCode" },
+{ "key": "ctrl+space",            "command": "editor.action.inlineEdits.accept",
+                                        "when": "inlineEditsVisible" }
 ]
\ No newline at end of file