@orangecollective/oc 0.1.1 → 0.2.0

package/README.md

@@ -52,18 +52,28 @@ In the chat:
 
 | | |
 |---|---|
-| `@name` | attach a company, founder, batch or skill |
+| `@name` | mention a company, founder, batch or skill — it stays in your text, highlighted, and goes to the agent as context |
 | `/` | open the command list (tab to complete) |
 | `/model [name]` | switch model (no argument lists them) |
 | `/web` | toggle web search |
 | `/team [slug]` · `/batch [W26]` | change scope |
 | `/digest [-r]` | re-run the digest (`-r` regenerates it server-side) |
+| `/activity [n]` | the latest batch activity (default 10) |
+| `/activity on` · `off` | the live ticker — new batch activity prints as it happens (on by default, polled once a minute) |
+| `/fav <company> [in <folder>]` | add a company to a favorites folder (`/fav @Lyon` works too; a folder that doesn't exist is created) |
+| `/unfav <company>` | remove your favorite |
+| `/favs [folder]` | list your team's folders, or one folder's companies |
 | `/new` · `/clear` · `/quit` | |
 | `?` | shortcuts (on an empty prompt) |
 | `↑ ↓` | history, or move through a list |
-| `esc` | interrupt · close a list · drop context |
+| `esc` | interrupt · close a list |
 | `ctrl-c` ×2 | exit |
 
+Activity rows led by an orange `◆` are things a teammate did (favorited a
+company, made a folder, joined) — the same events the web app's Activity tab
+shows. Rows led by `·` are the sync pipeline noticing a change (a new launch, an
+edited one-liner).
+
 Config lives in `~/.oc/` — `credentials.json` (session) and `state.json` (model,
 team, batch, thread), both `0600`. Set `OC_CONFIG_DIR` to relocate them.
 
@@ -98,6 +108,11 @@ Notes for anyone editing this:
 - `build.mjs` resolves the app's `@/` alias so a small allowlist of **pure**
   modules can be shared (the digest wire format). Never import anything that
   touches `next/headers`, a Supabase server client, or React components.
+- An accepted `@`-mention is ordinary text (`@Label`) plus a record attached
+  behind it. The record lives exactly as long as its `@Label` is in the prompt
+  — delete the text and the context goes with it — and `findMentionSpans` in
+  `App.tsx` is what both highlights it and stops the picker reopening inside it.
 - Server-side pieces this depends on: `lib/supabase/request.ts` (bearer auth),
-  `app/api/cli/*`, `app/auth/cli/[port]/[code]/page.tsx`, `lib/cli-auth.ts`. See
-  the `oc` CLI section in the repo's `CLAUDE.md`.
+  `app/api/cli/*` (bootstrap, activity, favorites), `app/auth/cli/[port]/[code]/page.tsx`,
+  `lib/cli-auth.ts`, `lib/favorites-core.ts`. See the `oc` CLI section in the
+  repo's `CLAUDE.md`.

package/dist/oc.js

@@ -13,7 +13,7 @@ import open from "open";
 import { chmod, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import path from "node:path";
-var VERSION = true ? "0.1.1" : "0.0.0-dev";
+var VERSION = true ? "0.2.0" : "0.0.0-dev";
 function isOlderThan(version, floor) {
   const parse = (v) => v.split("-")[0].split(".").map((n) => Number.parseInt(n, 10) || 0);
   const [a, b] = [parse(version), parse(floor)];
@@ -323,6 +323,16 @@ var OcClient = class {
   }
   host;
   getToken;
+  /** Read a JSON error body into a thrown Error, falling back to the status. */
+  async fail(res, fallback) {
+    let detail = null;
+    try {
+      const json = await res.json();
+      if (typeof json.error === "string") detail = json.error;
+    } catch {
+    }
+    throw new Error(detail ?? `${fallback} (HTTP ${res.status})`);
+  }
   async authHeaders() {
     return {
       Authorization: `Bearer ${await this.getToken()}`,
@@ -403,6 +413,65 @@ var OcClient = class {
     if (!res.ok) return [];
     return flattenContextResults(await res.json());
   }
+  /**
+   * The batch's activity feed (`GET /api/cli/activity`) — with `after`, only
+   * events newer than that timestamp, which is how the ticker polls cheaply.
+   */
+  async activity(args) {
+    const params = new URLSearchParams({ teamId: String(args.teamId), batch: args.batch });
+    if (args.after) params.set("after", args.after);
+    if (args.limit) params.set("limit", String(args.limit));
+    const res = await this.request(`/api/cli/activity?${params}`, { signal: args.signal });
+    if (!res.ok) return this.fail(res, "Couldn't load activity");
+    const json = await res.json();
+    return json.items ?? [];
+  }
+  /** Company-only search, for resolving the name given to `/fav` and `/unfav`. */
+  async searchCompanies(query, limit = 8) {
+    const params = new URLSearchParams({
+      q: query,
+      companies: String(limit),
+      founders: "0",
+      skills: "0",
+      sections: "companies"
+    });
+    const res = await this.request(`/api/search/context?${params}`);
+    if (!res.ok) return [];
+    const data = await res.json();
+    return (data.companies ?? []).map((c) => ({ id: c.id, name: c.name, batch: c.batch }));
+  }
+  async favoriteFolders(teamId) {
+    const res = await this.request(`/api/cli/favorites?teamId=${teamId}`);
+    if (!res.ok) return this.fail(res, "Couldn't load your folders");
+    const json = await res.json();
+    return json.folders ?? [];
+  }
+  async addFavorite(folderId, companyId) {
+    const res = await this.request("/api/cli/favorites", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ folderId, companyId })
+    });
+    if (!res.ok) return this.fail(res, "Couldn't add the favorite");
+  }
+  async removeFavorite(folderId, companyId) {
+    const res = await this.request("/api/cli/favorites", {
+      method: "DELETE",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ folderId, companyId })
+    });
+    if (!res.ok) return this.fail(res, "Couldn't remove the favorite");
+  }
+  async createFavoriteFolder(teamId, name) {
+    const res = await this.request("/api/cli/favorites/folders", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ teamId, name })
+    });
+    if (!res.ok) return this.fail(res, "Couldn't create the folder");
+    const json = await res.json();
+    return json.id;
+  }
   /**
    * Transport for POST /api/chat. Sends exactly the body the web chat panel's
    * transport sends, so the route needs no CLI-specific branch.
@@ -462,7 +531,7 @@ function buildContextPrefix(items) {
 
 // src/ui/App.tsx
 import { useCallback, useEffect as useEffect2, useMemo, useRef, useState as useState2 } from "react";
-import { Box as Box5, Static, Text as Text5, useApp, useInput } from "ink";
+import { Box as Box6, Static, Text as Text6, useApp, useInput } from "ink";
 import { generateId, readUIMessageStream } from "ai";
 
 // src/markdown.ts
@@ -485,9 +554,118 @@ function renderMarkdown(text) {
   }
 }
 
-// src/ui/Input.tsx
+// src/ui/Activity.tsx
 import { Box, Text } from "ink";
 
+// ../lib/format-relative-date.ts
+function formatRelativeDate(iso) {
+  if (!iso) return "";
+  const then = new Date(iso).getTime();
+  if (Number.isNaN(then)) return "";
+  const diffMs = Date.now() - then;
+  const diffSec = Math.floor(diffMs / 1e3);
+  if (diffSec < 60) return "just now";
+  const diffMin = Math.floor(diffSec / 60);
+  if (diffMin < 60) return `${diffMin}m ago`;
+  const diffHr = Math.floor(diffMin / 60);
+  if (diffHr < 24) return `${diffHr}h ago`;
+  const diffDay = Math.floor(diffHr / 24);
+  if (diffDay < 7) return `${diffDay}d ago`;
+  const d = new Date(then);
+  return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+}
+
+// src/activity.ts
+var FIELD_LABELS = {
+  one_liner: "one-liner",
+  founder_dynamics: "founder dynamics",
+  group_partner: "group partner",
+  tldr: "TLDR"
+};
+var humanize = (field) => FIELD_LABELS[field] ?? field.replace(/_/g, " ");
+function joinFields(fields) {
+  const labels = fields.map(humanize);
+  if (labels.length <= 1) return labels[0] ?? "";
+  if (labels.length === 2) return `${labels[0]} and ${labels[1]}`;
+  return `${labels.slice(0, -1).join(", ")}, and ${labels[labels.length - 1]}`;
+}
+function money(n) {
+  if (n == null) return null;
+  if (n >= 1e6) {
+    const v = n / 1e6;
+    return `$${Number.isInteger(v) ? v : v.toFixed(1)}M`;
+  }
+  if (n >= 1e3) return `$${Math.round(n / 1e3)}K`;
+  return `$${n}`;
+}
+var strong = (text) => ({ text, tone: "strong" });
+var dim = (text) => ({ text, tone: "dim" });
+function isSocialActivity(item) {
+  return item.actor != null;
+}
+function describeActivity(item) {
+  const { company, actor, meta } = item;
+  const name = company?.name ?? "a company";
+  const batch = company?.batch ? dim(` (${company.batch})`) : null;
+  const who = strong(actor?.name ?? meta.memberName ?? "Someone");
+  switch (item.eventType) {
+    case "yc_company_added":
+      return [
+        strong(name),
+        dim(` was added${company?.batch ? ` to ${company.batch}` : ""}`),
+        ...company?.oneLiner ? [dim(` \u2014 ${company.oneLiner}`)] : []
+      ];
+    case "yc_company_launched":
+      return [strong(name), ...batch ? [batch] : [], dim(" published their Launch YC post")];
+    case "yc_company_updated": {
+      const fields = meta.changedFields ?? [];
+      const single = fields.length === 1 ? fields[0] : null;
+      const value = single ? meta.changedValues?.[single] : null;
+      const old = single ? meta.changedOldValues?.[single] : null;
+      let verb;
+      if (!fields.length) verb = "was updated";
+      else if (single && value && old) verb = `updated their ${humanize(single)}: ${old} \u2192 ${value}`;
+      else if (single && value) verb = `updated their ${humanize(single)} to ${value}`;
+      else verb = `updated their ${joinFields(fields)}`;
+      return [strong(name), ...batch ? [batch] : [], dim(` ${verb}`)];
+    }
+    case "yc_company_team_size_changed": {
+      const span = meta.oldTeamSize != null && meta.newTeamSize != null ? `updated their team size: ${meta.oldTeamSize} \u2192 ${meta.newTeamSize}` : "changed team size";
+      return [strong(name), ...batch ? [batch] : [], dim(` ${span}`)];
+    }
+    case "company_progress_updated":
+      return [
+        dim("New progress update \xB7 "),
+        strong(name),
+        ...meta.headline ? [dim(`: ${meta.headline}`)] : []
+      ];
+    case "investment_tranche_added": {
+      const detail = [money(meta.amount), meta.stage].filter(Boolean).join(" \xB7 ");
+      return [
+        dim(meta.trancheType === "follow_on" ? "Follow-on investment in " : "New investment in "),
+        strong(name),
+        ...detail ? [dim(` \xB7 ${detail}`)] : []
+      ];
+    }
+    case "shared_folder_favorite_added":
+      return [
+        who,
+        dim(" favorited "),
+        strong(name),
+        ...meta.folderName ? [dim(" into "), strong(meta.folderName)] : []
+      ];
+    case "shared_folder_created":
+      return [who, dim(" created a shared folder "), strong(meta.folderName ?? "Untitled")];
+    case "team_member_added":
+      return [who, dim(" joined the team")];
+    default:
+      return [dim("Activity for "), strong(name)];
+  }
+}
+function activityAge(item) {
+  return formatRelativeDate(item.createdAt);
+}
+
 // src/ui/theme.ts
 var ORANGE = {
   tint: "#ffe2c4",
@@ -507,40 +685,97 @@ var LOGO_RAMP = [
 ];
 var ACCENT = ORANGE.base;
 
+// src/ui/Activity.tsx
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+function Segments({ segments }) {
+  return /* @__PURE__ */ jsx(Fragment, { children: segments.map((segment, index) => /* @__PURE__ */ jsx(Text, { bold: segment.tone === "strong", dimColor: segment.tone === "dim", children: segment.text }, index)) });
+}
+function ActivityBlock({
+  heading,
+  items
+}) {
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
+    heading ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: heading }) : null,
+    items.map((item) => /* @__PURE__ */ jsxs(Box, { children: [
+      /* @__PURE__ */ jsx(Text, { color: isSocialActivity(item) ? ACCENT : void 0, dimColor: !isSocialActivity(item), children: isSocialActivity(item) ? "\u25C6 " : "\xB7 " }),
+      /* @__PURE__ */ jsxs(Text, { wrap: "truncate-end", children: [
+        /* @__PURE__ */ jsx(Segments, { segments: describeActivity(item) }),
+        /* @__PURE__ */ jsx(Text, { dimColor: true, children: `  ${activityAge(item)}` })
+      ] })
+    ] }, item.id))
+  ] });
+}
+
 // src/ui/Input.tsx
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Box as Box2, Text as Text2 } from "ink";
+import { Fragment as Fragment2, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var PLACEHOLDER = "ask anything \u2014 @ for context, / for commands";
+function HighlightedText({
+  value,
+  cursor,
+  spans,
+  dimPlain = false
+}) {
+  const points = /* @__PURE__ */ new Set([0, value.length]);
+  if (cursor != null) {
+    points.add(cursor);
+    points.add(Math.min(cursor + 1, value.length));
+  }
+  for (const span of spans) {
+    points.add(span.start);
+    points.add(span.end);
+  }
+  const edges = [...points].sort((a, b) => a - b);
+  const runs = [];
+  for (let i = 0; i < edges.length - 1; i++) {
+    const [start, end] = [edges[i], edges[i + 1]];
+    if (start === end) continue;
+    const mention = spans.some((s) => start >= s.start && end <= s.end);
+    const caret = cursor != null && start === cursor && end === cursor + 1;
+    runs.push(
+      /* @__PURE__ */ jsx2(
+        Text2,
+        {
+          color: mention ? ACCENT : void 0,
+          bold: mention,
+          inverse: caret,
+          dimColor: !mention && dimPlain,
+          children: value.slice(start, end)
+        },
+        start
+      )
+    );
+  }
+  if (cursor != null && cursor >= value.length) {
+    runs.push(
+      /* @__PURE__ */ jsx2(Text2, { inverse: true, children: " " }, "caret")
+    );
+  }
+  return /* @__PURE__ */ jsx2(Fragment2, { children: runs });
+}
 function Input({
   value,
   cursor,
-  context,
+  spans,
   busy,
   status,
   hint
 }) {
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    context.length > 0 ? /* @__PURE__ */ jsxs(Box, { paddingLeft: 1, children: [
-      /* @__PURE__ */ jsx(Text, { color: ACCENT, children: "\u23F5 " }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: context.map((c) => c.label).join(", ") })
-    ] }) : null,
-    /* @__PURE__ */ jsxs(Box, { borderStyle: "round", borderColor: busy ? "gray" : ACCENT, paddingX: 1, children: [
-      /* @__PURE__ */ jsx(Text, { color: busy ? "gray" : ACCENT, children: "> " }),
-      value.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: PLACEHOLDER }) : /* @__PURE__ */ jsxs(Text, { children: [
-        value.slice(0, cursor),
-        /* @__PURE__ */ jsx(Text, { inverse: true, children: value[cursor] ?? " " }),
-        value.slice(cursor + 1)
-      ] })
+  return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs2(Box2, { borderStyle: "round", borderColor: busy ? "gray" : ACCENT, paddingX: 1, children: [
+      /* @__PURE__ */ jsx2(Text2, { color: busy ? "gray" : ACCENT, children: "> " }),
+      value.length === 0 ? /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: PLACEHOLDER }) : /* @__PURE__ */ jsx2(Text2, { children: /* @__PURE__ */ jsx2(HighlightedText, { value, cursor, spans }) })
     ] }),
