Bump version.

Add horizontal scrolling support and refactor mouse click handling in GUI.
- Introduce horizontal scrolling with column offset synchronization in GUI. - Refactor mouse click handling for improved accuracy and viewport alignment. - Enhance tab expansion and cursor rendering logic for better user experience. - Replace redundant variable declarations in `Buffer` for cleaner code.
2025-11-30 17:22:54 -08:00 · 2025-11-30 17:19:46 -08:00 · 2025-11-30 16:49:24 -08:00
13 changed files with 744 additions and 318 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -17,7 +17,6 @@
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue" value="2" type="int" />
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_CODE/@EntryValue" value="2" type="int" />
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_USER_LINEBREAKS/@EntryValue" value="true" type="bool" />
-      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CASE_FROM_SWITCH/@EntryValue" />
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_COMMENT/@EntryValue" value="true" type="bool" />
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INT_ALIGN_EQ/@EntryValue" value="true" type="bool" />
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SIMPLE_BLOCK_STYLE/@EntryValue" value="LINE_BREAK" type="string" />
@@ -115,33 +114,18 @@
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TOPLEVEL_FUNCTION_DECLARATION_RETURN_TYPE_STYLE/@EntryValue" value="ON_SINGLE_LINE" type="string" />
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/FUNCTION_DECLARATION_RETURN_TYPE_STYLE/@EntryValue" value="ON_SINGLE_LINE" type="string" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=0B82708A1BA7774EB13D27F245698A56/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;1&quot; Title=&quot;Classes and structs&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;__interface&quot; /&gt;&lt;type Name=&quot;class&quot; /&gt;&lt;type Name=&quot;struct&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=0B82708A1BA7774EB13D27F245698A56/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=A7EBF16DA3BDCB42A0B710704BC8A053/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;3&quot; Title=&quot;Enums&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;enum&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=A7EBF16DA3BDCB42A0B710704BC8A053/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=0AFB7787612DF743B09AD9412E48D4CC/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;7&quot; Title=&quot;Local variables&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;local variable&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;aaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=0AFB7787612DF743B09AD9412E48D4CC/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=72514D5DF422D442B71A277F97B72887/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;8&quot; Title=&quot;Global variables&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;global variable&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AA_BB&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=72514D5DF422D442B71A277F97B72887/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=821F3C5CF47D5640AD3511BCBADE17C4/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;9&quot; Title=&quot;Lambdas&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;lambda&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=821F3C5CF47D5640AD3511BCBADE17C4/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=8F69F48E2532F54CBAA0039D4557825E/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;10&quot; Title=&quot;Global functions&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;global function&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=8F69F48E2532F54CBAA0039D4557825E/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=B6E900853D6D05429D8C57765B2E546A/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;11&quot; Title=&quot;Class and struct methods&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;member function&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=B6E900853D6D05429D8C57765B2E546A/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=B82A063F0DDD98498A70D8D7EBB97F8D/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;12&quot; Title=&quot;Class and struct fields&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;class field&quot; /&gt;&lt;type Name=&quot;struct field&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;_&quot; Style=&quot;aaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=B82A063F0DDD98498A70D8D7EBB97F8D/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=BBE8AA08E662BF409B2CB08EC597C493/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;13&quot; Title=&quot;Class and struct public fields&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;PUBLIC&quot;&gt;&lt;type Name=&quot;class field&quot; /&gt;&lt;type Name=&quot;struct field&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;aaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=BBE8AA08E662BF409B2CB08EC597C493/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=A4FAA2257682A94F8C2C93E123FAFC7A/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;19&quot; Title=&quot;Typedefs&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;Indeterminate&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;type alias&quot; /&gt;&lt;type Name=&quot;typedef&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=A4FAA2257682A94F8C2C93E123FAFC7A/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=BF0D1AE66D64FE4FAF613448A12051A0/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;17&quot; Title=&quot;Global constants&quot;&gt;&lt;Descriptor Static=&quot;Indeterminate&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;True&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;global variable&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=BF0D1AE66D64FE4FAF613448A12051A0/@EntryIndexRemoved" />
      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=2B232F1067F0324F8FF4B9D63ACECDB2/@EntryIndexedValue" value="&lt;NamingElement Priority=&quot;16&quot; Title=&quot;Other constants&quot;&gt;&lt;Descriptor Static=&quot;True&quot; Constexpr=&quot;Indeterminate&quot; Const=&quot;True&quot; Volatile=&quot;Indeterminate&quot; Accessibility=&quot;NOT_APPLICABLE&quot;&gt;&lt;type Name=&quot;class field&quot; /&gt;&lt;type Name=&quot;local variable&quot; /&gt;&lt;type Name=&quot;struct field&quot; /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect=&quot;True&quot; WarnAboutPrefixesAndSuffixes=&quot;False&quot; Prefix=&quot;&quot; Suffix=&quot;&quot; Style=&quot;AaBb&quot; /&gt;&lt;/NamingElement&gt;" type="string" />
-      <option name="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=2B232F1067F0324F8FF4B9D63ACECDB2/@EntryIndexRemoved" />
-      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/REMOVE_BLANK_LINES_NEAR_BRACES_IN_CODE/@EntryValue" />
      <option name="/Default/CodeStyle/CppIncludeDirective/SortIncludeDirectives/@EntryValue" value="true" type="bool" />
-      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/USE_CONTINUOUS_LINE_INDENT_IN_METHOD_PARS/@EntryValue" />
-      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/USE_CONTINUOUS_LINE_INDENT_IN_EXPRESSION_BRACES/@EntryValue" />
      <option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_GOTO_LABELS/@EntryValue" value="false" type="bool" />
    </RiderCodeStyleSettings>
    <files>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,7 +21,11 @@
    <option name="reloaded" value="true" />
  </component>
  <component name="CMakeRunConfigurationManager">
-    <generated />
+    <generated>
+      <config projectName="kte" targetName="kte" />
+      <config projectName="kte" targetName="imgui" />
+      <config projectName="kte" targetName="kge" />
+    </generated>
  </component>
  <component name="CMakeSettings" AUTO_RELOAD="true">
    <configurations>
@@ -29,13 +33,11 @@
    </configurations>
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="e1fe3ab0-3650-4fca-8664-a247d5dfa457" name="Changes" comment="Add GUI initialization updates and improve navigation commands.&#10;&#10;- Implement terminal detachment for GUI mode to enable terminal closure post-launch.&#10;- Add `+N` support for opening files at specific line numbers and refine cursor positioning.&#10;- Introduce `JumpToLine` command for direct navigation by line number.&#10;- Enhance mouse wheel handling for line-wise scrolling.">
-      <change afterPath="$PROJECT_DIR$/default-nogui.nix" afterDir="false" />
+    <list default="true" id="e1fe3ab0-3650-4fca-8664-a247d5dfa457" name="Changes" comment="Refactor code for consistency and enhanced functionality.&#10;&#10;- Normalize path handling for buffer operations, supporting tilde expansion and absolute paths.&#10;- Introduce `DisplayNameFor` to uniquely resolve buffer display names, minimizing filename clashes.&#10;- Add new commands: `ShowWorkingDirectory` and `ChangeWorkingDirectory`.&#10;- Refine keybindings and enhance existing commands for improved command flow.&#10;- Adjust GUI and terminal renderers to display total line counts alongside filenames.&#10;- Update coding style to align with project guidelines.">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/default-gui.nix" beforeDir="false" afterPath="$PROJECT_DIR$/default-gui.nix" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/default.nix" beforeDir="false" afterPath="$PROJECT_DIR$/default.nix" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/flake.nix" beforeDir="false" afterPath="$PROJECT_DIR$/flake.nix" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Buffer.cc" beforeDir="false" afterPath="$PROJECT_DIR$/Buffer.cc" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/GUIRenderer.cc" beforeDir="false" afterPath="$PROJECT_DIR$/GUIRenderer.cc" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/KKeymap.cc" beforeDir="false" afterPath="$PROJECT_DIR$/KKeymap.cc" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/main.cc" beforeDir="false" afterPath="$PROJECT_DIR$/main.cc" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@@ -89,54 +91,69 @@
    <option name="sortByType" value="true" />
    <option name="sortKey" value="BY_TYPE" />
  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "CMake Application.kge.executor": "Run",
