ali-skills 0.0.23 → 0.0.24

package/node_modules/@ali/cli-skills/dist/cli.mjs

@@ -2205,7 +2205,7 @@ function logSkillParseFailures(failures) {
 		if (f.hint) M.message(import_picocolors.default.yellow(`  提示: ${f.hint}`));
 	}
 }
-var version$1 = "2.0.23";
+var version$1 = "2.0.24";
 const isCancelled$1 = (value) => typeof value === "symbol";
 function redactSensitiveText(text) {
 	return text.replace(/(https?:\/\/)([^/\s:@]+)(?::([^@/\s]*))?@/gi, "$1").replace(/([?&](?:private_token|access_token|token|api_key|access_key|secret|password)=)[^&\s]+/gi, "$1***");
@@ -5381,6 +5381,17 @@ const REDIRECT_STATUS_CODES = new Set([
 	308
 ]);
 const MAX_REDIRECTS = 5;
+function normalizeEscapedUrlInput(rawUrl) {
+	if (!rawUrl.includes("\\")) return {
+		normalizedUrl: rawUrl,
+		changed: false
+	};
+	const normalizedUrl = rawUrl.replace(/\\([?&=#])/g, "$1");
+	return {
+		normalizedUrl,
+		changed: normalizedUrl !== rawUrl
+	};
+}
 function detectAuthMode(platformKey, platform, hostname) {
 	if (platform.authType === "private_token") return "private_token";
 	if (platformKey === "o2") return "auto";
@@ -5709,7 +5720,7 @@ async function sendSsoTicketDirectRequest(targetUrl, options) {
 	} else console.log(outputBody);
 	if (!response.ok) process.exit(1);
 }
-async function sendPlainDirectRequest(targetUrl, options) {
+async function sendPlainDirectRequest(targetUrl, options, allowSsoCookieFallback = false) {
 	const requestHeaders = { "User-Agent": "ali-skills-cli/1.0" };
 	if (options.headers) Object.entries(options.headers).forEach(([key, value]) => {
 		requestHeaders[key] = value;
@@ -5723,11 +5734,19 @@ async function sendPlainDirectRequest(targetUrl, options) {
 		console.log(`${DIM$2}${options.method.toUpperCase()} ${targetUrl}${RESET$2}`);
 		console.log(`${DIM$2}→ 直接请求 (No Auth)${RESET$2}`);
 	}
-	const controller = new AbortController();
 	const timeout = options.timeout || 3e4;
-	const timeoutId = setTimeout(() => controller.abort(), timeout);
-	const { response, responseBody } = await fetchWithRedirects(targetUrl, options.method.toUpperCase(), requestHeaders, body, timeout, options.quiet);
-	clearTimeout(timeoutId);
+	const { response, responseBody, sawAlibabaLoginRedirect } = await fetchWithRedirects(targetUrl, options.method.toUpperCase(), requestHeaders, body, timeout, options.quiet);
+	if (allowSsoCookieFallback && sawAlibabaLoginRedirect) {
+		if (!options.quiet) {
+			console.log(`${YELLOW$2}检测到请求被重定向到 login.alibaba-inc.com，目标接口可能需要登录鉴权${RESET$2}`);
+			console.log(`${DIM$2}将自动使用 --auth sso_cookie 重试原始接口；如不符合预期，请显式指定 --auth${RESET$2}`);
+		}
+		await sendSsoCookieDirectRequest(targetUrl, {
+			...options,
+			authMode: "sso_cookie"
+		});
+		return;
+	}
 	if (!options.quiet) {
 		const statusColor = response.ok ? GREEN$1 : RED$2;
 		console.log(`${statusColor}${response.status} ${response.statusText}${RESET$2}`);
@@ -5757,6 +5776,7 @@ async function fetchWithRedirects(initialUrl, method, headers, body, timeout, qu
 	const timeoutId = setTimeout(() => controller.abort(), timeout);
 	let currentUrl = initialUrl;
 	let redirects = 0;
+	let sawAlibabaLoginRedirect = false;
 	try {
 		while (true) {
 			const response = await fetch(currentUrl, {
@@ -5768,15 +5788,18 @@ async function fetchWithRedirects(initialUrl, method, headers, body, timeout, qu
 			});
 			if (!REDIRECT_STATUS_CODES.has(response.status)) return {
 				response,
-				responseBody: await response.text()
+				responseBody: await response.text(),
+				sawAlibabaLoginRedirect
 			};
 			const location = response.headers.get("location");
 			if (!location) return {
 				response,
-				responseBody: await response.text()
+				responseBody: await response.text(),
+				sawAlibabaLoginRedirect
 			};
 			if (redirects >= MAX_REDIRECTS) throw new Error(`重定向次数超过上限(${MAX_REDIRECTS})`);
 			const nextUrl = new URL(location, currentUrl).toString();
+			if (new URL(nextUrl).hostname === "login.alibaba-inc.com") sawAlibabaLoginRedirect = true;
 			redirects += 1;
 			if (!quiet) console.log(`${DIM$2}↪ 重定向 ${redirects}: ${response.status} ${response.statusText} -> ${nextUrl}${RESET$2}`);
 			currentUrl = nextUrl;
@@ -5863,8 +5886,9 @@ async function sendGatewayRequest(targetUrl, platformKey, options, authMode = "g
 }
 async function proxyRequest(targetUrl, options) {
 	let url;
+	const { normalizedUrl, changed: urlInputNormalized } = normalizeEscapedUrlInput(targetUrl);
 	try {
-		url = new URL(targetUrl);
+		url = new URL(normalizedUrl);
 	} catch {
 		console.error(`${RED$2}Error: URL 必须是绝对地址，收到 "${targetUrl}"${RESET$2}`);
 		console.log(`${DIM$2}未传 platform 时，请使用完整 URL（包含协议和域名）${RESET$2}`);
@@ -5885,12 +5909,17 @@ async function proxyRequest(targetUrl, options) {
 		ssoType: "refresh_token"
 	};
 	try {
+		if (urlInputNormalized && !options.quiet) {
+			console.log(`${DIM$2}检测到 URL 中包含转义分隔符，已自动还原后请求${RESET$2}`);
+			console.log(`${DIM$2}原始: ${targetUrl}${RESET$2}`);
+			console.log(`${DIM$2}还原: ${normalizedUrl}${RESET$2}`);
+		}
 		if (!isKnownPlatform && !hasExplicitAuthMode) {
 			if (!options.quiet) {
 				console.log(`${DIM$2}平台: Custom Host${RESET$2}`);
 				console.log(`${DIM$2}认证方式: Auto (未知平台默认直连，无鉴权)${RESET$2}`);
 			}
-			await sendPlainDirectRequest(targetUrl, options);
+			await sendPlainDirectRequest(normalizedUrl, options, true);
 			return;
 		}
 		if (!options.quiet) console.log(`${DIM$2}平台: ${platform.name}${RESET$2}`);
@@ -5902,7 +5931,7 @@ async function proxyRequest(targetUrl, options) {
 					console.error(`${RED$2}Error: o2 仅支持 --auth auto 或 --auth sso_ticket${RESET$2}`);
 					process.exit(1);
 				}
-				await sendO2SdkRequest(targetUrl, options, authMode === "sso_ticket");
+				await sendO2SdkRequest(normalizedUrl, options, authMode === "sso_ticket");
 				return;
 			}
 			switch (authMode) {
@@ -5921,17 +5950,17 @@ async function proxyRequest(targetUrl, options) {
 							process.exit(1);
 						}
 					}
-					await sendDirectRequest(targetUrl, platform, token, options);
+					await sendDirectRequest(normalizedUrl, platform, token, options);
 					return;
 				}
 				case "sso_cookie":
-					await sendSsoCookieDirectRequest(targetUrl, options);
+					await sendSsoCookieDirectRequest(normalizedUrl, options);
 					return;
 				case "sso_ticket":
-					await sendSsoTicketDirectRequest(targetUrl, options);
+					await sendSsoTicketDirectRequest(normalizedUrl, options);
 					return;
 				case "gateway":
-					await sendGatewayRequest(targetUrl, platformKey, options, "gateway");
+					await sendGatewayRequest(normalizedUrl, platformKey, options, "gateway");
 					return;
 				default: break;
 			}
@@ -5941,12 +5970,12 @@ async function proxyRequest(targetUrl, options) {
 				console.error(`${RED$2}Error: o2 仅支持 --auth auto 或 --auth sso_ticket${RESET$2}`);
 				process.exit(1);
 			}
-			await sendO2SdkRequest(targetUrl, options, authMode === "sso_ticket");
+			await sendO2SdkRequest(normalizedUrl, options, authMode === "sso_ticket");
 			return;
 		}
 		switch (authMode) {
 			case "private_token": {
-				let token = getPlatformPrivateToken(platformKey, options.token, targetUrl);
+				let token = getPlatformPrivateToken(platformKey, options.token, normalizedUrl);
 				if (!token) {
 					token = await promptConfigureToken(platformKey, platform);
 					if (!token) {
@@ -5960,19 +5989,19 @@ async function proxyRequest(targetUrl, options) {
 						process.exit(1);
 					}
 				}
-				await sendDirectRequest(targetUrl, platform, token, options);
+				await sendDirectRequest(normalizedUrl, platform, token, options);
 				break;
 			}
 			case "sso_ticket":
 			case "gateway":
-				await sendGatewayRequest(targetUrl, platformKey, options, authMode);
+				await sendGatewayRequest(normalizedUrl, platformKey, options, authMode);
 				break;
 			case "sso_cookie":
-				await sendSsoCookieDirectRequest(targetUrl, options);
+				await sendSsoCookieDirectRequest(normalizedUrl, options);
 				break;
 			default: if (platform.authType === "private_token") {
-				const token = getPlatformPrivateToken(platformKey, options.token, targetUrl);
-				if (token) await sendDirectRequest(targetUrl, platform, token, options);
+				const token = getPlatformPrivateToken(platformKey, options.token, normalizedUrl);
+				if (token) await sendDirectRequest(normalizedUrl, platform, token, options);
 				else {
 					console.error(`${RED$2}Error: ${platform.name} 需要配置 Private Token${RESET$2}`);
 					console.log(`${DIM$2}您可以通过以下方式配置:${RESET$2}`);
@@ -5983,8 +6012,8 @@ async function proxyRequest(targetUrl, options) {
 					console.log(`    参数: --token <your_token>`);
 					process.exit(1);
 				}
-			} else if (isAlibabaIncRootDomain) await sendSsoCookieDirectRequest(targetUrl, options);
-			else await sendGatewayRequest(targetUrl, platformKey, options, "sso_ticket");
+			} else if (isAlibabaIncRootDomain) await sendSsoCookieDirectRequest(normalizedUrl, options);
+			else await sendGatewayRequest(normalizedUrl, platformKey, options, "sso_ticket");
 		}
 	} catch (error) {
 		if (error instanceof Error) if (error.name === "AbortError") console.error(`${RED$2}Error: 请求超时${RESET$2}`);
@@ -6452,19 +6481,20 @@ ${BOLD}Gateway Commands:${RESET}
   request [platform] <url|path>  Send HTTP request (supports platform + path shorthand)
   req [platform] <url|path>      Alias for request, recommended
 
+${BOLD}Platform Values:${RESET}
+  ${platformKeysForHelp}
+
 ${BOLD}Yuque Commands:${RESET}
   login yuque [group]                         Configure/switch specified Yuque group directly
   logout yuque [group] [--all]                Choose one/many Yuque groups to clear, or clear all
   status yuque [group] [--show|-s] [--pretty] Show Yuque group/all config JSON
 
-${BOLD}Platform Values:${RESET}
-  ${platformKeysForHelp}
-
 ${BOLD}Request Options:${RESET}
   -X, --method <method>   HTTP method (default: GET)
   -b, --body <body>       Request body (JSON string or @file)
   -h, --header <header>   Custom header (can be used multiple times)
   --auth, --auth-mode <mode>  Auth mode: auto/private_token/sso_cookie/sso_ticket
+  --sso <cookie|ticket>   Shortcut for --auth sso_cookie/sso_ticket
   --token <token>         Explicit token for private_token mode
   -o, --output <file>     Save response to file
   -i, --include-headers   Include response headers in output
@@ -6473,46 +6503,104 @@ ${BOLD}Request Options:${RESET}
   --raw                   Raw output without formatting
   -q, --quiet             Quiet mode, only output response body
 
-${BOLD}Environment:${RESET}
-  ALI_SKILLS_YUQUE_GROUP   Yuque team slug when multiple teams have tokens in config
-  O2_API_ENV               O2 SDK env override (default online; set pre for pre env)
-  ALI_SKILLS_DEBUG_GATEWAY Enable gateway auth debug logs (1/true/on)
-
 ${BOLD}Examples:${RESET}
   ${DIM}$${RESET} ali-skills login
   ${DIM}$${RESET} ali-skills login code
   ${DIM}$${RESET} ali-skills login yuque
-  ${DIM}$${RESET} ali-skills login yuque fliggy
+  ${DIM}$${RESET} ali-skills login yuque group
   ${DIM}$${RESET} ali-skills status --all
+  ${DIM}$${RESET} ali-skills status
   ${DIM}$${RESET} ali-skills status code
-  ${DIM}$${RESET} ali-skills status -s
-  ${DIM}$${RESET} ali-skills status -s --pretty
+  ${DIM}$${RESET} ali-skills status yuque
+  ${DIM}$${RESET} ali-skills status yuque group
+  ${DIM}$${RESET} ali-skills status o2
+  ${DIM}$${RESET} ali-skills status --show
   ${DIM}$${RESET} ali-skills status code --show
   ${DIM}$${RESET} ali-skills status yuque --show
-  ${DIM}$${RESET} ali-skills status yuque fliggy
   ${DIM}$${RESET} ali-skills status yuque fliggy --show
+  ${DIM}$${RESET} ali-skills logout
   ${DIM}$${RESET} ali-skills logout code
   ${DIM}$${RESET} ali-skills logout yuque
   ${DIM}$${RESET} ali-skills logout yuque my-team
   ${DIM}$${RESET} ali-skills logout yuque --all
-  ${DIM}$${RESET} ali-skills req o2 /v1.0/work/apps
-  ${DIM}$${RESET} ali-skills req o2 /v1.0/work/aone/issues/search -X POST -b '{"keyword":"auth"}'
-  ${DIM}$${RESET} ali-skills req o2 /v1.0/work/issues/123 --auth sso_ticket
-  ${DIM}$${RESET} ali-skills req https://code.alibaba-inc.com/api/v4/projects -X GET
-  ${DIM}$${RESET} ali-skills req https://yuque-api.antfin-inc.com/api/v2/repos -o repos.json
-  ${DIM}$${RESET} ali-skills req yuque "/api/v2/search?q=buc&type=doc"
-  ${DIM}$${RESET} ali-skills req yuque "/api/v2/search?q=buc&type=doc&scope=fliggyfe-infra"
-  ${DIM}$${RESET} ali-skills logout
+  ${DIM}$${RESET} ali-skills req 'https://subdomain.alibaba-inc.com/path?q=v'
+  ${DIM}$${RESET} ali-skills req 'https://subdomain.alibaba-inc.com/path?q=v' --auth sso_cookie
+  ${DIM}$${RESET} ali-skills req 'https://subdomain.alibaba-inc.com/path?q=v' --auth sso_cookie -X POST -b '{"k": "v"}' -h 'X-Custom-Header: value'
+  ${DIM}$${RESET} ali-skills req 'https://support-buc-sso-ticket-site/path?q=v' --auth sso_ticket
+  ${DIM}$${RESET} ali-skills req code '/api/v3/project?path=clam-ng/clam'
+  ${DIM}$${RESET} ali-skills req yuque '/api/v2/repos/fliggyfe-infra/ali-skills-dev/docs/mll9xim6y6lcnvyg'
+  ${DIM}$${RESET} ali-skills req yuque '/api/v2/search?q=buc&type=doc&scope=fliggyfe-infra'
+  ${DIM}$${RESET} ali-skills req o2 '/v1.0/work/apps/rxpi%252Fmtop/trunk'
+  ${DIM}$${RESET} ali-skills req o2 '/v1.0/work/apps/rxpi%252Fmtop/detail' --auth sso_ticket
 `);
 }
 function parseRequestOptions(args) {
 	let url = "";
 	const options = { method: "GET" };
 	const headers = {};
+	const parseSsoShortcut = (raw) => {
+		if (!raw) return void 0;
+		const normalized = raw.trim().toLowerCase();
+		if (normalized === "cookie") return "sso_cookie";
+		if (normalized === "ticket") return "sso_ticket";
+	};
 	for (let i = 0; i < args.length; i++) {
 		const arg = args[i];
+		const parseLongOptionValue = (name) => {
+			const prefix = `--${name}=`;
+			if (!arg?.startsWith(prefix)) return void 0;
+			return arg.slice(prefix.length);
+		};
+		const methodValue = parseLongOptionValue("method");
+		if (methodValue !== void 0) {
+			options.method = methodValue || "GET";
+			continue;
+		}
+		const bodyValue = parseLongOptionValue("body");
+		if (bodyValue !== void 0) {
+			options.body = bodyValue;
+			continue;
+		}
+		const headerValue = parseLongOptionValue("header");
+		if (headerValue !== void 0) {
+			const [key, ...valueParts] = headerValue.split(":");
+			if (key && valueParts.length > 0) headers[key.trim()] = valueParts.join(":").trim();
+			continue;
+		}
+		const outputValue = parseLongOptionValue("output");
+		if (outputValue !== void 0) {
+			options.output = outputValue;
+			continue;
+		}
+		const timeoutValue = parseLongOptionValue("timeout");
+		if (timeoutValue !== void 0) {
+			if (timeoutValue) options.timeout = parseInt(timeoutValue, 10);
+			continue;
+		}
+		const authModeValue = parseLongOptionValue("auth-mode") ?? parseLongOptionValue("auth");
+		if (authModeValue !== void 0) {
+			options.authMode = authModeValue || "auto";
+			continue;
+		}
+		const tokenValue = parseLongOptionValue("token");
+		if (tokenValue !== void 0) {
+			options.token = tokenValue;
+			continue;
+		}
+		const ssoValue = parseLongOptionValue("sso");
+		if (ssoValue !== void 0) {
+			const mapped = parseSsoShortcut(ssoValue);
+			if (!mapped) {
+				console.error(`Unknown value for --sso: ${ssoValue}, expected cookie or ticket`);
+				process.exit(1);
+			}
+			options.authMode = mapped;
+			continue;
+		}
 		switch (arg) {
 			case "-m":
+			case "-x":
+			case "-X":
 			case "--method":
 				options.method = args[++i] || "GET";
 				break;
@@ -6556,6 +6644,15 @@ function parseRequestOptions(args) {
 			case "--token":
 				options.token = args[++i];
 				break;
+			case "--sso": {
+				const mode = parseSsoShortcut(args[++i]);
+				if (!mode) {
+					console.error("Unknown value for --sso, expected cookie or ticket");
+					process.exit(1);
+				}
+				options.authMode = mode;
+				break;
+			}
 			case "-q":
 			case "--quiet":
 				options.quiet = true;

package/node_modules/@ali/cli-skills/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ali/cli-skills",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ali-skills",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@ali/cli-skills": "^2.0.23"
+    "@ali/cli-skills": "^2.0.24"
   },
   "bundleDependencies": [
     "@ali/cli-skills"