-    /* @__PURE__ */ jsxs(Box, { paddingLeft: 1, children: [
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: status }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: hint ? `   ${hint}` : "" })
+    /* @__PURE__ */ jsxs2(Box2, { paddingLeft: 1, children: [
+      /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: status }),
+      /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: hint ? `   ${hint}` : "" })
     ] })
   ] });
 }
 
 // src/ui/Logo.tsx
-import { Box as Box2, Text as Text2 } from "ink";
-import { jsx as jsx2 } from "react/jsx-runtime";
+import { Box as Box3, Text as Text3 } from "ink";
+import { jsx as jsx3 } from "react/jsx-runtime";
 var LOGO_ROWS = [
   " \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557        \u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557     \u2588\u2588\u2557",
   "\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D       \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551     \u2588\u2588\u2551",
@@ -551,17 +786,17 @@ var LOGO_ROWS = [
 ];
 var LOGO_WIDTH = 43;
 function CompactLogo() {
-  return /* @__PURE__ */ jsx2(Text2, { bold: true, color: ORANGE.base, children: "oc-cli" });
+  return /* @__PURE__ */ jsx3(Text3, { bold: true, color: ORANGE.base, children: "oc-cli" });
 }
 function Logo() {
   const columns = process.stdout.columns || 80;
-  if (columns < LOGO_WIDTH + 2) return /* @__PURE__ */ jsx2(CompactLogo, {});
-  return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: LOGO_ROWS.map((row, index) => /* @__PURE__ */ jsx2(Text2, { color: LOGO_RAMP[index], children: row }, row)) });
+  if (columns < LOGO_WIDTH + 2) return /* @__PURE__ */ jsx3(CompactLogo, {});
+  return /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", children: LOGO_ROWS.map((row, index) => /* @__PURE__ */ jsx3(Text3, { color: LOGO_RAMP[index], children: row }, row)) });
 }
 
 // src/ui/Picker.tsx
