@1agh/maude 0.55.0 → 0.57.0

package/apps/studio/client/app.jsx

@@ -21,6 +21,11 @@ import { GRID_KEYWORD_UNITS, parseTrackList, serializeTrackList } from '../grid-
 // canvas-cursors.ts above.
 import { PAPER_PRESETS, resolvePrintArtboard } from '../print/units.ts';
 import { sizingModeOf, sizingModePatch } from '../sizing-mode.ts';
+// The single "what is the hub link doing" rule, shared with the cloud rail's
+// connect note so the two surfaces can never disagree. Pure data + strings —
+// same "pull only pure logic into the client bundle" shape as the imports
+// above (a type-only SyncStatusSnapshot import that Bun erases).
+import { syncPresentation } from '../sync/presentation.ts';
 import { canvasUrl } from './canvas-url.js';
 import { TreeRowMenu, useRowMenu } from './tree-row-menu.jsx';
 import { useTreeDrag } from './use-tree-drag.js';
@@ -77,6 +82,7 @@ const Lu = ({ as: C, size = 14 }) => <C size={size} strokeWidth={1.75} style={{
 import { PhotoKnobs } from './photo-knobs.jsx';
 import {
   appIsFirstRun,
+  invoke,
   isNativeApp,
   onMenuReportBug,
   onUpdateReady,
@@ -156,7 +162,7 @@ const LAYERS_MODE_STORE = 'mdcc-layers-mode';
 // resizable width + a tab strip over the panels assigned to the slot; renders
 // the active panel (passed as children). Collapses to 0 width when nothing is
 // visibly open (it may still host an always-mounted hidden ChatPanel).
-function DockSlot({ side, width, open, ids, activeId, onPick, children }) {
+function DockSlot({ side, width, open, ids, activeId, onPick, children, labels = null }) {
   return (
     <div
       className={'st-dockslot st-dockslot--' + side + (open ? '' : ' is-collapsed')}
@@ -173,7 +179,7 @@ function DockSlot({ side, width, open, ids, activeId, onPick, children }) {
               className={'st-docktab' + (activeId === id ? ' is-active' : '')}
               onClick={() => onPick(id)}
             >
-              {(DOCK_PANELS.find((p) => p.id === id) || {}).label || id}
+              {labels?.[id] || (DOCK_PANELS.find((p) => p.id === id) || {}).label || id}
             </button>
           ))}
         </div>
@@ -203,14 +209,30 @@ const MDCC_VERSION = typeof __MDCC_VERSION__ !== 'undefined' ? __MDCC_VERSION__
 // handleAssistantAttention below (identical support/permission check +
 // try/catch, only the title/body differ). The in-app badge stays the
 // reliable signal if this silently fails for any reason.
+//
+// feature-acp-turn-notifications Task 6 — under Tauri, route through the
+// native `send_notification` command (notify.rs) instead of the Web `Notification` API.
+// This is the SAME native notifier the shell's cross-project poller uses for
+// every OTHER project, so the visible project now goes through the identical
+// OS-level path rather than a webview API whose behavior inside WKWebView was
+// never empirically confirmed (see Task 1's finding in the plan). Falls back
+// to the Web API on any failure — an older desktop build without the command,
+// or a plain browser tab — so the signal degrades rather than disappearing.
 function notifyDesktop(title, body) {
-  try {
-    if (typeof Notification !== 'undefined' && Notification.permission === 'granted') {
-      new Notification(title, { body });
+  const webFallback = () => {
+    try {
+      if (typeof Notification !== 'undefined' && Notification.permission === 'granted') {
+        new Notification(title, { body });
+      }
+    } catch {
+      /* best-effort — the in-app badge is the reliable signal */
     }
-  } catch {
-    /* best-effort — the in-app badge is the reliable signal */
+  };
+  if (isNativeApp()) {
+    invoke('send_notification', { title, body }).catch(webFallback);
+    return;
   }
+  webFallback();
 }
 
 function readInitialTheme() {
@@ -2473,6 +2495,9 @@ function Sidebar({
   onMoveCanvas,
   onNewFolder,
   onDeleteFolder,
+  // Passed through to CloudBar only — the live `sync:status` payload that makes
+  // the connect note follow the link instead of freezing at attach time.
+  syncStatus,
 }) {
   const filteredGroups = useMemo(() => {
     if (!search) return groups;
@@ -2846,7 +2871,7 @@ function Sidebar({
           Absent rather than disabled, because unlike the agent chat there is
           nothing here to explain — the capability is not missing, it is
           already satisfied. */}
-      {cloud === null ? <CloudBar /> : null}
+      {cloud === null ? <CloudBar syncStatus={syncStatus} /> : null}
       {/* Phase 28 (E3) — GitHub identity as a compact avatar docked at the BOTTOM:
           sign in, connected account + New/Pull/Share, sign out. Self-contained
           (owns its device-code + CreateProject dialogs). Renders nothing in browser. */}
@@ -3733,7 +3758,14 @@ function Menubar({
     { id: 'tree', label: 'Project Tree', shortcut: 'T', checked: sidebarOpen, disabled: false },
     {
       id: 'changes',
-      label: changesCount > 0 ? `Changes · ${changesCount} unsaved` : 'Changes',
+      // In a cell this panel is History (the hub already committed the work),
+      // so the menu names what it opens rather than an unsaved count there is
+      // no way — and no reason — to act on.
+      label: cloud
+        ? 'History'
+        : changesCount > 0
+          ? `Changes · ${changesCount} unsaved`
+          : 'Changes',
       shortcut: '⌘ ⇧ G',
       checked: changesOpen,
       disabled: false,
@@ -4530,6 +4562,7 @@ function StatusBar({
   onToggleTheme,
   onClearSelected,
   syncStatus,
+  syncProject,
   changesCount = 0,
   unpushed = 0,
   changesOpen = false,
@@ -4552,32 +4585,21 @@ function StatusBar({
   // shapes: solo `{linked:false}` (hide), DDR-060 `{notSyncable,tsxCount,reason}`
   // (linked but 0 syncable), or the connection-state machine `{state,queuedOps,
   // flash,…}` (the common linked case the old notSyncable-only guard never
-  // showed — the "hub sync se neukazuje" bug). Map each to a label + dot tone.
+  // showed — the "hub sync se neukazuje" bug).
+  //
+  // The mapping used to live here, and it referenced `docs` ZERO times: it read
+  // `state` alone, so a link whose every document the hub had refused still
+  // showed a green dot and the word "synced". `syncPresentation` is now the one
+  // rule, shared with the cloud rail's connect note, so the two surfaces cannot
+  // give a person different answers about the same payload.
   const syncSlot = (() => {
-    if (!syncStatus || syncStatus.linked === false) return null;
-    if (syncStatus.notSyncable) {
-      return {
-        online: false,
-        label: `0 syncable${syncStatus.tsxCount > 0 ? ` · ${syncStatus.tsxCount} tsx` : ''}`,
-        title: syncStatus.reason || 'Linked to a hub, but no canvases are syncable.',
-      };
-    }
-    const q = syncStatus.queuedOps ?? 0;
-    const synced = syncStatus.state === 'online' || syncStatus.flash === 'synced';
-    if (synced) {
-      return {
-        online: true,
-        label: q > 0 ? `${q} ↑` : 'synced',
-        title: q > 0 ? `${q} edit(s) queued to push` : 'All changes synced to the hub',
-      };
-    }
+    const p = syncPresentation(syncStatus, { project: syncProject });
+    if (!p) return null;
+    const detail = p.names.length ? ` (${p.names.join(', ')})` : '';
     return {
-      online: false,
-      label: `${q} ↑`,
-      title:
-        syncStatus.state === 'connecting'
-          ? 'Connecting to the hub…'
-          : 'Offline — edits queued, will sync when the hub reconnects',
+      online: p.online,
+      label: p.label,
+      title: `${p.title}${detail}${p.next ? ` — ${p.next}` : ''}`,
     };
   })();
 
@@ -14019,6 +14041,11 @@ function App() {
     changes: changesOpen,
     assistant: assistantOpen,
   };
+  // Per-shell overrides for the dock tab strip. In a cell the `changes` panel
+  // IS the history (the hub commits server-side), so its tab must say so —
+  // otherwise the one visible word still promises a working-tree surface that
+  // panel no longer has.
+  const dockLabels = cfg.cloud ? { changes: 'History' } : null;
   const leftIds = idsForSide('left');
   const rightIds = idsForSide('right');
   const leftActive = leftIds.find((id) => panelIsOpen[id]) || null;
@@ -14075,6 +14102,7 @@ function App() {
           remoteSync={remoteSync}
           onGetLatest={gitGetLatest}
           canvasKinds={cfg?.canvasKinds}
+          syncStatus={syncStatus}
         />
       );
     if (id === 'changes')
@@ -14083,6 +14111,20 @@ function App() {
           status={gitStatus && remoteSync ? { ...gitStatus, ...remoteSync } : gitStatus}
           project={project}
           readOnly={!isNativeApp() || viewerMode}
+          // A cloud cell commits every edit server-side as it lands, so the
+          // working-tree half of this panel describes work that is already
+          // saved. `cfg.cloud` is present exactly when the hub runs the
+          // workspace agent that owns this project's history, which is the
+          // same condition.
+          //
+          // PRESENTATION, NOT A CONTROL — nothing may come to depend on this.
+          // `/_api/git/commit` and `/_api/git/discard` are classified `edit` in
+          // the cell's route manifest and stay reachable by any member with a
+          // session; withdrawing the buttons removes an offer that would
+          // mislead, it does not remove a capability. The real gates are
+          // server-side (`projectReadOnly`, the manifest's role matrix), and
+          // they are unchanged by this flag.
+          historyOnly={!!cfg.cloud}
           resizing={resizingFor('changes')}
           onClose={() => setChangesOpen(false)}
           onCommit={gitCommit}
@@ -14330,6 +14372,7 @@ function App() {
               ids={leftIds}
               activeId={leftActive}
               onPick={togglePanel}
+              labels={dockLabels}
             >
               {leftHostsAssistant && (
                 <ChatPanel
@@ -14402,6 +14445,7 @@ function App() {
               ids={rightIds}
               activeId={rightActive}
               onPick={togglePanel}
+              labels={dockLabels}
             >
               {rightHostsAssistant && (
                 <ChatPanel
@@ -15119,6 +15163,7 @@ function App() {
           onToggleTheme={toggleTheme}
           onClearSelected={clearSelected}
           syncStatus={syncStatus}
+          syncProject={cfg?.cloud?.projectName || project}
           changesCount={unsavedCount}
           unpushed={gitStatus?.unpushed || 0}
           changesOpen={changesOpen}

package/apps/studio/client/panels/ChatPanel.jsx

@@ -1855,6 +1855,11 @@ export default function ChatPanel({
   const connsRef = useRef(new Map()); // chatId → connection
   const busyRef = useRef(new Map()); // chatId → busy (aggregated for the menubar)
   const hydratedRef = useRef(new Map()); // chatId → initial messages
+  // chatId → the transcript LINE the hydration above covered (the
+  // `X-Maude-Chat-Seq` response header). Handed to the connection's `attach`
+  // so the server replays only what the client missed — Addendum Task 8's
+  // re-attach seam. Absent/0 for a chat that was never hydrated (a new chat).
+  const hydratedSeqRef = useRef(new Map());
   const [openChatIds, setOpenChatIds] = useState([]);
   const [activeChatId, setActiveChatId] = useState(null);
   const [busyChats, setBusyChats] = useState({}); // reactive: chatId → busy (for the dot)
@@ -1872,6 +1877,13 @@ export default function ChatPanel({
       const existing = connsRef.current.get(chatId);
       if (existing) return existing;
       const conn = createAcpConnection();
+      // Addendum Task 8 — bind BEFORE anything can open the socket. The `attach`
+      // frame goes out from `onopen` and is what subscribes this socket to the
+      // chat's server-side bridge (which now outlives its socket, so it may
+      // already be mid-turn from before a reload). `hydratedSeqRef` holds the
+      // transcript line the history fetch covered, so the server replays exactly
+      // the gap — no duplicated tail, no hole.
+      conn.bindChat(chatId, hydratedSeqRef.current.get(chatId) || 0);
       connsRef.current.set(chatId, conn);
       // Agent-generated title (session_info_update — fires at turn-end, so a
       // fresh chat shows the client's "New chat" heuristic until the first
@@ -1949,7 +1961,12 @@ export default function ChatPanel({
         return;
       }
       fetch(`/_api/acp/chat?id=${encodeURIComponent(id)}`)
-        .then((r) => r.json())
+        .then(async (r) => {
+          // Capture the seam marker alongside the body — see hydratedSeqRef.
+          const seq = Number(r.headers.get('X-Maude-Chat-Seq') || 0);
+          hydratedSeqRef.current.set(id, Number.isFinite(seq) ? seq : 0);
+          return r.json();
+        })
         .then((msgs) => openChat(id, toThreadMessages(msgs)))
         .catch(() => {});
     },
@@ -1965,6 +1982,7 @@ export default function ChatPanel({
       connsRef.current.delete(id);
       busyRef.current.delete(id);
       hydratedRef.current.delete(id);
+      hydratedSeqRef.current.delete(id);
       setBusyChats((prev) => {
         const next = { ...prev };
         delete next[id];

package/apps/studio/client/panels/CloudBar.jsx

@@ -14,6 +14,7 @@
 
 import { useEffect, useRef, useState } from 'react';
 
+import { safeName, syncPresentation } from '../../sync/presentation.ts';
 import { invoke, isNativeApp, listen, openCloudUrl } from '../github.js';
 
 const api = async (path, init) => {
@@ -247,6 +248,73 @@ export function localIdentityHint({
   return related ? 'similar' : 'mismatch';
 }
 
+/**
+ * What to say after a successful Connect.
+ *
+ * The old copy said "Linked to <X> — restart the studio server to start
+ * syncing", which was three problems in one line: it named a thing the person
+ * cannot see (there is no visible server in the desktop app), gave them a task
+ * instead of a result, and never explained what connecting had achieved. The
+ * server now cycles the sync runtime itself, so this reports an OUTCOME —
+ * and on the paths where syncing genuinely didn't start, it says which one and
+ * what to do, rather than prescribing a restart for every cause.
+ *
+ * Returns `{ text, title }` — `text` is the rail's one line, `title` the full
+ * sentence on hover (the rail truncates).
+ */
+export function connectOutcomeNote(project, sync, live) {
+  // The project name and `sync.detail` both originate at the hub, and the
+  // fallback path below puts them in trusted app chrome uncapped — including a
+  // `title=` tooltip, where a newline renders. `safeName` strips control and
+  // bidi-override characters, collapses whitespace and bounds the length; the
+  // live path already went through it inside `syncPresentation`.
+  const name = safeName(project, 'the workspace');
+
+  // The LIVE payload wins whenever there is one.
+  //
+  // `sync` is the attach response, and it reports an intention: the supervisor
+  // answers `{ syncing: true }` as soon as `runtime.start()` did not throw and
+  // one local canvas qualified — before a socket, before a token was accepted,
+  // before a byte moved. Rendered once and never updated, it was the whole of
+  // the reported complaint ("vyskočí modal, pak vidím jen syncing canvases, ale
+  // reálně se nic nestane"). `live` comes off the `sync:status` bus that is
+  // already wired to this app, so the same sentence now MOVES: connecting →
+  // syncing 40/75 → synced. That motion is the feedback that was missing.
+  //
+  // Same rule as the status bar (`syncPresentation`), deliberately — the old
+  // hover text told the person to go look at that slot for the real answer,
+  // which only worked as long as the two agreed, and they did not.
+  if (live) {
+    const p = syncPresentation(live, { project: name });
+    if (p) {
+      const detail = p.names.length ? ` (${p.names.join(', ')})` : '';
+      return {
+        text: p.title,
+        title: `${p.title}${detail}${p.next ? ` — ${p.next}` : ''}`,
+      };
+    }
+  }
+
+  if (sync?.syncing) {
+    const n = sync.canvases ?? 0;
+    return {
+      text: `Connecting to ${name} — ${n} canvas${n === 1 ? '' : 'es'}…`,
+      title: `Opening ${n} canvas${n === 1 ? '' : 'es'} against the ${name} workspace. This line updates as they settle.`,
+    };
+  }
+  if (sync?.reason === 'nothing-syncable') {
+    return {
+      text: `Connected to ${name} — nothing to sync yet.`,
+      title: safeName(sync.detail, 'No canvases in this project are syncable yet.'),
+    };
+  }
+  const detail = safeName(sync?.detail, 'restart Maude to start syncing.');
+  return {
+    text: `Connected to ${name} — ${detail}`,
+    title: detail,
+  };
+}
+
 function Spark({ size = 15 }) {
   return (
     <svg width={size} height={size} viewBox="0 0 32 32" fill="currentColor" aria-hidden="true">
@@ -301,14 +369,21 @@ function Icon({ name, size = 15 }) {
   );
 }
 
-export default function CloudBar() {
+export default function CloudBar({ syncStatus }) {
   const [state, setState] = useState('loading'); // loading | out | in
   const [email, setEmail] = useState(null);
   const [menuOpen, setMenuOpen] = useState(false);
   const [device, setDevice] = useState(null); // { userCode, verificationUrl, deviceCode }
   const [projects, setProjects] = useState(null);
   const [busy, setBusy] = useState('');
-  const [note, setNote] = useState('');
+  // What the last Connect attached, NOT the sentence it produced.
+  //
+  // This used to hold the rendered `{ text, title }`, which is why the note was
+  // frozen: a string computed once at the moment the dialog closed could only
+  // ever describe that moment. Keeping the INPUTS and deriving the sentence on
+  // every render is the whole liveness mechanism — `syncStatus` arrives on the
+  // already-wired `sync:status` bus, so no polling and no second fetch.
+  const [connected, setConnected] = useState(null); // { project, sync }
   const [error, setError] = useState('');
   const [copied, setCopied] = useState(false);
   const [copiedLink, setCopiedLink] = useState(false);
@@ -321,6 +396,15 @@ export default function CloudBar() {
   const railRef = useRef(null);
   const pollRef = useRef(null);
 
+  // Derived, not stored — so the sentence follows the link instead of freezing
+  // at the instant the confirm dialog closed. `syncStatus` is the live payload
+  // App already receives; when it is absent (older server, first render) the
+  // attach response is still the fallback and the note degrades to what it
+  // said before, never to nothing.
+  const note = connected
+    ? connectOutcomeNote(connected.project, connected.sync, syncStatus)
+    : null;
+
   useEffect(() => {
     api('/_api/cloud/status')
       .then((r) => {
@@ -391,7 +475,7 @@ export default function CloudBar() {
     setBusy('');
     setPending(null);
     if (r.ok && r.json?.ok) {
-      setNote(`Linked to ${r.json.project ?? pending.project} — restart the studio server to start syncing.`);
+      setConnected({ project: r.json.project ?? pending.project, sync: r.json.sync });
     } else {
       setError(r.json?.error || 'The workspace could not be connected.');
     }
@@ -468,7 +552,7 @@ export default function CloudBar() {
 
   async function connect(projectId) {
     setBusy(projectId);
-    setNote('');
+    setConnected(null);
     setError('');
     const r = await api('/_api/cloud/attach', {
       method: 'POST',
@@ -477,7 +561,7 @@ export default function CloudBar() {
     });
     setBusy('');
     if (r.ok && r.json?.ok) {
-      setNote(`Linked to ${projectId} — restart the studio server to start syncing.`);
+      setConnected({ project: r.json.project ?? projectId, sync: r.json.sync });
     } else {
       setError(r.json?.error || 'The workspace could not be connected.');
     }
@@ -670,7 +754,21 @@ export default function CloudBar() {
             <span className="gi-rail-login">{email ?? 'Maude Cloud'}</span>
             <span className="gi-rail-caret"><Icon name="chevron-up" size={13} /></span>
           </button>
-          {note && <span className="gi-rail-hint" title={note}>{note}</span>}
+          {/* A live region: the sentence now CHANGES as the link settles, and a
+              screen-reader user has to hear that transition rather than only
+              whatever text happened to be there when they last tabbed past.
+              `polite` — it is progress, never an interruption. */}
+          {note && (
+            <span
+              className="gi-rail-hint"
+              title={note.title}
+              role="status"
+              aria-live="polite"
+              data-testid="cloud-connect-note"
+            >
+              {note.text}
+            </span>
+          )}
           {error && <span className="gi-rail-err" title={error}>{error}</span>}
           {menuOpen && (
             <div className="gi-menu" role="menu" aria-label="Maude Cloud">

package/apps/studio/client/panels/GitPanel.jsx

@@ -155,8 +155,19 @@ export default function GitPanel({
   // checkboxes) — the developer commits and pushes from their terminal
   // (DDR-119). Native app keeps the full plain-words cycle.
   readOnly = false,
+  // THE SERVER ALREADY COMMITTED IT. In a cloud cell the hub owns this
+  // project's history and commits every edit as it lands (the studio child's
+  // own autocommit is disabled precisely so there is one committer) — so an
+  // "unsaved changes" list is not a to-do, it is a lie about work that is
+  // already saved, and Save / Publish offer to do a thing that has happened.
+  // The read-only variant of this panel used to answer that with "save and
+  // publish from your terminal", which is advice a browser user cannot take.
+  //
+  // History STAYS, and is the point: what the server committed is exactly what
+  // someone wants to look back at. Only the working-tree half goes.
+  historyOnly = false,
 }) {
-  const [tab, setTab] = useState('changes');
+  const [tab, setTab] = useState(historyOnly ? 'history' : 'changes');
   const [message, setMessage] = useState('');
   const [unchecked, setUnchecked] = useState(() => new Set()); // default = all checked
   const [expanded, setExpanded] = useState(() => new Set()); // unit keys with supporting files shown
@@ -443,13 +454,13 @@ export default function GitPanel({
     <aside
       className={'st-rpanel gp-panel' + (resizing ? ' is-resizing' : '')}
       style={width ? { width, flexBasis: width } : undefined}
-      aria-label="Changes"
+      aria-label={historyOnly ? 'History' : 'Changes'}
       data-testid="git-panel"
     >
       <div className="gp-head">
         <div className="gp-panel-hd">
-          <span className="gp-panel-title">Changes</span>
-          {count > 0 && <span className="gp-count">{count} unsaved</span>}
+          <span className="gp-panel-title">{historyOnly ? 'History' : 'Changes'}</span>
+          {!historyOnly && count > 0 && <span className="gp-count">{count} unsaved</span>}
           <span className="gp-spacer" />
           <span className="gp-draft" title="Your project and shared draft">
             <Icon name="folder" size={12} />
@@ -465,26 +476,28 @@ export default function GitPanel({
             ×
           </button>
         </div>
-        <div className="gp-tabs" role="tablist" aria-label="Changes and history">
-          <button
-            type="button"
-            role="tab"
-            aria-selected={tab === 'changes'}
-            className={'gp-tab' + (tab === 'changes' ? ' is-active' : '')}
-            onClick={() => setTab('changes')}
-          >
-            Changes
-          </button>
-          <button
-            type="button"
-            role="tab"
-            aria-selected={tab === 'history'}
-            className={'gp-tab' + (tab === 'history' ? ' is-active' : '')}
-            onClick={openHistory}
-          >
-            History
-          </button>
-        </div>
+        {!historyOnly && (
+          <div className="gp-tabs" role="tablist" aria-label="Changes and history">
+            <button
+              type="button"
+              role="tab"
+              aria-selected={tab === 'changes'}
+              className={'gp-tab' + (tab === 'changes' ? ' is-active' : '')}
+              onClick={() => setTab('changes')}
+            >
+              Changes
+            </button>
+            <button
+              type="button"
+              role="tab"
+              aria-selected={tab === 'history'}
+              className={'gp-tab' + (tab === 'history' ? ' is-active' : '')}
+              onClick={openHistory}
+            >
+              History
+            </button>
+          </div>
+        )}
       </div>
 
       {banner && (
@@ -530,7 +543,7 @@ export default function GitPanel({
         </div>
       )}
 
-      {tab === 'changes' ? (
+      {tab === 'changes' && !historyOnly ? (
         notRepo ? (
           <div className="gp-empty">
             <span className="gp-empty-glyph">