@1agh/maude 0.60.3 → 0.60.4

package/apps/studio/api.ts

@@ -2577,6 +2577,11 @@ export function createApi(ctx: Context, hooks: ApiHooks): Api {
     // via git "Get latest" — the file travels through git, this event is only a
     // "refresh your list" nudge for online local tabs (loopback inspector WS).
     ctx.bus.emit('canvas-list-update', { action: 'added', rel, slug });
+    // The inverse of `canvas-deleted` (see deleteCanvas for why this is its own
+    // event). Creating a name the project buried earlier has to lift the
+    // tombstone, or every peer would dutifully trash the new canvas for as long
+    // as the gravestone lives.
+    ctx.bus.emit('canvas-created', { slug });
     // designRel-prefixed path — matches the file-tree `file.path` shape so the
     // client can open it directly after reloadTree().
     return { ok: true, file: path.posix.join(paths.designRel, rel), rel, slug };
@@ -2690,6 +2695,15 @@ export function createApi(ctx: Context, hooks: ApiHooks): Api {
 
     // Phase 30 — live tree refresh for other local tabs (see createCanvas).
     ctx.bus.emit('canvas-list-update', { action: 'removed', rel, slug });
+    // A SEPARATE EVENT, DELIBERATELY. `canvas-list-update` is emitted by this
+    // API *and* by the filesystem watcher, so its payload can describe a file
+    // an agent or a `git checkout` produced — which is why discovery treats it
+    // as a nudge and re-derives the truth itself. This one is only ever emitted
+    // HERE, from a privileged route the canvas origin cannot reach, so it
+    // carries something the watcher's version cannot: the user meant it. Sync
+    // needs exactly that, because "gone from this disk" and "deleted from the
+    // project" are different claims and only the second may travel.
+    ctx.bus.emit('canvas-deleted', { slug });
     return {
       ok: true,
       rel,

package/apps/studio/client/app.jsx

@@ -4704,6 +4704,11 @@ function StatusBar({
   onOpenSync,
   changesCount = 0,
   unpushed = 0,
+  // Somebody else commits this project (a cloud cell, or the cell behind a
+  // linked+credentialed desktop repo — DDR-218). The chip then names the
+  // mechanism that IS saving rather than reporting a working-tree count the
+  // user has no reason to act on. Default false = today's local-first chip.
+  savingIsManaged = false,
   changesOpen = false,
   onOpenChanges,
   version,
@@ -4811,11 +4816,17 @@ function StatusBar({
           <span className="st-sb-changes-dot" aria-hidden="true" />
           <span className="lbl">changes</span>
           <span className="val">
-            {changesCount > 0
-              ? `${changesCount} unsaved`
-              : unpushed > 0
-                ? `${unpushed} to publish`
-                : 'all saved'}
+            {savingIsManaged
+              ? // Not "all saved": assets and project config are written into the
+                // cell's checkout but never committed there, so asserting a clean
+                // save would overstate what the cloud actually holds. Naming the
+                // mechanism is both honest and the thing the user needs to know.
+                'cloud saving'
+              : changesCount > 0
+                ? `${changesCount} unsaved`
+                : unpushed > 0
+                  ? `${unpushed} to publish`
+                  : 'all saved'}
           </span>
         </button>
       )}
@@ -11383,7 +11394,26 @@ function App() {
     for (const f of gitStatus?.files || []) m.set(f.path, KIND[f.status]);
     return m;
   }, [gitStatus]);
-  const unsavedCount = gitStatus?.files?.length || 0;
+  // WHO IS SAVING THIS PROJECT — one expression, read by every surface that
+  // would otherwise offer to save it (DDR-218 + the cell's `historyOnly`).
+  //
+  // These two flags were previously derived at the GitPanel call site alone, so
+  // the panel withdrew correctly while the toolbar menu and the status-bar chip
+  // kept rendering a raw dirty count from `gitStatus.files.length` — the very
+  // "lie about work that is already saved" the withdrawal exists to delete. The
+  // count is the claim, wherever it is drawn; hoisting the rule here is what
+  // keeps a third surface from re-introducing it.
+  //
+  // PRESENTATION, NOT A CONTROL — unchanged from DDR-218. `.git` is untouched,
+  // a terminal `git` behaves exactly as before, the server routes keep their own
+  // gates, and Disconnect restores every surface live.
+  const cellManaged = !!cfg.cloud;
+  const cloudManaged = !cfg.cloud && !!cloudLinkedHub?.credentialed;
+  const savingIsManaged = cellManaged || cloudManaged;
+  // The raw truth stays available for surfaces that legitimately need it (the
+  // panel's own file list, `dirtyByPath`); only the COUNT — the thing that reads
+  // as a to-do — is withheld when this project's saving is somebody else's job.
+  const unsavedCount = savingIsManaged ? 0 : gitStatus?.files?.length || 0;
 
   // Phase 28 (E3) — keep remote ahead/behind fresh so the "Get latest" nudge
   // surfaces on its own: probe once a repo is known, again whenever the Changes
@@ -14446,7 +14476,7 @@ function App() {
           // 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}
+          historyOnly={cellManaged}
           // DDR-218 (fix 8) — the DESKTOP half of the same withdrawal: a repo
           // linked+credentialed to Maude Cloud is cloud-managed (the cell
           // commits every edit as it lands), so the local Changes surface is
@@ -14454,7 +14484,7 @@ function App() {
           // Live: CloudBar lifts every link change (resolve/attach/detach)
           // into `cloudLinkedHub`. Same presentation-not-a-control rule as
           // `historyOnly` above; Disconnect restores the panel in place.
-          cloudManaged={!cfg.cloud && !!cloudLinkedHub?.credentialed}
+          cloudManaged={cloudManaged}
           resizing={resizingFor('changes')}
           onClose={() => setChangesOpen(false)}
           onCommit={gitCommit}
@@ -15521,7 +15551,11 @@ function App() {
           // holds (opening Sync closes whatever else the right slot shows).
           onOpenSync={syncStatus ? () => toggleRightPanel('sync') : undefined}
           changesCount={unsavedCount}
-          unpushed={gitStatus?.unpushed || 0}
+          // `unpushed` is a LOCAL-git offer ("N to publish"), and the panel has
+          // withdrawn Publish under either managed posture — so the chip must
+          // not keep advertising it either.
+          unpushed={savingIsManaged ? 0 : gitStatus?.unpushed || 0}
+          savingIsManaged={savingIsManaged}
           changesOpen={changesOpen}
           onOpenChanges={gitStatus?.repo ? () => setChangesOpen(true) : undefined}
           version={cfg?.version}

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

@@ -89,6 +89,15 @@ function readAssets(raw) {
   return { ...raw, failures };
 }
 
+/** The file plane (feature-sync-file-plane), or null when unreadable/absent —
+ *  absent is the norm: the payload carries `files` only once a flag-on pull
+ *  has run this boot. */
+function readFiles(raw) {
+  if (!raw || typeof raw !== 'object') return null;
+  if (![raw.synced, raw.pulled, raw.conflicts].every(isCount)) return null;
+  return raw;
+}
+
 export default function SyncPanel({
   status, // the live `sync:status` payload (never null while mounted)
   project, // display name for the header sentence (hub-supplied → safeName'd)
@@ -150,6 +159,7 @@ export default function SyncPanel({
   const truncated = isCount(status?.itemsTruncated) ? status.itemsTruncated : 0;
   const assets = readAssets(status?.assets);
   const assetFailures = assets?.failures || [];
+  const files = readFiles(status?.files);
 
   const { attention, byGroup } = useMemo(() => {
     const attention = items.filter((i) => i.state === 'auth-rejected');
@@ -329,6 +339,23 @@ export default function SyncPanel({
             )}
           </section>
         )}
+
+        {files && (
+          <section aria-label="Project files" data-testid="sync-files">
+            <div className="gp-sect-label">
+              project files <span className="gp-group-count">{files.synced}</span>
+            </div>
+            <div className="sp-assets-line">
+              {`${files.synced} synced` + (files.pulled > 0 ? ` · ${files.pulled} pulled` : '')}
+            </div>
+            {files.conflicts > 0 && (
+              <div className="sp-assets-retry" data-testid="sync-files-conflicts">
+                {files.conflicts} conflict{files.conflicts === 1 ? '' : 's'} — the older copies are
+                kept in _trash/.
+              </div>
+            )}
+          </section>
+        )}
       </div>
     </aside>
   );

package/apps/studio/context.ts

@@ -47,6 +47,15 @@ export interface LinkedHub {
    * would split peers of the same project apart. See sync/doc-name.ts.
    */
   workspaceId?: string;
+  /**
+   * feature-sync-file-plane — opt-in for the manifest-driven file plane
+   * (Plane B): the downward project-file pull AND the widened upward sweep
+   * (stylesheets, docs, code modules — classifier membership, see
+   * sync/file-membership.ts). Default OFF this release; `MAUDE_SYNC_FILES=1`
+   * forces it on for a session. The flag gates ONLY the new plane — the
+   * canvas CRDT lanes and the DDR-217 asset lanes run regardless.
+   */
+  syncFiles?: boolean;
 }
 
 export interface DevServerConfig {