Repository navigation
chore: rolling promotion dev -> main #650
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| #!/usr/bin/env bash | ||
| # Genie TUI — project session tabs for tmux top status bar | ||
| # Reads workers.json for agent counts per session, merges with tmux sessions. | ||
| # | ||
| # Output format per session: | ||
| # Active: #[bg=#7b2ff7,fg=#e0e0e0,bold] name (N) ● #[bg=#1a1a2e,fg=#7b2ff7] | ||
| # Inactive: #[fg=#b8a9c9,bg=#1a1a2e] name (N) | ||
| # | ||
| # Env: GENIE_WORKERS — override path to workers.json (for testing) | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| workers_file="${GENIE_WORKERS:-${HOME}/.genie/workers.json}" | ||
|
|
||
| # Get agent counts per session from workers.json (single jq pass) | ||
| declare -A agent_counts=() | ||
| if [[ -f "$workers_file" ]]; then | ||
| worker_data=$(jq -r ' | ||
| .workers // {} | to_entries | ||
| | group_by(.value.session) | ||
| | map({session: .[0].value.session, count: length}) | ||
| | map(.session + "\t" + (.count | tostring)) | ||
| | .[] | ||
| ' "$workers_file" 2>/dev/null) || worker_data="" | ||
|
|
||
| if [[ -n "$worker_data" ]]; then | ||
| while IFS=$'\t' read -r sess count; do | ||
| [[ -z "$sess" ]] && continue | ||
| agent_counts["$sess"]="$count" | ||
| done <<< "$worker_data" | ||
| fi | ||
| fi | ||
|
|
||
| # Get the currently active session name | ||
| has_tmux=true | ||
| active_session="" | ||
| if command -v tmux &>/dev/null; then | ||
| active_session=$(tmux display-message -p '#{client_session}' 2>/dev/null) || active_session="" | ||
| else | ||
| has_tmux=false | ||
| fi | ||
|
|
||
| max_visible=8 | ||
| output="" | ||
| declare -A seen_sessions=() | ||
| declare -a all_sessions=() | ||
| active_output="" | ||
|
There was a problem hiding this comment. 🧹 Nitpick | 🔵 Trivial Remove the dead
Also applies to: 60-60 🤖 Prompt for AI Agents |
||
|
|
||
| if [[ "$has_tmux" == "true" ]]; then | ||
| # Collect all sessions with their rendered output | ||
| while IFS=$'\t' read -r session_name window_count; do | ||
| [[ -z "$session_name" ]] && continue | ||
| seen_sessions["$session_name"]=1 | ||
| all_sessions+=("$session_name") | ||
|
|
||
| # Use agent count from workers.json; fall back to window count | ||
| task_count="${agent_counts[$session_name]:-$window_count}" | ||
|
|
||
| if [[ "$session_name" == "$active_session" ]]; then | ||
| active_output="#[bg=#7b2ff7,fg=#e0e0e0,bold] ${session_name} (${task_count}) ● #[bg=#1a1a2e,fg=#7b2ff7] " | ||
| fi | ||
| done < <(tmux list-sessions -F "#{session_name} #{session_windows}" 2>/dev/null) | ||
| fi | ||
|
|
||
| # Also include sessions from workers.json not yet seen (no tmux session or testing mode) | ||
| for sess in "${!agent_counts[@]}"; do | ||
| [[ -n "${seen_sessions[$sess]:-}" ]] && continue | ||
| all_sessions+=("$sess") | ||
| done | ||
|
|
||
| total=${#all_sessions[@]} | ||
|
|
||
| if [[ "$total" -le "$max_visible" ]]; then | ||
| # No overflow — render all sessions | ||
| for session_name in "${all_sessions[@]}"; do | ||
| task_count="${agent_counts[$session_name]:-0}" | ||
| # Prefer window count from tmux if available | ||
| if [[ "$has_tmux" == "true" ]]; then | ||
| wcount=$(tmux list-windows -t "$session_name" -F "x" 2>/dev/null | wc -l) || wcount=0 | ||
| task_count="${agent_counts[$session_name]:-$wcount}" | ||
| fi | ||
|
|
||
| if [[ "$session_name" == "$active_session" ]]; then | ||
| output+="#[bg=#7b2ff7,fg=#e0e0e0,bold] ${session_name} (${task_count}) ● #[bg=#1a1a2e,fg=#7b2ff7] " | ||
| else | ||
| output+="#[fg=#b8a9c9,bg=#1a1a2e] ${session_name} (${task_count}) " | ||
| fi | ||
| done | ||
| else | ||
| # Overflow — show up to max_visible with active session always included | ||
| shown=0 | ||
| active_shown=false | ||
|
|
||
| for session_name in "${all_sessions[@]}"; do | ||
| if [[ "$shown" -ge "$((max_visible - 1))" && "$active_shown" == "false" && "$session_name" != "$active_session" ]]; then | ||
| # Reserve last slot for active session | ||
| continue | ||
| fi | ||
| if [[ "$shown" -ge "$max_visible" ]]; then | ||
| break | ||
|
Comment on lines
+95
to
+100
There was a problem hiding this comment. Don't reserve an active-session slot when In the no-tmux/testing path, Suggested fixAlso applies to: 128-130 🤖 Prompt for AI Agents |
||
| fi | ||
|
|
||
| task_count="${agent_counts[$session_name]:-0}" | ||
| if [[ "$has_tmux" == "true" ]]; then | ||
| wcount=$(tmux list-windows -t "$session_name" -F "x" 2>/dev/null | wc -l) || wcount=0 | ||
| task_count="${agent_counts[$session_name]:-$wcount}" | ||
| fi | ||
|
|
||
| if [[ "$session_name" == "$active_session" ]]; then | ||
| output+="#[bg=#7b2ff7,fg=#e0e0e0,bold] ${session_name} (${task_count}) ● #[bg=#1a1a2e,fg=#7b2ff7] " | ||
| active_shown=true | ||
| else | ||
| output+="#[fg=#b8a9c9,bg=#1a1a2e] ${session_name} (${task_count}) " | ||
| fi | ||
| ((shown++)) || true | ||
| done | ||
|
|
||
| # If active session wasn't shown yet, append it | ||
| if [[ "$active_shown" == "false" && -n "$active_session" ]]; then | ||
| task_count="${agent_counts[$active_session]:-0}" | ||
| if [[ "$has_tmux" == "true" ]]; then | ||
| wcount=$(tmux list-windows -t "$active_session" -F "x" 2>/dev/null | wc -l) || wcount=0 | ||
| task_count="${agent_counts[$active_session]:-$wcount}" | ||
| fi | ||
| output+="#[bg=#7b2ff7,fg=#e0e0e0,bold] ${active_session} (${task_count}) ● #[bg=#1a1a2e,fg=#7b2ff7] " | ||
| fi | ||
|
|
||
| # Append overflow indicator | ||
| remaining=$((total - max_visible)) | ||
| output+="#[fg=#6c6c8a,bg=#1a1a2e] +${remaining} more " | ||
| fi | ||
|
|
||
| echo -n "$output" | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #!/usr/bin/env bash | ||
| # List all tmux sessions formatted for status bar display | ||
| # Active session gets purple highlight, others get dim text | ||
|
|
||
| current_session="$1" | ||
| if [ -z "$current_session" ]; then | ||
| current_session=$(tmux display-message -p '#{session_name}' 2>/dev/null) | ||
| fi | ||
|
|
||
| output="" | ||
| for sess in $(tmux list-sessions -F '#{session_name}' 2>/dev/null | sort); do | ||
| if [ "$sess" = "$current_session" ]; then | ||
| output+="#[bg=#7b2ff7,fg=#e0e0e0,bold] $sess #[bg=#16213e,fg=#7b2ff7,nobold]" | ||
| else | ||
| output+="#[fg=#b8a9c9,bg=#16213e] $sess " | ||
| fi | ||
| done | ||
|
Comment on lines
+11
to
+17
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: Repository: automagik-dev/genie Length of output: 93 🏁 Script executed: Repository: automagik-dev/genie Length of output: 839 🌐 Web query:
💡 Result: Tmux session names must be non-empty and cannot contain the characters ':' or '.'. Spaces and other special characters are allowed as long as they are not ':' or '.'. There is no defined maximum length. When creating or renaming a session, tmux validates the name using session_check_name, which returns an error if the name is empty or contains ':' or '.'. In the source code, this check is: return (*name != '\0' && name[strcspn(name, ":.")] == '\0');. If invalid, commands like new-session or rename-session report "bad session name". Colons and periods are prohibited because they are special characters used in tmux targets to separate session:window and window.pane (e.g., mysession:mywindow.1). Tabs are allowed in older versions but sanitized to spaces in tmux 3.2+. Control characters may cause issues like hanging (fixed in 3.0+), but are not explicitly forbidden beyond validation. Examples: - Valid: "my session", "test-123", "user@host" - Invalid: "", "my:session", "my.session", "session:name" Official tmux man pages do not explicitly document these constraints, but they are enforced in the code and confirmed by tmux maintainer in GitHub issues. Citations:
Avoid word-splitting session names during iteration. Line 11 uses command substitution in a Suggested fix🤖 Prompt for AI Agents |
||
|
|
||
| echo "$output" | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #!/usr/bin/env bash | ||
| # Genie TUI — per-window agent enrichment label | ||
| # Called from window-status-format via #() for each window tab. | ||
| # Must be fast (< 50ms) — single jq query, early exit on missing data. | ||
| # | ||
| # Usage: genie-window-label.sh <session_name> <window_name> | ||
| # Output: " ×count emoji" (e.g., " ×3 🔨") or empty string | ||
| # | ||
| # Env: GENIE_WORKERS — override path to workers.json (for testing) | ||
|
|
||
| session="${1:-}" | ||
| window="${2:-}" | ||
|
|
||
| # Early exit if no args | ||
| if [ -z "$session" ] || [ -z "$window" ]; then | ||
| exit 0 | ||
| fi | ||
|
|
||
| workers_file="${GENIE_WORKERS:-${HOME}/.genie/workers.json}" | ||
|
|
||
| # Early exit if no workers file | ||
| if [ ! -f "$workers_file" ]; then | ||
| exit 0 | ||
| fi | ||
|
|
||
| # Single jq pass: filter by session + window, count + worst state emoji | ||
| result=$(jq -r --arg sess "$session" --arg win "$window" ' | ||
| def state_priority: | ||
| {"error": 7, "permission": 6, "working": 5, "spawning": 4, "idle": 3, "done": 2, "suspended": 1}; | ||
| def state_emoji: | ||
| {"spawning": "⏳", "working": "🔨", "idle": "⏸", "done": "✓", "error": "✗", "permission": "❓", "suspended": "💤"}; | ||
|
|
||
| .workers // {} | to_entries | ||
| | map(select(.value.session == $sess and (.value.windowName // .value.team // "unknown") == $win)) | ||
| | if length == 0 then "" | ||
| else | ||
| length as $count | ||
| | map(.value.state // "idle") | ||
| | map(. as $s | state_priority[$s] // 0) | ||
| | max as $max_pri | ||
| | (state_priority | to_entries | map(select(.value == $max_pri)) | .[0].key // "idle") as $worst | ||
| | " ×\($count) \(state_emoji[$worst] // "")" | ||
| end | ||
| ' "$workers_file" 2>/dev/null) || exit 0 | ||
|
|
||
| # Only print if non-empty | ||
| if [ -n "$result" ]; then | ||
| printf '%s' "$result" | ||
| fi |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,16 +44,14 @@ describe('buildClaudeCommand', () => { | |
| expect(cmd).toContain('--dangerously-skip-permissions'); | ||
| }); | ||
|
|
||
| test('includes --agent-id with team-lead@team pattern', () => { | ||
| const cmd = buildClaudeCommand('my-team'); | ||
| expect(cmd).toContain(`--agent-id 'team-lead@my-team'`); | ||
| }); | ||
|
|
||
| test('includes --agent-name as team-lead', () => { | ||
| const cmd = buildClaudeCommand('genie'); | ||
| expect(cmd).toContain('--agent-name team-lead'); | ||
| }); | ||
|
|
||
| test('with system prompt file references it via --append-system-prompt-file', () => { | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -113,7 +113,7 @@ async function ensureNativeTeamForLeader(teamName: string, cwd: string): Promise | |||||||
|
|
||||||||
| await registerNativeMember(teamName, { | ||||||||
| agentName: basename(cwd), | ||||||||
| agentType: 'team-lead', | ||||||||
| color: 'blue', | ||||||||
| cwd, | ||||||||
| }); | ||||||||
|
|
@@ -319,8 +319,8 @@ function attachToWindow(sessionName: string, windowName: string): void { | |||||||
| } | ||||||||
|
|
||||||||
| export async function sessionCommand(options: SessionOptions = {}): Promise<void> { | ||||||||
| const workspaceDir = options.dir ?? process.cwd(); | ||||||||
| const sessionName = options.name ?? sanitizeWindowName(basename(workspaceDir)); | ||||||||
|
There was a problem hiding this comment. Revert default Defaulting to Proposed fix📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||
|
|
||||||||
| try { | ||||||||
| const windowName = await deriveWindowName(sessionName, workspaceDir, options.team); | ||||||||
|
|
@@ -335,12 +335,24 @@ export async function sessionCommand(options: SessionOptions = {}): Promise<void | |||||||
|
|
||||||||
| if (!session) { | ||||||||
| await createSession(sessionName, windowName, workspaceDir, systemPromptFile); | ||||||||
| attachToWindow(sessionName, windowName); | ||||||||
| } else if (process.env.TMUX) { | ||||||||
| // Already inside tmux — launch Claude Code in the CURRENT pane | ||||||||
| const suffix = Date.now().toString(36).slice(-4); | ||||||||
| const currentWindowName = `${windowName}-${suffix}`; | ||||||||
| await tmux.executeTmux(`rename-window ${shellQuote(currentWindowName)}`); | ||||||||
| await ensureNativeTeamForLeader(currentWindowName, workspaceDir); | ||||||||
| const agentName = basename(workspaceDir); | ||||||||
| const resumeSessionId = findLastSessionId(sanitizeTeamName(currentWindowName), agentName, workspaceDir); | ||||||||
| const cmd = buildClaudeCommand(currentWindowName, systemPromptFile || undefined, resumeSessionId || undefined); | ||||||||
|
Comment on lines
+339
to
+347
There was a problem hiding this comment. Inside-tmux flow can target the wrong window and fragments team identity.
Proposed fixBased on learnings: 🤖 Prompt for AI Agents |
||||||||
| const { execSync: execSyncCmd } = require('node:child_process'); | ||||||||
| execSyncCmd(cmd, { stdio: 'inherit', cwd: workspaceDir }); | ||||||||
|
Comment on lines
+348
to
+349
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: Repository: automagik-dev/genie Length of output: 1151 🏁 Script executed: Repository: automagik-dev/genie Length of output: 2020 🏁 Script executed: Repository: automagik-dev/genie Length of output: 637 🏁 Script executed: Repository: automagik-dev/genie Length of output: 657 Use static import for In ESM mode ( Proposed fixThen at line 348–349: 📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||
| } else { | ||||||||
| // Outside tmux — attach to existing session | ||||||||
| console.log(`Session "${sessionName}" already exists`); | ||||||||
| await focusTeamWindow(sessionName, windowName, workspaceDir, systemPromptFile); | ||||||||
| attachToWindow(sessionName, windowName); | ||||||||
| } | ||||||||
| } catch (error) { | ||||||||
| const message = error instanceof Error ? error.message : String(error); | ||||||||
| console.error(`Error: ${message}`); | ||||||||
|
|
||||||||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The versioning script (
scripts/version.ts) updates this version by targeting the first plugin in thepluginsarray (plugins[0]). This approach is brittle and may lead to incorrect versioning if more plugins are added to this file or if their order changes. To make the update process more robust, the script should be modified to locate the 'genie' plugin by itsnameproperty before updating the version.