@teammates/cli 0.4.0 → 0.5.0

package/dist/cli.js

@@ -7,12 +7,12 @@
  *   teammates --adapter codex     Use a specific agent adapter
  *   teammates --dir <path>        Override .teammates/ location
  */
-import { exec as execCb, execSync, spawn } from "node:child_process";
+import { exec as execCb, execSync, spawnSync } from "node:child_process";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { mkdir, readdir, rm, stat, unlink } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { createInterface } from "node:readline";
-import { App, ChatView, concat, esc, Interview, pen, renderMarkdown, stripAnsi, } from "@teammates/consolonia";
+import { App, ChatView, concat, esc, pen, renderMarkdown, stripAnsi, } from "@teammates/consolonia";
 import chalk from "chalk";
 import ora from "ora";
 import { syncRecallIndex } from "./adapter.js";
@@ -23,6 +23,7 @@ import { buildWisdomPrompt, compactEpisodic } from "./compact.js";
 import { PromptInput } from "./console/prompt-input.js";
 import { buildTitle } from "./console/startup.js";
 import { buildImportAdaptationPrompt, copyTemplateFiles, getOnboardingPrompt, importTeammates, } from "./onboard.js";
+import { loadPersonas, scaffoldFromPersona } from "./personas.js";
 import { Orchestrator } from "./orchestrator.js";
 import { colorToHex, theme, tp } from "./theme.js";
 // ─── Parsed CLI arguments ────────────────────────────────────────────
@@ -48,6 +49,108 @@ class TeammatesREPL {
             text: result.summary,
         });
     }
