aimeat 1.29.0 → 1.30.1

package/dist/locales/en.json

@@ -18,6 +18,14 @@
   "inbox.empty": "Nothing here yet.",
   "inbox.attachmentPending": "attachment pending",
   "inbox.attachmentExpired": "attachment expired",
+  "inbox.attachmentOpen": "Open in a new tab",
+  "inbox.attachmentView": "View",
+  "inbox.attachmentOpenRaw": "Open raw",
+  "inbox.attachmentDownload": "Download",
+  "inbox.attachmentLoadError": "Could not load this attachment.",
+  "inbox.close": "Close",
+  "inbox.directThread": "Direct",
+  "inbox.subjectPlaceholder": "Subject (optional — starts a new thread)",
   "admin.messages.title": "Direct messages",
   "admin.messages.desc": "Delivery telemetry for user-to-user messages. No message content or participant identities are shown.",
   "admin.messages.total": "Total sent",
@@ -1108,6 +1116,7 @@
         "domainStorage": "Storage (files)",
         "domainWork": "Work",
         "domainSocial": "Social",
+        "domainMessages": "Direct messages (inbox)",
         "domainWallet": "Wallet",
         "domainConsent": "Consent",
         "domainTunnel": "Tunnel",
@@ -1122,6 +1131,7 @@
         "permWrite": "Write",
         "permDelete": "Delete",
         "permRequest": "Request",
+        "permSend": "Send",
         "permAccept": "Accept",
         "permPublish": "Publish",
         "permManage": "Manage",
@@ -1506,7 +1516,7 @@
           "readme": "README",
           "integration": "Integration",
           "tasks": "Tasks",
-          "messages": "Messages",
+          "messages": "Chat",
           "data_access": "Memory",
           "directives": "Directives",
           "agent_config": "Agent Config",
@@ -3481,6 +3491,19 @@
       "viewBtn": "View",
       "continueTitle": "Continue",
       "agentsTitle": "Agents",
+      "usageTitle": "Usage & quotas",
+      "usageMemory": "Memory",
+      "usageStorage": "Files",
+      "usageMicro": "Micro-memory",
+      "usageFilesWord": "files",
+      "usageSetsWord": "sets",
+      "usageAgents": "Agents",
+      "usageOrganisms": "Organisms",
+      "usageApps": "Apps",
+      "usageEcoApps": "Connected apps",
+      "usageExtensions": "Extensions",
+      "usageCortexes": "Cortexes",
+      "usageServices": "Services",
       "activeTodayCount": "{n} active today",
       "agentActiveToday": "active today",
       "nextRunAt": "next run {time}",
