practicode 0.1.3 → 0.1.5

package/Cargo.lock

@@ -357,7 +357,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "practicode"
-version = "0.1.3"
+version = "0.1.5"
 dependencies = [
  "anyhow",
  "crossterm 0.29.0",

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "practicode"
-version = "0.1.3"
+version = "0.1.5"
 edition = "2024"
 description = "Local-first coding-test practice in a Rust terminal UI with optional AI help."
 readme = "README.md"

package/README.md

@@ -63,6 +63,7 @@ Submissions are saved as you type under `submissions/<problem-id>/solution.<ext>
 | Command | Action |
 | --- | --- |
 | `/run` | Judge the current submission |
+| `/code` | Return to the code editor |
 | `/next` | Open the next local problem, or ask AI to create one |
 | `/next easy string problem` | Ask AI for a custom next problem |
 | `/prev` | Go back through problem history |
@@ -78,7 +79,6 @@ Submissions are saved as you type under `submissions/<problem-id>/solution.<ext>
 | `/lang python` | Set code language: `python`, `ts`, `java`, `rust` |
 | `/ui en` | Set UI language: `en`, `ko`, `ja`, `zh`, `es` |
 | `/theme dark` | Set theme: `dark` or `light` |
-| `/source ai` | Prefer AI for next-problem generation |
 | `/update` | Show update instructions when a newer version is available |
 | `/exit` | Quit |
 
@@ -106,7 +106,6 @@ Claude Code is also supported:
 ```text
 /provider claude
 /model sonnet
-/source ai
 ```
 
 Generated problems and submissions stay local:

package/assets/i18n/en.json

@@ -15,7 +15,7 @@
   "palette_hint": "up/down select | Enter run | Esc cancel",
   "hint_command": "Enter submit | Esc cancel",
   "hint_list": "up/down move | Enter open | Esc close",
-  "hint_output": "Esc code | / command | ? help",
+  "hint_output": "Esc/click edit | / command | ? help",
   "hint_code": "Esc then / command",
   "hint_idle": "/ command | ? help",
   "help_title": "Help",
@@ -23,6 +23,7 @@
   "keys": "Keys",
   "debug_prints": "Debug prints",
   "cmd_run": "Judge the current submission",
+  "cmd_code": "Return to the code editor",
   "cmd_edit": "Return to the code editor",
   "cmd_next": "Open the next problem",
   "cmd_prev": "Open the previous problem",
@@ -50,5 +51,7 @@
   "update_check_disabled": "Update check is disabled.",
   "update_check_failed": "Could not check for updates.",
   "generating_next": "Generating next problem",
-  "already_busy": "Already busy."
+  "already_busy": "Already busy.",
+  "run_pass_next": "Next: /next",
+  "run_fail_next": "Fix: press Esc or click this pane to edit, then /run"
 }

package/assets/i18n/es.json

@@ -15,7 +15,7 @@
   "palette_hint": "arriba/abajo elegir | Enter ejecutar | Esc cancelar",
   "hint_command": "Enter ejecutar | Esc cancelar",
   "hint_list": "arriba/abajo mover | Enter abrir | Esc cerrar",
-  "hint_output": "Esc codigo | / comando | ? ayuda",
+  "hint_output": "Esc/clic editar | / comando | ? ayuda",
   "hint_code": "Esc y luego / comando",
   "hint_idle": "/ comando | ? ayuda",
   "help_title": "Ayuda",
@@ -23,6 +23,7 @@
   "keys": "Teclas",
   "debug_prints": "Salida de depuracion",
   "cmd_run": "Evalua la solucion actual",
+  "cmd_code": "Volver al editor de codigo",
   "cmd_edit": "Volver al editor de codigo",
   "cmd_next": "Abrir el siguiente problema",
   "cmd_prev": "Abrir el problema anterior",
@@ -50,5 +51,7 @@
   "update_check_disabled": "La comprobacion de actualizaciones esta desactivada.",
   "update_check_failed": "No se pudo comprobar actualizaciones.",
   "generating_next": "Generando el siguiente problema",
