diff --git a/src/api/agents.js b/src/api/agents.js
index d8c2b662..8abf5478 100644
--- a/src/api/agents.js
+++ b/src/api/agents.js
@@ -396,3 +396,14 @@ export async function createRegistryValue(agentId, path, name, type, data) {
     throw e;
   }
 }
+
+export async function fetchAgentShell(agent_id) {
+  try {
+    const { data } = await axios.get(
+      `${baseUrl}/${agent_id}/terminal-defaults/`,
+    );
+    return data;
+  } catch (e) {
+    console.error(e);
+  }
+}
diff --git a/src/components/agents/remotebg/TerminalManager.vue b/src/components/agents/remotebg/TerminalManager.vue
new file mode 100644
index 00000000..c452ee36
--- /dev/null
+++ b/src/components/agents/remotebg/TerminalManager.vue
@@ -0,0 +1,528 @@
+<template>
+  <div class="full-page-terminal">
+    <div
+      v-if="shellOptions.length > 0"
+      class="row items-center q-px-lg q-py-xs bg-grey-9 text-white"
+    >
+      <div class="row items-center">
+        <div class="text-subtitle1 text-body2 q-mr-md">Shell:</div>
+        <q-option-group
+          dense
+          v-model="selectedShell"
+          :options="shellOptions"
+          type="radio"
+          inline
+          color="primary"
+          @update:model-value="onShellChange"
+          class="q-gutter-lg"
+        />
+
+        <q-btn
+          label="Edit Path"
+          color="primary"
+          @click="handleCustomEdit"
+          class="q-px-sm q-ml-lg q-pb-0 text-caption text-capitalize"
+          dense
+        />
+      </div>
+
+      <div v-if="isWindows" class="row items-center q-ml-lg">
+        <div class="text-subtitle1 text-body2 q-mr-md q-ml-md">Run as:</div>
+
+        <q-option-group
+          dense
+          v-model="runAsUser"
+          :options="runAsOptions"
+          type="radio"
+          inline
+          color="primary"
+          @update:model-value="onRunAsChange"
+          class="q-gutter-lg"
+        />
+      </div>
+    </div>
+
+    <div class="terminal-wrapper">
+      <div ref="xtermContainer" class="xterm-container"></div>
+      <q-inner-loading :showing="loading" color="primary" />
+    </div>
+  </div>
+  <q-dialog v-model="showCustomShellDialog" persistent>
+    <q-card style="min-width: 400px">
+      <q-card-section class="text-h6"> Enter Custom Shell Path </q-card-section>
+
+      <q-card-section>
+        <q-input
+          v-model="customShellInput"
+          label="Shell Path"
+          dense
+          autofocus
+        />
+      </q-card-section>
+
+      <q-card-actions align="right">
+        <q-btn flat label="Cancel" @click="cancelCustomShell" />
+        <q-btn color="primary" label="Start" @click="startCustomShell" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script setup lang="ts">
+import {
+  ref,
+  onMounted,
+  onBeforeUnmount,
+  watch,
+  Ref,
+  computed,
+  type WatchStopHandle,
+} from "vue";
+import { Terminal } from "@xterm/xterm";
+import { FitAddon } from "@xterm/addon-fit";
+import { uid, useQuasar } from "quasar";
+import { useResizeObserver, useDebounceFn } from "@vueuse/core";
+import { useTerminalWSConnection } from "@/websocket/websocket";
+import { fetchAgentShell } from "@/api/agents";
+import "@xterm/xterm/css/xterm.css";
+
+interface TerminalWSMessage {
+  action?: string;
+  data?: {
+    output?: string;
+    done?: boolean;
+    messageId?: string;
+    error?: string;
+  };
+  message?: string;
+  error?: string;
+}
+
+interface ShellOption {
+  label: string;
+  value: string;
+  disable?: boolean;
+}
+
+const $q = useQuasar();
+const props = defineProps<{ agent_id: string; agentPlatform: string }>();
+
+const loading = ref(false);
+const customShellPath = ref<string | null>(null);
+const showCustomShellDialog = ref(false);
+const customShellInput = ref("");
+const invalidCustomShell = ref(false);
+const lastSelectedShell = ref<string>("");
+const pendingCustomShell = ref<string | null>(null);
+const runAsUser = ref(false);
+const isWindows = computed(() => props.agentPlatform === "windows");
+const runAsOptions = [
+  { label: "System", value: false },
+  { label: "User", value: true },
+];
+
+const shellOptions = computed<ShellOption[]>(() => {
+  const isWindows = props.agentPlatform === "windows";
+  const base: ShellOption[] = isWindows
+    ? [
+        { label: "CMD", value: "cmd" },
+        { label: "PowerShell", value: "powershell" },
+      ]
+    : [{ label: "Bash", value: "bash" }];
+
+  let customLabel = "Custom Shell";
+  if (loading.value && pendingCustomShell.value) {
+    customLabel = "Custom (Shell loading...)";
+  } else if (invalidCustomShell.value) {
+    customLabel = "Custom (Shell path doesn't exist)";
+  } else if (customShellPath.value) {
+    customLabel = `Custom (${customShellPath.value})`;
+  }
+
+  base.push({
+    label: customLabel,
+    value: "custom",
+  });
+
+  return base;
+});
+
+const selectedShell = ref<string>("");
+
+let term: Terminal | null = null;
+const fit = new FitAddon();
+
+let inputDisposable: { dispose: () => void } | null = null;
+let stopResizeObserver: (() => void) | null = null;
+let stopWSDataWatch: WatchStopHandle | null = null;
+let wsReadyInterval: ReturnType<typeof setInterval> | null = null;
+
+let startRequested = false;
+let started = false;
+
+let activeSessionId: string | null = null;
+
+let wsData!: Ref<TerminalWSMessage | null>;
+let wsSend!: (msg: string) => void;
+let wsClose!: () => void;
+let wsStatus!: Ref<string>;
+
+const xtermContainer = ref<HTMLElement | null>(null);
+
+function waitForLayout(): Promise<void> {
+  return new Promise((resolve) => {
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => resolve());
+    });
+  });
+}
+
+function clearWSReadyInterval() {
+  if (wsReadyInterval) {
+    clearInterval(wsReadyInterval);
+    wsReadyInterval = null;
+  }
+}
+
+function cleanupCurrentSession({
+  sendKill = true,
+}: { sendKill?: boolean } = {}) {
+  clearWSReadyInterval();
+
+  stopWSDataWatch?.();
+  stopWSDataWatch = null;
+
+  inputDisposable?.dispose();
+  inputDisposable = null;
+
+  startRequested = false;
+  started = false;
+
+  if (sendKill) {
+    try {
+      wsSend?.(JSON.stringify({ action: "kill" }));
+    } catch {}
+  }
+
+  try {
+    wsClose?.();
+  } catch {}
+
+  activeSessionId = null;
+}
+
+function markSessionReadyAndResize() {
+  if (!term || !startRequested || started) return;
+
+  started = true;
+  loading.value = false;
+
+  if (pendingCustomShell.value) {
+    customShellPath.value = pendingCustomShell.value;
+    selectedShell.value = "custom";
+    showCustomShellDialog.value = false;
+    pendingCustomShell.value = null;
+    invalidCustomShell.value = false;
+  }
+
+  void waitForLayout().then(() => {
+    if (!term || !started) return;
+    fit.fit();
+    wsSend(
+      JSON.stringify({
+        action: "resize",
+        rows: term.rows,
+        cols: term.cols,
+      }),
+    );
+  });
+}
+
+function initWS(shell: string) {
+  cleanupCurrentSession();
+
+  const sessionId = uid();
+  activeSessionId = sessionId;
+
+  ({
+    data: wsData,
+    send: wsSend,
+    close: wsClose,
+    status: wsStatus,
+  } = useTerminalWSConnection(props.agent_id, sessionId) as {
+    data: Ref<TerminalWSMessage | null>;
+    send: (msg: string) => void;
+    close: () => void;
+    status: Ref<string>;
+  });
+
+  stopWSDataWatch = watch(wsData, (msg) => {
+    if (!msg || !term) return;
+    if (activeSessionId !== sessionId) return;
+
+    if (msg.action === "terminal_error") {
+      loading.value = false;
+      startRequested = false;
+      started = false;
+      invalidCustomShell.value = true;
+
+      $q.notify({
+        type: "negative",
+        message: msg.error || msg.data?.error || "Shell path doesn't exist",
+      });
+
+      showCustomShellDialog.value = true;
+      pendingCustomShell.value = null;
+      return;
+    }
+
+    if (msg.action === "terminal_info") {
+      runAsUser.value = false;
+      $q.notify({
+        type: "warning",
+        message: msg.message || "Run as user was not available..",
+      });
+
+      return;
+    }
+
+    if (msg.data?.output) {
+      term.write(msg.data.output);
+
+      if (!started) {
+        markSessionReadyAndResize();
+      }
+    }
+
+    if (msg.data?.done) {
+      started = false;
+      startRequested = false;
+      loading.value = false;
+      term.write("\r\n[Session Ended]\r\n");
+    }
+  });
+
+  inputDisposable = term!.onData((d) => {
+    if (!started) return;
+    if (activeSessionId !== sessionId) return;
+
+    wsSend(JSON.stringify({ action: "input", data: d }));
+  });
+
+  wsReadyInterval = setInterval(async () => {
+    if (activeSessionId !== sessionId) {
+      clearWSReadyInterval();
+      return;
+    }
+
+    if (wsStatus.value === "OPEN" && term) {
+      clearWSReadyInterval();
+
+      await waitForLayout();
+      if (!term || activeSessionId !== sessionId) return;
+
+      fit.fit();
+
+      startRequested = true;
+      started = false;
+      loading.value = true;
+
+      wsSend(
+        JSON.stringify({
+          action: "start",
+          shell,
+          run_as_user: isWindows.value ? runAsUser.value : false,
+        }),
+      );
+    }
+  }, 50);
+}
+
+function handleCustomEdit() {
+  showCustomShellDialog.value = true;
+  customShellInput.value = customShellPath.value || "";
+}
+
+async function onShellChange(newShell: string) {
+  if (!term) return;
+
+  if (newShell === "custom") {
+    if (selectedShell.value !== "custom") {
+      lastSelectedShell.value = selectedShell.value;
+    }
+
+    if (!customShellPath.value || invalidCustomShell.value) {
+      showCustomShellDialog.value = true;
+      customShellInput.value = "";
+      return;
+    }
+
+    newShell = customShellPath.value;
+  }
+
+  loading.value = true;
+  startRequested = false;
+  started = false;
+  term.reset();
+  fit.fit();
+  initWS(newShell);
+}
+
+function startCustomShell() {
+  if (!customShellInput.value || !term) return;
+
+  loading.value = true;
+  startRequested = false;
+  started = false;
+  invalidCustomShell.value = false;
+  pendingCustomShell.value = customShellInput.value;
+
+  term.reset();
+  fit.fit();
+  initWS(customShellInput.value);
+}
+
+async function setupXTerm() {
+  term = new Terminal({
+    convertEol: true,
+    fontFamily: "Menlo, Monaco, 'Courier New', monospace",
+    fontSize: 14,
+    fontWeight: 400,
+    cursorBlink: true,
+    theme: { background: "#333" },
+  });
+
+  term.loadAddon(fit);
+  term.open(xtermContainer.value!);
+  fit.fit();
+}
+
+const resizeWindow = useDebounceFn(async () => {
+  if (!term || !started) return;
+
+  await waitForLayout();
+  if (!term || !started) return;
+
+  fit.fit();
+  wsSend(
+    JSON.stringify({
+      action: "resize",
+      rows: term.rows,
+      cols: term.cols,
+    }),
+  );
+}, 200);
+
+function disconnect() {
+  clearWSReadyInterval();
+
+  stopResizeObserver?.();
+  stopResizeObserver = null;
+
+  cleanupCurrentSession();
+
+  term?.dispose();
+  term = null;
+}
+
+function cancelCustomShell() {
+  showCustomShellDialog.value = false;
+  selectedShell.value = lastSelectedShell.value;
+  loading.value = true;
+  startRequested = false;
+  started = false;
+  term?.reset();
+  fit.fit();
+  initWS(lastSelectedShell.value);
+}
+
+const BUILT_IN_SHELLS = ["cmd", "powershell", "bash"] as const;
+type BuiltInShell = (typeof BUILT_IN_SHELLS)[number];
+
+const isBuiltInShell = (shell: string): shell is BuiltInShell => {
+  return (BUILT_IN_SHELLS as readonly string[]).includes(shell);
+};
+
+onMounted(async () => {
+  await setupXTerm();
+
+  const { stop } = useResizeObserver(xtermContainer, resizeWindow);
+  stopResizeObserver = stop;
+
+  const data = await fetchAgentShell(props.agent_id);
+  if (data) {
+    const { resolved_default_shell, effective_default_shell } = data;
+    const isWindows = props.agentPlatform === "windows";
+
+    if (resolved_default_shell === "custom") {
+      if (isBuiltInShell(effective_default_shell)) {
+        selectedShell.value = effective_default_shell;
+        lastSelectedShell.value = effective_default_shell;
+        customShellPath.value = null;
+        invalidCustomShell.value = true;
+      } else {
+        customShellPath.value = effective_default_shell;
+        selectedShell.value = "custom";
+        lastSelectedShell.value = isWindows ? "cmd" : "bash";
+        invalidCustomShell.value = false;
+      }
+    } else {
+      selectedShell.value = effective_default_shell;
+      lastSelectedShell.value = effective_default_shell;
+      invalidCustomShell.value = false;
+      customShellPath.value = null;
+    }
+  }
+
+  const shellToStart =
+    selectedShell.value === "custom"
+      ? customShellPath.value!
+      : selectedShell.value;
+
+  initWS(shellToStart);
+});
+
+async function onRunAsChange() {
+  if (!term) return;
+
+  loading.value = true;
+  startRequested = false;
+  started = false;
+
+  term.write("\r\n[Restarting terminal with new mode...]\r\n");
+  term.reset();
+  fit.fit();
+
+  const shellToStart =
+    selectedShell.value === "custom"
+      ? customShellPath.value!
+      : selectedShell.value;
+
+  initWS(shellToStart);
+}
+
+onBeforeUnmount(() => {
+  disconnect();
+});
+</script>
+
+<style scoped>
+.full-page-terminal {
+  height: calc(100vh - 36px);
+  display: flex;
+  flex-direction: column;
+  background: #333333;
+}
+.terminal-wrapper {
+  position: relative;
+  flex-grow: 1;
+  display: flex;
+  min-height: 0;
+  padding: 10px 6px 4px;
+}
+.xterm-container {
+  flex-grow: 1;
+  overflow: hidden;
+  height: 100%;
+}
+</style>
diff --git a/src/components/modals/agents/EditAgent.vue b/src/components/modals/agents/EditAgent.vue
index db0b210d..e3b23c68 100644
--- a/src/components/modals/agents/EditAgent.vue
+++ b/src/components/modals/agents/EditAgent.vue
@@ -73,6 +73,28 @@
                       class="col-8"
                     />
                   </q-card-section>
