aimeat 1.28.0 → 1.30.0

package/dist/public/js/services/organisms.js

@@ -6,6 +6,8 @@
  *   resolve gate approvals.
  * @usage import * as orgService from '/js/services/organisms.js';
  * @version-history
+ *   v1.3.0 — 2026-06-22 — Batch endpoints: discoverWorkspaces({include:'enrichment'}) folds the
+ *     per-workspace fan-out; new getWaiting() (home widget) and listCommentsBatch() (workspace comments).
  *   v1.2.1 — 2026-06-21 — Decode HTML entities in workspace names on read (listWorkspaces +
  *     discoverWorkspaces) so legacy double-escaped registry names (e.g. "STT & Voice") render
  *     as plain text in the list + breadcrumb.
@@ -38,6 +40,7 @@ export async function listOrganisms(opts = {}) {
   if (opts.interest) params.set('interest', opts.interest);
   if (opts.visibility) params.set('visibility', opts.visibility);
   if (opts.member) params.set('member', opts.member);
+  if (opts.include) params.set('include', opts.include);   // 'counts' → each org gains workspace_count
   return apiGet(`/v1/organisms?${params.toString()}`);
 }
 
@@ -90,12 +93,43 @@ export async function reviewJoinRequest(organismId, requestId, decision) {
   return apiPost(`/v1/organisms/${encodeURIComponent(organismId)}/join-requests/${encodeURIComponent(requestId)}/review`, { decision });
 }
 
+/** "Waiting for you" — pending reviews + join-requests + invitations aggregated across the caller's
+ *  member organisms in ONE request (replaces the home widget's per-org listApprovals/listJoinRequests/
+ *  listWorkspaces fan-out). Returns the flat `items` array ({kind:'review'|'join'|'invite', …}). */
+export async function getWaiting() {
+  try {
+    const resp = await apiGet('/v1/organisms/waiting');
+    return Array.isArray(resp?.data?.items) ? resp.data.items : [];
+  } catch { return []; }
+}
+
+/** Agent activity aggregated across every readable workspace in ONE request (organism Agents tab).
+ *  Returns { agentName: { count, lastAt, workspaces:[names] } } (replaces per-workspace activity fetches). */
+export async function getAgentsActivity(orgId) {
+  try {
+    const resp = await apiGet(`/v1/organisms/${encodeURIComponent(orgId)}/agents/activity`);
+    return resp?.data?.agents || {};
+  } catch { return {}; }
+}
+
 /** List the comment thread on a workspace object (record or document). */
 export async function listComments(orgId, ws, space, instanceId) {
   const params = new URLSearchParams({ ws, space, instance_id: instanceId });
   return apiGet(`/v1/organisms/${encodeURIComponent(orgId)}/comments?${params.toString()}`);
 }
 
