This merge is rather large, so it needs some explaining. Most of it was
a straightforward merge, but there were a few markdown edits i made that
had to manually be resolved.
There were also a few path changes to be made in the userinput.tsx file.
* 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
* 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
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.
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.
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.
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.
* 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
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.
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.
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.
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.
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.
* 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
* 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
* 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>
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.
* save
* not working yet but close
* logic is working, just need to do styling
* save work
* save
* save work
* ta da!
* fix line height
* format files
* remove running commands on hangup. also don't allow numrunning to be less than 0
* remove < 0 check (safer without for concurrency)
* working on cmd restart logic
* button to restart command
* bind Cmd-R to restart selected command, and Cmd-Shift-R to restart last command. Browser Refresh is now Option-R. also fix 'clear' command to not delete running commands (like archive). some small changes to keyboard utility code to always set 'alt' and 'meta' appropriately. use 'cmd' and 'option' for crossplatform bindings
* focus restarted line
* update termopts, use current winsize to set termopts for new command
* add cmd.restartts to track restart time
* display restarted time in line w/ tooltip with original time
* add restartts to line:show
* first pass of copy file
* first pass fixing up function
* first pass fixing key press
* fixed up key press parsing
* reverted cmdrunner.go
* fixed cmdrunner.go again :p
* fixed cmdrunner again lol
* Add job status indicators to tabs within a workspace (#232)
Adds job status indicators that will show any updates to running commands while you are focused away from a tab. These will show up as status icons in the tab view.
These indicators will reset for a given tab when you focus back to it.
I've updated the inner formatting of the tab to use flexboxes, allowing the title to display more text when there are no icons to display.
Also includes some miscellaneous for-loop pattern improvements in model.ts and removing of unused variables, etc.
* first pass fixing key press
* added key util check file
* addressed rebase artifacts
* fixed more rebase artifacts
* fixed keybindings
* removed log
* fixed a ton of rebase artifacts
* fixed a ton of rebase artifacts
* added cmd maps to altKey if not on macos
* fixed platform check code and fixed some small bugs
* save work
* refactor end-icon and actions-icon into separate components
* reverting change part 1
* fix
* separate out workspace and tab formatting more
* save work
* Got it working!
* fix scrollbar but hide it so that the formatting doesn't jump when hovering
* revert some changes, replace some svgs with fontawesome
* remove listitem
* remove log
* create proof of concept ssh library integration
This is a first attempt to integrate the golang crypto/ssh library for
handling remote connections. As it stands, this features is limited to
identity files without passphrases. It needs to be expanded to include
key+passphrase and password verifications as well.
* add password and keyboard-interactive ssh auth
This adds several new ssh auth methods. In addition to the PublicKey
method used previously, this adds password authentication,
keyboard-interactive authentication, and PublicKey+Passphrase
authentication.
Furthermore, it refactores the ssh connection code into its own wavesrv
file rather than storing int in waveshell's shexec file.
* clean up old mshell launch methods
In the debugging the addition of the ssh library, i had several versions
of the MShellProc Launch function. Since this seems mostly stable, I
have removed the old version and the experimental version in favor of
the combined version.
* allow switching between new and old ssh for dev
It is inconvenient to create milestones without being able to merge into
the main branch. But due to the experimental nature of the ssh changes,
it is not desired to use these changes in the main branch yet. This
change disables the new ssh launcher by default. It can be used by
changing the UseSshLibrary constant to true in remote.go. With this, it
becomes possible to merge these changes into the main branch without
them being used in production.
* fix: allow retry after ssh auth failure
Previously, the error status was not set when an ssh connection failed.
Because of this, an ssh connection failure would lock the failed remote
until waveterm was rebooted. This fix properly sets the error status so
this cannot happen.
* better osrelease parsing (ignore garbage at end of string)
* add defaultshelltype to telemetry input
* track reinit errors by shelltype to see if zsh integration is working
Readonly variables cannot be reset and attempting to do so causes errors
on my machine. The `keymaps` and `widgets` variables caused problems, so
they have been added to the list of variables to ignore.
* Tweak the color of the output status indicator, adjust the placement of the tab end-icons a bit
* adjust the margins a bit more
* a few more slight adjustments to even out the spacing
* save work
* fix nullref, some smaller tweaks to the front icon
* made the tab slightly smaller so that the ratios made more sense
* remove unnecessary width
* format fix
Adds job status indicators that will show any updates to running commands while you are focused away from a tab. These will show up as status icons in the tab view.
These indicators will reset for a given tab when you focus back to it.
I've updated the inner formatting of the tab to use flexboxes, allowing the title to display more text when there are no icons to display.
Also includes some miscellaneous for-loop pattern improvements in model.ts and removing of unused variables, etc.
---------
Co-authored-by: sawka <mike.sawka@gmail.com>
adds zsh support to waveterm. big change, lots going on here. lots of other improvements and bug fixes added while debugging and building out the feature.
Commits:
* refactor shexec parser.go into new package shellenv. separate out bash specific parsing from generic functions
* checkpoint
* work on refactoring shexec. created two new packages shellapi (for bash/zsh specific stuff), and shellutil (shared between shellapi and shexec)
* more refactoring
* create shellapi interface to abstract bash specific functionality
* more refactoring, move bash shell state parsing to shellapi
* move makeRcFile to shellapi. remove all of the 'client' options CLI options from waveshell
* get shellType passed through to server/single paths for waveshell
* add a local shelltype detector
* mock out a zshapi
* move shelltype through more of the code
* get a command to run via zsh
* zsh can now switch directories. poc, needs cleanup
* working on ShellState encoding differences between zsh/bash. Working on parsing zsh decls. move utilfn package into waveshell (shouldn't have been in wavesrv)
* switch to use []byte for vardecl serialization + diffs
* progress on zsh environment. still have issues reconciling init environment with trap environment
* fix typeset argument parsing
* parse promptvars, more zsh specific ignores
* fix bug with promptvar not getting set (wrong check in FeState func)
* add sdk (issue #188) to list of rtnstate commands
* more zsh compatibility -- working with a larger ohmyzsh environment. ignore more variables, handle exit trap better. unique path/fpath. add a processtype variable to base.
* must return a value
* zsh alias parsing/restoring. diff changes (and rtnstate changes). introduces linediff v1.
* force zmodload of zsh/parameter
* starting work on zsh functions
* need a v1 of mapdiff as well (to handle null chars)
* pack/unpack of ints was wrong (one used int and one use uint). turned out we only ever encoded '0' so it worked. that also means it is safe to change unpack to unpackUInt
* reworking for binary encoding of aliases and functions (because of zsh allows any character, including nulls, in names and values)
* fixes, working on functions, issue with line endings
* zsh functions. lots of ugliness here around dealing with line dicipline and cooked stty. new runcommand function to grab output from a non-tty fd. note that we still to run the actual command in a stty to get the proper output.
* write uuid tempdir, cleanup with tmprcfilename code
* hack in some simple zsh function declaration finding code for rtnstate. create function diff for rtnstate that supports zsh
* make sure key order is constant so shell hashes are consistent
* fix problems with state diffs to support new zsh formats. add diff/apply code to shellapi (moved from shellenv), that is now specific to zsh or bash
* add log packet and new shellstate packets
* switch to shellstate map that's also keyed by shelltype
* add shelltype to remoteinstance
* remove shell argument from waveshell
* added new shelltype statemap to remote.go (msh), deal with fallout
* move shellstate out of init packet, and move to an explicit reinit call. try to initialize all of the active shell states
* change dont always store init state (only store on demand). initialize shell states on demand (if not already initialized). allow reset to change shells
* add shellpref field to remote table. use to drive the default shell choice for new tabs
* show shelltag on cmdinput, pass through ri and remote (defaultshellstate)
* bump mshell version to v0.4
* better version validation for shellstate. also relax compatibility requirements for diffing states (shelltype + major version need to match)
* better error handling, check shellstate compatibility during run (on waveshell server)
* add extra separator for bash shellstate processing to deal with spurious output from rc files
* special migration for v30 -- flag invalid bash shell states and show special button in UI to fix
* format
* remove zsh-decls (unused)
* remove test code
* remove debug print
* fix typo
* init
* client settings view
* add some extra padding and a border below the header
* move settings-field classes under the main class to prevent conflicts
* fix style overrides
2024-01-15 12:08:58 -08:00
208 changed files with 18323 additions and 12395 deletions
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.
@@ -18,6 +18,7 @@ Wave isn't just another terminal emulator; it's a rethink on how terminals are b
* 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
// just marked these as important since we're keeping the
// settings-field styles below this intact until we figure out what do with them
.settings-field {
&:not(:first-child) {
margin-top: 15px !important;
}
.settings-label {
width: 250px !important;
}
}
// @TODO: These styles are duplicated in the settings modals
.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;
margin-right: 10px;
.info-message {
margin-left: 5px;
}
}
.settings-input {
display: flex;
flex-direction: row;
align-items: center;
&.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;
}
}
}
Some files were not shown because too many files have changed in this diff
Show More
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Sylvia Crowe
Red J Adaya
Cole Lashley
sawka
Sylvie Crowe
Evan Simkowitz