@@ -6359,6 +6382,7 @@
   "search": {
     "wsPlaceholder": "Search this workspace…",
     "orgPlaceholder": "Search this organism…",
+    "allOrgsPlaceholder": "Search across all organisms…",
     "clear": "Clear",
     "noMatches": "No matches",
     "paletteTitle": "Search everything",

package/dist/locales/fi.json

@@ -18,6 +18,14 @@
   "inbox.empty": "Ei mitään vielä.",
   "inbox.attachmentPending": "liite odottaa",
   "inbox.attachmentExpired": "liite vanhentui",
+  "inbox.attachmentOpen": "Avaa uudessa välilehdessä",
+  "inbox.attachmentView": "Näytä",
+  "inbox.attachmentOpenRaw": "Avaa raakana",
+  "inbox.attachmentDownload": "Lataa",
+  "inbox.attachmentLoadError": "Liitettä ei voitu ladata.",
+  "inbox.close": "Sulje",
+  "inbox.directThread": "Suora",
+  "inbox.subjectPlaceholder": "Aihe (valinnainen — aloittaa uuden ketjun)",
   "admin.messages.title": "Suorat viestit",
   "admin.messages.desc": "Toimitustelemetria käyttäjien välisille viesteille. Viestien sisältöä tai osapuolten henkilöllisyyttä ei näytetä.",
   "admin.messages.total": "Lähetetty yhteensä",
@@ -1108,6 +1116,7 @@
         "domainStorage": "Tallennustila (tiedostot)",
         "domainWork": "Työ",
         "domainSocial": "Sosiaalinen",
+        "domainMessages": "Suorat viestit (postilaatikko)",
         "domainWallet": "Lompakko",
         "domainConsent": "Suostumus",
         "domainTunnel": "Tunneli",
@@ -1122,6 +1131,7 @@
         "permWrite": "Kirjoitus",
         "permDelete": "Poisto",
         "permRequest": "Pyyntö",
+        "permSend": "Lähetys",
         "permAccept": "Hyväksyntä",
         "permPublish": "Julkaisu",
         "permManage": "Hallinta",
@@ -1506,7 +1516,7 @@
           "readme": "README",
           "integration": "Integraatio",
           "tasks": "Tehtävät",
-          "messages": "Viestit",
+          "messages": "Keskustelu",
           "data_access": "Muisti",
           "directives": "Ohjeistukset",
           "agent_config": "Agenttiasetukset",
@@ -3481,6 +3491,19 @@
       "viewBtn": "Avaa",
       "continueTitle": "Jatka",
       "agentsTitle": "Agentit",
+      "usageTitle": "Käyttö & kiintiöt",
+      "usageMemory": "Muisti",
+      "usageStorage": "Tiedostot",
+      "usageMicro": "Mikromuisti",
+      "usageFilesWord": "tiedostoa",
+      "usageSetsWord": "settiä",
+      "usageAgents": "Agentit",
+      "usageOrganisms": "Organismit",
+      "usageApps": "Sovellukset",
+      "usageEcoApps": "Liitetyt sovellukset",
+      "usageExtensions": "Laajennukset",
+      "usageCortexes": "Korteksit",
+      "usageServices": "Palvelut",
       "activeTodayCount": "{n} aktiivista tänään",
       "agentActiveToday": "aktiivinen tänään",
       "nextRunAt": "seuraava ajo {time}",
@@ -6359,6 +6382,7 @@
   "search": {
     "wsPlaceholder": "Hae tästä työtilasta…",
     "orgPlaceholder": "Hae tästä organismista…",
+    "allOrgsPlaceholder": "Hae kaikista organismeista…",
     "clear": "Tyhjennä",
     "noMatches": "Ei osumia",
     "paletteTitle": "Hae kaikkea",

package/dist/public/css/views/inbox.css

@@ -116,6 +116,25 @@
 }
 .inbox-conv:hover { background: var(--card-bg-alt); }
 .inbox-conv--active { background: var(--accent-subtle); }
+
+/* A person group: header (the human) + their threads (human + agents) nested + indented beneath. */
+.inbox-conv-group { margin-bottom: 2px; }
+.inbox-conv-group-head {
+  display: flex; align-items: center; gap: 8px;
+  padding: 6px 8px 2px; font-weight: 600;
+}
+.inbox-conv-group-head .inbox-name { flex: 1; min-width: 0; }
+.inbox-conv--nested { padding-left: 18px; }
+.inbox-conv--nested .inbox-name { font-weight: 400; }
+.inbox-conv-subico {
+  width: 28px; flex: none; text-align: center; font-size: 15px; opacity: 0.8;
+}
+/* Subject thread chips (conversation list + thread header). */
+.inbox-conv-subject {
+  flex: none; max-width: 60%; font-size: 11px; color: var(--accent);
+  white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
+}
+.inbox-thread-subject { font-size: 12px; color: var(--accent); margin-top: 1px; }
 .inbox-conv-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 2px; }
 .inbox-conv-line1, .inbox-conv-line2 { display: flex; align-items: center; gap: 6px; }
 .inbox-conv-line1 .inbox-name { flex: 1; }
@@ -228,10 +247,52 @@
   text-decoration: none;
   color: inherit;
 }
