npm - @salesforcedevs/dx-components - Versions diffs - 1.21.0 → 1.22.0-alpha - Mend

@salesforcedevs/dx-components 1.21.0 → 1.22.0-alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json +2 -3
package/src/modules/dxUtils/shikiGrammars/shikiGrammars.ts +275 -197
package/LICENSE +0 -12

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.21.0",
+    "version": "1.22.0-alpha",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -46,6 +46,5 @@
     "volta": {
         "node": "20.19.0",
         "yarn": "1.22.19"
-    },
-    "gitHead": "3825e51e8056c0366f640f2c526801bc9d1b37bc"
+    }
 }

package/src/modules/dxUtils/shikiGrammars/shikiGrammars.ts CHANGED Viewed

@@ -1315,7 +1315,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "1": { name: "keyword.control.block.agentscript" }
             },
-            end: "^(?=topic|variables|start_agent|system|$)",
+            end: "^(?=topic\\b|variables\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1323,11 +1323,30 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "keyword.config.key.agentscript",
-                    match: "^\\s+(model_provider|user_locale|locale|agent_id|agent_name|agent_version|agent_type|agent_label|default_agent_user|language|developer_name|agent_description|enable_enhanced_event_logs)(?=:)"
+                    match: "^\\s+(model_provider|agent_id|agent_name|planner_type|agent_version|agent_type|agent_label|default_agent_user|developer_name|description|agent_description|enable_enhanced_event_logs|agent_template|outbound_flow)(?=\\s?:)"
                 },
                 {
                     name: "entity.name.config.agentscript",
-                    match: "^\\s+([a-zA-Z_][a-zA-Z0-9_]*)(?=:)"
+                    match: "^\\s+([a-zA-Z_][a-zA-Z0-9_]*)(?=\\s?:)"
+                },
+                { include: "#values" }
+            ]
+        },
+        {
+            name: "meta.language.agentscript",
+            begin: "^(language):",
+            beginCaptures: {
+                "1": { name: "keyword.control.block.agentscript" }
+            },
+            end: "^(?=topic\\b|config\\b|variables\\b|connection\\b|start_agent\\b|system\\b|knowledge_action\\b|\\z)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                {
+                    name: "keyword.language.field.agentscript",
+                    match: "^\\s+(default_locale|additional_locales|all_additional_locales)(?=\\s?:)"
                 },
                 { include: "#values" }
             ]
@@ -1338,7 +1357,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "1": { name: "keyword.control.block.agentscript" }
             },
-            end: "^(?=topic|config|start_agent|system|$)",
+            end: "^(?=topic\\b|config\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1346,11 +1365,15 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "keyword.variable.metadata.agentscript",
-                    match: "^\\s{8}(description|source)(?=:)"
+                    match: "^\\s+(description|source|label)(?=\\s?:)"
                 },
                 {
                     name: "variable.definition.agentscript",
-                    match: "^\\s+([a-zA-Z_][a-zA-Z0-9_]*)(?=:)"
+                    match: "^\\s+([a-zA-Z_][a-zA-Z0-9_]*)(?=\\s?:)"
+                },
+                {
+                    name: "storage.modifier.variable.agentscript",
+                    match: "\\b(mutable|linked)\\b"
                 },
                 {
                     name: "keyword.variable.source.agentscript",
@@ -1364,27 +1387,66 @@ const agentscriptGrammar = {
                 { include: "#values" }
             ]
         },
