Merge branch 'main' into feat/close-on-last-terminal-exit

Author: apanchoo

.kilocode/skills/add-rpc/SKILL.md

@@ -26,7 +26,7 @@ RPC commands in Wave Terminal follow these conventions:
 
 - **Method names** must end with `Command`
 - **First parameter** must be `context.Context`
-- **Second parameter** (optional) is the command data structure
+- **Remaining parameters** are a regular Go parameter list (zero or more typed args)
 - **Return values** can be either just an error, or one return value plus an error
 - **Streaming commands** return a channel instead of a direct value
 
@@ -49,7 +49,7 @@ type WshRpcInterface interface {
 
 - Method name must end with `Command`
 - First parameter must be `ctx context.Context`
-- Optional second parameter for input data
+- Remaining parameters are a regular Go parameter list (zero or more)
 - Return either `error` or `(ReturnType, error)`
 - For streaming, return `chan RespOrErrorUnion[T]`
 

.kilocode/skills/waveenv/SKILL.md

@@ -69,6 +69,12 @@ export type MyEnv = WaveEnvSubset<{
   // --- wos: always take the whole thing, no sub-typing needed ---
   wos: WaveEnv["wos"];
 
+  // --- services: list only the services you call; no method-level narrowing ---
+  services: {
+    block: WaveEnv["services"]["block"];
+    workspace: WaveEnv["services"]["workspace"];
+  };
+
   // --- key-parameterized atom factories: enumerate the keys you use ---
   getSettingsKeyAtom: SettingsKeyAtomFnType<"app:focusfollowscursor" | "window:magnifiedblockopacity">;
   getBlockMetaKeyAtom: BlockMetaKeyAtomFnType<"view" | "frame:title" | "connection">;
@@ -80,6 +86,14 @@ export type MyEnv = WaveEnvSubset<{
 }>;
 ```
 
+### Automatically Included Fields
+
+Every `WaveEnvSubset<T>` automatically includes the mock fields — you never need to declare them:
+
+- `isMock: boolean`
+- `mockSetWaveObj: <T extends WaveObj>(oref: string, obj: T) => void`
+- `mockModels?: Map<any, any>`
+
 ### Rules for Each Section
 
 | Section                    | Pattern                                                | Notes                                                                                              |
@@ -88,6 +102,7 @@ export type MyEnv = WaveEnvSubset<{
 | `rpc`                      | `rpc: { Cmd: WaveEnv["rpc"]["Cmd"]; }`                 | List every RPC command called; omit the rest.                                                      |
 | `atoms`                    | `atoms: { atom: WaveEnv["atoms"]["atom"]; }`           | List every atom read; omit the rest.                                                               |
 | `wos`                      | `wos: WaveEnv["wos"]`                                  | Take the whole `wos` object (no sub-typing needed), but **only add it if `wos` is actually used**. |
+| `services`                 | `services: { svc: WaveEnv["services"]["svc"]; }`       | List each service used; take the whole service object (no method-level narrowing).                 |
 | `getSettingsKeyAtom`       | `SettingsKeyAtomFnType<"key1" \| "key2">`              | Union all settings keys accessed.                                                                  |
 | `getBlockMetaKeyAtom`      | `BlockMetaKeyAtomFnType<"key1" \| "key2">`             | Union all block meta keys accessed.                                                                |
 | `getConnConfigKeyAtom`     | `ConnConfigKeyAtomFnType<"key1">`                      | Union all conn config keys accessed.                                                               |

cmd/generatets/main-generatets.go

@@ -88,14 +88,37 @@ func generateServicesFile(tsTypesMap map[reflect.Type]string) error {
 	fmt.Fprintf(&buf, "// Copyright 2026, Command Line Inc.\n")
 	fmt.Fprintf(&buf, "// SPDX-License-Identifier: Apache-2.0\n\n")
 	fmt.Fprintf(&buf, "// generated by cmd/generate/main-generatets.go\n\n")
-	fmt.Fprintf(&buf, "import * as WOS from \"./wos\";\n\n")
+	fmt.Fprintf(&buf, "import * as WOS from \"./wos\";\n")
+	fmt.Fprintf(&buf, "import type { WaveEnv } from \"@/app/waveenv/waveenv\";\n\n")
+	fmt.Fprintf(&buf, "function callBackendService(waveEnv: WaveEnv, service: string, method: string, args: any[], noUIContext?: boolean): Promise<any> {\n")
+	fmt.Fprintf(&buf, "    if (waveEnv != null) {\n")
+	fmt.Fprintf(&buf, "        return waveEnv.callBackendService(service, method, args, noUIContext)\n")
+	fmt.Fprintf(&buf, "    }\n")
+	fmt.Fprintf(&buf, "    return WOS.callBackendService(service, method, args, noUIContext);\n")
+	fmt.Fprintf(&buf, "}\n\n")
 	orderedKeys := utilfn.GetOrderedMapKeys(service.ServiceMap)
 	for _, serviceName := range orderedKeys {
 		serviceObj := service.ServiceMap[serviceName]
 		svcStr := tsgen.GenerateServiceClass(serviceName, serviceObj, tsTypesMap)
 		fmt.Fprint(&buf, svcStr)
 		fmt.Fprint(&buf, "\n")
 	}
+	fmt.Fprintf(&buf, "export const AllServiceTypes = {\n")
+	for _, serviceName := range orderedKeys {
+		serviceObj := service.ServiceMap[serviceName]
+		serviceType := reflect.TypeOf(serviceObj)
+		tsServiceName := serviceType.Elem().Name()
+		fmt.Fprintf(&buf, "    %q: %sType,\n", serviceName, tsServiceName)
+	}
+	fmt.Fprintf(&buf, "};\n\n")
+	fmt.Fprintf(&buf, "export const AllServiceImpls = {\n")
+	for _, serviceName := range orderedKeys {
+		serviceObj := service.ServiceMap[serviceName]
+		serviceType := reflect.TypeOf(serviceObj)
+		tsServiceName := serviceType.Elem().Name()
+		fmt.Fprintf(&buf, "    %q: %s,\n", serviceName, tsServiceName)
+	}
+	fmt.Fprintf(&buf, "};\n")
 	written, err := utilfn.WriteFileIfDifferent(fileName, buf.Bytes())
 	if !written {
 		fmt.Fprintf(os.Stderr, "no changes to %s\n", fileName)

cmd/wsh/cmd/wshcmd-ssh.go

@@ -1,4 +1,4 @@
-// Copyright 2025, Command Line Inc.
+// Copyright 2026, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
@@ -7,6 +7,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	"github.com/wavetermdev/waveterm/pkg/remote"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wconfig"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
@@ -15,6 +16,8 @@ import (
 
 var (
 	identityFiles []string
+	sshLogin      string
+	sshPort       string
 	newBlock      bool
 )
 
@@ -28,6 +31,8 @@ var sshCmd = &cobra.Command{
 
 func init() {
 	sshCmd.Flags().StringArrayVarP(&identityFiles, "identityfile", "i", []string{}, "add an identity file for publickey authentication")
+	sshCmd.Flags().StringVarP(&sshLogin, "login", "l", "", "set the remote login name")
+	sshCmd.Flags().StringVarP(&sshPort, "port", "p", "", "set the remote port")
 	sshCmd.Flags().BoolVarP(&newBlock, "new", "n", false, "create a new terminal block with this connection")
 	rootCmd.AddCommand(sshCmd)
 }
@@ -38,6 +43,11 @@ func sshRun(cmd *cobra.Command, args []string) (rtnErr error) {
 	}()
 
 	sshArg := args[0]
+	var err error
+	sshArg, err = applySSHOverrides(sshArg, sshLogin, sshPort)
+	if err != nil {
+		return err
+	}
 	blockId := RpcContext.BlockId
 	if blockId == "" && !newBlock {
 		return fmt.Errorf("cannot determine blockid (not in JWT)")
@@ -91,10 +101,27 @@ func sshRun(cmd *cobra.Command, args []string) (rtnErr error) {
 			waveobj.MetaKey_CmdCwd:     nil,
 		},
 	}
-	err := wshclient.SetMetaCommand(RpcClient, data, nil)
+	err = wshclient.SetMetaCommand(RpcClient, data, nil)
 	if err != nil {
 		return fmt.Errorf("setting connection in block: %w", err)
 	}
 	WriteStderr("switched connection to %q\n", sshArg)
 	return nil
 }
+
+func applySSHOverrides(sshArg string, login string, port string) (string, error) {
+	if login == "" && port == "" {
+		return sshArg, nil
+	}
+	opts, err := remote.ParseOpts(sshArg)
+	if err != nil {
+		return "", err
+	}
+	if login != "" {
+		opts.SSHUser = login
+	}
+	if port != "" {
+		opts.SSHPort = port
+	}
+	return opts.String(), nil
+}

cmd/wsh/cmd/wshcmd-ssh_test.go

@@ -0,0 +1,75 @@
+// Copyright 2026, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import "testing"
+
+func TestApplySSHOverrides(t *testing.T) {
+	tests := []struct {
+		name    string
+		sshArg  string
+		login   string
+		port    string
+		want    string
+		wantErr bool
+	}{
+		{
+			name:   "no overrides preserves target",
+			sshArg: "root@bar.com:2022",
+			want:   "root@bar.com:2022",
+		},
+		{
+			name:   "login override replaces parsed user",
+			sshArg: "root@bar.com",
+			login:  "foo",
+			want:   "foo@bar.com",
+		},
+		{
+			name:   "port override replaces parsed port",
+			sshArg: "root@bar.com:2022",
+			port:   "2222",
+			want:   "root@bar.com:2222",
+		},
+		{
+			name:   "both overrides replace parsed user and port",
+			sshArg: "root@bar.com:2022",
+			login:  "foo",
+			port:   "2200",
+			want:   "foo@bar.com:2200",
+		},
+		{
+			name:   "login override adds user to bare host",
+			sshArg: "bar.com",
+			login:  "foo",
+			want:   "foo@bar.com",
+		},
+		{
+			name:   "port override adds port to bare host",
+			sshArg: "bar.com",
+			port:   "2200",
+			want:   "bar.com:2200",
+		},
+		{
+			name:    "invalid target returns parse error when override requested",
+			sshArg:  "bad host",
+			login:   "foo",
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := applySSHOverrides(tt.sshArg, tt.login, tt.port)
+			if (err != nil) != tt.wantErr {
+				t.Fatalf("applySSHOverrides() error = %v, wantErr %v", err, tt.wantErr)
+			}
+			if tt.wantErr {
+				return
+			}
+			if got != tt.want {
+				t.Fatalf("applySSHOverrides() = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}

docs/docs/claude-code.mdx

@@ -0,0 +1,131 @@
+---
+sidebar_position: 1.9
+id: "claude-code"
+title: "Claude Code Integration"
+---
+
+import { VersionBadge } from "@site/src/components/versionbadge";
+
+# Claude Code Tab Badges <VersionBadge version="v0.14.2" />
+
+When you run multiple Claude Code sessions in parallel — one per feature, one per repo, a few long-running tasks — it gets hard to know which tabs need your attention without clicking through each one. Wave's badge system solves this: hooks in Claude Code write a small visual indicator to the tab header whenever something important happens, so you can see at a glance which sessions are waiting, done, or in trouble.
+
+:::info
+tl;dr You can copy and paste this page directly into Claude Code and it will help you set everything up!
+:::
+
+## How it works
+
+Claude Code supports [lifecycle hooks](https://code.claude.com/docs/en/hooks) — shell commands that run automatically at specific points in a session. Wave's `wsh badge` command sets or clears a visual indicator on the current block or tab. By wiring these together, you get ambient awareness across all your sessions without watching any of them.
+
+Badges auto-clear when you focus the block, so they're purely a "hey, look over here" signal. Once you click in and read what's happening, the badge disappears on its own.
+
+Wave already shows a bell icon when a terminal outputs a BEL character. These hooks complement that with semantic badges — *permission needed*, *done* — that survive across tab switches and work across splits.
+
+### Badge rollup
+
+If a tab has multiple terminals (block), Wave shows the highest-priority badge on the tab header. Ties at the same priority go to the earliest badge set, so the most urgent signal from any pane in the tab floats to the top.
+
+## Setup
+
+These hooks go in your global Claude Code settings so they apply to every session on your machine, not just one project.
+
+Add the following to `~/.claude/settings.json`. If you already have a `hooks` key, merge the entries in:
+
+```json
+{
+  "hooks": {
+    "Notification": [
+      {
+        "matcher": "permission_prompt",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "wsh badge bell-exclamation --color '#e0b956' --priority 20 --beep"
+          }
+        ]
+      },
+      {
+        "matcher": "elicitation_dialog",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "wsh badge message-question --color '#e0b956' --priority 20 --beep"
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "wsh badge check --color '#58c142' --priority 10"
+          }
+        ]
+      }
+    ],
+    "PreToolUse": [
+      {
+        "matcher": "AskUserQuestion",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "wsh badge message-question --color '#e0b956' --priority 20 --beep"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+That's it. Restart any running Claude Code sessions for the hooks to take effect.
+
+:::warning Known Issue
+There is a known issue in Claude Code where `Notification` hooks may be delayed by several seconds before firing. This delay is unrelated to Wave — it occurs in Claude Code itself. See [#5186](https://github.com/anthropics/claude-code/issues/5186) and [#19627](https://github.com/anthropics/claude-code/issues/19627) for details.
+:::
+
+## What each hook does
+
+### Permission prompt — `bell-exclamation` gold, priority 20
+
+Claude Code occasionally needs your approval before it can continue — to run a command, write a file outside the project, or use a tool that requires explicit permission. When it hits one of these, it stops and waits. Without a signal, you might not notice for minutes.
+
+This hook fires on the `permission_prompt` notification type and sets a high-priority gold badge with an audible beep. Priority 20 means it beats any other badge on that tab, so a waiting session always surfaces above a finished one.
+
+When you click into the tab and approve or deny the request, the badge clears automatically.
+
+### Session complete — `check` green, priority 10
+
+When Claude Code finishes responding, this hook sets a green check badge. It's a low-key signal: glance at the tab bar, see which sessions are done, review their output in whatever order you like.
+
+### AskUserQuestion — `message-question` gold, priority 20
+
+When Claude Code uses the `AskUserQuestion` tool, it's paused and waiting for you to respond before it can proceed. This `PreToolUse` hook fires just before that tool call and sets the same high-priority gold badge as the permission prompt.
+
+`PreToolUse` hooks can match any tool by name, so you can add badges for other tools as well — for example, to get a signal whenever Claude runs a shell command (`Bash`) or edits a file (`Edit`). Any tool name Claude Code supports can be used as a matcher.
+
+## Choosing your own icons and colors
+
+Icon names are [Font Awesome](https://fontawesome.com/icons) icon names without the `fa-` prefix. Colors are any valid CSS color — hex values, named colors, or anything else CSS accepts.
+
+Some icon and color ideas:
+
+| Situation | Icon | Color |
+|-----------|------|-------|
+| Custom high-priority alert | `triangle-exclamation` | `#FF453A` |
+| Blocked / waiting on input | `hourglass-half` | `#FF9500` |
+| Neutral / informational | `circle-info` | `#429DFF` |
+| Background task running | `spinner` | `#00FFDB` |
+
+See the [`wsh badge` reference](/wsh-reference#badge) for all available flags.
+
+## Adjusting priorities
+
+Priority controls which badge wins when multiple blocks in a tab each have one. Higher numbers take precedence. The defaults above use:
+
+- **20** for permission prompts — always surfaces above everything else
+- **10** for session complete — visible when nothing more urgent is active
+
+If you add more hooks, keep permission-blocking signals at the high end (15–25) and informational signals at the low end (5–10).

docs/docs/config.mdx

@@ -81,6 +81,7 @@ wsh editconfig
 | editor:fontsize                      | float64  | set the font size for the editor (defaults to 12px)                                                                                                                                                                                                           |
 | editor:inlinediff                    | bool     | set to true to show diffs inline instead of side-by-side, false for side-by-side (defaults to undefined which uses Monaco's responsive behavior)                                                                                                              |
 | preview:showhiddenfiles              | bool     | set to false to disable showing hidden files in the directory preview (defaults to true)                                                                                                                                                                      |
+| preview:defaultsort <VersionBadge version="v0.14.2" />                 | string   | sets the default sort column for directory preview. `"name"` (default) sorts alphabetically by name ascending; `"modtime"` sorts by last modified time descending (newest first)                                                                               |
 | 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                                                                                                                                                                                                            |
@@ -154,7 +155,8 @@ For reference, this is the current default configuration (v0.14.0):
     "term:copyonselect": true,
     "term:durable": false,
     "waveai:showcloudmodes": true,
-    "waveai:defaultmode": "waveai@balanced"
+    "waveai:defaultmode": "waveai@balanced",
+    "preview:defaultsort": "name"
 }
 ```