@agentscope-ai/platform-cli 1.0.2 → 1.0.4

package/dist/cli.js

@@ -5,6 +5,7 @@ import {
   CLI_VERSION,
   DEFAULT_SCOPE,
   PLATFORM_URL,
+  PRE_PLATFORM_URL,
   clearCredentials,
   credentialsFromTokenResponse,
   getAspConfigDir,
@@ -12,7 +13,7 @@ import {
   loadCredentials,
   resolveConfig,
   saveCredentials
-} from "./chunk-YN3EQLE2.js";
+} from "./chunk-IHANUO75.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -68,6 +69,64 @@ function maskSecrets(text) {
   return text.replace(/Bearer\s+[A-Za-z0-9._-]+/gi, "Bearer [REDACTED]").replace(/"access_token"\s*:\s*"[^"]+"/gi, '"access_token":"[REDACTED]"').replace(/"refresh_token"\s*:\s*"[^"]+"/gi, '"refresh_token":"[REDACTED]"').replace(/"token"\s*:\s*"[^"]+"/gi, '"token":"[REDACTED]"');
 }
 
+// src/utils/platform.ts
+function detectPlatformEnv(url) {
+  const normalized = url.replace(/\/$/, "");
+  if (normalized === PLATFORM_URL) return "default";
+  if (normalized === PRE_PLATFORM_URL) return "pre";
+  return "custom";
+}
+function formatPlatformLabel(url) {
+  const env = detectPlatformEnv(url);
+  if (env === "default") return `platform (${PLATFORM_URL})`;
+  if (env === "pre") return `pre (${PRE_PLATFORM_URL})`;
+  return url;
+}
+function envCommandSuffix(platformUrl) {
+  return detectPlatformEnv(platformUrl) === "pre" ? " pre" : "";
+}
+function loginCommandHint(platformUrl) {
+  return `Run \`asp auth login${envCommandSuffix(platformUrl)}\`.`;
+}
+function withPlatformUrl(config, platformUrl) {
+  return { ...config, platformUrl: platformUrl.replace(/\/$/, "") };
+}
+async function requireCredentials(config, targetPlatformUrl) {
+  if (config.token) {
+    return {
+      config: withPlatformUrl(config, targetPlatformUrl),
+      creds: {
+        access_token: config.token,
+        token_type: "Bearer",
+        platform_url: targetPlatformUrl
+      }
+    };
+  }
+  const creds = await loadCredentials(targetPlatformUrl);
+  if (!creds?.access_token) {
+    throw new AspError("Not logged in.", {
+      code: "UNAUTHORIZED",
+      hint: loginCommandHint(targetPlatformUrl),
+      exitCode: 3
+    });
+  }
+  const credsUrl = creds.platform_url.replace(/\/$/, "");
+  const targetUrl = targetPlatformUrl.replace(/\/$/, "");
+  if (credsUrl !== targetUrl) {
+    const loggedIn = formatPlatformLabel(credsUrl);
+    const target = formatPlatformLabel(targetUrl);
+    throw new AspError(`Credential environment mismatch: logged in to ${loggedIn}, command targets ${target}.`, {
+      code: "ENV_MISMATCH",
+      hint: loginCommandHint(targetUrl),
+      exitCode: 1
+    });
+  }
+  return {
+    config: withPlatformUrl(config, targetUrl),
+    creds
+  };
+}
+
 // src/auth/session.ts
 function isSessionInvalidError(err) {
   if (!(err instanceof AspError)) return false;
@@ -114,7 +173,7 @@ var HttpClient = class {
       return await this.doRequest(opts);
     } catch (err) {
       if (opts.auth !== false && !opts._retried && isSessionInvalidError(err) && !this.config.token) {
-        const creds = await loadCredentials();
+        const creds = await loadCredentials(this.config.platformUrl);
         if (creds?.refresh_token) {
           await refreshStoredSession(configWithPlatform(this.config, creds), creds.refresh_token, creds.platform_url);
           return this.doRequest({ ...opts, _retried: true });
@@ -124,7 +183,7 @@ var HttpClient = class {
     }
   }
   async doRequest(opts) {
-    const creds = opts.auth !== false && !this.config.token ? await loadCredentials() : null;
+    const creds = opts.auth !== false && !this.config.token ? await loadCredentials(this.config.platformUrl) : null;
     const platformUrl = creds?.platform_url ?? this.config.platformUrl;
     const prefix = opts.prefix ?? "";
     const url = `${platformUrl}${prefix}${opts.path}`;
@@ -169,7 +228,7 @@ var HttpClient = class {
   }
   async resolveAccessToken(existing) {
     if (this.config.token) return this.config.token;
-    const creds = existing ?? await loadCredentials();
+    const creds = existing ?? await loadCredentials(this.config.platformUrl);
     if (!creds) return void 0;
     if (isTokenExpired(creds) && creds.refresh_token) {
       const refreshed = await refreshStoredSession(
@@ -351,56 +410,6 @@ function generatePkce() {
   return { codeVerifier, codeChallenge, state, nonce };
 }
 
-// src/utils/platform.ts
-function detectPlatformEnv(url) {
-  const normalized = url.replace(/\/$/, "");
-  if (normalized === PLATFORM_URL) return "default";
-  return "custom";
-}
-function formatPlatformLabel(url) {
-  const env = detectPlatformEnv(url);
-  if (env === "default") return `platform (${PLATFORM_URL})`;
-  return url;
-}
-function withPlatformUrl(config, platformUrl) {
-  return { ...config, platformUrl: platformUrl.replace(/\/$/, "") };
-}
-async function requireCredentials(config, targetPlatformUrl) {
-  if (config.token) {
-    return {
-      config: withPlatformUrl(config, targetPlatformUrl),
-      creds: {
-        access_token: config.token,
-        token_type: "Bearer",
-        platform_url: targetPlatformUrl
-      }
-    };
-  }
-  const creds = await loadCredentials();
-  if (!creds?.access_token) {
-    throw new AspError("Not logged in.", {
-      code: "UNAUTHORIZED",
-      hint: "Run `asp auth login`.",
-      exitCode: 3
-    });
-  }
-  const credsUrl = creds.platform_url.replace(/\/$/, "");
-  const targetUrl = targetPlatformUrl.replace(/\/$/, "");
-  if (credsUrl !== targetUrl) {
-    const loggedIn = formatPlatformLabel(credsUrl);
-    const target = formatPlatformLabel(targetUrl);
-    throw new AspError(`Credential environment mismatch: logged in to ${loggedIn}, command targets ${target}.`, {
-      code: "ENV_MISMATCH",
-      hint: "Run `asp auth login` for the current target platform.",
-      exitCode: 1
-    });
-  }
-  return {
-    config: withPlatformUrl(config, targetUrl),
-    creds
-  };
-}
-
 // src/utils/output.ts
 import chalk from "chalk";
 function printJson(data) {
@@ -647,9 +656,10 @@ function wantsPasswordLogin(opts) {
 async function ensureBrowserLoginEnabled(config) {
   const meta = await new CliApiClient(config).getMeta().catch(() => null);
   if (meta?.features?.browser_pkce_login === false) {
+    const suffix = envCommandSuffix(config.platformUrl);
     throw new AspError("Browser authorization login is not enabled on this platform.", {
       code: "FEATURE_DISABLED",
-      hint: "Use `asp auth login --password` instead."
+      hint: `Use \`asp auth login --password${suffix}\` instead.`
     });
   }
 }
@@ -688,9 +698,10 @@ async function runLogin(config, opts) {
     return;
   }
   if (!process.stdin.isTTY) {
+    const suffix = envCommandSuffix(config.platformUrl);
     throw new AspError("Non-interactive login requires a login method flag.", {
       code: "INVALID_REQUEST",
-      hint: "Use `asp auth login --browser` or `asp auth login --password --account <email> --pass <password>`."
+      hint: `Use \`asp auth login --browser${suffix}\` or \`asp auth login --password --account <email> --pass <password>${suffix}\`.`
     });
   }
   const method = await promptLoginMethod();
@@ -712,16 +723,16 @@ async function saveTokenLogin(config, token) {
 }
 async function runStatus(getConfig2) {
   const base = getConfig2();
-  const creds = await loadCredentials();
+  const creds = await loadCredentials(base.platformUrl);
   if (!base.token && !creds) {
     printInfo("Not logged in.");
-    printInfo("Run `asp auth login` to sign in.");
+    printInfo(loginCommandHint(base.platformUrl));
     return;
   }
   const { config: apiConfig } = await requireCredentials(base, base.platformUrl);
   const client = new CliApiClient(apiConfig);
   const me = await client.getMe();
-  const latestCreds = await loadCredentials() ?? creds;
+  const latestCreds = await loadCredentials(base.platformUrl) ?? creds;
   if (base.json) {
     printJson({
       logged_in: true,
@@ -756,7 +767,7 @@ async function runRefresh(getConfig2) {
   if (!creds.refresh_token) {
     throw new AspError("No refresh token available.", {
       code: "UNAUTHORIZED",
-      hint: "Run `asp auth login`.",
+      hint: loginCommandHint(config.platformUrl),
       exitCode: 3
     });
   }
@@ -766,7 +777,7 @@ async function runRefresh(getConfig2) {
 async function runLogout(getConfig2) {
   const base = getConfig2();
   const platformUrl = base.platformUrl;
-  const creds = await loadCredentials();
+  const creds = await loadCredentials(platformUrl);
   if (!creds) {
     printInfo(`Not logged in to ${formatPlatformLabel(platformUrl)}.`);
     return;
@@ -776,7 +787,7 @@ async function runLogout(getConfig2) {
     await client.logout().catch(() => {
     });
   }
-  await clearCredentials();
+  await clearCredentials(creds.platform_url);
   printSuccess(`Logged out from ${formatPlatformLabel(creds.platform_url)}.`);
 }
 async function runLogs(getConfig2, opts) {
@@ -808,7 +819,7 @@ async function runLogs(getConfig2, opts) {
 }
 function registerAuthCommands(program2, getConfig2) {
   const auth = program2.command("auth").description("Authentication commands");
-  let login = auth.command("login").description("Log in (default platform is pre environment)");
+  let login = auth.command("login").description("Log in (append `pre` for pre-production, e.g. asp auth login pre)");
   for (const [flags, desc] of LOGIN_OPTIONS) {
     login = login.option(flags, desc);
   }
@@ -1549,15 +1560,17 @@ async function runPublish(getConfig2, zipPath, opts) {
     publishOpts = { ...opts, category };
   }
   if (useUrlMode && zipPath) {
+    const suffix = envCommandSuffix(config.platformUrl);
     throw new AspError("Do not pass zip path when using --url.", {
       code: "INVALID_REQUEST",
-      hint: "Use either `asp plugin publish ./plugin.zip` or `asp plugin publish --url <url>`."
+      hint: `Use either \`asp plugin publish ./plugin.zip${suffix}\` or \`asp plugin publish --url <url>${suffix}\`.`
     });
   }
   if (!useUrlMode && !zipPath) {
+    const suffix = envCommandSuffix(config.platformUrl);
     throw new AspError("Zip path is required unless --url is provided.", {
       code: "INVALID_REQUEST",
-      hint: "Use `asp plugin publish ./plugin.zip`."
+      hint: `Use \`asp plugin publish ./plugin.zip${suffix}\`.`
     });
   }
   let submission;
@@ -1575,7 +1588,6 @@ async function runPublish(getConfig2, zipPath, opts) {
         code: "UPLOAD_URL_MISSING"
       });
     }
-    printInfo("Uploading plugin zip to object storage...");
     await uploadZipToSignedUrl(localSubmission.upload, fileBuffer);
     localSubmission = await client.completeArtifactSubmission(localSubmission.submission_id, {
       sha512,
@@ -1609,14 +1621,16 @@ async function runPublish(getConfig2, zipPath, opts) {
   printInfo(`Initial status: ${submission.status}`);
   const trackRef = publishOpts.artifactId ?? manifest?.id ?? urlPluginId ?? submission.submission_id;
   if (opts.noWait) {
-    printInfo(`Track progress: asp plugin publish status ${trackRef}`);
-    printInfo(`Show logs: asp plugin publish logs ${trackRef}`);
+    const envSuffix2 = envCommandSuffix(config.platformUrl);
+    printInfo(`Track progress: asp plugin publish status ${trackRef}${envSuffix2}`);
+    printInfo(`Show logs: asp plugin publish logs ${trackRef}${envSuffix2}`);
     return;
   }
   if (!submission.terminal) {
     printSuccess("Upload submitted successfully. Scanning continues asynchronously.");
-    printInfo(`Track progress: asp plugin publish status ${trackRef} --watch`);
-    printInfo(`Show logs: asp plugin publish logs ${trackRef}`);
+    const envSuffix2 = envCommandSuffix(config.platformUrl);
+    printInfo(`Track progress: asp plugin publish status ${trackRef} --watch${envSuffix2}`);
+    printInfo(`Show logs: asp plugin publish logs ${trackRef}${envSuffix2}`);
     return;
   }
   if (submission.status === "published") {
@@ -1630,7 +1644,8 @@ async function runPublish(getConfig2, zipPath, opts) {
   if (submission.failure?.message) {
     printWarn(`Failure: ${submission.failure.message}`);
   }
-  printInfo(`Inspect logs: asp plugin publish logs ${trackRef}`);
+  const envSuffix = envCommandSuffix(config.platformUrl);
+  printInfo(`Inspect logs: asp plugin publish logs ${trackRef}${envSuffix}`);
 }
 async function runPublishStatus(getConfig2, pluginRef, opts) {
   const base = getConfig2();
@@ -2147,15 +2162,17 @@ async function runPublish2(getConfig2, zipPath, opts) {
   }
   const useUrlMode = Boolean(opts.url);
   if (useUrlMode && zipPath) {
+    const suffix = envCommandSuffix(config.platformUrl);
     throw new AspError("Do not pass zip path when using --url.", {
       code: "INVALID_REQUEST",
-      hint: "Use either `asp skill publish ./skill.zip` or `asp skill publish --url <url>`."
+      hint: `Use either \`asp skill publish ./skill.zip${suffix}\` or \`asp skill publish --url <url>${suffix}\`.`
     });
   }
   if (!useUrlMode && !zipPath) {
+    const suffix = envCommandSuffix(config.platformUrl);
     throw new AspError("Zip path is required unless --url is provided.", {
       code: "INVALID_REQUEST",
-      hint: "Use `asp skill publish ./skill.zip`."
+      hint: `Use \`asp skill publish ./skill.zip${suffix}\`.`
     });
   }
   const manifest = useUrlMode ? void 0 : await readSkillManifestFromZip(zipPath);
@@ -2180,7 +2197,6 @@ async function runPublish2(getConfig2, zipPath, opts) {
         code: "UPLOAD_URL_MISSING"
       });
     }
-    printInfo("Uploading skill zip to object storage...");
     await uploadZipToSignedUrl2(localSubmission.upload, fileBuffer);
     localSubmission = await client.completeArtifactSubmission(localSubmission.submission_id, {
       sha512,
@@ -2225,14 +2241,16 @@ async function runPublish2(getConfig2, zipPath, opts) {
   printInfo(`Initial status: ${submission.status}`);
   const trackRef = publishOpts.artifactId ?? urlSkillId ?? submission.submission_id;
   if (opts.noWait) {
-    printInfo(`Track progress: asp skill publish status ${trackRef}`);
-    printInfo(`Show logs: asp skill publish logs ${trackRef}`);
+    const envSuffix2 = envCommandSuffix(config.platformUrl);
+    printInfo(`Track progress: asp skill publish status ${trackRef}${envSuffix2}`);
+    printInfo(`Show logs: asp skill publish logs ${trackRef}${envSuffix2}`);
     return;
   }
   if (!submission.terminal) {
     printSuccess("Upload submitted successfully. Scanning continues asynchronously.");
-    printInfo(`Track progress: asp skill publish status ${trackRef} --watch`);
-    printInfo(`Show logs: asp skill publish logs ${trackRef}`);
+    const envSuffix2 = envCommandSuffix(config.platformUrl);
+    printInfo(`Track progress: asp skill publish status ${trackRef} --watch${envSuffix2}`);
+    printInfo(`Show logs: asp skill publish logs ${trackRef}${envSuffix2}`);
     return;
   }
   if (submission.status === "published") {
@@ -2246,7 +2264,8 @@ async function runPublish2(getConfig2, zipPath, opts) {
   if (submission.failure?.message) {
     printWarn(`Failure: ${submission.failure.message}`);
   }
-  printInfo(`Inspect logs: asp skill publish logs ${trackRef}`);
+  const envSuffix = envCommandSuffix(config.platformUrl);
+  printInfo(`Inspect logs: asp skill publish logs ${trackRef}${envSuffix}`);
 }
 async function runPublishStatus2(getConfig2, skillRef, opts) {
   const base = getConfig2();
@@ -2347,9 +2366,20 @@ function registerSkillCommands(program2, getConfig2) {
 
 // src/cli.ts
 var globalOpts = {};
-var program = new Command().name("asp").description("AgentScope Platform CLI").version(CLI_VERSION).option("--platform-url <url>", "Custom Platform base URL (advanced)").option("--token <token>", "Access token (overrides stored credentials)").option("-v, --verbose", "Verbose logging").option("--json", "Output JSON").hook("preAction", (thisCommand) => {
+function preprocessArgv(argv) {
+  const args = [...argv];
+  let pre = false;
+  if (args.length >= 4 && args[args.length - 1] === "pre") {
+    pre = true;
+    args.pop();
+  }
+  return { argv: args, pre };
+}
+var { argv: cliArgv, pre: trailingPre } = preprocessArgv(process.argv);
+var program = new Command().name("asp").description("AgentScope Platform CLI").version(CLI_VERSION).option("--platform-url <url>", "Custom Platform base URL (advanced)").option("--pre", "Target pre-production environment (https://platform-pre.agentscope.io)").option("--token <token>", "Access token (overrides stored credentials)").option("-v, --verbose", "Verbose logging").option("--json", "Output JSON").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   globalOpts.platformUrl = opts.platformUrl;
+  globalOpts.pre = opts.pre || trailingPre;
   globalOpts.token = opts.token;
   globalOpts.verbose = opts.verbose;
   globalOpts.json = opts.json;
@@ -2360,7 +2390,7 @@ registerPluginCommands(program, getConfig);
 registerSkillCommands(program, getConfig);
 async function main() {
   try {
-    await program.parseAsync(process.argv);
+    await program.parseAsync(cliArgv);
   } catch (err) {
     if (err instanceof AspError) {
       printError(`${err.message} [${err.code}]`);