Build workspace agent, capability graph, and versioned cutovers

grammar/QuixosCapability.g4

@@ -2,6 +2,8 @@ grammar QuixosCapability;
 
 document
   : workspaceDecl EOF
+  | interfaceResourceDecl EOF
+  | packageResourceDecl EOF
   ;
 
 workspaceDecl
@@ -11,29 +13,40 @@ workspaceDecl
 
 workspaceItem
   : atomDecl
-  | interfaceDecl
-  | packageDecl
+  | resourceImportDecl
   | sharedAttachmentDecl
   | conformanceDecl
   | constructorBindingDecl
   ;
 
+resourceImportDecl
+  : IMPORT INTERFACE identifier SEMI
+  | IMPORT PACKAGE identifier SEMI
+  ;
+
+externalAtomDecl
+  : EXTERNAL ATOM identifier ID stringLiteral SEMI
+  ;
+
+externalInterfaceDecl
+  : EXTERNAL INTERFACE identifier REVISION stringLiteral SEMI
+  ;
+
+resourcePreamble
+  : resourceImportDecl
+  | externalAtomDecl
+  | externalInterfaceDecl
+  ;
+
 atomDecl
   : ATOM identifier ID stringLiteral (DOC stringLiteral)? SEMI
   ;
 
-interfaceDecl
-  : INTERFACE identifier ID stringLiteral REVISION stringLiteral sourceBlock
+interfaceResourceDecl
+  : resourcePreamble* INTERFACE identifier ID stringLiteral REVISION stringLiteral
     LBRACE interfaceMember* RBRACE
   ;
 
-sourceBlock
-  : SOURCE LBRACE
-    REPOSITORY stringLiteral SEMI
-    COMMIT stringLiteral SEMI
-    RBRACE
-  ;
-
 interfaceMember
   : valueMember
   | relationshipMember
@@ -73,8 +86,8 @@ targetConstraint
   | INTERFACE identifier
   ;
 
-packageDecl
-  : PACKAGE identifier ID stringLiteral REVISION stringLiteral sourceBlock
+packageResourceDecl
+  : resourcePreamble* PACKAGE identifier ID stringLiteral REVISION stringLiteral
     LBRACE packageExport* RBRACE
   ;
 
@@ -237,7 +250,7 @@ dependencyBindingBlock
 dependencyBinding
   : identifier TO STATE identifier (VIA EDGE identifier DOT identifier)? SEMI
   | identifier TO EDGE identifier DOT identifier (VIA EDGE identifier DOT identifier)? SEMI
-  | identifier TO INTERFACE identifier SEMI
+  | identifier TO INTERFACE identifier (VIA EDGE identifier DOT identifier)? SEMI
   | identifier TO CONSTRUCTOR identifier SEMI
   ;
 
@@ -307,6 +320,8 @@ stringLiteral
   ;
 
 WORKSPACE: 'workspace';
+IMPORT: 'import';
+EXTERNAL: 'external';
 ATOM: 'atom';
 INTERFACE: 'interface';
 INTERFACES: 'interfaces';

grammar/QuixosLock.g4

@@ -1,17 +1,22 @@
 grammar QuixosLock;
 
 document
-  : QUIXOS_LOCK VERSION INTEGER LBRACE quixosEntry resourceEntry* RBRACE EOF
+  : QUIXOS_LOCK FRAGMENT? VERSION INTEGER LBRACE
+    (quixosEntry | importEntry | resourceEntry)* RBRACE EOF
   ;
 
 quixosEntry
-  : QUIXOS SOURCE sourceBlock
+  : QUIXOS SOURCE quixosSourceBlock
   ;
 
 resourceEntry
   : resourceKind identifier SOURCE sourceBlock
   ;
 
+importEntry
+  : IMPORT stringLiteral SEMI
+  ;
+
 resourceKind
   : INTERFACE
   | PACKAGE
@@ -24,6 +29,20 @@ sourceBlock
     RBRACE
   ;
 
+quixosSourceBlock
+  : LBRACE
+    REPOSITORY stringLiteral SEMI
+    (POLICY sourcePolicy SEMI REF stringLiteral SEMI)?
+    COMMIT stringLiteral SEMI
+    RBRACE
+  ;
+
+sourcePolicy
+  : PINNED
+  | TRACK_RELEASE
+  | TRACK_DEVELOPMENT
+  ;
+
 identifier
   : IDENTIFIER
   ;
@@ -33,6 +52,7 @@ stringLiteral
   ;
 
 QUIXOS_LOCK: 'quixos-lock';
+FRAGMENT: 'fragment';
 VERSION: 'version';
 QUIXOS: 'quixos';
 SOURCE: 'source';
@@ -40,6 +60,12 @@ INTERFACE: 'interface';
 PACKAGE: 'package';
 REPOSITORY: 'repository';
 COMMIT: 'commit';
+POLICY: 'policy';
+REF: 'ref';
+PINNED: 'pinned';
+TRACK_RELEASE: 'track-release';
+TRACK_DEVELOPMENT: 'track-development';
+IMPORT: 'import';
 
 LBRACE: '{';
 RBRACE: '}';