refine agent rule structure

Author: Jicheng Lu

src/lib/common/shared/CodeScript.svelte

@@ -1,7 +1,7 @@
 <script>
     import { onMount, createEventDispatcher } from "svelte";
     import CodeMirror from "svelte-codemirror-editor";
-    import { keymap } from "@codemirror/view";
+    import { keymap, lineNumbers } from "@codemirror/view";
     import { indentUnit, indentOnInput, indentService } from "@codemirror/language";
     import { defaultKeymap, history, indentWithTab, historyKeymap } from "@codemirror/commands";
     import { EditorState } from "@codemirror/state";
@@ -21,10 +21,13 @@
     export let containerClasses = '';
 
     /** @type {boolean} */
-    export let darkTheme = true;
+    export let useDarkTheme = true;
 
     /** @type {boolean} */
-    export let useBasicSetup = true;
+    export let hideLineNumber = false;
+
+    /** @type {boolean} */
+    export let editable = true;
 
 
     /** @type {import("@codemirror/state").Extension[]} */
@@ -33,7 +36,7 @@
         EditorState.tabSize.of(4),
         indentOnInput(),
         history(),
-        keymap.of([...defaultKeymap, ...historyKeymap, indentWithTab])
+        keymap.of([...defaultKeymap, ...historyKeymap, indentWithTab]),
     ];
 
     /** @type {import("@codemirror/state").Extension[]} */
@@ -65,6 +68,17 @@
                 javascript(),
                 ...baseExtensions
             ];
+        } else {
+            extensions = [
+                ...baseExtensions
+            ];
+        }
+
+        if (hideLineNumber) {
+            extensions = [
+                lineNumbers({ formatNumber: () => "" }),
+                ...extensions
+            ];
         }
     });
 
@@ -80,8 +94,8 @@
 <CodeMirror
     class={`code-script-container ${containerClasses}`}
     lineWrapping
-    basic={useBasicSetup}
-    theme={darkTheme ? oneDark : null}
+    theme={useDarkTheme ? oneDark : null}
+    editable={editable}
     extensions={extensions}
     value={scriptText}
     on:change={e => handleChange(e)}

src/lib/helpers/types/agentTypes.js

@@ -226,17 +226,25 @@
 /**
  * @typedef {Object} AgentRule
  * @property {string} trigger_name 
- * @property {string} criteria
  * @property {string?} [displayName]
  * @property {boolean} disabled
- * @property {AgentAction?} [action]
+ * @property {AgentRuleCriteria?} [rule_criteria]
+ * @property {AgentRuleAction?} [rule_action]
  * @property {any?} [output_args]
  * @property {string?} [json_args]
  * @property {string?} [statement]
  */
 
 /**
- * @typedef {Object} AgentAction
+ * @typedef {Object} AgentRuleCriteria
+ * @property {string?} [name]
+ * @property {string?} [criteria_text]
+ * @property {boolean} disabled
+ * @property {any} [config]
+ */
+
+/**
+ * @typedef {Object} AgentRuleAction
  * @property {string?} [name]
  * @property {boolean} disabled
  * @property {any} [config]

src/lib/scss/custom/pages/_agent.scss

@@ -323,7 +323,7 @@
     }
 }
 
-.agent-action-config {
+.agent-rule-config {
     min-height: 0px;
     max-height: 200px;
 }

src/lib/services/agent-service.js

@@ -115,6 +115,16 @@ export async function getAgentRuleOptions() {
     return response.data;
 }
 
+/**
+ * Get agent rule criteria providers
+ * @returns {Promise<string[]>}
+ */
+export async function getAgentRuleCriteriaProviders() {
+    const url = endpoints.agentRuleCriteriaProvidersUrl;
+    const response = await axios.get(url);
+    return response.data;
+}
+
 /**
  * Get agent rule actions
  * @returns {Promise<string[]>}

src/lib/services/api-endpoints.js

@@ -41,6 +41,7 @@ export const endpoints = {
     agentUtilityOptionsUrl: `${host}/agent/utility/options`,
     agentRuleOptionsUrl: `${host}/rule/triggers`,
     agentRuleActionsUrl: `${host}/rule/actions`,
+    agentRuleCriteriaProvidersUrl: `${host}/rule/criteria-providers`,
     agentLabelsUrl: `${host}/agent/labels`,
 
     // agent code script:

src/routes/chat/[agentId]/[conversationId]/chat-box.svelte

@@ -1662,6 +1662,7 @@
 	<CodeScript
 		language={codeLanguage || 'python'}
 		scriptText={codeScript}
+		editable={false}
 	/>
 </PlainModal>