@fresh-editor/fresh-editor 0.2.12 → 0.2.13

package/plugins/merge_conflict.ts

@@ -1164,7 +1164,7 @@ function computeResultConflictOffset(conflictIndex: number): number {
 /**
  * Start merge conflict resolution for current buffer
  */
-globalThis.start_merge_conflict = async function(): Promise<void> {
+async function start_merge_conflict() : Promise<void> {
   if (mergeState.isActive) {
     editor.setStatus(editor.t("status.already_active"));
     return;
@@ -1304,7 +1304,8 @@ globalThis.start_merge_conflict = async function(): Promise<void> {
   } else {
     editor.setStatus(editor.t("status.all_auto_resolved", { total: String(mergeState.conflicts.length) }));
   }
-};
+}
+registerHandler("start_merge_conflict", start_merge_conflict);
 
 /**
  * Create the multi-panel merge UI (JetBrains-style: OURS | RESULT | THEIRS)
@@ -1393,7 +1394,7 @@ async function createMergePanels(): Promise<void> {
 // Public Commands - Navigation
 // =============================================================================
 
-globalThis.merge_next_conflict = function(): void {
+function merge_next_conflict() : void {
   editor.debug(`merge_next_conflict called, isActive=${mergeState.isActive}, conflicts=${mergeState.conflicts.length}`);
 
   if (!mergeState.isActive) {
@@ -1432,9 +1433,10 @@ globalThis.merge_next_conflict = function(): void {
   editor.setStatus(editor.t("status.conflict_all_resolved", { current: String(mergeState.selectedIndex + 1), total: String(mergeState.conflicts.length) }));
   updateViews();
   scrollToSelectedConflict();
-};
+}
+registerHandler("merge_next_conflict", merge_next_conflict);
 
-globalThis.merge_prev_conflict = function(): void {
+function merge_prev_conflict() : void {
   editor.debug(`merge_prev_conflict called, isActive=${mergeState.isActive}, conflicts=${mergeState.conflicts.length}`);
 
   if (!mergeState.isActive) {
@@ -1473,13 +1475,14 @@ globalThis.merge_prev_conflict = function(): void {
   editor.setStatus(editor.t("status.conflict_all_resolved", { current: String(mergeState.selectedIndex + 1), total: String(mergeState.conflicts.length) }));
   updateViews();
   scrollToSelectedConflict();
-};
+}
+registerHandler("merge_prev_conflict", merge_prev_conflict);
 
 // =============================================================================
 // Public Commands - Resolution
 // =============================================================================
 
-globalThis.merge_use_ours = function(): void {
+function merge_use_ours() : void {
   if (!mergeState.isActive) {
     editor.setStatus(editor.t("status.no_active_merge"));
     return;
@@ -1497,9 +1500,10 @@ globalThis.merge_use_ours = function(): void {
   // Move to next unresolved conflict
   moveToNextUnresolved();
   updateViews();
-};
+}
+registerHandler("merge_use_ours", merge_use_ours);
 
-globalThis.merge_take_theirs = function(): void {
+function merge_take_theirs() : void {
   if (!mergeState.isActive) {
     editor.setStatus(editor.t("status.no_active_merge"));
     return;
@@ -1517,9 +1521,10 @@ globalThis.merge_take_theirs = function(): void {
   // Move to next unresolved conflict
   moveToNextUnresolved();
   updateViews();
-};
+}
+registerHandler("merge_take_theirs", merge_take_theirs);
 
-globalThis.merge_use_both = function(): void {
+function merge_use_both() : void {
   if (!mergeState.isActive) {
     editor.setStatus(editor.t("status.no_active_merge"));
     return;
@@ -1537,7 +1542,8 @@ globalThis.merge_use_both = function(): void {
   // Move to next unresolved conflict
   moveToNextUnresolved();
   updateViews();
-};
+}
+registerHandler("merge_use_both", merge_use_both);
 
 /**
  * Move selection to the next unresolved conflict
@@ -1561,7 +1567,7 @@ function moveToNextUnresolved(): void {
 // Public Commands - Completion
 // =============================================================================
 
-globalThis.merge_save_and_exit = async function(): Promise<void> {
+async function merge_save_and_exit() : Promise<void> {
   if (!mergeState.isActive) {
     editor.setStatus(editor.t("status.no_active_merge"));
     return;
@@ -1609,9 +1615,10 @@ globalThis.merge_save_and_exit = async function(): Promise<void> {
   closeMergePanels();
 
   editor.setStatus(editor.t("status.complete"));
-};
+}
+registerHandler("merge_save_and_exit", merge_save_and_exit);
 
-globalThis.merge_abort = function(): void {
+function merge_abort() : void {
   if (!mergeState.isActive) {
     editor.setStatus(editor.t("status.nothing_to_abort"));
     return;
@@ -1623,7 +1630,8 @@ globalThis.merge_abort = function(): void {
   closeMergePanels();
 
   editor.setStatus(editor.t("status.aborted"));
-};
+}
+registerHandler("merge_abort", merge_abort);
 
 /**
  * Close all merge panels and reset state
@@ -1682,9 +1690,10 @@ function closeMergePanels(): void {
 // Public Commands - Help
 // =============================================================================
 
-globalThis.merge_show_help = function(): void {
+function merge_show_help() : void {
   editor.setStatus(editor.t("status.help"));
-};
+}
+registerHandler("merge_show_help", merge_show_help);
 
 // =============================================================================
 // Hook Handlers - Auto-Detection
@@ -1693,7 +1702,7 @@ globalThis.merge_show_help = function(): void {
 /**
  * Handle buffer activation - check for conflict markers
  */
-globalThis.onMergeBufferActivated = async function(data: { buffer_id: number }): Promise<void> {
+async function onMergeBufferActivated(data: { buffer_id: number }) : Promise<void> {
   // Don't trigger if already in merge mode
   if (mergeState.isActive) return;
 
@@ -1717,12 +1726,13 @@ globalThis.onMergeBufferActivated = async function(data: { buffer_id: number }):
   } catch (e) {
     // Not in git repo or other error, ignore
   }
-};
+}
+registerHandler("onMergeBufferActivated", onMergeBufferActivated);
 
 /**
  * Handle file open - check for conflict markers
  */
-globalThis.onMergeAfterFileOpen = async function(data: { buffer_id: number; path: string }): Promise<void> {
+async function onMergeAfterFileOpen(data: { buffer_id: number; path: string }) : Promise<void> {
   // Don't trigger if already in merge mode
   if (mergeState.isActive) return;
 
@@ -1742,7 +1752,8 @@ globalThis.onMergeAfterFileOpen = async function(data: { buffer_id: number; path
   } catch (e) {
     // Not in git repo or other error, ignore
   }
-};
+}
+registerHandler("onMergeAfterFileOpen", onMergeAfterFileOpen);
 
 // =============================================================================
 // Hook Registration

package/plugins/odin-lsp.ts

@@ -44,7 +44,7 @@ let odinLspError: { serverCommand: string; message: string } | null = null;
 /**
  * Handle LSP server errors for Odin
  */
-globalThis.on_odin_lsp_server_error = function (data: LspServerErrorData): void {
+function on_odin_lsp_server_error(data: LspServerErrorData) : void {
   // Only handle Odin language errors
   if (data.language !== "odin") {
     return;
@@ -66,7 +66,8 @@ globalThis.on_odin_lsp_server_error = function (data: LspServerErrorData): void
   } else {
     editor.setStatus(`Odin LSP error: ${data.message}`);
   }
-};
+}
+registerHandler("on_odin_lsp_server_error", on_odin_lsp_server_error);
 
 // Register hook for LSP server errors
 editor.on("lsp_server_error", "on_odin_lsp_server_error");
@@ -74,7 +75,7 @@ editor.on("lsp_server_error", "on_odin_lsp_server_error");
 /**
  * Handle status bar click when there's an Odin LSP error
  */
-globalThis.on_odin_lsp_status_clicked = function (
+function on_odin_lsp_status_clicked(
   data: LspStatusClickedData
 ): void {
   // Only handle Odin language clicks when there's an error
@@ -94,7 +95,8 @@ globalThis.on_odin_lsp_status_clicked = function (
       { id: "dismiss", label: "Dismiss (ESC)" },
     ],
   });
-};
+}
+registerHandler("on_odin_lsp_status_clicked", on_odin_lsp_status_clicked);
 
 // Register hook for status bar clicks
 editor.on("lsp_status_clicked", "on_odin_lsp_status_clicked");