-  "already_busy": "Ya hay una tarea en curso."
+  "already_busy": "Ya hay una tarea en curso.",
+  "run_pass_next": "Siguiente: /next",
+  "run_fail_next": "Corrige: pulsa Esc o haz clic en este panel para editar, luego /run"
 }

package/assets/i18n/ja.json

@@ -15,7 +15,7 @@
   "palette_hint": "上下 選択 | Enter 実行 | Esc キャンセル",
   "hint_command": "Enter 実行 | Esc キャンセル",
   "hint_list": "上下 移動 | Enter 開く | Esc 閉じる",
-  "hint_output": "Esc コード | / コマンド | ? ヘルプ",
+  "hint_output": "Esc/クリック 編集 | / コマンド | ? ヘルプ",
   "hint_code": "Esc の後 / コマンド",
   "hint_idle": "/ コマンド | ? ヘルプ",
   "help_title": "ヘルプ",
@@ -23,6 +23,7 @@
   "keys": "キー",
   "debug_prints": "デバッグ出力",
   "cmd_run": "現在の提出を判定",
+  "cmd_code": "コードエディタに戻る",
   "cmd_edit": "コードエディタに戻る",
   "cmd_next": "次の問題を開く",
   "cmd_prev": "前の問題を開く",
@@ -50,5 +51,7 @@
   "update_check_disabled": "更新確認は無効です。",
   "update_check_failed": "更新を確認できませんでした。",
   "generating_next": "次の問題を生成中",
-  "already_busy": "すでに処理中です。"
+  "already_busy": "すでに処理中です。",
+  "run_pass_next": "次: /next",
+  "run_fail_next": "修正: Esc またはこのペインをクリックして編集し、/run"
 }

package/assets/i18n/ko.json

@@ -15,7 +15,7 @@
   "palette_hint": "위/아래 선택 | Enter 실행 | Esc 취소",
   "hint_command": "Enter 실행 | Esc 취소",
   "hint_list": "위/아래 이동 | Enter 열기 | Esc 닫기",
-  "hint_output": "Esc 코드 | / 명령 | ? 도움말",
+  "hint_output": "Esc/클릭 편집 | / 명령 | ? 도움말",
   "hint_code": "Esc 후 / 명령",
   "hint_idle": "/ 명령 | ? 도움말",
   "help_title": "도움말",
@@ -23,6 +23,7 @@
   "keys": "키",
   "debug_prints": "디버그 출력",
   "cmd_run": "현재 제출을 채점",
+  "cmd_code": "코드 편집기로 돌아가기",
   "cmd_edit": "코드 편집기로 돌아가기",
   "cmd_next": "다음 문제 열기",
   "cmd_prev": "이전 문제 열기",
@@ -50,5 +51,7 @@
   "update_check_disabled": "업데이트 확인이 꺼져 있습니다.",
   "update_check_failed": "업데이트를 확인할 수 없습니다.",
   "generating_next": "다음 문제 생성 중",
-  "already_busy": "이미 작업 중입니다."
+  "already_busy": "이미 작업 중입니다.",
+  "run_pass_next": "다음: /next",
+  "run_fail_next": "수정: Esc를 누르거나 이 창을 클릭해 편집한 뒤 /run"
 }

package/assets/i18n/zh.json

@@ -15,7 +15,7 @@
   "palette_hint": "上下 选择 | Enter 执行 | Esc 取消",
   "hint_command": "Enter 执行 | Esc 取消",
   "hint_list": "上下 移动 | Enter 打开 | Esc 关闭",
-  "hint_output": "Esc 代码 | / 命令 | ? 帮助",
+  "hint_output": "Esc/点击 编辑 | / 命令 | ? 帮助",
   "hint_code": "Esc 后输入 / 命令",
   "hint_idle": "/ 命令 | ? 帮助",
   "help_title": "帮助",
@@ -23,6 +23,7 @@
   "keys": "按键",
   "debug_prints": "调试输出",
   "cmd_run": "评测当前提交",
