Once more with README merges

README.md

···
 ## Conference Profile
 For starters, we're going to have a custom conference profile. Attendees and speakers (and anyone else!) can login and create an extended profile. Inspired by [Discover Toronto](https://discover.toronto.inc/), we had an [initial discussion in the forum](https://discourse.atprotocol.community/t/conference-profiles/186) and are going to work on fleshing this out here with detailed issues.
 
-# Astro Starter Kit: Minimal
+# Astro ATProto OAuth Starter
+
+A minimal [Astro](https://astro.build) starter template demonstrating OAuth authentication with AT Protocol (ATProto), the decentralized social networking protocol used by Bluesky and other services.
+
+This starter includes:
+- Complete OAuth authentication flow using `@atproto/oauth-client-node`
+- Cookie-based session management
+- Profile display after authentication
+- Login/logout endpoints
+- Tailwind CSS and DaisyUI styling
+
+## 🚀 Getting Started
+
+1. **Install dependencies:**
+   ```sh
+   npm install
+   ```
 
-```sh
-npm create astro@latest -- --template minimal
-```
+2. **Configure environment variables:**
+   ```sh
+   cp .env.template .env
+   ```
+   Edit `.env` if you need to change the port (default: 4321) or set a public URL.
 
-> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
+3. **Start the development server:**
+   ```sh
+   npm run dev
+   ```
+   The app will be available at `http://localhost:4321`
 
-## 🚀 Project Structure
+4. **Try logging in:**
+   Enter your AT Protocol handle (e.g., `alice.bsky.social`) to authenticate.
 
-Inside of your Astro project, you'll see the following folders and files:
+## 📁 Project Structure
 
 ```text
 /
 ├── public/
 ├── src/
-│   └── pages/
-│       └── index.astro
+│   ├── lib/
+│   │   ├── context.ts      # OAuth client singleton
+│   │   ├── oauth.ts        # OAuth client configuration
+│   │   ├── session.ts      # Session management
+│   │   └── storage.ts      # Cookie-based stores
+│   ├── pages/
+│   │   ├── api/
+│   │   │   ├── login.ts    # Login endpoint
+│   │   │   ├── logout.ts   # Logout endpoint
+│   │   │   └── oauth/
+│   │   │       └── callback.ts  # OAuth callback handler
+│   │   └── index.astro     # Main page with login UI
+│   └── styles.css
 └── package.json
 ```
-
-Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
-
-There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.
-
-Any static assets, like images, can be placed in the `public/` directory.
 
 ## 🧞 Commands
 
···
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |
 | `npm run astro -- --help` | Get help using the Astro CLI                     |
 
-## 👀 Want to learn more?
+## 📚 Learn More
 
-Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).
+- [Astro Documentation](https://docs.astro.build)
+- [AT Protocol Documentation](https://atproto.com)
+- [@atproto/oauth-client-node](https://github.com/bluesky-social/atproto/tree/main/packages/oauth/oauth-client-node)
+- [Bluesky](https://bsky.app)

src/lib/context.ts

···
-import { NodeOAuthClient } from '@atproto/oauth-client-node'
+import type { AstroCookies } from 'astro'
 import { createOAuthClient } from './oauth'
 
-export type AppContext = {
-  oauthClient: NodeOAuthClient
-}
-
-let _ctx: AppContext | null = null
-
-export async function getAppContext(): Promise<AppContext> {
-  if (_ctx) return _ctx
-
-  const oauthClient = await createOAuthClient()
-
-  _ctx = { oauthClient }
-  return _ctx
+// Create a request-scoped OAuth client with cookie-based storage
+export function getOAuthClient(cookies: AstroCookies) {
+  return createOAuthClient(cookies)
 }

src/lib/oauth.ts

···
+import type { AstroCookies } from 'astro'
 import {
   atprotoLoopbackClientMetadata,
   NodeOAuthClient,
 } from "@atproto/oauth-client-node";
 import { env } from "./env";
-import { SessionStore, StateStore } from "./storage";
+import { CookieSessionStore, CookieStateStore } from "./storage";
 
-export async function createOAuthClient() {
+export function createOAuthClient(cookies: AstroCookies) {
   const clientMetadata = atprotoLoopbackClientMetadata(
     `http://localhost?${new URLSearchParams([
       ["redirect_uri", `http://127.0.0.1:${env.PORT}/api/oauth/callback`],
···
 
   return new NodeOAuthClient({
     clientMetadata,
-    stateStore: new StateStore(),
-    sessionStore: new SessionStore(),
+    stateStore: new CookieStateStore(cookies),
+    sessionStore: new CookieSessionStore(cookies),
   });
 }

src/lib/storage.ts

···
+import type { AstroCookies } from 'astro'
 import type {
   NodeSavedSession,
   NodeSavedSessionStore,
···
   NodeSavedStateStore,
 } from '@atproto/oauth-client-node'
 
-// In-memory storage for OAuth state and sessions
-// For production, you'd want to use a proper database or distributed cache
+// Cookie-based storage for OAuth state and sessions
+// All data is serialized into cookies for stateless operation
 
-export class StateStore implements NodeSavedStateStore {
-  private store = new Map<string, NodeSavedState>()
+export class CookieStateStore implements NodeSavedStateStore {
+  constructor(private cookies: AstroCookies) {}
 
   async get(key: string): Promise<NodeSavedState | undefined> {
-    return this.store.get(key)
+    const cookieName = `oauth_state_${key}`
+    const cookie = this.cookies.get(cookieName)
+    if (!cookie?.value) return undefined
+
+    try {
+      const decoded = atob(cookie.value)
+      return JSON.parse(decoded) as NodeSavedState
+    } catch (err) {
+      console.warn('Failed to decode OAuth state:', err)
+      return undefined
+    }
   }
 
   async set(key: string, val: NodeSavedState) {
-    this.store.set(key, val)
+    const cookieName = `oauth_state_${key}`
+    const encoded = btoa(JSON.stringify(val))
+
+    this.cookies.set(cookieName, encoded, {
+      httpOnly: true,
+      secure: false,
+      sameSite: 'lax',
+      path: '/',
+      maxAge: 60 * 10, // 10 minutes (OAuth flow timeout)
+    })
   }
 
   async del(key: string) {
-    this.store.delete(key)
+    const cookieName = `oauth_state_${key}`
+    this.cookies.delete(cookieName, { path: '/' })
   }
 }
 
-export class SessionStore implements NodeSavedSessionStore {
-  private store = new Map<string, NodeSavedSession>()
+export class CookieSessionStore implements NodeSavedSessionStore {
+  constructor(private cookies: AstroCookies) {}
 
   async get(key: string): Promise<NodeSavedSession | undefined> {
-    return this.store.get(key)
+    const cookieName = `oauth_session_${key}`
+    const cookie = this.cookies.get(cookieName)
+    if (!cookie?.value) return undefined
+
+    try {
+      const decoded = atob(cookie.value)
+      return JSON.parse(decoded) as NodeSavedSession
+    } catch (err) {
+      console.warn('Failed to decode OAuth session:', err)
+      return undefined
+    }
   }
 
   async set(key: string, val: NodeSavedSession) {
-    this.store.set(key, val)
+    const cookieName = `oauth_session_${key}`
+    const encoded = btoa(JSON.stringify(val))
+
+    this.cookies.set(cookieName, encoded, {
+      httpOnly: true,
+      secure: false,
+      sameSite: 'lax',
+      path: '/',
+      maxAge: 60 * 60 * 24 * 30, // 30 days
+    })
   }
 
   async del(key: string) {
-    this.store.delete(key)
+    const cookieName = `oauth_session_${key}`
+    this.cookies.delete(cookieName, { path: '/' })
   }
 }

src/pages/api/login.ts

···
 import type { APIRoute } from 'astro'
-import { getAppContext } from '../../lib/context'
+import { getOAuthClient } from '../../lib/context'
 
-export const POST: APIRoute = async ({ request, redirect }) => {
+export const POST: APIRoute = async ({ request, cookies, redirect }) => {
   try {
-    const ctx = await getAppContext()
+    const oauthClient = getOAuthClient(cookies)
     const formData = await request.formData()
     const handle = formData.get('handle')
 
···
       return new Response('Invalid handle', { status: 400 })
     }
 
-    const url = await ctx.oauthClient.authorize(handle, {
+    const url = await oauthClient.authorize(handle, {
       scope: 'atproto transition:generic',
     })
 

src/pages/api/logout.ts

···
 import type { APIRoute } from 'astro'
-import { getAppContext } from '../../lib/context'
+import { getOAuthClient } from '../../lib/context'
 import { getSession } from '../../lib/session'
 
 export const POST: APIRoute = async (context) => {
   try {
-    const ctx = await getAppContext()
+    const oauthClient = getOAuthClient(context.cookies)
     const session = getSession(context.cookies)
 
     if (session.did) {
       try {
-        const oauthSession = await ctx.oauthClient.restore(session.did)
+        const oauthSession = await oauthClient.restore(session.did)
         if (oauthSession) await oauthSession.signOut()
       } catch (err) {
         console.warn('Failed to revoke credentials:', err)

src/pages/api/oauth/callback.ts

···
 import type { APIRoute } from 'astro'
-import { getAppContext } from '../../../lib/context'
+import { getOAuthClient } from '../../../lib/context'
 import { getSession } from '../../../lib/session'
 
 export const GET: APIRoute = async (context) => {
   try {
-    const ctx = await getAppContext()
+    const oauthClient = getOAuthClient(context.cookies)
     const url = new URL(context.request.url)
     const params = new URLSearchParams(url.search)
 
···
 
     if (session.did) {
       try {
-        const oauthSession = await ctx.oauthClient.restore(session.did)
+        const oauthSession = await oauthClient.restore(session.did)
         if (oauthSession) await oauthSession.signOut()
       } catch (err) {
         console.warn('OAuth restore failed during callback:', err)
       }
     }
 
-    const oauth = await ctx.oauthClient.callback(params)
+    const oauth = await oauthClient.callback(params)
     session.did = oauth.session.did
     await session.save()
 

src/pages/index.astro

···
 ---
 import "../styles.css";
 import { getSession } from "../lib/session";
-import { getAppContext } from "../lib/context";
+import { getOAuthClient } from "../lib/context";
 import { Agent } from "@atproto/api";
 
 const session = getSession(Astro.cookies);
-const ctx = await getAppContext();
+const oauthClient = getOAuthClient(Astro.cookies);
 
 let agent: Agent | null = null;
 let profile: any = null;
 
 if (session.did) {
   try {
-    const oauthSession = await ctx.oauthClient.restore(session.did);
+    const oauthSession = await oauthClient.restore(session.did);
     if (oauthSession) {
       agent = new Agent(oauthSession);