-    "CMake Application.test_example.executor": "Run",
-    "CMake Application.test_undo.executor": "Run",
-    "ModuleVcsDetector.initialDetectionPerformed": "true",
-    "NIXITCH_NIXPKGS_CONFIG": "",
-    "NIXITCH_NIX_CONF_DIR": "",
-    "NIXITCH_NIX_OTHER_STORES": "",
-    "NIXITCH_NIX_PATH": "",
-    "NIXITCH_NIX_PROFILES": "",
-    "NIXITCH_NIX_REMOTE": "",
-    "NIXITCH_NIX_USER_PROFILE_DIR": "",
-    "RunOnceActivity.RadMigrateCodeStyle": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.readMode.enableVisualFormatting": "true",
-    "RunOnceActivity.west.config.association.type.startup.service": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "code.cleanup.on.save": "true",
-    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
-    "git-widget-placeholder": "master",
-    "junie.onboarding.icon.badge.shown": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "onboarding.tips.debug.path": "/Users/kyle/src/kte/main.cpp",
-    "rearrange.code.on.save": "true",
-    "settings.editor.selected.configurable": "editor.preferences.fonts.default",
-    "to.speed.mode.migration.done": "true",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;CMake Application.kge.executor&quot;: &quot;Run&quot;,
+    &quot;CMake Application.test_example.executor&quot;: &quot;Run&quot;,
+    &quot;CMake Application.test_undo.executor&quot;: &quot;Run&quot;,
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;NIXITCH_NIXPKGS_CONFIG&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_CONF_DIR&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_OTHER_STORES&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_PATH&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_PROFILES&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_REMOTE&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_USER_PROFILE_DIR&quot;: &quot;&quot;,
+    &quot;RunOnceActivity.RadMigrateCodeStyle&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.west.config.association.type.startup.service&quot;: &quot;true&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;code.cleanup.on.save&quot;: &quot;true&quot;,
+    &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;onboarding.tips.debug.path&quot;: &quot;/Users/kyle/src/kte/main.cpp&quot;,
+    &quot;rearrange.code.on.save&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;editor.preferences.fonts.default&quot;,
+    &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
-}]]></component>
+}</component>
  <component name="RecentsManager">
    <key name="MoveFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$/docs" />
    </key>
  </component>
-  <component name="RunManager">
-    <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
+  <component name="RunManager" selected="CMake Application.kge">
+    <configuration name="imgui" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="kte" TARGET_NAME="imgui" CONFIG_NAME="Debug">
      <method v="2">
        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
      </method>
    </configuration>
+    <configuration name="kge" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" WORKING_DIR="file://$PROJECT_DIR$" PASS_PARENT_ENVS_2="true" PROJECT_NAME="kte" TARGET_NAME="kge" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="kte" RUN_TARGET_NAME="kge">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="kte" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="kte" TARGET_NAME="kte" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="kte" RUN_TARGET_NAME="kte">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <list>
+      <item itemvalue="CMake Application.imgui" />
+      <item itemvalue="CMake Application.kge" />
+      <item itemvalue="CMake Application.kte" />
+    </list>
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
@@ -153,6 +170,7 @@
      <workItem from="1764539556448" duration="156000" />
      <workItem from="1764539725338" duration="1075000" />
      <workItem from="1764542392763" duration="3512000" />
+      <workItem from="1764548345516" duration="3453000" />
    </task>
    <task id="LOCAL-00001" summary="Add undo/redo infrastructure and buffer management additions.">
      <option name="closed" value="true" />
@@ -226,7 +244,15 @@
      <option name="project" value="LOCAL" />
      <updated>1764505723411</updated>
    </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="Refactor code for consistency and enhanced functionality.&#10;&#10;- Normalize path handling for buffer operations, supporting tilde expansion and absolute paths.&#10;- Introduce `DisplayNameFor` to uniquely resolve buffer display names, minimizing filename clashes.&#10;- Add new commands: `ShowWorkingDirectory` and `ChangeWorkingDirectory`.&#10;- Refine keybindings and enhance existing commands for improved command flow.&#10;- Adjust GUI and terminal renderers to display total line counts alongside filenames.&#10;- Update coding style to align with project guidelines.">
+      <option name="closed" value="true" />
+      <created>1764550164829</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1764550164829</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -249,7 +275,8 @@
    <MESSAGE value="Remove `packaging.cmake`, deprecate `test_undo` setup, and add new testing infrastructure.&#10;&#10;- Delete `packaging.cmake` to streamline build system.&#10;- Deprecate `test_undo` in CMake setup; condition builds on `BUILD_TESTS`.&#10;- Introduce `TestFrontend`, `TestRenderer`, and `TestInputHandler` for structured testing.&#10;- Update `GUIInputHandler` and `Command` for enhanced buffer save handling and overwrite confirmation.&#10;- Enhance kill ring operations and new prompt workflows in `Editor`." />
    <MESSAGE value="Add man pages for `kge` and `kte` with installation targets in CMake.&#10;&#10;- Introduce `docs/kge.1` and `docs/kte.1` man pages covering usage, options, keybindings, and examples.&#10;- Update `CMakeLists.txt` to install man pages under `${CMAKE_INSTALL_MANDIR}/man1`.&#10;- Ensure `kge` man page installation is conditional on GUI being built." />
    <MESSAGE value="Add GUI initialization updates and improve navigation commands.&#10;&#10;- Implement terminal detachment for GUI mode to enable terminal closure post-launch.&#10;- Add `+N` support for opening files at specific line numbers and refine cursor positioning.&#10;- Introduce `JumpToLine` command for direct navigation by line number.&#10;- Enhance mouse wheel handling for line-wise scrolling." />
-    <option name="LAST_COMMIT_MESSAGE" value="Add GUI initialization updates and improve navigation commands.&#10;&#10;- Implement terminal detachment for GUI mode to enable terminal closure post-launch.&#10;- Add `+N` support for opening files at specific line numbers and refine cursor positioning.&#10;- Introduce `JumpToLine` command for direct navigation by line number.&#10;- Enhance mouse wheel handling for line-wise scrolling." />
+    <MESSAGE value="Refactor code for consistency and enhanced functionality.&#10;&#10;- Normalize path handling for buffer operations, supporting tilde expansion and absolute paths.&#10;- Introduce `DisplayNameFor` to uniquely resolve buffer display names, minimizing filename clashes.&#10;- Add new commands: `ShowWorkingDirectory` and `ChangeWorkingDirectory`.&#10;- Refine keybindings and enhance existing commands for improved command flow.&#10;- Adjust GUI and terminal renderers to display total line counts alongside filenames.&#10;- Update coding style to align with project guidelines." />
+    <option name="LAST_COMMIT_MESSAGE" value="Refactor code for consistency and enhanced functionality.&#10;&#10;- Normalize path handling for buffer operations, supporting tilde expansion and absolute paths.&#10;- Introduce `DisplayNameFor` to uniquely resolve buffer display names, minimizing filename clashes.&#10;- Add new commands: `ShowWorkingDirectory` and `ChangeWorkingDirectory`.&#10;- Refine keybindings and enhance existing commands for improved command flow.&#10;- Adjust GUI and terminal renderers to display total line counts alongside filenames.&#10;- Update coding style to align with project guidelines." />
  </component>
  <component name="XSLT-Support.FileAssociations.UIState">
    <expand />
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -1,39 +1,19 @@
 # Project Guidelines

 kte is Kyle's Text Editor — a simple, fast text editor written in C++17. It
-replaces the earlier C implementation, ke (see the ke manual in `ke.md`). The
+replaces the earlier C implementation, ke (see the ke manual in `docs/ke.md`). The
 design draws inspiration from Antirez' kilo, with keybindings rooted in the
 WordStar/VDE family and emacs. The spiritual parent is `mg(1)`.

 These guidelines summarize the goals, interfaces, key operations, and current
 development practices for kte.

-Style note: all code should be formatted with the current CLion C++ style.
-
 ## Goals

 - Keep the core small, fast, and understandable.
- Provide an ncurses-based terminal-first editing experience, with an optional ImGui GUI.
+- Provide an ncurses-based terminal-first editing experience, with an additional ImGui GUI.
 - Preserve familiar keybindings from ke while modernizing the internals.