@@ -102,7 +104,7 @@ editor.on("lsp_status_clicked", "on_odin_lsp_status_clicked");
 /**
  * Handle action popup results for Odin LSP help
  */
-globalThis.on_odin_lsp_action_result = function (
+function on_odin_lsp_action_result(
   data: ActionPopupResultData
 ): void {
   // Only handle our popup
@@ -127,7 +129,8 @@ globalThis.on_odin_lsp_action_result = function (
     default:
       editor.debug(`odin-lsp: Unknown action: ${data.action_id}`);
   }
-};
+}
+registerHandler("on_odin_lsp_action_result", on_odin_lsp_action_result);
 
 // Register hook for action popup results
 editor.on("action_popup_result", "on_odin_lsp_action_result");

package/plugins/path_complete.ts

@@ -148,7 +148,7 @@ function generateCompletions(input: string): PromptSuggestion[] {
 }
 
 // Handle prompt changes for file prompts
-globalThis.onPathCompletePromptChanged = function (args: { prompt_type: string; input: string }): boolean {
+function onPathCompletePromptChanged(args: { prompt_type: string; input: string }) : boolean {
   if (args.prompt_type !== "open-file" && args.prompt_type !== "save-file-as") {
     return true; // Not our prompt
   }
@@ -157,7 +157,8 @@ globalThis.onPathCompletePromptChanged = function (args: { prompt_type: string;
   editor.setPromptSuggestions(suggestions);
 
   return true;
-};
+}
+registerHandler("onPathCompletePromptChanged", onPathCompletePromptChanged);
 
 // Register event handler
 editor.on("prompt_changed", "onPathCompletePromptChanged");

package/plugins/pkg.ts

@@ -584,7 +584,7 @@ function getInstalledPackages(type: "plugin" | "theme" | "language" | "bundle"):
           type,
           source,
           version: manifest?.version || "unknown",
-          manifest,
+          manifest: manifest ?? undefined,
           localSource,
         });
       }
