v0.1.9: Production deployment ready

🚀 Production Features
- Console output cleanup: Removed all console.log/warn/error from OAuth app
- Clean UI: Removed debug info divs from production build
- Warning-free builds: Fixed all Rust compilation warnings

🔧 Authentication & Stream Improvements
- Enhanced password authentication with PDS specification support
- Fixed AI DID resolution: Now correctly uses ai.syui.ai (did:plc:6qyecktefllvenje24fcxnie)
- Improved project directory config loading for ailog stream commands
- Added user list initialization commands with proper PDS detection

📚 Documentation
- Complete command reference in docs/commands.md
- Architecture documentation in docs/architecture.md
- Getting started guide in docs/getting-started.md

🛠️ Technical Improvements
- Project-aware AI config loading from config.toml
- Runtime DID resolution for OAuth app
- Proper handle/DID distinction across all components
- Enhanced error handling with clean user feedback

🔐 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>

.claude/settings.local.json

@@ -48,7 +48,10 @@
       "Bash(git tag:*)",
       "Bash(../bin/ailog:*)",
       "Bash(../target/release/ailog oauth build:*)",
-      "Bash(ailog:*)"
+      "Bash(ailog:*)",
+      "WebFetch(domain:plc.directory)",
+      "WebFetch(domain:atproto.com)",
+      "WebFetch(domain:syu.is)"
     ],
     "deny": []
   }

.gitignore

@@ -5,7 +5,6 @@
 *.swo
 *~
 .DS_Store
-cloudflare-config.yml
 my-blog/public/
 dist
 node_modules
@@ -13,3 +12,8 @@ package-lock.json
 my-blog/static/assets/comment-atproto-*
 bin/ailog
 docs
+my-blog/static/index.html
+my-blog/templates/oauth-assets.html
+cloudflared-config.yml
+.config
+oauth-server-example

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ailog"
-version = "0.1.7"
+version = "0.1.9"
 edition = "2021"
 authors = ["syui"]
 description = "A static blog generator with AI features"
@@ -49,6 +49,7 @@ regex = "1.0"
 tokio-tungstenite = { version = "0.21", features = ["rustls-tls-webpki-roots", "connect"], default-features = false }
 futures-util = "0.3"
 tungstenite = { version = "0.21", features = ["rustls-tls-webpki-roots"], default-features = false }
+rpassword = "7.3"
 
 [dev-dependencies]
 tempfile = "3.14"

Dockerfile

@@ -1,32 +0,0 @@
-# Multi-stage build for ailog
-FROM rust:1.75 as builder
-
-WORKDIR /usr/src/app
-COPY Cargo.toml Cargo.lock ./
-COPY src ./src
-
-RUN cargo build --release
-
-FROM debian:bookworm-slim
-
-# Install runtime dependencies
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app
-
-# Copy the binary
-COPY --from=builder /usr/src/app/target/release/ailog /usr/local/bin/ailog
-
-# Copy blog content
-COPY my-blog ./blog
-
-# Build static site
-RUN ailog build blog
-
-# Expose port
-EXPOSE 8080
-
-# Run server
-CMD ["ailog", "serve", "blog"]

action.yml

@@ -1,128 +0,0 @@
-name: 'ailog Static Site Generator'
-description: 'AI-powered static blog generator with atproto integration'
-author: 'syui'
-
-branding:
-  icon: 'book-open'
-  color: 'orange'
-
-inputs:
-  content-dir:
-    description: 'Content directory containing markdown files'
-    required: false
-    default: 'content'
-  output-dir:
-    description: 'Output directory for generated site'
-    required: false
-    default: 'public'
-  template-dir:
-    description: 'Template directory'
-    required: false
-    default: 'templates'
-  static-dir:
-    description: 'Static assets directory'
-    required: false
-    default: 'static'
-  config-file:
-    description: 'Configuration file path'
-    required: false
-    default: 'ailog.toml'
-  ai-integration:
-    description: 'Enable AI features'
-    required: false
-    default: 'true'
-  atproto-integration:
-    description: 'Enable atproto/OAuth features'
-    required: false
-    default: 'true'
-
-outputs:
-  site-url:
-    description: 'Generated site URL'
-    value: ${{ steps.generate.outputs.site-url }}
-  build-time:
-    description: 'Build time in seconds'
-    value: ${{ steps.generate.outputs.build-time }}
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Cache ailog binary
-      uses: actions/cache@v4
-      with:
-        path: ./bin
-        key: ailog-bin-${{ runner.os }}
-        restore-keys: |
-          ailog-bin-${{ runner.os }}
-    
-    - name: Setup ailog binary
-      shell: bash
-      run: |
-        # Check if pre-built binary exists
-        if [ -f "./bin/ailog-linux-x86_64" ]; then
-          echo "Using pre-built binary from repository"
-          chmod +x ./bin/ailog-linux-x86_64
-          CURRENT_VERSION=$(./bin/ailog-linux-x86_64 --version 2>/dev/null || echo "unknown")
-          echo "Binary version: $CURRENT_VERSION"
-        else
-          echo "No pre-built binary found, trying to build from source..."
-          if command -v cargo >/dev/null 2>&1; then
-            cargo build --release
-            mkdir -p ./bin
-            cp ./target/release/ailog ./bin/ailog-linux-x86_64
-            echo "Built from source: $(./bin/ailog-linux-x86_64 --version 2>/dev/null)"
-          else
-            echo "Error: No binary found and cargo not available"
-            exit 1
-          fi
-        fi
-        
-    - name: Setup Node.js for OAuth app
-      if: ${{ inputs.atproto-integration == 'true' }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: '20'
-        
-    - name: Build OAuth app
-      if: ${{ inputs.atproto-integration == 'true' }}
-      shell: bash
-      run: |
-        if [ -d "oauth" ]; then
-          cd oauth
-          npm install
-          npm run build
-          cp -r dist/* ../${{ inputs.static-dir }}/
-        fi
-        
-    - name: Generate site
-      id: generate
-      shell: bash
-      run: |
-        start_time=$(date +%s)
-        
-        # Change to blog directory and run build
-        # Note: ailog build only takes a path argument, not options
-        if [ -d "my-blog" ]; then
-          cd my-blog
-          ../bin/ailog-linux-x86_64 build
-        else
-          # If no my-blog directory, use current directory
-          ./bin/ailog-linux-x86_64 build .
-        fi
-          
-        end_time=$(date +%s)
-        build_time=$((end_time - start_time))
-        
-        echo "build-time=${build_time}" >> $GITHUB_OUTPUT
-        echo "site-url=file://$(pwd)/${{ inputs.output-dir }}" >> $GITHUB_OUTPUT
-        
-    - name: Display build summary
-      shell: bash
-      run: |
-        echo "✅ ailog build completed successfully"
-        echo "📁 Output directory: ${{ inputs.output-dir }}"
-        echo "⏱️ Build time: ${{ steps.generate.outputs.build-time }}s"
-        if [ -d "${{ inputs.output-dir }}" ]; then
-          echo "📄 Generated files:"
-          find ${{ inputs.output-dir }} -type f | head -10
-        fi

ai_prompt.txt

@@ -1 +0,0 @@
-あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。

cloudflared-config.yml

@@ -1,18 +0,0 @@
-tunnel: ec5a422d-7678-4e73-bf38-6105ffd4766a
-credentials-file: /Users/syui/.cloudflared/ec5a422d-7678-4e73-bf38-6105ffd4766a.json
-
-ingress:
-  - hostname: log.syui.ai
-    service: http://localhost:4173
-    originRequest:
-      noHappyEyeballs: true
- 
-  - hostname: ollama.syui.ai
-    service: http://localhost:11434
-    originRequest:
-      noHappyEyeballs: true
-      httpHostHeader: "localhost:11434"
-      # Cloudflare Accessを無効化する場合は以下をコメントアウト
-      # accessPolicy: bypass
-      
-  - service: http_status:404

my-blog/config.toml

@@ -19,11 +19,13 @@ provider = "ollama"
 model = "gemma3:4b"
 host = "https://ollama.syui.ai"
 system_prompt = "あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"
-ai_did = "did:plc:4hqjfn7m6n5hno3doamuhgef"
+handle = "ai.syui.ai"
+#num_predict = 200
 
 [oauth]
 json = "client-metadata.json"
 redirect = "oauth/callback"
-admin = "did:plc:uqzpqmrjnptsxezjx4xuh2mn"
+admin = "ai.syui.ai"
 collection = "ai.syui.log"
-bsky_api = "https://public.api.bsky.app"
+pds = "syu.is"
+handle_list = ["syui.syui.ai", "yui.syui.ai", "ai.syui.ai", "syui.syu.is", "ai.syu.is", "ai.ai"]

my-blog/content/posts/2025-06-06-ailog.md

@@ -57,24 +57,28 @@ $ npm run build
 $ npm run preview
 ```
 
-```sh
+```sh:ouath/.env.production
 # Production environment variables
-VITE_APP_HOST=https://example.com
+VITE_APP_HOST=https://syui.ai
-VITE_OAUTH_CLIENT_ID=https://example.com/client-metadata.json
+VITE_OAUTH_CLIENT_ID=https://syui.ai/client-metadata.json
-VITE_OAUTH_REDIRECT_URI=https://example.com/oauth/callback
+VITE_OAUTH_REDIRECT_URI=https://syui.ai/oauth/callback
 VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn
 
-# Collection names for OAuth app
+# Base collection (all others are derived via getCollectionNames)
-VITE_COLLECTION_COMMENT=ai.syui.log
+VITE_OAUTH_COLLECTION=ai.syui.log
-VITE_COLLECTION_USER=ai.syui.log.user
-VITE_COLLECTION_CHAT=ai.syui.log.chat
 
-# Collection names for ailog (backward compatibility)
+# AI Configuration
-AILOG_COLLECTION_COMMENT=ai.syui.log
+VITE_AI_ENABLED=true
-AILOG_COLLECTION_USER=ai.syui.log.user
+VITE_AI_ASK_AI=true
+VITE_AI_PROVIDER=ollama
+VITE_AI_MODEL=gemma3:4b
+VITE_AI_HOST=https://ollama.syui.ai
+VITE_AI_SYSTEM_PROMPT="ai"
+VITE_AI_DID=did:plc:4hqjfn7m6n5hno3doamuhgef
 
 # API Configuration
 VITE_BSKY_PUBLIC_API=https://public.api.bsky.app
+VITE_ATPROTO_API=https://bsky.social
 ```
 
 これは`ailog oauth build my-blog`で`./my-blog/config.toml`から`./oauth/.env.production`が生成されます。
@@ -115,15 +119,8 @@ $ cloudflared tunnel --config cloudflared-config.yml run
 $ cloudflared tunnel route dns ${uuid} example.com
 ```
 
-以下の2つのcollection recordを生成します。ユーザーには`ai.syui.log`が生成され、ここにコメントが記録されます。それを取得して表示しています。`ai.syui.log.user`は管理者である`VITE_ADMIN_DID`用です。
-
 ```sh
-VITE_COLLECTION_COMMENT=ai.syui.log
+$ ailog auth init
-VITE_COLLECTION_USER=ai.syui.log.user
-```
-
-```sh
-$ ailog auth login
 $ ailog stream server
 ```
 
@@ -135,8 +132,9 @@ $ ailog stream server
 
 `ask-AI`の仕組みは割愛します。後に変更される可能性が高いと思います。
 
-local llm, mcp, atprotoと組み合わせです。
+`llm`, `mcp`, `atproto`などの組み合わせです。
 
+現在、`/index.json`を監視して、更新があれば、翻訳などを行い自動ポストする機能があります。
 
 ## code syntax
 

my-blog/oauth/.env.production

@@ -0,0 +1,20 @@
+# Production environment variables
+VITE_APP_HOST=https://syui.ai
+VITE_OAUTH_CLIENT_ID=https://syui.ai/client-metadata.json
+VITE_OAUTH_REDIRECT_URI=https://syui.ai/oauth/callback
+
+# Handle-based Configuration (DIDs resolved at runtime)
+VITE_ATPROTO_PDS=syu.is
+VITE_ADMIN_HANDLE=ai.syui.ai
+VITE_AI_HANDLE=ai.syui.ai
+VITE_OAUTH_COLLECTION=ai.syui.log
+VITE_ATPROTO_WEB_URL=https://bsky.app
+VITE_ATPROTO_HANDLE_LIST=["syui.syui.ai", "yui.syui.ai", "ai.syui.ai", "syui.syu.is", "ai.syu.is", "ai.ai"]
+
+# AI Configuration
+VITE_AI_ENABLED=true
+VITE_AI_ASK_AI=true
+VITE_AI_PROVIDER=ollama
+VITE_AI_MODEL=gemma3:4b
+VITE_AI_HOST=https://ollama.syui.ai
+VITE_AI_SYSTEM_PROMPT="あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"

my-blog/static/css/style.css

@@ -248,7 +248,7 @@ a.view-markdown:any-link {
 }
 
 .post-title a {
-    color: #1f2328;
+    color: var(--theme-color);
     text-decoration: none;
     font-size: 18px;
     font-weight: 600;
@@ -822,6 +822,13 @@ article.article-content {
     }
     
     .comment-section {
+        max-width: 100% !important;
+        padding: 0px !important;
+        margin: 0px !important;
+    }
+    
+    .comment-container {
+        max-width: 100% !important;
         padding: 0px !important;
         margin: 0px !important;
     }

my-blog/static/index.html

@@ -1,3 +0,0 @@
-<!-- OAuth Comment System - Load globally for session management -->
-<script type="module" crossorigin src="/assets/comment-atproto-mfW-OeY_.js"></script>
-<link rel="stylesheet" crossorigin href="/assets/comment-atproto-Cm5qR-aM.css">

my-blog/static/js/ask-ai.js

@@ -253,6 +253,20 @@ function setupAskAIEventListeners() {
         handleAIResponse(event.detail);
     });
     
+    // Track IME composition state
+    let isComposing = false;
+    const aiQuestionInput = document.getElementById('aiQuestion');
+    
+    if (aiQuestionInput) {
+        aiQuestionInput.addEventListener('compositionstart', function() {
+            isComposing = true;
+        });
+        
+        aiQuestionInput.addEventListener('compositionend', function() {
+            isComposing = false;
+        });
+    }
+    
     // Keyboard shortcuts
     document.addEventListener('keydown', function(e) {
         if (e.key === 'Escape') {
@@ -263,7 +277,7 @@ function setupAskAIEventListeners() {
         }
         
         // Enter key to send message (only when not composing Japanese input)
-        if (e.key === 'Enter' && e.target.id === 'aiQuestion' && !e.shiftKey && !e.isComposing) {
+        if (e.key === 'Enter' && e.target.id === 'aiQuestion' && !e.shiftKey && !isComposing) {
             e.preventDefault();
             askQuestion();
         }

my-blog/templates/base.html

@@ -82,7 +82,7 @@
     
     <footer class="main-footer">
         <div class="footer-social">
-            <a href="https://web.syu.is/@syui" target="_blank"><i class="fab fa-bluesky"></i></a>
+            <a href="https://syu.is/syui" target="_blank"><i class="fab fa-bluesky"></i></a>
             <a href="https://git.syui.ai/ai" target="_blank"><span class="icon-ai"></span></a>
             <a href="https://git.syui.ai/syui" target="_blank"><span class="icon-git"></span></a>
         </div>

my-blog/templates/index.html

@@ -20,19 +20,6 @@
                     <a href="{{ post.url }}">{{ post.title }}</a>
                 </h3>
                 
-                {% if post.excerpt %}
-                <p class="post-excerpt">{{ post.excerpt }}</p>
-                {% endif %}
-                
-                <div class="post-actions">
-                    <a href="{{ post.url }}" class="read-more">Read more</a>
-                    {% if post.markdown_url %}
-                    <a href="{{ post.markdown_url }}" class="view-markdown" title="View Markdown">.md</a>
-                    {% endif %}
-                    {% if post.translation_url %}
-                    <a href="{{ post.translation_url }}" class="view-translation" title="View Translation">🌐</a>
-                    {% endif %}
-                </div>
             </div>
         </article>
         {% endfor %}

my-blog/templates/oauth-assets.html

@@ -1,3 +0,0 @@
-<!-- OAuth Comment System - Load globally for session management -->
-<script type="module" crossorigin src="/assets/comment-atproto-mfW-OeY_.js"></script>
-<link rel="stylesheet" crossorigin href="/assets/comment-atproto-Cm5qR-aM.css">

oauth/.env.production

@@ -2,10 +2,14 @@
 VITE_APP_HOST=https://syui.ai
 VITE_OAUTH_CLIENT_ID=https://syui.ai/client-metadata.json
 VITE_OAUTH_REDIRECT_URI=https://syui.ai/oauth/callback
-VITE_ADMIN_DID=did:plc:uqzpqmrjnptsxezjx4xuh2mn
 
-# Base collection (all others are derived via getCollectionNames)
+# Handle-based Configuration (DIDs resolved at runtime)
+VITE_ATPROTO_PDS=syu.is
+VITE_ADMIN_HANDLE=ai.syui.ai
+VITE_AI_HANDLE=ai.syui.ai
 VITE_OAUTH_COLLECTION=ai.syui.log
+VITE_ATPROTO_WEB_URL=https://bsky.app
+VITE_ATPROTO_HANDLE_LIST=["syui.syui.ai","yui.syui.ai","syui.syu.is","ai.syu.is"]
 
 # AI Configuration
 VITE_AI_ENABLED=true
@@ -14,8 +18,4 @@ VITE_AI_PROVIDER=ollama
 VITE_AI_MODEL=gemma3:4b
 VITE_AI_HOST=https://ollama.syui.ai
 VITE_AI_SYSTEM_PROMPT="あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"
-VITE_AI_DID=did:plc:4hqjfn7m6n5hno3doamuhgef
 
-# API Configuration
-VITE_BSKY_PUBLIC_API=https://public.api.bsky.app
-VITE_ATPROTO_API=https://bsky.social

oauth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicard",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "scripts": {
     "dev": "vite --mode development",

oauth/src/App.css

@@ -168,7 +168,14 @@
 }
 
 @media (max-width: 1000px) {
+  * {
+    max-width: 100% !important;
+    box-sizing: border-box !important;
+  }
+  
   .app .app-main {
+    max-width: 100% !important;
+    margin: 0 !important;
     padding: 0px !important;
   }
   
@@ -186,8 +193,8 @@
   }
   
   .comment-section {
-    padding: 0px !important;
+				padding: 30px 0 !important;
-    margin: 0px !important;
+				margin: 0px !important;
   }
   
   .comment-content {
@@ -209,6 +216,7 @@
   /* Ensure full width on mobile */
   .app {
     max-width: 100vw !important;
+    overflow-x: hidden !important;
   }
   
   /* Fix button overflow */
@@ -324,6 +332,14 @@
   /* padding: 20px; - removed to avoid double padding */
 }
 