+        {
+            name: "meta.knowledge.agentscript",
+            begin: "^(knowledge_action):",
+            beginCaptures: {
+                "1": { name: "keyword.control.block.agentscript" }
+            },
+            end: "^(?=topic\\b|config\\b|variables\\b|connection\\b|start_agent\\b|system\\b|language\\b|connection\\b|\\z)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                {
+                    name: "keyword.knowledge.field.agentscript",
+                    match: "^\\s+(rag_feature_config_id|citations_enabled|citations_url)(?=\\s?:)"
+                },
+                { include: "#values" }
+            ]
+        },
+        {
+            name: "meta.connection.agentscript",
+            begin: "^(connection)\\s+([a-zA-Z_][a-zA-Z0-9_]*):",
+            beginCaptures: {
+                "1": { name: "keyword.control.block.agentscript" },
+                "2": { name: "entity.name.connection.agentscript" }
+            },
+            end: "^(?=topic\\b|config\\b|variables\\b|knowledge_action\\b|start_agent\\b|system\\b|language\\b|connection\\b|\\z)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                {
+                    name: "keyword.connection.field.agentscript",
+                    match: "^\\s+(escalation_message|outbound_route_type|outbound_route_name|adaptive_response_allowed)(?=\\s?:)"
+                },
+                { include: "#values" }
+            ]
+        },
         {
             name: "meta.system.agentscript",
             begin: "^(system):",
             beginCaptures: {
                 "1": { name: "keyword.control.block.agentscript" }
             },
-            end: "^(?=topic|config|variables|start_agent|$)",
+            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
+                { include: "#block-instructions" },
                 {
                     name: "keyword.system.agentscript",
-                    match: "\\b(instructions|messages|prompt)(?=:)"
+                    match: "^\\s+(instructions|messages|prompt)(?=\\s?:)"
                 },
                 {
                     name: "keyword.system.message-type.agentscript",
-                    match: "\\b(error|welcome)(?=:)"
+                    match: "^\\s{2,}(error|welcome)(?=\\s?:)"
                 },
-                { include: "#multiline-instructions" },
                 { include: "#values" }
             ]
         },
@@ -1395,25 +1457,21 @@ const agentscriptGrammar = {
                 "1": { name: "keyword.control.block.agentscript" },
                 "2": { name: "entity.name.topic.agentscript" }
             },
-            end: "^(?=topic|config|variables|start_agent|system|$)",
+            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
+                { include: "#topic-label" },
+                { include: "#topic-system-block" },
+                { include: "#reasoning-block" },
                 { include: "#action-definitions" },
                 { include: "#agent-task" },
                 { include: "#task-content" },
                 { include: "#description-section" },
-                { include: "#override-instructions" },
-                { include: "#before-reasoning" },
-                { include: "#reasoning-instructions" },
-                { include: "#reasoning-actions" },
+                { include: "#before-or-after-reasoning" },
                 { include: "#directives" },
-                {
-                    name: "keyword.topic.section.agentscript",
-                    match: "\\b(action_definitions|after_reasoning|reasoning_actions|override|variables|instructions)(?=:)"
-                },
                 {
                     name: "storage.type.agentscript",
                     match: "\\b(string|number|boolean|object|date|timestamp|currency|id|list)\\b"
@@ -1425,30 +1483,26 @@ const agentscriptGrammar = {
         },
         {
             name: "meta.start-agent.agentscript",
-            begin: "^(start_agent)(?:\\s+([a-zA-Z_][a-zA-Z0-9_]*))?",
+            begin: "^(start_agent)(?:\\s+([a-zA-Z_][a-zA-Z0-9_]*))?:",
             beginCaptures: {
                 "1": { name: "keyword.control.block.agentscript" },
                 "2": { name: "entity.name.agent.agentscript" }
             },
-            end: "^(?=topic|config|variables|start_agent|system|$)",
+            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
+                { include: "#topic-label" },
+                { include: "#topic-system-block" },
+                { include: "#reasoning-block" },
                 { include: "#action-definitions" },
                 { include: "#agent-task" },
                 { include: "#task-content" },
                 { include: "#description-section" },
-                { include: "#override-instructions" },
-                { include: "#before-reasoning" },
-                { include: "#reasoning-instructions" },
-                { include: "#reasoning-actions" },
+                { include: "#before-or-after-reasoning" },
                 { include: "#directives" },
-                {
-                    name: "keyword.topic.section.agentscript",
-                    match: "\\b(actions|action_definitions|after_reasoning|reasoning_actions|reasoning_instructions|override|variables|instructions)(?=:)"
-                },
                 {
                     name: "storage.type.agentscript",
                     match: "\\b(string|number|boolean|object|date|timestamp|currency|id|list)\\b"
@@ -1472,11 +1526,15 @@ const agentscriptGrammar = {
         },
         {
             name: "keyword.control.agentscript",
-            match: "\\b(if|else|run|set|with|and|or|implementation)\\b|\\btransition to\\b"
+            match: "\\b(if|else|run|set|with|and|or|not)\\b|\\btransition to\\b|\\bdelegate to\\b"
         },
         {
             name: "constant.language.agentscript",
-            match: "\\b(True|False)\\b"
+            match: "\\b(True|False|None)\\b"
+        },
+        {
+            name: "constant.language.llm.agentscript",
+            match: "\\.\\.\\."
         },
         {
             name: "constant.other.timestamp.agentscript",
@@ -1517,7 +1575,7 @@ const agentscriptGrammar = {
         },
         {
             name: "meta.variable.reference.agentscript",
-            match: "(@)(variable|result|input|topic|action)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
+            match: "(@)(variables|outputs|inputs|topic|actions|knowledge_action)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
             captures: {
                 "1": { name: "support.class.agentscript" },
                 "2": { name: "support.class.agentscript" },
@@ -1531,7 +1589,7 @@ const agentscriptGrammar = {
         },
         {
             name: "variable.other.member.agentscript",
-            match: "(?<=@(?:variable|topic|input|action|result)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
+            match: "(?<=@(?:variables|topic|inputs|actions|outputs|knowledge_action)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
         },
         {
             name: "operator.arithmetic.agentscript",
@@ -1576,7 +1634,11 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "constant.language.agentscript",
-                    match: "\\b(True|False)\\b"
+                    match: "\\b(True|False|None)\\b"
+                },
+                {
+                    name: "constant.language.llm.agentscript",
+                    match: "\\.\\.\\."
                 },
                 {
                     name: "constant.other.timestamp.agentscript",
@@ -1592,7 +1654,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "variable.other.member.agentscript",
-                    match: "(?<=@(?:variable|topic|input|action|result)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
+                    match: "(?<=@(?:variables|topic|inputs|actions|outputs|knowledge_action)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
                 }
             ]
         },
@@ -1636,13 +1698,76 @@ const agentscriptGrammar = {
                 }
             ]
         },
-        "multiline-instructions": {
-            name: "meta.multiline.instructions.agentscript",
-            begin: "^(\\s+)(instructions:)\\s*$",
+        "topic-label": {
+            name: "meta.topic.label.agentscript",
+            begin: "^\\s+(label)(?=\\s?:)",
+            beginCaptures: {
+                "1": { name: "keyword.topic.section.agentscript" }
+            },
+            end: "^(?=\\s+(reasoning|system|description|before_reasoning|after_reasoning|actions|variables|instructions)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|language\\b|knowledge_action\\b|connection\\b)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                { include: "#values" }
+            ]
+        },
+        "topic-system-block": {
+            name: "meta.topic.system.agentscript",
+            begin: "^\\s+(system)(?=\\s?:)",
+            beginCaptures: {
+                "1": { name: "keyword.topic.section.agentscript" }
+            },
+            end: "^(?=\\s+(reasoning|label|description|before_reasoning|after_reasoning|actions)\\b)|^(?=topic\\b|config\\b|language\\b|knowledge_action\\b|connection\\b)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                { include: "#block-instructions" },
+                {
+                    name: "keyword.system.agentscript",
+                    match: "\\b(instructions)(?=:)"
+                },
+                { include: "#values" }
+            ]
+        },
+        "reasoning-block": {
+            name: "meta.reasoning.block.agentscript",
+            begin: "^\\s+(reasoning)(?=\\s?:)",
             beginCaptures: {
-                "2": { name: "keyword.system.agentscript" }
+                "1": { name: "keyword.topic.section.agentscript" }
+            },
+            end: "^(?=\\s+(label|system|description|before_reasoning|after_reasoning|variables)\\b)|^(?=\\s{1,5}actions\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                { include: "#block-instructions" },
+                { include: "#reasoning-actions" }
+            ]
+        },
+        "block-instructions": {
+            name: "meta.block.instructions.agentscript",
+            begin: "^(\\s{4,8})(instructions)\\s*(:\\s*(->|\\|))",
+            beginCaptures: {
+                "2": { name: "keyword.topic.section.agentscript" },
+                "3": {
+                    name: "keyword.operator.procedure-or-template.agentscript"
+                },
+                "4": {
+                    name: "keyword.operator.procedure.agentscript",
+                    patterns: [
+                        {
+                            name: "keyword.operator.template.agentscript",
+                            match: "\\|"
+                        }
+                    ]
+                }
             },
-            end: "^(?=\\s{4}(messages|prompt)\\b)|^(?=\\S)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
+            end: "^(?=\\s+(reasoning|actions|before_reasoning|after_reasoning)\\s?:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1650,11 +1775,11 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "string.heredoc.agentscript",
-                    begin: "(>>)\\s*$",
+                    begin: "^\\s+",
                     beginCaptures: {
                         "1": { name: "keyword.operator.heredoc.agentscript" }
                     },
-                    end: "^(?=\\s{4}(messages|prompt)\\b)|^(?=\\S)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
+                    end: "^(?=\\s{0,8}\\S)|^(?=\\s{4}(reasoning|actions|before_reasoning|after_reasoning|description|label|system|variables|instructions|override)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
                     patterns: [
                         { include: "#template-expression" },
                         {
@@ -1663,17 +1788,21 @@ const agentscriptGrammar = {
                         }
                     ]
                 },
+                { include: "#directives" }
+            ]
+        },
+        "template-block": {
+            name: "meta.template.block.agentscript",
+            begin: "^\\s+(\\|)",
+            beginCaptures: {
+                "1": { name: "keyword.operator.template.agentscript" }
+            },
+            end: "^(?!\\s+\\|)",
+            patterns: [
+                { include: "#template-expression" },
                 {
-                    name: "string.unquoted.multiline.agentscript",
-                    begin: "^\\s+",
-                    end: "^(?=\\s{4}(messages|prompt)\\b)|^(?=\\S)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
-                    patterns: [
-                        { include: "#template-expression" },
-                        {
-                            name: "string.unquoted.instructions.agentscript",
-                            match: ".*"
-                        }
-                    ]
+                    name: "string.unquoted.template.agentscript",
+                    match: ".*"
                 }
             ]
         },
@@ -1685,7 +1814,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "string.heredoc.agentscript",
-                    begin: "(>>)\\s*$",
+                    begin: "(\\|)\\s*$",
                     beginCaptures: {
                         "1": { name: "keyword.operator.heredoc.agentscript" }
                     },
@@ -1700,7 +1829,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "string.heredoc.quoted.agentscript",
-                    begin: '(>>)\\s*"',
+                    begin: '(\\|)\\s*"',
                     beginCaptures: {
                         "1": { name: "keyword.operator.heredoc.agentscript" }
                     },
@@ -1712,6 +1841,13 @@ const agentscriptGrammar = {
                             match: "\\\\."
                         }
                     ]
+                },
+                {
+                    name: "string.agent-task.single-line.agentscript",
+                    match: '\\|\\s+"(?:[^"\\\\]|\\\\.)*"',
+                    captures: {
+                        "0": { name: "string.quoted.double.agentscript" }
+                    }
                 }
             ]
         },
@@ -1736,11 +1872,11 @@ const agentscriptGrammar = {
         },
         "description-section": {
             name: "meta.description.section.agentscript",
-            begin: "^(\\s{4})(description):\\s*",
+            begin: "^\\s+(description)(?=\\s?:)",
             beginCaptures: {
-                "2": { name: "keyword.topic.section.agentscript" }
+                "1": { name: "keyword.topic.section.agentscript" }
             },
-            end: "^(?=\\s{4}(reasoning_instructions|reasoning_actions|actions|before_reasoning|after_reasoning|variables|instructions)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
+            end: "^(?=\\s+(reasoning|label|system|actions|before_reasoning|after_reasoning|variables|instructions)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1755,76 +1891,20 @@ const agentscriptGrammar = {
                 { include: "#values" }
             ]
         },
