fix(teams): back-fill PG teams row from ensureNativeTeam by automagik-genie · Pull Request #1165 · automagik-si/genie

automagik-genie · 2026-04-17T18:34:35Z

Summary

Genie keeps two parallel team registries: PG teams (queried by genie team ls, listTeams, etc.) and on-disk ~/.claude/teams/<name>/config.json (used by the Claude Code native-team IPC protocol). Only genie team create writes to both. Every other spawn path that reaches ensureNativeTeam (implicit team creation during genie agent spawn) writes ONLY to disk.

After a reboot that resets pgserve data (or any PG-loss scenario with the native team file intact), genie team ls returns empty even though the team is fully operational on disk. No code path reconciles the two sources — this was observed on a real reboot as part of the same incident that motivated #1163 and #1164.

Fix

Add ensureTeamRow(name, { repo }) in team-manager.ts as a lightweight, idempotent back-fill. Call it from ensureNativeTeam after the native config is either loaded or freshly saved.

Design — minimal by intent

ensureTeamRow does not create a git worktree. worktreePath defaults to repo (the current cwd). If a user later runs genie team create <same-name>, the existing getTeam check returns this back-filled row and skips worktree creation. Callers who need a real worktree must run createTeam explicitly before spawning.
INSERT ... ON CONFLICT (name) DO NOTHING — never clobbers an explicit createTeam row.
The callback in claude-native-teams.ts uses await import('./team-manager.js') to avoid a circular dependency (team-manager already imports claude-native-teams), and swallows all errors so the native-team code path is never blocked by PG issues.
Invalid branch names return null silently rather than throwing, because the caller is on a hot spawn path.

Not in scope

Unifying the two registries into a single source of truth is a bigger design change and is deliberately not attempted here. This PR only eliminates the empty-team ls drift after reboot. A full unification needs a separate design discussion — e.g. should native-team files become a projection of the PG table, or vice versa, or should genie team ls merge both?

Tests

Four new cases in team-manager.test.ts:

inserts a minimal row when no team exists in PG
is idempotent — returns existing row on re-run
does not clobber a row created via createTeam
returns null for invalid branch names

Full suite: 2487/2487 pass. Team + native-teams files alone: 75/75.

Test plan

Unit tests cover insert / idempotency / non-clobber / invalid name
Full repo test suite passes locally
CI on `dev` passes
Manual verification: delete a row from the `teams` table with an on-disk native-team file still present → next spawn triggers back-fill → `genie team ls` lists the team again

🤖 Generated with Claude Code

Symptom: after a reboot that wiped the pgserve data dir (or any scenario where PG state is lost while the on-disk native team config at ~/.claude/teams/<name>/config.json survived), `genie team ls` returned an empty list even though the team was fully usable via the native protocol. The two registries — PG `teams` table and native team files — drifted apart and no code path reconciled them. Fix: add `ensureTeamRow(name, { repo })` to team-manager as a lightweight, idempotent back-fill, and call it from `ensureNativeTeam` after the native config is either loaded or saved. Mirrors newly minted (or surviving) native teams into the PG registry so `team ls` reflects reality. Design choices to keep this minimal: - `ensureTeamRow` does NOT create a git worktree — `worktreePath` defaults to `repo` (current cwd). If a user later runs `genie team create <same-name>`, its own `getTeam` check returns the back-filled row and skips worktree creation. Callers who need a real worktree must run `createTeam` explicitly. - `INSERT ... ON CONFLICT (name) DO NOTHING` — never clobbers an explicit `createTeam` row. - `backfillTeamRow` in claude-native-teams.ts uses a dynamic import to avoid circular dependency with team-manager.ts, and swallows errors so the native-team path is never blocked by PG issues. - Invalid branch names are rejected silently (returns null) since the caller is `ensureNativeTeam`, which is on a hot path. Tests: 4 new cases in team-manager.test.ts covering fresh insert, idempotency, non-clobber of createTeam rows, and invalid name rejection. Full suite: 75/75 pass across team-manager + native-teams. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

coderabbitai · 2026-04-17T18:34:42Z

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: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 62bf050f-4d6c-4969-9d54-3ba122f83c95

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/ensure-native-team-upsert-pg

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

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

gemini-code-assist

Code Review

This pull request implements a back-fill mechanism to synchronize on-disk native teams with the PostgreSQL database, ensuring consistency in team listings. The review feedback identifies opportunities to improve performance by making the back-fill operation non-blocking and optimizing the database insertion logic to eliminate redundant queries and refine audit logging.

gemini-code-assist · 2026-04-17T18:37:03Z

+    // Back-fill the PG teams row if it's missing (e.g. after a pgserve reset
+    // where the on-disk native team survived but the `teams` row did not).
+    // Best-effort — never block the native team code path on PG failures.
+    await backfillTeamRow(sanitizeTeamName(teamName));


The backfillTeamRow function is intended to be a best-effort, non-blocking operation. However, it is currently being awaited, which means if the database is slow to respond or if pgserve needs to be auto-started (which has a 16-second timeout), the "hot" spawn path will be significantly delayed. Since the native team functionality does not depend on the PostgreSQL row being present immediately, this call should not be awaited.

Suggested change

await backfillTeamRow(sanitizeTeamName(teamName));

