@1agh/maude 0.56.0 → 0.58.0

package/apps/studio/http.ts

@@ -17,7 +17,14 @@ import {
   startSignin,
 } from './acp/login-state.ts';
 import { probeAcpAvailabilityAuthed } from './acp/probe.ts';
-import { deleteChat, listChats, readChatMessages, writeChatMeta } from './acp/transcript.ts';
+import { activitySnapshot, runningChats } from './acp/running.ts';
+import {
+  chatTranscriptSeq,
+  deleteChat,
+  listChats,
+  readChatMessages,
+  writeChatMeta,
+} from './acp/transcript.ts';
 import { type Api, ASSET_MAX_BYTES, ASSET_MAX_VIDEO_BYTES } from './api.ts';
 import { ImportAssetError, importSvg, SVG_MAX_BYTES } from './bin/_import-asset.mjs';
 import { ImportBrandError, importBrand } from './bin/_import-brand.mjs';
@@ -1319,6 +1326,40 @@ export function createHttp(
       return Response.json({ ok: true }, { headers: { 'Cache-Control': 'no-store' } });
     },
 
+    // Addendum Task 9 — "is a chat mid-turn right now?", asked by
+    // RepoBranchSwitcher.jsx before any of its three `window.location.reload()`
+    // call sites. A `git checkout` moves the worktree under a running agent
+    // (read on `draft-a`, written back after the checkout to `main` — a silent
+    // cross-branch clobber that `_history/`, being per-canvas-slug with no
+    // branch awareness, cannot undo), so this gates a confirm rather than
+    // reloading silently. MAIN-ORIGIN ONLY, read-only, no chat CONTENT — just
+    // how many are busy, so it says nothing the canvas origin could want.
+    '/_api/acp/running': (req: Request) => {
+      if (!isTrustedRequestHost(req))
+        return new Response('local request required (DNS-rebinding guard)', { status: 403 });
+      const running = runningChats();
+      return Response.json(
+        { running: running.length, chats: running },
+        { headers: { 'Cache-Control': 'no-store' } }
+      );
+    },
+
+    // feature-acp-turn-notifications Task 3 — the native shell's poller reads
+    // this to decide whether to fire an OS notification for a NON-visible
+    // project (Decision C). A sibling of `/_api/acp/running` above rather than
+    // an extension of it — that route stays exactly as-is because the reaper's
+    // `has_running_chat` (sidecar.rs) already depends on its `{running,chats}`
+    // shape and has no reason to grow one. MAIN-ORIGIN ONLY, same gate, and —
+    // load-bearing (Decision D) — NEVER a chat title, message text, or any
+    // transcript content: just chat ids (opaque, already exposed by `running`
+    // above) and a three-value state. Anyone adding a field here should ask
+    // what it would look like rendered on a lock screen.
+    '/_api/acp/activity': (req: Request) => {
+      if (!isTrustedRequestHost(req))
+        return new Response('local request required (DNS-rebinding guard)', { status: 403 });
+      return Response.json(activitySnapshot(), { headers: { 'Cache-Control': 'no-store' } });
+    },
+
     // Phase 31 — repo-level chat list + history (for the chat switcher +
     // hydration). MAIN-ORIGIN ONLY. Read-only; ids are sanitized before disk.
     '/_api/acp/chats': () =>
@@ -1365,8 +1406,16 @@ export function createHttp(
         return Response.json(meta, { headers: { 'Cache-Control': 'no-store' } });
       }
       if (!id) return Response.json([], { headers: { 'Cache-Control': 'no-store' } });
+      // Addendum Task 8 — the re-attach seam. Read the sequence marker BEFORE
+      // the messages: a line appended between the two reads then shows up in
+      // neither, and the client's `attach` will replay it. Reading it after
+      // would risk the opposite (a line counted but not returned), which the
+      // client would silently drop as "already hydrated" — a hole in the feed.
+      // Shipped as a header rather than a body field so the response SHAPE
+      // stays the plain message array every existing consumer expects.
+      const seq = chatTranscriptSeq(ctx.paths.designRoot, id);
       return Response.json(readChatMessages(ctx.paths.designRoot, id), {
-        headers: { 'Cache-Control': 'no-store' },
+        headers: { 'Cache-Control': 'no-store', 'X-Maude-Chat-Seq': String(seq) },
       });
     },
 
