aimeat 1.28.0 → 1.30.0

package/dist/public/views/profile/organisms/workspace.js

@@ -11,6 +11,13 @@
  *   v1.0.0 — 2026-06-19 — Extracted from organisms-tab.js during the module split.
  *   v1.1.0 — 2026-06-22 — Add the free-form README panel + the interactive workspace mindmap; rename
  *     the structure overview to "table of contents" (Osa A/C).
+ *   v1.2.0 — 2026-06-22 — Batch + debounce: one /comments/batch covers all visible threads (records +
+ *     open doc) instead of per-thread fetches; the main load + comments refresh are debounced (1.5s)
+ *     so an agent-driven 'organisms'/'memory' event burst is a single reload.
+ *   v1.3.0 — 2026-06-22 — Record readability: fields render label-on-top, left-aligned, wrapping, with
+ *     markdown for text / lists for arrays / pretty JSON for objects (was a right-aligned one-liner);
+ *     editing happens INLINE in the record's own card (one editor at a time) instead of a form at the
+ *     top of the space; each record is a separated card with breathing room.
  */
 import { h } from 'preact';
 import { useState, useEffect, useCallback, useRef } from 'preact/hooks';
@@ -21,9 +28,9 @@ import { t, getLocale } from '/js/i18n.js';
 import { Spinner, KebabMenu } from '/views/profile/shared.js';
 import { useConfirm } from '/components/Modal.js';
 import { EmptyState } from '/components/EmptyState.js';
-import { KeyValueRow } from '/components/KeyValueRow.js';
+import { SearchBar } from '/components/SearchBar.js';
 import { Mermaid } from '/components/Mermaid.js';
-import { slugifyHeading } from '/components/Markdown.js';
+import { Markdown, slugifyHeading } from '/components/Markdown.js';
 import * as orgService from '/js/services/organisms.js';
 import { getGhii } from '/js/services/auth.js';
 import { copyToClipboard } from '/js/utils.js';
@@ -194,6 +201,31 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
   };
   const onWsMapNav = (target) => { if (target?.type === 'space' && target.space) setTab('space:' + target.space); };
 
+  // ── In-workspace content search (Kerros 1): indexed FTS scoped to this workspace. While a query is
+  // active the space tabs are filtered to the ones with matches (+ counts) and a grouped result list
+  // replaces the space view; clicking a hit jumps straight to that record/document. ──
+  const [wsQuery, setWsQuery] = useState('');
+  const [wsHits, setWsHits] = useState(null);   // null = not searching; [] = searched, no matches
+  const [wsSearching, setWsSearching] = useState(false);
+  useEffect(() => {
+    const q = wsQuery.trim();
+    if (q.length < 2) { setWsHits(null); setWsSearching(false); return undefined; }
+    let cancelled = false;
+    setWsSearching(true);
+    const tid = setTimeout(async () => {
+      const r = await orgService.searchOrganism(orgId, q, wsId).catch(() => null);
+      if (!cancelled) { setWsHits((r?.data?.results) || []); setWsSearching(false); }
+    }, 220);   // debounce — instant feel without a request per keystroke
+    return () => { cancelled = true; clearTimeout(tid); };
+  }, [wsQuery, orgId, wsId]);
+  const wsSearchCounts = wsHits ? wsHits.reduce((m, h) => { m[h.space] = (m[h.space] || 0) + 1; return m; }, {}) : null;
+  // One-shot: the command palette (Cmd-K) can pre-fill this workspace's search so you land on the
+  // filtered result list for the query you jumped from.
+  useEffect(() => {
+    const k = `aimeat.ws.${orgId}.${wsId}.search`;
+    try { const v = sessionStorage.getItem(k); if (v) { setWsQuery(v); sessionStorage.removeItem(k); } } catch { /* noop */ }
+  }, [orgId, wsId]);
+
   // Deep-link from the librarian "Open" button: aimeat.ws.{org}.{ws}.openDoc = { namespace, id }.
   // Once the manifest is loaded we resolve the namespace → object-type name, open that space tab and
   // its document, then clear the key (one-shot).
@@ -216,8 +248,44 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
     } catch (e) { /* noop */ }
   }, [activeDoc, docKey]);
 
+  // Subscribe to 'organisms' ONLY — NOT the global 'memory' firehose (every one of dozens of agents'
+  // unrelated memory writes was waking this view even when nothing in THIS workspace changed). Organism
+  // content writes now also emit 'organisms' (see the memory route), so real workspace changes still
+  // refresh; debounced to coalesce a burst into one reload.
   const liveRef = useRef(load); liveRef.current = load;
