privateer-agent 0.1.0 → 0.2.1

package/src/components/App.tsx

@@ -7,6 +7,7 @@ import { Banner } from "./Banner.tsx";
 import { StatusBar, formatTokens, formatDuration } from "./StatusBar.tsx";
 import { RowView, groupRows, visualRows, clampStreamingText } from "./Transcript.tsx";
 import { ApprovalPrompt } from "./ApprovalPrompt.tsx";
+import { OptionPicker } from "./OptionPicker.tsx";
 import { ModelPicker } from "./ModelPicker.tsx";
 import { PromptInput } from "./PromptInput.tsx";
 import { PlanConfirm } from "./PlanConfirm.tsx";
@@ -25,7 +26,7 @@ import { loadMcpServers, connectMcpServers, type McpConnection } from "../mcp/cl
 import { hasStoredAuth, clearStoredAuth } from "../mcp/oauth.ts";
 import { TodoPanel } from "./TodoPanel.tsx";
 import { exec } from "../tools/exec.ts";
-import { resolveAttachments, chipFor } from "../util/images.ts";
+import { resolveAttachments, chipFor, mediaModality } from "../util/images.ts";
 import type { Attachment } from "../util/images.ts";
 import { AttachmentStore } from "../util/attachmentStore.ts";
 import type { Entry, ToolEntry, Row } from "./types.ts";
@@ -35,13 +36,20 @@ import { createSession } from "../session.ts";
 import { QueryEngine } from "../engine/QueryEngine.ts";
 import { emptyUsage, type UsageTotals } from "../engine/events.ts";
 import { runCommand, commandList } from "../commands/registry.ts";
+import { sendToDaemon, DaemonNotRunningError } from "../daemon/ipc.ts";
+import { drainNotices } from "../routines/store.ts";
+import { describeTrigger } from "../routines/trigger.ts";
+import type { Routine } from "../routines/schema.ts";
 import { isSlashCommand } from "./promptModel.ts";
 import { loadCustomCommands } from "../commands/custom.ts";
+import { loadSkills } from "../skills/loader.ts";
+import { installSkills, removeSkill } from "../skills/installer.ts";
 import { saveGlobalConfig } from "../config/load.ts";
-import { logout as privateerLogout, hasCredentials } from "../auth/privateer.ts";
+import { logout as privateerLogout, hasCredentials, onSessionExpired, warmSession } from "../auth/privateer.ts";
 import { RelayClient } from "../remote/relayClient.ts";
 import { ModeGate, type AskOutcome } from "../permissions/uiGate.ts";
 import type { PermissionRequest } from "../permissions/gate.ts";
