diff --git a/bin/omarchy-agent b/bin/omarchy-agent
index 4005dfbf..8e03976e 100755
--- a/bin/omarchy-agent
+++ b/bin/omarchy-agent
@@ -101,7 +101,7 @@ pi)
   ;;
 kimi)
   command=(kimi)
-  [[ -n ${prompt:-} ]] && command+=("$prompt")
+  [[ -n ${prompt:-} ]] && command+=(--prompt "$prompt")
   ;;
 deepcode)
   command=(deepcode)
diff --git a/bin/omarchy-cn-ai-setup b/bin/omarchy-cn-ai-setup
index ff9f070f..c0e791f7 100755
--- a/bin/omarchy-cn-ai-setup
+++ b/bin/omarchy-cn-ai-setup
@@ -73,4 +73,10 @@ fi
 
 rm -f "$profile_file.omarchycn-prev"
 omarchy-cn-ai-profile-use "$name"
+
+if [[ $harness == "claude-code" || $harness == "codex" ]]; then
+  if gum confirm "设为系统默认 Agent（Super+Shift+Ctrl+A）？"; then
+    omarchy-cn-ai-default "$name"
+  fi
+fi
 echo "完成。启动: omarchycn ai launch"
diff --git a/bin/omarchy-default-agent b/bin/omarchy-default-agent
index d5358cd4..7e3257b9 100755
--- a/bin/omarchy-default-agent
+++ b/bin/omarchy-default-agent
@@ -50,10 +50,13 @@ if [[ $agent == "kimi" ]]; then
     if [[ $installing == "false" ]]; then
       exec omarchy-launch-floating-terminal-with-presentation omarchy-default-agent --install kimi
     fi
-    if ! curl -fsSL https://code.kimi.com/kimi-code/install.sh | bash; then
+    installer=$(mktemp)
+    if ! curl -fsSL https://code.kimi.com/kimi-code/install.sh -o "$installer" || ! bash "$installer"; then
+      rm -f "$installer"
       echo "Could not install $name with the official installer" >&2
       exit 1
     fi
+    rm -f "$installer"
   fi
 else
   if [[ $installing == "false" ]] && ! mise where "$agent_package" &>/dev/null; then