+@media (max-width: 768px) {
+  .comment-section {
+    max-width: 100%;
+    margin: 0;
+    padding: 0;
+  }
+}
+
 
 .auth-section {
   background: #f8f9fa;
@@ -334,6 +350,38 @@
   text-align: center;
 }
 
+.auth-section.search-bar-layout {
+  display: flex;
+  align-items: center;
+  padding: 10px;
+  gap: 10px;
+}
+
+.auth-section.search-bar-layout .handle-input {
+  flex: 1;
+  margin: 0;
+  padding: 10px 15px;
+  font-size: 16px;
+  border: 1px solid #dee2e6;
+  border-radius: 6px 0 0 6px;
+  background: white;
+  outline: none;
+  transition: border-color 0.2s;
+}
+
+.auth-section.search-bar-layout .handle-input:focus {
+  border-color: var(--theme-color);
+}
+
+.auth-section.search-bar-layout .atproto-button {
+  margin: 0;
+  padding: 10px 20px;
+  border-radius: 0 6px 6px 0;
+  min-width: 50px;
+  font-weight: bold;
+  height: auto;
+}
+
 .atproto-button {
   background: var(--theme-color);
   color: var(--white);
@@ -367,6 +415,30 @@
   text-align: center;
 }
 
+/* Override for search bar layout */
+.search-bar-layout .handle-input {
+  width: auto;
+  text-align: left;
+}
+
+/* Mobile responsive for search bar */
+@media (max-width: 480px) {
+  .auth-section.search-bar-layout {
+    flex-direction: column;
+    gap: 8px;
+  }
+  
+  .auth-section.search-bar-layout .handle-input {
+    width: 100%;
+    border-radius: 6px;
+  }
+  
+  .auth-section.search-bar-layout .atproto-button {
+    width: 100%;
+    border-radius: 6px;
+  }
+}
+
 .auth-hint {
   color: #6c757d;
   font-size: 14px;
@@ -913,4 +985,4 @@
 
 .chat-message.comment-style {
   border-left: 4px solid var(--theme-color);
-}
+}

oauth/src/App.tsx

@@ -4,6 +4,7 @@ import { AIChat } from './components/AIChat';
 import { authService, User } from './services/auth';
 import { atprotoOAuthService } from './services/atproto-oauth';
 import { appConfig, getCollectionNames } from './config/app';
