feat(linux): add Waybar and Quickshell shell - #1
Open
EaeDave wants to merge 3 commits into
Open
Conversation
Keep Linux discovery and UI modular while reusing the shared enrichment contracts.
|
ⓘ Qodo reviews are paused because the subscription is no longer active. Ask your workspace admin to reactivate the subscription to resume reviews. Manage billing |
📝 WalkthroughSummary by CodeRabbit
WalkthroughA alteração adiciona um preview Linux para descoberta, visualização, abertura e encerramento de servidores locais. O fluxo usa ChangesPreview Linux
Estimated code review effort: 4 (Complex) | ~45 minutes Sequence Diagram(s)sequenceDiagram
participant Waybar
participant Quickshell
participant CLI
participant linuxScanner
participant ss
participant proc
Waybar->>CLI: executar dev-tray-linux waybar
Quickshell->>CLI: executar scan, open ou kill
CLI->>linuxScanner: consultar ou alterar servidores
linuxScanner->>ss: ler listeners TCP
linuxScanner->>proc: ler processos e diretórios de trabalho
linuxScanner-->>CLI: retornar entradas ou resultado
CLI-->>Waybar: retornar JSON
CLI-->>Quickshell: retornar dados da operação
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 20
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@apps/linux/install-local.sh`:
- Around line 7-9: Atualize o script de instalação local para usar
`${XDG_CONFIG_HOME:-$HOME/.config}/quickshell` ao criar o link do Quickshell e
garantir que o diretório de binários instalado esteja disponível no PATH.
Informe explicitamente ao usuário as configurações necessárias para que `qs -c
dev-tray` e os chamadores de `dev-tray-linux` em `shell.qml` e
`waybar-module.jsonc` funcionem no ambiente gráfico.
- Line 12: Update the README’s dev-tray usage instructions to include the -d
daemonize flag, matching the command printed by the installer’s start message.
Keep the documented command consistent with `qs -c dev-tray -d`.
In `@apps/linux/quickshell/shell.qml`:
- Line 495: Atualize os Accessible.name dos botões de abrir e encerrar
associados a groupBlock para incluir também a porta do servidor, além de
groupBlock.group.name, garantindo que cada linha seja distinguível e que as
ações destrutivas tenham identificação única.
- Around line 279-318: Padronize para um único idioma todo o texto visível ao
usuário nas superfícies Linux: atualize os textos em português do painel
Quickshell neste bloco e as mensagens em inglês do tooltip do Waybar e do
scanner, incluindo a saída associada a “No dev servers” e “PID ${pid} is not a
listed dev server”. Preserve o significado e a consistência entre as mensagens.
- Around line 82-86: Atualize o catch do fluxo de leitura do scanner para
registrar o erro original no console, preservando a limpeza de entries e groups
e a mensagem exibida ao usuário. Também valide e trate o exitCode de
scanProcess, distinguindo falhas de execução, como dev-tray-linux ausente no
PATH, das respostas inválidas antes de processar o conteúdo.
- Around line 107-109: Atualize o fluxo de confirmação de encerramento em torno
de killProcess.exec para não iniciar uma nova execução enquanto
killProcess.running estiver ativo. Bloqueie novas ações de encerramento durante
a execução ou enfileire cada requestKill para processamento sequencial,
garantindo que o comando anterior termine antes do próximo começar.
- Around line 164-172: Atualize o PanelWindow identificado por id panel para
fechar o painel ao pressionar Escape, atribuindo false a root.panelVisible, e
encaminhe o foco para o conteúdo quando a visibilidade mudar para true. Preserve
o comportamento atual de dimensões e visibilidade, garantindo que o foco inicial
permita a navegação por Tab.
In `@apps/linux/src/cli.ts`:
- Around line 58-64: Share the resolved command from main with its error handler
so the default 'scan' command is preserved when no argument is provided. Update
the main/handler flow around main and the catch block to use that resolved
command for branching, ensuring scan failures emit the expected JSON on stdout.
- Around line 50-51: Atualize o fluxo que abre URLs para usar spawn com
detached: true e stdio: 'ignore', substituindo execFile e child.unref. Não
descarte falhas silenciosamente: preserve um mecanismo de erro apropriado para
informar quando xdg-open não existir ou falhar, sem criar pipes de
stdout/stderr.
- Around line 30-32: Atualize a construção de tooltip próxima à variável tooltip
para escapar projectName e framework antes de interpolá-los, convertendo &,
< e > conforme necessário para o markup Pango do Waybar. Preserve o
formato atual das entradas, separadores e a mensagem “No dev servers”.
In `@apps/linux/src/linux-scanner.ts`:
- Around line 73-92: Rename the local process variables in the grouping and
scoring callbacks around the owners calculation, and in killEntry, to socket or
candidateProcess so they no longer shadow Node’s global process object; update
all references within those scopes consistently, preserving the existing
behavior.
- Around line 115-118: Prevent indefinite Linux scans at both affected sites: in
apps/linux/src/linux-scanner.ts:115-118, update collectSocketProcesses and its
execFileAsync('ss', ...) options to include timeout and maxBuffer consistent
with execGitBranch; in apps/linux/quickshell/shell.qml:89-97, add a protection
Timer that cancels scanProcess, sets errorMessage, and clears loading when the
scan exceeds the expected duration.
- Around line 142-154: Atualize o fluxo de scan em torno de scanEntries e
sessions.merge para persistir branchAtStart por PID fora da memória do processo,
reutilizando esse estado nas chamadas subsequentes da CLI Linux. Preserve a
detecção de branchDrifted quando branchCurrent divergir do valor persistido;
caso não seja possível adicionar persistência, remova explicitamente o suporte a
drift em vez de apresentar comparações incorretas.
- Around line 182-195: Atualize o fluxo que coleta `tree` e executa o segundo
loop de sinais para capturar o `starttime` de cada PID no momento da coleta.
Antes de chamar `process.kill(target, 'SIGKILL')`, releia o `starttime`
correspondente em `/proc` e só envie o sinal quando o valor permanecer idêntico;
trate processos ausentes ou leituras inválidas como inelegíveis para o SIGKILL.
In `@apps/linux/test/linux-scanner.test.ts`:
- Around line 34-46: Expand the selectListenerOwners tests to cover grouping
processes by different ports, terminating ancestor traversal when the injected
parentOf chain cycles via the seen set, and selecting the lowest PID when
candidates are unrelated. Use injected parent mappings in each case and preserve
the existing direct-ancestor assertion.
In `@apps/linux/waybar-module.jsonc`:
- Around line 1-7: Make apps/linux/waybar-module.jsonc a valid standalone JSONC
document by wrapping the existing "custom/dev-tray" configuration in a top-level
object, preserving all current module properties and values.
In `@apps/linux/waybar-style.css`:
- Around line 1-3: Update the `#custom-dev-tray` styles to add a .error rule for
the CLI-emitted error class, applying visible emphasis to the error state while
preserving the existing margin styling.
In `@docs/ARCHITECTURE.md`:
- Line 70: Atualize o fence Markdown iniciado na seção de layout de
docs/ARCHITECTURE.md para declarar explicitamente a linguagem text, preservando
o conteúdo e o fechamento do bloco.
In `@packages/core/src/enrich/candidate-dirs.ts`:
- Around line 28-38: Atualize o laço de tokenização em extractPaths em
packages/core/src/enrich/candidate-dirs.ts#L28-L38 para reconhecer valores entre
aspas em qualquer posição do token, evitar cortar no primeiro '=' quando o
trecho anterior já for um caminho absoluto e remover as aspas somente após esse
corte. Em packages/core/test/enrich-pipeline.test.ts#L69-L77, adicione um caso
para --config="/home/dev/my app/config.js" e verifique a extração desse caminho.
In `@packages/core/test/enrich-pipeline.test.ts`:
- Around line 69-77: Extend the `extracts absolute POSIX command-line paths`
test for `extractPaths` with an option assignment whose quoted value contains
spaces, such as `--config="/path with space/config.js"`, and assert that the
quoted path is extracted correctly.
🪄 Autofix
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro Plus
Run ID: 8a2822a1-cf39-490c-930d-8e81f5e8570f
⛔ Files ignored due to path filters (1)
package-lock.jsonis excluded by!**/package-lock.json
📒 Files selected for processing (15)
README.mdapps/linux/install-local.shapps/linux/package.jsonapps/linux/quickshell/shell.qmlapps/linux/src/cli.tsapps/linux/src/linux-scanner.tsapps/linux/test/linux-scanner.test.tsapps/linux/tsconfig.jsonapps/linux/vitest.config.tsapps/linux/waybar-module.jsoncapps/linux/waybar-style.cssdocs/ARCHITECTURE.mdpackage.jsonpackages/core/src/enrich/candidate-dirs.tspackages/core/test/enrich-pipeline.test.ts
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
All reported issues were addressed across 16 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
There was a problem hiding this comment.
7 issues found across 13 files (changes from recent commits).
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="packages/core/src/enrich/candidate-dirs.ts">
<violation number="1" location="packages/core/src/enrich/candidate-dirs.ts:37">
P2: Linux command-line project detection breaks for valid paths containing quote characters when the process cwd is unavailable: `commandTokens` treats the literal apostrophe as shell syntax and removes it. Preserving literal argv characters (or serializing every argument with quotes/escapes before tokenizing) keeps fallback attribution correct.</violation>
</file>
<file name="apps/linux/quickshell/shell.qml">
<violation number="1" location="apps/linux/quickshell/shell.qml:190">
P2: A failed browser launch hides the discovered server list under the “Server scan failed” panel and stops auto-refresh, even though scanning itself may still work. Keeping action errors separate from scan state, or retaining the list while showing the action error, would avoid making a transient open failure look like a scan failure.</violation>
<violation number="2" location="apps/linux/quickshell/shell.qml:484">
P2: The new group collapse/expand control doesn't persist: its state lives in the delegate-local `collapsed` property, but the 5s auto-refresh rebuilds `root.groups` via `groupEntries` on every scan, which recreates all delegates and resets `collapsed` to `false`. In practice a collapsed group springs back open within seconds, making the collapse feature effectively unusable with auto-refresh enabled. Consider persisting collapsed state keyed by group key (e.g., a `collapsedKeys` set on the root, or tracking per-group keys) rather than in the delegate so it survives model rebuilds.</violation>
<violation number="3" location="apps/linux/quickshell/shell.qml:593">
P2: Slow probes are displayed and announced as unknown because this new mapping handles only alive and dead. Adding an explicit `slow` branch would preserve the health distinction exposed by the core and desktop UI.</violation>
</file>
<file name="apps/linux/src/linux-scanner.ts">
<violation number="1" location="apps/linux/src/linux-scanner.ts:251">
P2: Concurrent Waybar and Quickshell scans can lose persisted session records: the last scan to rename its snapshot wins even when it started from stale state. Locking the state update or reloading/merging immediately before writing would keep branch-at-start records stable across overlapping scans.</violation>
<violation number="2" location="apps/linux/src/linux-scanner.ts:299">
P1: The kill workflow can still terminate an unrelated process after PID reuse because descendant discovery, identity checking, and `process.kill` are not atomic. Using Linux pidfds (or another identity-bound signal handle) for each discovered process would preserve the start-time safety guarantee through both signals.</violation>
</file>
<file name="apps/linux/install-local.sh">
<violation number="1" location="apps/linux/install-local.sh:13">
P2: The new PATH guard hard-fails the whole install (`exit 1` before creating anything) whenever `~/.local/bin` isn't already on PATH. For a first-time user that's a chicken-and-egg: they run the installer expecting it to set up the binary, but it aborts and creates nothing, forcing a manual two-step. It also checks the installer's own transient shell PATH rather than the graphical session's — the README already tells users to keep the two in sync precisely because they can differ — so the guard gives a false sense of certainty about the actual goal. Consider downgrading the hard failure to a clear warning (install anyway) or offering to create `~/.local/bin`, so a fresh setup isn't a dead end; and use an exact equality on a `:`-delimited entry (rather than a `case` glob) so homedirs containing glob metacharacters don't produce a false mismatch.</violation>
</file>
Tip: Review your code locally with the cubic CLI to iterate faster.
Re-trigger cubic
|
|
||
| const seen = new Set<number>(); | ||
| const tree = selected.flatMap((entry) => processTree(entry.pid, seen)); | ||
| const startTimes = new Map(tree.map((target) => [target, readProcessStartTime(target)])); |
There was a problem hiding this comment.
P1: The kill workflow can still terminate an unrelated process after PID reuse because descendant discovery, identity checking, and process.kill are not atomic. Using Linux pidfds (or another identity-bound signal handle) for each discovered process would preserve the start-time safety guarantee through both signals.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At apps/linux/src/linux-scanner.ts, line 299:
<comment>The kill workflow can still terminate an unrelated process after PID reuse because descendant discovery, identity checking, and `process.kill` are not atomic. Using Linux pidfds (or another identity-bound signal handle) for each discovered process would preserve the start-time safety guarantee through both signals.</comment>
<file context>
@@ -172,24 +278,46 @@ function processTree(pid: number, seen = new Set<number>()): number[] {
const seen = new Set<number>();
- const tree = socketPids.flatMap((socketPid) => processTree(socketPid, seen));
+ const tree = selected.flatMap((entry) => processTree(entry.pid, seen));
+ const startTimes = new Map(tree.map((target) => [target, readProcessStartTime(target)]));
+ for (const entry of selected) {
+ if (startTimes.get(entry.pid) !== entry.startTime) {
</file context>
| token += quote; | ||
| index += 1; | ||
| } else token += character; | ||
| } else if (character === '"' || character === "'") { |
There was a problem hiding this comment.
P2: Linux command-line project detection breaks for valid paths containing quote characters when the process cwd is unavailable: commandTokens treats the literal apostrophe as shell syntax and removes it. Preserving literal argv characters (or serializing every argument with quotes/escapes before tokenizing) keeps fallback attribution correct.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At packages/core/src/enrich/candidate-dirs.ts, line 37:
<comment>Linux command-line project detection breaks for valid paths containing quote characters when the process cwd is unavailable: `commandTokens` treats the literal apostrophe as shell syntax and removes it. Preserving literal argv characters (or serializing every argument with quotes/escapes before tokenizing) keeps fallback attribution correct.</comment>
<file context>
@@ -21,21 +21,52 @@ export function dirOf(
+ token += quote;
+ index += 1;
+ } else token += character;
+ } else if (character === '"' || character === "'") {
+ quote = character;
+ } else if (/\s/.test(character)) {
</file context>
| radius: 3 | ||
| color: serverRow.entry.health === "alive" ? root.colorAlive | ||
| : serverRow.entry.health === "dead" ? root.colorDanger | ||
| : root.colorSubtle |
There was a problem hiding this comment.
P2: Slow probes are displayed and announced as unknown because this new mapping handles only alive and dead. Adding an explicit slow branch would preserve the health distinction exposed by the core and desktop UI.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At apps/linux/quickshell/shell.qml, line 593:
<comment>Slow probes are displayed and announced as unknown because this new mapping handles only alive and dead. Adding an explicit `slow` branch would preserve the health distinction exposed by the core and desktop UI.</comment>
<file context>
@@ -451,30 +588,55 @@ Scope {
- Accessible.name: "Servidor ativo"
+ color: serverRow.entry.health === "alive" ? root.colorAlive
+ : serverRow.entry.health === "dead" ? root.colorDanger
+ : root.colorSubtle
+ Accessible.name: serverRow.entry.health === "alive"
+ ? "Server healthy"
</file context>
|
|
||
| onExited: (exitCode, exitStatus) => { | ||
| if (exitCode !== 0) | ||
| root.errorMessage = "Could not open the server in your browser." |
There was a problem hiding this comment.
P2: A failed browser launch hides the discovered server list under the “Server scan failed” panel and stops auto-refresh, even though scanning itself may still work. Keeping action errors separate from scan state, or retaining the list while showing the action error, would avoid making a transient open failure look like a scan failure.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At apps/linux/quickshell/shell.qml, line 190:
<comment>A failed browser launch hides the discovered server list under the “Server scan failed” panel and stops auto-refresh, even though scanning itself may still work. Keeping action errors separate from scan state, or retaining the list while showing the action error, would avoid making a transient open failure look like a scan failure.</comment>
<file context>
@@ -123,42 +161,78 @@ Scope {
+
+ onExited: (exitCode, exitStatus) => {
+ if (exitCode !== 0)
+ root.errorMessage = "Could not open the server in your browser."
+ }
}
</file context>
| execGitBranch, | ||
| }, caches); | ||
| const merged = mergeSessionState(partial, loadSessionState()); | ||
| saveSessionState(merged.state); |
There was a problem hiding this comment.
P2: Concurrent Waybar and Quickshell scans can lose persisted session records: the last scan to rename its snapshot wins even when it started from stale state. Locking the state update or reloading/merging immediately before writing would keep branch-at-start records stable across overlapping scans.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At apps/linux/src/linux-scanner.ts, line 251:
<comment>Concurrent Waybar and Quickshell scans can lose persisted session records: the last scan to rename its snapshot wins even when it started from stale state. Locking the state update or reloading/merging immediately before writing would keep branch-at-start records stable across overlapping scans.</comment>
<file context>
@@ -128,29 +225,38 @@ export async function collectScanRows(): Promise<ScanRow[]> {
execGitBranch,
}, caches);
+ const merged = mergeSessionState(partial, loadSessionState());
+ saveSessionState(merged.state);
- return sessions.merge(partial).map((entry) => ({
</file context>
| width: groupsColumn.width | ||
|
|
||
| property bool grouped: group.items.length > 1 | ||
| property bool collapsed: false |
There was a problem hiding this comment.
P2: The new group collapse/expand control doesn't persist: its state lives in the delegate-local collapsed property, but the 5s auto-refresh rebuilds root.groups via groupEntries on every scan, which recreates all delegates and resets collapsed to false. In practice a collapsed group springs back open within seconds, making the collapse feature effectively unusable with auto-refresh enabled. Consider persisting collapsed state keyed by group key (e.g., a collapsedKeys set on the root, or tracking per-group keys) rather than in the delegate so it survives model rebuilds.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At apps/linux/quickshell/shell.qml, line 484:
<comment>The new group collapse/expand control doesn't persist: its state lives in the delegate-local `collapsed` property, but the 5s auto-refresh rebuilds `root.groups` via `groupEntries` on every scan, which recreates all delegates and resets `collapsed` to `false`. In practice a collapsed group springs back open within seconds, making the collapse feature effectively unusable with auto-refresh enabled. Consider persisting collapsed state keyed by group key (e.g., a `collapsedKeys` set on the root, or tracking per-group keys) rather than in the delegate so it survives model rebuilds.</comment>
<file context>
@@ -395,34 +480,86 @@ Scope {
width: groupsColumn.width
+ property bool grouped: group.items.length > 1
+ property bool collapsed: false
+
RowLayout {
</file context>
| *) | ||
| echo "Dev Tray needs $bin_dir on PATH in the graphical session." >&2 | ||
| echo "Add 'export PATH=\"\$HOME/.local/bin:\$PATH\"' to your session environment, then rerun this installer." >&2 | ||
| exit 1 |
There was a problem hiding this comment.
P2: The new PATH guard hard-fails the whole install (exit 1 before creating anything) whenever ~/.local/bin isn't already on PATH. For a first-time user that's a chicken-and-egg: they run the installer expecting it to set up the binary, but it aborts and creates nothing, forcing a manual two-step. It also checks the installer's own transient shell PATH rather than the graphical session's — the README already tells users to keep the two in sync precisely because they can differ — so the guard gives a false sense of certainty about the actual goal. Consider downgrading the hard failure to a clear warning (install anyway) or offering to create ~/.local/bin, so a fresh setup isn't a dead end; and use an exact equality on a :-delimited entry (rather than a case glob) so homedirs containing glob metacharacters don't produce a false mismatch.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At apps/linux/install-local.sh, line 13:
<comment>The new PATH guard hard-fails the whole install (`exit 1` before creating anything) whenever `~/.local/bin` isn't already on PATH. For a first-time user that's a chicken-and-egg: they run the installer expecting it to set up the binary, but it aborts and creates nothing, forcing a manual two-step. It also checks the installer's own transient shell PATH rather than the graphical session's — the README already tells users to keep the two in sync precisely because they can differ — so the guard gives a false sense of certainty about the actual goal. Consider downgrading the hard failure to a clear warning (install anyway) or offering to create `~/.local/bin`, so a fresh setup isn't a dead end; and use an exact equality on a `:`-delimited entry (rather than a `case` glob) so homedirs containing glob metacharacters don't produce a false mismatch.</comment>
<file context>
@@ -2,11 +2,23 @@
+ *)
+ echo "Dev Tray needs $bin_dir on PATH in the graphical session." >&2
+ echo "Add 'export PATH=\"\$HOME/.local/bin:\$PATH\"' to your session environment, then rerun this installer." >&2
+ exit 1
+ ;;
+esac
</file context>
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
1 participant
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.
Summary
ssand/proc, reusing the shared enrichment contractsTesting
npm testnpm run build:linuxSummary by cubic
Adds a Linux shell preview with a
dev-tray-linuxCLI, a Waybar count module, and a Quickshell popover. This adds branch-aware sessions and stronger error handling while keeping the desktop app Windows-only.dev-tray-linux: scans viass+/proc, enriches with@dev-tray/core, and exposesscan,waybar,open <port>, andkill <pid>; validates PIDs, selects the real listener owner via parent-chain, and kills process trees (SIGTERM then SIGKILL).branchAtStartper PID/start time under XDG state to flag branch drift; includes tests.active|idle|errorclasses; popover with project grouping (flat rows show project names), open/kill with confirm, 5s auto-refresh, 15s scan timeout, rescan-after-finish, and clear PATH errors with a retry action.build:linux,install:linux,scan:linux); README and ARCHITECTURE updated.Written for commit f9a5873. Summary will update on new commits.