@fresh-editor/fresh-editor 0.2.24 → 0.3.0

package/plugins/git_log.i18n.json

@@ -32,9 +32,7 @@
     "status.move_to_diff": "Move cursor to a diff line",
 
     "panel.commits_header": "Commits:",
-    "panel.no_commits": "  No commits found",
-    "panel.log_footer": "%{count} commits | Up/Down/j/k: navigate | RET: show | y: yank hash | r: refresh | q: quit",
-    "panel.detail_footer": "Up/Down/j/k: navigate | RET: open file at line | q: back to log"
+    "panel.no_commits": "  No commits found"
   },
   "cs": {
     "cmd.git_log": "Git Log",
@@ -69,9 +67,7 @@
     "status.move_to_diff": "Presunte kurzor na radek diffu",
 
     "panel.commits_header": "Commity:",
-    "panel.no_commits": "  Zadne commity nenalezeny",
-    "panel.log_footer": "%{count} commitu | Nahoru/Dolu/j/k: navigace | RET: zobrazit | y: kopirovat hash | r: obnovit | q: ukoncit",
-    "panel.detail_footer": "Nahoru/Dolu/j/k: navigace | RET: otevrit soubor na radku | q: zpet do logu"
+    "panel.no_commits": "  Zadne commity nenalezeny"
   },
   "de": {
     "cmd.git_log": "Git-Protokoll",
@@ -106,9 +102,7 @@
     "status.move_to_diff": "Cursor auf eine Diff-Zeile bewegen",
 
     "panel.commits_header": "Commits:",
-    "panel.no_commits": "  Keine Commits gefunden",
-    "panel.log_footer": "%{count} Commits | Auf/Ab/j/k: navigieren | RET: anzeigen | y: Hash kopieren | r: aktualisieren | q: beenden",
-    "panel.detail_footer": "Auf/Ab/j/k: navigieren | RET: Datei bei Zeile oeffnen | q: zurueck zum Protokoll"
+    "panel.no_commits": "  Keine Commits gefunden"
   },
   "es": {
     "cmd.git_log": "Registro Git",
@@ -143,9 +137,7 @@
     "status.move_to_diff": "Mueve el cursor a una linea de diff",
 
     "panel.commits_header": "Commits:",
-    "panel.no_commits": "  No se encontraron commits",
-    "panel.log_footer": "%{count} commits | Arriba/Abajo/j/k: navegar | RET: mostrar | y: copiar hash | r: actualizar | q: salir",
-    "panel.detail_footer": "Arriba/Abajo/j/k: navegar | RET: abrir archivo en linea | q: volver al registro"
+    "panel.no_commits": "  No se encontraron commits"
   },
   "fr": {
     "cmd.git_log": "Journal Git",
@@ -180,9 +172,7 @@
     "status.move_to_diff": "Deplacez le curseur sur une ligne de diff",
 
     "panel.commits_header": "Commits:",
-    "panel.no_commits": "  Aucun commit trouve",
-    "panel.log_footer": "%{count} commits | Haut/Bas/j/k: naviguer | RET: afficher | y: copier hash | r: actualiser | q: quitter",
-    "panel.detail_footer": "Haut/Bas/j/k: naviguer | RET: ouvrir fichier a la ligne | q: retour au journal"
+    "panel.no_commits": "  Aucun commit trouve"
   },
   "it": {
     "cmd.git_log": "Git Log",
@@ -215,9 +205,7 @@
     "status.move_to_diff_with_context": "Sposta il cursore su una riga di diff con contesto file",
     "status.move_to_diff": "Sposta il cursore su una riga di diff",
     "panel.commits_header": "Commit:",
-    "panel.no_commits": "  Nessun commit trovato",
-    "panel.log_footer": "%{count} commit | Su/Giù/j/k: naviga | RET: mostra | y: copia hash | r: aggiorna | q: esci",
-    "panel.detail_footer": "Su/Giù/j/k: naviga | RET: apri file alla riga | q: torna al log"
+    "panel.no_commits": "  Nessun commit trovato"
   },
   "ja": {
     "cmd.git_log": "Gitログ",
@@ -252,9 +240,7 @@
     "status.move_to_diff": "カーソルを差分行に移動してください",
 
     "panel.commits_header": "コミット:",
-    "panel.no_commits": "  コミットが見つかりません",
-    "panel.log_footer": "%{count}件のコミット | 上/下/j/k: 移動 | RET: 表示 | y: ハッシュをコピー | r: 更新 | q: 終了",
-    "panel.detail_footer": "上/下/j/k: 移動 | RET: ファイルを行で開く | q: ログに戻る"
+    "panel.no_commits": "  コミットが見つかりません"
   },
   "ko": {
     "cmd.git_log": "Git 로그",
@@ -289,9 +275,7 @@
     "status.move_to_diff": "커서를 diff 줄로 이동하세요",
 
     "panel.commits_header": "커밋:",
-    "panel.no_commits": "  커밋을 찾을 수 없습니다",
-    "panel.log_footer": "%{count}개 커밋 | 위/아래/j/k: 탐색 | RET: 표시 | y: 해시 복사 | r: 새로고침 | q: 종료",
-    "panel.detail_footer": "위/아래/j/k: 탐색 | RET: 해당 줄에서 파일 열기 | q: 로그로 돌아가기"
+    "panel.no_commits": "  커밋을 찾을 수 없습니다"
   },
   "pt-BR": {
     "cmd.git_log": "Git Log",
@@ -326,9 +310,7 @@
     "status.move_to_diff": "Mova o cursor para uma linha de diff",
 
     "panel.commits_header": "Commits:",
-    "panel.no_commits": "  Nenhum commit encontrado",
-    "panel.log_footer": "%{count} commits | Cima/Baixo/j/k: navegar | RET: mostrar | y: copiar hash | r: atualizar | q: sair",
-    "panel.detail_footer": "Cima/Baixo/j/k: navegar | RET: abrir arquivo na linha | q: voltar ao log"
+    "panel.no_commits": "  Nenhum commit encontrado"
   },
   "ru": {
     "cmd.git_log": "Git Log",
@@ -363,9 +345,7 @@
     "status.move_to_diff": "Peremesstite kursor na stroku diff",
 
     "panel.commits_header": "Kommity:",
-    "panel.no_commits": "  Kommity ne naydeny",
-    "panel.log_footer": "%{count} kommitov | Vverkh/Vniz/j/k: navigatsiya | RET: pokazat' | y: kopirovat' khesh | r: obnovit' | q: vyyti",
-    "panel.detail_footer": "Vverkh/Vniz/j/k: navigatsiya | RET: otkryt' fayl na stroke | q: nazad k logu"
+    "panel.no_commits": "  Kommity ne naydeny"
   },
   "th": {
     "cmd.git_log": "Git Log",
@@ -400,9 +380,7 @@
     "status.move_to_diff": "เลื่อนเคอร์เซอร์ไปที่บรรทัด diff",
 
     "panel.commits_header": "คอมมิต:",
-    "panel.no_commits": "  ไม่พบคอมมิต",
-    "panel.log_footer": "%{count} คอมมิต | ขึ้น/ลง/j/k: นำทาง | RET: แสดง | y: คัดลอกแฮช | r: รีเฟรช | q: ออก",
-    "panel.detail_footer": "ขึ้น/ลง/j/k: นำทาง | RET: เปิดไฟล์ที่บรรทัด | q: กลับไปที่ log"
+    "panel.no_commits": "  ไม่พบคอมมิต"
   },
   "uk": {
     "cmd.git_log": "Git Log",
@@ -437,9 +415,7 @@
     "status.move_to_diff": "Peremistit' kursor na ryadok diff",
 
     "panel.commits_header": "Komity:",
-    "panel.no_commits": "  Komity ne znaydeno",
-    "panel.log_footer": "%{count} komitiv | Vhoru/Vnyz/j/k: navihatsiya | RET: pokazaty | y: kopiyuvaty khesh | r: onovyty | q: vyyty",
-    "panel.detail_footer": "Vhoru/Vnyz/j/k: navihatsiya | RET: vidkryty fayl na ryadku | q: nazad do lohu"
+    "panel.no_commits": "  Komity ne znaydeno"
   },
   "vi": {
     "cmd.git_log": "Git Log",
@@ -474,9 +450,7 @@
     "status.move_to_diff": "Di chuyển con trỏ đến dòng diff",
 
     "panel.commits_header": "Commit:",
-    "panel.no_commits": "  Không tìm thấy commit",
-    "panel.log_footer": "%{count} commit | Lên/Xuống/j/k: điều hướng | RET: hiển thị | y: sao chép hash | r: làm mới | q: thoát",
-    "panel.detail_footer": "Lên/Xuống/j/k: điều hướng | RET: mở tệp tại dòng | q: quay lại log"
+    "panel.no_commits": "  Không tìm thấy commit"
   },
   "zh-CN": {
     "cmd.git_log": "Git日志",
@@ -511,8 +485,6 @@
     "status.move_to_diff": "请将光标移动到差异行",
 
     "panel.commits_header": "提交:",
-    "panel.no_commits": "  未找到提交",
-    "panel.log_footer": "%{count}个提交 | 上/下/j/k: 导航 | RET: 显示 | y: 复制哈希 | r: 刷新 | q: 退出",
-    "panel.detail_footer": "上/下/j/k: 导航 | RET: 在行处打开文件 | q: 返回日志"
+    "panel.no_commits": "  未找到提交"
   }
 }