-        "override-instructions": {
-            name: "meta.override.instructions.agentscript",
-            begin: "^(\\s+)(override system\\.instructions):\\s*(.*)$",
-            beginCaptures: {
-                "2": { name: "keyword.override.path.agentscript" },
-                "3": { name: "string.quoted.double.agentscript" }
-            },
-            end: "^(?=\\s{4}(reasoning_instructions|reasoning_actions|actions|before_reasoning|after_reasoning|description|variables|instructions)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
-            patterns: [
-                {
-                    name: "comment.line.agentscript",
-                    match: "(^|[ \t]+)#.*$"
-                },
-                {
-                    name: "string.heredoc.agentscript",
-                    begin: "(>>)\\s*$",
-                    beginCaptures: {
-                        "1": { name: "keyword.operator.heredoc.agentscript" }
-                    },
-                    end: "^(?=\\s{0,4}\\S)|^(?=\\s{4}(reasoning_actions|actions|before_reasoning|after_reasoning|description|variables|instructions|override|reasoning_instructions)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
-                    patterns: [
-                        { include: "#template-expression" },
-                        {
-                            name: "string.unquoted.heredoc.agentscript",
-                            match: "."
-                        }
-                    ]
-                },
-                {
-                    name: "string.heredoc.quoted.agentscript",
-                    begin: '(>>)\\s*"',
-                    beginCaptures: {
-                        "1": { name: "keyword.operator.heredoc.agentscript" }
-                    },
-                    end: '"',
-                    patterns: [
-                        { include: "#template-expression" },
-                        {
-                            name: "string.unquoted.heredoc.agentscript",
-                            match: "."
-                        }
-                    ]
-                },
-                {
-                    name: "string.unquoted.multiline.agentscript",
-                    begin: "^\\s+",
-                    end: "^(?=\\s{4}(reasoning_instructions|reasoning_actions|actions|before_reasoning|after_reasoning|description|variables|instructions)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)|^\\s*$",
-                    patterns: [
-                        { include: "#template-expression" },
-                        {
-                            name: "string.unquoted.instructions.agentscript",
-                            match: ".*"
-                        }
-                    ]
-                }
-            ]
-        },
-        "before-reasoning": {
-            name: "meta.before-reasoning.agentscript",
-            begin: "^(\\s+)(before_reasoning):",
+        "before-or-after-reasoning": {
+            name: "meta.before-or-after-reasoning.agentscript",
+            begin: "^(\\s+)(before_reasoning|after_reasoning):",
             beginCaptures: {
                 "2": { name: "keyword.topic.section.agentscript" }
             },
-            end: "^(?=\\s{4}(reasoning_instructions|reasoning_actions|actions|after_reasoning|description|variables|instructions|override)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
+            end: "^(?=\\s{2,4}(reasoning|actions|after_reasoning|before_reasoning|description|label|system|variables|instructions|override)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
                 { include: "#directives" },
+                { include: "#template-block" },
                 {
                     name: "meta.utils.call.agentscript",
                     match: "(@utils)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)\\b",
@@ -1836,7 +1916,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "meta.variable.reference.agentscript",
-                    match: "(@)(action|topic|variable|result|input)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
+                    match: "(@)(actions|topic|variables|outputs|inputs|knowledge_action)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "support.class.agentscript" },
@@ -1871,82 +1951,70 @@ const agentscriptGrammar = {
                 { include: "#values" }
             ]
         },
-        "reasoning-instructions": {
-            name: "meta.reasoning.instructions.agentscript",
-            begin: "^(\\s+)(reasoning_instructions):\\s*$",
+        "action-definitions": {
+            name: "meta.actions.agentscript",
+            begin: "^(\\s+)(actions):",
             beginCaptures: {
                 "2": { name: "keyword.topic.section.agentscript" }
             },
-            end: "^(?=\\s{4}(reasoning_actions|actions|before_reasoning|after_reasoning|description|variables|instructions|override)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
+            end: "^(?=\\s{2,4}(reasoning|before_reasoning|after_reasoning|description|label|system|variables|instructions|override)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
                 {
-                    name: "string.heredoc.agentscript",
-                    begin: "(>>)\\s*$",
+                    name: "meta.action.inputsAndOutputs.agentscript",
+                    begin: "^\\s{6,12}(inputs|outputs):\\s*",
                     beginCaptures: {
-                        "1": { name: "keyword.operator.heredoc.agentscript" }
+                        "1": { name: "keyword.action.property.agentscript" }
                     },
-                    end: "^(?=\\s{0,4}\\S)|^(?=\\s{4}(reasoning_actions|actions|before_reasoning|after_reasoning|description|variables|instructions|override)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
+                    end: "^(?=\\s+(target|inputs|outputs|label|reasoning|require_user_confirmation|include_in_progress_indicator|progress_indicator_message)\\b)|^(?=\\s{4,8}[a-zA-Z_]\\s*:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
                     patterns: [
-                        { include: "#template-expression" },
                         {
-                            name: "string.unquoted.heredoc.agentscript",
-                            match: "."
-                        }
-                    ]
-                },
-                {
-                    name: "string.heredoc.quoted.agentscript",
-                    begin: '(>>)\\s*"',
-                    beginCaptures: {
-                        "1": { name: "keyword.operator.heredoc.agentscript" }
-                    },
-                    end: '"',
-                    patterns: [
-                        { include: "#template-expression" },
+                            name: "comment.line.agentscript",
+                            match: "(^|[ \t]+)#.*$"
+                        },
                         {
-                            name: "string.unquoted.heredoc.agentscript",
-                            match: "."
-                        }
+                            name: "meta.action.parameter.definition.agentscript",
+                            begin: "^\\s{8,16}(?!(?:description|is_required|is_user_input|label|is_displayable|is_used_by_planner|complex_data_type_name)\\s*:)([a-zA-Z_][a-zA-Z0-9_]*):\\s*",
+                            beginCaptures: {
+                                "1": {
+                                    name: "variable.parameter.name.agentscript"
+                                }
+                            },
+                            end: "^(?=\\s+(?!(?:description|is_required|is_user_input|label|is_displayable|is_used_by_planner|complex_data_type_name)\\s*:)[a-zA-Z_][a-zA-Z0-9_]*\\s*:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)",
+                            patterns: [
+                                {
+                                    name: "comment.line.agentscript",
+                                    match: "(^|[ \t]+)#.*$"
+                                },
+                                {
+                                    name: "storage.type.agentscript",
+                                    match: "\\b(string|number|boolean|object|date|timestamp|currency|id|list(?:\\[\\w+\\])?)\\b"
+                                },
+                                {
+                                    name: "keyword.action.parameter.metadata.agentscript",
+                                    match: "^\\s+(description|is_required|is_user_input|label|complex_data_type_name|is_used_by_planner|is_displayable)(?=:)"
+                                },
+                                {
+                                    name: "variable.parameter.name.agentscript",
+                                    match: "^\\s+(?!(?:description|is_required|is_user_input|label|is_displayable|is_used_by_planner|complex_data_type_name)\\s*:)[a-zA-Z_][a-zA-Z0-9_]*\\s*:"
+                                },
+                                { include: "#values" }
+                            ]
+                        },
+                        { include: "#values" }
                     ]
                 },
                 {
-                    name: "string.heredoc.agentscript",
-                    begin: '"',
-                    end: '"',
-                    patterns: [
-                        { include: "#template-expression" },
-                        {
-                            name: "string.unquoted.heredoc.agentscript",
-                            match: "."
-                        }
-                    ]
-                }
-            ]
-        },
-        "action-definitions": {
-            name: "meta.actions.agentscript",
-            begin: "^(\\s+)(actions|action_definitions):",
-            beginCaptures: {
-                "2": { name: "keyword.topic.section.agentscript" }
-            },
-            end: "^(?=\\s{4}(reasoning_instructions|reasoning_actions|before_reasoning|after_reasoning|description|variables|instructions|override)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
-            patterns: [
-                {
-                    name: "comment.line.agentscript",
-                    match: "(^|[ \t]+)#.*$"
+                    name: "keyword.action.property.agentscript",
+                    match: "^\\s{6,12}(description|target|parameters|returns|label|require_user_confirmation|include_in_progress_indicator|progress_indicator_message|is_required|is_user_input|developer_name|complex_data_type_name|is_used_by_planner|is_displayable)(?=:)"
                 },
                 {
                     name: "entity.name.action.agentscript",
                     match: "^\\s{4,8}([a-zA-Z_][a-zA-Z0-9_]*)(?=:)"
                 },
-                {
-                    name: "keyword.action.property.agentscript",
-                    match: "^\\s{12}(description|target|inputs|outputs|parameters|returns|implementation|label|require_user_confirmation|include_in_progress_indicator|progress_indicator_message|is_required|is_user_input|developer_name|complex_data_type_name|is_used_by_planner|is_displayable)(?=:)"
-                },
                 {
                     name: "storage.type.agentscript",
                     match: "\\b(string|number|boolean|object|date|timestamp|currency|id|list)\\b"
@@ -1958,16 +2026,29 @@ const agentscriptGrammar = {
         },
         "reasoning-actions": {
             name: "meta.reasoning-actions.agentscript",
-            begin: "^(\\s+)(reasoning_actions):",
+            begin: "^(\\s+)(actions):",
             beginCaptures: {
                 "2": { name: "keyword.topic.section.agentscript" }
             },
-            end: "^(?=\\s{4}(reasoning_instructions|actions|before_reasoning|after_reasoning|description|variables|instructions|override)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b)",
+            end: "^(?=\\s+(instructions|before_reasoning|after_reasoning|label|system|override|actions)\\s?:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge_action\\b|connection\\b)|^(?=\\s{2,4}(description\\s?:))",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
+                {
+                    name: "keyword.reasoning.description.agentscript",
+                    match: "^\\s+(description)(?=\\s?:)"
+                },
+                {
+                    name: "meta.tool.declaration.agentscript",
+                    match: "^\\s+(([a-zA-Z_][a-zA-Z0-9_]*)):\\s*(@(actions|utils|topic|knowledge_action))",
+                    captures: {
+                        "2": { name: "entity.name.tool.agentscript" },
+                        "3": { name: "support.class.agentscript" },
+                        "4": { name: "support.class.agentscript" }
+                    }
+                },
                 { include: "#directives" },
                 {
                     name: "meta.utils.call.agentscript",
@@ -1980,7 +2061,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "meta.variable.reference.agentscript",
-                    match: "(@)(action|topic|variable|result|input)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
+                    match: "(@)(actions|topic|variables|outputs|inputs|knowledge_action)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "support.class.agentscript" },
@@ -2000,18 +2081,10 @@ const agentscriptGrammar = {
                     name: "keyword.control.transition.reasoning.agentscript",
                     match: "\\s+to\\s+"
                 },
-                {
-                    name: "keyword.reasoning.description.agentscript",
-                    match: "^\\s{12}(description)(?=:)"
-                },
                 {
                     name: "keyword.control.agentscript",
                     match: "\\b(setVariables)\\b"
                 },
-                {
-                    name: "entity.name.action.agentscript",
-                    match: "\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
-                },
                 { include: "#values" }
             ]
         },
@@ -2035,11 +2108,11 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "keyword.control.directive.agentscript",
-                    match: "\\b(run|set|if|else|after|with|and|or)\\b|\\btransition to\\b"
+                    match: "\\b(run|set|if|else|after|with|and|or|not)\\b|\\btransition to\\b|\\bdelegate to\\b"
                 },
                 {
                     name: "keyword.action-call.agentscript",
-                    match: "(@action)(\\.)",
+                    match: "(@actions)(\\.)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "punctuation.accessor.dot.agentscript" }
@@ -2047,7 +2120,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "keyword.variable-set.agentscript",
-                    match: "(@variable)(\\.)",
+                    match: "(@variables)(\\.)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "punctuation.accessor.dot.agentscript" }
@@ -2062,24 +2135,29 @@ const agentscriptGrammar = {
                     }
                 },
                 {
-                    name: "keyword.result-ref.agentscript",
-                    match: "(@result)(\\.)",
+                    name: "keyword.outputs-ref.agentscript",
+                    match: "(@outputs)(\\.)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "punctuation.accessor.dot.agentscript" }
                     }
                 },
                 {
-                    name: "keyword.input-ref.agentscript",
-                    match: "(@input)(\\.)",
+                    name: "keyword.inputs-ref.agentscript",
+                    match: "(@inputs)(\\.)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "punctuation.accessor.dot.agentscript" }
                     }
                 },
