fix wrong colors

initial implementation for lines.less
Fix sidebar middle div max-height calculation (#299 )
2026-04-22 15:26:58 -07:00 · 2024-02-23 10:54:33 +08:00 · 2024-02-22 22:17:53 +08:00 · 2024-02-20 12:23:39 -08:00 · 2024-02-20 12:22:09 -08:00 · 2024-02-20 12:20:17 -08:00
199 changed files with 14143 additions and 15860 deletions
@@ -1,4 +1,21 @@
 {
    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-}
+    "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[javascriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[less]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[css]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    }
+}
@@ -1,28 +1,31 @@
 # Build Instructions for Wave Terminal

-These instructions are for setting up the build on MacOS. 
+These instructions are for setting up the build on MacOS.
 If you're developing on Linux please use the [Linux Build Instructions](./build-linux.md).

 ## Running the Development Version of Wave

-If you install the production version of Wave, you'll see a semi-transparent sidebar, and the data for Wave is stored in the directory ~/.waveterm.  The development version has a blue sidebar and stores its data in ~/.waveterm-dev.  This allows the production and development versions to be run simultaneously with no conflicts.  If the dev database is corrupted by development bugs, or the schema changes in development it will not affect the production copy.
+If you install the production version of Wave, you'll see a semi-transparent gray sidebar, and the data for Wave is stored in the directory ~/.waveterm. The development version has a blue sidebar and stores its data in ~/.waveterm-dev. This allows the production and development versions to be run simultaneously with no conflicts. If the dev database is corrupted by development bugs, or the schema changes in development it will not affect the production copy.

 ## Prereqs and Tools

 Download and install Go (must be at least go 1.18):
+
 ```
 brew install go
 ```

 Download and install ScriptHaus (to run the build commands):
+
 ```
 brew tap scripthaus-dev/scripthaus
 brew install scripthaus
 ```

 You also need a relatively modern nodejs with npm and yarn installed.
