diff --git a/.github/actions/pr-comment-on-failure/action.yaml b/.github/actions/pr-comment-on-failure/action.yaml
new file mode 100644
index 00000000000..bbdc73bd16d
--- /dev/null
+++ b/.github/actions/pr-comment-on-failure/action.yaml
@@ -0,0 +1,63 @@
+name: "PR Comment on Failure"
+description: "Comments on PRs from forks when checks fail"
+inputs:
+  check-name:
+    description: "The name of the check that failed"
+    required: true
+  command:
+    description: "The command that contributors should run"
+    required: true
+  github-token:
+    description: "GitHub token for commenting"
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Comment on PR
+      if: github.event.pull_request.head.repo.fork == true
+      uses: actions/github-script@v7
+      with:
+        github-token: ${{ inputs.github-token }}
+        script: |
+          const checkName = '${{ inputs.check-name }}';
+          const command = '${{ inputs.command }}';
+
+          const body = `👋 It looks like the **${checkName}** check failed.
+
+          To fix this locally, please run:
+
+          \`\`\`bash
+          ${command}
+          \`\`\`
+          `;
+
+          // Check if we already commented
+          const { data: comments } = await github.rest.issues.listComments({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            issue_number: context.issue.number,
+          });
+
+          const botComment = comments.find(comment =>
+            comment.user.type === 'Bot' &&
+            comment.body.includes(checkName)
+          );
+
+          if (botComment) {
+            // Update existing comment
+            await github.rest.issues.updateComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: botComment.id,
+              body: body
+            });
+          } else {
+            // Create new comment
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: body
+            });
+          }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f04fc58ccd0..6bb252997d2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -132,6 +132,34 @@ jobs:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
 
+      - name: ⏳ Wait for PyPI package availability
+        run: |
+          VERSION="${{ needs.publish_release.outputs.marimo_version }}"
+          echo "Waiting for marimo version $VERSION to be available on PyPI..."
+
+          MAX_ATTEMPTS=30
+          ATTEMPT=0
+          SLEEP_TIME=10
+
+          while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
+            ATTEMPT=$((ATTEMPT + 1))
+            echo "Attempt $ATTEMPT/$MAX_ATTEMPTS: Checking PyPI for version $VERSION..."
+
+            # Check if the version exists on PyPI
+            HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" "https://pypi.org/pypi/marimo/$VERSION/json")
+
+            if [ "$HTTP_CODE" = "200" ]; then
+              echo "✅ Version $VERSION is available on PyPI!"
+              exit 0
+            else
+              echo "Version $VERSION not yet available (HTTP $HTTP_CODE). Waiting ${SLEEP_TIME}s..."
+              sleep $SLEEP_TIME
+            fi
+          done
+
+          echo "❌ Timed out waiting for version $VERSION on PyPI after $((MAX_ATTEMPTS * SLEEP_TIME)) seconds"
+          exit 1
+
       - name: 🐋 Log in to the Container registry
         uses: docker/login-action@v3
         with:
diff --git a/.github/workflows/test_be.yaml b/.github/workflows/test_be.yaml
index 9347aa5e1de..bafbb2bfbc4 100644
--- a/.github/workflows/test_be.yaml
+++ b/.github/workflows/test_be.yaml
@@ -7,6 +7,7 @@ on:
 
 permissions:
   contents: read
+  pull-requests: write
 
 env:
   MARIMO_SKIP_UPDATE_CHECK: 1
@@ -46,8 +47,17 @@ jobs:
         uses: pypa/hatch@install
 
       - name: 📚 Build docs
+        id: docs
         run: hatch run docs:build --strict
 
+      - name: Comment on docs failure
+        if: failure() && steps.docs.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "docs build"
+          command: "hatch run docs:build --strict"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
   test_check:
     needs: changes
     if: ${{ needs.changes.outputs.backend == 'true' }}
@@ -64,11 +74,29 @@ jobs:
         uses: pypa/hatch@install
 
       - name: 🧹 Lint
+        id: lint
         run: hatch run lint
 
       - name: 🔍 Typecheck
+        id: typecheck
         run: hatch run typecheck:check
 
+      - name: Comment on lint failure
+        if: failure() && steps.lint.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "lint"
+          command: "hatch run lint"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Comment on typecheck failure
+        if: failure() && steps.typecheck.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "typecheck"
+          command: "hatch run typecheck:check"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
   # For PRs, we only run the tests for the changed files.
   # If there is a `test-all` label, we run the tests across unchanged files as well.
   test_python:
diff --git a/.github/workflows/test_fe.yaml b/.github/workflows/test_fe.yaml
index 8570f7fa12a..2906b15cfd2 100644
--- a/.github/workflows/test_fe.yaml
+++ b/.github/workflows/test_fe.yaml
@@ -1,6 +1,7 @@
 name: Test FE
 permissions:
   contents: read
+  pull-requests: write
 
 on:
   push:
@@ -51,11 +52,29 @@ jobs:
 
       - name: 📦 pnpm dedupe
         if: github.event_name == 'pull_request'
+        id: dedupe
         run: pnpm dedupe --check
 
       - name: 🧹 Lint
+        id: lint
         run: pnpm turbo lint
 
+      - name: Comment on lint failure
+        if: failure() && steps.lint.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "lint"
+          command: "pnpm turbo lint"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Comment on dedupe failure
+        if: failure() && steps.dedupe.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "dedupe"
+          command: "pnpm dedupe"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
   test_frontend:
     needs: changes
     if: ${{ needs.changes.outputs.frontend == 'true' }}
@@ -80,11 +99,29 @@ jobs:
         uses: ./.github/actions/install
 
       - name: 🔎 Type check
+        id: typecheck
         run: pnpm turbo typecheck
 
       - name: 🧪 Test
+        id: test
         run: pnpm turbo test
 
+      - name: Comment on typecheck failure
+        if: failure() && steps.typecheck.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "typecheck"
+          command: "pnpm turbo typecheck"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Comment on test failure
+        if: failure() && steps.test.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "test"
+          command: "pnpm turbo test"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
   build_frontend:
     needs: changes
     if: ${{ needs.changes.outputs.frontend == 'true' }}
@@ -120,6 +157,7 @@ jobs:
           fi
 
       - name: 📦 Build
+        id: build
         run: pnpm turbo build
         env:
           NODE_ENV: production
@@ -133,3 +171,11 @@ jobs:
           npm version 0.0.0 --no-git-tag-version
           pnpm turbo build:islands
           ./islands/validate.sh
+
+      - name: Comment on build failure
+        if: failure() && steps.build.outcome == 'failure'
+        uses: ./.github/actions/pr-comment-on-failure
+        with:
+          check-name: "build"
+          command: "pnpm turbo build"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/guides/debugging.md b/docs/guides/debugging.md
index 810a9e938df..7baed9a37db 100644
--- a/docs/guides/debugging.md
+++ b/docs/guides/debugging.md
@@ -1,39 +1,16 @@
-# Debugging marimo notebooks
+# Debugging
 
-## Debugging in marimo
+## In the marimo editor
 
-### Using pdb in marimo notebooks
+### Setting breakpoints with pdb
 
-marimo has direct support for pdb, the Python debugger. You can set breakpoints
-in your code using the built-in `breakpoint()` function. When the code
-execution reaches a breakpoint, it will pause, and you can inspect variables,
-step through the code, and evaluate expressions.
+marimo supports pdb, the Python debugger. Set breakpoints in your code using
+the built-in `breakpoint()` function. When the code execution reaches a
+breakpoint, it will pause, and you can inspect variables, step through the
+code, and evaluate expressions.
 
-Here's an example of how to use `breakpoint()` in a marimo notebook cell.
-
-![PDB in marimo](../_static/docs-pdb-demo.png)
-
-Type `help` in the debugger for a list of commands:
-
-```txt
-Documented commands (type help <topic>):
-========================================
-EOF    cl         disable     ignore    n        return  u          where
-a      clear      display     interact  next     retval  unalias
-alias  commands   down        j         p        run     undisplay
-args   condition  enable      jump      pp       rv      unt
-b      cont       exceptions  l         q        s       until
-break  continue   exit        list      quit     source  up
-bt     d          h           ll        r        step    w
-c      debug      help        longlist  restart  tbreak  whatis
-
-Miscellaneous help topics:
-==========================
-exec  pdb
-```
-
-!!! note
-    Since this block is runnable, you can test the debugger directly
+Here's a live example of how to use `breakpoint()` in a marimo notebook cell. Type
+`help` in the debugger for a list of commands.
 
 /// marimo-embed
 
@@ -52,11 +29,18 @@ def _():
     return
 ```
 
+
 ///
 
-!!! tip
+!!! warning "The debugger blocks execution"
+
+    When the debugger is active, you cannot execute cells. Remember to continue
+    or quit the debugger to avoid hanging the notebook!
+
+??? note "Adding breakpoints in the stack trace"
     Click the little bug icon in the stack trace to add breakpoints.
-    <video autoplay muted loop playsinline width="100%" align="center" src="/_static/docs-pdb-breakpoint.webm" alt="Animation showing how to click the bug icon to add PDB breakpoints">
+
+    <video muted controls playsinline width="100%" align="center" src="/_static/docs-pdb-breakpoint.webm" alt="Animation showing how to click the bug icon to add PDB breakpoints">
     </video>
     Clicking on the cell link will also take you to the cell where the error occurred.
 
@@ -66,25 +50,24 @@ If your code raises an exception, you can use postmortem debugging to inspect
 the state of the program at the point where the exception occurred. Click on
 the "Launch debugger" button as shown below:
 
-<video autoplay muted loop playsinline width="100%" align="center" src="/_static/docs-postmortem-debugging.webm" alt="Video demonstrating postmortem debugging with the Launch debugger button">
+<video muted controls playsinline width="100%" align="center" src="/_static/docs-postmortem-debugging.webm" alt="Video demonstrating postmortem debugging with the Launch debugger button">
 </video>
 
+## Debugging notebooks as scripts
 
-!!! note
-    Other tools like the following will also work in marimo notebooks:
-
-    ```python
-      import code
-      code.interact()
-      return
-    ```
+Since marimo notebooks are standard Python files, you can run them as scripts
+from the command line. The following command will run your marimo notebook and
+drop you into the pdb debugger if an exception occurs, or if you hit a
+breakpoint.
 
-!!! danger
-    Remember to continue or quit the debugger to avoid hanging the notebook!
+```bash
+python -m pdb your_script.py
+```
 
-## Tips for debugging marimo notebooks with AI
+## Debugging with AI
 
-marimo provides built-in integration with AI assistants to help debug your notebooks more effectively.
+marimo provides built-in integration with AI assistants to help you debug your
+notebooks.
 
 ### Ask about notebook errors
 
@@ -117,26 +100,17 @@ advice.
     concepts like reactive execution, cell dependencies, and the differences
     between marimo notebooks and traditional Jupyter notebooks.
 
-## Debugging notebooks as a script
-Since marimo notebooks are standard Python files, you can run them as scripts
-from the command line. The following command will run your marimo notebook and
-drop you into the pdb debugger if an exception occurs, or if you hit a
-breakpoint.
-
-```bash
-python -m pdb your_script.py
-```
-
-## External IDE debugging with `debugpy`
+## Integrating with external IDEs
 
-marimo supports debugging with IDEs, like VSCode, which natively support the
+marimo supports debugging with IDEs, like VS Code, which natively support the
 `debugpy` library. This allows you to set breakpoints, step through code, and
 inspect variables directly from your IDE.
 
-### Script mode
-You can debug marimo notebooks in VSCode using the following `launch.json`.
-This launch configuration will debug a marimo notebook in [script
-mode](./scripts.md).
+### Running as scripts
+
+You can debug marimo notebooks in VS Code using the following `launch.json`.
+This launch configuration will debug a marimo notebook executing it as a
+[script](./scripts.md).
 
 ```json
 {
@@ -155,9 +129,10 @@ mode](./scripts.md).
 }
 ```
 
-### Edit mode
+### Interactive development
+
 Edit mode debugging allows the marimo editor to trigger breakpoints set in an
-IDE like VSCode. Running in this mode will automatically start your notebook in
+IDE like VS Code. Running in this mode will automatically start your notebook in
 [watch mode](./editor_features/watching.md). Note that the file state and
 editor must be consistent for break points to correctly work. If debugging is
 not acting as expected, force a notebook save and toggle the relevant
@@ -185,18 +160,12 @@ Use the following `launch.json` configuration to enable edit mode debugging:
 }
 ```
 
-<video autoplay muted loop playsinline width="100%" align="center" src="/_static/docs-debugpy-edit-mode.webm" alt="Video showing debugpy edit mode debugging with VSCode hitting marimo breakpoints">
+<video muted controls loop playsinline width="100%" align="center" src="/_static/docs-debugpy-edit-mode.webm" alt="Video showing debugpy edit mode debugging with VS Code hitting marimo breakpoints">
 </video>
 
 !!! note
     This will disable marimo's internal debugging features.
 
 !!! danger
-    This mode is blocking in VSCode, so you will need to interact with the
+    This mode is blocking in VS Code, so you will need to interact with the
     debugger in your editor to regain control of the marimo notebook.
-
-
-## Debug directly in VSCode
-
-!!! note
-    LSP support for marimo notebooks is coming soon, along with native debug server integration.
diff --git a/docs/guides/editor_features/ai_completion.md b/docs/guides/editor_features/ai_completion.md
index e50c3d08792..b686f1ac141 100644
--- a/docs/guides/editor_features/ai_completion.md
+++ b/docs/guides/editor_features/ai_completion.md
@@ -161,7 +161,7 @@ See the [llm_providers](../configuration/llm_providers.md) guide for detailed in
 
 ## Copilots
 
-Copilots allow you to tab-complete code based on your notebook's context, similar to editors like Cursor. 
+Copilots allow you to tab-complete code based on your notebook's context, similar to editors like Cursor.
 
 <video autoplay muted loop playsinline width="100%" height="100%" align="center">
   <source src="/_static/docs-ai-completion-preview.mp4" type="video/mp4">
@@ -185,6 +185,39 @@ an AI pair programmer, similar to VS Code:
 _GitHUb Copilot is not yet available in our conda distribution; please install
 marimo using `pip`/`uv` if you need Copilot._
 
