fix tool approval lifecycle to match SSE connection, not keep-alives (#2693)

tie the tool approvals to the lifecycle of the SSE connection, NOT FE
keepalive packets. this prevents timeouts when the FE hasn't rendered
the tools (or FE tool rendering lifecycle issues). also allows immediate
timeouts on refresh.

other small fixes: convert to use wshclient in wshcmd-*.go files,
cleanup in SSE code

Author: sawka

.vscode/settings.json

@@ -55,7 +55,6 @@
     "files.associations": {
         "*.css": "tailwindcss"
     },
-    "go.lintTool": "staticcheck",
     "gopls": {
         "analyses": {
             "QF1003": false

cmd/wsh/cmd/wshcmd-connserver.go

@@ -191,14 +191,10 @@ func serverRunRouter(jwtToken string) error {
 
 func checkForUpdate() error {
 	remoteInfo := wshutil.GetInfo()
-	needsRestartRaw, err := RpcClient.SendRpcRequest(wshrpc.Command_ConnUpdateWsh, remoteInfo, &wshrpc.RpcOpts{Timeout: 60000})
+	needsRestart, err := wshclient.ConnUpdateWshCommand(RpcClient, remoteInfo, &wshrpc.RpcOpts{Timeout: 60000})
 	if err != nil {
 		return fmt.Errorf("could not update: %w", err)
 	}
-	needsRestart, ok := needsRestartRaw.(bool)
-	if !ok {
-		return fmt.Errorf("wrong return type from update")
-	}
 	if needsRestart {
 		// run the restart command here
 		// how to get the correct path?

cmd/wsh/cmd/wshcmd-deleteblock.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var deleteBlockCmd = &cobra.Command{
@@ -35,7 +36,7 @@ func deleteBlockRun(cmd *cobra.Command, args []string) (rtnErr error) {
 	deleteBlockData := &wshrpc.CommandDeleteBlockData{
 		BlockId: fullORef.OID,
 	}
-	_, err = RpcClient.SendRpcRequest(wshrpc.Command_DeleteBlock, deleteBlockData, &wshrpc.RpcOpts{Timeout: 2000})
+	err = wshclient.DeleteBlockCommand(RpcClient, *deleteBlockData, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("delete block failed: %v", err)
 	}

cmd/wsh/cmd/wshcmd-editconfig.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var editConfigMagnified bool
@@ -48,7 +49,7 @@ func editConfigRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		Focused:   true,
 	}
 
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_CreateBlock, wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	_, err := wshclient.CreateBlockCommand(RpcClient, *wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("opening config file: %w", err)
 	}

cmd/wsh/cmd/wshcmd-notify.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 	"github.com/wavetermdev/waveterm/pkg/wshutil"
 )
 
@@ -38,7 +39,7 @@ func notifyRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		Body:   message,
 		Silent: notifySilent,
 	}
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_Notify, notificationOptions, &wshrpc.RpcOpts{Timeout: 2000, Route: wshutil.ElectronRoute})
+	err := wshclient.NotifyCommand(RpcClient, *notificationOptions, &wshrpc.RpcOpts{Timeout: 2000, Route: wshutil.ElectronRoute})
 	if err != nil {
 		return fmt.Errorf("sending notification: %w", err)
 	}

cmd/wsh/cmd/wshcmd-secret.go

@@ -187,7 +187,7 @@ func secretUiRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		Focused:   true,
 	}
 
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_CreateBlock, wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	_, err := wshclient.CreateBlockCommand(RpcClient, *wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("opening secrets UI: %w", err)
 	}

cmd/wsh/cmd/wshcmd-setmeta.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var setMetaCmd = &cobra.Command{
@@ -192,7 +193,7 @@ func setMetaRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		ORef: *fullORef,
 		Meta: fullMeta,
 	}
-	_, err = RpcClient.SendRpcRequest(wshrpc.Command_SetMeta, setMetaWshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	err = wshclient.SetMetaCommand(RpcClient, *setMetaWshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("setting metadata: %v", err)
 	}

cmd/wsh/cmd/wshcmd-view.go

@@ -13,6 +13,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var viewMagnified bool
@@ -99,7 +100,7 @@ func viewRun(cmd *cobra.Command, args []string) (rtnErr error) {
 			wshCmd.BlockDef.Meta[waveobj.MetaKey_Connection] = conn
 		}
 	}
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_CreateBlock, wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	_, err := wshclient.CreateBlockCommand(RpcClient, *wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("running view command: %w", err)
 	}

frontend/app/aipanel/aitooluse.tsx

@@ -146,26 +146,11 @@ interface AIToolUseBatchProps {
 
 const AIToolUseBatch = memo(({ parts, isStreaming }: AIToolUseBatchProps) => {
     const [userApprovalOverride, setUserApprovalOverride] = useState<string | null>(null);
-    const partsRef = useRef(parts);
-    partsRef.current = parts;
 
-    // All parts in a batch have the same approval status (enforced by grouping logic in AIToolUseGroup)
     const firstTool = parts[0].data;
     const baseApproval = userApprovalOverride || firstTool.approval;
     const effectiveApproval = getEffectiveApprovalStatus(baseApproval, isStreaming);
 
-    useEffect(() => {
-        if (!isStreaming || effectiveApproval !== "needs-approval") return;
-
-        const interval = setInterval(() => {
-            partsRef.current.forEach((part) => {
-                WaveAIModel.getInstance().toolUseKeepalive(part.data.toolcallid);
-            });
-        }, 4000);
-
-        return () => clearInterval(interval);
-    }, [isStreaming, effectiveApproval]);
-
     const handleApprove = () => {
         setUserApprovalOverride("user-approved");
         parts.forEach((part) => {
@@ -212,8 +197,6 @@ const AIToolUse = memo(({ part, isStreaming }: AIToolUseProps) => {
     const showRestoreModal = restoreModalToolCallId === toolData.toolcallid;
     const highlightTimeoutRef = useRef<NodeJS.Timeout | null>(null);
     const highlightedBlockIdRef = useRef<string | null>(null);
-    const toolCallIdRef = useRef(toolData.toolcallid);
-    toolCallIdRef.current = toolData.toolcallid;
 
     const statusIcon = toolData.status === "completed" ? "✓" : toolData.status === "error" ? "✗" : "•";
     const statusColor =
@@ -224,16 +207,6 @@ const AIToolUse = memo(({ part, isStreaming }: AIToolUseProps) => {
 
     const isFileWriteTool = toolData.toolname === "write_text_file" || toolData.toolname === "edit_text_file";
 
-    useEffect(() => {
-        if (!isStreaming || effectiveApproval !== "needs-approval") return;
-
-        const interval = setInterval(() => {
-            WaveAIModel.getInstance().toolUseKeepalive(toolCallIdRef.current);
-        }, 4000);
-
-        return () => clearInterval(interval);
-    }, [isStreaming, effectiveApproval]);
-
     useEffect(() => {
         return () => {
             if (highlightTimeoutRef.current) {

frontend/app/store/global.ts

@@ -458,6 +458,16 @@ function useBlockDataLoaded(blockId: string): boolean {
     return useAtomValue(loadedAtom);
 }
 
+/**
+ * Safely read an atom value, returning null if the atom is null.
+ */
+function readAtom<T>(atom: Atom<T>): T {
+    if (atom == null) {
+        return null;
+    }
+    return globalStore.get(atom);
+}
+
 /**
  * Get the preload api.
  */
@@ -863,6 +873,7 @@ export {
     getUserName,
     globalPrimaryTabStartup,
     globalStore,
+    readAtom,
     initGlobal,
     initGlobalWaveEventSubs,
     isDev,