npm - @1agh/maude - Versions diffs - 0.29.0 → 0.31.0 - Mend

@1agh/maude 0.29.0 → 0.31.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (162) hide show

package/README.md +6 -6
package/apps/studio/acp/bridge.ts +285 -0
package/apps/studio/acp/env.ts +48 -0
package/apps/studio/acp/index.ts +132 -0
package/apps/studio/acp/probe.ts +112 -0
package/apps/studio/acp/transcript.ts +149 -0
package/apps/studio/ai-banner.tsx +0 -1
package/apps/studio/annotations-align.ts +149 -0
package/apps/studio/annotations-bindings.ts +197 -0
package/apps/studio/annotations-context-toolbar.tsx +436 -186
package/apps/studio/annotations-groups.ts +270 -0
package/apps/studio/annotations-layer.tsx +1714 -1661
package/apps/studio/annotations-model.ts +2077 -0
package/apps/studio/annotations-snap.ts +125 -0
package/apps/studio/api.ts +433 -182
package/apps/studio/bin/_png-playwright.mjs +1 -1
package/apps/studio/bin/annotate.mjs +732 -0
package/apps/studio/bin/annotate.sh +17 -0
package/apps/studio/bin/chat-open.sh +44 -0
package/apps/studio/bin/read-annotations.mjs +152 -17
package/apps/studio/build.ts +1 -1
package/apps/studio/canvas-arrowheads.ts +78 -9
package/apps/studio/canvas-cursors.ts +2 -0
package/apps/studio/canvas-edit.ts +257 -7
package/apps/studio/canvas-icons.tsx +105 -0
package/apps/studio/canvas-lib.tsx +112 -19
package/apps/studio/canvas-list-watch.ts +177 -0
package/apps/studio/canvas-shell.tsx +326 -9
package/apps/studio/client/app.jsx +3579 -250
package/apps/studio/client/canvas-url.js +5 -0
package/apps/studio/client/github.js +99 -0
package/apps/studio/client/index.html +1 -1
package/apps/studio/client/panels/ChatPanel.jsx +770 -0
package/apps/studio/client/panels/CollabModelInfographic.jsx +71 -0
package/apps/studio/client/panels/CreateProject.jsx +334 -0
package/apps/studio/client/panels/DiffView.jsx +590 -0
package/apps/studio/client/panels/GitPanel.jsx +767 -0
package/apps/studio/client/panels/IdentityBar.jsx +294 -0
package/apps/studio/client/panels/OnboardingWizard.jsx +563 -0
package/apps/studio/client/panels/RepoBranchSwitcher.jsx +349 -0
package/apps/studio/client/panels/acp-runtime.js +286 -0
package/apps/studio/client/panels/chat-markdown.jsx +138 -0
package/apps/studio/client/panels/git-grouping.js +86 -0
package/apps/studio/client/styles/0-reset.css +4 -0
package/apps/studio/client/styles/3-shell-maude.css +1326 -14
package/apps/studio/client/styles/4-components.css +39 -0
package/apps/studio/client/styles/5-maude-overrides.css +41 -2
package/apps/studio/client/styles/6-acp-chat.css +771 -0
package/apps/studio/client/styles/_index.css +2 -0
package/apps/studio/client/tour/collab-tour.js +61 -0
package/apps/studio/client/tour/overlay.jsx +116 -18
package/apps/studio/client/tour/usage-tour.js +23 -10
package/apps/studio/client/whats-new.jsx +25 -10
package/apps/studio/collab/registry.ts +13 -0
package/apps/studio/collab/room.ts +36 -0
package/apps/studio/commands/annotation-strokes-command.ts +1 -1
package/apps/studio/commands/move-artboards-command.ts +1 -1
package/apps/studio/comments-overlay.tsx +7 -5
package/apps/studio/context-menu.tsx +4 -3
package/apps/studio/contextual-toolbar.tsx +14 -0
package/apps/studio/cursors-overlay.tsx +37 -21
package/apps/studio/dist/client.bundle.js +31795 -1829
package/apps/studio/dist/comment-mount.js +97 -9
package/apps/studio/dist/styles.css +7938 -1599
package/apps/studio/dom-selection.ts +115 -0
package/apps/studio/export-dialog.tsx +3 -3
package/apps/studio/git/endpoints.ts +338 -0
package/apps/studio/git/service.ts +1334 -0
package/apps/studio/git/watch.ts +97 -0
package/apps/studio/github/endpoints.ts +358 -0
package/apps/studio/github/service.ts +231 -0
package/apps/studio/github/token.ts +53 -0
package/apps/studio/history.ts +20 -3
package/apps/studio/hmr-broadcast.ts +9 -2
package/apps/studio/http.ts +508 -6
package/apps/studio/input-router.tsx +7 -0
package/apps/studio/inspect.ts +37 -8
package/apps/studio/participants-chrome.tsx +70 -16
package/apps/studio/paths.ts +12 -0
package/apps/studio/scaffold-design.ts +57 -0
package/apps/studio/server.ts +70 -4
package/apps/studio/sync/agent.ts +311 -57
package/apps/studio/sync/codec.ts +69 -0
package/apps/studio/sync/cold-start.ts +198 -0
package/apps/studio/sync/connection-state.ts +58 -2
package/apps/studio/sync/hub-link.ts +137 -0
package/apps/studio/sync/index.ts +563 -221
package/apps/studio/sync/journal.ts +190 -0
package/apps/studio/sync/migrate-seed.ts +202 -44
package/apps/studio/sync/projection.ts +22 -3
package/apps/studio/sync/status.ts +15 -4
package/apps/studio/test/acp-bridge.test.ts +127 -0
package/apps/studio/test/acp-env.test.ts +65 -0
package/apps/studio/test/acp-origin-gate.test.ts +78 -0
package/apps/studio/test/acp-transcript.test.ts +112 -0
package/apps/studio/test/activity.test.ts +1 -7
package/apps/studio/test/annotate-write.test.ts +184 -0
package/apps/studio/test/annotations-align.test.ts +88 -0
package/apps/studio/test/annotations-bindings.test.ts +124 -0
package/apps/studio/test/annotations-groups.test.ts +231 -0
package/apps/studio/test/annotations-snap.test.ts +79 -0
package/apps/studio/test/canvas-create-api.test.ts +72 -0
package/apps/studio/test/canvas-edit.test.ts +181 -1
package/apps/studio/test/canvas-list-watch.test.ts +322 -0
package/apps/studio/test/canvas-meta-api.test.ts +161 -27
package/apps/studio/test/canvas-origin-gate.test.ts +43 -0
package/apps/studio/test/chat-markdown.test.tsx +58 -0
package/apps/studio/test/collab-bridge.test.ts +0 -2
package/apps/studio/test/collab-room.test.ts +2 -7
package/apps/studio/test/collab-session-survival.test.tsx +176 -0
package/apps/studio/test/csp-canvas-shell.test.ts +5 -0
package/apps/studio/test/csrf-write-guard.test.ts +78 -0
package/apps/studio/test/editing-presence.test.ts +103 -0
package/apps/studio/test/figjam-v3-model.test.ts +342 -0
package/apps/studio/test/fixtures/figjam-v3-groups-bindings.svg +1 -0
package/apps/studio/test/fixtures/mock-acp-agent.mjs +45 -0
package/apps/studio/test/git-api.test.ts +0 -0
package/apps/studio/test/git-branches.test.ts +106 -0
package/apps/studio/test/git-grouping.test.ts +106 -0
package/apps/studio/test/git-watch.test.ts +97 -0
package/apps/studio/test/github-api.test.ts +465 -0
package/apps/studio/test/hub-link.test.ts +69 -0
package/apps/studio/test/participants-chrome.test.ts +36 -1
package/apps/studio/test/shared-doc-migrate.test.ts +224 -14
package/apps/studio/test/sync-agent.test.ts +272 -2
package/apps/studio/test/sync-codec.test.ts +65 -0
package/apps/studio/test/sync-cold-seed-dedup.test.ts +187 -0
package/apps/studio/test/sync-cold-start.test.ts +304 -0
package/apps/studio/test/sync-connection-state.test.ts +68 -0
package/apps/studio/test/sync-hardening.test.ts +0 -8
package/apps/studio/test/sync-hubs-config.test.ts +0 -1
package/apps/studio/test/sync-incident-replay.test.ts +211 -0
package/apps/studio/test/sync-journal.test.ts +176 -0
package/apps/studio/test/sync-runtime.test.ts +360 -5
package/apps/studio/test/sync-status.test.ts +66 -0
package/apps/studio/test/tour-overlay.test.tsx +18 -0
package/apps/studio/test/use-annotation-resize.test.ts +159 -0
package/apps/studio/test/use-artboard-drag.test.ts +0 -1
package/apps/studio/test/use-collab.test.ts +0 -0
package/apps/studio/test/use-tool-mode.test.tsx +5 -2
package/apps/studio/tool-palette.tsx +30 -11
package/apps/studio/undo-hud.tsx +0 -1
package/apps/studio/use-agent-presence.tsx +4 -2
package/apps/studio/use-annotation-resize.tsx +484 -54
package/apps/studio/use-annotation-selection.tsx +16 -4
package/apps/studio/use-canvas-activity.tsx +2 -2
package/apps/studio/use-chrome-visibility.tsx +66 -0
package/apps/studio/use-collab.tsx +434 -202
package/apps/studio/use-selection-set.tsx +9 -0
package/apps/studio/use-tool-mode.tsx +5 -1
package/apps/studio/whats-new.json +208 -10
package/apps/studio/whats-new.schema.json +18 -2
package/apps/studio/ws.ts +44 -1
package/cli/commands/design-link.test.mjs +84 -0
package/cli/commands/design.mjs +3 -1
package/cli/commands/design.test.mjs +5 -1
package/cli/lib/design-link.mjs +51 -1
package/cli/lib/gitignore-block.mjs +16 -3
package/cli/lib/gitignore-block.test.mjs +13 -1
package/package.json +11 -9
package/plugins/design/dependencies.json +17 -0
package/plugins/design/templates/_shell.html +58 -12