-  useEffect(() => onLiveUpdate(['organisms', 'memory'], () => liveRef.current()), []);
+  useEffect(() => {
+    let timer = null;
+    const off = onLiveUpdate(['organisms'], () => { clearTimeout(timer); timer = setTimeout(() => liveRef.current(), 1500); });
+    return () => { clearTimeout(timer); off(); };
+  }, []);
+
+  // ── Comments: ONE /comments/batch request covers every visible thread (the open document + each
+  // expanded record), instead of every <WorkspaceComments> self-fetching AND re-fetching on every
+  // 'organisms' event (the per-document comments storm). Debounced like the main load. ──
+  const [commentsByKey, setCommentsByKey] = useState({});
+  const cKey = orgService.commentBatchKey;
+  const reloadComments = useCallback(async () => {
+    const instances = [];
+    for (const k of Object.keys(expandedRec)) {
+      if (!expandedRec[k]) continue;
+      const i = k.indexOf(':');
+      if (i < 0) continue;
+      instances.push({ ws: wsId, space: k.slice(0, i), instance_id: k.slice(i + 1) });
+    }
+    if (activeDoc?.type && activeDoc.page?.id) instances.push({ ws: wsId, space: activeDoc.type, instance_id: activeDoc.page.id });
+    if (!instances.length) { setCommentsByKey({}); return; }
+    const res = await orgService.listCommentsBatch(orgId, instances);
+    const map = {};
+    for (const [key, val] of Object.entries(res)) map[key] = val.comments || [];
+    setCommentsByKey(map);
+  }, [orgId, wsId, expandedRec, activeDoc]);
+  useEffect(() => { reloadComments(); }, [reloadComments]);
+  const commentsLiveRef = useRef(reloadComments); commentsLiveRef.current = reloadComments;
+  useEffect(() => {
+    let timer = null;
+    const off = onLiveUpdate(['organisms'], () => { clearTimeout(timer); timer = setTimeout(() => commentsLiveRef.current(), 1500); });
+    return () => { clearTimeout(timer); off(); };
+  }, []);
 
   // Clicking a single space inside a stacked group view opens that group, then scrolls to (and
   // expands) the clicked space's section. The anchor wrapper is id="ws-sec-<name>"; a short timeout
@@ -336,12 +404,33 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
     const lang = getLocale();
     return (m[lang] && m[lang][key]) || (m.en && m.en[key]) || '';
   }, [ws]);
+  // Render ONE field value, type-aware + left-aligned + wrapping. Strings that look like markdown (or
+  // are multi-line) render through the safe Markdown component; plain strings wrap as text; arrays
+  // become a bullet list; objects pretty-print in a wrapped <pre>. (Was a right-aligned KeyValueRow
+  // with everything String()'d onto one line — unreadable for real record data.)
+  const looksMarkdown = (s) => /\n/.test(s) || /(^|\s)[-*]\s/.test(s) || /[#`>|]|\[[^\]]+\]\(|\*\*/.test(s);
+  const renderFieldVal = (v) => {
+    if (Array.isArray(v)) {
+      return html`<ul class="pj-rec-field-list">${v.map((it, i) => html`<li key=${i}>${
+        (it && typeof it === 'object') ? html`<pre class="pj-rec-json">${JSON.stringify(it, null, 2)}</pre>` : String(it)
+      }</li>`)}</ul>`;
+    }
+    if (v && typeof v === 'object') return html`<pre class="pj-rec-json">${JSON.stringify(v, null, 2)}</pre>`;
+    if (typeof v === 'string') {
+      return looksMarkdown(v)
+        ? html`<div class="pj-rec-md"><${Markdown} text=${v} /></div>`
+        : html`<span class="pj-rec-field-text">${v}</span>`;
+    }
+    return html`<span class="pj-rec-field-text">${String(v)}</span>`;
+  };
   const recordFields = (ot, rec) => {
     const rows = Object.entries(rec || {}).filter(([k, v]) =>
       !k.startsWith('_') && v !== undefined && v !== null && v !== '' && !(Array.isArray(v) && v.length === 0));
     if (!rows.length) return html`<div class="pj-muted pj-rec-empty">${t('organisms.noFields') || 'No fields'}</div>`;
-    return rows.map(([k, v]) => html`<${KeyValueRow} key=${k} label=${wsT(`${ot.namespace}.${k}`) || k}
-      value=${Array.isArray(v) ? v.join(', ') : (typeof v === 'object' ? JSON.stringify(v) : String(v))} />`);
+    return rows.map(([k, v]) => html`<div class="pj-rec-field" key=${k}>
+      <div class="pj-rec-field-label">${wsT(`${ot.namespace}.${k}`) || k}</div>
+      <div class="pj-rec-field-val">${renderFieldVal(v)}</div>
+    </div>`);
   };
 
   const saveDraft = useCallback(async (ot, value) => {
@@ -801,7 +890,8 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
                     if (target) { setActiveDoc({ type: ot.name, mode: 'view', page: target }); scrollToAnchor(); }
                     else showToast((t('organisms.docNotFound') || 'No document titled “{title}”').replace('{title}', title));
                   }} />
-                <${WorkspaceComments} orgId=${orgId} ws=${wsId} space=${ot.name} instanceId=${livePage.id} showToast=${showToast} />`;
+                <${WorkspaceComments} orgId=${orgId} ws=${wsId} space=${ot.name} instanceId=${livePage.id} showToast=${showToast}
+                  batched=${true} initialComments=${commentsByKey[cKey(wsId, ot.name, livePage.id)]} onReload=${reloadComments} />`;
             })()}
           </div>
         </div>