+#### Advanced configuration
+
+You can customize GitHub Copilot's behavior by adding `copilot_settings` to your `marimo.toml` configuration file:
+
+```toml title="marimo.toml"
+[ai.github]
+copilot_settings = { http = { proxy = "http://proxy.example.com:8888", proxyStrictSSL = true } }
+```
+
+Or in a more readable format:
+
+```toml title="marimo.toml"
+[ai.github.copilot_settings.http]
+proxy = "http://proxy.example.com:8888"
+proxyStrictSSL = true
+
+[ai.github.copilot_settings.github-enterprise]
+uri = "https://github.enterprise.com"  # For GitHub Enterprise users
+```
+
+Available configuration options (these are the same settings directory from the [npm package](https://github.com/orgs/github/packages/npm/package/copilot-language-server):
+
+* **HTTP settings**: Configure proxy settings for network connections
+    * `proxy`: HTTP proxy URL (e.g., `"http://proxy.example.com:8888"`)
+    * `proxyStrictSSL`: Whether to verify SSL certificates for the proxy (default: `false`)
+    * `proxyKerberosServicePrincipal`: Kerberos service principal for proxy authentication
+
+* **Telemetry settings**: Control telemetry data collection
+    * `telemetryLevel`: Level of telemetry to send - `"off"`, `"crash"`, `"error"`, or `"all"` (default: `"off"`)
+
+* **GitHub Enterprise**: Configure GitHub Enterprise Server
+    * `uri`: URL of your GitHub Enterprise Server instance
+
 ### Windsurf Copilot
 
 [Windsurf](https://windsurf.com/) (formerly codeium) provides tab-completion tooling that can also be used from within marimo.
diff --git a/docs/guides/editor_features/watching.md b/docs/guides/editor_features/watching.md
index 6c49af7f71a..cf320c483f1 100644
--- a/docs/guides/editor_features/watching.md
+++ b/docs/guides/editor_features/watching.md
@@ -7,7 +7,7 @@ the marimo editor or running application. This lets you edit your notebook
 using an editor of your choice, like neovim, VSCode, Cursor, or PyCharm, and
 have the changes automatically reflected in your browser.
 
-/// admonition | Prefer VS Code/Cursor?
+/// admonition | Prefer VS Code/Cursor? Try our extension!
     type: tip
 
 This guide teaches you how to use marimo with arbitrary text editors.
diff --git a/docs/guides/lint_rules/index.md b/docs/guides/lint_rules/index.md
index 1cfa916e88b..8b7febcde3c 100644
--- a/docs/guides/lint_rules/index.md
+++ b/docs/guides/lint_rules/index.md
@@ -1,10 +1,12 @@
 # Lint Rules
 
-marimo includes a comprehensive linting system that helps you write better, more reliable notebooks. The linter checks for various issues that could prevent your notebook from running correctly or cause confusion.
+marimo includes a linter that helps you write better notebooks. The linter
+checks for various issues that could prevent your notebook from running
+correctly or cause confusion.
 
-## How to Use
+## Usage
 
-You can run the linter using the CLI:
+Run the linter using the CLI:
 
 ```bash
 # Check all notebooks in current directory
diff --git a/docs/guides/publishing/embedding.md b/docs/guides/publishing/embedding.md
index 50888b09e26..a15e91f175c 100644
--- a/docs/guides/publishing/embedding.md
+++ b/docs/guides/publishing/embedding.md
@@ -7,12 +7,9 @@ are the main approaches:
 * Host on [GitHub Pages](github_pages.md) or [self-host WASM HTML](self_host_wasm.md),
   and `<iframe>` the published notebook.
 * `<iframe>` a [playground](playground.md) notebook, and [customize the embedding](playground.md#embedding-in-other-web-pages) with query params.
-  (This is what we do throughout docs.marimo.io.)
+  (This is what we do throughout https://docs.marimo.io.)
 * Use the [marimo snippets](from_code_snippets.md) plugin to replace code snippets in HTML or markdown with interactive notebooks.
 
-We plan to provide more turn-key solutions for static site generation with
-marimo notebooks in the future.
-
 ## Iframe Sandbox Configuration
 
 When embedding marimo notebooks in sandboxed iframes, proper configuration is essential for full functionality. marimo is designed to gracefully degrade when certain features are restricted, but understanding these requirements will help you provide the best experience.
diff --git a/docs/guides/publishing/from_github.md b/docs/guides/publishing/from_github.md
index 0728f63c39f..7fa0820726b 100644
--- a/docs/guides/publishing/from_github.md
+++ b/docs/guides/publishing/from_github.md
@@ -6,7 +6,7 @@ data stored in your GitHub repo to the notebook's filesystem, making it
 easy to bundle data with your notebooks.
 
 
+- [Share molab links](https://molab.marimo.io/github) to notebooks hosted on GitHub
 - Publish notebooks to [GitHub Pages](github_pages.md)
 - Edit notebooks on the [marimo playground](playground.md), with public link-based sharing
   (no login required!)
-- Synchronize to our [Community Cloud](community_cloud/index.md) for email-based sharing
diff --git a/docs/guides/publishing/index.md b/docs/guides/publishing/index.md
index 70e6bcfeefc..d82936cc97b 100644
--- a/docs/guides/publishing/index.md
+++ b/docs/guides/publishing/index.md
@@ -1,15 +1,20 @@
 # Publishing notebooks to the web
 
 You can publish marimo notebooks to the web as interactive editable notebooks,
-readonly web apps, or [static documents](../exporting.md).
-
-Thanks to [WebAssembly](../wasm.md), you can even share executable
-notebooks on GitHub Pages or other static sites without paying for backend
-infrastrcture. This makes it easy to share your work with colleagues, embed
-executable notebooks in web documentation or educational websites, and more.
+readonly web apps, or [static documents](../exporting.md). Thanks to
+[WebAssembly](../wasm.md), you can even share executable notebooks on GitHub
+Pages or other static sites without paying for backend infrastrcture. This
+makes it easy to share your work with colleagues, embed executable notebooks in
+web documentation or educational websites, and more.
 
 This guide provides an overview of the various ways to publish marimo notebooks.
 
+!!! tip "Share cloud-hosted notebooks with molab"
+
+    For a turn-key sharing experience, use [molab](https://molab.marimo.io/notebooks),
+    our free cloud-hosted marimo notebook
+
+
 | Guide                                                 | Description                                                  |
 | ----------------------------------------------------- | ------------------------------------------------------------ |
 | [Embedding](embedding.md)                             | An overview of embedding notebooks in other sites            |
@@ -17,10 +22,8 @@ This guide provides an overview of the various ways to publish marimo notebooks.
 | [From code snippets](from_code_snippets.md)           | Convert code snippets in Markdown or HTML to interactive notebooks |
 | [GitHub Pages](github_pages.md)                       | Publish interactive notebooks on GitHub Pages                |
 | [Cloudflare](cloudflare.md)                           | Publish interactive notebooks on Cloudflare                  |
-| [Online playground](playground.md)                    | Share links to notebooks using our online playground         |
-| [Community Cloud](community_cloud/index.md)           | Save notebooks to our free Community Cloud                   |
 | [Self-host WebAssembly notebooks](self_host_wasm.md)  | Self-hosting interactive WebAssembly (HTML export) notebooks |
+| [Online playground](playground.md)                    | Share links to notebooks using our online playground         |
 | [View notebooks on GitHub](view_outputs_on_github.md) | Viewing notebook outputs on GitHub                           |
 | [Deploy on a backend](deploy.md)                      | Deploying notebooks on backends                              |
-| [With MkDocs](mkdocs.md)                              | Publish reactive websites with MkDocs from markdown          |
 | [With Quarto](quarto.md)                              | Publish reactive websites with Quarto from markdown          |
diff --git a/frontend/src/components/chat/acp/__tests__/state.test.ts b/frontend/src/components/chat/acp/__tests__/state.test.ts
index c94e4cd56da..bc975c970c4 100644
--- a/frontend/src/components/chat/acp/__tests__/state.test.ts
+++ b/frontend/src/components/chat/acp/__tests__/state.test.ts
@@ -87,6 +87,7 @@ describe("state utility functions", () => {
               "createdAt": 1735689600000,
               "externalAgentSessionId": null,
               "lastUsedAt": 1735689600000,
+              "selectedModel": null,
               "title": "New claude session",
             },
           ],
@@ -103,6 +104,7 @@ describe("state utility functions", () => {
         createdAt: 1_735_689_600_000,
         lastUsedAt: 1_735_689_600_000,
         externalAgentSessionId: null,
+        selectedModel: null,
       };
       const initialState: AgentSessionState = {
         sessions: [existingSession],
@@ -127,6 +129,7 @@ describe("state utility functions", () => {
               "createdAt": 1735689600000,
               "externalAgentSessionId": null,
               "lastUsedAt": 1735689600000,
+              "selectedModel": null,
               "title": "New claude session",
             },
           ],
@@ -142,6 +145,7 @@ describe("state utility functions", () => {
         createdAt: 1_735_689_600_000,
         lastUsedAt: 1_735_689_600_000,
         externalAgentSessionId: null,
+        selectedModel: null,
       };
       const initialState: AgentSessionState = {
         sessions: [existingSession],
@@ -163,6 +167,7 @@ describe("state utility functions", () => {
               "createdAt": 1735689600000,
               "externalAgentSessionId": null,
               "lastUsedAt": 1735689600000,
+              "selectedModel": null,
               "tabId": "tab_existing",
               "title": "Hello",
             },
@@ -180,6 +185,7 @@ describe("state utility functions", () => {
         createdAt: 1_735_689_600_000,
         lastUsedAt: 1_735_689_600_000,
         externalAgentSessionId: "claude-session-123" as ExternalAgentSessionId,
+        selectedModel: null,
       };
       const initialState: AgentSessionState = {
         sessions: [claudeSession],
@@ -208,6 +214,7 @@ describe("state utility functions", () => {
         createdAt: 1_735_689_600_000,
         lastUsedAt: 1_735_689_600_000,
         externalAgentSessionId: "gemini-session-456" as ExternalAgentSessionId,
+        selectedModel: null,
       };
       const initialState: AgentSessionState = {
         sessions: [geminiSession],
@@ -253,6 +260,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "gemini",
@@ -261,6 +269,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "claude",
@@ -269,6 +278,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
       ];
       state = {
@@ -289,6 +299,7 @@ describe("state utility functions", () => {
               "createdAt": 1735689600000,
               "externalAgentSessionId": null,
               "lastUsedAt": 1735689600000,
+              "selectedModel": null,
               "tabId": "tab_1",
               "title": "Claude session 1",
             },
@@ -297,6 +308,7 @@ describe("state utility functions", () => {
               "createdAt": 1735689600000,
               "externalAgentSessionId": null,
               "lastUsedAt": 1735689600000,
+              "selectedModel": null,
               "tabId": "tab_3",
               "title": "Claude session 2",
             },
@@ -323,6 +335,7 @@ describe("state utility functions", () => {
         createdAt: 1_735_689_600_000,
         lastUsedAt: 1_735_689_600_000,
         externalAgentSessionId: null,
+        selectedModel: null,
       };
       const singleSessionState: AgentSessionState = {
         sessions: [singleSession],
@@ -356,6 +369,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "gemini",
@@ -364,6 +378,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
       ];
       state = {
@@ -420,6 +435,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "gemini",
@@ -428,6 +444,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
       ];
       state = {
@@ -483,6 +500,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "gemini",
@@ -491,6 +509,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000,
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
       ];
       state = {
@@ -557,6 +576,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_689_600_000, // 2025-01-01T00:00:00Z
           lastUsedAt: 1_735_689_600_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "gemini",
@@ -565,6 +585,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_693_200_000, // 2025-01-01T01:00:00Z
           lastUsedAt: 1_735_693_200_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "claude",
@@ -573,6 +594,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_696_800_000, // 2025-01-01T02:00:00Z
           lastUsedAt: 1_735_696_800_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
         {
           agentId: "claude",
@@ -581,6 +603,7 @@ describe("state utility functions", () => {
           createdAt: 1_735_700_400_000, // 2025-01-01T03:00:00Z
           lastUsedAt: 1_735_700_400_000,
           externalAgentSessionId: null,
+          selectedModel: null,
         },
       ];
     });
diff --git a/frontend/src/components/chat/acp/agent-panel.tsx b/frontend/src/components/chat/acp/agent-panel.tsx
index 110798d6a60..7a6d544a2e3 100644
--- a/frontend/src/components/chat/acp/agent-panel.tsx
+++ b/frontend/src/components/chat/acp/agent-panel.tsx
@@ -31,6 +31,7 @@ import { cn } from "@/utils/cn";
 import { Logger } from "@/utils/Logger";
 import { AgentDocs } from "./agent-docs";
 import { AgentSelector } from "./agent-selector";
+import { ModelSelector } from "./model-selector";
 import ScrollToBottomButton from "./scroll-to-bottom-button";
 import { SessionTabs } from "./session-tabs";
 import {
@@ -66,6 +67,7 @@ import { DelayMount } from "@/components/utils/delay-mount";
 import { useRequestClient } from "@/core/network/requests";
 import { filenameAtom } from "@/core/saving/file-state";
 import { store } from "@/core/state/jotai";
+import { ErrorBanner } from "@/plugins/impl/common/error-banner";
 import { Functions } from "@/utils/functions";
 import { Paths } from "@/utils/paths";
 import { FileAttachmentPill } from "../chat-components";
@@ -82,6 +84,7 @@ import type {
   ExternalAgentSessionId,
   NotificationEvent,
   SessionMode,
+  SessionModelState,
 } from "./types";
 
 const logger = Logger.get("agents");
@@ -298,6 +301,8 @@ interface PromptAreaProps {
   fileInputRef: React.RefObject<HTMLInputElement | null>;
   sessionMode?: SessionMode;
   onModeChange?: (mode: string) => void;
+  sessionModels?: SessionModelState | null;
+  onModelChange?: (modelId: string) => void;
 }
 
 const PromptArea = memo<PromptAreaProps>(
@@ -313,6 +318,8 @@ const PromptArea = memo<PromptAreaProps>(
     fileInputRef,
     sessionMode,
     onModeChange,
+    sessionModels,
+    onModelChange,
   }) => {
     const inputRef = useRef<ReactCodeMirrorRef | null>(null);
     const promptCompletions: AdditionalCompletions | undefined = useMemo(() => {
@@ -376,6 +383,13 @@ const PromptArea = memo<PromptAreaProps>(
                   onModeChange={onModeChange}
                 />
               )}
+              {sessionModels && onModelChange && activeSessionId && (
+                <ModelSelector
+                  sessionModels={sessionModels}
+                  onModelChange={onModelChange}
+                  disabled={isLoading}
+                />
+              )}
             </div>
             <div className="flex flex-row">
               <Tooltip content="Add context">
@@ -639,15 +653,21 @@ const NO_WS_SET = "_skip_auto_connect_";
 function getCwd() {
   const filename = store.get(filenameAtom);
   if (!filename) {
-    return "";
+    throw new Error(
+      "Please save the notebook and refresh the browser to use the agent",
+    );
   }
   return Paths.dirname(filename);
 }
 
 const AgentPanel: React.FC = () => {
   const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<Error | string | null>(null);
   const [promptValue, setPromptValue] = useState("");
   const [files, setFiles] = useState<File[]>();
+  const [sessionModels, setSessionModels] = useState<SessionModelState | null>(
+    null,
+  );
   const fileInputRef = useRef<HTMLInputElement>(null);
 
   const [selectedTab] = useAtom(selectedTabAtom);
@@ -745,16 +765,26 @@ const AgentPanel: React.FC = () => {
       });
     }
 
-    logger.debug("Creating new agent session", {});
+    // Get the selected model from the current session state
+    const currentModel = selectedTab?.selectedModel ?? null;
+    logger.debug("Creating new agent session", { model: currentModel });
     isCreatingNewSession.current = true;
     const newSession = await agent
       .newSession({
         cwd: getCwd(),
         mcpServers: [],
+        _meta: currentModel ? { model: currentModel } : undefined,
       })
       .finally(() => {
         isCreatingNewSession.current = false;
       });
+
+    // Capture models from the response
+    if (newSession.models) {
+      logger.debug("Session models received", { models: newSession.models });
+      setSessionModels(newSession.models);
+    }
+
     setSessionState((prev) =>
       updateSessionExternalAgentSessionId(
         prev,
@@ -774,11 +804,20 @@ const AgentPanel: React.FC = () => {
       if (!agent.loadSession) {
         throw new Error("Agent does not support loading sessions");
       }
-      await agent.loadSession({
+      const loadedSession = await agent.loadSession({
         sessionId: previousSessionId,
         cwd: getCwd(),
         mcpServers: [],
       });
+
+      // Capture models from the response if available
+      if (loadedSession?.models) {
+        logger.debug("Session models received", {
+          models: loadedSession.models,
+        });
+        setSessionModels(loadedSession.models);
+      }
+
       setSessionState((prev) =>
         updateSessionExternalAgentSessionId(prev, previousSessionId),
       );
@@ -816,8 +855,10 @@ const AgentPanel: React.FC = () => {
         } else {
           await handleNewSession();
         }
+        setError(null);
       } catch (error) {
         logger.error("Failed to create or resume session:", error);
+        setError(error instanceof Error ? error : String(error));
       }
     };
 
@@ -945,6 +986,33 @@ const AgentPanel: React.FC = () => {
     disconnect();
   });
 
+  const handleModelChange = useEvent((modelId: string) => {
+    logger.debug("Model change requested", {
+      modelId,
+      sessionId: activeSessionId,
+    });
+
+    if (!agent || !activeSessionId) {
+      toast({
+        title: "Cannot change model",
+        description: "Please connect to an agent with an active session first",
+        variant: "danger",
+      });
+      return;
+    }
+
+    // Call agent.setSessionModel to notify the agent
+    void agent.setSessionModel?.({
+      sessionId: activeSessionId,
+      modelId,
+    });
+
+    // Update local state
+    setSessionModels((prev) =>
+      prev ? { ...prev, currentModelId: modelId } : null,
+    );
+  });
+
   const handleModeChange = useEvent((mode: string) => {
     logger.debug("Mode change requested", {
       sessionId: activeSessionId,
@@ -987,6 +1055,24 @@ const AgentPanel: React.FC = () => {
   }
 
   const renderBody = () => {
+    if (error) {
+      return (
+        <ErrorBanner
+          className="w-3/4 mx-auto mt-10"
+          error={error}
+          action={
+            <Button
+              variant="linkDestructive"
+              size="sm"
+              onClick={() => setError(null)}
+            >
+              Dismiss
+            </Button>
+          }
+        />
+      );
+    }
+
     const isConnecting = connectionState.status === "connecting";
     const delay = 200; // ms
     if (isConnecting) {
@@ -1067,6 +1153,8 @@ const AgentPanel: React.FC = () => {
           commands={availableCommands}
           sessionMode={sessionMode}
           onModeChange={handleModeChange}
+          sessionModels={sessionModels}
+          onModelChange={handleModelChange}
         />
       </>
     );
diff --git a/frontend/src/components/chat/acp/model-selector.tsx b/frontend/src/components/chat/acp/model-selector.tsx
new file mode 100644
index 00000000000..f90de63b6ef
--- /dev/null
+++ b/frontend/src/components/chat/acp/model-selector.tsx
@@ -0,0 +1,73 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+
+import { memo } from "react";
+import {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectTrigger,
+} from "@/components/ui/select";
+import type { SessionModelState } from "./types";
+
+interface ModelSelectorProps {
+  sessionModels: SessionModelState | null;
+  onModelChange: (modelId: string) => void;
+  disabled?: boolean;
+}
+
+export const ModelSelector = memo<ModelSelectorProps>(
+  ({ sessionModels, onModelChange, disabled }) => {
+    if (!sessionModels || sessionModels.availableModels.length === 0) {
+      return null;
+    }
+
+    const { availableModels, currentModelId } = sessionModels;
+    const currentModel = availableModels.find(
+      (m) => m.modelId === currentModelId,
+    );
+    const displayName = currentModel?.name ?? currentModelId;
+
+    return (
+      <Select
+        value={currentModelId}
+        onValueChange={onModelChange}
+        disabled={disabled}
+      >
+        <SelectTrigger className="h-6 text-xs border-border shadow-none! ring-0! bg-muted hover:bg-muted/30 py-0 px-2 gap-1">
+          {displayName}
+        </SelectTrigger>
+        <SelectContent>
+          <SelectGroup>
+            <SelectLabel>Model</SelectLabel>
+            {availableModels.map((model, index) => (
+              <SelectItem
+                key={model.modelId}
+                value={model.modelId}
+                className="text-xs"
+              >
+                <div className="flex flex-col">
+                  <span>
+                    {model.name}
+                    {index === 0 && (
+                      <span className="text-muted-foreground ml-1">
+                        (default)
+                      </span>
+                    )}
+                  </span>
+                  {model.description && (
+                    <span className="text-muted-foreground text-xs pt-1 block">
+                      {model.description}
+                    </span>
+                  )}
+                </div>
+              </SelectItem>
+            ))}
+          </SelectGroup>
+        </SelectContent>
+      </Select>
+    );
+  },
+);
+ModelSelector.displayName = "ModelSelector";
diff --git a/frontend/src/components/chat/acp/state.ts b/frontend/src/components/chat/acp/state.ts
index 1a1869da04a..7d2fef762f0 100644
--- a/frontend/src/components/chat/acp/state.ts
+++ b/frontend/src/components/chat/acp/state.ts
@@ -25,6 +25,8 @@ export interface AgentSession {
   lastUsedAt: number;
   // Store the actual agent session ID for resumption
   externalAgentSessionId: ExternalAgentSessionId | null;
+  // Selected model for this session (null = agent default)
+  selectedModel: string | null;
 }
 
 export interface AgentSessionState {
@@ -82,6 +84,7 @@ export function addSession(
   session: {
     agentId: ExternalAgentId;
     firstMessage?: string;
+    model?: string | null;
   },
 ): AgentSessionState {
   const sessionSupport = getAgentSessionSupport(session.agentId);
@@ -111,6 +114,7 @@ export function addSession(
         lastUsedAt: now,
         tabId: existingSession.tabId, // Keep the same ID to maintain tab reference
         externalAgentSessionId: null, // Clear the external session ID
+        selectedModel: session.model ?? existingSession.selectedModel ?? null,
       };
 
       return {
@@ -133,6 +137,7 @@ export function addSession(
         createdAt: now,
         lastUsedAt: now,
         externalAgentSessionId: null,
+        selectedModel: session.model ?? null,
       },
     ],
     activeTabId: tabId,
@@ -277,3 +282,24 @@ export function getAgentConnectionCommand(agentId: ExternalAgentId): string {
   const wrappedCommand = isPlatformWindows() ? `cmd /c ${command}` : command;
   return `npx stdio-to-ws "${wrappedCommand}" --port ${port}`;
 }
+
+/**
+ * Update the selected model for the currently active session
+ */
+export function updateSessionModel(
+  state: AgentSessionState,
+  model: string | null,
+): AgentSessionState {
+  const selectedTab = state.activeTabId;
+  if (!selectedTab) {
+    return state;
+  }
+  return {
+    ...state,
+    sessions: state.sessions.map((session) =>
+      session.tabId === selectedTab
+        ? { ...session, selectedModel: model }
+        : session,
+    ),
+  };
+}
diff --git a/frontend/src/components/chat/acp/types.ts b/frontend/src/components/chat/acp/types.ts
index fe8b0239687..a3a9ea40d8c 100644
--- a/frontend/src/components/chat/acp/types.ts
+++ b/frontend/src/components/chat/acp/types.ts
@@ -2,6 +2,12 @@
 import type { ContentBlock } from "@zed-industries/agent-client-protocol";
 import type { groupNotifications, useAcpClient } from "use-acp";
 
+// Re-export model types for use in the app
+export type {
+  ModelInfo,
+  SessionModelState,
+} from "@zed-industries/agent-client-protocol";
+
 export type SessionMode = ReturnType<typeof useAcpClient>["sessionMode"];
 
 export type NotificationEvent = Awaited<
diff --git a/frontend/src/components/data-table/SearchBar.tsx b/frontend/src/components/data-table/SearchBar.tsx
index 9c7091d996f..ba9a79624d1 100644
--- a/frontend/src/components/data-table/SearchBar.tsx
+++ b/frontend/src/components/data-table/SearchBar.tsx
@@ -31,14 +31,13 @@ export const SearchBar = ({
     onSearch(debouncedSearch);
   }, [debouncedSearch, onSearch]);
 
-  if (!hidden) {
-    ref.current?.focus();
-  }
-
-  // Reset internal value when hidden becomes true
-  if (hidden && internalValue !== "") {
-    setInternalValue("");
-  }
+  useEffect(() => {
+    if (hidden) {
+      setInternalValue("");
+    } else {
+      ref.current?.focus();
+    }
+  }, [hidden]);
 
   return (
     <div
diff --git a/frontend/src/components/data-table/__tests__/columns.test.tsx b/frontend/src/components/data-table/__tests__/columns.test.tsx
index c4b2158cd94..70b44d8fcff 100644
--- a/frontend/src/components/data-table/__tests__/columns.test.tsx
+++ b/frontend/src/components/data-table/__tests__/columns.test.tsx
@@ -5,6 +5,7 @@ import { render } from "@testing-library/react";
 import { I18nProvider } from "react-aria";
 import { describe, expect, it, test } from "vitest";
 import { TooltipProvider } from "@/components/ui/tooltip";
+import { parseContent } from "@/utils/url-parser";
 import {
   generateColumns,
   inferFieldTypes,
@@ -14,7 +15,7 @@ import {
 import { getMimeValues, isMimeValue, MimeCell } from "../mime-cell";
 import type { FieldTypesWithExternalType } from "../types";
 import { uniformSample } from "../uniformSample";
-import { parseContent, UrlDetector } from "../url-detector";
+import { UrlDetector } from "../url-detector";
 
 test("uniformSample", () => {
   const items = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J"];
diff --git a/frontend/src/components/data-table/__tests__/header-items.test.tsx b/frontend/src/components/data-table/__tests__/header-items.test.tsx
index 3f0db55f950..8e02ecaf171 100644
--- a/frontend/src/components/data-table/__tests__/header-items.test.tsx
+++ b/frontend/src/components/data-table/__tests__/header-items.test.tsx
@@ -5,13 +5,14 @@ import { describe, expect, it, vi } from "vitest";
 
 describe("multi-column sorting logic", () => {
   // Extract the core sorting logic to test in isolation
-  const handleSort = (
-    columnId: string,
-    desc: boolean,
-    sortingState: SortingState,
-    setSorting: (state: SortingState) => void,
-    clearSorting: () => void,
-  ) => {
+  const handleSort = (options: {
+    columnId: string;
+    desc: boolean;
+    sortingState: SortingState;
+    setSorting: (state: SortingState) => void;
+    clearSorting: () => void;
+  }) => {
+    const { columnId, desc, sortingState, setSorting, clearSorting } = options;
     const currentSort = sortingState.find((s) => s.id === columnId);
 
     if (currentSort && currentSort.desc === desc) {
@@ -34,7 +35,13 @@ describe("multi-column sorting logic", () => {
     const clearSorting = vi.fn();
 
     // Click Desc on age - should move age to end with desc=true
-    handleSort("age", true, sortingState, setSorting, clearSorting);
+    handleSort({
+      columnId: "age",
+      desc: true,
+      sortingState,
+      setSorting,
+      clearSorting,
+    });
 
     expect(setSorting).toHaveBeenCalledWith([
       { id: "name", desc: false },
@@ -49,7 +56,13 @@ describe("multi-column sorting logic", () => {
     const clearSorting = vi.fn();
 
     // Click Asc on age again - should remove the sort
-    handleSort("age", false, sortingState, setSorting, clearSorting);
+    handleSort({
+      columnId: "age",
+      desc: false,
+      sortingState,
+      setSorting,
+      clearSorting,
+    });
 
     expect(clearSorting).toHaveBeenCalled();
     expect(setSorting).not.toHaveBeenCalled();
@@ -61,7 +74,13 @@ describe("multi-column sorting logic", () => {
     const clearSorting = vi.fn();
 
     // Click Asc on age - should add age to end
-    handleSort("age", false, sortingState, setSorting, clearSorting);
+    handleSort({
+      columnId: "age",
+      desc: false,
+      sortingState,
+      setSorting,
+      clearSorting,
+    });
 
     expect(setSorting).toHaveBeenCalledWith([
       { id: "name", desc: false },
@@ -76,7 +95,13 @@ describe("multi-column sorting logic", () => {
     const clearSorting = vi.fn();
 
     // Click Desc on age - should toggle to descending
-    handleSort("age", true, sortingState, setSorting, clearSorting);
+    handleSort({
+      columnId: "age",
+      desc: true,
+      sortingState,
+      setSorting,
+      clearSorting,
+    });
 
     expect(setSorting).toHaveBeenCalledWith([{ id: "age", desc: true }]);
     expect(clearSorting).not.toHaveBeenCalled();
@@ -109,7 +134,13 @@ describe("multi-column sorting logic", () => {
     const clearSorting = vi.fn();
 
     // Click Desc on age again - should remove it
-    handleSort("age", true, sortingState, setSorting, clearSorting);
+    handleSort({
+      columnId: "age",
+      desc: true,
+      sortingState,
+      setSorting,
+      clearSorting,
+    });
 
     expect(clearSorting).toHaveBeenCalled();
     // After removal, dept should move from priority 3 to priority 2
diff --git a/frontend/src/components/data-table/__tests__/url-detector.test.tsx b/frontend/src/components/data-table/__tests__/url-detector.test.tsx
index 3105bcebe5f..ac036faf40a 100644
--- a/frontend/src/components/data-table/__tests__/url-detector.test.tsx
+++ b/frontend/src/components/data-table/__tests__/url-detector.test.tsx
@@ -1,65 +1,8 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 import { fireEvent, render, screen } from "@testing-library/react";
 import { describe, expect, it, vi } from "vitest";
-import { isMarkdown, parseContent, UrlDetector } from "../url-detector";
-
-describe("parseContent", () => {
-  it("handles data URIs", () => {
-    const parts = parseContent("data:image/png;base64,iVBOR");
-    expect(parts).toEqual([
-      {
-        type: "image",
-        url: "data:image/png;base64,iVBOR",
-      },
-    ]);
-  });
-
-  it("handles complete URLs", () => {
-    const parts = parseContent("https://marimo.io/path?query=value");
-    expect(parts).toEqual([
-      { type: "url", url: "https://marimo.io/path?query=value" },
-    ]);
-  });
-
-  it("handles multiple URLs with text", () => {
-    const parts = parseContent(
-      "Visit https://marimo.io and https://github.com/marimo-team",
-    );
-    expect(parts).toEqual([
-      { type: "text", value: "Visit " },
-      { type: "url", url: "https://marimo.io" },
-      { type: "text", value: " and " },
-      { type: "url", url: "https://github.com/marimo-team" },
-    ]);
-  });
-
-  // Currently doesn't detect mixed content
-  it.fails("handles text with data URIs", () => {
-    const parts = parseContent("Image: data:image/png;base64,iVBOR");
-    expect(parts).toEqual([
-      {
-        type: "text",
-        value: "Image: ",
-      },
-      {
-        type: "image",
-        url: "data:image/png;base64,iVBOR",
-      },
-    ]);
-  });
-
-  it.fails("handles data URIs, text and images", () => {
-    const parts = parseContent(
-      "this is a picture: https://avatars.githubusercontent.com/u/123 and data:image/png;base64,iVBOR",
-    );
-    expect(parts).toEqual([
-      { type: "text", value: "this is a picture: " },
-      { type: "image", url: "https://avatars.githubusercontent.com/u/123" },
-      { type: "text", value: " and " },
-      { type: "image", url: "data:image/png;base64,iVBOR" },
-    ]);
-  });
-});
+import { parseContent } from "@/utils/url-parser";
+import { isMarkdown, UrlDetector } from "../url-detector";
 
 describe("UrlDetector", () => {
   it("renders plain text without URLs", () => {
diff --git a/frontend/src/components/data-table/columns.tsx b/frontend/src/components/data-table/columns.tsx
index 347f8f3f2ff..e650d28033a 100644
--- a/frontend/src/components/data-table/columns.tsx
+++ b/frontend/src/components/data-table/columns.tsx
@@ -14,6 +14,7 @@ import { Logger } from "@/utils/Logger";
 import { Maps } from "@/utils/maps";
 import { maxFractionalDigits } from "@/utils/numbers";
 import { Objects } from "@/utils/objects";
+import { parseContent } from "@/utils/url-parser";
 import { EmotionCacheProvider } from "../editor/output/EmotionCacheProvider";
 import { JsonOutput } from "../editor/output/JsonOutput";
 import { CopyClipboardIcon } from "../icons/copy-icon";
@@ -35,7 +36,7 @@ import {
   INDEX_COLUMN_NAME,
 } from "./types";
 import { uniformSample } from "./uniformSample";
-import { MarkdownUrlDetector, parseContent, UrlDetector } from "./url-detector";
+import { MarkdownUrlDetector, UrlDetector } from "./url-detector";
 
 // Artificial limit to display long strings
 const MAX_STRING_LENGTH = 50;
diff --git a/frontend/src/components/data-table/url-detector.tsx b/frontend/src/components/data-table/url-detector.tsx
index 2d6f84b6327..b19f1bea714 100644
--- a/frontend/src/components/data-table/url-detector.tsx
+++ b/frontend/src/components/data-table/url-detector.tsx
@@ -9,11 +9,7 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { Events } from "@/utils/events";
-
-const urlRegex = /(https?:\/\/\S+)/;
-const imageRegex = /\.(png|jpe?g|gif|webp|svg|ico)(\?.*)?$/i;
-const dataImageRegex = /^data:image\//i;
-const knownImageDomains = ["avatars.githubusercontent.com"];
+import type { ContentPart } from "@/utils/url-parser";
 
 const ImageWithFallback = ({ url }: { url: string }) => {
   const [error, setError] = useState(false);
@@ -56,34 +52,6 @@ const ImageWithFallback = ({ url }: { url: string }) => {
   );
 };
 
-export type ContentPart =
-  | { type: "text"; value: string }
-  | { type: "url"; url: string }
-  | { type: "image"; url: string };
-
-export function parseContent(text: string): ContentPart[] {
-  if (dataImageRegex.test(text)) {
-    return [{ type: "image", url: text }];
-  }
-
-  const parts = text.split(urlRegex).filter((part) => part.trim() !== "");
-  return parts.map((part) => {
-    const isUrl = urlRegex.test(part);
-    if (isUrl) {
-      const isImage =
-        imageRegex.test(part) ||
-        dataImageRegex.test(part) ||
-        knownImageDomains.some((domain) => part.includes(domain));
-
-      if (isImage) {
-        return { type: "image", url: part };
-      }
-      return { type: "url", url: part };
-    }
-    return { type: "text", value: part };
-  });
-}
-
 export function isMarkdown(text: string): boolean {
   const tokens = marked.lexer(text);
 
diff --git a/frontend/src/components/editor/actions/types.ts b/frontend/src/components/editor/actions/types.ts
index e2d1dc54828..649d275ed03 100644
--- a/frontend/src/components/editor/actions/types.ts
+++ b/frontend/src/components/editor/actions/types.ts
@@ -3,7 +3,7 @@ import type { HotkeyAction } from "@/core/hotkeys/hotkeys";
 
 /**
  * Shared interface to render a user action in the editor.
- * This can be in a dropdown menu, context menu, or toolbar.
+ * This can be in a dropdown menu, context menu, toolbar, or command palette.
  */
 export interface ActionButton {
   label: string;
@@ -14,7 +14,10 @@ export interface ActionButton {
   variant?: "danger" | "muted" | "disabled";
   disableClick?: boolean;
   icon?: React.ReactElement;
+  // whether the action is applicable
   hidden?: boolean;
+  // whether to show the action in a menu
+  redundant?: boolean;
   rightElement?: React.ReactNode;
   hotkey?: HotkeyAction;
   handle: (event?: Event) => void;
diff --git a/frontend/src/components/editor/actions/useCellActionButton.tsx b/frontend/src/components/editor/actions/useCellActionButton.tsx
index ff9a20a0191..59c158e347c 100644
--- a/frontend/src/components/editor/actions/useCellActionButton.tsx
+++ b/frontend/src/components/editor/actions/useCellActionButton.tsx
@@ -35,7 +35,6 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
 import { toast } from "@/components/ui/use-toast";
 import { aiCompletionCellAtom } from "@/core/ai/state";
 import { maybeAddMarimoImport } from "@/core/cells/add-missing-import";
@@ -141,50 +140,6 @@ export function useCellActionButtons({ cell, closePopover }: Props) {
   // Actions
   const actions: ActionButton[][] = [
     [
-      {
-        icon: <TextCursorInputIcon size={13} strokeWidth={1.5} />,
-        label: "Name",
-        disableClick: true,
-        handle: (evt) => {
-          evt?.stopPropagation();
-          evt?.preventDefault();
-        },
-        handleHeadless: () => {
-          openModal(
-            <DialogContent>
-              <DialogHeader>
-                <DialogTitle>Rename cell</DialogTitle>
-              </DialogHeader>
-              <div className="flex items-center justify-between">
-                <Label htmlFor="cell-name">Cell name</Label>
-                <NameCellInput
-                  placeholder={"cell name"}
-                  value={name}
-                  onKeyDown={(e) => {
-                    if (e.key === "Enter") {
-                      e.preventDefault();
-                      e.stopPropagation();
-                      openModal(null);
-                    }
-                  }}
-                  onChange={(newName) =>
-                    updateCellName({ cellId, name: newName })
-                  }
-                />
-              </div>
-            </DialogContent>,
-          );
-        },
-        rightElement: (
-          <NameCellInput
-            placeholder={"cell name"}
-            value={name}
-            onChange={(newName) => updateCellName({ cellId, name: newName })}
-            onEnterKey={() => closePopover?.()}
-          />
-        ),
-        hidden: isSetupCell,
-      },
       {
         icon: <PlayIcon size={13} strokeWidth={1.5} />,
         label: "Run cell",
@@ -194,11 +149,12 @@ export function useCellActionButtons({ cell, closePopover }: Props) {
           status === "queued" ||
           status === "disabled-transitively" ||
           config.disabled,
+        redundant: true,
         handle: () => runCell(),
       },
       {
         icon: <SparklesIcon size={13} strokeWidth={1.5} />,
-        label: "AI completion",
+        label: "Refactor with AI",
         hidden: !aiEnabled,
         handle: () => {
           setAiCompletionCell((current) =>
@@ -209,19 +165,13 @@ export function useCellActionButtons({ cell, closePopover }: Props) {
       },
       {
         icon: <ScissorsIcon size={13} strokeWidth={1.5} />,
-        label: "Split cell",
+        label: "Split",
         hotkey: "cell.splitCell",
         handle: () => splitCell({ cellId }),
       },
-      {
-        icon: <ImageIcon size={13} strokeWidth={1.5} />,
-        label: "Export output as PNG",
-        hidden: !hasOutput,
-        handle: () => downloadCellOutput(cellId),
-      },
       {
         icon: <Code2Icon size={13} strokeWidth={1.5} />,
-        label: "Format cell",
+        label: "Format",
         hotkey: "cell.format",
         handle: () => {
           const editorView = getEditorView();
@@ -247,26 +197,10 @@ export function useCellActionButtons({ cell, closePopover }: Props) {
         ) : (
           <ZapIcon size={13} strokeWidth={1.5} />
         ),
-        label: "Reactive execution",
-        rightElement: (
-          <Switch
-            data-testid="cell-disable-switch"
-            checked={!config.disabled}
-            size="sm"
-            onCheckedChange={toggleDisabled}
-          />
-        ),
+        label: config.disabled ? "Enable execution" : "Disable execution",
         handle: toggleDisabled,
         hidden: isSetupCell,
       },
-      {
-        icon: <XCircleIcon size={13} strokeWidth={1.5} />,
-        label: "Clear output",
-        hidden: !(hasOutput || hasConsoleOutput),
-        handle: () => {
-          clearCellOutput({ cellId });
-        },
-      },
     ],
 
     // View as
@@ -332,6 +266,7 @@ export function useCellActionButtons({ cell, closePopover }: Props) {
         hotkey: "cell.createAbove",
         handle: () => createCell({ cellId, before: true }),
         hidden: isSetupCell,
+        redundant: true,
       },
       {
         icon: (
@@ -343,6 +278,7 @@ export function useCellActionButtons({ cell, closePopover }: Props) {
         label: "Create cell below",
         hotkey: "cell.createBelow",
         handle: () => createCell({ cellId, before: false }),
+        redundant: true,
       },
       {
         icon: <ChevronUpIcon size={13} strokeWidth={1.5} />,
@@ -399,8 +335,70 @@ export function useCellActionButtons({ cell, closePopover }: Props) {
       },
     ],
 
+    // Outputs
+    [
+      {
+        icon: <ImageIcon size={13} strokeWidth={1.5} />,
+        label: "Export output as PNG",
+        hidden: !hasOutput,
+        handle: () => downloadCellOutput(cellId),
+      },
+      {
+        icon: <XCircleIcon size={13} strokeWidth={1.5} />,
+        label: "Clear output",
+        hidden: !(hasOutput || hasConsoleOutput),
+        handle: () => {
+          clearCellOutput({ cellId });
+        },
+      },
+    ],
+
     // Link to cell
     [
+      {
+        icon: <TextCursorInputIcon size={13} strokeWidth={1.5} />,
+        label: "Name",
+        disableClick: true,
+        handle: (evt) => {
+          evt?.stopPropagation();
+          evt?.preventDefault();
+        },
+        handleHeadless: () => {
+          openModal(
+            <DialogContent>
+              <DialogHeader>
+                <DialogTitle>Rename cell</DialogTitle>
+              </DialogHeader>
+              <div className="flex items-center justify-between">
+                <Label htmlFor="cell-name">Cell name</Label>
+                <NameCellInput
+                  placeholder={"cell name"}
+                  value={name}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter") {
+                      e.preventDefault();
+                      e.stopPropagation();
+                      openModal(null);
+                    }
+                  }}
+                  onChange={(newName) =>
+                    updateCellName({ cellId, name: newName })
+                  }
+                />
+              </div>
+            </DialogContent>,
+          );
+        },
+        rightElement: (
+          <NameCellInput
+            placeholder={"cell name"}
+            value={name}
+            onChange={(newName) => updateCellName({ cellId, name: newName })}
+            onEnterKey={() => closePopover?.()}
+          />
+        ),
+        hidden: isSetupCell,
+      },
       {
         icon: <LinkIcon size={13} strokeWidth={1.5} />,
         label: "Copy link to cell",
diff --git a/frontend/src/components/editor/actions/useNotebookActions.tsx b/frontend/src/components/editor/actions/useNotebookActions.tsx
index 748ea3de4f1..a5c5d15ddab 100644
--- a/frontend/src/components/editor/actions/useNotebookActions.tsx
+++ b/frontend/src/components/editor/actions/useNotebookActions.tsx
@@ -39,7 +39,6 @@ import {
   XCircleIcon,
   YoutubeIcon,
   ZapIcon,
-  ZapOffIcon,
 } from "lucide-react";
 import { settingDialogAtom } from "@/components/app-config/state";
 import { MarkdownIcon } from "@/components/editor/cell/code/icons";
@@ -51,10 +50,9 @@ import {
   canUndoDeletesAtom,
   getNotebook,
   hasDisabledCellsAtom,
-  hasEnabledCellsAtom,
   useCellActions,
 } from "@/core/cells/cells";
-import { disabledCellIds, enabledCellIds } from "@/core/cells/utils";
+import { disabledCellIds } from "@/core/cells/utils";
 import { useResolvedMarimoConfig } from "@/core/config/config";
 import { Constants } from "@/core/constants";
 import { useLayoutActions, useLayoutState } from "@/core/layout/layout";
@@ -115,7 +113,6 @@ export function useNotebookActions() {
   const { exportAsMarkdown, readCode, saveCellConfig } = useRequestClient();
 
   const hasDisabledCells = useAtomValue(hasDisabledCellsAtom);
-  const hasEnabledCells = useAtomValue(hasEnabledCellsAtom);
   const canUndoDeletes = useAtomValue(canUndoDeletesAtom);
   const { selectedLayout } = useLayoutState();
   const { setLayoutView } = useLayoutActions();
@@ -132,36 +129,6 @@ export function useNotebookActions() {
   );
 
   const actions: ActionButton[] = [
-    {
-      icon: <Share2Icon size={14} strokeWidth={1.5} />,
-      label: "Share",
-      handle: NOOP_HANDLER,
-      hidden: !sharingHtmlEnabled && !sharingWasmEnabled,
-      dropdown: [
-        {
-          icon: <GlobeIcon size={14} strokeWidth={1.5} />,
-          label: "Publish HTML to web",
-          hidden: !sharingHtmlEnabled,
-          handle: async () => {
-            openModal(<ShareStaticNotebookModal onClose={closeModal} />);
-          },
-        },
-        {
-          icon: <LinkIcon size={14} strokeWidth={1.5} />,
-          label: "Create WebAssembly link",
-          hidden: !sharingWasmEnabled,
-          handle: async () => {
-            const code = await readCode();
-            const url = createShareableLink({ code: code.contents });
-            await copyToClipboard(url);
-            toast({
-              title: "Copied",
-              description: "Link copied to clipboard.",
-            });
-          },
-        },
-      ],
-    },
     {
       icon: <DownloadIcon size={14} strokeWidth={1.5} />,
       label: "Download",
@@ -267,9 +234,40 @@ export function useNotebookActions() {
     },
 
     {
-      divider: true,
+      icon: <Share2Icon size={14} strokeWidth={1.5} />,
+      label: "Share",
+      handle: NOOP_HANDLER,
+      hidden: !sharingHtmlEnabled && !sharingWasmEnabled,
+      dropdown: [
+        {
+          icon: <GlobeIcon size={14} strokeWidth={1.5} />,
+          label: "Publish HTML to web",
+          hidden: !sharingHtmlEnabled,
+          handle: async () => {
+            openModal(<ShareStaticNotebookModal onClose={closeModal} />);
+          },
+        },
+        {
+          icon: <LinkIcon size={14} strokeWidth={1.5} />,
+          label: "Create WebAssembly link",
+          hidden: !sharingWasmEnabled,
+          handle: async () => {
+            const code = await readCode();
+            const url = createShareableLink({ code: code.contents });
+            await copyToClipboard(url);
+            toast({
+              title: "Copied",
+              description: "Link copied to clipboard.",
+            });
+          },
+        },
+      ],
+    },
+
+    {
       icon: <PanelLeftIcon size={14} strokeWidth={1.5} />,
       label: "Helper panel",
+      redundant: true,
       handle: NOOP_HANDLER,
       dropdown: PANELS.flatMap(({ type, Icon, hidden }) => {
         if (hidden) {
@@ -324,10 +322,9 @@ export function useNotebookActions() {
         }),
       ],
     },
-
     {
       icon: <Files size={14} strokeWidth={1.5} />,
-      label: "Create notebook copy",
+      label: "Duplicate notebook",
       hidden: !filename || isWasm(),
       handle: copyNotebook,
     },
@@ -362,42 +359,9 @@ export function useNotebookActions() {
         }
       },
     },
+
     {
-      icon: <ZapOffIcon size={14} strokeWidth={1.5} />,
-      label: "Disable all cells",
-      hidden: !hasEnabledCells || kioskMode,
-      handle: async () => {
-        const notebook = getNotebook();
-        const ids = enabledCellIds(notebook);
-        const newConfigs = Objects.fromEntries(
-          ids.map((cellId) => [cellId, { disabled: true }]),
-        );
-        // send to BE
-        await saveCellConfig({ configs: newConfigs });
-        // update on FE
-        for (const cellId of ids) {
-          updateCellConfig({ cellId, config: { disabled: true } });
-        }
-      },
-    },
-    {
-      icon: <EyeOffIcon size={14} strokeWidth={1.5} />,
-      label: "Hide all markdown code",
-      handle: hideAllMarkdownCode,
-    },
-    {
-      icon: <ChevronRightCircleIcon size={14} strokeWidth={1.5} />,
-      label: "Collapse all sections",
-      hotkey: "global.collapseAllSections",
-      handle: collapseAllCells,
-    },
-    {
-      icon: <ChevronDownCircleIcon size={14} strokeWidth={1.5} />,
-      label: "Expand all sections",
-      hotkey: "global.expandAllSections",
-      handle: expandAllCells,
-    },
-    {
+      divider: true,
       icon: <DiamondPlusIcon size={14} strokeWidth={1.5} />,
       label: "Add setup cell",
       handle: () => {
@@ -405,36 +369,63 @@ export function useNotebookActions() {
       },
     },
     {
-      icon: <XCircleIcon size={14} strokeWidth={1.5} />,
-      label: "Clear all outputs",
+      icon: <DatabaseIcon size={14} strokeWidth={1.5} />,
+      label: "Add database connection",
       handle: () => {
-        clearAllCellOutputs();
+        openModal(<AddDatabaseDialogContent onClose={closeModal} />);
       },
     },
+    {
+      icon: <Undo2Icon size={14} strokeWidth={1.5} />,
+      label: "Undo cell deletion",
+      hidden: !canUndoDeletes || kioskMode,
+      handle: () => {
+        undoDeleteCell();
+      },
+    },
+    {
+      icon: <PowerSquareIcon size={14} strokeWidth={1.5} />,
+      label: "Restart kernel",
+      variant: "danger",
+      handle: restartKernel,
+    },
     {
       icon: <FastForwardIcon size={14} strokeWidth={1.5} />,
       label: "Re-run all cells",
+      redundant: true,
       hotkey: "global.runAll",
       handle: async () => {
         runAllCells();
       },
     },
     {
-      icon: <Undo2Icon size={14} strokeWidth={1.5} />,
-      label: "Undo cell deletion",
-      hidden: !canUndoDeletes || kioskMode,
+      icon: <XCircleIcon size={14} strokeWidth={1.5} />,
+      label: "Clear all outputs",
+      redundant: true,
       handle: () => {
-        undoDeleteCell();
+        clearAllCellOutputs();
       },
     },
     {
-      icon: <DatabaseIcon size={14} strokeWidth={1.5} />,
-      label: "Add database connection",
-      handle: () => {
-        openModal(<AddDatabaseDialogContent onClose={closeModal} />);
-      },
+      icon: <EyeOffIcon size={14} strokeWidth={1.5} />,
+      label: "Hide all markdown code",
+      handle: hideAllMarkdownCode,
+      redundant: true, // hidden by default
+    },
+    {
+      icon: <ChevronRightCircleIcon size={14} strokeWidth={1.5} />,
+      label: "Collapse all sections",
+      hotkey: "global.collapseAllSections",
+      handle: collapseAllCells,
+      redundant: true,
+    },
+    {
+      icon: <ChevronDownCircleIcon size={14} strokeWidth={1.5} />,
+      label: "Expand all sections",
+      hotkey: "global.expandAllSections",
+      handle: expandAllCells,
+      redundant: true,
     },
-
     {
       divider: true,
       icon: <CommandIcon size={14} strokeWidth={1.5} />,
@@ -443,27 +434,18 @@ export function useNotebookActions() {
       handle: () => setCommandPaletteOpen((open) => !open),
     },
 
-    {
-      icon: <SettingsIcon size={14} strokeWidth={1.5} />,
-      label: "User settings",
-      handle: () => setSettingsDialogOpen((open) => !open),
-    },
-
     {
       icon: <KeyboardIcon size={14} strokeWidth={1.5} />,
       label: "Keyboard shortcuts",
       hotkey: "global.showHelp",
       handle: () => setKeyboardShortcutsOpen((open) => !open),
     },
-
     {
-      icon: <BookMarkedIcon size={14} strokeWidth={1.5} />,
-      label: "Open documentation",
-      handle: () => {
-        window.open(Constants.docsPage, "_blank");
-      },
+      icon: <SettingsIcon size={14} strokeWidth={1.5} />,
+      label: "User settings",
+      handle: () => setSettingsDialogOpen((open) => !open),
+      redundant: true,
     },
-
     {
       icon: <ExternalLinkIcon size={14} strokeWidth={1.5} />,
       label: "Resources",
@@ -531,13 +513,6 @@ export function useNotebookActions() {
         window.open(url, "_blank");
       },
     },
-
-    {
-      icon: <PowerSquareIcon size={14} strokeWidth={1.5} />,
-      label: "Restart kernel",
-      variant: "danger",
-      handle: restartKernel,
-    },
   ];
 
   return actions
diff --git a/frontend/src/components/editor/ai/add-cell-with-ai.tsx b/frontend/src/components/editor/ai/add-cell-with-ai.tsx
index e8c1c9df8ad..ac9ed0c2c3b 100644
--- a/frontend/src/components/editor/ai/add-cell-with-ai.tsx
+++ b/frontend/src/components/editor/ai/add-cell-with-ai.tsx
@@ -56,10 +56,7 @@ import { prettyError } from "@/utils/errors";
 import { jotaiJsonStorage } from "@/utils/storage/jotai";
 import { ZodLocalStorage } from "@/utils/storage/typed";
 import { PythonIcon } from "../cell/code/icons";
-import {
-  CompletionActions,
-  createAiCompletionOnKeydown,
-} from "./completion-handlers";
+import { createAiCompletionOnKeydown } from "./completion-handlers";
 import { CONTEXT_TRIGGER, mentionsCompletionSource } from "./completion-utils";
 import { StreamingChunkTransport } from "./transport/chat-transport";
 
@@ -151,7 +148,6 @@ export const AddCellWithAI: React.FC<{
 
   const isLoading = status === "streaming" || status === "submitted";
   const hasCompletion = stagedAICells.size > 0;
-  const multipleCompletions = stagedAICells.size > 1;
 
   const submit = () => {
     if (!isLoading) {
@@ -256,29 +252,20 @@ export const AddCellWithAI: React.FC<{
   );
 
   return (
-    <div className={cn("flex flex-col w-full gap-2 py-2")}>
+    <div className={cn("flex flex-col w-full py-2")}>
       {inputComponent}
       <div className="flex flex-row justify-between -mt-1 ml-1 mr-3">
         {!hasCompletion && (
-          <span className="text-xs text-muted-foreground px-3 flex flex-col gap-1">
+          <span className="text-xs text-muted-foreground px-3 flex flex-col gap-1 mt-2">
             <span>
               You can mention{" "}
               <span className="text-(--cyan-11)">@dataframe</span> or{" "}
               <span className="text-(--cyan-11)">@sql_table</span> to pull
-              additional context such as column names.
+              additional context such as column names. Code from other cells is
+              automatically included.
             </span>
-            <span>Code from other cells is automatically included.</span>
           </span>
         )}
-        {hasCompletion && (
-          <CompletionActions
-            isLoading={isLoading}
-            onAccept={handleAcceptCompletion}
-            onDecline={handleDeclineCompletion}
-            size="sm"
-            multipleCompletions={multipleCompletions}
-          />
-        )}
         <div className="ml-auto flex items-center gap-1">
           {languageDropdown}
           <AIModelDropdown
diff --git a/frontend/src/components/editor/ai/ai-completion-editor.tsx b/frontend/src/components/editor/ai/ai-completion-editor.tsx
index 7fa8318aa29..ec3fddf180f 100644
--- a/frontend/src/components/editor/ai/ai-completion-editor.tsx
+++ b/frontend/src/components/editor/ai/ai-completion-editor.tsx
@@ -6,6 +6,7 @@ import {
   AtSignIcon,
   CircleCheckIcon,
   Loader2Icon,
+  SendIcon,
   SparklesIcon,
   XIcon,
 } from "lucide-react";
@@ -38,7 +39,6 @@ import { retryWithTimeout } from "@/utils/timeout";
 import { PromptInput } from "./add-cell-with-ai";
 import {
   AcceptCompletionButton,
-  CompletionActions,
   createAiCompletionOnKeydown,
   RejectCompletionButton,
 } from "./completion-handlers";
@@ -253,6 +253,60 @@ export const AiCompletionEditor: React.FC<Props> = ({
     }
   };
 
+  const loadingStopButton = (
+    <Button
+      data-testid="stop-completion-button"
+      variant="text"
+      size="xs"
+      className="mb-0"
+      onClick={stop}
+    >
+      <Loader2Icon className="animate-spin mr-1" size={14} />
+      Stop
+    </Button>
+  );
+
+  const submitButton = (
+    <Tooltip content="Submit">
+      <Button variant="text" size="icon" onClick={handleSubmit}>
+        <SendIcon className="h-3 w-3" />
+      </Button>
+    </Tooltip>
+  );
+
+  const contextButton = (
+    <Tooltip content="Add context">
+      <Button
+        variant="text"
+        size="icon"
+        onClick={() => addContextCompletion(inputRef)}
+      >
+        <AtSignIcon className="h-3 w-3" />
+      </Button>
+    </Tooltip>
+  );
+
+  const completionButtons = (
+    <>
+      <AcceptCompletionButton
+        isLoading={isLoading}
+        onAccept={handleAcceptCompletion}
+        size="xs"
+        multipleCompletions={false}
+        acceptShortcut="Mod-↵"
+        runCell={runCell}
+        borderless={true}
+      />
+      <RejectCompletionButton
+        onDecline={handleDeclineCompletion}
+        size="xs"
+        multipleCompletions={false}
+        declineShortcut="Shift-Mod-Delete"
+        borderless={true}
+      />
+    </>
+  );
+
   return (
     <div
       data-ai-input-open={showInput}
@@ -295,43 +349,22 @@ export const AiCompletionEditor: React.FC<Props> = ({
                 hasCompletion: completion.trim().length > 0,
               })}
             />
-            {isLoading && (
-              <Button
-                data-testid="stop-completion-button"
-                variant="text"
-                size="xs"
-                className="mb-0"
-                onClick={stop}
-              >
-                <Loader2Icon className="animate-spin mr-1" size={14} />
-                Stop
-              </Button>
-            )}
+
             <div className="-mr-1.5 py-1.5">
               <div className="flex flex-row items-center justify-end gap-0.5">
-                <Tooltip content="Add context">
-                  <Button
-                    variant="text"
-                    size="icon"
-                    onClick={() => addContextCompletion(inputRef)}
-                  >
-                    <AtSignIcon className="h-3 w-3" />
-                  </Button>
-                </Tooltip>
+                {isLoading && loadingStopButton}
+                {submitButton}
+                {contextButton}
                 <AIModelDropdown
-                  triggerClassName="h-7 text-xs w-24"
+                  triggerClassName="h-7 text-xs"
                   iconSize="small"
                   forRole="edit"
+                  displayIconOnly={true}
                 />
               </div>
               {completion && (
-                <div className="-mb-1.5">
-                  <CompletionActions
-                    isLoading={isLoading}
-                    onAccept={handleAcceptCompletion}
-                    onDecline={handleDeclineCompletion}
-                    size="xs"
-                  />
+                <div className="mt-1 flex items-center gap-1">
+                  {completionButtons}
                 </div>
               )}
             </div>
@@ -351,7 +384,7 @@ export const AiCompletionEditor: React.FC<Props> = ({
                   htmlFor={includeOtherCellsCheckboxId}
                   className="text-muted-foreground text-xs whitespace-nowrap ellipsis"
                 >
-                  Include all code
+                  All code
                 </Label>
               </div>
             </Tooltip>
@@ -450,15 +483,14 @@ const CompletionBanner: React.FC<CompletionBannerProps> = ({
           isLoading={isLoading}
           onAccept={onAccept}
           size="xs"
-          buttonStyles="border-none rounded-md rounded-r-none"
-          playButtonStyles="border-0 border-l-1 rounded-md rounded-l-none"
+          borderless={true}
           runCell={runCell}
           // acceptShortcut="Mod-↵"
         />
         <RejectCompletionButton
           onDecline={onReject}
           size="xs"
-          className="border-none rounded-md"
+          borderless={true}
           // declineShortcut="Shift-Mod-Delete"
         />
       </div>
diff --git a/frontend/src/components/editor/ai/completion-handlers.tsx b/frontend/src/components/editor/ai/completion-handlers.tsx
index eeadb281740..3d469733f49 100644
--- a/frontend/src/components/editor/ai/completion-handlers.tsx
+++ b/frontend/src/components/editor/ai/completion-handlers.tsx
@@ -41,57 +41,6 @@ export const createAiCompletionOnKeydown = (opts: {
   };
 };
 
-/**
- * Common completion action buttons with keyboard shortcuts
- */
-export const CompletionActions: React.FC<{
-  isLoading: boolean;
-  onAccept: () => void;
-  onDecline: () => void;
-  size?: "xs" | "sm";
-  acceptShortcut?: string;
-  declineShortcut?: string;
-  multipleCompletions?: boolean;
-}> = ({
-  isLoading,
-  onAccept,
-  onDecline,
-  size = "sm",
-  acceptShortcut = "Mod-↵",
-  declineShortcut = "Shift-Mod-Delete",
-  multipleCompletions = false,
-}) => {
-  return (
-    <>
-      <Button
-        data-testid="accept-completion-button"
-        variant="text"
-        size={size}
-        className="mb-0"
-        disabled={isLoading}
-        onClick={onAccept}
-      >
-        <span className="text-(--grass-11) opacity-100">
-          Accept{multipleCompletions && " all"}{" "}
-          <MinimalHotkeys className="ml-1 inline" shortcut={acceptShortcut} />
-        </span>
-      </Button>
-      <Button
-        data-testid="decline-completion-button"
-        variant="text"
-        size={size}
-        className="mb-0 pl-1 pr-0"
-        onClick={onDecline}
-      >
-        <span className="text-(--red-10)">
-          Reject{multipleCompletions && " all"}{" "}
-          <MinimalHotkeys className="ml-1 inline" shortcut={declineShortcut} />
-        </span>
-      </Button>
-    </>
-  );
-};
-
 export const CompletionActionsCellFooter: React.FC<{
   isLoading: boolean;
   onAccept: () => void;
@@ -120,6 +69,7 @@ export const AcceptCompletionButton: React.FC<{
   size?: "xs" | "sm";
   buttonStyles?: string;
   playButtonStyles?: string;
+  borderless?: boolean;
   acceptShortcut?: string;
   runCell?: () => void;
 }> = ({
@@ -131,6 +81,7 @@ export const AcceptCompletionButton: React.FC<{
   acceptShortcut,
   runCell,
   playButtonStyles,
+  borderless = false,
 }) => {
   const handleAcceptAndRun = () => {
     onAccept();
@@ -154,7 +105,7 @@ export const AcceptCompletionButton: React.FC<{
           size={size}
           disabled={isLoading}
           onClick={onAccept}
-          className={`${baseClasses} rounded-r-none ${buttonStyles}`}
+          className={`${baseClasses} rounded-r-none ${borderless && "border-none rounded-md rounded-r-none"} ${buttonStyles}`}
         >
           {text}
           {acceptShortcut && (
@@ -173,7 +124,7 @@ export const AcceptCompletionButton: React.FC<{
             size={size}
             disabled={isLoading}
             onClick={handleAcceptAndRun}
-            className={`${baseClasses} rounded-l-none px-1.5 ${playButtonStyles}`}
+            className={`${baseClasses} rounded-l-none px-1.5 ${borderless && "border-0 border-l-1"} ${playButtonStyles}`}
           >
             <PlayIcon className="h-2.5 w-2.5" />
           </Button>
@@ -203,6 +154,7 @@ export const RejectCompletionButton: React.FC<{
   multipleCompletions?: boolean;
   size?: "xs" | "sm";
   className?: string;
+  borderless?: boolean;
   declineShortcut?: string;
 }> = ({
   onDecline,
@@ -210,6 +162,7 @@ export const RejectCompletionButton: React.FC<{
   size = "sm",
   className,
   declineShortcut,
+  borderless = false,
 }) => {
   return (
     <Button
@@ -219,7 +172,7 @@ export const RejectCompletionButton: React.FC<{
       className={`h-6 text-(--red-10) bg-(--red-3)/60 hover:bg-(--red-3)
     dark:bg-(--red-4)/80 dark:hover:bg-(--red-3) rounded px-3 font-semibold
     active:bg-(--red-5) dark:active:bg-(--red-4)
-    border-(--red-6) border hover:shadow-xs ${className}`}
+    border-(--red-6) border hover:shadow-xs ${borderless && "border-none rounded-md"} ${className}`}
     >
       Reject{multipleCompletions && " all"}
       {declineShortcut && (
diff --git a/frontend/src/components/editor/cell/CreateCellButton.tsx b/frontend/src/components/editor/cell/CreateCellButton.tsx
index 7d25087a6ef..b6e90dbb585 100644
--- a/frontend/src/components/editor/cell/CreateCellButton.tsx
+++ b/frontend/src/components/editor/cell/CreateCellButton.tsx
@@ -120,12 +120,11 @@ export const CreateCellButton = ({
           )}
           onMouseDown={Events.preventFocus}
           size="small"
-          color="hint-green"
           data-testid="create-cell-button"
         >
           <Tooltip content={finalTooltipContent}>
             <PlusIcon
-              strokeWidth={3}
+              strokeWidth={1.8}
               size={14}
               className="opacity-60 hover:opacity-90"
             />
diff --git a/frontend/src/components/editor/cell/cell-actions.tsx b/frontend/src/components/editor/cell/cell-actions.tsx
index 269ca5261f5..2f9750ace98 100644
--- a/frontend/src/components/editor/cell/cell-actions.tsx
+++ b/frontend/src/components/editor/cell/cell-actions.tsx
@@ -80,6 +80,9 @@ const CellActionsDropdownInternal = (
             <Fragment key={i}>
               <CommandGroup key={i}>
                 {group.map((action) => {
+                  if (action.redundant) {
+                    return null;
+                  }
                   let body = (
                     <div className="flex items-center flex-1">
                       {action.icon && (
diff --git a/frontend/src/components/editor/cell/cell-context-menu.tsx b/frontend/src/components/editor/cell/cell-context-menu.tsx
index fbca79fdc5d..9e1afd8b06f 100644
--- a/frontend/src/components/editor/cell/cell-context-menu.tsx
+++ b/frontend/src/components/editor/cell/cell-context-menu.tsx
@@ -192,7 +192,7 @@ export const CellActionsContextMenu = ({
         {allActions.map((group, i) => (
           <Fragment key={i}>
             {group.map((action) => {
-              if (action.hidden) {
+              if (action.hidden || action.redundant) {
                 return null;
               }
 
diff --git a/frontend/src/components/editor/cell/collapse.tsx b/frontend/src/components/editor/cell/collapse.tsx
index 1b3a6c31755..53adb8ff1a9 100644
--- a/frontend/src/components/editor/cell/collapse.tsx
+++ b/frontend/src/components/editor/cell/collapse.tsx
@@ -44,9 +44,17 @@ export const CollapseToggle: React.FC<Props> = (props) => {
 
 const Arrow = ({ isCollapsed }: { isCollapsed: boolean }) => {
   return isCollapsed ? (
-    <ChevronRightIcon className="w-5 h-5 shrink-0 opacity-60" strokeWidth={2} />
+    <ChevronRightIcon
+      className="shrink-0 opacity-60"
+      strokeWidth={1.8}
+      size={14}
+    />
   ) : (
-    <ChevronDownIcon className="w-5 h-5 shrink-0 opacity-60" strokeWidth={2} />
+    <ChevronDownIcon
+      className="shrink-0 opacity-60"
+      strokeWidth={1.8}
+      size={14}
+    />
   );
 };
 
diff --git a/frontend/src/components/editor/chrome/wrapper/footer-items/copilot-status.tsx b/frontend/src/components/editor/chrome/wrapper/footer-items/copilot-status.tsx
index 4da68b63ece..0f820b7a297 100644
--- a/frontend/src/components/editor/chrome/wrapper/footer-items/copilot-status.tsx
+++ b/frontend/src/components/editor/chrome/wrapper/footer-items/copilot-status.tsx
@@ -17,6 +17,7 @@ import {
 import { resolvedMarimoConfigAtom } from "@/core/config/config";
 import { useOnMount } from "@/hooks/useLifecycle";
 import { cn } from "@/utils/cn";
+import { prettyError } from "@/utils/errors";
 import { Logger } from "@/utils/Logger";
 import { FooterItem } from "../footer-item";
 
@@ -90,8 +91,19 @@ const GitHubCopilotStatus: React.FC = () => {
         setStep("connectionError");
         toast({
           title: "GitHub Copilot Connection Error",
-          description:
-            "Failed to connect to GitHub Copilot. Check settings and try again.",
+          description: (
+            <>
+              {" "}
+              <div>
+                Failed to connect to GitHub Copilot. Check settings and try
+                again.
+              </div>
+              <br />
+              <div className="text-sm font-mono whitespace-pre-wrap">
+                {prettyError(error)}
+              </div>
+            </>
+          ),
           variant: "danger",
           action: (
             <Button variant="link" onClick={openSettings}>
@@ -120,15 +132,15 @@ const GitHubCopilotStatus: React.FC = () => {
   return (
     <FooterItem
       tooltip={
-        <>
+        <div className="max-w-[200px]">
           <b>GitHub Copilot:</b> {label}
           {status.kind && (
             <>
               <br />
-              <span className="text-xs">Status: {status.kind}</span>
+              <span className="pt-1 text-xs">Status: {status.kind}</span>
             </>
           )}
-        </>
+        </div>
       }
       selected={false}
       onClick={openSettings}
diff --git a/frontend/src/components/editor/controls/notebook-menu-dropdown.tsx b/frontend/src/components/editor/controls/notebook-menu-dropdown.tsx
index fec9d11a62b..1c4c129ef1d 100644
--- a/frontend/src/components/editor/controls/notebook-menu-dropdown.tsx
+++ b/frontend/src/components/editor/controls/notebook-menu-dropdown.tsx
@@ -113,7 +113,7 @@ export const NotebookMenuDropdown: React.FC<Props> = ({
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" className="no-print w-[240px]">
         {actions.map((action) => {
-          if (action.hidden) {
+          if (action.hidden || action.redundant) {
             return null;
           }
 
diff --git a/frontend/src/components/editor/navigation/__tests__/navigation.test.ts b/frontend/src/components/editor/navigation/__tests__/navigation.test.ts
index 7b9421baffc..37872e57daa 100644
--- a/frontend/src/components/editor/navigation/__tests__/navigation.test.ts
+++ b/frontend/src/components/editor/navigation/__tests__/navigation.test.ts
@@ -53,6 +53,20 @@ vi.mock("../focus-utils", () => ({
   focusCell: vi.fn(),
 }));
 
+// Mock simplifySelection from @codemirror/commands
+const mockSimplifySelection = vi.fn();
+vi.mock("@codemirror/commands", () => ({
+  simplifySelection: (...args: unknown[]) => mockSimplifySelection(...args),
+}));
+
+// Mock @codemirror/autocomplete
+const mockCompletionStatus = vi.fn();
+const mockCloseCompletion = vi.fn();
+vi.mock("@codemirror/autocomplete", () => ({
+  completionStatus: (...args: unknown[]) => mockCompletionStatus(...args),
+  closeCompletion: (...args: unknown[]) => mockCloseCompletion(...args),
+}));
+
 // Get mocked functions
 const mockUseCellActions = vi.mocked(
   await import("@/core/cells/cells"),
@@ -1594,6 +1608,11 @@ describe("useCellEditorNavigationProps", () => {
 
     // Reset config overrides
     store.set(configOverridesAtom, {});
+
+    // Default: simplifySelection returns false (nothing to simplify)
+    mockSimplifySelection.mockReturnValue(false);
+    // Default: no autocomplete popup
+    mockCompletionStatus.mockReturnValue(null);
   });
 
   describe("keyboard shortcuts", () => {
@@ -1614,13 +1633,15 @@ describe("useCellEditorNavigationProps", () => {
     });
 
     it("should clear text selection when Escape is pressed with selection", () => {
-      const mockDispatch = vi.fn();
+      // Return true (simplified something)
+      mockSimplifySelection.mockReturnValue(true);
+
       const mockEditorView = {
         current: {
           state: {
             selection: { main: { from: 5, to: 10 } },
           },
-          dispatch: mockDispatch,
+          dispatch: vi.fn(),
         } as unknown as EditorView,
       };
       const { result } = renderWithProvider(() =>
@@ -1633,30 +1654,72 @@ describe("useCellEditorNavigationProps", () => {
         result.current.onKeyDown?.(mockEvent);
       });
 
-      const mockCall = mockDispatch.mock.calls[0][0];
-      expect(mockCall.selection.ranges[0].anchor).toBe(5);
-      expect(mockCall.selection.ranges[0].head).toBe(5);
+      expect(mockSimplifySelection).toHaveBeenCalledWith(
+        mockEditorView.current,
+      );
+      // Should not exit to command mode when simplifySelection returns true
       expect(focusCell).not.toHaveBeenCalled();
     });
 
+    it("should collapse multiple cursors on first Escape, then exit to command mode on second Escape", () => {
+      const mockEditorView = {
+        current: {
+          state: {
+            selection: {
+              main: { from: 10, to: 10, empty: true },
+              ranges: [
+                { from: 5, to: 5, empty: true },
+                { from: 10, to: 10, empty: true },
+                { from: 15, to: 15, empty: true },
+              ],
+            },
+          },
+          dispatch: vi.fn(),
+        } as unknown as EditorView,
+      };
+      const { result } = renderWithProvider(() =>
+        useCellEditorNavigationProps(mockCellId, mockEditorView),
+      );
+
+      // First Escape: simplifySelection returns true (collapsed multiple cursors)
+      mockSimplifySelection.mockReturnValue(true);
+      const firstEscape = Mocks.keyboardEvent({ key: "Escape" });
+
+      act(() => {
+        result.current.onKeyDown?.(firstEscape);
+      });
+
+      expect(mockSimplifySelection).toHaveBeenCalledWith(
+        mockEditorView.current,
+      );
+      // Should NOT exit to command mode - first Escape simplifies cursors
+      expect(focusCell).not.toHaveBeenCalled();
+
+      // Second Escape: nothing left to simplify
+      mockSimplifySelection.mockReturnValue(false);
+      const secondEscape = Mocks.keyboardEvent({ key: "Escape" });
+
+      act(() => {
+        result.current.onKeyDown?.(secondEscape);
+      });
+
+      // Exit to command mode
+      expect(focusCell).toHaveBeenCalledWith(mockCellId);
+    });
+
     it("should close autocomplete popup when Escape is pressed with popup active", () => {
+      mockSimplifySelection.mockReturnValue(false); // Mock: nothing to simplify
+      mockCompletionStatus.mockReturnValue("active"); // Mock: popup is open
+
       const mockEditorView = {
         current: {
           state: {
             selection: { main: { from: 5, to: 5, empty: true } },
-            field: vi.fn().mockReturnValue({ active: [{ state: 1 }] }), // Mock active completion
           },
           dispatch: vi.fn(),
         } as unknown as EditorView,
       };
 
-      // Mock the closeCompletion function
-      const originalCloseCompletion = vi.hoisted(() => vi.fn());
-      vi.mock("@codemirror/autocomplete", () => ({
-        completionStatus: vi.fn().mockReturnValue("active"),
-        closeCompletion: originalCloseCompletion,
-      }));
-
       const { result } = renderWithProvider(() =>
         useCellEditorNavigationProps(mockCellId, mockEditorView),
       );
@@ -1667,9 +1730,7 @@ describe("useCellEditorNavigationProps", () => {
         result.current.onKeyDown?.(mockEvent);
       });
 
-      expect(originalCloseCompletion).toHaveBeenCalledWith(
-        mockEditorView.current,
-      );
+      expect(mockCloseCompletion).toHaveBeenCalledWith(mockEditorView.current);
       expect(focusCell).not.toHaveBeenCalled();
     });
 
diff --git a/frontend/src/components/editor/navigation/navigation.ts b/frontend/src/components/editor/navigation/navigation.ts
index 4f8e909fec7..4541cbd8335 100644
--- a/frontend/src/components/editor/navigation/navigation.ts
+++ b/frontend/src/components/editor/navigation/navigation.ts
@@ -1,7 +1,7 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
 import { closeCompletion, completionStatus } from "@codemirror/autocomplete";
-import { EditorSelection } from "@codemirror/state";
+import { simplifySelection } from "@codemirror/commands";
 import type { EditorView } from "@codemirror/view";
 import { useAtomValue, useSetAtom, useStore } from "jotai";
 import { useMemo } from "react";
@@ -635,12 +635,8 @@ export function useCellEditorNavigationProps(
     const view = editorView.current;
     const state = view.state;
 
-    const hasTextSelection = !state.selection.main.empty;
-
-    if (hasTextSelection) {
-      view.dispatch({
-        selection: EditorSelection.single(state.selection.main.from), // Cursor to the start of the selection
-      });
+    const wasSimplified = simplifySelection(view);
+    if (wasSimplified) {
       return;
     }
 
diff --git a/frontend/src/components/editor/notebook-cell.tsx b/frontend/src/components/editor/notebook-cell.tsx
index da2a276787f..95408fa8c2f 100644
--- a/frontend/src/components/editor/notebook-cell.tsx
+++ b/frontend/src/components/editor/notebook-cell.tsx
@@ -87,7 +87,7 @@ import {
   useTemporarilyShownCodeActions,
 } from "./navigation/state";
 import { type OnRefactorWithAI, OutputArea } from "./Output";
-import { ConsoleOutput } from "./output/ConsoleOutput";
+import { ConsoleOutput } from "./output/console/ConsoleOutput";
 import { CellDragHandle, SortableCell } from "./SortableCell";
 
 /**
diff --git a/frontend/src/components/editor/output/Outputs.css b/frontend/src/components/editor/output/Outputs.css
index 250e731e97f..8fcb3e7519d 100644
--- a/frontend/src/components/editor/output/Outputs.css
+++ b/frontend/src/components/editor/output/Outputs.css
@@ -47,19 +47,19 @@
   font-size: 0.813rem;
 }
 
-.marimo-error,
 .stderr {
-  font-weight: bold;
-
-  @apply text-error;
+  color: var(--amber-12);
 }
 
 .marimo-error {
   background: #ffc0cb30;
   padding: 3%;
   font-size: 0.8125rem;
+  font-weight: bold;
   border-radius: 20px;
   white-space: pre-wrap; /* respect newlines */
+
+  @apply text-error;
 }
 
 .marimo-json-output {
diff --git a/frontend/src/components/editor/output/TextOutput.tsx b/frontend/src/components/editor/output/TextOutput.tsx
index 7111f698830..0a565c77073 100644
--- a/frontend/src/components/editor/output/TextOutput.tsx
+++ b/frontend/src/components/editor/output/TextOutput.tsx
@@ -1,11 +1,9 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
-import { AnsiUp } from "ansi_up";
 import type { JSX } from "react";
 import type { OutputChannel } from "@/core/kernel/messages";
 import { cn } from "@/utils/cn";
-
-const ansiUp = new AnsiUp();
+import { RenderTextWithLinks } from "./console/text-rendering";
 
 interface Props {
   text: string;
@@ -22,8 +20,9 @@ export const TextOutput = ({ text, channel, wrapText }: Props): JSX.Element => {
         className={
           wrapText ? "whitespace-pre-wrap break-words" : "whitespace-pre"
         }
-        dangerouslySetInnerHTML={{ __html: ansiUp.ansi_to_html(text) }}
-      />
+      >
+        <RenderTextWithLinks text={text} />
+      </span>
     );
   };
 
diff --git a/frontend/src/components/editor/output/ConsoleOutput.tsx b/frontend/src/components/editor/output/console/ConsoleOutput.tsx
similarity index 89%
rename from frontend/src/components/editor/output/ConsoleOutput.tsx
rename to frontend/src/components/editor/output/console/ConsoleOutput.tsx
index 0ca0695226b..2473b2edaf4 100644
--- a/frontend/src/components/editor/output/ConsoleOutput.tsx
+++ b/frontend/src/components/editor/output/console/ConsoleOutput.tsx
@@ -1,6 +1,5 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
-import { AnsiUp } from "ansi_up";
 import { ChevronRightIcon, WrapTextIcon } from "lucide-react";
 import React, { useLayoutEffect } from "react";
 import { ToggleButton } from "react-aria-components";
@@ -14,15 +13,13 @@ import type { WithResponse } from "@/core/cells/types";
 import type { OutputMessage } from "@/core/kernel/messages";
 import { useSelectAllContent } from "@/hooks/useSelectAllContent";
 import { cn } from "@/utils/cn";
-import { ansiToPlainText, parseHtmlContent } from "@/utils/dom";
 import { invariant } from "@/utils/invariant";
-import { Strings } from "@/utils/strings";
-import { NameCellContentEditable } from "../actions/name-cell-input";
-import { ErrorBoundary } from "../boundary/ErrorBoundary";
-import { type OnRefactorWithAI, OutputRenderer } from "../Output";
-import { useWrapText } from "./useWrapText";
-
-const ansiUp = new AnsiUp();
+import { NameCellContentEditable } from "../../actions/name-cell-input";
+import { ErrorBoundary } from "../../boundary/ErrorBoundary";
+import { type OnRefactorWithAI, OutputRenderer } from "../../Output";
+import { useWrapText } from "../useWrapText";
+import { processOutput } from "./process-output";
+import { RenderTextWithLinks } from "./text-rendering";
 
 interface Props {
   cellId: CellId;
@@ -268,20 +265,5 @@ const renderText = (text: string | null) => {
     return null;
   }
 
-  return (
-    <span dangerouslySetInnerHTML={{ __html: ansiUp.ansi_to_html(text) }} />
-  );
-};
-
-/** Convert cell or console output to a string, while handling html and ansi codes */
-export const processOutput = (output: OutputMessage): string => {
-  if (
-    output.mimetype.startsWith("application/vnd.marimo") ||
-    output.mimetype === "text/html"
-  ) {
-    return parseHtmlContent(Strings.asString(output.data));
-  }
-
-  // Convert ANSI to HTML, then parse as HTML
-  return ansiToPlainText(Strings.asString(output.data));
+  return <RenderTextWithLinks text={text} />;
 };
diff --git a/frontend/src/components/editor/output/console/__tests__/ConsoleOutput.test.tsx b/frontend/src/components/editor/output/console/__tests__/ConsoleOutput.test.tsx
new file mode 100644
index 00000000000..69f3ea28db1
--- /dev/null
+++ b/frontend/src/components/editor/output/console/__tests__/ConsoleOutput.test.tsx
@@ -0,0 +1,50 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import type { CellId } from "@/core/cells/ids";
+import type { OutputMessage } from "@/core/kernel/messages";
+import { ConsoleOutput } from "../ConsoleOutput";
+
+describe("ConsoleOutput integration", () => {
+  const createOutput = (data: string, channel = "stdout"): OutputMessage => ({
+    channel: channel as "stdout" | "stderr",
+    mimetype: "text/plain",
+    data,
+    timestamp: 0,
+  });
+
+  const defaultProps = {
+    cellId: "cell-1" as CellId,
+    cellName: "test_cell",
+    consoleOutputs: [],
+    stale: false,
+    debuggerActive: false,
+    onSubmitDebugger: () => {
+      // noop
+    },
+  };
+
+  it("should render console output with clickable URLs", () => {
+    const props = {
+      ...defaultProps,
+      consoleOutputs: [
+        {
+          ...createOutput("Check out https://marimo.io for more info"),
+          response: undefined,
+        },
+      ],
+    };
+
+    render(
+      <TooltipProvider>
+        <ConsoleOutput {...props} />
+      </TooltipProvider>,
+    );
+
+    const link = screen.getByRole("link", { name: "https://marimo.io" });
+    expect(link).toBeInTheDocument();
+    expect(link).toHaveAttribute("href", "https://marimo.io");
+  });
+});
diff --git a/frontend/src/components/editor/output/console/__tests__/text-rendering.test.tsx b/frontend/src/components/editor/output/console/__tests__/text-rendering.test.tsx
new file mode 100644
index 00000000000..8ca5cde571c
--- /dev/null
+++ b/frontend/src/components/editor/output/console/__tests__/text-rendering.test.tsx
@@ -0,0 +1,272 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { cleanAnsiCodes, RenderTextWithLinks } from "../text-rendering";
+
+// Mock the useInstallPackages hook
+vi.mock("@/core/packages/useInstallPackage", () => ({
+  useInstallPackages: () => ({
+    handleInstallPackages: vi.fn(),
+  }),
+}));
+
+describe("RenderTextWithLinks", () => {
+  describe("URL detection", () => {
+    it("should render plain text without URLs", () => {
+      render(<RenderTextWithLinks text="Hello, world!" />);
+      expect(screen.getByText("Hello, world!")).toBeInTheDocument();
+    });
+
+    it("should make URLs clickable", () => {
+      render(
+        <RenderTextWithLinks text="Check out https://marimo.io for more info" />,
+      );
+      const link = screen.getByRole("link", { name: "https://marimo.io" });
+      expect(link).toBeInTheDocument();
+      expect(link).toHaveAttribute("href", "https://marimo.io");
+      expect(link).toHaveAttribute("target", "_blank");
+      expect(link).toHaveAttribute("rel", "noopener noreferrer");
+    });
+
+    it("should handle multiple URLs in one line", () => {
+      render(
+        <RenderTextWithLinks text="Visit https://marimo.io or https://github.com/marimo-team/marimo" />,
+      );
+      expect(
+        screen.getByRole("link", { name: "https://marimo.io" }),
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole("link", {
+          name: "https://github.com/marimo-team/marimo",
+        }),
+      ).toBeInTheDocument();
+    });
+
+    it("should handle http URLs", () => {
+      render(<RenderTextWithLinks text="Link: http://example.com" />);
+      const link = screen.getByRole("link", { name: "http://example.com" });
+      expect(link).toBeInTheDocument();
+    });
+
+    it("should handle URLs with query parameters", () => {
+      render(
+        <RenderTextWithLinks text="Visit https://marimo.io/docs?page=1&section=intro" />,
+      );
+      const link = screen.getByRole("link", {
+        name: "https://marimo.io/docs?page=1&section=intro",
+      });
+      expect(link).toBeInTheDocument();
+      expect(link).toHaveAttribute(
+        "href",
+        "https://marimo.io/docs?page=1&section=intro",
+      );
+    });
+
+    it("should handle URLs at the start of text", () => {
+      render(<RenderTextWithLinks text="https://marimo.io is awesome" />);
+      expect(
+        screen.getByRole("link", { name: "https://marimo.io" }),
+      ).toBeInTheDocument();
+      expect(screen.getByText("is awesome")).toBeInTheDocument();
+    });
+
+    it("should handle URLs at the end of text", () => {
+      render(<RenderTextWithLinks text="Check out https://marimo.io" />);
+      expect(screen.getByText("Check out")).toBeInTheDocument();
+      expect(
+        screen.getByRole("link", { name: "https://marimo.io" }),
+      ).toBeInTheDocument();
+    });
+
+    it("should not break on text without protocols", () => {
+      render(<RenderTextWithLinks text="Visit marimo.io or github.com" />);
+      // These should be rendered as plain text, not links
+      expect(
+        screen.queryByRole("link", { name: "marimo.io" }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.getByText(/Visit marimo.io or github.com/),
+      ).toBeInTheDocument();
+    });
+  });
+
+  describe("XSS safety", () => {
+    it("should safely handle URLs with special characters", () => {
+      render(
+        <RenderTextWithLinks text="Visit https://example.com/<script>alert('xss')</script>" />,
+      );
+      // The URL should be rendered but script should not execute
+      expect(screen.getByText(/Visit/)).toBeInTheDocument();
+      // Should not have a script element in the DOM
+      const scripts = document.querySelectorAll("script");
+      const hasXSSScript = [...scripts].some((script) =>
+        script.textContent?.includes("alert('xss')"),
+      );
+      expect(hasXSSScript).toBe(false);
+    });
+
+    it("should handle javascript: protocol URLs safely", () => {
+      render(<RenderTextWithLinks text="Link: javascript:alert('xss')" />);
+      // javascript: protocol should not be detected as a valid URL
+      expect(
+        screen.queryByRole("link", { name: /javascript:/ }),
+      ).not.toBeInTheDocument();
+    });
+  });
+});
+
+describe("cleanAnsiCodes", () => {
+  it("should remove basic ANSI color codes", () => {
+    const text = "\u001B[31mRed text\u001B[0m";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("Red text");
+  });
+
+  it("should remove multiple ANSI codes", () => {
+    const text =
+      "\u001B[31mRed\u001B[0m \u001B[32mGreen\u001B[0m \u001B[34mBlue\u001B[0m";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("Red Green Blue");
+  });
+
+  it("should handle text without ANSI codes", () => {
+    const text = "Plain text";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("Plain text");
+  });
+
+  it("should remove ANSI codes with multiple parameters", () => {
+    const text = "\u001B[1;31mBold Red\u001B[0m";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("Bold Red");
+  });
+
+  it("should clean ANSI codes from URLs", () => {
+    const text = "https://marimo.io\u001B[0m";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("https://marimo.io");
+  });
+
+  it("should handle empty string", () => {
+    const text = "";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("");
+  });
+
+  it("should remove complex ANSI sequences", () => {
+    const text = "\u001B[38;5;208mOrange text\u001B[0m";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("Orange text");
+  });
+
+  it("should handle text with only ANSI codes", () => {
+    const text = "\u001B[31m\u001B[0m";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("");
+  });
+
+  it("should preserve special characters and whitespace", () => {
+    const text = "\u001B[31mSpecial: !@#$%^&*()\n\tTab and newline\u001B[0m";
+    const cleaned = cleanAnsiCodes(text);
+    expect(cleaned).toBe("Special: !@#$%^&*()\n\tTab and newline");
+  });
+});
+
+describe("RenderTextWithLinks - pip install detection", () => {
+  it("should render pip install command with install button", () => {
+    render(<RenderTextWithLinks text="pip install pandas" />);
+
+    expect(screen.getByText(/pip install pandas/)).toBeInTheDocument();
+    expect(screen.getByRole("button")).toBeInTheDocument();
+  });
+
+  it("should handle pip install with package extras", () => {
+    render(<RenderTextWithLinks text="pip install package[extra,dep]" />);
+
+    expect(
+      screen.getByText(/pip install package\[extra,dep]/),
+    ).toBeInTheDocument();
+    expect(screen.getByRole("button")).toBeInTheDocument();
+  });
+
+  it("should handle multiple packages", () => {
+    render(<RenderTextWithLinks text="pip install pandas numpy scipy" />);
+
+    expect(screen.getByText(/pip install pandas/)).toBeInTheDocument();
+    const button = screen.getByRole("button");
+    expect(button).toBeInTheDocument();
+    expect(button.textContent).toContain("pandas");
+  });
+
+  it("should handle pip install with surrounding text", () => {
+    render(
+      <RenderTextWithLinks text="Error: please run pip install pandas to fix this issue" />,
+    );
+
+    expect(screen.getByText(/Error: please run/)).toBeInTheDocument();
+    expect(screen.getByText(/pip install pandas/)).toBeInTheDocument();
+    expect(screen.getByText(/to fix this issue/)).toBeInTheDocument();
+    expect(screen.getByRole("button")).toBeInTheDocument();
+  });
+
+  it("should not render button for non-pip install text", () => {
+    render(<RenderTextWithLinks text="Install the package manually" />);
+
+    expect(screen.queryByRole("button")).not.toBeInTheDocument();
+  });
+  it("should handle pip install with ANSI codes", () => {
+    // ANSI codes create nested spans which makes the replacer logic complex
+    // For now, just verify it renders without crashing
+    const { container } = render(
+      <RenderTextWithLinks text="\u001B[31mError: pip install pandas\u001B[0m" />,
+    );
+    expect(container).toBeInTheDocument();
+  });
+
+  it("should handle pip install with hyphens in package name", () => {
+    render(<RenderTextWithLinks text="pip install scikit-learn" />);
+
+    expect(screen.getByRole("button")).toBeInTheDocument();
+  });
+
+  it("should handle pip install with dots in package name", () => {
+    render(<RenderTextWithLinks text="pip install types.boto3" />);
+
+    expect(screen.getByRole("button")).toBeInTheDocument();
+  });
+
+  it("should handle both pip install and URLs in the same text", () => {
+    render(
+      <RenderTextWithLinks text="Run pip install pandas and visit https://marimo.io for docs" />,
+    );
+
+    expect(screen.getByRole("button")).toBeInTheDocument();
+    expect(
+      screen.getByRole("link", { name: "https://marimo.io" }),
+    ).toBeInTheDocument();
+  });
+
+  it("should handle multiple separate pip install commands in the same text", () => {
+    render(
+      <RenderTextWithLinks text="You need to: pip install polars pandas to fix this." />,
+    );
+
+    // Should create button for the first package in the command
+    const buttons = screen.getAllByRole("button");
+    expect(buttons).toHaveLength(1);
+    expect(buttons[0].textContent).toContain("pip install polars");
+  });
+
+  it("should handle multiple distinct pip install commands", () => {
+    render(
+      <RenderTextWithLinks text="First run pip install polars. Then run pip install pandas." />,
+    );
+
+    // Should create separate buttons for each command
+    const buttons = screen.getAllByRole("button");
+    expect(buttons).toHaveLength(2);
+    expect(buttons[0].textContent).toContain("polars");
+    expect(buttons[1].textContent).toContain("pandas");
+  });
+});
diff --git a/frontend/src/components/editor/output/console/process-output.ts b/frontend/src/components/editor/output/console/process-output.ts
new file mode 100644
index 00000000000..1ad72c78bac
--- /dev/null
+++ b/frontend/src/components/editor/output/console/process-output.ts
@@ -0,0 +1,17 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+import type { OutputMessage } from "@/core/kernel/messages";
+import { ansiToPlainText, parseHtmlContent } from "@/utils/dom";
+import { Strings } from "@/utils/strings";
+
+/** Convert cell or console output to a string, while handling html and ansi codes */
+export function processOutput(output: OutputMessage): string {
+  if (
+    output.mimetype.startsWith("application/vnd.marimo") ||
+    output.mimetype === "text/html"
+  ) {
+    return parseHtmlContent(Strings.asString(output.data));
+  }
+
+  // Convert ANSI to HTML, then parse as HTML
+  return ansiToPlainText(Strings.asString(output.data));
+}
diff --git a/frontend/src/components/editor/output/console/text-rendering.tsx b/frontend/src/components/editor/output/console/text-rendering.tsx
new file mode 100644
index 00000000000..79d909580d5
--- /dev/null
+++ b/frontend/src/components/editor/output/console/text-rendering.tsx
@@ -0,0 +1,332 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+
+import { AnsiUp } from "ansi_up";
+import parse, { type DOMNode, Text } from "html-react-parser";
+import React, { useMemo } from "react";
+import { useInstallPackages } from "@/core/packages/useInstallPackage";
+import { Events } from "@/utils/events";
+import { parseContent } from "@/utils/url-parser";
+
+const ansiUp = new AnsiUp();
+
+/**
+ * Helper to clean ANSI escape codes from text
+ */
+export const cleanAnsiCodes = (text: string): string => {
+  // Remove ANSI escape sequences (ESC[ followed by numbers/semicolons and 'm')
+  // Using String.fromCharCode to avoid linter error
+  const ansiRegex = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+  return text.replaceAll(ansiRegex, "");
+};
+
+// Regex to match install commands: pip install, uv add, uv pip install
+const INSTALL_COMMAND_REGEX =
+  /(pip\s+install|uv\s+add|uv\s+pip\s+install)\s+/gi;
+
+/**
+ * Parse install command to extract a single package name
+ * Supports: pip install, uv add, uv pip install
+ * Handles flags like -U, --upgrade that can appear before or after the package name
+ */
+function parsePipInstallCommand(
+  text: string,
+): { package: string; endIndex: number } | null {
+  INSTALL_COMMAND_REGEX.lastIndex = 0;
+  const match = INSTALL_COMMAND_REGEX.exec(text);
+  if (!match) {
+    return null;
+  }
+
+  const commandEndIndex = match.index + match[0].length;
+  const afterCommand = text.slice(commandEndIndex);
+
+  // Skip any flags (tokens starting with -)
+  // Split by whitespace and find the first non-flag token
+  const tokens = afterCommand.split(/\s+/);
+  let packageName = "";
+  let packageStartOffset = 0;
+
+  for (const token_ of tokens) {
+    const token = token_.trim();
+    if (!token) {
+      continue;
+    }
+
+    // Skip flags (anything starting with -)
+    if (token.startsWith("-")) {
+      // Add to offset: token length + space
+      packageStartOffset += token.length + 1;
+      continue;
+    }
+
+    // Found the package name - extract it using character matching
+    // Match until we hit a character that's not valid in package names
+    const packageMatch = token.match(/^[\w,.[\]-]+/);
+    if (packageMatch) {
+      packageName = packageMatch[0];
+      break;
+    }
+
+    break;
+  }
+
+  if (!packageName) {
+    return null;
+  }
+
+  const endIndex = commandEndIndex + packageStartOffset + packageName.length;
+
+  return { package: packageName, endIndex };
+}
+
+/**
+ * Type for a replacer function that can transform DOM nodes during parsing
+ * Returns a React element, string, boolean, null, or undefined (to skip replacement)
+ */
+type Replacer = (
+  domNode: DOMNode,
+) => React.ReactElement | string | boolean | null | undefined;
+
+/**
+ * Helper function to process text content for URLs and images
+ * This is used by multiple replacers to avoid code duplication
+ */
+function processTextForUrls(text: string, keyPrefix = ""): React.ReactNode {
+  if (!text) {
+    return null;
+  }
+
+  // Quick check to avoid unnecessary parsing
+  if (!/https?:\/\//.test(text)) {
+    return text;
+  }
+
+  const parts = parseContent(text);
+
+  // If no URLs detected, return original text
+  if (parts.length === 1 && parts[0].type === "text") {
+    return text;
+  }
+
+  // Render parts with clickable links
+  return (
+    <>
+      {parts.map((part, idx) => {
+        const key = keyPrefix ? `${keyPrefix}-${idx}` : idx;
+        if (part.type === "url") {
+          const cleanUrl = cleanAnsiCodes(part.url);
+          return (
+            <a
+              key={key}
+              href={cleanUrl}
+              target="_blank"
+              rel="noopener noreferrer"
+              onClick={Events.stopPropagation()}
+              className="text-link hover:underline"
+            >
+              {cleanUrl}
+            </a>
+          );
+        }
+        if (part.type === "image") {
+          // For console output, just render images as links
+          const cleanUrl = cleanAnsiCodes(part.url);
+          return (
+            <a
+              key={key}
+              href={cleanUrl}
+              target="_blank"
+              rel="noopener noreferrer"
+              onClick={Events.stopPropagation()}
+              className="text-link hover:underline"
+            >
+              {cleanUrl}
+            </a>
+          );
+        }
+        return <React.Fragment key={key}>{part.value}</React.Fragment>;
+      })}
+    </>
+  );
+}
+
+const InstallPackageLink = ({
+  packages,
+  children,
+}: {
+  packages: string[];
+  children: React.ReactNode;
+}) => {
+  const { handleInstallPackages } = useInstallPackages();
+  return (
+    <button
+      onClick={(e) => {
+        handleInstallPackages(packages);
+        e.preventDefault();
+      }}
+      className="text-link hover:underline"
+      type="button"
+    >
+      {children}
+    </button>
+  );
+};
+
+/**
+ * Replacer that detects pip install commands and renders an install button
+ */
+export const pipInstallReplacer: Replacer = (domNode: DOMNode) => {
+  // Only process text nodes
+  if (!(domNode instanceof Text)) {
+    return undefined;
+  }
+
+  const textContent = cleanAnsiCodes(domNode.data);
+
+  // Quick check to avoid unnecessary regex
+  if (!/(pip\s+install|uv\s+add|uv\s+pip\s+install)/i.test(textContent)) {
+    return undefined;
+  }
+
+  // Find all matches in the text
+  const matches: {
+    match: RegExpExecArray;
+    result: { package: string; endIndex: number };
+  }[] = [];
+
+  // Create a new regex for iteration (don't reuse the global one)
+  const regex = /(pip\s+install|uv\s+add|uv\s+pip\s+install)\s+/gi;
+  let match: RegExpExecArray | null;
+
+  while ((match = regex.exec(textContent)) !== null) {
+    const startIndex = match.index;
+    const textFromMatch = textContent.slice(startIndex);
+    const result = parsePipInstallCommand(textFromMatch);
+
+    if (result) {
+      matches.push({ match, result });
+    }
+  }
+
+  // If no valid matches found, return undefined
+  if (matches.length === 0) {
+    return undefined;
+  }
+
+  // Build the result by splitting text into segments
+  const segments: React.ReactNode[] = [];
+  let lastIndex = 0;
+
+  matches.forEach((matchInfo, idx) => {
+    const { match, result } = matchInfo;
+    const startIndex = match.index;
+    const endIndex = startIndex + result.endIndex;
+
+    // Add text before this match (with URL processing)
+    if (lastIndex < startIndex) {
+      const beforeText = textContent.slice(lastIndex, startIndex);
+      segments.push(
+        <React.Fragment key={`before-${idx}`}>
+          {processTextForUrls(beforeText, `before-${idx}`)}
+        </React.Fragment>,
+      );
+    }
+
+    // Add the install button
+    const commandText = textContent.slice(startIndex, endIndex);
+    segments.push(
+      <InstallPackageLink key={`install-${idx}`} packages={[result.package]}>
+        {commandText}
+      </InstallPackageLink>,
+    );
+
+    lastIndex = endIndex;
+  });
+
+  // Add any remaining text after the last match
+  if (lastIndex < textContent.length) {
+    const afterText = textContent.slice(lastIndex);
+    segments.push(
+      <React.Fragment key="after">
+        {processTextForUrls(afterText, "after")}
+      </React.Fragment>,
+    );
+  }
+
+  return <>{segments}</>;
+};
+
+/**
+ * Replacer that detects URLs in text nodes and makes them clickable
+ */
+export const urlReplacer: Replacer = (domNode: DOMNode) => {
+  // Only process text nodes
+  if (!(domNode instanceof Text)) {
+    return undefined;
+  }
+
+  const textContent = domNode.data;
+
+  // Check if text contains URLs (fast check before parsing)
+  if (!/https?:\/\//.test(textContent)) {
+    return undefined;
+  }
+
+  // Use the shared helper to process URLs
+  const result = processTextForUrls(textContent);
+
+  // If no change was made (just plain text), return undefined to let other replacers try
+  if (typeof result === "string") {
+    return undefined;
+  }
+
+  return <>{result}</>;
+};
+
+/**
+ * Creates a composed replacer function from multiple replacers
+ * Replacers are applied in order, and the first one that returns a value wins
+ */
+export const composeReplacers = (...replacers: Replacer[]): Replacer => {
+  return (domNode: DOMNode) => {
+    for (const replacer of replacers) {
+      const result = replacer(domNode);
+      if (result !== undefined) {
+        return result;
+      }
+    }
+    return undefined;
+  };
+};
+
+/**
+ * Convert text to React element with ANSI colors and custom replacers applied
+ */
+export const renderTextWithReplacers = (
+  text: string,
+  replacer: Replacer,
+): React.ReactNode => {
+  const html = ansiUp.ansi_to_html(text);
+
+  const content = parse(html, {
+    replace: (domNode: DOMNode) => {
+      return replacer(domNode);
+    },
+  });
+
+  return <span>{content}</span>;
+};
+
+/**
+ * Convert text to React element with ANSI colors, clickable URLs, and pip install buttons
+ */
+export const RenderTextWithLinks = ({ text }: { text: string }) => {
+  const content = useMemo(() => {
+    return renderTextWithReplacers(
+      text,
+      composeReplacers(pipInstallReplacer, urlReplacer),
+    );
+  }, [text]);
+
+  return <>{content}</>;
+};
diff --git a/frontend/src/components/editor/renderers/vertical-layout/vertical-layout.tsx b/frontend/src/components/editor/renderers/vertical-layout/vertical-layout.tsx
index a27e083e673..4eb9bac25c8 100644
--- a/frontend/src/components/editor/renderers/vertical-layout/vertical-layout.tsx
+++ b/frontend/src/components/editor/renderers/vertical-layout/vertical-layout.tsx
@@ -13,7 +13,7 @@ import { memo, useRef, useState } from "react";
 import { z } from "zod";
 import { ReadonlyCode } from "@/components/editor/code/readonly-python-code";
 import { OutputArea } from "@/components/editor/Output";
-import { ConsoleOutput } from "@/components/editor/output/ConsoleOutput";
+import { ConsoleOutput } from "@/components/editor/output/console/ConsoleOutput";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import {
diff --git a/frontend/src/components/scratchpad/scratchpad.tsx b/frontend/src/components/scratchpad/scratchpad.tsx
index b39a2803d26..5120a7e0407 100644
--- a/frontend/src/components/scratchpad/scratchpad.tsx
+++ b/frontend/src/components/scratchpad/scratchpad.tsx
@@ -27,7 +27,7 @@ import { Functions } from "@/utils/functions";
 import { CellEditor } from "../editor/cell/code/cell-editor";
 import { HideInKioskMode } from "../editor/kiosk-mode";
 import { OutputArea } from "../editor/Output";
-import { ConsoleOutput } from "../editor/output/ConsoleOutput";
+import { ConsoleOutput } from "../editor/output/console/ConsoleOutput";
 import { Spinner } from "../icons/spinner";
 import { renderShortcut } from "../shortcuts/renderShortcut";
 import { Button } from "../ui/button";
diff --git a/frontend/src/core/ai/context/providers/cell-output.ts b/frontend/src/core/ai/context/providers/cell-output.ts
index 0ad858000e4..c1d00f1ffc2 100644
--- a/frontend/src/core/ai/context/providers/cell-output.ts
+++ b/frontend/src/core/ai/context/providers/cell-output.ts
@@ -3,7 +3,7 @@
 import type { Completion } from "@codemirror/autocomplete";
 import type { FileUIPart } from "ai";
 import { toPng } from "html-to-image";
-import { processOutput } from "@/components/editor/output/ConsoleOutput";
+import { processOutput } from "@/components/editor/output/console/process-output";
 import { type NotebookState, notebookAtom } from "@/core/cells/cells";
 import { type CellId, CellOutputId } from "@/core/cells/ids";
 import { displayCellName } from "@/core/cells/names";
diff --git a/frontend/src/core/codemirror/cm.ts b/frontend/src/core/codemirror/cm.ts
index bd1b9f67cb8..664d4d35d2c 100644
--- a/frontend/src/core/codemirror/cm.ts
+++ b/frontend/src/core/codemirror/cm.ts
@@ -152,7 +152,7 @@ export const setupCodeMirror = (opts: CodeMirrorSetupOpts): Extension[] => {
     // Reactive references highlighting
     reactiveReferencesBundle(
       cellId,
-      displayConfig.reference_highlighting ?? false,
+      displayConfig.reference_highlighting ?? true,
     ),
   ];
 };
diff --git a/frontend/src/core/codemirror/copilot/__tests__/language-server.test.ts b/frontend/src/core/codemirror/copilot/__tests__/language-server.test.ts
new file mode 100644
index 00000000000..9366b3dac72
--- /dev/null
+++ b/frontend/src/core/codemirror/copilot/__tests__/language-server.test.ts
@@ -0,0 +1,209 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import { Transport } from "@open-rpc/client-js/build/transports/Transport";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { CopilotLanguageServerClient } from "../language-server";
+
+// Mock transport
+class MockTransport extends Transport {
+  override connect = vi.fn().mockResolvedValue(undefined);
+  override close = vi.fn();
+  override sendData = vi.fn().mockResolvedValue({});
+  override subscribe = vi.fn();
+  override unsubscribe = vi.fn();
+  override parseData = vi.fn();
+}
+
+describe("CopilotLanguageServerClient", () => {
+  let mockTransport: MockTransport;
+
+  beforeEach(() => {
+    mockTransport = new MockTransport();
+  });
+
+  it("should initialize without copilot settings", () => {
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+    });
+
+    expect(client).toBeDefined();
+  });
+
+  it("should initialize with empty copilot settings", () => {
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+      copilotSettings: {},
+    });
+
+    expect(client).toBeDefined();
+  });
+
+  it("should initialize with copilot settings", () => {
+    const copilotSettings = {
+      http: {
+        proxy: "http://proxy.example.com:8888",
+        proxyStrictSSL: true,
+      },
+      telemetry: {
+        telemetryLevel: "off",
+      },
+    };
+
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+      copilotSettings,
+    });
+
+    expect(client).toBeDefined();
+  });
+
+  it("should send configuration after initialization when settings are provided", async () => {
+    const copilotSettings = {
+      http: {
+        proxy: "http://proxy.example.com:8888",
+        proxyStrictSSL: true,
+      },
+    };
+
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+      copilotSettings,
+    });
+
+    // Spy on the notify method
+    const notifySpy = vi.spyOn(client as any, "notify");
+
+    // Wait for initialization
+    await client.initializePromise;
+
+    // Wait for next tick to let the configuration be sent
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    // Verify that notify was called with the correct parameters
+    expect(notifySpy).toHaveBeenCalledWith("workspace/didChangeConfiguration", {
+      settings: copilotSettings,
+    });
+  });
+
+  it("should not send configuration after initialization when settings are empty", async () => {
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+      copilotSettings: {},
+    });
+
+    // Spy on the notify method
+    const notifySpy = vi.spyOn(client as any, "notify");
+
+    // Wait for initialization
+    await client.initializePromise;
+
+    // Wait for next tick
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    // Verify that notify was NOT called with didChangeConfiguration
+    expect(notifySpy).not.toHaveBeenCalledWith(
+      "workspace/didChangeConfiguration",
+      expect.anything(),
+    );
+  });
+
+  it("should not send configuration after initialization when settings are not provided", async () => {
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+    });
+
+    // Spy on the notify method
+    const notifySpy = vi.spyOn(client as any, "notify");
+
+    // Wait for initialization
+    await client.initializePromise;
+
+    // Wait for next tick
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    // Verify that notify was NOT called with didChangeConfiguration
+    expect(notifySpy).not.toHaveBeenCalledWith(
+      "workspace/didChangeConfiguration",
+      expect.anything(),
+    );
+  });
+
+  it("should accept github-enterprise settings", async () => {
+    const copilotSettings = {
+      "github-enterprise": {
+        uri: "https://github.enterprise.com",
+      },
+    };
+
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+      copilotSettings,
+    });
+
+    // Spy on the notify method
+    const notifySpy = vi.spyOn(client as any, "notify");
+
+    // Wait for initialization
+    await client.initializePromise;
+
+    // Wait for next tick to let the configuration be sent
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    // Verify that notify was called with the enterprise settings
+    expect(notifySpy).toHaveBeenCalledWith("workspace/didChangeConfiguration", {
+      settings: copilotSettings,
+    });
+  });
+
+  it("should accept all supported settings at once", async () => {
+    const copilotSettings = {
+      http: {
+        proxy: "http://proxy.example.com:8888",
+        proxyStrictSSL: true,
+        proxyKerberosServicePrincipal: "HTTP/proxy.example.com",
+      },
+      telemetry: {
+        telemetryLevel: "all",
+      },
+      "github-enterprise": {
+        uri: "https://github.enterprise.com",
+      },
+    };
+
+    const client = new CopilotLanguageServerClient({
+      rootUri: "file:///test",
+      workspaceFolders: null,
+      transport: mockTransport,
+      copilotSettings,
+    });
+
+    // Spy on the notify method
+    const notifySpy = vi.spyOn(client as any, "notify");
+
+    // Wait for initialization
+    await client.initializePromise;
+
+    // Wait for next tick to let the configuration be sent
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    // Verify that notify was called with all settings
+    expect(notifySpy).toHaveBeenCalledWith("workspace/didChangeConfiguration", {
+      settings: copilotSettings,
+    });
+  });
+});
diff --git a/frontend/src/core/codemirror/copilot/__tests__/transport.test.ts b/frontend/src/core/codemirror/copilot/__tests__/transport.test.ts
index 94b041a43d1..583e0c06cf2 100644
--- a/frontend/src/core/codemirror/copilot/__tests__/transport.test.ts
+++ b/frontend/src/core/codemirror/copilot/__tests__/transport.test.ts
@@ -155,7 +155,7 @@ describe("LazyWebsocketTransport", () => {
       expect(mockShowError).toHaveBeenCalledTimes(1);
       expect(mockShowError).toHaveBeenCalledWith(
         "GitHub Copilot Connection Error",
-        "Failed to connect to GitHub Copilot. Please check your settings and try again.",
+        "Failed to connect to GitHub Copilot. Please check your settings and try again.\n\nConnection failed",
       );
       expect((transport as any).delegate).toBeUndefined();
     });
diff --git a/frontend/src/core/codemirror/copilot/client.ts b/frontend/src/core/codemirror/copilot/client.ts
index b2a474b8c18..070a3343b4b 100644
--- a/frontend/src/core/codemirror/copilot/client.ts
+++ b/frontend/src/core/codemirror/copilot/client.ts
@@ -2,8 +2,10 @@
 
 import { languageServerWithClient } from "@marimo-team/codemirror-languageserver";
 import { toast } from "@/components/ui/use-toast";
+import { resolvedMarimoConfigAtom } from "@/core/config/config";
 import { waitForConnectionOpen } from "@/core/network/connection";
 import { getRuntimeManager } from "@/core/runtime/config";
+import { store } from "@/core/state/jotai";
 import { once } from "@/utils/once";
 import { CopilotLanguageServerClient } from "./language-server";
 import { waitForEnabledCopilot } from "./state";
@@ -32,14 +34,17 @@ export const createWSTransport = once(() => {
   });
 });
 
-export const getCopilotClient = once(
-  () =>
-    new CopilotLanguageServerClient({
-      rootUri: FILE_URI,
-      workspaceFolders: null,
-      transport: createWSTransport(),
-    }),
-);
+export const getCopilotClient = once(() => {
+  const userConfig = store.get(resolvedMarimoConfigAtom);
+  const copilotSettings = userConfig.ai?.github?.copilot_settings ?? {};
+
+  return new CopilotLanguageServerClient({
+    rootUri: FILE_URI,
+    workspaceFolders: null,
+    transport: createWSTransport(),
+    copilotSettings,
+  });
+});
 
 export function copilotServer() {
   return languageServerWithClient({
diff --git a/frontend/src/core/codemirror/copilot/language-server.ts b/frontend/src/core/codemirror/copilot/language-server.ts
index 773f196d068..265b882939b 100644
--- a/frontend/src/core/codemirror/copilot/language-server.ts
+++ b/frontend/src/core/codemirror/copilot/language-server.ts
@@ -66,10 +66,34 @@ export type EnhancedNotification = {
 export class CopilotLanguageServerClient extends LanguageServerClient {
   private documentVersion = 0;
   private hasOpenedDocument = false;
-
-  constructor(...args: ConstructorParameters<typeof LanguageServerClient>) {
-    super(...args);
+  private copilotSettings: Record<string, unknown> = {};
+
+  constructor(
+    options: ConstructorParameters<typeof LanguageServerClient>[0] & {
+      copilotSettings?: Record<string, unknown>;
+    },
+  ) {
+    super(options);
+    this.copilotSettings = options.copilotSettings ?? {};
     this.onNotification(this.handleNotification);
+    this.attachInitializeListener();
+  }
+
+  private attachInitializeListener() {
+    // Send configuration after initialization
+    this.initializePromise.then(() => {
+      this.sendConfiguration();
+    });
+  }
+
+  private async sendConfiguration() {
+    const settings = this.copilotSettings;
+    // Skip if no settings are provided
+    if (!settings || Object.keys(settings).length === 0) {
+      return;
+    }
+    await this.notify("workspace/didChangeConfiguration", { settings });
+    logger.debug("#sendConfiguration: Configuration sent", settings);
   }
 
   private async _request<Method extends keyof LSPRequestMap>(
diff --git a/frontend/src/core/codemirror/copilot/transport.ts b/frontend/src/core/codemirror/copilot/transport.ts
index 9082b6381dd..ada25ec592b 100644
--- a/frontend/src/core/codemirror/copilot/transport.ts
+++ b/frontend/src/core/codemirror/copilot/transport.ts
@@ -3,6 +3,7 @@
 import { WebSocketTransport } from "@open-rpc/client-js";
 import type { JSONRPCRequestData } from "@open-rpc/client-js/build/Request";
 import { Transport } from "@open-rpc/client-js/build/transports/Transport";
+import { prettyError } from "@/utils/errors";
 import { Logger } from "@/utils/Logger";
 
 export interface LazyWebsocketTransportOptions {
@@ -20,7 +21,7 @@ export interface LazyWebsocketTransportOptions {
   /**
    * Function to show error toast notifications.
    */
-  showError: (title: string, description: string) => void;
+  showError: (title: string, description: string | React.ReactNode) => void;
 
   /**
    * Number of retry attempts for connection.
@@ -159,7 +160,8 @@ export class LazyWebsocketTransport extends Transport {
           // Show error toast on final retry
           this.options.showError(
             "GitHub Copilot Connection Error",
-            "Failed to connect to GitHub Copilot. Please check your settings and try again.",
+            "Failed to connect to GitHub Copilot. Please check your settings and try again.\n\n" +
+              prettyError(error),
           );
           throw error;
         }
diff --git a/frontend/src/core/config/__tests__/config-schema.test.ts b/frontend/src/core/config/__tests__/config-schema.test.ts
index 0e583f3fb38..fa2756795a9 100644
--- a/frontend/src/core/config/__tests__/config-schema.test.ts
+++ b/frontend/src/core/config/__tests__/config-schema.test.ts
@@ -65,7 +65,7 @@ test("default UserConfig - empty", () => {
         "default_table_max_columns": 50,
         "default_table_page_size": 10,
         "default_width": "medium",
-        "reference_highlighting": false,
+        "reference_highlighting": true,
         "theme": "light",
       },
       "experimental": {},
@@ -133,7 +133,7 @@ test("default UserConfig - one level", () => {
         "default_table_max_columns": 50,
         "default_table_page_size": 10,
         "default_width": "medium",
-        "reference_highlighting": false,
+        "reference_highlighting": true,
         "theme": "light",
       },
       "experimental": {},
diff --git a/frontend/src/core/config/config-schema.ts b/frontend/src/core/config/config-schema.ts
index 13fded6408b..70accf4f3b0 100644
--- a/frontend/src/core/config/config-schema.ts
+++ b/frontend/src/core/config/config-schema.ts
@@ -145,7 +145,7 @@ export const UserConfigSchema = z
             return width;
           }),
         locale: z.string().nullable().optional(),
-        reference_highlighting: z.boolean().prefault(false),
+        reference_highlighting: z.boolean().prefault(true),
       })
       .prefault({}),
     package_management: z
diff --git a/frontend/src/core/layout/useTogglePresenting.ts b/frontend/src/core/layout/useTogglePresenting.ts
index fba130962b9..32985f932c2 100644
--- a/frontend/src/core/layout/useTogglePresenting.ts
+++ b/frontend/src/core/layout/useTogglePresenting.ts
@@ -14,7 +14,7 @@ interface ScrollAnchor {
 function findScrollAnchor(): ScrollAnchor | null {
   const outputAreas = document.getElementsByClassName(CSSClasses.outputArea);
 
-  for (const elem of Array.from(outputAreas)) {
+  for (const elem of outputAreas) {
     const rect = elem.getBoundingClientRect();
 
     // Find first visible output area
diff --git a/frontend/src/plugins/impl/anywidget/AnyWidgetPlugin.tsx b/frontend/src/plugins/impl/anywidget/AnyWidgetPlugin.tsx
index 9f8a9702705..1e709cb3ab1 100644
--- a/frontend/src/plugins/impl/anywidget/AnyWidgetPlugin.tsx
+++ b/frontend/src/plugins/impl/anywidget/AnyWidgetPlugin.tsx
@@ -37,6 +37,7 @@ interface Data {
 
 type T = Record<string, unknown>;
 
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type PluginFunctions = {
   send_to_widget: <T>(req: {
     content: unknown;
diff --git a/frontend/src/utils/__tests__/data-views.test.ts b/frontend/src/utils/__tests__/data-views.test.ts
index 7d1ed24a392..0f567129e77 100644
--- a/frontend/src/utils/__tests__/data-views.test.ts
+++ b/frontend/src/utils/__tests__/data-views.test.ts
@@ -300,7 +300,7 @@ describe("dataViewToBase64", () => {
     for (let i = 0; i < decoded.length; i++) {
       decodedBytes[i] = decoded.charCodeAt(i);
     }
-    expect(Array.from(decodedBytes)).toEqual([0, 1, 2, 255, 254, 253]);
+    expect([...decodedBytes]).toEqual([0, 1, 2, 255, 254, 253]);
   });
 });
 
diff --git a/frontend/src/utils/__tests__/url-parser.test.ts b/frontend/src/utils/__tests__/url-parser.test.ts
new file mode 100644
index 00000000000..767b76a4969
--- /dev/null
+++ b/frontend/src/utils/__tests__/url-parser.test.ts
@@ -0,0 +1,79 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+import { describe, expect, it } from "vitest";
+import { parseContent } from "../url-parser";
+
+describe("parseContent", () => {
+  it("handles data URIs", () => {
+    const parts = parseContent("data:image/png;base64,iVBOR");
+    expect(parts).toEqual([
+      {
+        type: "image",
+        url: "data:image/png;base64,iVBOR",
+      },
+    ]);
+  });
+
+  it("handles complete URLs", () => {
+    const parts = parseContent("https://marimo.io/path?query=value");
+    expect(parts).toEqual([
+      { type: "url", url: "https://marimo.io/path?query=value" },
+    ]);
+  });
+
+  it("handles multiple URLs with text", () => {
+    const parts = parseContent(
+      "Visit https://marimo.io and https://github.com/marimo-team",
+    );
+    expect(parts).toEqual([
+      { type: "text", value: "Visit " },
+      { type: "url", url: "https://marimo.io" },
+      { type: "text", value: " and " },
+      { type: "url", url: "https://github.com/marimo-team" },
+    ]);
+  });
+
+  it("handles text with data URIs", () => {
+    // Currently doesn't detect mixed content
+    const parts = parseContent("Image: data:image/png;base64,iVBOR");
+    expect(parts).toEqual([
+      { type: "text", value: "Image: data:image/png;base64,iVBOR" },
+    ]);
+  });
+
+  it("handles data URIs, text and images", () => {
+    const parts = parseContent(
+      "this is a picture: https://avatars.githubusercontent.com/u/123 and data:image/png;base64,iVBOR",
+    );
+    expect(parts).toEqual([
+      { type: "text", value: "this is a picture: " },
+      { type: "image", url: "https://avatars.githubusercontent.com/u/123" },
+      { type: "text", value: " and data:image/png;base64,iVBOR" },
+    ]);
+  });
+
+  it("handles plain text without URLs", () => {
+    const parts = parseContent("Hello world");
+    expect(parts).toEqual([{ type: "text", value: "Hello world" }]);
+  });
+
+  it("handles image URLs with various extensions", () => {
+    const extensions = ["png", "jpg", "jpeg", "gif", "webp", "svg", "ico"];
+    extensions.forEach((ext) => {
+      const parts = parseContent(`Image: https://example.com/image.${ext}`);
+      expect(parts).toContainEqual({
+        type: "image",
+        url: `https://example.com/image.${ext}`,
+      });
+    });
+  });
+
+  it("handles known image domains", () => {
+    const parts = parseContent(
+      "Avatar: https://avatars.githubusercontent.com/u/123",
+    );
+    expect(parts).toContainEqual({
+      type: "image",
+      url: "https://avatars.githubusercontent.com/u/123",
+    });
+  });
+});
diff --git a/frontend/src/utils/data-views.ts b/frontend/src/utils/data-views.ts
index 6eaec3051c2..2836fecf1cf 100644
--- a/frontend/src/utils/data-views.ts
+++ b/frontend/src/utils/data-views.ts
@@ -37,8 +37,8 @@ function findDataViewPaths(
   if (obj instanceof DataView) {
     paths.push(currentPath);
   } else if (Array.isArray(obj)) {
-    for (let i = 0; i < obj.length; i++) {
-      paths.push(...findDataViewPaths(obj[i], [...currentPath, i]));
+    for (const [i, element] of obj.entries()) {
+      paths.push(...findDataViewPaths(element, [...currentPath, i]));
     }
   } else if (obj !== null && typeof obj === "object") {
     for (const [key, value] of Object.entries(obj)) {
diff --git a/frontend/src/utils/url-parser.ts b/frontend/src/utils/url-parser.ts
new file mode 100644
index 00000000000..62e559dab3e
--- /dev/null
+++ b/frontend/src/utils/url-parser.ts
@@ -0,0 +1,38 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+
+const urlRegex = /(https?:\/\/\S+)/;
+const imageRegex = /\.(png|jpe?g|gif|webp|svg|ico)(\?.*)?$/i;
+const dataImageRegex = /^data:image\//i;
+const knownImageDomains = ["avatars.githubusercontent.com"];
+
+export type ContentPart =
+  | { type: "text"; value: string }
+  | { type: "url"; url: string }
+  | { type: "image"; url: string };
+
+/**
+ * Parse text content to detect URLs and images
+ * Returns an array of content parts that can be text, URL, or image
+ */
+export function parseContent(text: string): ContentPart[] {
+  if (dataImageRegex.test(text)) {
+    return [{ type: "image", url: text }];
+  }
+
+  const parts = text.split(urlRegex).filter((part) => part.trim() !== "");
+  return parts.map((part) => {
+    const isUrl = urlRegex.test(part);
+    if (isUrl) {
+      const isImage =
+        imageRegex.test(part) ||
+        dataImageRegex.test(part) ||
+        knownImageDomains.some((domain) => part.includes(domain));
+
+      if (isImage) {
+        return { type: "image", url: part };
+      }
+      return { type: "url", url: part };
+    }
+    return { type: "text", value: part };
+  });
+}
diff --git a/marimo/_ast/visitor.py b/marimo/_ast/visitor.py
index 4ec0d39221d..eb5a083bee5 100644
--- a/marimo/_ast/visitor.py
+++ b/marimo/_ast/visitor.py
@@ -1006,12 +1006,20 @@ def visit_Name(self, node: ast.Name) -> ast.Name:
 
         # Handle refs on the block scope level, or capture cell level
         # references.
+        # Only add to ref_stack if the variable is not defined in any
+        # non-module ancestor block. This prevents function parameters from
+        # being incorrectly marked as refs when used in nested scopes like
+        # list comprehensions, while still capturing module-level references.
         if (
             isinstance(node.ctx, ast.Load)
             and self._is_defined(node.id)
             and node.id not in self.ref_stack[-1]
             and (
-                node.id not in self.block_stack[-1].defs
+                # Check blocks[1:] - skip module block so module-level vars
+                # are still tracked as refs, but function params aren't
+                not any(
+                    node.id in block.defs for block in self.block_stack[1:]
+                )
                 or len(self.block_stack) == 1
             )
         ):
diff --git a/marimo/_config/config.py b/marimo/_config/config.py
index df7b063edd3..e7f882c7990 100644
--- a/marimo/_config/config.py
+++ b/marimo/_config/config.py
@@ -375,10 +375,14 @@ class GitHubConfig(TypedDict, total=False):
 
     - `api_key`: the GitHub API token
     - `base_url`: the base URL for the API
+    - `copilot_settings`: configuration settings for GitHub Copilot LSP.
+        Supports settings like `http` (proxy configuration), `telemetry`,
+        and `github-enterprise` (enterprise URI).
     """
 
     api_key: str
     base_url: NotRequired[str]
+    copilot_settings: NotRequired[dict[str, Any]]
 
 
 @dataclass
@@ -628,7 +632,7 @@ class PartialMarimoConfig(TypedDict, total=False):
         "dataframes": "rich",
         "default_table_page_size": 10,
         "default_table_max_columns": 50,
-        "reference_highlighting": False,
+        "reference_highlighting": True,
     },
     "formatting": {"line_length": 79},
     "keymap": {"preset": "default", "overrides": {}},
diff --git a/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py b/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py
index 8a3a171bed2..f5fdefb4acb 100644
--- a/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py
+++ b/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py
@@ -144,9 +144,18 @@ def generate_where_clause(df_name: str, where: Condition) -> str:
             transform.drop_na,
         )
         # Use explicit aggregation columns if provided, otherwise all except group-by columns
-        aggregation_columns = transform.aggregation_column_ids or [
-            col for col in all_columns if col not in column_ids
-        ]
+        # Filter out group-by columns from aggregation columns to match narwhals behavior
+        group_by_column_id_set = set(column_ids)
+        if transform.aggregation_column_ids:
+            aggregation_columns = [
+                col
+                for col in transform.aggregation_column_ids
+                if col not in group_by_column_id_set
+            ]
+        else:
+            aggregation_columns = [
+                col for col in all_columns if col not in group_by_column_id_set
+            ]
         args = _args_list(_list_of_strings(column_ids), f"dropna={drop_na}")
         group_by = f"{df_name}.groupby({args})"
         # Narwhals adds suffixes to aggregated columns like 'column_count'
@@ -166,22 +175,17 @@ def generate_where_clause(df_name: str, where: Condition) -> str:
         else:
             assert_never(aggregation)
 
-        # If specific aggregation columns are provided, only aggregate those and rename explicitly.
-        if aggregation_columns:
-            agg_dict = ", ".join(
-                f"{_as_literal(f'{col}_{aggregation}')} : ({_as_literal(col)}, {_as_literal(agg_func)})"
-                for col in aggregation_columns
-            )
-            return f"{group_by}.agg(**{{{agg_dict}}}).reset_index()"
+        # If aggregation_columns is empty after filtering, just return unique grouped columns
+        # This matches narwhals behavior when agg() is called with empty list
+        if not aggregation_columns:
+            return f"{df_name}[{_list_of_strings(column_ids)}].drop_duplicates().reset_index(drop=True)"
 
-        # Otherwise, follow pandas default across all applicable columns and suffix the result
-        if aggregation in ["mean", "median"]:
-            agg_call = f"{group_by}.{agg_func}(numeric_only=True)"
-        else:
-            agg_call = f"{group_by}.{agg_func}()"
-        # Need to escape the f-string properly for the lambda and include the aggregation string literal
-        # Use single curly braces in the f-string since we want them in the generated code
-        return f"({agg_call}.reset_index().rename(columns=lambda col: col if col in {_list_of_strings(column_ids)} else f'{{col}}_{aggregation}'))"
+        # If specific aggregation columns are provided, only aggregate those and rename explicitly.
+        agg_dict = ", ".join(
+            f"{_as_literal(f'{col}_{aggregation}')} : ({_as_literal(col)}, {_as_literal(agg_func)})"
+            for col in aggregation_columns
+        )
+        return f"{group_by}.agg(**{{{agg_dict}}}).reset_index()"
 
     elif transform.type == TransformType.SELECT_COLUMNS:
         column_ids = transform.column_ids
diff --git a/marimo/_plugins/ui/_impl/table.py b/marimo/_plugins/ui/_impl/table.py
index 3e4c25f93e8..a13ae4455d1 100644
--- a/marimo/_plugins/ui/_impl/table.py
+++ b/marimo/_plugins/ui/_impl/table.py
@@ -319,9 +319,6 @@ def hover_cell(rowId, columnName, value):
         table
         ```
 
-        Note: when sorting is applied, per-cell hover and styling may not be
-        correctly aligned with rows, similar to cell styling behavior.
-
         In each case, access the table data with `table.value`.
 
     Attributes:
@@ -1255,7 +1252,9 @@ def do_style_cell(row: str, col: str) -> dict[str, Any]:
         if response.all_rows or response.error:
             row_ids = range(skip, skip + take)
             if descending and total_rows != "too_many":
-                row_ids = range(total_rows - 1, total_rows - 1 - take, -1)
+                row_ids = range(
+                    total_rows - 1 - skip, total_rows - 1 - skip - take, -1
+                )
         else:
             row_ids = response.row_ids[skip : skip + take]
 
@@ -1265,7 +1264,11 @@ def do_style_cell(row: str, col: str) -> dict[str, Any]:
         }
 
     def _hover_cells(
-        self, skip: int, take: int, total_rows: Union[int, Literal["too_many"]]
+        self,
+        skip: int,
+        take: int,
+        total_rows: Union[int, Literal["too_many"]],
+        descending: bool = False,
     ) -> Optional[dict[RowId, dict[ColumnName, Optional[str]]]]:
         """Calculate hover text for cells in the table (plain strings or None)."""
         if self._hover_cell is None:
@@ -1298,6 +1301,10 @@ def do_hover_cell(row: str, col: str) -> Optional[str]:
         row_ids: Union[list[int], range]
         if response.all_rows or response.error:
             row_ids = range(skip, skip + take)
+            if descending and total_rows != "too_many":
+                row_ids = range(
+                    total_rows - 1 - skip, total_rows - 1 - skip - take, -1
+                )
         else:
             row_ids = response.row_ids[skip : skip + take]
 
@@ -1405,7 +1412,7 @@ def clamp_rows_and_columns(manager: TableManager[Any]) -> str:
                 offset, args.page_size, total_rows, descending
             ),
             cell_hover_texts=self._hover_cells(
-                offset, args.page_size, total_rows
+                offset, args.page_size, total_rows, descending
             ),
         )
 
diff --git a/marimo/_plugins/ui/_impl/tables/narwhals_table.py b/marimo/_plugins/ui/_impl/tables/narwhals_table.py
index f4b49f87b02..4c142a8f506 100644
--- a/marimo/_plugins/ui/_impl/tables/narwhals_table.py
+++ b/marimo/_plugins/ui/_impl/tables/narwhals_table.py
@@ -616,9 +616,36 @@ def _get_bin_values_temporal(
                     int(hours), int(minutes), int(seconds), int(microseconds)
                 )
             elif dtype == nw.Date:
-                bin_end = datetime.date.fromtimestamp(bin_end / ms_time)
+                # Use timedelta to handle dates before Unix epoch (1970)
+                # which cause OSError on Windows with fromtimestamp
+                try:
+                    bin_end = datetime.date.fromtimestamp(bin_end / ms_time)
+                except (OSError, OverflowError, ValueError):
+                    # Fall back to timedelta calculation for old dates
+                    epoch = datetime.datetime(
+                        1970, 1, 1, tzinfo=datetime.timezone.utc
+                    )
+                    bin_end_dt = epoch + datetime.timedelta(
+                        seconds=bin_end / ms_time
+                    )
+                    bin_end = bin_end_dt.date()
             else:
-                bin_end = datetime.datetime.fromtimestamp(bin_end / ms_time)
+                # Use timedelta to handle datetimes before Unix epoch (1970)
+                # which cause OSError on Windows with fromtimestamp
+                try:
+                    bin_end = datetime.datetime.fromtimestamp(
+                        bin_end / ms_time
+                    )
+                except (OSError, OverflowError, ValueError):
+                    # Fall back to timedelta calculation for old dates
+                    epoch = datetime.datetime(
+                        1970, 1, 1, tzinfo=datetime.timezone.utc
+                    )
+                    bin_end = epoch + datetime.timedelta(
+                        seconds=bin_end / ms_time
+                    )
+                    # Remove timezone to match fromtimestamp behavior
+                    bin_end = bin_end.replace(tzinfo=None)
 
             # Only append if the count is greater than 0
             if count > 0:
diff --git a/marimo/_save/loaders/__init__.py b/marimo/_save/loaders/__init__.py
index 3a596e85dae..7987bb0ce4d 100644
--- a/marimo/_save/loaders/__init__.py
+++ b/marimo/_save/loaders/__init__.py
@@ -21,12 +21,13 @@
 }
 
 __all__ = [
-    "PERSISTENT_LOADERS",
+    "BasePersistenceLoader",
+    "JsonLoader",
     "Loader",
     "LoaderKey",
-    "BasePersistenceLoader",
     "LoaderPartial",
     "LoaderType",
     "MemoryLoader",
+    "PERSISTENT_LOADERS",
     "PickleLoader",
 ]
diff --git a/marimo/_save/save.py b/marimo/_save/save.py
index a7fd31ffc70..680f6017126 100644
--- a/marimo/_save/save.py
+++ b/marimo/_save/save.py
@@ -424,7 +424,7 @@ def __call__(self, *args: Any, **kwargs: Any) -> Any:
         try:
             if attempt.hit:
                 attempt.restore(scope)
-                return attempt.meta["return"]
+                return attempt.meta.get("return")
 
             start_time = time.time()
             response = self.__wrapped__(*args, **kwargs)
@@ -907,9 +907,9 @@ def fib(n):
 
     `mo.cache` is similar to `functools.cache`, but with three key benefits:
 
-    1. `mo.cache` persists its cache even if the cell defining the
-        cached function is re-run, as long as the code defining the function
-        (excluding comments and formatting) has not changed.
+    1. `mo.cache` persists its cache even if the cell defining the cached
+        function is re-run, as long as the code defining the function and
+        ancestors (excluding comments and formatting) has not changed.
     2. `mo.cache` keys on closed-over values in addition to function arguments,
         preventing accumulation of hidden state associated with
         `functools.cache`.
diff --git a/marimo/_server/api/endpoints/assets.py b/marimo/_server/api/endpoints/assets.py
index fa8574fa365..09bdd03ec8c 100644
--- a/marimo/_server/api/endpoints/assets.py
+++ b/marimo/_server/api/endpoints/assets.py
@@ -72,6 +72,33 @@
 FILE_QUERY_PARAM_KEY = "file"
 
 
+async def _fetch_index_html_from_url(asset_url: str) -> str:
+    """Fetch index.html from the given asset URL."""
+    import marimo._utils.requests as requests
+    from marimo._version import __version__
+
+    # Replace {version} placeholder if present
+    if "{version}" in asset_url:
+        asset_url = asset_url.replace("{version}", __version__)
+
+    # Construct the full URL to index.html
+    # Remove trailing slash if present
+    asset_url = asset_url.rstrip("/")
+    index_url = f"{asset_url}/index.html"
+
+    try:
+        LOGGER.debug("Fetching index.html from: %s", index_url)
+        response = requests.get(index_url)
+        response.raise_for_status()
+        return response.text()
+    except Exception as e:
+        LOGGER.error("Failed to fetch index.html from %s: %s", index_url, e)
+        raise HTTPException(
+            status_code=500,
+            detail=f"Failed to fetch index.html from asset_url: {e}",
+        ) from e
+
+
 @router.get("/")
 @requires("read", redirect="auth:login_page")
 async def index(request: Request) -> HTMLResponse:
@@ -83,7 +110,20 @@ async def index(request: Request) -> HTMLResponse:
         or app_state.session_manager.file_router.get_unique_file_key()
     )
 
-    html = index_html.read_text()
+    # Try local index.html first, fallback to asset_url if local file doesn't exist
+    if index_html.exists():
+        html = index_html.read_text()
+    elif app_state.asset_url:
+        LOGGER.info(
+            "Local index.html not found, fetching from asset_url: %s",
+            app_state.asset_url,
+        )
+        html = await _fetch_index_html_from_url(app_state.asset_url)
+    else:
+        raise HTTPException(
+            status_code=500,
+            detail="index.html not found and no asset_url configured",
+        )
 
     if not file_key:
         # We don't know which file to use, so we need to render a homepage
diff --git a/marimo/_server/api/endpoints/home.py b/marimo/_server/api/endpoints/home.py
index 29033bb1a0a..9f0e01ac336 100644
--- a/marimo/_server/api/endpoints/home.py
+++ b/marimo/_server/api/endpoints/home.py
@@ -207,6 +207,14 @@ async def tutorial(
 
     atexit.register(temp_dir.cleanup)
 
+    # Register the temp directory with the file router so it can be accessed
+    # This is needed for directory-based routers to allow temp tutorial files
+    app_state = AppState(request)
+    if isinstance(
+        app_state.session_manager.file_router, LazyListOfFilesAppFileRouter
+    ):
+        app_state.session_manager.file_router.register_temp_dir(temp_dir.name)
+
     return MarimoFile(
         name=os.path.basename(path.absolute_name),
         path=path.absolute_name,
diff --git a/marimo/_server/file_router.py b/marimo/_server/file_router.py
index 2598f2a6183..719560976ab 100644
--- a/marimo/_server/file_router.py
+++ b/marimo/_server/file_router.py
@@ -195,6 +195,9 @@ def __init__(self, directory: str, include_markdown: bool) -> None:
         self._directory = str(Path(directory))
         self.include_markdown = include_markdown
         self._lazy_files: Optional[list[FileInfo]] = None
+        # Track temp directories that are allowed to be accessed
+        # (e.g., for tutorials created by marimo)
+        self._allowed_temp_dirs: set[Path] = set()
 
     @property
     def directory(self) -> str:
@@ -213,6 +216,47 @@ def toggle_markdown(
     def mark_stale(self) -> None:
         self._lazy_files = None
 
+    def register_temp_dir(self, temp_dir: str) -> None:
+        """Register a temp directory as allowed for file access.
+
+        Args:
+            temp_dir: The absolute path to the temp directory to allow.
+        """
+        # Normalize the path to ensure consistency
+        normalized_path = Path(temp_dir).resolve()
+        self._allowed_temp_dirs.add(normalized_path)
+        LOGGER.debug("Registered allowed temp directory: %s", normalized_path)
+
+    def is_file_in_allowed_temp_dir(self, filepath: str) -> bool:
+        """Check if a file is inside an allowed temp directory.
+
+        Args:
+            filepath: The file path to check.
+
+        Returns:
+            True if the file is in an allowed temp directory, False otherwise.
+        """
+        if not self._allowed_temp_dirs:
+            return False
+
+        try:
+            file_resolved = Path(filepath).resolve(strict=False)
+            for temp_dir in list(self._allowed_temp_dirs):
+                try:
+                    file_resolved.relative_to(temp_dir)
+                    return True
+                except ValueError:
+                    # Not a child of this temp directory, try next
+                    continue
+            return False
+        except Exception as e:
+            LOGGER.warning(
+                "Error checking if file %s is in allowed temp dir: %s",
+                filepath,
+                e,
+            )
+            return False
+
     def get_file_manager(
         self,
         key: MarimoFileKey,
@@ -238,8 +282,13 @@ def get_file_manager(
         directory = Path(self._directory)
         filepath = Path(key)
 
-        # Validate that filepath is inside directory
-        validate_inside_directory(directory, filepath)
+        # Check if file is in an allowed temp directory (e.g., for tutorials)
+        # If so, skip the directory validation
+        is_in_allowed_temp_dir = self.is_file_in_allowed_temp_dir(key)
+
+        if not is_in_allowed_temp_dir:
+            # Validate that filepath is inside directory
+            validate_inside_directory(directory, filepath)
 
         # Resolve filepath for use
         # If directory is absolute and filepath is relative, resolve relative to directory
diff --git a/marimo/_smoke_tests/outputs/console_with_links.py b/marimo/_smoke_tests/outputs/console_with_links.py
new file mode 100644
index 00000000000..4e8ea011649
--- /dev/null
+++ b/marimo/_smoke_tests/outputs/console_with_links.py
@@ -0,0 +1,102 @@
+import marimo
+
+__generated_with = "0.18.4"
+app = marimo.App(width="medium")
+
+
+@app.cell
+def _():
+    import altair as alt
+    import polars as pl
+    import vegafusion
+
+    # Enable VegaFusion data transformer
+    alt.data_transformers.enable("vegafusion")
+
+    _df = pl.DataFrame(
+        {"category": ["A", "B", "C", "D", "E"], "value": [28, 55, 43, 91, 81]}
+    )
+
+    _chart = (
+        alt.Chart(_df)
+        .mark_bar()
+        .encode(
+            x=alt.X("category", title="Category"),
+            y=alt.Y("value", title="Value"),
+            tooltip=["category", "value"],
+        )
+        .properties(title="Basic VegaFusion Example")
+        .interactive()
+    )
+    _chart
+    return
+
+
+@app.cell
+def _():
+    import marimo as mo
+    return
+
+
+@app.cell
+def _():
+    import sys
+    return (sys,)
+
+
+@app.cell
+def _(sys):
+    sys.stdout.write("Here is a link in stdout: https://marimo.io\n")
+    return
+
+
+@app.cell
+def _(sys):
+    sys.stderr.write(
+        "Here is a link in stderr: https://github.com/marimo-team/marimo\n"
+    )
+    return
+
+
+@app.cell
+def _():
+    print("Here is a link in a print statement: https://docs.marimo.io")
+    return
+
+
+@app.cell
+def _(sys):
+    sys.stdout.write(
+        "Here is a command in stdout: pip install pydantic[openai,google]\n"
+    )
+    sys.stderr.write("Here is a command in stderr: pip install pandas\n")
+    print("Here is a command in a print statement: pip install polars")
+    return
+
+
+@app.cell
+def _():
+    print("You need to: pip install polars")
+    return
+
+
+@app.cell
+def _():
+    print("Original functionality: pip install pandas")
+    print("Complex package: pip install package[extra,dep]")
+    print("Hyphenated package: pip install scikit-learn")
+
+    print("New uv support: uv add polars")
+    print("New uv pip support: uv pip install numpy")
+
+    print("Flags before package: pip install -U pandas")
+    print("Flags before package (uv): uv add -U polars")
+    print("Flags before package (uv pip): uv pip install --upgrade numpy")
+
+    print("Flags after package: uv add polars -U")
+    print("Flags after package: pip install pandas --upgrade")
+    return
+
+
+if __name__ == "__main__":
+    app.run()
diff --git a/mkdocs.yml b/mkdocs.yml
index 009cc394f81..0dc49a284b2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -85,6 +85,11 @@ nav:
       - Running cells: guides/reactivity.md
       - Interactive elements: guides/interactivity.md
       - Visualize outputs: guides/outputs.md
+      - SQL, dataframes, and plots:
+          - SQL, dataframes, and plots: guides/working_with_data/index.md
+          - DataFrames: guides/working_with_data/dataframes.md
+          - SQL: guides/working_with_data/sql.md
+          - Plotting: guides/working_with_data/plotting.md
       - Migrate from Jupyter: guides/coming_from/jupyter.md
       - Expensive notebooks: guides/expensive_notebooks.md
       - Understanding errors:
@@ -93,29 +98,6 @@ nav:
           - Import star: guides/understanding_errors/import_star.md
           - Cycles: guides/understanding_errors/cycles.md
           - Setup References: guides/understanding_errors/setup.md
-      - Debugging notebooks: guides/debugging.md
-      - Lint Rules:
-          - Lint Rules: guides/lint_rules/index.md
-          - Rules:
-              - Unparsable cells: guides/lint_rules/rules/unparsable_cells.md
-              - Multiple definitions: guides/lint_rules/rules/multiple_definitions.md
-              - Cycle dependencies: guides/lint_rules/rules/cycle_dependencies.md
-              - Setup cell dependencies: guides/lint_rules/rules/setup_cell_dependencies.md
-              - Syntax error: guides/lint_rules/rules/invalid_syntax.md
-              - Self Import: guides/lint_rules/rules/self_import.md
-              - Branch expression: guides/lint_rules/rules/branch_expression.md
-              - General formatting: guides/lint_rules/rules/general_formatting.md
-              - Parse stdout: guides/lint_rules/rules/parse_stdout.md
-              - Parse stderr: guides/lint_rules/rules/parse_stderr.md
-              - Empty cells: guides/lint_rules/rules/empty_cells.md
-              - Markdown Indentation: guides/lint_rules/rules/markdown_indentation.md
-              - SQL parse error: guides/lint_rules/rules/sql_parse_error.md
-              - Misc parse log: guides/lint_rules/rules/misc_log_capture.md
-      - SQL, dataframes, and plots:
-          - SQL, dataframes, and plots: guides/working_with_data/index.md
-          - DataFrames: guides/working_with_data/dataframes.md
-          - SQL: guides/working_with_data/sql.md
-          - Plotting: guides/working_with_data/plotting.md
       - Package management:
           - Package management: guides/package_management/index.md
           - Importing packages: guides/package_management/importing_packages.md
@@ -127,39 +109,37 @@ nav:
           - Generate with AI: guides/generate_with_ai/index.md
           - Generate entire notebooks: guides/generate_with_ai/text_to_notebook.md
           - AI-assisted coding: guides/editor_features/ai_completion.md
-          - Prompts for the marimo editor: guides/generate_with_ai/prompts.md
+          - Prompts: guides/generate_with_ai/prompts.md
       - Editor features:
           - Editor features: guides/editor_features/index.md
           - Editor overview: guides/editor_features/overview.md
           - Understanding dataflow: guides/editor_features/dataflow.md
+          - Module autoreloading: guides/editor_features/module_autoreloading.md
+          - Hotkeys: guides/editor_features/hotkeys.md
           - AI completion: guides/editor_features/ai_completion.md
           - Model Context Protocol: guides/editor_features/mcp.md
           - AI tools: guides/editor_features/tools.md
           - Agents: guides/editor_features/agents.md
           - Language Server: guides/editor_features/language_server.md
           - Package management: guides/editor_features/package_management.md
-          - Module autoreloading: guides/editor_features/module_autoreloading.md
-          - Hotkeys: guides/editor_features/hotkeys.md
       - Using your own editor: guides/editor_features/watching.md
       - Run notebooks as apps: guides/apps.md
       - Run notebooks as scripts: guides/scripts.md
       - Reuse functions and classes: guides/reusing_functions.md
-      - Test notebooks:
-          - Testing notebooks: guides/testing/index.md
-          - pytest: guides/testing/pytest.md
-          - doctest: guides/testing/doctest.md
       - Export to other formats: guides/exporting.md
-      - Share cloud notebooks with molab: guides/molab.md
+      - Cloud notebooks with molab: guides/molab.md
       - Publish to the web:
           - Publish to the web: guides/publishing/index.md
-          - Embedding: guides/publishing/embedding.md
-          - From code snippets: guides/publishing/from_code_snippets.md
+          - Embedding:
+            - Embedding: guides/publishing/embedding.md
+            - From code snippets: guides/publishing/from_code_snippets.md
           - From GitHub: guides/publishing/from_github.md
-          - GitHub Pages: guides/publishing/github_pages.md
-          - Cloudflare: guides/publishing/cloudflare.md
-          - Online playground: guides/publishing/playground.md
-          - Community Cloud: guides/publishing/community_cloud/index.md
-          - Self-host WASM: guides/publishing/self_host_wasm.md
+          - Static sites:
+            - GitHub Pages: guides/publishing/github_pages.md
+            - Cloudflare: guides/publishing/cloudflare.md
+            - Quarto: guides/publishing/quarto.md
+            - Self-host WebAssembly notebooks: guides/publishing/self_host_wasm.md
+          - Share playground notebooks: guides/publishing/playground.md
           - View outputs on GitHub: guides/publishing/view_outputs_on_github.md
           - Deploy a backend: guides/publishing/deploy.md
       - Deployment:
@@ -167,7 +147,6 @@ nav:
           - Authentication: guides/deploying/authentication.md
           - Docker: guides/deploying/deploying_docker.md
           - HuggingFace: guides/deploying/deploying_hugging_face.md
-          - Ploomber: guides/deploying/deploying_ploomber.md
           - Public gallery: guides/deploying/deploying_public_gallery.md
           - Railway: guides/deploying/deploying_railway.md
           - nginx: guides/deploying/deploying_nginx.md
@@ -183,16 +162,38 @@ nav:
           - Theming: guides/configuration/theming.md
           - Snippets: guides/configuration/snippets.md
           - i18n: guides/configuration/internationalization.md
+      - Extending marimo:
+          - Extending marimo: guides/integrating_with_marimo/index.md
+          - Custom UI plugins: guides/integrating_with_marimo/custom_ui_plugins.md
+          - Displaying objects: guides/integrating_with_marimo/displaying_objects.md
       - Coming from other tools:
           - Coming from other tools: guides/coming_from/index.md
           - Jupytext: guides/coming_from/jupytext.md
           - Papermill: guides/coming_from/papermill.md
           - Streamlit: guides/coming_from/streamlit.md
-      - Extending marimo:
-          - Extending marimo: guides/integrating_with_marimo/index.md
-          - Custom UI plugins: guides/integrating_with_marimo/custom_ui_plugins.md
-          - Displaying objects: guides/integrating_with_marimo/displaying_objects.md
       - Best practices: guides/best_practices.md
+      - Debugging: guides/debugging.md
+      - Linting:
+          - Lint Rules: guides/lint_rules/index.md
+          - Rules:
+              - Unparsable cells: guides/lint_rules/rules/unparsable_cells.md
+              - Multiple definitions: guides/lint_rules/rules/multiple_definitions.md
+              - Cycle dependencies: guides/lint_rules/rules/cycle_dependencies.md
+              - Setup cell dependencies: guides/lint_rules/rules/setup_cell_dependencies.md
+              - Syntax error: guides/lint_rules/rules/invalid_syntax.md
+              - Self Import: guides/lint_rules/rules/self_import.md
+              - Branch expression: guides/lint_rules/rules/branch_expression.md
+              - General formatting: guides/lint_rules/rules/general_formatting.md
+              - Parse stdout: guides/lint_rules/rules/parse_stdout.md
+              - Parse stderr: guides/lint_rules/rules/parse_stderr.md
+              - Empty cells: guides/lint_rules/rules/empty_cells.md
+              - Markdown Indentation: guides/lint_rules/rules/markdown_indentation.md
+              - SQL parse error: guides/lint_rules/rules/sql_parse_error.md
+              - Misc parse log: guides/lint_rules/rules/misc_log_capture.md
+      - Testing:
+          - Testing notebooks: guides/testing/index.md
+          - pytest: guides/testing/pytest.md
+          - doctest: guides/testing/doctest.md
       - Troubleshooting: guides/troubleshooting.md
       - Dangerously set state: guides/state.md
   - Examples:
diff --git a/packages/openapi/api.yaml b/packages/openapi/api.yaml
index 58f17b4d4c1..beae4d07fe2 100644
--- a/packages/openapi/api.yaml
+++ b/packages/openapi/api.yaml
@@ -1628,12 +1628,17 @@ components:
       type: object
     GitHubConfig:
       description: "Configuration options for GitHub.\n\n    **Keys.**\n\n    - `api_key`:\
-        \ the GitHub API token\n    - `base_url`: the base URL for the API"
+        \ the GitHub API token\n    - `base_url`: the base URL for the API\n    -\
+        \ `copilot_settings`: configuration settings for GitHub Copilot LSP.\n   \
+        \     Supports settings like `http` (proxy configuration), `telemetry`,\n\
+        \        and `github-enterprise` (enterprise URI)."
       properties:
         api_key:
           type: string
         base_url:
           type: string
+        copilot_settings:
+          type: object
       required: []
       title: GitHubConfig
       type: object
@@ -3761,7 +3766,7 @@ components:
       type: object
 info:
   title: marimo API
-  version: 0.18.1
+  version: 0.18.4
 openapi: 3.1.0
 paths:
   /@file/{filename_and_length}:
diff --git a/packages/openapi/src/api.ts b/packages/openapi/src/api.ts
index f2d0b869949..c1a653a9c0f 100644
--- a/packages/openapi/src/api.ts
+++ b/packages/openapi/src/api.ts
@@ -3664,10 +3664,14 @@ export interface components {
      *
      *         - `api_key`: the GitHub API token
      *         - `base_url`: the base URL for the API
+     *         - `copilot_settings`: configuration settings for GitHub Copilot LSP.
+     *             Supports settings like `http` (proxy configuration), `telemetry`,
+     *             and `github-enterprise` (enterprise URI).
      */
     GitHubConfig: {
       api_key?: string;
       base_url?: string;
+      copilot_settings?: Record<string, any>;
     };
     /**
      * GoogleAiConfig
diff --git a/pyproject.toml b/pyproject.toml
index fe614d33a80..5c49205f3c1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -294,7 +294,8 @@ dependencies = [
     "marimo_docs @ file://docs",
     "ruff>=0.13.2",
     "mkdocs>=1.6.1",
-    "mkdocs-material>=9.5.49",
+    # Live reloading broken in >= 9.6.21: https://github.com/squidfunk/mkdocs-material/issues/8478
+    "mkdocs-material==9.6.20",
     "mkdocstrings[python]>=0.27.0",
     "mkdocs-material-extensions>=1.3.1",
     "mkdocs-autorefs>=1.2.0",
diff --git a/tests/_ast/test_compiler.py b/tests/_ast/test_compiler.py
index 01a655de15b..cc25ec74f53 100644
--- a/tests/_ast/test_compiler.py
+++ b/tests/_ast/test_compiler.py
@@ -9,7 +9,7 @@
 import pytest
 
 from marimo._ast import compiler
-from marimo._ast.app import CellManager
+from marimo._ast.cell_manager import CellManager
 from marimo._ast.visitor import ImportData, VariableData
 from marimo._dependencies.dependencies import DependencyManager
 
diff --git a/tests/_ast/test_visitor.py b/tests/_ast/test_visitor.py
index 89510a8e7fa..1464ddcfcbf 100644
--- a/tests/_ast/test_visitor.py
+++ b/tests/_ast/test_visitor.py
@@ -9,11 +9,11 @@
 
 from marimo._ast import visitor
 from marimo._ast.errors import ImportStarError
+from marimo._ast.sql_visitor import normalize_sql_f_string
 from marimo._ast.visitor import (
     AnnotationData,
     ImportData,
     VariableData,
-    normalize_sql_f_string,
 )
 from marimo._dependencies.dependencies import DependencyManager
 
@@ -305,6 +305,96 @@ def test_nested_comprehension_generator_with_named_expr() -> None:
     assert v.variable_data == {"x": [VariableData(kind="variable")]}
 
 
+def test_function_param_in_comprehension_not_required_ref() -> None:
+    """Function parameters used in list comprehensions should not be required_refs.
+
+    Regression test: The parameter `extension` was incorrectly added to required_refs
+    when used as the iterator in a list comprehension inside the function.
+    See: test_shadowed_ui_variable_threadpool in tests/_save/test_cache.py
+    """
+    code = cleandoc(
+        """
+        def helper(extension):
+            return [e for e in extension or []]
+        """
+    )
+    v = visitor.ScopedVisitor()
+    mod = ast.parse(code)
+    v.visit(mod)
+
+    assert v.defs == {"helper"}
+    assert v.refs == set()  # No external refs!
+    # extension is a PARAMETER, not an external dependency
+    # Compare to test_globals_in_functions: foo(a...) where a is not in required_refs
+    assert v.variable_data == {
+        "helper": [VariableData(kind="function", required_refs=set())]
+    }
+
+
+def test_nested_function_param_in_comprehension_not_required_ref() -> None:
+    """Ensure that additional nesting works."""
+    code = cleandoc(
+        """
+        def helper():
+            extension = []
+            def foo():
+                def bar():
+                    return [e for e in extension or []]
+                return bar
+            return foo
+        """
+    )
+    v = visitor.ScopedVisitor()
+    mod = ast.parse(code)
+    v.visit(mod)
+
+    assert v.defs == {"helper"}
+    assert v.refs == set()  # No external refs!
+    assert v.variable_data == {
+        "helper": [VariableData(kind="function", required_refs=set())]
+    }
+
+
+def test_param_in_comprehension_has_required_ref() -> None:
+    """Sanity check ref still is picked up"""
+    code = cleandoc(
+        """
+        def helper():
+            return [e for e in extension or []]
+        """
+    )
+    v = visitor.ScopedVisitor()
+    mod = ast.parse(code)
+    v.visit(mod)
+
+    assert v.defs == {"helper"}
+    assert v.refs == {"extension"}
+    assert v.variable_data == {
+        "helper": [VariableData(kind="function", required_refs={"extension"})]
+    }
+
+
+def test_shadowed_param_in_comprehension_not_required_ref() -> None:
+    """Check that a shadowed variable doesn't capture ref in module scope."""
+    code = cleandoc(
+        """
+        extension = []
+        def helper(extension):
+            return [e for e in extension or []]
+        """
+    )
+    v = visitor.ScopedVisitor()
+    mod = ast.parse(code)
+    v.visit(mod)
+
+    assert v.defs == {"helper", "extension"}
+    assert v.refs == set()
+    assert v.variable_data == {
+        "helper": [VariableData(kind="function", required_refs=set())],
+        "extension": [VariableData(kind="variable", required_refs=set())],
+    }
+
+
 def test_walrus_leaks_to_global_in_comprehension() -> None:
     code = "\n".join(
         [
diff --git a/tests/_config/test_config.py b/tests/_config/test_config.py
index d5da317ded5..31b793827b1 100644
--- a/tests/_config/test_config.py
+++ b/tests/_config/test_config.py
@@ -93,6 +93,44 @@ def test_merge_config() -> None:
     )
 
 
+def test_configure_github_with_copilot_settings() -> None:
+    """Test GitHub AI configuration with copilot_settings."""
+    config = merge_default_config(
+        PartialMarimoConfig(
+            ai={
+                "github": {
+                    "api_key": "test-github-key",
+                    "copilot_settings": {
+                        "http": {
+                            "proxy": "http://proxy.example.com:8888",
+                            "proxyStrictSSL": True,
+                        },
+                        "telemetry": {"telemetryLevel": "off"},
+                        "github-enterprise": {
+                            "uri": "https://github.enterprise.com"
+                        },
+                    },
+                }
+            }
+        )
+    )
+
+    github_config = config.get("ai", {}).get("github", {})
+    assert github_config.get("api_key") == "test-github-key"
+    assert github_config.get("copilot_settings") is not None
+    copilot_settings = github_config.get("copilot_settings", {})
+    assert (
+        copilot_settings.get("http", {}).get("proxy")
+        == "http://proxy.example.com:8888"
+    )
+    assert copilot_settings.get("http", {}).get("proxyStrictSSL") is True
+    assert copilot_settings.get("telemetry", {}).get("telemetryLevel") == "off"
+    assert (
+        copilot_settings.get("github-enterprise", {}).get("uri")
+        == "https://github.enterprise.com"
+    )
+
+
 def test_merge_config_with_keymap_overrides() -> None:
     prev_config = merge_default_config(
         PartialMarimoConfig(
diff --git a/tests/_plugins/ui/_impl/tables/snapshots/polars.download.json b/tests/_plugins/ui/_impl/tables/snapshots/polars.download.json
index ce09062932a..430b4e6e616 100644
--- a/tests/_plugins/ui/_impl/tables/snapshots/polars.download.json
+++ b/tests/_plugins/ui/_impl/tables/snapshots/polars.download.json
@@ -1,205 +1,208 @@
 [
-    {
-        "strings": "a",
-        "bool": true,
-        "int": 1,
-        "large_int": {
-            "$bigint": "18446744073709551616"
-        },
-        "float": 1.0,
-        "decimals": "1.23",
-        "datetime": "2021-01-01 00:00:00",
-        "date": "2021-01-01",
-        "struct": {
-            "a": 1,
-            "b": 2
-        },
-        "list": [
-            1,
-            2
-        ],
-        "nested_lists": [
-            [
-                1,
-                2
-            ]
-        ],
-        "nested_arrays": [
-            [
-                1,
-                2
-            ]
-        ],
-        "array": [
-            1
-        ],
-        "nulls": null,
-        "category": "cat",
-        "set": [
-            1,
-            2
-        ],
-        "imaginary": "(1+2j)",
-        "time": "12:30:00",
-        "duration": "1d",
-        "nans":NaN,
-        "infs": "inf",
-        "mixed_list": [
-            "1",
-            "two"
-        ],
-        "structs_with_list": {
-            "a": [
-                1,
-                2
-            ],
-            "b": 2
-        },
-        "list_with_structs": [
-            {
-                "a": 1,
-                "c": null
-            },
-            {
-                "a": null,
-                "c": 3
-            }
-        ],
-        "enum_list": [
-            "A",
-            "B",
-            "C"
-        ],
-        "binary": "\u0000\u0000\u0000\u0000\u0001\u00c0U\u00e8\u00b1n1\u00c0T@D\u00f1?Bc\u0095\u0083"
+  {
+    "strings": "a",
+    "bool": true,
+    "int": 1,
+    "large_int": {
+      "$bigint": "18446744073709551616"
     },
-    {
-        "strings": "b",
-        "bool": false,
-        "int": 2,
-        "large_int": {
-            "$bigint": "36893488147419103233"
-        },
-        "float": 2.0,
-        "decimals": "4.56",
-        "datetime": "2021-01-02 00:00:00",
-        "date": "2021-01-02",
-        "struct": {
-            "a": 3,
-            "b": 4
-        },
-        "list": [
-            3,
-            4
-        ],
-        "nested_lists": [
-            [
-                3,
-                4
-            ]
-        ],
-        "nested_arrays": [
-            [
-                3,
-                4
-            ]
-        ],
-        "array": [
-            2
-        ],
-        "nulls": "data",
-        "category": "dog",
-        "set": [
-            3,
-            4
-        ],
-        "imaginary": "(3+4j)",
-        "time": "13:45:00",
-        "duration": "315\u00b5s",
-        "nans":NaN,
-        "infs": "-inf",
-        "mixed_list": [
-            "3.0",
-            "0.0"
-        ],
-        "structs_with_list": {
-            "a": [
-                3,
-                4
-            ],
-            "b": 4
-        },
-        "list_with_structs": [
-            {
-                "a": null,
-                "c": null
-            }
-        ],
-        "enum_list": [
-            "A",
-            "B",
-            "C"
-        ],
-        "binary": "world"
+    "float": 1.0,
+    "decimals": "1.23",
+    "datetime": "2021-01-01 00:00:00",
+    "date": "2021-01-01",
+    "struct": {
+      "a": 1,
+      "b": 2
     },
-    {
-        "strings": "c",
-        "bool": true,
-        "int": 3,
-        "large_int": {
-            "$bigint": "73786976294838206466"
-        },
-        "float": 3.0,
-        "decimals": "7.89",
-        "datetime": "2021-01-03 00:00:00",
-        "date": "2021-01-03",
-        "struct": {
-            "a": 5,
-            "b": 6
-        },
-        "list": [
-            5,
-            6
-        ],
-        "nested_lists": [
-            [
-                5,
-                6
-            ]
-        ],
-        "nested_arrays": [
-            [
-                5,
-                6
-            ]
-        ],
-        "array": [
-            3
-        ],
-        "nulls": null,
-        "category": "mouse",
-        "set": [
-            5,
-            6
-        ],
-        "imaginary": "(5+6j)",
-        "time": "14:15:00",
-        "duration": "2h 30m",
-        "nans":NaN,
-        "infs": "inf",
-        "mixed_list": [
-            null,
-            "2021-01-01 00:00:00.000000"
-        ],
-        "structs_with_list": {
-            "a": null,
-            "b": null
-        },
-        "list_with_structs": [],
-        "enum_list": [
-            "A",
-            "B",
-            "C"
-        ],
-        "binary": "foo"
-    }
+    "list": [
+      1,
+      2
+    ],
+    "nested_lists": [
+      [
+        1,
+        2
+      ]
+    ],
+    "nested_arrays": [
+      [
+        1,
+        2
+      ]
+    ],
+    "array": [
+      1
+    ],
+    "nulls": null,
+    "category": "cat",
+    "set": [
+      1,
+      2
+    ],
+    "imaginary": "(1+2j)",
+    "time": "12:30:00",
+    "duration": "1d",
+    "nans":NaN,
+    "infs": "inf",
+    "mixed_list": [
+      "1",
+      "two"
+    ],
+    "structs_with_list": {
+      "a": [
+        1,
+        2
+      ],
+      "b": 2
+    },
+    "list_with_structs": [
+      {
+        "a": 1,
+        "c": null,
+        "e": null
+      },
+      {
+        "a": null,
+        "c": 3,
+        "e": null
+      }
+    ],
+    "enum_list": [
+      "A",
+      "B",
+      "C"
+    ],
+    "binary": "\u0000\u0000\u0000\u0000\u0001\u00c0U\u00e8\u00b1n1\u00c0T@D\u00f1?Bc\u0095\u0083"
+  },
+  {
+    "strings": "b",
+    "bool": false,
+    "int": 2,
+    "large_int": {
+      "$bigint": "36893488147419103233"
+    },
+    "float": 2.0,
+    "decimals": "4.56",
+    "datetime": "2021-01-02 00:00:00",
+    "date": "2021-01-02",
+    "struct": {
+      "a": 3,
+      "b": 4
+    },
+    "list": [
+      3,
+      4
+    ],
+    "nested_lists": [
+      [
+        3,
+        4
+      ]
+    ],
+    "nested_arrays": [
+      [
+        3,
+        4
+      ]
+    ],
+    "array": [
+      2
+    ],
+    "nulls": "data",
+    "category": "dog",
+    "set": [
+      3,
+      4
+    ],
+    "imaginary": "(3+4j)",
+    "time": "13:45:00",
+    "duration": "315\u00b5s",
+    "nans":NaN,
+    "infs": "-inf",
+    "mixed_list": [
+      "3.0",
+      "0.0"
+    ],
+    "structs_with_list": {
+      "a": [
+        3,
+        4
+      ],
+      "b": 4
+    },
+    "list_with_structs": [
+      {
+        "a": null,
+        "c": null,
+        "e": 5
+      }
+    ],
+    "enum_list": [
+      "A",
+      "B",
+      "C"
+    ],
+    "binary": "world"
+  },
+  {
+    "strings": "c",
+    "bool": true,
+    "int": 3,
+    "large_int": {
+      "$bigint": "73786976294838206466"
+    },
+    "float": 3.0,
+    "decimals": "7.89",
+    "datetime": "2021-01-03 00:00:00",
+    "date": "2021-01-03",
+    "struct": {
+      "a": 5,
+      "b": 6
+    },
+    "list": [
+      5,
+      6
+    ],
+    "nested_lists": [
+      [
+        5,
+        6
+      ]
+    ],
+    "nested_arrays": [
+      [
+        5,
+        6
+      ]
+    ],
+    "array": [
+      3
+    ],
+    "nulls": null,
+    "category": "mouse",
+    "set": [
+      5,
+      6
+    ],
+    "imaginary": "(5+6j)",
+    "time": "14:15:00",
+    "duration": "2h 30m",
+    "nans":NaN,
+    "infs": "inf",
+    "mixed_list": [
+      null,
+      "2021-01-01 00:00:00.000000"
+    ],
+    "structs_with_list": [
+      5,
+      6
+    ],
+    "list_with_structs": [],
+    "enum_list": [
+      "A",
+      "B",
+      "C"
+    ],
+    "binary": "foo"
+  }
 ]
diff --git a/tests/_plugins/ui/_impl/tables/snapshots/polars.field_types.json b/tests/_plugins/ui/_impl/tables/snapshots/polars.field_types.json
index 1d288f334eb..c3fce4e0eb9 100644
--- a/tests/_plugins/ui/_impl/tables/snapshots/polars.field_types.json
+++ b/tests/_plugins/ui/_impl/tables/snapshots/polars.field_types.json
@@ -1,184 +1,184 @@
 [
+  [
+    "strings",
     [
-        "strings",
-        [
-            "string",
-            "str"
-        ]
-    ],
-    [
-        "bool",
-        [
-            "boolean",
-            "bool"
-        ]
-    ],
-    [
-        "int",
-        [
-            "integer",
-            "i64"
-        ]
-    ],
-    [
-        "large_int",
-        [
-            "integer",
-            "i128"
-        ]
-    ],
-    [
-        "float",
-        [
-            "number",
-            "f64"
-        ]
-    ],
-    [
-        "decimals",
-        [
-            "number",
-            "decimal[38,2]"
-        ]
-    ],
-    [
-        "datetime",
-        [
-            "datetime",
-            "datetime[\u03bcs]"
-        ]
-    ],
-    [
-        "date",
-        [
-            "date",
-            "date"
-        ]
-    ],
-    [
-        "struct",
-        [
-            "unknown",
-            "struct[2]"
-        ]
-    ],
-    [
-        "list",
-        [
-            "unknown",
-            "list[i64]"
-        ]
-    ],
-    [
-        "nested_lists",
-        [
-            "unknown",
-            "list[list[i64]]"
-        ]
-    ],
-    [
-        "nested_arrays",
-        [
-            "unknown",
-            "array[i64, (1, 2)]"
-        ]
-    ],
-    [
-        "array",
-        [
-            "unknown",
-            "array[i64, 1]"
-        ]
-    ],
-    [
-        "nulls",
-        [
-            "string",
-            "str"
-        ]
-    ],
-    [
-        "category",
-        [
-            "string",
-            "cat"
-        ]
-    ],
-    [
-        "set",
-        [
-            "unknown",
-            "object"
-        ]
-    ],
-    [
-        "imaginary",
-        [
-            "unknown",
-            "object"
-        ]
-    ],
-    [
-        "time",
-        [
-            "time",
-            "time"
-        ]
-    ],
-    [
-        "duration",
-        [
-            "number",
-            "duration[\u03bcs]"
-        ]
-    ],
-    [
-        "nans",
-        [
-            "number",
-            "f64"
-        ]
-    ],
-    [
-        "infs",
-        [
-            "number",
-            "f64"
-        ]
-    ],
-    [
-        "mixed_list",
-        [
-            "unknown",
-            "list[str]"
-        ]
-    ],
-    [
-        "structs_with_list",
-        [
-            "unknown",
-            "struct[2]"
-        ]
-    ],
-    [
-        "list_with_structs",
-        [
-            "unknown",
-            "list[struct[2]]"
-        ]
-    ],
-    [
-        "enum_list",
-        [
-            "unknown",
-            "list[enum]"
-        ]
-    ],
-    [
-        "binary",
-        [
-            "unknown",
-            "binary"
-        ]
-    ]
-]
\ No newline at end of file
+      "string",
+      "str"
+    ]
+  ],
+  [
+    "bool",
+    [
+      "boolean",
+      "bool"
+    ]
+  ],
+  [
+    "int",
+    [
+      "integer",
+      "i64"
+    ]
+  ],
+  [
+    "large_int",
+    [
+      "integer",
+      "i128"
+    ]
+  ],
+  [
+    "float",
+    [
+      "number",
+      "f64"
+    ]
+  ],
+  [
+    "decimals",
+    [
+      "number",
+      "decimal[38,2]"
+    ]
+  ],
+  [
+    "datetime",
+    [
+      "datetime",
+      "datetime[\u03bcs]"
+    ]
+  ],
+  [
+    "date",
+    [
+      "date",
+      "date"
+    ]
+  ],
+  [
+    "struct",
+    [
+      "unknown",
+      "struct[2]"
+    ]
+  ],
+  [
+    "list",
+    [
+      "unknown",
+      "list[i64]"
+    ]
+  ],
+  [
+    "nested_lists",
+    [
+      "unknown",
+      "list[list[i64]]"
+    ]
+  ],
+  [
+    "nested_arrays",
+    [
+      "unknown",
+      "array[i64, (1, 2)]"
+    ]
+  ],
+  [
+    "array",
+    [
+      "unknown",
+      "array[i64, 1]"
+    ]
+  ],
+  [
+    "nulls",
+    [
+      "string",
+      "str"
+    ]
+  ],
+  [
+    "category",
+    [
+      "string",
+      "cat"
+    ]
+  ],
+  [
+    "set",
+    [
+      "unknown",
+      "object"
+    ]
+  ],
+  [
+    "imaginary",
+    [
+      "unknown",
+      "object"
+    ]
+  ],
+  [
+    "time",
+    [
+      "time",
+      "time"
+    ]
+  ],
+  [
+    "duration",
+    [
+      "number",
+      "duration[\u03bcs]"
+    ]
+  ],
+  [
+    "nans",
+    [
+      "number",
+      "f64"
+    ]
+  ],
+  [
+    "infs",
+    [
+      "number",
+      "f64"
+    ]
+  ],
+  [
+    "mixed_list",
+    [
+      "unknown",
+      "list[str]"
+    ]
+  ],
+  [
+    "structs_with_list",
+    [
+      "unknown",
+      "object"
+    ]
+  ],
+  [
+    "list_with_structs",
+    [
+      "unknown",
+      "list[struct[3]]"
+    ]
+  ],
+  [
+    "enum_list",
+    [
+      "unknown",
+      "list[enum]"
+    ]
+  ],
+  [
+    "binary",
+    [
+      "unknown",
+      "binary"
+    ]
+  ]
+]
diff --git a/tests/_plugins/ui/_impl/tables/snapshots/polars.json b/tests/_plugins/ui/_impl/tables/snapshots/polars.json
index 3dff8680b04..430b4e6e616 100644
--- a/tests/_plugins/ui/_impl/tables/snapshots/polars.json
+++ b/tests/_plugins/ui/_impl/tables/snapshots/polars.json
@@ -1,205 +1,208 @@
 [
-    {
-        "strings": "a",
-        "bool": true,
-        "int": 1,
-        "large_int": {
-            "$bigint": "18446744073709551616"
-        },
-        "float": 1.0,
-        "decimals": "1.23",
-        "datetime": "2021-01-01 00:00:00",
-        "date": "2021-01-01",
-        "struct": {
-            "a": 1,
-            "b": 2
-        },
-        "list": [
-            1,
-            2
-        ],
-        "nested_lists": [
-            [
-                1,
-                2
-            ]
-        ],
-        "nested_arrays": [
-            [
-                1,
-                2
-            ]
-        ],
-        "array": [
-            1
-        ],
-        "nulls": null,
-        "category": "cat",
-        "set": [
-            1,
-            2
-        ],
-        "imaginary": "(1+2j)",
-        "time": "12:30:00",
-        "duration": "1d",
-        "nans":NaN,
-        "infs": "inf",
-        "mixed_list": [
-            "1",
-            "two"
-        ],
-        "structs_with_list": {
-            "a": [
-                1,
-                2
-            ],
-            "b": 2
-        },
-        "list_with_structs": [
-            {
-                "a": 1,
-                "c": null
-            },
-            {
-                "a": null,
-                "c": 3
-            }
-        ],
-        "enum_list": [
-            "A",
-            "B",
-            "C"
-        ],
-        "binary": "\u0000\u0000\u0000\u0000\u0001\u00c0U\u00e8\u00b1n1\u00c0T@D\u00f1?Bc\u0095\u0083"
+  {
+    "strings": "a",
+    "bool": true,
+    "int": 1,
+    "large_int": {
+      "$bigint": "18446744073709551616"
     },
-    {
-        "strings": "b",
-        "bool": false,
-        "int": 2,
-        "large_int": {
-            "$bigint": "36893488147419103233"
-        },
-        "float": 2.0,
-        "decimals": "4.56",
-        "datetime": "2021-01-02 00:00:00",
-        "date": "2021-01-02",
-        "struct": {
-            "a": 3,
-            "b": 4
-        },
-        "list": [
-            3,
-            4
-        ],
-        "nested_lists": [
-            [
-                3,
-                4
-            ]
-        ],
-        "nested_arrays": [
-            [
-                3,
-                4
-            ]
-        ],
-        "array": [
-            2
-        ],
-        "nulls": "data",
-        "category": "dog",
-        "set": [
-            3,
-            4
-        ],
-        "imaginary": "(3+4j)",
-        "time": "13:45:00",
-        "duration": "315\u00b5s",
-        "nans":NaN,
-        "infs": "-inf",
-        "mixed_list": [
-            "3.0",
-            "0.0"
-        ],
-        "structs_with_list": {
-            "a": [
-                3,
-                4
-            ],
-            "b": 4
-        },
-        "list_with_structs": [
-            {
-                "a": null,
-                "c": null
-            }
-        ],
-        "enum_list": [
-            "A",
-            "B",
-            "C"
-        ],
-        "binary": "world"
+    "float": 1.0,
+    "decimals": "1.23",
+    "datetime": "2021-01-01 00:00:00",
+    "date": "2021-01-01",
+    "struct": {
+      "a": 1,
+      "b": 2
     },
-    {
-        "strings": "c",
-        "bool": true,
-        "int": 3,
-        "large_int": {
-            "$bigint": "73786976294838206466"
-        },
-        "float": 3.0,
-        "decimals": "7.89",
-        "datetime": "2021-01-03 00:00:00",
-        "date": "2021-01-03",
-        "struct": {
-            "a": 5,
-            "b": 6
-        },
-        "list": [
-            5,
-            6
-        ],
-        "nested_lists": [
-            [
-                5,
-                6
-            ]
-        ],
-        "nested_arrays": [
-            [
-                5,
-                6
-            ]
-        ],
-        "array": [
-            3
-        ],
-        "nulls": null,
-        "category": "mouse",
-        "set": [
-            5,
-            6
-        ],
-        "imaginary": "(5+6j)",
-        "time": "14:15:00",
-        "duration": "2h 30m",
-        "nans":NaN,
-        "infs": "inf",
-        "mixed_list": [
-            null,
-            "2021-01-01 00:00:00.000000"
-        ],
-        "structs_with_list": {
-            "a": null,
-            "b": null
-        },
-        "list_with_structs": [],
-        "enum_list": [
-            "A",
-            "B",
-            "C"
-        ],
-        "binary": "foo"
-    }
-]
\ No newline at end of file
+    "list": [
+      1,
+      2
+    ],
+    "nested_lists": [
+      [
+        1,
+        2
+      ]
+    ],
+    "nested_arrays": [
+      [
+        1,
+        2
+      ]
+    ],
+    "array": [
+      1
+    ],
+    "nulls": null,
+    "category": "cat",
+    "set": [
+      1,
+      2
+    ],
+    "imaginary": "(1+2j)",
+    "time": "12:30:00",
+    "duration": "1d",
+    "nans":NaN,
+    "infs": "inf",
+    "mixed_list": [
+      "1",
+      "two"
+    ],
+    "structs_with_list": {
+      "a": [
+        1,
+        2
+      ],
+      "b": 2
+    },
+    "list_with_structs": [
+      {
+        "a": 1,
+        "c": null,
+        "e": null
+      },
+      {
+        "a": null,
+        "c": 3,
+        "e": null
+      }
+    ],
+    "enum_list": [
+      "A",
+      "B",
+      "C"
+    ],
+    "binary": "\u0000\u0000\u0000\u0000\u0001\u00c0U\u00e8\u00b1n1\u00c0T@D\u00f1?Bc\u0095\u0083"
+  },
+  {
+    "strings": "b",
+    "bool": false,
+    "int": 2,
+    "large_int": {
+      "$bigint": "36893488147419103233"
+    },
+    "float": 2.0,
+    "decimals": "4.56",
+    "datetime": "2021-01-02 00:00:00",
+    "date": "2021-01-02",
+    "struct": {
+      "a": 3,
+      "b": 4
+    },
+    "list": [
+      3,
+      4
+    ],
+    "nested_lists": [
+      [
+        3,
+        4
+      ]
+    ],
+    "nested_arrays": [
+      [
+        3,
+        4
+      ]
+    ],
+    "array": [
+      2
+    ],
+    "nulls": "data",
+    "category": "dog",
+    "set": [
+      3,
+      4
+    ],
+    "imaginary": "(3+4j)",
+    "time": "13:45:00",
+    "duration": "315\u00b5s",
+    "nans":NaN,
+    "infs": "-inf",
+    "mixed_list": [
+      "3.0",
+      "0.0"
+    ],
+    "structs_with_list": {
+      "a": [
+        3,
+        4
+      ],
+      "b": 4
+    },
+    "list_with_structs": [
+      {
+        "a": null,
+        "c": null,
+        "e": 5
+      }
+    ],
+    "enum_list": [
+      "A",
+      "B",
+      "C"
+    ],
+    "binary": "world"
+  },
+  {
+    "strings": "c",
+    "bool": true,
+    "int": 3,
+    "large_int": {
+      "$bigint": "73786976294838206466"
+    },
+    "float": 3.0,
+    "decimals": "7.89",
+    "datetime": "2021-01-03 00:00:00",
+    "date": "2021-01-03",
+    "struct": {
+      "a": 5,
+      "b": 6
+    },
+    "list": [
+      5,
+      6
+    ],
+    "nested_lists": [
+      [
+        5,
+        6
+      ]
+    ],
+    "nested_arrays": [
+      [
+        5,
+        6
+      ]
+    ],
+    "array": [
+      3
+    ],
+    "nulls": null,
+    "category": "mouse",
+    "set": [
+      5,
+      6
+    ],
+    "imaginary": "(5+6j)",
+    "time": "14:15:00",
+    "duration": "2h 30m",
+    "nans":NaN,
+    "infs": "inf",
+    "mixed_list": [
+      null,
+      "2021-01-01 00:00:00.000000"
+    ],
+    "structs_with_list": [
+      5,
+      6
+    ],
+    "list_with_structs": [],
+    "enum_list": [
+      "A",
+      "B",
+      "C"
+    ],
+    "binary": "foo"
+  }
+]
diff --git a/tests/_plugins/ui/_impl/tables/test_narwhals.py b/tests/_plugins/ui/_impl/tables/test_narwhals.py
index ba29ddadd7e..6b3196f8797 100644
--- a/tests/_plugins/ui/_impl/tables/test_narwhals.py
+++ b/tests/_plugins/ui/_impl/tables/test_narwhals.py
@@ -394,7 +394,11 @@ def test_summary_datetime(self) -> None:
             min=datetime.datetime(2021, 1, 1, 0, 0),
             max=datetime.datetime(2021, 1, 3, 0, 0),
             mean=datetime.datetime(2021, 1, 2, 0, 0),
-            # median=datetime.datetime(2021, 1, 2, 0, 0),
+            median=datetime.datetime(2021, 1, 2, 0, 0),
+            p5=datetime.datetime(2021, 1, 1, 0, 0),
+            p25=datetime.datetime(2021, 1, 2, 0, 0),
+            p75=datetime.datetime(2021, 1, 3, 0, 0),
+            p95=datetime.datetime(2021, 1, 3, 0, 0),
         )
 
     def test_summary_date(self) -> None:
@@ -1311,6 +1315,57 @@ def test_dates_multiple(self, df: Any) -> None:
         assert bin_values[0].count == 5
 
 
+@pytest.mark.skipif(not HAS_DEPS, reason="optional dependencies not installed")
+@pytest.mark.parametrize(
+    "df",
+    create_dataframes(
+        {
+            "old_dates": [
+                datetime.datetime.fromisoformat("1902-01-01 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-01 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-02 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-03 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-04 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-05 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-06 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-07 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-08 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-09 00:00:00"),
+                datetime.datetime.fromisoformat("2020-01-10 00:00:00"),
+            ]
+        },
+        exclude=["ibis"],
+    ),
+)
+class TestOldDates:
+    """Test handling of old dates (pre-1970) that cause OSError on Windows."""
+
+    def test_get_bin_values_with_old_dates(self, df: Any) -> None:
+        """
+        Test that get_bin_values works with timestamps before Unix epoch.
+
+        This reproduces issue #7469 where dates like 1902-01-01 cause
+        OSError: [Errno 22] Invalid argument on Windows when using
+        datetime.fromtimestamp().
+        """
+        manager = NarwhalsTableManager.from_dataframe(df)
+        # Should not raise OSError even with old dates
+        bin_values = manager.get_bin_values("old_dates", 3)
+
+        # Verify we get valid bin values
+        assert len(bin_values) > 0
+        assert all(
+            isinstance(bv.bin_start, (datetime.datetime, type(None)))
+            for bv in bin_values
+        )
+        assert all(
+            isinstance(bv.bin_end, (datetime.datetime, type(None)))
+            for bv in bin_values
+        )
+        # Total count should be 11 (all rows)
+        assert sum(bin_value.count for bin_value in bin_values) == 11
+
+
 @pytest.mark.skipif(not HAS_DEPS, reason="optional dependencies not installed")
 @pytest.mark.parametrize(
     "df",
diff --git a/tests/_plugins/ui/_impl/tables/test_polars_table.py b/tests/_plugins/ui/_impl/tables/test_polars_table.py
index 6f0f78184e7..baf4322b6c5 100644
--- a/tests/_plugins/ui/_impl/tables/test_polars_table.py
+++ b/tests/_plugins/ui/_impl/tables/test_polars_table.py
@@ -112,6 +112,7 @@ def get_complex_data(self) -> TableManager[Any]:
                 "structs_with_list": pl.Series(
                     "mixed",
                     [{"a": [1, 2], "b": 2}, {"a": [3, 4], "b": 4}, [5, 6]],
+                    strict=False,
                 ),
                 "list_with_structs": pl.Series(
                     "list_with_structs",
@@ -120,6 +121,7 @@ def get_complex_data(self) -> TableManager[Any]:
                         [{"e": 5}],
                         [],
                     ],
+                    strict=False,
                 ),
                 "enum_list": pl.Series(
                     [["A", "B", "C"], ["A", "B", "C"], ["A", "B", "C"]],
@@ -446,9 +448,11 @@ def test_stats_datetime(self) -> None:
             min=datetime.datetime(2021, 1, 1, 0, 0),
             max=datetime.datetime(2021, 1, 3, 0, 0),
             mean=datetime.datetime(2021, 1, 2, 0, 0),
-            # TODO: narwhals doesn't support median
-            # and polars doesn't support quantiles for dates
-            # median=datetime.datetime(2021, 1, 2, 0, 0),
+            median=datetime.datetime(2021, 1, 2, 0, 0),
+            p5=datetime.datetime(2021, 1, 1, 0, 0),
+            p25=datetime.datetime(2021, 1, 2, 0, 0),
+            p75=datetime.datetime(2021, 1, 3, 0, 0),
+            p95=datetime.datetime(2021, 1, 3, 0, 0),
         )
 
     def test_stats_date(self) -> None:
diff --git a/tests/_plugins/ui/_impl/test_table.py b/tests/_plugins/ui/_impl/test_table.py
index 5902b603cc1..990851cf3c8 100644
--- a/tests/_plugins/ui/_impl/test_table.py
+++ b/tests/_plugins/ui/_impl/test_table.py
@@ -1773,6 +1773,89 @@ def always_green(_row, _col, _value):
     }
 
 
+@pytest.mark.parametrize(
+    "df",
+    create_dataframes(
+        {
+            "Index": list(range(20)),
+            "Category": [f"Label {i % 5}" for i in range(20)],
+            "Value": [i * ((-1) ** i) for i in range(20)],
+        },
+        exclude=NON_EAGER_LIBS,
+    ),
+)
+def test_cell_styles_sorted_with_pagination(df: Any):
+    """Test that cell styles are correctly applied with sorting and pagination.
+
+    Regression test for issue #6223 - cell styles should work on all pages,
+    not just the last N rows of the entire dataset.
+    """
+
+    def cell_style(_row_id, _column_name, value):
+        # Handle both Python numbers and numpy numbers
+        try:
+            numeric_value = float(value)
+            return {"color": "black" if numeric_value > 0 else "red"}
+        except (TypeError, ValueError):
+            return {}
+
+    table = ui.table(df, style_cell=cell_style)
+
+    # Test page 0 (rows 19, 18, 17, 16, 15 when sorted descending by Index)
+    page0 = table._search(
+        SearchTableArgs(
+            page_size=5,
+            page_number=0,
+            query="",
+            sort=[SortArgs(by="Index", descending=True)],
+        )
+    )
+    assert "19" in page0.cell_styles
+    assert "18" in page0.cell_styles
+    assert "17" in page0.cell_styles
+    assert "16" in page0.cell_styles
+    assert "15" in page0.cell_styles
+    # Check that the style function was applied
+    # i=19: 19 * ((-1)**19) = 19 * -1 = -19 (negative, red)
+    assert page0.cell_styles["19"]["Value"] == {"color": "red"}
+    # i=18: 18 * ((-1)**18) = 18 * 1 = 18 (positive, black)
+    assert page0.cell_styles["18"]["Value"] == {"color": "black"}
+
+    # Test page 1 (rows 14, 13, 12, 11, 10 when sorted descending)
+    page1 = table._search(
+        SearchTableArgs(
+            page_size=5,
+            page_number=1,
+            query="",
+            sort=[SortArgs(by="Index", descending=True)],
+        )
+    )
+    assert "14" in page1.cell_styles
+    assert "13" in page1.cell_styles
+    assert "12" in page1.cell_styles
+    assert "11" in page1.cell_styles
+    assert "10" in page1.cell_styles
+    # i=13: 13 * ((-1)**13) = 13 * -1 = -13 (negative, red)
+    assert page1.cell_styles["13"]["Value"] == {"color": "red"}
+
+    # Test page 2 (rows 9, 8, 7, 6, 5 when sorted descending)
+    page2 = table._search(
+        SearchTableArgs(
+            page_size=5,
+            page_number=2,
+            query="",
+            sort=[SortArgs(by="Index", descending=True)],
+        )
+    )
+    assert "9" in page2.cell_styles
+    assert "8" in page2.cell_styles
+    assert "7" in page2.cell_styles
+    assert "6" in page2.cell_styles
+    assert "5" in page2.cell_styles
+    # i=9: 9 * ((-1)**9) = 9 * -1 = -9 (negative, red)
+    assert page2.cell_styles["9"]["Value"] == {"color": "red"}
+
+
 @pytest.mark.skipif(
     not DependencyManager.pandas.has(),
     reason="Pandas not installed, only pandas has multi-col idx",
diff --git a/tests/_runtime/packages/test_pypi_package_manager.py b/tests/_runtime/packages/test_pypi_package_manager.py
index e9e31af6411..9e78b84d72c 100644
--- a/tests/_runtime/packages/test_pypi_package_manager.py
+++ b/tests/_runtime/packages/test_pypi_package_manager.py
@@ -8,8 +8,8 @@
 from unittest.mock import MagicMock, patch
 
 from marimo._ast import compiler
+from marimo._runtime.packages.package_manager import PackageDescription
 from marimo._runtime.packages.pypi_package_manager import (
-    PackageDescription,
     PipPackageManager,
     PoetryPackageManager,
     UvPackageManager,
diff --git a/tests/_runtime/test_manage_script_metadata.py b/tests/_runtime/test_manage_script_metadata.py
index 33bc9d12b46..9404f8a5c66 100644
--- a/tests/_runtime/test_manage_script_metadata.py
+++ b/tests/_runtime/test_manage_script_metadata.py
@@ -58,7 +58,7 @@ async def test_manage_script_metadata_uv(
 
     with open(filename) as f:  # noqa: ASYNC230
         contents = f.read()
-        assert '"marimo",' in contents
+        assert '"marimo' in contents
         assert "markdown" not in contents
         assert '"os",' not in contents
 
@@ -67,7 +67,7 @@ async def test_manage_script_metadata_uv(
 
     with open(filename) as f:  # noqa: ASYNC230
         contents = f.read()
-        assert '"marimo",' in contents
+        assert '"marimo' in contents
         assert '"os",' not in contents
         assert '"markdown==' in contents
 
@@ -76,7 +76,7 @@ async def test_manage_script_metadata_uv(
 
     with open(filename) as f:  # noqa: ASYNC230
         contents = f.read()
-        assert '"marimo",' in contents
+        assert '"marimo' in contents
         assert '"markdown==' in contents
         assert '"os",' not in contents
 
@@ -108,7 +108,7 @@ async def test_manage_script_metadata_uv_deletion(
 
     with open(filename) as f:  # noqa: ASYNC230
         contents = f.read()
-        assert '"marimo",' in contents
+        assert '"marimo' in contents
         assert '"os",' not in contents
 
     # Add markdown
@@ -116,7 +116,7 @@ async def test_manage_script_metadata_uv_deletion(
 
     with open(filename) as f:  # noqa: ASYNC230
         contents = f.read()
-        assert '"marimo",' in contents
+        assert '"marimo' in contents
         assert '"os",' not in contents
         assert '"markdown==' in contents
 
@@ -125,7 +125,7 @@ async def test_manage_script_metadata_uv_deletion(
 
     with open(filename) as f:  # noqa: ASYNC230
         contents = f.read()
-        assert '"marimo",' in contents
+        assert '"marimo' in contents
         assert '"markdown==' in contents
         assert '"os",' not in contents
 
@@ -134,7 +134,7 @@ async def test_manage_script_metadata_uv_deletion(
 
     with open(filename) as f:  # noqa: ASYNC230
         contents = f.read()
-        assert '"marimo",' in contents
+        assert '"marimo' in contents
         assert '"markdown==' in contents
         assert '"os",' not in contents
 
diff --git a/tests/_runtime/test_runtime_secrets.py b/tests/_runtime/test_runtime_secrets.py
index 27f0803e3ce..7cc6b8f9b7f 100644
--- a/tests/_runtime/test_runtime_secrets.py
+++ b/tests/_runtime/test_runtime_secrets.py
@@ -13,7 +13,7 @@
 from marimo._runtime.runtime import SecretsCallbacks
 from marimo._types.ids import RequestId
 from tests._messaging.mocks import MockStream
-from tests._runtime.test_runtime import MockedKernel
+from tests.conftest import MockedKernel
 
 
 @pytest.fixture
diff --git a/tests/_save/test_cache.py b/tests/_save/test_cache.py
index 23062fcc1bd..39d2cfafd2b 100644
--- a/tests/_save/test_cache.py
+++ b/tests/_save/test_cache.py
@@ -14,7 +14,9 @@
 from marimo._plugins.ui._impl.input import dropdown
 from marimo._runtime.requests import ExecutionRequest
 from marimo._runtime.runtime import Kernel
-from marimo._save.cache import Cache, ModuleStub, UIElementStub
+from marimo._save.cache import Cache
+from marimo._save.stubs.module_stub import ModuleStub
+from marimo._save.stubs.ui_element_stub import UIElementStub
 from tests.conftest import ExecReqProvider, TestableModuleStub
 
 
@@ -2500,6 +2502,56 @@ def g():
             assert g() == 2
             return (g, arr)
 
+    @staticmethod
+    def test_shadowed_ui_variable_threadpool(app) -> None:
+        """Test shadow error with UI-derived variable and ThreadPoolExecutor.
+
+        Bug requires:
+        1. UI element providing a cell-scoped variable (e.g. `extension`)
+        2. Helper function with same-named parameter using nested scope (list comp)
+        3. Cached function called via ThreadPoolExecutor.submit()
+
+        Causes KeyError at hash.py because scope has '*extension' (ARG_PREFIX)
+        but lookup uses 'extension'.
+        """
+        with app.setup:
+            from concurrent.futures import ThreadPoolExecutor
+
+            import marimo as mo
+
+        @app.cell
+        def _():
+            ui_input = mo.ui.text(value="hello")
+            return (ui_input,)
+
+        @app.cell
+        def _():
+            def helper(extension: list[str] | None) -> int:
+                # Nested scope using extension triggers the bug
+                # for e in extension: ... works fine.
+                return len([e for e in extension or []])
+
+            @mo.cache
+            def inner(extension: list[str] | None) -> int:
+                assert len([e for e in extension or []]) == 5
+                return helper(extension)
+
+            return (inner,)
+
+        @app.cell
+        def _(inner, ui_input):
+            extension = ui_input.value
+
+            results = []
+            # has to be in a thread submission
+            # the following works fine
+            assert inner(extension) == 5
+
+            with ThreadPoolExecutor(max_workers=2) as executor:
+                future = executor.submit(inner, extension)
+                assert future.result() == 5
+            return
+
 
 class TestPersistentCache:
     async def test_pickle_context(
diff --git a/tests/_server/ai/test_ai_config.py b/tests/_server/ai/test_ai_config.py
index d330acb603b..b38096b9b17 100644
--- a/tests/_server/ai/test_ai_config.py
+++ b/tests/_server/ai/test_ai_config.py
@@ -13,8 +13,6 @@
     MarimoConfig,
 )
 from marimo._server.ai.config import (
-    DEFAULT_MAX_TOKENS,
-    DEFAULT_MODEL,
     AnyProviderConfig,
     _get_ai_config,
     _get_base_url,
@@ -24,6 +22,7 @@
     get_edit_model,
     get_max_tokens,
 )
+from marimo._server.ai.constants import DEFAULT_MAX_TOKENS, DEFAULT_MODEL
 from marimo._server.ai.tools.types import ToolDefinition
 from marimo._server.api.status import HTTPStatus
 
@@ -217,6 +216,29 @@ def test_for_github_user_headers_override_defaults(self):
             provider_config.extra_headers["X-Custom-Header"] == "custom-value"
         )
 
+    def test_for_github_with_copilot_settings(self):
+        """Test GitHub configuration with copilot_settings is accepted."""
+        config: AiConfig = {
+            "github": {
+                "api_key": "test-github-key",
+                "copilot_settings": {
+                    "http": {
+                        "proxy": "http://proxy.example.com:8888",
+                        "proxyStrictSSL": True,
+                    },
+                    "telemetry": {"telemetryLevel": "off"},
+                },
+            }
+        }
+
+        # Should not raise an error - copilot_settings is a valid field
+        provider_config = AnyProviderConfig.for_github(config)
+
+        # Note: copilot_settings is stored in config but not used by AnyProviderConfig
+        # It's used by the frontend LSP client
+        assert provider_config.api_key == "test-github-key"
+        assert provider_config.base_url == "https://api.githubcopilot.com/"
+
     def test_for_openrouter(self):
         """Test OpenRouter configuration."""
         config: AiConfig = {
diff --git a/tests/_server/ai/test_providers.py b/tests/_server/ai/test_providers.py
index 08778d201e1..0edda283f9b 100644
--- a/tests/_server/ai/test_providers.py
+++ b/tests/_server/ai/test_providers.py
@@ -6,9 +6,9 @@
 
 from marimo._ai._types import ChatMessage
 from marimo._config.config import AiConfig
+from marimo._server.ai.config import AnyProviderConfig
 from marimo._server.ai.providers import (
     AnthropicProvider,
-    AnyProviderConfig,
     AzureOpenAIProvider,
     BedrockProvider,
     GoogleProvider,
diff --git a/tests/_server/api/endpoints/test_ai.py b/tests/_server/api/endpoints/test_ai.py
index bd1f1d39845..9783e97565d 100644
--- a/tests/_server/api/endpoints/test_ai.py
+++ b/tests/_server/api/endpoints/test_ai.py
@@ -9,13 +9,13 @@
 import pytest
 
 from marimo._dependencies.dependencies import DependencyManager
+from marimo._server.ai.config import AnyProviderConfig
 from marimo._server.ai.prompts import (
     FIM_MIDDLE_TAG,
     FIM_PREFIX_TAG,
     FIM_SUFFIX_TAG,
 )
 from marimo._server.ai.providers import (
-    AnyProviderConfig,
     OpenAIProvider,
     without_wrapping_backticks,
 )
diff --git a/tests/_server/api/endpoints/test_assets.py b/tests/_server/api/endpoints/test_assets.py
index 9d1277bd2e2..809658796ee 100644
--- a/tests/_server/api/endpoints/test_assets.py
+++ b/tests/_server/api/endpoints/test_assets.py
@@ -6,6 +6,7 @@
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import TYPE_CHECKING, Any, cast
+from unittest.mock import Mock, patch
 
 from marimo._server.api.deps import AppState
 from marimo._server.api.endpoints.assets import _inject_service_worker
@@ -217,3 +218,80 @@ def test_inject_service_worker() -> None:
         "const notebookId = 'c%3A%5Cpath%5Cto%5Cnotebook.py';"
         in _inject_service_worker("<body></body>", r"c:\path\to\notebook.py")
     )
+
+
+def test_index_with_missing_local_file_and_asset_url(
+    client: TestClient,
+) -> None:
+    """Test that index.html is fetched from asset_url when local file doesn't exist."""
+    app_state = AppState.from_app(cast(Any, client.app))
+
+    # Mock HTML content that would come from the CDN
+    mock_html = """<!DOCTYPE html>
+<html>
+<head><title>{{ title }}</title></head>
+<body>
+<marimo-filename hidden>{{ filename }}</marimo-filename>
+'{{ mount_config }}'
+</body>
+</html>"""
+
+    # Mock the requests.get to return our mock HTML
+    mock_response = Mock()
+    mock_response.text.return_value = mock_html
+    mock_response.raise_for_status.return_value = None
+
+    with (
+        patch("marimo._server.api.endpoints.assets.root") as mock_root,
+        patch("marimo._utils.requests.get", return_value=mock_response),
+    ):
+        # Make local index.html appear to not exist
+        mock_index_html = Mock()
+        mock_index_html.exists.return_value = False
+        mock_root.__truediv__.return_value = mock_index_html
+
+        # Set asset_url on the app state
+        client.app.state.asset_url = "https://cdn.example.com/assets/0.1.0"
+
+        response = client.get("/", headers=token_header())
+        assert response.status_code == 200, response.text
+        # The response should contain processed HTML
+        assert "<title>" in response.text
+
+
+def test_index_with_missing_local_file_no_asset_url(
+    client: TestClient,
+) -> None:
+    """Test that error is raised when local file doesn't exist and no asset_url."""
+    with patch("marimo._server.api.endpoints.assets.root") as mock_root:
+        # Make local index.html appear to not exist
+        mock_index_html = Mock()
+        mock_index_html.exists.return_value = False
+        mock_root.__truediv__.return_value = mock_index_html
+
+        # Ensure asset_url is None
+        client.app.state.asset_url = None
+
+        response = client.get("/", headers=token_header())
+        assert response.status_code == 500
+        assert "index.html not found" in response.json()["detail"]
+
+
+def test_index_prefers_local_file_over_asset_url(client: TestClient) -> None:
+    """Test that local index.html is preferred even when asset_url is set."""
+    # Set asset_url on the app state
+    client.app.state.asset_url = "https://cdn.example.com/assets/0.1.0"
+
+    # Mock requests.get to track if it's called
+    mock_response = Mock()
+    with patch(
+        "marimo._utils.requests.get", return_value=mock_response
+    ) as mock_get:
+        response = client.get("/", headers=token_header())
+        assert response.status_code == 200, response.text
+
+        # requests.get should NOT be called since local file exists
+        mock_get.assert_not_called()
+
+    # Reset asset_url
+    client.app.state.asset_url = None
diff --git a/tests/_server/api/endpoints/test_home.py b/tests/_server/api/endpoints/test_home.py
index d6c03024fb5..9eab0183ce2 100644
--- a/tests/_server/api/endpoints/test_home.py
+++ b/tests/_server/api/endpoints/test_home.py
@@ -106,3 +106,39 @@ def test_cant_open_non_tutorial(client: TestClient) -> None:
     )
     assert response.status_code == 400
     assert response.json() == {"detail": "Tutorial not found"}
+
+
+@with_session(SESSION_ID)
+def test_tutorial_file_accessible_after_open(client: TestClient) -> None:
+    """Test that a tutorial file can be accessed after being opened.
+
+    This is an integration test for issue #7424.
+    When a tutorial is opened via the endpoint, it creates a file in a temp
+    directory. This test verifies that the file router can access that
+    file despite it being outside the base directory.
+    """
+    from marimo._server.file_router import LazyListOfFilesAppFileRouter
+
+    # Open a tutorial
+    response = client.post(
+        "/api/home/tutorial/open",
+        headers=HEADERS,
+        json={"tutorialId": "intro"},
+    )
+    assert response.status_code == 200
+    data = response.json()
+    tutorial_path = data["path"]
+
+    # Verify the temp directory was registered with the file router
+    session_manager = get_session_manager(client)
+    file_router = session_manager.file_router
+
+    # Only test for directory-based routers
+    if isinstance(file_router, LazyListOfFilesAppFileRouter):
+        assert file_router.is_file_in_allowed_temp_dir(tutorial_path)
+
+    # Try to get a file manager for the tutorial file
+    # This should not raise an HTTPException about being outside the directory
+    file_manager = session_manager.app_manager(tutorial_path)
+    assert file_manager is not None
+    assert file_manager.path == tutorial_path
diff --git a/tests/_server/api/test_auth.py b/tests/_server/api/test_auth.py
index 1f3a3b2728e..a33cfa27028 100644
--- a/tests/_server/api/test_auth.py
+++ b/tests/_server/api/test_auth.py
@@ -11,11 +11,11 @@
 
 from marimo._config.manager import UserConfigManager
 from marimo._server.api.auth import (
-    AppState,
     CustomAuthenticationMiddleware,
     CustomSessionMiddleware,
     validate_auth,
 )
+from marimo._server.api.deps import AppState
 from marimo._server.api.middleware import AuthBackend
 from marimo._server.main import create_starlette_app
 from tests._server.mocks import get_mock_session_manager
diff --git a/tests/_server/session/test_session_view.py b/tests/_server/session/test_session_view.py
index 20e68e456f8..71e4e80f0c4 100644
--- a/tests/_server/session/test_session_view.py
+++ b/tests/_server/session/test_session_view.py
@@ -5,13 +5,18 @@
 from unittest.mock import patch
 
 from marimo._ast.cell import RuntimeStateType
-from marimo._data.models import Database, DataTable, DataTableColumn, Schema
+from marimo._data.models import (
+    Database,
+    DataSourceConnection,
+    DataTable,
+    DataTableColumn,
+    Schema,
+)
 from marimo._messaging.cell_output import CellChannel, CellOutput
 from marimo._messaging.msgspec_encoder import asdict as serialize
 from marimo._messaging.ops import (
     CellOp,
     Datasets,
-    DataSourceConnection,
     DataSourceConnections,
     InstallingPackageAlert,
     SendUIElementMessage,
diff --git a/tests/_server/test_file_router.py b/tests/_server/test_file_router.py
index 4ce410c8428..37cec5a8010 100644
--- a/tests/_server/test_file_router.py
+++ b/tests/_server/test_file_router.py
@@ -534,3 +534,80 @@ def test_lazy_router_counts_nested_files(tmp_path: Path):
 
     total_files = count_files(files)
     assert total_files == 2
+
+
+def test_lazy_router_allows_temp_dir_files(tmp_path: Path):
+    """Test that files in registered temp directories bypass validation"""
+    # Create a base directory
+    base_dir = tmp_path / "base"
+    base_dir.mkdir()
+
+    # Create a file in the base directory
+    base_file = base_dir / "base_app.py"
+    base_file.write_text("import marimo\napp = marimo.App()\n")
+
+    # Create a separate temp directory
+    temp_dir = tmp_path / "temp"
+    temp_dir.mkdir()
+
+    # Create a file in the temp directory
+    temp_file = temp_dir / "tutorial.py"
+    temp_file.write_text("import marimo\napp = marimo.App()\n")
+
+    # Create router for base directory
+    router = LazyListOfFilesAppFileRouter(
+        str(base_dir), include_markdown=False
+    )
+
+    # Without registering temp dir, accessing temp file should fail
+    with pytest.raises(HTTPException) as exc_info:
+        router.get_file_manager(str(temp_file))
+    assert exc_info.value.status_code == HTTPStatus.FORBIDDEN
+    assert "outside the allowed directory" in exc_info.value.detail
+
+    # Register the temp directory
+    router.register_temp_dir(str(temp_dir))
+
+    # Now accessing the temp file should succeed
+    manager = router.get_file_manager(str(temp_file))
+    assert manager is not None
+    assert manager.path == str(temp_file)
+
+
+def test_lazy_router_temp_dir_doesnt_affect_normal_files(
+    tmp_path: Path,
+):
+    """Test that temp dir registration doesn't interfere with normal file access"""
+    # Create a base directory
+    base_dir = tmp_path / "base"
+    base_dir.mkdir()
+
+    # Create a file in the base directory
+    base_file = base_dir / "base_app.py"
+    base_file.write_text("import marimo\napp = marimo.App()\n")
+
+    # Create a file outside the base directory
+    outside_file = tmp_path / "outside.py"
+    outside_file.write_text("import marimo\napp = marimo.App()\n")
+
+    # Create a different temp directory
+    other_temp_dir = tmp_path / "other_temp"
+    other_temp_dir.mkdir()
+
+    # Create router
+    router = LazyListOfFilesAppFileRouter(
+        str(base_dir), include_markdown=False
+    )
+
+    # Register a different temp directory (not containing our outside_file)
+    router.register_temp_dir(str(other_temp_dir))
+
+    # Base file should still be accessible
+    manager = router.get_file_manager(str(base_file))
+    assert manager is not None
+    assert manager.path == str(base_file)
+
+    # Outside file should still be blocked (not in registered temp dir)
+    with pytest.raises(HTTPException) as exc_info:
+        router.get_file_manager(str(outside_file))
+    assert exc_info.value.status_code == HTTPStatus.FORBIDDEN
diff --git a/tests/_server/test_session_manager.py b/tests/_server/test_session_manager.py
index 4b17963e171..d2053d8c6aa 100644
--- a/tests/_server/test_session_manager.py
+++ b/tests/_server/test_session_manager.py
@@ -8,11 +8,11 @@
 
 from marimo._config.manager import get_default_config_manager
 from marimo._server.file_router import AppFileRouter
+from marimo._server.lsp import LspServer
 from marimo._server.model import ConnectionState, SessionConsumer, SessionMode
 from marimo._server.notebook import AppFileManager
 from marimo._server.sessions import (
     KernelManager,
-    LspServer,
     Session,
     SessionManager,
 )
diff --git a/tests/conftest.py b/tests/conftest.py
index 4fdcdc25ca1..99b4eade3af 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -13,8 +13,9 @@
 import pytest
 from _pytest import runner
 
-from marimo._ast.app import App, CellManager
+from marimo._ast.app import App
 from marimo._ast.app_config import _AppConfig
+from marimo._ast.cell_manager import CellManager
 from marimo._config.config import DEFAULT_CONFIG
 from marimo._messaging.mimetypes import ConsoleMimeType
 from marimo._messaging.ops import (
@@ -38,7 +39,7 @@
 from marimo._runtime.marimo_pdb import MarimoPdb
 from marimo._runtime.requests import AppMetadata, ExecutionRequest
 from marimo._runtime.runtime import Kernel
-from marimo._save.cache import ModuleStub
+from marimo._save.stubs.module_stub import ModuleStub
 from marimo._server.model import SessionMode
 from marimo._types.ids import CellId_t