forge-jsxy 1.0.76 → 1.0.77

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").
@@ -107,7 +111,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).