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.

Rename GUI and mux binaries to thinkterm-*

RoversX06ab0844401e
diff --git a/assets/flatpak/com.roversx.thinkterm.json b/assets/flatpak/com.roversx.thinkterm.json
index 7911bdf0..c55beb71 100644
--- a/assets/flatpak/com.roversx.thinkterm.json
+++ b/assets/flatpak/com.roversx.thinkterm.json
@@ -42,8 +42,8 @@
"cp ./assets/wezterm.desktop /app/share/applications/com.roversx.thinkterm.desktop",
"install -Dm755 ./target/release/thinkterm -t /app/bin/",
"install -Dm755 ./target/release/wezterm -t /app/bin/",
- "install -Dm755 ./target/release/wezterm-gui -t /app/bin/",
- "install -Dm755 ./target/release/wezterm-mux-server -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/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 8916784a..f47cfe7f 100644
--- a/assets/flatpak/com.roversx.thinkterm.template.json
+++ b/assets/flatpak/com.roversx.thinkterm.template.json
@@ -37,8 +37,8 @@
"install -Dm644 ./assets/wezterm.desktop /app/share/applications/com.roversx.thinkterm.desktop",
"install -Dm755 ./target/release/thinkterm -t /app/bin/",
"install -Dm755 ./target/release/wezterm -t /app/bin/",
- "install -Dm755 ./target/release/wezterm-gui -t /app/bin/",
- "install -Dm755 ./target/release/wezterm-mux-server -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/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/macos/ThinkTerm.app/Contents/Info.plist b/assets/macos/ThinkTerm.app/Contents/Info.plist
index 3ce441a3..e01c6d03 100644
--- a/assets/macos/ThinkTerm.app/Contents/Info.plist
+++ b/assets/macos/ThinkTerm.app/Contents/Info.plist
@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
- <string>wezterm-gui</string>
+ <string>thinkterm-gui</string>
<key>CFBundleIdentifier</key>
<string>com.roversx.thinkterm</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/ci/PKGBUILD.template b/ci/PKGBUILD.template
index cbb5924b..97306fe2 100644
--- a/ci/PKGBUILD.template
+++ b/ci/PKGBUILD.template
@@ -53,8 +53,8 @@ build() {
package() {
install -Dm755 squashfs-root/usr/bin/thinkterm -t "${pkgdir}/usr/bin/"
install -Dm755 squashfs-root/usr/bin/wezterm -t "${pkgdir}/usr/bin/"
- install -Dm755 squashfs-root/usr/bin/wezterm-gui -t "${pkgdir}/usr/bin/"
- install -Dm755 squashfs-root/usr/bin/wezterm-mux-server -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 -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -Dm644 squashfs-root/usr/share/icons/hicolor/128x128/apps/com.roversx.thinkterm.png \
"${pkgdir}/usr/share/icons/hicolor/128x128/apps/com.roversx.thinkterm.png"
diff --git a/ci/appimage.sh b/ci/appimage.sh
index 2faac42e..27a359e6 100755
--- a/ci/appimage.sh
+++ b/ci/appimage.sh
@@ -5,10 +5,10 @@ set -e
mkdir AppDir
-install -Dsm755 -t AppDir/usr/bin target/release/wezterm-mux-server
+install -Dsm755 -t AppDir/usr/bin target/release/thinkterm-mux-server
install -Dsm755 -t AppDir/usr/bin target/release/thinkterm
install -Dsm755 -t AppDir/usr/bin target/release/wezterm
-install -Dsm755 -t AppDir/usr/bin target/release/wezterm-gui
+install -Dsm755 -t AppDir/usr/bin target/release/thinkterm-gui
install -Dsm755 -t AppDir/usr/bin target/release/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 de5ad984..97ac88de 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -38,7 +38,7 @@ case $OSTYPE in
cp -r assets/shell-completion $zipdir/ThinkTerm.app/Contents/Resources
tic -xe wezterm -o $zipdir/ThinkTerm.app/Contents/Resources/terminfo termwiz/data/wezterm.terminfo
- for bin in wezterm thinkterm wezterm-mux-server wezterm-gui strip-ansi-escapes ; do
+ for bin in wezterm thinkterm thinkterm-mux-server thinkterm-gui strip-ansi-escapes ; do
# If the user ran a simple `cargo build --release`, then we want to allow
# a single-arch package to be built
if [[ -f $TARGET_DIR/release/$bin ]] ; then
@@ -121,8 +121,8 @@ case $OSTYPE in
mkdir $zipdir
cp $TARGET_DIR/release/thinkterm.exe \
$TARGET_DIR/release/wezterm.exe \
- $TARGET_DIR/release/wezterm-mux-server.exe \
- $TARGET_DIR/release/wezterm-gui.exe \
+ $TARGET_DIR/release/thinkterm-mux-server.exe \
+ $TARGET_DIR/release/thinkterm-gui.exe \
$TARGET_DIR/release/strip-ansi-escapes.exe \
$TARGET_DIR/release/thinkterm.pdb \
$TARGET_DIR/release/wezterm.pdb \
@@ -252,8 +252,8 @@ mkdir -p %{buildroot}/usr/bin %{buildroot}/etc/profile.d %{buildroot}/usr/share/
install -Dm755 assets/open-thinkterm-here assets/open-wezterm-here -t %{buildroot}/usr/bin
install -Dsm755 $TARGET_DIR/release/thinkterm -t %{buildroot}/usr/bin
install -Dsm755 $TARGET_DIR/release/wezterm -t %{buildroot}/usr/bin
-install -Dsm755 $TARGET_DIR/release/wezterm-gui -t %{buildroot}/usr/bin
-install -Dsm755 $TARGET_DIR/release/wezterm-mux-server -t %{buildroot}/usr/bin
+install -Dsm755 $TARGET_DIR/release/thinkterm-gui -t %{buildroot}/usr/bin
+install -Dsm755 $TARGET_DIR/release/thinkterm-mux-server -t %{buildroot}/usr/bin
install -Dsm755 $TARGET_DIR/release/strip-ansi-escapes -t %{buildroot}/usr/bin
install -Dm644 assets/shell-integration/* -t %{buildroot}/etc/profile.d
install -Dm644 assets/shell-completion/zsh %{buildroot}/usr/share/zsh/site-functions/_thinkterm
@@ -283,14 +283,14 @@ install -Dm644 assets/wezterm-nautilus.py %{buildroot}/usr/share/nautilus-python
%files -n wezterm-gui
/usr/bin/open-thinkterm-here
/usr/bin/open-wezterm-here
-/usr/bin/wezterm-gui
+/usr/bin/thinkterm-gui
/usr/share/icons/hicolor/128x128/apps/com.roversx.thinkterm.png
/usr/share/applications/com.roversx.thinkterm.desktop
/usr/share/metainfo/com.roversx.thinkterm.appdata.xml
/usr/share/nautilus-python/extensions/wezterm-nautilus.py*
%files -n wezterm-mux-server
-/usr/bin/wezterm-mux-server
+/usr/bin/thinkterm-mux-server
%changelog
* Mon Oct 2 2023 Wez Furlong
@@ -352,8 +352,8 @@ if [ "\$1" = "remove" ]; then
fi
EOF
- install -Dsm755 -t pkg/debian/usr/bin $TARGET_DIR/release/wezterm-mux-server
- install -Dsm755 -t pkg/debian/usr/bin $TARGET_DIR/release/wezterm-gui
+ install -Dsm755 -t pkg/debian/usr/bin $TARGET_DIR/release/thinkterm-mux-server
+ install -Dsm755 -t pkg/debian/usr/bin $TARGET_DIR/release/thinkterm-gui
install -Dsm755 -t pkg/debian/usr/bin $TARGET_DIR/release/thinkterm
install -Dsm755 -t pkg/debian/usr/bin $TARGET_DIR/release/wezterm
install -Dm755 -t pkg/debian/usr/bin assets/open-thinkterm-here assets/open-wezterm-here
@@ -427,8 +427,8 @@ makedepends="cmd:tic"
source="
$TARGET_DIR/release/thinkterm
$TARGET_DIR/release/wezterm
- $TARGET_DIR/release/wezterm-gui
- $TARGET_DIR/release/wezterm-mux-server
+ $TARGET_DIR/release/thinkterm-gui
+ $TARGET_DIR/release/thinkterm-mux-server
assets/open-thinkterm-here
assets/open-wezterm-here
assets/wezterm.desktop
@@ -448,8 +448,8 @@ package() {
install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/open-wezterm-here
install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/thinkterm
install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/wezterm
- install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/wezterm-gui
- install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/wezterm-mux-server
+ install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/thinkterm-gui
+ install -Dm755 -t "\$pkgdir"/usr/bin "\$srcdir"/thinkterm-mux-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/wezterm-homebrew-macos.rb.template b/ci/wezterm-homebrew-macos.rb.template
index 908d744c..32c832b9 100644
--- a/ci/wezterm-homebrew-macos.rb.template
+++ b/ci/wezterm-homebrew-macos.rb.template
@@ -24,8 +24,8 @@ cask "thinkterm" do
[
"thinkterm",
"wezterm",
- "wezterm-gui",
- "wezterm-mux-server",
+ "thinkterm-gui",
+ "thinkterm-mux-server",
"strip-ansi-escapes"
].each do |tool|
binary "#{appdir}/ThinkTerm.app/Contents/MacOS/#{tool}"
@@ -46,7 +46,7 @@ cask "thinkterm" do
def caveats; <<~EOS
Cask #{token} related executables like 'thinkterm', 'wezterm',
- 'wezterm-gui', and 'wezterm-mux-server' are linked into
+ 'thinkterm-gui', and 'thinkterm-mux-server' are linked into
/usr/local/bin/ for x86 Mac,
/opt/homebrew/bin/ for M1 Mac.
diff --git a/ci/windows-installer.iss b/ci/windows-installer.iss
index a47dc787..7d132085 100644
--- a/ci/windows-installer.iss
+++ b/ci/windows-installer.iss
@@ -6,7 +6,7 @@
;#define MyAppVersion "1.5"
#define MyAppPublisher "RoversX"
#define MyAppURL "https://github.com/RoversX/thinkterm"
-#define MyAppExeName "wezterm-gui.exe"
+#define MyAppExeName "thinkterm-gui.exe"
[Setup]
AppId={{56CBA99B-8F65-4EC0-8CE4-F13BFCB70274}
@@ -45,8 +45,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files]
Source: "..\target\release\thinkterm.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\target\release\wezterm.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\target\release\wezterm-gui.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\target\release\wezterm-mux-server.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\target\release\thinkterm-gui.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\target\release\thinkterm-mux-server.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\target\release\mesa\opengl32.dll"; DestDir: "{app}\mesa"; Flags: ignoreversion
Source: "..\target\release\libEGL.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\target\release\libGLESv2.dll"; DestDir: "{app}"; Flags: ignoreversion
diff --git a/config/src/unix.rs b/config/src/unix.rs
index f918559e..467b0f4a 100644
--- a/config/src/unix.rs
+++ b/config/src/unix.rs
@@ -27,9 +27,9 @@ pub struct UnixDomain {
/// If we decide that we need to start the server, the command to run
/// to set that up. The default is to spawn:
- /// `wezterm-mux-server --daemonize`
+ /// `thinkterm-mux-server --daemonize`
/// but it can be useful to set this to eg:
- /// `wsl -e wezterm-mux-server --daemonize` to start up
+ /// `wsl -e thinkterm-mux-server --daemonize` to start up
/// a unix domain inside a wsl container.
pub serve_command: Option<Vec<String>>,
@@ -119,9 +119,9 @@ impl UnixDomain {
None => Ok(vec![
std::env::current_exe()?
.with_file_name(if cfg!(windows) {
- "wezterm-mux-server.exe"
+ "thinkterm-mux-server.exe"
} else {
- "wezterm-mux-server"
+ "thinkterm-mux-server"
})
.into_os_string(),
OsString::from("--daemonize"),
diff --git a/wezterm-gui/Cargo.toml b/wezterm-gui/Cargo.toml
index 513e6cfe..4d89a2d5 100644
--- a/wezterm-gui/Cargo.toml
+++ b/wezterm-gui/Cargo.toml
@@ -6,6 +6,13 @@ edition = "2018"
build = "build.rs"
resolver = "2"
publish = false
+autobins = false
+
+# The crate keeps its upstream name so patches still merge; only the produced
+# executable is branded.
+[[bin]]
+name = "thinkterm-gui"
+path = "src/main.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/wezterm-gui/src/main.rs b/wezterm-gui/src/main.rs
index 44faa582..1db8d643 100644
--- a/wezterm-gui/src/main.rs
+++ b/wezterm-gui/src/main.rs
@@ -81,6 +81,7 @@ pub use termwindow::{set_window_class, set_window_position, TermWindow, ICON_DAT
#[derive(Debug, Parser)]
#[command(
+ name = "thinkterm-gui",
about = "ThinkTerm - a workspace-first terminal\nhttps://github.com/RoversX/thinkterm",
version = config::wezterm_version()
)]
@@ -1658,7 +1659,7 @@ fn run() -> anyhow::Result<()> {
Some(sub) => sub,
None => {
// Need to fake an argv0
- let mut argv = vec!["wezterm-gui".to_string()];
+ let mut argv = vec!["thinkterm-gui".to_string()];
for a in &config.default_gui_startup_args {
argv.push(a.clone());
}
diff --git a/wezterm-mux-server/Cargo.toml b/wezterm-mux-server/Cargo.toml
index c95f37d3..6b3317e8 100644
--- a/wezterm-mux-server/Cargo.toml
+++ b/wezterm-mux-server/Cargo.toml
@@ -5,6 +5,13 @@ authors = ["Wez Furlong <[email protected]>"]
edition = "2018"
resolver = "2"
publish = false
+autobins = false
+
+# The crate keeps its upstream name so patches still merge; only the produced
+# executable is branded.
+[[bin]]
+name = "thinkterm-mux-server"
+path = "src/main.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/wezterm/src/main.rs b/wezterm/src/main.rs
index 17260054..4d5cef1f 100644
--- a/wezterm/src/main.rs
+++ b/wezterm/src/main.rs
@@ -912,9 +912,9 @@ fn delegate_to_gui(saver: UmaskSaver) -> anyhow::Result<()> {
drop(saver);
let exe_name = if cfg!(windows) {
- "wezterm-gui.exe"
+ "thinkterm-gui.exe"
} else {
- "wezterm-gui"
+ "thinkterm-gui"
};
let exe = std::env::current_exe()?