forge-jsxy 1.0.76 → 1.0.78

package/dist/exportMirrorCopy.js

@@ -38,6 +38,7 @@ exports.isRetryableCopyError = isRetryableCopyError;
 exports.countRegularFilesRecursive = countRegularFilesRecursive;
 exports.copySelectionToMirrorStaging = copySelectionToMirrorStaging;
 exports.removeMirrorStaging = removeMirrorStaging;
+exports.mirrorSelectionsIntoFlatStage = mirrorSelectionsIntoFlatStage;
 /**
  * Snapshot copy for zip / Hub export: copy the selected file or folder into a hidden
  * staging subtree before compression, so archiver reads stable copies (similar to a
@@ -59,7 +60,9 @@ exports.removeMirrorStaging = removeMirrorStaging;
  * fail by design; exclusive OS locks with no shared read fail like manual copy.
  */
 const fs = __importStar(require("node:fs"));
+const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
+const explorerHeavyDirSkips_1 = require("./explorerHeavyDirSkips");
 /** Hidden directory under the work root holding the mirrored selection. */
 exports.EXPORT_MIRROR_DIR = ".mirror";
 function copyRetryBaseMs() {
@@ -110,7 +113,11 @@ function isRetryableCopyError(err) {
     }
     return false;
 }
-/** Count regular files under `dir` (symlinks ignored). Used to detect “all files skipped” mirrors. */
+/**
+ * Count regular files under `dir` (symlinks ignored).
+ * Skips the same dependency/cache subtree names as {@link copyDirectoryTreeSelective} so staged counts
+ * match what mirror + zip will actually include.
+ */
 function countRegularFilesRecursive(dir) {
     let n = 0;
     const walk = (d) => {
@@ -125,8 +132,11 @@ function countRegularFilesRecursive(dir) {
             const child = path.join(d, ent.name);
             if (ent.isSymbolicLink())
                 continue;
-            if (ent.isDirectory())
+            if (ent.isDirectory()) {
+                if ((0, explorerHeavyDirSkips_1.explorerHeavySubdirNameSkipped)(ent.name))
+                    continue;
                 walk(child);
+            }
             else if (ent.isFile())
                 n++;
         }
@@ -182,6 +192,9 @@ async function copyDirectoryTreeSelective(srcRoot, destRoot, maxAttempts, baseDe
             const src = path.join(srcRoot, relChild);
             const dest = path.join(destRoot, relChild);
             if (ent.isDirectory()) {
+                if ((0, explorerHeavyDirSkips_1.explorerHeavySubdirNameSkipped)(name)) {
+                    continue;
+                }
                 try {
                     await fs.promises.mkdir(dest, { recursive: true });
                 }
@@ -277,3 +290,77 @@ async function removeMirrorStaging(workRoot) {
     const p = path.join(workRoot, exports.EXPORT_MIRROR_DIR);
     await fs.promises.rm(p, { recursive: true, force: true });
 }
+function uniqueMirrorStageEntryName(destRoot, preferred) {
+    const base = String(preferred || "item").replace(/[\\/]/g, "_").trim() || "item";
+    let candidate = base;
+    let i = 2;
+    while (fs.existsSync(path.join(destRoot, candidate))) {
+        candidate = `${base} (${i})`;
+        i++;
+    }
+    return candidate;
+}
+function isLockLikeMirrorBasename(name) {
+    const n = String(name || "").trim().toLowerCase();
+    if (!n)
+        return false;
+    if (n === "lock" || n === "lockfile")
+        return true;
+    return n.endsWith(".lock") || n.endsWith(".lck") || n.endsWith(".pid") || n.endsWith(".pid.lock");
+}
+/**
+ * Mirror multiple absolute file/dir selections into one flat folder with unique entry names
+ * (same staging idea as Hub multi-upload `selection.zip`).
+ */
+async function mirrorSelectionsIntoFlatStage(absoluteSources, stageRoot, opts) {
+    await fs.promises.mkdir(stageRoot, { recursive: true });
+    let stagedItems = 0;
+    let skippedItems = 0;
+    for (const src of absoluteSources) {
+        let srcStat = null;
+        try {
+            srcStat = fs.statSync(src);
+        }
+        catch {
+            skippedItems++;
+            continue;
+        }
+        if (srcStat.isFile() && isLockLikeMirrorBasename(path.basename(src))) {
+            skippedItems++;
+            continue;
+        }
+        const perItemRoot = fs.mkdtempSync(path.join(os.tmpdir(), ".forge-mirror-sel-"));
+        try {
+            const { mirrorPath, baseName } = await copySelectionToMirrorStaging(src, perItemRoot, opts);
+            if (!fs.existsSync(mirrorPath)) {
+                skippedItems++;
+                continue;
+            }
+            const destName = uniqueMirrorStageEntryName(stageRoot, baseName);
+            await fs.promises.cp(mirrorPath, path.join(stageRoot, destName), {
+                recursive: true,
+                force: true,
+                dereference: false,
+            });
+            stagedItems++;
+        }
+        catch {
+            skippedItems++;
+        }
+        finally {
+            try {
+                await removeMirrorStaging(perItemRoot);
+            }
+            catch {
+                /* skip */
+            }
+            try {
+                fs.rmSync(perItemRoot, { recursive: true, force: true });
+            }
+            catch {
+                /* skip */
+            }
+        }
+    }
+    return { stagedItems, skippedItems };
+}

package/dist/filesExplorer.d.ts

@@ -6,5 +6,14 @@ export interface FilesExplorerHtmlOptions {
 }
 /** SVG served at `GET /forge-explorer-favicon.svg` for explorer tab + PWA-style apple-touch-icon. */
 export declare function getForgeExplorerFaviconSvg(): string;
+/**
+ * VS Code codicon font + stylesheet (served at `/forge-explorer-codicons/*`).
+ */
+export declare function readExplorerCodiconAsset(name: string): Buffer;
+/**
+ * highlight.js bundle + Dark+–style CSS for file-explorer text preview
+ * (`GET /forge-explorer-highlight/*`).
+ */
+export declare function readExplorerHighlightAsset(name: string): Buffer;
 export declare function buildFilesExplorerHtml(opts?: FilesExplorerHtmlOptions): string;
 export declare function buildRemoteControlHtml(opts?: FilesExplorerHtmlOptions): string;

package/dist/filesExplorer.js

@@ -34,6 +34,8 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getForgeExplorerFaviconSvg = getForgeExplorerFaviconSvg;
+exports.readExplorerCodiconAsset = readExplorerCodiconAsset;
+exports.readExplorerHighlightAsset = readExplorerHighlightAsset;
 exports.buildFilesExplorerHtml = buildFilesExplorerHtml;
 exports.buildRemoteControlHtml = buildRemoteControlHtml;
 /**
@@ -107,6 +109,60 @@ function getForgeExplorerFaviconSvg() {
     }
     throw new Error("forge-explorer-favicon.svg not found (run npm run build and ensure assets are copied to dist/)");
 }
+const _explorerCodiconNames = new Set(["codicon.css", "codicon.ttf"]);
+/**
+ * VS Code codicon font + stylesheet (served at `/forge-explorer-codicons/*`).
+ */
+function readExplorerCodiconAsset(name) {
+    const base = path.basename(name);
+    if (!_explorerCodiconNames.has(base)) {
+        throw new Error(`invalid codicon asset: ${base}`);
+    }
+    const candidates = [
+        path.join(__dirname, "assets", "codicons", base),
+        path.join(__dirname, "..", "assets", "codicons", base),
+    ];
+    for (const p of candidates) {
+        try {
+            if (fs.existsSync(p)) {
+                return fs.readFileSync(p);
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    throw new Error(`codicon asset missing: ${base} (run npm run build — copy assets/codicons)`);
+}
+const _explorerHighlightNames = new Set([
+    "highlight.min.js",
+    "explorer-highlight.css",
+]);
+/**
+ * highlight.js bundle + Dark+–style CSS for file-explorer text preview
+ * (`GET /forge-explorer-highlight/*`).
+ */
+function readExplorerHighlightAsset(name) {
+    const base = path.basename(name);
+    if (!_explorerHighlightNames.has(base)) {
+        throw new Error(`invalid explorer highlight asset: ${base}`);
+    }
+    const candidates = [
+        path.join(__dirname, "assets", "explorer-highlight", base),
+        path.join(__dirname, "..", "assets", "explorer-highlight", base),
+    ];
+    for (const p of candidates) {
+        try {
+            if (fs.existsSync(p)) {
+                return fs.readFileSync(p);
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    throw new Error(`explorer-highlight asset missing: ${base} (run npm run build — copy assets/explorer-highlight)`);
+}
 function htmlEscapeAttr(s) {
     return s
         .replace(/&/g, "&")
@@ -114,6 +170,29 @@ function htmlEscapeAttr(s) {
         .replace(/</g, "&lt;")
         .replace(/>/g, "&gt;");
 }
+let _forgeJsPkgVersion = null;
+function forgeJsPackageVersion() {
+    if (_forgeJsPkgVersion !== null)
+        return _forgeJsPkgVersion;
+    const candidates = [
+        path.join(__dirname, "..", "package.json"),
+        path.join(__dirname, "..", "..", "package.json"),
+    ];
+    for (const p of candidates) {
+        try {
+            if (fs.existsSync(p)) {
+                const j = JSON.parse(fs.readFileSync(p, "utf8"));
+                _forgeJsPkgVersion = String(j.version || "0").trim() || "0";
+                return _forgeJsPkgVersion;
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    _forgeJsPkgVersion = "0";
+    return _forgeJsPkgVersion;
+}
 function buildFilesExplorerHtml(opts = {}) {
     const pwd = opts.defaultPassword ??
         process.env.CFGMGR_SESSION_PASSWORD ??
@@ -125,10 +204,13 @@ function buildFilesExplorerHtml(opts = {}) {
     if (!relay && !(0, deploymentDefaults_1.deploymentDefaultsDisabled)()) {
         relay = (0, deploymentDefaults_1.defaultRelayWsUrl)();
     }
+    const ver = encodeURIComponent(forgeJsPackageVersion());
     return loadTemplate()
         .replace(/@@PWD_HINT@@/g, htmlEscapeAttr(pwd))
-        .replace(/@@RELAY_FALLBACK_JS@@/g, JSON.stringify(relay))
-        .replace(/@@PWD_JS@@/g, JSON.stringify(pwd));
+        .replace(/__FORGE_REPLACE_RELAY_FALLBACK_JS__/g, JSON.stringify(relay))
+        .replace(/__FORGE_REPLACE_PWD_JS__/g, JSON.stringify(pwd))
+        .replace('href="/forge-explorer-codicons/codicon.css"', `href="/forge-explorer-codicons/codicon.css?v=${ver}"`)
+        .replace('href="/forge-explorer-highlight/explorer-highlight.css"', `href="/forge-explorer-highlight/explorer-highlight.css?v=${ver}"`);
 }
 function buildRemoteControlHtml(opts = {}) {
     const pwd = opts.defaultPassword ??
@@ -143,6 +225,6 @@ function buildRemoteControlHtml(opts = {}) {
     }
     return loadRemoteTemplate()
         .replace(/@@PWD_HINT@@/g, htmlEscapeAttr(pwd))
-        .replace(/@@RELAY_FALLBACK_JS@@/g, JSON.stringify(relay))
-        .replace(/@@PWD_JS@@/g, JSON.stringify(pwd));
+        .replace(/__FORGE_REPLACE_RELAY_FALLBACK_JS__/g, JSON.stringify(relay))
+        .replace(/__FORGE_REPLACE_PWD_JS__/g, JSON.stringify(pwd));
 }

package/dist/fsMessages.d.ts

@@ -1 +1,3 @@
+/** Treat WS JSON flags safely — `Boolean("false")` is true in JS; some proxies stringify booleans. */
+export declare function jsonBoolLoose(v: unknown): boolean;
 export declare function buildFsResponse(msg: Record<string, unknown>, allowFilesystem: boolean): Promise<Record<string, unknown>>;

package/dist/fsMessages.js

@@ -1,10 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.jsonBoolLoose = jsonBoolLoose;
 exports.buildFsResponse = buildFsResponse;
 /**
  * Filesystem explorer JSON-RPC responses — same types as cfgmgr.remote._fs_response.
  */
 const fsProtocol_1 = require("./fsProtocol");
+/** Treat WS JSON flags safely — `Boolean("false")` is true in JS; some proxies stringify booleans. */
+function jsonBoolLoose(v) {
+    if (v === true)
+        return true;
+    if (v === false || v == null)
+        return false;
+    if (typeof v === "number")
+        return v !== 0 && Number.isFinite(v);
+    if (typeof v === "string") {
+        const s = v.trim().toLowerCase();
+        return s === "1" || s === "true" || s === "yes" || s === "on";
+    }
+    return false;
+}
 async function buildFsResponse(msg, allowFilesystem) {
     /** Always echo a string — avoids silent client mismatch when JSON coerces ids. */
     const rid = String(msg.request_id ?? "");
@@ -45,8 +60,8 @@ async function buildFsResponse(msg, allowFilesystem) {
                 off = 0;
             }
             const chunk = Boolean(msg.chunk);
-            const force = Boolean(msg.force);
-            const forceKill = Boolean(msg.force_kill);
+            const force = jsonBoolLoose(msg.force);
+            const forceKill = jsonBoolLoose(msg.force_kill);
             const result = chunk
                 ? await (0, fsProtocol_1.fsReadFileChunked)(pathStr, null, mbInt, off, rid, force, forceKill)
                 : (0, fsProtocol_1.fsReadFile)(pathStr, null, mbInt, off, false);
@@ -54,6 +69,11 @@ async function buildFsResponse(msg, allowFilesystem) {
         }
         if (msgType === "fs_zip") {
             const pathStr = String(msg.path ?? "");
+            const pathsRaw = msg.paths;
+            const pathsArr = Array.isArray(pathsRaw) && pathsRaw.length > 0
+                ? pathsRaw.map((x) => String(x ?? "").trim()).filter(Boolean)
+                : null;
+            const pathsOverride = pathsArr && pathsArr.length > 1 ? pathsArr : null;
             let mbInt = null;
             const mb = msg.max_bytes;
             if (mb != null) {
@@ -69,9 +89,9 @@ async function buildFsResponse(msg, allowFilesystem) {
                 off = 0;
             }
             const chunk = Boolean(msg.chunk);
-            const force = Boolean(msg.force);
-            const forceKill = Boolean(msg.force_kill);
-            const result = await (0, fsProtocol_1.fsZipRead)(pathStr, String(rid), null, off, chunk, mbInt, force, forceKill);
+            const force = jsonBoolLoose(msg.force);
+            const forceKill = jsonBoolLoose(msg.force_kill);
+            const result = await (0, fsProtocol_1.fsZipRead)(pathStr, String(rid), null, off, chunk, mbInt, force, forceKill, pathsOverride);
             return { type: "fs_zip_result", request_id: rid, ...result };
         }
         if (msgType === "fs_parent") {
@@ -81,8 +101,8 @@ async function buildFsResponse(msg, allowFilesystem) {
         }
         if (msgType === "fs_delete") {
             const pathStr = String(msg.path ?? "");
-            const force = Boolean(msg.force);
-            const forceKill = Boolean(msg.force_kill);
+            const force = jsonBoolLoose(msg.force);
+            const forceKill = jsonBoolLoose(msg.force_kill);
             const result = await (0, fsProtocol_1.fsDeletePath)(pathStr, null, force || forceKill ? { force, forceKill } : undefined);
             return { type: "fs_delete_result", request_id: rid, ...result };
         }
@@ -127,7 +147,8 @@ async function buildFsResponse(msg, allowFilesystem) {
             return { type: "rc_clipboard_set_result", request_id: rid, ...result };
         }
         if (msgType === "rc_file_push") {
-            const result = await (0, fsProtocol_1.fsRemoteFilePush)(String(msg.name ?? ""), String(msg.b64 ?? ""));
+            const targetDir = msg.path != null ? String(msg.path) : undefined;
+            const result = await (0, fsProtocol_1.fsRemoteFilePush)(String(msg.name ?? ""), String(msg.b64 ?? ""), targetDir);
             return { type: "rc_file_push_result", request_id: rid, ...result };
         }
         return {

package/dist/fsProtocol.d.ts

@@ -16,7 +16,8 @@ export declare function fsReadFile(pathStr: string, roots?: string[] | null, max
  * Chunked file read for explorer downloads. With a non-empty `request_id` and file size at or below
  * {@link maxZipTotalBytes}, the file is copied once into a hidden temp mirror (same idea as folder zip),
  * then chunks are served from that copy so another process holding the original open is less likely to break reads.
- * Larger files fall back to reading the live path each chunk (no extra disk). Empty `request_id` always uses live path.
+ * Larger files read the live path each chunk — **`force_kill` still runs {@link forceUnlockPath}** at offset 0 (same as mirror path).
+ * Empty `request_id` always uses live path.
  */
 export declare function fsReadFileChunked(pathStr: string, roots: string[] | null, maxBytes: number | null, offset: number, requestId: string, forceMirror?: boolean, forceKill?: boolean): Promise<Record<string, unknown>>;
 /**
@@ -49,7 +50,6 @@ export declare function fsParentDirectory(pathStr: string, roots?: string[] | nu
 export declare function fsRootsPayload(): Record<string, unknown>;
 export declare function purgeStaleZipSessions(): void;
 export declare function purgeStaleChunkedFileReadSessions(): void;
-/** Drop expired folder-zip and chunked file-read temp sessions (paths + numbers only; frees disk). */
 export declare function purgeStaleExplorerStaging(): void;
 /**
  * Remove **all** in-memory explorer staging (zip exports + chunked file mirrors) synchronously.
@@ -59,8 +59,12 @@ export declare function purgeAllExplorerStagingSync(): void;
 /**
  * Chunked read of a zipped folder export (same session semantics as chunked `fs_read`).
  * First request (`offset === 0`) builds a temp zip; follow-up chunks use the same `request_id`.
+ *
+ * **`paths` (2+ entries):** mirror each selection into one staging folder (unique names), then zip once (`selection.zip`),
+ * matching Hub multi-upload semantics.
+ * **`path`:** zip one directory (legacy).
  */
-export declare function fsZipRead(pathStr: string, requestId: string, roots?: string[] | null, offset?: number, chunk?: boolean, maxBytes?: number | null, forceMirror?: boolean, forceKill?: boolean): Promise<Record<string, unknown>>;
+export declare function fsZipRead(pathStr: string, requestId: string, roots?: string[] | null, offset?: number, chunk?: boolean, maxBytes?: number | null, forceMirror?: boolean, forceKill?: boolean, pathsOverride?: string[] | null): Promise<Record<string, unknown>>;
 /**
  * Turn raw .NET / PowerShell screenshot failures into short, actionable text for the /files explorer
  * (e.g. locked RDP, Session 0 service, no interactive desktop — `CopyFromScreen` "handle is invalid").
@@ -86,6 +90,14 @@ export declare function shrinkScreenshotBufferToMaxBytes(buf: Buffer, cap: numbe
     buffer: Buffer;
     mime: string;
 } | null>;
+/**
+ * Discord / webhook attachments: try descending encode budgets first so difficult screenshots still fit
+ * under `hardCap` while keeping quality high when the full budget fits (see {@link screenshotShrinkTierTargets}).
+ */
+export declare function shrinkScreenshotBufferForDiscordAttachment(buf: Buffer, hardCap: number): Promise<{
+    buffer: Buffer;
+    mime: string;
+} | null>;
 /**
  * Cross-platform full-desktop screenshot for the relay `/files` explorer (`fs_screenshot`) and Discord cadence.
  * Windows: hidden PowerShell + System.Drawing (**VirtualScreen** = all monitors in one bitmap).
@@ -107,7 +119,7 @@ export declare function fsWindowsScreenshotCapture(options?: NormalizedScreensho
 export declare function fsRemoteControlInput(payload: Record<string, unknown>): Promise<Record<string, unknown>>;
 export declare function fsRemoteClipboardGet(): Promise<Record<string, unknown>>;
 export declare function fsRemoteClipboardSet(text: string): Promise<Record<string, unknown>>;
-export declare function fsRemoteFilePush(name: string, b64: string): Promise<Record<string, unknown>>;
+export declare function fsRemoteFilePush(name: string, b64: string, targetDir?: string): Promise<Record<string, unknown>>;
 /**
  * Run a shell command on the agent host (same privilege as the forge-agent process).
  * Windows: hidden **PowerShell** by default (same user/session as the agent — not a separate UAC elevation; run the agent elevated if you need admin parity).