+                  <q-card-section class="row items-start content-between">
+                    <div class="col-4">Default Terminal</div>
+                    <div class="col-8">
+                      <q-option-group
+                        v-if="agent && agent.plat"
+                        class="q-gutter-lg"
+                        v-model="agent.default_shell"
+                        :options="defaultShellOptions"
+                        type="radio"
+                        inline
+                        dense
+                      />
+                      <q-input
+                        v-if="agent.default_shell === 'custom'"
+                        v-model="agent.default_shell_custom"
+                        class="q-mt-md"
+                        dense
+                        outlined
+                        placeholder="Enter custom shell path"
+                      />
+                    </div>
+                  </q-card-section>
                   <q-card-section class="row">
                     <div class="col-10">Run checks every:</div>
                     <q-input
@@ -557,7 +579,36 @@ export default {
   },
   computed: {
     ...mapState(["dash_warning_color", "dash_negative_color"]),
+    defaultShellOptions() {
+      if (!this.agent?.plat) return [];
+      if (this.agent.plat === "windows") {
+        return [
+          { label: "Global", value: "use_global" },
+          { label: "CMD", value: "cmd" },
+          { label: "PowerShell", value: "powershell" },
+          { label: "Custom", value: "custom" },
+        ];
+      }
+
+      if (this.agent.plat === "linux") {
+        return [
+          { label: "Global", value: "use_global" },
+          { label: "Bash", value: "bash" },
+          { label: "Custom", value: "custom" },
+        ];
+      }
+
+      if (this.agent.plat === "darwin") {
+        return [
+          { label: "Global", value: "use_global" },
+          { label: "Bash", value: "bash" },
+          { label: "Custom", value: "custom" },
+        ];
+      }
+      return [];
+    },
   },