package/apps/studio/inspect.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 // Active-canvas state, selected-element tracking, and HTML injection
 // (inspector overlay + canvas runtime). See plan Task 7 + DDR-007.
-import path from 'node:path';
 import type { Context } from './context.ts';
 export interface SelectedElement {
@@ -356,16 +355,31 @@ const INSPECTOR_SCRIPT = `
     new MutationObserver(function(){ startTick(); }).observe(document.documentElement, { subtree: true, attributes: true, attributeFilter: ['style', 'class'], childList: true });
   }
-  // ⌘K / Ctrl+K command palette — keydown fired inside the canvas iframe never
-  // reaches the shell's window-scoped listener (iframe keyboard isolation), so
-  // the palette wouldn't open while focus is in the canvas. Forward the chord to
-  // the parent; the shell toggles the palette (mirrors its own handler, which
-  // fires "even in inputs"). Capture phase so canvas-lib's pan/zoom keydown
-  // handler can't swallow it first.
+  // Shell chords — keydown fired inside the canvas iframe never reaches the
+  // shell's window-scoped listener (iframe keyboard isolation), so each shell
+  // chord must be forwarded to the parent. preventDefault is load-bearing for
+  // ⌘R: without it the BROWSER reloads the whole shell while focus is in the
+  // canvas (the advertised behavior is "reload the active canvas"). Capture
+  // phase so canvas-lib's pan/zoom keydown handler can't swallow them first.
   document.addEventListener('keydown', function(e) {
-    if ((e.metaKey || e.ctrlKey) && (e.key === 'k' || e.key === 'K')) {
+    if (!(e.metaKey || e.ctrlKey)) return;
+    var k = (e.key || '').toLowerCase();
+    if (k === 'k' && !e.shiftKey) {
       e.preventDefault();
       try { window.parent.postMessage({ dgn: 'toggle-palette' }, '*'); } catch (err) {}
+      return;
+    }
+    if (k === 'r' && !e.shiftKey) {
+      e.preventDefault();
+      try { window.parent.postMessage({ dgn: 'shell-shortcut', id: 'reload' }, '*'); } catch (err) {}
+      return;
+    }
+    if (e.shiftKey) {
+      var id = k === 'i' ? 'inspector' : k === 'm' ? 'comments' : k === 'e' ? 'export' : k === 'h' ? 'handoff' : null;
+      if (id) {
+        e.preventDefault();
+        try { window.parent.postMessage({ dgn: 'shell-shortcut', id: id }, '*'); } catch (err) {}
+      }
     }
   }, true);
@@ -389,6 +403,21 @@ const INSPECTOR_SCRIPT = `
           if (t) t.scrollIntoView({ behavior: 'smooth', block: 'center' });
         } catch (e) {}
       }