@@ -1188,7 +1188,7 @@ async function loadLanguagePack(packageDir: string, manifest: PackageManifest):
   }
 
   // Apply changes
-  editor.reloadGrammars();
+  await editor.reloadGrammars();
 }
 
 /**
@@ -1271,7 +1271,7 @@ async function loadBundle(packageDir: string, manifest: PackageManifest): Promis
   }
 
   // Apply grammar changes
-  editor.reloadGrammars();
+  await editor.reloadGrammars();
   editor.debug(`[pkg] Bundle loaded: ${bundleName}`);
 }
 
@@ -2559,7 +2559,7 @@ function getCurrentFocusIndex(): number {
 }
 
 // Navigation commands
-globalThis.pkg_nav_up = function(): void {
+function pkg_nav_up() : void {
   if (!pkgState.isOpen) return;
 
   const items = getFilteredItems();
@@ -2569,9 +2569,10 @@ globalThis.pkg_nav_up = function(): void {
   pkgState.selectedIndex = Math.max(0, pkgState.selectedIndex - 1);
   pkgState.focus = { type: "list" };
   updatePkgManagerView();
-};
+}
+registerHandler("pkg_nav_up", pkg_nav_up);
 
-globalThis.pkg_nav_down = function(): void {
+function pkg_nav_down() : void {
   if (!pkgState.isOpen) return;
 
   const items = getFilteredItems();
@@ -2581,9 +2582,10 @@ globalThis.pkg_nav_down = function(): void {
   pkgState.selectedIndex = Math.min(items.length - 1, pkgState.selectedIndex + 1);
   pkgState.focus = { type: "list" };
   updatePkgManagerView();
-};
+}
+registerHandler("pkg_nav_down", pkg_nav_down);
 
-globalThis.pkg_next_button = function(): void {
+function pkg_next_button() : void {
   if (!pkgState.isOpen) return;
 
   const order = getFocusOrder();
@@ -2591,9 +2593,10 @@ globalThis.pkg_next_button = function(): void {
   const nextIdx = (currentIdx + 1) % order.length;
   pkgState.focus = order[nextIdx];
   updatePkgManagerView();
-};
+}
+registerHandler("pkg_next_button", pkg_next_button);
 
-globalThis.pkg_prev_button = function(): void {
+function pkg_prev_button() : void {
   if (!pkgState.isOpen) return;
 
   const order = getFocusOrder();
@@ -2601,9 +2604,10 @@ globalThis.pkg_prev_button = function(): void {
   const prevIdx = (currentIdx - 1 + order.length) % order.length;
   pkgState.focus = order[prevIdx];
   updatePkgManagerView();
-};
+}
+registerHandler("pkg_prev_button", pkg_prev_button);
 
-globalThis.pkg_activate = async function(): Promise<void> {
+async function pkg_activate() : Promise<void> {
   if (!pkgState.isOpen) return;
 
   const focus = pkgState.focus;
@@ -2628,7 +2632,7 @@ globalThis.pkg_activate = async function(): Promise<void> {
 
   // Handle search button - open search prompt with current query
   if (focus.type === "search") {
-    globalThis.pkg_search();
+    pkg_search();
     return;
   }
 
@@ -2679,9 +2683,10 @@ globalThis.pkg_activate = async function(): Promise<void> {
       updatePkgManagerView();
     }
   }
-};
+}
+registerHandler("pkg_activate", pkg_activate);
 
-globalThis.pkg_back_or_close = function(): void {
+function pkg_back_or_close() : void {
   if (!pkgState.isOpen) return;
 
   // If focus is on action buttons, go back to list
@@ -2693,19 +2698,22 @@ globalThis.pkg_back_or_close = function(): void {
 
   // Otherwise close
   closePackageManager();
-};
+}
+registerHandler("pkg_back_or_close", pkg_back_or_close);
 
-globalThis.pkg_scroll_up = function(): void {
+function pkg_scroll_up() : void {
   // Just move cursor up in detail view
   editor.executeAction("move_up");
-};
+}
+registerHandler("pkg_scroll_up", pkg_scroll_up);
 
-globalThis.pkg_scroll_down = function(): void {
+function pkg_scroll_down() : void {
   // Just move cursor down in detail view
   editor.executeAction("move_down");
-};
+}
+registerHandler("pkg_scroll_down", pkg_scroll_down);
 
-globalThis.pkg_search = function(): void {
+function pkg_search() : void {
   if (!pkgState.isOpen) return;
 
   // Pre-fill with current search query so typing replaces it
@@ -2714,9 +2722,10 @@ globalThis.pkg_search = function(): void {
   } else {
     editor.startPrompt("Search packages: ", "pkg-search");
   }
-};
+}
+registerHandler("pkg_search", pkg_search);
 
-globalThis.onPkgSearchConfirmed = function(args: {
+function onPkgSearchConfirmed(args: {
   prompt_type: string;
   selected_index: number | null;
   input: string;
@@ -2729,7 +2738,8 @@ globalThis.onPkgSearchConfirmed = function(args: {
   updatePkgManagerView();
 
   return true;
-};
+}
+registerHandler("onPkgSearchConfirmed", onPkgSearchConfirmed);
 
 editor.on("prompt_confirmed", "onPkgSearchConfirmed");
 
@@ -2755,7 +2765,7 @@ const registryFinder = new Finder<[string, RegistryEntry]>(editor, {
 /**
  * Browse and install plugins from registry
  */
