Skip to content

fix cli blankspace issue#243

Closed
dkirby-ms wants to merge 9 commits intobradygaster:devfrom
dkirby-ms:main
Closed

fix cli blankspace issue#243
dkirby-ms wants to merge 9 commits intobradygaster:devfrom
dkirby-ms:main

Conversation

@dkirby-ms
Copy link

Intended to address #239. Tested locally and works to remove the blankspace issue I encountered.

I also found another compile-time issue with doubled single quotes which I fixed. Not sure if there was some intention behind that but it didnt build otherwise.

jsturtevant and others added 9 commits March 4, 2026 20:03
- Register consult and extract commands in cli-entry.ts with help text
- Add docs/features/consult-mode.md with full command reference
- Update docs/guide/personal-squad.md to reference consult mode
- Add happy-path E2E tests (init global → consult → status → extract)
- Add acceptance test features for consult and extract commands

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ster#196)

runShell() hardcoded teamRoot to process.cwd(), ignoring the global
(personal) squad path. Now uses a fallback chain:
1. Walk up from cwd for local .squad/
2. Check global squad path (resolveGlobalSquadPath)
3. Fall back to cwd (triggers init mode)

Closes bradygaster#196

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Feature files referenced old output strings ("Getting Started",
"Here:", "Scaffold ready") that no longer exist in the CLI help,
status, and init output. Updated to match actual output.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Fix runtime crash by declaring @opentelemetry/api as required dependency
feat: wire up consult mode CLI + fix global squad resolution (bradygaster#196)
The upstream command (add/remove/list/sync) was fully implemented in
upstream.ts but never registered in cli-entry.ts. Running 'squad upstream'
returned 'Unknown command'.

Closes bradygaster#224

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…-wiring

fix: wire upstream command into CLI entry point
@bradygaster bradygaster changed the base branch from main to dev March 7, 2026 14:45
@bradygaster
Copy link
Owner

Hi @dkirby-ms - thanks for this fix! The App.tsx blankspace fix is a solid improvement (conditionally applying height/overflow only when processing).

Conflict status after retarget to dev:

This PR was retargeted from main to dev (our active development branch). Unfortunately, it now has 4 merge conflicts:

  1. cli-entry.ts - The doubled-backtick fix on the upstream help line conflicts because that line was refactored/removed on dev. This part of the fix is already resolved on dev.
  2. test/acceptance/features/consult-command.feature - add/add conflict from main/dev divergence (not related to your changes)
  3. test/acceptance/features/init-command.feature - content conflict from main/dev divergence
  4. test/cli/consult.test.ts - content conflict from main/dev divergence

The good news: Your actual App.tsx blankspace fix (components/App.tsx) auto-merges cleanly with no conflicts. That is the valuable part.

The root cause of the extra conflicts is that main and dev have diverged - your fork is based on main, so the PR carries main-only commits that conflict with dev.

Recommended next step: If you can rebase your branch onto origin/dev (keeping only your fix commit), this should merge cleanly. Alternatively, we can cherry-pick just the App.tsx change on our side.

Cannot merge as-is due to the conflicts - leaving this open for resolution.

bradygaster added a commit that referenced this pull request Mar 7, 2026
Apply fix from PR #243 (dkirby-ms): only constrain live region height
while processing. When idle, auto-size to avoid blank space between
the agent panel and the input prompt.

Credit: @dkirby-ms

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@bradygaster
Copy link
Owner

Hey @dkirby-ms! Great fix — I cherry-picked the App.tsx blankspace fix directly onto dev (commit 3f924d0) and closed #239. The rest of the PR (consult mode docs, test changes) has merge conflicts from dev divergence, so I'm going to close this PR. Your contribution is credited in the commit. Thank you! 🙏

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.

5 participants