@newlandnpt/pep-cli 0.9.0-rc.1 → 0.9.0-rc.3

package/README.md

@@ -77,6 +77,18 @@ pep setup --skip-skills                # only sign in and configure Maven
 pep setup group/sub -p                 # a different group, into THIS project
 ```
 
+`--issuer`, `--client-id` and `--resource` work here exactly as on `pep auth login`, for pointing a
+run at another deployment:
+
+```powershell
+pep setup --issuer https://pep-dev.example --client-id <that deployment's id>
+```
+
+⚠ Both are needed for a non-production deployment: the client ID is baked in for production and does
+not fork per environment, so production's ID gets `unauthorized_client` elsewhere. If you are already
+signed in to a different deployment, `pep setup` signs in again rather than silently using the one
+you are signed in to — and since there is a single stored sign-in, that replaces it.
+
 The integration guide **group** is baked in at build time (currently `distribution/skills`). Passing
 one overrides it **for that run only** — it is deliberately not remembered, unlike `--docs-url`.
 Where each repository installs *is* remembered, in the local ledger, so `pep skills update` later

package/dist/pep.cjs

@@ -1174,17 +1174,27 @@ Repositories you installed earlier that have since left the group are reported,
 never deleted. \`pep skills remove <repo>\` drops one for good.
 
 The group is baked into this build and is not remembered between runs: pass one
-to install from a different group, just for this run.`,
+to install from a different group, just for this run.
+
+--issuer, --client-id and --resource are passed to step 1, exactly as on
+\`pep auth login\`, and are not remembered either. If you are already signed in to
+a different deployment, setup signs in again rather than silently using the one
+you are signed in to. There is a single stored sign-in, so signing in elsewhere
+replaces it \u2014 run \`pep auth login\` to go back.`,
     flags: [
-      "--skip-skills   Skip the integration guide step",
-      "--skip-nexus    Skip the Maven credential step (not needed outside Android)",
+      "--skip-skills      Skip the integration guide step",
+      "--skip-nexus       Skip the Maven credential step (not needed outside Android)",
       PROJECT_FLAG,
-      "--dir <path>    Install skills into this directory instead"
+      "--dir <path>       Install skills into this directory instead",
+      `--issuer <url>     PEP server for this run (default: ${DEFAULT_ISSUER})`,
+      "--client-id <id>   Registered OAuth client for this run",
+      "--resource <uri>   Token audience; repeat for multiple resources"
     ],
     examples: [
       "pep setup",
       "pep setup --skip-nexus",
-      `pep setup ${DEFAULT_SKILLS_GROUP} -p`
+      `pep setup ${DEFAULT_SKILLS_GROUP} -p`,
+      "pep setup --issuer https://pep-dev.example --client-id <that deployment's id>"
     ]
   }
 };
