diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index d3d67fae2..c66948376 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -10,7 +10,7 @@
   "plugins": [
     {
       "name": "genie",
-      "version": "4.260416.3",
+      "version": "4.260416.5",
       "source": "./plugins/genie",
       "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, wish them into plans, make with parallel agents, ship as one team. A coding genie that grows with your project."
     }
diff --git a/package.json b/package.json
index 33847533c..7a092e23a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@automagik/genie",
-  "version": "4.260416.3",
+  "version": "4.260416.5",
   "description": "Collaborative terminal toolkit for human + AI workflows",
   "type": "module",
   "bin": {
diff --git a/plugins/genie/.claude-plugin/plugin.json b/plugins/genie/.claude-plugin/plugin.json
index 4f1da5072..978953848 100644
--- a/plugins/genie/.claude-plugin/plugin.json
+++ b/plugins/genie/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "genie",
-  "version": "4.260416.3",
+  "version": "4.260416.5",
   "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, turn them into wishes, execute with /work, validate with /review, and ship as one team.",
   "author": {
     "name": "Namastex Labs"
diff --git a/plugins/genie/package.json b/plugins/genie/package.json
index 0f7492ab6..871cb5868 100644
--- a/plugins/genie/package.json
+++ b/plugins/genie/package.json
@@ -1,6 +1,6 @@
 {
   "name": "genie-plugin",
-  "version": "4.260416.3",
+  "version": "4.260416.5",
   "private": true,
   "description": "Runtime dependencies for genie bundled CLIs",
   "type": "module",
diff --git a/src/term-commands/agents.ts b/src/term-commands/agents.ts
index f316d18ec..9ea4dae0f 100644
--- a/src/term-commands/agents.ts
+++ b/src/term-commands/agents.ts
@@ -1898,7 +1898,12 @@ async function buildResumeParams(
 ): Promise<SpawnParams> {
   const agentName = agent.role ?? agent.id;
   const provider = (template?.provider ?? agent.provider ?? 'claude') as ProviderName;
-  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.`,
+    );
+  }
 
   // Restore identity file on resume so the agent keeps its AGENTS.md identity
   // instead of falling back to CWD-based discovery (which walks up and may find