@@ -817,10 +907,10 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
       </div>
       ${spaceDesc(ot) ? html`<div class="section-desc">${spaceDesc(ot)}</div>` : null}
 
-      ${adding === ot.name && (addingSchema
-        ? html`<${SchemaForm} key=${'sf-' + (addingId || 'new')} schema=${addingSchema} busy=${busy} initial=${addingInitial}
+      ${adding === ot.name && !addingId && (addingSchema
+        ? html`<div class="pj-rec-edit pj-rec-edit-new">${html`<${SchemaForm} key=${'sf-new'} schema=${addingSchema} busy=${busy} initial=${addingInitial}
             idPrefix=${ot.name} namespace=${ot.namespace} wsT=${wsT}
-            onSave=${(v) => saveDraft(ot, addingId ? { ...v, id: addingId } : v)} onCancel=${cancelForm} />`
+            onSave=${(v) => saveDraft(ot, v)} onCancel=${cancelForm} />`}</div>`
         : html`<${Spinner} />`)}
 
       ${draftsFor(ot.name).map((d, i) => html`
@@ -832,7 +922,13 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
             <button class="btn-primary btn-sm" onClick=${() => publish(ot, d.id)} disabled=${busy}>${t('organisms.publish') || 'Publish'}</button>
             <button class="pj-icon-btn" title=${t('organisms.delete') || 'Delete'} disabled=${busy} onClick=${() => removeObject(ot.namespace, d.id, String(d[PRIMARY_FIELD[ot.name] || 'title'] || d.id))}>🗑</button>
           </div>
-          ${expandedRec[ot.name + ':' + d.id] ? html`<div class="pj-rec-fields">${recordFields(ot, d)}</div><${WorkspaceComments} orgId=${orgId} ws=${wsId} space=${ot.name} instanceId=${d.id} showToast=${showToast} />` : null}
+          ${adding === ot.name && addingId === d.id
+            ? html`<div class="pj-rec-edit">${addingSchema
+                ? html`<${SchemaForm} key=${'sf-' + d.id} schema=${addingSchema} busy=${busy} initial=${addingInitial}
+                    idPrefix=${ot.name} namespace=${ot.namespace} wsT=${wsT}
+                    onSave=${(v) => saveDraft(ot, { ...v, id: addingId })} onCancel=${cancelForm} />`
+                : html`<${Spinner} />`}</div>`
+            : (expandedRec[ot.name + ':' + d.id] ? html`<div class="pj-rec-fields">${recordFields(ot, d)}</div><${WorkspaceComments} orgId=${orgId} ws=${wsId} space=${ot.name} instanceId=${d.id} showToast=${showToast} batched=${true} initialComments=${commentsByKey[cKey(wsId, ot.name, d.id)]} onReload=${reloadComments} />` : null)}
         </div>
       `)}
 
@@ -847,7 +943,7 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
                 <button class="btn-ghost btn-sm" title=${t('organisms.reopenEditHint') || 'Reopen for editing — creates an editable draft from the published version'} disabled=${busy} onClick=${() => reopen(ot, o.id)}>${t('organisms.edit') || 'Edit'}</button>` : null}
               <button class="pj-icon-btn" title=${t('organisms.delete') || 'Delete'} disabled=${busy} onClick=${() => removeObject(ot.namespace, o.id, String(o[PRIMARY_FIELD[ot.name] || 'title'] || o.id))}>🗑</button>
             </div>
-            ${expandedRec[ot.name + ':' + o.id] ? html`<div class="pj-rec-fields">${recordFields(ot, o)}</div><${WorkspaceComments} orgId=${orgId} ws=${wsId} space=${ot.name} instanceId=${o.id} showToast=${showToast} />` : null}
+            ${expandedRec[ot.name + ':' + o.id] ? html`<div class="pj-rec-fields">${recordFields(ot, o)}</div><${WorkspaceComments} orgId=${orgId} ws=${wsId} space=${ot.name} instanceId=${o.id} showToast=${showToast} batched=${true} initialComments=${commentsByKey[cKey(wsId, ot.name, o.id)]} onReload=${reloadComments} />` : null}
           </div>
         `)
       }
@@ -958,6 +1054,32 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
     pickTab('space:' + target.name);
   };
   const openOvRec = (ot, r) => { setExpandedRec(s => ({ ...s, [ot.name + ':' + r.id]: true })); pickTab('space:' + ot.name); };
