diff --git a/src/ui/app.rs b/src/ui/app.rs
index e52b847..2cc8a98 100644
--- a/src/ui/app.rs
+++ b/src/ui/app.rs
@@ -1,17 +1,18 @@
 use anyhow::Result;
-use crossterm::event::{KeyCode, KeyEvent};
+use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
+use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
-use crate::command::cmd::{Cmd, CmdContext};
+use crate::command::cmd::CmdContext;
 use crate::command::keymap::{Keymap, KeymapSet};
 use crate::command::{self, Command};
 use crate::import::wizard::{ImportWizard, WizardStep};
 use crate::model::cell::{CellKey, CellValue};
 use crate::model::Model;
 use crate::persistence;
-use crate::view::{Axis, GridLayout};
+use crate::view::GridLayout;
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum AppMode {
@@ -34,9 +35,7 @@ pub enum AppMode {
         buffer: String,
     },
     ViewPanel,
-    TileSelect {
-        cat_idx: usize,
-    },
+    TileSelect,
     ImportWizard,
     ExportPrompt {
         buffer: String,
@@ -67,6 +66,10 @@ pub struct App {
     pub dirty: bool,
     /// Yanked cell value for `p` paste
     pub yanked: Option<CellValue>,
+    /// Tile select cursor (which category index is highlighted)
+    pub tile_cat_idx: usize,
+    /// Named text buffers for text-entry modes
+    pub buffers: HashMap<String, String>,
     /// Transient keymap for Emacs-style prefix key sequences (g→gg, y→yy, etc.)
     pub transient_keymap: Option<Arc<Keymap>>,
     keymap_set: KeymapSet,
@@ -91,12 +94,14 @@ impl App {
             formula_cursor: 0,
             dirty: false,
             yanked: None,
+            tile_cat_idx: 0,
+            buffers: HashMap::new(),
             transient_keymap: None,
             keymap_set: KeymapSet::default_keymaps(),
         }
     }
 
-    fn cmd_context(&self) -> CmdContext {
+    fn cmd_context(&self, key: KeyCode, mods: KeyModifiers) -> CmdContext<'_> {
         let view = self.model.active_view();
         CmdContext {
             model: &self.model,
@@ -108,9 +113,17 @@ impl App {
             yanked: &self.yanked,
             dirty: self.dirty,
             file_path_set: self.file_path.is_some(),
+            search_mode: self.search_mode,
             formula_panel_open: self.formula_panel_open,
             category_panel_open: self.category_panel_open,
             view_panel_open: self.view_panel_open,
+            buffers: &self.buffers,
+            formula_cursor: self.formula_cursor,
+            cat_panel_cursor: self.cat_panel_cursor,
+            view_panel_cursor: self.view_panel_cursor,
+            tile_cat_idx: self.tile_cat_idx,
+            key_code: key,
+            key_modifiers: mods,
         }
     }
 
@@ -1098,7 +1111,7 @@ mod tests {
     }
 
     fn run_cmd(app: &mut App, cmd: &dyn crate::command::cmd::Cmd) {
-        let ctx = app.cmd_context();
+        let ctx = app.cmd_context(KeyCode::Null, KeyModifiers::NONE);
         let effects = cmd.execute(&ctx);
         drop(ctx);
         app.apply_effects(effects);