-import { Box as Box3, Text as Text3 } from "ink";
-import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Box as Box4, Text as Text4 } from "ink";
+import { jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
 var MAX_VISIBLE = 10;
 var MAX_LABEL_PAD = 28;
 function Picker({
@@ -576,22 +811,22 @@ function Picker({
     visible.reduce((width, row) => Math.max(width, row.label.length), 0)
   );
   if (rows.length === 0) {
-    return status ? /* @__PURE__ */ jsx3(Box3, { paddingLeft: 2, children: /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: status }) }) : null;
+    return status ? /* @__PURE__ */ jsx4(Box4, { paddingLeft: 2, children: /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: status }) }) : null;
   }
-  return /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", children: visible.map((row) => {
+  return /* @__PURE__ */ jsx4(Box4, { flexDirection: "column", children: visible.map((row) => {
     const isSelected = rows[selected]?.key === row.key;
-    return /* @__PURE__ */ jsxs2(Box3, { paddingLeft: 1, children: [
-      /* @__PURE__ */ jsx3(Text3, { color: isSelected ? ACCENT : void 0, children: isSelected ? "\u276F " : "  " }),
-      /* @__PURE__ */ jsx3(Text3, { color: isSelected ? ACCENT : void 0, bold: isSelected, children: row.label }),
-      row.meta ? /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: `${" ".repeat(Math.max(1, labelPad - row.label.length))}  ${row.meta}` }) : null
+    return /* @__PURE__ */ jsxs3(Box4, { paddingLeft: 1, children: [
+      /* @__PURE__ */ jsx4(Text4, { color: isSelected ? ACCENT : void 0, children: isSelected ? "\u276F " : "  " }),
+      /* @__PURE__ */ jsx4(Text4, { color: isSelected ? ACCENT : void 0, bold: isSelected, children: row.label }),
+      row.meta ? /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: `${" ".repeat(Math.max(1, labelPad - row.label.length))}  ${row.meta}` }) : null
     ] }, row.key);
   }) });
 }
 
 // src/ui/Turn.tsx
 import { useEffect, useState } from "react";
