[namastex888]

Summary

Final cleanup of the ?? 'genie' team-fallback anti-pattern. Trace investigation after PRs #1154 / #1156 / #1157 merged found one remaining site the prior audits missed because it lived on the RESUME path, not the spawn path.

The remaining site

src/term-commands/agents.ts:1901 (buildResumeParams):

// Before
const team = template?.team ?? agent.team ?? 'genie';

When BOTH template?.team and agent.team are undefined (registry corruption, pre-team-tracking record, or template missing team), the literal 'genie' silently captured the resumed agent into the wrong team — same drift the spawn-path fixes targeted, just on a different code path.

Fix

Use the same hierarchical resolution chain as handleWorkerSpawn at agents.ts:1606:

-  const team = template?.team ?? agent.team ?? 'genie';
+  const team = template?.team ?? agent.team ?? (await nativeTeams.discoverTeamName());
+  if (!team) {
+    throw new Error(
+      `Cannot resume agent "${agent.id}": no team context (template, agent record, env, or session). Pass --team or set GENIE_TEAM, or run inside a registered tmux session.`,
+    );
+  }

Resolution chain becomes:

1. template?.team (immediate)
2. agent.team (stored on registration)
3. discoverTeamName() (env → tmux session-id matching)
4. Explicit error if all fail (matches the pattern at agents.ts:1607-1609)

Behavior change

Resume operations that previously fell back silently to 'genie' team now either resolve hierarchically OR fail loudly with a recovery hint. No more silent team-misattribution on resume.

Verification

After this commit lands: 0 occurrences of ?? 'genie' (or any literal 'genie' team-fallback shape) remain in src/. Full 100% removal.

The remaining 'genie' literals in the codebase are NOT anti-patterns:

• process.argv[1] ?? 'genie' — CLI binary name (correct)
• process.env.GENIE_TMUX_SOCKET || 'genie' — tmux socket name (correct)

Test plan

• bun run check — full gate: 2461 tests, 0 fail, lint clean (modulo pre-existing complexity warning at line 1073)
• Manual: kill an agent, then genie resume <name> from inside tmux session → should resume with discovered team
• Manual: kill an agent, then genie resume <name> from outside tmux with no GENIE_TEAM → should error with recovery hint, not silently fall back to 'genie' team

Sequencing

Fourth and final PR in the spawn-hierarchy cleanup arc. Order:

• fix(spawn): remove hardcoded 'genie' default from --team #1154 (merged) — spawn.ts:23 (genie agent spawn long form)
• fix(team-resolution): remove all '?? genie' fallbacks — spawns + dispatch respect hierarchy (100%) #1156 (merged) — genie.ts:292 (genie spawn top-level alias) + dispatch.ts (4 sub-spawns) + SpawnOptions.team optional + ci.yml 8vcpu
• fix(reset): prevent data loss in resetWishCommand — let createState own delete+create atomically #1157 (merged) — resetWishCommand data-loss
• #this — buildResumeParams (resume path)

After this lands, the 'genie' literal team-fallback drift is fully eliminated.

Generated with Claude Code.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: f3414458-5f1c-4937-859c-40975cf09fbe

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix/resume-team-hierarchy

---

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.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[gemini-code-assist]

Code Review

This pull request updates the buildResumeParams function in src/term-commands/agents.ts to dynamically resolve the team name using nativeTeams.discoverTeamName() instead of a hardcoded default. It also adds an error check to ensure a team context is available. A review comment suggests passing agent.repoPath to the discovery function to improve robustness when the command is executed from outside the agent's repository.

[gemini-code-assist]

When discovering the team name as a fallback during resume, it is more robust to pass agent.repoPath to discoverTeamName(). This allows the discovery logic to correctly identify the team context from the agent's project directory, even if the current working directory of the CLI process is different (e.g., when running genie resume from outside the repository).

Suggested change

	const team = template?.team ?? agent.team ?? (await nativeTeams.discoverTeamName());
	const team = template?.team ?? agent.team ?? (await nativeTeams.discoverTeamName(agent.repoPath));