add error handling and fix workspace directory fetch

- add try/catch to folder browse dialog in workspace editor
- refactor getWorkspaceDirectory to getWorkspaceInfo returning both wsId and wsDir
- fetch workspace info once with timeout and pass to makeSwapToken to avoid duplicate DB calls

Author: rnunley-nmg

frontend/app/tab/workspaceeditor.tsx

@@ -132,9 +132,13 @@ export const WorkspaceEditor = memo(function WorkspaceEditor({
                     <Button
                         className="ghost browse-btn"
                         onClick={async () => {
-                            const path = await getApi().showOpenFolderDialog();
-                            if (path) {
-                                onDirectoryChange(path);
+                            try {
+                                const path = await getApi().showOpenFolderDialog();
+                                if (path) {
+                                    onDirectoryChange(path);
+                                }
+                            } catch (e) {
+                                console.error("error opening folder dialog:", e);
                             }
                         }}
                     >

pkg/blockcontroller/shellcontroller.go

@@ -386,12 +386,15 @@ func (bc *ShellController) setupAndStartShellProcess(logCtx context.Context, rc
 	blocklogger.Infof(logCtx, "[conndebug] remoteName: %q, connType: %s, wshEnabled: %v, shell: %q, shellType: %s\n", remoteName, connUnion.ConnType, connUnion.WshEnabled, connUnion.ShellPath, connUnion.ShellType)
 	var cmdStr string
 	var cmdOpts shellexec.CommandOptsType
+	wsCtx, wsCancel := context.WithTimeout(context.Background(), 2*time.Second)
+	wsId, wsDir := getWorkspaceInfo(wsCtx, bc.TabId)
+	wsCancel()
 	if bc.ControllerType == BlockController_Shell {
 		cmdOpts.Interactive = true
 		cmdOpts.Login = true
 		cmdOpts.Cwd = blockMeta.GetString(waveobj.MetaKey_CmdCwd, "")
 		if cmdOpts.Cwd == "" && connUnion.ConnType == ConnType_Local {
-			cmdOpts.Cwd = getWorkspaceDirectory(ctx, bc.TabId)
+			cmdOpts.Cwd = wsDir
 		}
 		if cmdOpts.Cwd != "" {
 			cwdPath, err := wavebase.ExpandHomeDir(cmdOpts.Cwd)
@@ -411,7 +414,7 @@ func (bc *ShellController) setupAndStartShellProcess(logCtx context.Context, rc
 		return nil, fmt.Errorf("unknown controller type %q", bc.ControllerType)
 	}
 	var shellProc *shellexec.ShellProc
-	swapToken := bc.makeSwapToken(ctx, logCtx, blockMeta, remoteName, connUnion.ShellType)
+	swapToken := bc.makeSwapToken(ctx, logCtx, blockMeta, remoteName, connUnion.ShellType, wsId, wsDir)
 	cmdOpts.SwapToken = swapToken
 	blocklogger.Debugf(logCtx, "[conndebug] created swaptoken: %s\n", swapToken.Token)
 	if connUnion.ConnType == ConnType_Wsl {
@@ -718,22 +721,22 @@ func createCmdStrAndOpts(blockId string, blockMeta waveobj.MetaMapType, connName
 	return cmdStr, &cmdOpts, nil
 }
 
-func getWorkspaceDirectory(ctx context.Context, tabId string) string {
+func getWorkspaceInfo(ctx context.Context, tabId string) (wsId string, wsDir string) {
 	if tabId == "" {
-		return ""
+		return "", ""
 	}
 	wsId, err := wstore.DBFindWorkspaceForTabId(ctx, tabId)
 	if err != nil {
-		return ""
+		return "", ""
 	}
 	ws, err := wstore.DBGet[*waveobj.Workspace](ctx, wsId)
 	if err != nil || ws == nil {
-		return ""
+		return wsId, ""
 	}
-	return ws.Directory
+	return wsId, ws.Directory
 }
 
-func (bc *ShellController) makeSwapToken(ctx context.Context, logCtx context.Context, blockMeta waveobj.MetaMapType, remoteName string, shellType string) *shellutil.TokenSwapEntry {
+func (bc *ShellController) makeSwapToken(ctx context.Context, logCtx context.Context, blockMeta waveobj.MetaMapType, remoteName string, shellType string, wsId string, wsDir string) *shellutil.TokenSwapEntry {
 	token := &shellutil.TokenSwapEntry{
 		Token: uuid.New().String(),
 		Env:   make(map[string]string),
@@ -749,17 +752,11 @@ func (bc *ShellController) makeSwapToken(ctx context.Context, logCtx context.Con
 	} else {
 		token.Env["WAVETERM_TABID"] = tabId
 	}
-	if tabId != "" {
-		wsId, err := wstore.DBFindWorkspaceForTabId(ctx, tabId)
-		if err != nil {
-			log.Printf("error finding workspace for tab: %v\n", err)
-		} else {
-			token.Env["WAVETERM_WORKSPACEID"] = wsId
-			ws, err := wstore.DBGet[*waveobj.Workspace](ctx, wsId)
-			if err == nil && ws != nil && ws.Directory != "" {
-				token.Env["WAVETERM_WORKSPACE_DIR"] = ws.Directory
-			}
-		}
+	if wsId != "" {
+		token.Env["WAVETERM_WORKSPACEID"] = wsId
+	}
+	if wsDir != "" {
+		token.Env["WAVETERM_WORKSPACE_DIR"] = wsDir
 	}
 	clientData, err := wstore.DBGetSingleton[*waveobj.Client](ctx)
 	if err != nil {