@salesforcedevs/dx-components 1.28.7-alpha.2 → 1.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.28.7-alpha.2",
+    "version": "1.29.0",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -44,5 +44,5 @@
         "luxon": "3.4.4",
         "msw": "^2.12.4"
     },
-    "gitHead": "e01282790aaa44be0931fa6ddbf78126fa2a8a4c"
+    "gitHead": "6b290fbf6e3032a9708592af2932b43d5e970bfc"
 }

package/src/modules/dx/sidebar/sidebar.html

@@ -48,6 +48,10 @@
                 <dx-sidebar-search
                     onchange={onSearchChange}
                     onloading={onSearchLoading}
+                    coveo-organization-id={coveoOrganizationId}
+                    coveo-public-access-token={coveoPublicAccessToken}
+                    coveo-search-hub={coveoSearchHub}
+                    coveo-advanced-query-config={coveoAdvancedQueryConfig}
                 ></dx-sidebar-search>
             </div>
             <slot name="version-picker"></slot>

package/src/modules/dx/sidebar/sidebar.ts

@@ -1,18 +1,18 @@
 import cx from "classnames";
 import { api, track } from "lwc";
 import { TreeNode, SidebarSearchResult } from "typings/custom";
+import { getSidebarSearchParams } from "dxUtils/coveo";
 import { toJson } from "dxUtils/normalizers";
 import SidebarSearch from "dx/sidebarSearch";
 import { SidebarBase } from "dxBaseElements/sidebarBase";
 
 const MOBILE_SIZE_MATCH = "768px";
 
