Files
werkator/docs/plan/07-server-mode.md
Michael HönnigandClaude Opus 5 d0169e57bc Renaming gitTally to Werkator because there is another git-related tool named gittally (#1)
* renaming from gitTally to Werkator

* Rename GitTally to Werkator

`gitTally` is the name of another product in the git space, so the
rename is a precaution; nothing about what the build system does changes.

The name follows one rule: `Werkator` where it is prose, capitalized
where it is a Kotlin type and its file, lowercase everywhere a machine
reads it — the command, packages, paths, configuration keys and values,
the Gitea check context. Environment variables keep their convention and
are uppercase throughout.

Every configuration file is still found under its pre-rename name
(`ConfigFiles`): `.gittally.yml` at the repository root, in a build
worktree and as committed on a branch, `.git/gittally/.gittally.yml` for
the machine layer. The current name wins where both exist, and the old
file is then ignored rather than merged — two files side by side are a
half-done rename, not a layering. Without the fallback an installation
that updated without renaming would not fail: a configuration that is
not found leaves every setting at its default, so it would come up
looking healthy while having forgotten its credentials and its builds.

`docs/werkator-migrationsplan.md` lists what the fallback does not
cover and has to be moved by hand — above all the state directory
`.git/werkator/`, which holds the build history, the control token and
the worktrees, and has no fallback of its own.

`docs/migration-from-legacy.md` is deleted with this: it mapped the
legacy script's environment variables, and every host it addressed has
long since moved to the YAML configuration.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Move the pre-rename state directory at the first start

The configuration is found under either name, the state is not: build
history, control token, auto-build slots and worktrees live at one fixed
path. An installation that updates without moving `.git/gittally` would
not fail — it would come up with an empty history and a fresh control
token, quietly. So the first start moves it instead of the release notes
asking for it.

Only when the old directory exists and the new one does not. Where both
exist nothing is touched and a warning names the leftover: which of the
two is the live state is not something to guess. A failed move is an
error in the log, never an abort — a CI must not hang on it.

The worktrees are dropped rather than moved, since they point at their
old path in both directions; `GitWorktreeWorkspaces` prunes the stale
admin entry and recreates each on its branch's next build. A generated
systemd unit moves with the directory and leaves its symlink dangling,
which is warned about — the running service is unaffected, the next
start is not.

Runs from `CliRunner`, before any command resolves a path under the
directory, and so before the second context of `server` exists.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Document PR#1: the rename to Werkator

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Drop the legacy env-to-YAML conversion from the setup tool

The old bash script configured itself through `GITTALLY_*` environment
variables. The blanket rename rewrote those literals, so the converter
was looking for `WERKATOR_*` — a spelling no host has ever written. Fed
a real legacy file it would have found nothing and written an almost
empty configuration, without an error, which is the same silent failure
this rename is otherwise careful to avoid.

The conversion has served its purpose with the vm2176 to vm4006
migration, so it goes instead of being repaired. What remains is the
setup of a new instance: the preconditions, the credential prompt, and
the machine configuration written mode 600 — now carrying the host's
public URL as well, since that is host-specific too. Everything the
repository builds comes from `init` and its templates.

It also stops emitting a legacy `branches:` section, which step 18 is
about to reject outright.

`docs/plan/00-legacy-analysis.md` and `13-nginx-tls.md` get the real
`GITTALLY_*` spelling back: they record what the old script read.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Describe this repository's build with a build definition

Its own `.werkator.yml` still used the deprecated `branches` section
with an `autoBuild` schedule that was switched off. That section is read
only while nothing defines a build at all, and step 18 rejects it by
name — so this repository would have blocked the precondition of that
step, which asks that no configuration still in play carries it.

Nothing about the build changes: `builds.default` with `trigger.onPush`
is a build of every new commit on every branch, which is what the branch
section said. `config:print --full` resolves the definition completely
and logs no deprecation warning any more.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Stop documenting the pre-rename fallback for users

Exactly one repository is configured with the old names, and it is
migrated by hand in the same move as this release. The fallback is
therefore a transition of days, not a feature anyone reading the release
notes or the configuration reference has to plan around.

Removed from `releases.html` and `docs/configuration.md`. The mechanism
itself is unchanged and stays described where it is worked on: in
`ConfigFiles`, in `StateDirMigration`, and in the migration plan.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Bring the PR-doc to its final state

The `statusContext` question is answered and marked as decided rather
than left standing: it is the one value a human reads as a label, and it
stays lowercase because Gitea matches it and the client reads it back,
which makes it a value.

Also records that the pre-rename fallback is deliberately absent from
the release notes and the configuration reference.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Release v1.0.0: Werkator

The release after 0.9.21 is 1.0.0, because a product that changes its
name is better off counting from one under it. The release note says as
much, so the jump is not read as a claim about maturity — plan steps 14,
17 and 18 are still open.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Correct the PR-doc about the version

It claimed the PR carries no version bump, which the release commit made
untrue, and records why the number is 1.0.0 instead of 0.9.22.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Point the legacy references at the history

`legacy/gitTally` was removed from the tree with the rename, but the
README still described it as a reference kept in the repository, and the
plan told an executing session to read parts of it — including step 14,
which is open.

The README section is gone; `docs/plan/README.md`, step 14 and the
legacy analysis now say where the script actually is
(`git show 7f55068^:legacy/gitTally`). Executed steps and ADR 0004 keep
their wording: they record what was true when they ran.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Retarget the links in the historic PR-docs

The package rename moved every file the older PR-docs link to, leaving
60 dead links. Only the link targets are rewritten, never the visible
text and never a statement: those documents record what was true when
they were written, GitTally in the prose included. A snapshot may be
outdated; it should still be navigable.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Add the v1.0.0 deployment procedure for vm4006

Measured, not estimated: the state directory is 878 MB, of which 878 MB
are the nine build worktrees. What cannot be recreated is 84 KB, so the
snapshot before an in-place switch is instant and the rollback is one
sequence of moves.

Records the three expected non-failures — a cold Gradle volume, one
image rebuild, containers left under the old label — and that
`gitea.statusContext` needs no attention because it comes from the
watched repository's committed configuration.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Rename the machine configuration along with its directory

Found by the deployment to vm4006: the move renames the directory and
leaves the file inside it alone, so the machine configuration ended up at
`.git/werkator/.gittally.yml` — a pair of names the lookup did not
expect, because it pairs directory and file name. The instance resolved
empty credentials, no public URL and none of the host's build
definitions, and said nothing about it. That is the exact failure this
change exists to prevent, produced by the change itself.

`StateDirMigration` now renames the configuration with the directory,
unless one under the current name is already there. `ConfigFiles` carries
`.git/werkator/.gittally.yml` as a third candidate as well, for a
directory somebody moved by hand, where the migration never runs and so
can rename nothing.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Let init see a configuration under its previous name

`init --systemd` runs `init`, and its "already exists" check knew only
the current name. On the one repository still carrying `.gittally.yml`
it therefore wrote a fresh template `.werkator.yml` beside it — and
since the current name wins, that repository would have built the
template's `./gradlew test` instead of what its own configuration says.
Found on vm4006, where the file was created in the watched working tree
and removed again by hand.

Both checks now ask `ConfigFiles`, so init decides existence by the same
rule the loader uses to read.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Record the v1.0.0 deployment to vm4006

Deployed from the branch as the final test of PR#1, and it did what a
final test is for: it found two silent-failure defects before the
service was started, both fixed and redeployed in the same window.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Drop the control token left under the old localStorage key

The key is named after the product, so the rename left every browser
with a token under `gittally.controlToken`, which nothing reads any more
and which "forget token" can no longer reach. It is a write-scope token
in a browser store, not a password, but a secret nobody owns is worth
one line to remove.

Removed on load. The token on the server is unchanged, so re-entering it
once per browser is all the rename costs.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
2026-08-31 13:32:54 +02:00

5.3 KiB
Raw Permalink Blame History

Step 07: Server Mode and HTTP API

Prerequisites: steps 04, 05, 06. Read README.md and 00-legacy-analysis.md first.

Goal

Implement the server subcommand: a persistent web server exposing build state as JSON and serving artifacts.

Design

Bootstrapping:

  • CLAUDE.md notes the context starts with web type none; the server subcommand must run a web context. Preferred approach: ServerCommand launches a second SpringApplication with WebApplicationType.SERVLET and a server profile, then blocks until shutdown. Document the chosen mechanism in the code and, if it deviates, in an ADR.
  • Add spring-boot-starter-web dependency.
  • The watcher (step 06) is active only in the server profile.
  • New config keys server.port and server.bindAddress (defaults 18080 / 0.0.0.0, as legacy).

JSON API (package de.hoennig.werkator.server), replacing the legacy /control/* endpoints:

  • GET /api/builds/latest — latest build per branch.
  • GET /api/builds/history — all builds, newest first.
  • GET /api/builds/current — the list of running builds (there can be several, one per branch, up to builds.maxConcurrent), each with live status and log tail (?offset= for incremental log fetch, addressed by artifact key).
  • GET /api/status/{commit} — effective status including Gitea lookup (replaces /control/status); must return an explicit error state on Gitea failure, never hang.
  • POST /api/builds/{branch}/restart, POST /api/builds/{artifactKey}/cancel (cancel takes the artifact key because multiple builds can run concurrently), DELETE /api/builds/{artifactKey} — guarded by a simple token like the legacy cancel token; wire into executor/watcher/repository.
  • GET /api/watcher — watcher health (last poll, last error).
  • Artifact serving: GET /artifacts/{artifactKey}/** streaming from the artifact store, with no-cache headers for html/json/log.

Out of Scope

  • HTML pages (step 08); JSON plus artifact files only.
  • TLS/reverse proxy (documented in step 12).

Tests

  • @WebMvcTest slices with @MockkBean per controller (see CLAUDE.md conventions).
  • Contract tests: JSON shapes, error states (Gitea down → explicit unknown status, HTTP 200), cancel token rejection.
  • One @SpringBootTest on the server profile proving the context boots with watcher and web enabled.

Acceptance Criteria

  • ./gradlew ktlintFormat then ./gradlew build is green.
  • java -jar ... server starts, GET /api/builds/latest answers, Ctrl-C shuts down cleanly (manual smoke test; document result in this file).

Implementation Notes (2026-07-07)

Bootstrapping was implemented as designed, with two additions. application-server.yml switches spring.main.web-application-type to servlet, because spring.main.* properties override the programmatic SpringApplicationBuilder.web(...) setting. CliRunner is excluded from the server profile so the second context does not run picocli again. After Ctrl-C, ServerCommand parks the command thread while the JVM shuts down; otherwise main() races the shutdown hooks and SpringApplication.exit prints a stack trace for the already-closed CLI context.

Deviations and decisions:

  • The live log tail is a sibling endpoint: GET /api/builds/current lists the running builds (with logSize), and GET /api/builds/current/{artifactKey}/log?offset= fetches the log incrementally, addressed by artifact key as required. Responses are capped at 1 MiB per chunk.
  • The control token needs no config key. It is generated on first use and persisted to .git/werkator/control-token (mode 600); operators can write their own token there, deleting the file rotates it. Requests pass it via the X-werkator-Token header or a token parameter; mismatch answers 403 like legacy.
  • DELETE /api/builds/{artifactKey} removes the result and then calls ArtifactStore.prune(history), so no new store interface method was needed.
  • GET /api/status/{commit} also accepts abbreviated hashes (740 hex like legacy) and resolves them against the local history. The GiteaClient (step 03) gained 10s connect/read timeouts so the endpoint can never hang; a Gitea failure yields HTTP 200 with status: unknown (or the local status) plus giteaError.
  • POST /api/builds/{branch}/restart rebuilds the branch's last recorded commit. Branch names containing / would need an encoded slash, which Tomcat rejects by default — revisit in step 08 if the UI needs restart for such branches. (Resolved in step 08: the endpoint moved to POST /api/builds/restart?branch=….)
  • Spring Boot 4 moved @WebMvcTest into the new spring-boot-starter-webmvc-test test module (added as test dependency).
  • The server-profile @SpringBootTest mocks the Watcher bean, so booting the test never fetches origin or enqueues builds; watcher wiring is proven by verifying start() was called.

Manual smoke test (2026-07-07): in a scratch repository, java -jar build/libs/werkator-0.1.0-SNAPSHOT.jar server started on the configured port 18981. GET /api/builds/latest answered [] with HTTP 200, GET /api/watcher exposed the failing fetch of the origin-less repo as lastFetchError, GET /api/status/<sha> answered unknown with HTTP 200, and cancel without token answered 403. SIGINT (Ctrl-C) shut the process down cleanly in about 2 seconds: port closed, no exceptions in the log, exit code 130.