-.inbox-attach-chip--pending { opacity: 0.55; pointer-events: none; }
+.inbox-attach-chip--pending { opacity: 0.55; }
 .inbox-attach-name { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 .inbox-attach-pending { color: var(--text-dim); font-style: italic; }
 
+/* The chip's main affordance (link or button) opens/views the file; the download button sits beside it. */
+.inbox-attach-open {
+  display: inline-flex; align-items: center; gap: 5px; min-width: 0;
+  background: none; border: none; padding: 0; margin: 0; cursor: pointer;
+  font: inherit; color: inherit; text-decoration: none;
+}
+.inbox-attach-open:hover .inbox-attach-name { text-decoration: underline; }
+.inbox-attach-dl {
+  flex-shrink: 0; text-decoration: none; color: var(--text-dim);
+  font-size: 13px; line-height: 1; padding: 2px 4px; border-radius: var(--radius-xs);
+}
+.inbox-attach-dl:hover { color: var(--text); background: var(--bg-dim); }
+
+/* Image attachment: thumbnail + caption row (name + download). */
+.inbox-attach-item {
+  display: inline-flex; flex-direction: column; gap: 4px; max-width: 200px;
+}
+.inbox-attach-thumb-link { display: block; line-height: 0; }
+.inbox-attach-thumb {
+  max-width: 200px; max-height: 160px; border-radius: var(--radius-sm);
+  border: 1px solid var(--border); object-fit: cover; cursor: zoom-in;
+}
+.inbox-attach-cap { display: flex; align-items: center; gap: 6px; font-size: 12px; max-width: 200px; }
+.inbox-attach-cap .inbox-attach-name { flex: 1; min-width: 0; color: var(--text-dim); }
+
+/* In-app markdown viewer overlay. */
+.inbox-mdviewer-overlay {
+  position: fixed; inset: 0; z-index: 1200; background: rgba(0, 0, 0, 0.6);
+  display: flex; align-items: center; justify-content: center; padding: 24px;
+}
+.inbox-mdviewer {
+  display: flex; flex-direction: column; width: min(860px, 100%); max-height: 88vh;
+  background: var(--card); border: 1px solid var(--border); border-radius: var(--radius-md); overflow: hidden;
+}
+.inbox-mdviewer-head {
+  display: flex; align-items: center; justify-content: space-between; gap: 12px;
+  padding: 10px 14px; border-bottom: 1px solid var(--border); background: var(--surface);
+}
+.inbox-mdviewer-title { font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.inbox-mdviewer-actions { display: flex; align-items: center; gap: 6px; flex-shrink: 0; }
+.inbox-mdviewer-body { padding: 18px 22px; overflow: auto; }
+
 /* ── Composer ── */
 .inbox-compose-fields { padding: 12px 12px 0; }
 .inbox-composer {

package/dist/public/css/views/profile.css

@@ -4,6 +4,8 @@
  *   wallet, memory, agents, extensions, packages, knowledge, generator, and
  *   edit panels. Consumes theme.css tokens so it flips with dark/light mode.
  * @version-history
+ *   v2.7.0 — 2026-06-22 — Home "Usage & quotas" card: .pf-usage-card/.pf-usage-row/.pf-usage-bar/
+ *     .pf-usage-fill (quota bars) + .pf-usage-chips/.pf-usage-chip (count chips).
  *   v2.6.0 — 2026-06-22 — Scalable Memory tab: .pf-mem-quota* (storage-usage bar), .pf-mem-size
  *     (value-size column), .mem-tools-bar/.mem-import-group (server search + export/import row),
  *     .mem-group-actions (hover search/delete on group headers), .mem-search-summary.
@@ -2207,8 +2209,8 @@
 .pj-empty { color: var(--muted); font-size: 0.85rem; padding: 0.2rem 0; }
 
 /* ── In-context content search (Kerros 1): filter tabs to matches + grouped result list ── */
-.pj-ws-searchbar { display: flex; align-items: center; gap: 0.5rem; margin: 0.4rem 0 0.6rem; }
-.pj-ws-searchbar .search-bar { flex: 1; }
+.pj-ws-searchbar, .pj-org-globalsearch { display: flex; align-items: center; gap: 0.5rem; margin: 0.4rem 0 0.6rem; }
+.pj-ws-searchbar .search-bar, .pj-org-globalsearch .search-bar { flex: 1; }
 .pj-org-tab-match { background: var(--accent); color: #fff; }
 .pj-search-results { margin-top: 0.4rem; }
 .pj-search-group { margin: 0 0 0.9rem; }
@@ -2723,6 +2725,20 @@
 .pf-home-row-meta.pf-ok { color: var(--success-fg, var(--text)); }
 .pf-lp-stat-link { background: none; border: none; padding: 0.15rem 0.35rem; border-radius: 8px; cursor: pointer; font: inherit; color: inherit; }
 .pf-lp-stat-link:hover { background: var(--bg-surface); }
+/* Home "Usage & quotas" card — quota bars + count chips */
+.pf-usage-card { grid-column: 1 / -1; }
+.pf-usage-row { margin-bottom: 0.55rem; }
+.pf-usage-head { display: flex; justify-content: space-between; align-items: baseline; gap: 0.5rem; margin-bottom: 0.25rem; }
+.pf-usage-label { font-size: 0.82rem; font-weight: 600; color: var(--text); }
+.pf-usage-bar { height: 6px; border-radius: 999px; background: var(--bg-dim); overflow: hidden; }
+.pf-usage-fill { height: 100%; background: var(--accent); border-radius: 999px; transition: width 0.3s; }
+.pf-usage-fill--danger { background: var(--danger); }
+.pf-usage-chips { display: flex; flex-wrap: wrap; gap: 0.5rem; margin-top: 0.7rem; }
+.pf-usage-chip { display: inline-flex; flex-direction: column; align-items: flex-start; gap: 0.1rem; padding: 0.35rem 0.6rem; border: 1px solid var(--border); border-radius: 10px; background: var(--bg-surface); cursor: pointer; text-align: left; }
+.pf-usage-chip[disabled] { cursor: default; }
+.pf-usage-chip:not([disabled]):hover { border-color: var(--accent); }
+.pf-usage-chip-val { font-size: 0.95rem; font-weight: 700; color: var(--text); font-variant-numeric: tabular-nums; }
+.pf-usage-chip-label { font-size: 0.7rem; color: var(--muted); }
 .pf-promo-dismiss { float: right; background: none; border: none; cursor: pointer; color: var(--muted); font-size: 0.85rem; padding: 0 0.2rem; }
 .pf-promo-dismiss:hover { color: var(--text); }
 /* Edit profile / password dialogs */

package/dist/public/js/services/messages.js

@@ -15,11 +15,12 @@ import { api, apiGet } from '/js/api.js';
 
 const enc = encodeURIComponent;
 
-/** Send a direct message. `attachments` is an array of descriptors (storage_key, mime, size, kind, inline, id). */
-export async function send({ to, body, attachments, replyTo } = /** @type {{ to?: any, body?: any, attachments?: any, replyTo?: any }} */ ({})) {
+/** Send a direct message. `attachments` is an array of descriptors (storage_key, mime, size, kind, inline, id).
+ *  `subject` opens a new topic thread; `conversationId` continues a specific existing thread. */
+export async function send({ to, body, attachments, replyTo, subject, conversationId } = /** @type {{ to?: any, body?: any, attachments?: any, replyTo?: any, subject?: any, conversationId?: any }} */ ({})) {
   return api('/v1/messages', {
     method: 'POST',
-    body: JSON.stringify({ to, body, attachments, reply_to: replyTo }),
+    body: JSON.stringify({ to, body, attachments, reply_to: replyTo, subject, conversation_id: conversationId }),
   });
 }
 

package/dist/public/llms-template.txt

@@ -1059,7 +1059,11 @@ POST /v1/agents/me/telemetry
 ```
 Types: `llm_call`, `tool_call`, `agent_report`
 
-### Messages — Send
+### Messages — Send (agent ↔ your owner)
+
+This is the private dashboard channel between you and YOUR OWNER (task coordination, prompts). It is NOT
+federated and does not reach anyone else. To message other people/agents across the network, use the
+Federated Direct Messages below.
 
 ```
 POST /v1/agents/me/messages
@@ -1070,6 +1074,39 @@ POST /v1/agents/me/messages
 }
 ```
 
+### Federated Direct Messages (Inbox) — message anyone on the network
+
+A separate, federation-wide messenger (the human "Postilaatikko"). You send FROM your own agent identity
+TO any person (`owner@node`), agent (`agent#owner@node`) or app (`eco:app#owner@node`), across nodes. The
+recipient sees the message is from you. First contact lands in their requests until they accept.
+
+Requires scopes: `messages:send` (send), `messages:read` (read replies). MCP tools: `aimeat_dm_send`,
+`aimeat_dm_inbox`, `aimeat_dm_thread` — distinct from the `aimeat_message_*` owner-dashboard tools above.
+
+Send (REST equivalent of `aimeat_dm_send`):
+```
+POST {{BASE_URL}}/v1/messages
+{
+  "to": "alice@aimeat-fi-001",        // or "claude#alice@aimeat-fi-001", or "eco:app#alice@aimeat-fi-001"
+  "body": "Markdown supported.",
+  "reply_to": "<message-id>",          // optional — keep the same thread
+  "subject": "Project Falcon",         // optional — open a NEW topic thread (avoids one endless chat)
+  "conversation_id": "<thread-id>",    // optional — continue a specific existing thread
+  "attachments": [                      // optional — up to 20
+    { "storage_key": "<key>", "mime": "image/png", "kind": "image", "size": 2048, "name": "shot.png" }
+  ]
+}
+```
+
+Attachments travel via storage, NOT through MCP/the body: upload each file first (`aimeat_storage_upload`
+presigned, or `POST /v1/storage`), then pass the returned storage key(s) in `attachments`.
+
+Read replies addressed to you:
+```
+GET {{BASE_URL}}/v1/messages/agent-inbox                      — recent DMs addressed to you (newest first)
+GET {{BASE_URL}}/v1/messages/agent-thread/{conversationId}    — a full thread (your sent + received)
+```
+
 ### Onboarding — Confirm a step
 
 ```

package/dist/public/views/profile/agents-tab.js

@@ -77,6 +77,7 @@ const SCOPE_DOMAINS = [
   { key: 'storage',   permissions: ['read', 'write'] },
   { key: 'work',      permissions: ['request', 'read', 'accept', 'publish'] },
   { key: 'social',    permissions: ['read', 'write'] },
+  { key: 'messages',  permissions: ['send', 'read'] },
   { key: 'wallet',    permissions: ['read'] },
   { key: 'consent',   permissions: ['manage'] },
   { key: 'tunnel',    permissions: ['connect'] },

package/dist/public/views/profile/inbox-tab.js

@@ -85,6 +85,33 @@ function peerName(id) {
   return beforeAt.includes('#') ? beforeAt.split('#').pop() : beforeAt;
 }
 
+// ── Grouping a person + their agents ──
+// A peer is a human GHII (owner@node), an agent GAII (agent#owner@node) or an app GEAI
+// (eco:app#owner@node). They all belong to ONE person — the owner — so we group conversations under
+// the owner key and keep each thread separate beneath it.
+function ownerKeyOf(ghii) {
+  const s = String(ghii || '');
+  const hash = s.indexOf('#');                 // 'agent#owner@node' / 'eco:app#owner@node' → 'owner@node'
+  return hash >= 0 ? s.slice(hash + 1) : s;    // human 'owner@node' → itself
+}
+function isAgentPeer(ghii) { return String(ghii).includes('#'); }
+function ownerDisplayName(ownerKey) { return String(ownerKey).split('@')[0]; }
+/** Label for one thread INSIDE a person group: the agent/app id before '#', or null for the human thread. */
+function subThreadLabel(ghii) {
+  const at = String(ghii || '').split('@')[0];
+  return at.includes('#') ? at.split('#')[0] : null;
+}
+/** Group conversations by the owner behind each peer, preserving input (recency) order. */
+function groupConversations(conversations) {
+  const map = new Map();
+  for (const c of conversations) {
+    const key = ownerKeyOf(c.peerGhii);
+    if (!map.has(key)) map.set(key, { ownerKey: key, convs: [] });
+    map.get(key).convs.push(c);
+  }
+  return [...map.values()];
+}
+
 function Avatar({ seed, size = 36 }) {
   const svg = minidenticon(seed || 'user');
   return html`<span class="inbox-avatar" style=${`width:${size}px;height:${size}px`}
@@ -134,7 +161,92 @@ function trackStateLabel(state) {
   }
 }
 
-function MessageBubble({ msg, mine, urlMap, starred, onStar, onTrack, tracked }) {
+/** Classify an attachment for rendering: how to view it (thumbnail / native tab / markdown viewer). */
+const ATTACH_ICO = { image: '🖼', pdf: '📄', markdown: '📄', audio: '🎵', video: '🎬', file: '📎' };
+function attachKind(a) {
+  const mime = a.mime || '';
+  const name = a.name || a.storageKey || '';
+  if (a.kind === 'image' || /^image\//.test(mime)) return 'image';
+  if (mime === 'application/pdf' || /\.pdf$/i.test(name)) return 'pdf';
+  if (/markdown/.test(mime) || /\.(md|markdown|mdx)$/i.test(name)) return 'markdown';
+  if (a.kind === 'audio' || /^audio\//.test(mime)) return 'audio';
+  if (a.kind === 'video' || /^video\//.test(mime)) return 'video';
+  return 'file';
+}
+
+/** One received/sent attachment. Images render as a thumbnail (click → full-size in a new tab);
+ *  PDF/audio/video/file open natively in a new tab; markdown opens the in-app rendered viewer. Every
+ *  ready attachment gets a download button. Not-yet-duplicated / expired attachments show their state. */
+function AttachmentItem({ a, url, onOpenMarkdown }) {
+  const kind = attachKind(a);
+  const name = a.name || a.storageKey;
+  const ready = !!url && !a.expired;
+
+  if (!ready) {
+    const status = a.expired ? t('inbox.attachmentExpired') : (a.mode !== 'duplicate' ? t('inbox.attachmentPending') : null);
+    return html`<div class="inbox-attach-chip inbox-attach-chip--pending">
+      <span class="inbox-attach-ico">${ATTACH_ICO[kind]}</span>
+      <span class="inbox-attach-name">${escHtml(name)}</span>
+      ${status ? html`<span class="inbox-attach-pending">${status}</span>` : null}
+    </div>`;
+  }
+
+  const download = html`<a class="inbox-attach-dl" href=${url} download=${name} title=${t('inbox.attachmentDownload')}>⬇</a>`;
+
+  if (kind === 'image') {
+    return html`<div class="inbox-attach-item">
+      <a class="inbox-attach-thumb-link" href=${url} target="_blank" rel="noopener" title=${t('inbox.attachmentOpen')}>
+        <img class="inbox-attach-thumb" src=${url} alt=${escHtml(name)} loading="lazy" />
+      </a>
+      <div class="inbox-attach-cap"><span class="inbox-attach-name">${escHtml(name)}</span>${download}</div>
+    </div>`;
+  }
+  if (kind === 'markdown') {
+    return html`<div class="inbox-attach-chip">
+      <button class="inbox-attach-open" onClick=${() => onOpenMarkdown?.(url, name)} title=${t('inbox.attachmentView')}>
+        <span class="inbox-attach-ico">📄</span><span class="inbox-attach-name">${escHtml(name)}</span>
+      </button>${download}
+    </div>`;
+  }
+  // pdf / audio / video / file — let the browser open it in a new tab.
+  return html`<div class="inbox-attach-chip">
+    <a class="inbox-attach-open" href=${url} target="_blank" rel="noopener" title=${t('inbox.attachmentOpen')}>
+      <span class="inbox-attach-ico">${ATTACH_ICO[kind]}</span><span class="inbox-attach-name">${escHtml(name)}</span>
+    </a>${download}
+  </div>`;
+}
+
+/** In-app viewer for a markdown attachment — browsers don't render .md, so we fetch the (same-origin,
+ *  presigned) file and render it with the shared safe Markdown component. Offers open-raw + download. */
+function MarkdownViewer({ url, name, onClose }) {
+  const [text, setText] = useState(null);
+  const [failed, setFailed] = useState(false);
+  useEffect(() => {
+    let alive = true;
+    fetch(url).then(r => r.ok ? r.text() : Promise.reject(new Error('http'))).then(tx => { if (alive) setText(tx); }).catch(() => { if (alive) setFailed(true); });
+    return () => { alive = false; };
+  }, [url]);
+  return html`
+    <div class="inbox-mdviewer-overlay" onClick=${onClose}>
+      <div class="inbox-mdviewer" onClick=${e => e.stopPropagation()}>
+        <div class="inbox-mdviewer-head">
+          <span class="inbox-mdviewer-title">📄 ${escHtml(name)}</span>
+          <div class="inbox-mdviewer-actions">
+            <a class="btn-ghost btn-sm" href=${url} target="_blank" rel="noopener">${t('inbox.attachmentOpenRaw')}</a>
+            <a class="btn-ghost btn-sm" href=${url} download=${name}>${t('inbox.attachmentDownload')}</a>
+            <button class="btn-ghost btn-sm" onClick=${onClose} title=${t('inbox.close')}>✕</button>
+          </div>
+        </div>
+        <div class="inbox-mdviewer-body">
+          ${failed ? html`<div class="inbox-empty-sm">${t('inbox.attachmentLoadError')}</div>`
+            : text === null ? html`<div class="inbox-empty-sm">…</div>`
+            : html`<${Markdown} text=${text} />`}
+        </div>
+      </div>
+    </div>`;
+}
+
+function MessageBubble({ msg, mine, urlMap, starred, onStar, onTrack, tracked, onOpenMarkdown }) {
   const nonInline = (msg.attachments || []).filter(a => !a.inline);
   const expiredIds = new Set((msg.attachments || []).filter(a => a.expired).map(a => a.id));
   const trk = tracked ? trackStateLabel(tracked.state) : null;
@@ -152,14 +264,7 @@ function MessageBubble({ msg, mine, urlMap, starred, onStar, onTrack, tracked })
         <div class="inbox-bubble-body"><${Markdown} text=${prepareBody(msg.body, urlMap, expiredIds)} /></div>
         ${nonInline.length > 0 && html`
           <div class="inbox-attach-row">
-            ${nonInline.map(a => html`
-              <a key=${a.id} class=${`inbox-attach-chip${(urlMap[a.id] && !a.expired) ? '' : ' inbox-attach-chip--pending'}`}
-                href=${(urlMap[a.id] && !a.expired) ? urlMap[a.id] : '#'} target="_blank" rel="noopener">
-                <span class="inbox-attach-ico">${a.kind === 'image' ? '🖼' : a.kind === 'audio' ? '🎵' : a.kind === 'video' ? '🎬' : '📎'}</span>
-                <span class="inbox-attach-name">${escHtml(a.name || a.storageKey)}</span>
-                ${a.expired ? html`<span class="inbox-attach-pending">${t('inbox.attachmentExpired')}</span>`
-                  : a.mode !== 'duplicate' ? html`<span class="inbox-attach-pending">${t('inbox.attachmentPending')}</span>` : null}
-              </a>`)}
+            ${nonInline.map(a => html`<${AttachmentItem} key=${a.id} a=${a} url=${urlMap[a.id]} onOpenMarkdown=${onOpenMarkdown} />`)}
           </div>`}
         <div class="inbox-bubble-meta">
           ${trk ? html`<span class=${`inbox-track-badge inbox-track-badge--${trk.tone}`} title=${t('inbox.trackResponse')}>🔗 ${trk.text}</span>` : null}
@@ -256,6 +361,8 @@ export default function InboxTab({ showToast }) {
   const [activeConv, setActiveConv] = useState(null);     // { conversationId, peerGhii }
   const [thread, setThread] = useState([]);
   const [urlMap, setUrlMap] = useState({});
+  const [mdViewer, setMdViewer] = useState(null);         // { url, name } — open markdown attachment viewer
+  const [composeSubject, setComposeSubject] = useState(''); // optional subject → opens a new topic thread
   const [mode, setMode] = useState('idle');               // 'idle' | 'compose' | 'thread'
   const [to, setTo] = useState('');
   const [sending, setSending] = useState(false);
@@ -385,8 +492,16 @@ export default function InboxTab({ showToast }) {
     setThread(msgs);
     const map = {};
     await Promise.all(msgs.flatMap(m => (m.attachments || [])
-      .filter(a => a.mode === 'duplicate' && a.localKey)
-      .map(async a => { const u = await messages.attachmentUrl(a.localKey).catch(() => null); if (u) map[a.id] = u; })));
+      .filter(a => !a.inline)
+      .map(async a => {
+        // Inbound: only the recipient's duplicated local copy is fetchable (after accept). Outbound:
+        // the sender owns the original storage key, so resolve that — you can view/download what you sent.
+        const key = (a.mode === 'duplicate' && a.localKey) ? a.localKey
+          : (m.direction === 'outbound' && a.storageKey) ? a.storageKey : null;
+        if (!key) return;
+        const u = await messages.attachmentUrl(key).catch(() => null);
+        if (u) map[a.id] = u;
+      })));
     setUrlMap(map);
     if (markRead) await messages.markConversationRead(conv.conversationId).catch(() => {});
   }, []);
@@ -434,7 +549,7 @@ export default function InboxTab({ showToast }) {
     await loadThread(conv, true);                 // mark read only on explicit open (avoids a refresh loop)
     loadLists();
   };
-  const startCompose = () => { setMode('compose'); setActiveConv(null); setTo(''); };
+  const startCompose = () => { setMode('compose'); setActiveConv(null); setTo(''); setComposeSubject(''); };
 
   // Open the conversation for a tracked response, then (for awaiting-approval) seed the suggested reply.
   const openTracked = async (tr) => {
@@ -485,10 +600,13 @@ export default function InboxTab({ showToast }) {
         const desc = await messages.uploadAttachment(files[i]);
         attachments.push({ ...desc, inline: false, id: `at${i}` });
       }
-      const resp = await messages.send({ to: recipient, body, attachments });
+      // A subject (compose mode only) opens a new topic thread; replies stay in the active thread.
+      const subject = (mode === 'compose' && composeSubject.trim()) ? composeSubject.trim() : undefined;
+      const resp = await messages.send({ to: recipient, body, attachments, subject });
       if (resp?.ok === false) { showToast?.(resp?.error?.message || t('inbox.failed'), true); }
       else {
         reset?.();
+        setComposeSubject('');
         // If this send fulfils a Tracked Response awaiting approval, mark it replied.
         if (replyingTrId) {
           await tracked.markTrackedResponseReplied(replyingTrId, resp?.data?.message?.id).catch(() => {});
@@ -528,23 +646,47 @@ export default function InboxTab({ showToast }) {
 
       <div class="inbox-list-section">${t('inbox.conversations')}</div>
       ${conversations.length === 0 ? html`<div class="inbox-empty-sm">${t('inbox.noConversations')}</div>` : null}
-      ${conversations.map(c => html`
-        <button class=${`inbox-conv${activeConv?.conversationId === c.conversationId ? ' inbox-conv--active' : ''}`}
-          key=${c.conversationId} onClick=${() => openConversation(c)}>
-          <${Avatar} seed=${c.peerGhii} size=${40} />
-          <div class="inbox-conv-main">
-            <div class="inbox-conv-line1">
-              <span class="inbox-name">${escHtml(peerName(c.peerGhii))} <${PresenceDot} ghii=${c.peerGhii} /></span>
-              <span class="inbox-conv-time">${c.updatedAt ? timeShort(c.updatedAt) : ''}</span>
+      ${groupConversations(conversations).map(g => {
+        // A person with a single human-only thread (no agents) renders flat, as before.
+        if (g.convs.length === 1 && !isAgentPeer(g.convs[0].peerGhii)) return convRow(g.convs[0], false);
+        // Otherwise: a group header for the person + a nested row per thread (human + each agent).
+        const unread = g.convs.reduce((n, c) => n + (c.unread || 0), 0);
+        return html`
+          <div class="inbox-conv-group" key=${g.ownerKey}>
+            <div class="inbox-conv-group-head">
+              <${Avatar} seed=${g.ownerKey} size=${28} />
+              <span class="inbox-name">${escHtml(ownerDisplayName(g.ownerKey))} <${PresenceDot} ghii=${g.ownerKey} /></span>
+              ${unread > 0 ? html`<span class="inbox-conv-badge">${unread}</span>` : null}
             </div>
-            <div class="inbox-conv-line2">
-              <span class="inbox-conv-preview">${c.lastDirection === 'outbound' ? `${t('inbox.youPrefix')} ` : ''}${escHtml(c.lastMessage || '')}</span>
-              ${c.unread > 0 ? html`<span class="inbox-conv-badge">${c.unread}</span>` : null}
-            </div>
-          </div>
-        </button>`)}
+            ${g.convs.map(c => convRow(c, true))}
+          </div>`;
+      })}
     </div>`;
 
+  /** One conversation row. `nested` = inside a person group (labelled by the agent/thread, indented). */
+  const convRow = (c, nested) => {
+    const active = activeConv?.conversationId === c.conversationId ? ' inbox-conv--active' : '';
+    const sub = subThreadLabel(c.peerGhii);
+    // Nested: a subject thread shows its topic; otherwise the agent name / "Direct". Flat: the person.
+    const label = nested ? (c.subject || sub || t('inbox.directThread')) : peerName(c.peerGhii);
+    const icon = sub ? '🤖' : (c.subject ? '🏷' : '💬');
+    return html`
+      <button class=${`inbox-conv${active}${nested ? ' inbox-conv--nested' : ''}`} key=${c.conversationId} onClick=${() => openConversation(c)}>
+        ${nested ? html`<span class="inbox-conv-subico">${icon}</span>` : html`<${Avatar} seed=${c.peerGhii} size=${40} />`}
+        <div class="inbox-conv-main">
+          <div class="inbox-conv-line1">
+            <span class="inbox-name">${escHtml(label)} ${nested ? '' : html`<${PresenceDot} ghii=${c.peerGhii} />`}</span>
+            <span class="inbox-conv-time">${c.updatedAt ? timeShort(c.updatedAt) : ''}</span>
+          </div>
+          <div class="inbox-conv-line2">
+            ${(!nested && c.subject) ? html`<span class="inbox-conv-subject">🏷 ${escHtml(c.subject)}</span>` : ''}
+            <span class="inbox-conv-preview">${c.lastDirection === 'outbound' ? `${t('inbox.youPrefix')} ` : ''}${escHtml(c.lastMessage || '')}</span>
+            ${c.unread > 0 ? html`<span class="inbox-conv-badge">${c.unread}</span>` : null}
+          </div>
+        </div>
+      </button>`;
+  };
+
   const renderThread = () => {
     let lastDay = '';
     return html`
@@ -553,6 +695,7 @@ export default function InboxTab({ showToast }) {
           <${Avatar} seed=${activeConv.peerGhii} size=${36} />
           <div class="inbox-thread-id">
             <div class="inbox-name">${escHtml(peerName(activeConv.peerGhii))} <${PresenceDot} ghii=${activeConv.peerGhii} label=${true} /></div>
+            ${activeConv.subject ? html`<div class="inbox-thread-subject">🏷 ${escHtml(activeConv.subject)}</div>` : null}
             <div class="inbox-sub">${escHtml(activeConv.peerGhii)}</div>
           </div>
         </div>
@@ -564,7 +707,8 @@ export default function InboxTab({ showToast }) {
             return html`
               ${showDay ? html`<div class="inbox-day" key=${'d' + m.id}><span>${dayLabel(m.createdAt)}</span></div>` : null}
               <${MessageBubble} key=${m.id + m.direction} msg=${m} mine=${m.direction === 'outbound'} urlMap=${urlMap}
-                starred=${important.has(m.id)} onStar=${toggleImportant} onTrack=${onTrackMsg} tracked=${trackedByMsg[m.id]} />`;
+                starred=${important.has(m.id)} onStar=${toggleImportant} onTrack=${onTrackMsg} tracked=${trackedByMsg[m.id]}
+                onOpenMarkdown=${(url, name) => setMdViewer({ url, name })} />`;
           })}
         </div>
         ${awaitingForConv.map(tr => html`
@@ -653,6 +797,8 @@ export default function InboxTab({ showToast }) {
             <div class="inbox-compose-fields">
               <input class="inbox-input" type="text" placeholder=${t('inbox.toPlaceholder')}
                 value=${to} onInput=${(e) => setTo(e.target.value)} />
+              <input class="inbox-input" type="text" placeholder=${t('inbox.subjectPlaceholder')}
+                value=${composeSubject} onInput=${(e) => setComposeSubject(e.target.value)} />
             </div>
             <${Composer} key="c-new" recipient=${to.trim()} sendLabel=${t('inbox.send')}
               sending=${sending} onSend=${doSend} />
@@ -673,5 +819,6 @@ export default function InboxTab({ showToast }) {
 
       <${TrackResponseModal} open=${!!trackMsg} msg=${trackMsg}
         onClose=${() => setTrackMsg(null)} onDone=${loadLists} showToast=${showToast} />
+      ${mdViewer && html`<${MarkdownViewer} url=${mdViewer.url} name=${mdViewer.name} onClose=${() => setMdViewer(null)} />`}
     </div>`;
 }