@newlandnpt/pep-cli 0.9.2 → 0.9.4

package/dist/pep.cjs

@@ -23,6 +23,17 @@ var DEFAULT_SCOPES = [
 var DEFAULT_RESOURCES = ["urn:newland:pep:docs"];
 var LEGACY_PACKAGE = "semi-integration";
 var DEFAULT_DOCS_URL = "https://docs.newlandnpt.us";
+var DOCS_BY_ISSUER = {
+  "https://pep.newlandnpt.us": "https://docs.newlandnpt.us",
+  "https://pep-webapp-view.onrender.com": "https://pep-developer-docs.onrender.com"
+};
+function docsUrlForIssuer(issuer) {
+  try {
+    return DOCS_BY_ISSUER[normalizeIssuer(issuer)];
+  } catch {
+    return void 0;
+  }
+}
 var DEFAULT_SKILLS_GROUP = "distribution/skills";
 var EXAMPLE_SKILLS_REPO = `${DEFAULT_SKILLS_GROUP}/semi-integration-skill`;
 function issuerForEnvironment(environment) {
@@ -684,6 +695,7 @@ public static class PepCredential {
 function encodedPowerShell(script) {
   return Buffer.from(script, "utf16le").toString("base64");
 }
+var CREDENTIAL_TOOL_TIMEOUT_MS = 6e4;
 async function runPowerShell(script, input) {
   return new Promise((resolve5, reject) => {
     const child = (0, import_node_child_process2.spawn)(
@@ -699,7 +711,11 @@ async function runPowerShell(script, input) {
     );
     let stdout = "";
     let stderr = "";
-    const timeout = setTimeout(() => child.kill(), 1e4);
+    let killed = false;
+    const timeout = setTimeout(() => {
+      killed = true;
+      child.kill();
+    }, CREDENTIAL_TOOL_TIMEOUT_MS);
     child.stdout.setEncoding("utf8").on("data", (chunk) => stdout += chunk);
     child.stderr.setEncoding("utf8").on("data", (chunk) => stderr += chunk);
     child.once(
@@ -708,6 +724,14 @@ async function runPowerShell(script, input) {
     );
     child.once("close", (code) => {
       clearTimeout(timeout);
+      if (killed) {
+        reject(
+          new Error(
+            `Windows Credential Manager did not answer within ${CREDENTIAL_TOOL_TIMEOUT_MS / 1e3}s. The machine may be heavily loaded \u2014 try again.`
+          )
+        );
+        return;
+      }
       if (code === 0) resolve5(stdout.trim());
       else
         reject(
@@ -768,7 +792,11 @@ async function runSecurity(args) {
     });
     let stdout = "";
     let stderr = "";
-    const timeout = setTimeout(() => child.kill(), 1e4);
+    let killed = false;
+    const timeout = setTimeout(() => {
+      killed = true;
+      child.kill();
+    }, CREDENTIAL_TOOL_TIMEOUT_MS);
     child.stdout.setEncoding("utf8").on("data", (chunk) => stdout += chunk);
     child.stderr.setEncoding("utf8").on("data", (chunk) => stderr += chunk);
     child.once(
@@ -777,6 +805,14 @@ async function runSecurity(args) {
     );
     child.once("close", (code) => {
       clearTimeout(timeout);
+      if (killed) {
+        reject(
+          new Error(
+            `macOS Keychain did not answer within ${CREDENTIAL_TOOL_TIMEOUT_MS / 1e3}s. The machine may be heavily loaded \u2014 try again.`
+          )
+        );
+        return;
+      }
       resolve5({ code: code ?? -1, stdout, stderr });
     });
   });
@@ -1117,6 +1153,30 @@ async function blobShaOfFile(path) {
   });
   return digest.digest("hex");
 }
+function humanBytes(n) {
+  if (n < 1024) return `${n} B`;
+  const units = ["KB", "MB", "GB"];
+  let value = n / 1024;
+  let unit = 0;
+  while (value >= 1024 && unit < units.length - 1) {
+    value /= 1024;
+    unit += 1;
+  }
+  return `${value.toFixed(value < 10 ? 1 : 0)} ${units[unit]}`;
+}
+function formatProgress(progress, width = 24) {
+  if (progress.phase === "verifying") return "  verifying\u2026";
+  const { bytes, total, elapsedMs } = progress;
+  const speed = elapsedMs > 0 && bytes > 0 ? `  \xB7  ${humanBytes(bytes / elapsedMs * 1e3)}/s` : "";
+  if (total === void 0 || total <= 0) {
+    return `  ${humanBytes(bytes)}${speed}`;
+  }
+  const ratio = Math.min(1, bytes / total);
+  const filled = Math.round(ratio * width);
+  const bar = `${"\u2588".repeat(filled)}${"\u2591".repeat(width - filled)}`;
+  const pct = `${Math.floor(ratio * 100)}`.padStart(3);
+  return `  ${bar} ${pct}%  ${humanBytes(bytes)} / ${humanBytes(total)}${speed}`;
+}
 async function downloadResource(dependencies, resource, options) {
   const file = (0, import_node_path3.basename)(resource.file);
   if (file !== resource.file || file === "." || file === "..") {
@@ -1149,8 +1209,26 @@ async function downloadResource(dependencies, resource, options) {
   await (0, import_promises3.mkdir)(directory, { recursive: true });
   const temporary = `${target}.${process.pid}.part`;
   try {
+    const report = options.onProgress;
+    const startedAt = Date.now();
+    let seen = 0;
     await (0, import_promises4.pipeline)(
       import_node_stream.Readable.fromWeb(response.body),
+      // ⚠ 这一层**无条件**插着，没有回调时它只是加一个数。本来想「没人听就不插」，
+      //   但那要往 `pipeline(...)` 里展开一个数组，TS 的重载当场推不出来；为省一层
+      //   generator 去跟类型较劲不划算。
+      async function* (source) {
+        for await (const chunk of source) {
+          seen += chunk.length;
+          report?.({
+            phase: "downloading",
+            bytes: seen,
+            ...Number.isFinite(declared) && declared > 0 ? { total: declared } : {},
+            elapsedMs: Date.now() - startedAt
+          });
+          yield chunk;
+        }
+      },
       (0, import_node_fs.createWriteStream)(temporary)
     );
     const bytes = (await (0, import_promises3.stat)(temporary)).size;
@@ -1161,6 +1239,7 @@ async function downloadResource(dependencies, resource, options) {
     }
     let verified = "none";
     if (expected !== void 0) {
+      options.onProgress?.({ phase: "verifying" });
       const actual = (await blobShaOfFile(temporary)).slice(0, 12);
       if (actual !== expected) {
         throw new Error(
@@ -1308,6 +1387,7 @@ async function persistMavenEnv(credential, target = resolveTarget(), now = () =>
 var EXAMPLE_PATH = EXAMPLE_SKILLS_REPO;
 var EXAMPLE_REPO = `https://git.newlandpayment.com/${EXAMPLE_PATH}.git`;
 var PROJECT_FLAG = "-p, --project   Install into ./.agents/skills of the current directory instead";
+var DOCS_URL_FLAG = `--docs-url <url>   This run only; login picks the one paired with your PEP (default: ${DEFAULT_DOCS_URL})`;
 var REGION_FLAG = "--region <id>      Documentation region for this run only (see pep docs regions)";
 var groups = {
   auth: {
@@ -1435,7 +1515,7 @@ pep skills update will not bring the skills back. Run pep skills add to do that.
         usage: "pep docs list [flags]",
         description: "Requires a saved PEP login. Prints each document's path and description.\nPass a path from this list to pep docs get to read its Markdown content.\n\nWithout --region you get the Global English documentation. The region applies to\nthis run only and is never remembered.",
         flags: [
-          `--docs-url <url>   Documentation server; saved for later use (default: ${DEFAULT_DOCS_URL})`,
+          DOCS_URL_FLAG,
           REGION_FLAG
         ],
         examples: [
@@ -1449,7 +1529,7 @@ pep skills update will not bring the skills back. Run pep skills add to do that.
         usage: "pep docs get <path> [flags]",
         description: "Requires a saved PEP login. Use a document path returned by pep docs list.\nWrites the document's Markdown to stdout, ready to pipe or save to a file.\n\nThe path already names its region, so a path from pep docs list --region na reads\nthe North American version. Pass --region to read that same document from another\nregion instead.",
         flags: [
-          `--docs-url <url>   Documentation server; saved for later use (default: ${DEFAULT_DOCS_URL})`,
+          DOCS_URL_FLAG,
           REGION_FLAG
         ],
         examples: [
@@ -1462,7 +1542,7 @@ pep skills update will not bring the skills back. Run pep skills add to do that.
         summary: "List the documentation regions this deployment serves.",
         usage: "pep docs regions [flags]",
         description: 'Prints one region per line: id, aliases, default language, name.\nThe list comes from the documentation server, so a region added there shows up\nwithout upgrading the CLI.\n\nThis is the one docs command that needs no login: "what do I pass to --region?"\nis a question you have before signing in.',
-        flags: [`--docs-url <url>   Documentation server; saved for later use (default: ${DEFAULT_DOCS_URL})`],
+        flags: [DOCS_URL_FLAG],
         examples: ["pep docs regions"]
       }
     }
@@ -1477,7 +1557,7 @@ pep skills update will not bring the skills back. Run pep skills add to do that.
         flags: [
           `--platform <name>  Only this platform (${PLATFORMS.join(", ")})`,
           REGION_FLAG,
-          `--docs-url <url>   Documentation server; saved for later use (default: ${DEFAULT_DOCS_URL})`
+          DOCS_URL_FLAG
         ],
         examples: [
           "pep resources list",
@@ -1493,7 +1573,7 @@ pep skills update will not bring the skills back. Run pep skills add to do that.
           "--dir <path>       Directory to save into; created if missing (default: the current directory)",
           "--force            Replace an existing file of the same name",
           REGION_FLAG,
-          `--docs-url <url>   Documentation server; saved for later use (default: ${DEFAULT_DOCS_URL})`
+          DOCS_URL_FLAG
         ],
         examples: [
           "pep resources download SaleSystemDemo-4.8.0.2-win-x64.zip",
@@ -2484,8 +2564,29 @@ async function planSetup(dependencies) {
 }
 
 // src/cli.ts
-var VERSION = false ? "0.0.0-dev" : "0.9.2";
+var VERSION = false ? "0.0.0-dev" : "0.9.4";
 var SKILLS_ADD_DEPRECATION = "\u26A0 `pep skills add` will be removed in a future release.";
+function createProgressReporter(stream = process.stderr) {
+  if (!stream.isTTY) return void 0;
+  const INTERVAL_MS = 100;
+  let lastAt = 0;
+  let painted = false;
+  const paint = (line) => {
+    stream.write(`\r${" ".repeat(78)}\r${line}`);
+    painted = true;
+  };
+  return {
+    report(progress) {
+      const now = Date.now();
+      if (progress.phase === "downloading" && now - lastAt < INTERVAL_MS) return;
+      lastAt = now;
+      paint(formatProgress(progress));
+    },
+    done() {
+      if (painted) stream.write(`\r${" ".repeat(78)}\r`);
+    }
+  };
+}
 function reportUpdate(result) {
   const conflicts = () => {
     for (const { skill, owner } of result.conflicts) {
@@ -2565,14 +2666,14 @@ async function loginConfig(args, store = fileConfigStore()) {
   const explicit = repeatedOption(args, "--resource");
   const resources = explicit.length > 0 ? explicit : [...DEFAULT_RESOURCES];
   if (args.length > 0) throw new Error(`Unknown option: ${args[0]}`);
-  const saved = await store.read();
+  const paired = docsUrlForIssuer(issuer);
   return {
     version: 1,
     issuer,
     clientId,
     redirectUri: DEFAULT_REDIRECT_URI,
     resources,
-    ...saved?.docsUrl !== void 0 ? { docsUrl: saved.docsUrl } : {}
+    ...paired !== void 0 ? { docsUrl: paired } : {}
   };
 }
 function takeLoginOptions(args) {
@@ -2880,9 +2981,6 @@ ${usage(VERSION, [group])}`);
     }
     const saved = await configStore.read();
     const docsUrl = explicitDocsUrl ? normalizeDocsUrl(explicitDocsUrl) : saved?.docsUrl ?? DEFAULT_DOCS_URL;
-    if (explicitDocsUrl && saved && saved.docsUrl !== docsUrl) {
-      await configStore.write({ ...saved, docsUrl });
-    }
     if (action === "docs:regions") {
       const known = await fetchRegions({ docsUrl });
       for (const one of known.regions) {
@@ -2922,11 +3020,14 @@ ${usage(VERSION, [group])}`);
         return;
       }
       const target = pickResource(all, wantedFile);
+      const progress = createProgressReporter();
       const result = await downloadResource(dependencies, target, {
         // 默认落在**执行命令时的当前目录**，不是 CLI 装在哪儿。
         directory: intoDirectory ?? process.cwd(),
-        force
+        force,
+        ...progress ? { onProgress: progress.report } : {}
       });
+      progress?.done();
       console.error(
         result.verified === "blob-sha" ? `  ${result.bytes} bytes, content hash verified` : result.verified === "content-length" ? `  ${result.bytes} bytes, length verified (no content hash in the address)` : `  ${result.bytes} bytes \u2014 the server declared neither length nor content hash`
       );
@@ -3070,6 +3171,16 @@ ${usage(VERSION, ["skills"])}`);
 ${url}`)
     );
     console.log(`Logged in. Granted scopes: ${authorization.scopes.join(" ")}`);
+    if (config.docsUrl !== void 0) {
+      console.error(`Documentation site: ${config.docsUrl}`);
+    } else {
+      console.error(
+        `\u26A0 No documentation site is paired with this PEP.
+  docs and resources commands will use ${DEFAULT_DOCS_URL}, which checks
+  tokens against a different PEP and will answer 401. Pass --docs-url to
+  point them at the right one for this run.`
+      );
+    }
     return;
   }
   if (args.length > 0) throw new Error(`Unexpected argument: ${args[0]}`);

package/package.json

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