ali-skills 0.0.26 → 0.0.27

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

@@ -2340,7 +2340,7 @@ function logSkillParseFailures(failures) {
 		if (f.hint) M.message(import_picocolors.default.yellow(`  提示: ${f.hint}`));
 	}
 }
-var version$1 = "2.0.27";
+var version$1 = "2.0.28";
 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***");
@@ -5643,6 +5643,12 @@ function getAuthModeDescription(mode) {
 		default: return "Auto";
 	}
 }
+function maskCredential(value) {
+	const trimmed = value.trim();
+	if (!trimmed) return "(empty)";
+	if (trimmed.length <= 8) return "******";
+	return `${trimmed.slice(0, 4)}...${trimmed.slice(-4)}`;
+}
 const O2_CREDENTIALS_BASE64 = "eyJhY2Nlc3NLZXlJZCI6IlNZS2NFNWtrbHhtT1M3WjJYYXRObiIsImFjY2Vzc0tleVNlY3JldCI6IjQ2NGNhYTc0MmNiYTk2NzFkZjM5NzJkYzdhNWI3MmQ1Nzk5ZTc2NTQyYzRiZGFjM2M3YTk5N2QzMDM3YTIyNzAifQ==";
 function getO2Credentials() {
 	const accessKeyId = process.env.O2_ACCESS_KEY_ID?.trim();
@@ -5681,8 +5687,14 @@ async function sendO2SdkRequest(targetUrl, options, withSsoTicket) {
 	const path = parsed.pathname;
 	const query = searchParamsToObject(parsed.searchParams);
 	const headers = { ...options.headers ?? {} };
+	let ssoTicketSource = null;
 	if (withSsoTicket) {
-		const ssoTicket = await ensureSsoTicket();
+		let ssoTicket = options.ssoTicket?.trim() || null;
+		if (ssoTicket) ssoTicketSource = "arg";
+		else {
+			ssoTicket = await ensureSsoTicket();
+			if (ssoTicket) ssoTicketSource = "gateway";
+		}
 		if (!ssoTicket) throw new Error("无法获取 SSO_TICKET，请重新登录后重试");
 		headers.SSO_TICKET = ssoTicket;
 	}
@@ -5707,6 +5719,10 @@ async function sendO2SdkRequest(targetUrl, options, withSsoTicket) {
 	if (!options.quiet) {
 		console.log(`${DIM$2}${method} ${parsed.toString()}${RESET$2}`);
 		console.log(`${DIM$2}→ O2 SDK 直连${withSsoTicket ? " (携带 SSO_TICKET)" : ""}${RESET$2}`);
+		if (withSsoTicket && ssoTicketSource) {
+			const sourceText = ssoTicketSource === "arg" ? "参数传入(--sso-ticket)" : "登录态获取";
+			console.log(`${DIM$2}→ SSO_TICKET 来源: ${sourceText}${RESET$2}`);
+		}
 		if (o2Env) console.log(`${DIM$2}→ O2 SDK Env: ${o2Env}${RESET$2}`);
 	}
 	let responseData;
@@ -5850,8 +5866,10 @@ async function sendSsoCookieDirectRequest(targetUrl, options) {
 		log(`${TEXT$2}请先执行: npx ali-skills login --reauth（刷新 SSO_REFRESH_TOKEN）${RESET$2}`);
 		log(`${TEXT$2}刷新后请重新发起当前请求${RESET$2}`);
 	};
-	let ssoRefreshToken = null;
-	try {
+	const explicitSsoCookie = options.ssoCookie?.trim() || "";
+	let ssoRefreshToken = explicitSsoCookie || null;
+	const ssoCookieSource = explicitSsoCookie ? "arg" : "gateway";
+	if (!ssoRefreshToken) try {
 		await ensureLogin();
 		ssoRefreshToken = await ensureSsoRefreshToken();
 	} catch (error) {
@@ -5867,8 +5885,10 @@ async function sendSsoCookieDirectRequest(targetUrl, options) {
 		console.log(`${TEXT$2}建议执行: npx ali-skills login${RESET$2}`);
 		process.exit(1);
 	}
-	const authForRt = readAuth();
-	if (authForRt) exitIfSsoRefreshCookieExpired(authForRt, { quiet: options.quiet });
+	if (!explicitSsoCookie) {
+		const authForRt = readAuth();
+		if (authForRt) exitIfSsoRefreshCookieExpired(authForRt, { quiet: options.quiet });
+	}
 	const requestHeaders = {
 		"User-Agent": "ali-skills-cli/1.0",
 		Cookie: `SSO_REFRESH_TOKEN=${ssoRefreshToken}`
@@ -5884,6 +5904,8 @@ async function sendSsoCookieDirectRequest(targetUrl, options) {
 	if (!options.quiet) {
 		console.log(`${DIM$2}${options.method.toUpperCase()} ${targetUrl}${RESET$2}`);
 		console.log(`${DIM$2}→ 直接请求 (Cookie: SSO_REFRESH_TOKEN)${RESET$2}`);
+		console.log(`${DIM$2}→ SSO_REFRESH_TOKEN 来源: ${ssoCookieSource === "arg" ? "参数传入(--sso-refresh-token)" : "登录态获取"}${RESET$2}`);
+		if (ssoCookieSource === "arg") console.log(`${DIM$2}→ SSO_REFRESH_TOKEN: ${maskCredential(explicitSsoCookie)}${RESET$2}`);
 	}
 	const controller = new AbortController();
 	const timeout = options.timeout || 3e4;
@@ -5930,8 +5952,10 @@ async function sendSsoCookieDirectRequest(targetUrl, options) {
 	if (!response.ok) process.exit(1);
 }
 async function sendSsoTicketDirectRequest(targetUrl, options) {
-	let ssoTicket = null;
-	try {
+	const explicitSsoTicket = options.ssoTicket?.trim() || "";
+	let ssoTicket = explicitSsoTicket || null;
+	const ssoTicketSource = explicitSsoTicket ? "arg" : "gateway";
+	if (!ssoTicket) try {
 		await ensureLogin();
 		ssoTicket = await ensureSsoTicket();
 	} catch (error) {
@@ -5958,6 +5982,8 @@ async function sendSsoTicketDirectRequest(targetUrl, options) {
 	if (!options.quiet) {
 		console.log(`${DIM$2}${options.method.toUpperCase()} ${targetUrl}${RESET$2}`);
 		console.log(`${DIM$2}→ 直接请求 (Header: SSO_TICKET)${RESET$2}`);
+		console.log(`${DIM$2}→ SSO_TICKET 来源: ${ssoTicketSource === "arg" ? "参数传入(--sso-ticket)" : "登录态获取"}${RESET$2}`);
+		if (ssoTicketSource === "arg") console.log(`${DIM$2}→ SSO_TICKET: ${maskCredential(explicitSsoTicket)}${RESET$2}`);
 	}
 	const controller = new AbortController();
 	const timeout = options.timeout || 3e4;
@@ -6038,7 +6064,7 @@ async function fetchWithRedirects(initialUrl, method, headers, body, timeout, qu
 	let redirects = 0;
 	let sawAlibabaLoginRedirect = false;
 	try {
-		while (true) {
+		while (redirects <= MAX_REDIRECTS) {
 			const response = await fetch(currentUrl, {
 				method,
 				headers,
@@ -6072,6 +6098,7 @@ async function fetchWithRedirects(initialUrl, method, headers, body, timeout, qu
 			if (!quiet) console.log(`${DIM$2}↪ 重定向 ${redirects}: ${response.status} ${response.statusText} -> ${nextUrl}${RESET$2}`);
 			currentUrl = nextUrl;
 		}
+		throw new Error(`重定向次数超过上限(${MAX_REDIRECTS})`);
 	} finally {
 		clearTimeout(timeoutId);
 	}
@@ -6085,6 +6112,8 @@ async function sendGatewayRequest(targetUrl, platformKey, options, authMode = "g
 		process.exit(1);
 	}
 	const proxyUrl = `${getGatewayUrl()}/api/gateway/proxy`;
+	const explicitSsoCookie = options.ssoCookie?.trim() || "";
+	const explicitSsoTicket = options.ssoTicket?.trim() || "";
 	const requestHeaders = {
 		Authorization: `Bearer ${credentials.privateToken}`,
 		"X-Private-Token": credentials.privateToken,
@@ -6093,6 +6122,8 @@ async function sendGatewayRequest(targetUrl, platformKey, options, authMode = "g
 		"X-Platform": platformKey,
 		"X-Auth-Mode": authMode
 	};
+	if (explicitSsoCookie) requestHeaders["X-SSO-Refresh-Token"] = explicitSsoCookie;
+	if (explicitSsoTicket) requestHeaders["X-SSO-Ticket"] = explicitSsoTicket;
 	if (options.headers) Object.entries(options.headers).forEach(([key, value]) => {
 		requestHeaders[key] = value;
 	});
@@ -6104,6 +6135,14 @@ async function sendGatewayRequest(targetUrl, platformKey, options, authMode = "g
 	if (!options.quiet) {
 		console.log(`${DIM$2}${options.method.toUpperCase()} ${targetUrl}${RESET$2}`);
 		console.log(`${DIM$2}→ Gateway: ${proxyUrl}${RESET$2}`);
+		if (explicitSsoCookie) {
+			console.log(`${DIM$2}→ SSO_REFRESH_TOKEN 来源: 参数传入(--sso-refresh-token)${RESET$2}`);
+			console.log(`${DIM$2}→ SSO_REFRESH_TOKEN: ${maskCredential(explicitSsoCookie)}${RESET$2}`);
+		}
+		if (explicitSsoTicket) {
+			console.log(`${DIM$2}→ SSO_TICKET 来源: 参数传入(--sso-ticket)${RESET$2}`);
+			console.log(`${DIM$2}→ SSO_TICKET: ${maskCredential(explicitSsoTicket)}${RESET$2}`);
+		}
 	}
 	const controller = new AbortController();
 	const timeout = options.timeout || 3e4;
@@ -6752,6 +6791,8 @@ ${BOLD}Request Options:${RESET}
   --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
+  --sso-refresh-token <token>  Explicit SSO_REFRESH_TOKEN for sso_cookie mode
+  --sso-ticket <ticket>   Explicit SSO_TICKET for sso_ticket mode
   -o, --output <file>     Save response to file
   -i, --include-headers   Include response headers in output
   -t, --timeout <ms>      Request timeout (default: 30000)
@@ -6782,8 +6823,10 @@ ${BOLD}Examples:${RESET}
   ${DIM}$${RESET} ali-skills logout yuque --all
   ${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 --sso-refresh-token '<SSO_REFRESH_TOKEN>'
   ${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 'https://support-buc-sso-ticket-site/path?q=v' --auth sso_ticket --sso-ticket '<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'
@@ -6854,6 +6897,16 @@ function parseRequestOptions(args) {
 			options.authMode = mapped;
 			continue;
 		}
+		const ssoCookieValue = parseLongOptionValue("sso-refresh-token") ?? parseLongOptionValue("sso-cookie");
+		if (ssoCookieValue !== void 0) {
+			options.ssoCookie = ssoCookieValue;
+			continue;
+		}
+		const ssoTicketValue = parseLongOptionValue("sso-ticket");
+		if (ssoTicketValue !== void 0) {
+			options.ssoTicket = ssoTicketValue;
+			continue;
+		}
 		switch (arg) {
 			case "-m":
 			case "-x":
@@ -6910,6 +6963,13 @@ function parseRequestOptions(args) {
 				options.authMode = mode;
 				break;
 			}
+			case "--sso-refresh-token":
+			case "--sso-cookie":
+				options.ssoCookie = args[++i];
+				break;
+			case "--sso-ticket":
+				options.ssoTicket = args[++i];
+				break;
 			case "-q":
 			case "--quiet":
 				options.quiet = true;
@@ -6938,6 +6998,13 @@ function expandRequestShorthand(args) {
 	const normalizedPath = pathArg.startsWith("/") ? pathArg : `/${pathArg}`;
 	return [`https://${platform.key === "yuque" ? "yuque-api.antfin-inc.com" : platform.config.host}${normalizedPath}`, ...args.slice(2)];
 }
+function getHostFromUrl(rawUrl) {
+	try {
+		return new URL(rawUrl).hostname;
+	} catch {
+		return "";
+	}
+}
 function parseStatusArgs(args) {
 	const showPrivateTokenFlags = new Set(["--show", "-s"]);
 	const positionals = [];
@@ -7077,6 +7144,12 @@ async function runGatewayCommand(args) {
 				process.exit(1);
 			}
 			await proxyRequest(url, options);
+			track({
+				event: "req",
+				source: getHostFromUrl(url),
+				sourceType: options.authMode ?? "auto",
+				query: options.method.toUpperCase()
+			});
 			break;
 		}
 		case "--help":
@@ -7767,6 +7840,12 @@ async function main() {
 				process.exit(1);
 			}
 			await proxyRequest(url, options);
+			track({
+				event: "req",
+				source: getHostFromUrl(url),
+				sourceType: options.authMode ?? "auto",
+				query: options.method.toUpperCase()
+			});
 			break;
 		}
 		case "gateway":

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

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

package/package.json

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