@fresh-editor/fresh-editor 0.2.12 → 0.2.13

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # Release Notes
 
+## 0.2.13
+
+### Features
+
+* **Inline Diagnostics**: Diagnostic text displayed at end of lines, right-aligned, with version-aware staleness dropping. Disabled by default — enable "diagnostics inline text" in the Settings UI (#1175).
+
+* **Hanging Line Wrap**: Wrapped continuation lines preserve the indentation of their parent logical line (#1169).
+
+* **Theme Editor Redesign**: Virtual scrolling, mouse support, flicker-free inline styling. New "Inspect Theme at Cursor" command and Ctrl+Right-Click theme info popup.
+
+* **Open File Jump**: `path:line[:col]` syntax in Open File prompt and Quick Open (#1081, #1149).
+
+### Improvements
+
+* **Plugin API**: `registerHandler()` replacing `globalThis` pattern, `restartLspForLanguage`, process-limits for `registerLspServer`, async `reloadGrammars()`. Strict TypeScript across all plugins.
+
+* **Load Plugin from Buffer**: Run and hot-reload plugins directly from an open buffer, with LSP support for plugin dev buffers.
+
+* **Status Bar Toggle**: Command palette command and config option to show/hide the status bar.
+
+* **LSP Environment Variables**: Pass environment variables to LSP server binaries via config (#1159).
+
+* **LSP Language ID Overrides**: Configurable `language_id_overrides` in LSP server config.
+
+* **Rust LSP Mode Switching**: Command palette action to switch between Full and Reduced Memory modes for rust-analyzer.
+
+* **Signature Help Rendering**: Markdown rendering for signature help popups with hanging indent and paragraph spacing.
+
+* **Non-Blocking Grammar Builds**: `SyntaxSet::build()` moved to a background thread. Buffered input events drained before render for CPU-constrained responsiveness.
+
+* Disabled LSP start/restart commands for languages without LSP config (#1168).
+
+### Bug Fixes
+
+* **LSP Bracket Paths**: Fixed LSP failing for file paths containing `[` or `]` (#953).
+
+* **Search F3 Navigation**: Fixed F3 losing matches after viewport scroll (#1155).
+
+* **Settings JSON Copy**: Fixed Ctrl+C not working in settings JSON editor (#1159).
+
+* **Line Numbers on New Files**: Fixed line numbers showing when disabled in settings for newly opened files (#1181).
+
+* **Client/Server Paste**: Fixed bracketed paste mode and terminal feature parity in client/server sessions (#1168).
+
+* **Popup Selection**: Fixed popup text selection copying wrong text when lines wrap (#1170).
+
+* **Suggestions Popup Border**: Fixed bottom border overwritten by status bar (#1174).
+
+* **TSX/JSX Language ID**: Fixed wrong `languageId` sent to LSP for TSX/JSX files (#1174).
+
+* **LSP Error Suppression**: Suppress ContentModified/ServerCancelled errors per LSP spec instead of logging as errors.
+
+* **Semantic Tokens**: Skip degraded semantic token responses to preserve syntax highlighting.
+
+* **Theme Save**: Fixed save failing when themes directory doesn't exist (#1180). Fixed saving incomplete theme files.
+
+* **LSP Completion**: Fixed completion debounce, cleanup-on-disable, and popup positioning issues.
+
+---
+
 ## 0.2.12
 
 ### Features

package/README.md

@@ -67,6 +67,7 @@ Or, pick your preferred method:
 | Debian/Ubuntu | [.deb](#debianubuntu-deb) |
 | Fedora/RHEL | [.rpm](#fedorarhelopensuse-rpm), [Terra](https://terra.fyralabs.com/) |
 | FreeBSD | [ports / pkg](https://www.freshports.org/editors/fresh) |
+| Gentoo | [GURU](#gentoo-guru) |
 | Linux (any distro) | [AppImage](#appimage), [Flatpak](#flatpak) |
 | All platforms | [Pre-built binaries](#pre-built-binaries) |
 | npm | [npm / npx](#npm) |
@@ -142,6 +143,15 @@ curl -sL $(curl -s https://api.github.com/repos/sinelaw/fresh/releases/latest |
 
 Or download the `.rpm` file manually from the [releases page](https://github.com/sinelaw/fresh/releases).
 
+### Gentoo ([GURU](https://wiki.gentoo.org/wiki/Project:GURU))
+
+Enable the repository as read in [Project:GURU/Information for End Users](https://wiki.gentoo.org/wiki/Project:GURU/Information_for_End_Users) then emerge the package:
+
+
+```bash
+emerge --ask app-editors/fresh
+```
+
 ### AppImage
 
 Download the `.AppImage` file from the [releases page](https://github.com/sinelaw/fresh/releases) and run:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fresh-editor/fresh-editor",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "A modern terminal-based text editor with plugin support",
   "repository": {
     "type": "git",

package/plugins/audit_mode.ts

@@ -589,7 +589,7 @@ async function refreshReviewData() {
 
 // --- Actions ---
 
-globalThis.review_stage_hunk = async () => {
+async function review_stage_hunk() {
     const props = editor.getTextPropertiesAtCursor(editor.getActiveBufferId());
     if (props.length > 0 && props[0].hunkId) {
         const id = props[0].hunkId as string;
@@ -598,9 +598,10 @@ globalThis.review_stage_hunk = async () => {
         if (h) h.status = 'staged';
         await updateReviewUI();
     }
-};
+}
+registerHandler("review_stage_hunk", review_stage_hunk);
 
-globalThis.review_discard_hunk = async () => {
+async function review_discard_hunk() {
     const props = editor.getTextPropertiesAtCursor(editor.getActiveBufferId());
     if (props.length > 0 && props[0].hunkId) {
         const id = props[0].hunkId as string;
@@ -609,9 +610,10 @@ globalThis.review_discard_hunk = async () => {
         if (h) h.status = 'discarded';
         await updateReviewUI();
     }
-};
+}
+registerHandler("review_discard_hunk", review_discard_hunk);
 
-globalThis.review_undo_action = async () => {
+async function review_undo_action() {
     const props = editor.getTextPropertiesAtCursor(editor.getActiveBufferId());
     if (props.length > 0 && props[0].hunkId) {
         const id = props[0].hunkId as string;
@@ -620,25 +622,29 @@ globalThis.review_undo_action = async () => {
         if (h) h.status = 'pending';
         await updateReviewUI();
     }
-};
+}
+registerHandler("review_undo_action", review_undo_action);
 
-globalThis.review_next_hunk = () => {
+function review_next_hunk() {
     const bid = editor.getActiveBufferId();
     const props = editor.getTextPropertiesAtCursor(bid);
     let cur = -1;
     if (props.length > 0 && props[0].index !== undefined) cur = props[0].index as number;
     if (cur + 1 < state.hunks.length) editor.setBufferCursor(bid, state.hunks[cur + 1].byteOffset);
-};
+}
+registerHandler("review_next_hunk", review_next_hunk);
 
-globalThis.review_prev_hunk = () => {
+function review_prev_hunk() {
     const bid = editor.getActiveBufferId();
     const props = editor.getTextPropertiesAtCursor(bid);
     let cur = state.hunks.length;
     if (props.length > 0 && props[0].index !== undefined) cur = props[0].index as number;
     if (cur - 1 >= 0) editor.setBufferCursor(bid, state.hunks[cur - 1].byteOffset);
-};
+}
+registerHandler("review_prev_hunk", review_prev_hunk);
 
-globalThis.review_refresh = () => { refreshReviewData(); };
+function review_refresh() { refreshReviewData(); }
+registerHandler("review_refresh", review_refresh);
 
 let activeDiffViewState: { lSplit: number, rSplit: number } | null = null;
 
@@ -659,7 +665,7 @@ function findLineForByte(lineByteOffsets: number[], topByte: number): number {
     return low;
 }
 
-globalThis.on_viewport_changed = (data: any) => {
+function on_viewport_changed(data: any) {
     // This handler is now a no-op - scroll sync is handled by the core
     // using the anchor-based ScrollSyncGroup system.
     // Keeping the handler for backward compatibility if core sync fails.
@@ -681,7 +687,8 @@ globalThis.on_viewport_changed = (data: any) => {
         const targetByte = oldLineByteOffsets[Math.min(lineNum, oldLineByteOffsets.length - 1)];
         (editor as any).setSplitScroll(oldSplitId, targetByte);
     }
-};
+}
+registerHandler("on_viewport_changed", on_viewport_changed);
 
 /**
  * Represents an aligned line pair for side-by-side diff display
@@ -1017,7 +1024,7 @@ interface CompositeDiffState {
 
 let activeCompositeDiffState: CompositeDiffState | null = null;
 
-globalThis.review_drill_down = async () => {
+async function review_drill_down() {
     const bid = editor.getActiveBufferId();
     const props = editor.getTextPropertiesAtCursor(bid);
     if (props.length > 0 && props[0].hunkId) {
@@ -1048,10 +1055,8 @@ globalThis.review_drill_down = async () => {
         const oldContent = gitShow.stdout;
 
         // Read new file content (use absolute path for readFile)
-        let newContent: string;
-        try {
-            newContent = await editor.readFile(absoluteFilePath);
-        } catch (e) {
+        const newContent = await editor.readFile(absoluteFilePath);
+        if (newContent === null) {
             editor.setStatus(editor.t("status.failed_new_version"));
             return;
         }
@@ -1185,7 +1190,8 @@ globalThis.review_drill_down = async () => {
 
         editor.setStatus(editor.t("status.diff_summary", { added: String(addedCount), removed: String(removedCount), modified: String(modifiedCount) }));
     }
-};
+}
+registerHandler("review_drill_down", review_drill_down);
 
 // Define the diff-view mode - inherits from "normal" for all standard navigation/selection/copy
 // Only adds diff-specific keybindings (close, hunk navigation)
@@ -1237,7 +1243,7 @@ function getCurrentLineInfo(): PendingCommentInfo | null {
 // Pending prompt state for event-based prompt handling
 let pendingCommentInfo: PendingCommentInfo | null = null;
 
-globalThis.review_add_comment = async () => {
+async function review_add_comment() {
     const info = getCurrentLineInfo();
     if (!info) {
         editor.setStatus(editor.t("status.no_hunk_selected"));
@@ -1257,10 +1263,11 @@ globalThis.review_add_comment = async () => {
         lineRef = `L${info.oldLine}`;
     }
     editor.startPrompt(editor.t("prompt.comment", { line: lineRef }), "review-comment");
-};
+}
+registerHandler("review_add_comment", review_add_comment);
 
 // Prompt event handlers
-globalThis.on_review_prompt_confirm = (args: { prompt_type: string; input: string }): boolean => {
+function on_review_prompt_confirm(args: { prompt_type: string; input: string }): boolean {
     if (args.prompt_type !== "review-comment") {
         return true; // Not our prompt
     }
@@ -1292,21 +1299,23 @@ globalThis.on_review_prompt_confirm = (args: { prompt_type: string; input: strin
     }
     pendingCommentInfo = null;
     return true;
-};
+}
+registerHandler("on_review_prompt_confirm", on_review_prompt_confirm);
 
-globalThis.on_review_prompt_cancel = (args: { prompt_type: string }): boolean => {
+function on_review_prompt_cancel(args: { prompt_type: string }): boolean {
     if (args.prompt_type === "review-comment") {
         pendingCommentInfo = null;
         editor.setStatus(editor.t("status.comment_cancelled"));
     }
     return true;
-};
+}
+registerHandler("on_review_prompt_cancel", on_review_prompt_cancel);
 
 // Register prompt event handlers
 editor.on("prompt_confirmed", "on_review_prompt_confirm");
 editor.on("prompt_cancelled", "on_review_prompt_cancel");
 
-globalThis.review_approve_hunk = async () => {
+async function review_approve_hunk() {
     const hunkId = getCurrentHunkId();
     if (!hunkId) return;
     const h = state.hunks.find(x => x.id === hunkId);
@@ -1315,9 +1324,10 @@ globalThis.review_approve_hunk = async () => {
         await updateReviewUI();
         editor.setStatus(editor.t("status.hunk_approved"));
     }
-};
+}
+registerHandler("review_approve_hunk", review_approve_hunk);
 
-globalThis.review_reject_hunk = async () => {
+async function review_reject_hunk() {
     const hunkId = getCurrentHunkId();
     if (!hunkId) return;
     const h = state.hunks.find(x => x.id === hunkId);
@@ -1326,9 +1336,10 @@ globalThis.review_reject_hunk = async () => {
         await updateReviewUI();
         editor.setStatus(editor.t("status.hunk_rejected"));
     }
-};
+}
+registerHandler("review_reject_hunk", review_reject_hunk);
 
-globalThis.review_needs_changes = async () => {
+async function review_needs_changes() {
     const hunkId = getCurrentHunkId();
     if (!hunkId) return;
     const h = state.hunks.find(x => x.id === hunkId);
@@ -1337,9 +1348,10 @@ globalThis.review_needs_changes = async () => {
         await updateReviewUI();
         editor.setStatus(editor.t("status.hunk_needs_changes"));
     }
-};
+}
+registerHandler("review_needs_changes", review_needs_changes);
 
-globalThis.review_question_hunk = async () => {
+async function review_question_hunk() {
     const hunkId = getCurrentHunkId();
     if (!hunkId) return;
     const h = state.hunks.find(x => x.id === hunkId);
@@ -1348,9 +1360,10 @@ globalThis.review_question_hunk = async () => {
         await updateReviewUI();
         editor.setStatus(editor.t("status.hunk_question"));
     }
-};
+}
+registerHandler("review_question_hunk", review_question_hunk);
 
-globalThis.review_clear_status = async () => {
+async function review_clear_status() {
     const hunkId = getCurrentHunkId();
     if (!hunkId) return;
     const h = state.hunks.find(x => x.id === hunkId);
@@ -1359,17 +1372,19 @@ globalThis.review_clear_status = async () => {
         await updateReviewUI();
         editor.setStatus(editor.t("status.hunk_status_cleared"));
     }
-};
+}
+registerHandler("review_clear_status", review_clear_status);
 
-globalThis.review_set_overall_feedback = async () => {
+async function review_set_overall_feedback() {
     const text = await editor.prompt(editor.t("prompt.overall_feedback"), state.overallFeedback || "");
     if (text !== null) {
         state.overallFeedback = text.trim();
         editor.setStatus(text.trim() ? editor.t("status.feedback_set") : editor.t("status.feedback_cleared"));
     }
-};
+}
+registerHandler("review_set_overall_feedback", review_set_overall_feedback);
 
-globalThis.review_export_session = async () => {
+async function review_export_session() {
     const cwd = editor.getCwd();
     const reviewDir = editor.pathJoin(cwd, ".review");
 
@@ -1440,9 +1455,10 @@ globalThis.review_export_session = async () => {
     const filePath = editor.pathJoin(reviewDir, "session.md");
     await editor.writeFile(filePath, md);
     editor.setStatus(editor.t("status.exported", { path: filePath }));
-};
+}
+registerHandler("review_export_session", review_export_session);
 
-globalThis.review_export_json = async () => {
+async function review_export_json() {
     const cwd = editor.getCwd();
     const reviewDir = editor.pathJoin(cwd, ".review");
     // writeFile creates parent directories
@@ -1476,9 +1492,10 @@ globalThis.review_export_json = async () => {
     const filePath = editor.pathJoin(reviewDir, "session.json");
     await editor.writeFile(filePath, JSON.stringify(session, null, 2));
     editor.setStatus(editor.t("status.exported", { path: filePath }));
-};
+}
+registerHandler("review_export_json", review_export_json);
 
-globalThis.start_review_diff = async () => {
+async function start_review_diff() {
     editor.setStatus(editor.t("status.generating"));
     editor.setContext("review-mode", true);
 
@@ -1497,27 +1514,31 @@ globalThis.start_review_diff = async () => {
     editor.setStatus(editor.t("status.review_summary", { count: String(state.hunks.length) }));
     editor.on("buffer_activated", "on_review_buffer_activated");
     editor.on("buffer_closed", "on_review_buffer_closed");
-};
+}
+registerHandler("start_review_diff", start_review_diff);
 
-globalThis.stop_review_diff = () => {
+function stop_review_diff() {
     state.reviewBufferId = null;
     editor.setContext("review-mode", false);
     editor.off("buffer_activated", "on_review_buffer_activated");
     editor.off("buffer_closed", "on_review_buffer_closed");
     editor.setStatus(editor.t("status.stopped"));
-};
+}
+registerHandler("stop_review_diff", stop_review_diff);
 
 
-globalThis.on_review_buffer_activated = (data: any) => {
+function on_review_buffer_activated(data: any) {
     if (data.buffer_id === state.reviewBufferId) refreshReviewData();
-};
+}
+registerHandler("on_review_buffer_activated", on_review_buffer_activated);
 
-globalThis.on_review_buffer_closed = (data: any) => {
-    if (data.buffer_id === state.reviewBufferId) globalThis.stop_review_diff();
-};
+function on_review_buffer_closed(data: any) {
+    if (data.buffer_id === state.reviewBufferId) stop_review_diff();
+}
+registerHandler("on_review_buffer_closed", on_review_buffer_closed);
 
 // Side-by-side diff for current file using composite buffers
-globalThis.side_by_side_diff_current_file = async () => {
+async function side_by_side_diff_current_file() {
     const bid = editor.getActiveBufferId();
     const absolutePath = editor.getBufferPath(bid);
 
@@ -1613,10 +1634,8 @@ globalThis.side_by_side_diff_current_file = async () => {
     const oldContent = gitShow.stdout;
 
     // Read new file content (use absolute path for readFile)
-    let newContent: string;
-    try {
-        newContent = await editor.readFile(absolutePath);
-    } catch (e) {
+    const newContent = await editor.readFile(absolutePath);
+    if (newContent === null) {
         editor.setStatus(editor.t("status.failed_new_version"));
         return;
     }
@@ -1740,7 +1759,8 @@ globalThis.side_by_side_diff_current_file = async () => {
     const modifiedCount = Math.min(addedCount, removedCount);
 
     editor.setStatus(editor.t("status.diff_summary", { added: String(addedCount), removed: String(removedCount), modified: String(modifiedCount) }));
-};
+}
+registerHandler("side_by_side_diff_current_file", side_by_side_diff_current_file);
 
 // Register Modes and Commands
 editor.registerCommand("%cmd.review_diff", "%cmd.review_diff_desc", "start_review_diff", null);
@@ -1760,7 +1780,7 @@ editor.registerCommand("%cmd.export_markdown", "%cmd.export_markdown_desc", "rev
 editor.registerCommand("%cmd.export_json", "%cmd.export_json_desc", "review_export_json", "review-mode");
 
 // Handler for when buffers are closed - cleans up scroll sync groups and composite buffers
-globalThis.on_buffer_closed = (data: any) => {
+function on_buffer_closed(data: any) {
     // If one of the diff view buffers is closed, clean up the scroll sync group
     if (activeSideBySideState) {
         if (data.buffer_id === activeSideBySideState.oldBufferId ||
@@ -1787,7 +1807,8 @@ globalThis.on_buffer_closed = (data: any) => {
             activeCompositeDiffState = null;
         }
     }
-};
+}
+registerHandler("on_buffer_closed", on_buffer_closed);
 
 editor.on("buffer_closed", "on_buffer_closed");
 

package/plugins/check-types.sh

@@ -22,6 +22,7 @@ ERRORS=0
 for file in "${FILES[@]}"; do
   if ! npx -p typescript tsc \
     --noEmit \
+    --strict \
     --target esnext \
     --moduleResolution node \
     --lib esnext,dom \

package/plugins/clangd-lsp.ts

@@ -54,7 +54,7 @@ let clangdLspError: {
 /**
  * Handle LSP server errors for C/C++
  */
-globalThis.on_clangd_lsp_server_error = function (
+function on_clangd_lsp_server_error(
   data: LspServerErrorData
 ): void {
   // Only handle C/C++ language errors
@@ -79,7 +79,8 @@ globalThis.on_clangd_lsp_server_error = function (
   } else {
     editor.setStatus(`C/C++ LSP error: ${data.message}`);
   }
-};
+}
+registerHandler("on_clangd_lsp_server_error", on_clangd_lsp_server_error);
 
 // Register hook for LSP server errors
 editor.on("lsp_server_error", "on_clangd_lsp_server_error");
@@ -87,7 +88,7 @@ editor.on("lsp_server_error", "on_clangd_lsp_server_error");
 /**
  * Handle status bar click when there's a C/C++ LSP error
  */
-globalThis.on_clangd_lsp_status_clicked = function (
+function on_clangd_lsp_status_clicked(
   data: LspStatusClickedData
 ): void {
   // Only handle C/C++ language clicks when there's an error
@@ -110,7 +111,8 @@ globalThis.on_clangd_lsp_status_clicked = function (
       { id: "dismiss", label: "Dismiss (ESC)" },
     ],
   });
-};
+}
+registerHandler("on_clangd_lsp_status_clicked", on_clangd_lsp_status_clicked);
 
 // Register hook for status bar clicks
 editor.on("lsp_status_clicked", "on_clangd_lsp_status_clicked");
@@ -118,7 +120,7 @@ editor.on("lsp_status_clicked", "on_clangd_lsp_status_clicked");
 /**
  * Handle action popup results for C/C++ LSP help
  */
-globalThis.on_clangd_lsp_action_result = function (
+function on_clangd_lsp_action_result(
   data: ActionPopupResultData
 ): void {
   // Only handle our popup
@@ -160,7 +162,8 @@ globalThis.on_clangd_lsp_action_result = function (
     default:
       editor.debug(`clangd-lsp: Unknown action: ${data.action_id}`);
   }
-};
+}
+registerHandler("on_clangd_lsp_action_result", on_clangd_lsp_action_result);
 
 // Register hook for action popup results
 editor.on("action_popup_result", "on_clangd_lsp_action_result");

package/plugins/clangd_support.ts

@@ -50,7 +50,7 @@ function setClangdStatus(message: string): void {
   editor.setStatus(message);
 }
 
-globalThis.clangdSwitchSourceHeader = async function(): Promise<void> {
+async function clangdSwitchSourceHeader() : Promise<void> {
   const bufferId = editor.getActiveBufferId();
   const path = editor.getBufferPath(bufferId);
   if (!path) {
@@ -82,7 +82,8 @@ globalThis.clangdSwitchSourceHeader = async function(): Promise<void> {
     setClangdStatus(editor.t("status.switch_failed", { error: String(err) }));
     editor.debug(`clangdSwitchSourceHeader error: ${err}`);
   }
-};
+}
+registerHandler("clangdSwitchSourceHeader", clangdSwitchSourceHeader);
 
 const projectPanel = new PanelManager(editor, "Clangd project setup", "clangd-project-setup");
 
@@ -226,7 +227,7 @@ function analyzeProject(root: string | null) {
   return status;
 }
 
-globalThis.clangdProjectSetup = async function (): Promise<void> {
+async function clangdProjectSetup() : Promise<void> {
   const projectRoot = detectProjectRoot();
   const summary = analyzeProject(projectRoot);
   const entries = summary.map((line) => ({
@@ -237,7 +238,8 @@ globalThis.clangdProjectSetup = async function (): Promise<void> {
     entries,
     ratio: 0.3,
   });
-};
+}
+registerHandler("clangdProjectSetup", clangdProjectSetup);
 
 editor.registerCommand(
   "%cmd.project_setup",
@@ -246,7 +248,7 @@ editor.registerCommand(
   null
 );
 
-globalThis.clangdOpenProjectConfig = function(): void {
+function clangdOpenProjectConfig() : void {
   const bufferId = editor.getActiveBufferId();
   const targets = new Set<string>();
   const bufferPath = editor.getBufferPath(bufferId);
@@ -273,7 +275,8 @@ globalThis.clangdOpenProjectConfig = function(): void {
   if (!opened) {
     setClangdStatus(editor.t("status.config_not_found"));
   }
-};
+}
+registerHandler("clangdOpenProjectConfig", clangdOpenProjectConfig);
 
 editor.registerCommand(
   "%cmd.switch_source_header",
@@ -290,7 +293,7 @@ editor.registerCommand(
 );
 
 
-globalThis.onClangdCustomNotification = function(payload: {
+function onClangdCustomNotification(payload: {
   language: string;
   method: string;
   params: Record<string, unknown> | null;
@@ -311,6 +314,7 @@ globalThis.onClangdCustomNotification = function(payload: {
     const usage = (payload.params as any).used ?? "unknown";
     editor.debug(`Clangd memory usage: ${usage}`);
   }
-};
+}
+registerHandler("onClangdCustomNotification", onClangdCustomNotification);
 
 editor.on("lsp/custom_notification", "onClangdCustomNotification");

package/plugins/code-tour.ts

@@ -123,7 +123,7 @@ interface ActionPopupResultData {
   action_id: string;
 }
 
-globalThis.tour_on_action_popup_result = function (data: ActionPopupResultData): void {
+function tour_on_action_popup_result(data: ActionPopupResultData) : void {
   if (data.popup_id !== TOUR_POPUP_ID) return;
 
   switch (data.action_id) {
@@ -137,7 +137,8 @@ globalThis.tour_on_action_popup_result = function (data: ActionPopupResultData):
       exitTour();
       break;
   }
-};
+}
+registerHandler("tour_on_action_popup_result", tour_on_action_popup_result);
 
 // ============================================================================
 // Overlay Rendering
@@ -337,26 +338,30 @@ async function prevStep(): Promise<void> {
 // Command Handlers
 // ============================================================================
 
-globalThis.tour_load = async function (): Promise<void> {
+async function tour_load() : Promise<void> {
   // Prompt for tour file
   const result = await editor.prompt("Enter tour file path:", ".fresh-tour.json");
 
   if (result) {
     await loadTour(result);
   }
-};
+}
+registerHandler("tour_load", tour_load);
 
-globalThis.tour_next = async function (): Promise<void> {
+async function tour_next() : Promise<void> {
   await nextStep();
-};
+}
+registerHandler("tour_next", tour_next);
 
-globalThis.tour_prev = async function (): Promise<void> {
+async function tour_prev() : Promise<void> {
   await prevStep();
-};
+}
+registerHandler("tour_prev", tour_prev);
 
-globalThis.tour_exit = function (): void {
+function tour_exit() : void {
   exitTour();
-};
+}
+registerHandler("tour_exit", tour_exit);
 
 // ============================================================================
 // Registration