backfillTeamRow(sanitizeTeamName(teamName)).catch(() => {});

gemini-code-assist · 2026-04-17T18:37:03Z

  await saveConfig(teamName, config);
+  // Mirror the newly created native team into the PG `teams` registry so
+  // `genie team ls` reflects reality. Idempotent and best-effort.
+  await backfillTeamRow(sanitized);


Similar to the previous call, this should not be awaited to avoid blocking the spawn flow on potential database latency or timeouts.

Suggested change

await backfillTeamRow(sanitized);

backfillTeamRow(sanitized).catch(() => {});

gemini-code-assist · 2026-04-17T18:37:03Z

+    await sql`
+      INSERT INTO teams (
+        name, repo, base_branch, worktree_path, leader,
+        members, status, native_teams_enabled, created_at
+      ) VALUES (
+        ${config.name}, ${config.repo}, ${config.baseBranch},
+        ${config.worktreePath}, ${null},
+        ${JSON.stringify(config.members)}, ${config.status},
+        ${config.nativeTeamsEnabled ?? false}, ${config.createdAt}
+      ) ON CONFLICT (name) DO NOTHING
+    `;
+    recordAuditEvent('team', name, 'backfilled', getActor(), { repo: repoPath, source: 'native-team' }).catch(() => {});
+    return (await getTeam(name)) ?? config;


This block can be optimized to avoid a redundant SELECT query when a new row is successfully inserted. Additionally, the audit event should only be recorded if a row was actually backfilled (i.e., when the INSERT didn't conflict with an existing row).

const result = await sql`\n INSERT INTO teams (\n name, repo, base_branch, worktree_path, leader,\n members, status, native_teams_enabled, created_at\n ) VALUES (\n ${config.name}, ${config.repo}, ${config.baseBranch},\n ${config.worktreePath}, ${null},\n ${JSON.stringify(config.members)}, ${config.status},\n ${config.nativeTeamsEnabled}, ${config.createdAt}\n ) ON CONFLICT (name) DO NOTHING\n `;\n\n if (result.count === 0) {\n return (await getTeam(name)) ?? config;\n }\n\n recordAuditEvent('team', name, 'backfilled', getActor(), { repo: repoPath, source: 'native-team' }).catch(() => {});\n return config;

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5f9e7d3707

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-04-17T18:38:10Z

+    // Back-fill the PG teams row if it's missing (e.g. after a pgserve reset
+    // where the on-disk native team survived but the `teams` row did not).
+    // Best-effort — never block the native team code path on PG failures.
+    await backfillTeamRow(sanitizeTeamName(teamName));


Backfill using canonical team name, not sanitized slug

ensureNativeTeam backfills PG with sanitizeTeamName(teamName), which changes branch-style team names like feat/auth into feat-auth. For teams originally created through createTeam, this misses the existing row (name='feat/auth') and can insert a second, mismatched row or collide with a real feat-auth team. That breaks team identity consistency across commands (getTeam, listTeams, disband/hire/fire) whenever names include / or other sanitized characters.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T18:38:10Z

+    name,
+    repo: repoPath,
+    baseBranch: 'dev',
+    worktreePath: repoPath,


Do not set backfilled worktreePath to repo directory

The backfilled row stores worktreePath equal to repoPath. Later, disbandTeam calls removeWorktree(config.worktreePath), and that helper falls back to recursive rm when git worktree remove fails; for a backfilled team this targets the repo directory itself. In practice, disbanding one of these teams can delete the main checkout (or a user’s current subdirectory if process.cwd() was used), which is destructive data loss.

Useful? React with 👍 / 👎.

namastex888 merged commit 9ec5ea9 into dev Apr 17, 2026
6 checks passed

gemini-code-assist Bot reviewed Apr 17, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Apr 17, 2026

View reviewed changes

automagik-genie mentioned this pull request Apr 18, 2026

release: spawn/team resolver hardening + TUI CLI-symmetric surfaces (v4.260417.1 → v4.260418.1) #1162

Closed

4 of 6 tasks

automagik-genie deleted the fix/ensure-native-team-upsert-pg branch September 25, 2026 04:50

Navigation Menu

Repository navigation

fix(teams): back-fill PG teams row from ensureNativeTeam - #1165

fix(teams): back-fill PG teams row from ensureNativeTeam#1165
namastex888 merged 1 commit into
devfrom
fix/ensure-native-team-upsert-pg

automagik-genie commented Apr 17, 2026

Uh oh!

coderabbitai Bot commented Apr 17, 2026

Review skipped

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Apr 17, 2026

Uh oh!

gemini-code-assist Bot Apr 17, 2026

Uh oh!

gemini-code-assist Bot Apr 17, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Apr 17, 2026

Uh oh!

chatgpt-codex-connector Bot Apr 17, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	await backfillTeamRow(sanitizeTeamName(teamName));
	backfillTeamRow(sanitizeTeamName(teamName)).catch(() => {});

	await backfillTeamRow(sanitized);
	backfillTeamRow(sanitized).catch(() => {});

Conversation

automagik-genie commented Apr 17, 2026

Summary

Fix

Design — minimal by intent

Not in scope

Tests

Test plan

Uh oh!

coderabbitai Bot commented Apr 17, 2026

Review skipped

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants