From 2f42f1cd55610e94565bf924f6c3035477d2d311 Mon Sep 17 00:00:00 2001 From: LukeGus Date: Tue, 10 Nov 2026 15:07:53 +0000 Subject: [PATCH 1/3] chore: pull sponsor logos from the docs site --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 3aba472..11bac70 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,10 @@ For a paid sponsor spot, email [mail@termix.site](mailto:mail@termix.site). Hetzner +    + + Ember Swan + From e26564083151b739e7d9bbe933b15c5f458f16c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2026 17:34:26 +0000 Subject: [PATCH 2/3] chore: update the demo video link --- README.md | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 11bac70..f359e21 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ -Watch the demo on YouTube +Watch the demo on YouTube diff --git a/manifest.json b/manifest.json index 00f4ef2..07b8845 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "license": "Apache-2.0", "repository": "https://github.com/Termix-SSH/Plugin-SSH-Terminal", "docs": "https://docs.termix.site/plugins/ssh-terminal", - "video": "https://www.youtube.com/watch?v=htdU7pw1fiw", + "video": "https://www.youtube.com/watch?v=A8mSVayxS7o", "category": "Terminal", "icon": "SquareTerminal", "features": [ From 312cccef2c270de490a44bada2564562d2f5295b Mon Sep 17 00:00:00 2001 From: Li-Lee <4946929+Li-Lee@users.noreply.github.com> Date: Tue, 10 Nov 2026 15:02:17 -0500 Subject: [PATCH 3/3] fix: open the requested tmux session instead of the session picker A terminal tab opened for a named tmux session passed it only as a command to type after login. With Auto tmux on and more than one session on the host, the backend sends the session list for the picker and never types that command, so the requested session was dropped. The tab now also asks for a direct attach (tmuxAttachSession); the command stays as the fallback for a backend without the tmux service. Co-Authored-By: Claude Fable 5.2 --- src/frontend/terminal/TerminalApp.tsx | 3 +++ src/frontend/terminal/TerminalTabContent.tsx | 9 ++++++++ tests/frontend/terminal/TerminalApp.test.tsx | 23 +++++++++++++++++-- .../terminal/TerminalTabContent.test.tsx | 11 +++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/frontend/terminal/TerminalApp.tsx b/src/frontend/terminal/TerminalApp.tsx index 79840f8..af150e6 100644 --- a/src/frontend/terminal/TerminalApp.tsx +++ b/src/frontend/terminal/TerminalApp.tsx @@ -55,6 +55,9 @@ const TerminalApp: React.FC = ({ hostId, tmuxSession }) => { executeCommand={ tmuxSession ? tmuxAttachCommand(tmuxSession) : undefined } + // Direct attach, so Auto tmux does not show the session picker + // instead; executeCommand is the fallback (see TerminalTabContent). + tmuxAttachSession={tmuxSession || undefined} tmuxSession={tmuxSession || undefined} /> diff --git a/src/frontend/terminal/TerminalTabContent.tsx b/src/frontend/terminal/TerminalTabContent.tsx index 346a378..fc3d164 100644 --- a/src/frontend/terminal/TerminalTabContent.tsx +++ b/src/frontend/terminal/TerminalTabContent.tsx @@ -127,6 +127,15 @@ export function TerminalTabContent({ ? tmuxAttachCommand(tab.data.tmuxSession) : undefined } + // Ask the backend for a direct attach as well. With Auto tmux on + // and several sessions on the host it would otherwise show the + // session picker and never run executeCommand, which stays as + // the fallback for a backend without the tmux service. + tmuxAttachSession={ + typeof tab.data?.tmuxSession === "string" + ? tab.data.tmuxSession || undefined + : undefined + } tmuxSession={ typeof tab.data?.tmuxSession === "string" ? tab.data.tmuxSession || undefined diff --git a/tests/frontend/terminal/TerminalApp.test.tsx b/tests/frontend/terminal/TerminalApp.test.tsx index 29b801e..6218528 100644 --- a/tests/frontend/terminal/TerminalApp.test.tsx +++ b/tests/frontend/terminal/TerminalApp.test.tsx @@ -3,8 +3,11 @@ import { afterEach, describe, expect, it, vi } from "vitest"; import type { ReactNode } from "react"; import { useCommandHistory } from "../../../src/frontend/terminal/command-history/CommandHistoryContext"; +const captured = vi.hoisted(() => ({ props: [] as Record[] })); + vi.mock("../../../src/frontend/terminal/Terminal", () => ({ - Terminal: () => { + Terminal: (props: Record) => { + captured.props.push(props); useCommandHistory(); return
terminal
; }, @@ -25,11 +28,27 @@ vi.mock("@termix-ssh/plugin-sdk/frontend", () => ({ import TerminalApp from "../../../src/frontend/terminal/TerminalApp"; -afterEach(cleanup); +afterEach(() => { + cleanup(); + captured.props = []; +}); describe("TerminalApp", () => { it("renders the terminal inside a command history provider", () => { render(); expect(screen.getByText("terminal")).toBeTruthy(); }); + + it("asks for a direct attach to the tmux session it was opened for", () => { + render(); + expect(captured.props.at(-1)?.tmuxAttachSession).toBe("build"); + expect(captured.props.at(-1)?.executeCommand).toBe( + "tmux attach-session -t '=build'", + ); + }); + + it("asks for no tmux session when opened without one", () => { + render(); + expect(captured.props.at(-1)?.tmuxAttachSession).toBeUndefined(); + }); }); diff --git a/tests/frontend/terminal/TerminalTabContent.test.tsx b/tests/frontend/terminal/TerminalTabContent.test.tsx index 2407bf3..20ffec1 100644 --- a/tests/frontend/terminal/TerminalTabContent.test.tsx +++ b/tests/frontend/terminal/TerminalTabContent.test.tsx @@ -86,6 +86,17 @@ describe("TerminalTabContent in a split", () => { renderTab(undefined, { tmuxSession: 42 }); await waitFor(() => expect(captured.props.length).toBeGreaterThan(0)); expect(captured.props.at(-1)?.executeCommand).toBeUndefined(); + expect(captured.props.at(-1)?.tmuxAttachSession).toBeUndefined(); + }); + it("asks for a direct attach, so Auto tmux does not show the session picker instead", async () => { + renderTab(undefined, { tmuxSession: "agent's session" }); + await waitFor(() => expect(captured.props.length).toBeGreaterThan(0)); + expect(captured.props.at(-1)?.tmuxAttachSession).toBe("agent's session"); + }); + it("asks for no tmux session in an ordinary tab", async () => { + renderTab(undefined); + await waitFor(() => expect(captured.props.length).toBeGreaterThan(0)); + expect(captured.props.at(-1)?.tmuxAttachSession).toBeUndefined(); }); });