+  // Jump from a search hit to its record/document in the right space, then close the search.
+  const gotoHit = (hit) => {
+    const target = allTypes.find(o => o.name === hit.space || o.namespace === hit.namespace);
+    if (!target) return;
+    if (isDocSpace(target)) setActiveDoc({ type: target.name, mode: 'view', page: { id: hit.id } });
+    else setExpandedRec(s => ({ ...s, [target.name + ':' + hit.id]: true }));
+    pickTab('space:' + target.name);
+    setWsQuery(''); setWsHits(null);
+  };
+  const renderWsSearchResults = () => {
+    if (wsSearching && !wsHits) return html`<${Spinner} text=${t('organisms.loading') || 'Loading...'} />`;
+    if (!wsHits || !wsHits.length) return html`<${EmptyState} text=${t('search.noMatches') || 'No matches'} />`;
+    const bySpace = {};
+    for (const h of wsHits) (bySpace[h.space] = bySpace[h.space] || []).push(h);
+    return html`<div class="pj-search-results">
+      ${Object.entries(bySpace).map(([space, hits]) => html`
+        <div class="pj-search-group" key=${space}>
+          <div class="pj-search-group-head">${cap(wsT('type.' + space) || space)}<span class="pj-org-tab-count">${hits.length}</span></div>
+          ${hits.map(h => html`
+            <button class="pj-search-hit" key=${h.id} onClick=${() => gotoHit(h)}>
+              <span class="pj-search-hit-title">${h.title}</span>
+              <span class="pj-search-hit-snippet">${h.snippet}</span>
+            </button>`)}
+        </div>`)}
+    </div>`;
+  };
   // A document opens in its space tab on desktop; on mobile it expands INLINE right here —
   // view and edit both — so no window juggling is ever needed on a phone.
   const openOvDoc = (ot, d) => {
@@ -1075,7 +1197,7 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
       <${ReadmePanel} markdown=${ws.readme || ''} canEdit=${wsCanEdit} kind="workspace" name=${ws.manifest?.name || 'Workspace'}
         aiPromptSeed=${wsTocSeed} onSave=${saveWsReadme} />
 
-      <${StructureMindmap} scope="workspace" graph=${wsGraph} onNavigate=${onWsMapNav} />
+      <${StructureMindmap} scope="workspace" graph=${wsGraph} onNavigate=${onWsMapNav} storageKey=${'ws.' + orgId + '.' + wsId} />
 
       <${StructureOverview} label=${t('organisms.structureOverviewWs') || 'Workspace structure — table of contents'}
         load=${() => orgService.getWorkspaceOverview(orgId, wsId)} />
@@ -1089,10 +1211,19 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
           <button class="btn-outline btn-sm" onClick=${() => setTab('review')}>${t('organisms.reviewQueue') || 'Review queue'}</button>
         </div>` : null}
 
+      <div class="pj-ws-searchbar">
+        <${SearchBar} value=${wsQuery} onInput=${e => setWsQuery(e.target.value)}
+          placeholder=${t('search.wsPlaceholder') || 'Search this workspace…'} ariaLabel=${t('search.wsPlaceholder') || 'Search this workspace'} />
+        ${wsHits !== null ? html`<button class="btn-ghost btn-sm" onClick=${() => { setWsQuery(''); setWsHits(null); }}>${t('search.clear') || 'Clear'}</button>` : null}
+      </div>
+
       <div class="pj-org-groups" role="tablist">
         ${groups.map(g => {
           const stacked = g.kind === 'stacked';
           const groupActive = activeTab === g.id;
+          // While searching, a stacked (content) group shows only the spaces that have matches.
+          const members = (wsSearchCounts && stacked) ? g.members.filter(tb => wsSearchCounts[tb.ot.name]) : g.members;
+          if (wsSearchCounts && stacked && !members.length) return null;
           return html`
             <div class="pj-org-group ${groupActive ? 'active' : ''}" key=${g.id}>
               ${stacked
@@ -1101,14 +1232,16 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
                   </button>`
                 : html`<span class="pj-org-group-cap pj-org-group-cap-static">${g.label}</span>`}
               <div class="pj-org-group-tabs">
-                ${g.members.map(tb => {
+                ${members.map(tb => {
                   // Related members are independent panels; a stacked member scrolls within its group.
                   const isActive = activeTab === tb.id;
                   const u = isActive ? 0 : unseenOf(tb.id);
+                  const matchCount = (wsSearchCounts && stacked) ? wsSearchCounts[tb.ot.name] : null;
                   const onClick = stacked ? () => scrollToSpace(g.id, tb.ot.name) : () => pickTab(tb.id);
                   return html`
                     <button class="pj-org-tab ${isActive ? 'active' : ''}" role="tab" aria-selected=${isActive} key=${tb.id} onClick=${onClick}>
-                      ${(tb.label)}${tb.count !== null && tb.count !== undefined ? html`<span class="pj-org-tab-count">${tb.count}</span>` : null}
+                      ${(tb.label)}${matchCount != null ? html`<span class="pj-org-tab-count pj-org-tab-match">${matchCount}</span>`
+                        : (tb.count !== null && tb.count !== undefined ? html`<span class="pj-org-tab-count">${tb.count}</span>` : null)}
                       ${u > 0 ? html`<span class="pj-org-tab-unseen" title=${t('organisms.unseenHint') || 'Changed since your last visit'}>${u}</span>` : null}
                     </button>`;
                 })}
@@ -1197,26 +1330,28 @@ export function Workspace({ org, wsId, showToast, onBack, onBackToList }) {
         </div>
       `}
 
-      ${REL_DESC[activeTab] ? html`<div class="section-desc pj-tab-desc">${REL_DESC[activeTab]}</div>` : null}
+      ${wsHits !== null ? renderWsSearchResults() : html`
+        ${REL_DESC[activeTab] ? html`<div class="section-desc pj-tab-desc">${REL_DESC[activeTab]}</div>` : null}
 
-      ${activeTab === 'overview' ? renderOverview() : null}
+        ${activeTab === 'overview' ? renderOverview() : null}
 
-      ${activeGroup ? html`
-        <div class="pj-ov pj-group-view">
-          <div class="pj-group-head">
-            <div class="section-title">${activeGroup.label}</div>
-            ${activeGroup.desc ? html`<div class="section-desc">${activeGroup.desc}</div>` : null}
-          </div>
-          ${activeGroup.spaces.map(ot => html`
-            <div class="pj-group-sec" id=${'ws-sec-' + ot.name} key=${'gs-' + ot.name}>${renderOvSection(ot)}</div>`)}
-          ${activeGroup.spaces.length === 0 ? html`<${EmptyState} text=${t('organisms.noneYet') || 'none yet'} />` : null}
-        </div>` : null}
+        ${activeGroup ? html`
+          <div class="pj-ov pj-group-view">
+            <div class="pj-group-head">
+              <div class="section-title">${activeGroup.label}</div>
+              ${activeGroup.desc ? html`<div class="section-desc">${activeGroup.desc}</div>` : null}
+            </div>
+            ${activeGroup.spaces.map(ot => html`
+              <div class="pj-group-sec" id=${'ws-sec-' + ot.name} key=${'gs-' + ot.name}>${renderOvSection(ot)}</div>`)}
+            ${activeGroup.spaces.length === 0 ? html`<${EmptyState} text=${t('organisms.noneYet') || 'none yet'} />` : null}
+          </div>` : null}
 
-      ${activeSpace
-        ? (!orgService.isMemorySpace(activeSpace)
-          ? renderSpaceNotice(activeSpace)
-          : (isDocSpace(activeSpace) ? renderDocSpace(activeSpace) : renderRecordSpace(activeSpace)))
-        : null}
+        ${activeSpace
+          ? (!orgService.isMemorySpace(activeSpace)
+            ? renderSpaceNotice(activeSpace)
+            : (isDocSpace(activeSpace) ? renderDocSpace(activeSpace) : renderRecordSpace(activeSpace)))
+          : null}
+      `}
 
       ${activeTab === 'sources' ? html`<${SourcesPanel} orgId=${orgId} wsId=${wsId} showToast=${showToast} />` : null}
 

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

@@ -17,6 +17,11 @@
  *   import OrganismsTab from '/views/profile/organisms-tab.js';
  *   <OrganismsTab session={session} showToast={showToast} onStats={onStats} />
  * @version-history
+ *   v2.2.0 — 2026-06-22 — Cross-organism content search on the list view: one box searches ALL my
+ *     organisms (indexed librarian FTS), results grouped per organism; a hit opens that organism +
+ *     workspace with the in-workspace search pre-filled. Also listens for the Cmd-K aimeat-open-organism.
+ *   v2.1.0 — 2026-06-22 — Workspace counts come inline via listOrganisms({include:'counts'}) instead
+ *     of a per-organism discoverWorkspaces fan-out.
  *   v1.31.1 — 2026-06-19 — JSDoc type annotations for frontend type-checking.
  *   v2.0.0 — 2026-06-19 — Split the ~3825-line module into cohesive sub-modules under ./organisms/*
  *     (no behaviour/visual change). This file keeps only OrganismsTab + the list-row renderers.
@@ -32,6 +37,8 @@ import { onLiveUpdate } from '/lib/live-updates.js';
 const html = htm.bind(h);
 import { t } from '/js/i18n.js';
 import { Spinner, KebabMenu } from './shared.js';
+import { SearchBar } from '/components/SearchBar.js';
+import { EmptyState } from '/components/EmptyState.js';
 import { useConfirm } from '/components/Modal.js';
 import * as orgService from '/js/services/organisms.js';
 import * as memoryService from '/js/services/memory.js';
@@ -56,6 +63,12 @@ export default function OrganismsTab({ session, showToast, onStats }) {
   const [sortMode, setSortMode] = useState('custom');
   const [customOrder, setCustomOrder] = useState([]);
   const [openSettings, setOpenSettings] = useState(false); // open OrganismHome with the Settings panel showing
+  // Cross-organism content search (all my organisms at once) — indexed librarian FTS, grouped per
+  // organism. Replaces the org lists while a query is active; a hit opens that organism + workspace
+  // with the in-workspace search pre-filled to the same query.
+  const [gQuery, setGQuery] = useState('');
+  const [gHits, setGHits] = useState(null);   // null = not searching
+  const [gBusy, setGBusy] = useState(false);
   const dragIdRef = useRef(null);
   const [dragOverId, setDragOverId] = useState(null);
 
@@ -73,7 +86,7 @@ export default function OrganismsTab({ session, showToast, onStats }) {
   const loadData = useCallback(async () => {
     try {
       const [myResp, pubResp] = await Promise.all([
-        ghii ? orgService.listOrganisms({ member: ghii }) : Promise.resolve({ data: { organisms: [] } }),
+        ghii ? orgService.listOrganisms({ member: ghii, include: 'counts' }) : Promise.resolve({ data: { organisms: [] } }),
         orgService.listOrganisms({ visibility: 'public' }),
       ]);
       const mine = myResp?.data?.organisms || [];
@@ -82,10 +95,8 @@ export default function OrganismsTab({ session, showToast, onStats }) {
       setMyOrganisms(mine);
       setPublicOrganisms(discover);
       onStats?.({ organisms: mine.length });
-      // Workspace counts for the 📁 row stat (member-gated endpoint, so own orgs only).
-      Promise.all(mine.map(async (o) => [o.id, (await orgService.discoverWorkspaces(o.id)).length]))
-        .then(entries => setWsCounts(Object.fromEntries(entries)))
-        .catch(() => {});
+      // Workspace counts for the 📁 row stat come inline via ?include=counts (no per-org fan-out).
+      setWsCounts(Object.fromEntries(mine.map(o => [o.id, o.workspace_count ?? 0])));
     } catch {
       setMyOrganisms([]);
       setPublicOrganisms([]);
@@ -172,6 +183,31 @@ export default function OrganismsTab({ session, showToast, onStats }) {
     if (openId && myOrganisms && !myOrganisms.some(o => o.id === openId)) { setOpenId(null); setOpenWs(null); }
   }, [openId, myOrganisms]);
 
+  // Jump from the global command palette (Cmd-K) when this tab is already mounted — open the chosen
+  // organism (+ workspace). A cold navigation instead reads sessionStorage on mount (above).
+  useEffect(() => {
+    const onOpen = (e) => {
+      const d = e.detail || {};
+      if (!d.orgId) return;
+      setOpenId(d.orgId); setOpenWs(d.wsId || null); setOpenSettings(false);
+    };
+    window.addEventListener('aimeat-open-organism', onOpen);
+    return () => window.removeEventListener('aimeat-open-organism', onOpen);
+  }, []);
+
+  // Cross-organism content search (debounced) — librarian FTS across all my own content.
+  useEffect(() => {
+    const query = gQuery.trim();
+    if (query.length < 2) { setGHits(null); setGBusy(false); return undefined; }
+    let cancelled = false;
+    setGBusy(true);
+    const tid = setTimeout(async () => {
+      const hits = await memoryService.librarianSearch(query, 60, 'own').catch(() => []);
+      if (!cancelled) { setGHits(hits || []); setGBusy(false); }
+    }, 220);
+    return () => { cancelled = true; clearTimeout(tid); };
+  }, [gQuery]);
+
   // Live update listener
   const liveRef = useRef(loadData);
   liveRef.current = loadData;
@@ -364,6 +400,20 @@ export default function OrganismsTab({ session, showToast, onStats }) {
 
   if (!myOrganisms) return html`<${Spinner} text=${t('organisms.loading') || 'Loading organisms...'} />`;
 
+  // Open a cross-organism search hit: jump to its organism + workspace, pre-filling the in-workspace
+  // search with the query so you land on the filtered result list (reuses Kerros 1).
+  const openGHit = (hit) => {
+    try { if (hit.workspaceId) sessionStorage.setItem(`aimeat.ws.${hit.organismId}.${hit.workspaceId}.search`, gQuery.trim()); } catch { /* noop */ }
+    setOpenId(hit.organismId);
+    setOpenWs(hit.workspaceId || null);
+    setOpenSettings(false);
+  };
+  // Group the librarian hits under each organism (name from my list / discover), for the results view.
+  const orgNameOf = (id) => (myOrganisms || []).find(o => o.id === id)?.name
+    || publicOrganisms.find(o => o.id === id)?.name || id;
+  const gGroups = {};
+  for (const hh of (gHits || [])) { if (!hh.organismId) continue; (gGroups[hh.organismId] = gGroups[hh.organismId] || []).push(hh); }
+
   return html`
     <div class="section-title">${t('organisms.title') || 'Organisms'}</div>
     <div class="section-desc">${t('organisms.desc') || 'Organisms are groups — communities, teams, clubs, or projects. Create one or join existing ones to share knowledge, coordinate work, and build together.'}</div>
@@ -415,6 +465,28 @@ export default function OrganismsTab({ session, showToast, onStats }) {
       `}
     </div>
 
