@dot-agent/language-server 0.3.1 → 0.4.0

package/features/completions.js

@@ -19,9 +19,9 @@
 const { CompletionItemKind } = require('vscode-languageserver');
 const { nodesOfType, positionToOffset, getContextNode } = require('../parser');
 
-const BEHAVIOR_TOP_KW   = ['state', 'merge', 'on event', 'on intent', 'on offtopic', 'on fallback'];
-const BEHAVIOR_BLOCK_KW = ['guide', 'teach', 'goal', 'interact', 'run', 'transition', 'set', 'if', 'else', 'after', 'parallel', 'apply', 'remove', 'on intent', 'on offtopic', 'on fallback', 'on complete', 'on failed'];
-const AGENT_TOP_KW  = ['agent', 'domain', 'license', 'terms', 'privacy', 'description', 'behavior', 'requires', 'input', 'capabilities', 'output', 'type', 'concept', 'schema'];
+const BEHAVIOR_TOP_KW   = ['state', 'merge', 'on event', 'on intent', 'on offtopic'];
+const BEHAVIOR_BLOCK_KW = ['guide', 'teach', 'goal', 'interact', 'run', 'transition', 'set', 'if', 'else', 'end', 'after', 'parallel', 'apply', 'remove', 'on intent', 'on offtopic', 'on failure', 'on success'];
+const DESCRIPTION_TOP_KW  = ['agent', 'domain', 'license', 'terms', 'privacy', 'description', 'behavior', 'requires', 'input', 'capabilities', 'output', 'type', 'concept'];
 const STRICT_BLOCKS = new Set(['input_block', 'output_block', 'requires_block', 'capabilities_block']);
 
 function kw(label) {
@@ -59,7 +59,7 @@ function provideCompletions(langId, tree, text, position) {
             return ['script', 'subagent', 'tool'].map(kw);
         }
         if (/\bon\s+\S*$/.test(before)) {
-            return ['event', 'intent', 'offtopic', 'fallback', 'complete', 'failed'].map(kw);
+            return ['event', 'intent', 'offtopic', 'failure', 'success'].map(kw);
         }
 
         // Context-aware: top-level vs. inside a block
@@ -72,9 +72,9 @@ function provideCompletions(langId, tree, text, position) {
         return (/^\s/.test(line) ? BEHAVIOR_BLOCK_KW : BEHAVIOR_TOP_KW).map(kw);
     }
 
-    if (langId === 'agent') {
+    if (langId === 'description') {
         if (!/^\s/.test(line)) {
-            return AGENT_TOP_KW.map(kw);
+            return DESCRIPTION_TOP_KW.map(kw);
         }
 
         // Inside a strict block → suggest declared types

package/features/definition.js

@@ -29,7 +29,7 @@ function provideDefinition(langId, tree, text, uri, position) {
     if (langId === 'behavior') {
         targetNode = nodesOfType(tree, 'state_decl')
             .find(n => n.childForFieldName('name')?.text === word);
-    } else if (langId === 'agent') {
+    } else if (langId === 'description') {
         if (!/^[A-Z]/.test(word) && !word.includes('.')) return null;
         targetNode = nodesOfType(tree, 'type_decl')
             .find(n => n.childForFieldName('name')?.text === word);

package/features/diagnostics.js

@@ -26,7 +26,7 @@ const STRICT_BLOCK_TYPES = {
     capabilities_block: 'capabilities',
 };
 
-function diagnoseAgent(tree, text) {
+function diagnoseDescription(tree, text) {
     const diagnostics = [];
 
     // ── Strict block validation ───────────────────────────────────────────────
@@ -44,7 +44,7 @@ function diagnoseAgent(tree, text) {
                     range: nodeToRange(errorNode),
                     message: `Syntax error in '${blockName}' block. Expected: Type or Type "Description", or compact: Type1, Type2.`,
                     severity: DiagnosticSeverity.Error,
-                    source: 'agent-dsl',
+                    source: 'description-dsl',
                 });
             }
 
@@ -59,7 +59,7 @@ function diagnoseAgent(tree, text) {
                             range: nodeToRange(idNode),
                             message: `Type '${typeName}' is not declared in this file (assuming native or external).`,
                             severity: DiagnosticSeverity.Warning,
-                            source: 'agent-dsl',
+                            source: 'description-dsl',
                         });
                     }
                 }
@@ -70,7 +70,7 @@ function diagnoseAgent(tree, text) {
     return diagnostics;
 }
 
-function diagnoseFlow(tree) {
+function diagnoseBehavior(tree) {
     const diagnostics = [];
 
     // ── Rule 1: Dangling transitions ──────────────────────────────────────────
@@ -100,18 +100,6 @@ function diagnoseFlow(tree) {
     for (const n of nodesOfType(tree, 'transition_stmt')) {
         checkTransitionTarget(n.childForFieldName('state'));
     }
-    for (const n of nodesOfType(tree, 'intent_trigger')) {
-        // inline form: on intent "..." transition to <state>
-        checkTransitionTarget(n.childForFieldName('state'));
-    }
-    for (const n of nodesOfType(tree, 'fallback_stmt')) {
-        // inline form: on fallback transition to <state>
-        checkTransitionTarget(n.childForFieldName('state'));
-    }
-    for (const n of nodesOfType(tree, 'offtopic_stmt')) {
-        // inline form: on offtopic transition to <state>
-        checkTransitionTarget(n.childForFieldName('state'));
-    }
 
     // ── Rule 2: Dead-end interact (now redundant but kept for safety) ────────────
     // With the new grammar, oriented_state_body requires repeat1(handlers),
@@ -125,14 +113,13 @@ function diagnoseFlow(tree) {
 
         // With new grammar: oriented_state_body always has handlers after interact (repeat1)
         // So this check should never trigger, but kept for robustness
-        const hasHandlers = ancestor.descendantsOfType('intent_trigger').length +
-                           ancestor.descendantsOfType('fallback_stmt').length +
-                           ancestor.descendantsOfType('offtopic_stmt').length > 0;
+        const hasHandlers = ancestor.descendantsOfType('intent_handler').length +
+                           ancestor.descendantsOfType('offtopic_handler').length > 0;
 
         if (!hasHandlers) {
             diagnostics.push({
                 range: nodeToRange(interactNode),
-                message: "This state calls interact but has no handlers (on intent/fallback/offtopic). This will trap the agent.",
+                message: "This state calls interact but has no handlers (on intent/offtopic). This will trap the agent.",
                 severity: DiagnosticSeverity.Warning,
                 source: 'behavior-dsl',
             });
@@ -144,8 +131,8 @@ function diagnoseFlow(tree) {
 
 function diagnose(langId, tree, text) {
     if (!tree) return [];
-    if (langId === 'agent') return diagnoseAgent(tree, text);
-    if (langId === 'behavior')  return diagnoseFlow(tree);
+    if (langId === 'description') return diagnoseDescription(tree, text);
+    if (langId === 'behavior')  return diagnoseBehavior(tree);
     return [];
 }
 

package/features/formatting.js

@@ -16,7 +16,7 @@
 
 'use strict';
 
-const BLOCK_HEADERS = /^(on\s+(intent|offtopic|fallback|complete|failed)|if|else|after|parallel)\b/;
+const BLOCK_HEADERS = /^(on\s+(intent|offtopic|failure|success)|if|else|after|parallel)\b/;
 const TOP_LEVEL_LINE = /^(state|merge)\s|^on\s+event\b/;
 
 function formatBehavior(text) {
@@ -39,7 +39,12 @@ function formatBehavior(text) {
             if (BLOCK_HEADERS.test(trimmed)) mode = 'NESTED_BODY';
             expectedIndent = 2;
         } else {
-            expectedIndent = BLOCK_HEADERS.test(trimmed) ? 2 : 4;
+            if (/^end\b/.test(trimmed)) {
+                mode = 'STATE_BODY';
+                expectedIndent = 2;
+            } else {
+                expectedIndent = BLOCK_HEADERS.test(trimmed) ? 2 : 4;
+            }
         }
 
         const actualIndent = raw.length - raw.trimStart().length;
@@ -53,7 +58,7 @@ function formatBehavior(text) {
     return edits;
 }
 
-function formatAgent(text) {
+function formatDescription(text) {
     const edits = [];
     const lines = text.split('\n');
     for (let i = 0; i < lines.length; i++) {
@@ -73,7 +78,7 @@ function formatAgent(text) {
 
 function format(langId, text) {
     if (langId === 'behavior') return formatBehavior(text);
-    if (langId === 'agent') return formatAgent(text);
+    if (langId === 'description') return formatDescription(text);
     return [];
 }
 

package/features/hover.js

@@ -18,7 +18,7 @@
 
 const { MarkupKind } = require('vscode-languageserver');
 
-const AGENT_DOCS = {
+const DESCRIPTION_DOCS = {
     'agent':        '**`agent name`**\n\nDeclares a new agent. The central node of the manifest.',
     'domain':       '**`domain url`**\n\nDeclares the canonical domain for this agent, establishing cryptographic identity and ownership.',
     'license':      '**`license type`**\n\nDeclares the license under which this agent is distributed (e.g., MIT, Copyright).',
@@ -32,30 +32,32 @@ const AGENT_DOCS = {
     'output':       '**`output Type`**\n\nThe data type this agent returns.',
     'type':         '**`type name`**\n\nDeclares a custom type to anchor custom typing to Wikidata or Schema.org.',
     'concept':      '**`concept url`**\n\nThe Wikidata or Schema.org concept URL this type maps to.',
-    'schema':       '**`schema file.json`**\n\nA JSON schema file for this type.',
 };
 
 const BEHAVIOR_DOCS = {
     'merge':       '**`merge "file.behavior"`**\n\nIncludes another `.behavior` file. Must appear before any `state` or `on event` declarations (preamble-only, eager loading).',
     'state':       '**`state name`**\n\nDeclares a named state. States contain the logic that runs while the agent is in that state.',
-    'on':          '**`on event|intent|offtopic|fallback|complete|failed`**\n\nBinds a handler to a trigger. Top-level: `on event`. Inside a state: `on intent`, `on offtopic`, `on fallback`. After parallel: `on complete`, `on failed`.',
-    'run':         '**`run script|subagent|tool "target"`**\n\nExecutes a script, subagent, or tool. Accepts optional modifiers: `silent`, `in background`, `each collection`.',
+    'on':          '**`on event|intent|offtopic|failure|success`**\n\nBinds a handler to a trigger. Top-level: `on event`. Inside a state: `on intent`, `on offtopic`. After `run`/`apply`/`remove`: `on failure`. Inside `parallel`: `on success` (optional), `on failure` (required).',
+    'run':         '**`run script|subagent|tool "target" ["parameters"]`**\n\nExecutes a script, subagent, or tool. Optionally followed by `on failure` to handle errors.',
     'guide':       '**`guide "text"`**\n\nInjects a system-level instruction into the conversation context, shaping the agent\'s persona or approach without being visible as a reply.',
-    'teach':       '**`teach "text"`**\n\nAdds a fact or constraint to the agent\'s working knowledge for the duration of this state.',
+    'teach':       '**`teach "file"`**\n\nLoads a file into the agent\'s working knowledge for the duration of this state.',
     'goal':        '**`goal "text"`**\n\nSets the agent\'s objective for this state, used by the runtime for planning and alignment checks.',
-    'interact':    '**`interact [requiring "text"]`**\n\nPauses execution and waits for user input. Optionally enforces a requirement before continuing.',
+    'interact':    '**`interact`**\n\nPauses execution and waits for user input.',
     'set':         '**`set domain.var = value`**\n\nAssigns a value to a memory variable. Domains: `context`, `session`, `worksession`, `user`.',
     'context':     '**`context`** memory domain — scoped to the current agent run.',
     'session':     '**`session`** memory domain — persists for the user\'s current session.',
     'worksession': '**`worksession`** memory domain — persists across a task-oriented work session (isolated per task).',
     'user':        '**`user`** memory domain — persists across sessions for a given user.',
     'transition':  '**`transition to state`**\n\nTransitions immediately to the named state.',
-    'if':          '**`if condition`**\n\nConditional execution. Condition can use `==`, `!=`, `>`, `<`, `>=`, `<=`, `and`, `or`.',
-    'else':        '**`else`**\n\nAlternative branch of an `if` statement.',
+    'if':          '**`if condition`**\n\nConditional execution. Condition can use `==`, `!=`, `>`, `<`, `>=`, `<=`, `and`, `or`. Close the block with `end`.',
+    'else':        '**`else`**\n\nAlternative branch of an `if` statement. Close the block with `end`.',
+    'end':         '**`end`**\n\nCloses an `if`/`else` block.',
     'after':       '**`after N prompts`**\n\n[Experimental] Executes a block after N user prompts have occurred in this state.',
-    'parallel':    '**`parallel`**\n\n[Experimental] Runs a block of `run` statements concurrently. Follow with `on complete` and `on failed` handlers.',
-    'apply':       '**`apply css|html|video "text"`**\n\nApplies a UI manipulation to a CSS selector, HTML element, or video element.',
-    'remove':      '**`remove css|html|video "text"`**\n\nRemoves a UI element by selector or reference.',
+    'parallel':    '**`parallel`**\n\n[Experimental] Runs a block of `run` statements concurrently. Follow with optional `on success` and required `on failure` handlers.',
+    'apply':       '**`apply css "selector"`**\n\nApplies a UI manipulation to a CSS selector. Optionally followed by `on failure`.',
+    'remove':      '**`remove css "selector"`**\n\nRemoves a UI element by CSS selector. Optionally followed by `on failure`.',
+    'failure':     '**`on failure`**\n\nError handler block executed when a `run`, `apply`, `remove`, or `parallel` statement fails.',
+    'success':     '**`on success`**\n\nOptional success handler block inside a `parallel` statement.',
 };
 
 function provideHover(langId, text, position) {
@@ -70,7 +72,7 @@ function provideHover(langId, text, position) {
     const word = line.slice(start, end);
     if (!word) return null;
 
-    const docs = langId === 'agent' ? AGENT_DOCS : BEHAVIOR_DOCS;
+    const docs = langId === 'description' ? DESCRIPTION_DOCS : BEHAVIOR_DOCS;
     const doc = docs[word];
     if (!doc) return null;
 

package/features/links.js

@@ -41,15 +41,11 @@ function provideDocumentLinks(langId, tree, docUri) {
         });
     }
 
-    if (langId === 'agent') {
+    if (langId === 'description') {
         for (const node of nodesOfType(tree, 'behavior_block')) {
             const fileNode = node.childForFieldName('file');
             if (fileNode) addLink(fileNode, fileNode.text);
         }
-        for (const node of nodesOfType(tree, 'schema_prop')) {
-            const fileNode = node.childForFieldName('file');
-            if (fileNode) addLink(fileNode, fileNode.text);
-        }
     }
 
     if (langId === 'behavior') {
@@ -58,7 +54,7 @@ function provideDocumentLinks(langId, tree, docUri) {
             if (pathNode) addLink(pathNode, pathNode.text);
         }
         for (const node of nodesOfType(tree, 'run_stmt')) {
-            const runTypeNode = node.childForFieldName('run_type');
+            const runTypeNode = node.childForFieldName('type');
             if (runTypeNode?.text !== 'script') continue;
             const targetNode = node.childForFieldName('target');
             if (targetNode) addLink(targetNode, targetNode.text);

package/features/references.js

@@ -41,12 +41,7 @@ function provideReferences(langId, tree, text, uri, position) {
             const stateNode = n.childForFieldName('state');
             if (stateNode?.text === word) add(stateNode);
         }
-        // Inline intent handlers: on intent "..." next <state>
-        for (const n of nodesOfType(tree, 'intent_trigger')) {
-            const stateNode = n.childForFieldName('state');
-            if (stateNode?.text === word) add(stateNode);
-        }
-    } else if (langId === 'agent') {
+    } else if (langId === 'description') {
         // Declaration
         for (const n of nodesOfType(tree, 'type_decl')) {
             const nameNode = n.childForFieldName('name');

package/features/rename.js

@@ -41,12 +41,7 @@ function provideRenameEdits(langId, tree, text, uri, position, newName) {
             const stateNode = n.childForFieldName('state');
             if (stateNode?.text === oldName) addEdit(stateNode);
         }
-        // Rename inline intent handler targets
-        for (const n of nodesOfType(tree, 'intent_trigger')) {
-            const stateNode = n.childForFieldName('state');
-            if (stateNode?.text === oldName) addEdit(stateNode);
-        }
-    } else if (langId === 'agent') {
+    } else if (langId === 'description') {
         // Rename type declarations
         for (const n of nodesOfType(tree, 'type_decl')) {
             const nameNode = n.childForFieldName('name');

package/features/symbols.js

@@ -49,7 +49,7 @@ function provideDocumentSymbols(langId, tree) {
         }
     }
 
-    if (langId === 'agent') {
+    if (langId === 'description') {
         for (const node of nodesOfType(tree, 'agent_decl')) {
             const nameNode = node.childForFieldName('name');
             if (!nameNode) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dot-agent/language-server",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "LSP server for .agent DSL files",
   "license": "Apache-2.0",
   "author": "Danilo Borges <contato@daniloborg.es>",
@@ -27,10 +27,10 @@
     "start": "node server.js --stdio"
   },
   "dependencies": {
-    "@dot-agent/tree-sitter": "^0.3.2",
-    "vscode-languageserver": "^9.0.1",
+    "@dot-agent/tree-sitter": "^0.3.4",
+    "vscode-languageserver": "^10.0.0",
     "vscode-languageserver-textdocument": "^1.0.12",
-    "web-tree-sitter": "^0.25.10"
+    "web-tree-sitter": "^0.26.9"
   },
   "publishConfig": {
     "access": "public"

package/parser.js

@@ -21,17 +21,17 @@ const { Parser, Language } = require('web-tree-sitter');
 const grammar = require('@dot-agent/tree-sitter');
 
 // path.resolve ensures absolute paths survive vsix packaging and cwd changes
-const AGENT_WASM = path.resolve(grammar.agentWasmPath);
+const DESCRIPTION_WASM = path.resolve(grammar.agentWasmPath);
 const BEHAVIOR_WASM  = path.resolve(grammar.behaviorWasmPath);
 
-let agentParser, behaviorParser;
+let descriptionParser, behaviorParser;
 
 async function initParsers() {
     await Parser.init();
-    const Agent = await Language.load(AGENT_WASM);
+    const DescriptionLang = await Language.load(DESCRIPTION_WASM);
     const Behavior  = await Language.load(BEHAVIOR_WASM);
-    agentParser = new Parser();
-    agentParser.setLanguage(Agent);
+    descriptionParser = new Parser();
+    descriptionParser.setLanguage(DescriptionLang);
     behaviorParser = new Parser();
     behaviorParser.setLanguage(Behavior);
 }
@@ -42,7 +42,7 @@ const cache = new Map();
 function parse(uri, langId, text, version) {
     const prev = cache.get(uri);
     if (prev?.version === version) return prev.tree;
-    const parser = langId === 'behavior' ? behaviorParser : agentParser;
+    const parser = langId === 'behavior' ? behaviorParser : descriptionParser;
     if (!parser) return null;
     const tree = parser.parse(text, prev?.tree);   // incremental reuse when possible
     cache.set(uri, { version, tree });

package/server.js

@@ -71,7 +71,7 @@ function getTree(doc) {
 
 function validate(doc) {
     const langId = doc.languageId;
-    if (langId !== 'agent' && langId !== 'behavior') return;
+    if (langId !== 'description' && langId !== 'behavior') return;
     const tree = getTree(doc);
     const diagnostics = diagnose(langId, tree, doc.getText());
     connection.sendDiagnostics({ uri: doc.uri, diagnostics });