-const getSearchQueryParam = (): string | null =>
-    typeof window !== "undefined"
-        ? new URLSearchParams(window.location.search).get("q")
-        : null;
-
 export default class Sidebar extends SidebarBase {
+    @api coveoOrganizationId!: string;
+    @api coveoPublicAccessToken!: string;
+    @api coveoSearchHub!: string;
+    @api coveoAdvancedQueryConfig!: string;
     @api header: string = "";
 
     @api
@@ -130,7 +130,7 @@ export default class Sidebar extends SidebarBase {
     constructor() {
         super();
 
-        if (getSearchQueryParam()) {
+        if (getSidebarSearchParams()) {
             this.isSearchLoading = true;
             this.scrollToSelectedSearchResult = true;
         }
@@ -175,7 +175,7 @@ export default class Sidebar extends SidebarBase {
         this.isSearchLoading = e.detail;
     }
 
-    private onSidebarSearchContentScroll(scrollEvent: Event) {
+    private onSidebarSearchContentScroll(scrollEvent) {
         if (this.isSearchLoading) {
             return;
         }

package/src/modules/dx/sidebarSearch/sidebarSearch.ts

@@ -1,45 +1,75 @@
 import { LightningElement, api } from "lwc";
 import debounce from "debounce";
+import {
+    Result,
+    ResultList,
+    Unsubscribe,
+    ResultsPerPage,
+    SearchBox,
+    buildInteractiveResult,
+    buildResultList,
+    buildResultsPerPage,
+    buildSearchBox,
+    loadAdvancedSearchQueryActions,
+    SearchEngine,
+    SearchAppState,
+    loadQueryActions
+} from "@coveo/headless";
+import { buildSearchEngine, getSidebarSearchParams } from "dxUtils/coveo";
 import { RecentSearches } from "dxUtils/recentSearches";
+import { toJson } from "dxUtils/normalizers";
 import {
     Option,
     PopoverRequestCloseType,
     SidebarSearchResult
 } from "typings/custom";
 
-const SEARCH_DEBOUNCE_DELAY = 1200;
-const DATA_CLOUD_SEARCH_PATH = "/data-cloud-search/search";
+const RESULT_CLICK_LOCAL_STORAGE_KEY = "dx-sidebar-search-result-click";
+export const SESSION_KEY = "dx-sidebar-search-state";
 
-/** Origin used for Data Cloud search (always production so results point to developer.salesforce.com). */
-const DATA_CLOUD_SEARCH_ORIGIN = "https://developer.salesforce.com";
+const DEFAULT_RESULT_COUNT = 20;
+const SEARCH_DEBOUNCE_DELAY = 1200;
 
 const UserRecentSearches = new RecentSearches();
 
-const getSearchQueryParam = (): string =>
-    new URLSearchParams(window.location.search).get("q") ?? "";
-
-/**
- * Returns the base URL path for the current page, always using developer.salesforce.com.
- * e.g. on QA or prod, path /docs/atlas.en-us.apexcode.meta/apexcode/apex_dev_guide.htm
- *  -> https://developer.salesforce.com/docs/atlas.en-us.apexcode.meta/apexcode
- */
-const getBaseUrlPath = (): string => {
-    const url = DATA_CLOUD_SEARCH_ORIGIN + window.location.pathname;
-    const lastSlash = url.lastIndexOf("/");
-    return lastSlash > 0 ? url.substring(0, lastSlash) : url;
-};
-
-/** Data Cloud Search API result item (title, url, matchedText) */
-interface DataCloudSearchResultItem {
-    title?: string;
-    url?: string;
-    matchedText?: string;
-}
+const normalizeCoveoAdvancedQueryValue = (version: string): string =>
+    version?.split(".").join("\\.");
 
 export default class SidebarSearch extends LightningElement {
+    @api coveoOrganizationId!: string;
+    @api coveoPublicAccessToken!: string;
+    @api coveoSearchHub!: string;
+    @api
+    get coveoAdvancedQueryConfig(): { [key: string]: any } {
+        return this._coveoAdvancedQueryConfig;
+    }
+    set coveoAdvancedQueryConfig(value) {
+        const jsonValue = toJson(value);
+        const hasChanged =
+            this._coveoAdvancedQueryConfig &&
+            Object.entries(jsonValue).some(
+                ([key, val]: [string, any]) =>
+                    this._coveoAdvancedQueryConfig[key] !== val
+            );
+        this._coveoAdvancedQueryConfig = jsonValue;
+
+        if (hasChanged && this.engine && this.value !== "") {
+            this.dispatchOnLoading(true);
+        }
+
+        if (hasChanged && this.engine) {
+            // set advanced filters needs access to the latest coveoAdvancedQueryConfig
+            this.setAdvancedFilters(this.engine);
+            this.submitSearch(true);
+        }
+    }
+
     @api
     public fetchMoreResults() {
-        // Data Cloud Search API does not expose pagination in the same way; no-op
+        if (this.resultList?.state?.moreResultsAvailable) {
+            this.fetchingMoreResults = true;
+            this.resultList.fetchMoreResults();
+        }
     }
 
     @api
@@ -55,98 +85,313 @@ export default class SidebarSearch extends LightningElement {
         this.dropdownRequestedOpen = value;
     }
 
+    private _coveoAdvancedQueryConfig!: { [key: string]: any };
     private dropdownRequestedOpen: boolean = false;
     private recentSearches: Option[] = [];
-    private value: string = "";
+    private unsubscribeFromResultList: Unsubscribe = () => {};
+    private resultList: ResultList | null = null;
+    private resultsPerPage: ResultsPerPage | null = null;
+    private preloadedState?: SearchAppState;
+    private searchBox: SearchBox | null = null;
+    private value?: string = "";
+    private engine: SearchEngine | null = null;
+    private fetchingMoreResults: boolean = false;
     private didRender = false;
-    private dataCloudSearchInitialized: boolean = false;
+
+    private get hasCorrectCoveoConfig(): boolean {
+        const coveoConfigurations = [
+            this.coveoOrganizationId,
+            this.coveoPublicAccessToken,
+            this.coveoSearchHub,
+            this.coveoAdvancedQueryConfig
+        ];
+
+        return coveoConfigurations.every(
+            (val) =>
+                !!val && (typeof val === "string" || typeof val === "object")
+        );
+    }
 
     private get isDropdownOpen() {
         return (
             this.dropdownRequestedOpen &&
-            this.recentSearches?.length > 0 &&
+            this.recentSearches &&
+            this.recentSearches.length > 0 &&
             !this.value
         );
     }
 
     constructor() {
         super();
+
         this.updateRecentSearches();
-        this.value = getSearchQueryParam();
+        this.value = getSidebarSearchParams() || "";
+    }
+
+    disconnectedCallback() {
+        this.unsubscribeFromResultList();
     }
 
     renderedCallback() {
-        if (!this.dataCloudSearchInitialized) {
-            this.dataCloudSearchInitialized = true;
-            if (!this.didRender && this.value) {
-                this.dispatchHighlightedTermChange();
-            }
-            if (!this.value) {
-                this.dispatchOnLoading(false);
-            }
+        // in prod some of the critical coveo configuration attributes seem to arrive later
+        // so I needed to put this coveo startup flow here where we can wait for them to arrive
+
+        if (this.hasCorrectCoveoConfig && !this.engine) {
+            this.initializeUserSession();
+            this.initializeCoveo();
+        } else if (!this.hasCorrectCoveoConfig) {
+            console.error(
+                "Incorrect coveo search configuration provided. All coveo configuration attributes must be defined.",
+                {
+                    coveoOrganizationId: this.coveoOrganizationId,
+                    coveoPublicAccessToken: this.coveoPublicAccessToken,
+                    coveoSearchHub: this.coveoSearchHub,
+                    coveoAdvancedQueryConfig: this.coveoAdvancedQueryConfig
+                }
+            );
         }
+
+        // If this is the first render and there is a search value, trigger
+        // term highlighting
         if (!this.didRender && this.value) {
             this.dispatchHighlightedTermChange();
         }
+
         this.didRender = true;
     }
 
-    private normalizeDataCloudResult = (
-        item: DataCloudSearchResultItem,
-        index: number
-    ): SidebarSearchResult => {
-        const href = item.url ?? "";
-        const resultPath = href.startsWith("http")
-            ? new URL(href).pathname
-            : href;
-        const isSelected =
-            !!resultPath && resultPath === window.location.pathname;
+    private initializeUserSession() {
+        const stringified = window.sessionStorage.getItem(SESSION_KEY);
+
+        if (!stringified) {
+            return;
+        }
+
+        try {
+            const json = JSON.parse(stringified);
+
+            const hasSameConfig = Object.entries(
+                json.coveoAdvancedQueryConfig
+            ).every(
+                ([key, value]: [string, any]) =>
+                    this.coveoAdvancedQueryConfig[key] === value
+            );
+            const hasSameQuery = json?.state?.query?.q === this.value;
+
+            if (hasSameConfig && hasSameQuery) {
+                this.preloadedState = json?.state;
+            } else {
+                window.sessionStorage.removeItem(SESSION_KEY);
+            }
+        } catch (e) {
+            console.error(e);
+            window.sessionStorage.removeItem(SESSION_KEY);
+        }
+    }
+
+    private initializeCoveo = () => {
+        try {
+            this.engine = buildSearchEngine({
+                organizationId: this.coveoOrganizationId,
+                publicAccessToken: this.coveoPublicAccessToken,
+                searchHub: this.coveoSearchHub,
+                preloadedState: this.preloadedState
+            });
+        } catch (ex) {
+            console.error(`Coveo engine failed to initialize (${ex})`);
+        }
+
+        if (!this.engine) {
+            console.error("Coveo engine failed to initialize!");
+            return;
+        }
+
+        if (this.preloadedState) {
+            const actions = loadQueryActions(this.engine);
+            this.engine.dispatch(actions.updateQuery({ q: this.value || "" }));
+        }
+
+        this.resultList = buildResultList(this.engine, {
+            options: { fieldsToInclude: ["sfhtml_url__c"] }
+        });
+
+        this.resultsPerPage = buildResultsPerPage(this.engine, {
+            initialState: {
+                numberOfResults: DEFAULT_RESULT_COUNT
+            }
+        });
+
+        this.searchBox = buildSearchBox(this.engine, {
+            options: { numberOfSuggestions: 3 }
+        });
+
+        this.setAdvancedFilters(this.engine);
+
+        this.unsubscribeFromResultList = this.resultList?.subscribe(
+            this.onResultListChange
+        );
+
+        if (this.value) {
+            this.dispatchHighlightedTermChange();
+        }
+
+        if (!this.preloadedState) {
+            if (this.value) {
+                this.submitSearch();
+            } else {
+                this.dispatchOnLoading(false);
+            }
+        }
+
+        this.syncAnalytics();
+    };
+
+    private syncAnalytics = () => {
+        const storedResult = window.localStorage.getItem(
+            RESULT_CLICK_LOCAL_STORAGE_KEY
+        );
+        if (storedResult) {
+            const interactiveResult = buildInteractiveResult(this.engine!, {
+                options: { result: JSON.parse(storedResult) }
+            });
+            interactiveResult.cancelPendingSelect();
+            interactiveResult.select();
+            window.localStorage.removeItem(RESULT_CLICK_LOCAL_STORAGE_KEY);
+        }
+    };
+
+    private onResultListChange = () => {
+        if (!this.resultList) {
+            return;
+        }
+
+        const { isLoading, firstSearchExecuted, results } =
+            this.resultList.state;
+
+        if ((!firstSearchExecuted && !isLoading) || !this.value) {
+            // coveo search is firing off some unwanted payloads on startup
+            return;
+        }
+
+        if (!isLoading) {
+            this.dispatchOnChangeEvent(results);
+        }
+
+        if (!this.fetchingMoreResults) {
+            this.dispatchOnLoading(isLoading);
+        }
+
+        if (!isLoading && this.fetchingMoreResults) {
+            this.fetchingMoreResults = false;
+        }
+    };
+
+    private setAdvancedFilters(engine: SearchEngine) {
+        const aq = Object.entries(this.coveoAdvancedQueryConfig).reduce(
+            (result, [key, value]) =>
+                `${result}(@${key}=="${normalizeCoveoAdvancedQueryValue(
+                    value
+                )}")`,
+            ""
+        );
+
+        const registerSearchQueryAction = loadAdvancedSearchQueryActions(
+            engine
+        ).registerAdvancedSearchQueries({
+            aq: aq
+        });
+
+        engine.dispatch(registerSearchQueryAction);
+    }
+
+    private normalizeCoveoResult = (result: Result): SidebarSearchResult => {
+        const {
+            clickUri,
+            excerpt,
+            excerptHighlights,
+            raw: { sfhtml_url__c },
+            title,
+            titleHighlights,
+            uniqueId
+        } = result;
+
+        // discussion about this normalization here: https://salesforce-internal.slack.com/archives/C020S6784JX/p1639506238376600
+
+        let pathname, queryParam;
+        if (sfhtml_url__c) {
+            pathname = `/docs/${sfhtml_url__c}`;
+        } else {
+            const isNestedGuide = clickUri.includes("/guide/");
+            const url = new URL(clickUri);
+            const extension =
+                isNestedGuide && !url.pathname?.endsWith(".html")
+                    ? ".html"
+                    : "";
+            pathname = `${url.pathname}${extension}`;
+            queryParam = url.search;
+        }
+
+        let href;
+        let isSelected = false;
+        const isReferenceUrl = clickUri.includes("/references/");
+        if (isReferenceUrl) {
+            if (queryParam) {
+                href = `${pathname}${queryParam}&q=${this.value}`;
+            } else {
+                href = `${pathname}?q=${this.value}`;
+            }
+
+            //NOTE: This is specific to references related comparison
+            const resultHrefWithMetaQuery = `${pathname}${queryParam}`;
+
+            const urlParams = new URLSearchParams(window.location.search);
+            const metaQueryParam = urlParams.get("meta");
+
+            let currentUrlPathWithQuery = window.location.pathname;
+            if (metaQueryParam) {
+                currentUrlPathWithQuery = `${currentUrlPathWithQuery}?meta=${metaQueryParam}`;
+            }
+
+            isSelected = resultHrefWithMetaQuery === currentUrlPathWithQuery;
+        } else {
+            href = `${pathname}?q=${this.value}`;
+            isSelected = pathname === window.location.pathname;
+        }
+
         return {
-            title: item.title ?? "",
-            titleHighlights: [],
-            excerpt: "",
-            excerptHighlights: [],
-            uniqueId: href || `result-${index}`,
+            title,
+            titleHighlights,
+            excerpt,
+            excerptHighlights,
+            uniqueId,
             href,
             selected: isSelected,
-            select: () => {}
+            select: () =>
+                window.localStorage.setItem(
+                    RESULT_CLICK_LOCAL_STORAGE_KEY,
+                    JSON.stringify(result)
+                )
         };
     };
 
-    private async fetchDataCloudSearch(): Promise<void> {
-        const body = {
-            searchQuery: this.value.trim(),
-            baseUrlPath: getBaseUrlPath()
-        };
-        try {
-            const res = await fetch(DATA_CLOUD_SEARCH_PATH, {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify(body)
-            });
-            if (!res.ok) {
-                throw new Error(`Search API error: ${res.status}`);
-            }
-            const data = await res.json();
-            const rawResults: DataCloudSearchResultItem[] = Array.isArray(data)
-                ? data
-                : data?.results ?? data?.data?.results ?? [];
-            const results: SidebarSearchResult[] = rawResults.map(
-                this.normalizeDataCloudResult
-            );
-            this.dispatchChange(results);
-        } catch (err) {
-            console.error("Data Cloud Search request failed", err);
-            this.dispatchChange([]);
-        } finally {
-            this.dispatchOnLoading(false);
-        }
+    private updateSessionStorage() {
+        window.sessionStorage.setItem(
+            SESSION_KEY,
+            JSON.stringify({
+                coveoAdvancedQueryConfig: this.coveoAdvancedQueryConfig,
+                state: this.engine?.state
+            })
+        );
     }
 
-    private dispatchChange(results: SidebarSearchResult[]) {
+    private dispatchOnChangeEvent(results: Result[]) {
+        this.updateSessionStorage();
         this.dispatchEvent(
             new CustomEvent("change", {
-                detail: { results, value: this.value }
+                detail: {
+                    results: results.map(this.normalizeCoveoResult),
+                    value: this.value
+                }
             })
         );
     }
@@ -182,12 +427,19 @@ export default class SidebarSearch extends LightningElement {
     }
 
     private submitSearch = debounce((isSyncingSearchValue = false) => {
-        UserRecentSearches.add(this.value);
-        this.updateRecentSearches();
-        if (!isSyncingSearchValue) {
-            this.dispatchSidebarSearchChange(this.value);
+        if (this.searchBox) {
+            UserRecentSearches.add(this.value);
+            this.updateRecentSearches();
+
+            // When `isSyncingSearchValue` is true, we are submitting in a case
+            // where the search box is already synced correctly.
+            if (!isSyncingSearchValue) {
+                this.dispatchSidebarSearchChange(this.value);
+            }
+
+            this.searchBox.updateText(this.value || "");
+            this.searchBox.submit();
         }
-        this.fetchDataCloudSearch();
     }, SEARCH_DEBOUNCE_DELAY);
 
     private onClickRecentSearch(e: CustomEvent) {
@@ -209,6 +461,7 @@ export default class SidebarSearch extends LightningElement {
 
     private onInputChange(e: CustomEvent) {
         this.value = e.detail;
+
         this.handleValueChange(false);
         this.dispatchHighlightedTermChange();
     }
@@ -224,10 +477,16 @@ export default class SidebarSearch extends LightningElement {
     private handleValueChange(isSyncingSearchValue = false) {
         if (this.value) {
             this.dispatchOnLoading(true);
-            this.submitSearch(isSyncingSearchValue);
+            if (this.searchBox) {
+                this.submitSearch(isSyncingSearchValue);
+            }
         } else {
+            // coveo's reaction to an empty value triggers a return of results
+            // bootlegging our own ux here`
             this.dispatchOnLoading(false);
-            this.dispatchChange([]);
+            this.dispatchOnChangeEvent([]);
+            // Empty search values are not submitted for search, so we need to manually
+            // trigger a search change on our own here
             this.dispatchSidebarSearchChange(this.value);
         }
     }

package/src/modules/dx/sidebarSearchResult/sidebarSearchResult.ts

@@ -1,8 +1,8 @@
 import { LightningElement, api } from "lwc";
 import cx from "classnames";
-import { HighlightedSections } from "typings/custom";
+import { CoveoHighlights } from "typings/custom";
 
-const toChunks = (value: string, highlights: HighlightedSections) => {
+const toChunks = (value: string, highlights: CoveoHighlights) => {
     if (!highlights || highlights.length < 1) {
         return [
             {
@@ -51,11 +51,11 @@ const toChunks = (value: string, highlights: HighlightedSections) => {
 
 export default class SidebarSearchResult extends LightningElement {
     @api description!: string;
-    @api descriptionHighlights!: HighlightedSections;
+    @api descriptionHighlights!: CoveoHighlights;
     @api href!: string;
     @api selected!: boolean;
     @api header!: string;
-    @api titleHighlights!: HighlightedSections;
+    @api titleHighlights!: CoveoHighlights;
     @api select!: Function;
 
     private get titleChunks() {

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

@@ -1315,7 +1315,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "1": { name: "keyword.control.block.agentscript" }
             },
-            end: "^(?=topic\\b|variables\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
+            end: "^(?=topic\\b|variables\\b|start_agent\\b|system\\b|knowledge\\b|connection\\b|language\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1323,12 +1323,16 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "keyword.config.key.agentscript",
-                    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?:)"
+                    match: "^\\s+(model_provider|agent_id|agent_name|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_]*)(?=\\s?:)"
                 },
+                {
+                    name: "keyword.config.empty.agentscript",
+                    match: "^\\s+empty\\b"
+                },
                 { include: "#values" }
             ]
         },
@@ -1338,7 +1342,7 @@ const agentscriptGrammar = {
             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)",
+            end: "^(?=topic\\b|config\\b|variables\\b|connection\\b|start_agent\\b|system\\b|knowledge\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1357,7 +1361,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "1": { name: "keyword.control.block.agentscript" }
             },
-            end: "^(?=topic\\b|config\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
+            end: "^(?=topic\\b|config\\b|start_agent\\b|system\\b|knowledge\\b|connection\\b|language\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1365,7 +1369,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "keyword.variable.metadata.agentscript",
-                    match: "^\\s+(description|source|label)(?=\\s?:)"
+                    match: "^\\s+(description|source|label|visibility)(?=\\s?:)"
                 },
                 {
                     name: "variable.definition.agentscript",
@@ -1384,16 +1388,17 @@ const agentscriptGrammar = {
                     match: "\\b(string|number|boolean|object|date|timestamp|currency|id|list)\\b"
                 },
                 { include: "#json-structures" },
+                { include: "#plain-template-block" },
                 { include: "#values" }
             ]
         },
         {
             name: "meta.knowledge.agentscript",
-            begin: "^(knowledge_action):",
+            begin: "^(knowledge):",
             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)",
+            end: "^(?=topic\\b|config\\b|variables\\b|connection\\b|start_agent\\b|system\\b|language\\b|connection\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1413,7 +1418,7 @@ const agentscriptGrammar = {
                 "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)",
+            end: "^(?=topic\\b|config\\b|variables\\b|knowledge\\b|start_agent\\b|system\\b|language\\b|connection\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1423,6 +1428,29 @@ const agentscriptGrammar = {
                     name: "keyword.connection.field.agentscript",
                     match: "^\\s+(escalation_message|outbound_route_type|outbound_route_name|adaptive_response_allowed)(?=\\s?:)"
                 },
+                {
+                    name: "keyword.connection.empty.agentscript",
+                    match: "^\\s+empty\\b"
+                },
+                { include: "#values" }
+            ]
+        },
+        {
+            name: "meta.model-config.agentscript",
+            begin: "^(model_config):",
+            beginCaptures: {
+                "1": { name: "keyword.control.block.agentscript" }
+            },
+            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge\\b|connection\\b|language\\b|\\z)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                {
+                    name: "keyword.model-config.field.agentscript",
+                    match: "^\\s+model\\s*:"
+                },
                 { include: "#values" }
             ]
         },
@@ -1432,13 +1460,14 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "1": { name: "keyword.control.block.agentscript" }
             },
-            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
+            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|knowledge\\b|connection\\b|language\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
                 { include: "#block-instructions" },
+                { include: "#system-message-template-block" },
                 {
                     name: "keyword.system.agentscript",
                     match: "^\\s+(instructions|messages|prompt)(?=\\s?:)"
@@ -1447,6 +1476,10 @@ const agentscriptGrammar = {
                     name: "keyword.system.message-type.agentscript",
                     match: "^\\s{2,}(error|welcome)(?=\\s?:)"
                 },
+                {
+                    name: "keyword.system.empty.agentscript",
+                    match: "^\\s+empty\\b"
+                },
                 { include: "#values" }
             ]
         },
@@ -1457,7 +1490,7 @@ const agentscriptGrammar = {
                 "1": { name: "keyword.control.block.agentscript" },
                 "2": { name: "entity.name.topic.agentscript" }
             },
-            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
+            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge\\b|connection\\b|language\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1470,6 +1503,7 @@ const agentscriptGrammar = {
                 { include: "#agent-task" },
                 { include: "#task-content" },
                 { include: "#description-section" },
+                { include: "#model-config-section" },
                 { include: "#before-or-after-reasoning" },
                 { include: "#directives" },
                 {
@@ -1488,7 +1522,7 @@ const agentscriptGrammar = {
                 "1": { name: "keyword.control.block.agentscript" },
                 "2": { name: "entity.name.agent.agentscript" }
             },
-            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge_action\\b|connection\\b|language\\b|\\z)",
+            end: "^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge\\b|connection\\b|language\\b|model_config\\b|\\z)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1501,6 +1535,7 @@ const agentscriptGrammar = {
                 { include: "#agent-task" },
                 { include: "#task-content" },
                 { include: "#description-section" },
+                { include: "#model-config-section" },
                 { include: "#before-or-after-reasoning" },
                 { include: "#directives" },
                 {
@@ -1575,7 +1610,7 @@ const agentscriptGrammar = {
         },
         {
             name: "meta.variable.reference.agentscript",
-            match: "(@)(variables|outputs|inputs|topic|actions|knowledge_action)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
+            match: "(@)(variables|outputs|inputs|topic|actions|knowledge|system_variables)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
             captures: {
                 "1": { name: "support.class.agentscript" },
                 "2": { name: "support.class.agentscript" },
@@ -1589,7 +1624,7 @@ const agentscriptGrammar = {
         },
         {
             name: "variable.other.member.agentscript",
-            match: "(?<=@(?:variables|topic|inputs|actions|outputs|knowledge_action)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
+            match: "(?<=@(?:variables|topic|inputs|actions|outputs|knowledge|system_variables)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
         },
         {
             name: "operator.arithmetic.agentscript",
@@ -1654,7 +1689,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "variable.other.member.agentscript",
-                    match: "(?<=@(?:variables|topic|inputs|actions|outputs|knowledge_action)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
+                    match: "(?<=@(?:variables|topic|inputs|actions|outputs|knowledge|system_variables)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
                 }
             ]
         },
@@ -1704,12 +1739,31 @@ const agentscriptGrammar = {
             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)",
+            end: "^(?=\\s+(reasoning|system|description|before_reasoning|after_reasoning|actions|variables|instructions|model_config)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|language\\b|knowledge\\b|connection\\b)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                { include: "#values" }
+            ]
+        },
+        "model-config-section": {
+            name: "meta.model-config.section.agentscript",
+            begin: "^\\s+(model_config)\\s*:",
+            beginCaptures: {
+                "1": { name: "keyword.topic.section.agentscript" }
+            },
+            end: "^(?=\\s+(reasoning|label|system|description|before_reasoning|after_reasoning|actions|variables|instructions|model_config)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
+                {
+                    name: "keyword.model-config.field.agentscript",
+                    match: "^\\s+model\\s*:"
+                },
                 { include: "#values" }
             ]
         },
@@ -1719,7 +1773,7 @@ const agentscriptGrammar = {
             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)",
+            end: "^(?=\\s+(reasoning|label|description|before_reasoning|after_reasoning|actions|model_config)\\b)|^(?=topic\\b|config\\b|language\\b|knowledge\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1739,7 +1793,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "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)",
+            end: "^(?=\\s+(label|system|description|before_reasoning|after_reasoning|variables|model_config)\\b)|^(?=\\s{1,5}actions\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1751,7 +1805,7 @@ const agentscriptGrammar = {
         },
         "block-instructions": {
             name: "meta.block.instructions.agentscript",
-            begin: "^(\\s{4,8})(instructions)\\s*(:\\s*(->|\\|))",
+            begin: "^(\\s+)(instructions)\\s*(:\\s*(->|\\|))",
             beginCaptures: {
                 "2": { name: "keyword.topic.section.agentscript" },
                 "3": {
@@ -1767,28 +1821,28 @@ const agentscriptGrammar = {
                     ]
                 }
             },
-            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)",
+            end: "^(?=\\s+(reasoning|actions|before_reasoning|after_reasoning|model_config|messages)\\s?:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
                     match: "(^|[ \t]+)#.*$"
                 },
+                { include: "#directives" },
                 {
                     name: "string.heredoc.agentscript",
-                    begin: "^\\s+",
+                    begin: "^(\\s+)(?!#)(?!\\s*(?:if|else|run|set|with|transition\\s+to|delegate\\s+to|available\\s+when)\\b)(?!\\s*@)",
                     beginCaptures: {
                         "1": { name: "keyword.operator.heredoc.agentscript" }
                     },
-                    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)",
+                    end: "^(?=\\s+(reasoning|actions|before_reasoning|after_reasoning|description|label|system|variables|instructions|override|model_config|messages)\\s?:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
                     patterns: [
                         { include: "#template-expression" },
                         {
                             name: "string.unquoted.heredoc.agentscript",
-                            match: "."
+                            match: "(?:[^{]|\\{(?!!))*"
                         }
                     ]
-                },
-                { include: "#directives" }
+                }
             ]
         },
         "template-block": {
@@ -1800,12 +1854,56 @@ const agentscriptGrammar = {
             end: "^(?!\\s+\\|)",
             patterns: [
                 { include: "#template-expression" },
+                {
+                    name: "string.unquoted.template.agentscript",
+                    match: "(?:[^{]|\\{(?!!))*"
+                }
+            ]
+        },
+        "plain-template-block": {
+            name: "meta.plain.template.block.agentscript",
+            begin: "^\\s+(\\|)",
+            beginCaptures: {
+                "1": { name: "keyword.operator.template.agentscript" }
+            },
+            end: "^(?!\\s+\\|)",
+            patterns: [
                 {
                     name: "string.unquoted.template.agentscript",
                     match: ".*"
                 }
             ]
         },
+        "system-message-template-block": {
+            name: "meta.system.message.template.agentscript",
+            begin: "^(\\s+)(welcome|error)\\s*:\\s*(\\|)\\s*$",
+            beginCaptures: {
+                "2": { name: "keyword.system.message-type.agentscript" },
+                "3": { name: "keyword.operator.template.agentscript" }
+            },
+            end: "^(?=\\s{2,}(welcome|error)\\s*:)|^(?=\\s+(instructions|messages|prompt)\\s*:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge\\b|connection\\b|language\\b|model_config\\b|\\z)",
+            patterns: [
+                {
+                    name: "comment.line.agentscript",
+                    match: "(^|[ \t]+)#.*$"
+                },
+                {
+                    name: "string.heredoc.agentscript",
+                    begin: "^(\\s+)(?!#)(?!\\s*(welcome|error)\\s*:)",
+                    beginCaptures: {
+                        "1": { name: "keyword.operator.heredoc.agentscript" }
+                    },
+                    end: "^(?=\\s{2,}(welcome|error)\\s*:)|^(?=\\s+(instructions|messages|prompt)\\s*:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|knowledge\\b|connection\\b|language\\b|model_config\\b|\\z)",
+                    patterns: [
+                        { include: "#template-expression" },
+                        {
+                            name: "string.unquoted.heredoc.agentscript",
+                            match: "(?:[^{]|\\{(?!!))*"
+                        }
+                    ]
+                }
+            ]
+        },
         "agent-task": {
             patterns: [
                 {
@@ -1823,7 +1921,7 @@ const agentscriptGrammar = {
                         { include: "#template-expression" },
                         {
                             name: "string.unquoted.heredoc.agentscript",
-                            match: ".*"
+                            match: "(?:[^{]|\\{(?!!))*"
                         }
                     ]
                 },
@@ -1876,7 +1974,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "1": { name: "keyword.topic.section.agentscript" }
             },
-            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)",
+            end: "^(?=\\s+(reasoning|label|system|actions|before_reasoning|after_reasoning|variables|instructions|model_config)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1888,16 +1986,17 @@ const agentscriptGrammar = {
                     end: '"',
                     patterns: [{ include: "#template-expression" }]
                 },