+    <!-- Cross-organism content search: one box over ALL my organisms, results grouped per organism -->
+    <div class="pj-org-globalsearch">
+      <${SearchBar} value=${gQuery} onInput=${e => setGQuery(e.target.value)}
+        placeholder=${t('search.allOrgsPlaceholder') || 'Search across all organisms…'} ariaLabel=${t('search.allOrgsPlaceholder') || 'Search across all organisms'} />
+      ${gHits !== null ? html`<button class="btn-ghost btn-sm" onClick=${() => setGQuery('')}>${t('search.clear') || 'Clear'}</button>` : null}
+    </div>
+
+    ${gHits !== null ? html`
+      <div class="pj-search-results">
+        ${gBusy && !gHits.length ? html`<${Spinner} text=${t('search.searching') || 'Searching…'} />` : null}
+        ${!gHits.length && !gBusy ? html`<${EmptyState} text=${t('search.noMatches') || 'No matches'} />` : null}
+        ${Object.entries(gGroups).map(([orgId, hits]) => html`
+          <div class="pj-search-group" key=${orgId}>
+            <div class="pj-search-group-head">${orgNameOf(orgId)}<span class="pj-org-tab-count">${hits.length}</span></div>
+            ${hits.map(hh => html`
+              <button class="pj-search-hit" key=${hh.key} onClick=${() => openGHit(hh)}>
+                <span class="pj-search-hit-title">${hh.title || hh.key}${hh.workspaceId ? html` <span class="pj-mini">· ${hh.workspaceId}</span>` : null}</span>
+                <span class="pj-search-hit-snippet">${hh.snippet || ''}</span>
+              </button>`)}
+          </div>`)}
+      </div>
+    ` : html`
     <!-- Incoming invitations -->
     <${IncomingInvitations} showToast=${showToast} onChanged=${loadData} />
 
@@ -448,6 +520,7 @@ export default function OrganismsTab({ session, showToast, onStats }) {
       <div class="section-title section-title-spaced">${t('organisms.discover') || 'Discover'}</div>
       <div class="pj-org-list">${publicOrganisms.map(org => renderOrgRow(org, false))}</div>
     `}