-globalThis.pkg_install_plugin = async function(): Promise<void> {
+async function pkg_install_plugin() : Promise<void> {
   editor.debug("[pkg] pkg_install_plugin called");
   try {
     // Always sync registry to ensure latest plugins are available
@@ -2785,12 +2795,13 @@ globalThis.pkg_install_plugin = async function(): Promise<void> {
     editor.debug(`[pkg] Error in pkg_install_plugin: ${e}`);
     editor.setStatus(`Error: ${e}`);
   }
-};
+}
+registerHandler("pkg_install_plugin", pkg_install_plugin);
 
 /**
  * Browse and install themes from registry
  */
-globalThis.pkg_install_theme = async function(): Promise<void> {
+async function pkg_install_theme() : Promise<void> {
   editor.debug("[pkg] pkg_install_theme called");
   try {
     // Always sync registry to ensure latest themes are available
@@ -2816,16 +2827,18 @@ globalThis.pkg_install_theme = async function(): Promise<void> {
     editor.debug(`[pkg] Error in pkg_install_theme: ${e}`);
     editor.setStatus(`Error: ${e}`);
   }
-};
+}
+registerHandler("pkg_install_theme", pkg_install_theme);
 
 /**
  * Install from git URL or local path
  */
-globalThis.pkg_install_url = function(): void {
+function pkg_install_url() : void {
   editor.startPrompt("Git URL or local path:", "pkg-install-url");
-};
+}
+registerHandler("pkg_install_url", pkg_install_url);
 
-globalThis.onPkgInstallUrlConfirmed = async function(args: {
+async function onPkgInstallUrlConfirmed(args: {
   prompt_type: string;
   selected_index: number | null;
   input: string;
@@ -2840,28 +2853,31 @@ globalThis.onPkgInstallUrlConfirmed = async function(args: {
   }
 
   return true;
-};
+}
+registerHandler("onPkgInstallUrlConfirmed", onPkgInstallUrlConfirmed);
 
 editor.on("prompt_confirmed", "onPkgInstallUrlConfirmed");
 
 /**
  * Open the package manager UI
  */
-globalThis.pkg_list = async function(): Promise<void> {
+async function pkg_list() : Promise<void> {
   await openPackageManager();
-};
+}
+registerHandler("pkg_list", pkg_list);
 
 /**
  * Update all packages
  */
-globalThis.pkg_update_all = async function(): Promise<void> {
+async function pkg_update_all() : Promise<void> {
   await updateAllPackages();
-};
+}
+registerHandler("pkg_update_all", pkg_update_all);
 
 /**
  * Update a specific package
  */
-globalThis.pkg_update = function(): void {
+function pkg_update() : void {
   const plugins = getInstalledPackages("plugin");
   const themes = getInstalledPackages("theme");
   const all = [...plugins, ...themes];
@@ -2895,12 +2911,13 @@ globalThis.pkg_update = function(): void {
       load: async () => all
     }
   });
-};
+}
+registerHandler("pkg_update", pkg_update);
 
 /**
  * Remove a package
  */
-globalThis.pkg_remove = function(): void {
+function pkg_remove() : void {
   const plugins = getInstalledPackages("plugin");
   const themes = getInstalledPackages("theme");
   const all = [...plugins, ...themes];
@@ -2930,19 +2947,21 @@ globalThis.pkg_remove = function(): void {
       load: async () => all
     }
   });
-};
+}
+registerHandler("pkg_remove", pkg_remove);
 
 /**
  * Sync registry
  */
-globalThis.pkg_sync = async function(): Promise<void> {
+async function pkg_sync() : Promise<void> {
   await syncRegistry();
-};
+}
+registerHandler("pkg_sync", pkg_sync);
 
 /**
  * Show outdated packages
  */
-globalThis.pkg_outdated = async function(): Promise<void> {
+async function pkg_outdated() : Promise<void> {
   const plugins = getInstalledPackages("plugin");
   const themes = getInstalledPackages("theme");
   const all = [...plugins, ...themes];
@@ -2996,21 +3015,24 @@ globalThis.pkg_outdated = async function(): Promise<void> {
       load: async () => outdated
     }
   });
-};
+}
+registerHandler("pkg_outdated", pkg_outdated);
 
 /**
  * Generate lockfile
  */
