@jxsuite/studio 6.1.1 → 6.1.2

package/src/new-project/new-project-modal.ts

@@ -41,6 +41,7 @@
 import { errorMessage } from "@jxsuite/schema/parse";
 import { layerHost } from "../ui/layers";
 import { enumArg, enumProperty } from "../commands/command-args";
+import type { CommandArgValues } from "../commands/command-args";
 import type { AnyCommand, CommandRegistry } from "../commands/registry";
 import { getPlatform } from "../platform";
 import { installUrlOf } from "../platform-errors";
@@ -118,9 +119,9 @@ let _nameError = "";
 /** GitHub-App install link carried by a structured needs_installation_access failure. */
 let _errorInstallUrl = "";
 
-function captureError(error: unknown) {
-  _error = errorMessage(error);
-  _errorInstallUrl = installUrlOf(error) ?? "";
+function captureError(cause: unknown) {
+  _error = errorMessage(cause);
+  _errorInstallUrl = installUrlOf(cause) ?? "";
 }
 
 let _creating = false;
@@ -244,6 +245,8 @@ export function openNewProjectModal(options?: { tab?: NewProjectTab }): Promise<
           if (_creating) {
             return;
           }
+          /* SAFETY: `value` is the selected `jx-tab`'s value, and the strip renders one tab per
+             `viewOf().tabs` entry, whose values are "starter", "import" and "agent". */
           _tab = value as NewProjectTab;
           _error = "";
           redraw();
@@ -348,10 +351,10 @@ async function finishCreated(result: { root: string; config: ProjectConfig }) {
     getTab: () => null,
   });
   if (!adopted && !openedElsewhere) {
-    notify.warn("Created the project, but could not open it here.", {
-      ...(error === null ? {} : { detail: error }),
-      source: "New Project",
-    });
+    notify.warn(
+      "Created the project, but could not open it here.",
+      error === null ? { source: "New Project" } : { detail: error, source: "New Project" },
+    );
   }
   finish(result);
 }