+    } else if (m.dgn === 'theme') {
+      // Catch the chrome-theme seed the shell posts in reply to our 'loaded'
+      // ping (sent below). THIS listener registers during page-load — before
+      // the React canvas-shell mounts and adds its OWN 'dgn:theme' listener —
+      // so without this branch the shell's reply lands in the gap between
+      // page-load and React-mount and is dropped, leaving the canvas stuck on
+      // its hardcoded dark default until a manual theme toggle re-broadcasts
+      // it (the recurring "open a canvas under a light shell → canvas chrome is
+      // dark; toggle twice to fix; next canvas reverts" bug). We set the same
+      // attribute the canvas-shell chrome reads (data-maude-theme on <html>);
+      // canvas-shell's default-dark guard then sees the value already present
+      // and won't override it, and its own listener takes over live toggles.
+      if (m.theme === 'light' || m.theme === 'dark') {
+        try { document.documentElement.setAttribute('data-maude-theme', m.theme); } catch (e) {}
+      }
     }
     /* force-clear is now consumed by canvas-shell.tsx — the inspector
        overlay has no per-element selection state to clear anymore. */

package/apps/studio/participants-chrome.tsx CHANGED Viewed

@@ -14,7 +14,7 @@
  * own avatar to release. tldraw-style.
  */
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useViewportControllerContext } from './canvas-lib.tsx';
 import { type AgentPresence, useAgentPresence } from './use-agent-presence.tsx';