-globalThis.pkg_lock = async function(): Promise<void> {
+async function pkg_lock() : Promise<void> {
   await generateLockfile();
-};
+}
+registerHandler("pkg_lock", pkg_lock);
 
 /**
  * Install from lockfile
  */
-globalThis.pkg_install_lock = async function(): Promise<void> {
+async function pkg_install_lock() : Promise<void> {
   await installFromLockfile();
-};
+}
+registerHandler("pkg_install_lock", pkg_install_lock);
 
 // =============================================================================
 // Command Registration

package/plugins/python-lsp.ts

@@ -49,7 +49,7 @@ let pythonLspError: { serverCommand: string; message: string } | null = null;
 /**
  * Handle LSP server errors for Python
  */
-globalThis.on_python_lsp_server_error = function (
+function on_python_lsp_server_error(
   data: LspServerErrorData
 ): void {
   // Only handle Python language errors
@@ -75,7 +75,8 @@ globalThis.on_python_lsp_server_error = function (
   } else {
     editor.setStatus(`Python LSP error: ${data.message}`);
   }
-};
+}
+registerHandler("on_python_lsp_server_error", on_python_lsp_server_error);
 
 // Register hook for LSP server errors
 editor.on("lsp_server_error", "on_python_lsp_server_error");
@@ -83,7 +84,7 @@ editor.on("lsp_server_error", "on_python_lsp_server_error");
 /**
  * Handle status bar click when there's a Python LSP error
  */
-globalThis.on_python_lsp_status_clicked = function (
+function on_python_lsp_status_clicked(
   data: LspStatusClickedData
 ): void {
   // Only handle Python language clicks when there's an error
@@ -106,7 +107,8 @@ globalThis.on_python_lsp_status_clicked = function (
       { id: "dismiss", label: "Dismiss (ESC)" },
     ],
   });
-};
+}
+registerHandler("on_python_lsp_status_clicked", on_python_lsp_status_clicked);
 
 // Register hook for status bar clicks
 editor.on("lsp_status_clicked", "on_python_lsp_status_clicked");
@@ -114,7 +116,7 @@ editor.on("lsp_status_clicked", "on_python_lsp_status_clicked");
 /**
  * Handle action popup results for Python LSP help
  */
-globalThis.on_python_lsp_action_result = function (
+function on_python_lsp_action_result(
   data: ActionPopupResultData
 ): void {
   // Only handle our popup
@@ -154,7 +156,8 @@ globalThis.on_python_lsp_action_result = function (
     default:
       editor.debug(`python-lsp: Unknown action: ${data.action_id}`);
   }
-};
+}
+registerHandler("on_python_lsp_action_result", on_python_lsp_action_result);
 
 // Register hook for action popup results
 editor.on("action_popup_result", "on_python_lsp_action_result");