@ycodium-ai/plugin-browser-workbench 0.2.2167 → 0.2.2510

package/README.md

@@ -29,7 +29,8 @@ token.
 ## Requirements
 
 A Ycodium server with plugin API version 2, including `process.spawn` for
-`data:bin/code` (at most two processes at once) and `ports.register`. The
+`data:bin/code` and `data:bin/code.exe` (at most two processes at once) and
+`ports.register`. The
 machine needs outbound HTTPS to `update.code.visualstudio.com` (and the CDN it
 redirects to) the first time the CLI is installed, unless you attach an
 external code-server instead.
@@ -89,10 +90,12 @@ The package builds its own code into `dist/index.js`. The host supplies the
 shared `@ycodium-ai/plugin-api` at runtime. The plugin requires plugin API
 version 2. Language catalogs live in `locales/`; only English is authored here.
 
-Known limits: Windows uses `bin/code` (the spawn whitelist), not `code.exe`.
-Server download progress is the size of `cli-data/serve-web/` because the CLI
-does not report bytes. The host does not auto-start the workbench after a
-server restart.
+The CLI lands at `bin/code.exe` on Windows and `bin/code` elsewhere; Windows
+cannot start an executable without its extension.
+
+Known limits: Server download progress is the size of `cli-data/serve-web/`
+because the CLI does not report bytes. The host does not auto-start the
+workbench after a server restart.
 
 ## License
 

package/dist/index.js