+                { include: "#plain-template-block" },
                 { include: "#values" }
             ]
         },
         "before-or-after-reasoning": {
             name: "meta.before-or-after-reasoning.agentscript",
-            begin: "^(\\s+)(before_reasoning|after_reasoning):",
+            begin: "^(\\s+)(before_reasoning|after_reasoning)(?::|\\s*:\\s*->)",
             beginCaptures: {
                 "2": { name: "keyword.topic.section.agentscript" }
             },
-            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)",
+            end: "^(?=\\s{2,4}(reasoning|actions|after_reasoning|before_reasoning|description|label|system|variables|instructions|override|model_config)\\b)|^(?=\\s{4}override\\s+system\\.instructions:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1916,7 +2015,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "meta.variable.reference.agentscript",
-                    match: "(@)(actions|topic|variables|outputs|inputs|knowledge_action)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
+                    match: "(@)(actions|topic|variables|outputs|inputs|knowledge|system_variables)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "support.class.agentscript" },
@@ -1957,7 +2056,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "2": { name: "keyword.topic.section.agentscript" }
             },
-            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)",
+            end: "^(?=\\s{2,4}(reasoning|before_reasoning|after_reasoning|description|label|system|variables|instructions|override|model_config)\\b)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -1969,7 +2068,7 @@ const agentscriptGrammar = {
                     beginCaptures: {
                         "1": { name: "keyword.action.property.agentscript" }
                     },
