Claude Code review R1: fix Rust sidecar timeout for shell detection, update vscode.md spec

Author: nedtwigg

docs/specs/vscode.md

@@ -144,12 +144,13 @@ All types defined in `message-types.ts`. Webview-side handling in `vscode-adapte
 
 | Message | Purpose |
 |---------|---------|
-| `pty:spawn` | Create new PTY (id, optional cols/rows/cwd) |
+| `pty:spawn` | Create new PTY (id, optional cols/rows/cwd/shell/args) |
 | `pty:input` | Write data to PTY |
 | `pty:resize` | Resize PTY dimensions |
 | `pty:kill` | Kill PTY and release ownership |
 | `pty:getCwd` | Query PTY working directory (request-response via requestId) |
 | `pty:getScrollback` | Query PTY scrollback buffer (request-response via requestId) |
+| `pty:getShells` | Query available shells (request-response via requestId) |
 | `mouseterm:init` | Trigger reconnection: get PTY list + replay data |
 | `mouseterm:saveState` | Frontend persisting session state |
 | `mouseterm:flushSessionSaveDone` | Ack for deactivate-triggered flush (matched by requestId) |
@@ -175,6 +176,7 @@ All types defined in `message-types.ts`. Webview-side handling in `vscode-adapte
 | `pty:replay` | Buffered output since spawn (response to `mouseterm:init`) |
 | `pty:cwd` | CWD query response (matched by requestId) |
 | `pty:scrollback` | Scrollback query response (matched by requestId) |
+| `pty:shells` | Available shells list response (matched by requestId) |
 | `mouseterm:flushSessionSave` | Request webview to save state now (deactivate trigger, matched by requestId) |
 | `alarm:state` | Alarm state change (status, todo, attentionDismissedRing) |
 

standalone/src-tauri/src/lib.rs

@@ -101,6 +101,15 @@ fn request_from_sidecar(
     state: &SidecarState,
     event: &str,
     data: JsonValue,
+) -> Result<JsonValue, String> {
+    request_from_sidecar_timeout(state, event, data, Duration::from_secs(1))
+}
+
+fn request_from_sidecar_timeout(
+    state: &SidecarState,
+    event: &str,
+    data: JsonValue,
+    timeout: Duration,
 ) -> Result<JsonValue, String> {
     let request_id = format!(
         "req-{}",
@@ -125,7 +134,7 @@ fn request_from_sidecar(
     });
     send_to_sidecar(state, msg.to_string());
 
-    match rx.recv_timeout(Duration::from_secs(1)) {
+    match rx.recv_timeout(timeout) {
         Ok(response) => Ok(response),
         Err(_) => {
             if let Ok(mut pending) = state.pending_requests.lock() {
@@ -225,7 +234,7 @@ struct ShellInfo {
 
 #[tauri::command]
 fn get_available_shells(state: tauri::State<'_, SidecarState>) -> Result<Vec<ShellInfo>, String> {
-    let response = request_from_sidecar(&state, "pty:getShells", serde_json::json!({}))?;
+    let response = request_from_sidecar_timeout(&state, "pty:getShells", serde_json::json!({}), Duration::from_secs(10))?;
     let shells: Vec<ShellInfo> = response
         .get("shells")
         .and_then(|v| serde_json::from_value(v.clone()).ok())