-import { Box as Box4, Text as Text4 } from "ink";
-import { jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Box as Box5, Text as Text5 } from "ink";
+import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
 var SPINNER = ["\u2722", "\u2733", "\u2736", "\u273B", "\u273D", "\u273B", "\u2736", "\u2733"];
 function useSpinner(active) {
   const [frame, setFrame] = useState(0);
@@ -604,15 +839,15 @@ function useSpinner(active) {
 }
 function ToolRows({ tools, live }) {
   if (tools.length === 0) return null;
-  return /* @__PURE__ */ jsx4(Box4, { flexDirection: "column", children: tools.map((tool) => /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs3(Box4, { children: [
-      /* @__PURE__ */ jsxs3(Text4, { color: tool.state === "error" ? "red" : tool.state === "running" ? ACCENT : "gray", children: [
+  return /* @__PURE__ */ jsx5(Box5, { flexDirection: "column", children: tools.map((tool) => /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs4(Box5, { children: [
+      /* @__PURE__ */ jsxs4(Text5, { color: tool.state === "error" ? "red" : tool.state === "running" ? ACCENT : "gray", children: [
         "\u25CF",
         " "
       ] }),
-      /* @__PURE__ */ jsx4(Text4, { bold: tool.state === "running" && live, children: tool.name })
+      /* @__PURE__ */ jsx5(Text5, { bold: tool.state === "running" && live, children: tool.name })
     ] }),
-    /* @__PURE__ */ jsxs3(Text4, { dimColor: true, children: [
+    /* @__PURE__ */ jsxs4(Text5, { dimColor: true, children: [
       "  \u23BF  ",
       tool.state === "running" ? "running\u2026" : tool.state === "error" ? "failed" : "done"
     ] })
@@ -620,7 +855,7 @@ function ToolRows({ tools, live }) {
 }
 function Sources({ sources }) {
   if (sources.length === 0) return null;
-  return /* @__PURE__ */ jsx4(Box4, { flexDirection: "column", marginTop: 1, children: sources.map((source, index) => /* @__PURE__ */ jsxs3(Text4, { dimColor: true, children: [
+  return /* @__PURE__ */ jsx5(Box5, { flexDirection: "column", marginTop: 1, children: sources.map((source, index) => /* @__PURE__ */ jsxs4(Text5, { dimColor: true, children: [
     `  ${index + 1}. `,
     source.title ? `${source.title} \u2014 ` : "",
     source.url
@@ -633,27 +868,27 @@ function AssistantTurn({
   thoughtSeconds
 }) {
   const body = renderMarkdown(stripContextLeakage(text));
-  return /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsx4(ToolRows, { tools, live: false }),
-    thoughtSeconds != null ? /* @__PURE__ */ jsxs3(Text4, { dimColor: true, children: [
+  return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", marginBottom: 1, children: [
+    /* @__PURE__ */ jsx5(ToolRows, { tools, live: false }),
+    thoughtSeconds != null ? /* @__PURE__ */ jsxs4(Text5, { dimColor: true, children: [
       "\u273B thought for ",
       thoughtSeconds,
       "s"
     ] }) : null,
-    body ? /* @__PURE__ */ jsx4(Box4, { marginTop: tools.length > 0 ? 1 : 0, children: /* @__PURE__ */ jsx4(Text4, { children: body }) }) : null,
-    /* @__PURE__ */ jsx4(Sources, { sources })
+    body ? /* @__PURE__ */ jsx5(Box5, { marginTop: tools.length > 0 ? 1 : 0, children: /* @__PURE__ */ jsx5(Text5, { children: body }) }) : null,
+    /* @__PURE__ */ jsx5(Sources, { sources })
   ] });
 }
 function StreamingTurn({ turn }) {
   const body = stripContextLeakage(turn.text);
   const reasoningTail = turn.reasoning.trim().split("\n").at(-1) ?? "";
-  return /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsx4(ToolRows, { tools: turn.tools, live: true }),
-    !body && reasoningTail ? /* @__PURE__ */ jsxs3(Text4, { dimColor: true, children: [
+  return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", marginBottom: 1, children: [
+    /* @__PURE__ */ jsx5(ToolRows, { tools: turn.tools, live: true }),
+    !body && reasoningTail ? /* @__PURE__ */ jsxs4(Text5, { dimColor: true, children: [
       "  ",
       truncate(reasoningTail, (process.stdout.columns || 80) - 4)
     ] }) : null,
-    body ? /* @__PURE__ */ jsx4(Text4, { children: body }) : null
+    body ? /* @__PURE__ */ jsx5(Text5, { children: body }) : null
   ] });
 }
 function StatusLine({ turn }) {
@@ -666,16 +901,16 @@ function StatusLine({ turn }) {
   const elapsed = Math.max(0, Math.round((now - turn.startedAt) / 1e3));
   const running = turn.tools.find((t) => t.state === "running");
   const verb = running ? running.name : turn.text ? "Writing" : "Thinking";
-  return /* @__PURE__ */ jsxs3(Box4, { children: [
-    /* @__PURE__ */ jsxs3(Text4, { color: ACCENT, children: [
+  return /* @__PURE__ */ jsxs4(Box5, { children: [
+    /* @__PURE__ */ jsxs4(Text5, { color: ACCENT, children: [
       spinner,
       " "
     ] }),
-    /* @__PURE__ */ jsxs3(Text4, { children: [
+    /* @__PURE__ */ jsxs4(Text5, { children: [
       verb,
       "\u2026 "
     ] }),
-    /* @__PURE__ */ jsxs3(Text4, { dimColor: true, children: [
+    /* @__PURE__ */ jsxs4(Text5, { dimColor: true, children: [
       "(",
       elapsed,
       "s \xB7 esc to interrupt)"
@@ -697,29 +932,56 @@ var EMPTY_TURN = {
 };
 
 // src/ui/App.tsx
-import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx6, jsxs as jsxs5 } from "react/jsx-runtime";
 var FLUSH_INTERVAL_MS = 60;
 var MENTION_DEBOUNCE_MS = 200;
 var EXIT_CONFIRM_MS = 3e3;
+var ACTIVITY_POLL_MS = 6e4;
+var ACTIVITY_LIST_DEFAULT = 10;
+var ACTIVITY_LIST_MAX = 30;
 var COMMANDS = [
   { name: "model", args: "[name]", blurb: "switch model" },
   { name: "web", blurb: "toggle web search" },
   { name: "team", args: "[slug]", blurb: "switch active team" },
   { name: "batch", args: "[W26]", blurb: "set the batch for the digest" },
   { name: "digest", args: "[-r]", blurb: "re-run the activity digest" },
+  { name: "activity", args: "[n | on | off]", blurb: "latest batch activity, or toggle the ticker" },
+  { name: "fav", args: "<company> [in folder]", blurb: "add a company to a favorites folder" },
+  { name: "unfav", args: "<company>", blurb: "remove your favorite" },
+  { name: "favs", args: "[folder]", blurb: "list folders, or a folder's companies" },
   { name: "new", blurb: "start a fresh thread" },
   { name: "clear", blurb: "clear the screen" },
   { name: "help", blurb: "show shortcuts" },
   { name: "quit", blurb: "exit" }
 ];
-var SHORTCUTS = `  @name            attach a company, founder, batch or skill
+var SHORTCUTS = `  @name            mention a company, founder, batch or skill (stays in your text)
   /                commands
   \u2191 \u2193              history, or move through a list
   tab              accept a suggestion
-  esc              interrupt \xB7 close a list \xB7 drop context
+  esc              interrupt \xB7 close a list
   ctrl-a / ctrl-e  start / end of line
   ctrl-w / ctrl-u  delete word / line
   ctrl-c \xD72        exit`;
+function findMentionSpans(text, records) {
+  const spans = [];
+  for (const record of records) {
+    const needle = `@${record.label}`;
+    let from = 0;
+    for (; ; ) {
+      const at = text.indexOf(needle, from);
+      if (at < 0) break;
+      spans.push({ start: at, end: at + needle.length });
+      from = at + needle.length;
+    }
+  }
+  spans.sort((a, b) => a.start - b.start || b.end - a.end);
+  return spans.filter((span, i) => !spans.slice(0, i).some((k) => span.start >= k.start && span.end <= k.end));
+}
+function parseFavArgument(argument) {
+  const match = /^(.*\S)\s+(?:in|into)\s+(\S.*)$/.exec(argument);
+  if (match) return { name: match[1].trim(), folder: match[2].trim() };
+  return { name: argument.trim(), folder: null };
+}
 function App({ client, bootstrap, host, state }) {
   const { exit } = useApp();
   const [transcript, setTranscript] = useState2([]);
@@ -738,6 +1000,10 @@ function App({ client, bootstrap, host, state }) {
   const [mentionLoading, setMentionLoading] = useState2(false);
   const [mentionSearchedFor, setMentionSearchedFor] = useState2(null);
   const [selected, setSelected] = useState2(0);
+  const [modal, setModal] = useState2(null);
+  const [activityOn, setActivityOn] = useState2(state.activityUpdates ?? true);
+  const activityCursorRef = useRef(null);
+  const pendingActivityRef = useRef([]);
   const [teamId, setTeamId] = useState2(
     state.activeTeamId ?? bootstrap.activeTeamId
   );
@@ -746,6 +1012,8 @@ function App({ client, bootstrap, host, state }) {
   const [webSearch, setWebSearch] = useState2(state.webSearchEnabled ?? false);
   const threadIdRef = useRef(state.threadId ?? generateId());
   const messagesRef = useRef([]);
+  const busyRef = useRef(false);
+  busyRef.current = busy;
   const turnAbortRef = useRef(null);
   const digestAbortRef = useRef(null);
   const team = useMemo(
@@ -866,9 +1134,280 @@ function App({ client, bootstrap, host, state }) {
       controller.abort();
     };
   }, [client, mentionQuery, teamId]);
+  const flushPendingActivity = useCallback(() => {
+    const items = pendingActivityRef.current;
+    if (items.length === 0) return;
+    pendingActivityRef.current = [];
+    push({ kind: "activity", heading: null, items });
+  }, [push]);
+  useEffect2(() => {
+    if (!activityOn || !batch || teamId == null) return;
+    let cancelled = false;
+    const controller = new AbortController();
+    const prime = async () => {
+      if (activityCursorRef.current) return;
+      try {
+        const [latest] = await client.activity({ teamId, batch, limit: 1, signal: controller.signal });
+        activityCursorRef.current = latest?.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
+      } catch {
+        if (!cancelled) activityCursorRef.current = (/* @__PURE__ */ new Date()).toISOString();
+      }
+    };
+    const tick = async () => {
+      if (cancelled || !activityCursorRef.current) return;
+      try {
+        const items = await client.activity({
+          teamId,
+          batch,
+          after: activityCursorRef.current,
+          limit: 20,
+          signal: controller.signal
+        });
+        if (cancelled || items.length === 0) return;
+        activityCursorRef.current = items[0].createdAt;
+        const chronological = [...items].reverse();
+        if (busyRef.current) pendingActivityRef.current.push(...chronological);
+        else push({ kind: "activity", heading: null, items: chronological });
+      } catch {
+      }
+    };
+    void prime();
+    const timer = setInterval(() => void tick(), ACTIVITY_POLL_MS);
+    return () => {
+      cancelled = true;
+      controller.abort();
+      clearInterval(timer);
+    };
+  }, [activityOn, batch, client, push, teamId]);
+  const showRecentActivity = useCallback(
+    async (count) => {
+      if (!batch || teamId == null) {
+        notice("No current batch for this team.", "error");
+        return;
+      }
+      try {
+        const items = await client.activity({ teamId, batch, limit: count });
+        if (items.length === 0) {
+          notice(`No activity yet for ${batch}.`);
+          return;
+        }
+        if (!activityCursorRef.current || items[0].createdAt > activityCursorRef.current) {
+          activityCursorRef.current = items[0].createdAt;
+        }
+        push({
+          kind: "activity",
+          heading: `Latest activity \xB7 ${batch} \xB7 ${team?.name ?? "team"}`,
+          items: [...items].reverse()
+        });
+      } catch (error) {
+        notice(describeError(error), "error");
+      }
+    },
+    [batch, client, notice, push, team?.name, teamId]
+  );
+  const pickFrom = useCallback(
+    (title, rows, defaultIndex = 0) => new Promise((resolve) => {
+      setSelected(Math.max(0, Math.min(defaultIndex, rows.length - 1)));
+      setModal({
+        title,
+        rows,
+        resolve: (key) => {
+          setModal(null);
+          resolve(key);
+        }
+      });
+    }),
+    []
+  );
+  const resolveCompany = useCallback(
+    async (name, attached) => {
+      const mentioned = attached.find((c) => c.type === "company");
+      if (mentioned) {
+        return { id: Number(mentioned.rawId), name: mentioned.label, batch: mentioned.subtitle ?? null };
+      }
+      if (!name) {
+        notice("Name a company \u2014 /fav Lyon, or /fav @Lyon.", "error");
+        return null;
+      }
+      const hits = await client.searchCompanies(name);
+      if (hits.length === 0) {
+        notice(`No company matches \u201C${name}\u201D.`, "error");
+        return null;
+      }
+      const exact = hits.filter((h) => h.name.toLowerCase() === name.toLowerCase());
+      if (exact.length === 1) return exact[0];
+      if (hits.length === 1) return hits[0];
+      const key = await pickFrom(
+        `Which \u201C${name}\u201D?`,
+        hits.map((h) => ({ key: String(h.id), label: h.name, meta: h.batch ?? void 0 }))
+      );
+      return hits.find((h) => String(h.id) === key) ?? null;
+    },
+    [client, notice, pickFrom]
+  );
+  const runFav = useCallback(
+    async (argument, attached) => {
+      if (teamId == null) {
+        notice("Pick a team first \u2014 /team.", "error");
+        return;
+      }
+      const { name, folder: folderName } = parseFavArgument(argument);
+      const company = await resolveCompany(name, attached);
+      if (!company) return;
+      let folders;
+      try {
+        folders = await client.favoriteFolders(teamId);
+      } catch (error) {
+        notice(describeError(error), "error");
+        return;
+      }
+      const me = bootstrap.user.id;
+      const already = (f) => f.items.some((i) => i.companyId === company.id && i.addedBy === me);
+      let folder = null;
+      if (folderName) {
+        const needle = folderName.toLowerCase();
+        folder = folders.find((f) => f.name.toLowerCase() === needle) ?? folders.find((f) => f.name.toLowerCase().includes(needle)) ?? null;
+        if (!folder) {
+          try {
+            const id = await client.createFavoriteFolder(teamId, folderName);
+            folder = { id, name: folderName };
+            notice(`Created folder \u201C${folderName}\u201D in ${team?.name ?? "this team"}.`);
+          } catch (error) {
+            notice(describeError(error), "error");
+            return;
+          }
+        }
+      } else if (folders.length === 0) {
+        notice(
+          `No favorites folders in ${team?.name ?? "this team"} yet \u2014 /fav ${company.name} in ${company.batch ?? batch ?? "My"} favorites creates one.`,
+          "error"
+        );
+        return;
+      } else {
+        const ordered = [...folders].sort((a, b) => Number(b.isOwner) - Number(a.isOwner));
+        const batchKey = (company.batch ?? batch ?? "").toLowerCase();
+        const defaultIndex = Math.max(
+          0,
+          ordered.findIndex((f) => batchKey && f.name.toLowerCase().startsWith(batchKey))
+        );
+        const key = await pickFrom(
+          `Add ${company.name} to\u2026`,
+          ordered.map((f) => ({
+            key: String(f.id),
+            label: f.name,
+            meta: [
+              f.isOwner ? "mine" : f.ownerName,
+              `${f.items.length} ${f.items.length === 1 ? "company" : "companies"}`,
+              already(f) ? "already added" : null
+            ].filter(Boolean).join(" \xB7 ")
+          })),
+          defaultIndex
+        );
+        if (!key) return;
+        folder = ordered.find((f) => String(f.id) === key) ?? null;
+        if (!folder) return;
+      }
+      if ("items" in folder && already(folder)) {
+        notice(`${company.name} is already in ${folder.name}.`);
+        return;
+      }
+      try {
+        await client.addFavorite(folder.id, company.id);
+        notice(`\u2605 Added ${company.name} to ${folder.name}.`);
+      } catch (error) {
+        notice(describeError(error), "error");
+      }
+    },
+    [batch, bootstrap.user.id, client, notice, pickFrom, resolveCompany, team?.name, teamId]
+  );
+  const runUnfav = useCallback(
+    async (argument, attached) => {
+      if (teamId == null) {
+        notice("Pick a team first \u2014 /team.", "error");
+        return;
+      }
+      const company = await resolveCompany(argument.trim(), attached);
+      if (!company) return;
+      let folders;
+      try {
+        folders = await client.favoriteFolders(teamId);
+      } catch (error) {
+        notice(describeError(error), "error");
+        return;
+      }
+      const me = bootstrap.user.id;
+      const holding = folders.filter(
+        (f) => f.items.some((i) => i.companyId === company.id && i.addedBy === me)
+      );
+      if (holding.length === 0) {
+        notice(`${company.name} isn't in any of your folders in ${team?.name ?? "this team"}.`);
+        return;
+      }
+      let folder = holding[0];
+      if (holding.length > 1) {
+        const key = await pickFrom(
+          `Remove ${company.name} from\u2026`,
+          holding.map((f) => ({ key: String(f.id), label: f.name }))
+        );
+        if (!key) return;
+        folder = holding.find((f) => String(f.id) === key) ?? folder;
+      }
+      try {
+        await client.removeFavorite(folder.id, company.id);
+        notice(`Removed ${company.name} from ${folder.name}.`);
+      } catch (error) {
+        notice(describeError(error), "error");
+      }
+    },
+    [bootstrap.user.id, client, notice, pickFrom, resolveCompany, team?.name, teamId]
+  );
+  const runFavs = useCallback(
+    async (argument) => {
+      if (teamId == null) {
+        notice("Pick a team first \u2014 /team.", "error");
+        return;
+      }
+      let folders;
+      try {
+        folders = await client.favoriteFolders(teamId);
+      } catch (error) {
+        notice(describeError(error), "error");
+        return;
+      }
+      if (folders.length === 0) {
+        notice(`No favorites folders in ${team?.name ?? "this team"} yet.`);
+        return;
+      }
+      const needle = argument.trim().toLowerCase();
+      if (!needle) {
+        const ordered = [...folders].sort((a, b) => Number(b.isOwner) - Number(a.isOwner));
+        const width = Math.max(...ordered.map((f) => f.name.length));
+        notice(
+          ordered.map(
+            (f) => `  \u2605 ${f.name.padEnd(width)}  ${f.items.length} ${f.items.length === 1 ? "company" : "companies"}  \xB7 ${f.isOwner ? "mine" : f.ownerName}`
+          ).join("\n")
+        );
+        return;
+      }
+      const folder = folders.find((f) => f.name.toLowerCase() === needle) ?? folders.find((f) => f.name.toLowerCase().includes(needle));
+      if (!folder) {
+        notice(`No folder matches \u201C${argument.trim()}\u201D. /favs lists them.`, "error");
+        return;
+      }
+      if (folder.items.length === 0) {
+        notice(`${folder.name} is empty.`);
+        return;
+      }
+      const me = bootstrap.user.id;
+      const seen = /* @__PURE__ */ new Set();
+      const lines = folder.items.filter((i) => seen.has(i.companyId) ? false : (seen.add(i.companyId), true)).sort((a, b) => a.companyName.localeCompare(b.companyName)).map((i) => `  ${i.addedBy === me ? "\u2605" : "\u2606"} ${i.companyName}${i.batch ? `  \xB7 ${i.batch}` : ""}`);
+      notice(`${folder.name}
+${lines.join("\n")}`);
+    },
+    [bootstrap.user.id, client, notice, team?.name, teamId]
+  );
   const send = useCallback(
-    async (raw) => {
-      const attached = context;
+    async (raw, attached) => {
       const userMessage = {
         id: generateId(),
         role: "user",
@@ -877,7 +1416,6 @@ function App({ client, bootstrap, host, state }) {
       const outgoing = [...messagesRef.current, userMessage];
       messagesRef.current = outgoing;
       push({ kind: "user", text: raw, context: attached });
-      setContext([]);
       setBusy(true);
       const controller = new AbortController();
       turnAbortRef.current = controller;
@@ -934,12 +1472,13 @@ function App({ client, bootstrap, host, state }) {
         setLive(null);
         setBusy(false);
         turnAbortRef.current = null;
+        flushPendingActivity();
       }
     },
-    [context, notice, push, transport]
+    [flushPendingActivity, notice, push, transport]
   );
   const runCommand = useCallback(
-    (raw) => {
+    (raw, attached) => {
       const [command, ...rest] = raw.trim().slice(1).split(/\s+/);
       const argument = rest.join(" ").trim();
       switch (command) {
@@ -998,6 +1537,7 @@ function App({ client, bootstrap, host, state }) {
             return;
           }
           setTeamId(match.teamId);
+          activityCursorRef.current = null;
           void patchState({ activeTeamId: match.teamId });
           notice(`Team: ${match.name}`);
           return;
@@ -1009,6 +1549,7 @@ function App({ client, bootstrap, host, state }) {
           }
           const next = argument.toUpperCase();
           setBatch(next);
+          activityCursorRef.current = null;
           void patchState({ batch: next });
           notice(`Batch: ${next}`);
           return;
@@ -1016,37 +1557,80 @@ function App({ client, bootstrap, host, state }) {
         case "digest":
           void runDigest(/--refresh|-r\b/.test(argument));
           return;
+        case "activity": {
+          const flag = argument.toLowerCase();
+          if (flag === "on" || flag === "off") {
+            const next = flag === "on";
+            setActivityOn(next);
+            void patchState({ activityUpdates: next });
+            notice(next ? "Activity updates on \u2014 new batch activity shows up as it happens." : "Activity updates off.");
+            return;
+          }
+          const count = Number.parseInt(argument, 10);
+          void showRecentActivity(
+            Number.isInteger(count) && count > 0 ? Math.min(count, ACTIVITY_LIST_MAX) : ACTIVITY_LIST_DEFAULT
+          );
+          return;
+        }
+        case "fav":
+          void runFav(argument, attached);
+          return;
+        case "unfav":
+          void runUnfav(argument, attached);
+          return;
+        case "favs":
+          void runFavs(argument);
+          return;
         default:
           notice(`Unknown command \u201C/${command}\u201D. Type / to see them.`, "error");
       }
     },
-    [batch, bootstrap.teams, exit, modelId, notice, runDigest, teamId, webSearch]
+    [
+      batch,
+      bootstrap.teams,
+      exit,
+      modelId,
+      notice,
+      runDigest,
+      runFav,
+      runFavs,
+      runUnfav,
+      showRecentActivity,
+      teamId,
+      webSearch
+    ]
   );
   const submit = useCallback(() => {
     const raw = value.trim();
+    const attached = context.filter((c) => raw.includes(`@${c.label}`));
     setValue("");
     setCursor(0);
+    setContext([]);
     setHistoryIndex(null);
     setMentionQuery(null);
     if (!raw) return;
     setHistory((prev) => [...prev, raw]);
     if (raw.startsWith("/")) {
-      runCommand(raw);
+      runCommand(raw, attached);
       return;
     }
-    void send(raw);
-  }, [runCommand, send, value]);
-  const syncMention = useCallback((text, at) => {
-    const match = /(?:^|\s)@([^\s@]*)$/.exec(text.slice(0, at));
+    void send(raw, attached);
+  }, [context, runCommand, send, value]);
+  const mentionSpans = useMemo(() => findMentionSpans(value, context), [context, value]);
+  const syncMention = useCallback((text, at, records) => {
+    const inside = findMentionSpans(text, records).some((s) => at > s.start && at <= s.end);
+    const match = inside ? null : /(?:^|\s)@([^\s@]*)$/.exec(text.slice(0, at));
     setMentionQuery(match ? match[1] : null);
   }, []);
   const applyEdit = useCallback(
     (text, at) => {
+      const kept = context.filter((c) => text.includes(`@${c.label}`));
+      if (kept.length !== context.length) setContext(kept);
       setValue(text);
       setCursor(at);
-      syncMention(text, at);
+      syncMention(text, at, kept);
     },
-    [syncMention]
+    [context, syncMention]
   );
   const acceptPick = useCallback(() => {
     if (slashQuery !== null) {
@@ -1059,7 +1643,7 @@ function App({ client, bootstrap, host, state }) {
     }
     const record = mentionRecords[selected];
     if (!record) return;
-    const before = value.slice(0, cursor).replace(/@[^\s@]*$/, "");
+    const before = value.slice(0, cursor).replace(/@[^\s@]*$/, `@${record.label} `);
     setContext(
       (prev) => prev.some((c) => c.type === record.type && c.rawId === record.rawId) ? prev : [...prev, record]
     );
@@ -1082,6 +1666,18 @@ function App({ client, bootstrap, host, state }) {
       return;
     }
     if (exitArmed) setExitArmed(false);
+    if (modal) {
+      if (key.escape) {
+        modal.resolve(null);
+      } else if (key.upArrow) {
+        setSelected((i) => (i - 1 + modal.rows.length) % modal.rows.length);
+      } else if (key.downArrow) {
+        setSelected((i) => (i + 1) % modal.rows.length);
+      } else if (key.return || key.tab) {
+        modal.resolve(modal.rows[selected]?.key ?? null);
+      }
+      return;
+    }
     if (key.escape) {
       if (pickerOpen) {
         setMentionQuery(null);
@@ -1100,7 +1696,6 @@ function App({ client, bootstrap, host, state }) {
         setShowShortcuts(false);
         return;
       }
-      if (context.length > 0) setContext([]);
       return;
     }
     if (pickerOpen && pickerRows.length > 0) {
@@ -1177,14 +1772,17 @@ function App({ client, bootstrap, host, state }) {
     team?.name ?? "no team",
     batch ?? "no batch"
   ].join(" \xB7 ");
-  const hint = exitArmed ? "press ctrl-c again to exit" : busy ? "" : showShortcuts ? "esc to close" : "? for shortcuts";
-  return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx5(Static, { items: transcript, children: (item) => /* @__PURE__ */ jsx5(TranscriptBlock, { item }, item.id) }),
-    digestText !== null ? /* @__PURE__ */ jsx5(DigestStream, { text: digestText }) : null,
-    live ? /* @__PURE__ */ jsx5(StreamingTurn, { turn: live }) : null,
-    live ? /* @__PURE__ */ jsx5(StatusLine, { turn: live }) : null,
-    showShortcuts ? /* @__PURE__ */ jsx5(Box5, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: SHORTCUTS }) }) : null,
-    pickerOpen ? /* @__PURE__ */ jsx5(
+  const hint = exitArmed ? "press ctrl-c again to exit" : modal ? "enter to choose \xB7 esc to cancel" : busy ? "" : showShortcuts ? "esc to close" : "? for shortcuts";
+  return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx6(Static, { items: transcript, children: (item) => /* @__PURE__ */ jsx6(TranscriptBlock, { item }, item.id) }),
+    digestText !== null ? /* @__PURE__ */ jsx6(DigestStream, { text: digestText }) : null,
+    live ? /* @__PURE__ */ jsx6(StreamingTurn, { turn: live }) : null,
+    live ? /* @__PURE__ */ jsx6(StatusLine, { turn: live }) : null,
+    showShortcuts ? /* @__PURE__ */ jsx6(Box6, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: SHORTCUTS }) }) : null,
+    modal ? /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx6(Box6, { paddingLeft: 1, children: /* @__PURE__ */ jsx6(Text6, { color: ACCENT, children: modal.title }) }),
+      /* @__PURE__ */ jsx6(Picker, { rows: modal.rows, selected })
+    ] }) : pickerOpen ? /* @__PURE__ */ jsx6(
       Picker,
       {
         rows: pickerRows,
@@ -1192,12 +1790,12 @@ function App({ client, bootstrap, host, state }) {
         status: mentionQuery !== null ? mentionLoading || mentionSearchedFor !== mentionQuery ? "searching\u2026" : `no records match \u201C${mentionQuery}\u201D` : void 0
       }
     ) : null,
-    /* @__PURE__ */ jsx5(
+    /* @__PURE__ */ jsx6(
       Input,
       {
         value,
         cursor,
-        context,
+        spans: mentionSpans,
         busy,
         status,
         hint
@@ -1208,45 +1806,52 @@ function App({ client, bootstrap, host, state }) {
 function DigestStream({ text }) {
   const spinner = useSpinner(true);
   if (!text.trim()) {
-    return /* @__PURE__ */ jsxs4(Box5, { marginBottom: 1, children: [
-      /* @__PURE__ */ jsxs4(Text5, { color: ACCENT, children: [
+    return /* @__PURE__ */ jsxs5(Box6, { marginBottom: 1, children: [
+      /* @__PURE__ */ jsxs5(Text6, { color: ACCENT, children: [
         spinner,
         " "
       ] }),
-      /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "Summarizing the latest activity\u2026" })
+      /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "Summarizing the latest activity\u2026" })
     ] });
   }
-  return /* @__PURE__ */ jsx5(Box5, { marginBottom: 1, children: /* @__PURE__ */ jsx5(Text5, { children: text }) });
+  return /* @__PURE__ */ jsx6(Box6, { marginBottom: 1, children: /* @__PURE__ */ jsx6(Text6, { children: text }) });
 }
 function TranscriptBlock({ item }) {
   switch (item.kind) {
     case "banner":
-      return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", marginBottom: 1, children: [
-        /* @__PURE__ */ jsx5(Logo, {}),
-        /* @__PURE__ */ jsxs4(Box5, { marginTop: 1, flexDirection: "column", children: [
-          /* @__PURE__ */ jsxs4(Text5, { dimColor: true, children: [
+      return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", marginBottom: 1, children: [
+        /* @__PURE__ */ jsx6(Logo, {}),
+        /* @__PURE__ */ jsxs5(Box6, { marginTop: 1, flexDirection: "column", children: [
+          /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
             item.email,
             item.email ? " \xB7 " : "",
             item.host.replace(/^https?:\/\//, "")
           ] }),
-          /* @__PURE__ */ jsxs4(Text5, { dimColor: true, children: [
+          /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
             item.team,
             item.batch ? ` \xB7 ${item.batch}` : ""
           ] })
         ] })
       ] });
     case "digest":
-      return /* @__PURE__ */ jsx5(Box5, { marginBottom: 1, children: /* @__PURE__ */ jsx5(Text5, { children: item.text }) });
+      return /* @__PURE__ */ jsx6(Box6, { marginBottom: 1, children: /* @__PURE__ */ jsx6(Text6, { children: item.text }) });
     case "user":
-      return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", marginBottom: 1, children: [
-        /* @__PURE__ */ jsxs4(Box5, { children: [
-          /* @__PURE__ */ jsx5(Text5, { color: ACCENT, children: "> " }),
-          /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: item.text })
-        ] }),
-        item.context.length > 0 ? /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: `  \u23F5 ${item.context.map((c) => c.label).join(", ")}` }) : null
+      return /* @__PURE__ */ jsxs5(Box6, { marginBottom: 1, children: [
+        /* @__PURE__ */ jsx6(Text6, { color: ACCENT, children: "> " }),
+        /* @__PURE__ */ jsx6(Text6, { children: /* @__PURE__ */ jsx6(
+          HighlightedText,
+          {
+            value: item.text,
+            cursor: null,
+            spans: findMentionSpans(item.text, item.context),
+            dimPlain: true
+          }
+        ) })
       ] });
+    case "activity":
+      return /* @__PURE__ */ jsx6(ActivityBlock, { heading: item.heading, items: item.items });
     case "assistant":
-      return /* @__PURE__ */ jsx5(
+      return /* @__PURE__ */ jsx6(
         AssistantTurn,
         {
           text: item.text,
@@ -1256,7 +1861,7 @@ function TranscriptBlock({ item }) {
         }
       );
     case "notice":
-      return /* @__PURE__ */ jsx5(Box5, { marginBottom: 1, children: /* @__PURE__ */ jsx5(Text5, { color: item.tone === "error" ? "red" : void 0, dimColor: item.tone !== "error", children: item.text }) });
+      return /* @__PURE__ */ jsx6(Box6, { marginBottom: 1, children: /* @__PURE__ */ jsx6(Text6, { color: item.tone === "error" ? "red" : void 0, dimColor: item.tone !== "error", children: item.text }) });
   }
 }
 function readTurn(message) {
@@ -1319,7 +1924,7 @@ function truncateError(message) {
 }
 
 // src/oc.tsx
-import { jsx as jsx6 } from "react/jsx-runtime";
+import { jsx as jsx7 } from "react/jsx-runtime";
 var USAGE = `oc \u2014 Orange Collective in your terminal
 
 Usage
@@ -1404,7 +2009,7 @@ ${USAGE}`);
     fail("Your account isn't on a team yet \u2014 ask an admin to add you.");
   }
   const instance = render(
-    /* @__PURE__ */ jsx6(App, { client, bootstrap, host, state: state ?? {} }),
+    /* @__PURE__ */ jsx7(App, { client, bootstrap, host, state: state ?? {} }),
     // Ctrl-C is handled in App (press twice), so Ink must not exit on the first.
     { exitOnCtrlC: false }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orangecollective/oc",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Orange Collective in your terminal — the YC research agent, batch digests, and company context",
   "license": "UNLICENSED",
   "homepage": "https://www.orangecollective.vc",