gitbash flow working (switching between local conns)

Author: sawka

frontend/app/block/blockframe.tsx

@@ -254,7 +254,8 @@ const BlockFrame_Header = ({
         icon: "link-slash",
         title: "wsh is not installed for this connection",
     };
-    const showNoWshButton = manageConnection && wshProblem && !util.isBlank(connName) && !connName.startsWith("aws:");
+    const showNoWshButton =
+        manageConnection && wshProblem && !util.isLocalConnName(connName) && !connName.startsWith("aws:");
 
     return (
         <div
@@ -600,7 +601,7 @@ const BlockFrame_Default_Component = (props: BlockFrameProps) => {
             return;
         }
         const connName = blockData?.meta?.connection;
-        if (!util.isBlank(connName)) {
+        if (!util.isLocalConnName(connName)) {
             console.log("ensure conn", nodeModel.blockId, connName);
             RpcApi.ConnEnsureCommand(
                 TabRpcClient,

frontend/app/modals/conntypeahead.tsx

@@ -3,17 +3,8 @@
 
 import { computeConnColorNum } from "@/app/block/blockutil";
 import { TypeAheadModal } from "@/app/modals/typeaheadmodal";
-import {
-    atoms,
-    createBlock,
-    getApi,
-    getConnStatusAtom,
-    getHostName,
-    getUserName,
-    globalStore,
-    WOS,
-} from "@/app/store/global";
 import { ConnectionsModel } from "@/app/store/connections-model";
+import { atoms, createBlock, getConnStatusAtom, getHostName, getUserName, globalStore, WOS } from "@/app/store/global";
 import { globalRefocusWithTimeout } from "@/app/store/keymodel";
 import { RpcApi } from "@/app/store/wshclientapi";
 import { TabRpcClient } from "@/app/store/wshrpcutil";
@@ -108,7 +99,7 @@ function createFilteredLocalSuggestionItem(
             iconColor: "var(--grey-text-color)",
             value: "",
             label: localName,
-            current: connection == null,
+            current: util.isBlank(connection),
         };
         return [localSuggestion];
     }
@@ -179,7 +170,7 @@ function getLocalSuggestions(
     const wslFiltered = filterConnections(connList, connSelected, fullConfig, filterOutNowsh);
     const wslSuggestionItems = createWslSuggestionItems(wslFiltered, connection, connStatusMap);
     const localSuggestionItem = createFilteredLocalSuggestionItem(localName, connection, connSelected);
-    
+
     const gitBashItems: Array<SuggestionConnectionItem> = [];
     if (hasGitBash && "Git Bash".toLowerCase().includes(connSelected.toLowerCase())) {
         gitBashItems.push({
@@ -191,7 +182,7 @@ function getLocalSuggestions(
             current: connection === "local:gitbash",
         });
     }
-    
+
     const combinedSuggestionItems = [...localSuggestionItem, ...gitBashItems, ...wslSuggestionItems];
     const sortedSuggestionItems = sortConnSuggestionItems(combinedSuggestionItems, fullConfig);
     if (sortedSuggestionItems.length == 0) {
@@ -250,7 +241,7 @@ function getDisconnectItem(
     connection: string,
     connStatusMap: Map<string, ConnStatus>
 ): SuggestionConnectionItem | null {
-    if (!connection) {
+    if (util.isLocalConnName(connection)) {
         return null;
     }
     const connStatus = connStatusMap.get(connection);
@@ -418,7 +409,7 @@ const ChangeConnectionBlockModal = React.memo(
                     oref: WOS.makeORef("block", blockId),
                     meta: { connection: connName, file: newFile, "cmd:cwd": null },
                 });
-                
+
                 try {
                     await RpcApi.ConnEnsureCommand(
                         TabRpcClient,

pkg/blockcontroller/blockcontroller.go

@@ -83,15 +83,15 @@ func getController(blockId string) Controller {
 
 func registerController(blockId string, controller Controller) {
 	var existingController Controller
-	
+
 	registryLock.Lock()
 	existing, exists := controllerRegistry[blockId]
 	if exists {
 		existingController = existing
 	}
 	controllerRegistry[blockId] = controller
 	registryLock.Unlock()
-	
+
 	if existingController != nil {
 		existingController.Stop(false, Status_Done)
 		wstore.DeleteRTInfo(waveobj.MakeORef(waveobj.OType_Block, blockId))
@@ -169,8 +169,9 @@ func ResyncController(ctx context.Context, tabId string, blockId string, rtOpts
 		// For shell/cmd, check if connection changed
 		if !needsReplace && (controllerName == BlockController_Shell || controllerName == BlockController_Cmd) {
 			connName := blockData.Meta.GetString(waveobj.MetaKey_Connection, "")
+			// Check if connection changed, including between different local connections
 			if existingStatus.ShellProcStatus == Status_Running && existingStatus.ShellProcConnName != connName {
-				log.Printf("stopping blockcontroller %s due to conn change\n", blockId)
+				log.Printf("stopping blockcontroller %s due to conn change (from %q to %q)\n", blockId, existingStatus.ShellProcConnName, connName)
 				StopBlockControllerAndSetStatus(blockId, Status_Init)
 				time.Sleep(100 * time.Millisecond)
 				// Don't delete, will reuse same controller type
@@ -209,7 +210,7 @@ func ResyncController(ctx context.Context, tabId string, blockId string, rtOpts
 	// Check if we need to start/restart
 	status := controller.GetRuntimeStatus()
 	if status.ShellProcStatus == Status_Init || status.ShellProcStatus == Status_Done {
-		// For shell/cmd, check connection status first
+		// For shell/cmd, check connection status first (for non-local connections)
 		if controllerName == BlockController_Shell || controllerName == BlockController_Cmd {
 			connName := blockData.Meta.GetString(waveobj.MetaKey_Connection, "")
 			if !conncontroller.IsLocalConnName(connName) {

pkg/blockcontroller/shellcontroller.go

@@ -483,7 +483,7 @@ func (bc *ShellController) setupAndStartShellProcess(logCtx context.Context, rc
 		}
 		cmdOpts.ShellPath = connUnion.ShellPath
 		cmdOpts.ShellOpts = getLocalShellOpts(blockMeta)
-		shellProc, err = shellexec.StartLocalShellProc(logCtx, rc.TermSize, cmdStr, cmdOpts)
+		shellProc, err = shellexec.StartLocalShellProc(logCtx, rc.TermSize, cmdStr, cmdOpts, remoteName)
 		if err != nil {
 			return nil, err
 		}
@@ -656,7 +656,7 @@ func getLocalShellPath(blockMeta waveobj.MetaMapType) (string, error) {
 	if shellPath != "" {
 		return shellPath, nil
 	}
-	
+
 	connName := blockMeta.GetString(waveobj.MetaKey_Connection, "")
 	if strings.HasPrefix(connName, "local:") {
 		variant := strings.TrimPrefix(connName, "local:")
@@ -673,7 +673,7 @@ func getLocalShellPath(blockMeta waveobj.MetaMapType) (string, error) {
 		}
 		return "", fmt.Errorf("unsupported local connection type: %q", connName)
 	}
-	
+
 	settings := wconfig.GetWatcher().GetFullConfig().Settings
 	if settings.TermLocalShellPath != "" {
 		return settings.TermLocalShellPath, nil

pkg/shellexec/shellexec.go

@@ -459,7 +459,7 @@ func StartRemoteShellProc(ctx context.Context, logCtx context.Context, termSize
 	return &ShellProc{Cmd: sessionWrap, ConnName: conn.GetName(), CloseOnce: &sync.Once{}, DoneCh: make(chan any)}, nil
 }
 
-func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdStr string, cmdOpts CommandOptsType) (*ShellProc, error) {
+func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdStr string, cmdOpts CommandOptsType, connName string) (*ShellProc, error) {
 	shellutil.InitCustomShellStartupFiles()
 	var ecmd *exec.Cmd
 	var shellOpts []string
@@ -562,7 +562,7 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
 		return nil, err
 	}
 	cmdWrap := MakeCmdWrap(ecmd, cmdPty)
-	return &ShellProc{Cmd: cmdWrap, CloseOnce: &sync.Once{}, DoneCh: make(chan any)}, nil
+	return &ShellProc{Cmd: cmdWrap, ConnName: connName, CloseOnce: &sync.Once{}, DoneCh: make(chan any)}, nil
 }
 
 func RunSimpleCmdInPty(ecmd *exec.Cmd, termSize waveobj.TermSize) ([]byte, error) {