-                    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)",
+                    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\\b|connection\\b)",
                     patterns: [
                         {
                             name: "comment.line.agentscript",
@@ -1977,13 +2076,13 @@ const agentscriptGrammar = {
                         },
                         {
                             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*",
+                            begin: "^\\s{8,16}(?!(?:description|is_required|is_user_input|label|is_displayable|is_used_by_planner|complex_data_type_name|filter_from_agent|schema)\\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)",
+                            end: "^(?=\\s+(?!(?:description|is_required|is_user_input|label|is_displayable|is_used_by_planner|complex_data_type_name|filter_from_agent|schema)\\s*:)[a-zA-Z_][a-zA-Z0-9_]*\\s*:)|^(?=topic\\b|config\\b|variables\\b|start_agent\\b|system\\b|language\\b|knowledge\\b|connection\\b)",
                             patterns: [
                                 {
                                     name: "comment.line.agentscript",
@@ -1995,21 +2094,23 @@ const agentscriptGrammar = {
                                 },
                                 {
                                     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)(?=:)"
+                                    match: "^\\s+(description|is_required|is_user_input|label|complex_data_type_name|is_used_by_planner|is_displayable|filter_from_agent|schema)(?=:)"
                                 },
                                 {
                                     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*:"
+                                    match: "^\\s+(?!(?:description|is_required|is_user_input|label|is_displayable|is_used_by_planner|complex_data_type_name|filter_from_agent|schema)\\s*:)[a-zA-Z_][a-zA-Z0-9_]*\\s*:"
                                 },
+                                { include: "#plain-template-block" },
                                 { include: "#values" }
                             ]
                         },
+                        { include: "#plain-template-block" },
                         { include: "#values" }
                     ]
                 },
                 {
                     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)(?=:)"
