tagteam 0.1.0 → 0.2.0

package/dist/index.js

@@ -2,6 +2,7 @@
 
 // src/index.ts
 import { Command } from "commander";
+import { execSync as execSync2 } from "child_process";
 import chalk from "chalk";
 
 // src/config.ts
@@ -10,17 +11,27 @@ import { join } from "path";
 import { homedir } from "os";
 import { parse, stringify } from "smol-toml";
 var DEFAULT_CONFIG = {
+  agents: ["claude", "codex"],
   claude: {
     model: "sonnet"
   },
   codex: {
     model: "gpt-5.3-codex"
   },
+  gemini: {
+    model: "gemini-2.5-pro"
+  },
   discussion: {
     max_rounds: 10
   }
 };
 function getConfigDir() {
+  if (process.platform === "win32") {
+    return join(
+      process.env.APPDATA || join(homedir(), "AppData", "Roaming"),
+      "tagteam"
+    );
+  }
   return join(homedir(), ".tagteam");
 }
 function getConfigPath() {
@@ -41,8 +52,10 @@ function loadConfig() {
     const raw = readFileSync(configPath, "utf-8");
     const parsed = parse(raw);
     return {
+      agents: Array.isArray(parsed.agents) && parsed.agents.length === 2 ? parsed.agents : [...DEFAULT_CONFIG.agents],
       claude: { ...DEFAULT_CONFIG.claude, ...parsed.claude },
       codex: { ...DEFAULT_CONFIG.codex, ...parsed.codex },
+      gemini: { ...DEFAULT_CONFIG.gemini, ...parsed.gemini },
       discussion: { ...DEFAULT_CONFIG.discussion, ...parsed.discussion }
     };
   } catch {
@@ -59,12 +72,18 @@ function setConfigValue(key, value) {
   const parts = key.split(".");
   if (parts.length === 1) {
     switch (parts[0]) {
+      case "agents":
+        config.agents = value.split(",").map((s) => s.trim());
+        break;
       case "claude_model":
         config.claude.model = value;
         break;
       case "codex_model":
         config.codex.model = value;
         break;
+      case "gemini_model":
+        config.gemini.model = value;
+        break;
       case "discussion_max_rounds":
         config.discussion.max_rounds = Number(value);
         break;
@@ -77,6 +96,8 @@ function setConfigValue(key, value) {
       config.claude.model = value;
     } else if (section === "codex" && field === "model") {
       config.codex.model = value;
+    } else if (section === "gemini" && field === "model") {
+      config.gemini.model = value;
     } else if (section === "discussion" && field === "max_rounds") {
       config.discussion.max_rounds = Number(value);
     } else {
@@ -338,6 +359,150 @@ async function runCodex(options) {
   };
 }
 
+// src/agents/gemini.ts
+import { spawn as spawn3 } from "child_process";
+async function* streamGemini(options) {
+  const args = ["-p"];
+  let fullPrompt = options.prompt;
+  if (options.systemPrompt) {
+    fullPrompt = `${options.systemPrompt}
+
+---
+
+${options.prompt}`;
+  }
+  args.push(fullPrompt, "--output-format", "json", "--yolo");
+  if (options.model) {
+    args.push("-m", options.model);
+  }
+  const proc = spawn3("gemini", args, {
+    cwd: options.cwd,
+    stdio: ["ignore", "pipe", "inherit"],
+    env: process.env
+  });
+  let spawnErrorMsg = "";
+  proc.on("error", (err) => {
+    spawnErrorMsg = err.message;
+  });
+  if (options.signal) {
+    if (options.signal.aborted) {
+      proc.kill();
+    } else {
+      options.signal.addEventListener("abort", () => proc.kill(), { once: true });
+    }
+  }
+  const chunks = [];
+  proc.stdout.on("data", (chunk) => {
+    chunks.push(chunk);
+  });
+  await new Promise((resolve) => {
+    proc.on("close", resolve);
+  });
+  if (spawnErrorMsg) {
+    yield {
+      type: "error",
+      agent: "gemini",
+      content: `Failed to spawn gemini: ${spawnErrorMsg}`
+    };
+    yield { type: "done", agent: "gemini" };
+    return;
+  }
+  const stdout = Buffer.concat(chunks).toString("utf-8").trim();
+  if (!stdout) {
+    yield { type: "error", agent: "gemini", content: "No output from gemini" };
+    yield { type: "done", agent: "gemini" };
+    return;
+  }
+  try {
+    const data = JSON.parse(stdout);
+    if (data.error) {
+      yield { type: "error", agent: "gemini", content: data.error };
+    } else if (data.response) {
+      yield { type: "text", agent: "gemini", content: data.response };
+    } else {
+      yield { type: "error", agent: "gemini", content: "Unexpected response format" };
+    }
+  } catch {
+    yield { type: "text", agent: "gemini", content: stdout };
+  }
+  yield { type: "done", agent: "gemini" };
+}
+async function runGemini(options) {
+  const start = Date.now();
+  const events = [];
+  const textParts = [];
+  const errors = [];
+  for await (const event of streamGemini(options)) {
+    events.push(event);
+    if (event.type === "text" && event.content) {
+      textParts.push(event.content);
+    } else if (event.type === "error" && event.content) {
+      errors.push(event.content);
+    }
+  }
+  return {
+    agent: "gemini",
+    text: textParts.join(""),
+    events,
+    durationMs: Date.now() - start,
+    error: errors.length > 0 ? errors.join("\n") : void 0
+  };
+}
+
+// src/agents/registry.ts
+var AGENTS = {
+  claude: {
+    name: "claude",
+    displayName: "Claude",
+    color: "magenta",
+    cliBinary: "claude",
+    installUrl: "https://docs.anthropic.com/en/docs/claude-code",
+    org: "Anthropic",
+    run: runClaude
+  },
+  codex: {
+    name: "codex",
+    displayName: "Codex",
+    color: "green",
+    cliBinary: "codex",
+    installUrl: "https://github.com/openai/codex",
+    org: "OpenAI",
+    run: runCodex
+  },
+  gemini: {
+    name: "gemini",
+    displayName: "Gemini",
+    color: "blue",
+    cliBinary: "gemini",
+    installUrl: "https://github.com/google-gemini/gemini-cli",
+    org: "Google",
+    run: runGemini
+  }
+};
+function getAgent(name) {
+  return AGENTS[name];
+}
+function getAllAgentNames() {
+  return Object.keys(AGENTS);
+}
+function isValidAgentName(name) {
+  return name in AGENTS;
+}
+function validateAgentPair(pair) {
+  if (pair.length !== 2) {
+    throw new Error("Agent pair must contain exactly 2 agents");
+  }
+  if (pair[0] === pair[1]) {
+    throw new Error("Agent pair must contain 2 distinct agents");
+  }
+  for (const name of pair) {
+    if (!isValidAgentName(name)) {
+      throw new Error(`Unknown agent: "${name}". Valid agents: ${getAllAgentNames().join(", ")}`);
+    }
+  }
+  return pair;
+}
+
 // src/format.ts
 function formatAsMarkdown(messages) {
   const parts = [];
@@ -345,8 +510,8 @@ function formatAsMarkdown(messages) {
     if (msg.role === "system") continue;
     if (msg.role === "user") {
       parts.push(`**You:** ${msg.content}`);
-    } else {
-      const name = msg.role === "claude" ? "Claude" : "Codex";
+    } else if (isValidAgentName(msg.role)) {
+      const name = getAgent(msg.role).displayName;
       if (msg.error) {
         parts.push(`**${name}:** *(error)*
 
@@ -371,14 +536,37 @@ function copyToClipboard(text) {
   } else if (platform === "win32") {
     cmd = "clip";
   } else {
+    let hasXclip = false;
+    let hasXsel = false;
     try {
       execSync("which xclip", { stdio: "ignore" });
-      cmd = "xclip -selection clipboard";
+      hasXclip = true;
     } catch {
+    }
+    if (!hasXclip) {
+      try {
+        execSync("which xsel", { stdio: "ignore" });
+        hasXsel = true;
+      } catch {
+      }
+    }
+    if (hasXclip) {
+      cmd = "xclip -selection clipboard";
+    } else if (hasXsel) {
       cmd = "xsel --clipboard --input";
+    } else {
+      throw new Error(
+        "Clipboard requires xclip or xsel. Install one with: sudo apt install xclip"
+      );
     }
   }
-  execSync(cmd, { input: text, stdio: ["pipe", "ignore", "ignore"] });
+  try {
+    execSync(cmd, { input: text, stdio: ["pipe", "ignore", "ignore"] });
+  } catch {
+    throw new Error(
+      `Failed to copy to clipboard using "${cmd.split(" ")[0]}". Check that it is installed and working.`
+    );
+  }
 }
 
 // src/db/index.ts
@@ -496,15 +684,16 @@ function deleteMessagesFromRound(sessionId, fromRound) {
 }
 
 // src/prompts.ts
-var OTHER = {
-  claude: "Codex (OpenAI)",
-  codex: "Claude (Anthropic)"
-};
-function collaborationPrompt(agent) {
-  return `You are in a collaborative session with ${OTHER[agent]}. You'll both respond to the user's prompt independently, then see each other's responses. In discussion rounds: highlight where you agree, constructively address disagreements, and build on each other's ideas. Be concise - avoid repeating what was already said.`;
+function otherAgent(agent, pair) {
+  const other = pair[0] === agent ? pair[1] : pair[0];
+  const desc = getAgent(other);
+  return `${desc.displayName} (${desc.org})`;
+}
+function collaborationPrompt(agent, pair) {
+  return `You are in a collaborative session with ${otherAgent(agent, pair)}. You'll both respond to the user's prompt independently, then see each other's responses. In discussion rounds: highlight where you agree, constructively address disagreements, and build on each other's ideas. Be concise - avoid repeating what was already said.`;
 }
-function discussionPrompt(agent, conversationHistory) {
-  return `${collaborationPrompt(agent)}
+function discussionPrompt(agent, conversationHistory, pair) {
+  return `${collaborationPrompt(agent, pair)}
 
 Here is the conversation so far:
 
@@ -512,29 +701,40 @@ ${conversationHistory}
 
 Now provide your response for this discussion round. Build on what was said, highlight agreements, and address any disagreements constructively. Be concise.`;
 }
-function debatePrompt(agent) {
-  return `You are in a structured debate with ${OTHER[agent]}. You'll both respond to the user's prompt, then see each other's responses and discuss.
+function debatePrompt(agent, pair) {
+  const other = otherAgent(agent, pair);
+  return `You are in a structured debate with ${other}. You'll both respond to the user's prompt, then see each other's responses and discuss.
 
 Your goal is to reach consensus through constructive discussion. In each round:
 - Address specific points of agreement and disagreement
-- Refine your position based on valid arguments from ${OTHER[agent]}
+- Refine your position based on valid arguments from ${other}
 - Be concise \u2014 don't repeat points already established
 
-When you believe you and ${OTHER[agent]} have reached substantial agreement on the key points, end your response with [CONSENSUS] on its own line. Only do this when you genuinely agree \u2014 don't force premature consensus.`;
+When you believe you and ${other} have reached substantial agreement on the key points, end your response with [CONSENSUS] on its own line. Only do this when you genuinely agree \u2014 don't force premature consensus.`;
 }
-function debateRoundPrompt(agent, conversationHistory) {
-  return `${debatePrompt(agent)}
+function debateRoundPrompt(agent, conversationHistory, pair) {
+  const other = otherAgent(agent, pair);
+  return `${debatePrompt(agent, pair)}
 
 Here is the conversation so far:
 
 ${conversationHistory}
 
-Respond to the latest round. If you agree with ${OTHER[agent]}'s position on all key points, end with [CONSENSUS]. Otherwise, continue the discussion.`;
+Respond to the latest round. If you agree with ${other}'s position on all key points, end with [CONSENSUS]. Otherwise, continue the discussion.`;
 }
 var CONSENSUS_MARKER = "[CONSENSUS]";
 function formatConversationHistory(messages) {
   return messages.map((m) => {
-    const label = m.role === "user" ? "User" : m.agent === "claude" ? "Claude" : "Codex";
+    let label;
+    if (m.role === "user") {
+      label = "User";
+    } else if (isValidAgentName(m.role)) {
+      label = getAgent(m.role).displayName;
+    } else if (m.agent && isValidAgentName(m.agent)) {
+      label = getAgent(m.agent).displayName;
+    } else {
+      label = m.role;
+    }
     return `[${label}]: ${m.content}`;
   }).join("\n\n");
 }
@@ -545,6 +745,21 @@ import { render, Box, Text, useApp, useInput } from "ink";
 import TextInput from "ink-text-input";
 import { jsx, jsxs } from "react/jsx-runtime";
 var CONFIG_FIELDS = [
+  {
+    key: "agents",
+    label: "Agent pair",
+    get: (c) => c.agents.join(", "),
+    type: "string",
+    validate: (value) => {
+      try {
+        const names = value.split(",").map((s) => s.trim());
+        validateAgentPair(names);
+        return null;
+      } catch (e) {
+        return e.message;
+      }
+    }
+  },
   {
     key: "claude.model",
     label: "Claude model",
@@ -557,6 +772,12 @@ var CONFIG_FIELDS = [
     get: (c) => c.codex.model,
     type: "string"
   },
+  {
+    key: "gemini.model",
+    label: "Gemini model",
+    get: (c) => c.gemini.model,
+    type: "string"
+  },
   {
     key: "discussion.max_rounds",
     label: "Discussion max rounds",
@@ -608,6 +829,14 @@ function InlineConfigEditor({ isActive, onClose }) {
         return;
       }
     }
+    if (field.validate) {
+      const error = field.validate(value);
+      if (error) {
+        setSavedMessage(`Error: ${error}`);
+        setMode("select");
+        return;
+      }
+    }
     try {
       const updated = setConfigValue(field.key, value);
       setConfig(updated);
@@ -658,16 +887,15 @@ function startConfigEditor() {
 // src/ui.tsx
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 marked.use(markedTerminal());
-function parseInput(input) {
+function parseInput(input, pair) {
   const lower = input.toLowerCase();
   if (lower.startsWith("discuss ")) {
     return { target: "both", prompt: input.slice(8).trim(), discuss: true };
   }
-  if (lower.startsWith("claude ") || lower.startsWith("claude, ")) {
-    return { target: "claude", prompt: input.slice(input.indexOf(" ") + 1).trim(), discuss: false };
-  }
-  if (lower.startsWith("codex ") || lower.startsWith("codex, ")) {
-    return { target: "codex", prompt: input.slice(input.indexOf(" ") + 1).trim(), discuss: false };
+  for (const agent of pair) {
+    if (lower.startsWith(`${agent} `) || lower.startsWith(`${agent}, `)) {
+      return { target: agent, prompt: input.slice(input.indexOf(" ") + 1).trim(), discuss: false };
+    }
   }
   return { target: "both", prompt: input, discuss: false };
 }
@@ -680,19 +908,19 @@ function AgentResponseBlock({
   content,
   error
 }) {
-  const color = agent === "claude" ? "magenta" : "green";
+  const descriptor = getAgent(agent);
   if (error) {
     return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginLeft: 1, marginBottom: 1, children: [
       /* @__PURE__ */ jsxs2(Text2, { color: "red", bold: true, children: [
-        agent === "claude" ? "Claude" : "Codex",
+        descriptor.displayName,
         " error:"
       ] }),
       /* @__PURE__ */ jsx2(Box2, { marginLeft: 1, children: /* @__PURE__ */ jsx2(Text2, { color: "red", children: content }) })
     ] });
   }
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginLeft: 1, marginBottom: 1, children: [
-    /* @__PURE__ */ jsxs2(Text2, { color, bold: true, children: [
-      agent === "claude" ? "Claude" : "Codex",
+    /* @__PURE__ */ jsxs2(Text2, { color: descriptor.color, bold: true, children: [
+      descriptor.displayName,
       ":"
     ] }),
     /* @__PURE__ */ jsx2(Box2, { marginLeft: 1, children: /* @__PURE__ */ jsx2(RenderedMarkdown, { text: content }) })
@@ -717,13 +945,12 @@ function UserMessage({ content }) {
   ] });
 }
 function ThinkingIndicator({ agent }) {
-  const color = agent === "claude" ? "magenta" : "green";
-  const label = agent === "claude" ? "Claude" : "Codex";
+  const descriptor = getAgent(agent);
   return /* @__PURE__ */ jsxs2(Box2, { marginLeft: 1, children: [
-    /* @__PURE__ */ jsx2(Text2, { color, children: /* @__PURE__ */ jsx2(Spinner, { type: "dots" }) }),
-    /* @__PURE__ */ jsxs2(Text2, { color, children: [
+    /* @__PURE__ */ jsx2(Text2, { color: descriptor.color, children: /* @__PURE__ */ jsx2(Spinner, { type: "dots" }) }),
+    /* @__PURE__ */ jsxs2(Text2, { color: descriptor.color, children: [
       " ",
-      label,
+      descriptor.displayName,
       " is thinking..."
     ] })
   ] });
@@ -768,9 +995,9 @@ function PromptInput({
 function App({
   initialPrompt,
   sessionId: existingSessionId,
-  claudeModel,
-  codexModel,
-  config,
+  agents: initialPair,
+  agentModels: initialAgentModels,
+  config: initialConfig,
   showTranscript: showTranscript2,
   discuss: initialDiscuss
 }) {
@@ -780,6 +1007,9 @@ function App({
   const [state, setState] = useState2(
     initialPrompt ? "running" : "input"
   );
+  const [pair, setPair] = useState2(initialPair);
+  const [agentModels, setAgentModels] = useState2(initialAgentModels);
+  const [config, setConfig] = useState2(initialConfig);
   const [thinkingAgents, setThinkingAgents] = useState2([]);
   const [discussionRound, setDiscussionRound] = useState2(0);
   const [consensusReached, setConsensusReached] = useState2(false);
@@ -828,22 +1058,18 @@ function App({
     }
   });
   const runAgents = async (currentMessages, round, target, promptOverride, isDebate = false) => {
-    const runCl = target === "both" || target === "claude";
-    const runCx = target === "both" || target === "codex";
-    const activeAgents = [];
-    if (runCl) activeAgents.push("claude");
-    if (runCx) activeAgents.push("codex");
+    const activeAgents = target === "both" ? [...pair] : [target];
     setThinkingAgents(activeAgents);
     const history = formatConversationHistory(
       currentMessages.map((m) => ({
         role: m.role,
-        agent: m.role === "claude" || m.role === "codex" ? m.role : void 0,
+        agent: isValidAgentName(m.role) ? m.role : void 0,
         content: m.content
       }))
     );
     const cwd = process.cwd();
     const isFirstRound = round === 0 && !existingSessionId;
-    const agentPrompt = (agent) => {
+    const agentPrompt = (_agent) => {
       if (promptOverride) return promptOverride;
       if (isFirstRound && target === "both") {
         return currentMessages[currentMessages.length - 1]?.content || "";
@@ -852,48 +1078,31 @@ function App({
     };
     const agentSystemPrompt = (agent) => {
       if (isDebate) {
-        if (isFirstRound) return debatePrompt(agent);
-        return debateRoundPrompt(agent, history);
+        if (isFirstRound) return debatePrompt(agent, pair);
+        return debateRoundPrompt(agent, history, pair);
       }
-      if (isFirstRound && target === "both") return collaborationPrompt(agent);
-      return discussionPrompt(agent, history);
+      if (isFirstRound && target === "both") return collaborationPrompt(agent, pair);
+      return discussionPrompt(agent, history, pair);
     };
     const ac = new AbortController();
     abortRef.current = ac;
     const results = [];
     const promises = [];
-    if (runCl) {
+    for (const agent of activeAgents) {
+      const descriptor = getAgent(agent);
       promises.push(
-        runClaude({
-          prompt: agentPrompt("claude"),
-          systemPrompt: agentSystemPrompt("claude"),
-          model: claudeModel,
+        descriptor.run({
+          prompt: agentPrompt(agent),
+          systemPrompt: agentSystemPrompt(agent),
+          model: agentModels[agent],
           cwd,
           signal: ac.signal
         }).then(
           (value) => {
-            results.push({ agent: "claude", result: { status: "fulfilled", value } });
+            results.push({ agent, result: { status: "fulfilled", value } });
           },
           (reason) => {
-            results.push({ agent: "claude", result: { status: "rejected", reason } });
-          }
-        )
-      );
-    }
-    if (runCx) {
-      promises.push(
-        runCodex({
-          prompt: agentPrompt("codex"),
-          systemPrompt: agentSystemPrompt("codex"),
-          model: codexModel,
-          cwd,
-          signal: ac.signal
-        }).then(
-          (value) => {
-            results.push({ agent: "codex", result: { status: "fulfilled", value } });
-          },
-          (reason) => {
-            results.push({ agent: "codex", result: { status: "rejected", reason } });
+            results.push({ agent, result: { status: "rejected", reason } });
           }
         )
       );
@@ -940,7 +1149,7 @@ function App({
     return newMessages;
   };
   const runRound = async (rawInput) => {
-    const { target, prompt, discuss } = parseInput(rawInput);
+    const { target, prompt, discuss } = parseInput(rawInput, pair);
     if (discuss) {
       return runDiscussion(prompt);
     }
@@ -1005,11 +1214,11 @@ function App({
       setMessages((prev) => [...prev, ...newMessages]);
       allMessages = [...allMessages, ...newMessages];
       currentRound++;
-      const claudeMsg = newMessages.find((m) => m.role === "claude" && !m.error);
-      const codexMsg = newMessages.find((m) => m.role === "codex" && !m.error);
-      const claudeConsensus = claudeMsg?.content.includes(CONSENSUS_MARKER) ?? false;
-      const codexConsensus = codexMsg?.content.includes(CONSENSUS_MARKER) ?? false;
-      if (claudeConsensus && codexConsensus) {
+      const consensusFlags = pair.map((agent) => {
+        const msg = newMessages.find((m) => m.role === agent && !m.error);
+        return msg?.content.includes(CONSENSUS_MARKER) ?? false;
+      });
+      if (consensusFlags.every(Boolean)) {
         setConsensusReached(true);
         break;
       }
@@ -1076,7 +1285,7 @@ function App({
       if (msg.role === "user") {
         return /* @__PURE__ */ jsx2(UserMessage, { content: msg.content }, i);
       }
-      if (msg.role === "claude" || msg.role === "codex") {
+      if (isValidAgentName(msg.role)) {
         return /* @__PURE__ */ jsx2(
           AgentResponseBlock,
           {
@@ -1097,7 +1306,21 @@ function App({
       InlineConfigEditor,
       {
         isActive: state === "config",
-        onClose: () => setState("input")
+        onClose: () => {
+          const updated = loadConfig();
+          setConfig(updated);
+          try {
+            setPair(validateAgentPair(updated.agents));
+          } catch {
+          }
+          setAgentModels((prev) => ({
+            ...prev,
+            claude: updated.claude.model,
+            codex: updated.codex.model,
+            gemini: updated.gemini.model
+          }));
+          setState("input");
+        }
       }
     ),
     state === "input" && /* @__PURE__ */ jsx2(PromptInput, { onSubmit: handleSubmit })
@@ -1129,7 +1352,7 @@ function showTranscript(sessionId) {
         if (msg.role === "user") {
           return /* @__PURE__ */ jsx2(UserMessage, { content: msg.content }, i);
         }
-        if (msg.role === "claude" || msg.role === "codex") {
+        if (isValidAgentName(msg.role)) {
           return /* @__PURE__ */ jsx2(AgentResponseBlock, { agent: msg.role, content: msg.content }, i);
         }
         return null;
@@ -1155,25 +1378,75 @@ function showSessionList(sessions) {
 }
 
 // src/index.ts
+process.on("SIGTERM", () => {
+  closeDb();
+  process.exit(0);
+});
+process.on("SIGINT", () => {
+  closeDb();
+  process.exit(0);
+});
+function checkCli(name, installUrl) {
+  try {
+    execSync2(`${name} --version`, { stdio: "ignore" });
+    return true;
+  } catch {
+    console.error(
+      chalk.red(`"${name}" not found. Install it from: ${installUrl}`)
+    );
+    return false;
+  }
+}
+function preflight(pair) {
+  let allFound = true;
+  for (const agent of pair) {
+    const descriptor = getAgent(agent);
+    if (!checkCli(descriptor.cliBinary, descriptor.installUrl)) {
+      allFound = false;
+    }
+  }
+  if (!allFound) {
+    process.exit(1);
+  }
+}
+function resolveAgentPair(opts, config) {
+  if (opts.agents) {
+    const names = opts.agents.split(",").map((s) => s.trim());
+    return validateAgentPair(names);
+  }
+  return validateAgentPair(config.agents);
+}
+function resolveAgentModels(pair, opts, config) {
+  return {
+    claude: opts.claudeModel ?? config.claude.model,
+    codex: opts.codexModel ?? config.codex.model,
+    gemini: opts.geminiModel ?? config.gemini.model
+  };
+}
 var program = new Command();
-program.name("tagteam").description("Tag Team - Orchestrate Claude and Codex collaboratively").version("0.1.0").option("--claude-model <model>", "Claude model to use").option("--codex-model <model>", "Codex model to use").argument("[prompt...]", "Prompt to send to both agents").action(async (promptParts, opts) => {
+program.name("tagteam").description("Tag Team - Orchestrate AI agents collaboratively").version("0.2.0").option("--agents <pair>", "Agent pair to use (comma-separated, e.g. claude,gemini)").option("--claude-model <model>", "Claude model to use").option("--codex-model <model>", "Codex model to use").option("--gemini-model <model>", "Gemini model to use").argument("[prompt...]", "Prompt to send to both agents").action(async (promptParts, opts) => {
   const config = loadConfig();
+  const pair = resolveAgentPair(opts, config);
+  preflight(pair);
   const prompt = promptParts.join(" ") || void 0;
   const instance = startApp({
     initialPrompt: prompt,
-    claudeModel: opts.claudeModel ?? config.claude.model,
-    codexModel: opts.codexModel ?? config.codex.model,
+    agents: pair,
+    agentModels: resolveAgentModels(pair, opts, config),
     config
   });
   await instance.waitUntilExit();
 });
-program.command("discuss").description("Have Claude and Codex discuss a topic until they reach consensus").argument("<prompt...>", "Topic to discuss").action(async (promptParts) => {
+program.command("discuss").description("Have agents discuss a topic until they reach consensus").argument("<prompt...>", "Topic to discuss").action(async (promptParts) => {
   const config = loadConfig();
+  const parentOpts = program.opts();
+  const pair = resolveAgentPair(parentOpts, config);
+  preflight(pair);
   const prompt = promptParts.join(" ");
   const instance = startApp({
     initialPrompt: prompt,
-    claudeModel: config.claude.model,
-    codexModel: config.codex.model,
+    agents: pair,
+    agentModels: resolveAgentModels(pair, parentOpts, config),
     config,
     discuss: true
   });
@@ -1181,6 +1454,9 @@ program.command("discuss").description("Have Claude and Codex discuss a topic un
 });
 program.command("continue").description("Resume the most recent session").action(async () => {
   const config = loadConfig();
+  const parentOpts = program.opts();
+  const pair = resolveAgentPair(parentOpts, config);
+  preflight(pair);
   const session = getMostRecentSession();
   if (!session) {
     console.log(chalk.red(" No active sessions found."));
@@ -1194,8 +1470,8 @@ program.command("continue").description("Resume the most recent session").action
   }));
   const instance = startApp({
     sessionId: session.id,
-    claudeModel: config.claude.model,
-    codexModel: config.codex.model,
+    agents: pair,
+    agentModels: resolveAgentModels(pair, parentOpts, config),
     config,
     showTranscript: transcript
   });
@@ -1203,6 +1479,9 @@ program.command("continue").description("Resume the most recent session").action
 });
 program.command("resume [id]").description("Resume a session by ID, or pick interactively").action(async (id) => {
   const config = loadConfig();
+  const parentOpts = program.opts();
+  const pair = resolveAgentPair(parentOpts, config);
+  preflight(pair);
   if (!id) {
     const sessions = listSessions(20);
     if (sessions.length === 0) {
@@ -1241,8 +1520,8 @@ program.command("resume [id]").description("Resume a session by ID, or pick inte
         }));
         const instance2 = startApp({
           sessionId: session2.id,
-          claudeModel: config.claude.model,
-          codexModel: config.codex.model,
+          agents: pair,
+          agentModels: resolveAgentModels(pair, parentOpts, config),
           config,
           showTranscript: transcript2
         });
@@ -1264,8 +1543,8 @@ program.command("resume [id]").description("Resume a session by ID, or pick inte
   }));
   const instance = startApp({
     sessionId: session.id,
-    claudeModel: config.claude.model,
-    codexModel: config.codex.model,
+    agents: pair,
+    agentModels: resolveAgentModels(pair, parentOpts, config),
     config,
     showTranscript: transcript
   });
@@ -1303,10 +1582,16 @@ configCmd.command("show").description("Show current configuration").action(() =>
   const config = loadConfig();
   console.log(chalk.bold("\n Configuration:\n"));
   console.log(
-    chalk.dim(" claude.model = ") + chalk.white(config.claude.model)
+    chalk.dim(" agents           = ") + chalk.white(config.agents.join(", "))
+  );
+  console.log(
+    chalk.dim(" claude.model     = ") + chalk.white(config.claude.model)
+  );
+  console.log(
+    chalk.dim(" codex.model      = ") + chalk.white(config.codex.model)
   );
   console.log(
-    chalk.dim(" codex.model  = ") + chalk.white(config.codex.model)
+    chalk.dim(" gemini.model     = ") + chalk.white(config.gemini.model)
   );
   console.log(
     chalk.dim(" discussion.max_rounds = ") + chalk.white(String(config.discussion.max_rounds))