+/** Composite key the comments-batch response is keyed by (NUL-joined, never collides with any id). */
+export const commentBatchKey = (ws, space, instanceId) => `${ws}\u0000${space}\u0000${instanceId}`;
+
+/** Fetch comment threads for MANY workspace objects in one POST (body, not URL params, so a long
+ *  target list never bloats the URL). Returns the raw `{ "ws\0space\0id": {comments,total} }` map. */
+export async function listCommentsBatch(orgId, instances) {
+  try {
+    const resp = await apiPost(`/v1/organisms/${encodeURIComponent(orgId)}/comments/batch`, { instances });
+    return (resp?.data?.comments) || {};
+  } catch { return {}; }
+}
+
 /** Add a comment to a workspace object. anchor: { section?|quote? }; parentId for a threaded reply. */
 export async function addComment(orgId, { ws, space, instanceId, body, anchor, parentId }) {
   return apiPost(`/v1/organisms/${encodeURIComponent(orgId)}/comments`, { ws, space, instance_id: instanceId, body, anchor, parent_id: parentId });
@@ -579,10 +613,13 @@ export async function saveWorkspaceRegistry(orgId, workspaces) {
  * Organism membership lets you DISCOVER every workspace (names + creator + your access status);
  * reading a workspace's content needs the creator's approval. ── */
 
-/** Discover all workspaces in the org with your access status ('owner' | 'granted' | 'none'). */
-export async function discoverWorkspaces(orgId) {
+/** Discover all workspaces in the org with your access status ('owner' | 'granted' | 'none').
+ *  opts.include='enrichment' folds the per-workspace getWorkspace+activity+participants fan-out into
+ *  one response: each readable row gains `enrichment:{hasManifest,recs,docs,lastEvent,participants,pendingReviews}`. */
+export async function discoverWorkspaces(orgId, opts = {}) {
   try {
-    const resp = await apiGet(`/v1/organisms/${encodeURIComponent(orgId)}/workspaces`);
+    const qs = opts.include ? `?include=${encodeURIComponent(opts.include)}` : '';
+    const resp = await apiGet(`/v1/organisms/${encodeURIComponent(orgId)}/workspaces${qs}`);
     const list = Array.isArray(resp?.data?.workspaces) ? resp.data.workspaces : [];
     // Names are plain text; legacy import paths stored them HTML-escaped. Decode for display.
     return list.map(w => (w && w.name ? { ...w, name: decodeEntities(w.name) } : w));
@@ -615,6 +652,15 @@ export async function getWorkspaceAccess(orgId, ws) {
   } catch { return { requests: [], members: [] }; }
 }
 
+/** Access rosters for ALL of my owned workspaces in one request (Members tab — replaces a per-owned-
+ *  workspace getWorkspaceAccess fan-out). Returns [{ ws, name, members, requests }]. */
+export async function getWorkspaceAccessAll(orgId) {
+  try {
+    const resp = await apiGet(`/v1/organisms/${encodeURIComponent(orgId)}/workspace-access?all=1`);
+    return Array.isArray(resp?.data?.workspaces) ? resp.data.workspaces : [];
+  } catch { return []; }
+}
+
 /** Directly add (or re-role) a member: role 'viewer' (read) | 'contributor' (read+write). grantee = an
  *  owner name, GHII, or GAII — the grant applies to that owner (so all their agents inherit it). */
 export async function grantWorkspaceRole(orgId, ws, grantee, role) {

package/dist/public/js/services/workflows.js

@@ -23,9 +23,10 @@ export async function getAgentOffers(agentName) {
   return apiGet(`/v1/agents/${encodeURIComponent(agentName)}/offers`);
 }
 
-/** List the owner's workflow definitions: { workflows, count }. */
-export async function listWorkflows() {
-  return apiGet('/v1/workflows');
+/** List the owner's workflow definitions: { workflows, count }. opts.include='health' attaches each
+ *  workflow's run-health inline (avoids a per-workflow getHealth fan-out in the list view). */
+export async function listWorkflows(opts = {}) {
+  return apiGet(`/v1/workflows${opts.include ? `?include=${encodeURIComponent(opts.include)}` : ''}`);
 }
 
 export async function getWorkflow(id) {

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/spa.html

@@ -240,6 +240,7 @@
       "/views/profile/organisms/sources-panel.js": "/views/profile/organisms/sources-panel.js",
       "/views/profile/organisms/schema-form.js": "/views/profile/organisms/schema-form.js",
       "/views/profile/organisms/document.js": "/views/profile/organisms/document.js",
+      "/views/command-palette.js": "/views/command-palette.js",
       "/views/profile/organisms/mindmap.js": "/views/profile/organisms/mindmap.js",
       "/views/profile/organisms/readme-panel.js": "/views/profile/organisms/readme-panel.js",
       "/views/profile/organisms/timeline-panel.js": "/views/profile/organisms/timeline-panel.js"
@@ -286,6 +287,7 @@
     import { loadTranslations, t, getLocale, switchLocale, onLocaleChange } from '/js/i18n.js';
     import { initThemeSystem, getTheme, toggleTheme, onThemeChange } from '/js/theme.js';
     import { NotificationBell } from '/components/NotificationBell.js';
+    import { CommandPalette } from '/views/command-palette.js';
     import { openAppSandboxed, isAppHtmlUrl } from '/js/app-sandbox.js';
     // generateStars no longer needed for light theme
 
@@ -467,6 +469,7 @@
 
       return html`
         <${Header} navigate=${navigate} locale=${locale} />
+        <${CommandPalette} navigate=${navigate} />
         <div class="page-content">
           ${viewError
             ? html`<div style="text-align:center; padding:3rem 1.5rem; color:var(--text-dim,#888);">

package/dist/public/views/command-palette.js

@@ -0,0 +1,145 @@
+/**
+ * @file command-palette.js
+ * @description Global command palette / quick-switcher (Cmd/Ctrl-K) — Layer 2 of the search feature.
+ *   Mounted once at the app shell so it works on any authenticated page. Empty query shows recents;
+ *   typing runs the indexed cross-owner librarian search (GET /v1/librarian/search, own scope) plus a
+ *   name match over the caller's organisms. Results are grouped (Organisms / content hits), keyboard-
+ *   navigable (↑↓/Enter/Esc), and selecting one jumps to that organism/workspace — pre-filling the
+ *   in-workspace search (Layer 1) with the same query so you land on the filtered list. Navigation
+ *   hands off via sessionStorage (read by OrganismsTab on mount) + an `aimeat-open-organism` event
+ *   (picked up if the tab is already mounted) + a route change to the organisms tab.
+ * @structure CommandPalette({ navigate })
+ * @usage import { CommandPalette } from '/views/command-palette.js';  html`<${CommandPalette} navigate=${navigate} />`
+ * @version-history
+ *   v1.0.0 — 2026-06-22 — Initial: Cmd-K quick-switcher over librarian search + organism names + recents.
+ */
+import { h } from 'preact';
+import { useState, useEffect, useRef, useCallback } from 'preact/hooks';
+import htm from 'htm';
+const html = htm.bind(h);
+import { t } from '/js/i18n.js';
+import { Modal } from '/components/Modal.js';
+import { SearchBar } from '/components/SearchBar.js';
+import { Spinner } from '/components/Spinner.js';
+import { EmptyState } from '/components/EmptyState.js';
+import { librarianSearch } from '/js/services/memory.js';
+import { listOrganisms } from '/js/services/organisms.js';
+import { getOwner } from '/js/services/auth.js';
+import { listRecents } from '/js/recents.js';
+
+/** Hand off to the organisms tab using the app's existing nav contract: prime the sessionStorage the
+ *  OrganismsTab reads on mount (open id + workspace + an optional ws-search pre-fill), then switch to
+ *  the Organisms tab via `aimeat-open-tab` (the LandingPage listener). Also fire `aimeat-open-organism`
+ *  for an ALREADY-mounted OrganismsTab (it won't remount, so it can't re-read sessionStorage), and a
+ *  route fallback for when we're not on /v1/profile at all. */
+function openTarget(navigate, { orgId, wsId, query }) {
+  try {
+    if (orgId) sessionStorage.setItem('aimeat.ws.openId', orgId);
+    if (wsId) sessionStorage.setItem('aimeat.ws.openWs', wsId); else sessionStorage.removeItem('aimeat.ws.openWs');
+    if (orgId && wsId && query) sessionStorage.setItem(`aimeat.ws.${orgId}.${wsId}.search`, query);
+  } catch { /* private mode — the route fallback still works */ }
+  try {
+    window.dispatchEvent(new CustomEvent('aimeat-open-tab', { detail: { tabId: 'organisms' } }));
+    window.dispatchEvent(new CustomEvent('aimeat-open-organism', { detail: { orgId, wsId: wsId || null } }));
+  } catch { /* noop */ }
+  if (!location.pathname.startsWith('/v1/profile')) navigate('/v1/profile?tab=organisms');
+}
+
+export function CommandPalette({ navigate }) {
+  const [open, setOpen] = useState(false);
+  const [q, setQ] = useState('');
+  const [hits, setHits] = useState(null);     // librarian content hits
+  const [orgs, setOrgs] = useState([]);       // caller's organisms (for name match)
+  const [busy, setBusy] = useState(false);
+  const [sel, setSel] = useState(0);
+  const inputRef = useRef(null);
+
+  // Global Cmd/Ctrl-K to open (ignore when typing in a field, except to toggle); Esc handled by Modal.
+  useEffect(() => {
+    const onKey = (e) => {
+      if ((e.ctrlKey || e.metaKey) && (e.key === 'k' || e.key === 'K')) {
+        e.preventDefault();
+        setOpen(o => !o);
+      }
+    };
+    document.addEventListener('keydown', onKey);
+    return () => document.removeEventListener('keydown', onKey);
+  }, []);
+
+  // On open: load recents + the caller's organisms (for name matching), focus the input.
+  useEffect(() => {
+    if (!open) { setQ(''); setHits(null); setSel(0); return; }
+    const me = getOwner();
+    if (me) listOrganisms({ member: me }).then(r => setOrgs((r?.data?.organisms) || [])).catch(() => {});
+    setTimeout(() => inputRef.current?.querySelector('input')?.focus(), 30);
+  }, [open]);
+
+  // Debounced content search.
+  useEffect(() => {
+    if (!open) return undefined;
+    const query = q.trim();
+    if (query.length < 2) { setHits(null); setBusy(false); return undefined; }
+    let cancelled = false;
+    setBusy(true);
+    const tid = setTimeout(async () => {
+      const r = await librarianSearch(query, 30, 'own').catch(() => []);
+      if (!cancelled) { setHits(r || []); setBusy(false); setSel(0); }
+    }, 200);
+    return () => { cancelled = true; clearTimeout(tid); };
+  }, [q, open]);
+
+  const orgName = useCallback((id) => orgs.find(o => o.id === id)?.name || id, [orgs]);
+
+  // Build a flat, selectable item list (with group headers derived for rendering).
+  const query = q.trim();
+  const orgMatches = query.length >= 2
+    ? orgs.filter(o => (o.name || '').toLowerCase().includes(query.toLowerCase())).slice(0, 6)
+        .map(o => ({ kind: 'org', orgId: o.id, label: o.name, sub: t(`organisms.types.${o.type}`) || o.type }))
+    : [];
+  const contentItems = (hits || []).map(hh => ({
+    kind: 'hit', orgId: hh.organismId, wsId: hh.workspaceId, label: hh.title || hh.key,
+    sub: [orgName(hh.organismId), hh.workspaceId, hh.space].filter(Boolean).join(' · '), snippet: hh.snippet,
+  })).filter(it => it.orgId);
+  const recents = (!query) ? listRecents(8).filter(r => r.type === 'workspace' && r.data?.orgId)
+    .map(r => ({ kind: 'recent', orgId: r.data.orgId, wsId: r.data.wsId, label: r.label, sub: r.sub })) : [];
+  const items = [...orgMatches, ...contentItems, ...recents];
+
+  const choose = (it) => {
+    if (!it) return;
+    openTarget(navigate, { orgId: it.orgId, wsId: it.wsId, query: it.kind === 'hit' ? query : '' });
+    setOpen(false);
+  };
+  const onInputKey = (e) => {
+    if (e.key === 'ArrowDown') { e.preventDefault(); setSel(s => Math.min(s + 1, items.length - 1)); }
+    else if (e.key === 'ArrowUp') { e.preventDefault(); setSel(s => Math.max(s - 1, 0)); }
+    else if (e.key === 'Enter') { e.preventDefault(); choose(items[sel]); }
+  };
+
+  if (!open) return null;
+  let idx = -1;
+  const row = (it) => { idx++; const i = idx; return html`
+    <button class=${'cmdk-item' + (i === sel ? ' is-sel' : '')} key=${it.kind + (it.orgId || '') + (it.wsId || '') + it.label}
+      onMouseEnter=${() => setSel(i)} onClick=${() => choose(it)}>
+      <span class="cmdk-item-label">${it.kind === 'org' ? '🏢 ' : it.kind === 'recent' ? '🕘 ' : '📄 '}${it.label}</span>
+      ${it.sub ? html`<span class="cmdk-item-sub">${it.sub}</span>` : null}
+      ${it.snippet ? html`<span class="cmdk-item-snippet">${it.snippet}</span>` : null}
+    </button>`; };
+
+  return html`
+    <${Modal} open=${open} onClose=${() => setOpen(false)} title=${t('search.paletteTitle') || 'Search everything'} className="cmdk-modal">
+      <div class="cmdk" ref=${inputRef} onKeyDown=${onInputKey}>
+        <${SearchBar} value=${q} onInput=${e => setQ(e.target.value)} placeholder=${t('search.palettePlaceholder') || 'Search organisms, workspaces, records…'} />
+        <div class="cmdk-hint section-desc">${t('search.openHint') || '↵ open · Esc close'}</div>
+        <div class="cmdk-list">
+          ${busy && !items.length ? html`<${Spinner} text=${t('search.searching') || 'Searching…'} />` : null}
+          ${!busy && query.length >= 2 && !items.length ? html`<${EmptyState} text=${t('search.noMatches') || 'No matches'} />` : null}
+          ${orgMatches.length ? html`<div class="cmdk-group">${t('organisms.title') || 'Organisms'}</div>` : null}
+          ${orgMatches.map(row)}
+          ${contentItems.length ? html`<div class="cmdk-group">${t('search.results') || 'Results'}</div>` : null}
+          ${contentItems.map(row)}
+          ${recents.length ? html`<div class="cmdk-group">${t('search.recents') || 'Recent'}</div>` : null}
+          ${recents.map(row)}
+        </div>
+      </div>
+    </${Modal}>`;
+}

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>`;
 }