@@ -1800,6 +1810,10 @@ function accountOf(user) {
 function messageOf(error) {
   return error instanceof Error ? error.message : String(error);
 }
+function sameIssuer(a, b) {
+  const trim = (one) => one.trim().replace(/\/+$/, "").toLowerCase();
+  return trim(a) === trim(b);
+}
 function driftedFromGroup(installedSources, groupRepos, group) {
   const present = new Set(groupRepos.map((one) => one.trim().toLowerCase()));
   return installedSources.filter((key) => {
@@ -1820,6 +1834,13 @@ async function installGroup(dependencies, remote) {
   if (repos.length === 0) {
     dependencies.onProgress(`   ${group} lists no repositories \u2014 nothing to install.`);
   }
+  const drifted = driftedFromGroup(dependencies.installedSources, repos, group);
+  if (drifted.length > 0) {
+    dependencies.onProgress(`   \u26A0 On your list but no longer in ${group}:`);
+    for (const source of drifted) dependencies.onProgress(`       ${source}`);
+    dependencies.onProgress("     Nothing was deleted. If one of them blocks an install below,");
+    dependencies.onProgress("     `pep skills remove <repo>` drops it for good.");
+  }
   const installed = [];
   const failed = [];
   for (const [index, source] of repos.entries()) {
@@ -1832,23 +1853,32 @@ async function installGroup(dependencies, remote) {
       dependencies.onProgress(`   \u2717 ${source}: ${message}`);
     }
   }
-  return {
-    status: "installed",
-    group,
-    installed,
-    failed,
-    drifted: driftedFromGroup(dependencies.installedSources, repos, group)
-  };
+  return { status: "installed", group, installed, failed, drifted };
 }
 async function runSetup(dependencies) {
   dependencies.onProgress("\u2460 Signing in to PEP\u2026");
   let login;
   let signedIn;
   try {
-    signedIn = await dependencies.auth.status();
+    const current = await dependencies.auth.status();
+    if (dependencies.requestedIssuer === void 0 || sameIssuer(current.authorization.issuer, dependencies.requestedIssuer)) {
+      signedIn = current;
+    } else {
+      dependencies.onProgress(
+        `   Signed in to ${current.authorization.issuer}, but --issuer names ${dependencies.requestedIssuer} \u2014 signing in again.`
+      );
+    }
+  } catch {
+  }
+  if (signedIn !== void 0) {
     login = { alreadySignedIn: true, account: accountOf(signedIn.user) };
     dependencies.onProgress(`   Already signed in as ${login.account} \u2014 skipped.`);
-  } catch {
+    if (dependencies.loginOptionsGiven) {
+      dependencies.onProgress(
+        "   (reused the stored sign-in; --client-id / --resource apply only to a fresh one)"
+      );
+    }
+  } else {
     const config = await dependencies.loginConfig();
     dependencies.onProgress("   Opening your browser to sign in\u2026");
     await dependencies.auth.login(config, dependencies.onAuthorizationUrl);
@@ -1895,7 +1925,7 @@ function setupFailureSummary(report) {
 }
 
 // src/cli.ts
-var VERSION = false ? "0.0.0-dev" : "0.9.0-rc.1";
+var VERSION = false ? "0.0.0-dev" : "0.9.0-rc.3";
 var SKILLS_ADD_DEPRECATION = "\u26A0 `pep skills add` will be removed in a future release.";
 function reportUpdate(result) {
   const conflicts = () => {
@@ -1975,6 +2005,19 @@ async function loginConfig(args, store = fileConfigStore()) {
     ...saved?.docsUrl !== void 0 ? { docsUrl: saved.docsUrl } : {}
   };
 }
+function takeLoginOptions(args) {
+  const out = [];
+  const issuer = option(args, "--issuer");
+  if (issuer !== void 0) out.push("--issuer", normalizeIssuer(issuer));
+  const clientId = option(args, "--client-id");
+  if (clientId !== void 0) out.push("--client-id", clientId);
+  for (const resource of repeatedOption(args, "--resource")) out.push("--resource", resource);
+  return out;
+}
+function issuerOf(loginOptions) {
+  const at = loginOptions.indexOf("--issuer");
+  return at === -1 ? void 0 : loginOptions[at + 1];
+}
 function parseSkillsArgs(command, args, cwd) {
   const local = command === "list" || command === "remove";
   const explicitDirectory = local ? void 0 : option(args, "--dir");
@@ -2066,12 +2109,14 @@ function reportSetup(report) {
       console.error(`  \u2717 ${source}: ${message}`);
     }
     if (skills.drifted.length > 0) {
-      console.error(`
-\u26A0 Still on your list, but no longer in ${skills.group}:`);
-      for (const source of skills.drifted) console.error(`    ${source}`);
-      console.error("  They were left in place \u2014 nothing was deleted. `pep skills update` will");
-      console.error("  report 404 for each of them (which reads exactly like a typo, but is not).");
-      console.error("  `pep skills remove <repo>` drops one for good.");
+      const n = skills.drifted.length;
+      console.error(
+        `
+\u26A0 ${n} ${n === 1 ? "repository" : "repositories"} on your list ${n === 1 ? "is" : "are"} no longer in ${skills.group} (listed above).`
+      );
+      console.error("  Nothing was deleted. `pep skills update` will report 404 for each of them");
+      console.error("  (which reads exactly like a typo, but is not). `pep skills remove <repo>`");
+      console.error("  drops one for good.");
     }
   }
   if (report.nexus.status === "skipped") {
@@ -2098,6 +2143,7 @@ async function main() {
   if (group === "setup") {
     const skipNexus = flag(args, "--skip-nexus");
     const skipSkills = flag(args, "--skip-skills");
+    const loginOptions = takeLoginOptions(args);
     const { requested, chosenTarget } = parseSkillsArgs("setup", args);
     const skillsGroup = requested ?? DEFAULT_SKILLS_GROUP;
     const { configStore: configStore2, auth: auth2 } = createCliServices();
@@ -2105,7 +2151,11 @@ async function main() {
     const state = await stateStore.read();
     const report = await runSetup({
       auth: auth2,
-      loginConfig: () => loginConfig(args, configStore2),
+      // ⚠ 传 `loginOptions` 而不是 `args`：后者到这里**恒为空**（`parseSkillsArgs` 要么抛、
+      // 要么把剩下的吃干净），传它等于永远只用构建期默认值。
+      loginConfig: () => loginConfig([...loginOptions], configStore2),
+      ...issuerOf(loginOptions) !== void 0 ? { requestedIssuer: issuerOf(loginOptions) } : {},
+      loginOptionsGiven: loginOptions.length > 0,
       group: skillsGroup,
       skipSkills,
       listGroupRepos: (remote) => listGroupRepos({ ...remote, group: skillsGroup }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlandnpt/pep-cli",
-  "version": "0.9.0-rc.1",
+  "version": "0.9.0-rc.3",
   "description": "PEP CLI —— 凭 PEP 身份读取 Newland 开发者文档与 agent skills",
   "license": "UNLICENSED",
   "type": "module",