@fresh-editor/fresh-editor 0.1.77 → 0.1.86

package/plugins/live_grep.ts

@@ -92,8 +92,7 @@ editor.registerCommand(
   "%cmd.live_grep",
   "%cmd.live_grep_desc",
   "start_live_grep",
-  "normal"
+  null
 );
 
 editor.debug("Live Grep plugin loaded (using Finder abstraction)");
-editor.setStatus(editor.t("status.ready"));

package/plugins/markdown_compose.ts

@@ -611,4 +611,3 @@ editor.registerCommand(
 
 // Initialization
 editor.debug("Markdown Compose plugin loaded - use 'Markdown: Toggle Compose' command");
-editor.setStatus(editor.t("status.plugin_ready"));

package/plugins/merge_conflict.ts

@@ -1783,7 +1783,7 @@ const MERGE_MODE_COMMANDS = [
  */
 function registerMergeModeCommands(): void {
   for (const cmd of MERGE_MODE_COMMANDS) {
-    editor.registerCommand(cmd.name, cmd.desc, cmd.action, "normal");
+    editor.registerCommand(cmd.name, cmd.desc, cmd.action, null);
   }
 }
 
@@ -1801,12 +1801,11 @@ editor.registerCommand(
   "%cmd.start",
   "%cmd.start_desc",
   "start_merge_conflict",
-  "normal"
+  null  // Always visible - entry point command
 );
 
 // =============================================================================
 // Plugin Initialization
 // =============================================================================
 
-editor.setStatus(editor.t("status.ready"));
 editor.debug("Merge plugin initialized - Use 'Merge: Start Resolution' for files with conflicts");

package/plugins/path_complete.ts

@@ -162,4 +162,3 @@ globalThis.onPathCompletePromptChanged = function (args: { prompt_type: string;
 // Register event handler
 editor.on("prompt_changed", "onPathCompletePromptChanged");
 
-editor.setStatus(editor.t("status.loaded"));

package/plugins/search_replace.ts

@@ -478,9 +478,8 @@ editor.registerCommand(
   "%cmd.search_replace",
   "%cmd.search_replace_desc",
   "start_search_replace",
-  "normal"
+  null
 );
 
 // Plugin initialization
 editor.debug("Search & Replace plugin loaded");
-editor.setStatus(editor.t("status.ready"));

package/plugins/theme_editor.ts

@@ -484,10 +484,17 @@ function findThemesDir(): string {
  */
 async function loadBuiltinThemes(): Promise<string[]> {
   try {
-    const builtinThemes = editor.getBuiltinThemes() as Record<string, string>;
+    editor.debug("[theme_editor] loadBuiltinThemes: calling editor.getBuiltinThemes()");
+    const rawThemes = editor.getBuiltinThemes();
+    editor.debug(`[theme_editor] loadBuiltinThemes: got rawThemes type=${typeof rawThemes}`);
+    // getBuiltinThemes returns a JSON string, need to parse it
+    const builtinThemes = typeof rawThemes === "string"
+      ? JSON.parse(rawThemes) as Record<string, string>
+      : rawThemes as Record<string, string>;
+    editor.debug(`[theme_editor] loadBuiltinThemes: parsed ${Object.keys(builtinThemes).length} themes`);
     return Object.keys(builtinThemes);
   } catch (e) {
-    editor.debug(`Failed to load built-in themes list: ${e}`);
+    editor.debug(`[theme_editor] Failed to load built-in themes list: ${e}`);
     throw e;
   }
 }
@@ -497,13 +504,17 @@ async function loadBuiltinThemes(): Promise<string[]> {
  */
 async function loadThemeFile(name: string): Promise<Record<string, unknown> | null> {
   try {
-    const builtinThemes = editor.getBuiltinThemes() as Record<string, string>;
+    const rawThemes = editor.getBuiltinThemes();
+    // getBuiltinThemes returns a JSON string, need to parse it
+    const builtinThemes = typeof rawThemes === "string"
+      ? JSON.parse(rawThemes) as Record<string, string>
+      : rawThemes as Record<string, string>;
     if (name in builtinThemes) {
       return JSON.parse(builtinThemes[name]);
     }
     return null;
   } catch (e) {
-    editor.debug(`Failed to load theme data for '${name}': ${e}`);
+    editor.debug(`[theme_editor] Failed to load theme data for '${name}': ${e}`);
     return null;
   }
 }
@@ -1190,7 +1201,12 @@ globalThis.onThemeSelectInitialPromptConfirmed = async function(args: {
   selected_index: number | null;
   input: string;
 }): Promise<boolean> {
-  if (args.prompt_type !== "theme-select-initial") return true;
+  editor.debug(`[theme_editor] onThemeSelectInitialPromptConfirmed called with: ${JSON.stringify(args)}`);
+  if (args.prompt_type !== "theme-select-initial") {
+    editor.debug(`[theme_editor] prompt_type mismatch, expected 'theme-select-initial', got '${args.prompt_type}'`);
+    return true;
+  }
+  editor.debug(`[theme_editor] prompt_type matched, processing selection...`);
 
   const value = args.input.trim();
 
@@ -1252,7 +1268,9 @@ globalThis.onThemeSelectInitialPromptConfirmed = async function(args: {
   }
 
   // Now open the editor with loaded theme
+  editor.debug(`[theme_editor] About to call doOpenThemeEditor()`);
   await doOpenThemeEditor();
+  editor.debug(`[theme_editor] doOpenThemeEditor() completed`);
 
   return true;
 };
@@ -1642,7 +1660,9 @@ globalThis.theme_editor_nav_prev_section = function(): void {
  * Open the theme editor - prompts user to select theme first
  */
 globalThis.open_theme_editor = async function(): Promise<void> {
+  editor.debug("[theme_editor] open_theme_editor called");
   if (isThemeEditorOpen()) {
+    editor.debug("[theme_editor] already open, focusing");
     // Focus the existing theme editor split
     if (state.splitId !== null) {
       editor.focusSplit(state.splitId);
@@ -1651,12 +1671,15 @@ globalThis.open_theme_editor = async function(): Promise<void> {
     return;
   }
 
+  editor.debug("[theme_editor] saving context");
   // Save context
   state.sourceSplitId = editor.getActiveSplitId();
   state.sourceBufferId = editor.getActiveBufferId();
 
+  editor.debug("[theme_editor] loading builtin themes...");
   // Load available themes
   state.builtinThemes = await loadBuiltinThemes();
+  editor.debug(`[theme_editor] loaded ${state.builtinThemes.length} builtin themes`);
 
   // Get current theme name from config
   const config = editor.getConfig() as Record<string, unknown>;
@@ -1704,10 +1727,13 @@ globalThis.open_theme_editor = async function(): Promise<void> {
  * Actually open the theme editor with loaded theme data
  */
 async function doOpenThemeEditor(): Promise<void> {
+  editor.debug("[theme_editor] doOpenThemeEditor: building display entries");
   // Build initial entries
   const entries = buildDisplayEntries();
+  editor.debug(`[theme_editor] doOpenThemeEditor: built ${entries.length} entries`);
 
   // Create virtual buffer in current split (no new split)
+  editor.debug("[theme_editor] doOpenThemeEditor: calling createVirtualBuffer...");
   const bufferId = await editor.createVirtualBuffer({
     name: "*Theme Editor*",
     mode: "theme-editor",
@@ -1717,13 +1743,20 @@ async function doOpenThemeEditor(): Promise<void> {
     show_cursors: true,
     editing_disabled: true,
   });
+  editor.debug(`[theme_editor] doOpenThemeEditor: createVirtualBuffer returned bufferId=${bufferId}`);
+  editor.debug(`[theme_editor] doOpenThemeEditor: checking if bufferId !== null...`);
 
   if (bufferId !== null) {
+    editor.debug(`[theme_editor] doOpenThemeEditor: bufferId is not null, setting state...`);
     state.bufferId = bufferId;
     state.splitId = null;
 
+    editor.debug(`[theme_editor] doOpenThemeEditor: calling applyHighlighting...`);
     applyHighlighting();
+    editor.debug(`[theme_editor] doOpenThemeEditor: applyHighlighting completed`);
+    editor.debug(`[theme_editor] doOpenThemeEditor: calling setStatus...`);
     editor.setStatus(editor.t("status.ready"));
+    editor.debug(`[theme_editor] doOpenThemeEditor: completed successfully`);
   } else {
     editor.setStatus(editor.t("status.open_failed"));
   }
@@ -2037,12 +2070,11 @@ globalThis.onThemeDeletePromptConfirmed = async function(args: {
 // Command Registration
 // =============================================================================
 
-// Main command to open theme editor (always available)
+// Main command to open theme editor (always available - no context restriction)
 editor.registerCommand(
   "%cmd.edit_theme",
   "%cmd.edit_theme_desc",
-  "open_theme_editor",
-  "normal"
+  "open_theme_editor"
 );
 
 // Buffer-scoped commands - only visible when a buffer with mode "theme-editor" is focused
@@ -2065,5 +2097,4 @@ editor.registerCommand("%cmd.nav_prev", "%cmd.nav_prev_desc", "theme_editor_nav_
 // Plugin Initialization
 // =============================================================================
 
-editor.setStatus(editor.t("status.plugin_loaded"));
 editor.debug("Theme Editor plugin initialized - Use 'Edit Theme' command to open");

package/plugins/todo_highlighter.ts

@@ -203,5 +203,4 @@ editor.registerCommand(
 );
 
 // Initialization
-editor.setStatus(editor.t("status.loaded"));
 editor.debug("TODO Highlighter initialized with keywords: " + config.keywords.map(k => k.word).join(", "));

package/plugins/vi_mode.i18n.json

@@ -25,10 +25,12 @@
     "status.line_beyond_end": "Line %{line} beyond end of file, moved to end",
 
     "error.no_write_since_change": "No write since last change (use %{cmd} to override)",
+    "error.other_buffers_modified": "Other buffers have unsaved changes (use %{cmd} to save all and quit)",
+    "error.no_file_name": "No file name (use :w filename)",
     "error.not_valid_command": "Not a valid command: %{cmd}",
     "error.unknown_command": "Unknown command: %{cmd}",
     "error.command_no_bang": "Command does not accept !: %{cmd}",
-    "error.save_as_not_implemented": "Save as not implemented. Use :w to save current file.",
+    "error.save_as_not_implemented": "Save as not implemented. Use Ctrl+Shift+S or File menu.",
     "error.shell_not_supported": "Shell commands not supported (use terminal)",
     "error.buffer_not_found": "Buffer %{id} not found",
     "error.multiple_buffers_match": "Multiple buffers match \"%{pattern}\". Be more specific.",
@@ -144,10 +146,12 @@
     "status.line_beyond_end": "Radek %{line} za koncem souboru, presunuto na konec",
 
     "error.no_write_since_change": "Neulozeno od posledni zmeny (pouzijte %{cmd} pro vynuceni)",
+    "error.other_buffers_modified": "Jiné buffery mají neuložené změny (použijte %{cmd} pro uložení všech a ukončení)",
+    "error.no_file_name": "Žádný název souboru (použijte :w název_souboru)",
     "error.not_valid_command": "Neplatny prikaz: %{cmd}",
     "error.unknown_command": "Neznamy prikaz: %{cmd}",
     "error.command_no_bang": "Prikaz neprijima !: %{cmd}",
-    "error.save_as_not_implemented": "Ulozit jako neimplementovano. Pouzijte :w pro ulozeni.",
+    "error.save_as_not_implemented": "Uložit jako není implementováno. Použijte Ctrl+Shift+S nebo menu Soubor.",
     "error.shell_not_supported": "Shell prikazy nepodporovany (pouzijte terminal)",
     "error.buffer_not_found": "Buffer %{id} nenalezen",
     "error.multiple_buffers_match": "Vice bufferu odpovida \"%{pattern}\". Bud presnejsi.",
@@ -263,10 +267,12 @@
     "status.line_beyond_end": "Zeile %{line} ueber Dateiende hinaus, zum Ende bewegt",
 
     "error.no_write_since_change": "Nicht gespeichert seit letzter Aenderung (verwende %{cmd} zum Ueberschreiben)",
+    "error.other_buffers_modified": "Andere Puffer haben ungespeicherte Änderungen (verwenden Sie %{cmd} um alle zu speichern und zu beenden)",
+    "error.no_file_name": "Kein Dateiname (verwenden Sie :w Dateiname)",
     "error.not_valid_command": "Kein gueltiger Befehl: %{cmd}",
     "error.unknown_command": "Unbekannter Befehl: %{cmd}",
     "error.command_no_bang": "Befehl akzeptiert kein !: %{cmd}",
-    "error.save_as_not_implemented": "Speichern unter nicht implementiert. Verwende :w zum Speichern.",
+    "error.save_as_not_implemented": "Speichern unter nicht implementiert. Verwenden Sie Strg+Umschalt+S oder das Datei-Menü.",
     "error.shell_not_supported": "Shell-Befehle nicht unterstuetzt (verwende Terminal)",
     "error.buffer_not_found": "Buffer %{id} nicht gefunden",
     "error.multiple_buffers_match": "Mehrere Buffer passen zu \"%{pattern}\". Sei genauer.",
@@ -382,10 +388,12 @@
     "status.line_beyond_end": "Linea %{line} mas alla del final, movido al final",
 
     "error.no_write_since_change": "Sin guardar desde el ultimo cambio (usa %{cmd} para forzar)",
+    "error.other_buffers_modified": "Otros búferes tienen cambios sin guardar (use %{cmd} para guardar todos y salir)",
+    "error.no_file_name": "Sin nombre de archivo (use :w nombre_archivo)",
     "error.not_valid_command": "Comando no valido: %{cmd}",
     "error.unknown_command": "Comando desconocido: %{cmd}",
     "error.command_no_bang": "El comando no acepta !: %{cmd}",
-    "error.save_as_not_implemented": "Guardar como no implementado. Usa :w para guardar.",
+    "error.save_as_not_implemented": "Guardar como no implementado. Use Ctrl+Shift+S o el menú Archivo.",
     "error.shell_not_supported": "Comandos de shell no soportados (usa terminal)",
     "error.buffer_not_found": "Buffer %{id} no encontrado",
     "error.multiple_buffers_match": "Multiples buffers coinciden con \"%{pattern}\". Se mas especifico.",
@@ -501,10 +509,12 @@
     "status.line_beyond_end": "Ligne %{line} au-dela de la fin, deplace a la fin",
 
     "error.no_write_since_change": "Non enregistre depuis la derniere modification (utilisez %{cmd} pour forcer)",
+    "error.other_buffers_modified": "D'autres tampons ont des modifications non enregistrées (utilisez %{cmd} pour tout enregistrer et quitter)",
+    "error.no_file_name": "Pas de nom de fichier (utilisez :w nom_fichier)",
     "error.not_valid_command": "Commande non valide: %{cmd}",
     "error.unknown_command": "Commande inconnue: %{cmd}",
     "error.command_no_bang": "La commande n'accepte pas !: %{cmd}",
-    "error.save_as_not_implemented": "Enregistrer sous non implemente. Utilisez :w pour enregistrer.",
+    "error.save_as_not_implemented": "Enregistrer sous non implémenté. Utilisez Ctrl+Shift+S ou le menu Fichier.",
     "error.shell_not_supported": "Commandes shell non supportees (utilisez terminal)",
     "error.buffer_not_found": "Buffer %{id} non trouve",
     "error.multiple_buffers_match": "Plusieurs buffers correspondent a \"%{pattern}\". Soyez plus precis.",
@@ -620,10 +630,12 @@
     "status.line_beyond_end": "Riga %{line} oltre la fine del file, spostato alla fine",
 
     "error.no_write_since_change": "Non salvato dall'ultima modifica (usa %{cmd} per forzare)",
+    "error.other_buffers_modified": "Altri buffer hanno modifiche non salvate (usa %{cmd} per salvare tutto ed uscire)",
+    "error.no_file_name": "Nessun nome file (usa :w nome_file)",
     "error.not_valid_command": "Comando non valido: %{cmd}",
     "error.unknown_command": "Comando sconosciuto: %{cmd}",
     "error.command_no_bang": "Il comando non accetta !: %{cmd}",
-    "error.save_as_not_implemented": "Salva come non implementato. Usa :w per salvare il file corrente.",
+    "error.save_as_not_implemented": "Salva con nome non implementato. Usa Ctrl+Shift+S o il menu File.",
     "error.shell_not_supported": "Comandi shell non supportati (usa il terminale)",
     "error.buffer_not_found": "Buffer %{id} non trovato",
     "error.multiple_buffers_match": "Più buffer corrispondono a \"%{pattern}\". Sii più specifico.",
@@ -739,10 +751,12 @@
     "status.line_beyond_end": "%{line}行目はファイル末尾を超えています。末尾に移動しました",
 
     "error.no_write_since_change": "最後の変更以降保存されていません（%{cmd}で強制実行）",
+    "error.other_buffers_modified": "他のバッファに未保存の変更があります（%{cmd} で全て保存して終了）",
+    "error.no_file_name": "ファイル名がありません（:w ファイル名 を使用）",
     "error.not_valid_command": "無効なコマンド: %{cmd}",
     "error.unknown_command": "不明なコマンド: %{cmd}",
     "error.command_no_bang": "コマンドは!を受け付けません: %{cmd}",
-    "error.save_as_not_implemented": "名前を付けて保存は未実装です。:wで保存してください。",
+    "error.save_as_not_implemented": "名前を付けて保存は未実装です。Ctrl+Shift+S またはファイルメニューを使用してください。",
     "error.shell_not_supported": "シェルコマンドはサポートされていません（ターミナルを使用）",
     "error.buffer_not_found": "バッファ%{id}が見つかりません",
     "error.multiple_buffers_match": "複数のバッファが\"%{pattern}\"に一致します。より具体的に指定してください。",
@@ -858,10 +872,12 @@
     "status.line_beyond_end": "%{line}줄이 파일 끝을 넘어감, 끝으로 이동함",
 
     "error.no_write_since_change": "마지막 변경 후 저장 안 됨 (%{cmd}로 강제 실행)",
+    "error.other_buffers_modified": "다른 버퍼에 저장되지 않은 변경사항이 있습니다 (%{cmd}로 모두 저장하고 종료)",
+    "error.no_file_name": "파일 이름 없음 (:w 파일이름 사용)",
     "error.not_valid_command": "유효하지 않은 명령: %{cmd}",
     "error.unknown_command": "알 수 없는 명령: %{cmd}",
     "error.command_no_bang": "명령이 !를 지원하지 않음: %{cmd}",
-    "error.save_as_not_implemented": "다른 이름으로 저장 미구현. :w로 저장하세요.",
+    "error.save_as_not_implemented": "다른 이름으로 저장이 구현되지 않았습니다. Ctrl+Shift+S 또는 파일 메뉴를 사용하세요.",
     "error.shell_not_supported": "셸 명령 지원 안 됨 (터미널 사용)",
     "error.buffer_not_found": "버퍼 %{id} 찾을 수 없음",
     "error.multiple_buffers_match": "여러 버퍼가 \"%{pattern}\"와 일치. 더 구체적으로 지정하세요.",
@@ -977,10 +993,12 @@
     "status.line_beyond_end": "Linha %{line} alem do fim do arquivo, movido para o fim",
 
     "error.no_write_since_change": "Nao salvo desde a ultima alteracao (use %{cmd} para forcar)",
+    "error.other_buffers_modified": "Outros buffers têm alterações não salvas (use %{cmd} para salvar tudo e sair)",
+    "error.no_file_name": "Sem nome de arquivo (use :w nome_arquivo)",
     "error.not_valid_command": "Comando invalido: %{cmd}",
     "error.unknown_command": "Comando desconhecido: %{cmd}",
     "error.command_no_bang": "Comando nao aceita !: %{cmd}",
-    "error.save_as_not_implemented": "Salvar como nao implementado. Use :w para salvar.",
+    "error.save_as_not_implemented": "Salvar como não implementado. Use Ctrl+Shift+S ou o menu Arquivo.",
     "error.shell_not_supported": "Comandos shell nao suportados (use terminal)",
     "error.buffer_not_found": "Buffer %{id} nao encontrado",
     "error.multiple_buffers_match": "Multiplos buffers correspondem a \"%{pattern}\". Seja mais especifico.",
@@ -1096,10 +1114,12 @@
     "status.line_beyond_end": "Строка %{line} за концом файла, перемещено в конец",
 
     "error.no_write_since_change": "Не сохранено с последнего изменения (используйте %{cmd} для принудительного выполнения)",
+    "error.other_buffers_modified": "Другие буферы имеют несохранённые изменения (используйте %{cmd} чтобы сохранить всё и выйти)",
+    "error.no_file_name": "Нет имени файла (используйте :w имя_файла)",
     "error.not_valid_command": "Недопустимая команда: %{cmd}",
     "error.unknown_command": "Неизвестная команда: %{cmd}",
     "error.command_no_bang": "Команда не принимает !: %{cmd}",
-    "error.save_as_not_implemented": "Сохранить как не реализовано. Используйте :w для сохранения.",
+    "error.save_as_not_implemented": "Сохранить как не реализовано. Используйте Ctrl+Shift+S или меню Файл.",
     "error.shell_not_supported": "Shell команды не поддерживаются (используйте терминал)",
     "error.buffer_not_found": "Буфер %{id} не найден",
     "error.multiple_buffers_match": "Несколько буферов соответствуют \"%{pattern}\". Будьте точнее.",
@@ -1215,10 +1235,12 @@
     "status.line_beyond_end": "บรรทัด %{line} เกินจุดสิ้นสุดไฟล์ ย้ายไปยังจุดสิ้นสุด",
 
     "error.no_write_since_change": "ไม่ได้บันทึกตั้งแต่การเปลี่ยนแปลงล่าสุด (ใช้ %{cmd} เพื่อบังคับ)",
+    "error.other_buffers_modified": "บัฟเฟอร์อื่นมีการเปลี่ยนแปลงที่ไม่ได้บันทึก (ใช้ %{cmd} เพื่อบันทึกทั้งหมดและออก)",
+    "error.no_file_name": "ไม่มีชื่อไฟล์ (ใช้ :w ชื่อไฟล์)",
     "error.not_valid_command": "คำสั่งไม่ถูกต้อง: %{cmd}",
     "error.unknown_command": "คำสั่งไม่รู้จัก: %{cmd}",
     "error.command_no_bang": "คำสั่งไม่รับ !: %{cmd}",
-    "error.save_as_not_implemented": "บันทึกเป็นยังไม่ได้ใช้งาน ใช้ :w เพื่อบันทึก",
+    "error.save_as_not_implemented": "บันทึกเป็นยังไม่รองรับ ใช้ Ctrl+Shift+S หรือเมนูไฟล์",
     "error.shell_not_supported": "ไม่รองรับคำสั่ง Shell (ใช้เทอร์มินัล)",
     "error.buffer_not_found": "ไม่พบบัฟเฟอร์ %{id}",
     "error.multiple_buffers_match": "มีหลายบัฟเฟอร์ที่ตรงกับ \"%{pattern}\" โปรดระบุให้ชัดเจนขึ้น",
@@ -1334,10 +1356,12 @@
     "status.line_beyond_end": "Рядок %{line} за кінцем файлу, переміщено в кінець",
 
     "error.no_write_since_change": "Не збережено з останньої зміни (використовуйте %{cmd} для примусового виконання)",
+    "error.other_buffers_modified": "Інші буфери мають незбережені зміни (використайте %{cmd} щоб зберегти все і вийти)",
+    "error.no_file_name": "Немає назви файлу (використайте :w назва_файлу)",
     "error.not_valid_command": "Недійсна команда: %{cmd}",
     "error.unknown_command": "Невідома команда: %{cmd}",
     "error.command_no_bang": "Команда не приймає !: %{cmd}",
-    "error.save_as_not_implemented": "Зберегти як не реалізовано. Використовуйте :w для збереження.",
+    "error.save_as_not_implemented": "Зберегти як не реалізовано. Використайте Ctrl+Shift+S або меню Файл.",
     "error.shell_not_supported": "Shell команди не підтримуються (використовуйте термінал)",
     "error.buffer_not_found": "Буфер %{id} не знайдено",
     "error.multiple_buffers_match": "Декілька буферів відповідають \"%{pattern}\". Будьте точнішими.",
@@ -1453,10 +1477,12 @@
     "status.line_beyond_end": "第%{line}行超出文件末尾，已移动到末尾",
 
     "error.no_write_since_change": "上次更改后未保存（使用%{cmd}强制执行）",
+    "error.other_buffers_modified": "其他缓冲区有未保存的更改（使用 %{cmd} 保存全部并退出）",
+    "error.no_file_name": "没有文件名（使用 :w 文件名）",
     "error.not_valid_command": "无效命令: %{cmd}",
     "error.unknown_command": "未知命令: %{cmd}",
     "error.command_no_bang": "命令不接受!: %{cmd}",
-    "error.save_as_not_implemented": "另存为未实现。使用:w保存当前文件。",
+    "error.save_as_not_implemented": "另存为未实现。请使用 Ctrl+Shift+S 或文件菜单。",
     "error.shell_not_supported": "不支持Shell命令（请使用终端）",
     "error.buffer_not_found": "未找到缓冲区%{id}",
     "error.multiple_buffers_match": "多个缓冲区匹配\"%{pattern}\"。请更具体。",

package/plugins/vi_mode.ts

@@ -1561,11 +1561,18 @@ editor.defineMode("vi-normal", null, [
 
   // Command mode
   [":", "vi_command_mode"],
+
+  // Pass through to standard editor shortcuts
+  ["C-p", "command_palette"],
+  ["C-q", "quit"],
 ], true); // read_only = true to prevent character insertion
 
 // Define vi-insert mode - only Escape is special, other keys insert text
 editor.defineMode("vi-insert", null, [
   ["Escape", "vi_escape"],
+  // Pass through to standard editor shortcuts
+  ["C-p", "command_palette"],
+  ["C-q", "quit"],
 ], false); // read_only = false to allow normal typing
 
 // Define vi-find-char mode - binds all printable chars to the handler
@@ -1769,6 +1776,10 @@ editor.defineMode("vi-visual", null, [
   // Exit
   ["Escape", "vi_vis_escape"],
   ["v", "vi_vis_escape"], // v again exits visual mode
+
+  // Pass through to standard editor shortcuts
+  ["C-p", "command_palette"],
+  ["C-q", "quit"],
 ], true);
 
 // Define vi-visual-line mode (line-wise)
@@ -1803,6 +1814,10 @@ editor.defineMode("vi-visual-line", null, [
   // Exit
   ["Escape", "vi_vis_escape"],
   ["V", "vi_vis_escape"], // V again exits visual-line mode
+
+  // Pass through to standard editor shortcuts
+  ["C-p", "command_palette"],
+  ["C-q", "quit"],
 ], true);
 
 // Define vi-visual-block mode (column/block selection)
@@ -1841,6 +1856,10 @@ editor.defineMode("vi-visual-block", null, [
   // Exit
   ["Escape", "vi_vblock_escape"],
   ["C-v", "vi_vblock_escape"], // Ctrl-v again exits visual-block mode
+
+  // Pass through to standard editor shortcuts
+  ["C-p", "command_palette"],
+  ["C-q", "quit"],
 ], true);
 
 // ============================================================================
@@ -2177,31 +2196,62 @@ async function executeCommand(
   switch (command) {
     case "write": {
       // :w - save current file
-      // :w filename - save as filename (not implemented yet)
+      // :w filename - save to specified filename
       if (args) {
-        return { error: editor.t("error.save_as_not_implemented") };
+        const bufferId = editor.getActiveBufferId();
+        // Resolve path (could be relative or absolute)
+        const path = args.startsWith("/") ? args : `${editor.getCwd()}/${args}`;
+        editor.saveBufferToPath(bufferId, path);
+        return { message: editor.t("status.file_saved") };
       }
       editor.executeAction("save");
       return { message: editor.t("status.file_saved") };
     }
 
     case "quit": {
-      // :q - quit (close buffer)
-      // :q! - force quit (discard changes)
-      const bufferId = editor.getActiveBufferId();
-      if (!force && editor.isBufferModified(bufferId)) {
+      // :q - quit editor (like vim)
+      // :q! - force quit (discard unsaved changes)
+      if (force) {
+        editor.executeAction("force_quit");
+        return {};
+      }
+      // Check ALL buffers for unsaved changes
+      const buffers = editor.listBuffers() as Array<{ id: number; modified: boolean }>;
+      const hasModified = buffers.some((b) => b.modified);
+      if (hasModified) {
         return { error: editor.t("error.no_write_since_change", { cmd: ":q!" }) };
       }
-      editor.executeAction("close_buffer");
+      editor.executeAction("force_quit");
       return {};
     }
 
     case "wq":
     case "xit":
     case "exit": {
-      // :wq or :x - save and quit
-      editor.executeAction("save");
-      editor.executeAction("close_buffer");
+      // :wq or :x - save current buffer and quit
+      // :wq filename - save to filename and quit
+      const wqBufferId = editor.getActiveBufferId();
+
+      if (args) {
+        // Save to specified filename
+        const path = args.startsWith("/") ? args : `${editor.getCwd()}/${args}`;
+        editor.saveBufferToPath(wqBufferId, path);
+      } else {
+        // Save to existing path
+        const wqPath = editor.getBufferPath(wqBufferId);
+        if (!wqPath) {
+          return { error: editor.t("error.no_file_name") };
+        }
+        editor.executeAction("save");
+      }
+
+      // Check if any OTHER buffers have unsaved changes
+      const allBuffers = editor.listBuffers() as Array<{ id: number; modified: boolean }>;
+      const otherModified = allBuffers.some((b: { id: number; modified: boolean }) => b.id !== wqBufferId && b.modified);
+      if (otherModified) {
+        return { error: editor.t("error.other_buffers_modified", { cmd: ":wqa" }) };
+      }
+      editor.executeAction("force_quit");
       return {};
     }
 
@@ -2215,16 +2265,15 @@ async function executeCommand(
       // :qa - quit all
       // :qa! - force quit all
       if (force) {
-        editor.executeAction("quit_all");
+        editor.executeAction("force_quit");
       } else {
         // Check if any buffer is modified
-        const buffers = editor.listBuffers();
-        for (const buf of buffers) {
-          if (buf.modified) {
-            return { error: editor.t("error.no_write_since_change", { cmd: ":qa!" }) };
-          }
+        const allBufs = editor.listBuffers() as Array<{ id: number; modified: boolean }>;
+        const anyModified = allBufs.some((b) => b.modified);
+        if (anyModified) {
+          return { error: editor.t("error.no_write_since_change", { cmd: ":qa!" }) };
         }
-        editor.executeAction("quit_all");
+        editor.executeAction("force_quit");
       }
       return {};
     }
@@ -2232,7 +2281,7 @@ async function executeCommand(
     case "wqall": {
       // :wqa or :xa - save all and quit
       editor.executeAction("save_all");
-      editor.executeAction("quit_all");
+      editor.executeAction("force_quit");
       return {};
     }
 
@@ -2307,7 +2356,7 @@ async function executeCommand(
       if (!force && editor.isBufferModified(bufferId)) {
         return { error: editor.t("error.no_write_since_change", { cmd: ":bd!" }) };
       }
-      editor.executeAction("close_buffer");
+      editor.executeAction("close");
       return {};
     }
 
@@ -2421,7 +2470,7 @@ async function executeCommand(
       if (!force && editor.isBufferModified(bufferId)) {
         return { error: editor.t("error.no_write_since_change", { cmd: ":close!" }) };
       }
-      editor.executeAction("close_buffer");
+      editor.executeAction("close");
       return {};
     }
 
@@ -2442,7 +2491,7 @@ async function executeCommand(
       if (!force && editor.isBufferModified(bufferId)) {
         return { error: editor.t("error.no_write_since_change", { cmd: ":tabclose!" }) };
       }
-      editor.executeAction("close_buffer");
+      editor.executeAction("close");
       return {};
     }
 
@@ -2724,28 +2773,33 @@ editor.on("prompt_confirmed", "vi_command_handler");
 let viModeEnabled = false;
 
 globalThis.vi_mode_toggle = function (): void {
+  editor.debug("[vi_mode_toggle] called, viModeEnabled was: " + viModeEnabled);
   viModeEnabled = !viModeEnabled;
+  editor.debug("[vi_mode_toggle] viModeEnabled now: " + viModeEnabled);
 
   if (viModeEnabled) {
+    editor.debug("[vi_mode_toggle] enabling vi mode, calling switchMode('normal')");
     switchMode("normal");
+    editor.debug("[vi_mode_toggle] switchMode done, setting status");
     editor.setStatus(editor.t("status.enabled"));
   } else {
+    editor.debug("[vi_mode_toggle] disabling vi mode");
     editor.setEditorMode(null);
     state.mode = "normal";
     state.pendingOperator = null;
     editor.setStatus(editor.t("status.disabled"));
   }
+  editor.debug("[vi_mode_toggle] done");
 };
 
 editor.registerCommand(
   "%cmd.toggle_vi_mode",
   "%cmd.toggle_vi_mode_desc",
   "vi_mode_toggle",
-  "normal",
+  null,  // Always visible - needed to enable vi mode in the first place
 );
 
 // ============================================================================
 // Initialization
 // ============================================================================
 
-editor.setStatus(editor.t("status.loaded"));