+import type { UserQuestion, UserAnswer, UserAsker } from "../tools/askUser.ts";
 import {
   saveSession,
   loadSession,
@@ -51,7 +59,7 @@ import {
   type SessionData,
   type SessionMeta,
 } from "../memory/store.ts";
-import { theme } from "./theme.ts";
+import { theme, toolDisplayName } from "./theme.ts";
 import { DOWN } from "./figures.ts";
 import { randomVerb } from "./spinnerVerbs.ts";
 
@@ -60,12 +68,33 @@ interface PendingApproval {
   resolve: (outcome: AskOutcome) => void;
 }
 
+// An `ask_user` question awaiting the user's choice in the TUI; mirrors how a
+// PendingApproval parks a tool blocked on the human.
+interface PendingQuestion {
+  q: UserQuestion;
+  resolve: (answer: UserAnswer) => void;
+}
+
 const BANNER = "__banner__";
 
 function asText(output: unknown): string {
   return typeof output === "string" ? output : JSON.stringify(output);
 }
 
+// Render the daemon's routine list for /routine.
+function formatRoutines(routines: Routine[]): string {
+  if (routines.length === 0) {
+    return "No routines. Ask the agent to create one (e.g. \"summarize world news every morning\").";
+  }
+  const lines = routines.map((r) => {
+    const state = r.enabled ? "▶" : "⏸";
+    const next = r.enabled && r.nextRun ? new Date(r.nextRun).toLocaleString() : "paused";
+    const last = r.lastRun ? ` · last ${r.lastStatus ?? "?"} ${new Date(r.lastRun).toLocaleString()}` : "";
+    return `  ${state} ${r.name} — ${describeTrigger(r)} → ${next} [${r.delivery.join(",")}]${last}`;
+  });
+  return `Routines:\n${lines.join("\n")}\n\n/routine pause|resume|rm|run <name>`;
+}
+
 // Rows of fixed chrome below the live transcript (spinner, todo, status bar, the
 // bordered input + mode hint) that the streaming text must leave room for, so the
 // dynamic region never outgrows the viewport and tips Ink into full-screen repaint.
@@ -95,13 +124,16 @@ function mergeAgentMetrics(
 
 // Project the committed transcript into structured feed items for a remote
 // controller's catch-up snapshot, mirroring the live event kinds the app renders.
+// Whitespace-only assistant/thinking entries (possible in transcripts persisted
+// before the empty-block guard in the turn loop) are dropped — the app would
+// render each one as a blank gap in its feed.
 function snapshotEntries(entries: Entry[]): { kind: string; text: string }[] {
   const out: { kind: string; text: string }[] = [];
   for (const e of entries) {
     if (e.kind === "user") out.push({ kind: "you", text: e.text });
-    else if (e.kind === "assistant") out.push({ kind: "assistant", text: e.text });
-    else if (e.kind === "thinking") out.push({ kind: "reasoning", text: e.text });
-    else if (e.kind === "tool") out.push({ kind: "tool", text: `▸ ${e.name} — ${e.status}` });
+    else if (e.kind === "assistant" && e.text.trim()) out.push({ kind: "assistant", text: e.text });
+    else if (e.kind === "thinking" && e.text.trim()) out.push({ kind: "reasoning", text: e.text });
+    else if (e.kind === "tool") out.push({ kind: "tool", text: `▸ ${toolDisplayName(e.name)} — ${e.status}` });
     else if (e.kind === "notice") out.push({ kind: "notice", text: e.text });
   }
   return out;
@@ -162,6 +194,7 @@ export function App({
   const [lastTurnUsage, setLastTurnUsage] = useState<UsageTotals>(emptyUsage());
   const [sessionError, setSessionError] = useState<string | null>(null);
   const [pending, setPending] = useState<PendingApproval | null>(null);
+  const [pendingQuestion, setPendingQuestion] = useState<PendingQuestion | null>(null);
   const [picking, setPicking] = useState(false);
   const [todos, setTodos] = useState<TodoItem[]>([]);
   const [verb, setVerb] = useState(randomVerb());
@@ -203,6 +236,9 @@ export function App({
   // rewrote to chips in the buffer text. Each turn claims the ones whose chip
   // survives into its submitted text, so the base64 still rides along.
   const pendingImagesRef = useRef<Attachment[]>([]);
+  // Files received from the app over the relay, awaiting the next remote prompt to
+  // ride along with (mirrors how drag/paste stages into pendingImagesRef).
+  const pendingRemoteAttachmentsRef = useRef<{ name: string; mediaType: string; base64: string }[]>([]);
   // Session-lifetime checkpoint store (survives model/style switches) for /rewind,
   // plus a live mirror of the committed transcript length for checkpointing. Bound to
   // the session's on-disk checkpoint dir so /rewind survives a restart-and-resume; a
@@ -250,7 +286,12 @@ export function App({
 
   // Custom slash commands from .privateer/commands, plus the merged autocomplete list.
   const customCommands = useMemo(() => loadCustomCommands(cwd), [cwd]);
-  const commands = useMemo(() => commandList(customCommands), [customCommands]);
+  // Agent skills from .privateer/skills. The epoch bumps after /skills install|remove
+  // so this list — and the session, whose skill-tool catalog is baked in at build
+  // time — pick up the change.
+  const [skillsEpoch, setSkillsEpoch] = useState(0);
+  const skills = useMemo(() => loadSkills(cwd).skills, [cwd, skillsEpoch]);
+  const commands = useMemo(() => commandList(customCommands, skills), [customCommands, skills]);
   // Lifecycle hooks (UserPromptSubmit / Stop) configured in settings.
   const hooks = useMemo(() => new HookRunner(loadHooks((config as any).hooks), cwd), [cwd]);
 
@@ -298,6 +339,18 @@ export function App({
     [],
   );
 
+  // Bridge the `ask_user` tool to the TUI: park the question's resolver in state so
+  // the OptionPicker can render and resolve it, exactly like the approval prompt. A
+  // remote-driven turn has no local human to ask, so it resolves as dismissed and the
+  // model falls back to its own judgment.
+  const askUser = useMemo<UserAsker>(
+    () => (q) =>
+      currentTurnRemoteRef.current
+        ? Promise.resolve({ kind: "dismissed" as const })
+        : new Promise<UserAnswer>((resolve) => setPendingQuestion({ q, resolve })),
+    [],
+  );
+
   // Build (and rebuild on model / output-style change) the agent session, carrying
   // history forward.
   useEffect(() => {
@@ -309,6 +362,7 @@ export function App({
         modelSpec,
         cwd,
         gate,
+        askUser,
         confineToCwd: config.confineToCwd,
         allowedOutsideRoots: allowedOutsideRootsRef.current,
         outputStyle: outputStyle ?? undefined,
@@ -318,6 +372,16 @@ export function App({
         processes: processesRef.current,
         attachments: attachmentsRef.current,
         onSubAgentMetrics: (id, m) => subAgentMetricsRef.current.set(id, m),
+        // Read the ref at call time: the relay lives in its own effect (the
+        // /remote-access toggle), so this closure stays valid across session
+        // rebuilds and remote on/off flips.
+        sendFileToController: (file) => {
+          const client = relayRef.current;
+          if (!client) {
+            return Promise.resolve({ ok: false, reason: "remote access is off (/remote-access to enable)" });
+          }
+          return client.sendFile(file);
+        },
       });
       if (prev) {
         session.engine.messages.push(...prev.messages);
@@ -342,7 +406,7 @@ export function App({
     // Rebuild on model/style change, and when entering/leaving plan mode (so the
     // system prompt gains or loses the plan-mode mandate) — not on every mode change.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [modelSpec, outputStyle, mode === "plan", mcpTools, zdrEnforced]);
+  }, [modelSpec, outputStyle, mode === "plan", mcpTools, zdrEnforced, skillsEpoch]);
 
   // One-time notice when resuming a prior conversation.
   useEffect(() => {
@@ -354,6 +418,22 @@ export function App({
     }
   }, []);
 
+  // Surface any scheduled-routine results that finished while no terminal was
+  // attached ("notice" delivery). Drained once on startup.
+  useEffect(() => {
+    const pending = drainNotices();
+    if (pending.length === 0) return;
+    const lines = pending.map((n) => {
+      const mark = n.status === "ok" ? "⏺" : "✗";
+      const where = n.path ? ` (${n.path})` : "";
+      return `  ${mark} ${n.routine}: ${n.preview}${where}`;
+    });
+    setCommitted((c) => [
+      { kind: "notice", text: `Scheduled routine results:\n${lines.join("\n")}` },
+      ...c,
+    ]);
+  }, []);
+
   // Keep a live mirror of the committed transcript so checkpoints can record its
   // length synchronously (the useInput/runTurn closures can lag a render).
   useEffect(() => {
@@ -457,14 +537,61 @@ export function App({
   // remote prompt queues/dispatches against the current `busy`, never a stale one.
   handleInputRef.current = (value, opts) => handleInput(value, opts);
 
+  // Fold any files the app sent over the relay into a remote prompt. Binary kinds
+  // (image/pdf/…) become "[Kind #n]" chips backed by staged bytes that runTurn's
+  // liveAttachments filter then claims; text-like kinds are decoded and inlined as a
+  // fenced block. Returns the augmented prompt, or null when there's nothing to run
+  // (no text and no files). Mirrors the drag/paste staging into pendingImagesRef.
+  function consumeRemoteAttachments(text: string): string | null {
+    const files = pendingRemoteAttachmentsRef.current;
+    pendingRemoteAttachmentsRef.current = [];
+    if (files.length === 0) return text.trim() ? text : null;
+
+    const chips: string[] = [];
+    const inlined: string[] = [];
+    const maxInline = config.router?.inlineTextMaxBytes ?? 65_536;
+    for (const f of files) {
+      const modality = mediaModality(f.mediaType);
+      if (modality) {
+        const n = (imageSeqRef.current += 1);
+        const att: Attachment = { data: f.base64, mediaType: f.mediaType, modality, path: f.name, n };
+        pendingImagesRef.current.push(att);
+        chips.push(chipFor(att));
+      } else {
+        let body = "";
+        try { body = Buffer.from(f.base64, "base64").toString("utf8"); } catch { body = ""; }
+        if (body.length > maxInline) body = body.slice(0, maxInline) + `\n… (truncated, ${body.length - maxInline} more chars)`;
+        inlined.push(`\n\n${f.name}:\n\`\`\`\n${body}\n\`\`\``);
+      }
+    }
+    const head = text.trim();
+    const chipLine = chips.length ? (head ? " " : "") + chips.join(" ") : "";
+    const composed = `${head}${chipLine}${inlined.join("")}`.trim();
+    return composed.length ? composed : null;
+  }
+
   // Open/close the relay when /remote-access is toggled. The client is owned here
   // (mirrors mcpRef) and torn down on disable/unmount. On teardown we resolve any
   // parked approvals to "deny" so a dropped controller can't wedge a turn.
   useEffect(() => {
     if (!remoteEnabled) return;
     const client = new RelayClient({
-      onPrompt: (text) => handleInputRef.current(text, { remote: true }),
+      onPrompt: (text) => {
+        const merged = consumeRemoteAttachments(text);
+        if (merged) handleInputRef.current(merged, { remote: true });
+      },
+      onAttachment: (file) => {
+        pendingRemoteAttachmentsRef.current.push(file);
+        append({ kind: "notice", text: `📎 received ${file.name} from app` });
+      },
       onInterrupt: () => abortRef.current?.abort(),
+      // The app's "End remote access" — same as typing /remote-access off. Flipping
+      // remoteEnabled runs this effect's cleanup: the client stops (no reconnect)
+      // and any parked approvals resolve to deny.
+      onTerminate: () => {
+        append({ kind: "notice", text: "Remote access turned off from the Privateer app. Use /remote-access on to re-enable." });
+        setRemoteEnabled(false);
+      },
       onApprovalResponse: (id, decision) => {
         const entry = pendingApprovalsRef.current.get(id);
         if (entry) {
@@ -520,8 +647,9 @@ export function App({
 
   useInput((input, key) => {
     if (key.ctrl && input === "c") exit();
-    // Esc interrupts an in-flight turn (the run loop persists partial output).
-    if (key.escape && busy && abortRef.current) abortRef.current.abort();
+    // Esc interrupts an in-flight turn (the run loop persists partial output) — but
+    // not while a question picker owns input, where Esc means "dismiss the question".
+    if (key.escape && busy && !pendingQuestion && abortRef.current) abortRef.current.abort();
     // Ctrl+O toggles detail level for the whole transcript: it expands/collapses
     // both the model's reasoning blocks and full tool output together. (Reasoning
     // only exists when extended thinking is enabled, so without also flipping tool
@@ -536,7 +664,16 @@ export function App({
     }
     // Shift+Tab rotates the permission mode — but not while a modal overlay owns
     // input (it has its own keybindings).
-    if (key.tab && key.shift && !pending && !picking && !rewinding && !planReady && !sessionsPicking)
+    if (
+      key.tab &&
+      key.shift &&
+      !pending &&
+      !pendingQuestion &&
+      !picking &&
+      !rewinding &&
+      !planReady &&
+      !sessionsPicking
+    )
       cycleMode();
   });
 
@@ -553,8 +690,34 @@ export function App({
 
   const append = (...entries: Entry[]) => setCommitted((c) => [...c, ...entries]);
 
+  // Announce a Privateer sign-out the moment it happens. The machine login
+  // dies server-side when its refresh-token TTL lapses (only after weeks of
+  // no use — spawns slide it forward) or it's revoked, and — because the child
+  // session only spawns on demand — the CLI used to discover that on the first
+  // request after a boot, where the credentials were wiped silently. The
+  // listener covers every spawn path (startup, first prompt, relay tickets);
+  // warming the session up front when the active model bills to the account
+  // moves the announcement to launch instead of mid-turn.
+  useEffect(() => {
+    const unsub = onSessionExpired(() =>
+      append({
+        kind: "notice",
+        tone: "error",
+        text: "Signed out of your Privateer account — this machine's login expired.",
+        hint: "Run /login to sign back in. Account models stay listed under /model.",
+      }),
+    );
+    try {
+      if (parseModelSpec(modelSpec).provider === "privateer") void warmSession();
+    } catch {
+      /* malformed model spec — nothing to warm */
+    }
+    return unsub;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   function handleCommand(raw: string): boolean {
-    const res = runCommand(raw, { config, modelSpec, mode, usage, context, cwd, todos, customCommands });
+    const res = runCommand(raw, { config, modelSpec, mode, usage, context, cwd, todos, customCommands, skills });
     if (!res) return false;
     append({ kind: "user", text: raw });
     switch (res.type) {
@@ -586,6 +749,32 @@ export function App({
       case "runPrompt":
         void runTurn(res.text, { hideInput: true });
         break;
+      case "skillOp": {
+        const scope = res.project ? ("project" as const) : ("user" as const);
+        if (res.op === "install") {
+          append({ kind: "notice", text: `Installing skill(s) from ${res.arg}…` });
+          void installSkills(res.arg, { scope, all: res.all, force: res.force, cwd })
+            .then((installed) => {
+              append({
+                kind: "notice",
+                text: `Installed (${scope}): ${installed.map((s) => s.name).join(", ")}`,
+              });
+              setSkillsEpoch((e) => e + 1);
+            })
+            .catch((err) => {
+              append({ kind: "notice", tone: "error", text: err instanceof Error ? err.message : String(err) });
+            });
+        } else {
+          try {
+            const { dir } = removeSkill(res.arg, { scope: res.project ? "project" : undefined, cwd });
+            append({ kind: "notice", text: `Removed skill "${res.arg}" (${dir}).` });
+            setSkillsEpoch((e) => e + 1);
+          } catch (err) {
+            append({ kind: "notice", tone: "error", text: err instanceof Error ? err.message : String(err) });
+          }
+        }
+        break;
+      }
       case "compact":
         void doCompact();
         break;
@@ -710,6 +899,47 @@ export function App({
         });
         break;
       }
+      case "routine": {
+        const targeted = res.action !== "list";
+        if (targeted && !res.arg) {
+          append({ kind: "notice", tone: "error", text: `Usage: /routine ${res.action} <name>` });
+          break;
+        }
+        const req =
+          res.action === "list"
+            ? ({ cmd: "list" } as const)
+            : res.action === "pause"
+              ? ({ cmd: "pause", idOrName: res.arg! } as const)
+              : res.action === "resume"
+                ? ({ cmd: "resume", idOrName: res.arg! } as const)
+                : res.action === "remove"
+                  ? ({ cmd: "remove", idOrName: res.arg! } as const)
+                  : ({ cmd: "run-now", idOrName: res.arg! } as const);
+        void sendToDaemon(req)
+          .then((r) => {
+            if (!r.ok) {
+              append({ kind: "notice", tone: "error", text: r.message ?? "Command failed." });
+              return;
+            }
+            if (res.action === "list") {
+              append({ kind: "notice", text: formatRoutines(r.routines ?? []) });
+            } else {
+              append({ kind: "notice", text: r.message ?? "Done." });
+            }
+          })
+          .catch((err) => {
+            if (err instanceof DaemonNotRunningError) {
+              append({
+                kind: "notice",
+                tone: "error",
+                text: "Routine daemon isn't running. Start it with `privateer daemon` (or `privateer daemon --detach`).",
+              });
+            } else {
+              append({ kind: "notice", tone: "error", text: `Routine error: ${String(err)}` });
+            }
+          });
+        break;
+      }
       case "rewind":
         if (checkpointsRef.current.list().length === 0) {
           append({ kind: "notice", text: "No checkpoints yet — they're taken before each turn." });
@@ -969,10 +1199,16 @@ export function App({
       }
       for await (const ev of engine.send(sendText, controller.signal, attachments)) {
         switch (ev.type) {
-          case "text":
+          case "text": {
             thinkingIdx = -1;
             if (assistantIdx === -1) {
-              pushLive({ kind: "assistant", text: ev.text });
+              // Models often emit a whitespace-only text block between tool
+              // calls; opening an entry for it paints an empty ⏺ bullet. Hold
+              // off until real text arrives, and drop the leading whitespace
+              // when it does (it was only ever a separator).
+              const opening = ev.text.replace(/^\s+/, "");
+              if (!opening) break;
+              pushLive({ kind: "assistant", text: opening });
               assistantIdx = liveEntries.length - 1;
             } else {
               const idx = assistantIdx;
@@ -982,9 +1218,13 @@ export function App({
               sync();
             }
             break;
-          case "reasoning":
+          }
+          case "reasoning": {
             if (thinkingIdx === -1) {
-              pushLive({ kind: "thinking", text: ev.text });
+              // Same whitespace-only guard as assistant text above.
+              const opening = ev.text.replace(/^\s+/, "");
+              if (!opening) break;
+              pushLive({ kind: "thinking", text: opening });
               thinkingIdx = liveEntries.length - 1;
             } else {
               const idx = thinkingIdx;
@@ -994,6 +1234,7 @@ export function App({
               sync();
             }
             break;
+          }
           case "tool-call": {
             // `task` calls carry the sub-agent's description/type so the grouped
             // agents view can label each row before its metrics land.
@@ -1288,7 +1529,7 @@ export function App({
             no work to animate. Crucially, ink-spinner re-renders the whole dynamic
             region every frame; left running it would erase+redraw the bordered
             ApprovalPrompt below it ~10×/s, which reads as the box flickering. */}
-        {busy && !pending && (
+        {busy && !pending && !pendingQuestion && (
           <Box marginTop={1} gap={1}>
             <Text color={theme.accent}>
               <Spinner type="dots" />
@@ -1313,6 +1554,7 @@ export function App({
           custom={statusText || undefined}
           zdr={zdr}
           tee={tee}
+          remote={remoteEnabled}
         />
 
         {picking ? (
@@ -1332,6 +1574,14 @@ export function App({
               setPending(null);
             }}
           />
+        ) : pendingQuestion ? (
+          <OptionPicker
+            question={pendingQuestion.q}
+            onRespond={(answer) => {
+              pendingQuestion.resolve(answer);
+              setPendingQuestion(null);
+            }}
+          />
         ) : rewinding ? (
           <RewindPicker
             checkpoints={checkpointsRef.current.list()}

package/src/components/ApprovalPrompt.tsx

@@ -20,18 +20,29 @@ export function ApprovalPrompt({
     else if (c === "n" || key.escape) onRespond("deny");
   });
 
+  // Quiet cue for elevated-stakes requests — stays in the blue theme, just flags
+  // that this one is weightier than a routine approval. Order = most severe first.
+  const badge = req.alwaysAsk
+    ? "destructive"
+    : req.protected
+      ? "guarded file"
+      : req.outside
+        ? "outside cwd"
+        : undefined;
+
   return (
-    <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={theme.warning} paddingX={1}>
+    <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={theme.accent} paddingX={1}>
       <Text>
-        <Text bold color={theme.warning}>
+        <Text bold color={theme.accent}>
           {req.title}
         </Text>
         <Text dimColor> ({req.tool})</Text>
+        {badge && <Text dimColor>  ⚠ {badge}</Text>}
       </Text>
       <Text>{req.detail}</Text>
       <Text dimColor>
-        <Text color={theme.success}>y</Text> allow · <Text color={theme.success}>a</Text> always ·{" "}
-        <Text color={theme.error}>n</Text> deny
+        <Text color={theme.accent}>y</Text> allow · <Text color={theme.accent}>a</Text> always ·{" "}
+        <Text color={theme.accentDim}>n</Text> deny
       </Text>
     </Box>
   );

package/src/components/Banner.tsx

@@ -4,6 +4,7 @@ import { Box, Text } from "ink";
 import { VERSION } from "../version.ts";
 import { theme } from "./theme.ts";
 import { WELCOME } from "./figures.ts";
+import { currentUser } from "../auth/privateer.ts";
 
 // Collapse the user's home directory to ~ for a compact path display.
 function shortenPath(cwd: string): string {
@@ -13,6 +14,17 @@ function shortenPath(cwd: string): string {
     : cwd;
 }
 
+// The Privateer account this terminal is signed into: email accounts show the
+// email; wallet accounts (no email) show the first few characters of the Solana
+// public key. Returns null when running unauthenticated (BYO key, no account).
+function accountLabel(): string | null {
+  const user = currentUser();
+  if (!user) return null;
+  if (user.email) return user.email;
+  if (user.solanaPublicKey) return user.solanaPublicKey.slice(0, 6) + "…";
+  return null;
+}
+
 // Anchor motif rendered in ASCII — the Privateer mark (ring, stock, shank, flukes).
 const ANCHOR = [
   "    .-.    ",
@@ -24,6 +36,7 @@ const ANCHOR = [
 ];
 
 export function Banner({ model }: { model: string }) {
+  const account = accountLabel();
   return (
     <Box flexDirection="column">
       <Box
@@ -44,7 +57,14 @@ export function Banner({ model }: { model: string }) {
           <Text bold color={theme.accent}>
             {WELCOME} PRIVATEER
           </Text>
-          <Text color={theme.dim}>bring your own model · v{VERSION}</Text>
+          <Text color={theme.dim}>
+            bring your own model or connect to Privateer · v{VERSION}
+          </Text>
+          {account && (
+            <Text color={theme.dim}>
+              connected as <Text color={theme.accent}>{account}</Text>
+            </Text>
+          )}
           <Text> </Text>
           <Text>
             model <Text color={theme.accent}>{model}</Text>