+    `}
     <${ConfirmUI} />
   `;
 }

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

@@ -9,6 +9,8 @@
  * @structure WorkflowsTab (default) — view state machine (list | detail | run)
  * @usage Registered in profile.js TABS as { id:'workflows', component: WorkflowsTab }.
  * @version-history
+ *   v1.2.0 -- 2026-06-22 -- List uses listWorkflows({include:'health'}) so health arrives inline in
+ *     one request instead of a per-workflow getHealth fan-out.
  *   v1.0.0 -- 2026-06-13 -- Phase 9: list + blueprint + runs + run-now + health.
  *   v1.1.0 -- 2026-06-13 -- Run view renders image deliverables: a step whose observed output / writes
  *     hold an image (a /v1/pub URL or { url, mime } value) shows inline thumbnails via the shared
@@ -20,7 +22,7 @@ import htm from 'htm';
 import { onLiveUpdate } from '/lib/live-updates.js';
 import { t } from '/js/i18n.js';
 import { timeAgo } from '/js/utils.js';
-import { listWorkflows, getWorkflow, getBlueprint, getHealth, listRuns, getRun, runWorkflow, cancelRun } from '/js/services/workflows.js';
+import { listWorkflows, getWorkflow, getBlueprint, listRuns, getRun, runWorkflow, cancelRun } from '/js/services/workflows.js';
 import { collectImages, ImageStrip } from '/components/ImageDeliverable.js';
 import WorkflowForm from './workflows-form.js';
 
