Skip to content

Rename the server binary to tokamak-server - #249

Merged
JustKira merged 6 commits into
devfrom
chore/tkm-161-rename-server-binary
Nov 21, 2026
Merged

JustKira merged 6 commits into
devfrom
chore/tkm-161-rename-server-binary

Conversation

@JustKira

Copy link
Copy Markdown
Contributor

Summary

- Cargo output, desktop sidecar, container entry point, and release archive member: tokamak
+ Cargo output, desktop sidecar, container entry point, and release archive member: tokamak-server

Scripts, test helpers, help text, and docs use the new name. Server subcommands and local discovery through server.json work as before. The app name, storage paths, and environment variables stay the same.

Linear: TKM-161

Evidence

  • Before: On dev, the Cargo binary target was tokamak.
  • After: cargo build -p server passed; test -x target/debug/tokamak-server && test ! -e target/debug/tokamak passed. The new binary printed a 64-character build ID and advertised the unchanged subcommands under its new name.
Local command Result
bash .ci/check.sh lint Passed formatting, Clippy, and TypeScript lint (warnings from TypeScript lint).
bash .ci/check.sh ts Passed type checks, unit tests, web build, and 9 release tests.
bash .ci/check.sh rust Passed; 15 Rust library tests.
cargo test -p server Passed; 161 tests, 2 ignored cases requiring installed adapters and owner login.
proto run bun -- e2e/run.ts Passed persistence and live subscriptions, CPU budget recovery, and all own-machine scenarios.
cargo test -p tokamak-app Passed all 5 tests, including replacement of old or missing build IDs and servers from another installation.
cd app && proto run bun -- run tauri build --debug --no-sign --bundles app Built the local macOS bundle with an executable Contents/MacOS/tokamak-server and no Contents/MacOS/tokamak.
Python smoke of the packaged sidecar (--build-id, --local-dir <temp> --plugins <bundle resources>) Matched PID and build ID through discovery and authenticated health. The first probe expected an HTTP response from shutdown; the server closed the connection as permitted by the app's shutdown logic. The corrected probe verified exit 0 and discovery cleanup. The desktop UI was not launched.
docker info --format '{{.ServerVersion}}' Docker daemon socket missing. Verified the Dockerfile build target, copy path, and entry point by inspection.
git grep -nI -P 'CARGO_BIN_EXE_tokamak(?!-server)|(?:target/[^\s"]*/|dist/|/bin/)tokamak(?!-server|-app)(?![\w-])|dist/tokamak-(?!server)|--bin(?:\s+|", ")tokamak(?![\w-])|\btokamak (?=(?:invite|members|revoke|plugin|--local-dir|--local-path)(?:\s|$))|(?:format!\(|ENTRYPOINT \[)"tokamak(?=[{"])|^name = "tokamak"$'

No hits. A broader git grep -nI -w tokamak -- ':!bun.lock' audit still includes the new hyphenated name, product and package identifiers, web and storage keys, Vite and lint helpers, repository URLs, and the Docker image, container, account, and resource paths. Those do not name the old server executable.

Merge Danger

Door: Two-way.

Blast Radius: Packaging. External scripts invoking the standalone server by filename must switch to tokamak-server. The desktop app can still replace an older local server through discovery.

A checkout that pulled the rename but has not rebuilt has only the old
executable on disk. stop and status failed there with ENOENT, so a
running old server could not be found or stopped. They now fall back to
the old name. start still needs the renamed build.
@JustKira
JustKira marked this pull request as draft November 20, 2026 14:07
@JustKira
JustKira marked this pull request as ready for review November 21, 2026 18:07
@JustKira
JustKira merged commit eb1934c into dev Nov 21, 2026
12 checks passed
@JustKira
JustKira deleted the chore/tkm-161-rename-server-binary branch November 21, 2026 18:33
@JustKira JustKira mentioned this pull request Nov 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant