fedipod-server 0.14.0 → 0.15.0

package/web/app/index.html

@@ -13,6 +13,7 @@
   --heading: #123f74; --sub: #565656; --line: #b0b0b0; --accent: #12467e;
   --btn: #3a5f43; --btn-hover: #30503a; --btn-text: #ffffff;
   --field-bg: #ececec; --field-text: #141414; --field-border: #6f6f6f;
+  --select-bg: #dce7f3; --select-border: #12467e;
   --err: #b00020; --warn: #8a4b00; --focus: #12467e;
 }
 @media (prefers-color-scheme: dark) {
@@ -20,6 +21,7 @@
     --bg: #191919; --fg: #f3f3f3;
     --heading: #8fc2f2; --sub: #d2d2d2; --line: #6d6d6d; --accent: #8fc2f2;
     --field-bg: #474747; --field-text: #f5f5f5; --field-border: #9aa0a6;
+    --select-bg: #2f4a66; --select-border: #8fc2f2;
     --btn: #4a7a54; --btn-hover: #3f6a49;
     --err: #ff9b9b; --warn: #ffb366; --focus: #8fc2f2;
   }
@@ -42,6 +44,10 @@ input[type=text], input[type=email], input[type=url], input[type=password], sele
   font: inherit; font-size: 1rem; width: 100%; padding: .55rem; box-sizing: border-box;
   border: 1px solid var(--field-border); border-radius: .3rem;
   background: var(--field-bg); color: var(--field-text); }
+/* A list to pick from looks different from a box to type in: its own tint,
+   the accent border, and the same on its options. */
+select { background: var(--select-bg); border-color: var(--select-border); }
+select option { background: var(--select-bg); color: var(--field-text); }
 ::placeholder { color: var(--sub); opacity: 1; }
 .choice { display: block; margin: .4rem 0; font-weight: normal; }
 .choice input { margin-right: .5rem; width: auto; }
@@ -88,7 +94,7 @@ a { color: var(--accent); }
 <section id="landing" hidden>
   <h2>Already have a FediPod account?</h2>
   <p class="row">
-    <input type="text" id="signin-address" autocapitalize="off" spellcheck="false" placeholder="@me@mypod"
+    <input type="text" id="signin-address" autocomplete="username" autocapitalize="off" spellcheck="false" placeholder="@me@mypod"
       aria-label="Your FediPod address, in the form @you@yourpod">
     <button type="button" class="primary" id="signin">sign in</button>
   </p>
@@ -136,18 +142,42 @@ a { color: var(--accent); }
         </div>
 
         <label for="provider">Pod provider</label>
-        <input type="url" id="provider" name="provider" autocomplete="url" placeholder="https://solidcommunity.net">
+        <!-- The providers listed at https://solidproject.org/get_a_pod that run Community
+             Solid Server, whose account API is what "A new pod" uses. Checked 2026-09-14. -->
+        <select id="provider" name="provider">
+          <option value="https://solidcommunity.net">solidcommunity.net</option>
+          <option value="https://privatedatapod.com">privatedatapod.com</option>
+          <option value="https://solid.redpencil.io">redpencil.io</option>
+          <option value="https://pods.solidcommunity.au">solidcommunity.au</option>
+          <option value="https://solidweb.me">solidweb.me</option>
+          <option value="https://teamid.live">teamid.live</option>
+          <option value="">Other…</option>
+        </select>
+        <div id="provider-other-field" hidden>
+          <label for="providerOther">Provider address</label>
+          <input type="url" id="providerOther" name="providerOther" autocomplete="url" placeholder="https://pods.example.org">
+        </div>
+
+        <div id="podname-field">
+          <label for="podName">Pod username</label>
+          <input type="text" id="podName" name="podName" autocomplete="off" aria-describedby="podname-hint">
+          <p class="hint" id="podname-hint">Depending on your provider's setup, your pod will be at
+            either https://USERNAME.podprovider or https://podprovider/USERNAME.</p>
+        </div>
 
-        <label for="podName">Pod username/subdomain</label>
-        <input type="text" id="podName" name="podName" autocomplete="off" aria-describedby="podname-hint">
-        <p class="hint" id="podname-hint">The subdomain of your pod. On solidcommunity.net, alice
-          becomes the pod https://alice.solidcommunity.net.</p>
+        <div id="pod-field" hidden>
+          <label for="pod">Pod address</label>
+          <input type="url" id="pod" name="pod" autocomplete="url" aria-describedby="pod-hint"
+            placeholder="https://alice.solidcommunity.net/ or https://server.example/alice/">
+          <p class="hint" id="pod-hint">The address of your pod: its own host, or a path on a
+            shared host.</p>
+        </div>
 
-        <label for="email">Pod email</label>
+        <label for="email">Email (used as pod id)</label>
         <input type="email" id="email" name="email" autocomplete="email" placeholder="you@example.org">
 
         <label for="password">Pod password</label>
-        <input type="password" id="password" name="password" autocomplete="current-password"
+        <input type="password" id="password" name="password" autocomplete="new-password"
           aria-describedby="password-hint">
         <p class="hint" id="password-hint">Your password is sent once, to make your account and to
           lock your signing key. It is never stored. The credential used to set things up is
@@ -172,6 +202,14 @@ a { color: var(--accent); }
         <p class="hint" id="handle-hint">The name in your Fediverse address. This is permanent.
           Letters, digits, and hyphens only.</p>
 
+        <div role="radiogroup" aria-labelledby="shape-label" id="shape-group">
+          <span id="shape-label" class="grouplabel">Where your address lives</span>
+          <label class="choice"><input type="radio" name="shape" value="pod" checked> On your pod</label>
+          <label class="choice"><input type="radio" name="shape" value="front"> At this site</label>
+        </div>
+        <p class="hint" id="shape-hint" hidden>Your pod provider uses suffixes, so your only option
+          is to use an account on a gateway like this one.</p>
+
         <span id="addr-label" class="grouplabel">Your Fediverse address</span>
         <p class="address" id="preview" role="status" aria-live="polite" aria-labelledby="addr-label">@…@…</p>
       </fieldset>

package/web/app/keys-browser.mjs

@@ -44,6 +44,10 @@ export async function cacheOpenedKeys(actorUrl, keysRecord) {
 // already relies on. It is what lets the worker boot itself after an idle kill
 // without a soul around to type anything.
 export const keyCacheKey = (actorUrl) => `signing-keys:${actorUrl}`;
+// The cache is keyed by the POD actor, whatever the identity advertises: a
+// fronted identity's advertised actor is the gateway's, and keying by that
+// would hide the opened copy sign-up stored and ask for the password again.
+export const podActorOf = (urls) => (urls.toPod ? urls.toPod(urls.actor) : urls.actor);
 
 // Read the signing key for this actor and import it for signing.
 //
@@ -54,16 +58,17 @@ export const keyCacheKey = (actorUrl) => `signing-keys:${actorUrl}`;
 // there is from before wrapping and is used as it stands, while an envelope
 // needs the password and so has to go back to the page.
 export async function loadKeysFromPod(remote, urls) {
-  const cached = await kvGet(keyCacheKey(urls.actor)).catch(() => null);
+  const podActor = podActorOf(urls);
+  const cached = await kvGet(keyCacheKey(podActor)).catch(() => null);
   if (isOpenedKey(cached)) return fromCache(cached);
   // A copy stored as PEM by an earlier build: import it and store the key form
   // in its place, so the PEM is gone from storage after one boot.
-  if (cached?.rsa?.privatePem) return cacheOpenedKeys(urls.actor, cached);
+  if (cached?.rsa?.privatePem) return cacheOpenedKeys(podActor, cached);
 
   const doc = await podState.readWrappedKeys(remote, urls);
   if (isKeyEnvelope(doc)) throw new KeyPasswordNeeded();
   if (!doc || !doc.rsa) throw new Error('no signing key on the pod — sign up did not finish');
   // A pre-wrapping install. Cache it so the next boot is one read, and leave
   // the pod's copy alone: re-wrapping it would need the password we do not have.
-  return cacheOpenedKeys(urls.actor, doc);
+  return cacheOpenedKeys(podActor, doc);
 }

package/web/app/signup.mjs

@@ -48,9 +48,24 @@ const progressKey = (a) => [a.issuer, a.mode, a.handle, a.mode === 'new' ? (a.po
  * draw the same tick list the CLI setup shows. Resumable: see PROGRESS above.
  *
  * answers: { mode:'new'|'existing', issuer, email, password, handle,
- *            podName?, pod?, gateway? }
+ *            podName?, pod?, gateway?, shape?: 'pod'|'front' }
+ *
+ * `shape` is where the address lives. On the pod, `@handle@yourpod`, with the
+ * gateway as a mail door only — the default. At the gateway, `@handle@front`,
+ * a fronted identity whose documents still live on the pod. A pod on a path of
+ * a shared host cannot answer WebFinger, so it is fronted whatever was asked.
+ *
  * returns: { credential, config, actorUrl, address, keysPublic }
  */
+/** A fronted name is one per gateway; a taken one is refused before anything is made. */
+async function assertFrontNameFree(frontOrigin, handle) {
+  const res = await fetch(`${frontOrigin.replace(/\/$/, '')}/api/handle?handle=${encodeURIComponent(handle)}`,
+    { headers: { accept: 'application/json' } }).catch(() => null);
+  const d = res ? await res.json().catch(() => ({})) : null;
+  if (!d) throw new Error(`${new URL(frontOrigin).host} did not answer whether @${handle} is free`);
+  if (!d.available) throw new Error(d.reason || `the name @${handle}@${new URL(frontOrigin).host} is taken — choose another handle`);
+}
+
 export async function signUp(answers, { onStep = () => {}, frontOrigin = null } = {}) {
   const { mode, issuer, email, password, handle } = answers;
   const bad = handleProblem(handle);
@@ -58,6 +73,10 @@ export async function signUp(answers, { onStep = () => {}, frontOrigin = null }
   if (!email) throw new Error('an email is required');           // recovery + account login
   if (!password) throw new Error('a password is required');
   if (mode === 'existing' && !answers.pod) throw new Error('a pod address is required');
+  const wantsFront = answers.shape === 'front';
+  if (wantsFront && !frontOrigin) throw new Error('an address at the gateway needs a gateway, and this page has none');
+  // A name at the gateway is one per gateway: settle it before making anything.
+  if (wantsFront) await assertFrontNameFree(frontOrigin, handle);
 
   const key = progressKey(answers);
   const prog = PROGRESS.get(key) || {};
@@ -91,17 +110,18 @@ export async function signUp(answers, { onStep = () => {}, frontOrigin = null }
   }
   const pod = prog.pod; const webId = prog.webId || null;
 
-  // WebFinger is answered at a host root, so the address only works if the pod
-  // is the root of its own host. Refuse a path pod rather than making an
-  // account nobody can find.
-  const podUrl = new URL(pod);
-  if (podUrl.pathname !== '/') {
-    throw new Error(`${pod} is a path on ${podUrl.host}, not its own host. `
-      + 'A Fediverse address lives at a host root, so this pod cannot carry one. '
-      + 'Use a pod that is the root of its own subdomain.');
+  // WebFinger is answered only at a host root. A pod on a path of a shared
+  // host therefore takes its address at the gateway, whatever was asked; a
+  // pod at its own root keeps the choice made on the form.
+  const pathPod = new URL(pod).pathname !== '/';
+  const fronted = pathPod || wantsFront;
+  if (fronted && !frontOrigin) {
+    throw new Error(`${pod} is a path on a shared host, so its address must live at a gateway, and this page has none.`);
   }
+  if (pathPod && !wantsFront) await assertFrontNameFree(frontOrigin, handle);
 
-  const actorUrl = actorUrlFor(pod);
+  const actorUrl = actorUrlFor(pod);                              // where the documents live, always
+  const frontActor = fronted ? `${frontOrigin.replace(/\/$/, '')}/u/${handle}/ap/actor` : null;
 
   // --- credential --- (a fresh attempt re-mints; a resumed one reuses it)
   const cred = step('credential');
@@ -143,12 +163,48 @@ export async function signUp(answers, { onStep = () => {}, frontOrigin = null }
   // The opened copy is kept in this browser (IndexedDB) so the worker can boot
   // itself after an idle kill with nobody there to type a password. A browser
   // that has no copy asks for the password once — see boot.mjs.
+  // Connect the gateway (fedipod.net) before the key is made, because a
+  // fronted identity's key is stamped with the gateway actor. Inbox-only: the
+  // actor advertises the door as its inbox and keeps its own ids. Fronted: the
+  // gateway answers WebFinger for @handle@front and serves the actor at its own
+  // address, rewriting reads onto the pod. Either way the door verifies each
+  // delivery and forwards the clean mail to the pod; the agent trusts the
+  // door's receipt. The same DPoP session proves the pod to the gateway — no
+  // password reaches it.
+  let gateway = answers.gateway || prog.gateway || null;
+  if (frontOrigin && !gateway) {
+    const gw = step('gateway');
+    gw.running(fronted ? `taking your address at ${new URL(frontOrigin).host}` : `connecting your mail door on ${new URL(frontOrigin).host}`);
+    const res = await session.fetch(`${frontOrigin.replace(/\/$/, '')}/api/attach`, {
+      method: 'POST', headers: { 'content-type': 'application/json' },
+      // podHome is the AP CONTAINER, not the pod root: the front builds the
+      // delivery target as `podHome + 'ap/inbox/'` (lib/front-core.mjs), so a
+      // bare pod root sends this identity's mail to <pod>/ap/inbox/ — outside
+      // the container the agent drains, where nothing would ever read it. The
+      // manage surface has always sent `urls.home`; this is the same value.
+      body: JSON.stringify({ handle, podHome: `${pod}${AP_ROOT}`, actorUrl, kind: 'person', fronted }),
+    });
+    const d = await res.json().catch(() => ({}));
+    if (res.status !== 201 || !d.hmacSecret) {
+      throw new Error(`could not connect the gateway (HTTP ${res.status}): ${d.error || ''}`);
+    }
+    gateway = fronted
+      ? { url: `${frontOrigin.replace(/\/$/, '')}/u/${handle}/ap/inbox/`, frontActor: String(d.frontActor || frontActor), hmacSecret: d.hmacSecret, mode: 'trust' }
+      : { url: d.doorInbox, hmacSecret: d.hmacSecret, mode: 'trust' };
+    prog.gateway = gateway;
+    gw.ok();
+  } else if (frontOrigin && gateway) {
+    step('gateway').ok();                                        // resumed
+  }
+
   const keysStep = step('keys');
   let keys;
   if (!prog.keysStored) {
     keysStep.running('making your signing key and locking it under your password');
     keys = await generateKeys();
-    keys.mintedFor = actorUrl;                                   // one key, one actor (lib/keys.mjs)
+    // One key, one actor (lib/keys.mjs): the actor the world knows, which for
+    // a fronted identity is the gateway's address for it.
+    keys.mintedFor = gateway?.frontActor || actorUrl;
     const remote = new BrowserRemotePod(session, { webId: credential.webId, role: 'signup', log: () => {} });
     // Owner-only, and THEN the key — one operation, so the order cannot be got
     // wrong here or anywhere else. A pod that refuses the ACL write is not a
@@ -174,34 +230,6 @@ export async function signUp(answers, { onStep = () => {}, frontOrigin = null }
     keysStep.ok();
   }
 
-  // Connect the mail door: attach to the gateway (fedipod.net), inbox-only, so
-  // the actor advertises the door as its inbox. The door verifies each delivery
-  // and forwards the clean mail to the pod; the agent trusts the door's receipt.
-  // The same DPoP session proves the pod to the gateway — no password reaches it.
-  let gateway = answers.gateway || prog.gateway || null;
-  if (frontOrigin && !gateway) {
-    const gw = step('gateway');
-    gw.running(`connecting your mail door on ${new URL(frontOrigin).host}`);
-    const res = await session.fetch(`${frontOrigin.replace(/\/$/, '')}/api/attach`, {
-      method: 'POST', headers: { 'content-type': 'application/json' },
-      // podHome is the AP CONTAINER, not the pod root: the front builds the
-      // delivery target as `podHome + 'ap/inbox/'` (lib/front-core.mjs), so a
-      // bare pod root sends this identity's mail to <pod>/ap/inbox/ — outside
-      // the container the agent drains, where nothing would ever read it. The
-      // manage surface has always sent `urls.home`; this is the same value.
-      body: JSON.stringify({ handle, podHome: `${pod}${AP_ROOT}`, actorUrl, kind: 'person' }),
-    });
-    const d = await res.json().catch(() => ({}));
-    if (res.status !== 201 || !d.hmacSecret) {
-      throw new Error(`could not connect the mail door (HTTP ${res.status}): ${d.error || ''}`);
-    }
-    gateway = { url: d.doorInbox, hmacSecret: d.hmacSecret, mode: 'trust' };
-    prog.gateway = gateway;
-    gw.ok();
-  } else if (frontOrigin && gateway) {
-    step('gateway').ok();                                        // resumed
-  }
-
   const config = {
     remotePod: pod, root: AP_ROOT, handle, name: handle, issuer: credential.issuerOrigin,
     ...(gateway ? { gateway } : {}),
@@ -233,7 +261,7 @@ export async function signUp(answers, { onStep = () => {}, frontOrigin = null }
 
   PROGRESS.delete(key);                                          // finished — nothing left to resume
 
-  const host = new URL(pod).host;
+  const host = gateway?.frontActor ? new URL(gateway.frontActor).host : new URL(pod).host;
   return {
     credential, config, actorUrl,
     address: `@${handle}@${host}`,

package/web/app/site/boot.js

@@ -33025,9 +33025,10 @@ var PodTransport = class {
     return serialize(doc, g, url, "text/turtle");
   }
   async setAcl(targetUrl, publicModes, opts = {}) {
-    const url = await this.aclUrlFor(targetUrl);
+    const podTarget = this.toPod ? this.toPod(targetUrl) : targetUrl;
+    const url = await this.aclUrlFor(podTarget);
     if (!await this.aclWritable(url)) return null;
-    return this.put(url, this.aclDoc(targetUrl, publicModes, { ...opts, aclUrl: url }), "text/turtle");
+    return this.put(url, this.aclDoc(podTarget, publicModes, { ...opts, aclUrl: url }), "text/turtle");
   }
   // Child documents of an LDP container (URLs under it, excluding aux docs).
   // Revalidated: the inbox is polled every couple of minutes and is usually
@@ -33266,6 +33267,15 @@ function handleProblem(handle) {
 }
 var PROGRESS = /* @__PURE__ */ new Map();
 var progressKey = (a) => [a.issuer, a.mode, a.handle, a.mode === "new" ? a.podName || a.handle : a.pod].join("|");
+async function assertFrontNameFree(frontOrigin, handle) {
+  const res = await fetch(
+    `${frontOrigin.replace(/\/$/, "")}/api/handle?handle=${encodeURIComponent(handle)}`,
+    { headers: { accept: "application/json" } }
+  ).catch(() => null);
+  const d = res ? await res.json().catch(() => ({})) : null;
+  if (!d) throw new Error(`${new URL(frontOrigin).host} did not answer whether @${handle} is free`);
+  if (!d.available) throw new Error(d.reason || `the name @${handle}@${new URL(frontOrigin).host} is taken \u2014 choose another handle`);
+}
 async function signUp(answers, { onStep = () => {
 }, frontOrigin = null } = {}) {
   const { mode, issuer, email, password, handle } = answers;
@@ -33274,6 +33284,9 @@ async function signUp(answers, { onStep = () => {
   if (!email) throw new Error("an email is required");
   if (!password) throw new Error("a password is required");
   if (mode === "existing" && !answers.pod) throw new Error("a pod address is required");
+  const wantsFront = answers.shape === "front";
+  if (wantsFront && !frontOrigin) throw new Error("an address at the gateway needs a gateway, and this page has none");
+  if (wantsFront) await assertFrontNameFree(frontOrigin, handle);
   const key = progressKey(answers);
   const prog = PROGRESS.get(key) || {};
   PROGRESS.set(key, prog);
@@ -33305,11 +33318,14 @@ async function signUp(answers, { onStep = () => {
   }
   const pod = prog.pod;
   const webId = prog.webId || null;
-  const podUrl = new URL(pod);
-  if (podUrl.pathname !== "/") {
-    throw new Error(`${pod} is a path on ${podUrl.host}, not its own host. A Fediverse address lives at a host root, so this pod cannot carry one. Use a pod that is the root of its own subdomain.`);
+  const pathPod = new URL(pod).pathname !== "/";
+  const fronted = pathPod || wantsFront;
+  if (fronted && !frontOrigin) {
+    throw new Error(`${pod} is a path on a shared host, so its address must live at a gateway, and this page has none.`);
   }
+  if (pathPod && !wantsFront) await assertFrontNameFree(frontOrigin, handle);
   const actorUrl = actorUrlFor(pod);
+  const frontActor = fronted ? `${frontOrigin.replace(/\/$/, "")}/u/${handle}/ap/actor` : null;
   const cred = step("credential");
   let credential;
   if (!prog.credential) {
@@ -33324,12 +33340,36 @@ async function signUp(answers, { onStep = () => {
     cred.ok();
   }
   const session = await makeDpopSession(credential);
+  let gateway = answers.gateway || prog.gateway || null;
+  if (frontOrigin && !gateway) {
+    const gw = step("gateway");
+    gw.running(fronted ? `taking your address at ${new URL(frontOrigin).host}` : `connecting your mail door on ${new URL(frontOrigin).host}`);
+    const res = await session.fetch(`${frontOrigin.replace(/\/$/, "")}/api/attach`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      // podHome is the AP CONTAINER, not the pod root: the front builds the
+      // delivery target as `podHome + 'ap/inbox/'` (lib/front-core.mjs), so a
+      // bare pod root sends this identity's mail to <pod>/ap/inbox/ — outside
+      // the container the agent drains, where nothing would ever read it. The
+      // manage surface has always sent `urls.home`; this is the same value.
+      body: JSON.stringify({ handle, podHome: `${pod}${AP_ROOT}`, actorUrl, kind: "person", fronted })
+    });
+    const d = await res.json().catch(() => ({}));
+    if (res.status !== 201 || !d.hmacSecret) {
+      throw new Error(`could not connect the gateway (HTTP ${res.status}): ${d.error || ""}`);
+    }
+    gateway = fronted ? { url: `${frontOrigin.replace(/\/$/, "")}/u/${handle}/ap/inbox/`, frontActor: String(d.frontActor || frontActor), hmacSecret: d.hmacSecret, mode: "trust" } : { url: d.doorInbox, hmacSecret: d.hmacSecret, mode: "trust" };
+    prog.gateway = gateway;
+    gw.ok();
+  } else if (frontOrigin && gateway) {
+    step("gateway").ok();
+  }
   const keysStep = step("keys");
   let keys;
   if (!prog.keysStored) {
     keysStep.running("making your signing key and locking it under your password");
     keys = await generateKeys();
-    keys.mintedFor = actorUrl;
+    keys.mintedFor = gateway?.frontActor || actorUrl;
     const remote = new BrowserRemotePod(session, { webId: credential.webId, role: "signup", log: () => {
     } });
     try {
@@ -33349,30 +33389,6 @@ async function signUp(answers, { onStep = () => {
     keys = prog.keys;
     keysStep.ok();
   }
-  let gateway = answers.gateway || prog.gateway || null;
-  if (frontOrigin && !gateway) {
-    const gw = step("gateway");
-    gw.running(`connecting your mail door on ${new URL(frontOrigin).host}`);
-    const res = await session.fetch(`${frontOrigin.replace(/\/$/, "")}/api/attach`, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      // podHome is the AP CONTAINER, not the pod root: the front builds the
-      // delivery target as `podHome + 'ap/inbox/'` (lib/front-core.mjs), so a
-      // bare pod root sends this identity's mail to <pod>/ap/inbox/ — outside
-      // the container the agent drains, where nothing would ever read it. The
-      // manage surface has always sent `urls.home`; this is the same value.
-      body: JSON.stringify({ handle, podHome: `${pod}${AP_ROOT}`, actorUrl, kind: "person" })
-    });
-    const d = await res.json().catch(() => ({}));
-    if (res.status !== 201 || !d.hmacSecret) {
-      throw new Error(`could not connect the mail door (HTTP ${res.status}): ${d.error || ""}`);
-    }
-    gateway = { url: d.doorInbox, hmacSecret: d.hmacSecret, mode: "trust" };
-    prog.gateway = gateway;
-    gw.ok();
-  } else if (frontOrigin && gateway) {
-    step("gateway").ok();
-  }
   const config = {
     remotePod: pod,
     root: AP_ROOT,
@@ -33397,7 +33413,7 @@ async function signUp(answers, { onStep = () => {
     onStep("credential", "ok", "this browser is ready (the setup credential could not be revoked automatically \u2014 you can remove it from your pod's account page)");
   }
   PROGRESS.delete(key);
-  const host = new URL(pod).host;
+  const host = gateway?.frontActor ? new URL(gateway.frontActor).host : new URL(pod).host;
   return {
     credential,
     config,
@@ -33425,6 +33441,45 @@ async function readIssuer(actorUrl, fetchImpl = fetch) {
   }
 }
 
+// lib/pod/urls.mjs
+function podBaseOfWebId(webId) {
+  const u = new URL(webId);
+  u.hash = "";
+  u.search = "";
+  const dir = u.pathname.replace(/profile\/card$/u, "").replace(/[^/]*$/u, "");
+  return `${u.origin}${dir.endsWith("/") ? dir : dir + "/"}`;
+}
+
+// lib/pod/root.mjs
+var OWNER_LOOKUP_MS = 5e3;
+var PUBLIC_DOC_MAX_BYTES = 1024 * 1024;
+async function podLayout(fetchImpl, providerOrigin, { timeoutMs = OWNER_LOOKUP_MS } = {}) {
+  let origin;
+  try {
+    origin = new URL(providerOrigin).origin;
+  } catch {
+    return null;
+  }
+  let res;
+  try {
+    res = await fetchImpl(
+      `${origin}/.well-known/solid`,
+      { headers: { accept: "text/turtle" }, signal: AbortSignal.timeout(timeoutMs) }
+    );
+  } catch {
+    return null;
+  }
+  if (res.status === 501) return "host";
+  if (res.status !== 200) return null;
+  let body = "";
+  try {
+    body = await readCapped(res, 64 * 1024);
+  } catch {
+    return null;
+  }
+  return /ns\/pim\/space#Storage|pim:Storage/u.test(body) ? "path" : null;
+}
+
 // web/app/oidc-session.mjs
 var DB2 = "fedipod-oidc";
 var STORE = "session";
@@ -33674,7 +33729,7 @@ window.fedipodUnlock = async (password) => {
   if (!password) throw new Error("Enter your account password.");
   const session = await getSession();
   if (!session) throw new Error("Sign in first.");
-  const podFromWebId = new URL(session.webId).origin + "/";
+  const podFromWebId = podBaseOfWebId(session.webId);
   const state = `${podFromWebId}${AP_ROOT}ap-state/`;
   const remote = new BrowserRemotePod(session, { webId: session.webId, role: "signup", log: () => {
   } });
@@ -33711,16 +33766,30 @@ async function issuerForPod(pod) {
     if (authz) return new URL(authz).origin;
   } catch {
   }
-  const host = new URL(pod).host;
-  const parent = host.split(".").slice(1).join(".");
-  return `https://${parent || host}`;
+  const u = new URL(pod);
+  if (u.pathname !== "/") return u.origin;
+  const parent = u.host.split(".").slice(1).join(".");
+  return `https://${parent || u.host}`;
+}
+async function podForFrontedAddress(handle) {
+  const res = await fetch(
+    `/.well-known/webfinger?resource=${encodeURIComponent(`acct:${handle}@${location.host}`)}`,
+    { headers: { accept: "application/jrd+json, application/json" } }
+  ).catch(() => null);
+  if (!res || res.status >= 400) throw new Error(`nobody at this site is called @${handle}@${location.host}`);
+  const doc = await res.json().catch(() => ({}));
+  const podActorId = (doc.aliases || []).find((a) => /\/ap\/actor$/u.test(String(a)));
+  if (!podActorId) throw new Error(`@${handle}@${location.host} lives here but names no pod to sign in to`);
+  const tail = `${AP_ROOT}ap/actor`;
+  if (!podActorId.endsWith(tail)) throw new Error(`the pod actor ${podActorId} is not where a FediPod pod keeps one`);
+  return podActorId.slice(0, -tail.length);
 }
 window.fedipodSignin = async ({ address }) => {
   const parsed = parseAddress(address);
   if (!parsed) throw new Error("Enter your address as @you@yourpod (for example @alice@alice.solidcommunity.net).");
   const bad = handleProblem(parsed.handle);
   if (bad) throw new Error(bad);
-  const pod = `https://${parsed.host}/`;
+  const pod = parsed.host === location.host.toLowerCase() ? await podForFrontedAddress(parsed.handle) : `https://${parsed.host}/`;
   const issuer = await issuerForPod(pod);
   const { authorizationUrl } = await beginLogin({ issuer, redirectUri: REDIRECT });
   location.href = authorizationUrl;
@@ -33866,8 +33935,8 @@ ${e.detail}` : "");
   });
   const f = () => $("form").elements;
   const providerUrl = () => {
-    let v = f().provider.value.trim();
-    if (!v) v = "https://solidcommunity.net";
+    let v = (f().provider.value || f().providerOther.value).trim();
+    if (!v) return "";
     if (!/^https?:\/\//i.test(v)) v = "https://" + v;
     return v;
   };
@@ -33883,6 +33952,42 @@ ${e.detail}` : "");
     const ph = providerHost();
     return sub && ph ? `${sub}.${ph}` : "";
   };
+  const podUrl = () => {
+    let v = f().pod.value.trim();
+    if (!v) return "";
+    if (!/^https?:\/\//i.test(v)) v = "https://" + v;
+    if (!v.endsWith("/")) v += "/";
+    try {
+      return new URL(v).href;
+    } catch {
+      return "";
+    }
+  };
+  const isPathPod = (u) => {
+    try {
+      return new URL(u).pathname !== "/";
+    } catch {
+      return false;
+    }
+  };
+  const layouts = /* @__PURE__ */ new Map();
+  let layout = null;
+  const learnLayout = async () => {
+    const origin = providerHost() ? new URL(providerUrl()).origin : "";
+    if (!origin) {
+      layout = null;
+      return;
+    }
+    if (!layouts.has(origin)) layouts.set(origin, podLayout(fetch, origin).catch(() => null));
+    const known = await layouts.get(origin);
+    if (providerHost() && new URL(providerUrl()).origin === origin) {
+      layout = known;
+      applyShape();
+      previewAddr();
+    }
+  };
+  const pathPod = () => f().mode.value === "existing" ? isPathPod(podUrl()) : layout === "path";
+  const shape = () => pathPod() ? "front" : f().shape.value;
   const answers = () => {
     const mode = f().mode.value;
     const a = {
@@ -33890,18 +33995,43 @@ ${e.detail}` : "");
       handle: f().handle.value.trim().toLowerCase(),
       email: f().email.value.trim(),
       password: f().password.value,
-      issuer: providerUrl()
+      issuer: providerUrl(),
+      shape: shape()
     };
     if (mode === "new") a.podName = f().podName.value.trim().toLowerCase();
-    else a.pod = `https://${podHostOf()}/`;
+    else a.pod = podUrl();
     return a;
   };
   const previewAddr = () => {
     const handle = f().handle.value.trim().toLowerCase();
-    const ph = podHostOf();
-    $("preview").textContent = handle && ph ? `@${handle}@${ph}` : "@\u2026@\u2026";
+    const host = shape() === "front" ? location.host : f().mode.value === "existing" ? podUrl() ? new URL(podUrl()).host : "" : podHostOf();
+    $("preview").textContent = handle && host ? `@${handle}@${host}` : "@\u2026@\u2026";
+  };
+  const applyShape = () => {
+    const fixed = pathPod();
+    for (const r of f().shape) {
+      if (fixed) r.checked = r.value === "front";
+    }
+    $("shape-group").hidden = fixed;
+    $("shape-hint").hidden = !fixed;
   };
-  for (const el of $("form").elements) el.addEventListener("input", previewAddr);
+  const applyMode = () => {
+    const existing = f().mode.value === "existing";
+    $("pod-field").hidden = !existing;
+    $("podname-field").hidden = existing;
+    $("provider-other-field").hidden = f().provider.value !== "";
+  };
+  for (const el of $("form").elements) for (const evt of ["input", "change"]) el.addEventListener(evt, () => {
+    applyMode();
+    applyShape();
+    previewAddr();
+  });
+  for (const evt of ["input", "change"]) {
+    $("provider").addEventListener(evt, learnLayout);
+    $("providerOther").addEventListener(evt, learnLayout);
+  }
+  applyMode();
+  learnLayout();
   const STEP_IDS = ["step-1", "step-2"];
   const FOCUS = { 1: "provider", 2: "handle" };
   const goStep = (n) => {
@@ -33910,15 +34040,23 @@ ${e.detail}` : "");
     });
     $("err-1").textContent = "";
     $("form-error").textContent = "";
-    if (n === 2) previewAddr();
+    if (n === 2) {
+      applyShape();
+      previewAddr();
+      learnLayout();
+    }
     if (FOCUS[n]) $(FOCUS[n]).focus();
   };
   const validateStep1 = () => {
-    if (!providerHost()) return "A valid pod provider URL is required.";
-    const sub = f().podName.value.trim().toLowerCase();
-    if (!sub) return "A pod username/subdomain is required.";
-    const sp = window.fedipodHandleProblem(sub);
-    if (sp) return `Pod username: ${sp}`;
+    if (!providerHost()) return f().provider.value === "" ? "A pod provider address is required under Other\u2026." : "A valid pod provider URL is required.";
+    if (f().mode.value === "existing") {
+      if (!podUrl()) return "A pod address is required, like https://alice.solidcommunity.net/ or https://server.example/alice/.";
+    } else {
+      const sub = f().podName.value.trim().toLowerCase();
+      if (!sub) return "A pod username/subdomain is required.";
+      const sp = window.fedipodHandleProblem(sub);
+      if (sp) return `Pod username: ${sp}`;
+    }
     if (!f().email.value.trim()) return "A pod email is required.";
     if (!f().password.value) return "A pod password is required.";
     return null;