-   * Node can be installed from [https://nodejs.org](https://nodejs.org).  
-   * npm can install yarn using: 
+
+-   Node can be installed from [https://nodejs.org](https://nodejs.org).
+-   npm can install yarn using:

 ```
 npm install -g yarn
@@ -40,16 +43,17 @@ git clone git@github.com:wavetermdev/waveterm.git
 scripthaus run build-backend
 ```

-This builds the Golang backends for Wave.  The binaries will put in waveshell/bin and wavesrv/bin respectively.  If you're working on a new plugin or other pure frontend changes to Wave, you won't need to rebuild these unless you pull new code from the Wave Repository.
+This builds the Golang backends for Wave. The binaries will put in waveshell/bin and wavesrv/bin respectively. If you're working on a new plugin or other pure frontend changes to Wave, you won't need to rebuild these unless you pull new code from the Wave Repository.

 ## One-Time Setup

 Install modules (we use yarn):
+
 ```
 yarn
 ```

-Electron also requires specific builds of node_modules to work (because Electron embeds a specific node.js version that might not match your development node.js version).  We use a special electron command to cross-compile those modules:
+Electron also requires specific builds of node_modules to work (because Electron embeds a specific node.js version that might not match your development node.js version). We use a special electron command to cross-compile those modules:

 ```
 scripthaus run electron-rebuild
@@ -57,7 +61,7 @@ scripthaus run electron-rebuild

 ## Running WebPack

-We use webpack to build both the React and Electron App Wrapper code.  They are both run together using:
+We use webpack to build both the React and Electron App Wrapper code. They are both run together using:

 ```
 scripthaus run webpack-watch
@@ -65,15 +69,16 @@ scripthaus run webpack-watch

 ## Running the WaveTerm Dev Client

-Now that webpack is running (and watching for file changes) we can finally run the WaveTerm Dev Client!  To start the client run:
+Now that webpack is running (and watching for file changes) we can finally run the WaveTerm Dev Client! To start the client run:
+
 ```
 scripthaus run electron
 ```

-To kill the client, either exit the Electron App normally or just Ctrl-C the ```scripthaus run electron``` command.
+To kill the client, either exit the Electron App normally or just Ctrl-C the `scripthaus run electron` command.

-Because we're running webpack in watch mode, any changes you make to the typescript will be automatically picked up by the client after a refresh.  Note that I've disabled hot-reloading in the webpack config, so to pick up new changes you'll have to manually refresh the WaveTerm Client window.  To do that use "Command-Shift-R" (Command-R is used internally by WaveTerm and will not force a refresh).
+Because we're running webpack in watch mode, any changes you make to the typescript will be automatically picked up by the client after a refresh. Note that I've disabled hot-reloading in the webpack config, so to pick up new changes you'll have to manually refresh the WaveTerm Client window. To do that use "Option-R" (Command-R is used internally by WaveTerm and will not force a refresh).

 ## Debugging the Dev Client

-You can use the regular Chrome DevTools to debug the frontend application.  You can open the DevTools using the keyboard shortcut `Cmd-Option-I`.
+You can use the regular Chrome DevTools to debug the frontend application. You can open the DevTools using the keyboard shortcut `Cmd-Option-I`.
@@ -1,23 +1,25 @@
-
 <p align="center">
  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./src/app/assets/wave-logo_horizontal-coloronblack.svg">
-    <source media="(prefers-color-scheme: light)" srcset="./src/app/assets/wave-logo_horizontal-coloronwhite.svg">
-    <img alt="Wave Terminal Logo" src="./src/app/assets/wave-logo_horizontal-coloronwhite.svg" width="352" height="59" style="max-width: 100%;">
+    <source media="(prefers-color-scheme: dark)" srcset="./assets/wave-logo_horizontal-coloronblack.svg">
+    <source media="(prefers-color-scheme: light)" srcset="./assets/wave-logo_horizontal-coloronwhite.svg">
+    <img alt="Wave Terminal Logo" src="./assets/wave-logo_horizontal-coloronwhite.svg" width="352" height="59" style="max-width: 100%;">
  </picture>
  <br/>
 </p>

-# Wave Terminal 
+# Wave Terminal

-A open-source, cross-platform, modern terminal for seamless workflows.
+A open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.

-Wave isn't just another terminal emulator; it's a rethink on how terminals are built.  Wave combines command line with the power of the open web to help veteran CLI users and new developers alike.
+Wave isn't just another terminal emulator; it's a rethink on how terminals are built. Wave combines command line with the power of the open web to help veteran CLI users and new developers alike.

-* Inline renderers to cut down on context switching.  Render code, images, markdown, and CSV files without ever leaving the terminal.
-* Persistent sessions that can restore state across network disconnections and reboots
-* Searchable contextual command history across all remote sessions (saved locally)
-* Workspaces, tabs, and command blocks to keep you organized
+-   Inline renderers to cut down on context switching. Render code, images, markdown, and CSV files without ever leaving the terminal.
+-   Persistent sessions that can restore state across network disconnections and reboots
+-   Searchable contextual command history across all remote sessions (saved locally)
+-   Workspaces, tabs, and command blocks to keep you organized
+-   AI Integration with ChatGPT (or ChatGPT compatible APIs) to help write commands and get answers inline
+
+![WaveTerm Screenshot](./assets/wave-screenshot.jpeg)

 ## Installation

@@ -26,30 +28,30 @@ Wave Terminal works with MacOS and Linux (preliminary).
 Install Wave Terminal from: [www.waveterm.dev/download](https://www.waveterm.dev/download)

 Also available as a homebrew cask for MacOS:
+
 ```
 brew install --cask wave
 ```

 ## Links

-* Homepage &mdash; https://www.waveterm.dev
-* Download Page &mdash; https://www.waveterm.dev/download
-* Documentation &mdash; https://docs.waveterm.dev/
-* Quick Start Guide &mdash; https://docs.waveterm.dev/quickstart/
-* Discord Community &mdash; https://discord.gg/XfvZ334gwU
+-   Homepage &mdash; https://www.waveterm.dev
+-   Download Page &mdash; https://www.waveterm.dev/download
+-   Documentation &mdash; https://docs.waveterm.dev/
+-   Blog &mdash; https://blog.waveterm.dev/
+-   Quick Start Guide &mdash; https://docs.waveterm.dev/quickstart/
+-   Discord Community &mdash; https://discord.gg/XfvZ334gwU

 ## Building from Source

-* [MacOS Build Instructions](./BUILD.md)
-* [Linux Build Instructions](./build-linux.md)
+-   [MacOS Build Instructions](./BUILD.md)
+-   [Linux Build Instructions](./build-linux.md)

 ## Contributing

-Wave uses Github Project for tracking issues. 
+Wave uses Github Project for tracking issues.

 Find more information in our [Contributions Guide](CONTRIBUTING.md), which includes:

-  * [Ways to contribute](CONTRIBUTING.md#contributing-to-wave-terminal)
-  * [Contribution guidelines](CONTRIBUTING.md#before-you-start)
-
-
+-   [Ways to contribute](CONTRIBUTING.md#contributing-to-wave-terminal)
+-   [Contribution guidelines](CONTRIBUTING.md#before-you-start)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 175" style="enable-background:new 0 0 1000 175;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_00000091720229019135579030000007505974356775393451_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#58C142;}
+	.st4{fill:url(#SVGID_00000057844994756141690520000013392915125647203757_);}
+	.st5{fill:url(#SVGID_00000122684313424325124480000003010239515924857535_);}
+	.st6{fill:url(#SVGID_00000075883355893983351890000012882526639983753630_);}
+	.st7{fill:url(#SVGID_00000000207897583077398290000006853703841187474602_);}
+	.st8{fill:url(#SVGID_00000008108614519912429220000010116473681835506344_);}
+	.st9{fill:url(#SVGID_00000132058454267173112380000008245439973034275726_);}
+	.st10{fill:url(#SVGID_00000034804588790703597750000013460998990473107363_);}
+	.st11{fill:url(#SVGID_00000131349218605867433520000014539481291819864990_);}
+	.st12{fill:url(#SVGID_00000003071904852992499350000013371332860686737080_);}
+	.st13{fill:url(#SVGID_00000072278415138862792700000002042113538205077667_);}
+</style>
+<g>
+	<path class="st3" d="M339.7,20.6h26.5l30.9,100.8l33.5-100.8h22l33.5,100.8l31.2-100.8h26.5L497.9,156h-23.8L441.9,55.4L409.1,156
+		h-23.8L339.7,20.6z"/>
+	<path class="st3" d="M693.8,20.6V156h-25.9V133c-10.5,16.2-27.2,26.2-47.9,26.2c-35.9,0-62.3-29.3-62.3-71
+		c0-41.4,26.5-70.7,62.3-70.7c20.7,0,37.5,10,47.9,26.2v-23H693.8z M667.9,88.2c0-28.3-17.3-48.2-41.9-48.2
+		c-24.6,0-42.2,19.9-42.2,48.2c0,28.3,17.6,48.5,42.2,48.5C650.6,136.6,667.9,116.5,667.9,88.2z"/>
+	<path class="st3" d="M713.8,20.6h27.8l42.2,105.3l41.4-105.3h28L796,156h-24.4L713.8,20.6z"/>
+	<path class="st3" d="M970.7,122.2l15.2,16c-11.8,12.8-35.6,21-54.7,21c-37.5,0-69.9-29.6-69.9-71.2c0-40.6,30.6-70.5,68.1-70.5
+		c41.4,0,65.5,30.9,65.5,79.1H886.6c3.1,23.8,19.9,41.1,44,41.1C945.3,137.7,962.3,131.1,970.7,122.2z M886.9,77.5h82.8
+		c-2.6-21.7-16.2-38.5-39.8-38.5C908.1,38.9,890.8,54.1,886.9,77.5z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.2128" y1="58.9088" x2="240.4477" y2="58.9088">
+		<stop  offset="0.1418" style="stop-color:#1F4D22"/>
+		<stop  offset="0.8656" style="stop-color:#418D31"/>
+	</linearGradient>
+	<path class="st0" d="M83.6,80.8c-12.3,0-19.1,8-22.8,25.9l-55.6-8C12,40.1,34.8,11.7,79.9,11.7C113.3,11.7,146,37,162,37
+		c12.4,0,19.1-8.6,22.8-25.9l55.6,8c-6.2,58.7-29.6,87.1-74.7,87.1C131.8,106.1,100.3,80.8,83.6,80.8z"/>
+</g>
+<g>
+	
+		<linearGradient id="SVGID_00000145018229965941010500000002424778669397199792_" gradientUnits="userSpaceOnUse" x1="20.9171" y1="116.0912" x2="256.1519" y2="116.0912">
+		<stop  offset="0.2223" style="stop-color:#418D31"/>
+		<stop  offset="0.7733" style="stop-color:#58C142"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000145018229965941010500000002424778669397199792_);" d="M99.3,138c-12.3,0-19.1,8-22.8,25.9
+		l-55.6-8c6.8-58.6,29.6-87.1,74.7-87.1c33.3,0,66.1,25.3,82.1,25.3c12.4,0,19.1-8.6,22.8-25.9l55.6,8
+		c-6.2,58.7-29.6,87.1-74.7,87.1C147.5,163.3,116,138,99.3,138z"/>
+</g>
+</svg>
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 175" style="enable-background:new 0 0 1000 175;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_00000097467401116752621440000013265923851559160252_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#58C142;}
+	.st4{fill:url(#SVGID_00000026844058065691411450000001084298207851076753_);}
+	.st5{fill:url(#SVGID_00000140695609015829564530000017877493759276215708_);}
+	.st6{fill:url(#SVGID_00000172429467579424709090000016892278147863045285_);}
+	.st7{fill:url(#SVGID_00000111161844774090145740000012271107721736914070_);}
+	.st8{fill:url(#SVGID_00000159463458951391818050000007934417898368699555_);}
+	.st9{fill:url(#SVGID_00000114048161574266679140000001630328408055608234_);}
+	.st10{fill:url(#SVGID_00000181790832707237646570000012870231436607310721_);}
+	.st11{fill:url(#SVGID_00000182504551275047381220000018143622223532349093_);}
+	.st12{fill:url(#SVGID_00000182503296231706301150000015159284117431565225_);}
+	.st13{fill:url(#SVGID_00000157991892590648824540000004483708798912232327_);}
+</style>
+<g>
+	<path d="M339.7,20.6h26.5l30.9,100.8l33.5-100.8h22l33.5,100.8l31.2-100.8h26.5L497.9,156h-23.8L441.9,55.4L409.1,156h-23.8
+		L339.7,20.6z"/>
+	<path d="M693.8,20.6V156h-25.9V133c-10.5,16.2-27.2,26.2-47.9,26.2c-35.9,0-62.3-29.3-62.3-71c0-41.4,26.5-70.7,62.3-70.7
+		c20.7,0,37.5,10,47.9,26.2v-23H693.8z M667.9,88.2c0-28.3-17.3-48.2-41.9-48.2c-24.6,0-42.2,19.9-42.2,48.2
+		c0,28.3,17.6,48.5,42.2,48.5C650.6,136.6,667.9,116.5,667.9,88.2z"/>
+	<path d="M713.8,20.6h27.8l42.2,105.3l41.4-105.3h28L796,156h-24.4L713.8,20.6z"/>
+	<path d="M970.7,122.2l15.2,16c-11.8,12.8-35.6,21-54.7,21c-37.5,0-69.9-29.6-69.9-71.2c0-40.6,30.6-70.5,68.1-70.5
+		c41.4,0,65.5,30.9,65.5,79.1H886.6c3.1,23.8,19.9,41.1,44,41.1C945.3,137.7,962.3,131.1,970.7,122.2z M886.9,77.5h82.8
+		c-2.6-21.7-16.2-38.5-39.8-38.5C908.1,38.9,890.8,54.1,886.9,77.5z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="5.2128" y1="58.9088" x2="240.4477" y2="58.9088">
+		<stop  offset="0.1418" style="stop-color:#1F4D22"/>
+		<stop  offset="0.8656" style="stop-color:#418D31"/>
+	</linearGradient>
+	<path class="st0" d="M83.6,80.8c-12.3,0-19.1,8-22.8,25.9l-55.6-8C12,40.1,34.8,11.7,79.9,11.7C113.3,11.7,146,37,162,37
+		c12.4,0,19.1-8.6,22.8-25.9l55.6,8c-6.2,58.7-29.6,87.1-74.7,87.1C131.8,106.1,100.3,80.8,83.6,80.8z"/>
+</g>
+<g>
+	
+		<linearGradient id="SVGID_00000055697211621202625680000016003686276294146176_" gradientUnits="userSpaceOnUse" x1="20.9171" y1="116.0912" x2="256.1519" y2="116.0912">
+		<stop  offset="0.2223" style="stop-color:#418D31"/>
+		<stop  offset="0.7733" style="stop-color:#58C142"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000055697211621202625680000016003686276294146176_);" d="M99.3,138c-12.3,0-19.1,8-22.8,25.9
+		l-55.6-8c6.8-58.6,29.6-87.1,74.7-87.1c33.3,0,66.1,25.3,82.1,25.3c12.4,0,19.1-8.6,22.8-25.9l55.6,8
+		c-6.2,58.7-29.6,87.1-74.7,87.1C147.5,163.3,116,138,99.3,138z"/>
+</g>
+</svg>
@@ -0,0 +1,29 @@
+<svg width="74" height="73" viewBox="0 0 74 73" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Icon Center Image Artwork">
+<g id="Guide - Hide">
+<rect x="1" width="44.7379" height="44.7379" fill="#EA33EC" fill-opacity="0.1"/>
+<rect x="3.18447" y="2.18447" width="40.3689" height="40.3689" stroke="#EA33EC" stroke-opacity="0.09" stroke-width="4.36893"/>
+</g>
+<g id="wave-logo_appicon 1">
+<path id="Vector" d="M73.8156 -0.808594H0.191406V72.8156H73.8156V-0.808594Z" fill="black"/>
+<g id="Group">
+<g id="Group_2">
+<path id="Vector_2" d="M27.2969 34.6218C24.7516 34.6218 23.3523 36.2741 22.5859 39.9726L11.125 38.3132C12.5242 26.2194 17.2352 20.3624 26.5305 20.3624C33.407 20.3624 40.157 25.5866 43.4688 25.5866C46.0141 25.5866 47.4133 23.8007 48.1797 20.2358L59.6406 21.8882C58.368 33.9819 53.5305 39.846 44.2352 39.846C37.225 39.846 30.7352 34.6218 27.2969 34.6218Z" fill="url(#paint0_linear_1373_32879)"/>
+</g>
+<g id="Group_3">
+<path id="Vector_3" d="M30.5312 46.4133C27.9859 46.4133 26.5867 48.0656 25.8203 51.7641L14.3594 50.1047C15.7586 38.0109 20.4695 32.1539 29.7648 32.1539C36.6414 32.1539 43.3914 37.3781 46.7031 37.3781C49.2484 37.3781 50.6477 35.5922 51.4141 32.0273L62.875 33.6797C61.6023 45.7734 56.7648 51.6375 47.4695 51.6375C40.4664 51.6375 33.9695 46.4133 30.5312 46.4133Z" fill="url(#paint1_linear_1373_32879)"/>
+</g>
+</g>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1373_32879" x1="11.1241" y1="30.1035" x2="59.6372" y2="30.1035" gradientUnits="userSpaceOnUse">
+<stop offset="0.1418" stop-color="#1F4D22"/>
+<stop offset="0.8656" stop-color="#418D31"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1373_32879" x1="14.3628" y1="41.8964" x2="62.8759" y2="41.8964" gradientUnits="userSpaceOnUse">
+<stop offset="0.2223" stop-color="#418D31"/>
+<stop offset="0.7733" stop-color="#58C142"/>
+</linearGradient>
+</defs>
+</svg>
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 600 400" style="enable-background:new 0 0 600 400;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_00000112609801797065440120000009078644614516335013_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#58C142;}
+	.st4{fill:url(#SVGID_00000140705471064485508570000011374545427215048096_);}
+	.st5{fill:url(#SVGID_00000070096993167771140800000009230862614014512804_);}
+	.st6{fill:url(#SVGID_00000018927797001490499930000007907141601259141028_);}
+	.st7{fill:url(#SVGID_00000177467729764420216790000007105154932047940258_);}
+	.st8{fill:url(#SVGID_00000094609616810712664470000012347852020703354001_);}
+	.st9{fill:url(#SVGID_00000147904120639373224840000010231811793887454594_);}
+	.st10{fill:url(#SVGID_00000124156599372995293460000015010576141345595828_);}
+	.st11{fill:url(#SVGID_00000113335101732495131180000003771446430366466471_);}
+	.st12{fill:url(#SVGID_00000123421819715807053460000011277887084625979316_);}
+	.st13{fill:url(#SVGID_00000070797766435397124570000013813146128488798621_);}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.3142" y1="133.3046" x2="556.0522" y2="133.3046">
+			<stop  offset="0.1418" style="stop-color:#1F4D22"/>
+			<stop  offset="0.8656" style="stop-color:#418D31"/>
+		</linearGradient>
+		<path class="st0" d="M190.2,184.4c-28.8,0-44.6,18.7-53.3,60.5L7.3,226.2C23.2,89.4,76.4,23.1,181.6,23.1
+			c77.8,0,154.1,59.1,191.6,59.1c28.8,0,44.7-20.2,53.3-60.5l129.6,18.7c-14.4,136.8-69.1,203.1-174.3,203.1
+			C302.6,243.5,229.1,184.4,190.2,184.4z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_00000085247734223146048360000005883855174484422067_" gradientUnits="userSpaceOnUse" x1="43.9478" y1="266.6954" x2="592.6859" y2="266.6954">
+			<stop  offset="0.2223" style="stop-color:#418D31"/>
+			<stop  offset="0.7733" style="stop-color:#58C142"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_00000085247734223146048360000005883855174484422067_);" d="M226.8,317.8
+			c-28.8,0-44.6,18.7-53.3,60.5L43.9,359.6c15.8-136.8,69.1-203.1,174.3-203.1c77.8,0,154.1,59.1,191.6,59.1
+			c28.8,0,44.7-20.2,53.3-60.5l129.6,18.7c-14.4,136.8-69.1,203.1-174.3,203.1C339.2,376.9,265.7,317.8,226.8,317.8z"/>
+	</g>
+</g>
+</svg>
@@ -1,16 +1,16 @@
 # Build Instructions for Wave Terminal on Linux

-These instructions are for setting up the build on Linux (Ubuntu). 
+These instructions are for setting up the build on Linux (Ubuntu).
 If you're developing on MacOS please use the [MacOS Build Instructions](./BUILD.md).
 If you are working on a different Linux distribution, you may need to adapt some of these instructions to fit your environment.

 ## Running the Development Version of Wave

-If you install the production version of Wave, you'll see a semi-transparent sidebar, and the data for Wave is stored in the directory ~/prompt.  The development version has a red/brown sidebar and stores its data in ~/prompt-dev.  This allows the production and development versions to be run simultaneously with no conflicts.  If the dev database is corrupted by development bugs, or the schema changes in development it will not affect the production copy.
+If you install the production version of Wave, you'll see a semi-transparent gray sidebar, and the data for Wave is stored in the directory ~/.waveterm. The development version has a blue sidebar and stores its data in ~/.waveterm-dev. This allows the production and development versions to be run simultaneously with no conflicts. If the dev database is corrupted by development bugs, or the schema changes in development it will not affect the production copy.

 ## Prereqs and Tools

-Download and install Go (must be at least go 1.18).  We also need gcc installed to run a CGO build (for Golang).
+Download and install Go (must be at least go 1.18). We also need gcc installed to run a CGO build (for Golang).
 zip is required to build linux deployment packages (not required for running and debugging dev builds).

 ```
@@ -36,7 +36,7 @@ sudo cp scripthaus /usr/local/bin

 ## Install nodejs, npm, and yarn

-We use [nvm](https://github.com/nvm-sh/nvm) to install nodejs on Linux (you can use an alternate installer if you wish).  You must have a relatively recent version of node in order to build the terminal.  Different distributions and shells will require different setup instructions.  These instructions work for Ubuntu 22 using bash (will install node v20.8.1):
+We use [nvm](https://github.com/nvm-sh/nvm) to install nodejs on Linux (you can use an alternate installer if you wish). You must have a relatively recent version of node in order to build the terminal. Different distributions and shells will require different setup instructions. These instructions work for Ubuntu 22 using bash (will install node v20.8.1):

 ```
 wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
@@ -50,10 +50,9 @@ Now we can install yarn:
 npm install -g yarn
 ```

-
 ## Clone the Wave Repo

-Move out of the `scripthaus` directory if you're still in it.  Clone the wave repository into the directory that you'd like to use for development.
+Move out of the `scripthaus` directory if you're still in it. Clone the wave repository into the directory that you'd like to use for development.

 ```
 git clone git@github.com:wavetermdev/waveterm.git
@@ -62,11 +61,12 @@ git clone git@github.com:wavetermdev/waveterm.git
 ## One-Time Setup

 Install Wave modules (we use yarn):
+
 ```
 yarn
 ```

-Electron also requires specific builds of node_modules to work (because Electron embeds a specific node.js version that might not match your development node.js version).  We use a special electron command to cross-compile those modules:
+Electron also requires specific builds of node_modules to work (because Electron embeds a specific node.js version that might not match your development node.js version). We use a special electron command to cross-compile those modules:

 ```
 scripthaus run electron-rebuild
@@ -81,12 +81,11 @@ cd waveterm
 scripthaus run build-backend
 ```

-This builds the Golang backends for Wave.  The binaries will put in waveshell/bin and wavesrv/bin respectively.  If you're working on a new plugin or other pure frontend changes to Wave, you won't need to rebuild these unless you pull new code from the Wave Repository.
-
+This builds the Golang backends for Wave. The binaries will put in waveshell/bin and wavesrv/bin respectively. If you're working on a new plugin or other pure frontend changes to Wave, you won't need to rebuild these unless you pull new code from the Wave Repository.

 ## Running WebPack

-We use webpack to build both the React and Electron App Wrapper code.  They are both run together using:
+We use webpack to build both the React and Electron App Wrapper code. They are both run together using:

 ```
 scripthaus run webpack-watch
@@ -94,15 +93,16 @@ scripthaus run webpack-watch

 ## Running the WaveTerm Dev Client

-Now that webpack is running (and watching for file changes) we can finally run the WaveTerm Dev Client!  To start the client run:
+Now that webpack is running (and watching for file changes) we can finally run the WaveTerm Dev Client! To start the client run:
+
 ```
 scripthaus run electron
 ```

-To kill the client, either exit the Electron App normally or just Ctrl-C the ```scripthaus run electron``` command.
+To kill the client, either exit the Electron App normally or just Ctrl-C the `scripthaus run electron` command.

-Because we're running webpack in watch mode, any changes you make to the typescript will be automatically picked up by the client after a refresh.  Note that I've disabled hot-reloading in the webpack config, so to pick up new changes you'll have to manually refresh the WaveTerm Client window.  To do that use "Command-Shift-R" (Command-R is used internally by Wave and will not force a refresh).
+Because we're running webpack in watch mode, any changes you make to the typescript will be automatically picked up by the client after a refresh. Note that I've disabled hot-reloading in the webpack config, so to pick up new changes you'll have to manually refresh the WaveTerm Client window. To do that use "Command-Shift-R" (Command-R is used internally by Wave and will not force a refresh).

 ## Debugging the Dev Client

-You can use the regular Chrome DevTools to debug the frontend application.  You can open the DevTools using the keyboard shortcut `Cmd-Option-I`.
+You can use the regular Chrome DevTools to debug the frontend application. You can open the DevTools using the keyboard shortcut `Cmd-Option-I`.
@@ -1,4 +1,4 @@
-@import "./common/themes/themes.less";
+@import "@/common/themes/themes.less";

@font-face {
    font-family: "Martian Mono";
@@ -19,7 +19,7 @@ body {
    font-weight: 300;
    line-height: 1.5;
    background: @base-background-transparent;
-    color: @base-color;
+    color: var(--base-color);
 }

 body.is-dev {
@@ -33,7 +33,7 @@ textarea {
    font-weight: 300;
    line-height: 1.5;
    background: @base-background;
-    color: @base-color;
+    color: var(--base-color);
 }

 // typography
@@ -103,7 +103,7 @@ body code {
 }

 svg.icon {
-    fill: @base-color;
+    fill: var(--base-color);
    width: 100%;
    height: 100%;
    display: inline-block;
@@ -664,3 +664,161 @@ a.a-block {
        }
    }
 }
+
+.settings-field {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    &.settings-field.sub-field {
+        .settings-label {
+            font-weight: normal;
+
+            text-align: right;
+            padding-right: 20px;
+        }
+    }
+
+    &.settings-error {
+        color: @term-red;
+        margin-top: 20px;
+        padding: 10px;
+        border-radius: 5px;
+        background-color: #200707;
+        border: 1px solid @term-red;
+        font-weight: bold;
+
+        .error-dismiss {
+            padding: 2px;
+            cursor: pointer;
+        }
+    }
+
+    .settings-label {
+        font-weight: bold;
+        width: 12em;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        .info-message {
+            margin-left: 5px;
+        }
+    }
+
+    .settings-input {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        color: @term-white;
+
+        &.settings-clickable {
+            cursor: pointer;
+        }
+
+        &.inline-edit.edit-active {
+            input.input {
+                padding: 0;
+                height: 20px;
+            }
+
+            .button {
+                height: 20px;
+            }
+        }
+
+        input {
+            padding: 4px;
+            border-radius: 3px;
+        }
+
+        .control {
+            .icon {
+                width: 1.5em;
+                height: 1.5em;
+                margin: 0;
+            }
+        }
+
+        .tab-color-icon.color-default path {
+            fill: @tab-green;
+        }
+        .tab-color-icon.color-green path {
+            fill: @tab-green;
+        }
+        .tab-color-icon.color-orange path {
+            fill: @tab-orange;
+        }
+        .tab-color-icon.color-red path {
+            fill: @tab-red;
+        }
+        .tab-color-icon.color-yellow path {
+            fill: @tab-yellow;
+        }
+        .tab-color-icon.color-blue path {
+            fill: @tab-blue;
+        }
+        .tab-color-icon.color-mint path {
+            fill: @tab-mint;
+        }
+        .tab-color-icon.color-cyan path {
+            fill: @tab-cyan;
+        }
+        .tab-color-icon.color-white path {
+            fill: @tab-white;
+        }
+        .tab-color-icon.color-violet path {
+            fill: @tab-violet;
+        }
+        .tab-color-icon.color-pink path {
+            fill: @tab-pink;
+        }
+
+        .tab-colors,
+        .tab-icons {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            .tab-color-sep,
+            .tab-icon-sep {
+                padding-left: 10px;
+                padding-right: 10px;
+                font-weight: bold;
+            }
+
+            .tab-color-icon,
+            .tab-icon-icon {
+                width: 1.1em;
+                vertical-align: middle;
+            }
+
+            .tab-color-name,
+            .tab-icon-name {
+                margin-left: 1em;
+            }
+
+            .tab-color-select,
+            .tab-icon-select {
+                cursor: pointer;
+                margin: 5px;
+                &:hover {
+                    outline: 2px solid white;
+                }
+            }
+        }
+
+        .action-text {
+            margin-left: 20px;
+
+            color: @term-red;
+        }
+
+        .settings-share-link {
+            width: 160px;
+        }
+    }
+
+    &:not(:first-child) {
+        margin-top: 10px;
+    }
+}
@@ -7,10 +7,9 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
 import dayjs from "dayjs";
-import type { ContextMenuOpts } from "../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../model/model";
-import { isBlank } from "../util/util";
+import { GlobalModel } from "@/models";
+import { isBlank } from "@/util/util";
 import { WorkspaceView } from "./workspace/workspaceview";
 import { PluginsView } from "./pluginsview/pluginsview";
 import { BookmarksView } from "./bookmarks/bookmarks";
@@ -21,17 +20,19 @@ import { MainSideBar } from "./sidebar/sidebar";
 import { DisconnectedModal, ClientStopModal } from "./common/modals";
 import { ModalsProvider } from "./common/modals/provider";
 import { ErrorBoundary } from "./common/error/errorboundary";
+
+import "@/common/themes/fonts.less";
+import "@/common/themes/themes.less";
 import "./app.less";

 dayjs.extend(localizedFormat);

-type OV<V> = mobx.IObservableValue<V>;
-
@mobxReact.observer
 class App extends React.Component<{}, {}> {
    dcWait: OV<boolean> = mobx.observable.box(false, { name: "dcWait" });
+    mainContentRef: React.RefObject<HTMLDivElement> = React.createRef();

-    constructor(props: any) {
+    constructor(props: {}) {
        super(props);
        if (GlobalModel.isDev) document.body.className = "is-dev";
    }
@@ -75,6 +76,13 @@ class App extends React.Component<{}, {}> {
        let hasClientStop = GlobalModel.getHasClientStop();
        let dcWait = this.dcWait.get();
        let platform = GlobalModel.getPlatform();
+        let clientData = GlobalModel.clientData.get();
+
+        // Previously, this is done in sidebar.tsx but it causes flicker when clientData is null cos screen-view shifts around.
+        // Doing it here fixes the flicker cos app is not rendered until clientData is populated.
+        if (clientData == null) {
+            return null;
+        }

        if (disconnected || hasClientStop) {
            if (!dcWait) {
@@ -82,8 +90,8 @@ class App extends React.Component<{}, {}> {
            }
            return (
                <div id="main" className={"platform-" + platform} onContextMenu={this.handleContextMenu}>
-                    <div className="main-content">
-                        <MainSideBar />
+                    <div ref={this.mainContentRef} className="main-content">
+                        <MainSideBar parentRef={this.mainContentRef} clientData={clientData} />
                        <div className="session-view" />
                    </div>
                    <If condition={dcWait}>
@@ -102,8 +110,8 @@ class App extends React.Component<{}, {}> {
        }
        return (
            <div id="main" className={"platform-" + platform} onContextMenu={this.handleContextMenu}>
-                <div className="main-content">
-                    <MainSideBar />
+                <div ref={this.mainContentRef} className="main-content">
+                    <MainSideBar parentRef={this.mainContentRef} clientData={clientData} />
                    <ErrorBoundary>
                        <PluginsView />
                        <WorkspaceView />
@@ -8,6 +8,7 @@ export const SESSION_SETTINGS = "sessionSettings";
 export const LINE_SETTINGS = "lineSettings";
 export const CLIENT_SETTINGS = "clientSettings";
 export const TAB_SWITCHER = "tabSwitcher";
+export const USER_INPUT = "userInput";

 export const LineContainer_Main = "main";
 export const LineContainer_History = "history";
@@ -16,3 +17,44 @@ export const LineContainer_Sidebar = "sidebar";
 export const ConfirmKey_HideShellPrompt = "hideshellprompt";

 export const NoStrPos = -1;
+
+export const RemotePtyRows = 8;
+export const RemotePtyTotalRows = 25;
+export const RemotePtyCols = 80;
+export const ProdServerEndpoint = "http://127.0.0.1:1619";
+export const ProdServerWsEndpoint = "ws://127.0.0.1:1623";
+export const DevServerEndpoint = "http://127.0.0.1:8090";
+export const DevServerWsEndpoint = "ws://127.0.0.1:8091";
+export const DefaultTermFontSize = 12;
+export const MinFontSize = 8;
+export const MaxFontSize = 24;
+export const InputChunkSize = 500;
+export const RemoteColors = ["red", "green", "yellow", "blue", "magenta", "cyan", "white", "orange"];
+export const TabColors = ["red", "orange", "yellow", "green", "mint", "cyan", "blue", "violet", "pink", "white"];
+export const TabIcons = [
+    "sparkle",
+    "fire",
+    "ghost",
+    "cloud",
+    "compass",
+    "crown",
+    "droplet",
+    "graduation-cap",
+    "heart",
+    "file",
+];
+
+// @ts-ignore
+export const VERSION = __WAVETERM_VERSION__;
+// @ts-ignore
+export const BUILD = __WAVETERM_BUILD__;
+
+/**
+ * Levels for the screen status indicator
+ */
+export enum StatusIndicatorLevel {
+    None = 0,
+    Output = 1,
+    Success = 2,
+    Error = 3,
+}
@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";

 .bookmarks-view {
    background-color: @background-session;
@@ -14,7 +14,7 @@
        svg {
            width: 1.5em;
            height: 1.5em;
-            fill: @base-color;
+            fill: var(--base-color);
        }
    }

@@ -31,7 +31,7 @@
    .icon {
        width: 1em;
        height: 1em;
-        fill: @base-color;
+        fill: var(--base-color);
    }

    .bookmarks-list {
@@ -7,20 +7,27 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import type { BookmarkType } from "../../types/types";
-import { GlobalModel } from "../../model/model";
-import { CmdStrCode, Markdown } from "../common/common";
+import { GlobalModel } from "@/models";
+import { CmdStrCode, Markdown } from "@/common/elements";

-import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
-import { ReactComponent as CopyIcon } from "../assets/icons/favourites/copy.svg";
-import { ReactComponent as PenIcon } from "../assets/icons/favourites/pen.svg";
-import { ReactComponent as TrashIcon } from "../assets/icons/favourites/trash.svg";
-import { ReactComponent as FavoritesIcon } from "../assets/icons/favourites.svg";
+import { ReactComponent as XmarkIcon } from "@/assets/icons/line/xmark.svg";
+import { ReactComponent as CopyIcon } from "@/assets/icons/favourites/copy.svg";
+import { ReactComponent as PenIcon } from "@/assets/icons/favourites/pen.svg";
+import { ReactComponent as TrashIcon } from "@/assets/icons/favourites/trash.svg";
+import { ReactComponent as FavoritesIcon } from "@/assets/icons/favourites.svg";

 import "./bookmarks.less";

+type BookmarkProps = {
+    bookmark: BookmarkType;
+};
+
@mobxReact.observer
-class Bookmark extends React.Component<{ bookmark: BookmarkType }, {}> {
+class Bookmark extends React.Component<BookmarkProps, {}> {
+    constructor(props: BookmarkProps) {
+        super(props);
+    }
+
    @boundMethod
    handleDeleteClick(): void {
        let { bookmark } = this.props;
@@ -179,6 +186,10 @@ class Bookmark extends React.Component<{ bookmark: BookmarkType }, {}> {

@mobxReact.observer
 class BookmarksView extends React.Component<{}, {}> {
+    constructor(props: {}) {
+        super(props);
+    }
+
    @boundMethod
    closeView(): void {
        GlobalModel.bookmarksModel.closeView();
@@ -1,4 +1,4 @@
-@import "../../app/common/themes/themes.less";
+@import "@/common/themes/themes.less";

 .clientsettings-view {
    background-color: @background-session;
@@ -6,23 +6,18 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, MinFontSize, MaxFontSize, RemotesModel } from "../../model/model";
-import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "../common/common";
-import { CommandRtnType, ClientDataType } from "../../types/types";
-import { commandRtnHandler, isBlank } from "../../util/util";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "@/models";
+import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "@/common/elements";
+import { commandRtnHandler, isBlank } from "@/util/util";
+import * as appconst from "@/app/appconst";

 import "./clientsettings.less";

-type OV<V> = mobx.IObservableValue<V>;
-
-// @ts-ignore
-const VERSION = __WAVETERM_VERSION__;
-// @ts-ignore
-const BUILD = __WAVETERM_BUILD__;
-
@mobxReact.observer
 class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hoveredItemId: string }> {
-    fontSizeDropdownActive: OV<boolean> = mobx.observable.box(false, { name: "clientSettings-fontSizeDropdownActive" });
+    fontSizeDropdownActive: OV<boolean> = mobx.observable.box(false, {
+        name: "clientSettings-fontSizeDropdownActive",
+    });
    errorMessage: OV<string> = mobx.observable.box(null, { name: "ClientSettings-errorMessage" });

    @boundMethod
@@ -34,12 +29,12 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove

    @boundMethod
    handleChangeFontSize(fontSize: string): void {
-        let newFontSize = Number(fontSize);
+        const newFontSize = Number(fontSize);
        this.fontSizeDropdownActive.set(false);
        if (GlobalModel.termFontSize.get() == newFontSize) {
            return;
        }
-        let prtn = GlobalCommandRunner.setTermFontSize(newFontSize, false);
+        const prtn = GlobalCommandRunner.setTermFontSize(newFontSize, false);
        commandRtnHandler(prtn, this.errorMessage);
    }

@@ -72,29 +67,29 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
        commandRtnHandler(prtn, this.errorMessage);
    }

-    getFontSizes(): any {
-        let availableFontSizes: { label: string; value: number }[] = [];
-        for (let s = MinFontSize; s <= MaxFontSize; s++) {
-            availableFontSizes.push({ label: s + "px", value: s });
+    getFontSizes(): DropdownItem[] {
+        const availableFontSizes: DropdownItem[] = [];
+        for (let s = appconst.MinFontSize; s <= appconst.MaxFontSize; s++) {
+            availableFontSizes.push({ label: s + "px", value: String(s) });
        }
        return availableFontSizes;
    }

    @boundMethod
    inlineUpdateOpenAIModel(newModel: string): void {
-        let prtn = GlobalCommandRunner.setClientOpenAISettings({ model: newModel });
+        const prtn = GlobalCommandRunner.setClientOpenAISettings({ model: newModel });
        commandRtnHandler(prtn, this.errorMessage);
    }

    @boundMethod
    inlineUpdateOpenAIToken(newToken: string): void {
-        let prtn = GlobalCommandRunner.setClientOpenAISettings({ apitoken: newToken });
+        const prtn = GlobalCommandRunner.setClientOpenAISettings({ apitoken: newToken });
        commandRtnHandler(prtn, this.errorMessage);
    }

    @boundMethod
    inlineUpdateOpenAIMaxTokens(newMaxTokensStr: string): void {
-        let prtn = GlobalCommandRunner.setClientOpenAISettings({ maxtokens: newMaxTokensStr });
+        const prtn = GlobalCommandRunner.setClientOpenAISettings({ maxtokens: newMaxTokensStr });
        commandRtnHandler(prtn, this.errorMessage);
    }

@@ -110,19 +105,41 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
        GlobalModel.clientSettingsViewModel.closeView();
    }

+    @boundMethod
+    handleChangeShortcut(newShortcut: string): void {
+        const prtn = GlobalCommandRunner.setGlobalShortcut(newShortcut);
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
+    getFKeys(): DropdownItem[] {
+        const opts: DropdownItem[] = [];
+        opts.push({ label: "Disabled", value: "" });
+        const platform = GlobalModel.getPlatform();
+        for (let i = 1; i <= 12; i++) {
+            const shortcut = (platform == "darwin" ? "Cmd" : "Alt") + "+F" + String(i);
+            opts.push({ label: shortcut, value: shortcut });
+        }
+        return opts;
+    }
+
+    getCurrentShortcut(): string {
+        const clientData = GlobalModel.clientData.get();
+        return clientData?.clientopts?.globalshortcut ?? "";
+    }
+
    render() {
-        let isHidden = GlobalModel.activeMainView.get() != "clientsettings";
+        const isHidden = GlobalModel.activeMainView.get() != "clientsettings";
        if (isHidden) {
            return null;
        }

-        let cdata: ClientDataType = GlobalModel.clientData.get();
-        let openAIOpts = cdata.openaiopts ?? {};
-        let apiTokenStr = isBlank(openAIOpts.apitoken) ? "(not set)" : "********";
-        let maxTokensStr = String(
+        const cdata: ClientDataType = GlobalModel.clientData.get();
+        const openAIOpts = cdata.openaiopts ?? {};
+        const apiTokenStr = isBlank(openAIOpts.apitoken) ? "(not set)" : "********";
+        const maxTokensStr = String(
            openAIOpts.maxtokens == null || openAIOpts.maxtokens == 0 ? 1000 : openAIOpts.maxtokens
        );
-        let curFontSize = GlobalModel.termFontSize.get();
+        const curFontSize = GlobalModel.termFontSize.get();

        return (
            <div className={cn("view clientsettings-view")}>
@@ -151,7 +168,7 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
                    <div className="settings-field">
                        <div className="settings-label">Client Version</div>
                        <div className="settings-input">
-                            {VERSION} {BUILD}
+                            {appconst.VERSION} {appconst.BUILD}
                        </div>
                    </div>
                    <div className="settings-field">
@@ -212,6 +229,17 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
                            />
                        </div>
                    </div>
+                    <div className="settings-field">
+                        <div className="settings-label">Global Hotkey</div>
+                        <div className="settings-input">
+                            <Dropdown
+                                className="hotkey-dropdown"
+                                options={this.getFKeys()}
+                                defaultValue={this.getCurrentShortcut()}
+                                onChange={this.handleChangeShortcut}
+                            />
+                        </div>
+                    </div>
                    <SettingsError errorMessage={this.errorMessage} />
                </div>
            </div>
@@ -0,0 +1,123 @@
+@import "@/common/themes/themes.less";
+
+.wave-button {
+    background: none;
+    color: inherit;
+    border: none;
+    font: inherit;
+    cursor: pointer;
+    outline: inherit;
+
+    display: flex;
+    padding: 6px 16px;
+    align-items: center;
+    gap: 4px;
+    border-radius: 6px;
+    height: auto;
+
+    &:hover {
+        color: @term-white;
+    }
+
+    i {
+        fill: rgba(255, 255, 255, 0.12);
+    }
+
+    &.primary {
+        color: @term-green;
+        background: none;
+
+        i {
+            fill: @term-green;
+        }
+
+        &.solid {
+            color: @term-bright-white;
+            background: @term-green;
+            box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.4), 0px 0px 0.5px 0px rgba(0, 0, 0, 0.5),
+                0px 0px 0.5px 0px rgba(255, 255, 255, 0.8) inset, 0px 0.5px 0px 0px rgba(255, 255, 255, 0.6) inset;
+
+            i {
+                fill: @term-white;
+            }
+        }
+
+        &.outlined {
+            border: 1px solid @term-green;
+        }
+
+        &.ghost {
+            // Styles for .ghost are already defined above
+        }
+
+        &:hover {
+            color: @term-bright-white;
+        }
+    }
+
+    &.secondary {
+        color: @term-white;
+        background: none;
+
+        &.solid {
+            background: rgba(255, 255, 255, 0.09);
+            box-shadow: none;
+        }
+
+        &.outlined {
+            border: 1px solid rgba(255, 255, 255, 0.09);
+        }
+
+        &.ghost {
+            padding: 6px 10px;
+
+            i {
+                fill: @term-green;
+            }
+        }
+    }
+
+    &.color-yellow {
+        &.solid {
+            border-color: @warning-yellow;
+            background-color: mix(@warning-yellow, @term-white, 50%);
+            box-shadow: none;
+        }
+
+        &.outlined {
+            color: @warning-yellow;
+            border-color: @warning-yellow;
+            &:hover {
+                color: @term-white;
+                border-color: @term-white;
+            }
+        }
+
+        &.ghost {
+        }
+    }
+
+    &.color-red {
+        &.solid {
+            border-color: @term-red;
+            background-color: mix(@term-red, @term-white, 50%);
+            box-shadow: none;
+        }
+
+        &.outlined {
+            color: @term-red;
+            border-color: @term-red;
+        }
+
+        &.ghost {
+        }
+    }
+
+    &.disabled {
+        opacity: 0.5;
+    }
+
+    &.link-button {
+        cursor: pointer;
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Red Adaya	5ccb1cb2ac	fix wrong colors	2024-02-23 10:54:33 +08:00
Red Adaya	6e3ab22a07	initial implementation for lines.less	2024-02-22 22:17:53 +08:00
Evan Simkowitz	96cabeff98	Fix sidebar middle div max-height calculation (#299 ) * Fix sidebar middle div max-height calculation * remove logs * update bottom div padding	2024-02-20 12:23:39 -08:00
Red J Adaya	8cb449d2e7	remove old model (#307 )	2024-02-20 12:22:09 -08:00
Mike Sawka	7b6025fd4b	forward port v0.6.3 changes to main (#308 )	2024-02-20 12:20:17 -08:00
Mike Sawka	07ad5f063e	Fix #302 and clean up extraneous terminal margins (#303 ) * font loading fix #302 * fix inconsistent paddings. issue was that the first '[' feels indented (because of the fixed with font). applying a negative 2px margin fixes it and allows us to remove the paddings on the other elements.	2024-02-18 17:58:22 -08:00
Evan Simkowitz	fe3ffd1545	Use IsEmpty rather than nullcheck for scbus types * Use IsEmpty rather than nullcheck for scbus types	2024-02-16 12:14:05 -08:00
Mike Sawka	e2e71898c1	new wlog package to do distributed logging from waveshell back to wavesrv (#295 )	2024-02-15 17:42:43 -08:00
Evan Simkowitz	07fa5bf9cb	Remove verbose log from scbus (#296 )	2024-02-15 16:50:03 -08:00
Evan Simkowitz	8acda3525b	Break model update code out of sstore (#290 ) * Break update code out of sstore * add license disclaimers * missed one * add another * fix regression in openai updates, remove unnecessary functions * another copyright * update casts * fix issue with variadic updates * remove logs * remove log * remove unnecessary log * save work * moved a bunch of stuff to scbus * make modelupdate an object * fix new screen not updating active screen * add comment * make updates into packet types * different cast * update comments, remove unused methods * add one more comment * add an IsEmpty() on model updates to prevent sending empty updates to client	2024-02-15 16:45:47 -08:00
Sylvie Crowe	158378a7ad	Ssh Fixes and Improvements (#293 ) * feat: parse multiple identity files in ssh While this does not make it possible to discover multiple identity files in every case, it does make it possible to parse them individually and check for user input if it's required for each one. * chore: remove unnecessary print in updatebus.go * chore: remove unnecessary print in sshclient.go * chore: remove old publicKey auth check With the new callback in place, we no longer need this, so it has been removed. * refactor: move logic for wave and config options The logic for making decisions between details made available from wave and details made available from ssh_config was spread out. This change condenses it into one function for gathering those details and one for picking between them. It also adds a few new keywords but the logic for those hasn't been implemented yet. * feat: allow attempting auth methods in any order While waveterm does not provide the control over which order to attempt yet, it is possible to provide that information in the ssh_config. This change allows that order to take precedence in a case where it is set. * feat: add batch mode support BatchMode turns off user input to enter passwords for ssh. Because we save passwords, we can still attempt these methods but we disable the user interactive prompts in this case. * fix: fix auth ordering and identity files The last few commits introduced a few bugs that are fixed here. The first is that the auth ordering is parsed as a single string and not a list. This is fixed by manually splitting the string into a list. The second is that the copy of identity files was not long enough to copy the contents of the original. This is now updated to use the length of the original in its construction. * deactivate timer while connecting to new ssh The new ssh setup handles timers differently from the old one due to the possibility of asking for user input multiple times. This limited the user input to entirely be done within 15 seconds. This removes that restriction which will allow those timers to increase. It does not impact the legacy ssh systems or the local connections on the new system. * merge branch 'main' into 'ssh--auth-control' This was mostly straightforward, but it appears that a previous commit to main broke the user input modals by deleting a function. This adds that back in addition to the merge. * fix: allow 60 second timeouts for ssh inputs With the previous change, it is now possible to extend the timeout for manual inputs. 60 seconds should be a reasonable starting point. * fix: change size of dummy key to 2048 This fixes the CodeQL scan issue for using a weak key.	2024-02-15 15:58:50 -08:00
sawka	766b7b90ce	fix directory names in build-linux.md. also fix reload accelerator for Linux (keybindings)	2024-02-15 10:01:18 -08:00
Mike Sawka	b3ada77c39	create assets directory, update README with screenshot (#294 )	2024-02-15 09:53:39 -08:00
sawka	fb7f055449	do not try to set ZDOTDIR in rcfile (ignore). remove spurious log messages	2024-02-14 18:21:23 -08:00
Mike Sawka	3e4bd458b3	global shortcut for wave (#287 ) * working on easy global shortcut for wave * globalshortcut setting working * cmd for macos, alt for others * re-remove types.ts (was added back during merge) * rename DDItem to DropdownItem, put into custom.d.ts * make some consts	2024-02-13 17:43:02 -08:00
Red J Adaya	18fe3f3296	import aliass and configuration updates (#291 )	2024-02-12 22:47:51 -08:00
Evan Simkowitz	2839179ced	Fix History view not honoring sidebar width (#292 ) * Fix History view not honoring sidebar width * update comment	2024-02-12 22:34:49 -08:00
Red J Adaya	532e65c8ab	Add main screens to Cmd-P search (#288 ) * declare types as global * remove mobx types aliases * put back model_old.ts * remove types.ts * add main screens to Cmd-P search * make viewData optional * minor hint fix * address improvements suggested by evan * more on let to const	2024-02-12 17:54:12 -08:00
Red J Adaya	85f22a0733	Declare types as global (#282 ) * declare types as global * remove mobx types aliases * put back model_old.ts * remove types.ts	2024-02-12 16:39:29 -08:00
sawka	94de0460b4	fix history layout (item height and table width)	2024-02-11 23:14:29 -03:00
sawka	71b09cb44e	fix typescript errors in emain.ts	2024-02-11 17:23:40 -03:00
sawka	07abaa92fa	fix types for GlobalModel / GlobalCommandRunner so references work	2024-02-11 15:34:31 -03:00
Red J Adaya	2a4d85430a	Fix term width in view connection detail modal (#274 ) * fix term width * add horizontal scroll to terminal when it overflows * revert width of modal	2024-02-10 19:18:50 -03:00
Evan Simkowitz	d319e72609	Refactor ModelUpdate to set up for decoupling sstore (#280 ) This PR changes ModelUpdate mechanism from a statically-typed struct to an interface, allowing us to define the update mechanism and the update types separately. This sets us up to move app logic and update mechanisms into separate packages. Ultimately, sstore will only define low-level persistence logic.	2024-02-09 17:19:44 -08:00
sawka	7a5afccab3	do not unset ZDOTDIR otherwise interactive configs will be unnecessarily re-read (causing big performance problem for zsh command initialization)	2024-02-09 20:05:00 -03:00
sawka	efe567398a	fix ts warning	2024-02-09 18:57:07 -03:00
Sylvia Crowe	187509504d	fix: type mismatch in userinput modal A null was used in a place where a string should have been. It has been updated to a string to remove the error associated with it.	2024-02-08 21:04:38 -08:00
Sylvie Crowe	903b26bfca	Use ssh library: add user input (#281 ) * feat: create backend for user input requests This is the first part of a change that allows the backend to request user input from the frontend. Essentially, the backend will send a request for the user to answer some query, and the frontend will send that answer back. It is blocking, so it needs to be used within a goroutine. There is some placeholder code in the frontend that will be updated in future commits. Similarly, there is some debug code in the backend remote.go file. * feat: create frontend for user input requests This is part of a change to allow the backend to request user input from the frontend. This adds a component specifically for handling this logic. It is only a starting point, and does not work perfectly yet. * refactor: update user input backend/interface This updates the user input backend to fix a few potential bugs. It also refactors the user input request and response types to better handle markdown and errors while making it more convenient to work with. A couple frontend changes were made to keep everything compatible. * fix: add props to user input request modal There was a second place that the modals were created that I previously missed. This fixes that second casel * feat: complete user input modal This rounds out the most immediate concerns for the new user input modal. The frontend now includes a timer to show how much time is left and will close itself once it reaches zero. Css formatting has been cleaned up to be more reasonable. There is still some test code present on the back end. This will be removed once actuall examples of the new modal are in place. * feat: create first pass known_hosts detection Manually integrating with golang's ssh library means that the code must authenticate known_hosts on its own. This is a first pass at creating a system that parses the known hosts files and denys a connection if there is a mismatch. This needs to be updated with a means to add keys to the known-hosts file if the user requests it. * feat: allow writing to known_hosts first pass As a follow-up to the previous change, we now allow the user to respond to interactive queries in order to determine if an unknown known hosts key can be added to a known_hosts file if it is missing. This needs to be refined further, but it gets the basic functionality there. * feat: add user input for kbd-interactive auth This adds a modal so the user can respond to prompts provided using the keyboard interactive authentication method. * feat: add interactive password authentication This makes the ssh password authentication interactive with its own user input modal. Unfortunately, this method does not allow trying a default first. This will need to be expanded in the future to accomodate that. * fix: allow automatic and interactive auth together Previously, it was impossible to use to separate methods of the same type to try ssh authentication. This made it impossible to make an auto attempt before a manual one. This change restricts that by combining them into one method where the auto attempt is tried once first and cannot be tried again. Following that, interactive authentication can be tried separately. It also lowers the time limit on kbd interactive authentication to 15 seconds due to limitations on the library we are using. * fix: set number of retries to one in ssh Number of retries means number of attempts after the fact, not number of total attempts. It has been adjusted from 2 to 1 to reflect this. * refactor: change argument order in GetUserInput This is a simple change to move the context to the first argument of GetUserInput to match the convention used elsewhere in the code. * fix: set number of retries to two again I was wrong in my previous analysis. The number given is the total number of tries. This is confusing when keyboard authentication and password authentication are both available which usually doesn't happen. * feat: create naive ui for ssh key passphrases This isn't quite as reactive as the other methods, but it does attempt to use publickey without a passphrase, then attempt to use the password as the passphrase, and finally prompting the user for a passphrase. The problem with this approach is that if multiple keys are used and they all have passphrases, they need to all be checked up front. In practice, this will not happen often, but it is something to be aware of. * fix: add the userinput.tsx changes These were missed in the previous commit. Adding them now.	2024-02-09 00:16:56 -03:00
Red J Adaya	e692c7c180	Split model into separate files (#279 ) * split settings modals * init * init * remove styles not related to checkbox * remove styles not related to CmdStrCode * renderCmdText doesn't need styles * remove styles not related to dropdown * IconButton doesn't need styles because it extends Button * remove old connections * InfoMessage conmponent no longer needed * fix import error * remove styles not related to InlineSettingsTextEdit * remove styles not related to InputDecoration * LinkButton doesn't need styles cos it's extends Button component * remove styles not related to markdown * remove styles not related to modal * NumberField doesn't need styles cos it extends TextField * remove styles not related to PasswordField * RemoteStatusLight no longer used. It's replaced by Status component. * remove styles not related to ResizableSidebar * SettingsError doesn't need styles cos it uses classnames in app.less * remove styles not related to Status * remove styles not related to TextField * remove styles not related to Toggle * remove styles not related to Tooltip * init * cleanup bookmarks model * cleanup clientsettingsview model * cleanup cmd model * remove dayjs import from bookmarks model * cleanup commandrunner model * cleanup historyview model * cleanup input model * cleanup linecontainer model * cleanup mainsidebar model * cleanup main model * cleanup plugins model * cleanup remote model * cleanup screen model * cleanup screenlines model * cleanup session model * cleanup screenlinecontainer model * cleanup connectionsview model * add index.ts inside model dir * replace /model_old imports with /model * rename model to models * move model_old to models * fix ptyDataSource errors * split models/model	2024-02-08 17:52:42 -03:00
Cole Lashley	b37f7f722e	Command to copy file from remote to local (#231 ) * first pass of copy file * first pass fixing up function * fleshed out copy function, still working on display and parameters * implemented scp like syntax * finished implemententation of copy file - there are still issues * more bug fixes, still running into error * pushing waveshell concurrency and channel fixes - still need to do some qol fixes before merge * aesthetic fixes and removed logs * fixed bug in GetRemoteRuntimeState * formatting small fix * fixed pretty print bytes * added local to local command * small fix removing workaround * added workaround back * added some logs for debug * added some more logs * quick bug fix for update cmd race condition * added fix for race condition * added some more logs for debugging * fixed up logs * added proper fe state for dest parameter * implemented setting status indicator output * first pass at updating status indicators * removed logs and small fix ups * removed whitespace * addressed review comments	2024-02-08 17:37:23 -03:00
sawka	ff855cf308	add AI and the blog	2024-02-07 17:20:28 -03:00
Red J Adaya	bf1b556537	Split components in common (#276 ) * split settings modals * init * init * remove styles not related to checkbox * remove styles not related to CmdStrCode * renderCmdText doesn't need styles * remove styles not related to dropdown * IconButton doesn't need styles because it extends Button * remove old connections * InfoMessage conmponent no longer needed * fix import error * remove styles not related to InlineSettingsTextEdit * remove styles not related to InputDecoration * LinkButton doesn't need styles cos it's extends Button component * remove styles not related to markdown * remove styles not related to modal * NumberField doesn't need styles cos it extends TextField * remove styles not related to PasswordField * RemoteStatusLight no longer used. It's replaced by Status component. * remove styles not related to ResizableSidebar * SettingsError doesn't need styles cos it uses classnames in app.less * remove styles not related to Status * remove styles not related to TextField * remove styles not related to Toggle * remove styles not related to Tooltip	2024-02-06 18:23:56 -03:00
Red J Adaya	fc65e65f11	remove old connections (#273 )	2024-02-03 01:23:10 -03:00
Red J Adaya	cedebe2196	split settings modals (#272 )	2024-02-03 01:22:30 -03:00
Red J Adaya	3a9f6dec6d	remove modals.tsx as it's no longer used. rename modals.less to settings.less (#271 )	2024-02-02 00:02:45 -03:00
Sylvie Crowe	51ee7bef61	Shellpref for sshconfig import (#270 )	2024-01-31 14:11:12 -08:00
Evan Simkowitz	5ce7b92232	Simplify logic for startResizing width calculation (#269 ) * Apply Red's suggestion and move width logic to getWidth * remove unnecessary * a little more * remove comment	2024-01-30 22:34:00 -08:00
Evan Simkowitz	81a9e74991	Fix onMouseDown causing width to snap back to persisted width (#268 ) * Fix onMouseDown causing width to snap back to persisted width * var name change * remove logs * remove redundant call	2024-01-30 22:23:00 -08:00
Evan Simkowitz	679e85a84a	Fix sidebar width not persisting when un-collapsing (#267 ) * Do not persist collapsed width to db * remove console.logs * one more * one more * remove setTemp from getWidth and add to the startResize call	2024-01-30 22:04:25 -08:00
Evan Simkowitz	da69a0f583	Fix broken merge (#266 )	2024-01-30 20:56:32 -08:00
Red J Adaya	37ab1bca90	allow resizing of left sidebar (#244 ) * wip * integrate original sidebar content * ResizableSidebar component * trigger toggleCollapse * remove debugging code * minor refactor. disable text select on mousemove * replace icons with fontawesome icons. fix alignment issues * fix session view width when tabs overflow * prevent index and icon from shifting when resizing * snap effect * minor refactor * apply collapsed mode to sidebar contents * change default width to 240px * backend implementation * fix wrong subcmd * save collapsed state * retore sidebar state on reload/launch * use collapse data form db on first load. use previously saved width on expand. * persist width as well collapse state * various fixes and improvements * bind methods * refactor * more refactor * fix minor bug * fix merge issues * various fixes * refactor * fixes * fix issues * fix all issues * resolve undefind tempWidth * fix toggleCollapsed * use Promise in stopResizing method * use tempCollapsed to for real time toggling between logos * minor method name change * refactor * remove debugging code * fix conflict * fix setting collapsed state via CLI * minor refactor * remove debugging code * create setTempWidthAndTempCollapsed method * handle invalid width set via cli * refactor: setbycli not actually needed * remove unused code	2024-01-30 20:17:49 -08:00
Evan Simkowitz	40757fa7f4	Prevent the status indicator flickering for quick-returning commands (#265 ) * add status-indicator-visible * save * save * Prevent the status indicator flickering for quick returns * flx regression * reduce delay, reset spinnerVisible when there's no more running commands * clean up code reuse * move code around * slight optimizations to prevent rendering before spinner is visible * rename var * revert shouldSync change as it broke the sync	2024-01-30 16:31:38 -08:00
Evan Simkowitz	e576f7f07d	Sync RotateIcon spin as well (#262 ) * Sync RotateIcon spin as well * make shouldSync a boolean value	2024-01-30 14:16:33 -08:00
Evan Simkowitz	9e804232c2	Fix SidebarItem key error (#263 )	2024-01-30 11:54:35 -08:00
sawka	d3dbac6e77	fix missing react key	2024-01-30 11:29:12 -08:00
Mike Sawka	198de02a65	code to restore indicator state on refresh (#260 ) * code to restore indicator state on refresh * fix style	2024-01-29 23:51:01 -08:00
Mike Sawka	8f64d6a589	set animation startTime to sync spinners for status indicators (#259 ) * set animation startTime to sync spinners for status indicators * catch animationstart (hover interaction) to restart startTime. * use const --------- Co-authored-by: Evan Simkowitz <esimkowitz@users.noreply.github.com>	2024-01-29 23:48:37 -08:00
Evan Simkowitz	1a51d93a54	Fix add-workspace so that only the plus button shows pointer (#258 )	2024-01-29 14:10:58 -08:00
sawka	9ab3b2a5b7	only run prettier on js/ts/css/less files	2024-01-29 13:35:09 -08:00