Use <dialog> for modals, guard on falsy update return, and relax gloss/senseRef constraint

- Replace `<div>` containers with `<dialog open aria-labelledby="…">` in `CreateProjectModal`, `ProjectMetadataModal`, and `SelectInterlinearProjectModal` for proper accessibility semantics.
- In `ProjectMetadataModal.handleSave`, return early when `updateProjectMetadata` resolves with a falsy value (mirrors the existing guard in `CreateProjectModal.handleCreate`).
- In `interlinearizer.d.ts`, replace the discriminated union on `Token` and `Phrase` that forbade setting both `gloss`/`glossSenseRef` (or `gloss`/`senseRef`) with optional fields, reflecting the updated rule that `gloss` serves as a local override when both are present.
- Add a test for the falsy-return early-exit path in `ProjectMetadataModal`, and add the missing `waitFor` before negative assertions in the `CreateProjectModal` falsy-return test.

Author: alex-rawlings-yyc

src/__tests__/components/CreateProjectModal.test.tsx

@@ -159,6 +159,7 @@ describe('CreateProjectModal', () => {
 
     await userEvent.click(screen.getByRole('button', { name: /^create$/i }));
 
+    await waitFor(() => expect(papi.commands.sendCommand).toHaveBeenCalled());
     expect(onProjectCreated).not.toHaveBeenCalled();
     expect(onClose).not.toHaveBeenCalled();
   });

src/__tests__/components/ProjectMetadataModal.test.tsx