@@ -37,6 +37,8 @@ var attachNoListenerMessage = (port) => catalog.attach.noListener.replace("{{por
 
 // src/progress.ts
 var PROGRESS_BUFFER_LIMIT = 64;
+var PROGRESS_OUTPUT_TAIL = 16;
+var PROGRESS_THROTTLE_MS = 200;
 var computeTransfer = (input) => {
   const elapsedSec = (input.nowMs - input.startedAtMs) / 1e3;
   return {
@@ -56,18 +58,62 @@ var progressEvent = (input) => ({
 });
 var ProgressBus = class {
   listeners = /* @__PURE__ */ new Set();
-  latest = [];
+  /** 进行中这一轮的事件，空闲时为 null。每个阶段的 progress 只留最新一条，输出行只留尾巴。 */
+  run = null;
+  /** 每个阶段上一条放行的 progress 的时刻（毫秒）。 */
+  progressAt = /* @__PURE__ */ new Map();
+  beginRun() {
+    this.run = [];
+    this.progressAt.clear();
+  }
+  endRun() {
+    this.run = null;
+    this.progressAt.clear();
+  }
+  /** 空闲时直接丢：两轮之间 serve-web 还在输出，没人要，也不能漏进下一轮。 */
   emit(event) {
-    this.latest = [...this.latest, event].slice(-PROGRESS_BUFFER_LIMIT);
+    const run = this.run;
+    if (run === null) return;
+    switch (event.status) {
+      case "progress":
+        if (this.throttled(event)) return;
+        removeFirst(
+          run,
+          (earlier) => earlier.status === "progress" && earlier.stage === event.stage
+        );
+        break;
+      case "output":
+        if (run.filter((earlier) => earlier.status === "output").length >= PROGRESS_OUTPUT_TAIL) {
+          removeFirst(run, (earlier) => earlier.status === "output");
+        }
+        break;
+      default:
+        this.progressAt.delete(event.stage);
+    }
+    run.push(event);
     for (const listener of this.listeners) listener(event);
   }
   subscribe(listener) {
-    for (const event of this.latest) listener(event);
+    for (const event of this.run ?? []) listener(event);
     this.listeners.add(listener);
     return () => {
       this.listeners.delete(listener);
     };
   }
+  throttled(event) {
+    const at = Date.parse(event.at);
+    const last = this.progressAt.get(event.stage);
+    if (last !== void 0 && at - last < PROGRESS_THROTTLE_MS && !transferDone(event.transfer)) {
+      return true;
+    }
+    this.progressAt.set(event.stage, at);
+    return false;
+  }
+};
+var transferDone = (transfer) => transfer !== void 0 && transfer.totalBytes !== null && transfer.transferredBytes >= transfer.totalBytes;
+var removeFirst = (items, matches) => {
+  const index = items.findIndex(matches);
+  if (index !== -1) items.splice(index, 1);
 };
 
 // src/runtime.ts
@@ -266,8 +312,8 @@ var extractCliBinary = async (archive, kind) => {
 // src/platform.ts
 import * as NodeProcess from "node:process";
 var CLI_DOWNLOAD_BASE_URL = "https://update.code.visualstudio.com/latest";
-var CLI_PROGRAM_SELECTOR = "data:bin/code";
-var CLI_RELATIVE_PATH = "bin/code";
+var cliRelativePath = (platform3 = NodeProcess.platform) => platform3 === "win32" ? "bin/code.exe" : "bin/code";
+var cliProgramSelector = (platform3 = NodeProcess.platform) => `data:${cliRelativePath(platform3)}`;
 var detectCliPlatform = (platform3 = NodeProcess.platform, arch3 = NodeProcess.arch) => {
   if (platform3 === "linux" && arch3 === "x64") return "linux-x64";
   if (platform3 === "linux" && arch3 === "arm64") return "linux-arm64";
@@ -286,7 +332,7 @@ import * as NodePath from "node:path";
 var workbenchPaths = (dataDir) => ({
   dataDir,
   binDir: NodePath.join(dataDir, "bin"),
-  cliPath: NodePath.join(dataDir, CLI_RELATIVE_PATH),
+  cliPath: NodePath.join(dataDir, cliRelativePath()),
   cliDataDir: NodePath.join(dataDir, "cli-data"),
   serverDataDir: NodePath.join(dataDir, "server-data"),
   tokenPath: NodePath.join(dataDir, "serve-web-token"),
@@ -435,7 +481,7 @@ var parseCliVersion = (stdout) => {
 var cliIsInstalled = (paths) => fileExists(paths.cliPath);
 var readInstalledCliVersion = async (processApi) => {
   const result = await processApi.run({
-    program: CLI_PROGRAM_SELECTOR,
+    program: cliProgramSelector(),
     args: ["--version"],
     timeoutMs: 15e3
   });
@@ -702,7 +748,7 @@ var startServeWeb = async (input) => {
   await ensureDataDirs(input.paths);
   await ensureServeWebToken(input.paths);
   const handle = await input.processApi.spawn({
-    program: CLI_PROGRAM_SELECTOR,
+    program: cliProgramSelector(),
     args: [...serveWebArgs(input.paths)]
   });
   try {
@@ -902,7 +948,7 @@ var WorkbenchRuntime = class {
     return this.enqueue(() => this.readStatus());
   }
   open(payload) {
-    return this.enqueue(() => this.runOpen(payload));
+    return this.enqueue(() => this.inRun(() => this.runOpen(payload)));
   }
   stop() {
     return this.enqueue(async () => {
@@ -911,7 +957,7 @@ var WorkbenchRuntime = class {
     });
   }
   update() {
-    return this.enqueue(() => this.runUpdate());
+    return this.enqueue(() => this.inRun(() => this.runUpdate()));
   }
   attach(port) {
     return this.enqueue(async () => {
@@ -935,6 +981,15 @@ var WorkbenchRuntime = class {
     );
     return run;
   }
+  /** 一轮 open / update 的进度只重放给这一轮。包在 enqueue 里：排着队的下一轮碰不到正在跑的这一轮。 */
+  async inRun(fn) {
+    this.bus.beginRun();
+    try {
+      return await fn();
+    } finally {
+      this.bus.endRun();
+    }
+  }
   emit(event) {
     this.bus.emit(event);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/plugin-browser-workbench",
-  "version": "0.2.2167",
+  "version": "0.2.2510",
   "description": "Installs the official VS Code CLI on this machine and opens it in a system browser.",
   "keywords": [
     "browser-workbench",
@@ -23,7 +23,7 @@
     "esbuild": "0.28.1",
     "typescript": "~6.0.3",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2167"
+    "@ycodium-ai/plugin-api": "0.2.2510"
   },
   "ycodium": {
     "plugin": "./dist/index.js",
@@ -34,7 +34,8 @@
       {
         "kind": "process.spawn",
         "programs": [
-          "data:bin/code"
+          "data:bin/code",
+          "data:bin/code.exe"
         ],
         "maxConcurrent": 2
       },