Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

build: ship thinkterm-plugin-server with the desktop packages

RoversX2a246b4228d6
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e32d96aa..3dabc639 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -312,6 +312,7 @@ jobs:
-p wezterm \
-p wezterm-gui \
-p wezterm-mux-server \
+ -p thinkterm-plugin-server \
-p strip-ansi-escapes
- name: Fetch the browser bundle
@@ -419,7 +420,7 @@ jobs:
shell: cmd
run: |
PATH C:\Strawberry\perl\bin;%PATH%
- cargo build --profile %CARGO_PROFILE% -p wezterm -p wezterm-gui -p wezterm-mux-server -p strip-ansi-escapes
+ cargo build --profile %CARGO_PROFILE% -p wezterm -p wezterm-gui -p wezterm-mux-server -p thinkterm-plugin-server -p strip-ansi-escapes
- name: Fetch the browser bundle
uses: actions/download-artifact@v8
@@ -547,6 +548,7 @@ jobs:
-p wezterm \
-p wezterm-gui \
-p wezterm-mux-server \
+ -p thinkterm-plugin-server \
-p strip-ansi-escapes
- name: Fetch the browser bundle
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b4cbd5e1..789ca5c2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -77,13 +77,15 @@ $ ./get-deps
$ cargo build --release
```
-That produces three binaries, whose names do not match their crate directories:
+That produces four binaries, three of whose names do not match their crate
+directories:
| Binary | Crate | What it is |
| --- | --- | --- |
| `thinkterm-gui` | `wezterm-gui/` | The terminal itself |
| `thinkterm-mux-server` | `wezterm-mux-server/` | The multiplexer server |
| `thinkterm` | `wezterm/` | The CLI |
+| `thinkterm-plugin-server` | `thinkterm-plugin-server/` | Runs the plugins (Snippets so far) apart from the mux; started when first needed |
`wezterm/` also builds a `wezterm` binary. That is a deliberate compatibility
shim, not a leftover — the environment variables ThinkTerm sets promise that a
@@ -98,6 +100,7 @@ shim, not a leftover — the environment variables ThinkTerm sets promise that a
| `wezterm-gui/` | The GUI. Rendering, windowing, and most ThinkTerm-specific UI. |
| `mux/` | The multiplexer model: panes, tabs, windows, domains. |
| `codec/` | The mux wire protocol. |
+| `thinkterm-plugin-channel/` | How clients reach the plugin host; the mux carries a browser's frames there unread. |
| `thinkterm-proto/` | Pure data types shared by the protocol. |
| `thinkterm-core/`, `thinkterm-tui/`, `thinkterm-syntax/` | ThinkTerm's own crates. |
| `wezterm-client/` | The mux client used by the GUI and the TUI. |
diff --git a/assets/flatpak/com.roversx.thinkterm.json b/assets/flatpak/com.roversx.thinkterm.json
index c55beb71..7c0e1ec7 100644
--- a/assets/flatpak/com.roversx.thinkterm.json
+++ b/assets/flatpak/com.roversx.thinkterm.json
@@ -44,6 +44,7 @@
"install -Dm755 ./target/release/wezterm -t /app/bin/",
"install -Dm755 ./target/release/thinkterm-gui -t /app/bin/",
"install -Dm755 ./target/release/thinkterm-mux-server -t /app/bin/",
+ "install -Dm755 ./target/release/thinkterm-plugin-server -t /app/bin/",
"install -Dm755 ./target/release/strip-ansi-escapes -t /app/bin/",
"install -Dm644 assets/shell-integration/* -t /app/extra/export/share/etc/profile.d",
"install -Dm644 assets/shell-completion/zsh /app/extra/export/share/zsh/site-functions/_thinkterm",
diff --git a/assets/flatpak/com.roversx.thinkterm.template.json b/assets/flatpak/com.roversx.thinkterm.template.json
index f47cfe7f..4707dade 100644
--- a/assets/flatpak/com.roversx.thinkterm.template.json
+++ b/assets/flatpak/com.roversx.thinkterm.template.json
@@ -39,6 +39,7 @@
"install -Dm755 ./target/release/wezterm -t /app/bin/",
"install -Dm755 ./target/release/thinkterm-gui -t /app/bin/",
"install -Dm755 ./target/release/thinkterm-mux-server -t /app/bin/",
+ "install -Dm755 ./target/release/thinkterm-plugin-server -t /app/bin/",
"install -Dm755 ./target/release/strip-ansi-escapes -t /app/bin/",
"install -Dm644 assets/shell-integration/* -t /app/extra/export/share/etc/profile.d",
"install -Dm644 assets/shell-completion/zsh /app/extra/export/share/zsh/site-functions/_thinkterm",
diff --git a/ci/PKGBUILD.template b/ci/PKGBUILD.template
index 41c1bb88..9b21ed0b 100644
--- a/ci/PKGBUILD.template
+++ b/ci/PKGBUILD.template
@@ -52,6 +52,7 @@ package() {
install -Dm755 squashfs-root/usr/bin/wezterm -t "${pkgdir}/usr/bin/"
install -Dm755 squashfs-root/usr/bin/thinkterm-gui -t "${pkgdir}/usr/bin/"
install -Dm755 squashfs-root/usr/bin/thinkterm-mux-server -t "${pkgdir}/usr/bin/"
+ install -Dm755 squashfs-root/usr/bin/thinkterm-plugin-server -t "${pkgdir}/usr/bin/"
install -Dm644 squashfs-root/usr/share/doc/thinkterm/LICENSE.md \
squashfs-root/usr/share/doc/thinkterm/LICENSE-MIT \
squashfs-root/usr/share/doc/thinkterm/NOTICE \
diff --git a/ci/appimage.sh b/ci/appimage.sh
index dd856cbf..30ea3e25 100755
--- a/ci/appimage.sh
+++ b/ci/appimage.sh
@@ -11,6 +11,7 @@ install -Dsm755 -t AppDir/usr/bin target/$PROFILE/thinkterm-mux-server
install -Dsm755 -t AppDir/usr/bin target/$PROFILE/thinkterm
install -Dsm755 -t AppDir/usr/bin target/$PROFILE/wezterm
install -Dsm755 -t AppDir/usr/bin target/$PROFILE/thinkterm-gui
+install -Dsm755 -t AppDir/usr/bin target/$PROFILE/thinkterm-plugin-server
install -Dsm755 -t AppDir/usr/bin target/$PROFILE/strip-ansi-escapes
install -Dm644 assets/icon/terminal.png AppDir/usr/share/icons/hicolor/128x128/apps/com.roversx.thinkterm.png
install -Dm644 assets/wezterm.desktop AppDir/usr/share/applications/com.roversx.thinkterm.desktop
diff --git a/ci/deploy.sh b/ci/deploy.sh
index dc7260b2..c1fb8475 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -100,7 +100,7 @@ case $OSTYPE in
esac
fi
- for bin in wezterm thinkterm thinkterm-mux-server thinkterm-gui strip-ansi-escapes ; do
+ for bin in wezterm thinkterm thinkterm-mux-server thinkterm-gui thinkterm-plugin-server strip-ansi-escapes ; do
if [[ -n "$macos_bin_dir" ]] ; then
cp $macos_bin_dir/$bin $zipdir/ThinkTerm.app/Contents/MacOS/$bin
# If the user ran a simple `cargo build --release`, then we want to allow
@@ -122,7 +122,7 @@ case $OSTYPE in
# report's addresses can be resolved against the matching build.
symdir="$zipdir-dSYM"
rm -rf "$symdir" "$symdir.zip"
- for bin in wezterm thinkterm thinkterm-mux-server thinkterm-gui strip-ansi-escapes ; do
+ for bin in wezterm thinkterm thinkterm-mux-server thinkterm-gui thinkterm-plugin-server strip-ansi-escapes ; do
dsym="${macos_bin_dir:-$TARGET_DIR/$PROFILE}/$bin.dSYM"
if [[ -d "$dsym" ]] ; then
mkdir -p "$symdir"
@@ -237,6 +237,7 @@ case $OSTYPE in
"$artifact_dir/wezterm.exe" \
"$artifact_dir/thinkterm-mux-server.exe" \
"$artifact_dir/thinkterm-gui.exe" \
+ "$artifact_dir/thinkterm-plugin-server.exe" \
"$artifact_dir/strip-ansi-escapes.exe" \
assets/windows/conhost/conpty.dll \
assets/windows/conhost/OpenConsole.exe \
@@ -307,7 +308,7 @@ source ~/.cargo/env
cargo build --profile ${PROFILE} \
-p wezterm-gui -p wezterm -p wezterm-mux-server \
- -p strip-ansi-escapes
+ -p thinkterm-plugin-server -p strip-ansi-escapes
BUILDEOFEOF
)
BUILD_REQUIRES=$(cat <<BREQEOF
@@ -388,6 +389,7 @@ install -Dm755 assets/open-thinkterm-here assets/open-wezterm-here -t %{buildroo
install -Dsm755 $TARGET_DIR/$PROFILE/thinkterm -t %{buildroot}/usr/bin
install -Dsm755 $TARGET_DIR/$PROFILE/wezterm -t %{buildroot}/usr/bin
install -Dsm755 $TARGET_DIR/$PROFILE/thinkterm-gui -t %{buildroot}/usr/bin
+install -Dsm755 $TARGET_DIR/$PROFILE/thinkterm-plugin-server -t %{buildroot}/usr/bin
install -Dsm755 $TARGET_DIR/$PROFILE/thinkterm-mux-server -t %{buildroot}/usr/bin
install -Dsm755 $TARGET_DIR/$PROFILE/strip-ansi-escapes -t %{buildroot}/usr/bin
install -Dm644 assets/shell-integration/* -t %{buildroot}/etc/profile.d
@@ -413,6 +415,7 @@ install -Dm644 LICENSE-MIT %{buildroot}/usr/share/licenses/thinkterm-server/LICE
/usr/bin/thinkterm
/usr/bin/wezterm
/usr/bin/thinkterm-gui
+/usr/bin/thinkterm-plugin-server
/usr/bin/thinkterm-mux-server
/usr/bin/strip-ansi-escapes
/usr/bin/open-thinkterm-here
@@ -553,6 +556,7 @@ EOF
install -Dsm755 -t $root/usr/bin $TARGET_DIR/$PROFILE/strip-ansi-escapes
if [[ "$variant" == desktop ]] ; then
install -Dsm755 -t $root/usr/bin $TARGET_DIR/$PROFILE/thinkterm-gui
+ install -Dsm755 -t $root/usr/bin $TARGET_DIR/$PROFILE/thinkterm-plugin-server
install -Dm755 -t $root/usr/bin assets/open-thinkterm-here assets/open-wezterm-here
install -Dm644 assets/icon/terminal.png $root/usr/share/icons/hicolor/128x128/apps/com.roversx.thinkterm.png
install -Dm644 assets/wezterm.desktop $root/usr/share/applications/com.roversx.thinkterm.desktop
@@ -656,6 +660,7 @@ EOF
$TARGET_DIR/$PROFILE/wezterm \
$TARGET_DIR/$PROFILE/thinkterm-mux-server \
$TARGET_DIR/$PROFILE/thinkterm-gui \
+ $TARGET_DIR/$PROFILE/thinkterm-plugin-server \
$TARGET_DIR/$PROFILE/strip-ansi-escapes
linux_tarball thinkterm-server \
$TARGET_DIR/$PROFILE/thinkterm \
@@ -688,6 +693,7 @@ source="
$TARGET_DIR/$PROFILE/wezterm
$TARGET_DIR/$PROFILE/thinkterm-gui
$TARGET_DIR/$PROFILE/thinkterm-mux-server
+ $TARGET_DIR/$PROFILE/thinkterm-plugin-server
assets/open-thinkterm-here
assets/open-wezterm-here
assets/wezterm.desktop
@@ -712,6 +718,7 @@ package() {
install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/wezterm
install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/thinkterm-gui
install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/thinkterm-mux-server
+ install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/thinkterm-plugin-server
install -Dm644 "\$srcdir"/wezterm.desktop "\$pkgdir"/usr/share/applications/com.roversx.thinkterm.desktop
install -Dm644 "\$srcdir"/wezterm.appdata.xml "\$pkgdir"/usr/share/metainfo/com.roversx.thinkterm.appdata.xml
diff --git a/ci/macos-package.sh b/ci/macos-package.sh
index e21c0354..8eebf879 100755
--- a/ci/macos-package.sh
+++ b/ci/macos-package.sh
@@ -302,7 +302,7 @@ EOT
echo " notarization credentials: profile '$NOTARY_PROFILE' works"
fi
-BINARIES="wezterm thinkterm thinkterm-mux-server thinkterm-gui strip-ansi-escapes"
+BINARIES="wezterm thinkterm thinkterm-mux-server thinkterm-gui thinkterm-plugin-server strip-ansi-escapes"
if [[ "$BUILD" == yes ]]; then
if ! rustup target list --installed 2>/dev/null | grep -qx "$RUST_TARGET"; then
@@ -314,13 +314,14 @@ if [[ "$BUILD" == yes ]]; then
echo
echo "==> Building for $ARCH ($PROFILE profile)"
- # The same four packages the release workflow builds, which between them
- # produce all five binaries the bundle carries. Building the whole
+ # The same five packages the release workflow builds, which between them
+ # produce all six binaries the bundle carries. Building the whole
# workspace instead would compile crates no package ships.
cargo build --profile "$PROFILE" --target "$RUST_TARGET" \
-p wezterm \
-p wezterm-gui \
-p wezterm-mux-server \
+ -p thinkterm-plugin-server \
-p strip-ansi-escapes
echo
echo "==> Building the browser client"
diff --git a/ci/windows-installer.iss b/ci/windows-installer.iss
index 083dab43..6e921247 100644
--- a/ci/windows-installer.iss
+++ b/ci/windows-installer.iss
@@ -50,6 +50,7 @@ Source: "{#MyAppSourceDir}\thinkterm.exe"; DestDir: "{app}"; Flags: ignoreversio
Source: "{#MyAppSourceDir}\wezterm.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MyAppSourceDir}\thinkterm-gui.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MyAppSourceDir}\thinkterm-mux-server.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppSourceDir}\thinkterm-plugin-server.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MyAppSourceDir}\mesa\opengl32.dll"; DestDir: "{app}\mesa"; Flags: ignoreversion
Source: "{#MyAppSourceDir}\libEGL.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MyAppSourceDir}\libGLESv2.dll"; DestDir: "{app}"; Flags: ignoreversion