fix(flock): close the gaps the out-of-the-box stack left open - #32
Closed
abeljim8am wants to merge 1 commit into
Closed
fix(flock): close the gaps the out-of-the-box stack left open#32abeljim8am wants to merge 1 commit into
abeljim8am wants to merge 1 commit into
Conversation
- pin a selector session layout to the layout dir only when the file is
really there, so a bare built-in name like "flock" survives to the new
session and resolves to the bundled asset instead of silently falling
back to the plain default layout on fresh installs
- drop `pick`'s `p` alias, which collided with `plugin`'s pre-existing one
and broke `flock p -- <url>`
- answer instead of panicking when bare `flock` runs inside the picker
session itself
- make `setup --check` read folders, providers and session layout from the
merged alias projection the selector actually receives, not the
`flock { }` section alone
- correct the empty-state hint ("start flock again", not "reopen the
selector") and truncate overflowing rows to the pane width instead of
wrapping into the row below
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
abeljim8am
force-pushed
the
fix/setup-stack-review-fixes
branch
from
August 4, 2026 15:34
d565014 to
2bd3a64
Compare
5 tasks
Collaborator
|
Superseded by mega PR #35 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Review fixes on top of the out-of-the-box setup stack (#27–#31). Five issues, found by a review pass over the stack; the first two are release blockers.
Selector-created sessions actually get the
flocklayout (high, #27)The selector opens a project with
LayoutInfo::File("flock"). The server pinned that name to the client's layout dir unconditionally, producing<layout_dir>/flock— a path that does not exist on a fresh install. The built-in-asset fallback only matches bare names, so resolution failed, andCliAssets::load_config_and_layoutswallowed the error and silently fell back to the plain upstream layout: no sidebar, no way back to the selector, on exactly the fresh-install flow the stack exists to fix. It looked fine before #27 only because the old default"default"made the erroneous fallback coincide with the intended layout.ConnectToSession::apply_layout_dirnow pins a name to the layout dir only when the file is really there. A bare built-in name survives to the new session and resolves to the bundled asset; a user's ownlayouts/flock.kdlstill wins. Unit-tested both ways.flock pickloses itspalias (high, #29)palready meantflock plugin. clap 3 does not reject the duplicate — the first-declared variant wins — soflock p -- <url>stopped loading plugins and--helpadvertised the same alias on two subcommands.pickhas no short alias now.Bare
flockinside the picker session answers instead of panicking (medium, #29)From a pane inside the
flock-selectorsession itself, the selector rewrite became an attach-to-self, which is apanic!deeper in the attach branch. The default entrypoint now explains you are already in the picker and exits cleanly.setup --checkreads the config the selector actually receives (medium, #31)The folders/providers/session-layout report read only the
flock { }section, but the runtime merges that section underneath theflock-selectoralias body, where anything the body states wins. A selector configured the pre-section way — args on the alias — was reported as unconfigured, complete with a false "your project list is empty" warning, andssh_enabledon the alias could be reported backwards. The check now reads the same merged projection the plugin thread is handed, parsed exactly the way the plugin parses it.The empty-state hint gives advice that works (medium, #30)
"then reopen the selector" was the one thing that does not work: plugin configuration is read when a session starts, so inside a running session, editing
config.kdland reopening the picker shows the identical empty state. The hint now says to start flock afresh and why. While in there:render_rowclaimed to truncate overflowing spans but emitted them whole, letting long hint/wizard lines wrap into the row below and scroll short panes out of place — it truncates to the pane width now (with tests), and the wizard narrow-pane test assertions are updated to the truncated reality.CHANGELOG: adds an entry for these fixes, corrects the #27 entry that contradicted itself about
default_layout(it stays unset;flockis a fallback), and notes that selector-created sessions previously followed your ownlayouts/default.kdl— withflock { session_layout "default" }as the way to keep that.The
flock-selector.wasmasset is rebuilt for the plugin changes.🤖 Generated with Claude Code