Skip to content

Commit a3bb27c

Browse files
sawkasawka
committed
Merge remote-tracking branch 'origin/main' into sawka/waveai-openai-comps
2 parents b2862e3 + 6211b21 commit a3bb27c

File tree

17 files changed

+175
-88
lines changed

17 files changed

+175
-88
lines changed

‎.github/workflows/build-helper.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# runner: "windows-11-arm64-16core"
3232
runs-on: ${{ matrix.runner }}
3333
steps:
34-
- uses: actions/checkout@v5
34+
- uses: actions/checkout@v6
3535
- name: Install Linux Build Dependencies (Linux only)
3636
if: matrix.platform == 'linux'
3737
run: |

‎.github/workflows/bump-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
app-id: ${{ vars.WAVE_BUILDER_APPID }}
3636
private-key: ${{ secrets.WAVE_BUILDER_KEY }}
37-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
3838
with:
3939
token: ${{ steps.app-token.outputs.token }}
4040

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Checkout repository
66-
uses: actions/checkout@v5
66+
uses: actions/checkout@v6
6767

6868
- name: Install Task
6969
uses: arduino/setup-task@v2

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
contents: read
1919

2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222

2323
# Go + Node versions match your helper
2424
- uses: actions/setup-go@v6

‎.github/workflows/deploy-docsite.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
if: github.event.pull_request.draft == false
3232
steps:
33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
with:
3535
fetch-depth: 0
3636
- uses: actions/setup-node@v6

‎.github/workflows/publish-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: ${{ startsWith(github.ref, 'refs/tags/') }}
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- name: Install Task
1616
uses: arduino/setup-task@v2
1717
with:
@@ -30,7 +30,7 @@ jobs:
3030
needs: [publish-s3]
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
- name: Install Task
3535
uses: arduino/setup-task@v2
3636
with:
@@ -55,7 +55,7 @@ jobs:
5555
needs: [publish-s3]
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v5
58+
- uses: actions/checkout@v6
5959
- name: Install Task
6060
uses: arduino/setup-task@v2
6161
with:
@@ -80,7 +80,7 @@ jobs:
8080
needs: [publish-s3]
8181
runs-on: windows-latest
8282
steps:
83-
- uses: actions/checkout@v5
83+
- uses: actions/checkout@v6
8484
- name: Install Task
8585
uses: arduino/setup-task@v2
8686
with:

‎.github/workflows/testdriver-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: windows-latest
4242
if: github.event.pull_request.draft == false
4343
steps:
44-
- uses: actions/checkout@v5
44+
- uses: actions/checkout@v6
4545

4646
# General build dependencies
4747
- uses: actions/setup-go@v6

‎cmd/wsh/cmd/wshcmd-secret.go‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ import (
99
"strings"
1010

1111
"github.com/spf13/cobra"
12+
"github.com/wavetermdev/waveterm/pkg/waveobj"
1213
"github.com/wavetermdev/waveterm/pkg/wshrpc"
1314
"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
1415
)
1516

1617
// secretNameRegex must match the validation in pkg/wconfig/secretstore.go
1718
var secretNameRegex = regexp.MustCompile(`^[A-Za-z][A-Za-z0-9_]*$`)
1819

