job events, terminal command types, connect error codes (#2855)

Author: sawka

cmd/server/main-server.go

@@ -238,6 +238,8 @@ func updateTelemetryCounts(lastCounts telemetrydata.TEventProps) telemetrydata.T
 	props.CountWorkspaces, _, _ = wstore.DBGetWSCounts(ctx)
 	props.CountSSHConn = conncontroller.GetNumSSHHasConnected()
 	props.CountWSLConn = wslconn.GetNumWSLHasConnected()
+	props.CountJobs = jobcontroller.GetNumJobsRunning()
+	props.CountJobsConnected = jobcontroller.GetNumJobsConnected()
 	props.CountViews, _ = wstore.DBGetBlockViewCounts(ctx)
 
 	fullConfig := wconfig.GetWatcher().GetFullConfig()

cmd/wsh/cmd/wshcmd-jobdebug.go

@@ -386,6 +386,7 @@ func jobDebugStartRun(cmd *cobra.Command, args []string) error {
 
 	data := wshrpc.CommandJobControllerStartJobData{
 		ConnName: jobConnFlag,
+		JobKind:  "task",
 		Cmd:      cmdToRun,
 		Args:     cmdArgs,
 		Env:      make(map[string]string),

emain/emain-activity.ts

@@ -10,6 +10,9 @@ let globalIsRelaunching = false;
 let forceQuit = false;
 let userConfirmedQuit = false;
 let termCommandsRun = 0;
+let termCommandsRemote = 0;
+let termCommandsWsl = 0;
+let termCommandsDurable = 0;
 
 export function setWasActive(val: boolean) {
     wasActive = val;
@@ -72,3 +75,33 @@ export function getAndClearTermCommandsRun(): number {
     termCommandsRun = 0;
     return count;
 }
+
+export function incrementTermCommandsRemote() {
+    termCommandsRemote++;
+}
+
+export function getAndClearTermCommandsRemote(): number {
+    const count = termCommandsRemote;
+    termCommandsRemote = 0;
+    return count;
+}
+
+export function incrementTermCommandsWsl() {
+    termCommandsWsl++;
+}
+
+export function getAndClearTermCommandsWsl(): number {
+    const count = termCommandsWsl;
+    termCommandsWsl = 0;
+    return count;
+}
+
+export function incrementTermCommandsDurable() {
+    termCommandsDurable++;
+}
+
+export function getAndClearTermCommandsDurable(): number {
+    const count = termCommandsDurable;
+    termCommandsDurable = 0;
+    return count;
+}

emain/emain-ipc.ts

@@ -12,7 +12,12 @@ import { RpcApi } from "../frontend/app/store/wshclientapi";
 import { getWebServerEndpoint } from "../frontend/util/endpoints";
 import * as keyutil from "../frontend/util/keyutil";
 import { fireAndForget, parseDataUrl } from "../frontend/util/util";
-import { incrementTermCommandsRun } from "./emain-activity";
+import {
+    incrementTermCommandsDurable,
+    incrementTermCommandsRemote,
+    incrementTermCommandsRun,
+    incrementTermCommandsWsl,
+} from "./emain-activity";
 import { createBuilderWindow, getAllBuilderWindows, getBuilderWindowByWebContentsId } from "./emain-builder";
 import { callWithOriginalXdgCurrentDesktopAsync, unamePlatform } from "./emain-platform";
 import { getWaveTabViewByWebContentsId } from "./emain-tabview";
@@ -407,9 +412,21 @@ export function initIpcHandlers() {
         console.log("fe-log", logStr);
     });
 
-    electron.ipcMain.on("increment-term-commands", () => {
-        incrementTermCommandsRun();
-    });
+    electron.ipcMain.on(
+        "increment-term-commands",
+        (event, opts?: { isRemote?: boolean; isWsl?: boolean; isDurable?: boolean }) => {
+            incrementTermCommandsRun();
+            if (opts?.isRemote) {
+                incrementTermCommandsRemote();
+            }
+            if (opts?.isWsl) {
+                incrementTermCommandsWsl();
+            }
+            if (opts?.isDurable) {
+                incrementTermCommandsDurable();
+            }
+        }
+    );
 
     electron.ipcMain.on("native-paste", (event) => {
         event.sender.paste();

emain/emain.ts

@@ -12,7 +12,10 @@ import { fireAndForget, sleep } from "../frontend/util/util";
 import { AuthKey, configureAuthKeyRequestInjection } from "./authkey";
 import {
     getActivityState,
+    getAndClearTermCommandsDurable,
+    getAndClearTermCommandsRemote,
     getAndClearTermCommandsRun,
+    getAndClearTermCommandsWsl,
     getForceQuit,
     getGlobalIsRelaunching,
     getUserConfirmedQuit,
@@ -182,6 +185,9 @@ function logActiveState() {
         if (termCmdCount > 0) {
             activity.termcommandsrun = termCmdCount;
         }
+        const termCmdRemoteCount = getAndClearTermCommandsRemote();
+        const termCmdWslCount = getAndClearTermCommandsWsl();
+        const termCmdDurableCount = getAndClearTermCommandsDurable();
 
         const props: TEventProps = {
             "activity:activeminutes": activity.activeminutes,
@@ -191,6 +197,15 @@ function logActiveState() {
         if (termCmdCount > 0) {
             props["activity:termcommandsrun"] = termCmdCount;
         }
+        if (termCmdRemoteCount > 0) {
+            props["activity:termcommands:remote"] = termCmdRemoteCount;
+        }
+        if (termCmdWslCount > 0) {
+            props["activity:termcommands:wsl"] = termCmdWslCount;
+        }
+        if (termCmdDurableCount > 0) {
+            props["activity:termcommands:durable"] = termCmdDurableCount;
+        }
         if (astate.wasActive && isWaveAIOpen) {
             props["activity:waveaiactiveminutes"] = 1;
         }

emain/preload.ts

@@ -63,7 +63,8 @@ contextBridge.exposeInMainWorld("api", {
     clearWebviewStorage: (webContentsId: number) => ipcRenderer.invoke("clear-webview-storage", webContentsId),
     setWaveAIOpen: (isOpen: boolean) => ipcRenderer.send("set-waveai-open", isOpen),
     closeBuilderWindow: () => ipcRenderer.send("close-builder-window"),
-    incrementTermCommands: () => ipcRenderer.send("increment-term-commands"),
+    incrementTermCommands: (opts?: { isRemote?: boolean; isWsl?: boolean; isDurable?: boolean }) =>
+        ipcRenderer.send("increment-term-commands", opts),
     nativePaste: () => ipcRenderer.send("native-paste"),
     openBuilder: (appId?: string) => ipcRenderer.send("open-builder", appId),
     setBuilderWindowAppId: (appId: string) => ipcRenderer.send("set-builder-window-appid", appId),