diff --git a/src/cli/index.js b/src/cli/index.js
index 0a62ed4..78231ad 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -539,7 +539,11 @@ function promptWithStatus(force = false) {
 }
 
 function buildApiMessages() {
-  const system = buildSystemPrompt(systemPrompt, { workspace: WORKSPACE, allowMode: state.allowMode });
+  const system = buildSystemPrompt(systemPrompt, {
+    workspace: WORKSPACE,
+    allowMode: state.allowMode,
+    modelId: state.modelId || state.modelKey,
+  });
   const messages = [{ role: 'system', content: system }];
   for (const msg of state.messages) {
     const m = { role: msg.role };
@@ -668,7 +672,7 @@ async function runAssistantLoop() {
           if (!gotAnswer) {
             clearTimeout(thinkingDelay);
             if (state.thinkingMode) {
-              spinner.stop(thinkingActive ? '○ 思考完成' : '○');
+              spinner.stop(thinkingActive ? '∙ 思考完成' : '∙');
             } else {
               spinner.stopSilent();
             }
@@ -695,7 +699,7 @@ async function runAssistantLoop() {
       } else {
       clearTimeout(thinkingDelay);
       if (state.thinkingMode) {
-        spinner.stop('○');
+        spinner.stop('∙');
       } else {
         spinner.stopSilent();
       }
@@ -708,14 +712,18 @@ async function runAssistantLoop() {
 
     clearTimeout(thinkingDelay);
     if (cancelled) {
-      stopSpinnerForCancel(spinner, thinkingActive, showThinkingLabel, state.thinkingMode);
+      if (gotAnswer) {
+        spinner.stopSilent();
+      } else {
+        stopSpinnerForCancel(spinner, thinkingActive, showThinkingLabel, state.thinkingMode);
+      }
       showCursor();
       printCancelLine();
       return;
     }
     if (!gotAnswer) {
       if (state.thinkingMode) {
-        spinner.stop(thinkingActive ? '○ 思考完成' : '○');
+        spinner.stop(thinkingActive ? '∙ 思考完成' : '∙');
       } else {
         spinner.stopSilent();
       }