Release notes
Sourced from github.com/shirou/gopsutil/v4's releases.
v4.24.11
What's Changed
host
- add anolis family with anolis platform in host/host_linux.go by
@​wangyu-geekin shirou/gopsutil#1745New Contributors
@​wangyu-geekmade their first contribution in shirou/gopsutil#1745Full Changelog: https://github.com/shirou/gopsutil/compare/v4.24.10...v4.24.11
Commits
62a52f9Merge pull request #1745 from wangyu-geek/add_anolis_family_in_host_linux8e62971add anolis family with anolis platform- See full diff in compare view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show
Release notes
Sourced from electron's releases.
electron v33.2.1
Release Notes for v33.2.1
Fixes
- Fixed a crash that could occur when calling
shell.readShortcutLinkon Windows. #44803 (Also in 34)- Fixed an issue where
WebContentsViews were being improperly removed. #44671 (Also in 31, 32, 34)- Fixed an issue where
resizewasn't being emitted for single-pixel resizes on Windows. #44723 (Also in 32, 34)- Fixed an issue where a
utilityProcesspid would not beundefinedafter exit. #44694 (Also in 32, 34)- Fixed an issue where buttons shown under the Window Controls Overlay API were missing tooltips. #44757 (Also in 32, 34)
- Fixed an issue where the webContents
context-menuevent was not emitted when using-webkit-app-region: drag. #44800 (Also in 32, 34)- Fixed an issue where the windows control overlay was unexpectedly visible in fullscreen on Linux. #44640 (Also in 31, 32, 34)
- Fixed crash in net api when utility process exits. #44729 (Also in 32, 34)
- Fixed segfault when moving WebContentsView between BrowserWindows. #44613 (Also in 31, 32, 34)
- Fixed theme does not work in DevTools. #44635 (Also in 32, 34)
- Fixed update file extension bug. #44771 (Also in 34)
- Return 0 exit code for normal termination of the utility process. #44732 (Also in 32, 34)
Other Changes
- Fixed an issue where a deprecation warning was being incorrectly emitted for frameless windows on macOS. #44767 (Also in 34)
- Fixed drag-and-drop session being canceled on wayland with empty dragData. #44753 (Also in 32)
- Security: backported fix for CVE-2024-11110. #44647
- Updated Chromium to 130.0.6723.137. #44781
- Updated Node.js to v20.18.1. #44780
Commits
cd6e3d7refactor: fix modernize-return-braced-init-list warnings (#44857)7152209fix: modernize-use-using clang-tidy warnings (#44836)51e31defix: modernize-use-nodiscard clang-tidy warnings (#44832)fe3467edocs: correct stable release dates for v34.0.0 (#44830)d0e24fcfix: clang-tidyperformance-inefficient-vector-operationwarnings (33-x-y) ...3483cd6refactor: remove unnecessary constructor code (#44825)1ef8b47fix: remove unused local variables (#44822)71c1149docs: update new GitHub issue link (#44810)bd5c8d7fix: crash callingshell.readShortcutLink(#44803)52b5d8afix: big endian bug in V8 serialization (#44796)- Additional commits viewable in compare view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show
+
{scrollable ?
diff --git a/frontend/app/theme.scss b/frontend/app/theme.scss
index ad9931a4b..9f25430c4 100644
--- a/frontend/app/theme.scss
+++ b/frontend/app/theme.scss
@@ -1,8 +1,6 @@
// Copyright 2024, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0
-// Used for syntax highlighting in markdown
-
:root {
--main-text-color: #f7f7f7;
--title-font-size: 18px;
@@ -16,8 +14,10 @@
--accent-color: rgb(88, 193, 66);
--panel-bg-color: rgba(31, 33, 31, 0.5);
--highlight-bg-color: rgba(255, 255, 255, 0.2);
- --markdown-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif,
+ --markdown-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif,
"Apple Color Emoji", "Segoe UI Emoji";
+ --markdown-font-size: 14px;
+ --markdown-fixed-font-size: 12px;
--error-color: rgb(229, 77, 46);
--warning-color: rgb(224, 185, 86);
--success-color: rgb(78, 154, 6);
diff --git a/frontend/app/view/preview/preview.tsx b/frontend/app/view/preview/preview.tsx
index 3a5c1e1bd..0c89d9428 100644
--- a/frontend/app/view/preview/preview.tsx
+++ b/frontend/app/view/preview/preview.tsx
@@ -783,6 +783,8 @@ function makePreviewModel(blockId: string, nodeModel: BlockNodeModel): PreviewMo
function MarkdownPreview({ model }: SpecializedViewProps) {
const connName = useAtomValue(model.connection);
const fileInfo = useAtomValue(model.statFile);
+ const fontSizeOverride = useAtomValue(getOverrideConfigAtom(model.blockId, "markdown:fontsize"));
+ const fixedFontSizeOverride = useAtomValue(getOverrideConfigAtom(model.blockId, "markdown:fixedfontsize"));
const resolveOpts: MarkdownResolveOpts = useMemo(() => {
return {
connName: connName,
@@ -791,7 +793,13 @@ function MarkdownPreview({ model }: SpecializedViewProps) {
}, [connName, fileInfo.dir]);
return (
) => void;
onKeyDown: (e: React.KeyboardEvent) => void;
onMouseDown: (e: React.MouseEvent) => void;
@@ -577,7 +577,7 @@ interface ChatInputProps {
}
const ChatInput = forwardRef(
- ({ value, onChange, onKeyDown, onMouseDown, termFontSize, model }, ref) => {
+ ({ value, onChange, onKeyDown, onMouseDown, baseFontSize, model }, ref) => {
const textAreaRef = useRef(null);
useImperativeHandle(ref, () => textAreaRef.current as HTMLTextAreaElement);
@@ -594,7 +594,7 @@ const ChatInput = forwardRef(
// Adjust the height of the textarea to fit the text
const textAreaMaxLines = 5;
- const textAreaLineHeight = termFontSize * 1.5;
+ const textAreaLineHeight = baseFontSize * 1.5;
const textAreaMinHeight = textAreaLineHeight;
const textAreaMaxHeight = textAreaLineHeight * textAreaMaxLines;
@@ -608,7 +608,7 @@ const ChatInput = forwardRef(
const newHeight = Math.min(Math.max(scrollHeight, textAreaMinHeight), textAreaMaxHeight);
textAreaRef.current.style.height = newHeight + "px";
},
- [termFontSize]
+ [baseFontSize]
);
useEffect(() => {
@@ -624,7 +624,7 @@ const ChatInput = forwardRef(
onMouseDown={onMouseDown} // When the user clicks on the textarea
onChange={onChange}
onKeyDown={onKeyDown}
- style={{ fontSize: termFontSize }}
+ style={{ fontSize: baseFontSize }}
placeholder="Ask anything..."
value={value}
>
@@ -642,7 +642,7 @@ const WaveAi = ({ model }: { model: WaveAiModel; blockId: string }) => {
const [value, setValue] = useState("");
const [selectedBlockIdx, setSelectedBlockIdx] = useState(null);
- const termFontSize: number = 14;
+ const baseFontSize: number = 14;
const msgWidths = {};
const locked = useAtomValue(model.locked);
@@ -815,7 +815,7 @@ const WaveAi = ({ model }: { model: WaveAiModel; blockId: string }) => {
onChange={handleTextAreaChange}
onKeyDown={handleTextAreaKeyDown}
onMouseDown={handleTextAreaMouseDown}
- termFontSize={termFontSize}
+ baseFontSize={baseFontSize}
/>
-
);
}
diff --git a/frontend/app/view/waveai/waveai.scss b/frontend/app/view/waveai/waveai.scss
index c35a5e24e..4a2020e5c 100644
--- a/frontend/app/view/waveai/waveai.scss
+++ b/frontend/app/view/waveai/waveai.scss
@@ -131,9 +131,6 @@
outline: none;
overflow: auto;
overflow-wrap: anywhere;
- font-family: var(--termfontfamily);
- font-weight: normal;
- line-height: var(--termlineheight);
height: 21px;
}
}
diff --git a/frontend/app/view/waveai/waveai.tsx b/frontend/app/view/waveai/waveai.tsx
index 6c0c02a38..b84bdd37f 100644
--- a/frontend/app/view/waveai/waveai.tsx
+++ b/frontend/app/view/waveai/waveai.tsx
@@ -569,7 +569,7 @@ const ChatWindow = memo(
interface ChatInputProps {
value: string;
- termFontSize: number;
+ baseFontSize: number;
onChange: (e: React.ChangeEvent
-
);
@@ -459,7 +466,12 @@ const ChatItem = ({ chatItem }: ChatItemProps) => {
-
) : (
@@ -474,11 +486,17 @@ const ChatItem = ({ chatItem }: ChatItemProps) => {
return (
<>
-
);
- }, [text, user]);
+ }, [text, user, fontSize, fixedFontSize]);
return {renderContent}
;
};
@@ -487,10 +505,11 @@ interface ChatWindowProps {
chatWindowRef: React.RefObject
{messages.map((chitem, idx) => (
-
@@ -804,7 +823,13 @@ const WaveAi = ({ model }: { model: WaveAiModel; blockId: string }) => {
return (
-
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
index afd3e6d24..afd817690 100644
--- a/frontend/types/gotypes.d.ts
+++ b/frontend/types/gotypes.d.ts
@@ -617,6 +617,8 @@ declare global {
"ai:apiversion"?: string;
"ai:maxtokens"?: number;
"ai:timeoutms"?: number;
+ "ai:fontsize"?: number;
+ "ai:fixedfontsize"?: number;
"term:*"?: boolean;
"term:fontsize"?: number;
"term:fontfamily"?: string;
@@ -629,6 +631,7 @@ declare global {
"editor:minimapenabled"?: boolean;
"editor:stickyscrollenabled"?: boolean;
"editor:wordwrap"?: boolean;
+ "editor:fontsize"?: number;
"web:*"?: boolean;
"web:openlinksinternally"?: boolean;
"web:defaulturl"?: string;
diff --git a/pkg/wconfig/metaconsts.go b/pkg/wconfig/metaconsts.go
index 42c7c89bd..6e62b5c20 100644
--- a/pkg/wconfig/metaconsts.go
+++ b/pkg/wconfig/metaconsts.go
@@ -17,6 +17,8 @@ const (
ConfigKey_AIApiVersion = "ai:apiversion"
ConfigKey_AiMaxTokens = "ai:maxtokens"
ConfigKey_AiTimeoutMs = "ai:timeoutms"
+ ConfigKey_AiFontSize = "ai:fontsize"
+ ConfigKey_AiFixedFontSize = "ai:fixedfontsize"
ConfigKey_TermClear = "term:*"
ConfigKey_TermFontSize = "term:fontsize"
@@ -31,6 +33,7 @@ const (
ConfigKey_EditorMinimapEnabled = "editor:minimapenabled"
ConfigKey_EditorStickyScrollEnabled = "editor:stickyscrollenabled"
ConfigKey_EditorWordWrap = "editor:wordwrap"
+ ConfigKey_EditorFontSize = "editor:fontsize"
ConfigKey_WebClear = "web:*"
ConfigKey_WebOpenLinksInternally = "web:openlinksinternally"
diff --git a/pkg/wconfig/settingsconfig.go b/pkg/wconfig/settingsconfig.go
index dc2671e4a..6b9e58319 100644
--- a/pkg/wconfig/settingsconfig.go
+++ b/pkg/wconfig/settingsconfig.go
@@ -33,17 +33,19 @@ const AnySchema = `
`
type SettingsType struct {
- AiClear bool `json:"ai:*,omitempty"`
- AiPreset string `json:"ai:preset,omitempty"`
- AiApiType string `json:"ai:apitype,omitempty"`
- AiBaseURL string `json:"ai:baseurl,omitempty"`
- AiApiToken string `json:"ai:apitoken,omitempty"`
- AiName string `json:"ai:name,omitempty"`
- AiModel string `json:"ai:model,omitempty"`
- AiOrgID string `json:"ai:orgid,omitempty"`
- AIApiVersion string `json:"ai:apiversion,omitempty"`
- AiMaxTokens float64 `json:"ai:maxtokens,omitempty"`
- AiTimeoutMs float64 `json:"ai:timeoutms,omitempty"`
+ AiClear bool `json:"ai:*,omitempty"`
+ AiPreset string `json:"ai:preset,omitempty"`
+ AiApiType string `json:"ai:apitype,omitempty"`
+ AiBaseURL string `json:"ai:baseurl,omitempty"`
+ AiApiToken string `json:"ai:apitoken,omitempty"`
+ AiName string `json:"ai:name,omitempty"`
+ AiModel string `json:"ai:model,omitempty"`
+ AiOrgID string `json:"ai:orgid,omitempty"`
+ AIApiVersion string `json:"ai:apiversion,omitempty"`
+ AiMaxTokens float64 `json:"ai:maxtokens,omitempty"`
+ AiTimeoutMs float64 `json:"ai:timeoutms,omitempty"`
+ AiFontSize float64 `json:"ai:fontsize,omitempty"`
+ AiFixedFontSize float64 `json:"ai:fixedfontsize,omitempty"`
TermClear bool `json:"term:*,omitempty"`
TermFontSize float64 `json:"term:fontsize,omitempty"`
@@ -55,9 +57,10 @@ type SettingsType struct {
TermScrollback *int64 `json:"term:scrollback,omitempty"`
TermCopyOnSelect *bool `json:"term:copyonselect,omitempty"`
- EditorMinimapEnabled bool `json:"editor:minimapenabled,omitempty"`
- EditorStickyScrollEnabled bool `json:"editor:stickyscrollenabled,omitempty"`
- EditorWordWrap bool `json:"editor:wordwrap,omitempty"`
+ EditorMinimapEnabled bool `json:"editor:minimapenabled,omitempty"`
+ EditorStickyScrollEnabled bool `json:"editor:stickyscrollenabled,omitempty"`
+ EditorWordWrap bool `json:"editor:wordwrap,omitempty"`
+ EditorFontSize float64 `json:"editor:fontsize,omitempty"`
WebClear bool `json:"web:*,omitempty"`
WebOpenLinksInternally bool `json:"web:openlinksinternally,omitempty"`
From 1ba370e4dd316a6aa6096b17b03ea9c2cb960106 Mon Sep 17 00:00:00 2001
From: Evan Simkowitz
Date: Mon, 16 Dec 2024 18:31:01 -0800
Subject: [PATCH 11/35] Fix iconbutton styling (#1538)
---
frontend/app/block/block.scss | 4 ++--
frontend/app/tab/workspaceswitcher.scss | 6 +++---
frontend/app/view/webview/webview.scss | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/frontend/app/block/block.scss b/frontend/app/block/block.scss
index 58a69c26e..87c5c645b 100644
--- a/frontend/app/block/block.scss
+++ b/frontend/app/block/block.scss
@@ -236,7 +236,7 @@
display: flex;
flex-shrink: 0;
- .iconbutton {
+ .wave-iconbutton {
display: flex;
width: 24px;
padding: 4px 6px;
@@ -268,7 +268,7 @@
align-items: center;
justify-content: center;
- .iconbutton {
+ .wave-iconbutton {
opacity: 0.7;
font-size: 45px;
margin: -30px 0 0 0;
diff --git a/frontend/app/tab/workspaceswitcher.scss b/frontend/app/tab/workspaceswitcher.scss
index a1b5545b8..596622501 100644
--- a/frontend/app/tab/workspaceswitcher.scss
+++ b/frontend/app/tab/workspaceswitcher.scss
@@ -100,17 +100,17 @@
gap: 5px;
}
- .iconbutton.edit {
+ .wave-iconbutton.edit {
visibility: hidden;
}
- .iconbutton.window {
+ .wave-iconbutton.window {
cursor: default;
opacity: 1 !important;
}
}
- &:hover .iconbutton.edit {
+ &:hover .wave-iconbutton.edit {
visibility: visible;
}
diff --git a/frontend/app/view/webview/webview.scss b/frontend/app/view/webview/webview.scss
index 761e556ba..960e5fa3b 100644
--- a/frontend/app/view/webview/webview.scss
+++ b/frontend/app/view/webview/webview.scss
@@ -42,7 +42,7 @@
opacity: 1;
}
- .iconbutton {
+ .wave-iconbutton {
width: fit-content !important;
margin-right: 5px;
}
From 78f3cd04722eff61986b1c4011c9da06f87acc48 Mon Sep 17 00:00:00 2001
From: Evan Simkowitz
Date: Mon, 16 Dec 2024 21:54:13 -0800
Subject: [PATCH 12/35] Synchronize workspace edits across windows, close
window when workspace is deleted (#1540)
---
frontend/app/tab/workspaceeditor.scss | 70 ++++++++
frontend/app/tab/workspaceeditor.tsx | 125 +++++++++++++++
frontend/app/tab/workspaceswitcher.scss | 115 +++-----------
frontend/app/tab/workspaceswitcher.tsx | 149 +++---------------
.../workspaceservice/workspaceservice.go | 3 +
pkg/wcore/window.go | 19 +--
pkg/wcore/workspace.go | 7 +
7 files changed, 256 insertions(+), 232 deletions(-)
create mode 100644 frontend/app/tab/workspaceeditor.scss
create mode 100644 frontend/app/tab/workspaceeditor.tsx
diff --git a/frontend/app/tab/workspaceeditor.scss b/frontend/app/tab/workspaceeditor.scss
new file mode 100644
index 000000000..d850d0a94
--- /dev/null
+++ b/frontend/app/tab/workspaceeditor.scss
@@ -0,0 +1,70 @@
+.workspace-editor {
+ width: 100%;
+ .input {
+ margin: 5px 0 10px;
+ }
+
+ .color-selector {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(15px, 15px)); // Ensures each color circle has a fixed 14px size
+ grid-gap: 18.5px; // Space between items
+ justify-content: center;
+ align-items: center;
+ margin-top: 5px;
+ padding-bottom: 15px;
+ border-bottom: 1px solid var(--modal-border-color);
+
+ .color-circle {
+ width: 15px;
+ height: 15px;
+ border-radius: 50%;
+ cursor: pointer;
+ position: relative;
+
+ // Border offset outward
+ &:before {
+ content: "";
+ position: absolute;
+ top: -3px;
+ left: -3px;
+ right: -3px;
+ bottom: -3px;
+ border-radius: 50%;
+ border: 1px solid transparent;
+ }
+
+ &.selected:before {
+ border-color: var(--main-text-color); // Highlight for the selected circle
+ }
+ }
+ }
+
+ .icon-selector {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(16px, 16px)); // Ensures each color circle has a fixed 14px size
+ grid-column-gap: 17.5px; // Space between items
+ grid-row-gap: 13px; // Space between items
+ justify-content: center;
+ align-items: center;
+ margin-top: 15px;
+
+ .icon-item {
+ font-size: 15px;
+ color: oklch(from var(--modal-bg-color) calc(l * 1.5) c h);
+ cursor: pointer;
+ transition: color 0.3s ease;
+
+ &.selected,
+ &:hover {
+ color: var(--main-text-color);
+ }
+ }
+ }
+
+ .delete-ws-btn-wrapper {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 10px;
+ }
+}
diff --git a/frontend/app/tab/workspaceeditor.tsx b/frontend/app/tab/workspaceeditor.tsx
new file mode 100644
index 000000000..e2fde28e9
--- /dev/null
+++ b/frontend/app/tab/workspaceeditor.tsx
@@ -0,0 +1,125 @@
+import { fireAndForget, makeIconClass } from "@/util/util";
+import clsx from "clsx";
+import { memo, useEffect, useRef, useState } from "react";
+import { Button } from "../element/button";
+import { Input } from "../element/input";
+import { WorkspaceService } from "../store/services";
+import "./workspaceeditor.scss";
+
+interface ColorSelectorProps {
+ colors: string[];
+ selectedColor?: string;
+ onSelect: (color: string) => void;
+ className?: string;
+}
+
+const ColorSelector = memo(({ colors, selectedColor, onSelect, className }: ColorSelectorProps) => {
+ const handleColorClick = (color: string) => {
+ onSelect(color);
+ };
+
+ return (
+
+ {colors.map((color) => (
+ (null);
+
+ const [colors, setColors] = useState([]);
+ const [icons, setIcons] = useState([]);
+
+ useEffect(() => {
+ fireAndForget(async () => {
+ const colors = await WorkspaceService.GetColors();
+ const icons = await WorkspaceService.GetIcons();
+ setColors(colors);
+ setIcons(icons);
+ });
+ }, []);
+
+ useEffect(() => {
+ if (focusInput && inputRef.current) {
+ inputRef.current.focus();
+ inputRef.current.select();
+ }
+ }, [focusInput]);
+
+ return (
+
handleColorClick(color)}
+ />
+ ))}
+
+ );
+});
+
+interface IconSelectorProps {
+ icons: string[];
+ selectedIcon?: string;
+ onSelect: (icon: string) => void;
+ className?: string;
+}
+
+const IconSelector = memo(({ icons, selectedIcon, onSelect, className }: IconSelectorProps) => {
+ const handleIconClick = (icon: string) => {
+ onSelect(icon);
+ };
+
+ return (
+
+ {icons.map((icon) => {
+ const iconClass = makeIconClass(icon, true);
+ return (
+ handleIconClick(icon)}
+ />
+ );
+ })}
+
+ );
+});
+
+interface WorkspaceEditorProps {
+ title: string;
+ icon: string;
+ color: string;
+ focusInput: boolean;
+ onTitleChange: (newTitle: string) => void;
+ onColorChange: (newColor: string) => void;
+ onIconChange: (newIcon: string) => void;
+ onDeleteWorkspace: () => void;
+}
+const WorkspaceEditorComponent = ({
+ title,
+ icon,
+ color,
+ focusInput,
+ onTitleChange,
+ onColorChange,
+ onIconChange,
+ onDeleteWorkspace,
+}: WorkspaceEditorProps) => {
+ const inputRef = useRef
+
+
+ );
+};
+
+export const WorkspaceEditor = memo(WorkspaceEditorComponent) as typeof WorkspaceEditorComponent;
diff --git a/frontend/app/tab/workspaceswitcher.scss b/frontend/app/tab/workspaceswitcher.scss
index 596622501..c8b3e1fa9 100644
--- a/frontend/app/tab/workspaceswitcher.scss
+++ b/frontend/app/tab/workspaceswitcher.scss
@@ -26,25 +26,6 @@
}
}
-.icon-left,
-.icon-right {
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 20px;
-}
-
-.divider {
- width: 1px;
- height: 20px;
- background: rgba(255, 255, 255, 0.08);
-}
-
-.scrollable {
- max-height: 400px;
- width: 100%;
-}
-
.workspace-switcher-content {
min-height: auto;
display: flex;
@@ -55,6 +36,25 @@
border-radius: 8px;
box-shadow: 0px 8px 24px 0px var(--modal-shadow-color);
+ .icon-left,
+ .icon-right {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 20px;
+ }
+
+ .divider {
+ width: 1px;
+ height: 20px;
+ background: rgba(255, 255, 255, 0.08);
+ }
+
+ .scrollable {
+ max-height: 400px;
+ width: 100%;
+ }
+
.title {
font-size: 12px;
line-height: 19px;
@@ -144,83 +144,6 @@
padding: 0;
}
- .workspace-editor {
- width: 100%;
- .input {
- margin: 5px 0 10px;
- }
-
- .color-selector {
- display: grid;
- grid-template-columns: repeat(
- auto-fit,
- minmax(15px, 15px)
- ); // Ensures each color circle has a fixed 14px size
- grid-gap: 18.5px; // Space between items
- justify-content: center;
- align-items: center;
- margin-top: 5px;
- padding-bottom: 15px;
- border-bottom: 1px solid var(--modal-border-color);
-
- .color-circle {
- width: 15px;
- height: 15px;
- border-radius: 50%;
- cursor: pointer;
- position: relative;
-
- // Border offset outward
- &:before {
- content: "";
- position: absolute;
- top: -3px;
- left: -3px;
- right: -3px;
- bottom: -3px;
- border-radius: 50%;
- border: 1px solid transparent;
- }
-
- &.selected:before {
- border-color: var(--main-text-color); // Highlight for the selected circle
- }
- }
- }
-
- .icon-selector {
- display: grid;
- grid-template-columns: repeat(
- auto-fit,
- minmax(16px, 16px)
- ); // Ensures each color circle has a fixed 14px size
- grid-column-gap: 17.5px; // Space between items
- grid-row-gap: 13px; // Space between items
- justify-content: center;
- align-items: center;
- margin-top: 15px;
-
- .icon-item {
- font-size: 15px;
- color: oklch(from var(--modal-bg-color) calc(l * 1.5) c h);
- cursor: pointer;
- transition: color 0.3s ease;
-
- &.selected,
- &:hover {
- color: var(--main-text-color);
- }
- }
- }
-
- .delete-ws-btn-wrapper {
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 10px;
- }
- }
-
.actions {
width: 100%;
padding: 3px 0;
diff --git a/frontend/app/tab/workspaceswitcher.tsx b/frontend/app/tab/workspaceswitcher.tsx
index 9f204b2ae..bd995a611 100644
--- a/frontend/app/tab/workspaceswitcher.tsx
+++ b/frontend/app/tab/workspaceswitcher.tsx
@@ -1,7 +1,6 @@
// Copyright 2024, Command Line
// SPDX-License-Identifier: Apache-2.0
-import { Button } from "@/element/button";
import {
ExpandableMenu,
ExpandableMenuItem,
@@ -10,139 +9,22 @@ import {
ExpandableMenuItemLeftElement,
ExpandableMenuItemRightElement,
} from "@/element/expandablemenu";
-import { Input } from "@/element/input";
import { Popover, PopoverButton, PopoverContent } from "@/element/popover";
import { fireAndForget, makeIconClass, useAtomValueSafe } from "@/util/util";
import clsx from "clsx";
import { atom, PrimitiveAtom, useAtom, useAtomValue, useSetAtom } from "jotai";
import { splitAtom } from "jotai/utils";
import { OverlayScrollbarsComponent } from "overlayscrollbars-react";
-import { CSSProperties, forwardRef, memo, useCallback, useEffect, useRef, useState } from "react";
+import { CSSProperties, forwardRef, useCallback, useEffect } from "react";
import WorkspaceSVG from "../asset/workspace.svg";
import { IconButton } from "../element/iconbutton";
import { atoms, getApi } from "../store/global";
import { WorkspaceService } from "../store/services";
-import { getObjectValue, makeORef, setObjectValue } from "../store/wos";
+import { getObjectValue, makeORef } from "../store/wos";
+import { waveEventSubscribe } from "../store/wps";
+import { WorkspaceEditor } from "./workspaceeditor";
import "./workspaceswitcher.scss";
-interface ColorSelectorProps {
- colors: string[];
- selectedColor?: string;
- onSelect: (color: string) => void;
- className?: string;
-}
-
-const ColorSelector = memo(({ colors, selectedColor, onSelect, className }: ColorSelectorProps) => {
- const handleColorClick = (color: string) => {
- onSelect(color);
- };
-
- return (
-
+
+
+
- {colors.map((color) => (
- (null);
-
- const [colors, setColors] = useState([]);
- const [icons, setIcons] = useState([]);
-
- useEffect(() => {
- fireAndForget(async () => {
- const colors = await WorkspaceService.GetColors();
- const icons = await WorkspaceService.GetIcons();
- setColors(colors);
- setIcons(icons);
- });
- }, []);
-
- useEffect(() => {
- if (focusInput && inputRef.current) {
- inputRef.current.focus();
- inputRef.current.select();
- }
- }, [focusInput]);
-
- return (
- ((_, ref) => {
setWorkspaceList(newList);
}, []);
+ useEffect(
+ () =>
+ waveEventSubscribe({
+ eventType: "workspace:update",
+ handler: () => fireAndForget(updateWorkspaceList),
+ }),
+ []
+ );
+
useEffect(() => {
fireAndForget(updateWorkspaceList);
}, []);
const onDeleteWorkspace = useCallback((workspaceId: string) => {
getApi().deleteWorkspace(workspaceId);
- setTimeout(() => {
- fireAndForget(updateWorkspaceList);
- }, 10);
}, []);
const isActiveWorkspaceSaved = !!(activeWorkspace.name && activeWorkspace.icon);
@@ -266,9 +154,16 @@ const WorkspaceSwitcherItem = ({
const setWorkspace = useCallback((newWorkspace: Workspace) => {
if (newWorkspace.name != "") {
- setObjectValue({ ...newWorkspace, otype: "workspace" }, undefined, true);
+ fireAndForget(() =>
+ WorkspaceService.UpdateWorkspace(
+ workspace.oid,
+ newWorkspace.name,
+ newWorkspace.icon,
+ newWorkspace.color,
+ false
+ )
+ );
}
- setWorkspaceEntry({ ...workspaceEntry, workspace: newWorkspace });
}, []);
const isActive = !!workspaceEntry.windowId;
diff --git a/pkg/service/workspaceservice/workspaceservice.go b/pkg/service/workspaceservice/workspaceservice.go
index b48bafcc8..1c86ff77b 100644
--- a/pkg/service/workspaceservice/workspaceservice.go
+++ b/pkg/service/workspaceservice/workspaceservice.go
@@ -50,6 +50,9 @@ func (svc *WorkspaceService) UpdateWorkspace(ctx context.Context, workspaceId st
return nil, fmt.Errorf("error updating workspace: %w", err)
}
+ wps.Broker.Publish(wps.WaveEvent{
+ Event: wps.Event_WorkspaceUpdate})
+
updates := waveobj.ContextGetUpdatesRtn(ctx)
go func() {
defer panichandler.PanicHandler("WorkspaceService:UpdateWorkspace:SendUpdateEvents")
diff --git a/pkg/wcore/window.go b/pkg/wcore/window.go
index 53fd823c1..19dea5392 100644
--- a/pkg/wcore/window.go
+++ b/pkg/wcore/window.go
@@ -28,7 +28,8 @@ func SwitchWorkspace(ctx context.Context, windowId string, workspaceId string) (
if err != nil {
return nil, fmt.Errorf("error getting window: %w", err)
}
- if window.WorkspaceId == workspaceId {
+ curWsId := window.WorkspaceId
+ if curWsId == workspaceId {
return nil, nil
}
@@ -45,24 +46,24 @@ func SwitchWorkspace(ctx context.Context, windowId string, workspaceId string) (
return nil, err
}
}
-
- curWs, err := GetWorkspace(ctx, window.WorkspaceId)
+ window.WorkspaceId = workspaceId
+ err = wstore.DBUpdate(ctx, window)
if err != nil {
- return nil, fmt.Errorf("error getting current workspace: %w", err)
+ return nil, fmt.Errorf("error updating window: %w", err)
}
- deleted, err := DeleteWorkspace(ctx, curWs.OID, false)
+
+ deleted, err := DeleteWorkspace(ctx, curWsId, false)
if err != nil {
return nil, fmt.Errorf("error deleting current workspace: %w", err)
}
if !deleted {
- log.Printf("current workspace %s was not deleted\n", curWs.OID)
+ log.Printf("current workspace %s was not deleted\n", curWsId)
} else {
- log.Printf("deleted current workspace %s\n", curWs.OID)
+ log.Printf("deleted current workspace %s\n", curWsId)
}
- window.WorkspaceId = workspaceId
log.Printf("switching window %s to workspace %s\n", windowId, workspaceId)
- return ws, wstore.DBUpdate(ctx, window)
+ return ws, nil
}
func GetWindow(ctx context.Context, windowId string) (*waveobj.Window, error) {
diff --git a/pkg/wcore/workspace.go b/pkg/wcore/workspace.go
index c0b2da324..b3143b2ab 100644
--- a/pkg/wcore/workspace.go
+++ b/pkg/wcore/workspace.go
@@ -122,6 +122,7 @@ func DeleteWorkspace(ctx context.Context, workspaceId string, force bool) (bool,
return false, fmt.Errorf("error closing tab: %w", err)
}
}
+ windowId, err := wstore.DBFindWindowForWorkspaceId(ctx, workspaceId)
err = wstore.DBDelete(ctx, waveobj.OType_Workspace, workspaceId)
if err != nil {
return false, fmt.Errorf("error deleting workspace: %w", err)
@@ -129,6 +130,12 @@ func DeleteWorkspace(ctx context.Context, workspaceId string, force bool) (bool,
log.Printf("deleted workspace %s\n", workspaceId)
wps.Broker.Publish(wps.WaveEvent{
Event: wps.Event_WorkspaceUpdate})
+ if windowId != "" {
+ err = CloseWindow(ctx, windowId, false)
+ if err != nil {
+ return false, fmt.Errorf("error closing window: %w", err)
+ }
+ }
return true, nil
}
From 95b1767c4557cf975cd2223081749e107cc5a3a2 Mon Sep 17 00:00:00 2001
From: Mike Sawka
Date: Tue, 17 Dec 2024 11:55:34 -0800
Subject: [PATCH 13/35] fix terminal escape sequence printing bug (#1544)
## Summary by CodeRabbit
- **Bug Fixes**
- Improved handling of terminal data processing by ensuring it only
occurs when the terminal is fully initialized.
---
frontend/app/view/term/termwrap.ts | 3 +++
1 file changed, 3 insertions(+)
diff --git a/frontend/app/view/term/termwrap.ts b/frontend/app/view/term/termwrap.ts
index 84c940ca3..0ab2ea634 100644
--- a/frontend/app/view/term/termwrap.ts
+++ b/frontend/app/view/term/termwrap.ts
@@ -165,6 +165,9 @@ export class TermWrap {
}
handleTermData(data: string) {
+ if (!this.loaded) {
+ return;
+ }
const b64data = util.stringToBase64(data);
RpcApi.ControllerInputCommand(TabRpcClient, { blockid: this.blockId, inputdata64: b64data });
}
From f5305cc8dd78609ad0966117a18ec64d2875b9fb Mon Sep 17 00:00:00 2001
From: Sylvie Crowe <107814465+oneirocosm@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:22:57 -0800
Subject: [PATCH 14/35] Disable Wsh on Remotes where the Domain Socket Listener
Fails (#1542)
A recent change meant that if certain operations for setting up wsh
failed, a fallback would be employed to launch the terminal without the
wsh connection. This adds the domain socket listener to the list of
things that are allowed to fail before retrying without wsh instead of
failing outright.
---
pkg/remote/conncontroller/conncontroller.go | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/pkg/remote/conncontroller/conncontroller.go b/pkg/remote/conncontroller/conncontroller.go
index b66088923..1215be657 100644
--- a/pkg/remote/conncontroller/conncontroller.go
+++ b/pkg/remote/conncontroller/conncontroller.go
@@ -509,11 +509,6 @@ func (conn *SSHConn) connectInternal(ctx context.Context, connFlags *wshrpc.Conn
conn.WithLock(func() {
conn.Client = client
})
- err = conn.OpenDomainSocketListener()
- if err != nil {
- log.Printf("error: unable to open domain socket listener for %s: %v\n", conn.GetName(), err)
- return err
- }
config := wconfig.ReadFullConfig()
enableWsh := config.Settings.ConnWshEnabled
askBeforeInstall := config.Settings.ConnAskBeforeWshInstall
@@ -545,15 +540,22 @@ func (conn *SSHConn) connectInternal(ctx context.Context, connFlags *wshrpc.Conn
}
if conn.WshEnabled.Load() {
- csErr := conn.StartConnServer()
- if csErr != nil {
- log.Printf("error: unable to start conn server for %s: %v\n", conn.GetName(), csErr)
+ dsErr := conn.OpenDomainSocketListener()
+ var csErr error
+ if dsErr != nil {
+ log.Printf("error: unable to open domain socket listener for %s: %v\n", conn.GetName(), dsErr)
+ } else {
+ csErr = conn.StartConnServer()
+ if csErr != nil {
+ log.Printf("error: unable to start conn server for %s: %v\n", conn.GetName(), csErr)
+ }
+ }
+ if dsErr != nil || csErr != nil {
log.Print("attempting to run with nowsh instead")
conn.WithLock(func() {
conn.WshError = csErr.Error()
})
conn.WshEnabled.Store(false)
- //return fmt.Errorf("conncontroller %s start wsh connserver error: %v", conn.GetName(), csErr)
}
}
} else {
From 799aecd501553662613128d83913b768857076b7 Mon Sep 17 00:00:00 2001
From: Evan Simkowitz
Date: Tue, 17 Dec 2024 13:00:55 -0800
Subject: [PATCH 15/35] Add ZDOTDIR after JWT token for WSL commands (#1546)
---
pkg/shellexec/shellexec.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pkg/shellexec/shellexec.go b/pkg/shellexec/shellexec.go
index d22cdbb1f..2c811d85c 100644
--- a/pkg/shellexec/shellexec.go
+++ b/pkg/shellexec/shellexec.go
@@ -167,9 +167,6 @@ func StartWslShellProc(ctx context.Context, termSize waveobj.TermSize, cmdStr st
homeDir := wsl.GetHomeDir(conn.Context, client)
shellOpts = append(shellOpts, "~", "-d", client.Name())
- if isZshShell(shellPath) {
- shellOpts = append(shellOpts, fmt.Sprintf(`ZDOTDIR="%s/.waveterm/%s"`, homeDir, shellutil.ZshIntegrationDir))
- }
var subShellOpts []string
if cmdStr == "" {
@@ -216,6 +213,10 @@ func StartWslShellProc(ctx context.Context, termSize waveobj.TermSize, cmdStr st
} else {
shellOpts = append(shellOpts, "--", fmt.Sprintf(`%s=%s`, wshutil.WaveJwtTokenVarName, jwtToken))
}
+
+ if isZshShell(shellPath) {
+ shellOpts = append(shellOpts, fmt.Sprintf(`ZDOTDIR="%s/.waveterm/%s"`, homeDir, shellutil.ZshIntegrationDir))
+ }
shellOpts = append(shellOpts, shellPath)
shellOpts = append(shellOpts, subShellOpts...)
log.Printf("full cmd is: %s %s", "wsl.exe", strings.Join(shellOpts, " "))
From 0a3dadb6285b2752f036c377a017a849b6ba7fe5 Mon Sep 17 00:00:00 2001
From: Evan Simkowitz
Date: Tue, 17 Dec 2024 14:11:40 -0800
Subject: [PATCH 16/35] Add `wsh wavepath` command for getting Wave paths
(#1545)
---
cmd/wsh/cmd/wshcmd-wavepath.go | 135 +++++++++++++++++++++++++++++
docs/docs/wsh-reference.mdx | 48 ++++++++++
frontend/app/store/wshclientapi.ts | 5 ++
frontend/layout/lib/layoutModel.ts | 5 ++
frontend/types/gotypes.d.ts | 10 +++
go.mod | 1 +
go.sum | 2 +
pkg/waveobj/wtype.go | 1 +
pkg/wshrpc/wshclient/wshclient.go | 6 ++
pkg/wshrpc/wshrpctypes.go | 9 ++
pkg/wshrpc/wshserver/wshserver.go | 39 +++++++++
11 files changed, 261 insertions(+)
create mode 100644 cmd/wsh/cmd/wshcmd-wavepath.go
diff --git a/cmd/wsh/cmd/wshcmd-wavepath.go b/cmd/wsh/cmd/wshcmd-wavepath.go
new file mode 100644
index 000000000..fcfcbc7f3
--- /dev/null
+++ b/cmd/wsh/cmd/wshcmd-wavepath.go
@@ -0,0 +1,135 @@
+// Copyright 2024, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+ "bytes"
+ "fmt"
+ "io"
+ "os"
+
+ "github.com/spf13/cobra"
+ "github.com/wavetermdev/waveterm/pkg/wshrpc"
+ "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
+)
+
+var wavepathCmd = &cobra.Command{
+ Use: "wavepath {config|data|log}",
+ Short: "Get paths to various waveterm files and directories",
+ RunE: wavepathRun,
+ PreRunE: preRunSetupRpcClient,
+}
+
+func init() {
+ wavepathCmd.Flags().BoolP("open", "o", false, "Open the path in a new block")
+ wavepathCmd.Flags().BoolP("open-external", "O", false, "Open the path in the default external application")
+ wavepathCmd.Flags().BoolP("tail", "t", false, "Tail the last 100 lines of the log")
+ rootCmd.AddCommand(wavepathCmd)
+}
+
+func wavepathRun(cmd *cobra.Command, args []string) (rtnErr error) {
+ defer func() {
+ sendActivity("wavepath", rtnErr == nil)
+ }()
+
+ if len(args) == 0 {
+ OutputHelpMessage(cmd)
+ return fmt.Errorf("no arguments. wsh wavepath requires a type argument (config, data, or log)")
+ }
+ if len(args) > 1 {
+ OutputHelpMessage(cmd)
+ return fmt.Errorf("too many arguments. wsh wavepath requires exactly one argument")
+ }
+
+ pathType := args[0]
+ if pathType != "config" && pathType != "data" && pathType != "log" {
+ OutputHelpMessage(cmd)
+ return fmt.Errorf("invalid path type %q. must be one of: config, data, log", pathType)
+ }
+
+ tail, _ := cmd.Flags().GetBool("tail")
+ if tail && pathType != "log" {
+ return fmt.Errorf("--tail can only be used with the log path type")
+ }
+
+ open, _ := cmd.Flags().GetBool("open")
+ openExternal, _ := cmd.Flags().GetBool("open-external")
+
+ path, err := wshclient.PathCommand(RpcClient, wshrpc.PathCommandData{
+ PathType: pathType,
+ Open: open,
+ OpenExternal: openExternal,
+ }, nil)
+ if err != nil {
+ return fmt.Errorf("getting path: %w", err)
+ }
+
+ if tail && pathType == "log" {
+ err = tailLogFile(path)
+ if err != nil {
+ return fmt.Errorf("tailing log file: %w", err)
+ }
+ return nil
+ }
+
+ WriteStdout("%s\n", path)
+ return nil
+}
+
+func tailLogFile(path string) error {
+ file, err := os.Open(path)
+ if err != nil {
+ return fmt.Errorf("opening log file: %w", err)
+ }
+ defer file.Close()
+
+ // Get file size
+ stat, err := file.Stat()
+ if err != nil {
+ return fmt.Errorf("getting file stats: %w", err)
+ }
+
+ // Read last 16KB or whole file if smaller
+ readSize := int64(16 * 1024)
+ var offset int64
+ if stat.Size() > readSize {
+ offset = stat.Size() - readSize
+ }
+
+ _, err = file.Seek(offset, 0)
+ if err != nil {
+ return fmt.Errorf("seeking file: %w", err)
+ }
+
+ buf := make([]byte, readSize)
+ n, err := file.Read(buf)
+ if err != nil && err != io.EOF {
+ return fmt.Errorf("reading file: %w", err)
+ }
+ buf = buf[:n]
+
+ // Skip partial line at start if we're not at beginning of file
+ if offset > 0 {
+ idx := bytes.IndexByte(buf, '\n')
+ if idx >= 0 {
+ buf = buf[idx+1:]
+ }
+ }
+
+ // Split into lines
+ lines := bytes.Split(buf, []byte{'\n'})
+
+ // Take last 100 lines if we have more
+ startIdx := 0
+ if len(lines) > 100 {
+ startIdx = len(lines) - 100
+ }
+
+ // Print lines
+ for _, line := range lines[startIdx:] {
+ WriteStdout("%s\n", string(line))
+ }
+
+ return nil
+}
diff --git a/docs/docs/wsh-reference.mdx b/docs/docs/wsh-reference.mdx
index b5c095ed5..2931c4683 100644
--- a/docs/docs/wsh-reference.mdx
+++ b/docs/docs/wsh-reference.mdx
@@ -693,4 +693,52 @@ wsh setvar -b client MYVAR=value
Variables set with these commands persist across sessions and can be used to store configuration values, secrets, or any other string data that needs to be accessible across blocks or tabs.
+## wavepath
+
+The `wavepath` command lets you get the paths to various Wave Terminal directories and files, including configuration, data storage, and logs.
+
+```bash
+wsh wavepath {config|data|log}
+```
+
+This command returns the full path to the requested Wave Terminal system directory or file. It's useful for accessing Wave's configuration files, data storage, or checking logs.
+
+Flags:
+
+- `-o, --open` - open the path in a new block
+- `-O, --open-external` - open the path in the default external application
+- `-t, --tail` - show the last ~100 lines of the log file (only valid for log path)
+
+Examples:
+
+```bash
+# Get path to config directory
+wsh wavepath config
+
+# Get path to data directory
+wsh wavepath data
+
+# Get path to log file
+wsh wavepath log
+
+# Open log file in a new block
+wsh wavepath -o log
+
+# Open config directory in system file explorer
+wsh wavepath -O config
+
+# View recent log entries
+wsh wavepath -t log
+```
+
+The command will show you the full path to:
+
+- `config` - Where Wave Terminal stores its configuration files
+- `data` - Where Wave Terminal stores its persistent data
+- `log` - The main Wave Terminal log file
+
+:::tip
+Use the `-t` flag with the log path to quickly view recent log entries without having to open the full file. This is particularly useful for troubleshooting.
+:::
+
diff --git a/frontend/app/store/wshclientapi.ts b/frontend/app/store/wshclientapi.ts
index a5e75774d..846091596 100644
--- a/frontend/app/store/wshclientapi.ts
+++ b/frontend/app/store/wshclientapi.ts
@@ -202,6 +202,11 @@ class RpcApiType {
return client.wshRpcCall("notify", data, opts);
}
+ // command "path" [call]
+ PathCommand(client: WshClient, data: PathCommandData, opts?: RpcOpts): Promise {
+ return client.wshRpcCall("path", data, opts);
+ }
+
// command "remotefiledelete" [call]
RemoteFileDeleteCommand(client: WshClient, data: string, opts?: RpcOpts): Promise {
return client.wshRpcCall("remotefiledelete", data, opts);
diff --git a/frontend/layout/lib/layoutModel.ts b/frontend/layout/lib/layoutModel.ts
index 1a70fc22d..7f8479c0a 100644
--- a/frontend/layout/lib/layoutModel.ts
+++ b/frontend/layout/lib/layoutModel.ts
@@ -412,6 +412,11 @@ export class LayoutModel {
for (const action of actions) {
switch (action.actiontype) {
case LayoutTreeActionType.InsertNode: {
+ if (action.ephemeral) {
+ this.newEphemeralNode(action.blockid);
+ break;
+ }
+
const insertNodeAction: LayoutTreeInsertNodeAction = {
type: LayoutTreeActionType.InsertNode,
node: newLayoutNode(undefined, undefined, undefined, {
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
index afd817690..895494bda 100644
--- a/frontend/types/gotypes.d.ts
+++ b/frontend/types/gotypes.d.ts
@@ -139,6 +139,7 @@ declare global {
blockdef: BlockDef;
rtopts?: RuntimeOpts;
magnified?: boolean;
+ ephemeral?: boolean;
};
// wshrpc.CommandCreateSubBlockData
@@ -400,6 +401,7 @@ declare global {
indexarr?: number[];
focused: boolean;
magnified: boolean;
+ ephemeral: boolean;
};
// waveobj.LayoutState
@@ -562,6 +564,14 @@ declare global {
prompt: OpenAIPromptMessageType[];
};
+ // wshrpc.PathCommandData
+ type PathCommandData = {
+ pathtype: string;
+ open: boolean;
+ openexternal: boolean;
+ tabid: string;
+ };
+
// waveobj.Point
type Point = {
x: number;
diff --git a/go.mod b/go.mod
index c713a76c6..772c34c62 100644
--- a/go.mod
+++ b/go.mod
@@ -20,6 +20,7 @@ require (
github.com/sawka/txwrap v0.2.0
github.com/shirou/gopsutil/v4 v4.24.11
github.com/skeema/knownhosts v1.3.0
+ github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/cobra v1.8.1
github.com/ubuntu/gowsl v0.0.0-20240906163211-049fd49bd93b
github.com/wavetermdev/htmltoken v0.2.0
diff --git a/go.sum b/go.sum
index b59c00510..8429144ec 100644
--- a/go.sum
+++ b/go.sum
@@ -68,6 +68,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
diff --git a/pkg/waveobj/wtype.go b/pkg/waveobj/wtype.go
index 9fa4bb3d1..af775e019 100644
--- a/pkg/waveobj/wtype.go
+++ b/pkg/waveobj/wtype.go
@@ -208,6 +208,7 @@ type LayoutActionData struct {
IndexArr *[]int `json:"indexarr,omitempty"`
Focused bool `json:"focused"`
Magnified bool `json:"magnified"`
+ Ephemeral bool `json:"ephemeral"`
}
type LeafOrderEntry struct {
diff --git a/pkg/wshrpc/wshclient/wshclient.go b/pkg/wshrpc/wshclient/wshclient.go
index d8aa04748..3dce286c4 100644
--- a/pkg/wshrpc/wshclient/wshclient.go
+++ b/pkg/wshrpc/wshclient/wshclient.go
@@ -247,6 +247,12 @@ func NotifyCommand(w *wshutil.WshRpc, data wshrpc.WaveNotificationOptions, opts
return err
}
+// command "path", wshserver.PathCommand
+func PathCommand(w *wshutil.WshRpc, data wshrpc.PathCommandData, opts *wshrpc.RpcOpts) (string, error) {
+ resp, err := sendRpcRequestCallHelper[string](w, "path", data, opts)
+ return resp, err
+}
+
// command "remotefiledelete", wshserver.RemoteFileDeleteCommand
func RemoteFileDeleteCommand(w *wshutil.WshRpc, data string, opts *wshrpc.RpcOpts) error {
_, err := sendRpcRequestCallHelper[any](w, "remotefiledelete", data, opts)
diff --git a/pkg/wshrpc/wshrpctypes.go b/pkg/wshrpc/wshrpctypes.go
index ed5aaa7bb..71806f6b0 100644
--- a/pkg/wshrpc/wshrpctypes.go
+++ b/pkg/wshrpc/wshrpctypes.go
@@ -149,6 +149,7 @@ type WshRpcInterface interface {
ActivityCommand(ctx context.Context, data ActivityUpdate) error
GetVarCommand(ctx context.Context, data CommandVarData) (*CommandVarResponseData, error)
SetVarCommand(ctx context.Context, data CommandVarData) error
+ PathCommand(ctx context.Context, data PathCommandData) (string, error)
// connection functions
ConnStatusCommand(ctx context.Context) ([]ConnStatus, error)
@@ -290,6 +291,7 @@ type CommandCreateBlockData struct {
BlockDef *waveobj.BlockDef `json:"blockdef"`
RtOpts *waveobj.RuntimeOpts `json:"rtopts,omitempty"`
Magnified bool `json:"magnified,omitempty"`
+ Ephemeral bool `json:"ephemeral,omitempty"`
}
type CommandCreateSubBlockData struct {
@@ -604,6 +606,13 @@ type CommandVarResponseData struct {
Exists bool `json:"exists"`
}
+type PathCommandData struct {
+ PathType string `json:"pathtype"`
+ Open bool `json:"open"`
+ OpenExternal bool `json:"openexternal"`
+ TabId string `json:"tabid" wshcontext:"TabId"`
+}
+
type ActivityDisplayType struct {
Width int `json:"width"`
Height int `json:"height"`
diff --git a/pkg/wshrpc/wshserver/wshserver.go b/pkg/wshrpc/wshserver/wshserver.go
index 9e0cd1702..b4e2acfec 100644
--- a/pkg/wshrpc/wshserver/wshserver.go
+++ b/pkg/wshrpc/wshserver/wshserver.go
@@ -12,10 +12,12 @@ import (
"fmt"
"io/fs"
"log"
+ "path/filepath"
"regexp"
"strings"
"time"
+ "github.com/skratchdot/open-golang/open"
"github.com/wavetermdev/waveterm/pkg/blockcontroller"
"github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/waveterm/pkg/panichandler"
@@ -183,6 +185,7 @@ func (ws *WshServer) CreateBlockCommand(ctx context.Context, data wshrpc.Command
ActionType: wcore.LayoutActionDataType_Insert,
BlockId: blockData.OID,
Magnified: data.Magnified,
+ Ephemeral: data.Ephemeral,
Focused: true,
})
if err != nil {
@@ -829,3 +832,39 @@ func (ws *WshServer) SetVarCommand(ctx context.Context, data wshrpc.CommandVarDa
envStr := envutil.MapToEnv(envMap)
return filestore.WFS.WriteFile(ctx, data.ZoneId, data.FileName, []byte(envStr))
}
+
+func (ws *WshServer) PathCommand(ctx context.Context, data wshrpc.PathCommandData) (string, error) {
+ pathType := data.PathType
+ openInternal := data.Open
+ openExternal := data.OpenExternal
+ var path string
+ switch pathType {
+ case "config":
+ path = wavebase.GetWaveConfigDir()
+ case "data":
+ path = wavebase.GetWaveDataDir()
+ case "log":
+ path = filepath.Join(wavebase.GetWaveDataDir(), "waveapp.log")
+ }
+
+ if openInternal && openExternal {
+ return "", fmt.Errorf("open and openExternal cannot both be true")
+ }
+
+ if openInternal {
+ _, err := ws.CreateBlockCommand(ctx, wshrpc.CommandCreateBlockData{BlockDef: &waveobj.BlockDef{Meta: map[string]any{
+ waveobj.MetaKey_View: "preview",
+ waveobj.MetaKey_File: path,
+ }}, Ephemeral: true, TabId: data.TabId})
+
+ if err != nil {
+ return path, fmt.Errorf("error opening path: %w", err)
+ }
+ } else if openExternal {
+ err := open.Run(path)
+ if err != nil {
+ return path, fmt.Errorf("error opening path: %w", err)
+ }
+ }
+ return path, nil
+}
From a06ba64e2f167d15a132ab0d93b03a62bf7ea4a9 Mon Sep 17 00:00:00 2001
From: Mike Sawka
Date: Tue, 17 Dec 2024 14:23:27 -0800
Subject: [PATCH 17/35] document markdown font size settings (#1547)
## Summary by CodeRabbit
- **New Features**
- Introduced new configuration options for markdown rendering:
- `markdown:fontsize` for normal text size (default 14px).
- `markdown:fixedfontsize` for code block text size (default 12px).
---
docs/docs/config.mdx | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/docs/config.mdx b/docs/docs/config.mdx
index c72095558..c960d8be5 100644
--- a/docs/docs/config.mdx
+++ b/docs/docs/config.mdx
@@ -46,6 +46,8 @@ wsh editconfig
| editor:minimapenabled | bool | set to false to disable editor minimap |
| editor:stickyscrollenabled | bool | enables monaco editor's stickyScroll feature (pinning headers of current context, e.g. class names, method names, etc.), defaults to false |
| editor:wordwrap | bool | set to true to enable word wrapping in the editor (defaults to false) |
+| markdown:fontsize | float64 | font size for the normal text when rendering markdown in preview. headers are scaled up from this size, (default 14px) |
+| markdown:fixedfontsize | float64 | font size for the code blocks when rendering markdown in preview (default is 12px) |
| web:openlinksinternally | bool | set to false to open web links in external browser |
| web:defaulturl | string | default web page to open in the web widget when no url is provided (homepage) |
| web:defaultsearch | string | search template for web searches. e.g. `https://www.google.com/search?q={query}`. "\{query}" gets replaced by search term |
From 801034c87d0856051bdbd6375bf0c4c8b15f74b8 Mon Sep 17 00:00:00 2001
From: "wave-builder[bot]"
<181805596+wave-builder[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 22:24:41 +0000
Subject: [PATCH 18/35] chore: bump package version to 0.10.2-beta.0
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index cdb5a81ca..6497727ea 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"productName": "Wave",
"description": "Open-Source AI-Native Terminal Built for Seamless Workflows",
"license": "Apache-2.0",
- "version": "0.10.1",
+ "version": "0.10.2-beta.0",
"homepage": "https://waveterm.dev",
"build": {
"appId": "dev.commandline.waveterm"
From dbc2be1c1e9272a948ad08c20666af307eddb24c Mon Sep 17 00:00:00 2001
From: Sylvie Crowe <107814465+oneirocosm@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:25:34 -0800
Subject: [PATCH 19/35] Global Hotkey Docs (#1548)
Adds the following changes:
- renames "key:globalhotkey" to "app:globalhotkey"
- adds globalhostkey documentation (especially in regard to what keys are allowed)
- improves the algorithm that converts electron keybindings from wave keybindings
- fixes some regexp problems
---
docs/docs/config.mdx | 42 ++++++++++++++++++++++
docs/docs/keybindings.mdx | 4 +++
emain/emain-util.ts | 66 +++++++++++++++++++++++++++++++++++
emain/emain.ts | 2 +-
frontend/types/gotypes.d.ts | 4 +--
pkg/wconfig/metaconsts.go | 6 ++--
pkg/wconfig/settingsconfig.go | 6 ++--
7 files changed, 121 insertions(+), 9 deletions(-)
diff --git a/docs/docs/config.mdx b/docs/docs/config.mdx
index c960d8be5..49cada776 100644
--- a/docs/docs/config.mdx
+++ b/docs/docs/config.mdx
@@ -25,6 +25,7 @@ wsh editconfig
| Key Name | Type | Function |
| ------------------------------------ | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| app:globalhotkey | string | A systemwide keybinding to open your most recent wave window. This is a set of key names separated by `:`. For more info, see [Customizable Systemwide Global Hotkey](#customizable-systemwide-global-hotkey) |
| ai:preset | string | the default AI preset to use |
| ai:baseurl | string | Set the AI Base Url (must be OpenAI compatible) |
| ai:apitoken | string | your AI api token |
@@ -190,3 +191,44 @@ wsh editconfig termthemes.json
| background | CSS color | | | background color (default when no color code is applied), must have alpha channel (#rrggbbaa) if you want the terminal to be transparent |
| cursorAccent | CSS color | | | color for cursor |
| selectionBackground | CSS color | | | background color for selected text |
+
+### Customizable Systemwide Global Hotkey
+
+Wave allows settings a custom global hotkey to open your most recent window from anywhere in your computer. This has the name `"app:globalhotkey"` in the `settings.json` file and takes the form of a series of key names separated by the `:` character. We support the following key names:
+
+- `Ctrl`
+- `Cmd`
+- `Shift`
+- `Alt`
+- `Option`
+- `Meta`
+- `Super`
+- Digits (non-numpad) represented by `c{Digit0}` through `c{Digit9}`
+- Letters `a` though `z`
+- F keys `F1` through `F20`
+- Soft keys `Soft1` through `Soft4`. These are essentially the same as `F21` through `F24`.
+- Space represented as a literal space = waveParts.map((part: string) => {
+ const digitRegexpMatch = new RegExp("^c{Digit([0-9])}$").exec(part);
+ const numpadRegexpMatch = new RegExp("^c{Numpad([0-9])}$").exec(part);
+ const lowercaseCharMatch = new RegExp("^([a-z])$").exec(part);
if (part == "ArrowUp") {
return "Up";
}
@@ -182,6 +185,69 @@ export function waveKeyToElectronKey(waveKey: string): string {
if (part == "ArrowRight") {
return "Right";
}
+ if (part == "Soft1") {
+ return "F21";
+ }
+ if (part == "Soft2") {
+ return "F22";
+ }
+ if (part == "Soft3") {
+ return "F23";
+ }
+ if (part == "Soft4") {
+ return "F24";
+ }
+ if (part == " ") {
+ return "Space";
+ }
+ if (part == "CapsLock") {
+ return "Capslock";
+ }
+ if (part == "NumLock") {
+ return "Numlock";
+ }
+ if (part == "ScrollLock") {
+ return "Scrolllock";
+ }
+ if (part == "AudioVolumeUp") {
+ return "VolumeUp";
+ }
+ if (part == "AudioVolumeDown") {
+ return "VolumeDown";
+ }
+ if (part == "AudioVolumeMute") {
+ return "VolumeMute";
+ }
+ if (part == "MediaTrackNext") {
+ return "MediaNextTrack";
+ }
+ if (part == "MediaTrackPrevious") {
+ return "MediaPreviousTrack";
+ }
+ if (part == "Decimal") {
+ return "numdec";
+ }
+ if (part == "Add") {
+ return "numadd";
+ }
+ if (part == "Subtract") {
+ return "numsub";
+ }
+ if (part == "Multiply") {
+ return "nummult";
+ }
+ if (part == "Divide") {
+ return "numdiv";
+ }
+ if (digitRegexpMatch && digitRegexpMatch.length > 1) {
+ return digitRegexpMatch[1];
+ }
+ if (numpadRegexpMatch && numpadRegexpMatch.length > 1) {
+ return `num${numpadRegexpMatch[1]}`;
+ }
+ if (lowercaseCharMatch && lowercaseCharMatch.length > 1) {
+ return lowercaseCharMatch[1].toUpperCase();
+ }
return part;
});
diff --git a/emain/emain.ts b/emain/emain.ts
index c5cf985be..a4511db45 100644
--- a/emain/emain.ts
+++ b/emain/emain.ts
@@ -611,7 +611,7 @@ async function appMain() {
fireAndForget(createNewWaveWindow);
}
});
- const rawGlobalHotKey = launchSettings?.["key:globalhotkey"];
+ const rawGlobalHotKey = launchSettings?.["app:globalhotkey"];
if (rawGlobalHotKey) {
registerGlobalHotkey(rawGlobalHotKey);
}
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
index 895494bda..c0149d01e 100644
--- a/frontend/types/gotypes.d.ts
+++ b/frontend/types/gotypes.d.ts
@@ -616,6 +616,8 @@ declare global {
// wconfig.SettingsType
type SettingsType = {
+ "app:*"?: boolean;
+ "app:globalhotkey"?: string;
"ai:*"?: boolean;
"ai:preset"?: string;
"ai:apitype"?: string;
@@ -674,8 +676,6 @@ declare global {
"window:magnifiedblocksize"?: number;
"window:magnifiedblockblurprimarypx"?: number;
"window:magnifiedblockblursecondarypx"?: number;
- "key:*"?: boolean;
- "key:globalhotkey"?: string;
"telemetry:*"?: boolean;
"telemetry:enabled"?: boolean;
"conn:*"?: boolean;
diff --git a/pkg/wconfig/metaconsts.go b/pkg/wconfig/metaconsts.go
index 6e62b5c20..7e95579ad 100644
--- a/pkg/wconfig/metaconsts.go
+++ b/pkg/wconfig/metaconsts.go
@@ -6,6 +6,9 @@
package wconfig
const (
+ ConfigKey_AppClear = "app:*"
+ ConfigKey_AppGlobalHotkey = "app:globalhotkey"
+
ConfigKey_AiClear = "ai:*"
ConfigKey_AiPreset = "ai:preset"
ConfigKey_AiApiType = "ai:apitype"
@@ -75,9 +78,6 @@ const (
ConfigKey_WindowMagnifiedBlockBlurPrimaryPx = "window:magnifiedblockblurprimarypx"
ConfigKey_WindowMagnifiedBlockBlurSecondaryPx = "window:magnifiedblockblursecondarypx"
- ConfigKey_KeyClear = "key:*"
- ConfigKey_KeyGlobalHotkey = "key:globalhotkey"
-
ConfigKey_TelemetryClear = "telemetry:*"
ConfigKey_TelemetryEnabled = "telemetry:enabled"
diff --git a/pkg/wconfig/settingsconfig.go b/pkg/wconfig/settingsconfig.go
index 6b9e58319..8b312db4b 100644
--- a/pkg/wconfig/settingsconfig.go
+++ b/pkg/wconfig/settingsconfig.go
@@ -33,6 +33,9 @@ const AnySchema = `
`
type SettingsType struct {
+ AppClear bool `json:"app:*,omitempty"`
+ AppGlobalHotkey string `json:"app:globalhotkey,omitempty"`
+
AiClear bool `json:"ai:*,omitempty"`
AiPreset string `json:"ai:preset,omitempty"`
AiApiType string `json:"ai:apitype,omitempty"`
@@ -102,9 +105,6 @@ type SettingsType struct {
WindowMagnifiedBlockBlurPrimaryPx *int64 `json:"window:magnifiedblockblurprimarypx,omitempty"`
WindowMagnifiedBlockBlurSecondaryPx *int64 `json:"window:magnifiedblockblursecondarypx,omitempty"`
- KeyClear bool `json:"key:*,omitempty"`
- KeyGlobalHotkey string `json:"key:globalhotkey,omitempty"`
-
TelemetryClear bool `json:"telemetry:*,omitempty"`
TelemetryEnabled bool `json:"telemetry:enabled,omitempty"`
From 69bb1d4274a7f1c87e14042b87cafb4df9383f1c Mon Sep 17 00:00:00 2001
From: Sylvie Crowe <107814465+oneirocosm@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:06:34 -0800
Subject: [PATCH 20/35] Fish and Pwsh Examples (#1549)
This adds example widgets to the docs for fish and powershell core
(pwsh)
---
docs/docs/customwidgets.mdx | 60 +++++++++++++++++++++++++++++++++++--
1 file changed, 58 insertions(+), 2 deletions(-)
diff --git a/docs/docs/customwidgets.mdx b/docs/docs/customwidgets.mdx
index ca61fdb0f..8f693ee58 100644
--- a/docs/docs/customwidgets.mdx
+++ b/docs/docs/customwidgets.mdx
@@ -109,9 +109,65 @@ The `WidgetConfigType` takes the usual options common to all widgets. The `MetaT
| "term:localshellpath" | (optional) Sets the shell used for running your widget command. Only works locally. If left blank, wave will determine your system default instead. |
| "term:localshellopts" | (optional) Sets the shell options meant to be used with `"term:localshellpath"`. This is useful if you are using a nonstandard shell and need to provide a specific option that we do not cover. Only works locally. Defaults to an empty string. |
-## Example Terminal Widgets
+## Example Shell Widgets
-Here are a few simple widgets to serve as examples.
+If you have multiple shells installed on your machine, there may be times when you want to use a non-default shell. For cases like this, it is easy to create a widget for each.
+
+Suppose you want a widget to launch a `fish` shell. Once you have `fish` installed on your system, you can define a widget as
+
+```json
+{
+ <... other widgets go here ...>,
+ "fish" : {
+ "icon": "fish",
+ "color": "#4abc39",
+ "label": "fish",
+ "blockdef": {
+ "meta": {
+ "view": "term",
+ "controller": "shell",
+ "term:localshellpath": "/usr/local/bin/fish",
+ "term:localshellopts": "-i -l"
+ }
+ }
+ },
+ <... other widgets go here ...>
+}
+```
+
+:::info
+It is very possible that `fish` is not in your path. In this case, using `"fish"` as the value of `"term:localshellpath"` will not work. In these cases, you will need to provide a direct path to it. This is often somewhere like `"/usr/local/bin/fish"`, but it may be different on your system.
+:::
+
+If you want to do the same for something like Powershell Core, or `pwsh`, you can define the widget as
+
+```json
+{
+ <... other widgets go here ...>,
+ "pwsh" : {
+ "icon": "rectangle-terminal",
+ "color": "#2671be",
+ "label": "pwsh",
+ "blockdef": {
+ "meta": {
+ "view": "term",
+ "controller": "shell",
+ "term:localshellpath": "pwsh"
+ }
+ }
+ },
+ <... other widgets go here ...>
+}
+```
+
+:::info
+It is very possible that `pwsh` is not in your path. In this case, using `"pwsh"` as the value of `"term:localshellpath"` will not work. In these cases, you will need to provide a direct path to it. This could be somewhere like `"/usr/local/bin/pwsh"` on a Unix system or
Date: Wed, 18 Dec 2024 08:14:27 -0800
Subject: [PATCH 22/35] Add FAQ for WSH outside of Wave (#1558)
Adds FAQ explaining that WSH doesn't work outside of Wave
---
docs/docs/faq.mdx | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/docs/docs/faq.mdx b/docs/docs/faq.mdx
index dac3754ed..d8b84a151 100644
--- a/docs/docs/faq.mdx
+++ b/docs/docs/faq.mdx
@@ -30,3 +30,7 @@ Just remember in JSON, backslashes need to be escaped. So add this to your [sett
```json
"term:localshellpath": "C:\\Program Files\\Git\\bin\\bash.exe"
```
+
+### Can I use WSH outside of Wave?
+
+`wsh` is an internal CLI for extending control over Wave to the command line, you can learn more about it [here](./wsh). To prevent misuse by other applications, `wsh` requires an access token provided by Wave to work and will not function outside of the app.
From 007c2391f1369971c732557a4de4b517490555a4 Mon Sep 17 00:00:00 2001
From: Sylvie Crowe <107814465+oneirocosm@users.noreply.github.com>
Date: Wed, 18 Dec 2024 13:15:28 -0800
Subject: [PATCH 23/35] Shell Example Pictures (#1562)
- adds pictures to the fish and pwsh examples
- reformats some tabs as spaces in the example json
- adds missing brackets around some older json examples
- rewords repetitive parts of the shell examples
---
docs/docs/customwidgets.mdx | 70 +++++++++++++++----------
docs/docs/img/widget-example-fish.webp | Bin 0 -> 130078 bytes
docs/docs/img/widget-example-pwsh.webp | Bin 0 -> 132266 bytes
3 files changed, 43 insertions(+), 27 deletions(-)
create mode 100644 docs/docs/img/widget-example-fish.webp
create mode 100644 docs/docs/img/widget-example-pwsh.webp
diff --git a/docs/docs/customwidgets.mdx b/docs/docs/customwidgets.mdx
index 8f693ee58..44e6a95d0 100644
--- a/docs/docs/customwidgets.mdx
+++ b/docs/docs/customwidgets.mdx
@@ -118,25 +118,28 @@ Suppose you want a widget to launch a `fish` shell. Once you have `fish` install
```json
{
<... other widgets go here ...>,
- "fish" : {
- "icon": "fish",
- "color": "#4abc39",
- "label": "fish",
- "blockdef": {
- "meta": {
- "view": "term",
- "controller": "shell",
- "term:localshellpath": "/usr/local/bin/fish",
- "term:localshellopts": "-i -l"
- }
- }
- },
+ "fish" : {
+ "icon": "fish",
+ "color": "#4abc39",
+ "label": "fish",
+ "blockdef": {
+ "meta": {
+ "view": "term",
+ "controller": "shell",
+ "term:localshellpath": "/usr/local/bin/fish",
+ "term:localshellopts": "-i -l"
+ }
+ }
+ },
<... other widgets go here ...>
}
```
+This adds an icon to the widget bar that you can press to launch a terminal running the `fish` shell.
+
+
:::info
-It is very possible that `fish` is not in your path. In this case, using `"fish"` as the value of `"term:localshellpath"` will not work. In these cases, you will need to provide a direct path to it. This is often somewhere like `"/usr/local/bin/fish"`, but it may be different on your system.
+It is possible that `fish` is not in your path. If this is true, using `"fish"` as the value of `"term:localshellpath"` will not work. In these cases, you will need to provide a direct path to it. This is often somewhere like `"/usr/local/bin/fish"`, but it may be different on your system.
:::
If you want to do the same for something like Powershell Core, or `pwsh`, you can define the widget as
@@ -144,24 +147,27 @@ If you want to do the same for something like Powershell Core, or `pwsh`, you ca
```json
{
<... other widgets go here ...>,
- "pwsh" : {
- "icon": "rectangle-terminal",
- "color": "#2671be",
- "label": "pwsh",
- "blockdef": {
- "meta": {
- "view": "term",
- "controller": "shell",
- "term:localshellpath": "pwsh"
- }
- }
- },
+ "pwsh" : {
+ "icon": "rectangle-terminal",
+ "color": "#2671be",
+ "label": "pwsh",
+ "blockdef": {
+ "meta": {
+ "view": "term",
+ "controller": "shell",
+ "term:localshellpath": "pwsh"
+ }
+ }
+ },
<... other widgets go here ...>
}
```
+This adds an icon to the widget bar that you can press to launch a terminal running the `pwsh` shell.
+
+
:::info
-It is very possible that `pwsh` is not in your path. In this case, using `"pwsh"` as the value of `"term:localshellpath"` will not work. In these cases, you will need to provide a direct path to it. This could be somewhere like `"/usr/local/bin/pwsh"` on a Unix system or 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
handleColorClick(color)}
- />
- ))}
-
- );
-});
-
-interface IconSelectorProps {
- icons: string[];
- selectedIcon?: string;
- onSelect: (icon: string) => void;
- className?: string;
-}
-
-const IconSelector = memo(({ icons, selectedIcon, onSelect, className }: IconSelectorProps) => {
- const handleIconClick = (icon: string) => {
- onSelect(icon);
- };
-
- return (
-
- {icons.map((icon) => {
- const iconClass = makeIconClass(icon, true);
- return (
- handleIconClick(icon)}
- />
- );
- })}
-
- );
-});
-
-interface WorkspaceEditorProps {
- title: string;
- icon: string;
- color: string;
- focusInput: boolean;
- onTitleChange: (newTitle: string) => void;
- onColorChange: (newColor: string) => void;
- onIconChange: (newIcon: string) => void;
- onDeleteWorkspace: () => void;
-}
-const WorkspaceEditor = memo(
- ({
- title,
- icon,
- color,
- focusInput,
- onTitleChange,
- onColorChange,
- onIconChange,
- onDeleteWorkspace,
- }: WorkspaceEditorProps) => {
- const inputRef = useRef
-
-
- );
- }
-);
-
type WorkspaceListEntry = {
windowId: string;
workspace: Workspace;
@@ -175,15 +57,21 @@ const WorkspaceSwitcher = forwardRef
-
-
-
+- `Enter` (This is labeled as return on Mac)
+- `Tab`
+- `CapsLock`
+- `NumLock`
+- `Backspace` (This is labeled as delete on Mac)
+- `Delete`
+- `Insert`
+- The arrow keys `ArrowUp`, `ArrowDown`, `ArrowLeft`, and `ArrowRight`
+- `Home`
+- `End`
+- `PageUp`
+- `PageDown`
+- `Esc`
+- Volume controls `AudioVolumeUp`, `AudioVolumeDown`, `AudioVolumeMute`
+- Media controls `MediaTrackNext`, `MediaTrackPrevious`, `MediaPlayPause`, and `MediaStop`
+- `PrintScreen`
+- Numpad keys represented by `c{Numpad0}` through `c{Numpad9}`
+- The numpad decimal represented by `Decimal`
+- The numpad plus/add represented by `Add`
+- The numpad minus/subtract represented by `Subtract`
+- The numpad star/multiply represented by `Multiply`
+- The numpad slash/divide represented by `Divide`
+
+As an example, to set the key to the combination of Control, Option, and the letter E, you would configure it to `"Ctrl:Opt:e"`.
diff --git a/docs/docs/keybindings.mdx b/docs/docs/keybindings.mdx
index 2313bacc3..cfb1569e5 100644
--- a/docs/docs/keybindings.mdx
+++ b/docs/docs/keybindings.mdx
@@ -71,4 +71,8 @@ replace "Cmd" with "Alt" (note that "Ctrl" is "Ctrl" on both Mac, Windows, and L
| ---------------- | ------------- |
| | Clear AI Chat |
+## Customizeable Systemwide Global Hotkey
+
+Wave allows setting a custom global hotkey to focus your most recent window from anywhere in your computer. For more information on this, see [the config docs](./config#customizable-systemwide-global-hotkey).
+
diff --git a/emain/emain-util.ts b/emain/emain-util.ts
index 16fbf9367..601b1b7f3 100644
--- a/emain/emain-util.ts
+++ b/emain/emain-util.ts
@@ -170,6 +170,9 @@ export function ensureBoundsAreVisible(bounds: electron.Rectangle): electron.Rec
export function waveKeyToElectronKey(waveKey: string): string {
const waveParts = waveKey.split(":");
const electronParts: Array"C:\\Program Files\\PowerShell\\7\\pwsh.exe" on
+Windows. but it may be different on your system. Also note that both `pwsh.exe` and `pwsh` work on Windows, but only `pwsh` works on Unix systems.
+:::
+
+## Example Cmd Widgets
+
+Here are a few simple cmd widgets to serve as examples.
Suppose I want a widget that will run speedtest-go when opened. Then, I can define a widget as
From 410c01cae32ecd69339320c04b36f556521eb77f Mon Sep 17 00:00:00 2001
From: Sylvie Crowe <107814465+oneirocosm@users.noreply.github.com>
Date: Wed, 18 Dec 2024 00:19:15 -0800
Subject: [PATCH 21/35] Connections Examples (#1552)
Adds a few examples to the `connections.mdx` file to show:
- hiding a connection
- re-ordering connections
- theming connections
- disabling wsh for a connection
---
docs/docs/connections.mdx | 66 +++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/docs/docs/connections.mdx b/docs/docs/connections.mdx
index 4fb79ba62..066410a92 100644
--- a/docs/docs/connections.mdx
+++ b/docs/docs/connections.mdx
@@ -76,6 +76,72 @@ In addition to the regular ssh config file, wave also has its own config file to
| term:theme | This string can be used to specify a terminal theme for blocks using this connection. The block metadata takes priority over this setting. It defaults to null which means the global setting will be used instead. |
| ssh:identityfile | A list of strings containing the paths to identity files that will be used. If a `wsh ssh` command using the `-i` flag is successful, the identity file will automatically be added here. |
+### Example Internal Configurations
+
+Here are a couple examples of things you can do using the internal configuration file `connections.json`:
+
+#### Hiding a Connection
+
+Suppose you have a connection named `github.com` in your `~/.ssh/config` file that shows up as `git@github.com` in the connections dropdown. While it does belong in the config file for authentication reasons, it makes no sense to be in the dropdown since it doesn't involve connecting to a remote environment. In that case, you can hide it as in the example below:
+
+```json
+{
+ <... other connections go here ...>,
+ "git@github.com" : {
+ "display:hidden": true
+ },
+ <... other connections go here ...>
+}
+```
+
+#### Moving a Connection
+
+Suppose you have a connection named `rarelyused` that shows up as `myusername@rarelyused:9999` in the connections dropdown. Since it's so rarely used, you would prefer to move it later in the list. In that case, you can move it as in the example below:
+
+```json
+{
+ <... other connections go here ...>,
+ "myusername@rarelyused:9999" : {
+ "display:order": 100
+ },
+ <... other connections go here ...>
+}
+```
+
+#### Theming a Connection
+
+Suppose you have a connection named `myhost` that shows up as `myusername@myhost` in the connections dropdown. You use this connection a lot, but you keep getting it mixed up with your local connections. In this case, you can use the internal configuration file to style it differently. For example:
+
+```json
+{
+ <... other connections go here ...>,
+ "myusername@myhost" : {
+ "term:theme": "warmyellow",
+ "term:fontsize": 16,
+ "term:fontfamily": "menlo"
+ },
+ <... other connections go here ...>
+}
+```
+
+This style, font size, and font family will then only apply to the widgets that are using this connection.
+
+### Disabling Wsh for a Connection
+
+While Wave provides an option disable `wsh` when first connecting to a remote, there are cases where you may wish to disable it afterward. The easiest way to do this is by editing the `connections.json` file. Suppose the connection shows up in the dropdown as `root@wshless`. Then you can disable it manually with the following line:
+
+```json
+{
+ <... other connections go here ...>,
+ "root@wshless" : {
+ "conn:enablewsh": false,
+ },
+ <... other connections go here ...>
+}
+```
+
+Note that this same line gets added to your `connections.json` file automatically when you choose to disable `wsh` in gui when initially connecting.
+
## Managing Connections with the CLI
The `wsh` command gives some commands specifically for interacting with the connections. You can view these [here](/wsh-reference#conn).
From cc6da280323964066a6b0ab5537e47092033a87c Mon Sep 17 00:00:00 2001
From: Evan Simkowitz "C:\\Program Files\\PowerShell\\7\\pwsh.exe" on
+It is possible that `pwsh` is not in your path. If this is true, using `"pwsh"` as the value of `"term:localshellpath"` will not work. In these cases, you will need to provide a direct path to it. This could be somewhere like `"/usr/local/bin/pwsh"` on a Unix system or "C:\\Program Files\\PowerShell\\7\\pwsh.exe" on
Windows. but it may be different on your system. Also note that both `pwsh.exe` and `pwsh` work on Windows, but only `pwsh` works on Unix systems.
:::
@@ -198,6 +204,7 @@ Using `"cmd"` for the `"controller"` is the simplest way to accomplish this. `"c
Now suppose I wanted to run a TUI app, for instance, `dua`. Well, it turns out that you can more or less do the same thing:
```json
+{
<... other widgets go here ...>,
"dua" : {
"icon": "brands@linux",
@@ -211,6 +218,7 @@ Now suppose I wanted to run a TUI app, for instance, `dua`. Well, it turns out t
}
},
<... other widgets go here ...>
+}
```
This adds an icon to the widget bar that you can press to launch a terminal running the `dua` command.
@@ -252,6 +260,7 @@ The `WidgetConfigType` takes the usual options common to all widgets. The `MetaT
Say you want a widget that automatically starts at YouTube and will use YouTube as the home page. This can be done using:
```json
+{
<... other widgets go here ...>,
"youtube" : {
"icon": "brands@youtube",
@@ -265,6 +274,7 @@ Say you want a widget that automatically starts at YouTube and will use YouTube
}
},
<... other widgets go here ...>
+}
```
This adds an icon to the widget bar that you can press to launch a web widget on the youtube homepage.
@@ -273,6 +283,7 @@ This adds an icon to the widget bar that you can press to launch a web widget on
Alternatively, say you want a web widget that opens to github as if it were a bookmark, but will use google as its home page after that. This can easily be done with:
```json
+{
<... other widgets go here ...>,
"github" : {
"icon": "brands@github",
@@ -286,6 +297,7 @@ Alternatively, say you want a web widget that opens to github as if it were a bo
}
},
<... other widgets go here ...>
+}
```
This adds an icon to the widget bar that you can press to launch a web widget on the github homepage.
@@ -326,6 +338,7 @@ The `WidgetConfigType` takes the usual options common to all widgets. The `MetaT
Suppose you have a build process that lasts 3 minutes and you'd like to be able to see the entire build on the sysinfo graph. Also, you would really like to view both the cpu and memory since both are impacted by this process. In that case, you can set up a widget as follows:
```json
+{
<... other widgets go here ...>,
"3min-info" : {
"icon": "circle-3",
@@ -339,6 +352,7 @@ Suppose you have a build process that lasts 3 minutes and you'd like to be able
}
},
<... other widgets go here ...>
+}
```
This adds an icon to the widget bar that you can press to launch the CPU and Memory plots by default with 180 seconds of data.
@@ -347,6 +361,7 @@ This adds an icon to the widget bar that you can press to launch the CPU and Mem
Now, suppose you are fine with the default 100 points (and 100 seconds) but would like to show all of the CPU data when launched. In that case, you can write:
```json
+{
<... other widgets go here ...>,
"all-cpu" : {
"icon": "chart-scatter",
@@ -359,6 +374,7 @@ Now, suppose you are fine with the default 100 points (and 100 seconds) but woul
}
},
<... other widgets go here ...>
+}
```
This adds an icon to the widget bar that you can press to launch All CPU plots by default.
diff --git a/docs/docs/img/widget-example-fish.webp b/docs/docs/img/widget-example-fish.webp
new file mode 100644
index 0000000000000000000000000000000000000000..0819ce981d02455283f4d983b42a1146bd85b0b6
GIT binary patch
literal 130078
zcmbrmV|ZoTwly5vwr$(4*tYFd#je