@@ -74,12 +76,10 @@ export default function WorkflowsTab({ showToast }) {
 
   const loadList = useCallback(async () => {
     try {
-      const res = await listWorkflows();
+      const res = await listWorkflows({ include: 'health' });
       const defs = res?.data?.workflows || [];
-      const withHealth = await Promise.all(defs.map(async (def) => {
-        const hr = await getHealth(def.id).catch(() => null);
-        return { def, health: hr?.data || null };
-      }));
+      // Health arrives inline now (one request) — split it back out of each def.
+      const withHealth = defs.map((w) => { const { health = null, ...def } = w; return { def, health }; });
       setItems(withHealth);
       setError(null);
     } catch (e) {

package/dist/src/cli/connect/mcp/local-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-server.d.ts","sourceRoot":"","sources":["../../../../../src/cli/connect/mcp/local-server.ts"],"names":[],"mappings":"AAqDA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAmB,MAAM,sBAAsB,CAAC;AAM3E,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAEhD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,2DAA2D;IAC3D,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,OAAO,GAAG,WAAW,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;CAChD;AAED,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,mFAAmF;IACnF,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,iGAAiG;IACjG,MAAM,EAAE,mBAAmB,EAAE,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAkID,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,iFAAiF;IACjF,QAAQ,EAAE,MAAM,SAAS,CAAC;CAC3B;AAQD,wBAAsB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoY5E"}
+{"version":3,"file":"local-server.d.ts","sourceRoot":"","sources":["../../../../../src/cli/connect/mcp/local-server.ts"],"names":[],"mappings":"AAwDA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAmB,MAAM,sBAAsB,CAAC;AAM3E,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAEhD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,2DAA2D;IAC3D,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,OAAO,GAAG,WAAW,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;CAChD;AAED,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,mFAAmF;IACnF,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,iGAAiG;IACjG,MAAM,EAAE,mBAAmB,EAAE,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AA4ID,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,iFAAiF;IACjF,QAAQ,EAAE,MAAM,SAAS,CAAC;CAC3B;AAQD,wBAAsB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiZ5E"}

package/dist/src/cli/connect/mcp/local-server.js

@@ -44,6 +44,9 @@
  *     SEPARATE from tasks, so record wakes never intermix with real tasks). `workspace.record` delivers
  *     route to the new queue; `/local/status` exposes per-agent subscriptions + reconnect count (the
  *     consumer's catch-up signal).
+ *   v1.3.0 — 2026-06-22 — P3 cancellation push: `task.cancelled` delivers populate a per-agent
+ *     cancelled-set, exposed at `GET /local/cancelled` so the daemon checks a loopback set instead of
+ *     scanning owner-scoped `agents.cancel.*` memory before every dispatch.
  */
 import express from 'express';
 import { randomBytes } from 'node:crypto';
@@ -82,6 +85,9 @@ class AgentChannel {
     waiters = [];
     recordQueue = [];
     recordWaiters = [];
+    /** Task ids the node pushed as cancelled (P3) — checked by the daemon instead of polling the
+     *  owner-scoped `agents.cancel.*` memory before every dispatch. Bounded by a daemon's task volume. */
+    cancelledIds = new Set();
     /** Spaces the agent asked to subscribe to — held so the daemon re-sends them on each reconnect. */
     subscriptions = [];
     constructor(entry) {
@@ -89,6 +95,13 @@ class AgentChannel {
     }
     setSubscriptions(spaces) { this.subscriptions = spaces; }
     getSubscriptions() { return this.subscriptions; }
+    /** Record a pushed task cancellation (P3 `task.cancelled` deliver). */
+    handleCancelled(payload) {
+        const id = payload?.id;
+        if (typeof id === 'string' && id)
+            this.cancelledIds.add(id);
+    }
+    getCancelledIds() { return [...this.cancelledIds]; }
     /** A `workspace.record` event arrived — surface it on the record long-poll (no dedup: each write
      *  is a distinct wake; storage stays the source of truth for content via an authorized read). */
     handleRecord(payload) {
@@ -221,6 +234,8 @@ export async function runServeDaemon(opts) {
                     ch.handleTask(payload, 'deliver');
                 else if (kind === 'workspace.record')
                     ch.handleRecord(payload);
+                else if (kind === 'task.cancelled')
+                    ch.handleCancelled(payload);
             },
             onBacklog: ({ tasks, messages }) => {
                 for (const t of tasks)
@@ -418,6 +433,19 @@ export async function runServeDaemon(opts) {
             data: { agent: entry.agent, owner: entry.owner, received_at: item.receivedAt, reconnects: channels.get(entry.agent).reconnects, event: item.event },
         });
     });
+    // GET /local/cancelled?agent= — task ids the node has pushed as cancelled (P3). The daemon checks
+    // this loopback set before a dispatch instead of scanning the owner-scoped `agents.cancel.*` memory.
+    app.get('/local/cancelled', (req, res) => {
+        let entry;
+        try {
+            entry = resolveAgent(req);
+        }
+        catch (err) {
+            res.status(400).json({ ok: false, error: { code: 'UNKNOWN_AGENT', message: err.message } });
+            return;
+        }
+        res.json({ ok: true, data: { agent: entry.agent, cancelled: channels.get(entry.agent).getCancelledIds() } });
+    });
     // ── Tool-call surface: deterministic shell-callable tool dispatch over the
     // tunnel. Same handler registry as `aimeat connect call`, but routed through
     // the agent's tunnel-backed client — one loopback POST, no per-call subprocess