@@ -43,7 +43,7 @@ const testProps = {
 describe('ProjectMetadataModal', () => {
   beforeEach(() => {
     jest.mocked(useLocalizedStrings).mockReturnValue([LOCALIZED, false]);
-    mockSendCommand.mockResolvedValue(undefined);
+    mockSendCommand.mockResolvedValue('{}');
     jest.mocked(papi.notifications.send).mockResolvedValue('mock-notification-id');
   });
 
@@ -193,6 +193,21 @@ describe('ProjectMetadataModal', () => {
     );
   });
 
+  it('does not call onProjectSaved or onClose when save sendCommand resolves with a falsy value', async () => {
+    mockSendCommand.mockResolvedValue(undefined);
+    const onProjectSaved = jest.fn();
+    const onClose = jest.fn();
+    render(
+      <ProjectMetadataModal {...testProps} onProjectSaved={onProjectSaved} onClose={onClose} />,
+    );
+
+    await userEvent.click(screen.getByRole('button', { name: /^save$/i }));
+
+    await waitFor(() => expect(mockSendCommand).toHaveBeenCalled());
+    expect(onProjectSaved).not.toHaveBeenCalled();
+    expect(onClose).not.toHaveBeenCalled();
+  });
+
   it('does not call onProjectSaved or onClose when save sendCommand rejects, but sends an error notification', async () => {
     mockSendCommand.mockRejectedValue(new Error('save failed'));
     const onProjectSaved = jest.fn();

src/components/CreateProjectModal.tsx

@@ -82,8 +82,12 @@ export function CreateProjectModal({
 
   return (
     <div className="tw-fixed tw-inset-0 tw-z-50 tw-flex tw-items-center tw-justify-center tw-bg-black/40">
-      <div className="tw-bg-background tw-rounded tw-border tw-border-border tw-p-6 tw-w-96 tw-shadow-lg">
-        <h2 className="tw-text-base tw-font-semibold tw-mb-4">
+      <dialog
+        aria-labelledby="create-project-modal-title"
+        className="tw-bg-background tw-rounded tw-border tw-border-border tw-p-6 tw-w-96 tw-shadow-lg"
+        open
+      >
+        <h2 id="create-project-modal-title" className="tw-text-base tw-font-semibold tw-mb-4">
           {localizedStrings['%interlinearizer_modal_create_title%']}
         </h2>
         <label className="tw-block tw-text-sm tw-mb-1" htmlFor="project-name">
@@ -125,7 +129,7 @@ export function CreateProjectModal({
             {localizedStrings['%interlinearizer_modal_create_submit%']}
           </Button>
         </div>
-      </div>
+      </dialog>
     </div>
   );
 }

src/components/ProjectMetadataModal.tsx

@@ -92,13 +92,14 @@ export function ProjectMetadataModal({
     const newDescription = editDescription || undefined;
     const newLanguage = editLanguage.trim();
     try {
-      await papi.commands.sendCommand(
+      const updatedProjectJson = await papi.commands.sendCommand(
         'interlinearizer.updateProjectMetadata',
         interlinearProjectId,
         newName,
         newDescription,
         newLanguage,
       );
+      if (!updatedProjectJson) return;
       onProjectSaved?.({
         name: newName,
         description: newDescription,
@@ -136,8 +137,12 @@ export function ProjectMetadataModal({
 
   return (
     <div className="tw-fixed tw-inset-0 tw-z-50 tw-flex tw-items-center tw-justify-center tw-bg-black/40">
-      <div className="tw-bg-background tw-rounded-lg tw-border tw-border-border tw-p-6 tw-w-[32rem] tw-shadow-lg">
-        <h2 className="tw-text-base tw-font-semibold tw-mb-4">
+      <dialog
+        aria-labelledby="project-metadata-modal-title"
+        className="tw-bg-background tw-rounded-lg tw-border tw-border-border tw-p-6 tw-w-[32rem] tw-shadow-lg"
+        open
+      >
+        <h2 id="project-metadata-modal-title" className="tw-text-base tw-font-semibold tw-mb-4">
           {localizedStrings['%interlinearizer_modal_metadata_title%']}
         </h2>
 
@@ -249,7 +254,7 @@ export function ProjectMetadataModal({
             </div>
           </div>
         )}
-      </div>
+      </dialog>
     </div>
   );
 }

src/components/SelectInterlinearProjectModal.tsx

@@ -127,8 +127,12 @@ export function SelectInterlinearProjectModal({
 
   return (
     <div className="tw-fixed tw-inset-0 tw-z-50 tw-flex tw-items-center tw-justify-center tw-bg-black/40">
-      <div className="tw-bg-background tw-rounded-lg tw-border tw-border-border tw-p-6 tw-w-[32rem] tw-shadow-lg">
-        <h2 className="tw-text-base tw-font-semibold tw-mb-4">
+      <dialog
+        aria-labelledby="select-project-modal-title"
+        className="tw-bg-background tw-rounded-lg tw-border tw-border-border tw-p-6 tw-w-[32rem] tw-shadow-lg"
+        open
+      >
+        <h2 id="select-project-modal-title" className="tw-text-base tw-font-semibold tw-mb-4">
           {localizedStrings['%interlinearizer_modal_select_title%']}
         </h2>
 
@@ -175,7 +179,7 @@ export function SelectInterlinearProjectModal({
             {localizedStrings['%interlinearizer_modal_select_create_new%']}
           </Button>
         </div>
-      </div>
+      </dialog>
     </div>
   );
 }

src/types/interlinearizer.d.ts

@@ -640,7 +640,8 @@ declare module 'interlinearizer' {
    * `gloss` is a free-form gloss string for the token (keyed by analysis-language tag).
    * `glossSenseRef` alternatively resolves the gloss through a specific `ISense` in the Lexicon
    * extension — when set, the rendered gloss is the sense's gloss text and may be refreshed
-   * automatically if the lexicon is edited. Setting both is a type error: use one or the other.
+   * automatically if the lexicon is edited. Both may be set concurrently: when both are present,
+   * `gloss` serves as a local override that takes precedence for rendering.
    *
    * `morphemes` carries the parse information. Each morpheme links to the Lexicon extension via
    * `entryRef` / `senseRef`.
@@ -719,16 +720,21 @@ declare module 'interlinearizer' {
      * becomes a concern (token text is typically short, so the literal string is usually fine).
      */
     tokenSnapshot?: string;
-  } &
+
     /**
-     * Exactly one of `gloss` or `glossSenseRef` may be set, or neither — but never both. Use
-     * `gloss` for a free-form string; use `glossSenseRef` to derive the rendered gloss from a
-     * Lexicon sense (enabling automatic refresh when the lexicon is edited).
+     * Free-form gloss string for this token, keyed by analysis-language BCP 47 tag. May coexist
+     * with `glossSenseRef` when the user has both a local override and a lexicon-backed sense — the
+     * local gloss takes precedence for rendering in that case.
      */
-    (| { gloss: MultiString; glossSenseRef?: never }
-      | { glossSenseRef: SenseRef; gloss?: never }
-      | { gloss?: never; glossSenseRef?: never }
-    );
+    gloss?: MultiString;
+
+    /**
+     * Resolves the gloss through a specific `ISense` in the Lexicon extension, enabling automatic
+     * refresh when the lexicon is edited. May coexist with `gloss` when the user maintains both a
+     * lexicon-linked sense and a local override.
+     */
+    glossSenseRef?: SenseRef;
+  };
 
   /**
    * An ordered morpheme within a token's parse.
@@ -811,8 +817,9 @@ declare module 'interlinearizer' {
    *
    * `gloss` is a free-form phrase gloss. `senseRef` alternatively points at a lexicon sense when
    * the phrase is a multi-word lexical entry — the Lexicon extension supports both kinds via
-   * `IEntry.morphType = Phrase` (contiguous) or `DiscontiguousPhrase` (e.g. "ne … pas"). Setting
-   * both is a type error: use one or the other.
+   * `IEntry.morphType = Phrase` (contiguous) or `DiscontiguousPhrase` (e.g. "ne … pas"). Both may
+   * be set concurrently: when both are present, `gloss` serves as a local override that takes
+   * precedence for rendering.
    *
    * Provenance fields (`producer`, `sourceUser`, `confidence`, `status`) let a suggestion engine
    * record proposed phrases that a user can then approve or reject, enabling automated recognition
@@ -866,16 +873,22 @@ declare module 'interlinearizer' {
      * maintain this alignment when filtering or transforming tokens.
      */
     tokenSnapshots?: [string, ...string[]];
-  } &
+
     /**
-     * Exactly one of `gloss` or `senseRef` may be set, or neither — but never both. Use `gloss` for
-     * a free-form phrase gloss; use `senseRef` when the phrase is a multi-word lexical entry in the
-     * Lexicon extension (enabling automatic gloss refresh).
+     * Free-form phrase gloss keyed by analysis-language BCP 47 tag. May coexist with `senseRef`
+     * when the user has both a local override and a lexicon-backed sense — the local gloss takes
+     * precedence for rendering in that case.
      */
-    (| { gloss: MultiString; senseRef?: never }
-      | { senseRef: SenseRef; gloss?: never }
-      | { gloss?: never; senseRef?: never }
-    );
+    gloss?: MultiString;
+
+    /**
+     * Points at a multi-word lexical entry in the Lexicon extension (e.g. `IEntry.morphType =
+     * Phrase` or `DiscontiguousPhrase`), enabling automatic gloss refresh when the lexicon is
+     * edited. May coexist with `gloss` when the user maintains both a lexicon-linked sense and a
+     * local override.
+     */
+    senseRef?: SenseRef;
+  };
 
   // ---------------------------------------------------------------------------
   // §7 AlignmentLink, AlignmentEndpoint