+                {
+                    name: "keyword.knowledge-action-ref.agentscript",
+                    match: "(@knowledge_action)",
+                    captures: { "1": { name: "support.class.agentscript" } }
+                },
                 {
                     name: "variable.other.member.agentscript",
-                    match: "(?<=@(?:variable|topic|input|action|result)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
+                    match: "(?<=@(?:variables|topic|inputs|actions|outputs)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
                 },
                 { include: "#operators" },
                 { include: "#values" }
@@ -2087,13 +2165,13 @@ const agentscriptGrammar = {
         },
         "template-expression": {
             name: "meta.template.expression.agentscript",
-            begin: "\\{\\{",
+            begin: "\\{!",
             beginCaptures: {
                 "0": {
                     name: "punctuation.definition.template.begin.agentscript"
                 }
             },
-            end: "\\}\\}",
+            end: "\\}",
             endCaptures: {
                 "0": { name: "punctuation.definition.template.end.agentscript" }
             },
@@ -2130,15 +2208,15 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "constant.language.expression.agentscript",
-                    match: "\\b(True|False)\\b"
+                    match: "\\b(True|False|None)\\b"
                 },
                 {
                     name: "keyword.operator.expression.agentscript",
-                    match: "\\b(and|or|if|else)\\b"
+                    match: "\\b(and|or|if|else|not)\\b"
                 },
                 {
                     name: "operator.comparison.expression.agentscript",
-                    match: "==|!=|<=|>=|<|>"
+                    match: "==|!=|<=|>=|<|>|\\bis\\b|\\bis not\\b"
                 },
                 {
                     name: "operator.arithmetic.expression.agentscript",

package/LICENSE DELETED Viewed

@@ -1,12 +0,0 @@
-Copyright (c) 2020, Salesforce.com, Inc.
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.