package/plugins/git_log.ts

@@ -686,13 +686,23 @@ async function git_log_detail_open_file(): Promise<void> {
 registerHandler("git_log_detail_open_file", git_log_detail_open_file);
 
 // File-view mode so `q` closes the tab and returns to the group.
+//
+// j/k alias Up/Down as in the main git-log mode, and we inherit Normal
+// bindings so arrows, PageUp/Down, Home/End, Ctrl+C copy, etc. still work
+// in this read-only buffer — without `inheritNormalBindings`, unbound keys
+// in a read-only mode fall through to the edit actions and trip the
+// `editing_disabled` status message (see #566).
 editor.defineMode(
   "git-log-file-view",
   [
+    ["k", "move_up"],
+    ["j", "move_down"],
     ["q", "git_log_file_view_close"],
     ["Escape", "git_log_file_view_close"],
   ],
-  true
+  true, // read-only
+  false, // allow_text_input
+  true, // inherit Normal-context bindings for unbound keys
 );
 
 function git_log_file_view_close(): void {

package/plugins/lib/fresh.d.ts

@@ -70,6 +70,35 @@ interface MouseClickHookArgs {
 	/** 0-indexed byte column inside the buffer row. */
 	buffer_col: number | null;
 }
+/**
+* Registry of typed plugin APIs surfaced through
+* `editor.exportPluginApi` / `editor.getPluginApi`.
+*
+* Plugins that want their surface to be typed for downstream
+* consumers augment this interface in their own source:
+*
+* ```ts
+* // in my_plugin.ts
+* export type MyPluginApi = { doThing(): void };
+* declare global {
+*   interface FreshPluginRegistry {
+*     "my-plugin": MyPluginApi;
+*   }
+* }
+* ```
+*
+* `editor.getPluginApi("my-plugin")` then returns
+* `MyPluginApi | null` without any `as`-cast on the consumer side.
+* Plugins that skip the augmentation still work — the untyped
+* `getPluginApi<T = unknown>(name: string): T | null` overload
+* takes over.
+*
+* Each plugin's augmentation is emitted to
+* `<config_dir>/types/plugins.d.ts` at load time (via oxc's
+* isolated-declarations), so init.ts sees every loaded plugin's
+* registry entry automatically.
+*/
+interface FreshPluginRegistry {}
 type TextPropertyEntry = {
 	/**
 	* Text content for this entry
@@ -343,6 +372,15 @@ type BufferInfo = {
 	* refreshing itself for a preview tab.
 	*/
 	is_preview: boolean;
+	/**
+	* Split ids that currently hold this buffer (empty when the buffer is
+	* open but not visible in any split — e.g. background-opened tabs
+	* that haven't been focused). Lets plugins implement "focus existing
+	* buffer if visible, else open new" without having to track split
+	* ids across editor restarts (which reassign them). The list is a
+	* snapshot at the last `update_plugin_state_snapshot` tick.
+	*/
+	splits: number[];
 };
 type JsDiagnostic = {
 	/**
@@ -497,6 +535,15 @@ type CreateTerminalOptions = {
 	* Whether to focus the new terminal split (default: true)
 	*/
 	focus?: boolean;
+	/**
+	* Whether this terminal is part of the user's persisted workspace.
+	* Defaults to `false` for plugin-created terminals — they are typically
+	* one-off tool UIs (rebuilds, exec shells, build output) and should
+	* start with empty scrollback on each invocation. Set to `true` only
+	* when the plugin owns a terminal that the user should see restored
+	* across editor restarts.
+	*/
+	persistent?: boolean;
 };
 type CursorInfo = {
 	/**
@@ -584,6 +631,31 @@ type GrammarInfoSnapshot = {
 	*/
 	short_name: string | null;
 };
+type AuthorityFilesystem = {
+	kind: "local";
+};
+type AuthoritySpawner = {
+	kind: "local";
+} | {
+	kind: "docker-exec";
+	container_id: string;
+	user?: string | null;
+	workspace?: string | null;
+};
+type AuthorityTerminalWrapper = {
+	kind: "host-shell";
+} | {
+	kind: "explicit";
+	command: string;
+	args: string[];
+	manages_cwd?: boolean;
+};
+type AuthorityPayload = {
+	filesystem: AuthorityFilesystem;
+	spawner: AuthoritySpawner;
+	terminal_wrapper: AuthorityTerminalWrapper;
+	display_label?: string;
+};
 type BackgroundProcessResult = {
 	/**
 	* Unique process ID for later reference
@@ -808,6 +880,21 @@ type LspServerPackConfig = {
 	*/
 	processLimits: ProcessLimitsPackConfig | null;
 };
+type RemoteIndicatorStatePayload = {
+	kind: "local";
+} | {
+	kind: "connecting";
+	label?: string | null;
+} | {
+	kind: "connected";
+	label?: string | null;
+} | {
+	kind: "failed_attach";
+	error?: string | null;
+} | {
+	kind: "disconnected";
+	label?: string | null;
+};
 type ReplaceResult = {
 	/**
 	* Number of replacements made
@@ -860,6 +947,30 @@ interface EditorAPI {
 	*/
 	apiVersion(): number;
 	/**
+	* The name of the plugin this `editor` handle belongs to. Used by the
+	* M3 plugin-API plane (`exportPluginApi` tags the exporter). Plugin
+	* authors generally don't call this directly.
+	*/
+	pluginName(): string;
+	/**
+	* Publish a typed API surface under `name`. Another plugin (typically
+	* `init.ts`) can reach it later via `getPluginApi(name)`. Calling
+	* again with the same `name` replaces the previous registration
+	* (idempotent — reload works). Exports are auto-dropped when the
+	* calling plugin is unloaded.
+	* 
+	* Returns `true` on success. Rejects with a TypeError if `name` is
+	* empty or `api` is not an object (functions and primitives are not
+	* valid API surfaces — only objects).
+	*/
+	exportPluginApi(name: string, api: unknown): boolean;
+	/**
+	* Look up a plugin API previously published via `exportPluginApi`.
+	* Returns the api object (restored into the caller's context) or
+	* `null` if no plugin exports under that name.
+	*/
+	getPluginApi(name: string): unknown | null;
+	/**
 	* Get the active buffer ID (0 if none)
 	*/
 	getActiveBufferId(): number;
@@ -1045,8 +1156,26 @@ interface EditorAPI {
 	*/
 	getCwd(): string;
 	/**
+	* Get the active authority's display label.
+	* 
+	* Empty means the local (default) authority. A non-empty value
+	* means a plugin-installed or SSH authority is in effect (e.g.
+	* `"Container:abc123def456"` for a devcontainer). Intended as a
+	* simple "am I already attached?" check that survives editor
+	* restarts — the label lives on the `Editor` state snapshot so it
+	* is fresh after the authority-transition restart flow.
+	*/
+	getAuthorityLabel(): string;
+	/**
 	* Join path components (variadic - accepts multiple string arguments)
 	* Always uses forward slashes for cross-platform consistency (like Node.js path.posix.join)
+	* 
+	* Preserves up to 2 leading slashes, which matters on Windows: Rust's
+	* `Path::canonicalize` returns `\\?\`-prefixed paths, and `editor.getCwd()`
+	* surfaces that to plugin code verbatim. After the backslash→slash
+	* normalization the prefix becomes `//?/C:/...`; collapsing the leading
+	* `//` to a single `/` yields `/?/C:/...`, which every filesystem API on
+	* Windows rejects, breaking `findConfig()`-style plugin logic.
 	*/
 	pathJoin(...parts: string[]): string;
 	/**
@@ -1129,11 +1258,27 @@ interface EditorAPI {
 	*/
 	getTempDir(): string;
 	/**
-	* Get current config as JS object
+	* Parse a JSONC (JSON with comments) string into a JS value.
+	* 
+	* Accepts the JSONC superset: line and block comments, trailing
+	* commas, single-quoted strings, and unquoted object keys — matching
+	* devcontainer.json / tsconfig.json / VS Code settings.json.
+	* 
+	* Throws a JS error (catchable with try/catch) when the input is not
+	* valid JSONC, like `JSON.parse` does for invalid JSON.
+	*/
+	parseJsonc(text: string): unknown;
+	/**
+	* Get current config as JS object.
+	* 
+	* The snapshot holds an `Arc<serde_json::Value>` that was serialized
+	* on the editor side the last time the underlying `Arc<Config>`
+	* changed. Cloning the Arc inside the read lock is a refcount bump;
+	* the actual walk into the JS runtime happens outside the lock.
 	*/
 	getConfig(): unknown;
 	/**
-	* Get user config as JS object
+	* Get user config as JS object. Same Arc-clone pattern as `get_config`.
 	*/
 	getUserConfig(): unknown;
 	/**
@@ -1141,6 +1286,21 @@ interface EditorAPI {
 	*/
 	reloadConfig(): void;
 	/**
+	* Set a single config setting in the runtime layer for this session.
+	* 
+	* `path` is dot-separated (e.g. `"editor.tab_size"`). `value` is any JSON
+	* value in the shape the setting expects. The write lives in an
+	* in-memory layer scoped to the calling plugin — it does not modify
+	* `config.json`, and unloading the plugin (or reloading init.ts) drops
+	* it. Intended use is `init.ts` running a conditional:
+	* `if (editor.getEnv("SSH_TTY")) editor.setSetting("terminal.mouse", false);`
+	* 
+	* Returns `true` if the write was queued. The actual update is
+	* asynchronous; a subsequent `getConfig()` will reflect it after the
+	* editor processes the command.
+	*/
+	setSetting(path: string, value: unknown): boolean;
+	/**
 	* Reload theme registry from disk
 	* Call this after installing theme packages or saving new themes
 	*/
@@ -1192,6 +1352,17 @@ interface EditorAPI {
 	*/
 	applyTheme(themeName: string): boolean;
 	/**
+	* Override theme colors in-memory for the running session. `overrides`
+	* is a JS object mapping `"section.field"` keys (same namespace as
+	* `getThemeSchema`) to `[r, g, b]` triplets (0–255 each).
+	* 
+	* Unknown keys are dropped silently; out-of-range values are clamped
+	* to `0..=255`. Overrides survive until the next `applyTheme` call
+	* (which replaces the whole `Theme`). Intended for fast animation
+	* loops from `init.ts` — no disk I/O, no theme-registry rescan.
+	*/
+	overrideThemeColors(overrides: unknown): boolean;
+	/**
 	* Get theme schema as JS object
 	*/
 	getThemeSchema(): unknown;
@@ -1605,6 +1776,56 @@ interface EditorAPI {
 	*/
 	spawnProcess(command: string, args: string[], cwd?: string): ProcessHandle<SpawnResult>;
 	/**
+	* Spawn a process on the host regardless of the active authority.
+	* 
+	* Intended for plugin internals that must run host-side work
+	* (e.g. `devcontainer up`) before installing an authority that
+	* would otherwise route the spawn elsewhere. Same calling shape
+	* as `spawnProcess`.
+	*/
+	spawnHostProcess(command: string, args: string[], cwd?: string): ProcessHandle<SpawnResult>;
+	/**
+	* Install a new authority via an opaque payload.
+	* 
+	* The payload is a JS object describing filesystem + spawner +
+	* terminal wrapper + display label. The canonical schema lives in
+	* the `AuthorityPayload` type in `fresh-editor`; plugins should
+	* hand-build objects that match it. Fire-and-forget: the editor
+	* restarts as part of the transition, so the plugin is reloaded
+	* before any follow-up work can run on this call's return value.
+	*/
+	setAuthority(payload: AuthorityPayload): boolean;
+	/**
+	* Restore the default local authority. Same restart semantics as
+	* `setAuthority`.
+	*/
+	clearAuthority(): void;
+	/**
+	* Override the Remote Indicator's displayed state. Plugins call
+	* this to surface lifecycle transitions that the authority layer
+	* doesn't know about yet — "Connecting" while `devcontainer up`
+	* runs, "FailedAttach" after a non-zero exit, etc.
+	* 
+	* Accepts a tagged JS object:
+	* ```ts
+	* editor.setRemoteIndicatorState({ kind: "connecting", label: "Building" });
+	* editor.setRemoteIndicatorState({ kind: "failed_attach", error: "exit 1" });
+	* editor.setRemoteIndicatorState({ kind: "connected", label: "Container:abc" });
+	* editor.setRemoteIndicatorState({ kind: "local" });
+	* ```
+	* 
+	* The override sticks until replaced or cleared via
+	* `clearRemoteIndicatorState`. Editor restart (e.g. on
+	* `setAuthority`) resets it — plugins must reassert after a
+	* post-restart init if they want the override to persist.
+	*/
+	setRemoteIndicatorState(state: RemoteIndicatorStatePayload): boolean;
+	/**
+	* Drop any active Remote Indicator override. Safe to call even
+	* without a prior `setRemoteIndicatorState`.
+	*/
+	clearRemoteIndicatorState(): void;
+	/**
 	* Wait for a process to complete and get its result (async)
 	*/
 	spawnProcessWait(processId: number): Promise<SpawnResult>;
@@ -1695,3 +1916,12 @@ interface EditorAPI {
 		enabled: boolean;
 	}>>;
 }
+/**
+* Typed overload of `editor.getPluginApi`. When the caller passes a
+* key that some loaded plugin declared in `FreshPluginRegistry`, the
+* return type is narrowed to that plugin's API. Unknown names fall
+* through to the untyped `unknown | null` signature.
+*/
+interface EditorAPI {
+	getPluginApi<K extends keyof FreshPluginRegistry>(name: K): FreshPluginRegistry[K] | null;
+}

package/plugins/markdown_compose.ts

@@ -966,6 +966,23 @@ function concealedText(text: string): string {
 
 const MIN_COL_W = 3;
 
+/**
+ * Return the effective compose width for layout: the configured compose
+ * width clamped to the available viewport width.
+ *
+ * When `config.composeWidth` is explicitly set (e.g. 80) but the editor
+ * content area is smaller (e.g. after the File Explorer sidebar opens),
+ * using the configured value verbatim overflows the viewport. The Rust
+ * render layer already clamps the compose area the same way in
+ * `calculate_compose_layout`; plugin-side computations (table column
+ * allocation, soft-wrap width) need to match.
+ */
+function effectiveComposeWidth(viewportWidth: number): number {
+  const cw = config.composeWidth;
+  if (cw == null) return viewportWidth;
+  return Math.min(cw, viewportWidth);
+}
+
 /**
  * W3C-inspired column width distribution.
  * Constrains columns to fit within `available` width, distributing space
@@ -1142,6 +1159,26 @@ function processLineConceals(
         if (lineContent[i] === '|') pipePositions.push(i);
       }
 
+      // Precompute which cells will be truncated. Per-character conceals
+      // that land inside a truncated cell must be suppressed — the cell-
+      // wide truncate conceal already renders the replacement. When both
+      // fire, the per-char conceal at the cell's first byte emits its
+      // replacement, and the cell-wide conceal emits its replacement one
+      // byte later, producing a cell one character wider than allocated.
+      const truncatedCellCharRanges: Array<{start: number; end: number}> = [];
+      if (!cursorStrictlyOnLine && colWidths) {
+        for (let ci = 0; ci < Math.min(cells.length, colWidths.length); ci++) {
+          const cellText = concealedText(cells[ci]);
+          if (cellText.length > colWidths[ci]) {
+            const prevPipe = pipePositions[ci];
+            const nextPipe = pipePositions[ci + 1];
+            if (prevPipe !== undefined && nextPipe !== undefined) {
+              truncatedCellCharRanges.push({ start: prevPipe + 1, end: nextPipe });
+            }
+          }
+        }
+      }
+
       // Track which pipe index we're on (0 = leading pipe)
       let pipeIdx = 0;
       for (let i = 0; i < lineContent.length; i++) {
@@ -1161,11 +1198,15 @@ function processLineConceals(
             const allocatedWidth = colWidths[cellIdx];
 
             if (cellWidth > allocatedWidth) {
-              // Truncate: conceal entire cell content and replace with truncated text
+              // Truncate: conceal entire cell content and replace with truncated text.
+              // Separator rows use box-drawing ─ to match the non-truncated path
+              // (per-char conceals replace source `-` with ─ and pad via pipe replacement).
               const prevPipeCharPos = pipePositions[pipeIdx - 1];
               const cellByteStart = charToByte(lineContent, prevPipeCharPos + 1, byteStart);
               const cellByteEnd = pipeByte;
-              const truncated = cellText.slice(0, allocatedWidth - 1) + '-';
+              const truncated = isSeparator
+                ? '─'.repeat(allocatedWidth)
+                : cellText.slice(0, allocatedWidth - 1) + '-';
               editor.addConceal(bufferId, "md-syntax", cellByteStart, cellByteEnd, truncated);
               truncatedByteRanges.push({start: cellByteStart, end: cellByteEnd});
             } else {
@@ -1188,6 +1229,10 @@ function processLineConceals(
           }
           pipeIdx++;
         } else if (isSeparator && lineContent[i] === '-') {
+          // Skip per-character conceals that land inside a truncated cell;
+          // the cell-wide truncate conceal already handles the rendering.
+          const inTruncated = truncatedCellCharRanges.some(r => i >= r.start && i < r.end);
+          if (inTruncated) continue;
           const db = charToByte(lineContent, i, byteStart);
           editor.addConceal(bufferId, "md-syntax", db, charToByte(lineContent, i + 1, byteStart), "─");
         }
@@ -1292,7 +1337,7 @@ function processLineSoftBreaks(
 
   const viewport = editor.getViewport();
   if (!viewport) return;
-  const width = config.composeWidth ?? viewport.width;
+  const width = effectiveComposeWidth(viewport.width);
 
   // Parse this single line to get block structure
   const blocks = parseMarkdownBlocks(lineContent);
@@ -1516,9 +1561,12 @@ function processTableAlignment(
       mergeWith(widthMap.get(ln)!.maxW);
     }
 
-    // Compute allocated widths constrained to viewport
+    // Compute allocated widths constrained to viewport. Clamp the
+    // configured compose width to the actual viewport — otherwise a
+    // large configured width overflows when the editor area shrinks
+    // (e.g. when the File Explorer sidebar opens).
     const viewport = editor.getViewport();
-    const composeW = config.composeWidth ?? (viewport ? viewport.width : 80);
+    const composeW = effectiveComposeWidth(viewport ? viewport.width : 80);
     const numCols = merged.length;
     const available = composeW - (numCols + 1); // subtract pipe/box-drawing characters
     const allocated = distributeColumnWidths(merged, available);
@@ -1688,7 +1736,7 @@ function onMarkdownViewportChanged(data: {
   // Recompute allocated table column widths for new viewport width
   const bufWidths = getTableWidths(data.buffer_id);
   if (bufWidths) {
-    const composeW = config.composeWidth ?? data.width;
+    const composeW = effectiveComposeWidth(data.width);
     const seen = new Set<string>(); // Track by JSON key to deduplicate shared TableWidthInfo
     for (const [lineNum, info] of bufWidths) {
       const key = info.maxW.join(",");