ekms 9.7.1-beta.11 → 9.7.1-beta.13

package/common/drone.js

@@ -851,10 +851,10 @@ const template = {
         match: ({childId}) => childId == 'point',
         apply: ({config, childId}) => {
           config.updateBridge(childId, ({ bridge }) => {
-            if (!bridge.init) {
-              bridge.init = {}
+            if (!bridge.initial) {
+              bridge.initial = {}
             }
-            bridge.init['notConjunctableWith'] = ['quantity']
+            bridge.initial['notConjunctableWith'] = ['quantity', 'number']
           })
         }
       })
@@ -1351,8 +1351,11 @@ const template = {
         {
           where: where(),
           match: ({context}) => context.marker == 'doAction',
-          apply: async ({context, fragments, e, s, toEValue, toFinalValue, objects}) => {
-            await s({ ...context, marker: 'patrol', path: context.action})
+          apply: async ({context, fragments, e, s, toEValue, toFinalValue, namespaced, objects}) => {
+            const updated = { ...context, marker: 'patrol', path: context.action }
+            namespaced.set('actions', updated, 'logged', true)
+            await s(updated)
+            // await s({ ...context, marker: 'patrol', path: context.action })
           }
         },
         {
@@ -1456,8 +1459,26 @@ const template = {
           }
         },
         {
-          match: ({context}) => context.marker == 'speed' && context.evaluate,
+          where: where(),
+          match: ({context}) => {
+            // from stm lookup
+            if (context.marker == 'mentions' && context.evaluate && context.args.context.marker == 'speed') {
+              return true
+            }
+            // from property directly
+            if (context.marker == 'speed' && context.evaluate) {
+              return true
+            }
+          },
           apply: async ({gp, s, context, objects, fragments, resolveEvaluate, api}) => {
+            let return_context = context
+            if (context.marker == 'speed') {
+              // okay
+            } else {
+              // stm lookup
+              return_context = context
+              context = context.args.context
+            }
             let value = objects.current.speed
             if (context.condition) {
               if (['highest', 'maximum'].includes(context.condition.marker)) {
@@ -1468,11 +1489,20 @@ const template = {
             }
             const speed = await fragments("number meters per second", { number: { marker: 'integer', value, word: undefined} })
             const preferred = await s({ marker: 'preferredUnits', quantity: speed }) 
-            resolveEvaluate(context, preferred.response || speed)
+            resolveEvaluate(return_context, preferred.response || speed)
           }
         },
         {
-          match: ({context}) => ['direction', 'drone_direction'].includes(context.marker) && context.evaluate,
+          where: where(),
+          // recallOverride(context(), frameOfReference())
+          match: ({context}) => {
+            if (context.marker == 'mentions' && context.evaluate && ['direction', 'drone_direction'].includes(context.args.context.marker)) {
+              return true
+            }
+            if (['direction', 'drone_direction'].includes(context.marker) && context.evaluate) {
+              return true
+            }
+          },
           apply: async ({gp, s, context, objects, fragments, resolveEvaluate, api}) => {
             const value = objects.current.angleInRadians
             const fi = await fragments("number radians")

package/common/drone_v1.instance.json

@@ -122,6 +122,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -742,6 +747,11 @@
           "adjective",
           false
         ],
+        [
+          "heightMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "hierarchyAble",
           "queryable",
@@ -2167,6 +2177,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",
@@ -3199,6 +3214,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -3864,6 +3884,11 @@
           "adjective",
           false
         ],
+        [
+          "heightMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "hierarchyAble",
           "queryable",
@@ -5289,6 +5314,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",
@@ -8191,6 +8221,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -9031,6 +9066,11 @@
           "adjective",
           false
         ],
+        [
+          "heightMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "hierarchyAble",
           "queryable",
@@ -10501,6 +10541,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",
@@ -11760,6 +11805,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -12600,6 +12650,11 @@
           "adjective",
           false
         ],
+        [
+          "heightMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "hierarchyAble",
           "queryable",
@@ -14110,6 +14165,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",
@@ -15227,6 +15287,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -16067,6 +16132,11 @@
           "adjective",
           false
         ],
+        [
+          "heightMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "hierarchyAble",
           "queryable",
@@ -17622,6 +17692,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",
@@ -19164,6 +19239,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -20009,6 +20089,11 @@
           "adjective",
           false
         ],
+        [
+          "heightMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "hierarchyAble",
           "queryable",
@@ -21584,6 +21669,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",
@@ -22574,6 +22664,11 @@
           "adjective",
           false
         ],
+        [
+          "ageMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "all",
           "quantifier",
@@ -23419,6 +23514,11 @@
           "adjective",
           false
         ],
+        [
+          "heightMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "hierarchyAble",
           "queryable",
@@ -24994,6 +25094,11 @@
           "thisAble",
           false
         ],
+        [
+          "propertyMarker",
+          "propertyMarker",
+          false
+        ],
         [
           "propertyOf",
           "preposition",

package/common/edible.instance.json

@@ -48135,6 +48135,24 @@
             0
           ]
         ],
+        [
+          [
+            "a",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "sandwich",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -51027,6 +51045,24 @@
             0
           ]
         ],
+        [
+          [
+            "a",
+            0
+          ],
+          [
+            "hamburger",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "hamburger",
@@ -72542,6 +72578,24 @@
         0
       ]
     ],
+    [
+      [
+        "a",
+        0
+      ],
+      [
+        "hamburger",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "a",
@@ -72578,6 +72632,24 @@
         0
       ]
     ],
+    [
+      [
+        "a",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "sandwich",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "apple",

package/common/emotions.instance.json

@@ -910,11 +910,113 @@
               "pullFromContext": true,
               "concept": true,
               "wantsValue": true,
-              "determiner": "the",
-              "modifiers": [
+              "checks": [
                 "determiner"
               ],
+              "determiner": {
+                "modifiers": [],
+                "text": "the",
+                "marker": "the",
+                "word": "the",
+                "range": {
+                  "start": 36,
+                  "end": 38
+                },
+                "level": 0
+              },
+              "theable": {
+                "value": "emotion",
+                "unknown": true,
+                "text": "emotion",
+                "marker": "unknown",
+                "word": "emotion",
+                "range": {
+                  "start": 40,
+                  "end": 46
+                },
+                "dead": true,
+                "types": [
+                  "unknown"
+                ],
+                "level": 0
+              },
+              "flatten_ignore": [
+                "theable"
+              ],
+              "interpolate": [
+                {
+                  "property": "property"
+                },
+                {
+                  "word": "of"
+                },
+                {
+                  "property": "object"
+                }
+              ],
               "propertyOf": true,
+              "property": {
+                "value": "emotion",
+                "unknown": true,
+                "text": "the emotion",
+                "marker": "property",
+                "word": "emotion",
+                "range": {
+                  "start": 36,
+                  "end": 46
+                },
+                "dead": true,
+                "types": [
+                  "property",
+                  "unknown"
+                ],
+                "focusableForPhrase": true,
+                "pullFromContext": true,
+                "concept": true,
+                "wantsValue": true,
+                "checks": [
+                  "determiner"
+                ],
+                "determiner": {
+                  "modifiers": [],
+                  "text": "the",
+                  "marker": "the",
+                  "word": "the",
+                  "range": {
+                    "start": 36,
+                    "end": 38
+                  },
+                  "level": 0
+                },
+                "theable": {
+                  "value": "emotion",
+                  "unknown": true,
+                  "text": "emotion",
+                  "marker": "unknown",
+                  "word": "emotion",
+                  "range": {
+                    "start": 40,
+                    "end": 46
+                  },
+                  "dead": true,
+                  "types": [
+                    "unknown"
+                  ],
+                  "level": 0
+                },
+                "flatten_ignore": [
+                  "theable"
+                ],
+                "interpolate": [
+                  {
+                    "property": "determiner"
+                  },
+                  {
+                    "property": "theable"
+                  }
+                ],
+                "level": 0
+              },
               "object": {
                 "value": "sentientbeing1",
                 "unknown": true,
@@ -952,10 +1054,47 @@
                   "pullFromContext": true,
                   "concept": true,
                   "wantsValue": true,
-                  "determiner": "the",
-                  "modifiers": [
+                  "checks": [
                     "determiner"
                   ],
+                  "determiner": {
+                    "modifiers": [],
+                    "text": "the",
+                    "marker": "the",
+                    "word": "the",
+                    "range": {
+                      "start": 36,
+                      "end": 38
+                    },
+                    "level": 0
+                  },
+                  "theable": {
+                    "value": "emotion",
+                    "unknown": true,
+                    "text": "emotion",
+                    "marker": "unknown",
+                    "word": "emotion",
+                    "range": {
+                      "start": 40,
+                      "end": 46
+                    },
+                    "dead": true,
+                    "types": [
+                      "unknown"
+                    ],
+                    "level": 0
+                  },
+                  "flatten_ignore": [
+                    "theable"
+                  ],
+                  "interpolate": [
+                    {
+                      "property": "determiner"
+                    },
+                    {
+                      "property": "theable"
+                    }
+                  ],
                   "level": 0
                 },
                 {