- Favor simple data structures (e.g., gap buffer) and incremental evolution.
-
-## Interfaces
-
- Command-line interface: the primary interface today.
- GUI: planned ImGui-based interface.
-
-## Build and Run
-
-Prerequisites: a C++17 compiler, CMake, and ncurses development headers/libs.
-
- macOS (Homebrew): `brew install ncurses`
- Debian/Ubuntu: `sudo apt-get install libncurses5-dev libncursesw5-dev`
-
- Configure and build (example):
-    - `cmake -S . -B cmake-build-debug -DCMAKE_BUILD_TYPE=Debug`
-    - `cmake --build cmake-build-debug`
- Run:
-    - `./cmake-build-debug/kte [files]`
+- Favor simple data structures (e.g., piece table) and incremental evolution.

 Project entry point: `main.cpp`

@@ -52,31 +32,12 @@ Project entry point: `main.cpp`

 ## Keybindings (inherited from ke)

-kte aims to maintain ke’s command model while internals evolve. See `ke.md` for
-the full reference. Highlights:
-
- K-command prefix: `C-k` enters k-command mode; exit with `ESC` or `C-g`.
- Save/Exit: `C-k s` (save), `C-k x` or `C-k C-x` (save and exit), `C-k q` (quit
-  with confirm), `C-k C-q` (quit immediately).
- Editing: `C-k d` (kill to EOL), `C-k C-d` (kill line), `C-k BACKSPACE` (kill
-  to BOL), `C-w` (kill region), `C-y` (yank), `C-u` (universal argument).
- Navigation/Search: `C-s` (incremental find), `C-r` (regex search), `ESC f/b`
-  (word next/prev), `ESC BACKSPACE` (delete previous word).
- Buffers/Files: `C-k e` (open), `C-k b`/`C-k p` (switch), `C-k c` (close),
-  `C-k C-r` (reload).
- Misc: `C-l` (refresh), `C-g` (cancel), `C-k m` (run make), `C-k g` (goto line).
-
-Known behavior from ke retained for now:
-
- Incremental search navigates results with arrow keys; search restarts from
-  the top on each invocation (known bug to be revisited).
+The file `docs/ke.md` contains the canonical reference for keybindings.

 ## Contributing/Development Notes

 - C++ standard: C++17.
- Style: match existing file formatting and minimal-comment style.
- Keep dependencies minimal; ImGui integration will be isolated behind a GUI
-  module.
+- Keep dependencies minimal.
 - Prefer small, focused changes that preserve ke’s UX unless explicitly changing
  behavior.

--- a/Buffer.cc
+++ b/Buffer.cc
@@ -5,6 +5,7 @@
 #include <fstream>
 #include <sstream>
 #include <filesystem>
+#include <cstdlib>


 Buffer::Buffer()
