bailian-cli-core 1.0.0-beta.0 → 1.0.1

package/dist/index.mjs

@@ -1,6 +1,8 @@
-import { existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from "fs";
+import { r as __toESM } from "./chunk-e9Ob2GDo.mjs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { basename, join } from "path";
+import { stringify } from "yaml";
 import { createHash, createHmac, randomUUID } from "crypto";
 //#region src/errors/codes.ts
 const ExitCode = {
@@ -15,42 +17,56 @@ const ExitCode = {
 };
 //#endregion
 //#region src/errors/base.ts
-/**
-* Base error class for the Bailian SDK.
-*
-* Carries an `exitCode` (intended for CLI consumers to translate into a
-* process exit code) and an optional `hint` describing how to recover.
-* SDK consumers may ignore `exitCode` and treat instances as ordinary errors.
-*/
 var BailianError = class extends Error {
 	exitCode;
 	hint;
-	constructor(message, exitCode = ExitCode.GENERAL, hint) {
-		super(message);
+	api;
+	constructor(message, exitCode = ExitCode.GENERAL, hint, options) {
+		super(message, options?.cause !== void 0 ? { cause: options.cause } : void 0);
 		this.name = "BailianError";
 		this.exitCode = exitCode;
 		this.hint = hint;
+		this.api = options?.api;
 	}
 	toJSON() {
+		const causeJson = serializeCause(this.cause);
 		return { error: {
 			code: this.exitCode,
 			message: this.message,
-			...this.hint ? { hint: this.hint } : {}
+			...this.hint ? { hint: this.hint } : {},
+			...this.api?.httpStatus !== void 0 ? { http_status: this.api.httpStatus } : {},
+			...this.api?.apiCode ? { api_code: this.api.apiCode } : {},
+			...this.api?.requestId ? { request_id: this.api.requestId } : {},
+			...causeJson ? { cause: causeJson } : {}
 		} };
 	}
 };
+function serializeCause(cause) {
+	if (cause == null) return void 0;
+	if (cause instanceof Error) {
+		const out = { message: cause.message };
+		const code = cause.code;
+		if (code) out.code = code;
+		return out;
+	}
+	if (typeof cause === "string" || typeof cause === "number" || typeof cause === "boolean") return { message: String(cause) };
+	try {
+		return { message: JSON.stringify(cause) };
+	} catch {
+		return;
+	}
+}
 //#endregion
 //#region src/errors/api.ts
 function mapApiError(status, body, _url) {
 	const apiMsg = body.error?.message || body.message || `HTTP ${status}`;
-	const apiCode = body.error?.type || body.code;
-	if (status === 401 || status === 403 || apiCode === "InvalidApiKey" || apiCode === "Unauthorized") return new BailianError(`API key rejected (HTTP ${status}). ${apiMsg}`, ExitCode.AUTH, "Verify your API key is valid and not expired.");
-	if (status === 429 || apiCode === "Throttling" || apiCode === "Throttling.RateQuota" || apiCode === "Throttling.AllocationQuota") return new BailianError(`Rate limit or quota exceeded. ${apiMsg}`, ExitCode.QUOTA, "Wait a moment and retry, or check your account quota.");
-	if (status === 408 || status === 504) return new BailianError(`Request timed out (HTTP ${status}).`, ExitCode.TIMEOUT, "Try increasing the request timeout or retry later.");
-	if (apiCode === "InvalidParameter" || apiCode === "BadRequest") return new BailianError(`Invalid parameter: ${apiMsg}`, ExitCode.USAGE);
-	if (apiCode === "ModelNotFound" || apiCode === "AccessDenied") return new BailianError(`Model access denied or not found: ${apiMsg}`, ExitCode.AUTH, "Verify the model name and that your account has access to it.");
-	if (apiCode === "DataInspectionFailed") return new BailianError(`Content flagged by safety filter: ${apiMsg}`, ExitCode.CONTENT_FILTER);
-	return new BailianError(`API error: ${apiMsg} (HTTP ${status}${apiCode ? `, code: ${apiCode}` : ""})`, ExitCode.GENERAL);
+	const rawCode = body.error?.type ?? body.code;
+	const apiCode = typeof rawCode === "string" ? rawCode : typeof rawCode === "number" ? String(rawCode) : void 0;
+	return new BailianError(apiMsg, ExitCode.GENERAL, void 0, { api: {
+		httpStatus: status,
+		apiCode,
+		requestId: body.request_id
+	} });
 }
 //#endregion
 //#region src/config/schema.ts
@@ -76,6 +92,8 @@ function parseConfigFile(raw) {
 	const obj = raw;
 	const out = {};
 	if (typeof obj.api_key === "string") out.api_key = obj.api_key;
+	if (typeof obj.access_token === "string" && obj.access_token.length > 0) out.access_token = obj.access_token;
+	else if (typeof obj.accessToken === "string" && obj.accessToken.length > 0) out.access_token = obj.accessToken;
 	if (typeof obj.region === "string" && VALID_REGIONS.has(obj.region)) out.region = obj.region;
 	if (typeof obj.base_url === "string" && obj.base_url.startsWith("http")) out.base_url = obj.base_url;
 	if (typeof obj.output === "string" && VALID_OUTPUTS.has(obj.output)) out.output = obj.output;
@@ -89,6 +107,8 @@ function parseConfigFile(raw) {
 	if (typeof obj.access_key_id === "string" && obj.access_key_id.length > 0) out.access_key_id = obj.access_key_id;
 	if (typeof obj.access_key_secret === "string" && obj.access_key_secret.length > 0) out.access_key_secret = obj.access_key_secret;
 	if (typeof obj.workspace_id === "string" && obj.workspace_id.length > 0) out.workspace_id = obj.workspace_id;
+	if (typeof obj.console_gateway_url === "string" && obj.console_gateway_url.startsWith("http")) out.console_gateway_url = obj.console_gateway_url;
+	if (typeof obj.telemetry === "boolean") out.telemetry = obj.telemetry;
 	return out;
 }
 //#endregion
@@ -164,15 +184,21 @@ function formatErrorJson(code, message, hint) {
 	} }, null, 2);
 }
 //#endregion
+//#region src/output/yaml.ts
+function formatYaml(data) {
+	return stringify(data).replace(/\n$/, "");
+}
+//#endregion
 //#region src/output/formatter.ts
 function detectOutputFormat(flagValue) {
-	if (flagValue === "json" || flagValue === "text") return flagValue;
+	if (flagValue === "json" || flagValue === "text" || flagValue === "yaml") return flagValue;
 	if (!process.stdout.isTTY) return "json";
 	return "text";
 }
 function formatOutput(data, format) {
 	switch (format) {
 		case "json": return formatJson(data);
+		case "yaml": return formatYaml(data);
 		case "text": return formatText(data);
 	}
 }
@@ -200,6 +226,8 @@ function loadConfig(flags) {
 	const file = readConfigFile();
 	const apiKey = flags.apiKey || void 0;
 	const fileApiKey = file.api_key;
+	const accessTokenEnv = process.env.DASHSCOPE_ACCESS_TOKEN?.trim() || void 0;
+	const fileAccessToken = file.access_token?.trim() || void 0;
 	const explicitRegion = flags.region || process.env.DASHSCOPE_REGION || void 0;
 	const cachedRegion = file.region;
 	const region = explicitRegion || cachedRegion || "cn";
@@ -211,6 +239,8 @@ function loadConfig(flags) {
 	if (!Number.isFinite(timeout) || timeout <= 0) throw new BailianError("Timeout must be a positive finite number.", ExitCode.USAGE);
 	return {
 		apiKey,
+		accessTokenEnv,
+		fileAccessToken,
 		fileApiKey,
 		fileRegion: file.region,
 		configPath: getConfigPath(),
@@ -227,13 +257,15 @@ function loadConfig(flags) {
 		accessKeyId: process.env.ALIBABA_CLOUD_ACCESS_KEY_ID || file.access_key_id || void 0,
 		accessKeySecret: process.env.ALIBABA_CLOUD_ACCESS_KEY_SECRET || file.access_key_secret || void 0,
 		workspaceId: process.env.BAILIAN_WORKSPACE_ID || file.workspace_id || void 0,
+		consoleGatewayUrl: process.env.BAILIAN_CONSOLE_GATEWAY_URL || file.console_gateway_url || "https://bailian-cs.console.aliyun.com",
 		verbose: flags.verbose || process.env.DASHSCOPE_VERBOSE === "1",
 		quiet: flags.quiet || false,
 		noColor: flags.noColor || process.env.NO_COLOR !== void 0 || !process.stdout.isTTY,
 		yes: flags.yes || false,
 		dryRun: flags.dryRun || false,
 		nonInteractive: flags.nonInteractive || false,
-		async: flags.async || false
+		async: flags.async || false,
+		telemetry: process.env.DO_NOT_TRACK === "1" ? false : file.telemetry ?? true
 	};
 }
 //#endregion
@@ -268,6 +300,7 @@ async function clearApiKey() {
 	try {
 		const existing = JSON.parse(readFileSync(path, "utf-8"));
 		delete existing.api_key;
+		delete existing.access_token;
 		const tmp = path + ".tmp";
 		writeFileSync(tmp, JSON.stringify(existing, null, 2) + "\n", { mode: 384 });
 		renameSync(tmp, path);
@@ -286,6 +319,16 @@ async function resolveCredential(config) {
 		method: "api-key",
 		source: "config.json"
 	};
+	if (config.accessTokenEnv) return {
+		token: config.accessTokenEnv,
+		method: "access-token",
+		source: "DASHSCOPE_ACCESS_TOKEN"
+	};
+	if (config.fileAccessToken) return {
+		token: config.fileAccessToken,
+		method: "access-token",
+		source: "config.json"
+	};
 	if (process.env.DASHSCOPE_API_KEY) return {
 		token: process.env.DASHSCOPE_API_KEY,
 		method: "api-key",
@@ -627,6 +670,54 @@ async function* parseSSE(response) {
 	}
 }
 //#endregion
+//#region src/console/gateway.ts
+const GATEWAY_ACTION = "BroadScopeAspnGateway";
+const GATEWAY_PRODUCT = "sfm_bailian";
+function buildGatewayParams(api, data) {
+	return JSON.stringify({
+		Api: api,
+		V: "1.0",
+		Data: {
+			...data,
+			cornerstoneParam: {
+				protocol: "V2",
+				console: "ONE_CONSOLE",
+				productCode: "p_efm",
+				consoleSite: "BAILIAN_ALIYUN",
+				...typeof data.cornerstoneParam === "object" && data.cornerstoneParam !== null ? data.cornerstoneParam : {}
+			}
+		}
+	});
+}
+/**
+* Invoke a Bailian **console** OpenAPI via the CLI gateway (`/cli/api.json`).
+* Requires a console `access_token` (from `bl auth login --console`), not a DashScope API key.
+*/
+async function callConsoleGateway(config, token, { api, data, region = "cn-beijing" }) {
+	const params = buildGatewayParams(api, data);
+	const body = new URLSearchParams({
+		params,
+		region
+	});
+	const timeoutMs = config.timeout * 1e3;
+	const gatewayBase = config.consoleGatewayUrl;
+	const res = await fetch(`${gatewayBase}/cli/api.json?action=${GATEWAY_ACTION}&product=${GATEWAY_PRODUCT}&api=${encodeURIComponent(api)}`, {
+		method: "POST",
+		headers: {
+			Accept: "*/*",
+			Authorization: `Bearer ${token}`,
+			"Content-Type": "application/x-www-form-urlencoded"
+		},
+		body: body.toString(),
+		signal: AbortSignal.timeout(timeoutMs)
+	});
+	if (!res.ok) {
+		const t = await res.text().catch(() => "");
+		throw new BailianError(`Console CLI gateway failed: HTTP ${res.status} ${res.statusText}`, ExitCode.GENERAL, t.slice(0, 500));
+	}
+	return res.json();
+}
+//#endregion
 //#region src/files/upload.ts
 /**
 * Upload local files to DashScope temporary OSS storage.
@@ -743,7 +834,7 @@ const GLOBAL_OPTIONS = [
 	},
 	{
 		flag: "--output <format>",
-		description: "Output format: text, json"
+		description: "Output format: text, json, yaml"
 	},
 	{
 		flag: "--timeout <seconds>",
@@ -921,4 +1012,181 @@ function stripUndefined(obj) {
 	return obj;
 }
 //#endregion
-export { BAILIAN_HOST, BailianError, CHANNEL, DOCS_HOSTS, ExitCode, GLOBAL_OPTIONS, McpClient, REGIONS, SOURCE_CONFIG, TAGS, appCompletionEndpoint, chatEndpoint, clearApiKey, defineCommand, detectOutputFormat, ensureConfigDir, formatErrorJson, formatJson, formatKeyValue, formatOutput, formatTable, formatText, generateFilename, generateToolSchema, getConfigDir, getConfigPath, getCredentialsPath, imageEndpoint, imageSyncEndpoint, isCI, isInteractive, isLocalFile, loadApiKeyFromConfig, loadConfig, mapApiError, maskToken, mcpWebSearchEndpoint, memoryAddEndpoint, memoryListEndpoint, memoryNodeEndpoint, memorySearchEndpoint, parseConfigFile, parseSSE, profileSchemaEndpoint, readConfigFile, request, requestJson, resolveCredential, resolveFileUrl, resolveOutputDir, saveApiKeyToConfig, signRequest, speechRecognizeEndpoint, speechSynthesizeEndpoint, stripUndefined, taskEndpoint, trackingHeaders, uploadFile, userProfileEndpoint, videoGenerateEndpoint, writeConfigFile };
+//#region src/telemetry/event.ts
+function createTrackingEvent(opts) {
+	const event = {
+		command: opts.command,
+		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+		durationMs: opts.durationMs,
+		success: opts.success,
+		cliVersion: opts.cliVersion,
+		region: opts.region,
+		nodeVersion: process.version,
+		os: process.platform
+	};
+	if (opts.authMethod) event.authMethod = opts.authMethod;
+	if (!opts.success && opts.error) {
+		if (opts.error.code !== void 0) event.errorCode = opts.error.code;
+		if (opts.error.message) event.errorMessage = opts.error.message;
+	}
+	if (opts.params && Object.keys(opts.params).length > 0) event.params = opts.params;
+	return event;
+}
+//#endregion
+//#region src/telemetry/sink.ts
+const TELEMETRY_FILE = () => join(getConfigDir(), "telemetry.jsonl");
+const MAX_FILE_SIZE = 5 * 1024 * 1024;
+let aesSendEvent;
+async function getAesSendEvent() {
+	if (aesSendEvent) return aesSendEvent;
+	try {
+		const { default: AES } = await import("./index-node-C01JPicH.mjs").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		const { default: AESPluginEvent } = await import("./index-node-Ce966wQ9.mjs").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		aesSendEvent = new AES({ pid: "bailian-cli-node" }).use(AESPluginEvent);
+		return aesSendEvent;
+	} catch {
+		return;
+	}
+}
+async function localSink(event) {
+	try {
+		await ensureConfigDir();
+		const path = TELEMETRY_FILE();
+		try {
+			if (statSync(path).size > MAX_FILE_SIZE) unlinkSync(path);
+		} catch {}
+		appendFileSync(path, JSON.stringify(event) + "\n");
+	} catch {}
+}
+async function remoteSink(event) {
+	try {
+		const send = await getAesSendEvent();
+		if (!send) return;
+		const { command, params, ...ext } = event;
+		send(command, {
+			et: "EXP",
+			ext,
+			c1: params
+		});
+	} catch {}
+}
+//#endregion
+//#region src/telemetry/tracker.ts
+const GLOBAL_FLAG_KEYS = new Set([
+	"apiKey",
+	"baseUrl",
+	"output",
+	"quiet",
+	"verbose",
+	"timeout",
+	"noColor",
+	"yes",
+	"dryRun",
+	"help",
+	"nonInteractive",
+	"async",
+	"region",
+	"console"
+]);
+/**
+* Allowlist of flag names safe to send to telemetry.
+*
+* Default is to NOT report. Only flags whose value space is enumerable / numeric / boolean
+* (and therefore cannot leak user content, credentials, file paths, URLs, or customer IDs)
+* belong here. When adding a new flag, ask: could this field carry PII, secrets, prompts,
+* file paths, URLs, or tenant identifiers? If yes, do NOT add it.
+*/
+const PARAM_ALLOWLIST = new Set([
+	"page",
+	"pageSize",
+	"n",
+	"count",
+	"model",
+	"voice",
+	"language",
+	"provider",
+	"capability",
+	"temperature",
+	"topP",
+	"topK",
+	"maxTokens",
+	"seed",
+	"stream",
+	"size",
+	"resolution",
+	"ratio",
+	"duration",
+	"format",
+	"audioFormat",
+	"sampleRate",
+	"pitch",
+	"rate",
+	"volume",
+	"mode",
+	"download",
+	"noWait",
+	"textOnly",
+	"promptExtend",
+	"noPromptExtend",
+	"enableSsml",
+	"watermark",
+	"hasThoughts",
+	"listTools",
+	"rerank",
+	"rerankTopN",
+	"diarization"
+]);
+function extractParams(flags) {
+	const params = {};
+	for (const [key, value] of Object.entries(flags)) {
+		if (key.startsWith("_")) continue;
+		if (GLOBAL_FLAG_KEYS.has(key)) continue;
+		if (!PARAM_ALLOWLIST.has(key)) continue;
+		if (value === void 0 || value === false) continue;
+		params[key] = value;
+	}
+	return params;
+}
+async function trackCommandExecution(config, commandPath, flags, fn) {
+	if (!config.telemetry) {
+		await fn();
+		return;
+	}
+	const start = performance.now();
+	let success = true;
+	let errorCode;
+	let errorMessage;
+	try {
+		await fn();
+	} catch (err) {
+		success = false;
+		if (err instanceof BailianError) {
+			errorCode = err.exitCode;
+			errorMessage = err.message;
+		} else if (err instanceof Error) errorMessage = err.message;
+		throw err;
+	} finally {
+		const durationMs = Math.round(performance.now() - start);
+		let authMethod;
+		if (config.apiKey) authMethod = "api-key";
+		else if (config.fileApiKey) authMethod = "api-key";
+		else if (config.accessTokenEnv || config.fileAccessToken) authMethod = "access-token";
+		const event = createTrackingEvent({
+			command: commandPath.join(" "),
+			durationMs,
+			success,
+			error: success ? void 0 : {
+				code: errorCode,
+				message: errorMessage
+			},
+			cliVersion: config.clientVersion ?? "unknown",
+			region: config.region,
+			authMethod,
+			params: extractParams(flags)
+		});
+		localSink(event).catch(() => {});
+		remoteSink(event).catch(() => {});
+	}
+}
+//#endregion
+export { BAILIAN_HOST, BailianError, CHANNEL, DOCS_HOSTS, ExitCode, GLOBAL_OPTIONS, McpClient, REGIONS, SOURCE_CONFIG, TAGS, appCompletionEndpoint, callConsoleGateway, chatEndpoint, clearApiKey, createTrackingEvent, defineCommand, detectOutputFormat, ensureConfigDir, formatErrorJson, formatJson, formatKeyValue, formatOutput, formatTable, formatText, formatYaml, generateFilename, generateToolSchema, getConfigDir, getConfigPath, getCredentialsPath, imageEndpoint, imageSyncEndpoint, isCI, isInteractive, isLocalFile, loadApiKeyFromConfig, loadConfig, localSink, mapApiError, maskToken, mcpWebSearchEndpoint, memoryAddEndpoint, memoryListEndpoint, memoryNodeEndpoint, memorySearchEndpoint, parseConfigFile, parseSSE, profileSchemaEndpoint, readConfigFile, remoteSink, request, requestJson, resolveCredential, resolveFileUrl, resolveOutputDir, saveApiKeyToConfig, signRequest, speechRecognizeEndpoint, speechSynthesizeEndpoint, stripUndefined, taskEndpoint, trackCommandExecution, trackingHeaders, uploadFile, userProfileEndpoint, videoGenerateEndpoint, writeConfigFile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bailian-cli-core",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.1",
   "description": "Core SDK for bailian-cli. See https://www.npmjs.com/package/bailian-cli for usage.",
   "homepage": "https://bailian.console.aliyun.com/cli",
   "license": "Apache-2.0",
@@ -18,7 +18,12 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "dependencies": {
+    "yaml": "^2.8.3"
+  },
   "devDependencies": {
+    "@ali/aes-tracker": "^3.3.18",
+    "@ali/aes-tracker-plugin-event": "^3.0.3",
     "@types/node": "^24",
     "@typescript/native-preview": "7.0.0-dev.20260328.1",
     "typescript": "^6.0.2",
@@ -27,6 +32,14 @@
   "engines": {
     "node": ">=22.12.0"
   },
+  "inlinedDependencies": {
+    "@ali/aes-tracker": "3.3.18",
+    "@ali/aes-tracker-plugin-event": "3.0.3",
+    "node-fetch": "2.7.0",
+    "tr46": "0.0.3",
+    "webidl-conversions": "3.0.1",
+    "whatwg-url": "5.0.0"
+  },
   "scripts": {
     "build": "vp pack",
     "dev": "vp pack --watch",