+    /**
+     * Render a task result to the feed. Called from drainAgentQueue() AFTER
+     * the defensive retry so the user sees the final (possibly retried) output.
+     */
+    displayTaskResult(result, entryType) {
+        // Suppress display for internal summarization tasks
+        if (entryType === "summarize")
+            return;
+        if (!this.chatView)
+            this.input.deactivateAndErase();
+        const raw = result.rawOutput ?? "";
+        // Strip protocol artifacts
+        const cleaned = raw
+            .replace(/^TO:\s*\S+\s*\n/im, "")
+            .replace(/^#\s+.+\n*/m, "")
+            .replace(/```handoff\s*\n@\w+\s*\n[\s\S]*?```/g, "")
+            .replace(/```json\s*\n\s*\{[\s\S]*?\}\s*\n\s*```\s*$/g, "")
+            .trim();
+        // Header: "teammate: subject"
+        const subject = result.summary || "Task completed";
+        const displayTeammate = result.teammate === this.selfName
+            ? this.adapterName
+            : result.teammate;
+        this.feedLine(concat(tp.accent(`${displayTeammate}: `), tp.text(subject)));
+        this.lastCleanedOutput = cleaned;
+        if (cleaned) {
+            this.feedMarkdown(cleaned);
+        }
+        else if (result.changedFiles.length > 0 || result.summary) {
+            // Agent produced no body text but DID do work — generate a synthetic
+            // summary from available metadata so the user sees something useful.
+            const syntheticLines = [];
+            if (result.summary) {
+                syntheticLines.push(result.summary);
+            }
+            if (result.changedFiles.length > 0) {
+                syntheticLines.push("");
+                syntheticLines.push("**Files changed:**");
+                for (const f of result.changedFiles) {
+                    syntheticLines.push(`- ${f}`);
+                }
+            }
+            this.feedMarkdown(syntheticLines.join("\n"));
+        }
+        else {
+            this.feedLine(tp.muted("  (no response text — the agent may have only performed tool actions)"));
+            this.feedLine(tp.muted(`  Use /debug ${result.teammate} to view full output`));
+            // Show diagnostic hints for empty responses
+            const diag = result.diagnostics;
+            if (diag) {
+                if (diag.exitCode !== 0 && diag.exitCode !== null) {
+                    this.feedLine(tp.warning(`  ⚠  Process exited with code ${diag.exitCode}`));
+                }
+                if (diag.signal) {
+                    this.feedLine(tp.warning(`  ⚠  Process killed by signal: ${diag.signal}`));
+                }
+                if (diag.debugFile) {
+                    this.feedLine(tp.muted(`  Debug log: ${diag.debugFile}`));
+                }
+            }
+        }
+        // Render handoffs
+        const handoffs = result.handoffs;
+        if (handoffs.length > 0) {
+            this.renderHandoffs(result.teammate, handoffs);
+        }
+        // Clickable [reply] [copy] actions after the response
+        if (this.chatView && cleaned) {
+            const t = theme();
+            const teammate = result.teammate;
+            const replyId = `reply-${teammate}-${Date.now()}`;
+            this._replyContexts.set(replyId, { teammate, message: cleaned });
+            this.chatView.appendActionList([
+                {
+                    id: replyId,
+                    normalStyle: this.makeSpan({
+                        text: "  [reply]",
+                        style: { fg: t.textDim },
+                    }),
+                    hoverStyle: this.makeSpan({
+                        text: "  [reply]",
+                        style: { fg: t.accent },
+                    }),
+                },
+                {
+                    id: "copy",
+                    normalStyle: this.makeSpan({
+                        text: " [copy]",
+                        style: { fg: t.textDim },
+                    }),
+                    hoverStyle: this.makeSpan({
+                        text: " [copy]",
+                        style: { fg: t.accent },
+                    }),
+                },
+            ]);
+        }
+        this.feedLine();
+        // Auto-detect new teammates added during this task
+        this.refreshTeammates();
+        this.showPrompt();
+    }
     /** Token budget for recent conversation history (24k tokens ≈ 96k chars). */
     static CONV_HISTORY_CHARS = 24_000 * 4;
     buildConversationContext() {
@@ -103,10 +206,10 @@ class TeammatesREPL {
             : `You are maintaining a running summary of an ongoing conversation between a user and their AI teammates. Summarize the conversation entries below.\n\n## Entries to Summarize\n\n${entriesText}\n\n## Instructions\n\nReturn ONLY the summary — no preamble, no explanation. The summary should:\n- Be a concise bulleted list of key topics discussed, decisions made, and work completed\n- Preserve important context that future messages might reference\n- Drop trivial or redundant details\n- Stay under 2000 characters\n- Do NOT include any output protocol (no TO:, no # Subject, no handoff blocks)`;
         // Remove the summarized entries — they'll be captured in the summary
         this.conversationHistory.splice(0, splitIdx);
-        // Queue the summarization task to the base coding agent
+        // Queue the summarization task through the user's agent
         this.taskQueue.push({
             type: "summarize",
-            teammate: this.adapterName,
+            teammate: this.selfName,
             task: prompt,
         });
         this.kickDrain();
@@ -116,6 +219,8 @@ class TeammatesREPL {
     taskQueue = [];
     /** Per-agent active tasks — one per agent running in parallel. */
     agentActive = new Map();
+    /** Agents currently in a silent retry — suppress all events. */
+    silentAgents = new Set();
     /** Per-agent drain locks — prevents double-draining a single agent. */
     agentDrainLocks = new Map();
     /** Stored pasted text keyed by paste number, expanded on Enter. */
@@ -142,9 +247,16 @@ class TeammatesREPL {
     _replyContexts = new Map();
     /** Quoted reply text to expand on next submit. */
     _pendingQuotedReply = null;
-    defaultFooter = null; // cached default footer content
+    /** Resolver for inline ask — when set, next submit resolves this instead of normal handling. */
+    _pendingAsk = null;
+    defaultFooter = null; // cached left footer content
+    defaultFooterRight = null; // cached right footer content
     /** Cached service statuses for banner + /configure. */
     serviceStatuses = [];
+    /** Reference to the animated banner widget for live updates. */
+    banner = null;
+    /** The local user's alias (avatar name). Set after USER.md is read or interview completes. */
+    userAlias = null;
     // ── Animated status tracker ─────────────────────────────────────
     activeTasks = new Map();
     statusTimer = null;
@@ -166,6 +278,13 @@ class TeammatesREPL {
     constructor(adapterName) {
         this.adapterName = adapterName;
     }
+    /**
+     * The name used for the local user in the roster.
+     * Returns the user's alias if set, otherwise the adapter name.
+     */
+    get selfName() {
+        return this.userAlias ?? this.adapterName;
+    }
     /** Show the prompt with the fenced border. */
     showPrompt() {
         if (this.chatView) {
@@ -221,27 +340,28 @@ class TeammatesREPL {
         const entries = Array.from(this.activeTasks.values());
         const idx = this.statusRotateIndex % entries.length;
         const { teammate, task } = entries[idx];
+        const displayName = teammate === this.selfName ? this.adapterName : teammate;
         const spinChar = TeammatesREPL.SPINNER[this.statusFrame % TeammatesREPL.SPINNER.length];
         const taskPreview = task.length > 50 ? `${task.slice(0, 47)}...` : task;
         const queueInfo = this.activeTasks.size > 1 ? ` (${idx + 1}/${this.activeTasks.size})` : "";
         if (this.chatView) {
             // Strip newlines and truncate task text for single-line display
             const cleanTask = task.replace(/[\r\n]+/g, " ").trim();
-            const maxLen = Math.max(20, (process.stdout.columns || 80) - teammate.length - 10);
+            const maxLen = Math.max(20, (process.stdout.columns || 80) - displayName.length - 10);
             const taskText = cleanTask.length > maxLen
                 ? `${cleanTask.slice(0, maxLen - 1)}…`
                 : cleanTask;
             const queueTag = this.activeTasks.size > 1
                 ? ` (${idx + 1}/${this.activeTasks.size})`
                 : "";
-            this.chatView.setProgress(concat(tp.accent(`${spinChar} ${teammate}… `), tp.muted(taskText + queueTag)));
+            this.chatView.setProgress(concat(tp.accent(`${spinChar} ${displayName}… `), tp.muted(taskText + queueTag)));
             this.app.refresh();
         }
         else {
             // Mostly bright blue, periodically flicker to dark blue
             const spinColor = this.statusFrame % 8 === 0 ? chalk.blue : chalk.blueBright;
             const line = `  ${spinColor(spinChar)} ` +
-                chalk.bold(teammate) +
+                chalk.bold(displayName) +
                 chalk.gray(`… ${taskPreview}`) +
                 (queueInfo ? chalk.gray(queueInfo) : "");
             this.input.setStatus(line);
@@ -299,8 +419,8 @@ class TeammatesREPL {
                     rendered.push({ type: "text", content: line });
                 }
             }
-            // Render first line with "User: " label
-            const label = "user: ";
+            // Render first line with alias label
+            const label = `${this.selfName}: `;
             const first = rendered.shift();
             if (first) {
                 if (first.type === "text") {
@@ -483,7 +603,7 @@ class TeammatesREPL {
                 style: { fg: chrome },
             }));
             if (!isValid) {
-                this.feedLine(tp.error(`  ✖ Unknown teammate: @${h.to}`));
+                this.feedLine(tp.error(`  ✖  Unknown teammate: @${h.to}`));
             }
             else if (this.autoApproveHandoffs) {
                 this.taskQueue.push({ type: "agent", teammate: h.to, task: h.task });
@@ -847,13 +967,13 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         if (this.app)
             this.app.refresh();
     }
-    queueTask(input) {
+    queueTask(input, preMentions) {
         const allNames = this.orchestrator.listTeammates();
         // Check for @everyone — queue to all teammates except the coding agent
         const everyoneMatch = input.match(/^@everyone\s+([\s\S]+)$/i);
         if (everyoneMatch) {
             const task = everyoneMatch[1];
-            const names = allNames.filter((n) => n !== this.adapterName);
+            const names = allNames.filter((n) => n !== this.selfName && n !== this.adapterName);
             for (const teammate of names) {
                 this.taskQueue.push({ type: "agent", teammate, task });
             }
@@ -865,14 +985,22 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             this.kickDrain();
             return;
         }
-        // Collect all @mentioned teammates anywhere in the input
-        const mentionRegex = /@(\S+)/g;
-        let m;
-        const mentioned = [];
-        while ((m = mentionRegex.exec(input)) !== null) {
-            const name = m[1];
-            if (allNames.includes(name) && !mentioned.includes(name)) {
-                mentioned.push(name);
+        // Use pre-resolved mentions if provided (avoids picking up @mentions from expanded paste text),
+        // otherwise scan the input directly.
+        let mentioned;
+        if (preMentions) {
+            mentioned = preMentions;
+        }
+        else {
+            const mentionRegex = /@(\S+)/g;
+            let m;
+            mentioned = [];
+            while ((m = mentionRegex.exec(input)) !== null) {
+                // Remap adapter name alias → user avatar for routing
+                const name = (m[1] === this.adapterName && this.userAlias) ? this.selfName : m[1];
+                if (allNames.includes(name) && !mentioned.includes(name)) {
+                    mentioned.push(name);
+                }
             }
         }
         if (mentioned.length > 0) {
@@ -894,12 +1022,13 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             match = this.lastResult.teammate;
         }
         if (!match) {
-            match = this.orchestrator.route(input) ?? this.adapterName;
+            match = this.orchestrator.route(input) ?? this.selfName;
         }
         {
             const bg = this._userBg;
             const t = theme();
-            this.feedUserLine(concat(pen.fg(t.textMuted).bg(bg)("  → "), pen.fg(t.accent).bg(bg)(`@${match}`)));
+            const displayName = match === this.selfName ? this.adapterName : match;
+            this.feedUserLine(concat(pen.fg(t.textMuted).bg(bg)("  → "), pen.fg(t.accent).bg(bg)(`@${displayName}`)));
         }
         this.feedLine();
         this.refreshView();
@@ -924,66 +1053,184 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
     }
     // ─── Onboarding ───────────────────────────────────────────────────
     /**
-     * Interactive prompt when no .teammates/ directory is found.
-     * Returns the new .teammates/ path, or null if user chose to exit.
+     * Interactive prompt for team onboarding after user profile is set up.
+     * .teammates/ already exists at this point. Returns false if user chose to exit.
      */
-    async promptOnboarding(adapter) {
+    async promptTeamOnboarding(adapter, teammatesDir) {
         const cwd = process.cwd();
-        const teammatesDir = join(cwd, ".teammates");
         const termWidth = process.stdout.columns || 100;
         console.log();
-        this.printLogo([
-            chalk.bold("Teammates") + chalk.gray(` v${PKG_VERSION}`),
-            chalk.yellow("No .teammates/ directory found"),
-            chalk.gray(cwd),
-        ]);
-        console.log();
         console.log(chalk.gray("─".repeat(termWidth)));
         console.log();
         console.log(chalk.white("  Set up teammates for this project?\n"));
         console.log(chalk.cyan("  1") +
             chalk.gray(") ") +
-            chalk.white("New team") +
-            chalk.gray(" — analyze this codebase and create teammates from scratch"));
+            chalk.white("Pick teammates") +
+            chalk.gray(" — choose from persona templates"));
         console.log(chalk.cyan("  2") +
+            chalk.gray(") ") +
+            chalk.white("Auto-generate") +
+            chalk.gray(" — let your agent analyze the codebase and create teammates"));
+        console.log(chalk.cyan("  3") +
             chalk.gray(") ") +
             chalk.white("Import team") +
             chalk.gray(" — copy teammates from another project"));
-        console.log(chalk.cyan("  3") +
+        console.log(chalk.cyan("  4") +
             chalk.gray(") ") +
             chalk.white("Solo mode") +
-            chalk.gray(` — use ${this.adapterName} without teammates`));
-        console.log(chalk.cyan("  4") + chalk.gray(") ") + chalk.white("Exit"));
+            chalk.gray(" — use your agent without teammates"));
+        console.log(chalk.cyan("  5") + chalk.gray(") ") + chalk.white("Exit"));
         console.log();
-        const choice = await this.askChoice("Pick an option (1/2/3/4): ", [
+        const choice = await this.askChoice("Pick an option (1/2/3/4/5): ", [
             "1",
             "2",
             "3",
             "4",
+            "5",
         ]);
-        if (choice === "4") {
+        if (choice === "5") {
             console.log(chalk.gray("  Goodbye."));
-            return null;
+            return false;
         }
-        if (choice === "3") {
-            await mkdir(teammatesDir, { recursive: true });
-            console.log();
-            console.log(chalk.green("  ✔") + chalk.gray(` Created ${teammatesDir}`));
-            console.log(chalk.gray(`  Running in solo mode — all tasks go to ${this.adapterName}.`));
+        if (choice === "4") {
+            console.log(chalk.gray("  Running in solo mode — all tasks go to your agent."));
             console.log(chalk.gray("  Run /init later to set up teammates."));
             console.log();
-            return teammatesDir;
+            return true;
         }
-        if (choice === "2") {
-            // Import from another project
-            await mkdir(teammatesDir, { recursive: true });
+        if (choice === "3") {
             await this.runImport(cwd);
-            return teammatesDir;
+            return true;
         }
-        // choice === "1": Run onboarding via the agent
-        await mkdir(teammatesDir, { recursive: true });
-        await this.runOnboardingAgent(adapter, cwd);
-        return teammatesDir;
+        if (choice === "2") {
+            // Auto-generate via agent
+            await this.runOnboardingAgent(adapter, cwd);
+            return true;
+        }
+        // choice === "1": Pick from persona templates
+        await this.runPersonaOnboarding(teammatesDir);
+        return true;
+    }
+    /**
+     * Persona-based onboarding: show a list of bundled personas, let the user
+     * pick which ones to create, optionally rename them, and scaffold the folders.
+     */
+    async runPersonaOnboarding(teammatesDir) {
+        const personas = await loadPersonas();
+        if (personas.length === 0) {
+            console.log(chalk.yellow("  No persona templates found."));
+            return;
+        }
+        console.log();
+        console.log(chalk.white("  Available personas:\n"));
+        // Display personas grouped by tier
+        let currentTier = 0;
+        for (let i = 0; i < personas.length; i++) {
+            const p = personas[i];
+            if (p.tier !== currentTier) {
+                currentTier = p.tier;
+                const label = currentTier === 1 ? "Core" : "Specialized";
+                console.log(chalk.gray(`  ── ${label} ──`));
+            }
+            const num = String(i + 1).padStart(2, " ");
+            console.log(chalk.cyan(`  ${num}`) +
+                chalk.gray(") ") +
+                chalk.white(p.persona) +
+                chalk.gray(` (${p.alias})`) +
+                chalk.gray(` — ${p.description}`));
+        }
+        console.log();
+        console.log(chalk.gray("  Enter numbers separated by commas, e.g. 1,3,5"));
+        console.log();
+        const input = await this.askInput("Personas: ");
+        if (!input) {
+            console.log(chalk.gray("  No personas selected."));
+            return;
+        }
+        // Parse comma-separated numbers
+        const indices = input
+            .split(",")
+            .map((s) => parseInt(s.trim(), 10) - 1)
+            .filter((i) => i >= 0 && i < personas.length);
+        const unique = [...new Set(indices)];
+        if (unique.length === 0) {
+            console.log(chalk.yellow("  No valid selections."));
+            return;
+        }
+        console.log();
+        // Copy framework files first
+        await copyTemplateFiles(teammatesDir);
+        const created = [];
+        for (const idx of unique) {
+            const p = personas[idx];
+            const nameInput = await this.askInput(`Name for ${p.persona} [${p.alias}]: `);
+            const name = nameInput || p.alias;
+            const folderName = name.toLowerCase().replace(/[^a-z0-9_-]/g, "");
+            await scaffoldFromPersona(teammatesDir, folderName, p);
+            created.push(folderName);
+            console.log(chalk.green("  ✔  ") + chalk.white(`@${folderName}`) + chalk.gray(` — ${p.persona}`));
+        }
+        console.log();
+        console.log(chalk.green(`  ✔  Created ${created.length} teammate${created.length > 1 ? "s" : ""}: `) +
+            chalk.white(created.map((n) => `@${n}`).join(", ")));
+        console.log(chalk.gray("  Tip: Your agent will adapt ownership and capabilities to this codebase on first task."));
+        console.log();
+    }
+    /**
+     * In-TUI persona picker for /init pick. Uses feedLine + askInline instead
+     * of console.log + askInput.
+     */
+    async runPersonaOnboardingInline(teammatesDir) {
+        const personas = await loadPersonas();
+        if (personas.length === 0) {
+            this.feedLine(tp.warning("  No persona templates found."));
+            this.refreshView();
+            return;
+        }
+        // Display personas in the feed
+        this.feedLine(tp.text("  Available personas:\n"));
+        let currentTier = 0;
+        for (let i = 0; i < personas.length; i++) {
+            const p = personas[i];
+            if (p.tier !== currentTier) {
+                currentTier = p.tier;
+                const label = currentTier === 1 ? "Core" : "Specialized";
+                this.feedLine(tp.muted(`  ── ${label} ──`));
+            }
+            const num = String(i + 1).padStart(2, " ");
+            this.feedLine(concat(tp.text(`  ${num}) ${p.persona} `), tp.muted(`(${p.alias}) — ${p.description}`)));
+        }
+        this.feedLine(tp.muted("\n  Enter numbers separated by commas, e.g. 1,3,5"));
+        this.refreshView();
+        const input = await this.askInline("Personas: ");
+        if (!input) {
+            this.feedLine(tp.muted("  No personas selected."));
+            this.refreshView();
+            return;
+        }
+        const indices = input
+            .split(",")
+            .map((s) => parseInt(s.trim(), 10) - 1)
+            .filter((i) => i >= 0 && i < personas.length);
+        const unique = [...new Set(indices)];
+        if (unique.length === 0) {
+            this.feedLine(tp.warning("  No valid selections."));
+            this.refreshView();
+            return;
+        }
+        await copyTemplateFiles(teammatesDir);
+        const created = [];
+        for (const idx of unique) {
+            const p = personas[idx];
+            const nameInput = await this.askInline(`Name for ${p.persona} [${p.alias}]: `);
+            const name = nameInput || p.alias;
+            const folderName = name.toLowerCase().replace(/[^a-z0-9_-]/g, "");
+            await scaffoldFromPersona(teammatesDir, folderName, p);
+            created.push(folderName);
+            this.feedLine(concat(tp.success(`  ✔  @${folderName}`), tp.muted(` — ${p.persona}`)));
+        }
+        this.feedLine(concat(tp.success(`\n  ✔  Created ${created.length} teammate${created.length > 1 ? "s" : ""}: `), tp.text(created.map((n) => `@${n}`).join(", "))));
+        this.refreshView();
     }
     /**
      * Run the onboarding agent to analyze the codebase and create teammates.
@@ -992,19 +1239,20 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
     async runOnboardingAgent(adapter, projectDir) {
         console.log();
         console.log(chalk.blue("  Starting onboarding...") +
-            chalk.gray(` ${this.adapterName} will analyze your codebase and create .teammates/`));
+            chalk.gray(" Your agent will analyze your codebase and create .teammates/"));
         console.log();
         // Copy framework files from bundled template
         const teammatesDir = join(projectDir, ".teammates");
         const copied = await copyTemplateFiles(teammatesDir);
         if (copied.length > 0) {
-            console.log(chalk.green("  ✔") +
+            console.log(chalk.green("  ✔ ") +
                 chalk.gray(` Copied template files: ${copied.join(", ")}`));
             console.log();
         }
         const onboardingPrompt = await getOnboardingPrompt(projectDir);
         const tempConfig = {
             name: this.adapterName,
+            type: "ai",
             role: "Onboarding agent",
             soul: "",
             wisdom: "",
@@ -1016,8 +1264,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         };
         const sessionId = await adapter.startSession(tempConfig);
         const spinner = ora({
-            text: chalk.blue(this.adapterName) +
-                chalk.gray(" is analyzing your codebase..."),
+            text: chalk.gray("Analyzing your codebase..."),
             spinner: "dots",
         }).start();
         try {
@@ -1025,7 +1272,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             spinner.stop();
             this.printAgentOutput(result.rawOutput);
             if (result.success) {
-                console.log(chalk.green("  ✔ Onboarding complete!"));
+                console.log(chalk.green("  ✔  Onboarding complete!"));
             }
             else {
                 console.log(chalk.yellow(`  ⚠ Onboarding finished with issues: ${result.summary}`));
@@ -1091,7 +1338,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 return;
             }
             if (teammates.length > 0) {
-                console.log(chalk.green("  ✔") +
+                console.log(chalk.green("  ✔ ") +
                     chalk.white(` Imported ${teammates.length} teammate${teammates.length > 1 ? "s" : ""}: `) +
                     chalk.cyan(teammates.join(", ")));
                 console.log(chalk.gray(`    (${files.length} files copied)`));
@@ -1131,11 +1378,12 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         const teammatesDir = join(projectDir, ".teammates");
         console.log();
         console.log(chalk.blue("  Starting adaptation...") +
-            chalk.gray(` ${this.adapterName} will scan this project and adapt the team`));
+            chalk.gray(" Your agent will scan this project and adapt the team"));
         console.log();
         const prompt = await buildImportAdaptationPrompt(teammatesDir, teammateNames, sourceProjectPath);
         const tempConfig = {
             name: this.adapterName,
+            type: "ai",
             role: "Adaptation agent",
             soul: "",
             wisdom: "",
@@ -1147,8 +1395,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         };
         const sessionId = await adapter.startSession(tempConfig);
         const spinner = ora({
-            text: chalk.blue(this.adapterName) +
-                chalk.gray(" is scanning the project and adapting teammates..."),
+            text: chalk.gray("Scanning the project and adapting teammates..."),
             spinner: "dots",
         }).start();
         try {
@@ -1156,7 +1403,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             spinner.stop();
             this.printAgentOutput(result.rawOutput);
             if (result.success) {
-                console.log(chalk.green("  ✔ Team adaptation complete!"));
+                console.log(chalk.green("  ✔  Team adaptation complete!"));
             }
             else {
                 console.log(chalk.yellow(`  ⚠ Adaptation finished with issues: ${result.summary}`));
@@ -1206,6 +1453,30 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             });
         });
     }
+    /**
+     * Ask for input using the ChatView's own prompt (no raw readline).
+     * Temporarily replaces the footer with the prompt text and intercepts the next submit.
+     */
+    askInline(prompt) {
+        return new Promise((resolve) => {
+            if (!this.chatView) {
+                // Fallback if no ChatView (shouldn't happen during /configure)
+                return this.askInput(prompt).then(resolve);
+            }
+            // Show the prompt in the feed so it's visible
+            this.feedLine(tp.accent(`  ${prompt}`));
+            this.chatView.setFooter(tp.accent(`  ${prompt}`));
+            this._pendingAsk = (answer) => {
+                // Restore footer
+                if (this.chatView && this.defaultFooter) {
+                    this.chatView.setFooter(this.defaultFooter);
+                }
+                this.refreshView();
+                resolve(answer.trim());
+            };
+            this.refreshView();
+        });
+    }
     /**
      * Check whether USER.md needs to be created or is still template placeholders.
      */
@@ -1222,71 +1493,315 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         }
     }
     /**
-     * Run the user interview inside the ChatView using the Interview widget.
-     * Hides the normal input prompt until the interview completes.
+     * Pre-TUI user profile setup. Runs in the console before the ChatView is created.
+     * Offers GitHub-based or manual profile creation.
      */
-    startUserInterview(teammatesDir, bannerWidget) {
-        if (!this.chatView)
+    async runUserSetup(teammatesDir) {
+        const termWidth = process.stdout.columns || 100;
+        console.log();
+        console.log(chalk.gray("─".repeat(termWidth)));
+        console.log();
+        console.log(chalk.white("  Set up your profile\n"));
+        console.log(chalk.cyan("  1") +
+            chalk.gray(") ") +
+            chalk.white("Use GitHub account") +
+            chalk.gray(" — import your name and username from GitHub"));
+        console.log(chalk.cyan("  2") +
+            chalk.gray(") ") +
+            chalk.white("Manual setup") +
+            chalk.gray(" — enter your details manually"));
+        console.log(chalk.cyan("  3") +
+            chalk.gray(") ") +
+            chalk.white("Skip") +
+            chalk.gray(" — set up later with /user"));
+        console.log();
+        const choice = await this.askChoice("Pick an option (1/2/3): ", [
+            "1",
+            "2",
+            "3",
+        ]);
+        if (choice === "3") {
+            console.log(chalk.gray("  Skipped — run /user to set up your profile later."));
+            console.log();
             return;
-        const t = theme();
-        const interview = new Interview({
-            title: "Quick intro — helps teammates tailor their work to you.",
-            subtitle: "(press Enter to skip any question)",
-            questions: [
-                { key: "name", prompt: "Your name" },
-                {
-                    key: "role",
-                    prompt: "Your role",
-                    placeholder: "e.g., senior backend engineer",
-                },
-                {
-                    key: "experience",
-                    prompt: "Relevant experience",
-                    placeholder: "e.g., 10 years Go, new to React",
-                },
-                {
-                    key: "preferences",
-                    prompt: "How you like to work",
-                    placeholder: "e.g., terse responses, explain reasoning",
-                },
-                {
-                    key: "context",
-                    prompt: "Anything else",
-                    placeholder: "e.g., solo dev, working on a rewrite",
-                },
-            ],
-            titleStyle: { fg: t.text },
-            subtitleStyle: { fg: t.textDim, italic: true },
-            promptStyle: { fg: t.accent },
-            answeredStyle: { fg: t.textMuted, italic: true },
-            inputStyle: { fg: t.text },
-            cursorStyle: { fg: t.cursorFg, bg: t.cursorBg },
-            placeholderStyle: { fg: t.textDim, italic: true },
-        });
-        this.chatView.setInputOverride(interview);
-        if (this.app)
-            this.app.refresh();
-        interview.on("complete", (answers) => {
-            // Write USER.md
-            const userMdPath = join(teammatesDir, "USER.md");
-            const lines = ["# User\n"];
-            lines.push(`- **Name:** ${answers.name || "_not provided_"}`);
-            lines.push(`- **Role:** ${answers.role || "_not provided_"}`);
-            lines.push(`- **Experience:** ${answers.experience || "_not provided_"}`);
-            lines.push(`- **Preferences:** ${answers.preferences || "_not provided_"}`);
-            lines.push(`- **Context:** ${answers.context || "_not provided_"}`);
-            writeFileSync(userMdPath, `${lines.join("\n")}\n`, "utf-8");
-            // Remove override and restore normal input
-            if (this.chatView) {
-                this.chatView.setInputOverride(null);
-                this.chatView.appendStyledToFeed(concat(tp.success("  ✔ "), tp.dim("Saved USER.md — update anytime with /user")));
-            }
-            // Release the banner hold so commands animate in
-            if (bannerWidget)
-                bannerWidget.releaseHold();
-            if (this.app)
-                this.app.refresh();
+        }
+        if (choice === "1") {
+            await this.setupGitHubProfile(teammatesDir);
+        }
+        else {
+            await this.setupManualProfile(teammatesDir);
+        }
+    }
+    /**
+     * GitHub-based profile setup. Ensures gh is installed and authenticated,
+     * then fetches user info from the GitHub API to create the profile.
+     */
+    async setupGitHubProfile(teammatesDir) {
+        console.log();
+        // Step 1: Check if gh is installed
+        let ghInstalled = false;
+        try {
+            execSync("gh --version", { stdio: "pipe" });
+            ghInstalled = true;
+        }
+        catch {
+            // not installed
+        }
+        if (!ghInstalled) {
+            console.log(chalk.yellow("  GitHub CLI is not installed.\n"));
+            const plat = process.platform;
+            console.log(chalk.white("  Run this in another terminal:"));
+            if (plat === "win32") {
+                console.log(chalk.cyan("    winget install --id GitHub.cli"));
+            }
+            else if (plat === "darwin") {
+                console.log(chalk.cyan("    brew install gh"));
+            }
+            else {
+                console.log(chalk.cyan("    sudo apt install gh"));
+                console.log(chalk.gray("    (or see https://cli.github.com)"));
+            }
+            console.log();
+            const answer = await this.askChoice("Press Enter when done, or s to skip: ", ["", "s", "S"]);
+            if (answer.toLowerCase() === "s") {
+                console.log(chalk.gray("  Falling back to manual setup.\n"));
+                return this.setupManualProfile(teammatesDir);
+            }
+            // Re-check
+            try {
+                execSync("gh --version", { stdio: "pipe" });
+                ghInstalled = true;
+                console.log(chalk.green("  ✔  GitHub CLI installed"));
+            }
+            catch {
+                console.log(chalk.yellow("  GitHub CLI still not found. You may need to restart your terminal."));
+                console.log(chalk.gray("  Falling back to manual setup.\n"));
+                return this.setupManualProfile(teammatesDir);
+            }
+        }
+        else {
+            console.log(chalk.green("  ✔  GitHub CLI installed"));
+        }
+        // Step 2: Check auth
+        let authed = false;
+        try {
+            execSync("gh auth status", { stdio: "pipe" });
+            authed = true;
+        }
+        catch {
+            // not authenticated
+        }
+        if (!authed) {
+            console.log();
+            console.log(chalk.gray("  Authenticating with GitHub...\n"));
+            const result = spawnSync("gh", ["auth", "login", "--web", "--git-protocol", "https"], {
+                stdio: "inherit",
+                shell: true,
+            });
+            if (result.status !== 0) {
+                console.log(chalk.yellow("  Authentication failed or was cancelled."));
+                console.log(chalk.gray("  Falling back to manual setup.\n"));
+                return this.setupManualProfile(teammatesDir);
+            }
+            // Verify
+            try {
+                execSync("gh auth status", { stdio: "pipe" });
+                authed = true;
+            }
+            catch {
+                console.log(chalk.yellow("  Authentication could not be verified."));
+                console.log(chalk.gray("  Falling back to manual setup.\n"));
+                return this.setupManualProfile(teammatesDir);
+            }
+        }
+        console.log(chalk.green("  ✔  GitHub authenticated"));
+        // Step 3: Fetch user info from GitHub API
+        let login = "";
+        let name = "";
+        try {
+            const json = execSync("gh api user", {
+                stdio: "pipe",
+                encoding: "utf-8",
+            });
+            const user = JSON.parse(json);
+            login = (user.login || "").toLowerCase().replace(/[^a-z0-9_-]/g, "");
+            name = user.name || user.login || "";
+        }
+        catch {
+            console.log(chalk.yellow("  Could not fetch GitHub user info."));
+            console.log(chalk.gray("  Falling back to manual setup.\n"));
+            return this.setupManualProfile(teammatesDir);
+        }
+        if (!login) {
+            console.log(chalk.yellow("  No GitHub username found."));
+            console.log(chalk.gray("  Falling back to manual setup.\n"));
+            return this.setupManualProfile(teammatesDir);
+        }
+        console.log(chalk.green(`  ✔  Authenticated as `) +
+            chalk.cyan(`@${login}`) +
+            (name && name !== login ? chalk.gray(` (${name})`) : ""));
+        console.log();
+        // Ask for remaining fields since GitHub doesn't provide them
+        const role = await this.askInput("Your role (optional, press Enter to skip): ");
+        const experience = await this.askInput("Relevant experience (e.g., 10 years Go, new to React): ");
+        const preferences = await this.askInput("How you like to work (e.g., terse responses): ");
+        // Auto-detect timezone
+        const detectedTz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        const timezone = await this.askInput(`Primary timezone${detectedTz ? ` [${detectedTz}]` : ""}: `);
+        const answers = {
+            alias: login,
+            name: name || login,
+            role: role || "",
+            experience: experience || "",
+            preferences: preferences || "",
+            timezone: timezone || detectedTz || "",
+        };
+        this.writeUserProfile(teammatesDir, login, answers);
+        this.createUserAvatar(teammatesDir, login, answers);
+        console.log(chalk.green("  ✔  ") +
+            chalk.gray(`Profile created — avatar @${login}`));
+        console.log();
+    }
+    /**
+     * Manual (console-based) profile setup. Collects fields via askInput().
+     */
+    async setupManualProfile(teammatesDir) {
+        console.log();
+        console.log(chalk.gray("  (alias is required, press Enter to skip others)\n"));
+        const aliasRaw = await this.askInput("Your alias (e.g., alex): ");
+        const alias = aliasRaw.toLowerCase().replace(/[^a-z0-9_-]/g, "").trim();
+        if (!alias) {
+            console.log(chalk.yellow("  Alias is required. Run /user to try again.\n"));
+            return;
+        }
+        const name = await this.askInput("Your name: ");
+        const role = await this.askInput("Your role (e.g., senior backend engineer): ");
+        const experience = await this.askInput("Relevant experience (e.g., 10 years Go, new to React): ");
+        const preferences = await this.askInput("How you like to work (e.g., terse responses): ");
+        // Auto-detect timezone
+        const detectedTz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        const timezone = await this.askInput(`Primary timezone${detectedTz ? ` [${detectedTz}]` : ""}: `);
+        const answers = {
+            alias,
+            name,
+            role,
+            experience,
+            preferences,
+            timezone: timezone || detectedTz || "",
+        };
+        this.writeUserProfile(teammatesDir, alias, answers);
+        this.createUserAvatar(teammatesDir, alias, answers);
+        console.log();
+        console.log(chalk.green("  ✔  ") +
+            chalk.gray(`Profile created — avatar @${alias}`));
+        console.log(chalk.gray("  Update anytime with /user"));
+        console.log();
+    }
+    /**
+     * Write USER.md from collected answers.
+     */
+    writeUserProfile(teammatesDir, alias, answers) {
+        const userMdPath = join(teammatesDir, "USER.md");
+        const lines = ["# User\n"];
+        lines.push(`- **Alias:** ${alias}`);
+        lines.push(`- **Name:** ${answers.name || "_not provided_"}`);
+        lines.push(`- **Role:** ${answers.role || "_not provided_"}`);
+        lines.push(`- **Experience:** ${answers.experience || "_not provided_"}`);
+        lines.push(`- **Preferences:** ${answers.preferences || "_not provided_"}`);
+        lines.push(`- **Primary Timezone:** ${answers.timezone || "_not provided_"}`);
+        writeFileSync(userMdPath, `${lines.join("\n")}\n`, "utf-8");
+    }
+    /**
+     * Create the user's avatar folder with SOUL.md and WISDOM.md.
+     * The avatar is a teammate folder with type: human.
+     */
+    createUserAvatar(teammatesDir, alias, answers) {
+        const avatarDir = join(teammatesDir, alias);
+        const memoryDir = join(avatarDir, "memory");
+        mkdirSync(avatarDir, { recursive: true });
+        mkdirSync(memoryDir, { recursive: true });
+        const name = answers.name || alias;
+        const role = answers.role || "I'm a human working on this project";
+        const experience = answers.experience || "";
+        const preferences = answers.preferences || "";
+        const timezone = answers.timezone || "";
+        // Write SOUL.md
+        const soulLines = [
+            `# ${name}`,
+            "",
+            "## Identity",
+            "",
+            `**Type:** human`,
+            `**Alias:** ${alias}`,
+            `**Role:** ${role}`,
+        ];
+        if (experience)
+            soulLines.push(`**Experience:** ${experience}`);
+        if (preferences)
+            soulLines.push(`**Preferences:** ${preferences}`);
+        if (timezone)
+            soulLines.push(`**Primary Timezone:** ${timezone}`);
+        soulLines.push("");
+        const soulPath = join(avatarDir, "SOUL.md");
+        writeFileSync(soulPath, soulLines.join("\n"), "utf-8");
+        // Write empty WISDOM.md
+        const wisdomPath = join(avatarDir, "WISDOM.md");
+        writeFileSync(wisdomPath, `# ${name} — Wisdom\n\nDistilled from work history. Updated during compaction.\n`, "utf-8");
+        // Avatar registration happens later in start() after the orchestrator is initialized.
+        // During pre-TUI setup, the orchestrator doesn't exist yet.
+    }
+    /**
+     * Read USER.md and extract the alias field.
+     * Returns null if USER.md doesn't exist or has no alias.
+     */
+    readUserAlias(teammatesDir) {
+        try {
+            const content = readFileSync(join(teammatesDir, "USER.md"), "utf-8");
+            const match = content.match(/\*\*Alias:\*\*\s*(\S+)/);
+            return match ? match[1].toLowerCase().replace(/[^a-z0-9_-]/g, "") : null;
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Register the user's avatar as a teammate in the orchestrator.
+     * Sets presence to "online" since the local user is always online.
+     * Replaces the old coding agent entry.
+     */
+    registerUserAvatar(teammatesDir, alias) {
+        const registry = this.orchestrator.getRegistry();
+        const avatarDir = join(teammatesDir, alias);
+        // Read the avatar's SOUL.md if it exists
+        let soul = "";
+        let role = "I'm a human working on this project";
+        try {
+            soul = readFileSync(join(avatarDir, "SOUL.md"), "utf-8");
+            const roleMatch = soul.match(/\*\*Role:\*\*\s*(.+)/);
+            if (roleMatch)
+                role = roleMatch[1].trim();
+        }
+        catch { /* avatar folder may not exist yet */ }
+        let wisdom = "";
+        try {
+            wisdom = readFileSync(join(avatarDir, "WISDOM.md"), "utf-8");
+        }
+        catch { /* ok */ }
+        registry.register({
+            name: alias,
+            type: "human",
+            role,
+            soul,
+            wisdom,
+            dailyLogs: [],
+            weeklyLogs: [],
+            ownership: { primary: [], secondary: [] },
+            routingKeywords: [],
         });
+        // Set presence to online (local user is always online)
+        this.orchestrator.getAllStatuses().set(alias, { state: "idle", presence: "online" });
+        // Update the adapter name so tasks route to the avatar
+        this.userAlias = alias;
     }
     // ─── Display helpers ──────────────────────────────────────────────
     /**
@@ -1472,12 +1987,14 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             });
         }
         for (const name of teammates) {
-            if (name.toLowerCase().startsWith(lower)) {
+            // For user avatar, display and match using the adapter name alias
+            const display = name === this.userAlias ? this.adapterName : name;
+            if (display.toLowerCase().startsWith(lower)) {
                 const t = this.orchestrator.getRegistry().get(name);
                 items.push({
-                    label: `@${name}`,
+                    label: `@${display}`,
                     description: t?.role ?? "",
-                    completion: `${before}@${name} ${after.replace(/^\s+/, "")}`,
+                    completion: `${before}@${display} ${after.replace(/^\s+/, "")}`,
                 });
             }
         }
@@ -1613,15 +2130,29 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             agentPassthrough: cliArgs.agentPassthrough,
         });
         this.adapter = adapter;
-        // No .teammates/ found — offer onboarding or solo mode
+        // Detect whether this is a brand-new project (no .teammates/ at all)
+        const isNewProject = !teammatesDir;
         if (!teammatesDir) {
-            teammatesDir = await this.promptOnboarding(adapter);
-            if (!teammatesDir)
+            teammatesDir = join(process.cwd(), ".teammates");
+            await mkdir(teammatesDir, { recursive: true });
+            // Show welcome logo for new projects
+            console.log();
+            this.printLogo([
+                chalk.bold("Teammates") + chalk.gray(` v${PKG_VERSION}`),
+                chalk.yellow("New project setup"),
+                chalk.gray(process.cwd()),
+            ]);
+        }
+        // Always onboard the user first if USER.md is missing
+        if (this.needsUserSetup(teammatesDir)) {
+            await this.runUserSetup(teammatesDir);
+        }
+        // Team onboarding if .teammates/ was missing
+        if (isNewProject) {
+            const cont = await this.promptTeamOnboarding(adapter, teammatesDir);
+            if (!cont)
                 return; // user chose to exit
         }
-        // Check if USER.md needs setup — we'll run the interview inside the
-        // ChatView after the UI loads (not before).
-        const pendingUserInterview = this.needsUserSetup(teammatesDir);
         // Init orchestrator
         this.teammatesDir = teammatesDir;
         this.orchestrator = new Orchestrator({
@@ -1630,26 +2161,38 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             onEvent: (e) => this.handleEvent(e),
         });
         await this.orchestrator.init();
-        // Register the agent itself as a mentionable teammate
-        const registry = this.orchestrator.getRegistry();
-        registry.register({
-            name: this.adapterName,
-            role: `General-purpose coding agent (${this.adapterName})`,
-            soul: "",
-            wisdom: "",
-            dailyLogs: [],
-            weeklyLogs: [],
-            ownership: { primary: [], secondary: [] },
-            routingKeywords: [],
-            cwd: dirname(this.teammatesDir),
-        });
-        // Add status entry (init() already ran, so we add it manually)
-        this.orchestrator.getAllStatuses().set(this.adapterName, { state: "idle" });
+        // Register the local user's avatar if alias is configured.
+        // The user's avatar is the entry point for all generic/fallback tasks —
+        // the coding agent is an internal execution engine, not an addressable teammate.
+        const alias = this.readUserAlias(teammatesDir);
+        if (alias) {
+            this.registerUserAvatar(teammatesDir, alias);
+        }
+        else {
+            // No alias yet (solo mode or pre-interview). Register a minimal avatar
+            // under the adapter name so internal tasks (btw, summarize, debug) can execute.
+            const registry = this.orchestrator.getRegistry();
+            registry.register({
+                name: this.adapterName,
+                type: "ai",
+                role: "Coding agent that performs tasks on your behalf.",
+                soul: "",
+                wisdom: "",
+                dailyLogs: [],
+                weeklyLogs: [],
+                ownership: { primary: [], secondary: [] },
+                routingKeywords: [],
+                cwd: dirname(this.teammatesDir),
+            });
+            this.orchestrator.getAllStatuses().set(this.adapterName, { state: "idle", presence: "online" });
+        }
         // Populate roster on the adapter so prompts include team info
+        // Exclude the user avatar and adapter fallback — neither is an addressable teammate
         if ("roster" in this.adapter) {
             const registry = this.orchestrator.getRegistry();
             this.adapter.roster = this.orchestrator
                 .listTeammates()
+                .filter((n) => n !== this.adapterName && n !== this.userAlias)
                 .map((name) => {
                 const t = registry.get(name);
                 return { name: t.name, role: t.role, ownership: t.ownership };
@@ -1667,7 +2210,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             borderStyle: (s) => chalk.gray(s),
             colorize: (value) => {
                 const validNames = new Set([
-                    ...this.orchestrator.listTeammates(),
+                    ...this.orchestrator.listTeammates().filter((n) => n !== this.adapterName && n !== this.userAlias),
                     this.adapterName,
                     "everyone",
                 ]);
@@ -1707,18 +2250,31 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         // ── Detect service statuses ────────────────────────────────────────
         this.serviceStatuses = this.detectServices();
         // ── Build animated banner for ChatView ─────────────────────────────
-        const names = this.orchestrator.listTeammates();
+        const names = this.orchestrator
+            .listTeammates()
+            .filter((n) => n !== this.adapterName && n !== this.userAlias);
         const reg = this.orchestrator.getRegistry();
+        const statuses = this.orchestrator.getAllStatuses();
+        const bannerTeammates = [];
+        // Add user avatar first (displayed as adapter name alias)
+        if (this.userAlias) {
+            const ut = reg.get(this.userAlias);
+            const up = statuses.get(this.userAlias)?.presence ?? "online";
+            bannerTeammates.push({ name: this.adapterName, role: "Coding agent that performs tasks on your behalf.", presence: up });
+        }
+        for (const name of names) {
+            const t = reg.get(name);
+            const p = statuses.get(name)?.presence ?? "online";
+            bannerTeammates.push({ name, role: t?.role ?? "", presence: p });
+        }
         const bannerWidget = new AnimatedBanner({
-            adapterName: this.adapterName,
+            displayName: `@${this.adapterName}`,
             teammateCount: names.length,
             cwd: process.cwd(),
-            teammates: names.map((name) => {
-                const t = reg.get(name);
-                return { name, role: t?.role ?? "" };
-            }),
+            teammates: bannerTeammates,
             services: this.serviceStatuses,
         });
+        this.banner = bannerWidget;
         // ── Create ChatView and Consolonia App ────────────────────────────
         const t = theme();
         this.chatView = new ChatView({
@@ -1741,9 +2297,9 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                         styles[i] = accentStyle;
                     }
                 }
-                // Colorize @mentions only if they reference a valid teammate or the coding agent
+                // Colorize @mentions only if they reference a valid teammate or the user
                 const validNames = new Set([
-                    ...this.orchestrator.listTeammates(),
+                    ...this.orchestrator.listTeammates().filter((n) => n !== this.adapterName && n !== this.userAlias),
                     this.adapterName,
                     "everyone",
                 ]);
@@ -1787,10 +2343,12 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             progressStyle: { fg: t.progress, italic: true },
             dropdownHighlightStyle: { fg: t.accent },
             dropdownStyle: { fg: t.textMuted },
-            footer: concat(tp.accent(" Teammates"), tp.dim(` v${PKG_VERSION}`)),
+            footer: concat(tp.accent(" Teammates"), tp.dim(` v${PKG_VERSION}`), tp.muted("  "), tp.text(this.adapterName)),
+            footerRight: tp.muted("? /help "),
             footerStyle: { fg: t.textDim },
         });
-        this.defaultFooter = concat(tp.accent(" Teammates"), tp.dim(` v${PKG_VERSION}`));
+        this.defaultFooter = concat(tp.accent(" Teammates"), tp.dim(` v${PKG_VERSION}`), tp.muted("  "), tp.text(this.adapterName));
+        this.defaultFooterRight = tp.muted("? /help ");
         // Wire ChatView events for input handling
         this.chatView.on("submit", (rawLine) => {
             this.handleSubmit(rawLine).catch((err) => {
@@ -1816,6 +2374,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                     this.escTimer = null;
                 }
                 this.chatView.setFooter(this.defaultFooter);
+                this.chatView.setFooterRight(this.defaultFooterRight);
                 this.refreshView();
             }
             if (this.ctrlcPending) {
@@ -1825,6 +2384,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                     this.ctrlcTimer = null;
                 }
                 this.chatView.setFooter(this.defaultFooter);
+                this.chatView.setFooterRight(this.defaultFooterRight);
                 this.refreshView();
             }
         });
@@ -1848,22 +2408,21 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 }
                 this.chatView.inputValue = "";
                 this.chatView.setFooter(this.defaultFooter);
+                this.chatView.setFooterRight(this.defaultFooterRight);
                 this.pastedTexts.clear();
                 this.refreshView();
             }
             else if (this.chatView.inputValue.length > 0) {
-                // First ESC with text — show hint in footer, auto-expire after 2s
+                // First ESC with text — show hint in footer right, auto-expire after 2s
                 this.escPending = true;
-                const termW = process.stdout.columns || 80;
-                const hint = "ESC again to clear";
-                const pad = Math.max(0, termW - hint.length - 1);
-                this.chatView.setFooter(concat(tp.dim(" ".repeat(pad)), tp.muted(hint)));
+                this.chatView.setFooterRight(tp.muted("ESC again to clear "));
                 this.refreshView();
                 this.escTimer = setTimeout(() => {
                     this.escTimer = null;
                     if (this.escPending) {
                         this.escPending = false;
                         this.chatView.setFooter(this.defaultFooter);
+                        this.chatView.setFooterRight(this.defaultFooterRight);
                         this.refreshView();
                     }
                 }, 2000);
@@ -1881,29 +2440,31 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                     this.ctrlcTimer = null;
                 }
                 this.chatView.setFooter(this.defaultFooter);
+                this.chatView.setFooterRight(this.defaultFooterRight);
                 if (this.app)
                     this.app.stop();
                 this.orchestrator.shutdown().then(() => process.exit(0));
                 return;
             }
-            // First Ctrl+C — show hint in footer, auto-expire after 2s
+            // First Ctrl+C — show hint in footer right, auto-expire after 2s
             this.ctrlcPending = true;
-            const termW = process.stdout.columns || 80;
-            const hint = "Ctrl+C again to exit";
-            const pad = Math.max(0, termW - hint.length - 1);
-            this.chatView.setFooter(concat(tp.dim(" ".repeat(pad)), tp.muted(hint)));
+            this.chatView.setFooterRight(tp.muted("Ctrl+C again to exit "));
             this.refreshView();
             this.ctrlcTimer = setTimeout(() => {
                 this.ctrlcTimer = null;
                 if (this.ctrlcPending) {
                     this.ctrlcPending = false;
                     this.chatView.setFooter(this.defaultFooter);
+                    this.chatView.setFooterRight(this.defaultFooterRight);
                     this.refreshView();
                 }
             }, 2000);
         });
         this.chatView.on("action", (id) => {
-            if (id === "copy") {
+            if (id.startsWith("copy-cmd:")) {
+                this.doCopy(id.slice("copy-cmd:".length));
+            }
+            else if (id === "copy") {
                 this.doCopy(this.lastCleanedOutput || undefined);
             }
             else if (id.startsWith("retro-approve-") ||
@@ -1952,15 +2513,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         // Start the banner animation after the first frame renders.
         bannerWidget.onDirty = () => this.app?.refresh();
         const runPromise = this.app.run();
-        // Hold the banner animation before commands if we need to run the interview
-        if (pendingUserInterview) {
-            bannerWidget.hold();
-        }
         bannerWidget.start();
-        // Run user interview inside the ChatView if USER.md needs setup
-        if (pendingUserInterview) {
-            this.startUserInterview(teammatesDir, bannerWidget);
-        }
         await runPromise;
     }
     /**
@@ -1983,7 +2536,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 const fileName = trimmed.split(/[/\\]/).pop() || trimmed;
                 const n = ++this.pasteCounter;
                 this.pastedTexts.set(n, `[Image: source: ${trimmed}]`);
-                const placeholder = `[Image ${fileName}]`;
+                const placeholder = `[Image ${fileName}] `;
                 const newVal = current.slice(0, idx) +
                     placeholder +
                     current.slice(idx + clean.length);
@@ -2020,9 +2573,29 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
     }
     /** Handle line submission from ChatView. */
     async handleSubmit(rawLine) {
+        // If an inline ask is pending, resolve it instead of normal processing
+        if (this._pendingAsk) {
+            const resolve = this._pendingAsk;
+            this._pendingAsk = null;
+            resolve(rawLine);
+            return;
+        }
         this.clearWordwheel();
         this.wordwheelItems = [];
         this.wordwheelIndex = -1;
+        // Resolve @mentions from the raw input BEFORE paste expansion.
+        // This prevents @mentions inside pasted/expanded text from being picked up.
+        const allNames = this.orchestrator.listTeammates();
+        const preMentionRegex = /@(\S+)/g;
+        let pm;
+        const preMentions = [];
+        while ((pm = preMentionRegex.exec(rawLine)) !== null) {
+            // Remap adapter name alias → user avatar for routing
+            const name = (pm[1] === this.adapterName && this.userAlias) ? this.selfName : pm[1];
+            if (allNames.includes(name) && !preMentions.includes(name)) {
+                preMentions.push(name);
+            }
+        }
         // Expand paste placeholders with actual content
         let input = rawLine.replace(/\[Pasted text #(\d+) \+\d+ lines, [\d.]+KB\]\s*/g, (_match, num) => {
             const n = parseInt(num, 10);
@@ -2103,10 +2676,11 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             this.refreshView();
             return;
         }
-        // Everything else gets queued
-        this.conversationHistory.push({ role: "user", text: input });
+        // Everything else gets queued.
+        // Pass pre-resolved mentions so @mentions inside expanded paste text are ignored.
+        this.conversationHistory.push({ role: this.selfName, text: input });
         this.printUserMessage(input);
-        this.queueTask(input);
+        this.queueTask(input, preMentions);
         this.refreshView();
     }
     printBanner(teammates) {
@@ -2114,7 +2688,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         const termWidth = process.stdout.columns || 100;
         this.feedLine();
         this.feedLine(concat(tp.bold("  Teammates"), tp.muted(` v${PKG_VERSION}`)));
-        this.feedLine(concat(tp.text(`  ${this.adapterName}`), tp.muted(` · ${teammates.length} teammate${teammates.length === 1 ? "" : "s"}`)));
+        this.feedLine(concat(tp.text(`  @${this.adapterName}`), tp.muted(` · ${teammates.length} teammate${teammates.length === 1 ? "" : "s"}`)));
         this.feedLine(`  ${process.cwd()}`);
         // Service status rows
         for (const svc of this.serviceStatuses) {
@@ -2130,12 +2704,21 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                         : `missing — /configure ${svc.name.toLowerCase()}`;
             this.feedLine(concat(tp.text("  "), color(icon), color(svc.name), tp.muted(` ${label}`)));
         }
-        // Roster
+        // Roster (with presence indicators)
         this.feedLine();
+        const statuses = this.orchestrator.getAllStatuses();
+        // Show user avatar first (displayed as adapter name alias)
+        if (this.userAlias) {
+            const up = statuses.get(this.userAlias)?.presence ?? "online";
+            const udot = up === "online" ? tp.success("●") : up === "reachable" ? tp.warning("●") : tp.error("●");
+            this.feedLine(concat(tp.text("  "), udot, tp.accent(` @${this.adapterName.padEnd(14)}`), tp.muted("Coding agent that performs tasks on your behalf.")));
+        }
         for (const name of teammates) {
             const t = registry.get(name);
             if (t) {
-                this.feedLine(concat(tp.muted("  "), tp.accent(`● @${name.padEnd(14)}`), tp.muted(t.role)));
+                const p = statuses.get(name)?.presence ?? "online";
+                const dot = p === "online" ? tp.success("●") : p === "reachable" ? tp.warning("●") : tp.error("●");
+                this.feedLine(concat(tp.text("  "), dot, tp.accent(` @${name.padEnd(14)}`), tp.muted(t.role)));
             }
         }
         this.feedLine();
@@ -2255,43 +2838,21 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             this.feedLine(tp.warning("  GitHub CLI is not installed."));
             this.feedLine();
             const plat = process.platform;
-            let installCmd;
-            let installLabel;
+            this.feedLine(tp.text("  Run this in another terminal:"));
             if (plat === "win32") {
-                installCmd = "winget install --id GitHub.cli";
-                installLabel = "winget install --id GitHub.cli";
+                this.feedCommand("winget install --id GitHub.cli");
             }
             else if (plat === "darwin") {
-                installCmd = "brew install gh";
-                installLabel = "brew install gh";
+                this.feedCommand("brew install gh");
             }
             else {
-                installCmd = "sudo apt install gh";
-                installLabel = "sudo apt install gh  (or see https://cli.github.com)";
+                this.feedCommand("sudo apt install gh");
+                this.feedLine(tp.muted("    (or see https://cli.github.com)"));
             }
-            this.feedLine(tp.text(`  Install:  ${installLabel}`));
             this.feedLine();
-            // Ask user
-            const answer = await this.askInput("Run install command? [Y/n] ");
+            const answer = await this.askInline("Press Enter when done (or n to skip)");
             if (answer.toLowerCase() === "n") {
-                this.feedLine(tp.muted("  Skipped. Install manually and re-run /configure github"));
-                this.refreshView();
-                return;
-            }
-            // Spawn install in a visible subprocess
-            this.feedLine(tp.muted(`  Running: ${installCmd}`));
-            this.refreshView();
-            const installSuccess = await new Promise((res) => {
-                const parts = installCmd.split(" ");
-                const child = spawn(parts[0], parts.slice(1), {
-                    stdio: "inherit",
-                    shell: true,
-                });
-                child.on("error", () => res(false));
-                child.on("exit", (code) => res(code === 0));
-            });
-            if (!installSuccess) {
-                this.feedLine(tp.error("  Install failed. Please install manually from https://cli.github.com"));
+                this.feedLine(tp.muted("  Skipped. Run /configure github when ready."));
                 this.refreshView();
                 return;
             }
@@ -2302,7 +2863,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 this.feedLine(tp.success("  ✓ GitHub CLI installed"));
             }
             catch {
-                this.feedLine(tp.error("  GitHub CLI still not found after install. You may need to restart your terminal."));
+                this.feedLine(tp.error("  GitHub CLI still not found. You may need to restart your terminal."));
                 this.refreshView();
                 return;
             }
@@ -2321,31 +2882,19 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             // not authenticated
         }
         if (!authed) {
-            this.feedLine(tp.muted("  Authentication needed — this will open your browser for GitHub OAuth."));
             this.feedLine();
-            const answer = await this.askInput("Start authentication? [Y/n] ");
+            this.feedLine(tp.text("  Run this in another terminal to authenticate:"));
+            this.feedCommand("gh auth login --web --git-protocol https");
+            this.feedLine();
+            this.feedLine(tp.muted("  This will open your browser for GitHub OAuth."));
+            this.feedLine();
+            const answer = await this.askInline("Press Enter when done (or n to skip)");
             if (answer.toLowerCase() === "n") {
                 this.feedLine(tp.muted("  Skipped. Run /configure github when ready."));
                 this.refreshView();
                 this.updateServiceStatus("GitHub", "not-configured");
                 return;
             }
-            this.feedLine(tp.muted("  Starting auth flow..."));
-            this.refreshView();
-            const authSuccess = await new Promise((res) => {
-                const child = spawn("gh", ["auth", "login", "--web", "--git-protocol", "https"], {
-                    stdio: "inherit",
-                    shell: true,
-                });
-                child.on("error", () => res(false));
-                child.on("exit", (code) => res(code === 0));
-            });
-            if (!authSuccess) {
-                this.feedLine(tp.error("  Authentication failed. Try again with /configure github"));
-                this.refreshView();
-                this.updateServiceStatus("GitHub", "not-configured");
-                return;
-            }
             // Verify
             try {
                 execSync("gh auth status", { stdio: "pipe" });
@@ -2373,8 +2922,13 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
     }
     updateServiceStatus(name, status) {
         const svc = this.serviceStatuses.find((s) => s.name === name);
-        if (svc)
+        if (svc) {
             svc.status = status;
+            if (this.banner) {
+                this.banner.updateServices(this.serviceStatuses);
+                this.refreshView();
+            }
+        }
     }
     registerCommands() {
         const cmds = [
@@ -2409,8 +2963,8 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             {
                 name: "init",
                 aliases: ["onboard", "setup"],
-                usage: "/init [from-path]",
-                description: "Set up teammates (or import from another project)",
+                usage: "/init [pick | from-path]",
+                description: "Set up teammates (pick from personas, or import from another project)",
                 run: (args) => this.cmdInit(args),
             },
             {
@@ -2506,6 +3060,14 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
     }
     // ─── Event handler ───────────────────────────────────────────────
     handleEvent(event) {
+        // Suppress all events for agents in silent retry
+        const evtAgent = event.type === "task_assigned"
+            ? event.assignment.teammate
+            : event.type === "task_completed"
+                ? event.result.teammate
+                : event.teammate;
+        if (this.silentAgents.has(evtAgent))
+            return;
         switch (event.type) {
             case "task_assigned": {
                 // Track this task and start the animated status bar
@@ -2518,91 +3080,14 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 break;
             }
             case "task_completed": {
-                // Remove from active tasks
+                // Remove from active tasks and stop spinner.
+                // Result display is deferred to drainAgentQueue() so the defensive
+                // retry can update rawOutput before anything is shown to the user.
                 this.activeTasks.delete(event.result.teammate);
                 // Stop animation if no more active tasks
                 if (this.activeTasks.size === 0) {
                     this.stopStatusAnimation();
                 }
-                // Suppress display for internal summarization tasks
-                const activeEntry = this.agentActive.get(event.result.teammate);
-                if (activeEntry?.type === "summarize")
-                    break;
-                if (!this.chatView)
-                    this.input.deactivateAndErase();
-                const raw = event.result.rawOutput ?? "";
-                // Strip protocol artifacts
-                const cleaned = raw
-                    .replace(/^TO:\s*\S+\s*\n/im, "")
-                    .replace(/^#\s+.+\n*/m, "")
-                    .replace(/```handoff\s*\n@\w+\s*\n[\s\S]*?```/g, "")
-                    .replace(/```json\s*\n\s*\{[\s\S]*?\}\s*\n\s*```\s*$/g, "")
-                    .trim();
-                const sizeKB = cleaned ? Buffer.byteLength(cleaned, "utf-8") / 1024 : 0;
-                // Header: "teammate: subject"
-                const subject = event.result.summary || "Task completed";
-                this.feedLine(concat(tp.accent(`${event.result.teammate}: `), tp.text(subject)));
-                this.lastCleanedOutput = cleaned;
-                if (cleaned) {
-                    this.feedMarkdown(cleaned);
-                }
-                else {
-                    this.feedLine(tp.muted("  (no response text — the agent may have only performed tool actions)"));
-                    this.feedLine(tp.muted(`  Use /debug ${event.result.teammate} to view full output`));
-                    // Show diagnostic hints for empty responses
-                    const diag = event.result.diagnostics;
-                    if (diag) {
-                        if (diag.exitCode !== 0 && diag.exitCode !== null) {
-                            this.feedLine(tp.warning(`  ⚠ Process exited with code ${diag.exitCode}`));
-                        }
-                        if (diag.signal) {
-                            this.feedLine(tp.warning(`  ⚠ Process killed by signal: ${diag.signal}`));
-                        }
-                        if (diag.debugFile) {
-                            this.feedLine(tp.muted(`  Debug log: ${diag.debugFile}`));
-                        }
-                    }
-                }
-                // Render handoffs
-                const handoffs = event.result.handoffs;
-                if (handoffs.length > 0) {
-                    this.renderHandoffs(event.result.teammate, handoffs);
-                }
-                // Clickable [reply] [copy] actions after the response
-                if (this.chatView && cleaned) {
-                    const t = theme();
-                    const teammate = event.result.teammate;
-                    const replyId = `reply-${teammate}-${Date.now()}`;
-                    this._replyContexts.set(replyId, { teammate, message: cleaned });
-                    this.chatView.appendActionList([
-                        {
-                            id: replyId,
-                            normalStyle: this.makeSpan({
-                                text: "  [reply]",
-                                style: { fg: t.textDim },
-                            }),
-                            hoverStyle: this.makeSpan({
-                                text: "  [reply]",
-                                style: { fg: t.accent },
-                            }),
-                        },
-                        {
-                            id: "copy",
-                            normalStyle: this.makeSpan({
-                                text: " [copy]",
-                                style: { fg: t.textDim },
-                            }),
-                            hoverStyle: this.makeSpan({
-                                text: " [copy]",
-                                style: { fg: t.accent },
-                            }),
-                        },
-                    ]);
-                }
-                this.feedLine();
-                // Auto-detect new teammates added during this task
-                this.refreshTeammates();
-                this.showPrompt();
                 break;
             }
             case "error":
@@ -2611,7 +3096,8 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                     this.stopStatusAnimation();
                 if (!this.chatView)
                     this.input.deactivateAndErase();
-                this.feedLine(tp.error(`  ✖ ${event.teammate}: ${event.error}`));
+                const displayErr = event.teammate === this.selfName ? this.adapterName : event.teammate;
+                this.feedLine(tp.error(`  ✖  ${displayErr}: ${event.error}`));
                 this.showPrompt();
                 break;
         }
@@ -2622,16 +3108,34 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         this.feedLine();
         this.feedLine(tp.bold("  Status"));
         this.feedLine(tp.muted(`  ${"─".repeat(50)}`));
+        // Show user avatar first if present (displayed as adapter name alias)
+        if (this.userAlias) {
+            const userStatus = statuses.get(this.userAlias);
+            if (userStatus) {
+                this.feedLine(concat(tp.success("●"), tp.accent(` @${this.adapterName}`), tp.muted(" (you)")));
+                this.feedLine(tp.muted("    Coding agent that performs tasks on your behalf."));
+                this.feedLine();
+            }
+        }
         for (const [name, status] of statuses) {
+            // Skip the user avatar (shown above) and adapter fallback (not addressable)
+            if (name === this.adapterName || name === this.userAlias)
+                continue;
             const t = registry.get(name);
             const active = this.agentActive.get(name);
             const queued = this.taskQueue.filter((e) => e.teammate === name);
+            // Presence indicator: ● green=online, ● red=offline, ● yellow=reachable
+            const presenceIcon = status.presence === "online"
+                ? tp.success("●")
+                : status.presence === "reachable"
+                    ? tp.warning("●")
+                    : tp.error("●");
             // Teammate name + state
             const stateLabel = active ? "working" : status.state;
             const stateColor = stateLabel === "working"
                 ? tp.info(` (${stateLabel})`)
                 : tp.muted(` (${stateLabel})`);
-            this.feedLine(concat(tp.accent(`  @${name}`), stateColor));
+            this.feedLine(concat(presenceIcon, tp.accent(` @${name}`), stateColor));
             // Role
             if (t) {
                 this.feedLine(tp.muted(`    ${t.role}`));
@@ -2669,7 +3173,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             // Pick all teammates with debug files, queue one analysis per teammate
             const names = [];
             for (const [name] of this.lastDebugFiles) {
-                if (name !== this.adapterName)
+                if (name !== this.selfName)
                     names.push(name);
             }
             if (names.length === 0) {
@@ -2734,7 +3238,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         this.refreshView();
         this.taskQueue.push({
             type: "debug",
-            teammate: this.adapterName,
+            teammate: this.selfName,
             task: analysisPrompt,
         });
         this.kickDrain();
@@ -2752,7 +3256,8 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
             return;
         }
         const removed = this.taskQueue.splice(n - 1, 1)[0];
-        this.feedLine(concat(tp.muted("  Cancelled: "), tp.accent(`@${removed.teammate}`), tp.muted(" — "), tp.text(removed.task.slice(0, 60))));
+        const cancelDisplay = removed.teammate === this.selfName ? this.adapterName : removed.teammate;
+        this.feedLine(concat(tp.muted("  Cancelled: "), tp.accent(`@${cancelDisplay}`), tp.muted(" — "), tp.text(removed.task.slice(0, 60))));
         this.refreshView();
     }
     /** Drain tasks for a single agent — runs in parallel with other agents. */
@@ -2787,11 +3292,54 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                     const extraContext = entry.type === "btw" || entry.type === "debug"
                         ? ""
                         : this.buildConversationContext();
-                    const result = await this.orchestrator.assign({
+                    let result = await this.orchestrator.assign({
                         teammate: entry.teammate,
                         task: entry.task,
                         extraContext: extraContext || undefined,
                     });
+                    // Defensive retry: if the agent produced no text output but exited
+                    // successfully, it likely ended its turn with only file edits.
+                    // Retry up to 2 times with progressively simpler prompts.
+                    const rawText = (result.rawOutput ?? "").trim();
+                    if (!rawText &&
+                        result.success &&
+                        entry.type !== "btw" &&
+                        entry.type !== "debug") {
+                        this.silentAgents.add(entry.teammate);
+                        // Attempt 1: ask the agent to summarize what it did
+                        const retry1 = await this.orchestrator.assign({
+                            teammate: entry.teammate,
+                            task: `You completed the previous task but produced no visible text output. The user cannot see your work without a text response.\n\nOriginal task: ${entry.task}\n\nPlease respond now with a summary of what you did. Do NOT update session or memory files. Do NOT use any tools. Just produce text output.\n\nFormat:\nTO: user\n# <Subject line>\n\n<Body — what you did, key decisions, files changed>`,
+                            raw: true,
+                        });
+                        const retry1Raw = (retry1.rawOutput ?? "").trim();
+                        if (retry1Raw) {
+                            result = {
+                                ...result,
+                                rawOutput: retry1.rawOutput,
+                                summary: retry1.summary || result.summary,
+                            };
+                        }
+                        else {
+                            // Attempt 2: absolute minimum prompt — just ask for one sentence
+                            const retry2 = await this.orchestrator.assign({
+                                teammate: entry.teammate,
+                                task: `Say "Done." followed by one sentence describing what you changed. No tools. No file edits. Just text.`,
+                                raw: true,
+                            });
+                            const retry2Raw = (retry2.rawOutput ?? "").trim();
+                            if (retry2Raw) {
+                                result = {
+                                    ...result,
+                                    rawOutput: retry2.rawOutput,
+                                    summary: retry2.summary || result.summary,
+                                };
+                            }
+                        }
+                        this.silentAgents.delete(entry.teammate);
+                    }
+                    // Display the (possibly retried) result to the user
+                    this.displayTaskResult(result, entry.type);
                     // Write debug entry — skip for debug analysis tasks (avoid recursion)
                     if (entry.type !== "debug") {
                         this.writeDebugEntry(entry.teammate, entry.task, result, startTime);
@@ -2815,7 +3363,8 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 if (this.activeTasks.size === 0)
                     this.stopStatusAnimation();
                 const msg = err?.message ?? String(err);
-                this.feedLine(tp.error(`  ✖ @${agent}: ${msg}`));
+                const displayAgent = agent === this.selfName ? this.adapterName : agent;
+                this.feedLine(tp.error(`  ✖  @${displayAgent}: ${msg}`));
                 this.refreshView();
             }
             this.agentActive.delete(agent);
@@ -2916,7 +3465,11 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         const teammatesDir = join(cwd, ".teammates");
         await mkdir(teammatesDir, { recursive: true });
         const fromPath = argsStr.trim();
-        if (fromPath) {
+        if (fromPath === "pick") {
+            // Persona picker mode: /init pick
+            await this.runPersonaOnboardingInline(teammatesDir);
+        }
+        else if (fromPath) {
             // Import mode: /init <path-to-another-project>
             const resolved = resolve(fromPath);
             let sourceDir;
@@ -2950,11 +3503,11 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 // Copy framework files so the agent has TEMPLATE.md etc. available
                 await copyTemplateFiles(teammatesDir);
                 // Queue a single adaptation task that handles all teammates
-                this.feedLine(tp.muted(`  Queuing ${this.adapterName} to scan this project and adapt the team...`));
+                this.feedLine(tp.muted("  Queuing agent to scan this project and adapt the team..."));
                 const prompt = await buildImportAdaptationPrompt(teammatesDir, allTeammates, sourceDir);
                 this.taskQueue.push({
                     type: "agent",
-                    teammate: this.adapterName,
+                    teammate: this.selfName,
                     task: prompt,
                 });
                 this.kickDrain();
@@ -3014,9 +3567,11 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 return;
             const registry = this.orchestrator.getRegistry();
             // Update adapter roster so prompts include the new teammates
+            // Exclude the user avatar and adapter fallback — neither is an addressable teammate
             if ("roster" in this.adapter) {
                 this.adapter.roster = this.orchestrator
                     .listTeammates()
+                    .filter((n) => n !== this.adapterName && n !== this.userAlias)
                     .map((name) => {
                     const t = registry.get(name);
                     return { name: t.name, role: t.role, ownership: t.ownership };
@@ -3038,7 +3593,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         const arg = argsStr.trim().replace(/^@/, "");
         const allTeammates = this.orchestrator
             .listTeammates()
-            .filter((n) => n !== this.adapterName);
+            .filter((n) => n !== this.selfName && n !== this.adapterName);
         const names = !arg || arg === "everyone" ? allTeammates : [arg];
         // Validate all names first
         const valid = [];
@@ -3109,7 +3664,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 if (spinner)
                     spinner.succeed(`${name}: ${parts.join(", ")}`);
                 if (this.chatView)
-                    this.feedLine(tp.success(`  ✔ ${name}: ${parts.join(", ")}`));
+                    this.feedLine(tp.success(`  ✔  ${name}: ${parts.join(", ")}`));
             }
             if (this.chatView)
                 this.chatView.setProgress(null);
@@ -3131,7 +3686,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                     syncSpinner.succeed(`${name}: index synced`);
                 if (this.chatView) {
                     this.chatView.setProgress(null);
-                    this.feedLine(tp.success(`  ✔ ${name}: index synced`));
+                    this.feedLine(tp.success(`  ✔  ${name}: index synced`));
                 }
             }
             catch {
@@ -3161,7 +3716,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
                 spinner.fail(`${name}: ${msg}`);
             if (this.chatView) {
                 this.chatView.setProgress(null);
-                this.feedLine(tp.error(`  ✖ ${name}: ${msg}`));
+                this.feedLine(tp.error(`  ✖  ${name}: ${msg}`));
             }
         }
         this.refreshView();
@@ -3171,7 +3726,7 @@ Do NOT modify any other teammate's files. Only edit your own SOUL.md and daily l
         // Resolve target list
         const allTeammates = this.orchestrator
             .listTeammates()
-            .filter((n) => n !== this.adapterName);
+            .filter((n) => n !== this.selfName && n !== this.adapterName);
         let targets;
         if (arg === "everyone") {
             targets = allTeammates;
@@ -3284,7 +3839,7 @@ Issues that can't be resolved unilaterally — they need input from other teamma
         }
         const teammates = this.orchestrator
             .listTeammates()
-            .filter((n) => n !== this.adapterName);
+            .filter((n) => n !== this.selfName && n !== this.adapterName);
         if (teammates.length === 0)
             return;
         // 1. Check each teammate for stale daily logs (older than 7 days)
@@ -3369,7 +3924,7 @@ Issues that can't be resolved unilaterally — they need input from other teamma
             child.stdin?.end();
             // Show brief "Copied" message in the progress area
             if (this.chatView) {
-                this.chatView.setProgress(concat(tp.success("✔ "), tp.muted("Copied to clipboard")));
+                this.chatView.setProgress(concat(tp.success("✔  "), tp.muted("Copied to clipboard")));
                 this.refreshView();
                 setTimeout(() => {
                     this.chatView.setProgress(null);
@@ -3379,7 +3934,7 @@ Issues that can't be resolved unilaterally — they need input from other teamma
         }
         catch {
             if (this.chatView) {
-                this.chatView.setProgress(concat(tp.error("✖ "), tp.muted("Failed to copy")));
+                this.chatView.setProgress(concat(tp.error("✖  "), tp.muted("Failed to copy")));
                 this.refreshView();
                 setTimeout(() => {
                     this.chatView.setProgress(null);
@@ -3388,6 +3943,19 @@ Issues that can't be resolved unilaterally — they need input from other teamma
             }
         }
     }
+    /**
+     * Feed a command line with a clickable [copy] button.
+     * Renders as: `    command text  [copy]`
+     */
+    feedCommand(command) {
+        if (!this.chatView) {
+            this.feedLine(tp.accent(`    ${command}`));
+            return;
+        }
+        const normal = concat(tp.accent(`    ${command}  `), tp.muted("[copy]"));
+        const hover = concat(tp.accent(`    ${command}  `), tp.accent("[copy]"));
+        this.chatView.appendAction(`copy-cmd:${command}`, normal, hover);
+    }
     async cmdHelp() {
         this.feedLine();
         this.feedLine(tp.bold("  Commands"));
@@ -3439,9 +4007,9 @@ Issues that can't be resolved unilaterally — they need input from other teamma
             this.refreshView();
             return;
         }
-        // Has args — queue a task to the coding agent to apply the change
+        // Has args — queue a task to apply the change
         const task = `Update the file ${userMdPath} with the following change:\n\n${change}\n\nKeep the existing content intact unless the change explicitly replaces something. This is the user's profile — be concise and accurate.`;
-        this.taskQueue.push({ type: "agent", teammate: this.adapterName, task });
+        this.taskQueue.push({ type: "agent", teammate: this.selfName, task });
         this.feedLine(concat(tp.muted("  Queued USER.md update → "), tp.accent(`@${this.adapterName}`)));
         this.feedLine();
         this.refreshView();
@@ -3456,7 +4024,7 @@ Issues that can't be resolved unilaterally — they need input from other teamma
         }
         this.taskQueue.push({
             type: "btw",
-            teammate: this.adapterName,
+            teammate: this.selfName,
             task: question,
         });
         this.feedLine(concat(tp.muted("  Side question → "), tp.accent(`@${this.adapterName}`)));
@@ -3488,9 +4056,9 @@ Issues that can't be resolved unilaterally — they need input from other teamma
         row("textDim", t.textDim, "─── separator ───");
         this.feedLine();
         // Status
-        row("success", t.success, "✔ Task completed");
-        row("warning", t.warning, "⚠ Pending handoff");
-        row("error", t.error, "✖ Something went wrong");
+        row("success", t.success, "✔  Task completed");
+        row("warning", t.warning, "⚠  Pending handoff");
+        row("error", t.error, "✖  Something went wrong");
         row("info", t.info, "⠋ Working on task...");
         this.feedLine();
         // Interactive
@@ -3558,9 +4126,9 @@ Issues that can't be resolved unilaterally — they need input from other teamma
             "",
             "| Language   | Status  |",
             "|------------|---------|",
-            "| JavaScript | ✔ Ready |",
-            "| Python     | ✔ Ready |",
-            "| C#         | ✔ Ready |",
+            "| JavaScript | ✔  Ready |",
+            "| Python     | ✔  Ready |",
+            "| C#         | ✔  Ready |",
             "",
             "---",
         ].join("\n");