+import { getProfileForUser, detectPdsFromHandle, getApiUrlForUser, verifyPdsDetection, getNetworkConfigFromPdsEndpoint, getNetworkConfig } from './utils/pds-detection';
 import './App.css';
 
 function App() {
@@ -28,8 +29,35 @@ function App() {
   const [aiChatHistory, setAiChatHistory] = useState<any[]>([]);
   const [langEnRecords, setLangEnRecords] = useState<any[]>([]);
   const [aiCommentRecords, setAiCommentRecords] = useState<any[]>([]);
+  const [aiProfile, setAiProfile] = useState<any>(null);
+
+  const [adminDid, setAdminDid] = useState<string | null>(null);
+  const [aiDid, setAiDid] = useState<string | null>(null);
+
+  // ハンドルからDIDを解決する関数
+  const resolveHandleToDid = async (handle: string): Promise<string | null> => {
+    try {
+      const profile = await import('./utils/pds-detection').then(m => m.getProfileForUser(handle));
+      return profile?.did || null;
+    } catch {
+      return null;
+    }
+  };
 
   useEffect(() => {
+    // 管理者とAIのDIDを解決
+    const resolveAdminAndAiDids = async () => {
+      const [resolvedAdminDid, resolvedAiDid] = await Promise.all([
+        resolveHandleToDid(appConfig.adminHandle),
+        resolveHandleToDid(appConfig.aiHandle)
+      ]);
+      
+      setAdminDid(resolvedAdminDid || appConfig.adminDid);
+      setAiDid(resolvedAiDid || appConfig.aiDid);
+    };
+    
+    resolveAdminAndAiDids();
+    
     // Setup Jetstream WebSocket for real-time comments (optional)
     const setupJetstream = () => {
       try {
@@ -81,13 +109,85 @@ function App() {
       return false;
     };
     
-    // キャッシュがなければ、ATProtoから取得（認証状態に関係なく）
+    // DID解決が完了してからコメントとチャット履歴を読み込む
-    if (!loadCachedComments()) {
+    const loadDataAfterDidResolution = () => {
-      loadAllComments(); // URLフィルタリングを無効にして全コメント表示
+      // キャッシュがなければ、ATProtoから取得（認証状態に関係なく）
+      if (!loadCachedComments()) {
+        loadAllComments(); // URLフィルタリングを無効にして全コメント表示
+      }
+      
+      // Load AI chat history (認証状態に関係なく、全ユーザーのチャット履歴を表示)
+      loadAiChatHistory();
+    };
+    
+    // Wait for DID resolution before loading data
+    if (adminDid && aiDid) {
+      loadDataAfterDidResolution();
+    } else {
+      // Wait a bit and try again
+      setTimeout(() => {
+        if (adminDid && aiDid) {
+          loadDataAfterDidResolution();
+        }
+      }, 1000);
     }
     
-    // Load AI chat history (認証状態に関係なく、全ユーザーのチャット履歴を表示)
+    // Load AI profile from handle
-    loadAiChatHistory();
+    const loadAiProfile = async () => {
+      try {
+        // Use VITE_AI_HANDLE to detect PDS and get profile
+        const handle = appConfig.aiHandle;
+        if (!handle) {
+          throw new Error('No AI handle configured');
+        }
+
+        // Detect PDS: Use VITE_ATPROTO_PDS if handle matches admin/ai handles
+        let pds;
+        if (handle === appConfig.adminHandle || handle === appConfig.aiHandle) {
+          // Use configured PDS for admin/ai handles
+          pds = appConfig.atprotoPds || 'syu.is';
+        } else {
+          // Use handle-based detection for other handles
+          pds = detectPdsFromHandle(handle);
+        }
+        
+        const config = getNetworkConfigFromPdsEndpoint(`https://${pds}`);
+        const apiEndpoint = config.bskyApi;
+
+        // Get profile from appropriate bsky API
+        const profileResponse = await fetch(`${apiEndpoint}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(handle)}`);
+        if (profileResponse.ok) {
+          const profileData = await profileResponse.json();
+          setAiProfile({
+            did: profileData.did || appConfig.aiDid,
+            handle: profileData.handle || handle,
+            displayName: profileData.displayName || appConfig.aiDisplayName || 'ai',
+            avatar: profileData.avatar || generatePlaceholderAvatar(handle),
+            description: profileData.description || appConfig.aiDescription || ''
+          });
+        } else {
+          // Fallback to config values
+          setAiProfile({
+            did: appConfig.aiDid,
+            handle: handle,
+            displayName: appConfig.aiDisplayName || 'ai',
+            avatar: generatePlaceholderAvatar(handle),
+            description: appConfig.aiDescription || ''
+          });
+        }
+      } catch (err) {
+        // Failed to load AI profile
+        // Fallback to config values
+        setAiProfile({
+          did: appConfig.aiDid,
+          handle: appConfig.aiHandle,
+          displayName: appConfig.aiDisplayName || 'ai',
+          avatar: generatePlaceholderAvatar(appConfig.aiHandle || 'ai'),
+          description: appConfig.aiDescription || ''
+        });
+      }
+    };
+    loadAiProfile();
 
     // Handle popstate events for mock OAuth flow
     const handlePopState = () => {
@@ -119,6 +219,14 @@ function App() {
         // Ensure handle is not DID
         const handle = oauthResult.handle !== oauthResult.did ? oauthResult.handle : oauthResult.handle;
         
+        // Check if handle is allowed
+        if (appConfig.allowedHandles.length > 0 && !appConfig.allowedHandles.includes(handle)) {
+          // Handle not in allowed list
+          setError(`Access denied: ${handle} is not authorized for this application.`);
+          setIsLoading(false);
+          return;
+        }
+        
         // Get user profile including avatar
         const userProfile = await getUserProfile(oauthResult.did, handle);
         setUser(userProfile);
@@ -131,7 +239,7 @@ function App() {
         loadAiChatHistory();
         
         // Load user list records if admin
-        if (userProfile.did === appConfig.adminDid) {
+        if (userProfile.did === adminDid) {
           loadUserListRecords();
         }
         
@@ -142,6 +250,14 @@ function App() {
       // Fallback to legacy auth
       const verifiedUser = await authService.verify();
       if (verifiedUser) {
+        // Check if handle is allowed
+        if (appConfig.allowedHandles.length > 0 && !appConfig.allowedHandles.includes(verifiedUser.handle)) {
+          // Handle not in allowed list
+          setError(`Access denied: ${verifiedUser.handle} is not authorized for this application.`);
+          setIsLoading(false);
+          return;
+        }
+        
         setUser(verifiedUser);
         
         // Load all comments for display (this will be the default view)
@@ -149,7 +265,7 @@ function App() {
         loadAllComments();
         
         // Load user list records if admin
-        if (verifiedUser.did === appConfig.adminDid) {
+        if (verifiedUser.did === adminDid) {
           loadUserListRecords();
         }
       }
@@ -169,6 +285,14 @@ function App() {
     };
   }, []);
 
+  // DID解決完了時にデータを再読み込み
+  useEffect(() => {
+    if (adminDid && aiDid) {
+      loadAllComments();
+      loadAiChatHistory();
+    }
+  }, [adminDid, aiDid]);
+
   const getUserProfile = async (did: string, handle: string): Promise<User> => {
     try {
       const agent = atprotoOAuthService.getAgent();
@@ -206,12 +330,21 @@ function App() {
   const loadAiChatHistory = async () => {
     try {
       // Load all chat records from users in admin's user list
-      const adminDid = appConfig.adminDid;
+      const currentAdminDid = adminDid || appConfig.adminDid;
       const atprotoApi = appConfig.atprotoApi || 'https://bsky.social';
       const collections = getCollectionNames(appConfig.collections.base);
       
-      // First, get user list from admin
+      // First, get user list from admin using their proper PDS
-      const userListResponse = await fetch(`${atprotoApi}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(adminDid)}&collection=${encodeURIComponent(collections.user)}&limit=100`);
+      let adminPdsEndpoint;
+      try {
+        const resolved = await import('./utils/pds-detection').then(m => m.resolvePdsFromRepo(currentAdminDid));
+        const config = await import('./utils/pds-detection').then(m => m.getNetworkConfigFromPdsEndpoint(resolved.pds));
+        adminPdsEndpoint = config.pdsApi;
+      } catch {
+        adminPdsEndpoint = atprotoApi;
+      }
+      
+      const userListResponse = await fetch(`${adminPdsEndpoint}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(currentAdminDid)}&collection=${encodeURIComponent(collections.user)}&limit=100`);
       
       if (!userListResponse.ok) {
         setAiChatHistory([]);
@@ -234,15 +367,25 @@ function App() {
       });
       
       // Always include admin DID to check admin's own chats
-      allUserDids.push(adminDid);
+      allUserDids.push(currentAdminDid);
       
       const userDids = [...new Set(allUserDids)];
       
-      // Load chat records from all registered users (including admin)
+      // Load chat records from all registered users (including admin) using per-user PDS detection
       const allChatRecords = [];
       for (const userDid of userDids) {
         try {
-          const chatResponse = await fetch(`${atprotoApi}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(userDid)}&collection=${encodeURIComponent(collections.chat)}&limit=100`);
+          // Use per-user PDS detection for each user's chat records
+          let userPdsEndpoint;
+          try {
+            const resolved = await import('./utils/pds-detection').then(m => m.resolvePdsFromRepo(userDid));
+            const config = await import('./utils/pds-detection').then(m => m.getNetworkConfigFromPdsEndpoint(resolved.pds));
+            userPdsEndpoint = config.pdsApi;
+          } catch {
+            userPdsEndpoint = atprotoApi; // Fallback
+          }
+          
+          const chatResponse = await fetch(`${userPdsEndpoint}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(userDid)}&collection=${encodeURIComponent(collections.chat)}&limit=100`);
           
           if (chatResponse.ok) {
             const chatData = await chatResponse.json();
@@ -292,7 +435,7 @@ function App() {
   // Load AI generated content from admin DID
   const loadAIGeneratedContent = async () => {
     try {
-      const adminDid = appConfig.adminDid;
+      const currentAdminDid = adminDid || appConfig.adminDid;
       const atprotoApi = appConfig.atprotoApi || 'https://bsky.social';
       const collections = getCollectionNames(appConfig.collections.base);
       
@@ -351,26 +494,49 @@ function App() {
       });
       const userComments = response.data.records || [];
       
-      // Enhance comments with profile information if missing
+      // Enhance comments with fresh profile information
       const enhancedComments = await Promise.all(
         userComments.map(async (record) => {
-          if (!record.value.author?.avatar && record.value.author?.handle) {
+          if (record.value.author?.handle) {
             try {
-              const profile = await agent.getProfile({ actor: record.value.author.handle });
+              // Use existing PDS detection logic
-              return {
+              const handle = record.value.author.handle;
-                ...record,
+              const pds = detectPdsFromHandle(handle);
-                value: {
+              const config = getNetworkConfigFromPdsEndpoint(`https://${pds}`);
-                  ...record.value,
+              const apiEndpoint = config.bskyApi;
-                  author: {
+              
-                    ...record.value.author,
+              const profileResponse = await fetch(`${apiEndpoint}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(handle)}`);
-                    avatar: profile.data.avatar,
+              if (profileResponse.ok) {
-                    displayName: profile.data.displayName || record.value.author.handle,
+                const profileData = await profileResponse.json();
+                return {
+                  ...record,
+                  value: {
+                    ...record.value,
+                    author: {
+                      ...record.value.author,
+                      avatar: profileData.avatar,
+                      displayName: profileData.displayName || handle,
+                      _pdsEndpoint: `https://${pds}`, // Store PDS info for later use
+                      _webUrl: config.webUrl,         // Store web URL for profile links
+                    }
                   }
-                }
+                };
-              };
+              } else {
+                // If profile fetch fails, still add PDS info for links
+                return {
+                  ...record,
+                  value: {
+                    ...record.value,
+                    author: {
+                      ...record.value.author,
+                      _pdsEndpoint: `https://${pds}`,
+                      _webUrl: config.webUrl,
+                    }
+                  }
+                };
+              }
             } catch (err) {
-              // Ignore enhancement errors
+              // Ignore enhancement errors, use existing data
-              return record;
             }
           }
           return record;
@@ -387,23 +553,34 @@ function App() {
   // JSONからユーザーリストを取得
   const loadUsersFromRecord = async () => {
     try {
-      // 管理者のユーザーリストを取得
+      // 管理者のユーザーリストを取得 using proper PDS detection
-      const adminDid = appConfig.adminDid;
+      const currentAdminDid = adminDid || appConfig.adminDid;
-      // Fetching user list from admin DID
+      
-      const response = await fetch(`https://bsky.social/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(adminDid)}&collection=${encodeURIComponent(getCollectionNames(appConfig.collections.base).user)}&limit=100`);
+      // Use per-user PDS detection for admin's records
+      let adminPdsEndpoint;
+      try {
+        const resolved = await import('./utils/pds-detection').then(m => m.resolvePdsFromRepo(currentAdminDid));
+        const config = await import('./utils/pds-detection').then(m => m.getNetworkConfigFromPdsEndpoint(resolved.pds));
+        adminPdsEndpoint = config.pdsApi;
+      } catch {
+        adminPdsEndpoint = 'https://bsky.social'; // Fallback
+      }
+      
+      const userCollectionUrl = `${adminPdsEndpoint}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(currentAdminDid)}&collection=${encodeURIComponent(getCollectionNames(appConfig.collections.base).user)}&limit=100`;
+      
+      const response = await fetch(userCollectionUrl);
+      
       
       if (!response.ok) {
-        // Failed to fetch user list from admin, using default users
         return getDefaultUsers();
       }
       
       const data = await response.json();
       const userRecords = data.records || [];
-      // User records found
       
       if (userRecords.length === 0) {
-        // No user records found, using default users
+        const defaultUsers = getDefaultUsers();
-        return getDefaultUsers();
+        return defaultUsers;
       }
       
       // レコードからユーザーリストを構築し、プレースホルダーDIDを実際のDIDに解決
@@ -414,18 +591,15 @@ function App() {
           const resolvedUsers = await Promise.all(
             record.value.users.map(async (user) => {
               if (user.did && user.did.includes('-placeholder')) {
-                // Resolving placeholder DID
+                // Resolving placeholder DID using proper PDS detection
                 try {
-                  const profileResponse = await fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(user.handle)}`);
+                  const profile = await import('./utils/pds-detection').then(m => m.getProfileForUser(user.handle));
-                  if (profileResponse.ok) {
+                  if (profile && profile.did) {
-                    const profileData = await profileResponse.json();
+                    // Resolved DID
-                    if (profileData.did) {
+                    return {
-                      // Resolved DID
+                      ...user,
-                      return {
+                      did: profile.did
-                        ...user,
+                    };
-                        did: profileData.did
-                      };
-                    }
                   }
                 } catch (err) {
                   // Failed to resolve DID
@@ -438,7 +612,6 @@ function App() {
         }
       }
       
-      // Loaded and resolved users from admin records
       return allUsers;
     } catch (err) {
       // Failed to load users from records, using defaults
@@ -449,9 +622,20 @@ function App() {
   // ユーザーリスト一覧を読み込み
   const loadUserListRecords = async () => {
     try {
-      // Loading user list records
+      // Loading user list records using proper PDS detection
-      const adminDid = appConfig.adminDid;
+      const currentAdminDid = adminDid || appConfig.adminDid;
-      const response = await fetch(`https://bsky.social/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(adminDid)}&collection=${encodeURIComponent(getCollectionNames(appConfig.collections.base).user)}&limit=100`);
+      
+      // Use per-user PDS detection for admin's records
+      let adminPdsEndpoint;
+      try {
+        const resolved = await import('./utils/pds-detection').then(m => m.resolvePdsFromRepo(currentAdminDid));
+        const config = await import('./utils/pds-detection').then(m => m.getNetworkConfigFromPdsEndpoint(resolved.pds));
+        adminPdsEndpoint = config.pdsApi;
+      } catch {
+        adminPdsEndpoint = 'https://bsky.social'; // Fallback
+      }
+      
+      const response = await fetch(`${adminPdsEndpoint}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(currentAdminDid)}&collection=${encodeURIComponent(getCollectionNames(appConfig.collections.base).user)}&limit=100`);
       
       if (!response.ok) {
         // Failed to fetch user list records
@@ -476,21 +660,26 @@ function App() {
   };
 
   const getDefaultUsers = () => {
+    const currentAdminDid = adminDid || appConfig.adminDid;
     const defaultUsers = [
       // Default admin user
-      { did: appConfig.adminDid, handle: 'syui.ai', pds: 'https://bsky.social' },
+      { did: currentAdminDid, handle: appConfig.adminHandle, pds: 'https://syu.is' },
     ];
     
     // 現在ログインしているユーザーも追加（重複チェック）
     if (user && user.did && user.handle && !defaultUsers.find(u => u.did === user.did)) {
+      // Detect PDS based on handle
+      const userPds = user.handle.endsWith('.syu.is') ? 'https://syu.is' : 
+                     user.handle.endsWith('.syui.ai') ? 'https://syu.is' :
+                     'https://bsky.social';
+      
       defaultUsers.push({
         did: user.did,
         handle: user.handle,
-        pds: user.handle.endsWith('.syu.is') ? 'https://syu.is' : 'https://bsky.social'
+        pds: userPds
       });
     }
     
-    // Default users list (including current user)
     return defaultUsers;
   };
 
@@ -507,9 +696,19 @@ function App() {
       for (const user of knownUsers) {
         try {
           
-          // Public API使用（認証不要）
+          // Use per-user PDS detection for repo operations
+          let pdsEndpoint;
+          try {
+            const resolved = await import('./utils/pds-detection').then(m => m.resolvePdsFromRepo(user.did));
+            const config = await import('./utils/pds-detection').then(m => m.getNetworkConfigFromPdsEndpoint(resolved.pds));
+            pdsEndpoint = config.pdsApi;
+          } catch {
+            // Fallback to user.pds if PDS detection fails
+            pdsEndpoint = user.pds;
+          }
+          
           const collections = getCollectionNames(appConfig.collections.base);
-          const response = await fetch(`${user.pds}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(user.did)}&collection=${encodeURIComponent(collections.comment)}&limit=100`);
+          const response = await fetch(`${pdsEndpoint}/xrpc/com.atproto.repo.listRecords?repo=${encodeURIComponent(user.did)}&collection=${encodeURIComponent(collections.comment)}&limit=100`);
           
           if (!response.ok) {
             continue;
@@ -565,19 +764,18 @@ function App() {
         sortedComments.map(async (record) => {
           if (!record.value.author?.avatar && record.value.author?.handle) {
             try {
-              // Public API でプロフィール取得
+              // Use per-user PDS detection for profile fetching
-              const profileResponse = await fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(record.value.author.handle)}`);
+              const profile = await import('./utils/pds-detection').then(m => m.getProfileForUser(record.value.author.handle));
               
-              if (profileResponse.ok) {
+              if (profile) {
-                const profileData = await profileResponse.json();
                 return {
                   ...record,
                   value: {
                     ...record.value,
                     author: {
                       ...record.value.author,
-                      avatar: profileData.avatar,
+                      avatar: profile.avatar,
-                      displayName: profileData.displayName || record.value.author.handle,
+                      displayName: profile.displayName || record.value.author.handle,
                     }
                   }
                 };
@@ -744,7 +942,7 @@ function App() {
 
   // 管理者チェック
   const isAdmin = (user: User | null): boolean => {
-    return user?.did === appConfig.adminDid;
+    return user?.did === adminDid || user?.did === appConfig.adminDid;
   };
 
   // ユーザーリスト投稿
@@ -893,12 +1091,16 @@ function App() {
   };
 
   // ユーザーハンドルからプロフィールURLを生成
-  const generateProfileUrl = (handle: string, did: string): string => {
+  const generateProfileUrl = (author: any): string => {
-    if (handle.endsWith('.syu.is')) {
+    // Use stored PDS info if available (from comment enhancement)
-      return `https://web.syu.is/profile/${did}`;
+    if (author._webUrl) {
-    } else {
+      return `${author._webUrl}/profile/${author.did}`;
-      return `https://bsky.app/profile/${did}`;
     }
+    
+    // Fallback to handle-based detection
+    const pds = detectPdsFromHandle(author.handle);
+    const config = getNetworkConfigFromPdsEndpoint(`https://${pds}`);
+    return `${config.webUrl}/profile/${author.did}`;
   };
 
   // Rkey-based comment filtering
@@ -966,7 +1168,7 @@ function App() {
               {authorInfo?.displayName || 'AI'}
             </span>
             <span className="comment-handle">
-              @{authorInfo?.handle || 'ai'}
+              @{authorInfo?.handle || aiProfile?.handle || 'yui.syui.ai'}
             </span>
           </div>
           <span className="comment-date">
@@ -1039,30 +1241,28 @@ function App() {
         <section className="comment-section">
           {/* Authentication Section */}
           {!user ? (
-            <div className="auth-section">
+            <div className="auth-section search-bar-layout">
+              <input 
+                type="text" 
+                id="handle-input"
+                name="handle"
+                placeholder="user.bsky.social" 
+                className="handle-input"
+                value={handleInput}
+                onChange={(e) => setHandleInput(e.target.value)}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') {
+                    e.preventDefault();
+                    executeOAuth();
+                  }
+                }}
+              />
               <button 
                 onClick={executeOAuth}
                 className="atproto-button"
               >
-                atproto
+                <i class="fab fa-bluesky"></i>
               </button>
-              <div className="username-input-section">
-                <input 
-                  type="text" 
-                  id="handle-input"
-                  name="handle"
-                  placeholder="user.bsky.social" 
-                  className="handle-input"
-                  value={handleInput}
-                  onChange={(e) => setHandleInput(e.target.value)}
-                  onKeyDown={(e) => {
-                    if (e.key === 'Enter') {
-                      e.preventDefault();
-                      executeOAuth();
-                    }
-                  }}
-                />
-              </div>
             </div>
           ) : (
             <div className="user-section">
@@ -1182,25 +1382,25 @@ function App() {
               className={`tab-button ${activeTab === 'comments' ? 'active' : ''}`}
               onClick={() => setActiveTab('comments')}
             >
-              Comments ({comments.filter(shouldShowComment).length})
+              comment ({comments.filter(shouldShowComment).length})
             </button>
             <button 
               className={`tab-button ${activeTab === 'ai-chat' ? 'active' : ''}`}
               onClick={() => setActiveTab('ai-chat')}
             >
-              AI Chat ({aiChatHistory.length})
+              chat ({aiChatHistory.length})
             </button>
             <button 
               className={`tab-button ${activeTab === 'lang-en' ? 'active' : ''}`}
               onClick={() => setActiveTab('lang-en')}
             >
-              AI Lang:en ({langEnRecords.length})
+              en ({langEnRecords.length})
             </button>
             <button 
               className={`tab-button ${activeTab === 'ai-comment' ? 'active' : ''}`}
               onClick={() => setActiveTab('ai-comment')}
             >
-              AI Comment ({aiCommentRecords.length})
+              feedback ({aiCommentRecords.length})
             </button>
           </div>
 
@@ -1216,31 +1416,16 @@ function App() {
                 <div key={index} className="comment-item">
                   <div className="comment-header">
                     <img 
-                      src={generatePlaceholderAvatar(record.value.author?.handle || 'unknown')} 
+                      src={record.value.author?.avatar || generatePlaceholderAvatar(record.value.author?.handle || 'unknown')} 
                       alt="User Avatar" 
                       className="comment-avatar"
-                      ref={(img) => {
-                        // Fetch fresh avatar from API when component mounts
-                        if (img && record.value.author?.did) {
-                          fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(record.value.author.did)}`)
-                            .then(res => res.json())
-                            .then(data => {
-                              if (data.avatar && img) {
-                                img.src = data.avatar;
-                              }
-                            })
-                            .catch(err => {
-                              // Keep placeholder on error
-                            });
-                        }
-                      }}
                     />
                     <div className="comment-author-info">
                       <span className="comment-author">
                         {record.value.author?.displayName || record.value.author?.handle || 'unknown'}
                       </span>
                       <a 
-                        href={generateProfileUrl(record.value.author?.handle || '', record.value.author?.did || '')}
+                        href={generateProfileUrl(record.value.author)}
                         target="_blank"
                         rel="noopener noreferrer"
                         className="comment-handle"
@@ -1311,8 +1496,8 @@ function App() {
                 aiChatHistory.map((record, index) => {
                   // For AI responses, use AI DID; for user questions, use the actual author
                   const isAiResponse = record.value.type === 'answer';
-                  const displayDid = isAiResponse ? appConfig.aiDid : record.value.author?.did;
+                  const displayDid = isAiResponse ? (aiDid || appConfig.aiDid) : record.value.author?.did;
-                  const displayHandle = isAiResponse ? 'ai.syui' : record.value.author?.handle;
+                  const displayHandle = isAiResponse ? (aiProfile?.handle || 'yui.syui.ai') : record.value.author?.handle;
                   const displayName = isAiResponse ? 'AI' : (record.value.author?.displayName || record.value.author?.handle);
                   
                   return (
@@ -1343,7 +1528,7 @@ function App() {
                             {displayName || 'unknown'}
                           </span>
                           <a 
-                            href={generateProfileUrl(displayHandle || '', displayDid || '')}
+                            href={generateProfileUrl({ handle: displayHandle, did: displayDid })}
                             target="_blank"
                             rel="noopener noreferrer"
                             className="comment-handle"
@@ -1427,8 +1612,9 @@ function App() {
                         className="comment-avatar"
                         ref={(img) => {
                           // Fetch AI avatar
-                          if (img && appConfig.aiDid) {
+                          const currentAiDid = aiDid || appConfig.aiDid;
-                            fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(appConfig.aiDid)}`)
+                          if (img && currentAiDid) {
+                            fetch(`${appConfig.bskyPublicApi}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(currentAiDid)}`)
                               .then(res => res.json())
                               .then(data => {
                                 if (data.avatar && img) {
@@ -1446,7 +1632,7 @@ function App() {
                           AI
                         </span>
                         <span className="comment-handle">
-                          @ai
+                          @{aiProfile?.handle || 'yui.syui.ai'}
                         </span>
                       </div>
                       <span className="comment-date">
@@ -1519,13 +1705,6 @@ function App() {
             </div>
           )}
 
-          {/* Show authentication status on non-post pages */}
-          {user && !appConfig.rkey && (
-            <div className="auth-status">
-              <p>✅ Authenticated as @{user.handle}</p>
-              <p><small>Visit a post page to comment</small></p>
-            </div>
-          )}
         </section>
       </main>
 
@@ -1535,4 +1714,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;

oauth/src/components/AIChat-access.tsx

@@ -14,7 +14,7 @@ const response = await fetch(`${aiConfig.host}/api/generate`, {
     options: {
       temperature: 0.9,
       top_p: 0.9,
-      num_predict: 80,
+      num_predict: 200,
       repeat_penalty: 1.1,
     }
   }),

oauth/src/components/AIChat.tsx

@@ -199,7 +199,7 @@ Answer:`;
             options: {
               temperature: 0.9,
               top_p: 0.9,
-              num_predict: 80, // Shorter responses for faster generation
+              num_predict: 200, // Longer responses for better answers
               repeat_penalty: 1.1,
             }
           }),

oauth/src/components/AIProfile.tsx

@@ -32,7 +32,7 @@ export const AIProfile: React.FC<AIProfileProps> = ({ aiDid }) => {
           description: response.data.description,
         });
       } catch (error) {
-        console.error('Failed to fetch AI profile:', error);
+        // Failed to fetch AI profile
         // Fallback to basic info
         setProfile({
           did: aiDid,

oauth/src/components/CardBox.tsx

@@ -26,7 +26,7 @@ export const CardBox: React.FC<CardBoxProps> = ({ userDid }) => {
       const data = await atprotoOAuthService.getCardsFromBox();
       setBoxData(data);
     } catch (err) {
-      console.error('カードボックス読み込みエラー:', err);
+      // Failed to load card box
       setError(err instanceof Error ? err.message : 'カードボックスの読み込みに失敗しました');
     } finally {
       setLoading(false);
@@ -52,7 +52,7 @@ export const CardBox: React.FC<CardBoxProps> = ({ userDid }) => {
       setBoxData({ records: [] });
       alert('カードボックスを削除しました');
     } catch (err) {
-      console.error('カードボックス削除エラー:', err);
+      // Failed to delete card box
       setError(err instanceof Error ? err.message : 'カードボックスの削除に失敗しました');
     } finally {
       setIsDeleting(false);

oauth/src/components/CardList.tsx

@@ -32,7 +32,7 @@ export const CardList: React.FC = () => {
       const data = await response.json();
       setMasterData(data);
     } catch (err) {
-      console.error('Error loading card master data:', err);
+      // Failed to load card master data
       setError(err instanceof Error ? err.message : 'Failed to load card data');
     } finally {
       setLoading(false);

oauth/src/components/CollectionAnalysis.tsx

@@ -29,7 +29,7 @@ export const CollectionAnalysis: React.FC<CollectionAnalysisProps> = ({ userDid
       const result = await aiCardApi.analyzeCollection(userDid);
       setAnalysis(result);
     } catch (err) {
-      console.error('Collection analysis failed:', err);
+      // Collection analysis failed
       setError('AI分析機能を利用するにはai.gptサーバーが必要です。基本機能はai.cardサーバーのみで利用できます。');
     } finally {
       setLoading(false);

oauth/src/components/GachaAnimation.tsx

@@ -48,7 +48,7 @@ export const GachaAnimation: React.FC<GachaAnimationProps> = ({
       await atprotoOAuthService.saveCardToCollection(card);
       alert('カードデータをatprotoコレクションに保存しました！');
     } catch (error) {
-      console.error('保存エラー:', error);
+      // Failed to save card
       alert('保存に失敗しました。認証が必要かもしれません。');
     } finally {
       setIsSharing(false);

oauth/src/components/GachaStats.tsx

@@ -30,7 +30,7 @@ export const GachaStats: React.FC = () => {
         try {
           result = await aiCardApi.getEnhancedStats();
         } catch (aiError) {
-          console.warn('AI統計が利用できません、基本統計に切り替えます:', aiError);
+          // AI stats unavailable, using basic stats
           setUseAI(false);
           result = await cardApi.getGachaStats();
         }
@@ -39,7 +39,7 @@ export const GachaStats: React.FC = () => {
       }
       setStats(result);
     } catch (err) {
-      console.error('Gacha stats failed:', err);
+      // Gacha stats failed
       setError('統計データの取得に失敗しました。ai.cardサーバーが起動していることを確認してください。');
     } finally {
       setLoading(false);

oauth/src/components/Login.tsx

@@ -160,7 +160,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin, onClose, defaultHandle })
               />
               <small>
                 メインパスワードではなく、
-                <a href="https://bsky.app/settings/app-passwords" target="_blank" rel="noopener noreferrer">
+                <a href={`${import.meta.env.VITE_ATPROTO_WEB_URL || 'https://bsky.app'}/settings/app-passwords`} target="_blank" rel="noopener noreferrer">
                   アプリパスワード
                 </a>
                 を使用してください

oauth/src/components/OAuthCallback.tsx

@@ -7,8 +7,6 @@ interface OAuthCallbackProps {
 }
 
 export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError }) => {
-  console.log('=== OAUTH CALLBACK COMPONENT MOUNTED ===');
-  console.log('Current URL:', window.location.href);
   
   const [isProcessing, setIsProcessing] = useState(true);
   const [needsHandle, setNeedsHandle] = useState(false);
@@ -18,12 +16,10 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
   useEffect(() => {
     // Add timeout to prevent infinite loading
     const timeoutId = setTimeout(() => {
-      console.error('OAuth callback timeout');
       onError('OAuth認証がタイムアウトしました');
     }, 10000); // 10 second timeout
 
     const handleCallback = async () => {
-      console.log('=== HANDLE CALLBACK STARTED ===');
       try {
         // Handle both query params (?) and hash params (#)
         const hashParams = new URLSearchParams(window.location.hash.substring(1));
@@ -35,14 +31,6 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
         const error = hashParams.get('error') || queryParams.get('error');
         const iss = hashParams.get('iss') || queryParams.get('iss');
         
-        console.log('OAuth callback parameters:', {
-          code: code ? code.substring(0, 20) + '...' : null,
-          state: state,
-          error: error,
-          iss: iss,
-          hash: window.location.hash,
-          search: window.location.search
-        });
 
         if (error) {
           throw new Error(`OAuth error: ${error}`);
@@ -52,12 +40,10 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
           throw new Error('Missing OAuth parameters');
         }
 
-        console.log('Processing OAuth callback with params:', { code: code?.substring(0, 10) + '...', state, iss });
         
         // Use the official BrowserOAuthClient to handle the callback
         const result = await atprotoOAuthService.handleOAuthCallback();
         if (result) {
-          console.log('OAuth callback completed successfully:', result);
           
           // Success - notify parent component
           onSuccess(result.did, result.handle);
@@ -66,11 +52,7 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
         }
         
       } catch (error) {
-        console.error('OAuth callback error:', error);
-        
         // Even if OAuth fails, try to continue with a fallback approach
-        console.warn('OAuth callback failed, attempting fallback...');
-        
         try {
           // Create a minimal session to allow the user to proceed
           const fallbackSession = {
@@ -82,7 +64,6 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
           onSuccess(fallbackSession.did, fallbackSession.handle);
           
         } catch (fallbackError) {
-          console.error('Fallback also failed:', fallbackError);
           onError(error instanceof Error ? error.message : 'OAuth認証に失敗しました');
         }
       } finally {
@@ -104,17 +85,13 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
     
     const trimmedHandle = handle.trim();
     if (!trimmedHandle) {
-      console.log('Handle is empty');
       return;
     }
-    
-    console.log('Submitting handle:', trimmedHandle);
     setIsProcessing(true);
     
     try {
       // Resolve DID from handle
       const did = await atprotoOAuthService.resolveDIDFromHandle(trimmedHandle);
-      console.log('Resolved DID:', did);
       
       // Update session with resolved DID and handle
       const updatedSession = {
@@ -129,7 +106,6 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
       // Success - notify parent component
       onSuccess(did, trimmedHandle);
     } catch (error) {
-      console.error('Failed to resolve DID:', error);
       setIsProcessing(false);
       onError(error instanceof Error ? error.message : 'ハンドルからDIDの解決に失敗しました');
     }
@@ -149,7 +125,6 @@ export const OAuthCallback: React.FC<OAuthCallbackProps> = ({ onSuccess, onError
               type="text"
               value={handle}
               onChange={(e) => {
-                console.log('Input changed:', e.target.value);
                 setHandle(e.target.value);
               }}
               placeholder="例: syui.ai または user.bsky.social"

oauth/src/components/OAuthCallbackPage.tsx

@@ -6,14 +6,9 @@ export const OAuthCallbackPage: React.FC = () => {
   const navigate = useNavigate();
 
   useEffect(() => {
-    console.log('=== OAUTH CALLBACK PAGE MOUNTED ===');
-    console.log('Current URL:', window.location.href);
-    console.log('Search params:', window.location.search);
-    console.log('Pathname:', window.location.pathname);
   }, []);
 
   const handleSuccess = (did: string, handle: string) => {
-    console.log('OAuth success, redirecting to home:', { did, handle });
     
     // Add a small delay to ensure state is properly updated
     setTimeout(() => {
@@ -22,7 +17,6 @@ export const OAuthCallbackPage: React.FC = () => {
   };
 
   const handleError = (error: string) => {
-    console.error('OAuth error, redirecting to home:', error);
     
     // Add a small delay before redirect
     setTimeout(() => {

oauth/src/config/app.ts

@@ -1,7 +1,12 @@
 // Application configuration
 export interface AppConfig {
   adminDid: string;
+  adminHandle: string;
   aiDid: string;
+  aiHandle: string;
+  aiDisplayName: string;
+  aiAvatar: string;
+  aiDescription: string;
   collections: {
     base: string;  // Base collection like "ai.syui.log"
   };
@@ -13,6 +18,9 @@ export interface AppConfig {
   aiModel: string;
   aiHost: string;
   aiSystemPrompt: string;
+  allowedHandles: string[]; // Handles allowed for OAuth authentication
+  atprotoPds: string; // Configured PDS for admin/ai handles
+  // Legacy - prefer per-user PDS detection
   bskyPublicApi: string;
   atprotoApi: string;
 }
@@ -76,8 +84,15 @@ function extractRkeyFromUrl(): string | undefined {
 // Get application configuration from environment variables
 export function getAppConfig(): AppConfig {
   const host = import.meta.env.VITE_APP_HOST || 'https://log.syui.ai';
+  const adminHandle = import.meta.env.VITE_ADMIN_HANDLE || 'ai.syui.ai';
+  const aiHandle = import.meta.env.VITE_AI_HANDLE || 'ai.syui.ai';
+  
+  // DIDsはハンドルから実行時に解決される（フォールバック用のみ保持）
   const adminDid = import.meta.env.VITE_ADMIN_DID || 'did:plc:uqzpqmrjnptsxezjx4xuh2mn';
   const aiDid = import.meta.env.VITE_AI_DID || 'did:plc:4hqjfn7m6n5hno3doamuhgef';
+  const aiDisplayName = import.meta.env.VITE_AI_DISPLAY_NAME || 'ai';
+  const aiAvatar = import.meta.env.VITE_AI_AVATAR || '';
+  const aiDescription = import.meta.env.VITE_AI_DESCRIPTION || '';
   
   // Priority: Environment variables > Auto-generated from host
   const autoGeneratedBase = generateBaseCollectionFromHost(host);
@@ -101,13 +116,28 @@ export function getAppConfig(): AppConfig {
   const aiModel = import.meta.env.VITE_AI_MODEL || 'gemma2:2b';
   const aiHost = import.meta.env.VITE_AI_HOST || 'https://ollama.syui.ai';
   const aiSystemPrompt = import.meta.env.VITE_AI_SYSTEM_PROMPT || 'You are a helpful AI assistant trained on this blog\'s content.';
+  const atprotoPds = import.meta.env.VITE_ATPROTO_PDS || 'syu.is';
   const bskyPublicApi = import.meta.env.VITE_BSKY_PUBLIC_API || 'https://public.api.bsky.app';
   const atprotoApi = import.meta.env.VITE_ATPROTO_API || 'https://bsky.social';
   
+  // Parse allowed handles list
+  const allowedHandlesStr = import.meta.env.VITE_ATPROTO_HANDLE_LIST || '[]';
+  let allowedHandles: string[] = [];
+  try {
+    allowedHandles = JSON.parse(allowedHandlesStr);
+  } catch {
+    // If parsing fails, allow all handles (empty array means no restriction)
+    allowedHandles = [];
+  }
   
   return {
     adminDid,
+    adminHandle,
     aiDid,
+    aiHandle,
+    aiDisplayName,
+    aiAvatar,
+    aiDescription,
     collections,
     host,
     rkey,
@@ -117,6 +147,8 @@ export function getAppConfig(): AppConfig {
     aiModel,
     aiHost,
     aiSystemPrompt,
+    allowedHandles,
+    atprotoPds,
     bskyPublicApi,
     atprotoApi
   };

oauth/src/main.tsx

@@ -12,10 +12,8 @@ import { OAuthEndpointHandler } from './utils/oauth-endpoints'
 
 // Mount React app to all comment-atproto divs
 const mountPoints = document.querySelectorAll('#comment-atproto');
-console.log(`Found ${mountPoints.length} comment-atproto mount points`);
 
 mountPoints.forEach((mountPoint, index) => {
-  console.log(`Mounting React app to comment-atproto #${index + 1}`);
   ReactDOM.createRoot(mountPoint as HTMLElement).render(
     <React.StrictMode>
       <BrowserRouter>

oauth/src/utils/pds-detection.ts

@@ -0,0 +1,293 @@
+// PDS Detection and API URL mapping utilities
+
+export interface NetworkConfig {
+  pdsApi: string;
+  plcApi: string;
+  bskyApi: string;
+  webUrl: string;
+}
+
+// Detect PDS from handle
+export function detectPdsFromHandle(handle: string): string {
+  if (handle.endsWith('.syu.is')) {
+    return 'syu.is';
+  }
+  if (handle.endsWith('.bsky.social') || handle.endsWith('.bsky.app')) {
+    return 'bsky.social';
+  }
+  // Default to Bluesky for unknown domains
+  return 'bsky.social';
+}
+
+// Map PDS endpoint to network configuration
+export function getNetworkConfigFromPdsEndpoint(pdsEndpoint: string): NetworkConfig {
+  try {
+    const url = new URL(pdsEndpoint);
+    const hostname = url.hostname;
+    
+    // Map based on actual PDS endpoint
+    if (hostname === 'syu.is') {
+      return {
+        pdsApi: 'https://syu.is',           // PDS API (repo operations)
+        plcApi: 'https://plc.syu.is',       // PLC directory
+        bskyApi: 'https://bsky.syu.is',     // Bluesky API (getProfile, etc.)
+        webUrl: 'https://web.syu.is'        // Web interface
+      };
+    } else if (hostname.includes('bsky.network') || hostname === 'bsky.social' || hostname.includes('host.bsky.network')) {
+      // All Bluesky infrastructure (including *.host.bsky.network)
+      return {
+        pdsApi: pdsEndpoint,                      // Use actual PDS endpoint (e.g., shiitake.us-east.host.bsky.network)
+        plcApi: 'https://plc.directory',          // Standard PLC directory
+        bskyApi: 'https://public.api.bsky.app',   // Bluesky public API (NOT PDS)
+        webUrl: 'https://bsky.app'                // Bluesky web interface
+      };
+    } else {
+      // Unknown PDS, assume Bluesky-compatible but use PDS for repo operations
+      return {
+        pdsApi: pdsEndpoint,                      // Use actual PDS for repo ops
+        plcApi: 'https://plc.directory',          // Default PLC
+        bskyApi: 'https://public.api.bsky.app',   // Default to Bluesky API
+        webUrl: 'https://bsky.app'                // Default web interface
+      };
+    }
+  } catch (error) {
+    // Fallback for invalid URLs
+    return {
+      pdsApi: 'https://bsky.social',
+      plcApi: 'https://plc.directory',
+      bskyApi: 'https://public.api.bsky.app',
+      webUrl: 'https://bsky.app'
+    };
+  }
+}
+
+// Legacy function for backwards compatibility
+export function getNetworkConfig(pds: string): NetworkConfig {
+  // This now assumes pds is a hostname
+  return getNetworkConfigFromPdsEndpoint(`https://${pds}`);
+}
+
+// Get appropriate API URL for a user based on their handle
+export function getApiUrlForUser(handle: string): string {
+  const pds = detectPdsFromHandle(handle);
+  const config = getNetworkConfig(pds);
+  return config.bskyApi;
+}
+
+// Resolve handle/DID to actual PDS endpoint using com.atproto.repo.describeRepo
+export async function resolvePdsFromRepo(handleOrDid: string): Promise<{ pds: string; did: string; handle: string }> {
+  let targetDid = handleOrDid;
+  let targetHandle = handleOrDid;
+  
+  // If handle provided, resolve to DID first using identity.resolveHandle
+  if (!handleOrDid.startsWith('did:')) {
+    try {
+      // Try multiple endpoints for handle resolution
+      const resolveEndpoints = ['https://public.api.bsky.app', 'https://bsky.syu.is'];
+      let resolved = false;
+      
+      for (const endpoint of resolveEndpoints) {
+        try {
+          const resolveResponse = await fetch(`${endpoint}/xrpc/com.atproto.identity.resolveHandle?handle=${encodeURIComponent(handleOrDid)}`);
+          if (resolveResponse.ok) {
+            const resolveData = await resolveResponse.json();
+            targetDid = resolveData.did;
+            resolved = true;
+            break;
+          }
+        } catch (error) {
+          continue;
+        }
+      }
+      
+      if (!resolved) {
+        throw new Error('Handle resolution failed from all endpoints');
+      }
+    } catch (error) {
+      throw new Error(`Failed to resolve handle ${handleOrDid} to DID: ${error}`);
+    }
+  }
+  
+  // Now use com.atproto.repo.describeRepo to get PDS from known PDS endpoints
+  const pdsEndpoints = ['https://bsky.social', 'https://syu.is'];
+  
+  for (const pdsEndpoint of pdsEndpoints) {
+    try {
+      const response = await fetch(`${pdsEndpoint}/xrpc/com.atproto.repo.describeRepo?repo=${encodeURIComponent(targetDid)}`);
+      
+      if (response.ok) {
+        const data = await response.json();
+        
+        // Extract PDS from didDoc.service
+        const services = data.didDoc?.service || [];
+        const pdsService = services.find((s: any) => 
+          s.id === '#atproto_pds' || s.type === 'AtprotoPersonalDataServer'
+        );
+        
+        if (pdsService) {
+          return {
+            pds: pdsService.serviceEndpoint,
+            did: data.did || targetDid,
+            handle: data.handle || targetHandle
+          };
+        }
+      }
+    } catch (error) {
+      continue;
+    }
+  }
+  
+  throw new Error(`Failed to resolve PDS for ${handleOrDid} from any endpoint`);
+}
+
+// Resolve DID to actual PDS endpoint using com.atproto.repo.describeRepo
+export async function resolvePdsFromDid(did: string): Promise<string> {
+  const resolved = await resolvePdsFromRepo(did);
+  return resolved.pds;
+}
+
+// Enhanced resolve handle to DID with proper PDS detection
+export async function resolveHandleToDid(handle: string): Promise<{ did: string; pds: string }> {
+  try {
+    // First, try to resolve the handle to DID using multiple methods
+    const apiUrl = getApiUrlForUser(handle);
+    const response = await fetch(`${apiUrl}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(handle)}`);
+    
+    if (!response.ok) {
+      throw new Error(`Failed to resolve handle: ${response.status}`);
+    }
+    
+    const data = await response.json();
+    const did = data.did;
+    
+    // Now resolve the actual PDS from the DID
+    const actualPds = await resolvePdsFromDid(did);
+    
+    return {
+      did: did,
+      pds: actualPds
+    };
+  } catch (error) {
+    // Failed to resolve handle
+    
+    // Fallback to handle-based detection
+    const fallbackPds = detectPdsFromHandle(handle);
+    throw error;
+  }
+}
+
+// Get profile using appropriate API for the user with accurate PDS resolution
+export async function getProfileForUser(handleOrDid: string, knownPdsEndpoint?: string): Promise<any> {
+  try {
+    let apiUrl: string;
+    
+    if (knownPdsEndpoint) {
+      // If we already know the user's PDS endpoint, use it directly
+      const config = getNetworkConfigFromPdsEndpoint(knownPdsEndpoint);
+      apiUrl = config.bskyApi;
+    } else {
+      // Resolve the user's actual PDS using describeRepo
+      try {
+        const resolved = await resolvePdsFromRepo(handleOrDid);
+        const config = getNetworkConfigFromPdsEndpoint(resolved.pds);
+        apiUrl = config.bskyApi;
+      } catch {
+        // Fallback to handle-based detection
+        apiUrl = getApiUrlForUser(handleOrDid);
+      }
+    }
+    
+    const response = await fetch(`${apiUrl}/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(handleOrDid)}`);
+    if (!response.ok) {
+      throw new Error(`Failed to get profile: ${response.status}`);
+    }
+    
+    return await response.json();
+  } catch (error) {
+    // Failed to get profile
+    
+    // Final fallback: try with default Bluesky API
+    try {
+      const response = await fetch(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${encodeURIComponent(handleOrDid)}`);
+      if (response.ok) {
+        return await response.json();
+      }
+    } catch {
+      // Ignore fallback errors
+    }
+    
+    throw error;
+  }
+}
+
+// Test and verify PDS detection methods
+export async function verifyPdsDetection(handleOrDid: string): Promise<void> {
+  try {
+    // Method 1: com.atproto.repo.describeRepo (PRIMARY METHOD)
+    try {
+      const resolved = await resolvePdsFromRepo(handleOrDid);
+      const config = getNetworkConfigFromPdsEndpoint(resolved.pds);
+    } catch (error) {
+      // describeRepo failed
+    }
+    
+    // Method 2: com.atproto.identity.resolveHandle (for comparison)
+    if (!handleOrDid.startsWith('did:')) {
+      try {
+        const resolveResponse = await fetch(`https://public.api.bsky.app/xrpc/com.atproto.identity.resolveHandle?handle=${encodeURIComponent(handleOrDid)}`);
+        if (resolveResponse.ok) {
+          const resolveData = await resolveResponse.json();
+        }
+      } catch (error) {
+        // Error resolving handle
+      }
+    }
+    
+    // Method 3: PLC Directory lookup (if we have a DID)
+    let targetDid = handleOrDid;
+    if (!handleOrDid.startsWith('did:')) {
+      try {
+        const profile = await getProfileForUser(handleOrDid);
+        targetDid = profile.did;
+      } catch {
+        return;
+      }
+    }
+    
+    try {
+      const plcResponse = await fetch(`https://plc.directory/${targetDid}`);
+      if (plcResponse.ok) {
+        const didDocument = await plcResponse.json();
+        
+        // Find PDS service
+        const pdsService = didDocument.service?.find((s: any) => 
+          s.id === '#atproto_pds' || s.type === 'AtprotoPersonalDataServer'
+        );
+        
+        if (pdsService) {
+          // Try to detect if this is a known network
+          const pdsUrl = pdsService.serviceEndpoint;
+          const hostname = new URL(pdsUrl).hostname;
+          const detectedNetwork = detectPdsFromHandle(`user.${hostname}`);
+          const networkConfig = getNetworkConfig(hostname);
+        }
+      }
+    } catch (error) {
+      // Error fetching from PLC directory
+    }
+    
+    // Method 4: Our enhanced resolution
+    try {
+      if (handleOrDid.startsWith('did:')) {
+        const pdsEndpoint = await resolvePdsFromDid(handleOrDid);
+      } else {
+        const resolved = await resolveHandleToDid(handleOrDid);
+      }
+    } catch (error) {
+      // Enhanced resolution failed
+    }
+    
+  } catch (error) {
+    // Overall verification failed
+  }
+}

scpt/delete-chat-records.zsh

@@ -1,24 +1,24 @@
 #!/bin/zsh
+
 set -e
 
 cb=ai.syui.log
-cl=( $cb.chat $cb.chat.comment $cb.chat.lang )
+cl=( $cb.user )
+f=~/.config/syui/ai/log/config.json
 
-f=~/.config/syui/ai/bot/token.json
 default_collection="ai.syui.log.chat.comment"
-default_pds="bsky.social"
+default_pds="syu.is"
-default_did=`cat $f|jq -r .did`
+default_did=`cat $f|jq -r .admin.did`
-default_token=`cat $f|jq -r .accessJwt`
+default_token=`cat $f|jq -r .admin.access_jwt`
-default_refresh=`cat $f|jq -r .refreshJwt`
+default_refresh=`cat $f|jq -r .admin.refresh_jwt`
-curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $default_refresh" https://$default_pds/xrpc/com.atproto.server.refreshSession >! $f
+#curl -sL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $default_refresh" https://$default_pds/xrpc/com.atproto.server.refreshSession >! $f
-default_token=`cat $f|jq -r .accessJwt`
+#default_token=`cat $f|jq -r .admin.access_jwt`
 collection=${1:-$default_collection}
 pds=${2:-$default_pds}
 did=${3:-$default_did}
 token=${4:-$default_token}
 req=com.atproto.repo.deleteRecord
 url=https://$pds/xrpc/$req
-
 for i in $cl; do
 	echo $i
 	rkeys=($(curl -sL "https://$default_pds/xrpc/com.atproto.repo.listRecords?repo=$did&collection=$i&limit=100"|jq -r ".records[]?.uri"|cut -d '/' -f 5))

scpt/run.zsh

@@ -2,7 +2,7 @@
 
 function _env() {
 	d=${0:a:h}
-	ailog=$d/target/release/ailog
+	ailog=$d/target/debug/ailog
 	oauth=$d/oauth
 	myblog=$d/my-blog
 	port=4173
@@ -16,10 +16,14 @@ function _env() {
 	esac
 }
 
+function _deploy_ailog() {
+}
+
 function _server() {
 	lsof -ti:$port | xargs kill -9 2>/dev/null || true
 	cd $d/my-blog
-	cargo build --release
+	cargo build
+	cp -rf $ailog $CARGO_HOME/bin/
 	$ailog build
 	$ailog serve --port $port
 }
@@ -40,7 +44,8 @@ function _oauth_build() {
 }
 
 function _server_comment() {
-	cargo build --release
+	cargo build
+	cp -rf $ailog $CARGO_HOME/bin/
 	AILOG_DEBUG_ALL=1 $ailog stream start my-blog
 }
 

src/commands/auth.rs

@@ -86,7 +86,125 @@ fn get_config_path() -> Result<PathBuf> {
     Ok(config_dir.join("config.json"))
 }
 
+#[allow(dead_code)]
 pub async fn init() -> Result<()> {
+    init_with_pds(None).await
+}
+
+pub async fn init_with_options(
+    pds_override: Option<String>,
+    handle_override: Option<String>, 
+    use_password: bool,
+    access_jwt_override: Option<String>,
+    refresh_jwt_override: Option<String>
+) -> Result<()> {
+    println!("{}", "🔐 Initializing ATProto authentication...".cyan());
+    
+    let config_path = get_config_path()?;
+    
+    if config_path.exists() {
+        println!("{}", "⚠️  Configuration already exists. Use 'ailog auth logout' to reset.".yellow());
+        return Ok(());
+    }
+    
+    // Validate options
+    if let (Some(_), Some(_)) = (&access_jwt_override, &refresh_jwt_override) {
+        if use_password {
+            println!("{}", "⚠️  Cannot use both --password and JWT tokens. Choose one method.".yellow());
+            return Ok(());
+        }
+    } else if access_jwt_override.is_some() || refresh_jwt_override.is_some() {
+        println!("{}", "❌ Both --access-jwt and --refresh-jwt must be provided together.".red());
+        return Ok(());
+    }
+    
+    println!("{}", "📋 Please provide your ATProto credentials:".cyan());
+    
+    // Get handle
+    let handle = if let Some(h) = handle_override {
+        h
+    } else {
+        print!("Handle (e.g., your.handle.bsky.social): ");
+        std::io::Write::flush(&mut std::io::stdout())?;
+        let mut input = String::new();
+        std::io::stdin().read_line(&mut input)?;
+        input.trim().to_string()
+    };
+    
+    // Determine PDS URL
+    let pds_url = if let Some(override_pds) = pds_override {
+        if override_pds.starts_with("http") {
+            override_pds
+        } else {
+            format!("https://{}", override_pds)
+        }
+    } else {
+        if handle.ends_with(".syu.is") {
+            "https://syu.is".to_string()
+        } else {
+            "https://bsky.social".to_string()
+        }
+    };
+    
+    println!("{}", format!("🌐 Using PDS: {}", pds_url).cyan());
+    
+    // Get credentials
+    let (access_jwt, refresh_jwt) = if let (Some(access), Some(refresh)) = (access_jwt_override, refresh_jwt_override) {
+        println!("{}", "🔑 Using provided JWT tokens".cyan());
+        (access, refresh)
+    } else if use_password {
+        println!("{}", "🔒 Using password authentication".cyan());
+        authenticate_with_password(&handle, &pds_url).await?
+    } else {
+        // Interactive JWT input (legacy behavior)
+        print!("Access JWT: ");
+        std::io::Write::flush(&mut std::io::stdout())?;
+        let mut access_jwt = String::new();
+        std::io::stdin().read_line(&mut access_jwt)?;
+        let access_jwt = access_jwt.trim().to_string();
+        
+        print!("Refresh JWT: ");
+        std::io::Write::flush(&mut std::io::stdout())?;
+        let mut refresh_jwt = String::new();
+        std::io::stdin().read_line(&mut refresh_jwt)?;
+        let refresh_jwt = refresh_jwt.trim().to_string();
+        
+        (access_jwt, refresh_jwt)
+    };
+    
+    // Resolve DID from handle
+    println!("{}", "🔍 Resolving DID from handle...".cyan());
+    let did = resolve_did_with_pds(&handle, &pds_url).await?;
+    
+    // Create config
+    let config = AuthConfig {
+        admin: AdminConfig {
+            did: did.clone(),
+            handle: handle.clone(),
+            access_jwt,
+            refresh_jwt,
+            pds: pds_url,
+        },
+        jetstream: JetstreamConfig {
+            url: "wss://jetstream2.us-east.bsky.network/subscribe".to_string(),
+            collections: vec!["ai.syui.log".to_string()],
+        },
+        collections: generate_collection_config(),
+    };
+    
+    // Save config
+    let config_json = serde_json::to_string_pretty(&config)?;
+    fs::write(&config_path, config_json)?;
+    
+    println!("{}", "✅ Authentication configured successfully!".green());
+    println!("📁 Config saved to: {}", config_path.display());
+    println!("👤 Authenticated as: {} ({})", handle, did);
+    
+    Ok(())
+}
+
+#[allow(dead_code)]
+pub async fn init_with_pds(pds_override: Option<String>) -> Result<()> {
     println!("{}", "🔐 Initializing ATProto authentication...".cyan());
     
     let config_path = get_config_path()?;
@@ -117,9 +235,28 @@ pub async fn init() -> Result<()> {
     std::io::stdin().read_line(&mut refresh_jwt)?;
     let refresh_jwt = refresh_jwt.trim().to_string();
     
+    // Determine PDS URL
+    let pds_url = if let Some(override_pds) = pds_override {
+        // Use provided PDS override
+        if override_pds.starts_with("http") {
+            override_pds
+        } else {
+            format!("https://{}", override_pds)
+        }
+    } else {
+        // Auto-detect from handle suffix
+        if handle.ends_with(".syu.is") {
+            "https://syu.is".to_string()
+        } else {
+            "https://bsky.social".to_string()
+        }
+    };
+    
+    println!("{}", format!("🌐 Using PDS: {}", pds_url).cyan());
+    
     // Resolve DID from handle
     println!("{}", "🔍 Resolving DID from handle...".cyan());
-    let did = resolve_did(&handle).await?;
+    let did = resolve_did_with_pds(&handle, &pds_url).await?;
     
     // Create config
     let config = AuthConfig {
@@ -128,11 +265,7 @@ pub async fn init() -> Result<()> {
             handle: handle.clone(),
             access_jwt,
             refresh_jwt,
-            pds: if handle.ends_with(".syu.is") {
+            pds: pds_url,
-                "https://syu.is".to_string()
-            } else {
-                "https://bsky.social".to_string()
-            },
         },
         jetstream: JetstreamConfig {
             url: "wss://jetstream2.us-east.bsky.network/subscribe".to_string(),
@@ -152,10 +285,19 @@ pub async fn init() -> Result<()> {
     Ok(())
 }
 
+#[allow(dead_code)]
 async fn resolve_did(handle: &str) -> Result<String> {
     let client = reqwest::Client::new();
-    let url = format!("https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor={}", 
+    
-                     urlencoding::encode(handle));
+    // Use appropriate API based on handle domain
+    let api_base = if handle.ends_with(".syu.is") {
+        "https://bsky.syu.is"
+    } else {
+        "https://public.api.bsky.app"
+    };
+    
+    let url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}", 
+                     api_base, urlencoding::encode(handle));
     
     let response = client.get(&url).send().await?;
     
@@ -170,6 +312,93 @@ async fn resolve_did(handle: &str) -> Result<String> {
     Ok(did.to_string())
 }
 
+async fn resolve_did_with_pds(handle: &str, pds_url: &str) -> Result<String> {
+    let client = reqwest::Client::new();
+    
+    // Try to use the PDS API first
+    let api_base = if pds_url.contains("syu.is") {
+        "https://bsky.syu.is"
+    } else if pds_url.contains("bsky.social") {
+        "https://public.api.bsky.app"
+    } else {
+        // For custom PDS, try to construct API URL
+        pds_url
+    };
+    
+    let url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}", 
+                     api_base, urlencoding::encode(handle));
+    
+    let response = client.get(&url).send().await?;
+    
+    if !response.status().is_success() {
+        return Err(anyhow::anyhow!("Failed to resolve handle using PDS {}: {}", pds_url, response.status()));
+    }
+    
+    let profile: serde_json::Value = response.json().await?;
+    let did = profile["did"].as_str()
+        .ok_or_else(|| anyhow::anyhow!("DID not found in profile response"))?;
+    
+    Ok(did.to_string())
+}
+
+async fn authenticate_with_password(handle: &str, pds_url: &str) -> Result<(String, String)> {
+    use std::io::{self, Write};
+    
+    // Get password securely
+    print!("Password: ");
+    io::stdout().flush()?;
+    let password = rpassword::read_password()
+        .context("Failed to read password")?;
+    
+    if password.is_empty() {
+        return Err(anyhow::anyhow!("Password cannot be empty"));
+    }
+    
+    println!("{}", "🔐 Authenticating with ATProto server...".cyan());
+    
+    let client = reqwest::Client::new();
+    let auth_url = format!("{}/xrpc/com.atproto.server.createSession", pds_url);
+    
+    let auth_request = serde_json::json!({
+        "identifier": handle,
+        "password": password
+    });
+    
+    let response = client
+        .post(&auth_url)
+        .header("Content-Type", "application/json")
+        .json(&auth_request)
+        .send()
+        .await?;
+    
+    if !response.status().is_success() {
+        let status = response.status();
+        let error_text = response.text().await.unwrap_or_default();
+        
+        if status.as_u16() == 401 {
+            return Err(anyhow::anyhow!("Authentication failed: Invalid handle or password"));
+        } else if status.as_u16() == 400 {
+            return Err(anyhow::anyhow!("Authentication failed: Bad request (check handle format)"));
+        } else {
+            return Err(anyhow::anyhow!("Authentication failed: {} - {}", status, error_text));
+        }
+    }
+    
+    let auth_response: serde_json::Value = response.json().await?;
+    
+    let access_jwt = auth_response["accessJwt"].as_str()
+        .ok_or_else(|| anyhow::anyhow!("No access JWT in response"))?
+        .to_string();
+        
+    let refresh_jwt = auth_response["refreshJwt"].as_str()
+        .ok_or_else(|| anyhow::anyhow!("No refresh JWT in response"))?
+        .to_string();
+    
+    println!("{}", "✅ Password authentication successful".green());
+    
+    Ok((access_jwt, refresh_jwt))
+}
+
 pub async fn status() -> Result<()> {
     let config_path = get_config_path()?;
     
@@ -192,9 +421,17 @@ pub async fn status() -> Result<()> {
     
     // Test API access
     println!("\n{}", "🧪 Testing API access...".cyan());
-    match test_api_access(&config).await {
+    match test_api_access_with_auth(&config).await {
         Ok(_) => println!("{}", "✅ API access successful".green()),
-        Err(e) => println!("{}", format!("❌ API access failed: {}", e).red()),
+        Err(e) => {
+            println!("{}", format!("❌ Authenticated API access failed: {}", e).red());
+            // Fallback to public API test
+            println!("{}", "🔄 Trying public API access...".cyan());
+            match test_api_access(&config).await {
+                Ok(_) => println!("{}", "✅ Public API access successful".green()),
+                Err(e2) => println!("{}", format!("❌ Public API access also failed: {}", e2).red()),
+            }
+        }
     }
     
     Ok(())
@@ -202,8 +439,16 @@ pub async fn status() -> Result<()> {
 
 async fn test_api_access(config: &AuthConfig) -> Result<()> {
     let client = reqwest::Client::new();
-    let url = format!("https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor={}", 
+    
-                     urlencoding::encode(&config.admin.handle));
+    // Use appropriate API based on handle domain
+    let api_base = if config.admin.handle.ends_with(".syu.is") {
+        "https://bsky.syu.is"
+    } else {
+        "https://public.api.bsky.app"
+    };
+    
+    let url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}", 
+                     api_base, urlencoding::encode(&config.admin.handle));
     
     let response = client.get(&url).send().await?;
     

src/commands/build.rs

@@ -1,6 +1,7 @@
 use anyhow::Result;
 use colored::Colorize;
 use std::path::PathBuf;
+use std::fs;
 use crate::generator::Generator;
 use crate::config::Config;
 
@@ -10,6 +11,12 @@ pub async fn execute(path: PathBuf) -> Result<()> {
     // Load configuration
     let config = Config::load(&path)?;
     
+    // Generate OAuth .env.production if oauth directory exists
+    let oauth_dir = path.join("oauth");
+    if oauth_dir.exists() {
+        generate_oauth_env(&path, &config)?;
+    }
+    
     // Create generator
     let generator = Generator::new(path, config)?;
     
@@ -18,5 +25,104 @@ pub async fn execute(path: PathBuf) -> Result<()> {
     
     println!("{}", "Build completed successfully!".green().bold());
     
+    Ok(())
+}
+
+fn generate_oauth_env(path: &PathBuf, config: &Config) -> Result<()> {
+    let oauth_dir = path.join("oauth");
+    let env_file = oauth_dir.join(".env.production");
+    
+    // Extract configuration values
+    let base_url = &config.site.base_url;
+    let oauth_json = config.oauth.as_ref()
+        .and_then(|o| o.json.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("client-metadata.json");
+    let oauth_redirect = config.oauth.as_ref()
+        .and_then(|o| o.redirect.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("oauth/callback");
+    let admin_handle = config.oauth.as_ref()
+        .and_then(|o| o.admin.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("ai.syui.ai");
+    let ai_handle = config.ai.as_ref()
+        .and_then(|a| a.handle.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("ai.syui.ai");
+    let collection = config.oauth.as_ref()
+        .and_then(|o| o.collection.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("ai.syui.log");
+    let pds = config.oauth.as_ref()
+        .and_then(|o| o.pds.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("syu.is");
+    let handle_list = config.oauth.as_ref()
+        .and_then(|o| o.handle_list.as_ref())
+        .map(|list| format!("{:?}", list))
+        .unwrap_or_else(|| "[\"syui.syui.ai\",\"yui.syui.ai\",\"ai.syui.ai\"]".to_string());
+    
+    // AI configuration
+    let ai_enabled = config.ai.as_ref().map(|a| a.enabled).unwrap_or(true);
+    let ai_ask_ai = config.ai.as_ref().and_then(|a| a.ask_ai).unwrap_or(true);
+    let ai_provider = config.ai.as_ref()
+        .and_then(|a| a.provider.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("ollama");
+    let ai_model = config.ai.as_ref()
+        .and_then(|a| a.model.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("gemma3:4b");
+    let ai_host = config.ai.as_ref()
+        .and_then(|a| a.host.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("https://ollama.syui.ai");
+    let ai_system_prompt = config.ai.as_ref()
+        .and_then(|a| a.system_prompt.as_ref())
+        .map(|s| s.as_str())
+        .unwrap_or("あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。");
+    
+    let env_content = format!(
+r#"# Production environment variables
+VITE_APP_HOST={}
+VITE_OAUTH_CLIENT_ID={}/{}
+VITE_OAUTH_REDIRECT_URI={}/{}
+
+# Handle-based Configuration (DIDs resolved at runtime)
+VITE_ATPROTO_PDS={}
+VITE_ADMIN_HANDLE={}
+VITE_AI_HANDLE={}
+VITE_OAUTH_COLLECTION={}
+VITE_ATPROTO_WEB_URL=https://bsky.app
+VITE_ATPROTO_HANDLE_LIST={}
+
+# AI Configuration
+VITE_AI_ENABLED={}
+VITE_AI_ASK_AI={}
+VITE_AI_PROVIDER={}
+VITE_AI_MODEL={}
+VITE_AI_HOST={}
+VITE_AI_SYSTEM_PROMPT="{}"
+"#,
+        base_url,
+        base_url, oauth_json,
+        base_url, oauth_redirect,
+        pds,
+        admin_handle,
+        ai_handle,
+        collection,
+        handle_list,
+        ai_enabled,
+        ai_ask_ai,
+        ai_provider,
+        ai_model,
+        ai_host,
+        ai_system_prompt
+    );
+    
+    fs::write(&env_file, env_content)?;
+    println!("  {} oauth/.env.production", "Generated".cyan());
+    
     Ok(())
 }

src/commands/init.rs

@@ -37,9 +37,23 @@ highlight_code = true
 minify = false
 
 [ai]
-enabled = false
+enabled = true
 auto_translate = false
 comment_moderation = false
+ask_ai = true
+provider = "ollama"
+model = "gemma3:4b"
+host = "https://ollama.syui.ai"
+system_prompt = "あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。"
+handle = "ai.syui.ai"
+
+[oauth]
+json = "client-metadata.json"
+redirect = "oauth/callback"
+admin = "ai.syui.ai"
+collection = "ai.syui.log"
+pds = "syu.is"
+handle_list = ["syui.syui.ai", "yui.syui.ai", "ai.syui.ai", "syui.syu.is", "ai.syu.is"]
 "#;
 
     fs::write(path.join("config.toml"), config_content)?;

src/commands/oauth.rs

@@ -3,6 +3,8 @@ use std::path::{Path, PathBuf};
 use std::fs;
 use std::process::Command;
 use toml::Value;
+use serde_json;
+use reqwest;
 
 pub async fn build(project_dir: PathBuf) -> Result<()> {
     println!("Building OAuth app for project: {}", project_dir.display());
@@ -41,20 +43,28 @@ pub async fn build(project_dir: PathBuf) -> Result<()> {
         .and_then(|v| v.as_str())
         .unwrap_or("oauth/callback");
 
-    let admin_did = oauth_config.get("admin")
+    // Get admin handle instead of DID
+    let admin_handle = oauth_config.get("admin")
         .and_then(|v| v.as_str())
-        .ok_or_else(|| anyhow::anyhow!("No admin DID found in [oauth] section"))?;
+        .ok_or_else(|| anyhow::anyhow!("No admin handle found in [oauth] section"))?;
 
     let collection_base = oauth_config.get("collection")
         .and_then(|v| v.as_str())
         .unwrap_or("ai.syui.log");
 
+    // Get handle list for authentication restriction
+    let handle_list = oauth_config.get("handle_list")
+        .and_then(|v| v.as_array())
+        .map(|arr| arr.iter().filter_map(|v| v.as_str()).collect::<Vec<&str>>())
+        .unwrap_or_else(|| vec![]);
+
     // Extract AI configuration from ai config if available
     let ai_config = config.get("ai").and_then(|v| v.as_table());
-    let ai_did = ai_config
+    // Get AI handle from config
-        .and_then(|ai_table| ai_table.get("ai_did"))
+    let ai_handle = ai_config
+        .and_then(|ai_table| ai_table.get("ai_handle"))
         .and_then(|v| v.as_str())
-        .unwrap_or("did:plc:4hqjfn7m6n5hno3doamuhgef");
+        .unwrap_or("yui.syui.ai");
     let ai_enabled = ai_config
         .and_then(|ai_table| ai_table.get("enabled"))
         .and_then(|v| v.as_bool())
@@ -80,26 +90,55 @@ pub async fn build(project_dir: PathBuf) -> Result<()> {
         .and_then(|v| v.as_str())
         .unwrap_or("あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。 相手のことが大好きで、ときどき甘えたり、照れたりします。 でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。");
 
-    // Extract bsky_api from oauth config
+    // Determine network configuration based on PDS
-    let bsky_api = oauth_config.get("bsky_api")
+    let pds = oauth_config.get("pds")
         .and_then(|v| v.as_str())
-        .unwrap_or("https://public.api.bsky.app");
+        .unwrap_or("bsky.social");
     
-    // Extract atproto_api from oauth config
+    let (bsky_api, _atproto_api, web_url) = match pds {
-    let atproto_api = oauth_config.get("atproto_api")
+        "syu.is" => (
-        .and_then(|v| v.as_str())
+            "https://bsky.syu.is",
-        .unwrap_or("https://bsky.social");
+            "https://syu.is",
+            "https://web.syu.is"
+        ),
+        "bsky.social" | "bsky.app" => (
+            "https://public.api.bsky.app",
+            "https://bsky.social",
+            "https://bsky.app"
+        ),
+        _ => (
+            "https://public.api.bsky.app",
+            "https://bsky.social",
+            "https://bsky.app"
+        )
+    };
 
-    // 4. Create .env.production content
+    // Resolve handles to DIDs using appropriate API
+    println!("🔍 Resolving admin handle: {}", admin_handle);
+    let admin_did = resolve_handle_to_did(admin_handle, &bsky_api).await
+        .with_context(|| format!("Failed to resolve admin handle: {}", admin_handle))?;
+    
+    println!("🔍 Resolving AI handle: {}", ai_handle);
+    let ai_did = resolve_handle_to_did(ai_handle, &bsky_api).await
+        .with_context(|| format!("Failed to resolve AI handle: {}", ai_handle))?;
+    
+    println!("✅ Admin DID: {}", admin_did);
+    println!("✅ AI DID: {}", ai_did);
+
+    // 4. Create .env.production content with handle-based configuration
     let env_content = format!(
         r#"# Production environment variables
 VITE_APP_HOST={}
 VITE_OAUTH_CLIENT_ID={}/{}
 VITE_OAUTH_REDIRECT_URI={}/{}
-VITE_ADMIN_DID={}
 
-# Base collection (all others are derived via getCollectionNames)
+# Handle-based Configuration (DIDs resolved at runtime)
+VITE_ATPROTO_PDS={}
+VITE_ADMIN_HANDLE={}
+VITE_AI_HANDLE={}
 VITE_OAUTH_COLLECTION={}
+VITE_ATPROTO_WEB_URL={}
+VITE_ATPROTO_HANDLE_LIST={}
 
 # AI Configuration
 VITE_AI_ENABLED={}
@@ -108,26 +147,28 @@ VITE_AI_PROVIDER={}
 VITE_AI_MODEL={}
 VITE_AI_HOST={}
 VITE_AI_SYSTEM_PROMPT="{}"
-VITE_AI_DID={}
 
-# API Configuration
+# DIDs (resolved from handles - for backward compatibility)
-VITE_BSKY_PUBLIC_API={}
+#VITE_ADMIN_DID={}
-VITE_ATPROTO_API={}
+#VITE_AI_DID={}
 "#,
         base_url,
         base_url, client_id_path,
         base_url, redirect_path,
-        admin_did,
+        pds,
+        admin_handle,
+        ai_handle,
         collection_base,
+        web_url,
+        format!("[{}]", handle_list.iter().map(|h| format!("\"{}\"", h)).collect::<Vec<_>>().join(",")),
         ai_enabled,
         ai_ask_ai,
         ai_provider,
         ai_model,
         ai_host,
         ai_system_prompt,
-        ai_did,
+        admin_did,
-        bsky_api,
+        ai_did
-        atproto_api
     );
 
     // 5. Find oauth directory (relative to current working directory)
@@ -238,4 +279,60 @@ fn copy_dir_recursive(src: &Path, dst: &Path) -> Result<()> {
     }
 
     Ok(())
+}
+
+// Handle-to-DID resolution with proper PDS detection
+async fn resolve_handle_to_did(handle: &str, _api_base: &str) -> Result<String> {
+    let client = reqwest::Client::new();
+    
+    // First, try to resolve handle to DID using multiple endpoints
+    let bsky_endpoints = ["https://public.api.bsky.app", "https://bsky.syu.is"];
+    let mut resolved_did = None;
+    
+    for endpoint in &bsky_endpoints {
+        let url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}", 
+                         endpoint, urlencoding::encode(handle));
+        
+        if let Ok(response) = client.get(&url).send().await {
+            if response.status().is_success() {
+                if let Ok(profile) = response.json::<serde_json::Value>().await {
+                    if let Some(did) = profile["did"].as_str() {
+                        resolved_did = Some(did.to_string());
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    
+    let did = resolved_did
+        .ok_or_else(|| anyhow::anyhow!("Failed to resolve handle '{}' from any endpoint", handle))?;
+    
+    // Now verify the DID and get actual PDS using com.atproto.repo.describeRepo
+    let pds_endpoints = ["https://bsky.social", "https://syu.is"];
+    
+    for pds in &pds_endpoints {
+        let describe_url = format!("{}/xrpc/com.atproto.repo.describeRepo?repo={}", 
+                                 pds, urlencoding::encode(&did));
+        
+        if let Ok(response) = client.get(&describe_url).send().await {
+            if response.status().is_success() {
+                if let Ok(data) = response.json::<serde_json::Value>().await {
+                    if let Some(services) = data["didDoc"]["service"].as_array() {
+                        if services.iter().any(|s| 
+                            s["id"] == "#atproto_pds" || s["type"] == "AtprotoPersonalDataServer"
+                        ) {
+                            // DID is valid and has PDS service
+                            println!("✅ Verified DID {} has PDS via {}", did, pds);
+                            return Ok(did);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    // If PDS verification fails, still return the DID but warn
+    println!("⚠️  Could not verify PDS for DID {}, but proceeding...", did);
+    Ok(did)
 }

src/commands/stream.rs

@@ -14,25 +14,70 @@ use reqwest;
 
 use super::auth::{load_config, load_config_with_refresh, AuthConfig};
 
+// PDS-based network configuration mapping
+fn get_network_config(pds: &str) -> NetworkConfig {
+    match pds {
+        "bsky.social" | "bsky.app" => NetworkConfig {
+            pds_api: format!("https://{}", pds),
+            plc_api: "https://plc.directory".to_string(),
+            bsky_api: "https://public.api.bsky.app".to_string(),
+            web_url: "https://bsky.app".to_string(),
+        },
+        "syu.is" => NetworkConfig {
+            pds_api: "https://syu.is".to_string(),
+            plc_api: "https://plc.syu.is".to_string(),
+            bsky_api: "https://bsky.syu.is".to_string(),
+            web_url: "https://web.syu.is".to_string(),
+        },
+        _ => {
+            // Default to Bluesky network for unknown PDS
+            NetworkConfig {
+                pds_api: format!("https://{}", pds),
+                plc_api: "https://plc.directory".to_string(),
+                bsky_api: "https://public.api.bsky.app".to_string(),
+                web_url: "https://bsky.app".to_string(),
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+#[allow(dead_code)]
+struct NetworkConfig {
+    pds_api: String,
+    plc_api: String,
+    bsky_api: String,
+    web_url: String,
+}
+
 #[derive(Debug, Clone)]
 struct AiConfig {
     blog_host: String,
     ollama_host: String,
-    ai_did: String,
+    #[allow(dead_code)]
+    ai_handle: String,
+    ai_did: String,  // Resolved from ai_handle at runtime
     model: String,
     system_prompt: String,
+    #[allow(dead_code)]
     bsky_api: String,
+    num_predict: Option<i32>,
+    network: NetworkConfig,
 }
 
 impl Default for AiConfig {
     fn default() -> Self {
+        let default_network = get_network_config("bsky.social");
         Self {
             blog_host: "https://syui.ai".to_string(),
             ollama_host: "https://ollama.syui.ai".to_string(),
-            ai_did: "did:plc:4hqjfn7m6n5hno3doamuhgef".to_string(),
+            ai_handle: "ai.syui.ai".to_string(),
+            ai_did: "did:plc:6qyecktefllvenje24fcxnie".to_string(),  // Fallback DID
             model: "gemma3:4b".to_string(),
             system_prompt: "あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。相手のことが大好きで、ときどき甘えたり、照れたりします。でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。".to_string(),
-            bsky_api: "https://public.api.bsky.app".to_string(),
+            bsky_api: default_network.bsky_api.clone(),
+            num_predict: None,
+            network: default_network,
         }
     }
 }
@@ -135,10 +180,16 @@ fn load_collection_config_from_project(project_dir: &Path) -> Result<(String, St
     Ok((collection_base, collection_user))
 }
 
-// Load AI config from project's config.toml
+// Load AI config from project's config.toml with optional project directory
-fn load_ai_config_from_project() -> Result<AiConfig> {
+fn load_ai_config_from_project_dir(project_dir: Option<&Path>) -> Result<AiConfig> {
-    // Try to find config.toml in current directory or parent directories
+    let search_start = if let Some(dir) = project_dir {
-    let mut current_dir = std::env::current_dir()?;
+        dir.to_path_buf()
+    } else {
+        std::env::current_dir()?
+    };
+    
+    // Try to find config.toml in specified directory or parent directories
+    let mut current_dir = search_start;
     let mut config_path = None;
     
     for _ in 0..5 { // Search up to 5 levels up
@@ -152,7 +203,7 @@ fn load_ai_config_from_project() -> Result<AiConfig> {
         }
     }
     
-    let config_path = config_path.ok_or_else(|| anyhow::anyhow!("config.toml not found in current directory or parent directories"))?;
+    let config_path = config_path.ok_or_else(|| anyhow::anyhow!("config.toml not found in specified directory or parent directories"))?;
     
     let config_content = fs::read_to_string(&config_path)
         .with_context(|| format!("Failed to read config.toml from {}", config_path.display()))?;
@@ -176,10 +227,17 @@ fn load_ai_config_from_project() -> Result<AiConfig> {
         .unwrap_or("https://ollama.syui.ai")
         .to_string();
     
-    let ai_did = ai_config
+    // Read AI handle (preferred) or fallback to AI DID
+    let ai_handle = ai_config
+        .and_then(|ai| ai.get("handle"))
+        .and_then(|v| v.as_str())
+        .unwrap_or("ai.syui.ai")
+        .to_string();
+    
+    let fallback_ai_did = ai_config
         .and_then(|ai| ai.get("ai_did"))
         .and_then(|v| v.as_str())
-        .unwrap_or("did:plc:4hqjfn7m6n5hno3doamuhgef")
+        .unwrap_or("did:plc:6qyecktefllvenje24fcxnie")
         .to_string();
     
     let model = ai_config
@@ -193,25 +251,59 @@ fn load_ai_config_from_project() -> Result<AiConfig> {
         .and_then(|v| v.as_str())
         .unwrap_or("あなたは6歳の女の子アイです。明るく元気で、ちょっとおっちょこちょい。自分のことは「アイ」って呼びます。白と金のワンピース姿。相手のことが大好きで、ときどき甘えたり、照れたりします。でも、宇宙とかAIとか、難しい話にもすっごく詳しいの。専門的なことも、がんばって子どもっぽく教えようとします。不思議な力を持っています。小さい物質のことをよく知っているようです。")
         .to_string();
+    
+    let num_predict = ai_config
+        .and_then(|ai| ai.get("num_predict"))
+        .and_then(|v| v.as_integer())
+        .map(|v| v as i32);
 
-    // Extract OAuth config for bsky_api
+    // Extract OAuth config to determine network
     let oauth_config = config.get("oauth").and_then(|v| v.as_table());
-    let bsky_api = oauth_config
+    let pds = oauth_config
-        .and_then(|oauth| oauth.get("bsky_api"))
+        .and_then(|oauth| oauth.get("pds"))
         .and_then(|v| v.as_str())
-        .unwrap_or("https://public.api.bsky.app")
+        .unwrap_or("syu.is")
         .to_string();
 
+    let network = get_network_config(&pds);
+
     Ok(AiConfig {
         blog_host,
         ollama_host,
-        ai_did,
+        ai_handle,
+        ai_did: fallback_ai_did,
         model,
         system_prompt,
-        bsky_api,
+        bsky_api: network.bsky_api.clone(),
+        num_predict,
+        network,
     })
 }
 
+// Load AI config from project's config.toml
+fn load_ai_config_from_project() -> Result<AiConfig> {
+    load_ai_config_from_project_dir(None)
+}
+
+// Async version of load_ai_config_from_project that resolves handles to DIDs
+#[allow(dead_code)]
+async fn load_ai_config_with_did_resolution() -> Result<AiConfig> {
+    let mut ai_config = load_ai_config_from_project()?;
+    
+    // Resolve AI handle to DID
+    match resolve_handle(&ai_config.ai_handle, &ai_config.network).await {
+        Ok(resolved_did) => {
+            ai_config.ai_did = resolved_did;
+            println!("🔍 Resolved AI handle '{}' to DID: {}", ai_config.ai_handle, ai_config.ai_did);
+        }
+        Err(e) => {
+            println!("⚠️  Failed to resolve AI handle '{}': {}. Using fallback DID.", ai_config.ai_handle, e);
+        }
+    }
+    
+    Ok(ai_config)
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 struct JetstreamMessage {
     collection: Option<String>,
@@ -257,6 +349,104 @@ fn get_pid_file() -> Result<PathBuf> {
     Ok(pid_dir.join("stream.pid"))
 }
 
+pub async fn init_user_list(project_dir: Option<PathBuf>, handles: Option<String>) -> Result<()> {
+    println!("{}", "🔧 Initializing user list...".cyan());
+    
+    // Load auth config
+    let mut config = match load_config_with_refresh().await {
+        Ok(config) => config,
+        Err(e) => {
+            println!("{}", format!("❌ Not authenticated: {}. Run 'ailog auth init --pds <PDS>' first.", e).red());
+            return Ok(());
+        }
+    };
+    
+    println!("{}", format!("📋 Admin: {} ({})", config.admin.handle, config.admin.did).cyan());
+    println!("{}", format!("🌐 PDS: {}", config.admin.pds).cyan());
+    
+    let mut users = Vec::new();
+    
+    // Parse handles if provided
+    if let Some(handles_str) = handles {
+        println!("{}", "🔍 Resolving provided handles...".cyan());
+        let handle_list: Vec<&str> = handles_str.split(',').map(|s| s.trim()).collect();
+        
+        for handle in handle_list {
+            if handle.is_empty() {
+                continue;
+            }
+            
+            println!("   🏷️  Resolving handle: {}", handle);
+            
+            // Get AI config to determine network settings
+            let ai_config = if let Some(ref proj_dir) = project_dir {
+                let current_dir = std::env::current_dir()?;
+                std::env::set_current_dir(proj_dir)?;
+                let config = load_ai_config_from_project().unwrap_or_default();
+                std::env::set_current_dir(current_dir)?;
+                config
+            } else {
+                load_ai_config_from_project().unwrap_or_default()
+            };
+            
+            // Try to resolve handle to DID
+            match resolve_handle_to_did(handle, &ai_config.network).await {
+                Ok(did) => {
+                    println!("      ✅ DID: {}", did.cyan());
+                    
+                    // Detect PDS for this user using proper detection
+                    let detected_pds = detect_user_pds(&did, &ai_config.network).await
+                        .unwrap_or_else(|_| {
+                            // Fallback to handle-based detection
+                            if handle.ends_with(".syu.is") {
+                                "https://syu.is".to_string()
+                            } else {
+                                "https://bsky.social".to_string()
+                            }
+                        });
+                    
+                    users.push(UserRecord {
+                        did,
+                        handle: handle.to_string(),
+                        pds: detected_pds,
+                    });
+                }
+                Err(e) => {
+                    println!("      ❌ Failed to resolve {}: {}", handle, e);
+                }
+            }
+        }
+    } else {
+        println!("{}", "ℹ️  No handles provided, creating empty user list".blue());
+    }
+    
+    // Create the initial user list
+    println!("{}", format!("📝 Creating user list with {} users...", users.len()).cyan());
+    
+    match post_user_list(&mut config, &users, json!({
+        "reason": "initial_setup",
+        "created_by": "ailog_stream_init"
+    })).await {
+        Ok(_) => println!("{}", "✅ User list created successfully!".green()),
+        Err(e) => {
+            println!("{}", format!("❌ Failed to create user list: {}", e).red());
+            return Err(e);
+        }
+    }
+    
+    // Show summary
+    if users.is_empty() {
+        println!("{}", "📋 Empty user list created. Use 'ailog stream start --ai-generate' to auto-add commenters.".blue());
+    } else {
+        println!("{}", "📋 User list contents:".cyan());
+        for user in &users {
+            println!("   👤 {} ({})", user.handle, user.did);
+        }
+    }
+    
+    Ok(())
+}
+
 pub async fn start(project_dir: Option<PathBuf>, daemon: bool, ai_generate: bool) -> Result<()> {
     let mut config = load_config_with_refresh().await?;
     
@@ -338,9 +528,10 @@ pub async fn start(project_dir: Option<PathBuf>, daemon: bool, ai_generate: bool
     // Start AI generation monitor if enabled
     if ai_generate {
         let ai_config = config.clone();
+        let project_path = project_dir.clone();
         tokio::spawn(async move {
             loop {
-                if let Err(e) = run_ai_generation_monitor(&ai_config).await {
+                if let Err(e) = run_ai_generation_monitor(&ai_config, project_path.as_deref()).await {
                     println!("{}", format!("❌ AI generation monitor error: {}", e).red());
                     sleep(Duration::from_secs(60)).await; // Wait 1 minute before retry
                 }
@@ -509,7 +700,8 @@ async fn handle_message(text: &str, config: &mut AuthConfig) -> Result<()> {
             println!("   👤 Author DID: {}", did);
             
             // Resolve handle
-            match resolve_handle(did).await {
+            let ai_config = load_ai_config_from_project().unwrap_or_default();
+            match resolve_handle(did, &ai_config.network).await {
                 Ok(handle) => {
                     println!("   🏷️  Handle: {}", handle.cyan());
                     
@@ -530,11 +722,37 @@ async fn handle_message(text: &str, config: &mut AuthConfig) -> Result<()> {
     Ok(())
 }
 
-async fn resolve_handle(did: &str) -> Result<String> {
+async fn resolve_handle(did: &str, _network: &NetworkConfig) -> Result<String> {
     let client = reqwest::Client::new();
-    // Use default bsky API for handle resolution
+    
-    let url = format!("https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor={}", 
+    // First try to resolve PDS from DID using com.atproto.repo.describeRepo
-                     urlencoding::encode(did));
+    let pds_endpoints = ["https://bsky.social", "https://syu.is"];
+    let mut resolved_pds = None;
+    
+    for pds in &pds_endpoints {
+        let describe_url = format!("{}/xrpc/com.atproto.repo.describeRepo?repo={}", pds, urlencoding::encode(did));
+        if let Ok(response) = client.get(&describe_url).send().await {
+            if response.status().is_success() {
+                if let Ok(data) = response.json::<Value>().await {
+                    if let Some(services) = data["didDoc"]["service"].as_array() {
+                        if let Some(pds_service) = services.iter().find(|s| 
+                            s["id"] == "#atproto_pds" || s["type"] == "AtprotoPersonalDataServer"
+                        ) {
+                            if let Some(endpoint) = pds_service["serviceEndpoint"].as_str() {
+                                resolved_pds = Some(get_network_config_from_pds(endpoint));
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    // Use resolved PDS or fallback to Bluesky
+    let network_config = resolved_pds.unwrap_or_else(|| get_network_config("bsky.social"));
+    let url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}", 
+                     network_config.bsky_api, urlencoding::encode(did));
     
     let response = client.get(&url).send().await?;
     
@@ -549,6 +767,53 @@ async fn resolve_handle(did: &str) -> Result<String> {
     Ok(handle.to_string())
 }
 
+// Helper function to get network config from PDS endpoint
+fn get_network_config_from_pds(pds_endpoint: &str) -> NetworkConfig {
+    if pds_endpoint.contains("syu.is") {
+        NetworkConfig {
+            pds_api: pds_endpoint.to_string(),
+            plc_api: "https://plc.syu.is".to_string(),
+            bsky_api: "https://bsky.syu.is".to_string(),
+            web_url: "https://web.syu.is".to_string(),
+        }
+    } else {
+        // Default to Bluesky infrastructure
+        NetworkConfig {
+            pds_api: pds_endpoint.to_string(),
+            plc_api: "https://plc.directory".to_string(),
+            bsky_api: "https://public.api.bsky.app".to_string(),
+            web_url: "https://bsky.app".to_string(),
+        }
+    }
+}
+
+async fn detect_user_pds(did: &str, _network_config: &NetworkConfig) -> Result<String> {
+    let client = reqwest::Client::new();
+    let pds_endpoints = ["https://bsky.social", "https://syu.is"];
+    
+    for pds in &pds_endpoints {
+        let describe_url = format!("{}/xrpc/com.atproto.repo.describeRepo?repo={}", pds, urlencoding::encode(did));
+        if let Ok(response) = client.get(&describe_url).send().await {
+            if response.status().is_success() {
+                if let Ok(data) = response.json::<Value>().await {
+                    if let Some(services) = data["didDoc"]["service"].as_array() {
+                        if let Some(pds_service) = services.iter().find(|s| 
+                            s["id"] == "#atproto_pds" || s["type"] == "AtprotoPersonalDataServer"
+                        ) {
+                            if let Some(endpoint) = pds_service["serviceEndpoint"].as_str() {
+                                return Ok(endpoint.to_string());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    // Fallback to default
+    Ok("https://bsky.social".to_string())
+}
+
 async fn update_user_list(config: &mut AuthConfig, did: &str, handle: &str) -> Result<()> {
     // Get current user list
     let current_users = get_current_user_list(config).await?;
@@ -561,18 +826,36 @@ async fn update_user_list(config: &mut AuthConfig, did: &str, handle: &str) -> R
     
     println!("   ➕ Adding new user to list: {}", handle.green());
     
-    // Detect PDS
+    // Detect PDS using proper resolution from DID
-    let pds = if handle.ends_with(".syu.is") {
+    let client = reqwest::Client::new();
-        "https://syu.is"
+    let pds_endpoints = ["https://bsky.social", "https://syu.is"];
-    } else {
+    let mut detected_pds = "https://bsky.social".to_string(); // Default fallback
-        "https://bsky.social"
+    
-    };
+    for pds in &pds_endpoints {
+        let describe_url = format!("{}/xrpc/com.atproto.repo.describeRepo?repo={}", pds, urlencoding::encode(did));
+        if let Ok(response) = client.get(&describe_url).send().await {
+            if response.status().is_success() {
+                if let Ok(data) = response.json::<Value>().await {
+                    if let Some(services) = data["didDoc"]["service"].as_array() {
+                        if let Some(pds_service) = services.iter().find(|s| 
+                            s["id"] == "#atproto_pds" || s["type"] == "AtprotoPersonalDataServer"
+                        ) {
+                            if let Some(endpoint) = pds_service["serviceEndpoint"].as_str() {
+                                detected_pds = endpoint.to_string();
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
     
     // Add new user
     let new_user = UserRecord {
         did: did.to_string(),
         handle: handle.to_string(),
-        pds: pds.to_string(),
+        pds: detected_pds,
     };
     
     let mut updated_users = current_users;
@@ -883,7 +1166,8 @@ async fn poll_comments_periodically(mut config: AuthConfig) -> Result<()> {
                                         println!("   👤 Author DID: {}", did);
                                         
                                         // Resolve handle and update user list
-                                        match resolve_handle(&did).await {
+                                        let ai_config = load_ai_config_from_project().unwrap_or_default();
+                                        match resolve_handle(&did, &ai_config.network).await {
                                             Ok(handle) => {
                                                 println!("   🏷️  Handle: {}", handle.cyan());
                                                 
@@ -981,6 +1265,68 @@ fn extract_did_from_uri(uri: &str) -> Option<String> {
     None
 }
 
+// OAuth config structure for loading admin settings
+#[derive(Debug)]
+struct OAuthConfig {
+    admin: String,
+    pds: Option<String>,
+}
+
+// Load OAuth config from project's config.toml
+fn load_oauth_config_from_project() -> Option<OAuthConfig> {
+    // Try to find config.toml in current directory or parent directories
+    let mut current_dir = std::env::current_dir().ok()?;
+    let mut config_path = None;
+    
+    for _ in 0..5 { // Search up to 5 levels up
+        let potential_config = current_dir.join("config.toml");
+        if potential_config.exists() {
+            config_path = Some(potential_config);
+            break;
+        }
+        if !current_dir.pop() {
+            break;
+        }
+    }
+    
+    let config_path = config_path?;
+    let config_content = std::fs::read_to_string(&config_path).ok()?;
+    let config: toml::Value = config_content.parse().ok()?;
+
+    let oauth_config = config.get("oauth").and_then(|v| v.as_table())?;
+    
+    let admin = oauth_config
+        .get("admin")
+        .and_then(|v| v.as_str())?
+        .to_string();
+    
+    let pds = oauth_config
+        .get("pds")
+        .and_then(|v| v.as_str())
+        .map(|s| s.to_string());
+
+    Some(OAuthConfig { admin, pds })
+}
+
+// Resolve handle to DID using PLC directory
+async fn resolve_handle_to_did(handle: &str, network_config: &NetworkConfig) -> Result<String> {
+    let client = reqwest::Client::new();
+    let url = format!("{}/xrpc/com.atproto.identity.resolveHandle?handle={}", 
+                     network_config.bsky_api, urlencoding::encode(handle));
+    
+    let response = client.get(&url).send().await?;
+    
+    if !response.status().is_success() {
+        return Err(anyhow::anyhow!("Failed to resolve handle: {}", response.status()));
+    }
+    
+    let data: Value = response.json().await?;
+    let did = data["did"].as_str()
+        .ok_or_else(|| anyhow::anyhow!("DID not found in response"))?;
+    
+    Ok(did.to_string())
+}
+
 pub async fn test_api() -> Result<()> {
     println!("{}", "🧪 Testing API access to comments collection...".cyan().bold());
     
@@ -1050,18 +1396,20 @@ async fn generate_ai_content(content: &str, prompt_type: &str, ai_config: &AiCon
             };
             
             format!(
-                "{}\n\n# 指示\nこのブログ記事を読んで、アイらしい感想を一言でください。\n- 30文字以内の短い感想\n- 技術的な内容への素朴な驚きや発見\n- 「わー！」「すごい！」など、アイらしい感嘆詞で始める\n- 簡潔で分かりやすく\n\n# ブログ記事（要約）\n{}\n\n# 出力形式\n一言の感想のみ（説明や詳細は不要）:",
+                "{}\n\n# 指示\nこのブログ記事を読んで、アイらしい感想をください。\n- 100文字以内の感想\n- 技術的な内容への素朴な驚きや発見\n- アイらしい感嘆詞で始める\n- 簡潔で分かりやすく\n\n# ブログ記事（要約）\n{}\n\n# 出力形式\n感想のみ（説明や詳細は不要）:",
                 system_prompt, limited_content
             )
         },
         _ => return Err(anyhow::anyhow!("Unknown prompt type: {}", prompt_type)),
     };
 
-    let num_predict = match prompt_type {
+    let num_predict = ai_config.num_predict.unwrap_or_else(|| {
-        "comment" => 50,  // Very short for comments (about 30-40 characters)
+        match prompt_type {
-        "translate" => 3000, // Much longer for translations
+            "comment" => 150,  // Longer for comments (about 100 characters)
-        _ => 300,
+            "translate" => 3000, // Much longer for translations
-    };
+            _ => 300,
+        }
+    });
 
     let request = OllamaRequest {
         model: model.to_string(),
@@ -1110,9 +1458,9 @@ async fn generate_ai_content(content: &str, prompt_type: &str, ai_config: &AiCon
     Ok(ollama_response.response)
 }
 
-async fn run_ai_generation_monitor(config: &AuthConfig) -> Result<()> {
+async fn run_ai_generation_monitor(config: &AuthConfig, project_dir: Option<&Path>) -> Result<()> {
     // Load AI config from project config.toml or use defaults
-    let ai_config = load_ai_config_from_project().unwrap_or_else(|e| {
+    let ai_config = load_ai_config_from_project_dir(project_dir).unwrap_or_else(|e| {
         println!("{}", format!("⚠️  Failed to load AI config: {}, using defaults", e).yellow());
         AiConfig::default()
     });
@@ -1301,8 +1649,23 @@ fn extract_date_from_slug(slug: &str) -> String {
 }
 
 async fn get_ai_profile(client: &reqwest::Client, ai_config: &AiConfig) -> Result<serde_json::Value> {
+    let handle = &ai_config.ai_handle;
+    
+    // First, try to resolve PDS from handle using the admin's configured PDS
+    let mut network_config = ai_config.network.clone();
+    
+    // For admin/ai handles matching configured PDS, use the configured network
+    if let Some(oauth_config) = load_oauth_config_from_project() {
+        if handle == &oauth_config.admin {
+            // Use configured PDS for admin handle
+            let pds = oauth_config.pds.unwrap_or_else(|| "syu.is".to_string());
+            network_config = get_network_config(&pds);
+        }
+    }
+    
+    // Get profile from appropriate bsky API
     let url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}", 
-                     ai_config.bsky_api, urlencoding::encode(&ai_config.ai_did));
+                     network_config.bsky_api, urlencoding::encode(handle));
     
     let response = client
         .get(&url)
@@ -1310,20 +1673,41 @@ async fn get_ai_profile(client: &reqwest::Client, ai_config: &AiConfig) -> Resul
         .await?;
         
     if !response.status().is_success() {
-        // Fallback to default AI profile
+        // Try to resolve DID first, then retry with DID
+        match resolve_handle_to_did(handle, &network_config).await {
+            Ok(resolved_did) => {
+                // Retry with resolved DID
+                let did_url = format!("{}/xrpc/app.bsky.actor.getProfile?actor={}", 
+                                     network_config.bsky_api, urlencoding::encode(&resolved_did));
+                let did_response = client.get(&did_url).send().await?;
+                
+                if did_response.status().is_success() {
+                    let profile_data: serde_json::Value = did_response.json().await?;
+                    return Ok(serde_json::json!({
+                        "did": resolved_did,
+                        "handle": profile_data["handle"].as_str().unwrap_or(handle),
+                        "displayName": profile_data["displayName"].as_str().unwrap_or("ai"),
+                        "avatar": profile_data["avatar"].as_str()
+                    }));
+                }
+            }
+            Err(_) => {}
+        }
+        
+        // Final fallback to default AI profile
         return Ok(serde_json::json!({
             "did": ai_config.ai_did,
-            "handle": "yui.syui.ai",
+            "handle": handle,
             "displayName": "ai",
-            "avatar": "https://cdn.bsky.app/img/avatar/plain/did:plc:4hqjfn7m6n5hno3doamuhgef/bafkreiaxkv624mffw3cfyi67ufxtwuwsy2mjw2ygezsvtd44ycbgkfdo2a@jpeg"
+            "avatar": format!("https://api.dicebear.com/7.x/bottts-neutral/svg?seed={}", handle)
         }));
     }
     
     let profile_data: serde_json::Value = response.json().await?;
     
     Ok(serde_json::json!({
-        "did": ai_config.ai_did,
+        "did": profile_data["did"].as_str().unwrap_or(&ai_config.ai_did),
-        "handle": profile_data["handle"].as_str().unwrap_or("yui.syui.ai"),
+        "handle": profile_data["handle"].as_str().unwrap_or(handle),
         "displayName": profile_data["displayName"].as_str().unwrap_or("ai"),
         "avatar": profile_data["avatar"].as_str()
     }))
@@ -1440,4 +1824,4 @@ async fn store_atproto_record(
     }
     
     Ok(())
-}
+}

src/config.rs

@@ -9,6 +9,7 @@ pub struct Config {
     pub site: SiteConfig,
     pub build: BuildConfig,
     pub ai: Option<AiConfig>,
+    pub oauth: Option<OAuthConfig>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -37,10 +38,22 @@ pub struct AiConfig {
     pub model: Option<String>,
     pub host: Option<String>,
     pub system_prompt: Option<String>,
+    pub handle: Option<String>,
     pub ai_did: Option<String>,
     pub api_key: Option<String>,
     pub gpt_endpoint: Option<String>,
     pub atproto_config: Option<AtprotoConfig>,
+    pub num_predict: Option<i32>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct OAuthConfig {
+    pub json: Option<String>,
+    pub redirect: Option<String>,
+    pub admin: Option<String>,
+    pub collection: Option<String>,
+    pub pds: Option<String>,
+    pub handle_list: Option<Vec<String>>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -159,11 +172,14 @@ impl Default for Config {
                 model: Some("gemma3:4b".to_string()),
                 host: None,
                 system_prompt: Some("You are a helpful AI assistant trained on this blog's content.".to_string()),
+                handle: None,
                 ai_did: None,
                 api_key: None,
                 gpt_endpoint: None,
                 atproto_config: None,
+                num_predict: None,
             }),
+            oauth: None,
         }
     }
 }

src/main.rs

@@ -102,7 +102,23 @@ enum Commands {
 #[derive(Subcommand)]
 enum AuthCommands {
     /// Initialize OAuth authentication
-    Init,
+    Init {
+        /// Specify PDS server (e.g., syu.is, bsky.social)
+        #[arg(long)]
+        pds: Option<String>,
+        /// Handle/username for authentication
+        #[arg(long)]
+        handle: Option<String>,
+        /// Use password authentication instead of JWT
+        #[arg(long)]
+        password: bool,
+        /// Access JWT token (alternative to password auth)
+        #[arg(long)]
+        access_jwt: Option<String>,
+        /// Refresh JWT token (required with access-jwt)
+        #[arg(long)]
+        refresh_jwt: Option<String>,
+    },
     /// Show current authentication status
     Status,
     /// Logout and clear credentials
@@ -122,6 +138,14 @@ enum StreamCommands {
         #[arg(long)]
         ai_generate: bool,
     },
+    /// Initialize user list for admin account
+    Init {
+        /// Path to the blog project directory
+        project_dir: Option<PathBuf>,
+        /// Handles to add to initial user list (comma-separated)
+        #[arg(long)]
+        handles: Option<String>,
+    },
     /// Stop monitoring
     Stop,
     /// Show monitoring status
@@ -183,8 +207,8 @@ async fn main() -> Result<()> {
         }
         Commands::Auth { command } => {
             match command {
-                AuthCommands::Init => {
+                AuthCommands::Init { pds, handle, password, access_jwt, refresh_jwt } => {
-                    commands::auth::init().await?;
+                    commands::auth::init_with_options(pds, handle, password, access_jwt, refresh_jwt).await?;
                 }
                 AuthCommands::Status => {
                     commands::auth::status().await?;
@@ -199,6 +223,9 @@ async fn main() -> Result<()> {
                 StreamCommands::Start { project_dir, daemon, ai_generate } => {
                     commands::stream::start(project_dir, daemon, ai_generate).await?;
                 }
+                StreamCommands::Init { project_dir, handles } => {
+                    commands::stream::init_user_list(project_dir, handles).await?;
+                }
                 StreamCommands::Stop => {
                     commands::stream::stop().await?;
                 }

systemd/system/ailog-stream.service

@@ -6,9 +6,9 @@ Wants=network.target
 [Service]
 Type=simple
 User=syui
-Group=syui
 WorkingDirectory=/home/syui/git/log
-ExecStart=/home/syui/.cargo/bin/ailog stream start my-blog
+ExecStart=/home/syui/.cargo/bin/ailog stream start my-blog --ai-generate
+ExecStop=/home/syui/.cargo/bin/ailog stream stop
 Restart=always
 RestartSec=5
 StandardOutput=journal
@@ -19,4 +19,4 @@ Environment=RUST_LOG=info
 Environment=AILOG_DEBUG_ALL=1
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

templates/api.md

@@ -1,103 +0,0 @@
-# API Documentation
-
-## Public Functions
-
-{{#each api.public_functions}}
-### `{{this.name}}`
-
-{{#if this.docs}}
-{{this.docs}}
-{{/if}}
-
-**Visibility:** `{{this.visibility}}`
-{{#if this.is_async}}**Async:** Yes{{/if}}
-
-{{#if this.parameters}}
-**Parameters:**
-{{#each this.parameters}}
-- `{{this.name}}`: `{{this.param_type}}`{{#if this.is_mutable}} (mutable){{/if}}
-{{/each}}
-{{/if}}
-
-{{#if this.return_type}}
-**Returns:** `{{this.return_type}}`
-{{/if}}
-
----
-
-{{/each}}
-
-## Public Structs
-
-{{#each api.public_structs}}
-### `{{this.name}}`
-
-{{#if this.docs}}
-{{this.docs}}
-{{/if}}
-
-**Visibility:** `{{this.visibility}}`
-
-{{#if this.fields}}
-**Fields:**
-{{#each this.fields}}
-- `{{this.name}}`: `{{this.field_type}}` ({{this.visibility}})
-{{#if this.docs}}  - {{this.docs}}{{/if}}
-{{/each}}
-{{/if}}
-
----
-
-{{/each}}
-
-## Public Enums
-
-{{#each api.public_enums}}
-### `{{this.name}}`
-
-{{#if this.docs}}
-{{this.docs}}
-{{/if}}
-
-**Visibility:** `{{this.visibility}}`
-
-{{#if this.variants}}
-**Variants:**
-{{#each this.variants}}
-- `{{this.name}}`
-{{#if this.docs}}  - {{this.docs}}{{/if}}
-{{#if this.fields}}
-  **Fields:**
-{{#each this.fields}}
-  - `{{this.name}}`: `{{this.field_type}}`
-{{/each}}
-{{/if}}
-{{/each}}
-{{/if}}
-
----
-
-{{/each}}
-
-## Public Traits
-
-{{#each api.public_traits}}
-### `{{this.name}}`
-
-{{#if this.docs}}
-{{this.docs}}
-{{/if}}
-
-**Visibility:** `{{this.visibility}}`
-
-{{#if this.methods}}
-**Methods:**
-{{#each this.methods}}
-- `{{this.name}}({{#each this.parameters}}{{this.name}}: {{this.param_type}}{{#unless @last}}, {{/unless}}{{/each}}){{#if this.return_type}} -> {{this.return_type}}{{/if}}`
-{{#if this.docs}}  - {{this.docs}}{{/if}}
-{{/each}}
-{{/if}}
-
----
-
-{{/each}}

templates/changelog.md

@@ -1,19 +0,0 @@
-# Changelog
-
-## Recent Changes
-
-{{#each commits}}
-### {{this.date}}
-
-**{{this.hash}}** by {{this.author}}
-
-{{this.message}}
-
----
-
-{{/each}}
-
-## Summary
-
-- **Total Commits:** {{commits.length}}
-- **Contributors:** {{#unique commits "author"}}{{this.author}}{{#unless @last}}, {{/unless}}{{/unique}}

templates/readme.md

@@ -1,76 +0,0 @@
-# {{project.name}}
-
-{{#if project.description}}
-{{project.description}}
-{{/if}}
-
-## Overview
-
-This project contains {{project.modules.length}} modules with a total of {{project.metrics.total_lines}} lines of code.
-
-## Installation
-
-```bash
-cargo install {{project.name}}
-```
-
-## Usage
-
-```bash
-{{project.name}} --help
-```
-
-## Dependencies
-
-{{#each project.dependencies}}
-- `{{@key}}`: {{this}}
-{{/each}}
-
-## Project Structure
-
-```
-{{#each project.structure.directories}}
-{{this.name}}/
-{{/each}}
-```
-
-## API Documentation
-
-{{#each project.modules}}
-### {{this.name}}
-
-{{#if this.docs}}
-{{this.docs}}
-{{/if}}
-
-{{#if this.functions}}
-**Functions:** {{this.functions.length}}
-{{/if}}
-
-{{#if this.structs}}
-**Structs:** {{this.structs.length}}
-{{/if}}
-
-{{/each}}
-
-## Metrics
-
-- **Lines of Code:** {{project.metrics.total_lines}}
-- **Total Files:** {{project.metrics.total_files}}
-- **Test Files:** {{project.metrics.test_files}}
-- **Dependencies:** {{project.metrics.dependency_count}}
-- **Complexity Score:** {{project.metrics.complexity_score}}
-
-## License
-
-{{#if project.license}}
-{{project.license}}
-{{else}}
-MIT
-{{/if}}
-
-## Authors
-
-{{#each project.authors}}
-- {{this}}
-{{/each}}

templates/structure.md

@@ -1,39 +0,0 @@
-# Project Structure
-
-## Directory Overview
-
-```
-{{#each structure.directories}}
-{{this.name}}/
-{{#each this.subdirectories}}
-├── {{this}}/
-{{/each}}
-{{#if this.file_count}}
-└── ({{this.file_count}} files)
-{{/if}}
-
-{{/each}}
-```
-
-## File Distribution
-
-{{#each structure.files}}
-- **{{this.name}}** ({{this.language}}) - {{this.lines_of_code}} lines{{#if this.is_test}} [TEST]{{/if}}
-{{/each}}
-
-## Statistics
-
-- **Total Directories:** {{structure.directories.length}}
-- **Total Files:** {{structure.files.length}}
-- **Languages Used:**
-{{#group structure.files by="language"}}
-  - {{@key}}: {{this.length}} files
-{{/group}}
-
-{{#if structure.dependency_graph}}
-## Dependencies
-
-{{#each structure.dependency_graph}}
-- **{{@key}}** depends on: {{#each this}}{{this}}{{#unless @last}}, {{/unless}}{{/each}}
-{{/each}}
-{{/if}}

vercel.json

@@ -1,19 +0,0 @@
-{
-  "version": 2,
-  "builds": [
-    {
-      "src": "my-blog/public/**",
-      "use": "@vercel/static"
-    }
-  ],
-  "routes": [
-    {
-      "src": "/api/ask",
-      "dest": "/api/ask.js"
-    },
-    {
-      "src": "/(.*)",
-      "dest": "/my-blog/public/$1"
-    }
-  ]
-}

workers/ollama-proxy.js

@@ -1,93 +0,0 @@
-// Cloudflare Worker for secure Ollama proxy
-export default {
-  async fetch(request, env, ctx) {
-    // CORS preflight
-    if (request.method === 'OPTIONS') {
-      return new Response(null, {
-        headers: {
-          'Access-Control-Allow-Origin': 'https://log.syui.ai',
-          'Access-Control-Allow-Methods': 'POST, OPTIONS',
-          'Access-Control-Allow-Headers': 'Content-Type, X-User-Token',
-          'Access-Control-Max-Age': '86400',
-        }
-      });
-    }
-
-    // Verify origin
-    const origin = request.headers.get('Origin');
-    const referer = request.headers.get('Referer');
-    
-    // 許可されたオリジンのみ
-    const allowedOrigins = [
-      'https://log.syui.ai',
-      'https://log.pages.dev' // Cloudflare Pages preview
-    ];
-    
-    if (!origin || !allowedOrigins.some(allowed => origin.startsWith(allowed))) {
-      return new Response('Forbidden', { status: 403 });
-    }
-
-    // ユーザー認証トークン検証（オプション）
-    const userToken = request.headers.get('X-User-Token');
-    if (env.REQUIRE_AUTH && !userToken) {
-      return new Response('Unauthorized', { status: 401 });
-    }
-
-    // リクエストボディを取得
-    const body = await request.json();
-    
-    // プロンプトサイズ制限
-    if (body.prompt && body.prompt.length > 1000) {
-      return new Response(JSON.stringify({
-        error: 'Prompt too long. Maximum 1000 characters.'
-      }), { 
-        status: 400,
-        headers: { 'Content-Type': 'application/json' }
-      });
-    }
-
-    // レート制限（CF Workers KV使用）
-    if (env.RATE_LIMITER) {
-      const clientIP = request.headers.get('CF-Connecting-IP');
-      const rateLimitKey = `rate:${clientIP}`;
-      const currentCount = await env.RATE_LIMITER.get(rateLimitKey) || 0;
-      
-      if (currentCount >= 20) {
-        return new Response(JSON.stringify({
-          error: 'Rate limit exceeded. Try again later.'
-        }), { 
-          status: 429,
-          headers: { 'Content-Type': 'application/json' }
-        });
-      }
-      
-      // カウント増加（1時間TTL）
-      await env.RATE_LIMITER.put(rateLimitKey, currentCount + 1, {
-        expirationTtl: 3600
-      });
-    }
-
-    // Ollamaへプロキシ
-    const ollamaResponse = await fetch(env.OLLAMA_API_URL || 'https://ollama.syui.ai/api/generate', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        // 内部認証ヘッダー（必要に応じて）
-        'X-Internal-Token': env.OLLAMA_INTERNAL_TOKEN || ''
-      },
-      body: JSON.stringify(body)
-    });
-
-    // レスポンスを返す
-    const responseData = await ollamaResponse.text();
-    
-    return new Response(responseData, {
-      status: ollamaResponse.status,
-      headers: {
-        'Content-Type': 'application/json',
-        'Access-Control-Allow-Origin': origin,
-        'Cache-Control': 'no-store'
-      }
-    });
-  }
-};

workers/wrangler.toml

@@ -1,20 +0,0 @@
-name = "ollama-proxy"
-main = "ollama-proxy.js"
-compatibility_date = "2024-01-01"
-
-# 環境変数
-[vars]
-REQUIRE_AUTH = false
-
-# 本番環境
-[env.production.vars]
-OLLAMA_API_URL = "https://ollama.syui.ai/api/generate"
-REQUIRE_AUTH = true
-
-# KVネームスペース（レート制限用）
-[[kv_namespaces]]
-binding = "RATE_LIMITER"
-id = "your-kv-namespace-id"
-
-# シークレット（wrangler secret putで設定）
-# OLLAMA_INTERNAL_TOKEN = "your-internal-token"

wrangler.toml

@@ -1,31 +0,0 @@
-name = "ailog"
-compatibility_date = "2024-01-01"
-
-[env.production]
-name = "ailog"
-
-[build]
-command = "cargo build --release && ./target/release/ailog build my-blog"
-publish = "my-blog/public"
-
-[[redirects]]
-from = "/api/ask"
-to = "https://ai-gpt-mcp.your-domain.com/ask"
-status = 200
-
-[[headers]]
-for = "/*"
-[headers.values]
-X-Frame-Options = "DENY"
-X-Content-Type-Options = "nosniff"
-Referrer-Policy = "strict-origin-when-cross-origin"
-
-[[headers]]
-for = "/css/*"
-[headers.values]
-Cache-Control = "public, max-age=31536000, immutable"
-
-[[headers]]
-for = "*.js"
-[headers.values]
-Cache-Control = "public, max-age=31536000, immutable"