+
   mounted() {
     // Get custom fields
     this.getCustomFields("agent").then((r) => {
diff --git a/src/components/modals/coresettings/EditCoreSettings.vue b/src/components/modals/coresettings/EditCoreSettings.vue
index b6272d06..e8470395 100644
--- a/src/components/modals/coresettings/EditCoreSettings.vue
+++ b/src/components/modals/coresettings/EditCoreSettings.vue
@@ -220,6 +220,82 @@
                     :rules="[(val) => val >= 0 || 'Minimum is 0']"
                   />
                 </q-card-section>
+                <q-card-section class="row items-start content-between">
+                  <div class="col-6">Terminal Experience</div>
+                  <div class="col-6">
+                    <q-option-group
+                      class="q-gutter-lg"
+                      v-model="settings.terminal_mode"
+                      :options="terminalModeOptions"
+                      type="radio"
+                      inline
+                      dense
+                    />
+                  </div>
+                </q-card-section>
+                <q-card-section class="row items-start content-between">
+                  <div class="col-6">Windows Default Terminal</div>
+                  <div class="col-6">
+                    <q-option-group
+                      class="q-gutter-lg"
+                      v-model="settings.default_shell_windows"
+                      :options="windowsShellOptions"
+                      type="radio"
+                      inline
+                      dense
+                    />
+                    <q-input
+                      v-if="settings.default_shell_windows === 'custom'"
+                      v-model="settings.default_shell_windows_custom"
+                      class="q-mt-md"
+                      dense
+                      outlined
+                      placeholder="Enter custom shell path (e.g. C:\Windows\System32\cmd.exe)"
+                    />
+                  </div>
+                </q-card-section>
+                <q-card-section class="row items-start content-between">
+                  <div class="col-6">Linux Default Terminal</div>
+                  <div class="col-6">
+                    <q-option-group
+                      class="q-gutter-lg"
+                      v-model="settings.default_shell_linux"
+                      :options="linuxShellOptions"
+                      type="radio"
+                      inline
+                      dense
+                    />
+                    <q-input
+                      v-if="settings.default_shell_linux === 'custom'"
+                      v-model="settings.default_shell_linux_custom"
+                      class="q-mt-md"
+                      dense
+                      outlined
+                      placeholder="Enter custom shell path (e.g. /usr/bin/fish)"
+                    />
+                  </div>
+                </q-card-section>
+                <q-card-section class="row items-start content-between">
+                  <div class="col-6">Mac Default Terminal</div>
+                  <div class="col-6">
+                    <q-option-group
+                      class="q-gutter-lg"
+                      v-model="settings.default_shell_darwin"
+                      :options="darwinShellOptions"
+                      type="radio"
+                      inline
+                      dense
+                    />
+                    <q-input
+                      v-if="settings.default_shell_darwin === 'custom'"
+                      v-model="settings.default_shell_darwin_custom"
+                      class="q-mt-md"
+                      dense
+                      outlined
+                      placeholder="Enter custom shell path (e.g. /bin/zsh)"
+                    />
+                  </div>
+                </q-card-section>
                 <q-card-section class="row">
                   <div class="col-4">Reset Patch Policy on Agents:</div>
                   <div class="col-2"></div>
@@ -797,6 +873,31 @@ export default {
     hosted() {
       return this.$store.state.hosted;
     },
+    terminalModeOptions() {
+      return [
+        { label: "Use new terminal", value: "new" },
+        { label: "Use legacy terminal", value: "legacy" },
+      ];
+    },
+    windowsShellOptions() {
+      return [
+        { label: "CMD", value: "cmd" },
+        { label: "PowerShell", value: "powershell" },
+        { label: "Custom", value: "custom" },
+      ];
+    },
+    linuxShellOptions() {
+      return [
+        { label: "Bash", value: "bash" },
+        { label: "Custom", value: "custom" },
+      ];
+    },
+    darwinShellOptions() {
+      return [
+        { label: "Bash", value: "bash" },
+        { label: "Custom", value: "custom" },
+      ];
+    },
   },
   watch: {
     tab(newTab, oldTab) {
diff --git a/src/css/app.sass b/src/css/app.sass
index 2280f2ae..1065095e 100644
--- a/src/css/app.sass
+++ b/src/css/app.sass
@@ -1 +1,26 @@
 // app global css in Sass form
+
+.xterm .xterm-viewport
+  scrollbar-width: thin
+  scrollbar-color: rgba(255, 255, 255, 0.35) transparent
+
+.xterm .xterm-viewport::-webkit-scrollbar-track
+  background: transparent
+
+.xterm .xterm-viewport::-webkit-scrollbar-thumb
+  background-color: rgba(255, 255, 255, 0.35)
+  border-radius: 8px
+  border: 2px solid transparent
+  background-clip: content-box
+
+.xterm .xterm-viewport::-webkit-scrollbar-thumb:hover
+  background-color: rgba(255, 255, 255, 0.6)
+
+.xterm .xterm-viewport::-webkit-scrollbar-thumb
+  opacity: 0
+  transition: opacity 0.2s ease
+
+.xterm .xterm-viewport::-webkit-scrollbar-button
+  display: none
+  width: 0
+  height: 0
\ No newline at end of file
diff --git a/src/views/RemoteBackground.vue b/src/views/RemoteBackground.vue
index 8b5db9f6..72c8421a 100644
--- a/src/views/RemoteBackground.vue
+++ b/src/views/RemoteBackground.vue
@@ -39,7 +39,13 @@
     <q-separator />
     <q-tab-panels v-model="tab">
       <q-tab-panel name="terminal" class="q-pa-none">
+        <TerminalManager
+          v-if="terminalMode === 'new'"
+          :agent_id="agent_id"
+          :agentPlatform="$route.query.agentPlatform"
+        />
         <iframe
+          v-else
           allow="clipboard-read; clipboard-write"
           :src="terminal"
           :style="{
@@ -98,7 +104,7 @@ import { ref, computed, onMounted } from "vue";
 import { useRoute } from "vue-router";
 import { useQuasar, useMeta } from "quasar";
 import { fetchAgentMeshCentralURLs } from "@/api/agents";
-import { fetchDashboardInfo } from "@/api/core";
+import { fetchCoreSettings, fetchDashboardInfo } from "@/api/core";
 
 // ui imports
 import ProcessManager from "@/components/agents/remotebg/ProcessManager.vue";
@@ -106,6 +112,7 @@ import ServicesManager from "@/components/agents/remotebg/ServicesManager.vue";
 import EventLogManager from "@/components/agents/remotebg/EventLogManager.vue";
 import RegistryManager from "@/components/agents/remotebg/RegistryManager.vue";
 import registryIcon from "../assets/windows-registry.png";
+import TerminalManager from "@/components/agents/remotebg/TerminalManager.vue";
 
 export default {
   name: "RemoteBackground",
@@ -114,6 +121,7 @@ export default {
     EventLogManager,
     ProcessManager,
     RegistryManager,
+    TerminalManager,
   },
   setup() {
     // setup quasar
@@ -126,6 +134,7 @@ export default {
     const terminal = ref("");
     const file = ref("");
     const tab = ref("terminal");
+    const terminalMode = ref("legacy");
 
     const agent_id = computed(() => params.agent_id);
 
@@ -144,10 +153,17 @@ export default {
       $q.loadingBar.setDefaults({ size: "0px" });
     }
 
+    async function getCoreSettings() {
+      const settingsData = await fetchCoreSettings();
+      terminalMode.value =
+        settingsData?.terminal_mode === "new" ? "new" : "legacy";
+    }
+
     // vue lifecycle hooks
     onMounted(() => {
       getDashInfo();
       getMeshURLs();
+      getCoreSettings();
     });
 
     return {
@@ -157,6 +173,7 @@ export default {
       tab,
       agent_id,
       registryIcon,
+      terminalMode,
     };
   },
 };
diff --git a/src/websocket/websocket.ts b/src/websocket/websocket.ts
index 8f89e3fb..3071f91d 100644
--- a/src/websocket/websocket.ts
+++ b/src/websocket/websocket.ts
@@ -16,6 +16,7 @@ export function getWSUrl(path: string, token: string | null) {
 interface WSReturn {
   action: string;
   data: unknown;
+  error?: string;
 }
 
 let WSConnection: UseWebSocketReturn<string> | undefined = undefined;
@@ -79,3 +80,35 @@ export function useCliWSConnection() {
     close: closeConnection,
   };
 }
+
+export function useTerminalWSConnection(agentId: string, sessionId: string) {
+  const auth = useAuthStore();
+
+  const path = `agent/${agentId}/terminal/${sessionId}`;
+  const url = getWSUrl(path, auth.token);
+
+  const connection = useWebSocket(url);
+  const { status, data, send, open, close } = connection;
+  const parsedData = ref<WSReturn>({ action: "", data: {} });
+  watch(data, (newValue) => {
+    if (!newValue) return;
+
+    try {
+      parsedData.value = JSON.parse(newValue);
+    } catch {
+      parsedData.value = {
+        action: "",
+        data: {},
+        error: "Invalid websocket payload",
+      };
+    }
+  });
+
+  return {
+    status,
+    data: parsedData,
+    send,
+    open,
+    close,
+  };
+}