+                    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|filter_from_agent)(?=:)"
                 },
                 {
                     name: "entity.name.action.agentscript",
@@ -2021,6 +2122,7 @@ const agentscriptGrammar = {
                 },
                 { include: "#operators" },
                 { include: "#punctuation" },
+                { include: "#plain-template-block" },
                 { include: "#values" }
             ]
         },
@@ -2030,7 +2132,7 @@ const agentscriptGrammar = {
             beginCaptures: {
                 "2": { name: "keyword.topic.section.agentscript" }
             },
-            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?:))",
+            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\\b|connection\\b)|^(?=\\s{2,4}(description\\s?:))",
             patterns: [
                 {
                     name: "comment.line.agentscript",
@@ -2042,7 +2144,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "meta.tool.declaration.agentscript",
-                    match: "^\\s+(([a-zA-Z_][a-zA-Z0-9_]*)):\\s*(@(actions|utils|topic|knowledge_action))",
+                    match: "^\\s+(([a-zA-Z_][a-zA-Z0-9_]*)):\\s*(@(actions|utils|topic|knowledge))",
                     captures: {
                         "2": { name: "entity.name.tool.agentscript" },
                         "3": { name: "support.class.agentscript" },
@@ -2061,7 +2163,7 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "meta.variable.reference.agentscript",
-                    match: "(@)(actions|topic|variables|outputs|inputs|knowledge_action)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
+                    match: "(@)(actions|topic|variables|outputs|inputs|knowledge|system_variables)(\\.)([a-zA-Z_][a-zA-Z0-9_]*)",
                     captures: {
                         "1": { name: "support.class.agentscript" },
                         "2": { name: "support.class.agentscript" },
@@ -2152,12 +2254,20 @@ const agentscriptGrammar = {
                 },
                 {
                     name: "keyword.knowledge-action-ref.agentscript",
-                    match: "(@knowledge_action)",
+                    match: "(@knowledge)",
                     captures: { "1": { name: "support.class.agentscript" } }
                 },
+                {
+                    name: "keyword.system-variables-ref.agentscript",
+                    match: "(@system_variables)(\\.)",
+                    captures: {
+                        "1": { name: "support.class.agentscript" },
+                        "2": { name: "punctuation.accessor.dot.agentscript" }
+                    }
+                },
                 {
                     name: "variable.other.member.agentscript",
-                    match: "(?<=@(?:variables|topic|inputs|actions|outputs)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
+                    match: "(?<=@(?:variables|topic|inputs|actions|outputs|knowledge|system_variables)\\.)\\b[a-zA-Z_][a-zA-Z0-9_]*\\b"
                 },
                 { include: "#operators" },
                 { include: "#values" }