20+
var secretUiMagnified bool
21+
1922
var secretCmd = &cobra.Command{
2023
Use: "secret",
2124
Short: "manage secrets",
@@ -54,12 +57,22 @@ var secretDeleteCmd = &cobra.Command{
5457
PreRunE: preRunSetupRpcClient,
5558
}
5659

60+
var secretUiCmd = &cobra.Command{
61+
Use: "ui",
62+
Short: "open secrets UI",
63+
Args: cobra.NoArgs,
64+
RunE: secretUiRun,
65+
PreRunE: preRunSetupRpcClient,
66+
}
67+
5768
func init() {
69+
secretUiCmd.Flags().BoolVarP(&secretUiMagnified, "magnified", "m", false, "open secrets UI in magnified mode")
5870
rootCmd.AddCommand(secretCmd)
5971
secretCmd.AddCommand(secretGetCmd)
6072
secretCmd.AddCommand(secretSetCmd)
6173
secretCmd.AddCommand(secretListCmd)
6274
secretCmd.AddCommand(secretDeleteCmd)
75+
secretCmd.AddCommand(secretUiCmd)
6376
}
6477

6578
func secretGetRun(cmd *cobra.Command, args []string) (rtnErr error) {
@@ -156,4 +169,26 @@ func secretDeleteRun(cmd *cobra.Command, args []string) (rtnErr error) {
156169

157170
WriteStdout("secret deleted: %s\n", name)
158171
return nil
172+
}
173+
174+
func secretUiRun(cmd *cobra.Command, args []string) (rtnErr error) {
175+
defer func() {
176+
sendActivity("secret", rtnErr == nil)
177+
}()
178+
179+
wshCmd := &wshrpc.CommandCreateBlockData{
180+
BlockDef: &waveobj.BlockDef{
181+
Meta: map[string]interface{}{
182+
waveobj.MetaKey_View: "secretstore",
183+
},
184+
},
185+
Magnified: secretUiMagnified,
186+
Focused: true,
187+
}
188+
189+
_, err := RpcClient.SendRpcRequest(wshrpc.Command_CreateBlock, wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
190+
if err != nil {
191+
return fmt.Errorf("opening secrets UI: %w", err)
192+
}
193+
return nil
159194
}

‎docs/docs/releasenotes.mdx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ sidebar_position: 200
66

77
# Release Notes
88

9+
### v0.12.5 — Nov 24, 2025
10+
11+
Quick patch release to fix paste behavior on Linux (prevent raw HTML from getting pasted to the terminal).
12+
913
### v0.12.4 — Nov 21, 2025
1014

1115
Quick patch release with bug fixes and minor improvements.

‎docs/docs/wsh-reference.mdx‎

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,19 +342,36 @@ This will connect to a WSL distribution on the local machine. It will use the de
342342
343343
## web
344344
345-
You can search for a given url using:
345+
The `web` command opens URLs in a web block within Wave Terminal.
346346
347347
```sh
348-
wsh web open [url]
348+
wsh web open [url] [-m] [-r blockid]
349349
```
350350
351-
Alternatively, you can search with the configured search engine using:
351+
You can open a specific URL or perform a search using the configured search engine.
352+
353+
Flags:
354+
355+
- `-m, --magnified` - open the web block in magnified mode
356+
- `-r, --replace <blockid>` - replace an existing block instead of creating a new one
357+
358+
Examples:
352359
353360
```sh
354-
wsh web open [search-query]
361+
# Open a URL
362+
wsh web open https://waveterm.dev
363+
364+
# Search with the configured search engine
365+
wsh web open "wave terminal documentation"
366+
367+
# Open in magnified mode
368+
wsh web open -m https://github.com
369+
370+
# Replace an existing block
371+
wsh web open -r 2 https://example.com
355372
```
356373
357-
Both of these commands will open a new web block with the desired page.
374+
The command will open a new web block with the desired page, or replace an existing block if the `-r` flag is used. Note that `--replace` and `--magnified` cannot be used together.
358375
359376
---
360377
@@ -978,6 +995,30 @@ wsh secret delete old_api_key
978995
wsh secret delete temp_token
979996
```
980997
998+
### ui
999+
1000+
```sh
1001+
wsh secret ui [-m]
1002+
```
1003+
1004+
Open the secrets management interface in a new block. This provides a graphical interface for viewing and managing all your secrets.
1005+
1006+
Flags:
1007+
1008+
- `-m, --magnified` - open the secrets UI in magnified mode
1009+
1010+
Examples:
1011+
1012+
```sh
1013+
# Open the secrets UI
1014+
wsh secret ui
1015+
1016+
# Open the secrets UI in magnified mode
1017+
wsh secret ui -m
1018+
```
1019+
1020+
The secrets UI provides a convenient visual way to browse, add, edit, and delete secrets without needing to use the command-line interface.
1021+
9811022
:::tip
9821023
Use secrets in your scripts to avoid hardcoding sensitive values. Secrets work across remote machines - store an API key locally with `wsh secret set`, then access it from any SSH or WSL connection with `wsh secret get`. The secret is securely retrieved from your local machine without needing to duplicate it on remote systems.
9831024
:::

0 commit comments

Comments
 (0)