@@ -129,12 +130,36 @@ Buffer::operator=(Buffer &&other) noexcept
 bool
 Buffer::OpenFromFile(const std::string &path, std::string &err)
 {
+	auto normalize_path = [](const std::string &in) -> std::string {
+		std::string expanded = in;
+		// Expand leading '~' to HOME
+		if (!expanded.empty() && expanded[0] == '~') {
+			const char *home = std::getenv("HOME");
+			if (home && expanded.size() >= 2 && (expanded[1] == '/' || expanded[1] == '\\')) {
+				expanded = std::string(home) + expanded.substr(1);
+			} else if (home && expanded.size() == 1) {
+				expanded = std::string(home);
+			}
+		}
+		try {
+			std::filesystem::path p(expanded);
+			if (std::filesystem::exists(p)) {
+				return std::filesystem::canonical(p).string();
+			}
+			return std::filesystem::absolute(p).string();
+		} catch (...) {
+			// On any error, fall back to input
+			return expanded;
+		}
+	};
+
+	const std::string norm = normalize_path(path);
 	// If the file doesn't exist, initialize an empty, non-file-backed buffer
 	// with the provided filename. Do not touch the filesystem until Save/SaveAs.
-	if (!std::filesystem::exists(path)) {
+	if (!std::filesystem::exists(norm)) {
 		rows_.clear();
 		nrows_          = 0;
-		filename_       = path;
+		filename_       = norm;
 		is_file_backed_ = false;
 		dirty_          = false;

@@ -147,9 +172,9 @@ Buffer::OpenFromFile(const std::string &path, std::string &err)
 		return true;
 	}

-	std::ifstream in(path, std::ios::in | std::ios::binary);
+	std::ifstream in(norm, std::ios::in | std::ios::binary);
 	if (!in) {
-		err = "Failed to open file: " + path;
+		err = "Failed to open file: " + norm;
 		return false;
 	}

@@ -194,7 +219,7 @@ Buffer::OpenFromFile(const std::string &path, std::string &err)
 	}

 	nrows_          = rows_.size();
-	filename_       = path;
+	filename_       = norm;
 	is_file_backed_ = true;
 	dirty_          = false;

@@ -250,10 +275,29 @@ Buffer::Save(std::string &err) const
 bool
 Buffer::SaveAs(const std::string &path, std::string &err)
 {
+	// Normalize output path first
+	std::string out_path;
+	try {
+		std::filesystem::path p(path);
+		// Do a light expansion of '~'
+		std::string expanded = path;
+		if (!expanded.empty() && expanded[0] == '~') {
+			const char *home = std::getenv("HOME");
+			if (home && expanded.size() >= 2 && (expanded[1] == '/' || expanded[1] == '\\'))
+				expanded = std::string(home) + expanded.substr(1);
+			else if (home && expanded.size() == 1)
+				expanded = std::string(home);
+		}
+		std::filesystem::path ep(expanded);
+		out_path = std::filesystem::absolute(ep).string();
+	} catch (...) {
+		out_path = path;
+	}
+
 	// Write to the given path
-	std::ofstream out(path, std::ios::out | std::ios::binary | std::ios::trunc);
+	std::ofstream out(out_path, std::ios::out | std::ios::binary | std::ios::trunc);
 	if (!out) {
-		err = "Failed to open for write: " + path;
+		err = "Failed to open for write: " + out_path;
 		return false;
 	}
 	for (std::size_t i = 0; i < rows_.size(); ++i) {
@@ -270,7 +314,7 @@ Buffer::SaveAs(const std::string &path, std::string &err)
 		return false;
 	}

-	filename_       = path;
+	filename_       = out_path;
 	is_file_backed_ = true;
 	dirty_          = false;
 	return true;
@@ -303,8 +347,8 @@ Buffer::insert_text(int row, int col, std::string_view text)
 	if (static_cast<std::size_t>(row) >= rows_.size())
 		rows_.emplace_back("");

-	std::size_t y = static_cast<std::size_t>(row);
-	std::size_t x = static_cast<std::size_t>(col);
+	auto y = static_cast<std::size_t>(row);
+	auto x = static_cast<std::size_t>(col);
 	if (x > rows_[y].size())
 		x = rows_[y].size();

@@ -340,13 +384,13 @@ Buffer::delete_text(int row, int col, std::size_t len)
 		row = 0;
 	if (static_cast<std::size_t>(row) >= rows_.size())
 		return;
-	std::size_t y = static_cast<std::size_t>(row);
-	std::size_t x = std::min<std::size_t>(static_cast<std::size_t>(col), rows_[y].size());
+	const auto y = static_cast<std::size_t>(row);
+	const auto x = std::min<std::size_t>(static_cast<std::size_t>(col), rows_[y].size());

 	std::size_t remaining = len;
 	while (remaining > 0 && y < rows_.size()) {
-		auto &line          = rows_[y];
-		std::size_t in_line = std::min<std::size_t>(remaining, line.size() - std::min(x, line.size()));
+		auto &line                = rows_[y];
+		const std::size_t in_line = std::min<std::size_t>(remaining, line.size() - std::min(x, line.size()));
 		if (x < line.size() && in_line > 0) {
 			line.erase(x, in_line);
 			remaining -= in_line;
@@ -370,15 +414,18 @@ Buffer::delete_text(int row, int col, std::size_t len)


 void
-Buffer::split_line(int row, int col)
+Buffer::split_line(int row, const int col)
 {
-	if (row < 0)
+	if (row < 0) {
 		row = 0;
-	if (static_cast<std::size_t>(row) >= rows_.size())
+	}
+
+	if (static_cast<std::size_t>(row) >= rows_.size()) {
 		rows_.resize(static_cast<std::size_t>(row) + 1);
-	std::size_t y    = static_cast<std::size_t>(row);
-	std::size_t x    = std::min<std::size_t>(static_cast<std::size_t>(col), rows_[y].size());
-	std::string tail = rows_[y].substr(x);
+	}
+	const auto y    = static_cast<std::size_t>(row);
+	const auto x    = std::min<std::size_t>(static_cast<std::size_t>(col), rows_[y].size());
+	const auto tail = rows_[y].substr(x);
 	rows_[y].erase(x);
 	rows_.insert(rows_.begin() + static_cast<std::ptrdiff_t>(y + 1), tail);
 }
@@ -387,24 +434,28 @@ Buffer::split_line(int row, int col)
 void
 Buffer::join_lines(int row)
 {
-	if (row < 0)
+	if (row < 0) {
 		row = 0;
-	std::size_t y = static_cast<std::size_t>(row);
-	if (y + 1 >= rows_.size())
+	}
+
+	const auto y = static_cast<std::size_t>(row);
+	if (y + 1 >= rows_.size()) {
 		return;
+	}
+
 	rows_[y] += rows_[y + 1];
 	rows_.erase(rows_.begin() + static_cast<std::ptrdiff_t>(y + 1));
 }


 void
-Buffer::insert_row(int row, std::string_view text)
+Buffer::insert_row(int row, const std::string_view text)
 {
 	if (row < 0)
 		row = 0;
 	if (static_cast<std::size_t>(row) > rows_.size())
 		row = static_cast<int>(rows_.size());
-	rows_.insert(rows_.begin() + static_cast<std::ptrdiff_t>(row), std::string(text));
+	rows_.insert(rows_.begin() + row, std::string(text));
 }


@@ -415,7 +466,7 @@ Buffer::delete_row(int row)
 		row = 0;
 	if (static_cast<std::size_t>(row) >= rows_.size())
 		return;
-	rows_.erase(rows_.begin() + static_cast<std::ptrdiff_t>(row));
+	rows_.erase(rows_.begin() + row);
 }


--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(kte)
 include(GNUInstallDirs)

 set(CMAKE_CXX_STANDARD 17)
-set(KTE_VERSION "0.9.1")
+set(KTE_VERSION "0.9.2")

 # Default to terminal-only build to avoid SDL/OpenGL dependency by default.
 # Enable with -DBUILD_GUI=ON when SDL2/OpenGL/Freetype are available.
--- a/Command.cc
+++ b/Command.cc
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <filesystem>
+#include <cstdlib>

 #include "Command.h"
 #include "Editor.h"
@@ -453,6 +454,36 @@ cmd_save(CommandContext &ctx)
 }


+// --- Working directory commands ---
+static bool
+cmd_show_working_directory(CommandContext &ctx)
+{
+	try {
+		std::filesystem::path cwd = std::filesystem::current_path();
+		ctx.editor.SetStatus(std::string("cwd: ") + cwd.string());
+		return true;
+	} catch (const std::exception &e) {
+		ctx.editor.SetStatus(std::string("cwd: <error> ") + e.what());
+		return false;
+	}
+}
+
+
+static bool
+cmd_change_working_directory_start(CommandContext &ctx)
+{
+	std::string initial;
+	try {
+		initial = std::filesystem::current_path().string();
+	} catch (...) {
+		initial.clear();
+	}
+	ctx.editor.StartPrompt(Editor::PromptKind::Chdir, "chdir", initial);
+	ctx.editor.SetStatus(std::string("chdir: ") + ctx.editor.PromptText());
+	return true;
+}
+
+
 static bool
 cmd_save_as(CommandContext &ctx)
 {
@@ -762,43 +793,141 @@ cmd_insert_text(CommandContext &ctx)
 	}
 	// If a prompt is active, edit prompt text
 	if (ctx.editor.PromptActive()) {
-		// Special-case: buffer switch prompt supports Tab-completion
-		if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::BufferSwitch && ctx.arg == "\t") {
-			// Complete against buffer names (path and basename)
-			const std::string prefix = ctx.editor.PromptText();
-			std::vector<std::pair<std::string, std::size_t> > cands; // name, index
-			const auto &bs = ctx.editor.Buffers();
-			for (std::size_t i = 0; i < bs.size(); ++i) {
-				std::string full = buffer_display_name(bs[i]);
-				std::string base = buffer_basename(bs[i]);
-				if (full.rfind(prefix, 0) == 0) {
-					cands.emplace_back(full, i);
+		// Special-case: Tab-completion for prompts
+		if (ctx.arg == "\t") {
+			auto kind = ctx.editor.CurrentPromptKind();
+			// Buffer switch prompt supports Tab-completion on buffer names
+			if (kind == Editor::PromptKind::BufferSwitch) {
+				// Complete against buffer names (path and basename)
+				const std::string prefix = ctx.editor.PromptText();
+				std::vector<std::pair<std::string, std::size_t> > cands; // name, index
+				const auto &bs = ctx.editor.Buffers();
+				for (std::size_t i = 0; i < bs.size(); ++i) {
+					std::string full = buffer_display_name(bs[i]);
+					std::string base = buffer_basename(bs[i]);
+					if (full.rfind(prefix, 0) == 0) {
+						cands.emplace_back(full, i);
+					}
+					if (base.rfind(prefix, 0) == 0 && base != full) {
+						cands.emplace_back(base, i);
+					}
 				}
-				if (base.rfind(prefix, 0) == 0 && base != full) {
-					cands.emplace_back(base, i);
+				if (cands.empty()) {
+					// no change
+				} else if (cands.size() == 1) {
+					ctx.editor.SetPromptText(cands[0].first);
+				} else {
+					// extend to longest common prefix
+					std::string lcp = cands[0].first;
+					for (std::size_t i = 1; i < cands.size(); ++i) {
+						const std::string &s = cands[i].first;
+						std::size_t j        = 0;
+						while (j < lcp.size() && j < s.size() && lcp[j] == s[j])
+							++j;
+						lcp.resize(j);
+						if (lcp.empty())
+							break;
+					}
+					if (!lcp.empty() && lcp != ctx.editor.PromptText())
+						ctx.editor.SetPromptText(lcp);
 				}
+				ctx.editor.SetStatus(ctx.editor.PromptLabel() + ": " + ctx.editor.PromptText());
+				return true;
 			}
-			if (cands.empty()) {
-				// no change
-			} else if (cands.size() == 1) {
-				ctx.editor.SetPromptText(cands[0].first);
-			} else {
-				// extend to longest common prefix
-				std::string lcp = cands[0].first;
-				for (std::size_t i = 1; i < cands.size(); ++i) {
-					const std::string &s = cands[i].first;
-					std::size_t j        = 0;
-					while (j < lcp.size() && j < s.size() && lcp[j] == s[j])
-						++j;
-					lcp.resize(j);
-					if (lcp.empty())
-						break;
+
+			// File path completion for OpenFile/SaveAs/Chdir
+			if (kind == Editor::PromptKind::OpenFile || kind == Editor::PromptKind::SaveAs
+			    || kind == Editor::PromptKind::Chdir) {
+				auto expand_user_path = [](const std::string &in) -> std::string {
+					if (!in.empty() && in[0] == '~') {
+						const char *home = std::getenv("HOME");
+						if (home && in.size() == 1)
+							return std::string(home);
+						if (home && (in.size() > 1) && (in[1] == '/' || in[1] == '\\')) {
+							std::string rest = in.substr(1); // keep leading slash
+							return std::string(home) + rest;
+						}
+					}
+					return in;
+				};
+
+				std::string text = ctx.editor.PromptText();
+				// Build a path and split dir + base prefix
+				std::string expanded = expand_user_path(text);
+				std::filesystem::path p(expanded);
+				std::filesystem::path dir;
+				std::string base;
+				if (expanded.empty()) {
+					dir = std::filesystem::current_path();
+					base.clear();
+				} else if (std::filesystem::is_directory(p)) {
+					dir = p;
+					base.clear();
+				} else {
+					dir  = p.parent_path();
+					base = p.filename().string();
+					if (dir.empty())
+						dir = std::filesystem::current_path();
 				}
-				if (!lcp.empty() && lcp != ctx.editor.PromptText())
-					ctx.editor.SetPromptText(lcp);
+
+				std::error_code ec;
+				std::vector<std::filesystem::directory_entry> entries;
+				std::filesystem::directory_iterator it(dir, ec), end;
+				for (; !ec && it != end; it.increment(ec)) {
+					entries.push_back(*it);
+				}
+				// Filter by base prefix
+				std::vector<std::string> cands;
+				for (const auto &de: entries) {
+					std::string name = de.path().filename().string();
+					if (base.empty() || name.rfind(base, 0) == 0) {
+						std::string candidate = (dir / name).string();
+						// For dirs, add trailing slash hint
+						if (de.is_directory(ec))
+							candidate += "/";
+						cands.push_back(candidate);
+					}
+				}
+				// If no candidates, keep as-is
+				if (cands.empty()) {
+					// no-op
+				} else if (cands.size() == 1) {
+					ctx.editor.SetPromptText(cands[0]);
+				} else {
+					// Longest common prefix of display strings
+					auto lcp = cands[0];
+					for (size_t i = 1; i < cands.size(); ++i) {
+						const auto &s = cands[i];
+						size_t j      = 0;
+						while (j < lcp.size() && j < s.size() && lcp[j] == s[j])
+							++j;
+						lcp.resize(j);
+						if (lcp.empty())
+							break;
+					}
+					if (!lcp.empty() && lcp != ctx.editor.PromptText()) {
+						ctx.editor.SetPromptText(lcp);
+					} else {
+						// Show some choices in status (trim to avoid spam)
+						std::string msg = ctx.editor.PromptLabel() + ": ";
+						size_t shown    = 0;
+						for (const auto &s: cands) {
+							if (shown >= 10) {
+								msg += " …";
+								break;
+							}
+							if (shown > 0)
+								msg += ' ';
+							msg += std::filesystem::path(s).filename().string();
+							++shown;
+						}
+						ctx.editor.SetStatus(msg);
+						return true;
+					}
+				}
+				ctx.editor.SetStatus(ctx.editor.PromptLabel() + ": " + ctx.editor.PromptText());
+				return true;
 			}
-			ctx.editor.SetStatus(ctx.editor.PromptLabel() + ": " + ctx.editor.PromptText());
-			return true;
 		}

 		ctx.editor.AppendPromptText(ctx.arg);
@@ -909,6 +1038,20 @@ cmd_newline(CommandContext &ctx)
 				ensure_cursor_visible(ctx.editor, *b);
 		} else if (kind == Editor::PromptKind::OpenFile) {
 			std::string err;
+			// Expand "~" to the user's home directory
+			auto expand_user_path = [](const std::string &in) -> std::string {
+				if (!in.empty() && in[0] == '~') {
+					const char *home = std::getenv("HOME");
+					if (home && in.size() == 1)
+						return std::string(home);
+					if (home && (in.size() > 1) && (in[1] == '/' || in[1] == '\\')) {
+						std::string rest = in.substr(1);
+						return std::string(home) + rest;
+					}
+				}
+				return in;
+			};
+			value = expand_user_path(value);
 			if (value.empty()) {
 				ctx.editor.SetStatus("Open canceled (empty)");
 			} else if (!ctx.editor.OpenFile(value, err)) {
@@ -953,6 +1096,21 @@ cmd_newline(CommandContext &ctx)
 				if (!buf) {
 					ctx.editor.SetStatus("No buffer to save");
 				} else {
+					// Expand "~" for save path
+					auto expand_user_path = [](const std::string &in) -> std::string {
+						if (!in.empty() && in[0] == '~') {
+							const char *home = std::getenv("HOME");
+							if (home && in.size() == 1)
+								return std::string(home);
+							if (home && (in.size() > 1) && (
+								    in[1] == '/' || in[1] == '\\')) {
+								std::string rest = in.substr(1);
+								return std::string(home) + rest;
+							}
+						}
+						return in;
+					};
+					value = expand_user_path(value);
 					// If this is a first-time save (unnamed/non-file-backed) and the
 					// target exists, ask for confirmation before overwriting.
 					if (!buf->IsFileBacked() && std::filesystem::exists(value)) {
@@ -1031,6 +1189,43 @@ cmd_newline(CommandContext &ctx)
 			buf->SetCursor(0, y);
 			ensure_cursor_visible(ctx.editor, *buf);
 			ctx.editor.SetStatus("Goto line " + std::to_string(line1));
+		} else if (kind == Editor::PromptKind::Chdir) {
+			// Attempt to change the current working directory
+			if (value.empty()) {
+				ctx.editor.SetStatus("chdir canceled (empty)");
+				return true;
+			}
+			try {
+				// Expand "~" for chdir
+				auto expand_user_path = [](const std::string &in) -> std::string {
+					if (!in.empty() && in[0] == '~') {
+						const char *home = std::getenv("HOME");
+						if (home && in.size() == 1)
+							return std::string(home);
+						if (home && (in.size() > 1) && (in[1] == '/' || in[1] == '\\')) {
+							std::string rest = in.substr(1);
+							return std::string(home) + rest;
+						}
+					}
+					return in;
+				};
+				value = expand_user_path(value);
+				std::filesystem::path p(value);
+				std::error_code ec;
+				// Expand if value is relative: resolve against current_path implicitly
+				if (!std::filesystem::exists(p, ec)) {
+					ctx.editor.SetStatus(std::string("chdir: no such path: ") + value);
+					return true;
+				}
+				if (!std::filesystem::is_directory(p, ec)) {
+					ctx.editor.SetStatus(std::string("chdir: not a directory: ") + value);
+					return true;
+				}
+				std::filesystem::current_path(p);
+				ctx.editor.SetStatus(std::string("cwd: ") + std::filesystem::current_path().string());
+			} catch (const std::exception &e) {
+				ctx.editor.SetStatus(std::string("chdir failed: ") + e.what());
+			}
 		}
 		return true;
 	}
@@ -2435,6 +2630,15 @@ InstallDefaultCommands()
 		CommandId::MarkAllAndJumpEnd, "mark-all-jump-end", "Set mark at beginning and jump to end",
 		cmd_mark_all_and_jump_end
 	});
+	// Working directory
+	CommandRegistry::Register({
+		CommandId::ShowWorkingDirectory, "show-working-directory", "Show current working directory",
+		cmd_show_working_directory
+	});
+	CommandRegistry::Register({
+		CommandId::ChangeWorkingDirectory, "change-working-directory", "Change current working directory",
+		cmd_change_working_directory_start
+	});
 	// UI helpers
 	CommandRegistry::Register(
 		{CommandId::UArgStatus, "uarg-status", "Update universal-arg status", cmd_uarg_status});
--- a/Command.h
+++ b/Command.h
@@ -74,6 +74,8 @@ enum class CommandId {
 	MarkAllAndJumpEnd, // set mark at beginning, jump to end (C-k a)
 	// Direct navigation by line number
 	JumpToLine, // prompt for line and jump (C-k g)
+	ShowWorkingDirectory, // Display the current working directory in the editor message.
+	ChangeWorkingDirectory, // Change the editor's current directory.
 	// Meta
 	UnknownKCommand, // arg: single character that was not recognized after C-k
 };
--- a/Editor.cc
+++ b/Editor.cc
@@ -2,6 +2,7 @@

 #include <algorithm>
 #include <utility>
+#include <filesystem>


 Editor::Editor() = default;
@@ -43,6 +44,78 @@ Editor::CurrentBuffer() const
 }


+static std::vector<std::filesystem::path>
+split_reverse(const std::filesystem::path &p)
+{
+	std::vector<std::filesystem::path> parts;
+	for (auto it = p; !it.empty(); it = it.parent_path()) {
+		if (it == it.parent_path()) {
+			// root or single element
+			if (!it.empty())
+				parts.push_back(it);
+			break;
+		}
+		parts.push_back(it.filename());
+	}
+	return parts; // from leaf toward root
+}
+
+
+std::string
+Editor::DisplayNameFor(const Buffer &buf) const
+{
+	std::string full = buf.Filename();
+	if (full.empty())
+		return std::string("[no name]");
+
+	std::filesystem::path target(full);
+	auto target_parts = split_reverse(target);
+	if (target_parts.empty())
+		return target.filename().string();
+
+	// Prepare list of other buffer paths
+	std::vector<std::vector<std::filesystem::path> > others;
+	others.reserve(buffers_.size());
+	for (const auto &b: buffers_) {
+		if (&b == &buf)
+			continue;
+		if (b.Filename().empty())
+			continue;
+		others.push_back(split_reverse(std::filesystem::path(b.Filename())));
+	}
+
+	// Increase suffix length until unique among others
+	std::size_t need = 1; // at least basename
+	for (;;) {
+		// Build candidate suffix for target
+		std::filesystem::path cand;
+		for (std::size_t i = 0; i < need && i < target_parts.size(); ++i) {
+			cand = std::filesystem::path(target_parts[i]) / cand;
+		}
+		// Compare against others
+		bool clash = false;
+		for (const auto &o_parts: others) {
+			std::filesystem::path ocand;
+			for (std::size_t i = 0; i < need && i < o_parts.size(); ++i) {
+				ocand = std::filesystem::path(o_parts[i]) / ocand;
+			}
+			if (ocand == cand) {
+				clash = true;
+				break;
+			}
+		}
+		if (!clash || need >= target_parts.size()) {
+			std::string s = cand.string();
+			// Remove any trailing slash that may appear from root joining
+			if (!s.empty() && (s.back() == '/' || s.back() == '\\'))
+				s.pop_back();
+			return s;
+		}
+		++need;
+	}
+}
+
+
 std::size_t
 Editor::AddBuffer(const Buffer &buf)
 {
--- a/Editor.h
+++ b/Editor.h
@@ -302,7 +302,7 @@ public:


 	// --- Generic Prompt subsystem (for search, open-file, save-as, etc.) ---
-	enum class PromptKind { None = 0, Search, OpenFile, SaveAs, Confirm, BufferSwitch, GotoLine };
+	enum class PromptKind { None = 0, Search, OpenFile, SaveAs, Confirm, BufferSwitch, GotoLine, Chdir };


 	void StartPrompt(PromptKind kind, const std::string &label, const std::string &initial)
@@ -409,6 +409,11 @@ public:

 	const Buffer *CurrentBuffer() const;

+	// Compute a display-friendly short name for a buffer path that is the
+	// shortest unique suffix among all open buffers. If buffer has no name,
+	// returns "[no name]".
+	[[nodiscard]] std::string DisplayNameFor(const Buffer &buf) const;
+
 	// Add an existing buffer (copy/move) or open from file path
 	std::size_t AddBuffer(const Buffer &buf);

--- a/GUIRenderer.cc
+++ b/GUIRenderer.cc
@@ -8,6 +8,8 @@
 #include <cstdio>
 #include <string>
 #include <filesystem>
+#include <cmath>
+#include <limits>

 // Version string expected to be provided by build system as KTE_VERSION_STR
 #ifndef KTE_VERSION_STR
@@ -63,30 +65,45 @@ GUIRenderer::Draw(Editor &ed)
 		bool forced_scroll = false;
 		{
 			static long prev_buf_rowoffs = -1; // previous frame's Buffer::Rowoffs
+			static long prev_buf_coloffs = -1; // previous frame's Buffer::Coloffs
 			static float prev_scroll_y   = -1.0f; // previous frame's ImGui scroll Y in pixels
+			static float prev_scroll_x   = -1.0f; // previous frame's ImGui scroll X in pixels

 			const long buf_rowoffs = static_cast<long>(buf->Rowoffs());
+			const long buf_coloffs = static_cast<long>(buf->Coloffs());
 			const long scroll_top  = static_cast<long>(scroll_y / row_h);
+			const long scroll_left = static_cast<long>(scroll_x / space_w);

 			// Detect programmatic change (e.g., keyboard navigation ensured visibility)
 			if (prev_buf_rowoffs >= 0 && buf_rowoffs != prev_buf_rowoffs) {
 				ImGui::SetScrollY(static_cast<float>(buf_rowoffs) * row_h);
 				scroll_y      = ImGui::GetScrollY();
 				forced_scroll = true;
-			} else {
-				// If user scrolled (scroll_y changed), update buffer row offset accordingly
-				if (prev_scroll_y >= 0.0f && scroll_y != prev_scroll_y) {
-					if (Buffer *mbuf = const_cast<Buffer *>(buf)) {
-						// Keep horizontal offset owned by GUI; only update vertical offset here
-						mbuf->SetOffsets(static_cast<std::size_t>(std::max(0L, scroll_top)),
-						                 mbuf->Coloffs());
-					}
+			}
+			if (prev_buf_coloffs >= 0 && buf_coloffs != prev_buf_coloffs) {
+				ImGui::SetScrollX(static_cast<float>(buf_coloffs) * space_w);
+				scroll_x      = ImGui::GetScrollX();
+				forced_scroll = true;
+			}
+			// If user scrolled, update buffer offsets accordingly
+			if (prev_scroll_y >= 0.0f && scroll_y != prev_scroll_y) {
+				if (Buffer *mbuf = const_cast<Buffer *>(buf)) {
+					mbuf->SetOffsets(static_cast<std::size_t>(std::max(0L, scroll_top)),
+					                 mbuf->Coloffs());
+				}
+			}
+			if (prev_scroll_x >= 0.0f && scroll_x != prev_scroll_x) {
+				if (Buffer *mbuf = const_cast<Buffer *>(buf)) {
+					mbuf->SetOffsets(mbuf->Rowoffs(),
+					                 static_cast<std::size_t>(std::max(0L, scroll_left)));
 				}
 			}

 			// Update trackers for next frame
 			prev_buf_rowoffs = static_cast<long>(buf->Rowoffs());
+			prev_buf_coloffs = static_cast<long>(buf->Coloffs());
 			prev_scroll_y    = ImGui::GetScrollY();
+			prev_scroll_x    = ImGui::GetScrollX();
 		}
 		// Synchronize cursor and scrolling.
 		// Ensure the cursor is visible even on the first frame or when it didn't move,
@@ -120,61 +137,127 @@ GUIRenderer::Draw(Editor &ed)
 		// Handle mouse click before rendering to avoid dependent on drawn items
 		if (ImGui::IsWindowHovered() && ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
 			ImVec2 mp = ImGui::GetIO().MousePos;
-			// Map Y to row
-			float rel_y = scroll_y + (mp.y - list_origin.y);
-			long row    = static_cast<long>(rel_y / row_h);
-			if (row < 0)
-				row = 0;
-			if (row >= static_cast<long>(lines.size()))
-				row = static_cast<long>(lines.empty() ? 0 : (lines.size() - 1));
-			// Map X to column by measuring text width
-			std::size_t col = 0;
-			if (!lines.empty()) {
-				const std::string &line = lines[static_cast<std::size_t>(row)];
-				float rel_x             = scroll_x + (mp.x - list_origin.x);
-				if (rel_x <= 0.0f) {
-					col = 0;
-				} else {
-					float prev_w = 0.0f;
-					for (std::size_t i = 1; i <= line.size(); ++i) {
-						ImVec2 sz = ImGui::CalcTextSize(
-							line.c_str(), line.c_str() + static_cast<long>(i));
-						if (sz.x >= rel_x) {
-							// Pick closer between i-1 and i
-							float d_prev = rel_x - prev_w;
-							float d_curr = sz.x - rel_x;
-							col          = (d_prev <= d_curr) ? (i - 1) : i;
-							break;
-						}
-						prev_w = sz.x;
-						if (i == line.size()) {
-							// clicked beyond EOL
-							float eol_w = sz.x;
-							col         = (rel_x > eol_w + space_w * 0.5f)
-								      ? line.size()
-								      : line.size();
-						}
+			// Compute viewport-relative row so (0) is top row of the visible area
+			float vy_f = (mp.y - list_origin.y - scroll_y) / row_h;
+			long vy    = static_cast<long>(vy_f);
+			if (vy < 0)
+				vy = 0;
+
+			// Clamp vy within visible content height to avoid huge jumps
+			ImVec2 cr_min = ImGui::GetWindowContentRegionMin();
+			ImVec2 cr_max = ImGui::GetWindowContentRegionMax();
+			float child_h = (cr_max.y - cr_min.y);
+			long vis_rows = static_cast<long>(child_h / row_h);
+			if (vis_rows < 1)
+				vis_rows = 1;
+			if (vy >= vis_rows)
+				vy = vis_rows - 1;
+
+			// Translate viewport row to buffer row using Buffer::Rowoffs
+			std::size_t by = buf->Rowoffs() + static_cast<std::size_t>(vy);
+			if (by >= lines.size()) {
+				if (!lines.empty())
+					by = lines.size() - 1;
+				else
+					by = 0;
+			}
+
+			// Compute desired pixel X inside the viewport content (subtract horizontal scroll)
+			float px = (mp.x - list_origin.x - scroll_x);
+			if (px < 0.0f)
+				px = 0.0f;
+
+			// Convert pixel X to a render-column target including horizontal col offset
+			// Use our own tab expansion of width 8 to match command layer logic.
+			const std::string &line_clicked = lines[by];
+			const std::size_t tabw          = 8;
+			// We iterate source columns computing absolute rendered column (rx_abs) from 0,
+			// then translate to viewport-space by subtracting Coloffs.
+			std::size_t coloffs = buf->Coloffs();
+			std::size_t rx_abs  = 0; // absolute rendered column
+			std::size_t i       = 0; // source column iterator
+
+			// Fast-forward i until rx_abs >= coloffs to align with leftmost visible column
+			if (!line_clicked.empty() && coloffs > 0) {
+				while (i < line_clicked.size() && rx_abs < coloffs) {
+					if (line_clicked[i] == '\t') {
+						rx_abs += (tabw - (rx_abs % tabw));
+					} else {
+						rx_abs += 1;
 					}
+					++i;
 				}
 			}
-			// Dispatch command to move cursor
+
+			// Now search for closest source column to clicked px within/after viewport
+			std::size_t best_col = i; // default to first visible column
+			float best_dist      = std::numeric_limits<float>::infinity();
+			while (true) {
+				// For i in [current..size], evaluate candidate including the implicit end position
+				std::size_t rx_view = (rx_abs >= coloffs) ? (rx_abs - coloffs) : 0;
+				float rx_px         = static_cast<float>(rx_view) * space_w;
+				float dist          = std::fabs(px - rx_px);
+				if (dist <= best_dist) {
+					best_dist = dist;
+					best_col  = i;
+				}
+				if (i == line_clicked.size())
+					break;
+				// advance to next source column
+				if (line_clicked[i] == '\t') {
+					rx_abs += (tabw - (rx_abs % tabw));
+				} else {
+					rx_abs += 1;
+				}
+				++i;
+			}
+
+			// Dispatch absolute buffer coordinates (row:col)
 			char tmp[64];
-			std::snprintf(tmp, sizeof(tmp), "%ld:%zu", row, col);
+			std::snprintf(tmp, sizeof(tmp), "%zu:%zu", by, best_col);
 			Execute(ed, CommandId::MoveCursorTo, std::string(tmp));
 		}
+		// Cache current horizontal offset in rendered columns
+		const std::size_t coloffs_now = buf->Coloffs();
 		for (std::size_t i = rowoffs; i < lines.size(); ++i) {
 			// Capture the screen position before drawing the line
 			ImVec2 line_pos         = ImGui::GetCursorScreenPos();
 			const std::string &line = lines[i];
-			ImGui::TextUnformatted(line.c_str());
+
+			// Expand tabs to spaces with width=8 and apply horizontal scroll offset
+			const std::size_t tabw = 8;
+			std::string expanded;
+			expanded.reserve(line.size() + 16);
+			std::size_t rx_abs_draw = 0; // rendered column for drawing
+			// Emit entire line (ImGui child scrolling will handle clipping)
+			for (std::size_t src = 0; src < line.size(); ++src) {
+				char c = line[src];
+				if (c == '\t') {
+					std::size_t adv = (tabw - (rx_abs_draw % tabw));
+					// Emit spaces for the tab
+					expanded.append(adv, ' ');
+					rx_abs_draw += adv;
+				} else {
+					expanded.push_back(c);
+					rx_abs_draw += 1;
+				}
+			}
+
+			ImGui::TextUnformatted(expanded.c_str());

 			// Draw a visible cursor indicator on the current line
 			if (i == cy) {
-				// Compute X offset by measuring text width up to cursor column
-				std::size_t px_count = std::min(cx, line.size());
-				ImVec2 pre_sz        = ImGui::CalcTextSize(line.c_str(),
-				                                    line.c_str() + static_cast<long>(px_count));
-				ImVec2 p0 = ImVec2(line_pos.x + pre_sz.x, line_pos.y);
+				// Compute rendered X (rx) from source column with tab expansion
+				std::size_t rx_abs = 0;
+				for (std::size_t k = 0; k < std::min(cx, line.size()); ++k) {
+					if (line[k] == '\t')
+						rx_abs += (tabw - (rx_abs % tabw));
+					else
+						rx_abs += 1;
+				}
+				// Convert to viewport x by subtracting horizontal col offset
+				std::size_t rx_viewport = (rx_abs > coloffs_now) ? (rx_abs - coloffs_now) : 0;
+				ImVec2 p0 = ImVec2(line_pos.x + static_cast<float>(rx_viewport) * space_w, line_pos.y);
 				ImVec2 p1 = ImVec2(p0.x + space_w, p0.y + line_h);
 				ImU32 col = IM_COL32(200, 200, 255, 128); // soft highlight
 				ImGui::GetWindowDrawList()->AddRectFilled(p0, p1, col);
@@ -204,18 +287,26 @@ GUIRenderer::Draw(Editor &ed)
 		left += "kge"; // GUI app name
 		left += " ";
 		left += KTE_VERSION_STR;
-		std::string fname = buf->Filename();
-		if (!fname.empty()) {
+		std::string fname;
+		try {
+			fname = ed.DisplayNameFor(*buf);
+		} catch (...) {
+			fname = buf->Filename();
 			try {
 				fname = std::filesystem::path(fname).filename().string();
 			} catch (...) {}
-		} else {
-			fname = "[no name]";
 		}
 		left += "  ";
 		left += fname;
 		if (buf->Dirty())
 			left += " *";
+		// Append total line count as "<n>L"
+		{
+			unsigned long lcount = static_cast<unsigned long>(buf->Rows().size());
+			left += " ";
+			left += std::to_string(lcount);
+			left += "L";
+		}

 		// Build right text (cursor/mark)
 		int row1       = static_cast<int>(buf->Cury()) + 1;
--- a/KKeymap.cc
+++ b/KKeymap.cc
@@ -1,5 +1,8 @@
 #include "KKeymap.h"
+
+#include <iostream>
 #include <ncurses.h>
+#include <ostream>


 auto
@@ -13,17 +16,15 @@ KLookupKCommand(const int ascii_key, const bool ctrl, CommandId &out) -> bool
 		switch (k_lower) {
 		case 'd':
 			out = CommandId::KillLine;
-			return true; // C-k C-d
-		case 'x':
-			out = CommandId::SaveAndQuit;
-			return true; // C-k C-x
+			return true;
 		case 'q':
 			out = CommandId::QuitNow;
-			return true; // C-k C-q (quit immediately)
+			return true;
+		case 'x':
+			out = CommandId::SaveAndQuit;
+			return true;
 		default:
-			// Important: do not return here — fall through to non-ctrl table
-			// so that C-k u/U still work even if Ctrl is (incorrectly) held
-			break;
+			return false;
 		}
 	}

@@ -33,65 +34,75 @@ KLookupKCommand(const int ascii_key, const bool ctrl, CommandId &out) -> bool
 		return true;
 	}

-	// 3) Non-control k-table (lowercased)
 	switch (k_lower) {
-	case 'j':
-		out = CommandId::JumpToMark;
-		return true; // C-k j
-	case 'f':
-		out = CommandId::FlushKillRing;
-		return true; // C-k f
-	case 'd':
-		out = CommandId::KillToEOL;
-		return true; // C-k d
-	case 'y':
-		out = CommandId::Yank;
-		return true; // C-k y
-	case 's':
-		out = CommandId::Save;
-		return true; // C-k s
-	case 'e':
-		out = CommandId::OpenFileStart;
-		return true; // C-k e (open file)
-	case 'b':
-		out = CommandId::BufferSwitchStart;
-		return true; // C-k b (switch buffer by name)
-	case 'c':
-		out = CommandId::BufferClose;
-		return true; // C-k c (close current buffer)
-	case 'n':
-		out = CommandId::BufferPrev;
-		return true; // C-k n (switch to previous buffer)
-	case 'x':
-		out = CommandId::SaveAndQuit;
-		return true; // C-k x
-	case 'q':
-		out = CommandId::Quit;
-		return true; // C-k q
-	case 'p':
-		out = CommandId::BufferNext;
-		return true; // C-k p (switch to next buffer)
-	case 'u':
-		out = CommandId::Undo;
-		return true; // C-k u (undo)
-	case '-':
-		out = CommandId::UnindentRegion;
-		return true; // C-k - (unindent region)
-	case '=':
-		out = CommandId::IndentRegion;
-		return true; // C-k = (indent region)
-	case 'l':
-		out = CommandId::ReloadBuffer;
-		return true; // C-k l (reload buffer)
 	case 'a':
 		out = CommandId::MarkAllAndJumpEnd;
-		return true; // C-k a (mark all and jump to end)
+		return true;
+	case 'b':
+		out = CommandId::BufferSwitchStart;
+		return true;
+	case 'c':
+		out = CommandId::BufferClose;
+		return true;
+	case 'd':
+		out = CommandId::KillToEOL;
+		return true;
+	case 'e':
+		out = CommandId::OpenFileStart;
+		return true;
+	case 'E':
+		std::cerr << "E is not a valid command" << std::endl;
+		return false;
+	case 'f':
+		out = CommandId::FlushKillRing;
+		return true;
 	case 'g':
 		out = CommandId::JumpToLine;
-		return true; // C-k g (goto line)
+		return true;
+	case 'j':
+		out = CommandId::JumpToMark;
+		return true;
+	case 'l':
+		out = CommandId::ReloadBuffer;
+		return true;
+	case 'n':
+		out = CommandId::BufferPrev;
+		return true;
+	case 'o':
+		out = CommandId::ChangeWorkingDirectory;
+		return true;
+	case 'p':
+		out = CommandId::BufferNext;
+		return true;
+	case 'q':
+		out = CommandId::Quit;
+		return true;
+	case 's':
+		out = CommandId::Save;
+		return true;
+	case 'u':
+		out = CommandId::Undo;
+		return true;
+	case 'w':
+		out = CommandId::ShowWorkingDirectory;
+		return true;
+	case 'x':
+		out = CommandId::SaveAndQuit;
+		return true;
+	case 'y':
+		out = CommandId::Yank;
+		return true;
+	case '-':
+		out = CommandId::UnindentRegion;
+		return true;
+	case '=':
+		out = CommandId::IndentRegion;
+		return true;
 	default:
 		break;
 	}
+
+	// 3) Non-control k-table (lowercased)
 	return false;
 }

--- a/TerminalRenderer.cc
+++ b/TerminalRenderer.cc
@@ -168,13 +168,13 @@ TerminalRenderer::Draw(Editor &ed)
 		const Buffer *b = buf;
 		std::string fname;
 		if (b) {
-			fname = b->Filename();
-		}
-		if (!fname.empty()) {
 			try {
-				fname = std::filesystem::path(fname).filename().string();
+				fname = ed.DisplayNameFor(*b);
 			} catch (...) {
-				// keep original on any error
+				fname = b->Filename();
+				try {
+					fname = std::filesystem::path(fname).filename().string();
+				} catch (...) {}
 			}
 		} else {
 			fname = "[no name]";
@@ -183,6 +183,13 @@ TerminalRenderer::Draw(Editor &ed)
 		left += fname;
 		if (b && b->Dirty())
 			left += " *";
+		// Append total line count as "<n>L"
+		if (b) {
+			unsigned long lcount = static_cast<unsigned long>(b->Rows().size());
+			left += " ";
+			left += std::to_string(lcount);
+			left += "L";
+		}
 	}

 	// Build right segment (cursor and mark)
--- a/main.cc
+++ b/main.cc
@@ -26,52 +26,53 @@ static void
 PrintUsage(const char *prog)
 {
 	std::cerr << "Usage: " << prog << " [OPTIONS] [files]\n"
-		  << "Options:\n"
-		  << "  -g, --gui        Use GUI frontend (if built)\n"
-		  << "  -t, --term       Use terminal (ncurses) frontend [default]\n"
-		  << "  -h, --help       Show this help and exit\n"
-		  << "  -V, --version    Show version and exit\n";
+		<< "Options:\n"
+		<< "  -g, --gui        Use GUI frontend (if built)\n"
+		<< "  -t, --term       Use terminal (ncurses) frontend [default]\n"
+		<< "  -h, --help       Show this help and exit\n"
+		<< "  -V, --version    Show version and exit\n";
 }

+
 int
 main(int argc, const char *argv[])
 {
 	Editor editor;

 	// CLI parsing using getopt_long
-	bool req_gui = false;
-	bool req_term = false;
-	bool show_help = false;
+	bool req_gui      = false;
+	bool req_term     = false;
+	bool show_help    = false;
 	bool show_version = false;

 	static struct option long_opts[] = {
-	    {"gui",     no_argument, nullptr, 'g'},
-	    {"term",    no_argument, nullptr, 't'},
-	    {"help",    no_argument, nullptr, 'h'},
-	    {"version", no_argument, nullptr, 'V'},
-	    {nullptr,   0,           nullptr, 0}
+		{"gui", no_argument, nullptr, 'g'},
+		{"term", no_argument, nullptr, 't'},
+		{"help", no_argument, nullptr, 'h'},
+		{"version", no_argument, nullptr, 'V'},
+		{nullptr, 0, nullptr, 0}
 	};

 	int opt;
 	int long_index = 0;
 	while ((opt = getopt_long(argc, const_cast<char *const *>(argv), "gthV", long_opts, &long_index)) != -1) {
 		switch (opt) {
-			case 'g':
-				req_gui = true;
-				break;
-			case 't':
-				req_term = true;
-				break;
-			case 'h':
-				show_help = true;
-				break;
-			case 'V':
-				show_version = true;
-				break;
-			case '?':
-			default:
-				PrintUsage(argv[0]);
-				return 2;
+		case 'g':
+			req_gui = true;
+			break;
+		case 't':
+			req_term = true;
+			break;
+		case 'h':
+			show_help = true;
+			break;
+		case 'V':
+			show_version = true;
+			break;
+		case '?':
+		default:
+			PrintUsage(argv[0]);
+			return 2;
 		}
 	}

@@ -92,7 +93,7 @@ main(int argc, const char *argv[])
 #if !defined(KTE_BUILD_GUI)
 	if (req_gui) {
 		std::cerr << "kte: GUI not built. Reconfigure with -DBUILD_GUI=ON and required deps installed." <<
-			  std::endl;
+			std::endl;
 		return 2;
 	}
 #else
@@ -132,7 +133,7 @@ main(int argc, const char *argv[])
 						// Clamp to >=1 later; 0 disables.
 						try {
 							unsigned long v = std::stoul(p);
-							pending_line = static_cast<std::size_t>(v);
+							pending_line    = static_cast<std::size_t>(v);
 						} catch (...) {
 							// Ignore malformed huge numbers
 							pending_line = 0;
@@ -152,7 +153,7 @@ main(int argc, const char *argv[])
 				// Apply pending +N to the just-opened (current) buffer
 				if (Buffer *b = editor.CurrentBuffer()) {
 					std::size_t nrows = b->Nrows();
-					std::size_t line = pending_line > 0 ? pending_line - 1 : 0;
+					std::size_t line  = pending_line > 0 ? pending_line - 1 : 0;
 					// 1-based to 0-based
 					if (nrows > 0) {
 						if (line >= nrows)
@@ -178,7 +179,7 @@ main(int argc, const char *argv[])
 	InstallDefaultCommands();

 	// Select frontend
-	std::unique_ptr <Frontend> fe;
+	std::unique_ptr<Frontend> fe;
 #if defined(KTE_BUILD_GUI)
 	if (use_gui) {
 		fe = std::make_unique<GUIFrontend>();
@@ -188,6 +189,15 @@ main(int argc, const char *argv[])
 		fe = std::make_unique<TerminalFrontend>();
 	}

+#if defined(KTE_BUILD_GUI) && defined(__APPLE__)
+	if (use_gui) {
+		/* likely using the .app, so need to cd */
+		if (chdir(getenv("HOME")) != 0) {
+			std::cerr << "kge.app: failed to chdir to HOME" << std::endl;
+		}
+	}
+#endif
+
 	if (!fe->Init(editor)) {
 		std::cerr << "kte: failed to initialize frontend" << std::endl;
 		return 1;