From 20704ff1c6d8c4467f8b86b78f5bcd3560e73541 Mon Sep 17 00:00:00 2001
From: "zeyu.fz" <zeyu.fz@alibaba-inc.com>
Date: Tue, 9 Jun 2026 15:25:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(cli):=20=E4=BC=98=E5=8C=96=E9=89=B4?=
 =?UTF-8?q?=E6=9D=83=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81=E6=98=BE?=
 =?UTF-8?q?=E5=BC=8FAPI-Key=E5=92=8CAK/SK=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 优先使用显式提供的API-Key进行鉴权
- 在无显式API-Key时优先采用显式AK/SK鉴权
- 保持对无显式鉴权信息情况下的自动鉴权兼容
- 重构鉴权判断逻辑以提高代码清晰度和可维护性
---
 .../cli/src/commands/knowledge/retrieve.ts    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/commands/knowledge/retrieve.ts b/packages/cli/src/commands/knowledge/retrieve.ts
index 91f235d..56e56a0 100644
--- a/packages/cli/src/commands/knowledge/retrieve.ts
+++ b/packages/cli/src/commands/knowledge/retrieve.ts
@@ -81,19 +81,27 @@ export default defineCommand({
 
     const format = detectOutputFormat(config.output);
 
-    // Determine auth: prefer API-KEY, fall back to AK/SK (deprecated)
-    let useApiKey = false;
-    try {
-      await resolveCredential(config);
-      useApiKey = true;
-    } catch {
-      // No API-KEY credential available
-    }
+    const hasExplicitApiKey = !!config.apiKey;
+    const hasExplicitAkSk = !!(flags.accessKeyId && flags.accessKeySecret);
 
-    if (useApiKey) {
+    if (hasExplicitApiKey) {
       await runWithApiKey(config, flags, indexId, query, format);
-    } else {
+    } else if (hasExplicitAkSk) {
       await runWithAkSk(config, flags, indexId, query, format);
+    } else {
+      let useApiKey = false;
+      try {
+        await resolveCredential(config);
+        useApiKey = true;
+      } catch {
+        // No API-KEY credential available
+      }
+
+      if (useApiKey) {
+        await runWithApiKey(config, flags, indexId, query, format);
+      } else {
+        await runWithAkSk(config, flags, indexId, query, format);
+      }
     }
   },
 });