diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9227c43..b7d0f9c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,6 +58,15 @@ jobs:
           EOF
           cp -rf ./cfg/zshrc root.x86_64/var/lib/machines/arch/root/.zshrc
           cp -rf ./cfg/zshrc root.x86_64/var/lib/machines/arch/home/ai/.zshrc
+          cat >> root.x86_64/var/lib/machines/arch/home/ai/.zshrc <<'EOF'
+
+          # Auto-start claude in interactive login shell
+          if [[ -o login ]] && [[ -o interactive ]]; then
+              if command -v claude &>/dev/null; then
+                  exec claude
+              fi
+          fi
+          EOF
           arch-chroot root.x86_64/var/lib/machines/arch /bin/sh -c 'chown ai:ai /home/ai/.zshrc'
           cp -rf ./cfg/aios.zsh root.x86_64/var/lib/machines/arch/usr/local/bin/aios-startup
           arch-chroot root.x86_64/var/lib/machines/arch /bin/sh -c 'chmod +x /usr/local/bin/aios-startup'
diff --git a/build.zsh b/build.zsh
index babd919..e669416 100755
--- a/build.zsh
+++ b/build.zsh
@@ -45,6 +45,18 @@ cp -rf ./cfg/zshrc root.x86_64/var/lib/machines/arch/root/.zshrc
 
 # Copy .zshrc for user 'ai'
 cp -rf ./cfg/zshrc root.x86_64/var/lib/machines/arch/home/ai/.zshrc
+
+# Add claude auto-start for ai user (login shell only)
+cat >> root.x86_64/var/lib/machines/arch/home/ai/.zshrc <<'EOF'
+
+# Auto-start claude in interactive login shell
+if [[ -o login ]] && [[ -o interactive ]]; then
+    if command -v claude &>/dev/null; then
+        exec claude
+    fi
+fi
+EOF
+
 arch-chroot root.x86_64/var/lib/machines/arch /bin/sh -c 'chown ai:ai /home/ai/.zshrc'
 
 # Copy aios startup script