From d91ff886dad6a8908573dc53803093cccd370fde Mon Sep 17 00:00:00 2001 From: Dai Ha Date: Sat, 19 Sep 2026 15:15:54 +0700 Subject: [PATCH] #568 follow-up: fix the text defects the hunter-role merge introduced MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found by reading the diff at the merge gate, not reported by the worker. 1. FleetConfig.java: the operator-facing "unknown key" hint read "'fleet.architects', 'fleet.developers' or 'fleet.hunters' or 'fleet.reviewers'" — a double "or". This is text an operator reads at the moment their config is already wrong, so it should not itself be wrong. 2. MemberLifecycle.java: javadoc continuation asterisk indented 6 spaces, not 5. 3. MemberRegistry.java: javadoc asterisks moved from column 2 to column 4. 4. CallerResolver.java: a // comment indented one space past its block. 2-4 are the worker mangling alignment while widening enum lists to include HUNTER. No behaviour changes. CORRECTION to the #596 merge commit message. It claimed a fifth defect, "two javadoc lines pushed past the 100-column convention". There is no such convention in this repo: no checkstyle, no spotless, no .editorconfig, and 2975 of 32728 lines under fleetd/src/main/java already exceed 100 characters. I asserted the rule before measuring it. Those two lines are untouched. Verified: built in a scratch worktree, 1790 tests, 0 failures, 0 errors, 0 skipped, counted from the surefire XML. --- fleetd/src/main/java/dev/ltms/fleet/auth/CallerResolver.java | 3 ++- .../src/main/java/dev/ltms/fleet/auth/MemberLifecycle.java | 3 ++- fleetd/src/main/java/dev/ltms/fleet/auth/MemberRegistry.java | 4 ++-- fleetd/src/main/java/dev/ltms/fleet/config/FleetConfig.java | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fleetd/src/main/java/dev/ltms/fleet/auth/CallerResolver.java b/fleetd/src/main/java/dev/ltms/fleet/auth/CallerResolver.java index 300678b..9728510 100644 --- a/fleetd/src/main/java/dev/ltms/fleet/auth/CallerResolver.java +++ b/fleetd/src/main/java/dev/ltms/fleet/auth/CallerResolver.java @@ -221,7 +221,8 @@ public final class CallerResolver { // The config/live binding names this pane as an architect slot's own. Same // unforgeable pane mapping; the live binding, never a request argument, decides. // Check the slot role too: this defence in depth prevents a bad lifecycle bind from - // escalating a dev, hunter, or reviewer into an architect. Checked before the worker fallback. + // escalating a dev, hunter or reviewer into an architect. Checked before + // the worker fallback. return Principal.architect(memberSlotNames.apply(slot), c.terminal(), c.pid()); } return Principal.worker(c.terminal(), c.pid()); // unforgeable; never token-gated diff --git a/fleetd/src/main/java/dev/ltms/fleet/auth/MemberLifecycle.java b/fleetd/src/main/java/dev/ltms/fleet/auth/MemberLifecycle.java index af93b8c..7ee2da8 100644 --- a/fleetd/src/main/java/dev/ltms/fleet/auth/MemberLifecycle.java +++ b/fleetd/src/main/java/dev/ltms/fleet/auth/MemberLifecycle.java @@ -42,7 +42,8 @@ public interface MemberLifecycle { * Try to bind a newly spawned {@code terminal} into the role it was granted. * * @return the role this session actually holds: {@code role} unchanged for a role with no - * live slot-binding semantics (dev, hunter, reviewer), or when the bind succeeded; a fallback + * live slot-binding semantics (dev, hunter, reviewer), or when the bind + * succeeded; a fallback * role — never {@code role} — when a slot-bound role (architect) could not be bound. * Callers must record THIS value on the session, never the requested {@code role}, so * a later roster read never reports a role the session does not hold (CB-619). In diff --git a/fleetd/src/main/java/dev/ltms/fleet/auth/MemberRegistry.java b/fleetd/src/main/java/dev/ltms/fleet/auth/MemberRegistry.java index 200858e..158282a 100644 --- a/fleetd/src/main/java/dev/ltms/fleet/auth/MemberRegistry.java +++ b/fleetd/src/main/java/dev/ltms/fleet/auth/MemberRegistry.java @@ -20,8 +20,8 @@ import java.util.function.Supplier; * *

Two halves, split by who owns each: *