Skip to content

Commit 38163e7

Browse files
authored
exclude autoupdate channel in custom settings (#2438)
1 parent a44db26 commit 38163e7

File tree

9 files changed

+88
-22
lines changed

9 files changed

+88
-22
lines changed

docs/docs/releasenotes.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Wave Terminal v0.12.0 introduces a completely redesigned AI experience powered b
1616
- **New Slide-Out Chat Panel** - Access Wave AI via hotkeys (Cmd-Shift-A or Ctrl-Shift-0) from the left side of your screen
1717
- **Multi-Modal Input** - Support for images, PDFs, and text file attachments
1818
- **Drag & Drop Files** - Simply drag files into the chat to attach them
19+
- **Command-Line Integration** - Send files and command output directly to Wave AI using `wsh ai`
1920
- **Smart Context Switching** - Enable Wave AI to see into your widgets and file system
2021
- **Built-in Tools:**
2122
- Web search capabilities
@@ -30,6 +31,7 @@ For more information and upcoming features, visit our [Wave AI documentation](ht
3031

3132
**Other Improvements:**
3233
- New onboarding flow showcasing block magnification, Wave AI, and wsh view/edit capabilities
34+
- New `wsh blocks list` command for listing and filtering blocks by workspace, tab, or view type
3335
- Continued migration from SCSS to Tailwind v4
3436
- Package upgrades and dependency updates
3537
- Internal code cleanup and refactoring

docs/docs/wsh-reference.mdx

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -857,4 +857,42 @@ The command will show you the full path to:
857857
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.
858858
:::
859859
860+
---
861+
862+
## blocks
863+
864+
The `blocks` command provides operations for listing and querying blocks across workspaces, windows, and tabs. Primarily useful for debugging and scripting.
865+
866+
### list
867+
868+
```sh
869+
wsh blocks list [flags]
870+
```
871+
872+
List all blocks with optional filtering by workspace, window, tab, or view type. Output can be formatted as a table (default) or JSON for scripting.
873+
874+
Flags:
875+
- `--workspace <id>` - restrict to specific workspace id
876+
- `--window <id>` - restrict to specific window id
877+
- `--tab <id>` - restrict to specific tab id
878+
- `--view <type>` - filter by view type (term, web, preview, edit, sysinfo, waveai)
879+
- `--json` - output results as JSON
880+
- `--timeout <ms>` - RPC timeout in milliseconds (default: 5000)
881+
882+
Examples:
883+
884+
```sh
885+
# List all blocks
886+
wsh blocks list
887+
888+
# List only terminal blocks
889+
wsh blocks list --view=term
890+
891+
# Filter by workspace
892+
wsh blocks list --workspace=12d0c067-378e-454c-872e-77a314248114
893+
894+
# Output as JSON for scripting
895+
wsh blocks list --json
896+
```
897+
860898
</PlatformProvider>

frontend/app/modals/about.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ const AboutModal = ({}: AboutModalProps) => {
3636
</div>
3737
<div className="flex items-start gap-[10px] self-stretch w-full text-center">
3838
<a
39-
href="https://github.com/wavetermdev/waveterm"
39+
href="https://github.com/wavetermdev/waveterm?ref=about"
4040
target="_blank"
4141
rel="noopener"
4242
className="inline-flex items-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
4343
>
4444
<i className="fa-brands fa-github mr-2"></i>Github
4545
</a>
4646
<a
47-
href="https://www.waveterm.dev/"
47+
href="https://www.waveterm.dev/?ref=about"
4848
target="_blank"
4949
rel="noopener"
5050
className="inline-flex items-center px-4 py-2 rounded border border-border hover:bg-hoverbg transition-colors duration-200"
@@ -60,7 +60,9 @@ const AboutModal = ({}: AboutModalProps) => {
6060
<i className="fa-sharp fa-light fa-heart mr-2"></i>Acknowledgements
6161
</a>
6262
</div>
63-
<div className="items-center gap-4 self-stretch w-full text-center">&copy; {currentDate.getFullYear()} Command Line Inc.</div>
63+
<div className="items-center gap-4 self-stretch w-full text-center">
64+
&copy; {currentDate.getFullYear()} Command Line Inc.
65+
</div>
6466
</div>
6567
</Modal>
6668
);

frontend/app/onboarding/onboarding-upgrade.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,24 @@ const UpgradeOnboardingModal = () => {
5151
}, []);
5252

5353
const handleStarClick = async () => {
54+
RpcApi.RecordTEventCommand(TabRpcClient, {
55+
event: "onboarding:githubstar",
56+
props: { "onboarding:githubstar": "star" },
57+
}, { noresponse: true });
5458
const clientId = globalStore.get(atoms.clientId);
5559
await RpcApi.SetMetaCommand(TabRpcClient, {
5660
oref: WOS.makeORef("client", clientId),
5761
meta: { "onboarding:githubstar": true },
5862
});
59-
window.open("https://github.com/wavetermdev/waveterm", "_blank");
63+
window.open("https://github.com/wavetermdev/waveterm?ref=upgrade", "_blank");
6064
setPageName("features");
6165
};
6266

6367
const handleAlreadyStarred = async () => {
68+
RpcApi.RecordTEventCommand(TabRpcClient, {
69+
event: "onboarding:githubstar",
70+
props: { "onboarding:githubstar": "already" },
71+
}, { noresponse: true });
6472
const clientId = globalStore.get(atoms.clientId);
6573
await RpcApi.SetMetaCommand(TabRpcClient, {
6674
oref: WOS.makeORef("client", clientId),
@@ -70,6 +78,10 @@ const UpgradeOnboardingModal = () => {
7078
};
7179

7280
const handleMaybeLater = async () => {
81+
RpcApi.RecordTEventCommand(TabRpcClient, {
82+
event: "onboarding:githubstar",
83+
props: { "onboarding:githubstar": "later" },
84+
}, { noresponse: true });
7385
const clientId = globalStore.get(atoms.clientId);
7486
await RpcApi.SetMetaCommand(TabRpcClient, {
7587
oref: WOS.makeORef("client", clientId),

frontend/app/onboarding/onboarding.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ const InitPage = ({ isCompact }: { isCompact: boolean }) => {
7272
<div className="flex flex-col items-start gap-8 w-full mb-5 unselectable">
7373
<div className="flex w-full items-center gap-[18px]">
7474
<div>
75-
<a target="_blank" href="https://github.com/wavetermdev/waveterm" rel={"noopener"}>
75+
<a
76+
target="_blank"
77+
href="https://github.com/wavetermdev/waveterm?ref=install"
78+
rel={"noopener"}
79+
>
7680
<i className="text-[32px] text-white/50 fa-brands fa-github"></i>
7781
</a>
7882
</div>
@@ -81,7 +85,11 @@ const InitPage = ({ isCompact }: { isCompact: boolean }) => {
8185
<div className="text-secondary leading-5">
8286
We're <i>open source</i> and committed to providing a free terminal for individual
8387
users. Please show your support by giving us a star on{" "}
84-
<a target="_blank" href="https://github.com/wavetermdev/waveterm" rel={"noopener"}>
88+
<a
89+
target="_blank"
90+
href="https://github.com/wavetermdev/waveterm?ref=install"
91+
rel={"noopener"}
92+
>
8593
Github&nbsp;(wavetermdev/waveterm)
8694
</a>
8795
</div>
@@ -152,7 +160,7 @@ const NoTelemetryStarPage = ({ isCompact }: { isCompact: boolean }) => {
152160
oref: WOS.makeORef("client", clientId),
153161
meta: { "onboarding:githubstar": true },
154162
});
155-
window.open("https://github.com/wavetermdev/waveterm", "_blank");
163+
window.open("https://github.com/wavetermdev/waveterm?ref=not", "_blank");
156164
setPageName("features");
157165
};
158166

frontend/types/gotypes.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,7 @@ declare global {
953953
"conn:conntype"?: string;
954954
"onboarding:feature"?: "waveai" | "magnify" | "wsh";
955955
"onboarding:version"?: string;
956+
"onboarding:githubstar"?: "already" | "star" | "later";
956957
"display:height"?: number;
957958
"display:width"?: number;
958959
"display:dpr"?: number;

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/telemetry/telemetrydata/telemetrydata.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ var ValidEventNames = map[string]bool{
3434
"onboarding:start": true,
3535
"onboarding:skip": true,
3636
"onboarding:fire": true,
37+
"onboarding:githubstar": true,
3738
}
3839

3940
type TEvent struct {
@@ -81,16 +82,18 @@ type TEventProps struct {
8182
AppFirstDay bool `json:"app:firstday,omitempty"`
8283
AppFirstLaunch bool `json:"app:firstlaunch,omitempty"`
8384

84-
ActionInitiator string `json:"action:initiator,omitempty" tstype:"\"keyboard\" | \"mouse\""`
85-
PanicType string `json:"debug:panictype,omitempty"`
86-
BlockView string `json:"block:view,omitempty"`
87-
AiBackendType string `json:"ai:backendtype,omitempty"`
88-
AiLocal bool `json:"ai:local,omitempty"`
89-
WshCmd string `json:"wsh:cmd,omitempty"`
90-
WshHadError bool `json:"wsh:haderror,omitempty"`
91-
ConnType string `json:"conn:conntype,omitempty"`
92-
OnboardingFeature string `json:"onboarding:feature,omitempty" tstype:"\"waveai\" | \"magnify\" | \"wsh\""`
93-
OnboardingVersion string `json:"onboarding:version,omitempty"`
85+
ActionInitiator string `json:"action:initiator,omitempty" tstype:"\"keyboard\" | \"mouse\""`
86+
PanicType string `json:"debug:panictype,omitempty"`
87+
BlockView string `json:"block:view,omitempty"`
88+
AiBackendType string `json:"ai:backendtype,omitempty"`
89+
AiLocal bool `json:"ai:local,omitempty"`
90+
WshCmd string `json:"wsh:cmd,omitempty"`
91+
WshHadError bool `json:"wsh:haderror,omitempty"`
92+
ConnType string `json:"conn:conntype,omitempty"`
93+
94+
OnboardingFeature string `json:"onboarding:feature,omitempty" tstype:"\"waveai\" | \"magnify\" | \"wsh\""`
95+
OnboardingVersion string `json:"onboarding:version,omitempty"`
96+
OnboardingGithubStar string `json:"onboarding:githubstar,omitempty" tstype:"\"already\" | \"star\" | \"later\""`
9497

9598
DisplayHeight int `json:"display:height,omitempty"`
9699
DisplayWidth int `json:"display:width,omitempty"`

pkg/wconfig/settingsconfig.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,18 +832,18 @@ func (fc *FullConfigType) CountCustomAIPresets() int {
832832
}
833833

834834
// CountCustomSettings returns the number of settings in the user's settings file.
835-
// This excludes telemetry:enabled which doesn't count as a customization.
835+
// This excludes telemetry:enabled and autoupdate:channel which don't count as customizations.
836836
func CountCustomSettings() int {
837837
// Load user settings
838838
userSettings, _ := ReadWaveHomeConfigFile("settings.json")
839839
if userSettings == nil {
840840
return 0
841841
}
842842

843-
// Count all keys except telemetry:enabled
843+
// Count all keys except telemetry:enabled and autoupdate:channel
844844
count := 0
845845
for key := range userSettings {
846-
if key == "telemetry:enabled" {
846+
if key == "telemetry:enabled" || key == "autoupdate:channel" {
847847
continue
848848
}
849849
count++

0 commit comments

Comments
 (0)