+  "cmd_code": "回到代码编辑器",
   "cmd_edit": "回到代码编辑器",
   "cmd_next": "打开下一题",
   "cmd_prev": "打开上一题",
@@ -50,5 +51,7 @@
   "update_check_disabled": "更新检查已禁用。",
   "update_check_failed": "无法检查更新。",
   "generating_next": "正在生成下一题",
-  "already_busy": "已有任务正在运行。"
+  "already_busy": "已有任务正在运行。",
+  "run_pass_next": "下一步: /next",
+  "run_fail_next": "修复: 按 Esc 或点击此面板编辑，然后 /run"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "practicode",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Local-first coding-test practice in a Rust terminal UI with optional AI help.",
   "license": "MIT",
   "repository": {

package/src/ai.rs

@@ -15,6 +15,12 @@ use std::{
     time::Duration,
 };
 
+#[derive(Clone, Debug, Default)]
+pub struct ModelCatalog {
+    pub models: Vec<String>,
+    pub message: Option<String>,
+}
+
 pub fn run_ai_prompt(root: &Path, problem: &Problem, settings: &Settings, prompt: &str) -> String {
     let solution = match ensure_submission(root, problem, settings) {
         Ok(path) => path,
@@ -102,10 +108,17 @@ pub fn provider_status(provider: &str) -> String {
     }
 }
 
-pub fn available_models(provider: &str) -> Vec<String> {
+pub fn available_models(provider: &str) -> ModelCatalog {
     match normalize_ai_provider(provider).as_str() {
         "codex" => codex_models(),
-        _ => Vec::new(),
+        "claude" => ModelCatalog {
+            models: Vec::new(),
+            message: Some(
+                "Claude CLI does not expose a model list; use /model <name> for a known model."
+                    .to_string(),
+            ),
+        },
+        _ => ModelCatalog::default(),
     }
 }
 
@@ -139,20 +152,56 @@ pub fn read_problem_notes(root: &Path) -> Result<String> {
     }
 }
 
-fn codex_models() -> Vec<String> {
+fn codex_models() -> ModelCatalog {
     if which("codex").is_none() {
-        return Vec::new();
+        return ModelCatalog {
+            models: Vec::new(),
+            message: Some(
+                "Codex CLI not found; choose /provider claude or install Codex CLI.".to_string(),
+            ),
+        };
     }
+    if codex_daemon_path().is_none_or(|path| !path.exists()) {
+        return ModelCatalog {
+            models: Vec::new(),
+            message: Some("Codex app-server daemon is unavailable; install the standalone Codex app to list models, or use /model <name>.".to_string()),
+        };
+    }
+    let mut start = Command::new("codex");
+    start.args(["app-server", "daemon", "start"]);
+    let _ = run_capture(&mut start, "", Duration::from_secs(5));
     let mut command = Command::new("codex");
     command.args(["app-server", "proxy"]);
     let input = r#"{"id":1,"method":"model/list","params":{"limit":25}}"#;
     let Ok(run) = run_capture(&mut command, &format!("{input}\n"), Duration::from_secs(2)) else {
-        return Vec::new();
+        return ModelCatalog {
+            models: Vec::new(),
+            message: Some("Could not query Codex model list.".to_string()),
+        };
     };
     if run.code != Some(0) {
-        return Vec::new();
+        let detail = output_text(&run.stdout, &run.stderr);
+        return ModelCatalog {
+            models: Vec::new(),
+            message: Some(if detail.is_empty() {
+                "Could not query Codex model list.".to_string()
+            } else {
+                format!("Could not query Codex model list: {detail}")
+            }),
+        };
+    }
+    let models = parse_model_list(&run.stdout);
+    if models.is_empty() {
+        ModelCatalog {
+            models,
+            message: Some("Codex app-server returned no models.".to_string()),
+        }
+    } else {
+        ModelCatalog {
+            models,
+            message: None,
+        }
     }
-    parse_model_list(&run.stdout)
 }
 
 fn parse_model_list(output: &str) -> Vec<String> {

package/src/core.rs

@@ -601,8 +601,8 @@ pub fn judge(root: &Path, problem: &Problem, settings: &Settings) -> JudgeResult
         let run = match run_capture(&mut process, &case.input, Duration::from_secs(5)) {
             Ok(run) => run,
             Err(error) => {
-                lines.push(format!("case {}: FAIL", index + 1));
-                lines.push(error.to_string());
+                lines.push(format!("Case {}: FAIL", index + 1));
+                push_labeled_block(&mut lines, "Error", &error.to_string());
                 break;
             }
         };
@@ -610,28 +610,20 @@ pub fn judge(root: &Path, problem: &Problem, settings: &Settings) -> JudgeResult
         let expected = case.output.trim();
         if !run.timed_out && run.code == Some(0) && got == expected {
             passed += 1;
-            lines.push(format!("case {}: PASS", index + 1));
+            lines.push(format!("Case {}: PASS", index + 1));
             if !run.stderr.trim().is_empty() {
-                lines.push("stderr:".to_string());
-                lines.push(run.stderr.trim_end().to_string());
+                push_labeled_block(&mut lines, "Stderr", run.stderr.trim_end());
             }
         } else {
-            lines.push(format!("case {}: FAIL", index + 1));
+            lines.push(format!("Case {}: FAIL", index + 1));
             if run.timed_out {
-                lines.push("timeout: 5s".to_string());
+                push_labeled_block(&mut lines, "Error", "timeout: 5s");
             }
-            lines.push(format!("input: {:?}", case.input));
-            lines.push(format!("expected: {:?}", expected));
-            lines.push(format!("got: {:?}", got));
-            lines.push("stdout:".to_string());
-            lines.push(if run.stdout.trim_end().is_empty() {
-                "<empty>".to_string()
-            } else {
-                run.stdout.trim_end().to_string()
-            });
+            push_labeled_block(&mut lines, "Input", case.input.trim_end());
+            push_labeled_block(&mut lines, "Expected", expected);
+            push_labeled_block(&mut lines, "Got", run.stdout.trim_end());
             if !run.stderr.trim().is_empty() {
-                lines.push("stderr:".to_string());
-                lines.push(run.stderr.trim_end().to_string());
+                push_labeled_block(&mut lines, "Stderr", run.stderr.trim_end());
             }
             break;
         }
@@ -645,6 +637,16 @@ pub fn judge(root: &Path, problem: &Problem, settings: &Settings) -> JudgeResult
     }
 }
 
+fn push_labeled_block(lines: &mut Vec<String>, label: &str, body: &str) {
+    lines.push(String::new());
+    lines.push(label.to_string());
+    if body.is_empty() {
+        lines.push("  <empty>".to_string());
+    } else {
+        lines.extend(body.lines().map(|line| format!("  {line}")));
+    }
+}
+
 pub fn command_for(root: &Path, path: &Path, language: &str) -> Result<Option<CommandSpec>> {
     match language {
         "python" => Ok(which("python3")

package/src/lib.rs

@@ -1,5 +1,9 @@
 use anyhow::{Context, Result};
-use crossterm::{cursor::SetCursorStyle, execute};
+use crossterm::{
+    cursor::SetCursorStyle,
+    event::{DisableMouseCapture, EnableMouseCapture},
+    execute,
+};
 use std::{env, io::stdout};
 
 pub mod ai;
@@ -25,9 +29,13 @@ pub fn run_cli() -> Result<()> {
 
     let mut app = tui::PracticodeApp::new(root)?;
     let mut terminal = ratatui::init();
-    let _ = execute!(stdout(), SetCursorStyle::SteadyBar);
+    let _ = execute!(stdout(), SetCursorStyle::SteadyBar, EnableMouseCapture);
     let result = app.run(&mut terminal);
     ratatui::restore();
-    let _ = execute!(stdout(), SetCursorStyle::DefaultUserShape);
+    let _ = execute!(
+        stdout(),
+        SetCursorStyle::DefaultUserShape,
+        DisableMouseCapture
+    );
     result
 }

package/src/tui.rs

@@ -1,7 +1,7 @@
 use crate::{
     ai::{
-        append_problem_note, available_models, provider_status, read_problem_notes, run_ai_next,
-        run_ai_prompt,
+        ModelCatalog, append_problem_note, available_models, provider_status, read_problem_notes,
+        run_ai_next, run_ai_prompt,
     },
     core::{
         AI_PROVIDERS, AppState, HistoryItem, LANGUAGES, PROBLEM_NOTES_PATH, Problem, THEMES,
@@ -16,7 +16,10 @@ use crate::{
     update::{CURRENT_VERSION, UpdateCheck, check_latest_version},
 };
 use anyhow::Result;
-use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
+use crossterm::event::{
+    self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers, MouseButton, MouseEvent,
+    MouseEventKind,
+};
 use ratatui::{
     DefaultTerminal, Frame,
     layout::{Constraint, Direction, Layout, Position, Rect},
@@ -59,9 +62,9 @@ const COMMAND_HINTS: &[CommandHint] = &[
         help: true,
     },
     CommandHint {
-        insert: "edit",
-        display: "/edit",
-        desc_key: "cmd_edit",
+        insert: "code",
+        display: "/code",
+        desc_key: "cmd_code",
         keep_open: false,
         help: true,
     },
@@ -226,20 +229,6 @@ const COMMAND_HINTS: &[CommandHint] = &[
         keep_open: false,
         help: false,
     },
-    CommandHint {
-        insert: "source local",
-        display: "/source local",
-        desc_key: "cmd_source",
-        keep_open: false,
-        help: false,
-    },
-    CommandHint {
-        insert: "source ai",
-        display: "/source ai",
-        desc_key: "cmd_source",
-        keep_open: false,
-        help: false,
-    },
     CommandHint {
         insert: "update",
         display: "/update",
@@ -282,6 +271,7 @@ pub struct PracticodeApp {
     command_palette_cursor: usize,
     output: String,
     output_is_markdown: bool,
+    showing_model_status: bool,
     show_output: bool,
     focus: Focus,
     list_cursor: Option<usize>,
@@ -290,11 +280,15 @@ pub struct PracticodeApp {
     busy_frame: usize,
     task_rx: Option<Receiver<TaskResult>>,
     update_rx: Option<Receiver<UpdateCheck>>,
-    model_rx: Option<Receiver<Vec<String>>>,
+    model_rx: Option<Receiver<ModelCatalog>>,
     available_models: Vec<String>,
     available_models_provider: String,
+    model_message: Option<String>,
     update_check: Option<UpdateCheck>,
     update_notice: Option<String>,
+    code_area: Rect,
+    output_area: Rect,
+    command_area: Rect,
     should_quit: bool,
 }
 
@@ -325,6 +319,7 @@ impl PracticodeApp {
             command_palette_cursor: 0,
             output: String::new(),
             output_is_markdown: false,
+            showing_model_status: false,
             show_output: false,
             focus: Focus::Code,
             list_cursor: None,
@@ -336,8 +331,12 @@ impl PracticodeApp {
             model_rx: None,
             available_models: Vec::new(),
             available_models_provider: String::new(),
+            model_message: None,
             update_check: None,
             update_notice: None,
+            code_area: Rect::default(),
+            output_area: Rect::default(),
+            command_area: Rect::default(),
             should_quit: false,
         };
         app.load_code_editor()?;
@@ -353,11 +352,12 @@ impl PracticodeApp {
             self.check_update();
             self.start_model_check();
             self.check_models();
-            if event::poll(Duration::from_millis(100))?
-                && let Event::Key(key) = event::read()?
-                && key.kind != KeyEventKind::Release
-            {
-                self.handle_key(key)?;
+            if event::poll(Duration::from_millis(100))? {
+                match event::read()? {
+                    Event::Key(key) if key.kind != KeyEventKind::Release => self.handle_key(key)?,
+                    Event::Mouse(mouse) => self.handle_mouse(mouse)?,
+                    _ => {}
+                }
             }
             if !self.busy_label.is_empty() {
                 self.busy_frame = (self.busy_frame + 1) % 16;
@@ -391,6 +391,16 @@ impl PracticodeApp {
         self.handle_key(key)
     }
 
+    pub fn handle_mouse_for_test(&mut self, mouse: MouseEvent) -> Result<()> {
+        self.handle_mouse(mouse)
+    }
+
+    pub fn set_pane_areas_for_test(&mut self, code: Rect, output: Rect, command: Rect) {
+        self.code_area = code;
+        self.output_area = output;
+        self.command_area = command;
+    }
+
     pub fn busy_label(&self) -> &str {
         &self.busy_label
     }
@@ -403,6 +413,10 @@ impl PracticodeApp {
         self.status_text()
     }
 
+    pub fn output_for_test(&self) -> &str {
+        &self.output
+    }
+
     pub fn command_suggestions_for_test(&self) -> Vec<String> {
         self.command_suggestions()
             .into_iter()
@@ -413,6 +427,13 @@ impl PracticodeApp {
     pub fn set_available_models_for_test(&mut self, models: Vec<&str>) {
         self.available_models = models.into_iter().map(str::to_string).collect();
         self.available_models_provider = self.state.settings.ai_provider.clone();
+        self.model_message = None;
+    }
+
+    pub fn set_model_message_for_test(&mut self, message: &str) {
+        self.available_models.clear();
+        self.available_models_provider = self.state.settings.ai_provider.clone();
+        self.model_message = Some(message.to_string());
     }
 
     pub fn pane_title_for_test(title: &str, active: bool) -> String {
@@ -433,6 +454,9 @@ impl PracticodeApp {
             .direction(Direction::Horizontal)
             .constraints([Constraint::Percentage(58), Constraint::Percentage(42)])
             .split(vertical[0]);
+        self.code_area = body[1];
+        self.output_area = body[1];
+        self.command_area = vertical[2];
 
         let problem = Paragraph::new(self.problem_text())
             .block(Self::block(
@@ -444,13 +468,7 @@ impl PracticodeApp {
         frame.render_widget(problem, body[0]);
 
         if self.show_output {
-            let text = if !self.busy_label.is_empty() {
-                format!("{}{}", self.busy_body, self.busy_dots())
-            } else if self.output_is_markdown {
-                render_markdown_plain(&self.output)
-            } else {
-                self.output.clone()
-            };
+            let text = self.output_text();
             let output = Paragraph::new(text)
                 .block(Self::block(
                     ui_text(&self.state.settings.ui_language, "output"),
@@ -503,6 +521,79 @@ impl PracticodeApp {
         self.set_terminal_cursor(frame, body[1], vertical[2]);
     }
 
+    fn output_text(&self) -> Text<'static> {
+        let light = self.state.settings.theme == "light";
+        let title_style = if light {
+            Style::default()
+                .fg(Color::Blue)
+                .add_modifier(Modifier::BOLD)
+        } else {
+            Style::default()
+                .fg(Color::Yellow)
+                .add_modifier(Modifier::BOLD)
+        };
+        let label_style = if light {
+            Style::default()
+                .fg(Color::Magenta)
+                .add_modifier(Modifier::BOLD)
+        } else {
+            Style::default()
+                .fg(Color::Cyan)
+                .add_modifier(Modifier::BOLD)
+        };
+        let body_style = if light {
+            Style::default().fg(Color::Black)
+        } else {
+            Style::default().fg(Color::Rgb(229, 231, 235))
+        };
+        let code_style = if light {
+            Style::default()
+                .fg(Color::Black)
+                .bg(Color::Rgb(229, 231, 235))
+        } else {
+            Style::default()
+                .fg(Color::Rgb(243, 244, 246))
+                .bg(Color::Rgb(31, 41, 55))
+        };
+        if !self.busy_label.is_empty() {
+            return Text::from(Line::from(Span::styled(
+                format!("{}{}", self.busy_body, self.busy_dots()),
+                title_style,
+            )));
+        }
+        let output = if self.output_is_markdown {
+            render_markdown_plain(&self.output)
+        } else {
+            self.output.clone()
+        };
+        let mut lines = Vec::new();
+        for line in output.lines() {
+            if line.is_empty() {
+                lines.push(Line::default());
+            } else if line.starts_with("PASS ")
+                || line.starts_with("FAIL ")
+                || line.starts_with("Case ")
+                || line.starts_with("Next:")
+                || line.starts_with("Fix:")
+            {
+                lines.push(Line::from(Span::styled(line.to_string(), title_style)));
+            } else if matches!(
+                line,
+                "Input" | "Expected" | "Got" | "Stdout" | "Stderr" | "Compile" | "Error"
+            ) {
+                lines.push(Line::from(Span::styled(line.to_string(), label_style)));
+            } else if line.starts_with("  ") {
+                lines.push(Line::from(vec![
+                    Span::raw("  "),
+                    Span::styled(line.trim_start().to_string(), code_style),
+                ]));
+            } else {
+                lines.push(Line::from(Span::styled(line.to_string(), body_style)));
+            }
+        }
+        Text::from(lines)
+    }
+
     fn problem_text(&self) -> Text<'static> {
         let lang = normalize_ui_language(&self.state.settings.ui_language);
         let light = self.state.settings.theme == "light";
@@ -717,6 +808,19 @@ impl PracticodeApp {
         }
     }
 
+    fn handle_mouse(&mut self, mouse: MouseEvent) -> Result<()> {
+        if !matches!(mouse.kind, MouseEventKind::Down(MouseButton::Left)) {
+            return Ok(());
+        }
+        let position = Position::new(mouse.column, mouse.row);
+        if self.command_area.contains(position) {
+            self.focus_command();
+        } else if self.code_area.contains(position) || self.output_area.contains(position) {
+            self.action_edit()?;
+        }
+        Ok(())
+    }
+
     fn handle_command_key(&mut self, key: KeyEvent) -> Result<()> {
         match key.code {
             KeyCode::Esc => {
@@ -872,7 +976,7 @@ impl PracticodeApp {
         }
         match command {
             "run" | "r" => self.action_run()?,
-            "edit" | "e" => self.action_edit()?,
+            "code" | "edit" | "e" => self.action_edit()?,
             "next" | "n" => self.action_next(arg)?,
             "prev" | "previous" | "p" => self.action_previous()?,
             "giveup" | "give" | "g" => self.action_give_up()?,
@@ -885,12 +989,12 @@ impl PracticodeApp {
             "theme" if arg.is_empty() => self.action_toggle_theme()?,
             "theme" if THEMES.contains(&arg) => self.set_theme(arg)?,
             "source" | "next-source" if arg.is_empty() => {
-                self.write_text_output(&format!("Next source: {}", self.next_source_label()));
+                self.write_text_output(&self.next_source_help());
             }
             "source" | "next-source" if matches!(arg, "bank" | "local" | "ai") => {
                 self.state.settings.next_source = normalize_next_source(arg);
                 save_state(&self.root, &self.state)?;
-                self.write_text_output(&format!("Next source: {}", self.next_source_label()));
+                self.write_text_output(&self.next_source_help());
             }
             "ai-next-command" if !arg.is_empty() => {
                 self.state.settings.ai_next_command = arg.to_string();
@@ -910,6 +1014,7 @@ impl PracticodeApp {
                 self.model_rx = None;
                 self.available_models.clear();
                 self.available_models_provider.clear();
+                self.model_message = None;
                 save_state(&self.root, &self.state)?;
                 self.write_text_output(&format!(
                     "AI provider: {}\n{}",
@@ -918,7 +1023,9 @@ impl PracticodeApp {
                 ));
             }
             "model" if arg.is_empty() => {
-                self.write_text_output(&self.model_status_text());
+                self.start_model_check();
+                self.check_models();
+                self.write_model_status();
             }
             "model" => {
                 self.state.settings.ai_model = if arg == "auto" {
@@ -927,7 +1034,9 @@ impl PracticodeApp {
                     arg.to_string()
                 };
                 save_state(&self.root, &self.state)?;
-                self.write_text_output(&self.model_status_text());
+                self.start_model_check();
+                self.check_models();
+                self.write_model_status();
             }
             "hint" if arg.is_empty() => {
                 self.start_ai_prompt("Give one concise hint for the current problem.")?
@@ -962,9 +1071,9 @@ impl PracticodeApp {
             result.total_cases
         );
         let next_step = if result.passed {
-            "Next: /next"
+            ui_text(&self.state.settings.ui_language, "run_pass_next")
         } else {
-            "Fix code, then /run"
+            ui_text(&self.state.settings.ui_language, "run_fail_next")
         };
         self.write_text_output(&format!("{headline}\n{}\n\n{next_step}", result.output));
         Ok(())
@@ -1195,14 +1304,21 @@ impl PracticodeApp {
 
     fn check_models(&mut self) {
         let models = self.model_rx.as_ref().and_then(|rx| rx.try_recv().ok());
-        if let Some(models) = models {
+        if let Some(catalog) = models {
             self.model_rx = None;
-            self.available_models = models;
+            self.available_models = catalog.models;
+            self.model_message = catalog.message;
+            if self.showing_model_status {
+                self.output = self.model_status_text();
+                self.output_is_markdown = false;
+                self.show_output = true;
+            }
         }
     }
 
     fn model_status_text(&self) -> String {
         let mut lines = vec![
+            format!("AI provider: {}", self.state.settings.ai_provider),
             format!(
                 "AI model: {}",
                 if self.state.settings.ai_model == "auto" {
@@ -1213,11 +1329,15 @@ impl PracticodeApp {
             ),
             "Use /model auto to let the provider choose its default.".to_string(),
         ];
-        if self.available_models.is_empty() {
+        if self.model_rx.is_some() {
+            lines.push("Loading provider model list...".to_string());
+        } else if self.available_models.is_empty() {
             lines.push(
-                "Provider model list is unavailable; use /model <name> for a known model."
-                    .to_string(),
+                self.model_message
+                    .clone()
+                    .unwrap_or_else(|| "Provider model list is unavailable.".to_string()),
             );
+            lines.push("Use /model <name> for a known model.".to_string());
         } else {
             lines.push("Available models:".to_string());
             lines.extend(
@@ -1244,6 +1364,7 @@ impl PracticodeApp {
     }
 
     fn write_output(&mut self, output: &str) {
+        self.showing_model_status = false;
         self.output = output.to_string();
         self.output_is_markdown = true;
         self.show_output = true;
@@ -1251,12 +1372,21 @@ impl PracticodeApp {
     }
 
     fn write_text_output(&mut self, output: &str) {
+        self.showing_model_status = false;
         self.output = output.trim_end().to_string();
         self.output_is_markdown = false;
         self.show_output = true;
         self.focus = Focus::Output;
     }
 
+    fn write_model_status(&mut self) {
+        self.output = self.model_status_text();
+        self.output_is_markdown = false;
+        self.showing_model_status = true;
+        self.show_output = true;
+        self.focus = Focus::Output;
+    }
+
     fn show_update_notice(&mut self) {
         let lang = self.state.settings.ui_language.clone();
         if let Some(version) = &self.update_notice {
@@ -1614,11 +1744,11 @@ impl PracticodeApp {
         )
     }
 
-    fn next_source_label(&self) -> &'static str {
+    fn next_source_help(&self) -> String {
         if self.state.settings.next_source == "ai" {
-            "ai"
+            "Next behavior: plain /next asks AI every time. Use /source local to use local problems first.".to_string()
         } else {
-            "local"
+            "Next behavior: /next uses local problems first and asks AI when it needs a new one. Use /next <request> to ask AI directly.".to_string()
         }
     }