fix some FE local conn stuff

Author: sawka

frontend/app/block/blockutil.tsx

@@ -166,7 +166,7 @@ export const ConnectionButton = React.memo(
     React.forwardRef<HTMLDivElement, ConnectionButtonProps>(
         ({ connection, changeConnModalAtom }: ConnectionButtonProps, ref) => {
             const [connModalOpen, setConnModalOpen] = jotai.useAtom(changeConnModalAtom);
-            const isLocal = util.isBlank(connection);
+            const isLocal = util.isLocalConnName(connection);
             const connStatusAtom = getConnStatusAtom(connection);
             const connStatus = jotai.useAtomValue(connStatusAtom);
             let showDisconnectedSlash = false;
@@ -178,9 +178,15 @@ export const ConnectionButton = React.memo(
             };
             let titleText = null;
             let shouldSpin = false;
+            let connDisplayName: string = null;
             if (isLocal) {
                 color = "var(--grey-text-color)";
-                titleText = "Connected to Local Machine";
+                if (connection === "local:gitbash") {
+                    titleText = "Connected to Git Bash";
+                    connDisplayName = "Git Bash";
+                } else {
+                    titleText = "Connected to Local Machine";
+                }
                 connIconElem = (
                     <i
                         className={clsx(util.makeIconClass("laptop", false), "fa-stack-1x")}
@@ -238,7 +244,11 @@ export const ConnectionButton = React.memo(
                             }}
                         />
                     </span>
-                    {isLocal ? null : <div className="connection-name ellipsis">{connection}</div>}
+                    {connDisplayName ? (
+                        <div className="connection-name ellipsis">{connDisplayName}</div>
+                    ) : isLocal ? null : (
+                        <div className="connection-name ellipsis">{connection}</div>
+                    )}
                 </div>
             );
         }

frontend/app/store/global.ts

@@ -17,7 +17,14 @@ import {
 import { getWebServerEndpoint } from "@/util/endpoints";
 import { fetch } from "@/util/fetchutil";
 import { setPlatform } from "@/util/platformutil";
-import { base64ToString, deepCompareReturnPrev, fireAndForget, getPrefixedSettings, isBlank } from "@/util/util";
+import {
+    base64ToString,
+    deepCompareReturnPrev,
+    fireAndForget,
+    getPrefixedSettings,
+    isBlank,
+    isLocalConnName,
+} from "@/util/util";
 import { atom, Atom, PrimitiveAtom, useAtomValue } from "jotai";
 import { globalStore } from "./jotaiStore";
 import { modalsModel } from "./modalmodel";
@@ -730,8 +737,7 @@ function getConnStatusAtom(conn: string): PrimitiveAtom<ConnStatus> {
     const connStatusMap = globalStore.get(ConnStatusMapAtom);
     let rtn = connStatusMap.get(conn);
     if (rtn == null) {
-        if (isBlank(conn)) {
-            // create a fake "local" status atom that's always connected
+        if (isLocalConnName(conn)) {
             const connStatus: ConnStatus = {
                 connection: conn,
                 connected: true,

frontend/app/view/term/termwrap.ts

@@ -526,14 +526,14 @@ export class TermWrap {
                 oref: WOS.makeORef("block", this.blockId),
             });
 
-            if (rtInfo["shell:integration"]) {
+            if (rtInfo && rtInfo["shell:integration"]) {
                 const shellState = rtInfo["shell:state"] as ShellIntegrationStatus;
                 globalStore.set(this.shellIntegrationStatusAtom, shellState || null);
             } else {
                 globalStore.set(this.shellIntegrationStatusAtom, null);
             }
 
-            const lastCmd = rtInfo["shell:lastcmd"];
+            const lastCmd = rtInfo ? rtInfo["shell:lastcmd"] : null;
             globalStore.set(this.lastCommandAtom, lastCmd || null);
         } catch (e) {
             console.log("Error loading runtime info:", e);

frontend/util/util.ts

@@ -12,6 +12,13 @@ function isBlank(str: string): boolean {
     return str == null || str == "";
 }
 
+function isLocalConnName(connName: string): boolean {
+    if (isBlank(connName)) {
+        return true;
+    }
+    return connName === "local" || connName.startsWith("local:");
+}
+
 function base64ToString(b64: string): string {
     if (b64 == null) {
         return null;
@@ -509,6 +516,7 @@ export {
     getPromiseState,
     getPromiseValue,
     isBlank,
+    isLocalConnName,
     jotaiLoadableValue,
     jsonDeepEqual,
     lazy,

pkg/wshrpc/wshserver/wshserver.go

@@ -647,6 +647,9 @@ func (ws *WshServer) ConnDisconnectCommand(ctx context.Context, connName string)
 	if strings.HasPrefix(connName, "aws:") {
 		return nil
 	}
+	if conncontroller.IsLocalConnName(connName) {
+		return nil
+	}
 	if strings.HasPrefix(connName, "wsl://") {
 		distroName := strings.TrimPrefix(connName, "wsl://")
 		conn := wslconn.GetWslConn(distroName)
@@ -671,6 +674,9 @@ func (ws *WshServer) ConnConnectCommand(ctx context.Context, connRequest wshrpc.
 	if strings.HasPrefix(connRequest.Host, "aws:") {
 		return nil
 	}
+	if conncontroller.IsLocalConnName(connRequest.Host) {
+		return nil
+	}
 	ctx = genconn.ContextWithConnData(ctx, connRequest.LogBlockId)
 	ctx = termCtxWithLogBlockId(ctx, connRequest.LogBlockId)
 	connName := connRequest.Host
@@ -698,6 +704,9 @@ func (ws *WshServer) ConnReinstallWshCommand(ctx context.Context, data wshrpc.Co
 	if strings.HasPrefix(data.ConnName, "aws:") {
 		return nil
 	}
+	if conncontroller.IsLocalConnName(data.ConnName) {
+		return nil
+	}
 	ctx = genconn.ContextWithConnData(ctx, data.LogBlockId)
 	ctx = termCtxWithLogBlockId(ctx, data.LogBlockId)
 	connName := data.ConnName