From 320fcf238ebe1317ea688668d6b403766d845852 Mon Sep 17 00:00:00 2001
From: Bryan <bryan.duran@jpl.nasa.gov>
Date: Wed, 26 Feb 2025 12:33:28 -0800
Subject: [PATCH] Reorganize Phoenix Editor files to be a little more
 discoverable (#1635)

---
 src/components/parcels/DictionaryTable.svelte |  18 +-
 .../sequencing/CommandPanel/CommandArg.svelte |   2 +-
 .../CommandPanel/CommandDictionary.svelte     |   2 +-
 .../CommandPanel/CommandNumberArgDef.svelte   |   2 +-
 .../CommandPanel/CommandPanel.svelte          |   2 +-
 .../CommandPanel/CommandStringArgDef.svelte   |   2 +-
 .../CommandPanel/SelectedCommand.svelte       |   4 +-
 .../CommandPanel/TimeTagEditor.svelte         |   2 +-
 .../sequencing/SequenceEditor.svelte          | 217 +++++-------------
 src/components/sequencing/SequenceForm.svelte |   2 +
 src/components/sequencing/Sequences.svelte    |   2 +-
 .../sequencing/form/ArgEditor.svelte          |   4 +-
 .../sequencing/form/ArgTitle.svelte           |  46 ++--
 .../sequencing/form/ByteArrayEditor.svelte    |   4 +-
 .../sequencing/form/NumEditor.svelte          |   2 +-
 .../sequencing/form/StringEditor.svelte       |   2 +-
 .../sequencing/form/TimeTagEditor.svelte      |   2 +-
 src/components/ui/DataGrid/DataGrid.svelte    |   9 +-
 .../ui/DatePicker/DatePicker.svelte           |   8 +-
 src/constants/seq-n-grammar-constants.ts      |   1 -
 src/stores/sequence-adaptation.ts             |   9 +-
 src/stores/sequencing.ts                      |  28 ++-
 src/types/sequencing.ts                       |  40 ++--
 src/utilities/effects.ts                      |  33 +--
 .../command-info-mapper.ts}                   |   0
 .../sequence-editor/extension-points.ts       |  32 ++-
 .../sequence-editor/from-seq-json.ts          |   2 +-
 src/utilities/sequence-editor/grammar.test.ts |   2 +-
 .../languages}/satf/sasf.test.ts              |   0
 .../languages/satf/satf-constants.ts}         |   0
 .../languages}/satf/satf-sasf-utils.test.ts   |   0
 .../languages}/satf/satf-sasf-utils.ts        |   8 +-
 .../languages}/satf/satf-sasf.grammar         |   0
 .../languages}/satf/satf-sasf.grammar.d.ts    |   0
 .../languages}/satf/satf.test.ts              |   0
 .../languages}/satf/satf.ts                   |   2 +-
 .../languages/seq-n}/custom-folder.test.ts    |   4 +-
 .../languages/seq-n}/custom-folder.ts         |   4 +-
 .../languages/seq-n}/seq-n-highlighter.ts     |   6 +-
 .../languages/seq-n}/seq-n-tree-utils.ts      |  18 +-
 .../languages/seq-n/seq-n.grammar}            |   0
 .../languages/seq-n/seq-n.grammar.d.ts}       |   0
 .../languages/seq-n/seq-n.ts}                 |   2 +-
 .../languages/vml/cdl-dictionary.test.ts}     |   2 +-
 .../languages/vml/cdl-dictionary.ts}          |   0
 .../languages/vml/vml-adaptation.ts}          |  36 ++-
 .../languages/vml/vml-block-library.ts}       |   6 +-
 .../languages/vml/vml-constants.ts}           |   0
 .../languages/vml/vml-folder.ts}              |   2 +-
 .../languages/vml/vml-formatter.ts}           |   6 +-
 .../languages/vml/vml-linter.ts}              |  12 +-
 .../languages/vml/vml-snippets.ts}            |   2 +-
 .../languages/vml/vml-tooltip.ts}             |  20 +-
 .../languages/vml/vml-tree-utils.test.ts}     |   9 +-
 .../languages/vml/vml-tree-utils.ts}          |  10 +-
 .../languages}/vml/vml.grammar                |   0
 .../languages}/vml/vml.grammar.d.ts           |   0
 .../languages}/vml/vml.test.ts                |   6 +-
 .../languages}/vml/vml.ts                     |  14 +-
 .../sequence-editor/sequence-autoindent.ts    |   2 +-
 .../sequence-editor/sequence-completion.ts    |  25 +-
 .../sequence-editor/sequence-constants.ts     |   1 +
 .../sequence-editor/sequence-linter.ts        |  59 +++--
 .../sequence-editor/sequence-tooltip.ts       |   5 +-
 .../sequence-utils.test.ts}                   |   2 +-
 .../sequence-utils.ts}                        | 151 +++++++++++-
 .../sequence-editor/to-seq-json.test.ts       |   4 +-
 src/utilities/sequence-editor/to-seq-json.ts  |   2 +-
 src/utilities/sequence-editor/token.test.ts   |   2 +-
 69 files changed, 507 insertions(+), 394 deletions(-)
 rename src/utilities/{codemirror/commandInfoMapper.ts => sequence-editor/command-info-mapper.ts} (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/satf/sasf.test.ts (100%)
 rename src/utilities/{codemirror/satf/satfConstants.ts => sequence-editor/languages/satf/satf-constants.ts} (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/satf/satf-sasf-utils.test.ts (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/satf/satf-sasf-utils.ts (99%)
 rename src/utilities/{codemirror => sequence-editor/languages}/satf/satf-sasf.grammar (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/satf/satf-sasf.grammar.d.ts (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/satf/satf.test.ts (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/satf/satf.ts (97%)
 rename src/utilities/{codemirror => sequence-editor/languages/seq-n}/custom-folder.test.ts (99%)
 rename src/utilities/{codemirror => sequence-editor/languages/seq-n}/custom-folder.ts (99%)
 rename src/utilities/{codemirror => sequence-editor/languages/seq-n}/seq-n-highlighter.ts (92%)
 rename src/utilities/{codemirror => sequence-editor/languages/seq-n}/seq-n-tree-utils.ts (86%)
 rename src/utilities/{codemirror/sequence.grammar => sequence-editor/languages/seq-n/seq-n.grammar} (100%)
 rename src/utilities/{codemirror/sequence.grammar.d.ts => sequence-editor/languages/seq-n/seq-n.grammar.d.ts} (100%)
 rename src/utilities/{codemirror/index.ts => sequence-editor/languages/seq-n/seq-n.ts} (98%)
 rename src/utilities/{codemirror/cdlDictionary.test.ts => sequence-editor/languages/vml/cdl-dictionary.test.ts} (98%)
 rename src/utilities/{codemirror/cdlDictionary.ts => sequence-editor/languages/vml/cdl-dictionary.ts} (100%)
 rename src/utilities/{codemirror/vml/vmlAdaptation.ts => sequence-editor/languages/vml/vml-adaptation.ts} (93%)
 rename src/utilities/{codemirror/vml/vmlBlockLibrary.ts => sequence-editor/languages/vml/vml-block-library.ts} (98%)
 rename src/utilities/{codemirror/vml/vmlConstants.ts => sequence-editor/languages/vml/vml-constants.ts} (100%)
 rename src/utilities/{codemirror/vml/vmlFolder.ts => sequence-editor/languages/vml/vml-folder.ts} (99%)
 rename src/utilities/{codemirror/vml/vmlFormatter.ts => sequence-editor/languages/vml/vml-formatter.ts} (98%)
 rename src/utilities/{codemirror/vml/vmlLinter.ts => sequence-editor/languages/vml/vml-linter.ts} (97%)
 rename src/utilities/{codemirror/vml/vmlSnippets.ts => sequence-editor/languages/vml/vml-snippets.ts} (98%)
 rename src/utilities/{codemirror/vml/vmlTooltip.ts => sequence-editor/languages/vml/vml-tooltip.ts} (89%)
 rename src/utilities/{codemirror/vml/vmlTreeUtils.test.ts => sequence-editor/languages/vml/vml-tree-utils.test.ts} (95%)
 rename src/utilities/{codemirror/vml/vmlTreeUtils.ts => sequence-editor/languages/vml/vml-tree-utils.ts} (96%)
 rename src/utilities/{codemirror => sequence-editor/languages}/vml/vml.grammar (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/vml/vml.grammar.d.ts (100%)
 rename src/utilities/{codemirror => sequence-editor/languages}/vml/vml.test.ts (98%)
 rename src/utilities/{codemirror => sequence-editor/languages}/vml/vml.ts (95%)
 create mode 100644 src/utilities/sequence-editor/sequence-constants.ts
 rename src/utilities/{codemirror/codemirror-utils.test.ts => sequence-editor/sequence-utils.test.ts} (99%)
 rename src/utilities/{codemirror/codemirror-utils.ts => sequence-editor/sequence-utils.ts} (58%)

diff --git a/src/components/parcels/DictionaryTable.svelte b/src/components/parcels/DictionaryTable.svelte
index c94dc1aef5..72e26d060f 100644
--- a/src/components/parcels/DictionaryTable.svelte
+++ b/src/components/parcels/DictionaryTable.svelte
@@ -5,13 +5,13 @@
   import { createEventDispatcher } from 'svelte';
   import type { User } from '../../types/app';
   import type { DataGridColumnDef, DataGridRowSelection, RowId } from '../../types/data-grid';
-  import type { DictionaryType } from '../../types/sequencing';
+  import type { DictionaryMetadata } from '../../types/sequencing';
   import DataGridActions from '../ui/DataGrid/DataGridActions.svelte';
   import SingleActionDataGrid from '../ui/DataGrid/SingleActionDataGrid.svelte';
   import Panel from '../ui/Panel.svelte';
   import SectionTitle from '../ui/SectionTitle.svelte';
 
-  export let dictionaries: DictionaryType[];
+  export let dictionaries: DictionaryMetadata[];
   export let selectedDictionaryIds: Record<number, boolean> = {};
   export let isEditingDictionaries: boolean = false;
   export let isEditingParcel: boolean = false;
@@ -22,7 +22,7 @@
   export let user: User | null;
 
   let columnDefs: DataGridColumnDef[];
-  let dictionaryDataGrid: SingleActionDataGrid<DictionaryType> | undefined = undefined;
+  let dictionaryDataGrid: SingleActionDataGrid<DictionaryMetadata> | undefined = undefined;
   let dictionaryColumnDefs: DataGridColumnDef[];
   let displayText: string = '';
   let displayTextPlural: string = '';
@@ -37,9 +37,9 @@
   }>();
 
   type CellRendererParams = {
-    deleteDictionary?: (dictionary: DictionaryType) => void;
+    deleteDictionary?: (dictionary: DictionaryMetadata) => void;
   };
-  type DictionaryCellRendererParams = ICellRendererParams<DictionaryType> & CellRendererParams;
+  type DictionaryCellRendererParams = ICellRendererParams<DictionaryMetadata> & CellRendererParams;
 
   $: isSequenceAdaptation = type === 'Sequence';
   $: displayText = isSequenceAdaptation ? `${type} Adaptation` : `${type} Dictionary`;
@@ -90,7 +90,7 @@
       headerName: '',
       suppressAutoSize: true,
       suppressSizeToFit: true,
-      valueGetter: (params: ValueGetterParams<DictionaryType>) => {
+      valueGetter: (params: ValueGetterParams<DictionaryMetadata>) => {
         const { data } = params;
 
         if (data) {
@@ -150,7 +150,7 @@
     ...(isEditingDictionaries ? editingDictionariesColumnDefs : []),
   ];
 
-  function deleteDictionary({ id }: Pick<DictionaryType, 'id'>) {
+  function deleteDictionary({ id }: Pick<DictionaryMetadata, 'id'>) {
     dispatch('delete', { id });
   }
 
@@ -162,7 +162,7 @@
    * Called when a row is clicked on.
    * @param event
    */
-  function onRowClicked(event: CustomEvent<DataGridRowSelection<DictionaryType>>) {
+  function onRowClicked(event: CustomEvent<DataGridRowSelection<DictionaryMetadata>>) {
     const currentValue = selectedDictionaryIds[event.detail.data.id];
 
     selectRow(event.detail.data.id, currentValue === undefined ? true : !currentValue);
@@ -172,7 +172,7 @@
    * Called when a checkbox is selected.
    * @param event
    */
-  function onToggle(event: CustomEvent<CellEditingStoppedEvent<DictionaryType, boolean>>) {
+  function onToggle(event: CustomEvent<CellEditingStoppedEvent<DictionaryMetadata, boolean>>) {
     const {
       detail: { data, newValue },
     } = event;
diff --git a/src/components/sequencing/CommandPanel/CommandArg.svelte b/src/components/sequencing/CommandPanel/CommandArg.svelte
index 1f8fa9be22..5c7516aa00 100644
--- a/src/components/sequencing/CommandPanel/CommandArg.svelte
+++ b/src/components/sequencing/CommandPanel/CommandArg.svelte
@@ -8,7 +8,7 @@
     isFswCommandArgumentRepeat,
     isNumberArg,
     isStringArg,
-  } from '../../../utilities/codemirror/codemirror-utils';
+  } from '../../../utilities/sequence-editor/sequence-utils';
   import CommandBooleanArgDef from './CommandBooleanArgDef.svelte';
   import CommandEnumArgDef from './CommandEnumArgDef.svelte';
   import CommandNumberArgDef from './CommandNumberArgDef.svelte';
diff --git a/src/components/sequencing/CommandPanel/CommandDictionary.svelte b/src/components/sequencing/CommandPanel/CommandDictionary.svelte
index 20ef58a0c8..ea4b559a5d 100644
--- a/src/components/sequencing/CommandPanel/CommandDictionary.svelte
+++ b/src/components/sequencing/CommandPanel/CommandDictionary.svelte
@@ -7,8 +7,8 @@
   import SearchIcon from '@nasa-jpl/stellar/icons/search.svg?component';
   import CopyIcon from 'bootstrap-icons/icons/copy.svg?component';
   import { createEventDispatcher } from 'svelte';
-  import { isFswCommand, isFswCommandArgumentEnum } from '../../../utilities/codemirror/codemirror-utils';
   import { getTarget } from '../../../utilities/generic';
+  import { isFswCommand, isFswCommandArgumentEnum } from '../../../utilities/sequence-editor/sequence-utils';
   import { showFailureToast, showSuccessToast } from '../../../utilities/toast';
   import { tooltip } from '../../../utilities/tooltip';
   import Input from '../../form/Input.svelte';
diff --git a/src/components/sequencing/CommandPanel/CommandNumberArgDef.svelte b/src/components/sequencing/CommandPanel/CommandNumberArgDef.svelte
index 1690cba942..24feebb2f0 100644
--- a/src/components/sequencing/CommandPanel/CommandNumberArgDef.svelte
+++ b/src/components/sequencing/CommandPanel/CommandNumberArgDef.svelte
@@ -12,7 +12,7 @@
     isFswCommandArgumentInteger,
     isFswCommandArgumentNumeric,
     isFswCommandArgumentUnsigned,
-  } from '../../../utilities/codemirror/codemirror-utils';
+  } from '../../../utilities/sequence-editor/sequence-utils';
   import Collapse from '../../Collapse.svelte';
   import CommandArgUnit from './CommandArgUnit.svelte';
 
diff --git a/src/components/sequencing/CommandPanel/CommandPanel.svelte b/src/components/sequencing/CommandPanel/CommandPanel.svelte
index 72b09a93ba..673a42e48b 100644
--- a/src/components/sequencing/CommandPanel/CommandPanel.svelte
+++ b/src/components/sequencing/CommandPanel/CommandPanel.svelte
@@ -5,7 +5,7 @@
   import type { CommandDictionary, FswCommand, HwCommand } from '@nasa-jpl/aerie-ampcs';
   import type { EditorView } from 'codemirror';
   import type { ArgTextDef, TimeTagInfo } from '../../../types/sequencing';
-  import type { CommandInfoMapper } from '../../../utilities/codemirror/commandInfoMapper';
+  import type { CommandInfoMapper } from '../../../utilities/sequence-editor/command-info-mapper';
   import Tab from '../../ui/Tabs/Tab.svelte';
   import TabPanel from '../../ui/Tabs/TabPanel.svelte';
   import Tabs from '../../ui/Tabs/Tabs.svelte';
diff --git a/src/components/sequencing/CommandPanel/CommandStringArgDef.svelte b/src/components/sequencing/CommandPanel/CommandStringArgDef.svelte
index 4f20d54f45..4212f4d4cd 100644
--- a/src/components/sequencing/CommandPanel/CommandStringArgDef.svelte
+++ b/src/components/sequencing/CommandPanel/CommandStringArgDef.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import type { FswCommandArgumentFixedString, FswCommandArgumentVarString } from '@nasa-jpl/aerie-ampcs';
-  import { isFswCommandArgumentVarString } from '../../../utilities/codemirror/codemirror-utils';
+  import { isFswCommandArgumentVarString } from '../../../utilities/sequence-editor/sequence-utils';
   import Collapse from '../../Collapse.svelte';
   import CommandArgUnit from './CommandArgUnit.svelte';
 
diff --git a/src/components/sequencing/CommandPanel/SelectedCommand.svelte b/src/components/sequencing/CommandPanel/SelectedCommand.svelte
index 5b6d8b7e5c..de282f060c 100644
--- a/src/components/sequencing/CommandPanel/SelectedCommand.svelte
+++ b/src/components/sequencing/CommandPanel/SelectedCommand.svelte
@@ -14,12 +14,12 @@
   import { debounce } from 'lodash-es';
   import { createEventDispatcher } from 'svelte';
   import type { ArgTextDef, TimeTagInfo } from '../../../types/sequencing';
-  import type { CommandInfoMapper } from '../../../utilities/codemirror/commandInfoMapper';
+  import type { CommandInfoMapper } from '../../../utilities/sequence-editor/command-info-mapper';
+  import { addDefaultArgs, getMissingArgDefs } from '../../../utilities/sequence-editor/sequence-utils';
   import { tooltip } from '../../../utilities/tooltip';
   import AddMissingArgsButton from '../form/AddMissingArgsButton.svelte';
   import ArgEditor from '../form/ArgEditor.svelte';
   import StringEditor from '../form/StringEditor.svelte';
-  import { addDefaultArgs, getMissingArgDefs } from './../../../utilities/codemirror/codemirror-utils';
 
   export let argInfoArray: ArgTextDef[] = [];
   export let commandDef: (FswCommand | HwCommand) | null = null;
diff --git a/src/components/sequencing/CommandPanel/TimeTagEditor.svelte b/src/components/sequencing/CommandPanel/TimeTagEditor.svelte
index 7f4208d081..109ab0f68b 100644
--- a/src/components/sequencing/CommandPanel/TimeTagEditor.svelte
+++ b/src/components/sequencing/CommandPanel/TimeTagEditor.svelte
@@ -1,7 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import { SeqLanguage } from '../../../utilities/codemirror';
+  import { SeqLanguage } from '../../../utilities/sequence-editor/languages/seq-n/seq-n';
 
   export let initVal: string;
   export let setInEditor: (val: string) => void;
diff --git a/src/components/sequencing/SequenceEditor.svelte b/src/components/sequencing/SequenceEditor.svelte
index 461cc96719..a97c6158cb 100644
--- a/src/components/sequencing/SequenceEditor.svelte
+++ b/src/components/sequencing/SequenceEditor.svelte
@@ -7,14 +7,7 @@
   import { Compartment, EditorState } from '@codemirror/state';
   import { type ViewUpdate } from '@codemirror/view';
   import type { SyntaxNode, Tree } from '@lezer/common';
-  import type {
-    ChannelDictionary,
-    CommandDictionary,
-    FswCommand,
-    FswCommandArgument,
-    FswCommandArgumentRepeat,
-    ParameterDictionary,
-  } from '@nasa-jpl/aerie-ampcs';
+  import type { ChannelDictionary, CommandDictionary, FswCommand, ParameterDictionary } from '@nasa-jpl/aerie-ampcs';
   import ChevronDownIcon from '@nasa-jpl/stellar/icons/chevron_down.svg?component';
   import CollapseIcon from 'bootstrap-icons/icons/arrow-bar-down.svg?component';
   import ExpandIcon from 'bootstrap-icons/icons/arrow-bar-up.svg?component';
@@ -23,10 +16,10 @@
   import { basicSetup, EditorView } from 'codemirror';
   import { debounce } from 'lodash-es';
   import { createEventDispatcher, onDestroy, onMount } from 'svelte';
-  import { TOKEN_ERROR } from '../../constants/seq-n-grammar-constants';
   import {
+    getGlobals,
     inputFormat,
-    outputFormat,
+    outputFormat as outputFormatStore,
     sequenceAdaptation,
     setSequenceAdaptation,
   } from '../../stores/sequence-adaptation';
@@ -46,35 +39,49 @@
   import {
     type ArgTextDef,
     type IOutputFormat,
-    type ISequenceAdaptation,
     type LibrarySequence,
     type LibrarySequenceMap,
     type Parcel,
     type TimeTagInfo,
   } from '../../types/sequencing';
-  import { setupLanguageSupport } from '../../utilities/codemirror';
-  import { isFswCommandArgumentRepeat, unquoteUnescape } from '../../utilities/codemirror/codemirror-utils';
-  import type { CommandInfoMapper } from '../../utilities/codemirror/commandInfoMapper';
-  import { seqNHighlightBlock, seqqNBlockHighlighter } from '../../utilities/codemirror/seq-n-highlighter';
-  import { SeqNCommandInfoMapper, userSequenceToLibrarySequence } from '../../utilities/codemirror/seq-n-tree-utils';
   import { blockTheme } from '../../utilities/codemirror/themes/block';
+  import effects from '../../utilities/effects';
+  import { downloadBlob, downloadJSON } from '../../utilities/generic';
+  import type { CommandInfoMapper } from '../../utilities/sequence-editor/command-info-mapper';
+  import { inputLinter, outputLinter } from '../../utilities/sequence-editor/extension-points';
+  import { setupLanguageSupport } from '../../utilities/sequence-editor/languages/seq-n/seq-n';
+  import {
+    seqNHighlightBlock,
+    seqqNBlockHighlighter,
+  } from '../../utilities/sequence-editor/languages/seq-n/seq-n-highlighter';
+  import {
+    SeqNCommandInfoMapper,
+    userSequenceToLibrarySequence,
+  } from '../../utilities/sequence-editor/languages/seq-n/seq-n-tree-utils';
   import {
     setupVmlLanguageSupport,
     vmlAdaptation,
     vmlBlockHighlighter,
     vmlHighlightBlock,
-  } from '../../utilities/codemirror/vml/vml';
-  import { parseFunctionSignatures, vmlAutoComplete } from '../../utilities/codemirror/vml/vmlAdaptation';
-  import { librarySequenceToFswCommand } from '../../utilities/codemirror/vml/vmlBlockLibrary';
-  import { vmlFormat } from '../../utilities/codemirror/vml/vmlFormatter';
-  import { vmlLinter } from '../../utilities/codemirror/vml/vmlLinter';
-  import { vmlTooltip } from '../../utilities/codemirror/vml/vmlTooltip';
-  import { VmlCommandInfoMapper } from '../../utilities/codemirror/vml/vmlTreeUtils';
-  import effects from '../../utilities/effects';
-  import { downloadBlob, downloadJSON } from '../../utilities/generic';
-  import { getCustomArgDef, inputLinter, outputLinter } from '../../utilities/sequence-editor/extension-points';
+  } from '../../utilities/sequence-editor/languages/vml/vml';
+  import {
+    parseFunctionSignatures,
+    vmlAutoComplete,
+  } from '../../utilities/sequence-editor/languages/vml/vml-adaptation';
+  import { vmlFormat } from '../../utilities/sequence-editor/languages/vml/vml-formatter';
+  import { vmlLinter } from '../../utilities/sequence-editor/languages/vml/vml-linter';
+  import { vmlTooltip } from '../../utilities/sequence-editor/languages/vml/vml-tooltip';
+  import { VmlCommandInfoMapper } from '../../utilities/sequence-editor/languages/vml/vml-tree-utils';
   import { seqNFormat } from '../../utilities/sequence-editor/sequence-autoindent';
   import { sequenceTooltip } from '../../utilities/sequence-editor/sequence-tooltip';
+  import {
+    getArgumentInfo,
+    getCommandDef,
+    getTimeTagInfo,
+    getVariablesInScope,
+    isVmlSequence,
+    unquoteUnescape,
+  } from '../../utilities/sequence-editor/sequence-utils';
   import { showFailureToast, showSuccessToast } from '../../utilities/toast';
   import { tooltip } from '../../utilities/tooltip';
   import Menu from '../menus/Menu.svelte';
@@ -102,8 +109,6 @@
   const debouncedSeqNHighlightBlock = debounce(seqNHighlightBlock, 250);
   const debouncedVmlHighlightBlock = debounce(vmlHighlightBlock, 250);
 
-  let clientHeightGridRightBottom: number = 0;
-  let clientHeightGridRightTop: number = 0;
   let compartmentSeqJsonLinter: Compartment;
   let compartmentSeqLanguage: Compartment;
   let compartmentSeqLinter: Compartment;
@@ -140,11 +145,9 @@
   let timeTagNode: TimeTagInfo = null;
   let variablesInScope: string[] = [];
 
-  $: {
-    loadSequenceAdaptation(parcel?.sequence_adaptation_id);
-  }
+  $: loadSequenceAdaptation(parcel?.sequence_adaptation_id);
 
-  $: isInVmlMode = inVmlMode(sequenceName);
+  $: isInVmlMode = isVmlSequence(sequenceName);
 
   $: {
     if (editorSequenceView) {
@@ -189,9 +192,7 @@
         p => p.parameter_dictionary_id === pd.id && p.parcel_id === parcel?.id,
       );
 
-      if (parameterDictionary) {
-        return pd;
-      }
+      return parameterDictionary != null;
     });
 
     if (isInVmlMode) {
@@ -258,6 +259,8 @@
               ),
               compartmentSeqLinter.reconfigure(
                 inputLinter(
+                  $sequenceAdaptation,
+                  getGlobals(),
                   parsedChannelDictionary,
                   parsedCommandDictionary,
                   nonNullParsedParameterDictionaries,
@@ -265,7 +268,12 @@
                 ),
               ),
               compartmentSeqTooltip.reconfigure(
-                sequenceTooltip(parsedChannelDictionary, parsedCommandDictionary, nonNullParsedParameterDictionaries),
+                sequenceTooltip(
+                  $sequenceAdaptation,
+                  parsedChannelDictionary,
+                  parsedCommandDictionary,
+                  nonNullParsedParameterDictionaries,
+                ),
               ),
               ...($sequenceAdaptation.autoIndent
                 ? [compartmentSeqAutocomplete.reconfigure(indentService.of($sequenceAdaptation.autoIndent()))]
@@ -302,12 +310,15 @@
   $: commandDef = getCommandDef(commandDictionary, librarySequenceMap, commandName ?? '');
   $: timeTagNode = getTimeTagInfo(editorSequenceView, commandNode);
   $: argInfoArray = getArgumentInfo(
+    commandDef,
     commandInfoMapper,
+    channelDictionary,
     editorSequenceView,
     commandInfoMapper.getArgumentNodeContainer(commandNode),
     commandDef?.arguments,
     undefined,
     parameterDictionaries,
+    $sequenceAdaptation,
   );
   $: variablesInScope = getVariablesInScope(
     commandInfoMapper,
@@ -330,11 +341,11 @@
       extensions: [
         basicSetup,
         EditorView.lineWrapping,
-        EditorView.theme({ '.cm-gutter': { 'min-height': `${clientHeightGridRightTop}px` } }),
+        EditorView.theme({ '.cm-gutter': { 'min-height': '0px' } }),
         lintGutter(),
         compartmentSeqLanguage.of(setupLanguageSupport($sequenceAdaptation.autoComplete(null, null, [], []))),
-        compartmentSeqLinter.of(inputLinter()),
-        compartmentSeqTooltip.of(sequenceTooltip()),
+        compartmentSeqLinter.of(inputLinter($sequenceAdaptation, getGlobals())),
+        compartmentSeqTooltip.of(sequenceTooltip($sequenceAdaptation)),
         EditorView.updateListener.of(debounce(sequenceUpdateListener, 250)),
         EditorView.updateListener.of(selectedCommandUpdateListener),
         blockTheme,
@@ -355,7 +366,7 @@
       extensions: [
         basicSetup,
         EditorView.lineWrapping,
-        EditorView.theme({ '.cm-gutter': { 'min-height': `${clientHeightGridRightBottom}px` } }),
+        EditorView.theme({ '.cm-gutter': { 'min-height': '0px' } }),
         EditorView.editable.of(false),
         lintGutter(),
         json(),
@@ -388,7 +399,7 @@
       resetSequenceAdaptation();
     }
 
-    outputFormats = $outputFormat;
+    outputFormats = $outputFormatStore;
     selectedOutputFormat = outputFormats[0];
   }
 
@@ -494,130 +505,6 @@
       seqNFormat(editorSequenceView);
     }
   }
-
-  function inVmlMode(sequenceName: string | undefined): boolean {
-    return sequenceName !== undefined && sequenceName.endsWith('.vml');
-  }
-
-  function getTimeTagInfo(seqEditorView: EditorView, commandNode: SyntaxNode | null): TimeTagInfo {
-    const node = commandNode?.getChild('TimeTag');
-
-    return (
-      node && {
-        node,
-        text: seqEditorView.state.sliceDoc(node.from, node.to) ?? '',
-      }
-    );
-  }
-
-  function getCommandDef(
-    commandDictionary: CommandDictionary | null,
-    librarySequenceMap: LibrarySequenceMap,
-    stemName: string,
-  ): FswCommand | null {
-    const commandDefFromCommandDictionary = commandDictionary?.fswCommandMap[stemName];
-    if (commandDefFromCommandDictionary) {
-      return commandDefFromCommandDictionary;
-    }
-
-    const librarySeqDef = librarySequenceMap[stemName];
-    if (librarySeqDef) {
-      return librarySequenceToFswCommand(librarySeqDef);
-    }
-    return null;
-  }
-
-  function getVariablesInScope(
-    infoMapper: CommandInfoMapper,
-    seqEditorView: EditorView,
-    adaptation: ISequenceAdaptation,
-    tree: Tree | null,
-    cursorPosition?: number,
-  ): string[] {
-    const globalNames = (adaptation.globals ?? []).map(globalVariable => globalVariable.name);
-    if (tree && cursorPosition !== undefined) {
-      const docText = seqEditorView.state.doc.toString();
-      return [...globalNames, ...infoMapper.getVariables(docText, tree, cursorPosition)];
-    }
-    return globalNames;
-  }
-
-  function getArgumentInfo(
-    infoMapper: CommandInfoMapper,
-    seqEditorView: EditorView,
-    args: SyntaxNode | null,
-    argumentDefs: FswCommandArgument[] | undefined,
-    parentArgDef: FswCommandArgumentRepeat | undefined,
-    parameterDictionaries: ParameterDictionary[],
-  ) {
-    const argArray: ArgTextDef[] = [];
-    const precedingArgValues: string[] = [];
-    const parentRepeatLength = parentArgDef?.repeat?.arguments.length;
-
-    if (args) {
-      for (const node of infoMapper.getArgumentsFromContainer(args)) {
-        if (node.name === TOKEN_ERROR) {
-          continue;
-        }
-
-        let argDef: FswCommandArgument | undefined = undefined;
-        if (argumentDefs) {
-          let argDefIndex = argArray.length;
-          if (parentRepeatLength !== undefined) {
-            // for repeat args shift index
-            argDefIndex %= parentRepeatLength;
-          }
-          argDef = argumentDefs[argDefIndex];
-        }
-
-        if (commandDef && argDef) {
-          argDef = getCustomArgDef(
-            commandDef?.stem,
-            argDef,
-            precedingArgValues,
-            parameterDictionaries,
-            channelDictionary,
-          );
-        }
-
-        let children: ArgTextDef[] | undefined = undefined;
-        if (!!argDef && isFswCommandArgumentRepeat(argDef)) {
-          children = getArgumentInfo(
-            infoMapper,
-            seqEditorView,
-            node,
-            argDef.repeat?.arguments,
-            argDef,
-            parameterDictionaries,
-          );
-        }
-        const argValue = seqEditorView.state.sliceDoc(node.from, node.to);
-        argArray.push({
-          argDef,
-          children,
-          node,
-          parentArgDef,
-          text: argValue,
-        });
-        precedingArgValues.push(argValue);
-      }
-    }
-    // add entries for defined arguments missing from editor
-    if (argumentDefs) {
-      if (!parentArgDef) {
-        argArray.push(...argumentDefs.slice(argArray.length).map(argDef => ({ argDef })));
-      } else {
-        const repeatArgs = parentArgDef?.repeat?.arguments;
-        if (repeatArgs) {
-          if (argArray.length % repeatArgs.length !== 0) {
-            argArray.push(...argumentDefs.slice(argArray.length % repeatArgs.length).map(argDef => ({ argDef })));
-          }
-        }
-      }
-    }
-
-    return argArray;
-  }
 </script>
 
 <CssGrid bind:columns={commandFormBuilderGrid} minHeight={'0'}>
diff --git a/src/components/sequencing/SequenceForm.svelte b/src/components/sequencing/SequenceForm.svelte
index da4d5e088d..de444192cb 100644
--- a/src/components/sequencing/SequenceForm.svelte
+++ b/src/components/sequencing/SequenceForm.svelte
@@ -6,6 +6,7 @@
   import { base } from '$app/paths';
   import type { ParameterDictionary } from '@nasa-jpl/aerie-ampcs';
   import { SearchParameters } from '../../enums/searchParameters';
+  import { sequenceAdaptation } from '../../stores/sequence-adaptation';
   import {
     parameterDictionaries as parameterDictionariesStore,
     parcelToParameterDictionaries,
@@ -118,6 +119,7 @@
         fileNameAndContents.contents,
         parsedParameterDictionaries.filter((pd): pd is ParameterDictionary => pd !== null),
         parsedChannelDictionary,
+        $sequenceAdaptation,
       );
 
       if (sequence !== undefined) {
diff --git a/src/components/sequencing/Sequences.svelte b/src/components/sequencing/Sequences.svelte
index f23d829494..6e566886d8 100644
--- a/src/components/sequencing/Sequences.svelte
+++ b/src/components/sequencing/Sequences.svelte
@@ -9,7 +9,7 @@
   import { parcels, userSequences, userSequencesColumns, workspaces } from '../../stores/sequencing';
   import type { User } from '../../types/app';
   import type { Parcel, UserSequence, Workspace } from '../../types/sequencing';
-  import { satfToSequence } from '../../utilities/codemirror/satf/satf-sasf-utils';
+  import { satfToSequence } from '../../utilities/sequence-editor/languages/satf/satf-sasf-utils';
   import effects from '../../utilities/effects';
   import { getSearchParameterNumber, setQueryParam } from '../../utilities/generic';
   import { permissionHandler } from '../../utilities/permissionHandler';
diff --git a/src/components/sequencing/form/ArgEditor.svelte b/src/components/sequencing/form/ArgEditor.svelte
index 5d4956693b..d54ee2ac42 100644
--- a/src/components/sequencing/form/ArgEditor.svelte
+++ b/src/components/sequencing/form/ArgEditor.svelte
@@ -4,7 +4,7 @@
   import type { SyntaxNode } from '@lezer/common';
   import type { CommandDictionary, FswCommandArgument } from '@nasa-jpl/aerie-ampcs';
   import type { ArgTextDef } from '../../../types/sequencing';
-  import type { CommandInfoMapper } from '../../../utilities/codemirror/commandInfoMapper';
+  import type { CommandInfoMapper } from '../../../utilities/sequence-editor/command-info-mapper';
   import {
     getMissingArgDefs,
     isFswCommandArgumentBoolean,
@@ -14,7 +14,7 @@
     isNumberArg,
     quoteEscape,
     unquoteUnescape,
-  } from './../../../utilities/codemirror/codemirror-utils';
+  } from '../../../utilities/sequence-editor/sequence-utils';
   import AddMissingArgsButton from './AddMissingArgsButton.svelte';
   import ArgTitle from './ArgTitle.svelte';
   import BooleanEditor from './BooleanEditor.svelte';
diff --git a/src/components/sequencing/form/ArgTitle.svelte b/src/components/sequencing/form/ArgTitle.svelte
index bd6b02ba94..2a1dc8694a 100644
--- a/src/components/sequencing/form/ArgTitle.svelte
+++ b/src/components/sequencing/form/ArgTitle.svelte
@@ -3,16 +3,16 @@
 <script lang="ts">
   import type { FswCommandArgument } from '@nasa-jpl/aerie-ampcs';
   import { isArray } from 'lodash-es';
-  import type { CommandInfoMapper } from '../../../utilities/codemirror/commandInfoMapper';
   import { getTarget } from '../../../utilities/generic';
-  import Collapse from '../../Collapse.svelte';
+  import type { CommandInfoMapper } from '../../../utilities/sequence-editor/command-info-mapper';
   import {
     isFswCommandArgumentFloat,
     isFswCommandArgumentInteger,
     isFswCommandArgumentRepeat,
     isFswCommandArgumentUnsigned,
     isFswCommandArgumentVarString,
-  } from './../../../utilities/codemirror/codemirror-utils';
+  } from '../../../utilities/sequence-editor/sequence-utils';
+  import Collapse from '../../Collapse.svelte';
 
   export let argDef: FswCommandArgument;
   export let commandInfoMapper: CommandInfoMapper;
@@ -29,41 +29,41 @@
   $: formattedRange = formatRange(argDef);
   $: isSymbolAllowed = !isFswCommandArgumentRepeat(argDef);
 
-  function compactType(argDef: FswCommandArgument): string {
-    if (isFswCommandArgumentUnsigned(argDef)) {
-      return `U${argDef.bit_length}`;
-    } else if (isFswCommandArgumentInteger(argDef)) {
-      return `I${argDef.bit_length}`;
-    } else if (isFswCommandArgumentFloat(argDef)) {
-      return `F${argDef.bit_length}`;
-    } else if (isFswCommandArgumentVarString(argDef)) {
+  function compactType(argumentDefinition: FswCommandArgument): string {
+    if (isFswCommandArgumentUnsigned(argumentDefinition)) {
+      return `U${argumentDefinition.bit_length}`;
+    } else if (isFswCommandArgumentInteger(argumentDefinition)) {
+      return `I${argumentDefinition.bit_length}`;
+    } else if (isFswCommandArgumentFloat(argumentDefinition)) {
+      return `F${argumentDefinition.bit_length}`;
+    } else if (isFswCommandArgumentVarString(argumentDefinition)) {
       return `String`;
     }
 
     return '';
   }
 
-  function formatRange(argDef: FswCommandArgument): string {
-    if ('range' in argDef && argDef.range !== null && !isArray(argDef.range)) {
-      return `[${argDef.range.min} – ${argDef.range.max}]`;
+  function formatRange(argumentDefinition: FswCommandArgument): string {
+    if ('range' in argumentDefinition && argumentDefinition.range !== null && !isArray(argumentDefinition.range)) {
+      return `[${argumentDefinition.range.min} – ${argumentDefinition.range.max}]`;
     }
     return '';
   }
 
-  function getArgTitle(argDef: FswCommandArgument, typeInfo: string): string {
+  function getArgTitle(argumentDefinition: FswCommandArgument, typeString: string): string {
     if (
-      isFswCommandArgumentRepeat(argDef) &&
-      typeof argDef.repeat?.max === 'number' &&
-      typeof argDef.repeat?.min === 'number'
+      isFswCommandArgumentRepeat(argumentDefinition) &&
+      typeof argumentDefinition.repeat?.max === 'number' &&
+      typeof argumentDefinition.repeat?.min === 'number'
     ) {
-      return `${argDef.name} - [${argDef.repeat?.min}, ${argDef.repeat?.max}] sets`;
+      return `${argumentDefinition.name} - [${argumentDefinition.repeat?.min}, ${argumentDefinition.repeat?.max}] sets`;
     }
 
-    const bracketedTypeInfo = typeInfo && ` [${typeInfo}]`;
-    const base = `${argDef.name}${bracketedTypeInfo} ${formatRange(argDef)}`;
+    const bracketedTypeInfo = typeString ? ` [${typeString}]` : '';
+    const base = `${argumentDefinition.name}${bracketedTypeInfo} ${formatRange(argumentDefinition)}`;
 
-    if ('units' in argDef) {
-      return `${base} – (${argDef.units})`;
+    if ('units' in argumentDefinition) {
+      return `${base} – (${argumentDefinition.units})`;
     }
 
     return base;
diff --git a/src/components/sequencing/form/ByteArrayEditor.svelte b/src/components/sequencing/form/ByteArrayEditor.svelte
index 5b7f213ad8..7ebcfd9b1f 100644
--- a/src/components/sequencing/form/ByteArrayEditor.svelte
+++ b/src/components/sequencing/form/ByteArrayEditor.svelte
@@ -2,8 +2,8 @@
 
 <script lang="ts">
   import type { SyntaxNode } from '@lezer/common';
-  import { decodeInt32Array } from '../../../utilities/codemirror/codemirror-utils';
-  import type { CommandInfoMapper } from '../../../utilities/codemirror/commandInfoMapper';
+  import type { CommandInfoMapper } from '../../../utilities/sequence-editor/command-info-mapper';
+  import { decodeInt32Array } from '../../../utilities/sequence-editor/sequence-utils';
 
   export let argNode: SyntaxNode;
   export let commandInfoMapper: CommandInfoMapper;
diff --git a/src/components/sequencing/form/NumEditor.svelte b/src/components/sequencing/form/NumEditor.svelte
index 2551ba1e0e..5ad55f10e3 100644
--- a/src/components/sequencing/form/NumEditor.svelte
+++ b/src/components/sequencing/form/NumEditor.svelte
@@ -8,7 +8,7 @@
   // @digit ("_" | @digit)* "n" |
 
   import type { NumberArg } from '../../../types/sequencing';
-  import { isFswCommandArgumentUnsigned } from './../../../utilities/codemirror/codemirror-utils';
+  import { isFswCommandArgumentUnsigned } from '../../../utilities/sequence-editor/sequence-utils';
 
   export let argDef: NumberArg;
   export let initVal: number;
diff --git a/src/components/sequencing/form/StringEditor.svelte b/src/components/sequencing/form/StringEditor.svelte
index f3fa05869e..c8116d1226 100644
--- a/src/components/sequencing/form/StringEditor.svelte
+++ b/src/components/sequencing/form/StringEditor.svelte
@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import type { FswCommandArgumentVarString } from '@nasa-jpl/aerie-ampcs';
-  import { isQuoted, quoteEscape, unquoteUnescape } from './../../../utilities/codemirror/codemirror-utils';
+  import { isQuoted, quoteEscape, unquoteUnescape } from '../../../utilities/sequence-editor/sequence-utils';
 
   export let argDef: FswCommandArgumentVarString;
   export let initVal: string;
diff --git a/src/components/sequencing/form/TimeTagEditor.svelte b/src/components/sequencing/form/TimeTagEditor.svelte
index 7f4208d081..109ab0f68b 100644
--- a/src/components/sequencing/form/TimeTagEditor.svelte
+++ b/src/components/sequencing/form/TimeTagEditor.svelte
@@ -1,7 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import { SeqLanguage } from '../../../utilities/codemirror';
+  import { SeqLanguage } from '../../../utilities/sequence-editor/languages/seq-n/seq-n';
 
   export let initVal: string;
   export let setInEditor: (val: string) => void;
diff --git a/src/components/ui/DataGrid/DataGrid.svelte b/src/components/ui/DataGrid/DataGrid.svelte
index e3974020c0..743684ed8f 100644
--- a/src/components/ui/DataGrid/DataGrid.svelte
+++ b/src/components/ui/DataGrid/DataGrid.svelte
@@ -128,17 +128,18 @@
   const CURRENT_SELECTED_ROW_CLASS = 'ag-current-row-selected';
   const dispatch = createEventDispatcher<Dispatcher<$$Events>>();
 
-  let contextMenu: ContextMenu;
   // This is used so that the current instance of ag-grid always has a pointer to the latest current selected row id
   // without having to call anything on the ag-grid instance that results in a full rerender
-  let currentSelectedRowIdRef: RowIdRef = { value: null };
+  const currentSelectedRowIdRef: RowIdRef = { value: null };
+  const onColumnStateChangeDebounced = debounce(onColumnStateChange, 500);
+  const onWindowResizedDebounced = debounce(sizeColumnsToFit, 50);
+
+  let contextMenu: ContextMenu;
   let gridOptions: GridOptions<RowData>;
   let gridApi: GridApi<RowData> | undefined;
   let gridDiv: HTMLDivElement;
   let loadingMessageTimeout: NodeJS.Timeout | null = null;
   let mounted: boolean = false;
-  let onColumnStateChangeDebounced = debounce(onColumnStateChange, 500);
-  let onWindowResizedDebounced = debounce(sizeColumnsToFit, 50);
   let previousSelectedRowId: RowId | null = null;
   let resizeObserver: ResizeObserver | null = null;
 
diff --git a/src/components/ui/DatePicker/DatePicker.svelte b/src/components/ui/DatePicker/DatePicker.svelte
index 90b49418e3..29a9e3c5a8 100644
--- a/src/components/ui/DatePicker/DatePicker.svelte
+++ b/src/components/ui/DatePicker/DatePicker.svelte
@@ -165,8 +165,8 @@
   /**
    * Converts a date string (YYYY-MM-DDTHH:mm:ss) or DOY string (YYYY-DDDDTHH:mm:ss) into a Date object
    */
-  function getDateFromString(dateString: string): Date | null {
-    const parsedDate = parseDoyOrYmdTime(dateString) as ParsedYmdString | ParsedDoyString;
+  function getDateFromString(dateStringToGetDate: string): Date | null {
+    const parsedDate = parseDoyOrYmdTime(dateStringToGetDate) as ParsedYmdString | ParsedDoyString;
     if (parsedDate !== null) {
       const { hour, min, ms, sec, year } = parsedDate;
 
@@ -190,8 +190,8 @@
   /**
    * Determines if a given string is in the correct date string format (YYYY-MM-DDTHH:mm:ss) or DOY string format (YYYY-DDDDTHH:mm:ss)
    */
-  function isValidDateTime(dateString: string): boolean {
-    return parseDoyOrYmdTime(dateString) !== null;
+  function isValidDateTime(dateStringToCheck: string): boolean {
+    return parseDoyOrYmdTime(dateStringToCheck) !== null;
   }
 
   function onChangeViewMonth(event: Event) {
diff --git a/src/constants/seq-n-grammar-constants.ts b/src/constants/seq-n-grammar-constants.ts
index 7480f4dc64..ba6b4c4126 100644
--- a/src/constants/seq-n-grammar-constants.ts
+++ b/src/constants/seq-n-grammar-constants.ts
@@ -13,6 +13,5 @@ export const TOKEN_LOAD = 'Load';
 export const TOKEN_COMMAND = 'Command';
 export const TOKEN_REQUEST = 'Request';
 export const TOKEN_REPEAT_ARG = 'RepeatArg';
-export const TOKEN_ERROR = '⚠';
 export const TOKEN_STRING = 'String';
 export const TOKEN_NUMBER = 'Number';
diff --git a/src/stores/sequence-adaptation.ts b/src/stores/sequence-adaptation.ts
index 1e83e2b1e9..64e609cd61 100644
--- a/src/stores/sequence-adaptation.ts
+++ b/src/stores/sequence-adaptation.ts
@@ -1,6 +1,6 @@
 import { derived, get, writable, type Writable } from 'svelte/store';
 import type { GlobalType } from '../types/global-type';
-import type { ISequenceAdaptation, SequenceAdaptation } from '../types/sequencing';
+import type { ISequenceAdaptation, SequenceAdaptationMetadata } from '../types/sequencing';
 import gql from '../utilities/gql';
 import { seqJsonToSequence } from '../utilities/sequence-editor/from-seq-json';
 import { sequenceAutoIndent } from '../utilities/sequence-editor/sequence-autoindent';
@@ -35,7 +35,12 @@ export const sequenceAdaptation: Writable<ISequenceAdaptation> = writable(defaul
 
 /* Subscriptions. */
 
-export const sequenceAdaptations = gqlSubscribable<SequenceAdaptation[]>(gql.SUB_SEQUENCE_ADAPTATIONS, {}, [], null);
+export const sequenceAdaptations = gqlSubscribable<SequenceAdaptationMetadata[]>(
+  gql.SUB_SEQUENCE_ADAPTATIONS,
+  {},
+  [],
+  null,
+);
 
 /* Derived */
 
diff --git a/src/stores/sequencing.ts b/src/stores/sequencing.ts
index 85220dd3da..1615b5f266 100644
--- a/src/stores/sequencing.ts
+++ b/src/stores/sequencing.ts
@@ -6,9 +6,9 @@ import type {
 import { derived, get, writable, type Readable, type Writable } from 'svelte/store';
 import type { User } from '../types/app';
 import {
-  type ChannelDictionary,
-  type CommandDictionary,
-  type ParameterDictionary,
+  type ChannelDictionaryMetadata,
+  type CommandDictionaryMetadata,
+  type ParameterDictionaryMetadata,
   type Parcel,
   type ParcelBundle,
   type ParcelToParameterDictionary,
@@ -29,11 +29,21 @@ export const parsedParameterDictionaries: Writable<Record<string, AmpcsParameter
 
 /* Subscriptions. */
 
-export const channelDictionaries = gqlSubscribable<ChannelDictionary[]>(gql.SUB_CHANNEL_DICTIONARIES, {}, [], null);
+export const channelDictionaries = gqlSubscribable<ChannelDictionaryMetadata[]>(
+  gql.SUB_CHANNEL_DICTIONARIES,
+  {},
+  [],
+  null,
+);
 
-export const commandDictionaries = gqlSubscribable<CommandDictionary[]>(gql.SUB_COMMAND_DICTIONARIES, {}, [], null);
+export const commandDictionaries = gqlSubscribable<CommandDictionaryMetadata[]>(
+  gql.SUB_COMMAND_DICTIONARIES,
+  {},
+  [],
+  null,
+);
 
-export const parameterDictionaries = gqlSubscribable<ParameterDictionary[]>(
+export const parameterDictionaries = gqlSubscribable<ParameterDictionaryMetadata[]>(
   gql.SUB_PARAMETER_DICTIONARIES,
   {},
   [],
@@ -97,7 +107,7 @@ export const userSequenceEditorColumnsWithFormBuilder: Writable<string> = writab
 /* Helper Functions */
 
 export async function getParsedChannelDictionary(
-  unparsedChannelDictionary: ChannelDictionary,
+  unparsedChannelDictionary: ChannelDictionaryMetadata,
   user: User | null,
 ): Promise<AmpcsChannelDictionary | null> {
   const id = generateId(unparsedChannelDictionary.id, unparsedChannelDictionary.updated_at);
@@ -118,7 +128,7 @@ export async function getParsedChannelDictionary(
 }
 
 export async function getParsedCommandDictionary(
-  unparsedCommandDictionary: CommandDictionary,
+  unparsedCommandDictionary: CommandDictionaryMetadata,
   user: User | null,
 ): Promise<AmpcsCommandDictionary | null> {
   const id = generateId(unparsedCommandDictionary.id, unparsedCommandDictionary.updated_at);
@@ -139,7 +149,7 @@ export async function getParsedCommandDictionary(
 }
 
 export async function getParsedParameterDictionary(
-  unparsedParameterDictionary: ParameterDictionary,
+  unparsedParameterDictionary: ParameterDictionaryMetadata,
   user: User | null,
 ): Promise<AmpcsParameterDictionary | null> {
   const id = generateId(unparsedParameterDictionary.id, unparsedParameterDictionary.updated_at);
diff --git a/src/types/sequencing.ts b/src/types/sequencing.ts
index 26664012c8..5fee62b0ca 100644
--- a/src/types/sequencing.ts
+++ b/src/types/sequencing.ts
@@ -23,25 +23,25 @@ import type { ArgDelegator } from '../utilities/sequence-editor/extension-points
 import type { UserId } from './app';
 import type { GlobalType } from './global-type';
 
-export type ChannelDictionary = {
+export type ChannelDictionaryMetadata = {
   type: DictionaryTypes.CHANNEL;
-} & DictionaryType;
+} & DictionaryMetadata;
 
-export type CommandDictionary = {
+export type CommandDictionaryMetadata = {
   type: DictionaryTypes.COMMAND;
-} & DictionaryType;
+} & DictionaryMetadata;
 
-export type ParameterDictionary = {
+export type ParameterDictionaryMetadata = {
   type: DictionaryTypes.PARAMETER;
-} & DictionaryType;
+} & DictionaryMetadata;
 
-export type SequenceAdaptation = {
+export type SequenceAdaptationMetadata = {
   adaptation: ISequenceAdaptation;
   name: string;
   type: DictionaryTypes.ADAPTATION;
-} & DictionaryType;
+} & DictionaryMetadata;
 
-export type DictionaryType = {
+export type DictionaryMetadata = {
   created_at: string;
   id: number;
   mission: string;
@@ -68,6 +68,17 @@ export interface IOutputFormat {
   ): Promise<string>;
 }
 
+export interface IInputFormat {
+  linter?: (
+    diagnostics: Diagnostic[],
+    commandDictionary: AmpcsCommandDictionary,
+    view: EditorView,
+    node: SyntaxNode,
+  ) => Diagnostic[];
+  name: string;
+  toInputFormat?(input: string): Promise<string>;
+}
+
 export interface ISequenceAdaptation {
   argDelegator?: ArgDelegator;
   autoComplete: (
@@ -78,16 +89,7 @@ export interface ISequenceAdaptation {
   ) => (context: CompletionContext) => CompletionResult | null;
   autoIndent?: () => (context: IndentContext, pos: number) => number | null | undefined;
   globals?: GlobalType[];
-  inputFormat: {
-    linter?: (
-      diagnostics: Diagnostic[],
-      commandDictionary: AmpcsCommandDictionary,
-      view: EditorView,
-      node: SyntaxNode,
-    ) => Diagnostic[];
-    name: string;
-    toInputFormat?(input: string): Promise<string>;
-  };
+  inputFormat: IInputFormat;
   modifyOutput?: (
     output: string,
     parameterDictionaries: AmpcsParameterDictionary[],
diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index a87fa92ec4..2f93b64923 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -190,15 +190,15 @@ import type {
 } from '../types/scheduling';
 import type { ValueSchema } from '../types/schema';
 import {
-  type ChannelDictionary,
-  type CommandDictionary,
+  type ChannelDictionaryMetadata,
+  type CommandDictionaryMetadata,
   type GetSeqJsonResponse,
-  type ParameterDictionary,
+  type ParameterDictionaryMetadata,
   type Parcel,
   type ParcelInsertInput,
   type ParcelToParameterDictionary,
   type SeqJson,
-  type SequenceAdaptation,
+  type SequenceAdaptationMetadata,
   type UserSequence,
   type UserSequenceInsertInput,
   type Workspace,
@@ -239,7 +239,6 @@ import type {
 import type { Layer, Row, Timeline } from '../types/timeline';
 import type { View, ViewDefinition, ViewInsertInput, ViewSlim, ViewUpdateInput } from '../types/view';
 import { ActivityDeletionAction } from './activities';
-import { parseCdlDictionary, toAmpcsXml } from './codemirror/cdlDictionary';
 import { compare, convertToQuery, getSearchParameterNumber, setQueryParam } from './generic';
 import gql, { convertToGQLArray } from './gql';
 import {
@@ -266,6 +265,7 @@ import { gatewayPermissions, queryPermissions } from './permissions';
 import { reqExtension, reqGateway, reqHasura } from './requests';
 import { sampleProfiles } from './resources';
 import { convertResponseToMetadata } from './scheduling';
+import { parseCdlDictionary, toAmpcsXml } from './sequence-editor/languages/vml/cdl-dictionary';
 import { compareEvents } from './simulation';
 import { pluralize } from './text';
 import {
@@ -775,14 +775,14 @@ const effects = {
   async createCustomAdaptation(
     adaptation: { adaptation: string; name: string },
     user: User | null,
-  ): Promise<SequenceAdaptation | null> {
+  ): Promise<SequenceAdaptationMetadata | null> {
     try {
       if (!queryPermissions.CREATE_SEQUENCE_ADAPTATION(user)) {
         throwPermissionError('upload a custom adaptation');
       }
 
       if (adaptation?.adaptation) {
-        const data = await reqHasura<SequenceAdaptation>(gql.CREATE_SEQUENCE_ADAPTATION, { adaptation }, user);
+        const data = await reqHasura<SequenceAdaptationMetadata>(gql.CREATE_SEQUENCE_ADAPTATION, { adaptation }, user);
         const { createSequenceAdaptation: newSequenceAdaptation } = data;
 
         if (newSequenceAdaptation != null) {
@@ -4372,9 +4372,12 @@ const effects = {
     }
   },
 
-  async getSequenceAdaptation(sequenceAdaptationId: number, user: User | null): Promise<SequenceAdaptation | null> {
+  async getSequenceAdaptation(
+    sequenceAdaptationId: number,
+    user: User | null,
+  ): Promise<SequenceAdaptationMetadata | null> {
     try {
-      const data = await reqHasura<[sequence_adaptation: SequenceAdaptation]>(
+      const data = await reqHasura<[sequence_adaptation: SequenceAdaptationMetadata]>(
         gql.GET_SEQUENCE_ADAPTATION,
         { sequence_adaptation_id: sequenceAdaptationId },
         user,
@@ -6406,7 +6409,11 @@ const effects = {
   async uploadDictionary(
     dictionary: string,
     user: User | null,
-  ): Promise<{ channel?: ChannelDictionary; command?: CommandDictionary; parameter?: ParameterDictionary } | null> {
+  ): Promise<{
+    channel?: ChannelDictionaryMetadata;
+    command?: CommandDictionaryMetadata;
+    parameter?: ParameterDictionaryMetadata;
+  } | null> {
     try {
       if (!queryPermissions.CREATE_DICTIONARY(user)) {
         throwPermissionError(`upload a dictionary`);
@@ -6419,9 +6426,9 @@ const effects = {
       }
 
       const data = await reqHasura<{
-        channel?: ChannelDictionary;
-        command?: CommandDictionary;
-        parameter?: ParameterDictionary;
+        channel?: ChannelDictionaryMetadata;
+        command?: CommandDictionaryMetadata;
+        parameter?: ParameterDictionaryMetadata;
       }>(gql.CREATE_DICTIONARY, { dictionary }, user);
 
       const { createDictionary: newDictionaries } = data;
diff --git a/src/utilities/codemirror/commandInfoMapper.ts b/src/utilities/sequence-editor/command-info-mapper.ts
similarity index 100%
rename from src/utilities/codemirror/commandInfoMapper.ts
rename to src/utilities/sequence-editor/command-info-mapper.ts
diff --git a/src/utilities/sequence-editor/extension-points.ts b/src/utilities/sequence-editor/extension-points.ts
index f0785d9cb9..11e1b15af5 100644
--- a/src/utilities/sequence-editor/extension-points.ts
+++ b/src/utilities/sequence-editor/extension-points.ts
@@ -7,9 +7,8 @@ import {
   type FswCommandArgument,
   type ParameterDictionary,
 } from '@nasa-jpl/aerie-ampcs';
-import { get } from 'svelte/store';
-import { inputFormat, sequenceAdaptation } from '../../stores/sequence-adaptation';
-import type { IOutputFormat, LibrarySequence } from '../../types/sequencing';
+import type { GlobalType } from '../../types/global-type';
+import type { IInputFormat, IOutputFormat, ISequenceAdaptation, LibrarySequence } from '../../types/sequencing';
 import { seqJsonLinter } from './seq-json-linter';
 import { sequenceLinter } from './sequence-linter';
 
@@ -38,11 +37,12 @@ export function getCustomArgDef(
   precedingArgs: string[],
   parameterDictionaries: ParameterDictionary[],
   channelDictionary: ChannelDictionary | null,
+  sequenceAdaptation?: ISequenceAdaptation,
 ) {
   let delegate = undefined;
 
-  if (get(sequenceAdaptation).argDelegator !== undefined) {
-    delegate = get(sequenceAdaptation).argDelegator?.[stem]?.[dictArg.name];
+  if (sequenceAdaptation?.argDelegator !== undefined) {
+    delegate = sequenceAdaptation.argDelegator?.[stem]?.[dictArg.name];
   }
 
   return delegate?.(dictArg, parameterDictionaries, channelDictionary, precedingArgs) ?? dictArg;
@@ -52,8 +52,10 @@ export async function toInputFormat(
   output: string,
   parameterDictionaries: ParameterDictionary[],
   channelDictionary: ChannelDictionary | null,
+  sequenceAdaptation: ISequenceAdaptation,
+  inputFormat?: IInputFormat,
 ) {
-  const modifyOutputParse = get(sequenceAdaptation).modifyOutputParse;
+  const modifyOutputParse = sequenceAdaptation.modifyOutputParse;
   if (modifyOutputParse !== undefined) {
     let modifiedOutput = await modifyOutputParse(output, parameterDictionaries, channelDictionary);
     if (modifiedOutput === null) {
@@ -66,10 +68,10 @@ export async function toInputFormat(
       modifiedOutput = `${modifiedOutput}`;
     }
 
-    return (await get(inputFormat)?.toInputFormat?.(modifiedOutput)) ?? output;
+    return (await inputFormat?.toInputFormat?.(modifiedOutput)) ?? output;
   } else {
     try {
-      return (await get(inputFormat)?.toInputFormat?.(output)) ?? output;
+      return (await inputFormat?.toInputFormat?.(output)) ?? output;
     } catch (e) {
       console.error(e);
       return output;
@@ -78,18 +80,28 @@ export async function toInputFormat(
 }
 
 export function inputLinter(
+  sequenceAdaptation: ISequenceAdaptation,
+  globalVariables: GlobalType[],
   channelDictionary: ChannelDictionary | null = null,
   commandDictionary: CommandDictionary | null = null,
   parameterDictionaries: ParameterDictionary[] = [],
   librarySequences: LibrarySequence[] = [],
 ): Extension {
   return linter(view => {
-    const inputFormatLinter = get(sequenceAdaptation).inputFormat.linter;
+    const inputFormatLinter = sequenceAdaptation.inputFormat.linter;
     const tree = syntaxTree(view.state);
     const treeNode = tree.topNode;
     let diagnostics: Diagnostic[];
 
-    diagnostics = sequenceLinter(view, channelDictionary, commandDictionary, parameterDictionaries, librarySequences);
+    diagnostics = sequenceLinter(
+      view,
+      sequenceAdaptation,
+      channelDictionary,
+      commandDictionary,
+      parameterDictionaries,
+      librarySequences,
+      globalVariables,
+    );
 
     if (inputFormatLinter !== undefined && commandDictionary !== null) {
       diagnostics = inputFormatLinter(diagnostics, commandDictionary, view, treeNode);
diff --git a/src/utilities/sequence-editor/from-seq-json.ts b/src/utilities/sequence-editor/from-seq-json.ts
index 5dce337665..5970a2039f 100644
--- a/src/utilities/sequence-editor/from-seq-json.ts
+++ b/src/utilities/sequence-editor/from-seq-json.ts
@@ -20,8 +20,8 @@ import type {
   Time,
   VariableDeclaration,
 } from '@nasa-jpl/seq-json-schema/types';
-import { quoteEscape } from '../codemirror/codemirror-utils';
 import { logError } from './logger';
+import { quoteEscape } from './sequence-utils';
 
 /**
  * Transform a sequence JSON time to it's sequence string form.
diff --git a/src/utilities/sequence-editor/grammar.test.ts b/src/utilities/sequence-editor/grammar.test.ts
index b6d75abf7d..709036f177 100644
--- a/src/utilities/sequence-editor/grammar.test.ts
+++ b/src/utilities/sequence-editor/grammar.test.ts
@@ -1,6 +1,6 @@
 import { testTree } from '@lezer/generator/dist/test';
 import { describe, expect, test } from 'vitest';
-import { SeqLanguage } from '../codemirror';
+import { SeqLanguage } from './languages/seq-n/seq-n';
 
 /*
  * Test cases here are canaries against unintended changes to the grammar. Certain grammar changes will alter the parse tree which
diff --git a/src/utilities/codemirror/satf/sasf.test.ts b/src/utilities/sequence-editor/languages/satf/sasf.test.ts
similarity index 100%
rename from src/utilities/codemirror/satf/sasf.test.ts
rename to src/utilities/sequence-editor/languages/satf/sasf.test.ts
diff --git a/src/utilities/codemirror/satf/satfConstants.ts b/src/utilities/sequence-editor/languages/satf/satf-constants.ts
similarity index 100%
rename from src/utilities/codemirror/satf/satfConstants.ts
rename to src/utilities/sequence-editor/languages/satf/satf-constants.ts
diff --git a/src/utilities/codemirror/satf/satf-sasf-utils.test.ts b/src/utilities/sequence-editor/languages/satf/satf-sasf-utils.test.ts
similarity index 100%
rename from src/utilities/codemirror/satf/satf-sasf-utils.test.ts
rename to src/utilities/sequence-editor/languages/satf/satf-sasf-utils.test.ts
diff --git a/src/utilities/codemirror/satf/satf-sasf-utils.ts b/src/utilities/sequence-editor/languages/satf/satf-sasf-utils.ts
similarity index 99%
rename from src/utilities/codemirror/satf/satf-sasf-utils.ts
rename to src/utilities/sequence-editor/languages/satf/satf-sasf-utils.ts
index 394af64b6a..f2579c0656 100644
--- a/src/utilities/codemirror/satf/satf-sasf-utils.ts
+++ b/src/utilities/sequence-editor/languages/satf/satf-sasf-utils.ts
@@ -1,9 +1,9 @@
 import type { SyntaxNode } from '@lezer/common';
 import { Tree } from '@lezer/common';
 import type { CommandDictionary, FswCommandArgument } from '@nasa-jpl/aerie-ampcs';
-import { TimeTypes } from '../../../enums/time';
-import { unquoteUnescape } from '../../codemirror/codemirror-utils';
-import { getBalancedDuration, getDurationTimeComponents, parseDurationString, validateTime } from '../../time';
+import { TimeTypes } from '../../../../enums/time';
+import { getBalancedDuration, getDurationTimeComponents, parseDurationString, validateTime } from '../../../time';
+import { unquoteUnescape } from '../../sequence-utils';
 import { SatfLanguage } from './satf';
 import {
   ACTIVITY_TYPE_DEFINITIONS,
@@ -68,7 +68,7 @@ import {
   VAR_UINT,
   VARIABLES,
   VIRTUAL_CHANNEL,
-} from './satfConstants';
+} from './satf-constants';
 
 /**
  * Parses the metadata from seqN.
diff --git a/src/utilities/codemirror/satf/satf-sasf.grammar b/src/utilities/sequence-editor/languages/satf/satf-sasf.grammar
similarity index 100%
rename from src/utilities/codemirror/satf/satf-sasf.grammar
rename to src/utilities/sequence-editor/languages/satf/satf-sasf.grammar
diff --git a/src/utilities/codemirror/satf/satf-sasf.grammar.d.ts b/src/utilities/sequence-editor/languages/satf/satf-sasf.grammar.d.ts
similarity index 100%
rename from src/utilities/codemirror/satf/satf-sasf.grammar.d.ts
rename to src/utilities/sequence-editor/languages/satf/satf-sasf.grammar.d.ts
diff --git a/src/utilities/codemirror/satf/satf.test.ts b/src/utilities/sequence-editor/languages/satf/satf.test.ts
similarity index 100%
rename from src/utilities/codemirror/satf/satf.test.ts
rename to src/utilities/sequence-editor/languages/satf/satf.test.ts
diff --git a/src/utilities/codemirror/satf/satf.ts b/src/utilities/sequence-editor/languages/satf/satf.ts
similarity index 97%
rename from src/utilities/codemirror/satf/satf.ts
rename to src/utilities/sequence-editor/languages/satf/satf.ts
index 0ed7e6fd52..d0aeeea2ff 100644
--- a/src/utilities/codemirror/satf/satf.ts
+++ b/src/utilities/sequence-editor/languages/satf/satf.ts
@@ -9,7 +9,7 @@ export const SatfLanguage = LRLanguage.define({
   parser: parser.configure({
     props: [
       foldNodeProp.add({
-        // Add a custom folder
+        // TODO: Add a custom folder
       }),
       styleTags({
         Activity: t.strong,
diff --git a/src/utilities/codemirror/custom-folder.test.ts b/src/utilities/sequence-editor/languages/seq-n/custom-folder.test.ts
similarity index 99%
rename from src/utilities/codemirror/custom-folder.test.ts
rename to src/utilities/sequence-editor/languages/seq-n/custom-folder.test.ts
index a8704fe6fa..4c1befccd4 100644
--- a/src/utilities/codemirror/custom-folder.test.ts
+++ b/src/utilities/sequence-editor/languages/seq-n/custom-folder.test.ts
@@ -1,7 +1,7 @@
 import { EditorState } from '@codemirror/state';
 import { describe, expect, test } from 'vitest';
 import { foldRequest, foldSteps, foldVariables } from './custom-folder';
-import { parser } from './sequence.grammar';
+import { parser } from './seq-n.grammar';
 
 const COMMANDS = [
   'Command',
@@ -33,7 +33,7 @@ VARIABLE INT "MIN...MAX | ...MAX | MIN..." "VALUE_1, VALUE_2, ..."
 
 const LOCALS = [
   `@LOCALS_BEGIN
-VARIABLE INT 
+VARIABLE INT
 TEST FLOAT
 @LOCALS_END`,
 ];
diff --git a/src/utilities/codemirror/custom-folder.ts b/src/utilities/sequence-editor/languages/seq-n/custom-folder.ts
similarity index 99%
rename from src/utilities/codemirror/custom-folder.ts
rename to src/utilities/sequence-editor/languages/seq-n/custom-folder.ts
index afdfa3278b..9fd18aaf76 100644
--- a/src/utilities/codemirror/custom-folder.ts
+++ b/src/utilities/sequence-editor/languages/seq-n/custom-folder.ts
@@ -1,8 +1,8 @@
 import { syntaxTree } from '@codemirror/language';
 import { EditorState } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
-import { TOKEN_COMMAND } from '../../constants/seq-n-grammar-constants';
-import { getFromAndTo } from '../sequence-editor/tree-utils';
+import { TOKEN_COMMAND } from '../../../../constants/seq-n-grammar-constants';
+import { getFromAndTo } from '../../tree-utils';
 
 export function customFoldInside(node: SyntaxNode, state: EditorState): { from: number; to: number } | null {
   switch (node.name) {
diff --git a/src/utilities/codemirror/seq-n-highlighter.ts b/src/utilities/sequence-editor/languages/seq-n/seq-n-highlighter.ts
similarity index 92%
rename from src/utilities/codemirror/seq-n-highlighter.ts
rename to src/utilities/sequence-editor/languages/seq-n/seq-n-highlighter.ts
index c09c195e74..91f96459aa 100644
--- a/src/utilities/codemirror/seq-n-highlighter.ts
+++ b/src/utilities/sequence-editor/languages/seq-n/seq-n-highlighter.ts
@@ -1,10 +1,10 @@
 import { syntaxTree } from '@codemirror/language';
 import { Decoration, ViewPlugin, type DecorationSet, type ViewUpdate } from '@codemirror/view';
 import type { SyntaxNode } from '@lezer/common';
-import { TOKEN_COMMAND } from '../../constants/seq-n-grammar-constants';
-import { getNearestAncestorNodeOfType } from '../sequence-editor/tree-utils';
+import { TOKEN_COMMAND } from '../../../../constants/seq-n-grammar-constants';
+import { blockMark } from '../../../codemirror/themes/block';
+import { getNearestAncestorNodeOfType } from '../../tree-utils';
 import { computeBlocks, isBlockCommand } from './custom-folder';
-import { blockMark } from './themes/block';
 
 export const seqqNBlockHighlighter = ViewPlugin.fromClass(
   class {
diff --git a/src/utilities/codemirror/seq-n-tree-utils.ts b/src/utilities/sequence-editor/languages/seq-n/seq-n-tree-utils.ts
similarity index 86%
rename from src/utilities/codemirror/seq-n-tree-utils.ts
rename to src/utilities/sequence-editor/languages/seq-n/seq-n-tree-utils.ts
index 181ec45d86..23b3960f1c 100644
--- a/src/utilities/codemirror/seq-n-tree-utils.ts
+++ b/src/utilities/sequence-editor/languages/seq-n/seq-n-tree-utils.ts
@@ -1,6 +1,5 @@
 import type { SyntaxNode, Tree } from '@lezer/common';
 import type { EnumMap, FswCommandArgument } from '@nasa-jpl/aerie-ampcs';
-import { SeqLanguage } from '.';
 import {
   RULE_ARGS,
   RULE_COMMAND,
@@ -17,14 +16,15 @@ import {
   TOKEN_REPEAT_ARG,
   TOKEN_REQUEST,
   TOKEN_STRING,
-} from '../../constants/seq-n-grammar-constants';
-import { SequenceTypes } from '../../enums/sequencing';
-import { type LibrarySequence, type UserSequence } from '../../types/sequencing';
-import { fswCommandArgDefault } from '../sequence-editor/command-dictionary';
-import { validateVariables } from '../sequence-editor/sequence-linter';
-import { parseVariables } from '../sequence-editor/to-seq-json';
-import { getFromAndTo, getNearestAncestorNodeOfType } from '../sequence-editor/tree-utils';
-import type { CommandInfoMapper } from './commandInfoMapper';
+} from '../../../../constants/seq-n-grammar-constants';
+import { SequenceTypes } from '../../../../enums/sequencing';
+import { type LibrarySequence, type UserSequence } from '../../../../types/sequencing';
+import { fswCommandArgDefault } from '../../command-dictionary';
+import type { CommandInfoMapper } from '../../command-info-mapper';
+import { validateVariables } from '../../sequence-linter';
+import { parseVariables } from '../../to-seq-json';
+import { getFromAndTo, getNearestAncestorNodeOfType } from '../../tree-utils';
+import { SeqLanguage } from './seq-n';
 
 export function getNameNode(stepNode: SyntaxNode | null) {
   if (stepNode) {
diff --git a/src/utilities/codemirror/sequence.grammar b/src/utilities/sequence-editor/languages/seq-n/seq-n.grammar
similarity index 100%
rename from src/utilities/codemirror/sequence.grammar
rename to src/utilities/sequence-editor/languages/seq-n/seq-n.grammar
diff --git a/src/utilities/codemirror/sequence.grammar.d.ts b/src/utilities/sequence-editor/languages/seq-n/seq-n.grammar.d.ts
similarity index 100%
rename from src/utilities/codemirror/sequence.grammar.d.ts
rename to src/utilities/sequence-editor/languages/seq-n/seq-n.grammar.d.ts
diff --git a/src/utilities/codemirror/index.ts b/src/utilities/sequence-editor/languages/seq-n/seq-n.ts
similarity index 98%
rename from src/utilities/codemirror/index.ts
rename to src/utilities/sequence-editor/languages/seq-n/seq-n.ts
index 6dd65acc59..9100dc1e65 100644
--- a/src/utilities/codemirror/index.ts
+++ b/src/utilities/sequence-editor/languages/seq-n/seq-n.ts
@@ -2,7 +2,7 @@ import { CompletionContext, type CompletionResult } from '@codemirror/autocomple
 import { LRLanguage, LanguageSupport, delimitedIndent, foldNodeProp, indentNodeProp } from '@codemirror/language';
 import { styleTags, tags as t } from '@lezer/highlight';
 import { customFoldInside } from './custom-folder';
-import { parser } from './sequence.grammar';
+import { parser } from './seq-n.grammar';
 
 export const SeqLanguage = LRLanguage.define({
   languageData: {
diff --git a/src/utilities/codemirror/cdlDictionary.test.ts b/src/utilities/sequence-editor/languages/vml/cdl-dictionary.test.ts
similarity index 98%
rename from src/utilities/codemirror/cdlDictionary.test.ts
rename to src/utilities/sequence-editor/languages/vml/cdl-dictionary.test.ts
index d4f39af24d..c1d025eb12 100644
--- a/src/utilities/codemirror/cdlDictionary.test.ts
+++ b/src/utilities/sequence-editor/languages/vml/cdl-dictionary.test.ts
@@ -5,7 +5,7 @@ import {
 } from '@nasa-jpl/aerie-ampcs';
 import { readFileSync } from 'fs';
 import { describe, expect, test } from 'vitest';
-import { parseCdlDictionary, toAmpcsXml } from './cdlDictionary';
+import { parseCdlDictionary, toAmpcsXml } from './cdl-dictionary';
 
 const cdlString = `!
 ! Example dictionary
diff --git a/src/utilities/codemirror/cdlDictionary.ts b/src/utilities/sequence-editor/languages/vml/cdl-dictionary.ts
similarity index 100%
rename from src/utilities/codemirror/cdlDictionary.ts
rename to src/utilities/sequence-editor/languages/vml/cdl-dictionary.ts
diff --git a/src/utilities/codemirror/vml/vmlAdaptation.ts b/src/utilities/sequence-editor/languages/vml/vml-adaptation.ts
similarity index 93%
rename from src/utilities/codemirror/vml/vmlAdaptation.ts
rename to src/utilities/sequence-editor/languages/vml/vml-adaptation.ts
index 6c87b37740..f4c4b3a710 100644
--- a/src/utilities/codemirror/vml/vmlAdaptation.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-adaptation.ts
@@ -15,13 +15,13 @@ import type {
   HwCommand,
 } from '@nasa-jpl/aerie-ampcs';
 import type { VariableDeclaration } from '@nasa-jpl/seq-json-schema/types';
-import { SequenceTypes } from '../../../enums/sequencing';
-import type { GlobalType } from '../../../types/global-type';
-import { type LibrarySequence, type LibrarySequenceMap } from '../../../types/sequencing';
-import { getNearestAncestorNodeOfType } from '../../sequence-editor/tree-utils';
-import { isFswCommand, unquoteUnescape } from '../codemirror-utils';
+import { SequenceTypes } from '../../../../enums/sequencing';
+import type { GlobalType } from '../../../../types/global-type';
+import { type LibrarySequence, type LibrarySequenceMap } from '../../../../types/sequencing';
+import { isFswCommand, unquoteUnescape } from '../../sequence-utils';
+import { getNearestAncestorNodeOfType } from '../../tree-utils';
 import { VmlLanguage } from './vml';
-import { librarySequenceToFswCommand, vmlBlockLibraryToCommandDictionary } from './vmlBlockLibrary';
+import { librarySequenceToFswCommand, vmlBlockLibraryToCommandDictionary } from './vml-block-library';
 import {
   RULE_BODY,
   RULE_CALL_PARAMETER,
@@ -41,9 +41,9 @@ import {
   TOKEN_END_MODULE,
   TOKEN_MODULE,
   TOKEN_SYMBOL_CONST,
-} from './vmlConstants';
-import { emptyFileOptions, SEQUENCE_SNIPPETS, structureSnippets } from './vmlSnippets';
-import { getArgumentPosition, getVmlVariables } from './vmlTreeUtils';
+} from './vml-constants';
+import { emptyFileOptions, SEQUENCE_SNIPPETS, structureSnippets } from './vml-snippets';
+import { getArgumentPosition, getVmlVariables } from './vml-tree-utils';
 
 const SECTION_LOCAL_VARIABLES: CompletionSection = {
   name: 'Local Variables',
@@ -115,11 +115,11 @@ function suggestDictionaryCompletions(
   librarySequenceMap: LibrarySequenceMap,
 ): Completion[] | null {
   if (isStatementNode(context, node)) {
-    return suggestTimeTaggedCompletions(context, node, tree, globals);
+    return suggestTimeTaggedCompletions(context, tree, globals);
   } else if (isVariableReferenceNode(node)) {
-    return suggestVariableReferenceCompletions(context, node, tree, globals);
+    return suggestVariableReferenceCompletions(context, tree, globals);
   } else if (isSpawnSequenceNameNode(node)) {
-    return suggestSpawnSequenceNameCompletions(node, librarySequenceMap);
+    return suggestSpawnSequenceNameCompletions(librarySequenceMap);
   } else if (isIssueFunctionNameNode(node)) {
     return suggestIssueCompletions(context, node, commandDictionary);
   } else if (isCallParameter(node)) {
@@ -129,14 +129,9 @@ function suggestDictionaryCompletions(
   return null;
 }
 
-function suggestTimeTaggedCompletions(
-  context: CompletionContext,
-  node: SyntaxNode,
-  tree: Tree,
-  globals: GlobalType[],
-): Completion[] {
+function suggestTimeTaggedCompletions(context: CompletionContext, tree: Tree, globals: GlobalType[]): Completion[] {
   const structs: Completion[] = structureSnippets('');
-  const variableCompletions = suggestVariableReferenceCompletions(context, node, tree, globals);
+  const variableCompletions = suggestVariableReferenceCompletions(context, tree, globals);
   return [...structs, ...(variableCompletions ?? [])];
 }
 
@@ -160,7 +155,7 @@ function suggestIssueCompletions(
   return getStemOptions(commandDictionary, false, addArguments);
 }
 
-function suggestSpawnSequenceNameCompletions(node: SyntaxNode, librarySequenceMap: LibrarySequenceMap): Completion[] {
+function suggestSpawnSequenceNameCompletions(librarySequenceMap: LibrarySequenceMap): Completion[] {
   return Object.values(librarySequenceMap).map(
     (sequence): Completion => ({
       detail: 'library sequence',
@@ -276,7 +271,6 @@ function getFswCommand(
 
 function suggestVariableReferenceCompletions(
   context: CompletionContext,
-  node: SyntaxNode,
   tree: Tree,
   globals: GlobalType[],
 ): Completion[] {
diff --git a/src/utilities/codemirror/vml/vmlBlockLibrary.ts b/src/utilities/sequence-editor/languages/vml/vml-block-library.ts
similarity index 98%
rename from src/utilities/codemirror/vml/vmlBlockLibrary.ts
rename to src/utilities/sequence-editor/languages/vml/vml-block-library.ts
index 158d46c9c2..4684e2e9bc 100644
--- a/src/utilities/codemirror/vml/vmlBlockLibrary.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-block-library.ts
@@ -14,8 +14,8 @@ import type {
   NumericRange,
 } from '@nasa-jpl/aerie-ampcs';
 import type { VariableDeclaration } from '@nasa-jpl/seq-json-schema/types';
-import type { LibrarySequence } from '../../../types/sequencing';
-import { filterEmpty } from '../../generic';
+import type { LibrarySequence } from '../../../../types/sequencing';
+import { filterEmpty } from '../../../generic';
 import { VmlLanguage } from './vml';
 import {
   RULE_BLOCK,
@@ -46,7 +46,7 @@ import {
   TOKEN_TIME,
   TOKEN_UINT,
   TOKEN_UINT_CONST,
-} from './vmlConstants';
+} from './vml-constants';
 
 export function vmlBlockLibraryToCommandDictionary(vml: string, id?: string, path?: string): CommandDictionary {
   const parsed = VmlLanguage.parser.parse(vml);
diff --git a/src/utilities/codemirror/vml/vmlConstants.ts b/src/utilities/sequence-editor/languages/vml/vml-constants.ts
similarity index 100%
rename from src/utilities/codemirror/vml/vmlConstants.ts
rename to src/utilities/sequence-editor/languages/vml/vml-constants.ts
diff --git a/src/utilities/codemirror/vml/vmlFolder.ts b/src/utilities/sequence-editor/languages/vml/vml-folder.ts
similarity index 99%
rename from src/utilities/codemirror/vml/vmlFolder.ts
rename to src/utilities/sequence-editor/languages/vml/vml-folder.ts
index bb5158ce33..814ecca10d 100644
--- a/src/utilities/codemirror/vml/vmlFolder.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-folder.ts
@@ -11,7 +11,7 @@ import {
   RULE_IF,
   RULE_TIME_TAGGED_STATEMENT,
   RULE_WHILE,
-} from './vmlConstants';
+} from './vml-constants';
 
 type BlockStackNode = Readonly<{
   node: SyntaxNode;
diff --git a/src/utilities/codemirror/vml/vmlFormatter.ts b/src/utilities/sequence-editor/languages/vml/vml-formatter.ts
similarity index 98%
rename from src/utilities/codemirror/vml/vmlFormatter.ts
rename to src/utilities/sequence-editor/languages/vml/vml-formatter.ts
index fd796a719e..bc3e66541a 100644
--- a/src/utilities/codemirror/vml/vmlFormatter.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-formatter.ts
@@ -2,7 +2,7 @@ import { syntaxTree } from '@codemirror/language';
 import type { ChangeSpec, EditorState } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
 import { EditorView } from 'codemirror';
-import { filterEmpty } from '../../generic';
+import { filterEmpty } from '../../../generic';
 import {
   RULE_ASSIGNMENT,
   RULE_CALL_PARAMETERS,
@@ -26,8 +26,8 @@ import {
   RULE_WHILE,
   TOKEN_ERROR,
   TOKEN_TIME_CONST,
-} from './vmlConstants';
-import { computeBlocks } from './vmlFolder';
+} from './vml-constants';
+import { computeBlocks } from './vml-folder';
 
 type LineOfNodes = (SyntaxNode | undefined)[];
 
diff --git a/src/utilities/codemirror/vml/vmlLinter.ts b/src/utilities/sequence-editor/languages/vml/vml-linter.ts
similarity index 97%
rename from src/utilities/codemirror/vml/vmlLinter.ts
rename to src/utilities/sequence-editor/languages/vml/vml-linter.ts
index 031303dbc4..ae5dc6569c 100644
--- a/src/utilities/codemirror/vml/vmlLinter.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-linter.ts
@@ -5,10 +5,10 @@ import type { SyntaxNode, Tree } from '@lezer/common';
 import type { CommandDictionary, FswCommand, FswCommandArgument } from '@nasa-jpl/aerie-ampcs';
 import type { EditorView } from 'codemirror';
 import { closest } from 'fastest-levenshtein';
-import type { GlobalType } from '../../../types/global-type';
-import type { LibrarySequenceMap } from '../../../types/sequencing';
-import { filterNodes, getNearestAncestorNodeOfType } from '../../sequence-editor/tree-utils';
-import { quoteEscape, unquoteUnescape } from '../codemirror-utils';
+import type { GlobalType } from '../../../../types/global-type';
+import type { LibrarySequenceMap } from '../../../../types/sequencing';
+import { quoteEscape, unquoteUnescape } from '../../sequence-utils';
+import { filterNodes, getNearestAncestorNodeOfType } from '../../tree-utils';
 import { VmlLanguage } from './vml';
 import {
   RULE_CALL_PARAMETER,
@@ -27,8 +27,8 @@ import {
   TOKEN_INT_CONST,
   TOKEN_STRING_CONST,
   TOKEN_UINT_CONST,
-} from './vmlConstants';
-import { getVmlVariables } from './vmlTreeUtils';
+} from './vml-constants';
+import { getVmlVariables } from './vml-tree-utils';
 
 /**
  * Limitations
diff --git a/src/utilities/codemirror/vml/vmlSnippets.ts b/src/utilities/sequence-editor/languages/vml/vml-snippets.ts
similarity index 98%
rename from src/utilities/codemirror/vml/vmlSnippets.ts
rename to src/utilities/sequence-editor/languages/vml/vml-snippets.ts
index 731afaa17b..4fc304c11a 100644
--- a/src/utilities/codemirror/vml/vmlSnippets.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-snippets.ts
@@ -6,7 +6,7 @@ import {
   TOKEN_MODULE,
   TOKEN_RELATIVE_SEQUENCE,
   TOKEN_SEQUENCE,
-} from './vmlConstants';
+} from './vml-constants';
 
 function skeletonSeq(seqType: string): string {
   return `${seqType} \${name}
diff --git a/src/utilities/codemirror/vml/vmlTooltip.ts b/src/utilities/sequence-editor/languages/vml/vml-tooltip.ts
similarity index 89%
rename from src/utilities/codemirror/vml/vmlTooltip.ts
rename to src/utilities/sequence-editor/languages/vml/vml-tooltip.ts
index ab472ce981..a8c43f67d0 100644
--- a/src/utilities/codemirror/vml/vmlTooltip.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-tooltip.ts
@@ -9,14 +9,14 @@ import type {
   FswCommandArgumentInteger,
 } from '@nasa-jpl/aerie-ampcs';
 import type { EditorView } from 'codemirror';
-import ArgumentTooltip from '../../../components/sequencing/ArgumentTooltip.svelte';
-import CommandTooltip from '../../../components/sequencing/CommandTooltip.svelte';
-import StringTooltip from '../../../components/sequencing/StringTooltip.svelte';
-import type { LibrarySequence } from '../../../types/sequencing';
-import { getTokenPositionInLine } from '../../sequence-editor/sequence-tooltip';
-import { checkContainment, getNearestAncestorNodeOfType } from '../../sequence-editor/tree-utils';
-import { decodeInt32Array, unquoteUnescape } from '../codemirror-utils';
-import { librarySequenceToFswCommand } from './vmlBlockLibrary';
+import ArgumentTooltip from '../../../../components/sequencing/ArgumentTooltip.svelte';
+import CommandTooltip from '../../../../components/sequencing/CommandTooltip.svelte';
+import StringTooltip from '../../../../components/sequencing/StringTooltip.svelte';
+import type { LibrarySequence } from '../../../../types/sequencing';
+import { getTokenPositionInLine } from '../../sequence-tooltip';
+import { decodeInt32Array, unquoteUnescape } from '../../sequence-utils';
+import { checkContainment, getNearestAncestorNodeOfType } from '../../tree-utils';
+import { librarySequenceToFswCommand } from './vml-block-library';
 import {
   RULE_BYTE_ARRAY,
   RULE_CALL_PARAMETER,
@@ -32,8 +32,8 @@ import {
   RULE_VM_MANAGEMENT,
   TOKEN_HEX_CONST,
   TOKEN_INT_CONST,
-} from './vmlConstants';
-import { getVmlNameNode } from './vmlTreeUtils';
+} from './vml-constants';
+import { getVmlNameNode } from './vml-tree-utils';
 
 const sequenceEngineArgument: FswCommandArgumentInteger = {
   arg_type: 'integer',
diff --git a/src/utilities/codemirror/vml/vmlTreeUtils.test.ts b/src/utilities/sequence-editor/languages/vml/vml-tree-utils.test.ts
similarity index 95%
rename from src/utilities/codemirror/vml/vmlTreeUtils.test.ts
rename to src/utilities/sequence-editor/languages/vml/vml-tree-utils.test.ts
index 120f4f7c85..3ae7c7ab2b 100644
--- a/src/utilities/codemirror/vml/vmlTreeUtils.test.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-tree-utils.test.ts
@@ -1,9 +1,9 @@
 import type { SyntaxNode } from '@lezer/common';
 import { describe, expect, test } from 'vitest';
-import { filterNodes, nodeContents } from '../../sequence-editor/tree-utils';
+import { filterNodes, nodeContents } from '../../tree-utils';
 import { VmlLanguage } from './vml';
-import { RULE_CALL_PARAMETERS, RULE_FUNCTION_NAME, RULE_TIME_TAGGED_STATEMENT } from './vmlConstants';
-import { getArgumentPosition, VmlCommandInfoMapper } from './vmlTreeUtils';
+import { RULE_CALL_PARAMETERS, RULE_FUNCTION_NAME, RULE_TIME_TAGGED_STATEMENT } from './vml-constants';
+import { getArgumentPosition, VmlCommandInfoMapper } from './vml-tree-utils';
 
 describe('vml command info mapper', () => {
   const input = `MODULE
@@ -80,7 +80,10 @@ END_MODULE
     const cmdNode = vmlCommandInfoMapper.getContainingCommand(argNode);
     expect(vmlCommandInfoMapper.getArgumentAppendPosition(cmdNode)).toBe(inputPosition);
   });
+});
 
+// TODO: reword this description
+describe('vml command info mapper', () => {
   test('getVariables returns module variables and sequence/block parameters and variables', () => {
     const input = `MODULE
 
diff --git a/src/utilities/codemirror/vml/vmlTreeUtils.ts b/src/utilities/sequence-editor/languages/vml/vml-tree-utils.ts
similarity index 96%
rename from src/utilities/codemirror/vml/vmlTreeUtils.ts
rename to src/utilities/sequence-editor/languages/vml/vml-tree-utils.ts
index 27e385ea61..b125c19968 100644
--- a/src/utilities/codemirror/vml/vmlTreeUtils.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml-tree-utils.ts
@@ -1,9 +1,9 @@
 import type { SyntaxNode, Tree } from '@lezer/common';
 import type { EnumMap, FswCommandArgument } from '@nasa-jpl/aerie-ampcs';
-import { filterEmpty } from '../../generic';
-import { filterNodesToArray, getChildrenNode, getNearestAncestorNodeOfType } from '../../sequence-editor/tree-utils';
-import type { CommandInfoMapper } from '../commandInfoMapper';
-import { getDefaultArgumentValue } from './vmlAdaptation';
+import { filterEmpty } from '../../../generic';
+import type { CommandInfoMapper } from '../../command-info-mapper';
+import { filterNodesToArray, getChildrenNode, getNearestAncestorNodeOfType } from '../../tree-utils';
+import { getDefaultArgumentValue } from './vml-adaptation';
 import {
   GROUP_STATEMENT_SUB,
   RULE_BYTE_ARRAY,
@@ -29,7 +29,7 @@ import {
   TOKEN_HEX_CONST,
   TOKEN_INT_CONST,
   TOKEN_STRING_CONST,
-} from './vmlConstants';
+} from './vml-constants';
 
 export class VmlCommandInfoMapper implements CommandInfoMapper {
   formatArgumentArray(values: string[], commandNode: SyntaxNode | null): string {
diff --git a/src/utilities/codemirror/vml/vml.grammar b/src/utilities/sequence-editor/languages/vml/vml.grammar
similarity index 100%
rename from src/utilities/codemirror/vml/vml.grammar
rename to src/utilities/sequence-editor/languages/vml/vml.grammar
diff --git a/src/utilities/codemirror/vml/vml.grammar.d.ts b/src/utilities/sequence-editor/languages/vml/vml.grammar.d.ts
similarity index 100%
rename from src/utilities/codemirror/vml/vml.grammar.d.ts
rename to src/utilities/sequence-editor/languages/vml/vml.grammar.d.ts
diff --git a/src/utilities/codemirror/vml/vml.test.ts b/src/utilities/sequence-editor/languages/vml/vml.test.ts
similarity index 98%
rename from src/utilities/codemirror/vml/vml.test.ts
rename to src/utilities/sequence-editor/languages/vml/vml.test.ts
index 58a3dfd786..456537f6f1 100644
--- a/src/utilities/codemirror/vml/vml.test.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml.test.ts
@@ -1,9 +1,9 @@
 import type { SyntaxNode } from '@lezer/common';
 import type { FswCommandArgumentInteger } from '@nasa-jpl/aerie-ampcs';
 import { assert, describe, expect, it } from 'vitest';
-import { filterNodes, nodeContents } from '../../sequence-editor/tree-utils';
+import { filterNodes, nodeContents } from '../../tree-utils';
 import { VmlLanguage } from './vml';
-import { vmlBlockLibraryToCommandDictionary } from './vmlBlockLibrary';
+import { vmlBlockLibraryToCommandDictionary } from './vml-block-library';
 import {
   GROUP_STATEMENT_SUB as GROUP_STATEMENT_SUBTYPES,
   RULE_ABSOLUTE_SEQUENCE,
@@ -29,7 +29,7 @@ import {
   TOKEN_MODULE,
   TOKEN_SYMBOL_CONST,
   TOKEN_TIME_CONST,
-} from './vmlConstants';
+} from './vml-constants';
 
 // In versions of VML prior to 2.1, explicit time tags were required on every statement
 // confirm what version we're using
diff --git a/src/utilities/codemirror/vml/vml.ts b/src/utilities/sequence-editor/languages/vml/vml.ts
similarity index 95%
rename from src/utilities/codemirror/vml/vml.ts
rename to src/utilities/sequence-editor/languages/vml/vml.ts
index 7fac27bf7c..6f09012131 100644
--- a/src/utilities/codemirror/vml/vml.ts
+++ b/src/utilities/sequence-editor/languages/vml/vml.ts
@@ -4,11 +4,10 @@ import { Decoration, ViewPlugin, type DecorationSet, type ViewUpdate } from '@co
 import type { SyntaxNode } from '@lezer/common';
 import { styleTags, tags as t } from '@lezer/highlight';
 import type { ChannelDictionary, CommandDictionary } from '@nasa-jpl/aerie-ampcs';
-import type { ISequenceAdaptation } from '../../../types/sequencing';
-import { getNearestAncestorNodeOfType } from '../../sequence-editor/tree-utils';
-import { blockMark } from '../themes/block';
-import { parser } from '../vml/vml.grammar';
-import { vmlAutoComplete } from './vmlAdaptation';
+import type { ISequenceAdaptation } from '../../../../types/sequencing';
+import { blockMark } from '../../../codemirror/themes/block';
+import { getNearestAncestorNodeOfType } from '../../tree-utils';
+import { vmlAutoComplete } from './vml-adaptation';
 import {
   RULE_TIME_TAGGED_STATEMENT,
   TOKEN_CALL,
@@ -27,8 +26,9 @@ import {
   TOKEN_THEN,
   TOKEN_TO,
   TOKEN_WHILE,
-} from './vmlConstants';
-import { computeBlocks, isBlockCommand, vmlBlockFolder } from './vmlFolder';
+} from './vml-constants';
+import { computeBlocks, isBlockCommand, vmlBlockFolder } from './vml-folder';
+import { parser } from './vml.grammar';
 
 const VML_LANGUAGE_NAME = 'vml';
 
diff --git a/src/utilities/sequence-editor/sequence-autoindent.ts b/src/utilities/sequence-editor/sequence-autoindent.ts
index 661d41d30c..a41059b6a1 100644
--- a/src/utilities/sequence-editor/sequence-autoindent.ts
+++ b/src/utilities/sequence-editor/sequence-autoindent.ts
@@ -1,7 +1,7 @@
 import { indentSelection } from '@codemirror/commands';
 import { syntaxTree, type IndentContext } from '@codemirror/language';
 import { EditorView } from 'codemirror';
-import { computeBlocks } from '../codemirror/custom-folder';
+import { computeBlocks } from './languages/seq-n/custom-folder';
 import { getNearestAncestorNodeOfType } from './tree-utils';
 
 const TAB_SIZE = 2;
diff --git a/src/utilities/sequence-editor/sequence-completion.ts b/src/utilities/sequence-editor/sequence-completion.ts
index d2c128c8b4..ce27671efa 100644
--- a/src/utilities/sequence-editor/sequence-completion.ts
+++ b/src/utilities/sequence-editor/sequence-completion.ts
@@ -3,12 +3,12 @@ import { syntaxTree } from '@codemirror/language';
 import type { ChannelDictionary, CommandDictionary, ParameterDictionary } from '@nasa-jpl/aerie-ampcs';
 import { RULE_SEQUENCE_NAME, TOKEN_ACTIVATE, TOKEN_LOAD } from '../../constants/seq-n-grammar-constants';
 import { getGlobals } from '../../stores/sequence-adaptation';
-import type { LibrarySequence } from '../../types/sequencing';
-import { SeqLanguage } from '../codemirror';
-import { getDefaultVariableArgs } from '../codemirror/codemirror-utils';
+import type { ISequenceAdaptation, LibrarySequence } from '../../types/sequencing';
 import { getDoyTime } from '../time';
 import { fswCommandArgDefault } from './command-dictionary';
 import { getCustomArgDef } from './extension-points';
+import { SeqLanguage } from './languages/seq-n/seq-n';
+import { getDefaultVariableArgs } from './sequence-utils';
 import { getFromAndTo, getNearestAncestorNodeOfType } from './tree-utils';
 
 type CursorInfo = {
@@ -31,6 +31,7 @@ export function sequenceCompletion(
   commandDictionary: CommandDictionary | null = null,
   parameterDictionaries: ParameterDictionary[],
   librarySequences: LibrarySequence[],
+  sequenceAdaptation?: ISequenceAdaptation,
 ) {
   return (context: CompletionContext): CompletionResult | null => {
     const nodeBefore = syntaxTree(context.state).resolveInner(context.pos, -1);
@@ -245,7 +246,13 @@ export function sequenceCompletion(
       // If TimeTag has been entered show the completion list when 1 character has been entered
       if (word.text.length > (cursor.isAfterTimeTag || cursor.isBeforeImmedOrHDWCommands === false ? 0 : 1)) {
         fswCommandsCompletions.push(
-          ...generateCommandCompletions(channelDictionary, commandDictionary, cursor, parameterDictionaries),
+          ...generateCommandCompletions(
+            channelDictionary,
+            commandDictionary,
+            cursor,
+            parameterDictionaries,
+            sequenceAdaptation,
+          ),
         );
 
         //add load, activate, ground_block, and ground_event commands
@@ -337,6 +344,7 @@ function generateCommandCompletions(
   commandDictionary: CommandDictionary | null,
   cursor: CursorInfo,
   parameterDictionaries: ParameterDictionary[],
+  sequenceAdaptation?: ISequenceAdaptation,
 ): Completion[] {
   if (commandDictionary === null) {
     return [];
@@ -357,7 +365,14 @@ function generateCommandCompletions(
       args.forEach(arg => {
         argDefaults.push(
           fswCommandArgDefault(
-            getCustomArgDef(stem, arg, argDefaults.slice(), parameterDictionaries, channelDictionary),
+            getCustomArgDef(
+              stem,
+              arg,
+              argDefaults.slice(),
+              parameterDictionaries,
+              channelDictionary,
+              sequenceAdaptation,
+            ),
             commandDictionary.enumMap,
           ),
         );
diff --git a/src/utilities/sequence-editor/sequence-constants.ts b/src/utilities/sequence-editor/sequence-constants.ts
new file mode 100644
index 0000000000..a103fa8572
--- /dev/null
+++ b/src/utilities/sequence-editor/sequence-constants.ts
@@ -0,0 +1 @@
+export const TOKEN_ERROR = '⚠';
diff --git a/src/utilities/sequence-editor/sequence-linter.ts b/src/utilities/sequence-editor/sequence-linter.ts
index e628fea27a..378de21b67 100644
--- a/src/utilities/sequence-editor/sequence-linter.ts
+++ b/src/utilities/sequence-editor/sequence-linter.ts
@@ -20,24 +20,14 @@ import {
   RULE_SEQUENCE_NAME,
   TOKEN_ACTIVATE,
   TOKEN_COMMAND,
-  TOKEN_ERROR,
   TOKEN_LOAD,
   TOKEN_REPEAT_ARG,
   TOKEN_REQUEST,
 } from '../../constants/seq-n-grammar-constants';
 import { TimeTypes } from '../../enums/time';
-import { getGlobals } from '../../stores/sequence-adaptation';
-import type { LibrarySequence } from '../../types/sequencing';
+import type { GlobalType } from '../../types/global-type';
+import type { ISequenceAdaptation, LibrarySequence } from '../../types/sequencing';
 import { CustomErrorCodes } from '../../workers/customCodes';
-import {
-  addDefaultArgs,
-  addDefaultVariableArgs,
-  isHexValue,
-  parseNumericArg,
-  quoteEscape,
-} from '../codemirror/codemirror-utils';
-import { closeSuggestion, computeBlocks, openSuggestion } from '../codemirror/custom-folder';
-import { SeqNCommandInfoMapper } from '../codemirror/seq-n-tree-utils';
 import { pluralize } from '../text';
 import {
   getBalancedDuration,
@@ -49,6 +39,10 @@ import {
   validateTime,
 } from '../time';
 import { getCustomArgDef } from './extension-points';
+import { closeSuggestion, computeBlocks, openSuggestion } from './languages/seq-n/custom-folder';
+import { SeqNCommandInfoMapper } from './languages/seq-n/seq-n-tree-utils';
+import { TOKEN_ERROR } from './sequence-constants';
+import { addDefaultArgs, addDefaultVariableArgs, isHexValue, parseNumericArg, quoteEscape } from './sequence-utils';
 import { getChildrenNode, getDeepestNode, getFromAndTo } from './tree-utils';
 
 const KNOWN_DIRECTIVES = [
@@ -86,10 +80,12 @@ type VariableMap = {
  */
 export function sequenceLinter(
   view: EditorView,
+  sequenceAdaptation: ISequenceAdaptation,
   channelDictionary: ChannelDictionary | null = null,
   commandDictionary: CommandDictionary | null = null,
   parameterDictionaries: ParameterDictionary[] = [],
   librarySequences: LibrarySequence[] = [],
+  globalVariables: GlobalType[],
 ): Diagnostic[] {
   const tree = syntaxTree(view.state);
   const treeNode = tree.topNode;
@@ -100,7 +96,7 @@ export function sequenceLinter(
 
   // TODO: Get identify type mapping to use
   const variables: VariableDeclaration[] = [
-    ...(getGlobals().map(g => ({ name: g.name, type: 'STRING' }) as const) ?? []),
+    ...(globalVariables.map(g => ({ name: g.name, type: 'STRING' }) as const) ?? []),
   ];
 
   // Validate top level metadata
@@ -130,6 +126,7 @@ export function sequenceLinter(
   if (commandsNode) {
     diagnostics.push(
       ...commandLinter(
+        sequenceAdaptation,
         [
           ...commandsNode.getChildren(TOKEN_COMMAND),
           ...commandsNode.getChildren(TOKEN_LOAD), // TODO: remove in the library sequence PR because that check should validate load and activates
@@ -147,6 +144,7 @@ export function sequenceLinter(
         commandsNode.getChildren(TOKEN_REQUEST),
         docText,
         variableMap,
+        sequenceAdaptation,
         commandDictionary,
         channelDictionary,
         parameterDictionaries,
@@ -167,6 +165,7 @@ export function sequenceLinter(
       ],
       docText,
       variableMap,
+      sequenceAdaptation,
       commandDictionary,
       channelDictionary,
       parameterDictionaries,
@@ -175,6 +174,7 @@ export function sequenceLinter(
 
   diagnostics.push(
     ...hardwareCommandLinter(
+      sequenceAdaptation,
       treeNode.getChild('HardwareCommands')?.getChildren(TOKEN_COMMAND) || [],
       docText,
       commandDictionary,
@@ -263,6 +263,7 @@ function validateRequests(
   requestNodes: SyntaxNode[],
   text: string,
   variables: VariableMap,
+  sequenceAdaptation: ISequenceAdaptation,
   commandDictionary: CommandDictionary | null,
   channelDictionary: ChannelDictionary | null,
   parameterDictionaries: ParameterDictionary[],
@@ -277,6 +278,7 @@ function validateRequests(
   diagnostics.push(
     ...requestNodes.flatMap(request =>
       commandLinter(
+        sequenceAdaptation,
         request.getChild('Steps')?.getChildren(TOKEN_COMMAND) ?? [],
         text,
         variables,
@@ -683,6 +685,7 @@ function insertAction(name: string, insert: string) {
  * @return {Diagnostic[]} an array of diagnostics
  */
 function commandLinter(
+  sequenceAdaptation: ISequenceAdaptation,
   commandNodes: SyntaxNode[] | undefined,
   text: string,
   variables: VariableMap,
@@ -716,6 +719,7 @@ function commandLinter(
         text,
         'command',
         variables,
+        sequenceAdaptation,
         commandDictionary,
         channelDictionary,
         parameterDictionaries,
@@ -894,6 +898,7 @@ function immediateCommandLinter(
   commandNodes: SyntaxNode[] | undefined,
   text: string,
   variables: VariableMap,
+  sequenceAdaptation: ISequenceAdaptation,
   commandDictionary: CommandDictionary | null,
   channelDictionary: ChannelDictionary | null,
   parameterDictionaries: ParameterDictionary[],
@@ -929,6 +934,7 @@ function immediateCommandLinter(
         text,
         'immediate',
         variables,
+        sequenceAdaptation,
         commandDictionary,
         channelDictionary,
         parameterDictionaries,
@@ -962,6 +968,7 @@ function immediateCommandLinter(
  * @return {Diagnostic[]} an array of diagnostics
  */
 function hardwareCommandLinter(
+  sequenceAdaptation: ISequenceAdaptation,
   commands: SyntaxNode[] | undefined,
   text: string,
   commandDictionary: CommandDictionary | null,
@@ -995,7 +1002,16 @@ function hardwareCommandLinter(
 
     // Validate the command and push the generated diagnostics to the array
     diagnostics.push(
-      ...validateCommand(command, text, 'hardware', {}, commandDictionary, channelDictionary, parameterDictionaries),
+      ...validateCommand(
+        command,
+        text,
+        'hardware',
+        {},
+        sequenceAdaptation,
+        commandDictionary,
+        channelDictionary,
+        parameterDictionaries,
+      ),
     );
 
     // Lint the metadata
@@ -1030,6 +1046,7 @@ function validateCommand(
   text: string,
   type: 'command' | 'immediate' | 'hardware' = 'command',
   variables: VariableMap,
+  sequenceAdaptation: ISequenceAdaptation,
   commandDictionary: CommandDictionary | null,
   channelDictionary: ChannelDictionary | null,
   parameterDictionaries: ParameterDictionary[],
@@ -1076,6 +1093,7 @@ function validateCommand(
       text,
       stemText,
       variables,
+      sequenceAdaptation,
       commandDictionary,
       channelDictionary,
       parameterDictionaries,
@@ -1168,6 +1186,7 @@ function validateAndLintArguments(
   text: string,
   stem: string,
   variables: VariableMap,
+  sequenceAdaptation: ISequenceAdaptation,
   commandDictionary: CommandDictionary | null,
   channelDictionary: ChannelDictionary | null,
   parameterDictionaries: ParameterDictionary[],
@@ -1229,6 +1248,7 @@ function validateAndLintArguments(
         stem,
         argValues.slice(0, i),
         variables,
+        sequenceAdaptation,
         commandDictionary,
         channelDictionary,
         parameterDictionaries,
@@ -1316,11 +1336,19 @@ function validateArgument(
   stemText: string,
   precedingArgValues: string[],
   variables: VariableMap,
+  sequenceAdaptation: ISequenceAdaptation,
   commandDictionary: CommandDictionary | null,
   channelDictionary: ChannelDictionary | null,
   parameterDictionaries: ParameterDictionary[],
 ): Diagnostic[] {
-  dictArg = getCustomArgDef(stemText, dictArg, precedingArgValues, parameterDictionaries, channelDictionary);
+  dictArg = getCustomArgDef(
+    stemText,
+    dictArg,
+    precedingArgValues,
+    parameterDictionaries,
+    channelDictionary,
+    sequenceAdaptation,
+  );
 
   const diagnostics: Diagnostic[] = [];
 
@@ -1557,6 +1585,7 @@ function validateArgument(
                     text,
                     stemText,
                     variables,
+                    sequenceAdaptation,
                     commandDictionary,
                     channelDictionary,
                     parameterDictionaries,
diff --git a/src/utilities/sequence-editor/sequence-tooltip.ts b/src/utilities/sequence-editor/sequence-tooltip.ts
index 310e414bdc..e2a7881004 100644
--- a/src/utilities/sequence-editor/sequence-tooltip.ts
+++ b/src/utilities/sequence-editor/sequence-tooltip.ts
@@ -12,8 +12,9 @@ import type {
 import ArgumentTooltip from '../../components/sequencing/ArgumentTooltip.svelte';
 import CommandTooltip from '../../components/sequencing/CommandTooltip.svelte';
 import { TOKEN_REPEAT_ARG } from '../../constants/seq-n-grammar-constants';
-import { isFswCommandArgumentRepeat } from './../../utilities/codemirror/codemirror-utils';
+import type { ISequenceAdaptation } from '../../types/sequencing';
 import { getCustomArgDef } from './extension-points';
+import { isFswCommandArgumentRepeat } from './sequence-utils';
 
 /**
  * Searches up through a node's ancestors to find a node by the given name.
@@ -56,6 +57,7 @@ export function getTokenPositionInLine(view: EditorView, pos: number) {
  * Can be optionally called with a command dictionary so it's available during tooltip generation.
  */
 export function sequenceTooltip(
+  sequenceAdaptation: ISequenceAdaptation,
   channelDictionary: ChannelDictionary | null = null,
   commandDictionary: CommandDictionary | null = null,
   parameterDictionaries: ParameterDictionary[] = [],
@@ -151,6 +153,7 @@ export function sequenceTooltip(
                 argValues,
                 parameterDictionaries,
                 channelDictionary,
+                sequenceAdaptation,
               );
 
               if (arg) {
diff --git a/src/utilities/codemirror/codemirror-utils.test.ts b/src/utilities/sequence-editor/sequence-utils.test.ts
similarity index 99%
rename from src/utilities/codemirror/codemirror-utils.test.ts
rename to src/utilities/sequence-editor/sequence-utils.test.ts
index f2092d1971..280c93f087 100644
--- a/src/utilities/codemirror/codemirror-utils.test.ts
+++ b/src/utilities/sequence-editor/sequence-utils.test.ts
@@ -34,7 +34,7 @@ import {
   quoteEscape,
   removeEscapedQuotes,
   unquoteUnescape,
-} from './codemirror-utils';
+} from './sequence-utils';
 
 describe(`'Escaped quotes' from input`, () => {
   it('Should remove escaped quotes surrounding a string', () => {
diff --git a/src/utilities/codemirror/codemirror-utils.ts b/src/utilities/sequence-editor/sequence-utils.ts
similarity index 58%
rename from src/utilities/codemirror/codemirror-utils.ts
rename to src/utilities/sequence-editor/sequence-utils.ts
index 4716273d26..ae23ee737c 100644
--- a/src/utilities/codemirror/codemirror-utils.ts
+++ b/src/utilities/sequence-editor/sequence-utils.ts
@@ -1,5 +1,6 @@
-import type { SyntaxNode } from '@lezer/common';
+import type { SyntaxNode, Tree } from '@lezer/common';
 import type {
+  ChannelDictionary,
   CommandDictionary,
   FswCommand,
   FswCommandArgument,
@@ -13,12 +14,23 @@ import type {
   FswCommandArgumentUnsigned,
   FswCommandArgumentVarString,
   HwCommand,
+  ParameterDictionary,
 } from '@nasa-jpl/aerie-ampcs';
 import type { VariableDeclaration } from '@nasa-jpl/seq-json-schema/types';
 import type { EditorView } from 'codemirror';
-import type { ArgTextDef, NumberArg, StringArg } from '../../types/sequencing';
-import { fswCommandArgDefault } from '../sequence-editor/command-dictionary';
-import type { CommandInfoMapper } from './commandInfoMapper';
+import type {
+  ArgTextDef,
+  ISequenceAdaptation,
+  LibrarySequenceMap,
+  NumberArg,
+  StringArg,
+  TimeTagInfo,
+} from '../../types/sequencing';
+import { fswCommandArgDefault } from './command-dictionary';
+import type { CommandInfoMapper } from './command-info-mapper';
+import { getCustomArgDef } from './extension-points';
+import { librarySequenceToFswCommand } from './languages/vml/vml-block-library';
+import { TOKEN_ERROR } from './sequence-constants';
 
 export function isFswCommand(command: FswCommand | HwCommand): command is FswCommand {
   return (command as FswCommand).type === 'fsw_command';
@@ -199,3 +211,134 @@ export function encodeInt32Array(s: string) {
   }
   return encoded;
 }
+
+export function isVmlSequence(sequenceName: string | undefined): boolean {
+  return sequenceName !== undefined && sequenceName.endsWith('.vml');
+}
+
+export function getTimeTagInfo(seqEditorView: EditorView, node: SyntaxNode | null): TimeTagInfo {
+  const childTimeTagNode = node?.getChild('TimeTag');
+
+  return (
+    childTimeTagNode && {
+      node: childTimeTagNode,
+      text: seqEditorView.state.sliceDoc(childTimeTagNode.from, childTimeTagNode.to) ?? '',
+    }
+  );
+}
+
+export function getCommandDef(
+  commandDictionary: CommandDictionary | null,
+  librarySequenceMap: LibrarySequenceMap,
+  stemName: string,
+): FswCommand | null {
+  const commandDefFromCommandDictionary = commandDictionary?.fswCommandMap[stemName];
+  if (commandDefFromCommandDictionary) {
+    return commandDefFromCommandDictionary;
+  }
+
+  const librarySeqDef = librarySequenceMap[stemName];
+  if (librarySeqDef) {
+    return librarySequenceToFswCommand(librarySeqDef);
+  }
+  return null;
+}
+
+export function getVariablesInScope(
+  infoMapper: CommandInfoMapper,
+  seqEditorView: EditorView,
+  adaptation: ISequenceAdaptation,
+  tree: Tree | null,
+  cursorPosition?: number,
+): string[] {
+  const globalNames = (adaptation.globals ?? []).map(globalVariable => globalVariable.name);
+  if (tree && cursorPosition !== undefined) {
+    const docText = seqEditorView.state.doc.toString();
+    return [...globalNames, ...infoMapper.getVariables(docText, tree, cursorPosition)];
+  }
+  return globalNames;
+}
+
+export function getArgumentInfo(
+  commandDef: FswCommand | null,
+  infoMapper: CommandInfoMapper,
+  channelDictionary: ChannelDictionary | null,
+  seqEditorView: EditorView,
+  args: SyntaxNode | null,
+  argumentDefs: FswCommandArgument[] | undefined,
+  parentArgDef: FswCommandArgumentRepeat | undefined,
+  parameterDictionaries: ParameterDictionary[],
+  sequenceAdaptation: ISequenceAdaptation,
+) {
+  const argArray: ArgTextDef[] = [];
+  const precedingArgValues: string[] = [];
+  const parentRepeatLength = parentArgDef?.repeat?.arguments.length;
+
+  if (args) {
+    for (const node of infoMapper.getArgumentsFromContainer(args)) {
+      if (node.name === TOKEN_ERROR) {
+        continue;
+      }
+
+      let argDef: FswCommandArgument | undefined = undefined;
+      if (argumentDefs) {
+        let argDefIndex = argArray.length;
+        if (parentRepeatLength !== undefined) {
+          // for repeat args shift index
+          argDefIndex %= parentRepeatLength;
+        }
+        argDef = argumentDefs[argDefIndex];
+      }
+
+      if (commandDef && argDef) {
+        argDef = getCustomArgDef(
+          commandDef?.stem,
+          argDef,
+          precedingArgValues,
+          parameterDictionaries,
+          channelDictionary,
+          sequenceAdaptation,
+        );
+      }
+
+      let children: ArgTextDef[] | undefined = undefined;
+      if (!!argDef && isFswCommandArgumentRepeat(argDef)) {
+        children = getArgumentInfo(
+          commandDef,
+          infoMapper,
+          channelDictionary,
+          seqEditorView,
+          node,
+          argDef.repeat?.arguments,
+          argDef,
+          parameterDictionaries,
+          sequenceAdaptation,
+        );
+      }
+      const argValue = seqEditorView.state.sliceDoc(node.from, node.to);
+      argArray.push({
+        argDef,
+        children,
+        node,
+        parentArgDef,
+        text: argValue,
+      });
+      precedingArgValues.push(argValue);
+    }
+  }
+  // add entries for defined arguments missing from editor
+  if (argumentDefs) {
+    if (!parentArgDef) {
+      argArray.push(...argumentDefs.slice(argArray.length).map(argDef => ({ argDef })));
+    } else {
+      const repeatArgs = parentArgDef?.repeat?.arguments;
+      if (repeatArgs) {
+        if (argArray.length % repeatArgs.length !== 0) {
+          argArray.push(...argumentDefs.slice(argArray.length % repeatArgs.length).map(argDef => ({ argDef })));
+        }
+      }
+    }
+  }
+
+  return argArray;
+}
diff --git a/src/utilities/sequence-editor/to-seq-json.test.ts b/src/utilities/sequence-editor/to-seq-json.test.ts
index 2df852cd68..bb61b659eb 100644
--- a/src/utilities/sequence-editor/to-seq-json.test.ts
+++ b/src/utilities/sequence-editor/to-seq-json.test.ts
@@ -10,9 +10,9 @@ import {
 import type { VariableDeclaration } from '@nasa-jpl/seq-json-schema/types';
 import { readFileSync } from 'fs';
 import { describe, expect, it } from 'vitest';
-import { SeqLanguage } from '../codemirror';
-import { parser } from '../codemirror/sequence.grammar';
 import { seqJsonToSequence } from './from-seq-json';
+import { SeqLanguage } from './languages/seq-n/seq-n';
+import { parser } from './languages/seq-n/seq-n.grammar';
 import { parseVariables, sequenceToSeqJson } from './to-seq-json';
 
 function argArrToMap(cmdArgs: FswCommandArgument[]): FswCommandArgumentMap {
diff --git a/src/utilities/sequence-editor/to-seq-json.ts b/src/utilities/sequence-editor/to-seq-json.ts
index fdc721e0f1..170094806b 100644
--- a/src/utilities/sequence-editor/to-seq-json.ts
+++ b/src/utilities/sequence-editor/to-seq-json.ts
@@ -29,9 +29,9 @@ import type {
 } from '@nasa-jpl/seq-json-schema/types';
 import { TOKEN_ACTIVATE, TOKEN_COMMAND, TOKEN_LOAD, TOKEN_REPEAT_ARG } from '../../constants/seq-n-grammar-constants';
 import { TimeTypes } from '../../enums/time';
-import { removeEscapedQuotes, unquoteUnescape } from '../codemirror/codemirror-utils';
 import { getBalancedDuration, getDurationTimeComponents, parseDurationString, validateTime } from '../time';
 import { logInfo } from './logger';
+import { removeEscapedQuotes, unquoteUnescape } from './sequence-utils';
 
 /**
  * Returns a minimal valid Seq JSON object.
diff --git a/src/utilities/sequence-editor/token.test.ts b/src/utilities/sequence-editor/token.test.ts
index c46c182902..3ea493b1eb 100644
--- a/src/utilities/sequence-editor/token.test.ts
+++ b/src/utilities/sequence-editor/token.test.ts
@@ -5,7 +5,7 @@ import { readFileSync, readdirSync } from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
 import { assert, describe, it } from 'vitest';
-import { SeqLanguage } from '../codemirror';
+import { SeqLanguage } from './languages/seq-n/seq-n';
 
 const ERROR = '⚠';
 const ENUM_TOKEN = 'Enum';