@1agh/maude 0.36.1 → 0.38.0

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

@@ -12,7 +12,7 @@
 
 import { useEffect, useState } from 'react';
 
-import { cloneRepo, createProject, initDesign, invite, listRepos, openLocalProject, pickDirectory } from '../github.js';
+import { cloneRepo, createLocalProject, createProject, initDesign, invite, listRepos, openLocalProject, pickDirectory } from '../github.js';
 
 function Icon({ name, size = 16 }) {
   const p = {
@@ -57,6 +57,12 @@ function Icon({ name, size = 16 }) {
       </>
     ),
     spinner: <path d="M8 2.2a5.8 5.8 0 1 0 5.8 5.8" />,
+    laptop: (
+      <>
+        <rect x="3" y="3.5" width="10" height="7" rx="1" />
+        <path d="M1.5 13h13l-1.2-1.8H2.7z" />
+      </>
+    ),
   }[name];
   return (
     <svg width={size} height={size} viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="1.4" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true" className={name === 'spinner' ? 'cp-spin' : undefined}>
@@ -66,12 +72,12 @@ function Icon({ name, size = 16 }) {
 }
 
 const TITLES = {
-  new: ['Create a new project', 'A private project on GitHub, set up for you.'],
+  new: ['Create a new project', 'On GitHub, or just locally on your computer.'],
   get: ['Pull a local copy', 'Pick a project, choose where to save it, and open it here.'],
   share: ['Share this project', 'Invite a teammate by their GitHub username.'],
 };
 
-export default function CreateProject({ view, identity, onClose }) {
+export default function CreateProject({ view, identity, signedIn, onClose }) {
   const [title, sub] = TITLES[view] || TITLES.new;
   return (
     <div className="cp-modal" role="dialog" aria-modal="true" aria-label={title} onKeyDown={(e) => { if (e.key === 'Escape') onClose(); }}>
@@ -86,7 +92,7 @@ export default function CreateProject({ view, identity, onClose }) {
             <Icon name="x" size={15} />
           </button>
         </div>
-        {view === 'new' && <NewView identity={identity} onClose={onClose} />}
+        {view === 'new' && <NewView identity={identity} signedIn={signedIn} onClose={onClose} />}
         {view === 'get' && <GetView />}
         {view === 'share' && <ShareView onClose={onClose} />}
       </div>
@@ -94,20 +100,24 @@ export default function CreateProject({ view, identity, onClose }) {
   );
 }
 
-function NewView({ identity, onClose }) {
+function NewView({ identity, signedIn, onClose }) {
   const [name, setName] = useState('');
+  // 'github' = new repo on GitHub (needs sign-in); 'local' = just a local git repo,
+  // no remote. Default to local when signed out (GitHub isn't available then).
+  const [where, setWhere] = useState(signedIn ? 'github' : 'local');
   const [isPrivate, setIsPrivate] = useState(true);
   const [desc, setDesc] = useState('');
   const [busy, setBusy] = useState(false);
   const [step, setStep] = useState('');
   const [err, setErr] = useState('');
 
+  const local = where === 'local';
   const slug = name.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
   const owner = identity?.login || 'you';
 
-  // New project = create the GitHub repo AND a ready-to-design local project, then
-  // open it. You pick where to save it (like a real "new project"), then design
-  // and Publish when ready.
+  // New project = a ready-to-design local project, then open it. GitHub mode also
+  // creates the remote repo + sets origin; local mode is git init only (publish later).
+  // You pick where to save it, then design and Publish when ready.
   async function submit() {
     setErr('');
     setBusy(true);
@@ -115,8 +125,14 @@ function NewView({ identity, onClose }) {
       setStep('Choose where to save it…');
       const parentDir = await pickDirectory();
       if (!parentDir) { setBusy(false); setStep(''); return; } // cancelled
-      setStep('Creating your project on GitHub…');
-      const r = await createProject({ name, private: isPrivate, description: desc, parentDir });
+      let r;
+      if (local) {
+        setStep('Setting up your local project…');
+        r = await createLocalProject({ name, parentDir });
+      } else {
+        setStep('Creating your project on GitHub…');
+        r = await createProject({ name, private: isPrivate, description: desc, parentDir });
+      }
       if (!(r.ok && r.json?.ok)) {
         setErr(r.json?.error || 'Couldn’t create the project. Try again.');
         setBusy(false);
@@ -135,30 +151,48 @@ function NewView({ identity, onClose }) {
   return (
     <>
       <div className="cp-body">
-        <label className="cp-field">
-          <span className="cp-field-label">Project name</span>
-          <input className="input cp-input" type="text" value={name} placeholder="Acme Rebrand" aria-label="Project name" onChange={(e) => setName(e.target.value)} />
-          {slug && <span className="cp-field-help">Creates <b>github.com/{owner}/{slug}</b></span>}
-        </label>
         <div className="cp-field">
-          <span className="cp-field-label">Who can see it</span>
-          <div className="seg cp-seg" role="group" aria-label="Project visibility">
-            <button type="button" aria-pressed={isPrivate} onClick={() => setIsPrivate(true)}><Icon name="lock" size={14} /> Private</button>
-            <button type="button" aria-pressed={!isPrivate} onClick={() => setIsPrivate(false)}><Icon name="globe" size={14} /> Public</button>
+          <span className="cp-field-label">Where</span>
+          <div className="seg cp-seg" role="group" aria-label="Where to create the project">
+            <button type="button" aria-pressed={!local} disabled={!signedIn} title={signedIn ? undefined : 'Sign in with GitHub first'} onClick={() => setWhere('github')}><Icon name="globe" size={14} /> GitHub</button>
+            <button type="button" aria-pressed={local} onClick={() => setWhere('local')}><Icon name="laptop" size={14} /> This computer only</button>
           </div>
-          <span className="cp-field-help">{isPrivate ? 'Only you and people you invite. The safe default.' : 'Anyone on the internet can see this project.'}</span>
+          <span className="cp-field-help">
+            {local
+              ? 'A local git repo on your computer — no GitHub, no remote. You can publish it later.'
+              : signedIn
+                ? 'A repo on your GitHub account, cloned to your computer.'
+                : 'Sign in with GitHub (bottom-left) to publish. For now you can create a local project.'}
+          </span>
         </div>
         <label className="cp-field">
-          <span className="cp-field-label">Description <span className="cp-optional">optional</span></span>
-          <textarea className="textarea cp-textarea" rows={2} value={desc} placeholder="What is this project for?" aria-label="Project description" onChange={(e) => setDesc(e.target.value)} />
+          <span className="cp-field-label">Project name</span>
+          <input className="input cp-input" type="text" value={name} placeholder="Acme Rebrand" aria-label="Project name" onChange={(e) => setName(e.target.value)} />
+          {slug && <span className="cp-field-help">{local ? <>Creates a project folder <b>{slug}</b></> : <>Creates <b>github.com/{owner}/{slug}</b></>}</span>}
         </label>
+        {!local && (
+          <>
+            <div className="cp-field">
+              <span className="cp-field-label">Who can see it</span>
+              <div className="seg cp-seg" role="group" aria-label="Project visibility">
+                <button type="button" aria-pressed={isPrivate} onClick={() => setIsPrivate(true)}><Icon name="lock" size={14} /> Private</button>
+                <button type="button" aria-pressed={!isPrivate} onClick={() => setIsPrivate(false)}><Icon name="globe" size={14} /> Public</button>
+              </div>
+              <span className="cp-field-help">{isPrivate ? 'Only you and people you invite. The safe default.' : 'Anyone on the internet can see this project.'}</span>
+            </div>
+            <label className="cp-field">
+              <span className="cp-field-label">Description <span className="cp-optional">optional</span></span>
+              <textarea className="textarea cp-textarea" rows={2} value={desc} placeholder="What is this project for?" aria-label="Project description" onChange={(e) => setDesc(e.target.value)} />
+            </label>
+          </>
+        )}
         {err && <div className="callout callout--error"><span className="cp-cl-glyph" style={{ color: 'var(--status-error)' }}><Icon name="x" /></span><span>{err}</span></div>}
       </div>
       <div className="cp-ft">
         <span className="cp-spacer" />
         <button type="button" className="btn btn--ghost" onClick={onClose}>Cancel</button>
         <button type="button" className="btn btn--primary" onClick={submit} disabled={busy || !slug}>
-          <Icon name="plus" size={15} /> {busy ? step || 'Creating…' : 'Create project'}
+          <Icon name="plus" size={15} /> {busy ? step || 'Creating…' : local ? 'Create local project' : 'Create project'}
         </button>
       </div>
     </>

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

@@ -343,7 +343,7 @@ export default function GitPanel({
       if (res.authRequired)
         setBanner({
           variant: 'info',
-          text: res.error || 'Sign in with GitHub to publish — coming soon.',
+          text: res.error || 'Sign in with GitHub to publish.',
         });
       else if (res.conflict)
         // A push conflict (non-fast-forward) prompts a Get-latest; a Get-latest

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

@@ -15,6 +15,8 @@ import {
   isNativeApp,
   isSignedIn,
   onDeviceCode,
+  onMenuNewProject,
+  onSignedIn,
   openVerification,
   signIn,
   signOut,
@@ -107,6 +109,8 @@ export default function IdentityBar() {
   const [copied, setCopied] = useState(false);
   const unlistenRef = useRef(null);
   const railRef = useRef(null);
+  const stateRef = useRef(state);
+  stateRef.current = state; // keep current for the (subscribe-once) menu listener
 
   useEffect(() => {
     let alive = true;
@@ -116,7 +120,14 @@ export default function IdentityBar() {
         const signed = await isSignedIn();
         if (!alive) return;
         if (signed) {
-          const r = await fetchIdentity();
+          let r = await fetchIdentity();
+          // A valid keychain token can still hit a transient identity-fetch failure at
+          // mount (bridge not ready / GitHub 5xx / rate-limit) — retry before falling back
+          // to the signed-out CTA so we don't flash "Sign in" at a signed-in user.
+          for (let i = 0; i < 2 && alive && !(r.ok && r.json?.ok); i += 1) {
+            await new Promise((res) => setTimeout(res, 800));
+            r = await fetchIdentity();
+          }
           if (!alive) return;
           if (r.ok && r.json?.ok) {
             setIdentity({ login: r.json.login, name: r.json.name, avatar_url: r.json.avatar_url });
@@ -133,6 +144,36 @@ export default function IdentityBar() {
     };
   }, [native]);
 
+  // Live-update when sign-in completes in ANOTHER surface (the wizard's Door A emits
+  // `github://signed-in`). Without this the rail can sit on "Sign in" with a valid token
+  // until a full reload. Flip to signed-in off the event's login, then enrich the profile.
+  useEffect(() => {
+    if (!native) return undefined;
+    const p = onSignedIn(async (login) => {
+      setIdentity((cur) => cur || { login, name: null, avatar_url: null });
+      setState('in');
+      const r = await fetchIdentity();
+      if (r.ok && r.json?.ok)
+        setIdentity({ login: r.json.login, name: r.json.name, avatar_url: r.json.avatar_url });
+    });
+    return () => {
+      p?.then?.((fn) => fn?.());
+    };
+  }, [native]);
+
+  // Native File ▸ New Project… (menu.rs emits `menu://new-project`). Open the create
+  // dialog once the GitHub check settled — even when signed out, since it offers a
+  // local-only project (no GitHub needed); the dialog gates the GitHub option itself.
+  useEffect(() => {
+    if (!native) return undefined;
+    const p = onMenuNewProject(() => {
+      if (stateRef.current !== 'loading') setView('new');
+    });
+    return () => {
+      p?.then?.((fn) => fn?.());
+    };
+  }, [native]);
+
   useEffect(() => {
     if (!menuOpen) return;
     const onDoc = (e) => {
@@ -288,7 +329,7 @@ export default function IdentityBar() {
         </div>
       )}
 
-      {view && <CreateProject view={view} identity={identity} onClose={() => setView(null)} />}
+      {view && <CreateProject view={view} identity={identity} signedIn={state === 'in'} onClose={() => setView(null)} />}
     </div>
   );
 }

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

@@ -178,26 +178,26 @@ function AiReadiness() {
 }
 
 // ── A · Welcome (door picker) ────────────────────────────────────────────────
-function Welcome({ onGithub, onLocal, onHub, signing }) {
+function Welcome({ onGithub, onLocal, onHub, signing, signedIn, identity }) {
   return (
     <main className="ob-main">
       <header className="ob-head">
         <span className="ob-eyebrow">Welcome</span>
         <h1>How would you like to start?</h1>
-        <p>Most people sign in with GitHub — it's the simplest way to work with a team.</p>
+        <p>{signedIn ? `You're signed in as @${identity?.login || 'GitHub'}. Open a project, or start a new one.` : "Most people sign in with GitHub — it's the simplest way to work with a team."}</p>
       </header>
       <div className="ob-doors">
-        <button type="button" className="ob-door ob-door--primary" aria-label="Continue with GitHub — recommended" onClick={onGithub} disabled={signing}>
+        <button type="button" data-testid="ob-door-github" className="ob-door ob-door--primary" aria-label="Continue with GitHub — recommended" onClick={onGithub} disabled={signing}>
           <span className="ob-door-icon ob-door-icon--gh"><GitHubMark size={26} /></span>
           <span className="ob-door-tx">
             <span className="ob-door-title">Continue with GitHub<span className="ob-door-tag">Recommended</span></span>
             <span className="ob-door-sub">Start a shared project, or open one a teammate shared with you.</span>
           </span>
           <span className="ob-door-cta">
-            <span className="btn btn--primary ob-door-btn"><GitHubMark size={15} /> {signing ? 'Starting…' : 'Sign in with GitHub'}</span>
+            <span className="btn btn--primary ob-door-btn"><GitHubMark size={15} /> {signing ? 'Starting…' : signedIn ? 'Continue' : 'Sign in with GitHub'}</span>
           </span>
         </button>
-        <button type="button" className="ob-door" aria-label="Open a folder on this computer" onClick={onLocal}>
+        <button type="button" data-testid="ob-door-local" className="ob-door" aria-label="Open a folder on this computer" onClick={onLocal}>
           <span className="ob-door-icon"><Icon name="folder-open" size={22} /></span>
           <span className="ob-door-tx">
             <span className="ob-door-title">Open a folder on this computer</span>
@@ -205,7 +205,7 @@ function Welcome({ onGithub, onLocal, onHub, signing }) {
           </span>
           <span className="ob-door-go" aria-hidden="true"><Icon name="chevron-right" size={16} /></span>
         </button>
-        <button type="button" className="ob-door ob-door--advanced" aria-label="Connect to a team hub — advanced" onClick={onHub}>
+        <button type="button" data-testid="ob-door-hub" className="ob-door ob-door--advanced" aria-label="Connect to a team hub — advanced" onClick={onHub}>
           <span className="ob-door-icon ob-door-icon--quiet"><Icon name="server" size={18} /></span>
           <span className="ob-door-tx">
             <span className="ob-door-title">Connect to a team hub <span className="ob-door-adv">Advanced</span></span>
@@ -214,7 +214,7 @@ function Welcome({ onGithub, onLocal, onHub, signing }) {
           <span className="ob-door-go" aria-hidden="true"><Icon name="chevron-right" size={15} /></span>
         </button>
       </div>
-      <p className="ob-foot-note">Maude never touches the terminal. Everything here happens in the app.</p>
+      <p className="ob-foot-note">Browse, version, and collaborate — all in the app, no terminal.</p>
       <AiReadiness />
       <CrashOptIn />
     </main>
@@ -223,7 +223,7 @@ function Welcome({ onGithub, onLocal, onHub, signing }) {
 
 function BackBar({ onBack }) {
   return (
-    <button type="button" className="ob-back" onClick={onBack}>
+    <button type="button" data-testid="ob-back" className="ob-back" onClick={onBack}>
       <Icon name="back" size={14} /> Back
     </button>
   );
@@ -272,7 +272,7 @@ function GitHubDoor({ identity, onBack }) {
         <h1>Open a project, or start a new one</h1>
         <p>Pick up a shared project below, or create a fresh one — it's private until you invite someone.</p>
       </header>
-      <button type="button" className="ob-create" aria-label="Start a new project" onClick={() => setCreating(true)}>
+      <button type="button" data-testid="ob-github-create" className="ob-create" aria-label="Start a new project" onClick={() => setCreating(true)}>
         <span className="ob-create-icon"><Icon name="plus" size={20} /></span>
         <span className="ob-create-tx">
           <span className="ob-create-title">Start a new project</span>
@@ -280,12 +280,12 @@ function GitHubDoor({ identity, onBack }) {
         </span>
         <span className="btn btn--primary ob-create-btn"><Icon name="arrow-right" size={15} /> Create</span>
       </button>
-      <div className="ob-section-label">Shared with you</div>
+      <div className="ob-section-label">Your projects</div>
       {err && <div className="callout callout--error ob-callout"><span className="ob-callout-glyph" style={{ color: 'var(--status-error)' }}><Icon name="x" /></span><span>{err}</span></div>}
       {repos === null && <div className="ob-foot-note">Loading your projects…</div>}
-      {repos && repos.length === 0 && !err && <div className="ob-foot-note">No shared projects yet — create one to get started.</div>}
+      {repos && repos.length === 0 && !err && <div className="ob-foot-note">No projects yet — create one to get started.</div>}
       {repos && repos.length > 0 && (
-        <div className="ob-repolist" role="group" aria-label="Shared projects you can open">
+        <div className="ob-repolist" role="group" aria-label="Projects you can open">
           {repos.map((r) => {
             const isBusy = busy === r.full_name;
             return (
@@ -417,12 +417,12 @@ function LocalDoor({ onBack }) {
           {err && <div className="callout callout--error ob-callout"><span className="ob-callout-glyph" style={{ color: 'var(--status-error)' }}><Icon name="x" /></span><span>{err}</span></div>}
           <div className="ob-form-actions">
             <button type="button" className="btn btn--ghost" onClick={() => setNeedsSetup(null)} disabled={busy}>Pick a different folder</button>
-            <button type="button" className="btn btn--primary" onClick={setupHere} disabled={busy}><Icon name="folder" size={15} /> {busy ? 'Setting up…' : 'Set up Maude here'}</button>
+            <button type="button" data-testid="ob-local-setup" className="btn btn--primary" onClick={setupHere} disabled={busy}><Icon name="folder" size={15} /> {busy ? 'Setting up…' : 'Set up Maude here'}</button>
           </div>
         </>
       ) : (
         <>
-          <button type="button" className="ob-drop" onClick={choose} disabled={busy} aria-label="Choose a project folder">
+          <button type="button" data-testid="ob-local-choose" className="ob-drop" onClick={choose} disabled={busy} aria-label="Choose a project folder">
             <span className="ob-drop-glyph"><Icon name="folder-open" size={34} /></span>
             <span className="ob-drop-title">{busy ? 'Opening…' : 'Choose a project folder'}</span>
             <span className="ob-drop-or">click to browse</span>
@@ -506,11 +506,11 @@ function DeviceCodeModal({ device, onClose }) {
   return (
     <div className="gi-modal" role="dialog" aria-modal="true" aria-label="Sign in with GitHub" onKeyDown={(e) => { if (e.key === 'Escape') onClose(); }}>
       <div className="gi-scrim" aria-hidden="true" onClick={onClose} />
-      <div className="gi-dialog gi-dialog--code">
+      <div className="gi-dialog gi-dialog--code" data-testid="ob-device-modal">
         <div className="gi-dc-head">
           <span className="gi-dc-marks"><GitHubMark size={26} /></span>
           <h2>Sign in with GitHub</h2>
-          <p>Maude opened GitHub in your browser. Enter this code to connect your account.</p>
+          <p>Maude opened GitHub in your browser. Enter the code there to connect — you'll grant Maude access to create and manage your project repos.</p>
         </div>
         <ol className="gi-dc-steps">
           <li>
@@ -523,7 +523,7 @@ function DeviceCodeModal({ device, onClose }) {
           <li><span className="gi-dc-step-n">2</span><span className="gi-dc-step-tx">Enter this code to connect Maude</span></li>
         </ol>
         <div className="gi-code">
-          <span className="gi-code-val">{device.user_code}</span>
+          <span className="gi-code-val" data-testid="ob-device-code">{device.user_code}</span>
           <button type="button" className="btn btn--ghost gi-code-copy" onClick={copyCode} aria-label="Copy the code"><Icon name="copy" size={15} /> {copied ? 'Copied' : 'Copy'}</button>
         </div>
         <div className="gi-dc-status" aria-live="polite"><span className="gi-pulse" aria-hidden="true" /><span>Waiting for you to authorize in your browser…</span></div>
@@ -542,6 +542,7 @@ export default function OnboardingWizard() {
   const [device, setDevice] = useState(null);
   const [err, setErr] = useState('');
   const unlistenRef = useRef(null);
+  const cancelledRef = useRef(false);
 
   // If already signed in (re-onboarding), skip the sign-in step on the GitHub door.
   useEffect(() => {
@@ -560,16 +561,18 @@ export default function OnboardingWizard() {
 
   async function handleGithub() {
     if (signedIn) { setDoor('github'); return; }
+    cancelledRef.current = false;
     setErr(''); setSigning(true); setDevice(null);
     try {
       unlistenRef.current = onDeviceCode((p) => setDevice(p));
       const login = await signIn();
+      if (cancelledRef.current) return; // user hit Cancel — don't auto-advance on a late resolve
       const r = await fetchIdentity();
       setIdentity(r.ok && r.json?.ok ? { login: r.json.login, name: r.json.name } : { login });
       setSignedIn(true);
       setDoor('github');
     } catch (e) {
-      setErr(String(e?.message || e || "Sign-in didn't finish. Please try again."));
+      if (!cancelledRef.current) setErr(String(e?.message || e || "Sign-in didn't finish. Please try again."));
     } finally {
       setSigning(false);
       setDevice(null);
@@ -581,10 +584,10 @@ export default function OnboardingWizard() {
   if (!native) return null;
 
   return (
-    <div className="ob-overlay" role="dialog" aria-modal="true" aria-label="Welcome to Maude">
+    <div className="ob-overlay" data-testid="onboarding-wizard" role="dialog" aria-modal="true" aria-label="Welcome to Maude">
       <div className="ob-shell">
         <Rail signedInAs={signedIn ? identity?.login : null} />
-        {door === 'welcome' && <Welcome signing={signing} onGithub={handleGithub} onLocal={() => setDoor('local')} onHub={() => setDoor('hub')} />}
+        {door === 'welcome' && <Welcome signing={signing} signedIn={signedIn} identity={identity} onGithub={handleGithub} onLocal={() => setDoor('local')} onHub={() => setDoor('hub')} />}
         {door === 'github' && <GitHubDoor identity={identity} onBack={() => setDoor('welcome')} />}
         {door === 'local' && <LocalDoor onBack={() => setDoor('welcome')} />}
         {door === 'hub' && <HubDoor onBack={() => setDoor('welcome')} />}
@@ -592,7 +595,7 @@ export default function OnboardingWizard() {
       {err && door === 'welcome' && (
         <div className="ob-toast callout callout--error" role="alert"><span className="ob-callout-glyph" style={{ color: 'var(--status-error)' }}><Icon name="x" /></span><span>{err}</span></div>
       )}
-      {device && <DeviceCodeModal device={device} onClose={() => setDevice(null)} />}
+      {device && <DeviceCodeModal device={device} onClose={() => { cancelledRef.current = true; setSigning(false); setDevice(null); }} />}
     </div>
   );
 }

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

@@ -417,7 +417,7 @@ export default function RepoBranchSwitcher({ project, liveBranch }) {
               <span className="rb-pop-icon"><Icon name="plus" size={14} /></span>
               <span className="rb-pop-tx">
                 <span className="rb-pop-name">New branch</span>
-                <span className="rb-pop-sub">a separate line of work off the current branch</span>
+                <span className="rb-pop-sub">a separate line of work off what you're looking at now</span>
               </span>
             </button>
           </div>
@@ -435,11 +435,11 @@ export default function RepoBranchSwitcher({ project, liveBranch }) {
               <button type="button" className="btn btn--ghost btn--sm" onClick={() => { setNewDraft(false); setDraftName(''); setErr(''); }} disabled={busy}>Cancel</button>
               <button type="button" data-testid="switcher-new-branch-create" className="btn btn--primary btn--sm" onClick={createDraft} disabled={busy || !slug}><Icon name="draft" size={13} /> {busy ? 'Creating…' : 'Create branch'}</button>
             </div>
-            <p className="rb-newdraft-hint">A branch is your own line of work off the current branch. Merge it into {sharedName} when you're happy, or throw it away — nothing else changes.</p>
+            <p className="rb-newdraft-hint">A branch is your own line of work off what you're looking at now. Merge it into {sharedName} when you're happy, or throw it away — nothing else changes.</p>
           </div>
         )}
 
-        {switching ? (
+        {(switching || folding) ? (
           <div className="rb-switching" role="status" aria-live="polite">
             <Icon name="spinner" size={14} className="rb-spin" />
             <span>{folding ? <>Merging <b>{folding}</b> → {sharedName}…</> : downloading ? <>Downloading <b>{switching}</b>…</> : <>Opening <b>{switching}</b>…</>}</span>
@@ -466,7 +466,7 @@ export default function RepoBranchSwitcher({ project, liveBranch }) {
             <span className="rb-sheet-icon"><Icon name="arrow-up-to-line" size={20} /></span>
             <h2 className="rb-sheet-title" id="rb-sheet-title">Merge this branch → {sharedName}</h2>
             <p className="rb-sheet-body" id="rb-sheet-body">Everything in <b>“{currentDraft?.name || branch}”</b> becomes part of <b>{sharedName}</b> — the default branch everyone shares.</p>
-            <p className="rb-sheet-meta">Teammates pick it up the next time they Get latest, and this branch is then deleted. Nothing else changes.</p>
+            <p className="rb-sheet-meta">Your work is now part of {sharedName}, kept in History. Teammates pick it up the next time they Get latest, and the empty branch is cleared away — nothing is lost.</p>
             {err && <p className="rb-newdraft-err">{err}</p>}
             <div className="rb-sheet-actions">
               <button type="button" className="btn btn--ghost" onClick={() => { setFoldConfirm(false); setErr(''); }}>Cancel</button>