@@ -139,6 +139,35 @@ const CHROME_CSS = `
   white-space: normal;
   max-width: 200px;
 }
+/* Phase 30 / DDR-120 — soft editing-presence. A peer (or a bridged agent)
+   actively editing this canvas gets a gently-pulsing ring + a ✎ marker in the
+   peer's OWN identity hue (--dc-edit-ring, set inline from peer.color) so the
+   agent pulses violet, not the indigo accent. A heads-up, never a lock. */
+.dc-participant--editing { animation: dc-participant-edit-pulse 1.8s ease-in-out infinite; }
+@keyframes dc-participant-edit-pulse {
+  0%, 100% { box-shadow: 0 1px 2px rgba(0,0,0,0.08), 0 0 0 2px var(--dc-edit-ring, var(--maude-hud-accent, oklch(56% 0.170 50))); }
+  50% { box-shadow: 0 1px 2px rgba(0,0,0,0.08), 0 0 0 4px color-mix(in oklab, var(--dc-edit-ring, var(--maude-hud-accent, oklch(56% 0.170 50))) 45%, transparent); }
+}
+.dc-participant-edit-marker {
+  position: absolute;
+  right: -3px;
+  top: -3px;
+  width: 13px;
+  height: 13px;
+  border-radius: 50%;
+  background: var(--maude-chrome-bg-0, #fff);
+  color: var(--dc-edit-ring, var(--maude-hud-accent, oklch(56% 0.170 50)));
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 8px;
+  line-height: 1;
+  box-shadow: 0 0 0 1px rgba(0,0,0,0.14);
+  pointer-events: none;
+}
+@media (prefers-reduced-motion: reduce) {
+  .dc-participant--editing { animation: none; box-shadow: 0 1px 2px rgba(0,0,0,0.08), 0 0 0 2px var(--dc-edit-ring, var(--maude-hud-accent, oklch(56% 0.170 50))); }
+}
 `.trim();
 function ensureChromeStyles(): void {
@@ -150,6 +179,17 @@ function ensureChromeStyles(): void {
   document.head.appendChild(s);
 }
+/**
+ * Phase 30 / DDR-120 — true when a foreign peer is THIS machine's own
+ * server-side editing echo: a peer carrying my own name with editing set but
+ * no cursor/selection. That's the room's projection of my own agent/inspector
+ * edit (which I already see via the local ai-activity avatar), so I skip it. A
+ * remote peer never matches (different name), so they still get the heads-up.
+ */
+function isOwnEditingEcho(peer: ForeignAwareness, myName: string | undefined): boolean {
+  return peer.name === myName && !!peer.editing && !peer.cursor && !peer.selection;
+}
 function initialsFor(name: string): string {
   const cleaned = name.trim();
   if (!cleaned) return '?';
@@ -169,6 +209,7 @@ interface AvatarProps {
 function Avatar({ peer, isFollowing, onToggleFollow }: AvatarProps): JSX.Element {
   const [open, setOpen] = useState(false);
   const rootRef = useRef<HTMLDivElement | null>(null);
+  const editing = !!peer.editing;
   useEffect(() => {
     if (!open) return;
@@ -180,11 +221,16 @@ function Avatar({ peer, isFollowing, onToggleFollow }: AvatarProps): JSX.Element
     return () => document.removeEventListener('mousedown', onDocClick);
   }, [open]);
+  const cls = `dc-participant${isFollowing ? ' dc-participant--following' : ''}${editing ? ' dc-participant--editing' : ''}`;
+  // `--dc-edit-ring` drives the editing pulse/marker off the peer's own hue.
+  const style = (
+    editing ? { background: peer.color, '--dc-edit-ring': peer.color } : { background: peer.color }
+  ) as React.CSSProperties;
   return (
     <div
       ref={rootRef}
-      className={`dc-participant${isFollowing ? ' dc-participant--following' : ''}`}
-      style={{ background: peer.color }}
+      className={cls}
+      style={style}
       onClick={() => setOpen((v) => !v)}
       onKeyDown={(e) => {
         if (e.key === 'Enter' || e.key === ' ') {
@@ -192,19 +238,22 @@ function Avatar({ peer, isFollowing, onToggleFollow }: AvatarProps): JSX.Element
           setOpen((v) => !v);
         }
       }}
-      // biome-ignore lint/a11y/useSemanticElements: 28px round chip needs raw <div> + inline bg + custom focus ring; <button> reset is more code than the rule saves.
       role="button"
       tabIndex={0}
-      title={peer.name}
-      aria-label={peer.name}
+      title={editing ? `${peer.name} — editing this canvas` : peer.name}
+      aria-label={editing ? `${peer.name}, editing this canvas` : peer.name}
       aria-expanded={open}
     >
       {initialsFor(peer.name)}
+      {editing && (
+        <span className="dc-participant-edit-marker" aria-hidden="true">
+          ✎
+        </span>
+      )}
       {open && (
-        // biome-ignore lint/a11y/useKeyWithClickEvents: stop-propagation wrapper; keyboard focus stays in the button child.
-        // biome-ignore lint/a11y/useSemanticElements: popover wrapper carries no semantic role; the inner <button> is the actionable element.
         <div className="dc-participant-popover" onClick={(e) => e.stopPropagation()}>
           <div className="dc-participant-popover__name">{peer.name}</div>
+          {editing && <div className="dc-participant-popover__sub">Editing this canvas</div>}
           <button
             type="button"
             className={`dc-participant-popover__btn${isFollowing ? ' dc-participant-popover__btn--stop' : ''}`}
@@ -250,7 +299,6 @@ function AgentAvatar({ agent }: { agent: AgentPresence }): JSX.Element {
           setOpen((v) => !v);
         }
       }}
-      // biome-ignore lint/a11y/useSemanticElements: matches the peer Avatar chip pattern.
       role="button"
       tabIndex={0}
       title={`${agent.name} (AI agent)`}
@@ -262,8 +310,6 @@ function AgentAvatar({ agent }: { agent: AgentPresence }): JSX.Element {
         ✦
       </span>
       {open && (
-        // biome-ignore lint/a11y/useKeyWithClickEvents: stop-propagation wrapper; no actionable child.
-        // biome-ignore lint/a11y/useSemanticElements: popover wrapper carries no semantic role.
         <div className="dc-participant-popover" onClick={(e) => e.stopPropagation()}>
           <div className="dc-participant-popover__name">{agent.name}</div>
           <div className="dc-participant-popover__sub">AI agent · {agent.author}</div>
@@ -324,13 +370,21 @@ export function ParticipantsChrome(): JSX.Element | null {
     controller.setViewport(v);
   }, [controller, followTarget, peers]);
-  // Render whenever there's a human peer OR an active agent (so an agent shows
-  // even with no human collaborators connected).
-  if (peers.length === 0 && !agent) return null;
+  // Phase 30 / DDR-120 — drop the authoring machine's own server-side editing
+  // echo: a foreign peer carrying MY name with editing set but no cursor/
+  // selection is the room's projection of my own agent/inspector edit, which I
+  // already see via the local ai-activity avatar. A remote peer never matches
+  // (different name), so they still get the "X is editing" heads-up.
+  const myName = collab?.myName;
+  const visiblePeers = peers.filter((p) => !isOwnEditingEcho(p, myName));
+  // Render whenever there's a visible human peer OR an active agent (so an agent
+  // shows even with no human collaborators connected).
+  if (visiblePeers.length === 0 && !agent) return null;
   return (
     <div className="dc-participants" aria-label="Active collaborators">
-      {peers.map((p) => (
+      {visiblePeers.map((p) => (
         <Avatar
           key={p.clientID}
           peer={p}
@@ -343,4 +397,4 @@ export function ParticipantsChrome(): JSX.Element | null {
   );
 }
-export { initialsFor };
+export { initialsFor, isOwnEditingEcho };

package/apps/studio/paths.ts CHANGED Viewed

@@ -82,6 +82,18 @@ function isDevServerDir(dir: string): boolean {
 }
 function resolveDevServerRoot(): string {
+  // (0) Explicit override. Used when the runtime can't be found by walk-up — e.g.
+  // the Tauri desktop bundle (DDR-106) ships apps/studio/ as an app resource and
+  // sets MAUDE_DEV_SERVER_ROOT to it, because the sidecar binary sits alone in
+  // Maude.app/Contents/MacOS/ with no apps/studio/ up-tree (the bundle ships the
+  // full source, so `http.ts` is present at the resource root).
+  const override = process.env.MAUDE_DEV_SERVER_ROOT;
+  // Require the same `http.ts` anchor walk-up uses (not merely a `dist/` dir) so a
+  // planted dist-only directory can't hijack the runtime root (security review F4).
+  if (override && !isVirtualBunfsPath(override) && isDevServerDir(override)) {
+    return override;
+  }
   // (1) Dev mode: import.meta.url is a real file:// path AND lands in the
   // dev-server dir. Common case for `bun run server.ts`, tests, etc.
   const importDir = getImportMetaDir();

package/apps/studio/scaffold-design.ts ADDED Viewed

@@ -0,0 +1,57 @@
+// scaffold-design.ts — write a minimal, BOOTABLE `.design/` into a folder (Phase 28).
+//
+// Used by two native-app flows: "New project" (create a GitHub repo → init a local
+// project) and the "open a repo with no Maude design system" fallback ("set it up?").
+// It deliberately scaffolds only the MINIMUM the dev-server needs to boot (per
+// context.ts the only hard requirement is a `.design/` dir; config needs just
+// `name` + `designRoot`). A real design system is still created by /design:setup-ds
+// (agent-driven) — this just gets the project to open instead of crash-looping.
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { basename, join } from 'node:path';
+const CONFIG_SCHEMA =
+  'https://raw.githubusercontent.com/1aGh/maude/main/apps/studio/config.schema.json';
+/** Whether `dir` is already a Maude project (has `.design/config.json`). */
+export function hasDesign(dir: string): boolean {
+  return existsSync(join(dir, '.design', 'config.json'));
+}
+export interface ScaffoldResult {
+  ok: boolean;
+  error?: string;
+}
+/** Scaffold a minimal bootable `.design/` (no design system yet). Refuses to
+ *  clobber an existing project. `name` is the human project label. */
+export function scaffoldDesign(dir: string, name?: string): ScaffoldResult {
+  const designDir = join(dir, '.design');
+  const configPath = join(designDir, 'config.json');
+  if (existsSync(configPath)) {
+    return { ok: false, error: 'This folder is already a Maude project.' };
+  }
+  const projectName = (name && name.trim()) || basename(dir) || 'Untitled';
+  try {
+    mkdirSync(join(designDir, 'ui'), { recursive: true });
+    mkdirSync(join(designDir, 'system'), { recursive: true });
+    const config = {
+      $schema: CONFIG_SCHEMA,
+      name: projectName,
+      designRoot: '.design',
+      canvasGroups: [
+        { label: 'Design system', path: 'system' },
+        { label: 'UI kit', path: 'ui' },
+      ],
+      designSystems: [],
+      completenessProfile: 'standard',
+    };
+    writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, 'utf8');
+    // Keep the empty group dirs in git so a fresh clone still has the structure.
+    writeFileSync(join(designDir, 'ui', '.gitkeep'), '', 'utf8');
+    writeFileSync(join(designDir, 'system', '.gitkeep'), '', 'utf8');
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : 'Could not set up the project.' };
+  }
+}

package/apps/studio/server.ts CHANGED Viewed

@@ -16,14 +16,17 @@
 import { spawn } from 'node:child_process';
+import { createAcp } from './acp/index.ts';
 import { createActivity } from './activity.ts';
 import { createApi } from './api.ts';
 import { bootSelfHeal } from './boot-self-heal.ts';
-import { createAiActivity } from './collab/ai-activity.ts';
+import { createCanvasListWatch } from './canvas-list-watch.ts';
+import { type AiActivityEntry, createAiActivity } from './collab/ai-activity.ts';
 import { createGitLifecycle } from './collab/git-lifecycle.ts';
 import { createCollab } from './collab/index.ts';
 import { createContext } from './context.ts';
 import { createFsWatch } from './fs-watch.ts';
+import { createGitWatch } from './git/watch.ts';
 import { createHttp } from './http.ts';
 import { createInspect } from './inspect.ts';
 import { startHeapWatch } from './mem.ts';
@@ -77,11 +80,28 @@ await inspect.load();
 collab = createCollab(ctx, api);
 const aiActivity = createAiActivity(ctx);
+// Phase 30 — bridge agent `ai-activity` onto the per-canvas room awareness so a
+// remote peer sees "X is editing" cross-machine. The `ai-activity` bus event is
+// loopback-only (inspector WS); awareness is the one channel that crosses the
+// hub. Soft heads-up — projected onto the room's own awareness slot, cleared
+// when the activity ends/expires. No-op when no room is live for the slug.
+ctx.bus.on('ai-activity', (payload: { file: string; entry: AiActivityEntry | null }) => {
+  if (!collab) return;
+  const slug = api.fileSlug(payload.file);
+  collab.registry.setAgentEditing(
+    slug,
+    payload.entry ? { name: payload.entry.author, since: payload.entry.startedAt } : null
+  );
+});
 const gitLifecycle = createGitLifecycle(ctx, collab.registry);
 // Phase 13 / DDR-029 — fs-watch-driven canvas activity overlay. Subscribes to
 // `fs:any` and emits `activity:change`; ws.ts forwards it to canvas iframes.
 const activity = createActivity(ctx);
-const ws = createWs(ctx, api, inspect, collab, activity);
+// Phase 31 (DDR-123) — ACP chat bridge manager. Owns one claude-agent-acp
+// subprocess per /_ws/acp socket; main-origin + loopback only (wired below).
+const acp = createAcp(ctx);
+const ws = createWs(ctx, api, inspect, collab, activity, acp);
 const http = createHttp(ctx, api, inspect, aiActivity);
 const fsWatch = createFsWatch(ctx);
@@ -141,6 +161,26 @@ function startServer(port: number): BunServer {
         return new Response('Upgrade failed', { status: 400 });
       }
+      // Phase 31 (DDR-123) — ACP chat bridge WS. Main origin ONLY (this server,
+      // never startCanvasServer) and loopback-guarded like collab: the bridge
+      // spawns the user's `claude` and can drive file edits, so the untrusted
+      // canvas origin and remote hosts must never reach it. Checked BEFORE the
+      // generic `/_ws` inspector branch since `/_ws/acp`.startsWith('/_ws').
+      if (pathname === '/_ws/acp') {
+        if (!isLoopbackHost(req.headers.get('host'))) {
+          return new Response('ACP chat is loopback-only', { status: 403 });
+        }
+        const ok = srv.upgrade(req, {
+          data: {
+            id: crypto.randomUUID(),
+            remote: req.headers.get('x-forwarded-for') ?? '127.0.0.1',
+            kind: 'acp',
+          },
+        });
+        if (ok) return undefined as unknown as Response;
+        return new Response('Upgrade failed', { status: 400 });
+      }
       // Legacy inspector WS — JSON frames, designer-facing live tab state.
       if (pathname.startsWith('/_ws')) {
         const ok = srv.upgrade(req, {
@@ -294,8 +334,11 @@ let server: BunServer;
 // T2 (9.1-A) — advertise the main origin so the canvas origin's CSP can
 // allowlist it in `frame-ancestors` (the legit embedder). Must be set before
-// the canvas listener serves its first shell.
-ctx.mainOrigin = `http://localhost:${server.port}`;
+// the canvas listener serves its first shell. Both loopback host spellings are
+// listed: the server binds 127.0.0.1, so a user who opens the printed URL as
+// `127.0.0.1:<port>` is the same legit embedder — with only `localhost` allowed
+// the canvas iframe was silently refused (blank sad-page, no error anywhere).
+ctx.mainOrigin = `http://localhost:${server.port} http://127.0.0.1:${server.port}`;
 // T2 (9.1-A) — segregated canvas-content origin. ON BY DEFAULT (opt-OUT) since
 // phase-9.1: a second listener binds an OS-assigned free port, advertised as
@@ -336,6 +379,19 @@ await Bun.write(
 fsWatch.start();
 startHeapWatch();
+// Phase 27 Task 5 (E2) — live dirty-state. Subscribes to `fs:any` (after
+// fsWatch.start so it sees every event) and broadcasts `git-status` to the shell
+// on each versionable change. No-op for a non-git project (gitStatus → repo:false).
+const gitWatch = createGitWatch(ctx);
+// Phase 31 follow-up — external-canvas list watcher. Subscribes to `fs:any` and
+// emits `canvas-list-update` when a canvas file appears/disappears on disk from
+// OUTSIDE the dev-server (ACP agent `/design:new`, agent Write, git checkout),
+// so the browser file tree refreshes without a reload — the symmetric
+// counterpart to api.ts's create/delete emit. RCA:
+// `.ai/logs/rca/issue-acp-new-canvas-not-in-filetree.md`.
+const canvasListWatch = createCanvasListWatch(ctx);
 // Phase 9 Task 4 — bidirectional sync agent. No-op when the project isn't
 // linked to a hub (`.design/config.json` has no `linkedHub` field). Kicked
 // off after fsWatch so the agent's bus subscription receives every fs event.
@@ -368,6 +424,16 @@ if (!process.env.NO_OPEN) {
 async function shutdown() {
   console.log('\n  Stopping…');
   fsWatch.stop();
+  try {
+    gitWatch.stop();
+  } catch {
+    /* timer cleanup is best-effort */
+  }
+  try {
+    canvasListWatch.stop();
+  } catch {
+    /* timer cleanup is best-effort */
+  }
   try {
     activity.stop();
   } catch {