@@ -708,9 +711,9 @@ export function newProjectCommands(): AnyCommand[] {
       group: "1_file",
       /* No `aiTool`: application-level, refused at registration; it opens the wizard, and the
          model's own door is `create_project` / `import_site` (studio-ui-guidelines.md §12.4). */
-      run: (_commandCtx, args) => {
+      run: (_commandCtx, args: CommandArgValues) => {
         const tab =
-          (args as { tab?: unknown }).tab === undefined
+          args.tab === undefined
             ? undefined
             : enumArg("project.new", args, "tab", NEW_PROJECT_TABS);
         void openNewProjectModal(tab === undefined ? {} : { tab });

package/src/packages/jxsuite-update.ts

@@ -29,9 +29,10 @@ import { openJxsuiteUpdateSurface } from "../surfaces/jxsuite-update";
 import { showProgressModal } from "../ui/progress-modal";
 import { notify } from "../services/notify";
 import { isUpgrade } from "./semver";
-import type { JxsuiteUpdateSurfaceHandle } from "../surfaces/jxsuite-update";
+import type { DialogLayerHandle } from "../ui/surface";
 
-const JXSUITE_PREFIX = "@jxsuite/";
+/** The npm scope every first-party package is published under. */
+export const JXSUITE_PREFIX = "@jxsuite/";
 
 export interface JxsuiteUpdate {
   name: string;
@@ -170,7 +171,7 @@ function askToUpdate(outdated: JxsuiteUpdate[]): Promise<boolean> {
       closing = true;
       handle.close();
     };
-    const handle: JxsuiteUpdateSurfaceHandle = openJxsuiteUpdateSurface({
+    const handle: DialogLayerHandle = openJxsuiteUpdateSurface({
       layer: layerHost("dialog"),
       onCancel: () => {
         takeDown();

package/src/packages/pull-package-sync.ts

@@ -10,11 +10,13 @@
  */
 
 import { errorMessage } from "@jxsuite/schema/parse";
+import { isJsonObject } from "@jxsuite/schema/guards";
+import type { JsonObject, JsonValue } from "@jxsuite/schema/types";
 import { getPlatform } from "../platform";
 import { showConfirmDialog } from "../ui/layers";
 import { showProgressModal } from "../ui/progress-modal";
 import { notify } from "../services/notify";
-import { applyJxsuiteUpdate, checkJxsuiteUpdate } from "./jxsuite-update";
+import { JXSUITE_PREFIX, applyJxsuiteUpdate, checkJxsuiteUpdate } from "./jxsuite-update";
 import type { GitStatusResult } from "../types";
 
 const PKG_PATHS = ["package.json", "bun.lock", "bun.lockb"];
@@ -29,20 +31,16 @@ const UNTRACKED_STATUSES = new Set(["??", "U"]);
 /** Above this many dirty files, skip the per-file upstream comparison and leave the error as-is. */
 const MAX_CONFLICT_SCAN = 25;
 
-const JXSUITE_PREFIX = "@jxsuite/";
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function sortKeys(value: unknown): unknown {
+/** A copy of a JSON value with every object's keys in sorted order, so equal data prints equal. */
+function sortKeys(value: JsonValue): JsonValue {
   if (Array.isArray(value)) {
     return value.map((entry) => sortKeys(entry));
   }
-  if (isRecord(value)) {
-    const out: Record<string, unknown> = {};
-    for (const key of Object.keys(value).toSorted()) {
-      out[key] = sortKeys(value[key]);
+  if (isJsonObject(value)) {
+    const out: JsonObject = {};
+    // Keys are unique, so the comparator never sees a tie; `<` is the default sort's code-unit order.
+    for (const [key, entry] of Object.entries(value).toSorted(([a], [b]) => (a < b ? -1 : 1))) {
+      out[key] = sortKeys(entry);
     }
     return out;
   }
@@ -50,11 +48,11 @@ function sortKeys(value: unknown): unknown {
 }
 
 /** Replace every @jxsuite/* version in dependencies/devDependencies so they compare equal. */
-function maskJxsuiteVersions(pkg: Record<string, unknown>): Record<string, unknown> {
+function maskJxsuiteVersions(pkg: JsonObject): JsonObject {
   const out = { ...pkg };
   for (const section of ["dependencies", "devDependencies"]) {
     const deps = out[section];
-    if (!isRecord(deps)) {
+    if (!isJsonObject(deps)) {
       continue;
     }
     const masked = { ...deps };
@@ -88,7 +86,7 @@ export function isAutomatedPackageDiff(
   } catch {
     return false;
   }
-  if (!isRecord(head) || !isRecord(working)) {
+  if (!isJsonObject(head) || !isJsonObject(working)) {
     return false;
   }
   return (
@@ -251,20 +249,20 @@ async function discardPullAndSync(plan: PackagePullPlan): Promise<void> {
   await syncPackagesAfterPull();
 }
 
-async function recoverAfterFailedPull(original: unknown): Promise<void> {
+async function recoverAfterFailedPull(cause: unknown): Promise<void> {
   const platform = getPlatform();
   let status: GitStatusResult;
   try {
     status = await platform.gitStatus();
   } catch {
-    throw original;
+    throw cause;
   }
   if (!(status.behind > 0)) {
-    throw original;
+    throw cause;
   }
   const plan = await planPackageDiscard(status);
   if (planIsEmpty(plan) || (await otherFilesConflict(status))) {
-    throw original;
+    throw cause;
   }
   if (!plan.automated) {
     const confirmed = await showConfirmDialog(
@@ -273,7 +271,7 @@ async function recoverAfterFailedPull(original: unknown): Promise<void> {
       { confirmLabel: "Discard and pull", destructive: true },
     );
     if (!confirmed) {
-      throw original;
+      throw cause;
     }
   }
   await discardPullAndSync(plan);
@@ -346,15 +344,18 @@ export async function pullWithPackageSync(): Promise<void> {
  */
 export async function autoSyncProjectOnOpen(): Promise<void> {
   const platform = getPlatform();
-  let status: GitStatusResult;
   try {
-    status = await platform.gitStatus();
+    /* The status is host wire data. A host may leave `remotes` out (as `deploy-checklist.ts` and
+       `git-panel.ts` also allow), which reads as "nothing to sync"; a host that sends no status at
+       all throws on the first read and is caught below the same way, so a malformed status never
+       aborts the project open that awaits this. */
+    const status = await platform.gitStatus();
+    if (!status.isRepo || !Array.isArray(status.remotes) || status.remotes.length === 0) {
+      return;
+    }
   } catch {
     return;
   }
-  if (!status?.isRepo || (status.remotes?.length ?? 0) === 0) {
-    return;
-  }
   notify.info("Syncing project…", { key: "project.sync", source: "Source Control" });
   try {
     await pullWithPackageSync();

package/src/page-params.ts

@@ -10,14 +10,28 @@
  * produces for the matching built page.
  */
 
-import { documentUrlPattern as routePattern } from "@jxsuite/site/routes";
+import { documentUrlPattern } from "@jxsuite/site/routes";
 import { getPlatform } from "./platform";
 import { loadExtensions } from "./format/format-host";
-import type { JxMutableNode, JxPathsDef } from "@jxsuite/schema/types";
+import { isJsonObject, isRef, isString } from "@jxsuite/schema/guards";
+import type {
+  JsonObject,
+  JsonValue,
+  JxDocumentValue,
+  JxMutableNode,
+  JxPathsDef,
+  JxStateDefinition,
+} from "@jxsuite/schema/types";
 
 /** Param name → candidate values, in `$paths` declaration order. */
 export type ParamValues = Record<string, string[]>;
 
+/** One entry of a resolved ContentCollection, as `/__jx_resolve__` serializes it to JSON. */
+interface ResolvedContentEntry {
+  id?: JsonValue;
+  data?: JsonObject;
+}
+
 /**
  * Route derivation is `@jxsuite/site/routes`, re-exported so this module stays the studio's one
  * import for everything `$params`.
@@ -34,14 +48,21 @@ export { documentUrlPattern, dynamicRouteParams } from "@jxsuite/site/routes";
  * The `$paths` declaration of an open document. JSON pages carry it on the document root;
  * format-class pages (markdown) keep it in the frontmatter.
  *
- * @param {{ document?: unknown; frontmatter?: Record<string, unknown> }} doc
+ * @param {{
+ *   document?: JxMutableNode | null;
+ *   frontmatter?: Record<string, JxDocumentValue | undefined> | null;
+ * }} doc
  * @returns {JxPathsDef | null}
  */
 export function pagePathsDef(doc: {
   document?: JxMutableNode | null;
-  frontmatter?: Record<string, unknown> | null;
+  frontmatter?: Record<string, JxDocumentValue | undefined> | null;
 }) {
-  const fromDoc = (doc.document as { $paths?: JxPathsDef } | null | undefined)?.$paths;
+  const fromDoc = doc.document?.$paths;
+  /* SAFETY: frontmatter `$paths` is the format-page form of the root `$paths` block
+     (site-architecture.md §4.3). Its only consumer, loadParamValues, re-checks every JxPathsDef
+     shape (array, contentType, values, $ref) before reading it and turns any other value into an
+     empty result, so an off-shape block degrades to "no candidates" rather than a crash. */
   const fromFrontmatter = doc.frontmatter?.$paths as JxPathsDef | undefined;
   return fromDoc ?? fromFrontmatter ?? null;
 }
@@ -67,15 +88,15 @@ export function loadParamValues(
   pathsDef: JxPathsDef | null,
 ) {
   if (!pathsDef) {
-    return Promise.resolve({} as ParamValues);
+    return Promise.resolve<ParamValues>({});
   }
   const key = `${documentPath ?? ""}::${JSON.stringify(pathsDef)}`;
   let pending = valueCache.get(key);
   if (!pending) {
-    pending = resolveParamValues(pathsDef).catch((error: unknown) => {
+    pending = resolveParamValues(pathsDef).catch((error): ParamValues => {
       valueCache.delete(key);
       console.warn("page-params: failed to enumerate $paths values:", error);
-      return {} as ParamValues;
+      return {};
     });
     valueCache.set(key, pending);
   }
@@ -104,21 +125,19 @@ async function resolveParamValues(pathsDef: JxPathsDef): Promise<ParamValues> {
   // Discriminator member on JxPathsDef, so narrow to string. Resolved through the backend's
   // ContentCollection pipeline (the same one the canvas's ContentEntry uses), so every offered
   // Value is guaranteed to resolve in preview.
-  if (
-    "contentType" in pathsDef &&
-    typeof pathsDef.contentType === "string" &&
-    pathsDef.contentType
-  ) {
+  if ("contentType" in pathsDef && isString(pathsDef.contentType) && pathsDef.contentType) {
     const param = pathsDef.param ?? "slug";
     const field = pathsDef.field ?? "id";
-    const entries = (await resolveContentCollection(pathsDef.contentType)) as {
-      id?: unknown;
-      data?: Record<string, unknown>;
-    }[];
-    const out: ParamValues = { [param]: [] };
-    if (!Array.isArray(entries)) {
+    const resolved = await resolveContentCollection(pathsDef.contentType);
+    const out = { [param]: [] } satisfies ParamValues;
+    if (!Array.isArray(resolved)) {
       return out;
     }
+    /* SAFETY: a resolved ContentCollection is its entries array, each `{ id, data }` (the parser's
+       ContentLoaderEntry after the JSON hop). Off-shape entries stay harmless: a primitive reads as
+       having no id and is skipped, and a null throws on `.id`, which loadParamValues catches and
+       degrades to an empty result. */
+    const entries = resolved as ResolvedContentEntry[];
     for (const entry of entries) {
       pushValue(out, param, field === "id" ? entry.id : (entry.data?.[field] ?? entry.id));
     }
@@ -128,7 +147,7 @@ async function resolveParamValues(pathsDef: JxPathsDef): Promise<ParamValues> {
   // Explicit values: { values: ["en", "fr"], param: "lang" }
   if ("values" in pathsDef && Array.isArray(pathsDef.values)) {
     const param = pathsDef.param ?? "value";
-    const out: ParamValues = { [param]: [] };
+    const out = { [param]: [] } satisfies ParamValues;
     for (const value of pathsDef.values) {
       pushValue(out, param, value);
     }
@@ -137,17 +156,18 @@ async function resolveParamValues(pathsDef: JxPathsDef): Promise<ParamValues> {
 
   // Data file ref: { "$ref": "./data/products.json", param: "id", field: "sku" } — `$ref` also
   // Reaches here as an open discriminator key, so narrow to a non-empty string.
-  if ("$ref" in pathsDef && typeof pathsDef.$ref === "string" && pathsDef.$ref) {
+  if ("$ref" in pathsDef && isString(pathsDef.$ref) && pathsDef.$ref) {
     const param = pathsDef.param ?? "id";
     const field = pathsDef.field ?? "id";
     const content = await getPlatform().readFile(pathsDef.$ref.replace(/^\.\//, ""));
-    const data = JSON.parse(content) as unknown;
-    const out: ParamValues = { [param]: [] };
+    // SAFETY: JSON.parse only ever produces JSON values.
+    const data = JSON.parse(content) as JsonValue;
+    const out = { [param]: [] } satisfies ParamValues;
     if (!Array.isArray(data)) {
       return out;
     }
-    for (const item of data as Record<string, unknown>[]) {
-      pushValue(out, param, item?.[field] ?? item?.id ?? item);
+    for (const item of data) {
+      pushValue(out, param, isJsonObject(item) ? (item[field] ?? item.id ?? item) : item);
     }
     return out;
   }
@@ -179,9 +199,9 @@ async function contentCollectionSrc(): Promise<string> {
  * fetch on platforms that predate `resolveClass`.
  *
  * @param {string} contentType
- * @returns {Promise<unknown>}
+ * @returns {Promise<JsonValue>}
  */
-async function resolveContentCollection(contentType: string) {
+async function resolveContentCollection(contentType: string): Promise<JsonValue> {
   const body = {
     $prototype: "ContentCollection",
     $src: await contentCollectionSrc(),
@@ -189,26 +209,28 @@ async function resolveContentCollection(contentType: string) {
   };
   const platform = getPlatform();
   if (platform.resolveClass) {
-    return platform.resolveClass(body);
+    /* SAFETY: resolveClass hands back the backend's parsed `/__jx_resolve__` response, and that
+       endpoint answers with a JSON body, so the value is a JSON value. */
+    return platform.resolveClass(body) as Promise<JsonValue>;
   }
   return fetch("/__jx_resolve__", {
     body: JSON.stringify(body),
     headers: { "content-type": "application/json" },
     method: "POST",
-  }).then((res) => {
+  }).then((res): Promise<JsonValue> => {
     if (!res.ok) {
       throw new Error(`Class resolution failed: ${res.status}`);
     }
-    return res.json() as Promise<unknown>;
+    return res.json();
   });
 }
 
 /**
  * @param {ParamValues} out
  * @param {string} param
- * @param {unknown} value
+ * @param {JsonValue | undefined} value
  */
-function pushValue(out: ParamValues, param: string, value: unknown) {
+function pushValue(out: ParamValues, param: string, value: JsonValue | undefined) {
   if (value === null || value === undefined || value === "") {
     return;
   }
@@ -245,15 +267,15 @@ export function substitutePreviewParams(
   if (Object.keys(params).length === 0) {
     return renderDoc;
   }
-  const doc = substituteParamRefs(renderDoc, params) as JxMutableNode & {
-    state?: Record<string, unknown>;
-    title?: unknown;
-  };
+  /* SAFETY: a render document is a JSON tree (it reaches the canvas iframe by structured clone and
+     is serialized back to disk), so its root is a JSON object; substituteObjectRefs rebuilds it key
+     for key, replacing only `$params` ref values with strings, so the copy keeps the node's shape. */
+  const doc = substituteObjectRefs(renderDoc as JsonObject, params) as JxMutableNode;
   doc.state ??= {};
   doc.state.$page = {
     params: { ...params },
-    title: typeof doc.title === "string" ? doc.title : "",
-    url: routePattern(documentPath),
+    title: isString(doc.title) ? doc.title : "",
+    url: documentUrlPattern(documentPath),
   };
   return doc;
 }
@@ -263,21 +285,20 @@ export function substitutePreviewParams(
  * These are the entries `substitutePreviewParams` rewrites, and the ones `resolveParamBoundState`
  * bakes.
  *
- * @param {Record<string, unknown> | null | undefined} state - The ORIGINAL document state (with
- *   `$ref`s intact — substitution removes the marker)
+ * @param {Record<string, JxStateDefinition> | null | undefined} state - The ORIGINAL document state
+ *   (with `$ref`s intact — substitution removes the marker)
  * @returns {string[]}
  */
-export function paramBoundStateKeys(state: Record<string, unknown> | null | undefined) {
+export function paramBoundStateKeys(state: Record<string, JxStateDefinition> | null | undefined) {
   if (!state) {
     return [];
   }
   return Object.keys(state).filter((key) => {
-    const entry = state[key] as Record<string, unknown> | null;
+    const entry = state[key];
     return (
-      entry &&
-      typeof entry === "object" &&
-      typeof entry.$prototype === "string" &&
-      typeof entry.$src === "string" &&
+      isJsonObject(entry) &&
+      isString(entry.$prototype) &&
+      isString(entry.$src) &&
       JSON.stringify(entry).includes('"#/$params/')
     );
   });
@@ -306,24 +327,30 @@ export async function resolveParamBoundState(
     return;
   }
   const platform = getPlatform();
-  if (!platform.resolveClass) {
+  const { resolveClass } = platform;
+  if (!resolveClass) {
     return;
   }
-  const { state } = renderDoc as { state?: Record<string, unknown> };
+  const { state } = renderDoc;
   if (!state) {
     return;
   }
   await Promise.all(
     keys.map(async (key) => {
+      /* Keys come from paramBoundStateKeys, which only selects plain-object entries; substitution
+         keeps such an entry an object unless the whole entry was a param ref (then a string). */
       const entry = state[key];
-      if (!entry || typeof entry !== "object") {
+      if (!isJsonObject(entry)) {
         return;
       }
+      const body = { ...entry };
+      if (docBase) {
+        body.$base = docBase;
+      }
       try {
-        state[key] = await platform.resolveClass!({
-          ...(entry as Record<string, unknown>),
-          ...(docBase ? { $base: docBase } : {}),
-        });
+        /* SAFETY: the backend answers with the class's resolved JSON value (no `$prototype`), which
+           the runtime reads as a naked-value state entry, so it is a JxStateDefinition. */
+        state[key] = (await resolveClass.call(platform, body)) as JxStateDefinition;
       } catch (error) {
         console.warn(`page-params: failed to resolve state.${key} for preview:`, error);
       }
@@ -332,22 +359,28 @@ export async function resolveParamBoundState(
 }
 
 /**
- * @param {unknown} node
+ * @param {JsonValue} node
  * @param {Record<string, string>} params
- * @returns {unknown} — a rebuilt copy with matched param refs replaced by literals
+ * @returns {JsonValue} — a rebuilt copy with matched param refs replaced by literals
  */
-function substituteParamRefs(node: unknown, params: Record<string, string>): unknown {
+function substituteParamRefs(node: JsonValue, params: Record<string, string>): JsonValue {
   const replaced = paramRefValue(node, params);
   if (replaced !== null) {
     return replaced;
   }
-  if (!node || typeof node !== "object") {
-    return node;
-  }
   if (Array.isArray(node)) {
     return node.map((item) => substituteParamRefs(item, params));
   }
-  const out: Record<string, unknown> = {};
+  return isJsonObject(node) ? substituteObjectRefs(node, params) : node;
+}
+
+/**
+ * @param {JsonObject} node
+ * @param {Record<string, string>} params
+ * @returns {JsonObject} — a rebuilt copy of every member, param refs replaced by literals
+ */
+function substituteObjectRefs(node: JsonObject, params: Record<string, string>): JsonObject {
+  const out: JsonObject = {};
   for (const [key, value] of Object.entries(node)) {
     out[key] = substituteParamRefs(value, params);
   }
@@ -358,17 +391,13 @@ function substituteParamRefs(node: unknown, params: Record<string, string>): unk
  * The chosen literal for a `{ "$ref": "#/$params/<name>" }` value, or null when the value is not a
  * param ref (or no value was chosen for it).
  *
- * @param {unknown} value
+ * @param {JsonValue} value
  * @param {Record<string, string>} params
  * @returns {string | null}
  */
-function paramRefValue(value: unknown, params: Record<string, string>) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return null;
-  }
-  const ref = (value as { $ref?: unknown }).$ref;
-  if (typeof ref !== "string" || !ref.startsWith("#/$params/")) {
+function paramRefValue(value: JsonValue, params: Record<string, string>) {
+  if (!isRef(value) || !value.$ref.startsWith("#/$params/")) {
     return null;
   }
-  return params[ref.slice("#/$params/".length)] ?? null;
+  return params[value.$ref.slice("#/$params/".length)] ?? null;
 }

package/src/panels/activity-panel.ts

@@ -42,6 +42,7 @@ import { disposeActivitySurface, mountActivitySurface } from "../surfaces/panel-
 import { reactive } from "../reactivity";
 import { now } from "../services/clock";
 import { notify } from "../services/notify";
+import type { NotifyOptions } from "../services/notify";
 import { registerPanel } from "./panel-registry";
 import type { PanelBody } from "./panel-registry";
 import type {
@@ -189,7 +190,7 @@ export interface ActivityHandle {
  * @returns {ActivityHandle}
  */
 export function beginActivity(options: ActivityOptions): ActivityHandle {
-  const entry: ActivityEntry = {
+  const fields = {
     cancellable: options.cancel !== undefined,
     endedAt: null,
     expanded: false,
@@ -200,8 +201,9 @@ export function beginActivity(options: ActivityOptions): ActivityHandle {
     status: options.status ?? "",
     steps: (options.steps ?? []).map((label) => ({ label, state: "pending" as const })),
     title: options.title,
-    ...(options.source === undefined ? {} : { source: options.source }),
-  };
+  } satisfies ActivityEntry;
+  const entry: ActivityEntry =
+    options.source === undefined ? fields : { ...fields, source: options.source };
   if (options.cancel) {
     _cancels.set(entry.id, options.cancel);
   }
@@ -209,6 +211,7 @@ export function beginActivity(options: ActivityOptions): ActivityHandle {
   // The PROXY, not the literal: writing through the raw object a `reactive()` array was handed
   // Skips every effect depending on it, which is the one bug that would make a running operation
   // Look frozen. Read back before anything is retired, so the reference is unambiguous.
+  // SAFETY: `activities.push(entry)` just above guarantees the array has a last element.
   const live = activities.at(-1) as ActivityEntry;
   retireOldest();
 
@@ -243,12 +246,17 @@ export function beginActivity(options: ActivityOptions): ActivityHandle {
       }
       const detail = live.log.join("\n");
       finish("failed", message);
-      notify.error(message, {
-        source: live.source ?? live.title,
-        ...(detail === "" ? {} : { detail }),
-        ...(opts.action === undefined ? {} : { action: opts.action }),
-        ...(opts.path === undefined ? {} : { path: opts.path }),
-      });
+      const notice: NotifyOptions = { source: live.source ?? live.title };
+      if (detail !== "") {
+        notice.detail = detail;
+      }
+      if (opts.action !== undefined) {
+        notice.action = opts.action;
+      }
+      if (opts.path !== undefined) {
+        notice.path = opts.path;
+      }
+      notify.error(message, notice);
     },
     id: live.id,
     log(chunk: string) {

package/src/panels/ai-chat/attached-context.ts

@@ -1,13 +1,13 @@
 /**
  * Attached-context.js — the composer's "attach context" message-content convention.
  *
- * Attached context (current page, selected element) is embedded into the user message
- * content after a delimiter line: it's the only channel the LLM sees (the streaming
- * payload carries message content only) and it persists with the session for free.
- * The chat view splits the content back apart to show chips instead of the raw block.
+ * Attached context (current page, selected element) is embedded into the user message content after
+ * a delimiter line: it's the only channel the LLM sees (the streaming payload carries message
+ * content only) and it persists with the session for free. The chat view splits the content back
+ * apart to show chips instead of the raw block.
  *
- * The delimiter is a soft convention — a model echoing it would at worst render stray
- * chips (no security impact; assistant markdown is sanitized separately).
+ * The delimiter is a soft convention — a model echoing it would at worst render stray chips (no
+ * security impact; assistant markdown is sanitized separately).
  *
  * @license MIT
  */
@@ -36,8 +36,14 @@ export function buildMessageWithContext(text: string, chips: ContextChip[]): str
   return `${text}\n\n${ATTACHED_CONTEXT_DELIMITER}\n${lines}`;
 }
 
+/** A user message split into its typed body and its attached-context lines. */
+export interface SplitMessage {
+  body: string;
+  contextLines: string[];
+}
+
 /** Split a user message back into its typed body and any attached-context lines. */
-export function splitAttachedContext(content: string): { body: string; contextLines: string[] } {
+export function splitAttachedContext(content: string): SplitMessage {
   const idx = content.indexOf(`\n\n${ATTACHED_CONTEXT_DELIMITER}\n`);
   if (idx === -1) {
     return { body: content, contextLines: [] };