fvtt-world-cli 1.1.1 → 1.2.0

package/dist/index.js

@@ -10,7 +10,7 @@ import { readFileSync as readFileSync2 } from "node:fs";
 import { createHash as createHash2, randomBytes as randomBytes2, randomUUID as randomUUID2, timingSafeEqual } from "node:crypto";
 
 // ../protocol/src/constants.js
-var PROTOCOL_VERSION = "1.1.1";
+var PROTOCOL_VERSION = "1.2.0";
 var PROTOCOL_COMPONENTS = Object.freeze({
   MODULE: "module",
   CLI_DAEMON: "cli-daemon",
@@ -174,6 +174,7 @@ var ERROR_CODES = Object.freeze({
   TILE_NOT_FOUND: "TILE_NOT_FOUND",
   SOUND_NOT_FOUND: "SOUND_NOT_FOUND",
   WALL_NOT_FOUND: "WALL_NOT_FOUND",
+  LEVEL_NOT_FOUND: "LEVEL_NOT_FOUND",
   NOTE_NOT_FOUND: "NOTE_NOT_FOUND",
   DRAWING_NOT_FOUND: "DRAWING_NOT_FOUND",
   LIGHT_NOT_FOUND: "LIGHT_NOT_FOUND",
@@ -228,7 +229,8 @@ var ERROR_CODES = Object.freeze({
   APPROVAL_TIMEOUT: "APPROVAL_TIMEOUT",
   APPROVAL_CANCELLED: "APPROVAL_CANCELLED",
   APPROVAL_QUEUE_FULL: "APPROVAL_QUEUE_FULL",
-  APPROVAL_UNKNOWN: "APPROVAL_UNKNOWN"
+  APPROVAL_UNKNOWN: "APPROVAL_UNKNOWN",
+  APPROVAL_STALE: "APPROVAL_STALE"
 });
 
 // ../protocol/src/schemas/shared.js
@@ -298,7 +300,7 @@ var includeProperty = {
 var actorIncludeProperty = {
   include: {
     type: "array",
-    items: { type: "string", enum: ["flags", "effects", "items.flags", "items.effects", "prepared"] }
+    items: { type: "string", enum: ["flags", "effects", "items", "items.flags", "items.effects", "prepared"] }
   }
 };
 var batchIdsProperty = {
@@ -3152,6 +3154,68 @@ var executableBehaviorPatchSchema = {
   additionalProperties: true,
   minProperties: 1
 };
+var nullableNumberSchema = { type: ["number", "null"] };
+var levelImageProperties = {
+  src: nullableStringSchema,
+  tint: { type: "string", minLength: 1 },
+  alphaThreshold: { type: "number" }
+};
+var levelCreateSchema = {
+  type: "object",
+  required: ["name"],
+  properties: {
+    name: { type: "string", minLength: 1 },
+    elevation: {
+      type: "object",
+      required: [],
+      properties: { bottom: nullableNumberSchema, top: nullableNumberSchema },
+      additionalProperties: false
+    },
+    background: {
+      type: "object",
+      required: [],
+      properties: { color: { type: "string", minLength: 1 }, ...levelImageProperties },
+      additionalProperties: false
+    },
+    foreground: {
+      type: "object",
+      required: [],
+      properties: levelImageProperties,
+      additionalProperties: false
+    },
+    fog: {
+      type: "object",
+      required: [],
+      properties: { src: nullableStringSchema },
+      additionalProperties: false
+    },
+    textures: {
+      type: "object",
+      required: [],
+      properties: {
+        anchorX: { type: "number" },
+        anchorY: { type: "number" },
+        offsetX: { type: "integer" },
+        offsetY: { type: "integer" },
+        fit: { type: "string", minLength: 1 },
+        scaleX: { type: "number" },
+        scaleY: { type: "number" },
+        rotation: { type: "number" }
+      },
+      additionalProperties: false
+    },
+    visibility: {
+      type: "object",
+      required: [],
+      properties: { levels: { type: "array", items: { type: "string", minLength: 1 } } },
+      additionalProperties: false
+    },
+    sort: { type: "integer" },
+    flags: freeformObjectSchema
+  },
+  additionalProperties: false
+};
+var levelPatchSchema = patchFrom(levelCreateSchema);
 var sceneEmbeddedCommands = {
   "scene.token.list": cmd({
     type: "object",
@@ -3743,6 +3807,85 @@ var sceneEmbeddedCommands = {
     createSchema: wallCreateSchema,
     patchSchema: wallPatchSchema
   }),
+  "scene.level.list": cmd({
+    type: "object",
+    required: ["sceneId"],
+    properties: {
+      sceneId: { type: "string", minLength: 1 },
+      ...paginationProperties
+    },
+    additionalProperties: false
+  }),
+  "scene.level.get": cmd({
+    type: "object",
+    required: ["sceneId", "levelId"],
+    properties: {
+      sceneId: { type: "string", minLength: 1 },
+      levelId: { type: "string", minLength: 1 }
+    },
+    additionalProperties: false
+  }),
+  "scene.level.create": cmd(
+    {
+      type: "object",
+      required: ["sceneId", "data"],
+      properties: {
+        sceneId: { type: "string", minLength: 1 },
+        data: levelCreateSchema,
+        ...dryRunProperty,
+        ...idempotencyKeyProperty
+      },
+      additionalProperties: false
+    },
+    { mutation: true }
+  ),
+  "scene.level.update": cmd(
+    {
+      type: "object",
+      required: ["sceneId", "levelId", "patch"],
+      properties: {
+        sceneId: { type: "string", minLength: 1 },
+        levelId: { type: "string", minLength: 1 },
+        patch: levelPatchSchema,
+        ...dryRunProperty
+      },
+      additionalProperties: false
+    },
+    { mutation: true }
+  ),
+  "scene.level.delete": cmd(
+    {
+      type: "object",
+      required: ["sceneId", "levelId"],
+      properties: {
+        sceneId: { type: "string", minLength: 1 },
+        levelId: { type: "string", minLength: 1 },
+        ...dryRunProperty
+      },
+      additionalProperties: false
+    },
+    { mutation: true }
+  ),
+  "scene.level.clone": cmd(
+    {
+      type: "object",
+      required: ["sceneId", "levelId"],
+      properties: {
+        sceneId: { type: "string", minLength: 1 },
+        levelId: { type: "string", minLength: 1 },
+        patch: levelPatchSchema,
+        ...dryRunProperty,
+        ...idempotencyKeyProperty
+      },
+      additionalProperties: false
+    },
+    { mutation: true }
+  ),
+  ...batchWriteCommands("scene.level", {
+    scopeProperties: sceneScopeProperties,
+    createSchema: levelCreateSchema,
+    patchSchema: levelPatchSchema
+  }),
   "scene.note.list": cmd({
     type: "object",
     required: ["sceneId"],
@@ -4287,6 +4430,10 @@ var sceneBackgroundSchema = {
     scaleX: { type: "number" },
     scaleY: { type: "number" },
     rotation: { type: "number" },
+    anchorX: { type: "number" },
+    anchorY: { type: "number" },
+    fit: { type: "string", minLength: 1 },
+    alphaThreshold: { type: "number" },
     tint: { type: "string", minLength: 1 }
   },
   additionalProperties: false,
@@ -4298,15 +4445,12 @@ var sceneGridSchema = {
   properties: {
     type: { type: "number" },
     size: { type: "number" },
-    sizeX: { type: "number" },
-    sizeY: { type: "number" },
     distance: { type: "number" },
     units: { type: "string" },
     style: { type: "string" },
     thickness: { type: "number" },
     color: { type: "string", minLength: 1 },
-    alpha: { type: "number" },
-    diagonals: { type: "number" }
+    alpha: { type: "number" }
   },
   additionalProperties: false,
   minProperties: 1
@@ -4316,6 +4460,7 @@ var sceneCreateSchema = {
   required: ["name"],
   properties: {
     name: { type: "string", minLength: 1 },
+    folder: nullableStringSchema,
     active: { type: "boolean" },
     navigation: { type: "boolean" },
     navOrder: { type: "number" },
@@ -4332,7 +4477,7 @@ var sceneCreateSchema = {
     navName: nullableStringSchema,
     thumb: nullableStringSchema,
     sort: { type: "number" },
-    initialLevel: nullableStringSchema,
+    levels: { type: "array", minItems: 1, items: levelCreateSchema },
     playlist: nullableStringSchema,
     playlistSound: nullableStringSchema,
     journal: nullableStringSchema,
@@ -4347,7 +4492,10 @@ var sceneCreateSchema = {
   },
   additionalProperties: false
 };
-var scenePatchSchema = patchFrom(sceneCreateSchema);
+var scenePatchSchema = patchFrom(sceneCreateSchema, {
+  omit: ["levels"],
+  prepend: { initialLevel: nullableStringSchema }
+});
 var sceneCommands = {
   "scene.list": cmd(nameFilteredListSchema),
   "scene.get": cmd(sceneIdSchema),
@@ -4560,7 +4708,14 @@ var settingCommands = {
 // ../protocol/src/schemas/system.js
 var systemCommands = {
   "system.ping": cmd(emptyObjectSchema),
-  "system.info": cmd(emptyObjectSchema),
+  "system.info": cmd({
+    type: "object",
+    required: [],
+    properties: {
+      include: { type: "array", items: { type: "string", enum: ["modules"] } }
+    },
+    additionalProperties: false
+  }),
   "system.reload": cmd(emptyObjectSchema)
 };
 
@@ -5256,6 +5411,15 @@ var DEFAULT_COMMAND_PROFILE = deepFreeze({
   "scene.wall.create-many": "allow",
   "scene.wall.update-many": "allow",
   "scene.wall.delete-many": "approve",
+  "scene.level.list": "allow",
+  "scene.level.get": "allow",
+  "scene.level.create": "allow",
+  "scene.level.update": "allow",
+  "scene.level.delete": "approve",
+  "scene.level.clone": "allow",
+  "scene.level.create-many": "allow",
+  "scene.level.update-many": "allow",
+  "scene.level.delete-many": "approve",
   "scene.note.list": "allow",
   "scene.note.get": "allow",
   "scene.note.create": "allow",
@@ -6118,11 +6282,22 @@ function createCliConfigStore(configPath = getDefaultCliConfigPath()) {
     }
   };
 }
-function mergePersistedCliConfig(existingConfig, updates) {
-  return PersistedCliConfigSchema.parse({
-    ...existingConfig ?? createEmptyConfig(),
-    ...updates
-  });
+var DAEMON_OWNED_CONFIG_KEYS = ["version", "daemonUrl", "deviceCredential", "pairings"];
+function withDaemonOwnedKeys(config, owner) {
+  const merged = { ...config };
+  for (const key of DAEMON_OWNED_CONFIG_KEYS) {
+    if (owner[key] === void 0) delete merged[key];
+    else merged[key] = owner[key];
+  }
+  return merged;
+}
+function writeCliConfigUpdate(configStore, updates) {
+  configStore.writeConfig(
+    PersistedCliConfigSchema.parse({
+      ...configStore.readConfig() ?? createEmptyConfig(),
+      ...updates
+    })
+  );
 }
 function resolveRemoteCommandConfig({
   flagDaemonUrl,
@@ -6168,8 +6343,8 @@ function readPendingApprovalDetails(envelope) {
 var DaemonTransportError = class extends Error {
   code;
   details;
-  constructor(code, message, details) {
-    super(message);
+  constructor(code, message, details, options) {
+    super(message, options);
     this.name = "DaemonTransportError";
     this.code = code;
     this.details = details;
@@ -6614,7 +6789,7 @@ var BridgeSessionStore = class {
         ok: false,
         error: createProtocolError({
           code: ERROR_CODES.UNKNOWN_COMMAND,
-          message: `Bridge session does not advertise support for ${request.command}; run system.info to see the connected bridge's supported command inventory (the module may be older than this CLI)`,
+          message: `Bridge session does not advertise support for ${request.command}; details.supportedCommands lists the commands the connected bridge advertised, and \`fvtt-world-cli auth status\` reports them without the internal approval and policy commands; the Foundry module may be older than this CLI, or the GM page may need a reload`,
           details: {
             command: request.command,
             supportedCommands: this.activeSession.commands
@@ -7160,11 +7335,9 @@ var BridgeDaemon = class {
   }
   persistConfig() {
     if (!this.configStore) return;
-    const persisted = this.configStore.readConfig();
-    this.config = PersistedCliConfigSchema.parse({
-      ...this.config,
-      ...persisted?.uploadLimitBytes === void 0 ? {} : { uploadLimitBytes: persisted.uploadLimitBytes }
-    });
+    this.config = PersistedCliConfigSchema.parse(
+      withDaemonOwnedKeys(this.configStore.readConfig() ?? this.config, this.config)
+    );
     this.configStore.writeConfig(this.config);
   }
   handlePairingRequest(socket, state, message) {
@@ -7971,23 +8144,35 @@ async function connectDaemonClient({
       socket.send(JSON.stringify(createClientHello({ credential: deviceCredential ?? "" })));
     });
     socket.once("message", (data) => {
-      const parsed = parseBridgeMessage(normalizeIncomingData(data));
-      const skew = parsed.ok ? protocolVersionSkewError(parsed.value) : null;
-      if (skew) {
+      const decoded = decodeTransportFrame(data);
+      if (!decoded.ok) {
+        clearTimeout(timer);
+        reject(decoded.error);
+        socket.close();
+        return;
+      }
+      const message = decoded.value;
+      if (message.type !== MESSAGE_TYPES.CLIENT_HELLO_ACK) {
         clearTimeout(timer);
-        reject(skew);
+        reject(
+          new DaemonTransportError(
+            ERROR_CODES.INVALID_MESSAGE,
+            "Daemon returned an unexpected message type",
+            {
+              reason: "unexpected_type"
+            }
+          )
+        );
         socket.close();
         return;
       }
-      const validation = parsed.ok ? validateTransportMessage(parsed.value) : { ok: false };
-      const message = parsed.ok && validation.ok ? parsed.value : null;
-      if (!message || message.type !== MESSAGE_TYPES.CLIENT_HELLO_ACK || !message.ok) {
+      if (!message.ok) {
         clearTimeout(timer);
         reject(
           new DaemonTransportError(
-            message?.error?.code ?? ERROR_CODES.UNAUTHORIZED,
-            message?.error?.message ?? "Daemon rejected client authentication",
-            message?.error?.details
+            message.error?.code ?? ERROR_CODES.UNAUTHORIZED,
+            message.error?.message ?? "Daemon rejected client authentication",
+            message.error?.details
           )
         );
         socket.close();
@@ -8002,7 +8187,8 @@ async function connectDaemonClient({
         new DaemonTransportError(
           ERROR_CODES.DAEMON_UNAVAILABLE,
           error instanceof Error ? error.message : String(error),
-          { reason: "connect_error" }
+          { reason: "connect_error" },
+          { cause: error }
         )
       );
     });
@@ -8522,23 +8708,21 @@ function parseCsvList(value, label) {
   }
   return items;
 }
-var INCLUDE_ALLOWED = ["flags", "effects"];
-function parseIncludeFields(value) {
+function parseAllowedIncludeFields(value, allowed) {
   const fields = value.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
   if (fields.length === 0) {
-    throw new InvalidArgumentError(
-      `--include must name at least one field (allowed: ${INCLUDE_ALLOWED.join(", ")})`
-    );
+    throw new InvalidArgumentError(`--include must name at least one field (allowed: ${allowed.join(", ")})`);
   }
   for (const field of fields) {
-    if (!INCLUDE_ALLOWED.includes(field)) {
-      throw new InvalidArgumentError(
-        `--include only supports ${INCLUDE_ALLOWED.join(", ")}, received ${field}`
-      );
+    if (!allowed.includes(field)) {
+      throw new InvalidArgumentError(`--include only supports ${allowed.join(", ")}, received ${field}`);
     }
   }
   return fields;
 }
+function parseIncludeFields(value) {
+  return parseAllowedIncludeFields(value, ["flags", "effects"]);
+}
 var OWNERSHIP_LEVELS = [-1, 0, 1, 2, 3];
 var INTEGER_PATTERN = /^-?\d+$/;
 function parseOwnershipLevel(value) {
@@ -8638,56 +8822,24 @@ function parseWhisperIds(value) {
   }
   return ids;
 }
-var ACTOR_INCLUDE_ALLOWED = ["flags", "effects", "items.flags", "items.effects", "prepared"];
 function parseActorIncludeFields(value) {
-  const fields = value.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
-  if (fields.length === 0) {
-    throw new InvalidArgumentError(
-      `--include must name at least one field (allowed: ${ACTOR_INCLUDE_ALLOWED.join(", ")})`
-    );
-  }
-  for (const field of fields) {
-    if (!ACTOR_INCLUDE_ALLOWED.includes(field)) {
-      throw new InvalidArgumentError(
-        `--include only supports ${ACTOR_INCLUDE_ALLOWED.join(", ")}, received ${field}`
-      );
-    }
-  }
-  return fields;
+  return parseAllowedIncludeFields(value, [
+    "flags",
+    "effects",
+    "items",
+    "items.flags",
+    "items.effects",
+    "prepared"
+  ]);
 }
-var TOKEN_INCLUDE_ALLOWED = ["prepared"];
 function parseTokenIncludeFields(value) {
-  const fields = value.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
-  if (fields.length === 0) {
-    throw new InvalidArgumentError(
-      `--include must name at least one field (allowed: ${TOKEN_INCLUDE_ALLOWED.join(", ")})`
-    );
-  }
-  for (const field of fields) {
-    if (!TOKEN_INCLUDE_ALLOWED.includes(field)) {
-      throw new InvalidArgumentError(
-        `--include only supports ${TOKEN_INCLUDE_ALLOWED.join(", ")}, received ${field}`
-      );
-    }
-  }
-  return fields;
+  return parseAllowedIncludeFields(value, ["prepared"]);
+}
+function parseSystemInfoIncludeFields(value) {
+  return parseAllowedIncludeFields(value, ["modules"]);
 }
-var COMPENDIUM_INCLUDE_ALLOWED = ["effects"];
 function parseCompendiumIncludeFields(value) {
-  const fields = value.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
-  if (fields.length === 0) {
-    throw new InvalidArgumentError(
-      `--include must name at least one field (allowed: ${COMPENDIUM_INCLUDE_ALLOWED.join(", ")})`
-    );
-  }
-  for (const field of fields) {
-    if (!COMPENDIUM_INCLUDE_ALLOWED.includes(field)) {
-      throw new InvalidArgumentError(
-        `--include only supports ${COMPENDIUM_INCLUDE_ALLOWED.join(", ")}, received ${field}`
-      );
-    }
-  }
-  return fields;
+  return parseAllowedIncludeFields(value, ["effects"]);
 }
 function parseCompendiumFieldsList(value) {
   return value.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
@@ -8785,44 +8937,10 @@ function createItemUpdateParams(options) {
     ...options.include ? { include: options.include } : {}
   };
 }
-function createSceneUpdateParams(options) {
-  return {
-    sceneId: options.sceneId,
-    patch: assertNonEmptyPatch({
-      ...stringField("name", options.name),
-      ...booleanField("active", options.active),
-      ...booleanField("navigation", options.navigation),
-      ...numberField("navOrder", options.navOrder),
-      ...numberField("width", options.width),
-      ...numberField("height", options.height),
-      ...jsonObjectField("grid", options.gridJson, "--grid-json"),
-      ...jsonObjectField("background", options.backgroundJson, "--background-json"),
-      ...booleanField("tokenVision", options.tokenVision),
-      ...truthyStringField("weather", options.weather),
-      ...numberField("padding", options.padding),
-      ...numberField("shiftX", options.shiftX),
-      ...numberField("shiftY", options.shiftY),
-      ...truthyStringField("navName", options.navName),
-      ...truthyStringField("thumb", options.thumb),
-      ...truthyStringField("foreground", options.foreground),
-      ...numberField("foregroundElevation", options.foregroundElevation),
-      ...numberField("sort", options.sort),
-      ...truthyStringField("initialLevel", options.initialLevel),
-      ...truthyStringField("playlist", options.playlist),
-      ...truthyStringField("playlistSound", options.playlistSound),
-      ...truthyStringField("journal", options.journal),
-      ...truthyStringField("journalEntryPage", options.journalEntryPage),
-      ...jsonObjectField("environment", options.environmentJson, "--environment-json"),
-      ...jsonObjectField("fog", options.fogJson, "--fog-json"),
-      ...jsonObjectField("initial", options.initialJson, "--initial-json"),
-      ...jsonObjectField("transition", options.transitionJson, "--transition-json"),
-      ...optionalJsonObject(options.patchJson, "--patch-json") ?? {}
-    })
-  };
-}
 function buildScenePatch(options) {
   return {
     ...stringField("name", options.name),
+    ...folderField(options),
     ...booleanField("active", options.active),
     ...booleanField("navigation", options.navigation),
     ...numberField("navOrder", options.navOrder),
@@ -8851,6 +8969,15 @@ function buildScenePatch(options) {
     ...jsonObjectField("transition", options.transitionJson, "--transition-json")
   };
 }
+function createSceneUpdateParams(options) {
+  return {
+    sceneId: options.sceneId,
+    patch: assertNonEmptyPatch({
+      ...buildScenePatch(options),
+      ...optionalJsonObject(options.patchJson, "--patch-json") ?? {}
+    })
+  };
+}
 function createSceneCreateParams(options) {
   return {
     data: {
@@ -9656,6 +9783,23 @@ function createSceneWallCloneParams(options) {
     ...optionalPatch(optionalJsonObject(options.patchJson, "--patch-json") ?? {})
   };
 }
+function createSceneLevelCreateParams(options) {
+  return { sceneId: options.sceneId, data: optionalJsonObject(options.dataJson, "--data-json") ?? {} };
+}
+function createSceneLevelUpdateParams(options) {
+  return {
+    sceneId: options.sceneId,
+    levelId: options.levelId,
+    patch: assertNonEmptyPatch(optionalJsonObject(options.patchJson, "--patch-json") ?? {})
+  };
+}
+function createSceneLevelCloneParams(options) {
+  return {
+    sceneId: options.sceneId,
+    levelId: options.levelId,
+    ...optionalPatch(optionalJsonObject(options.patchJson, "--patch-json") ?? {})
+  };
+}
 function createSceneNoteCreateParams(options) {
   return { sceneId: options.sceneId, data: optionalJsonObject(options.dataJson, "--data-json") ?? {} };
 }
@@ -10368,7 +10512,7 @@ function renderActorDetails(actor) {
   if (actor && Object.hasOwn(actor, "prepared")) {
     lines.push(`prepared: ${Object.keys(actor.prepared ?? {}).join(", ")} (use --json for values)`);
   }
-  lines.push(`items: ${items.length}`);
+  lines.push(`items: ${actor?.itemCount ?? items.length}`);
   items.forEach((item) => {
     lines.push(`item: ${renderItemSummaryLine(item)}`);
   });
@@ -11127,16 +11271,23 @@ function renderSceneDetails(scene) {
   const lines = [
     `id: ${scene?.id}`,
     `name: ${scene?.name}`,
+    `folder: ${scene?.folder ?? ""}`,
     `active: ${String(Boolean(scene?.active))}`,
     `navigation: ${String(Boolean(scene?.navigation))}`,
     `nav order: ${scene?.navOrder ?? 0}`,
     `size: ${scene?.width}x${scene?.height}`,
     `grid: ${JSON.stringify(scene?.grid ?? null)}`,
-    `background: ${JSON.stringify(scene?.background ?? null)}`,
+    ...scene && Object.hasOwn(scene, "background") ? [`background: ${JSON.stringify(scene.background ?? null)}`] : [],
     `token vision: ${String(Boolean(scene?.tokenVision))}`,
     `weather: ${scene?.weather ?? ""}`,
     `playlist: ${scene?.playlist ?? ""}`
   ];
+  if (scene && Object.hasOwn(scene, "initialLevel")) {
+    lines.push(`initial level: ${scene.initialLevel ?? "(first level)"}`);
+  }
+  for (const level of Array.isArray(scene?.levels) ? scene.levels : []) {
+    lines.push(`level: ${renderLevelRow(level)}`);
+  }
   lines.push(...renderCompendiumSourceLines(scene));
   if (scene && Object.hasOwn(scene, "ownership")) {
     lines.push(...renderOwnershipLines(scene.ownership));
@@ -11148,6 +11299,20 @@ function renderSceneDetails(scene) {
   }
   return lines.join("\n");
 }
+function levelMembership(placeable) {
+  if (placeable && Object.hasOwn(placeable, "level")) return ["level", String(placeable.level)];
+  if (placeable && Object.hasOwn(placeable, "levels"))
+    return ["levels", placeable.levels.join(",") || "(all)"];
+  return null;
+}
+function levelMembershipLines(placeable) {
+  const membership = levelMembership(placeable);
+  return membership ? [`${membership[0]}: ${membership[1]}`] : [];
+}
+function levelMembershipCell(placeable) {
+  const membership = levelMembership(placeable);
+  return membership ? `	${membership[0]}=${membership[1]}` : "";
+}
 function renderTokenDetails(sceneId, token) {
   const lines = [
     `scene: ${sceneId}`,
@@ -11157,6 +11322,7 @@ function renderTokenDetails(sceneId, token) {
     `actorLink: ${String(Boolean(token?.actorLink))}`,
     `position: (${token?.x ?? 0}, ${token?.y ?? 0})`,
     `elevation: ${token?.elevation ?? 0}`,
+    ...levelMembershipLines(token),
     `rotation: ${token?.rotation ?? 0}`,
     `hidden: ${String(Boolean(token?.hidden))}`,
     `disposition: ${token?.disposition ?? ""}`,
@@ -11205,6 +11371,7 @@ function renderTileDetails(sceneId, tile) {
     `size: ${tile?.width}x${tile?.height}`,
     `rotation: ${tile?.rotation ?? 0}`,
     `elevation: ${tile?.elevation ?? 0}`,
+    ...levelMembershipLines(tile),
     `sort: ${tile?.sort ?? 0}`,
     `hidden: ${String(Boolean(tile?.hidden))}`,
     `locked: ${String(Boolean(tile?.locked))}`,
@@ -11218,6 +11385,7 @@ function renderSoundDetails(sceneId, sound) {
     `path: ${sound?.path ?? ""}`,
     `position: (${sound?.x ?? 0}, ${sound?.y ?? 0})`,
     `radius: ${sound?.radius ?? 0}`,
+    ...levelMembershipLines(sound),
     `volume: ${sound?.volume ?? ""}`,
     `walls: ${String(Boolean(sound?.walls))}`,
     `easing: ${String(Boolean(sound?.easing))}`,
@@ -11225,11 +11393,30 @@ function renderSoundDetails(sceneId, sound) {
     `hidden: ${String(Boolean(sound?.hidden))}`
   ].join("\n");
 }
+function renderLevelRow(level) {
+  const elevation = level?.elevation ?? {};
+  return `${level?.id}	${level?.name ?? ""}	elevation=${elevation.bottom ?? "-inf"}..${elevation.top ?? "+inf"}	sort=${level?.sort ?? 0}`;
+}
+function renderLevelDetails(sceneId, level) {
+  return [
+    `scene: ${sceneId}`,
+    `id: ${level?.id}`,
+    `name: ${level?.name ?? ""}`,
+    `elevation: ${JSON.stringify(level?.elevation ?? null)}`,
+    `sort: ${level?.sort ?? 0}`,
+    `background: ${JSON.stringify(level?.background ?? null)}`,
+    `foreground: ${JSON.stringify(level?.foreground ?? null)}`,
+    `fog: ${JSON.stringify(level?.fog ?? null)}`,
+    `textures: ${JSON.stringify(level?.textures ?? null)}`,
+    `visibility: ${JSON.stringify(level?.visibility ?? null)}`
+  ].join("\n");
+}
 function renderWallDetails(sceneId, wall) {
   return [
     `scene: ${sceneId}`,
     `id: ${wall?.id}`,
     `c: ${JSON.stringify(wall?.c ?? null)}`,
+    ...levelMembershipLines(wall),
     `door: ${wall?.door ?? 0}`,
     `ds: ${wall?.ds ?? 0}`,
     `doorSound: ${wall?.doorSound ?? ""}`,
@@ -11252,6 +11439,7 @@ function renderNoteDetails(sceneId, note) {
     `texture: ${JSON.stringify(note?.texture ?? null)}`,
     `iconSize: ${note?.iconSize ?? ""}`,
     `elevation: ${note?.elevation ?? 0}`,
+    ...levelMembershipLines(note),
     `sort: ${note?.sort ?? 0}`,
     `global: ${String(Boolean(note?.global))}`
   ].join("\n");
@@ -11267,6 +11455,7 @@ function renderDrawingDetails(sceneId, drawing) {
     `shape: ${JSON.stringify(drawing?.shape ?? null)}`,
     `rotation: ${drawing?.rotation ?? 0}`,
     `elevation: ${drawing?.elevation ?? 0}`,
+    ...levelMembershipLines(drawing),
     `sort: ${drawing?.sort ?? 0}`,
     `fillColor: ${drawing?.fillColor ?? ""}`,
     `strokeColor: ${drawing?.strokeColor ?? ""}`,
@@ -11281,6 +11470,7 @@ function renderLightDetails(sceneId, light) {
     `name: ${light?.name ?? ""}`,
     `position: (${light?.x ?? 0}, ${light?.y ?? 0})`,
     `elevation: ${light?.elevation ?? 0}`,
+    ...levelMembershipLines(light),
     `rotation: ${light?.rotation ?? 0}`,
     `walls: ${String(Boolean(light?.walls))}`,
     `vision: ${String(Boolean(light?.vision))}`,
@@ -11311,6 +11501,7 @@ function renderRegionDetails(sceneId, region) {
     `color: ${region?.color ?? ""}`,
     `visibility: ${region?.visibility ?? ""}`,
     `elevation: ${JSON.stringify(region?.elevation ?? null)}`,
+    ...levelMembershipLines(region),
     `shapes: ${JSON.stringify(region?.shapes ?? [])}`,
     `behaviors: ${JSON.stringify(region?.behaviors ?? [])}`,
     `locked: ${String(Boolean(region?.locked))}`
@@ -11613,10 +11804,12 @@ var RENDERERS = registerRenderers([
       `world: ${result.world?.title ?? "Unknown World"} [${result.world?.id ?? "unknown-world"}]`,
       `user: ${result.user?.name ?? "Unknown User"} [${result.user?.id ?? "unknown-user"}] GM=${String(Boolean(result.user?.isGM))}`,
       `bridge: ${result.bridge?.status ?? "unknown"}`,
-      `modules: ${(result.modules ?? []).length}`,
+      `modules: ${result.moduleCount ?? "unknown"} installed, ${result.activeModuleCount ?? "unknown"} active`,
+      ...(result.modules ?? []).map(
+        (module) => `  ${module.id} ${module.version ?? "unknown"} ${module.active ? "active" : "inactive"}`
+      ),
       `limits.uploadBytes: ${result.limits?.uploadBytes ?? "unknown"} (source: ${result.limits?.uploadSource ?? "unknown"})`,
-      `limits.wsMaxPayloadBytes: ${result.limits?.wsMaxPayloadBytes ?? "unknown"}`,
-      `commands: ${(result.commands ?? []).join(", ")}`
+      `limits.wsMaxPayloadBytes: ${result.limits?.wsMaxPayloadBytes ?? "unknown"}`
     ].join("\n")
   ),
   detailRenderer(
@@ -12347,7 +12540,7 @@ var RENDERERS = registerRenderers([
     empty: "No tokens found.",
     heading: "Tokens",
     prefix: scenePrefix,
-    row: (token) => `${token.id}	${token.name}	actor=${token.actorId ?? "-"}	linked=${String(Boolean(token.actorLink))}	(${token.x},${token.y})`
+    row: (token) => `${token.id}	${token.name}	actor=${token.actorId ?? "-"}	linked=${String(Boolean(token.actorLink))}	(${token.x},${token.y})${levelMembershipCell(token)}`
   }),
   detailRenderer(
     ["scene.token.get", "scene.token.create", "scene.token.update", "scene.token.clone"],
@@ -12371,7 +12564,7 @@ var RENDERERS = registerRenderers([
     empty: "No tiles found.",
     heading: "Tiles",
     prefix: scenePrefix,
-    row: (tile) => `${tile.id}	(${tile.x},${tile.y})	${tile.width}x${tile.height}	hidden=${String(Boolean(tile.hidden))}`
+    row: (tile) => `${tile.id}	(${tile.x},${tile.y})	${tile.width}x${tile.height}	hidden=${String(Boolean(tile.hidden))}${levelMembershipCell(tile)}`
   }),
   detailRenderer(
     ["scene.tile.get", "scene.tile.create", "scene.tile.update", "scene.tile.clone"],
@@ -12383,7 +12576,7 @@ var RENDERERS = registerRenderers([
     empty: "No sounds found.",
     heading: "Sounds",
     prefix: scenePrefix,
-    row: (sound) => `${sound.id}	${sound.path ?? ""}	(${sound.x},${sound.y})	r=${sound.radius}	hidden=${String(Boolean(sound.hidden))}`
+    row: (sound) => `${sound.id}	${sound.path ?? ""}	(${sound.x},${sound.y})	r=${sound.radius}	hidden=${String(Boolean(sound.hidden))}${levelMembershipCell(sound)}`
   }),
   detailRenderer(
     ["scene.sound.get", "scene.sound.create", "scene.sound.update", "scene.sound.clone"],
@@ -12395,20 +12588,32 @@ var RENDERERS = registerRenderers([
     empty: "No walls found.",
     heading: "Walls",
     prefix: scenePrefix,
-    row: (wall) => `${wall.id}	${wall.door ?? 0}/${wall.ds ?? 0}/${wall.doorSound ?? ""}	c=[${(wall.c ?? []).join(",")}]`
+    row: (wall) => `${wall.id}	${wall.door ?? 0}/${wall.ds ?? 0}/${wall.doorSound ?? ""}	c=[${(wall.c ?? []).join(",")}]${levelMembershipCell(wall)}`
   }),
   detailRenderer(
     ["scene.wall.get", "scene.wall.create", "scene.wall.update", "scene.wall.clone"],
     (result) => renderWallDetails(result.sceneId, result.wall)
   ),
   deleteRenderer("scene.wall.delete", "wall", { suffix: sceneSuffix }),
+  listRenderer("scene.level.list", {
+    key: "levels",
+    empty: "No levels found.",
+    heading: "Levels",
+    prefix: scenePrefix,
+    row: (level) => renderLevelRow(level)
+  }),
+  detailRenderer(
+    ["scene.level.get", "scene.level.create", "scene.level.update", "scene.level.clone"],
+    (result) => renderLevelDetails(result.sceneId, result.level)
+  ),
+  deleteRenderer("scene.level.delete", "level", { suffix: sceneSuffix }),
   detailRenderer(BATCH_WRITE_COMMANDS, (result, command) => renderBatchWriteResult(command, result)),
   listRenderer("scene.note.list", {
     key: "notes",
     empty: "No notes found.",
     heading: "Notes",
     prefix: scenePrefix,
-    row: (note) => `${note.id}	${note.text ?? ""}	(${note.x},${note.y})	${note.texture?.src ?? ""}	${note.iconSize ?? ""}`
+    row: (note) => `${note.id}	${note.text ?? ""}	(${note.x},${note.y})	${note.texture?.src ?? ""}	${note.iconSize ?? ""}${levelMembershipCell(note)}`
   }),
   detailRenderer(
     ["scene.note.get", "scene.note.create", "scene.note.update", "scene.note.clone"],
@@ -12420,7 +12625,7 @@ var RENDERERS = registerRenderers([
     empty: "No drawings found.",
     heading: "Drawings",
     prefix: scenePrefix,
-    row: (drawing) => `${drawing.id}	${drawing.text ?? ""}	(${drawing.x},${drawing.y})	${drawing.shape?.type ?? ""}	${String(Boolean(drawing.hidden))}	${drawing.name ?? "(no name)"}`
+    row: (drawing) => `${drawing.id}	${drawing.text ?? ""}	(${drawing.x},${drawing.y})	${drawing.shape?.type ?? ""}	${String(Boolean(drawing.hidden))}	${drawing.name ?? "(no name)"}${levelMembershipCell(drawing)}`
   }),
   detailRenderer(
     ["scene.drawing.get", "scene.drawing.create", "scene.drawing.update", "scene.drawing.clone"],
@@ -12432,7 +12637,7 @@ var RENDERERS = registerRenderers([
     empty: "No lights found.",
     heading: "Lights",
     prefix: scenePrefix,
-    row: (light) => `${light.id}	(${light.x},${light.y})	${light.config?.dim ?? ""}/${light.config?.bright ?? ""}	${String(Boolean(light.hidden))}	${light.name ?? "(no name)"}`
+    row: (light) => `${light.id}	(${light.x},${light.y})	${light.config?.dim ?? ""}/${light.config?.bright ?? ""}	${String(Boolean(light.hidden))}	${light.name ?? "(no name)"}${levelMembershipCell(light)}`
   }),
   detailRenderer(
     ["scene.light.get", "scene.light.create", "scene.light.update", "scene.light.clone"],
@@ -12456,7 +12661,7 @@ var RENDERERS = registerRenderers([
     empty: "No regions found.",
     heading: "Regions",
     prefix: scenePrefix,
-    row: (region) => `${region.id}	${region.name ?? ""}	${region.visibility ?? ""}	shapes=${region.shapesCount ?? 0}	behaviors=${region.behaviorsCount ?? 0}`
+    row: (region) => `${region.id}	${region.name ?? ""}	${region.visibility ?? ""}	shapes=${region.shapesCount ?? 0}	behaviors=${region.behaviorsCount ?? 0}${levelMembershipCell(region)}`
   }),
   detailRenderer(
     ["scene.region.get", "scene.region.create", "scene.region.update", "scene.region.clone"],
@@ -12855,11 +13060,17 @@ function addReservedIncludeOption(command, presence) {
 function addActorIncludeOption(command) {
   return command.option(
     "--include <fields>",
-    "Comma-separated extra fields (items.flags, items.effects, prepared add output; flags/effects are always present, so those two have no effect)",
+    "Comma-separated extra fields (items adds the owned items, which items.flags and items.effects also imply; prepared adds derived data; flags/effects are always present, so those two have no effect)",
     parseActorIncludeFields
   );
 }
+var INITIAL_LEVEL_FIELD = {
+  flag: "--initial-level <initialLevel>",
+  help: "Initial level id (Foundry v14)"
+};
 var SCENE_FIELDS = [
+  FOLDER_ID_FIELD,
+  CLEAR_FOLDER_FIELD,
   { flag: "--active <active>", help: "Scene active state", parser: parseBoolean },
   { flag: "--navigation <navigation>", help: "Scene navigation visibility", parser: parseBoolean },
   { flag: "--nav-order <navOrder>", help: "Scene navigation order", parser: parseNumber },
@@ -12872,14 +13083,14 @@ var SCENE_FIELDS = [
   { flag: "--shift-y <shiftY>", help: "Background Y shift", parser: parseNumber },
   { flag: "--nav-name <navName>", help: "Navigation label" },
   { flag: "--thumb <thumb>", help: "Thumbnail image path" },
-  { flag: "--foreground <foreground>", help: "Foreground image path" },
+  { flag: "--foreground <foreground>", help: "Foreground image path (Foundry v13)" },
   {
     flag: "--foreground-elevation <foregroundElevation>",
-    help: "Foreground image elevation",
+    help: "Foreground image elevation (Foundry v13)",
     parser: parseNumber
   },
   { flag: "--sort <sort>", help: "Sort order", parser: parseNumber },
-  { flag: "--initial-level <initialLevel>", help: "Initial elevation level id" },
+  INITIAL_LEVEL_FIELD,
   { flag: "--playlist <playlistId>", help: "Linked playlist id" },
   { flag: "--playlist-sound <playlistSoundId>", help: "Linked playlist sound id" },
   { flag: "--journal <journalId>", help: "Linked journal id" },
@@ -12899,14 +13110,15 @@ var SCENE_FIELDS = [
   {
     flag: "--background-json <json>",
     help: {
-      create: "Scene background as JSON object",
-      update: "Scene background patch as JSON object",
-      clone: "Scene background override as JSON object"
+      create: "Scene background as JSON object (Foundry v13)",
+      update: "Scene background patch as JSON object (Foundry v13)",
+      clone: "Scene background override as JSON object (Foundry v13)"
     }
   }
 ];
 function addSceneFieldOptions(command, verb) {
-  return addFieldOptions(command, verb, SCENE_FIELDS);
+  const specs = verb === "create" ? SCENE_FIELDS.filter((spec) => spec !== INITIAL_LEVEL_FIELD) : SCENE_FIELDS;
+  return addFieldOptions(command, verb, specs);
 }
 var TOKEN_NAME_FIELD = {
   flag: "--name <name>",
@@ -14350,7 +14562,9 @@ function createDaemonControlRunner(dependencies) {
 `);
     else if (response.ok) write(dependencies.stdout, `${JSON.stringify(response.result, null, 2)}
 `);
-    else
+    else write(dependencies.stderr, `${renderProtocolError(response.error)}
+`);
+    if (!response.ok)
       throw new CommanderError4(
         exitCodeForErrorCode(response.error?.code),
         "fvtt-world-cli.remoteError",
@@ -14683,11 +14897,9 @@ function recordSkillInstalls(dependencies, roots, { remove = false } = {}) {
       else current.add(root);
     }
     const skillInstalls = [...current].sort();
-    dependencies.configStore.writeConfig(
-      mergePersistedCliConfig(
-        existing,
-        skillInstalls.length > 0 ? { skillInstalls } : { skillInstalls: void 0 }
-      )
+    writeCliConfigUpdate(
+      dependencies.configStore,
+      skillInstalls.length > 0 ? { skillInstalls } : { skillInstalls: void 0 }
     );
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -15546,12 +15758,7 @@ function registerConfig({ program, dependencies }) {
   });
   config.command("set-upload-limit").description("Persist the file.upload size limit (raw bytes, pre-base64) for the daemon and CLI").argument("<size>", "Upload size limit as bytes or a size like 100MiB (max 512MiB)").action(function setUploadLimit(size) {
     const uploadLimitBytes = parseUploadLimitBytes(size);
-    const persistedConfig = getStoredConfig(dependencies);
-    const nextConfig = mergePersistedCliConfig(persistedConfig, {
-      daemonUrl: persistedConfig?.daemonUrl ?? DEFAULT_DAEMON_URL,
-      uploadLimitBytes
-    });
-    dependencies.configStore.writeConfig(nextConfig);
+    writeCliConfigUpdate(dependencies.configStore, { uploadLimitBytes });
     const payload = {
       configPath: dependencies.configStore.getConfigPath(),
       uploadLimitBytes,
@@ -16679,6 +16886,12 @@ function registerPlaylist({ program, dependencies }) {
 
 // src/commands/scene.ts
 import { Option as Option11 } from "commander";
+function addSceneLevelScopeOption(command) {
+  return command.requiredOption("--scene-id <sceneId>", "Scene id");
+}
+function addSceneLevelTargetOptions(command, levelDescription = "Level id") {
+  return addSceneLevelScopeOption(command).requiredOption("--level-id <levelId>", levelDescription);
+}
 function registerScene({ program, dependencies }) {
   const { registerOwnershipSet, registerCompendiumImport, registerBatchWriteCommands } = createSharedRegistrars(dependencies);
   const scene = program.command("scene").description("Foundry scene commands");
@@ -17254,6 +17467,58 @@ function registerScene({ program, dependencies }) {
     });
   });
   registerBatchWriteCommands(sceneWall, { prefix: "scene.wall", noun: "wall" });
+  const sceneLevel = scene.command("level").description("Scene level commands (Foundry v14)");
+  addPaginationOptions(addSceneLevelScopeOption(sceneLevel.command("list"))).action(
+    async function listSceneLevels(options) {
+      await executeRemoteCommand({
+        commandName: "scene.level.list",
+        params: { sceneId: options.sceneId, ...paginationParams(options) },
+        command: this,
+        dependencies
+      });
+    }
+  );
+  addSceneLevelTargetOptions(sceneLevel.command("get")).action(async function getSceneLevel(options) {
+    await executeRemoteCommand({
+      commandName: "scene.level.get",
+      params: { sceneId: options.sceneId, levelId: options.levelId },
+      command: this,
+      dependencies
+    });
+  });
+  addSceneLevelScopeOption(addIdempotencyKeyOption(sceneLevel.command("create"))).option("--data-json <json>", "Level data as a JSON object (name is required; e.g. elevation/background)").action(async function createSceneLevel(options) {
+    await executeRemoteCommand({
+      commandName: "scene.level.create",
+      params: createSceneLevelCreateParams(options),
+      command: this,
+      dependencies
+    });
+  });
+  addSceneLevelTargetOptions(sceneLevel.command("update")).option("--patch-json <json>", "Level patch as a JSON object (e.g. background/foreground/elevation)").action(async function updateSceneLevel(options) {
+    await executeRemoteCommand({
+      commandName: "scene.level.update",
+      params: createSceneLevelUpdateParams(options),
+      command: this,
+      dependencies
+    });
+  });
+  addSceneLevelTargetOptions(addIdempotencyKeyOption(sceneLevel.command("clone")), "Source level id").option("--patch-json <json>", "Override fields for the clone as a JSON object").action(async function cloneSceneLevel(options) {
+    await executeRemoteCommand({
+      commandName: "scene.level.clone",
+      params: createSceneLevelCloneParams(options),
+      command: this,
+      dependencies
+    });
+  });
+  addSceneLevelTargetOptions(sceneLevel.command("delete")).action(async function deleteSceneLevel(options) {
+    await executeRemoteCommand({
+      commandName: "scene.level.delete",
+      params: { sceneId: options.sceneId, levelId: options.levelId },
+      command: this,
+      dependencies
+    });
+  });
+  registerBatchWriteCommands(sceneLevel, { prefix: "scene.level", noun: "level" });
   const sceneNote = scene.command("note").description("Scene-embedded note (map pin) commands");
   addPaginationOptions(sceneNote.command("list").requiredOption("--scene-id <sceneId>", "Scene id")).action(
     async function listSceneNotes(options) {
@@ -18008,7 +18273,7 @@ function registerSystem({ program, dependencies }) {
   const system = program.command("system").description("Foundry bridge system commands");
   system.addHelpText(
     "after",
-    "\nResult key (--json): .result.pong + .result.bridge (ping); .result.foundry.* / .result.system.* / .result.world.* / .result.module.* / .result.modules[] / .result.bridge.* / .result.limits.* / .result.commands[] (info)."
+    "\nResult key (--json): .result.pong + .result.bridge (ping); .result.foundry.* / .result.system.* / .result.world.* / .result.module.* / .result.moduleCount / .result.activeModuleCount / .result.modules[] (with --include modules) / .result.bridge.* / .result.limits.* (info)."
   );
   system.command("ping").action(async function ping() {
     await executeRemoteCommand({
@@ -18018,10 +18283,14 @@ function registerSystem({ program, dependencies }) {
       dependencies
     });
   });
-  system.command("info").action(async function info() {
+  system.command("info").option(
+    "--include <fields>",
+    "Comma-separated extra fields (modules adds the installed module list)",
+    parseSystemInfoIncludeFields
+  ).action(async function info(options) {
     await executeRemoteCommand({
       commandName: "system.info",
-      params: {},
+      params: options.include ? { include: options.include } : {},
       command: this,
       dependencies
     });