@@ -1458,6 +1507,14 @@ export function createHttp(
         ...ctx.cfg,
         canvasOrigin: ctx.canvasOrigin,
         readOnly: projectReadOnly(req),
+        // WHICH RELEASE THIS IS. `/_config` reaches the browser in cloud mode,
+        // so the bar for adding a field here is "would I publish it" — and a
+        // version is the git tag, which is public. Nothing else rides along.
+        //
+        // Resolved through `resolveMaudeVersion`, the same function the What's
+        // New feed uses: one answer, so the chip in the status bar and the feed
+        // can never name different versions.
+        version: resolveMaudeVersion(),
         // Cloud Phase 27 (DDR-209) — the capability that opens the cookieless
         // canvas origin, minted per session by the proxy. Absent on a desktop,
         // where the canvas origin is loopback and needs none. `canvasUrl()`

package/apps/studio/input-router.tsx

@@ -446,6 +446,34 @@ export function yieldsToArtboardDrag(
   );
 }
 
+/**
+ * Click-phase counterpart to `yieldsToArtboardDrag` (issue-78). The onClick
+ * handler below suppresses the browser's native `click` for every gesture it
+ * already routed as `select` on the matching pointerdown, so a just-selected
+ * element's own click handler doesn't also fire. But an artboard-chrome
+ * control — e.g. the video-timeline badge (`.dc-artboard-video-badge`,
+ * DDR-148) rendered as a sibling of `.dc-artboard-body` — never goes through
+ * `select`; it's an interactive button that needs its own `onClick` to reach
+ * React. Without this exemption a bare click on it while in Move (or a
+ * Cmd/Ctrl+click from Browse/an annotation tool) is preventDefault +
+ * stopImmediatePropagation'd in the capture phase before React's delegated
+ * listener ever runs, so the button silently does nothing. Mirrors
+ * `yieldsToArtboardDrag`'s modifier gate: a held Cmd/Ctrl is reserved for
+ * deep-select and stays unexempted.
+ */
+export function yieldsClickToArtboardChrome(
+  wouldRouteKind: RouterAction['kind'] | null,
+  target: EventTarget | null,
+  modifiers: { metaKey: boolean; ctrlKey: boolean }
+): boolean {
+  return (
+    wouldRouteKind === 'select' &&
+    !modifiers.metaKey &&
+    !modifiers.ctrlKey &&
+    isArtboardDragChrome(target)
+  );
+}
+
 export function useInputRouter(opts: UseInputRouterOptions): void {
   const { hostRef, getActiveTool, isSpaceHeld, callbacks, enabled = true, claimableActions } = opts;
 
@@ -631,8 +659,18 @@ export function useInputRouter(opts: UseInputRouterOptions): void {
                 ? 'context-menu'
                 : null;
       if (wouldRouteKind && (!claimableActions || claimableActions.has(wouldRouteKind))) {
+        // issue-78 — a bare click on an artboard-chrome control (the video-
+        // timeline badge) must still reach its own onClick; see
+        // yieldsClickToArtboardChrome for why. Mirrors the onPointerDown/
+        // onMouseDown pattern above: preventDefault always runs (so a forged
+        // chrome-alike element inside untrusted canvas content can't use this
+        // exemption to let its own native click default action — e.g. an
+        // <a>'s navigation or an <input type="file">'s picker — fire), but
+        // stopImmediatePropagation is skipped so the real chrome button's own
+        // React onClick still gets the (now-inert-by-default) event.
+        const yields = yieldsClickToArtboardChrome(wouldRouteKind, e.target, e);
         e.preventDefault();
-        e.stopImmediatePropagation();
+        if (!yields) e.stopImmediatePropagation();
       }
     };
 

package/apps/studio/server.ts

@@ -735,6 +735,17 @@ async function shutdown() {
   // previously-unanswered "how does app-quit reach the grandchild" question.
   cancelSignin();
   cancelInstall();
+  // Addendum Task 8 — bridges now outlive their WebSocket, so socket-close is
+  // no longer the reaper it used to be. App quit / dev-server shutdown is the
+  // ONE lifetime boundary the detached model deliberately does NOT survive
+  // (DDR-166's SIGTERM-first path): extending a session across a project or
+  // branch *switch* is the point; extending it across a quit is not, and a
+  // surviving `claude` subprocess after quit would be an orphan.
+  try {
+    acp.stopAll();
+  } catch {
+    /* best-effort — the process is exiting either way */
+  }
   fsWatch.stop();
   try {
     gitWatch.stop();

package/apps/studio/sync/connection-state.ts

@@ -47,6 +47,22 @@ export interface SyncStatusSnapshot {
   /** DDR-102 — slugs currently auth-rejected, capped at 20 (see docs.rejected
    *  for the true count). Treat as text, never HTML. */
   rejectedSlugs?: string[];
+  /**
+   * Canvases this run brought DOWN from the project — documents that existed
+   * only on the hub and are now real local files.
+   *
+   * This field was briefly `remoteGap`, "what the project has that this machine
+   * does not". That name stopped being true the moment the pull landed: the
+   * diff is computed before providers are built and recorded after, so it
+   * enumerated exactly the documents that had just arrived. Observed live —
+   * `_sync.json` naming two canvases that were sitting on disk.
+   *
+   * "What arrived this run" is both true and the more useful fact: it is what
+   * the Synced state tells the user to go and open. Absent when the hub could
+   * not be asked (old hub, offline) or when nothing was pulled. Names are
+   * hub-controlled — treat as text, never HTML, and see the cap in `notePulled`.
+   */
+  pulled?: { names: string[]; count: number };
 }
 
 type TimerHandle = ReturnType<typeof setTimeout>;
@@ -75,6 +91,8 @@ export interface ConnectionMonitor {
   /** DDR-102 — real sync activity for a slug (reconcile done, hub-pushed flush
    *  applied): bumps `lastSyncAt` to now. */
   noteSyncActivity(slug: string): void;
+  /** Record the canvases this run pulled down from the project (see `pulled`). */
+  notePulled(slugs: readonly string[]): void;
   /** Current snapshot (defensive copy). */
   snapshot(): SyncStatusSnapshot;
   /** Tear down timers. */
@@ -100,7 +118,14 @@ export function createConnectionMonitor(opts: ConnectionMonitorOptions = {}): Co
   // DDR-102 — per-doc states (pending/connected/auth-rejected).
   const docStates = new Map<string, DocSyncState>();
 
-  let state: SyncState = 'online';
+  // NOT born connected. The monitor used to start `online`, so from the instant
+  // a link was created — before a socket, before a token was accepted, before a
+  // byte moved — every surface reading `state` reported success. On a healthy
+  // fast connect that was harmless (the truth arrived milliseconds later); on a
+  // refused or unreachable one it was the whole bug: the user was shown the
+  // intention and read it as the result. `connecting` is the honest seed, and
+  // it is the state a link genuinely occupies until a provider says otherwise.
+  let state: SyncState = 'connecting';
   let queuedOps = 0;
   let lastSyncAt: number | null = null;
   let offlineSince: number | null = null;
@@ -111,6 +136,25 @@ export function createConnectionMonitor(opts: ConnectionMonitorOptions = {}): Co
   let flashTimer: TimerHandle | null = null;
   let stopped = false;
 
+  /** Canvases pulled down from the project this run. */
+  let pulled: SyncStatusSnapshot['pulled'];
+
+  /**
+   * Start the clock at construction, not at the first provider event.
+   *
+   * `enterGrace` is reachable ONLY from `noteProviderStatus`, so a link where
+   * no provider ever reports — every provider rejected during boot, a hub that
+   * never completes an upgrade — would have sat in `connecting` forever and
+   * never reached the offline banner. Seeding `state` honestly is not enough on
+   * its own; something has to be counting from the moment the link exists.
+   */
+  function armInitialGrace(): void {
+    graceTimer = setTimer(() => {
+      graceTimer = null;
+      goOffline();
+    }, graceMs);
+  }
+
   function snapshot(): SyncStatusSnapshot {
     const docs = { synced: 0, pending: 0, rejected: 0 };
     const rejectedSlugs: string[] = [];
@@ -130,9 +174,31 @@ export function createConnectionMonitor(opts: ConnectionMonitorOptions = {}): Co
       updatedAt: now(),
       docs,
       rejectedSlugs,
+      ...(pulled ? { pulled } : {}),
     };
   }
 
+  /**
+   * Record the canvases this run pulled down from the project.
+   *
+   * `names` is capped like `rejectedSlugs` — this reaches a UI and a JSON file,
+   * and an unbounded list of hub-chosen names is a hub-controlled payload size.
+   * `count` keeps the true total, so the cap never falsifies the number the
+   * user is shown. An empty list clears the field rather than recording a zero:
+   * a run that pulled nothing has nothing to say.
+   */
+  function notePulled(slugs: readonly string[]): void {
+    // Every other mutator carries this guard; without it a late call could
+    // write `_sync.json` and broadcast for a monitor that has been torn down.
+    // Unreachable today (the sole caller checks `stopped` too) — kept so the
+    // invariant does not depend on the caller remembering it.
+    if (stopped) return;
+    pulled = slugs.length
+      ? { names: slugs.slice(0, MAX_REJECTED_SLUGS), count: slugs.length }
+      : undefined;
+    emit();
+  }
+
   function emit(): void {
     onChange?.(snapshot());
   }
@@ -181,15 +247,20 @@ export function createConnectionMonitor(opts: ConnectionMonitorOptions = {}): Co
   }
 
   function enterGrace(): void {
-    // Already counting down or already offline — don't restart the clock.
-    if (state !== 'online') return;
+    // Already offline — stay there until a provider reports 'connected'.
+    if (state === 'offline' || state === 'offline-long') return;
+    // Already counting down — don't restart the clock. The guard used to be
+    // `state !== 'online'`; the timer, not the state, is what says whether a
+    // countdown is running, and with the `connecting` seed those are no longer
+    // the same question.
+    if (graceTimer !== null) return;
     state = 'connecting';
-    if (graceTimer !== null) clearTimer(graceTimer);
     graceTimer = setTimer(() => {
       graceTimer = null;
       goOffline();
     }, graceMs);
-    emit();
+    // No emit here — the sole caller emits once for the whole update, so a
+    // demotion that does not change `state` still reaches the readers.
   }
 
   function goOffline(): void {
@@ -204,19 +275,56 @@ export function createConnectionMonitor(opts: ConnectionMonitorOptions = {}): Co
     emit();
   }
 
+  armInitialGrace();
+
   return {
     noteProviderStatus(providerId, status) {
       if (stopped) return;
+
+      // EMIT ONLY ON A REAL CHANGE.
+      //
+      // Every emit is a synchronous `_sync.json` write plus a WS broadcast to
+      // every open tab. Provider status is driven by the socket lifecycle,
+      // which the hub controls, and there is one provider per canvas — 75+ in
+      // the reported project. An unconditional emit here turns a flapping (or
+      // deliberately hostile) hub into a sustained disk-write and fan-out loop
+      // on the dev-server's main thread. The pre-existing code emitted only on
+      // a transition; adding the demotion below must not cost that property.
+      const prevStatus = providerStatuses.get(providerId);
       providerStatuses.set(providerId, status);
+      let changed = prevStatus !== status;
+
+      // A document whose socket is gone is not a synced document.
+      //
+      // `docs.synced` used to only ever RISE — nothing demoted a `connected`
+      // doc, so a hub that died left the last count frozen on screen, which is
+      // the most convincing form of the lie: it was true a moment ago. The
+      // provider id IS the slug (`index.ts` passes `canvas.slug`), so the
+      // monitor already knows which document just lost its socket.
+      //
+      // `auth-rejected` is deliberately NOT demoted. The hub gave an answer;
+      // losing the socket afterwards does not turn that answer back into
+      // "still trying", and letting it would hide a rotated credential behind
+      // a spinner.
+      if (status !== 'connected' && docStates.get(providerId) === 'connected') {
+        docStates.set(providerId, 'pending');
+        changed = true;
+      }
+
       const agg = aggregate();
       if (agg === 'connected') {
+        // goOnline() emits for the transition; otherwise only a real change
+        // (this provider's status moved, or a document was demoted) is news.
         if (state !== 'online') goOnline();
+        else if (changed) emit();
         return;
       }
       // Aggregate is connecting or disconnected → start (or continue) the
       // grace countdown. Once offline/offline-long we stay there until a
       // provider reports 'connected' again.
-      if (state === 'online') enterGrace();
+      const before = state;
+      enterGrace();
+      if (changed || state !== before) emit();
     },
 
     noteLocalEdit() {
@@ -245,6 +353,8 @@ export function createConnectionMonitor(opts: ConnectionMonitorOptions = {}): Co
       emit();
     },
 
+    notePulled,
+
     snapshot,
 
     stop() {

package/apps/studio/sync/index.ts

@@ -45,6 +45,7 @@ import { loadJournal, type SyncJournal } from './journal.ts';
 import { isLoopbackHost } from './loopback.ts';
 import { migrateSeed } from './migrate-seed.ts';
 import { createDocProjection, type DocProjection } from './projection.ts';
+import { describeRemoteDiff, diffRemoteDocs, fetchRemoteDocs, pullTargets } from './remote-docs.ts';
 import { createSyncStatusStore, type SyncStatusStore } from './status.ts';
 import { writeUntrustedMarkers } from './untrusted.ts';
 
@@ -424,7 +425,46 @@ export function createSyncRuntime(
     const scan = opts.canvases ? { canvases: opts.canvases, tsxCount: 0 } : await scanCanvases(ctx);
     // DDR-064 pre-cutover A4 + A6 — two files must never share a document, and
     // the pinned set must be bounded. See `admitCanvases`.
-    const canvases = admitCanvases(scan.canvases, useSharedDoc);
+    const localCanvases = admitCanvases(scan.canvases, useSharedDoc);
+
+    // PULL THE REST OF THE PROJECT DOWN.
+    //
+    // The scan above only sees this machine's disk, and Yjs cannot enumerate —
+    // so before this, a document that existed only on the hub was invisible to
+    // a peer forever. A desktop carrying 72 of a project's 75 canvases synced
+    // 72, reported "72/72 synced", and was accurate about the wrong universe.
+    // That is what "Open in Maude does nothing" was.
+    //
+    // A project you have access to is a project you get, in full and in both
+    // directions. Hub-only documents become real local files (flat under the
+    // design root — see `pullTargets` for why flat); local-only canvases go up
+    // as they always did. Best-effort: an older hub without the listing route,
+    // or an unreachable one, syncs exactly as before.
+    const remoteDocs = await fetchRemoteDocs(linkedHub.url, resolvedToken);
+    const remoteDiff = diffRemoteDocs(
+      localCanvases.map((c) => docNameFor(c.slug)),
+      remoteDocs
+    );
+    const pulled = pullTargets(
+      remoteDiff.hubOnly,
+      ctx.paths.designRoot,
+      path.join,
+      path.resolve,
+      path.sep
+    );
+    const pullNote = describeRemoteDiff(remoteDiff);
+    if (pullNote) console.log(`[sync] ${pullNote}`);
+    const canvases = [
+      ...localCanvases,
+      ...pulled.map((t) => ({
+        slug: t.slug,
+        html: t.bodyAbs,
+        comments: path.join(ctx.paths.commentsDir, `${t.slug}.json`),
+        annotations: path.join(ctx.paths.designRoot, `${t.slug}.annotations.svg`),
+        meta: t.bodyAbs.replace(/\.tsx$/i, '.meta.json'),
+        css: t.bodyAbs.replace(/\.tsx$/i, '.css'),
+      })),
+    ];
     // T4.5 (DDR-054 §3 F3) — every syncable canvas can receive hub-pushed
     // content, so the whole set is untrusted Claude-context. Mark it (writes
     // `_untrusted/INDEX.json` + a managed `.claudeignore` block; clears both
@@ -981,6 +1021,15 @@ export function createSyncRuntime(
       console.log(
         `[sync] ${linkedHub.url}: ${parts.join(' · ')} · shared-doc:${useSharedDoc ? 'on' : 'off'}`
       );
+      // What this run brought DOWN, recorded for `_sync.json` and the UI.
+      //
+      // This used to record `remoteDiff` under the name `remoteGap` — "what the
+      // project has that this machine does not". By the time it ran, that was
+      // false: the diff is taken BEFORE providers are built and recorded after
+      // the pull, so it named exactly the canvases that had just arrived and
+      // were sitting on disk. `pulled` is the same list under the name that is
+      // true, and it is the fact the user is told to act on.
+      mon.notePulled(pulled.map((t) => t.slug));
     });
   }