@koi-language/koi 1.0.5 → 1.1.0

package/src/grammar/koi.pegjs

@@ -28,29 +28,20 @@ Program
     }
 
 Declaration
-  = PackageDecl
-  / ImportDecl
+  = ImportDecl
   / RoleDecl
   / TeamDecl
   / AgentDecl
   / SkillDecl
+  / MCPDecl
   / RunStatement
 
-// ============================================================
-// Package
-// ============================================================
-
-PackageDecl
-  = "package"i _ name:StringLiteral _ {
-      return { type: 'PackageDecl', name, location: location() };
-    }
-
 // ============================================================
 // Import (TypeScript/JavaScript style)
 // ============================================================
 
 ImportDecl
-  = "import"i _ name:StringLiteral _ {
+  = "import" _ name:StringLiteral _ {
       return { type: 'ImportDecl', what: 'module', name, location: location() };
     }
 
@@ -59,7 +50,7 @@ ImportDecl
 // ============================================================
 
 RoleDecl
-  = "role"i _ name:Identifier _ "{" _ caps:RoleCapabilities _ "}" _ {
+  = "role" _ name:Identifier _ "{" _ caps:RoleCapabilities _ "}" _ {
       return { type: 'RoleDecl', name, capabilities: caps, location: location() };
     }
 
@@ -69,7 +60,7 @@ RoleCapabilities
     }
 
 RoleCapability
-  = "can"i _ name:Identifier {
+  = "can" _ name:Identifier {
       return { type: 'Capability', name, location: location() };
     }
 
@@ -78,12 +69,12 @@ RoleCapability
 // ============================================================
 
 TeamDecl
-  = "Team"i _ name:Identifier _ override:TeamOverride? _ "{" _ members:TeamMembers _ "}" _ {
+  = "team" _ name:Identifier _ override:TeamOverride? _ "{" _ members:TeamMembers _ "}" _ {
       return { type: 'TeamDecl', name, override, members, location: location() };
     }
 
 TeamOverride
-  = "override"i _ "{" _ overrides:TeamMembers _ "}" {
+  = "override" _ "{" _ overrides:TeamMembers _ "}" {
       return overrides;
     }
 
@@ -93,16 +84,25 @@ TeamMembers
     }
 
 TeamMember
-  = name:Identifier _ "=" _ value:(MCPAddress / StringLiteral / Identifier) _ {
+  = name:Identifier _ (":" / "=") _ value:(MCPAddress / StringLiteral / Identifier) _ {
       return { name, value, location: location() };
     }
 
+// ============================================================
+// MCP (Model Context Protocol) server declaration
+// ============================================================
+
+MCPDecl
+  = "mcp" _ name:Identifier _ "=" _ config:ObjectLiteral _ {
+      return { type: 'MCPDecl', name, config, location: location() };
+    }
+
 // ============================================================
 // Agent
 // ============================================================
 
 AgentDecl
-  = "Agent"i _ name:Identifier _ ":" _ role:Identifier _ "{" _ body:AgentBody _ "}" _ {
+  = "agent" _ name:Identifier _ ":" _ role:Identifier _ "{" _ body:AgentBody _ "}" _ {
       return { type: 'AgentDecl', name, role, body, location: location() };
     }
 
@@ -115,23 +115,35 @@ AgentBody
 AgentBodyItem
   = UsesSkill
   / UsesTeam
+  / UsesMCP
   / LLMConfig
+  / AmnesiaDecl
   / EventHandler
   / StateDecl
   / PlaybookDecl
   / ResilienceDecl
   / ExportFunction
 
+AmnesiaDecl
+  = "amnesia" _ "=" _ value:BooleanLiteral _ {
+      return { type: 'AmnesiaDecl', value, location: location() };
+    }
+
 UsesSkill
-  = "uses"i _ "skill"i _ names:IdentifierList _ {
+  = "uses" _ "skill" _ names:IdentifierList _ {
       return names.map(name => ({ type: 'UsesSkill', skill: name, location: location() }));
     }
 
 UsesTeam
-  = "uses"i _ "team"i _ names:IdentifierList _ {
+  = "uses" _ "team" _ names:IdentifierList _ {
       return names.map(name => ({ type: 'UsesTeam', team: name, location: location() }));
     }
 
+UsesMCP
+  = "uses" _ "mcp" _ names:IdentifierList _ {
+      return names.map(name => ({ type: 'UsesMCP', mcp: name, location: location() }));
+    }
+
 // Comma-separated list of identifiers
 IdentifierList
   = first:Identifier rest:(_ "," _ Identifier)* {
@@ -139,19 +151,19 @@ IdentifierList
     }
 
 LLMConfig
-  = "llm"i _ "default"i _ "=" _ config:ObjectLiteral _ {
+  = "llm" _ "default" _ "=" _ config:ObjectLiteral _ {
       return { type: 'LLMConfig', config, location: location() };
     }
 
 EventHandler
-  = "on"i _ event:HandlerName _ "(" _ params:Parameters? _ ")" _ "{" _ body:Statement* _ "}" _ {
+  = "on" _ event:HandlerName _ "(" _ params:Parameters? _ ")" _ "{" _ body:Statement* _ "}" _ {
       return { type: 'EventHandler', event, params: params || [], body, location: location() };
     }
 
 HandlerName
   = name:$([a-zA-Z_][a-zA-Z0-9_]*) &{
-      const reserved = ['run', 'package', 'import', 'skill', 'role', 'can', 'Team', 'Agent', 'Skill',
-                        'uses', 'llm', 'default', 'on', 'state', 'playbook', 'resilience',
+      const reserved = ['run', 'import', 'skill', 'role', 'can', 'team', 'agent',
+                        'uses', 'llm', 'default', 'on', 'state', 'playbook', 'resilience', 'amnesia', 'mcp',
                         'export', 'async', 'function', 'var', 'const', 'let', 'if', 'else', 'for', 'of', 'in', 'while',
                         'return', 'await', 'send', 'timeout', 'use', 'override', 'affordance',
                         'true', 'false', 'null'];
@@ -165,7 +177,7 @@ HandlerName
     }
 
 StateDecl
-  = "state"i _ "{" _ fields:StateFields _ "}" _ {
+  = "state" _ "{" _ fields:StateFields _ "}" _ {
       return { type: 'StateDecl', fields, location: location() };
     }
 
@@ -193,12 +205,12 @@ StateField
     }
 
 PlaybookDecl
-  = "playbook"i _ name:StringLiteral _ content:StringLiteral _ {
+  = "playbook" _ name:StringLiteral _ content:StringLiteral _ {
       return { type: 'PlaybookDecl', name, content, location: location() };
     }
 
 ResilienceDecl
-  = "resilience"i _ name:StringLiteral _ "{" _ props:ResilienceProps _ "}" _ {
+  = "resilience" _ name:StringLiteral _ "{" _ props:ResilienceProps _ "}" _ {
       return { type: 'ResilienceDecl', name, properties: props, location: location() };
     }
 
@@ -217,12 +229,14 @@ ResilienceProp
 // ============================================================
 
 SkillDecl
-  = "Skill"i _ name:Identifier _ "{" _ body:SkillBody _ "}" _ {
-      // Extract affordance, functions, agents, teams from body
+  = "skill" _ name:Identifier _ "{" _ body:SkillBody _ "}" _ {
+      // Extract affordance, functions, agents, teams, constants, variables from body
       const affordance = body.find(item => item.type === 'AffordanceDecl');
       const functions = body.filter(item => item.type === 'ExportFunction');
       const agents = body.filter(item => item.type === 'AgentDecl');
       const teams = body.filter(item => item.type === 'TeamDecl');
+      const constants = body.filter(item => item.type === 'SkillConstDeclaration');
+      const variables = body.filter(item => item.type === 'SkillVariableDeclaration');
 
       return {
         type: 'SkillDecl',
@@ -231,6 +245,8 @@ SkillDecl
         functions,
         agents,
         teams,
+        constants,
+        variables,
         location: location()
       };
     }
@@ -244,15 +260,116 @@ SkillBodyItem
   = AffordanceDecl
   / AgentDecl
   / TeamDecl
+  / SkillConstDeclaration
+  / SkillVariableDeclaration
   / ExportFunction
+  / NonExportFunction
 
 AffordanceDecl
-  = "affordance"i _ content:StringLiteral _ {
+  = "affordance" _ content:StringLiteral _ {
       return { type: 'AffordanceDecl', content, location: location() };
     }
 
+SkillConstDeclaration
+  = "const"i _ pattern:DestructuringPattern _ typeAnnotation:(":" _ TypeAnnotation)? _ "=" _ value:Expression _ {
+      return {
+        type: 'SkillConstDeclaration',
+        pattern,
+        typeAnnotation: typeAnnotation ? typeAnnotation[2] : null,
+        value,
+        location: location()
+      };
+    }
+  / "const"i _ name:Identifier _ typeAnnotation:(":" _ TypeAnnotation)? _ "=" _ value:Expression _ {
+      return {
+        type: 'SkillConstDeclaration',
+        pattern: { type: 'Identifier', name: name.name },
+        typeAnnotation: typeAnnotation ? typeAnnotation[2] : null,
+        value,
+        location: location()
+      };
+    }
+
+SkillVariableDeclaration
+  = "let"i _ pattern:DestructuringPattern _ typeAnnotation:(":" _ TypeAnnotation)? _ init:("=" _ Expression)? _ {
+      return {
+        type: 'SkillVariableDeclaration',
+        pattern,
+        typeAnnotation: typeAnnotation ? typeAnnotation[2] : null,
+        init: init ? init[2] : null,
+        location: location()
+      };
+    }
+  / "let"i _ name:Identifier _ typeAnnotation:(":" _ TypeAnnotation)? _ init:("=" _ Expression)? _ {
+      return {
+        type: 'SkillVariableDeclaration',
+        pattern: { type: 'Identifier', name: name.name },
+        typeAnnotation: typeAnnotation ? typeAnnotation[2] : null,
+        init: init ? init[2] : null,
+        location: location()
+      };
+    }
+
+DestructuringPattern
+  = ObjectDestructuringPattern
+  / ArrayDestructuringPattern
+
+ObjectDestructuringPattern
+  = "{" _ props:DestructuringPropertyList _ "}" {
+      return { type: 'ObjectPattern', properties: props };
+    }
+
+DestructuringPropertyList
+  = head:DestructuringProperty tail:(_ "," _ DestructuringProperty)* {
+      return [head, ...tail.map(t => t[3])];
+    }
+
+DestructuringProperty
+  = key:Identifier _ ":" _ value:Identifier {
+      return { key: key.name, value: value.name };
+    }
+  / name:Identifier {
+      return { key: name.name, value: name.name };
+    }
+
+ArrayDestructuringPattern
+  = "[" _ elements:DestructuringElementList _ "]" {
+      return { type: 'ArrayPattern', elements };
+    }
+
+DestructuringElementList
+  = head:Identifier tail:(_ "," _ Identifier)* {
+      return [head.name, ...tail.map(t => t[3].name)];
+    }
+
+NonExportFunction
+  = isAsync:("async"i _)? "function"i _ name:Identifier _ "(" _ params:Parameters? _ ")" _ ":" _ returnType:TypeAnnotation _ "{" body:FunctionBody "}" _ {
+      return {
+        type: 'ExportFunction',
+        name,
+        isExport: false,
+        isAsync: !!isAsync,
+        params: params || [],
+        returnType,
+        body: { code: body },
+        location: location()
+      };
+    }
+  / isAsync:("async"i _)? "function"i _ name:Identifier _ "(" _ params:Parameters? _ ")" _ "{" body:FunctionBody "}" _ {
+      return {
+        type: 'ExportFunction',
+        name,
+        isExport: false,
+        isAsync: !!isAsync,
+        params: params || [],
+        returnType: null,
+        body: { code: body },
+        location: location()
+      };
+    }
+
 ExportFunction
-  = "export"i _ isAsync:("async"i _)? "function"i _ name:Identifier _ "(" _ params:Parameters? _ ")" _ ":" _ returnType:TypeAnnotation _ "{" body:FunctionBody "}" _ {
+  = "export" _ isAsync:("async"i _)? "function"i _ name:Identifier _ "(" _ params:Parameters? _ ")" _ ":" _ returnType:TypeAnnotation _ "{" body:FunctionBody "}" _ {
       return {
         type: 'ExportFunction',
         name,
@@ -283,16 +400,18 @@ Statement
   = PlaybookStatement
   / VariableDeclaration
   / ConstDeclaration
+  / TryStatement
   / IfStatement
   / ForStatement
   / WhileStatement
   / ReturnStatement
+  / ThrowStatement
   / SendStatement
   / UsePlaybookStatement
   / ExpressionStatement
 
 PlaybookStatement
-  = "playbook"i _ content:StringLiteral _ {
+  = "playbook" _ content:StringLiteral _ {
       return { type: 'PlaybookStatement', content, location: location() };
     }
 
@@ -312,7 +431,7 @@ ConstDeclaration
       return { type: 'ConstDeclaration', name, value, location: location() };
     }
   / "let"i _ name:Identifier _ "=" _ value:Expression _ {
-      return { type: 'ConstDeclaration', name, value, location: location() };
+      return { type: 'VariableDeclaration', name, init: value, varType: null, location: location() };
     }
 
 IfStatement
@@ -325,6 +444,23 @@ ElseClause
       return body;
     }
 
+TryStatement
+  = "try"i _ "{" _ body:Statement* _ "}" _ handler:CatchClause? _ finalizer:FinallyClause? _ &{
+      return !!(handler || finalizer);
+    } {
+      return { type: 'TryStatement', body, handler, finalizer, location: location() };
+    }
+
+CatchClause
+  = "catch"i _ "(" _ param:Identifier _ ")" _ "{" _ body:Statement* _ "}" {
+      return { type: 'CatchClause', param, body, location: location() };
+    }
+
+FinallyClause
+  = "finally"i _ "{" _ body:Statement* _ "}" {
+      return body;
+    }
+
 ForStatement
   = "for"i _ "(" _ decl:("const"i / "let"i / "var"i) _ id:Identifier _ "of"i _ expr:Expression _ ")" _ "{" _ body:Statement* _ "}" _ {
       return { type: 'ForOfStatement', declaration: decl, id, expression: expr, body, location: location() };
@@ -351,27 +487,32 @@ ReturnStatement
       return { type: 'ReturnStatement', value, location: location() };
     }
 
+ThrowStatement
+  = "throw"i _ value:Expression _ {
+      return { type: 'ThrowStatement', argument: value, location: location() };
+    }
+
 SendStatement
   = "await"i _ "send"i _ target:SendTarget _ args:CallArguments _ timeout:TimeoutClause? _ {
       return { type: 'SendStatement', target, arguments: args, timeout, location: location() };
     }
 
 SendTarget
-  = base:PostfixExpression filters:SendFilter* {
+  = base:PrimaryExpression filters:SendFilter* {
       return { base, filters, location: location() };
     }
 
 SendFilter
-  = "." "event"i "(" _ name:StringLiteral _ ")" {
+  = _ "." "event"i "(" _ name:StringLiteral _ ")" {
       return { type: 'EventFilter', event: name, location: location() };
     }
-  / "." "role"i "(" _ role:Identifier _ ")" {
+  / _ "." "role"i "(" _ role:Identifier _ ")" {
       return { type: 'RoleFilter', role, location: location() };
     }
-  / "." "any"i "(" _ ")" {
+  / _ "." "any"i "(" _ ")" {
       return { type: 'SelectionFilter', mode: 'any', location: location() };
     }
-  / "." "all"i "(" _ ")" {
+  / _ "." "all"i "(" _ ")" {
       return { type: 'SelectionFilter', mode: 'all', location: location() };
     }
 
@@ -384,7 +525,7 @@ TimeUnit
   = "ms"i / "s"i / "m"i / "h"i
 
 UsePlaybookStatement
-  = "use"i _ "playbook"i _ name:(Identifier / StringLiteral) _ {
+  = "use" _ "playbook" _ name:(Identifier / StringLiteral) _ {
       return { type: 'UsePlaybookStatement', name, location: location() };
     }
 
@@ -399,13 +540,23 @@ ExpressionStatement
 
 Expression
   = AssignmentExpression
+  / ConditionalExpression
+
+ConditionalExpression
+  = test:LogicalOrExpression _ "?" _ consequent:Expression _ ":" _ alternate:Expression {
+      return { type: 'ConditionalExpression', test, consequent, alternate, location: location() };
+    }
   / LogicalOrExpression
 
 AssignmentExpression
-  = left:Identifier _ op:("=" / "+=" / "-=" / "*=" / "/=" / "%=") _ right:Expression {
+  = left:AssignmentTarget _ op:("=" / "+=" / "-=" / "*=" / "/=" / "%=") _ right:Expression {
       return { type: 'AssignmentExpression', operator: op, left, right, location: location() };
     }
 
+AssignmentTarget
+  = ChainedExpression
+  / Identifier
+
 LogicalOrExpression
   = head:LogicalAndExpression tail:(_ ("||") _ LogicalAndExpression)* {
       return buildBinaryExpression(head, tail);
@@ -422,7 +573,7 @@ EqualityExpression
     }
 
 RelationalExpression
-  = head:AdditiveExpression tail:(_ ("<=" / ">=" / "<" / ">") _ AdditiveExpression)* {
+  = head:AdditiveExpression tail:(_ ("<=" / ">=" / "<" / ">" / "instanceof"i) _ AdditiveExpression)* {
       return buildBinaryExpression(head, tail);
     }
 
@@ -480,23 +631,32 @@ ChainedExpression
   = base:PrimaryExpression chain:ChainElement+ {
       return chain.reduce((obj, element) => {
         if (element.type === 'call') {
-          return { type: 'CallExpression', callee: obj, arguments: element.args, location: location() };
+          return { type: 'CallExpression', callee: obj, arguments: element.args, optional: element.optional, location: location() };
         } else if (element.type === 'member') {
-          return { type: 'MemberExpression', object: obj, property: element.property, computed: element.computed, location: location() };
+          return { type: 'MemberExpression', object: obj, property: element.property, computed: element.computed, optional: element.optional, location: location() };
         }
         return obj;
       }, base);
     }
 
 ChainElement
-  = "." _ prop:Identifier {
-      return { type: 'member', property: prop, computed: false };
+  = "?." _ prop:PropertyIdentifier {
+      return { type: 'member', property: prop, computed: false, optional: true };
+    }
+  / "." _ prop:PropertyIdentifier {
+      return { type: 'member', property: prop, computed: false, optional: false };
+    }
+  / "?.[" _ prop:Expression _ "]" {
+      return { type: 'member', property: prop, computed: true, optional: true };
     }
   / "[" _ prop:Expression _ "]" {
-      return { type: 'member', property: prop, computed: true };
+      return { type: 'member', property: prop, computed: false, optional: false };
+    }
+  / "?." _ args:CallArguments {
+      return { type: 'call', args, optional: true };
     }
   / args:CallArguments {
-      return { type: 'call', args };
+      return { type: 'call', args, optional: false };
     }
 
 CallArguments
@@ -546,11 +706,11 @@ AwaitExpression
     }
 
 ArrowFunction
-  = "(" _ params:ParameterList? _ ")" _ "=>" _ body:ArrowBody {
-      return { type: 'ArrowFunction', params: params || [], body, location: location() };
+  = isAsync:("async"i _)? "(" _ params:ParameterList? _ ")" _ "=>" _ body:ArrowBody {
+      return { type: 'ArrowFunction', params: params || [], body, isAsync: !!isAsync, location: location() };
     }
-  / param:Identifier _ "=>" _ body:ArrowBody {
-      return { type: 'ArrowFunction', params: [param], body, location: location() };
+  / isAsync:("async"i _)? param:Identifier _ "=>" _ body:ArrowBody {
+      return { type: 'ArrowFunction', params: [param], body, isAsync: !!isAsync, location: location() };
     }
 
 ParameterList
@@ -574,6 +734,7 @@ Literal
   = MCPAddress
   / TemplateLiteral
   / StringLiteral
+  / RegexLiteral
   / NumberLiteral
   / BooleanLiteral
   / NullLiteral
@@ -625,6 +786,21 @@ SingleStringChar
   = !("'" / "\\") char:. { return char; }
   / "\\" seq:EscapeSequence { return seq; }
 
+RegexLiteral
+  = "/" pattern:RegexPattern "/" flags:RegexFlags? {
+      return { type: 'RegexLiteral', pattern, flags: flags || '', location: location() };
+    }
+
+RegexPattern
+  = chars:RegexChar* { return chars.join(''); }
+
+RegexChar
+  = "\\" char:. { return "\\" + char; }  // Escaped character (including \/)
+  / ![/\n\r] char:. { return char; }      // Any character except / and newlines
+
+RegexFlags
+  = flags:$[gimsuvy]+ { return flags; }
+
 EscapeSequence
   = "n" { return "\n"; }
   / "t" { return "\t"; }
@@ -693,13 +869,66 @@ ArrayLiteral
 // ============================================================
 
 TypeAnnotation
-  = "Int"i { return { type: 'TypeAnnotation', name: 'Int', location: location() }; }
-  / "String"i { return { type: 'TypeAnnotation', name: 'String', location: location() }; }
-  / "Bool"i { return { type: 'TypeAnnotation', name: 'Bool', location: location() }; }
-  / "Json"i { return { type: 'TypeAnnotation', name: 'Json', location: location() }; }
-  / "Promise"i _ "<" _ inner:TypeAnnotation _ ">" {
+  = UnionType
+  / PostfixType
+
+UnionType
+  = head:PostfixType tail:(_ "|" _ PostfixType)+ {
+      return { type: 'UnionType', types: [head, ...tail.map(t => t[3])], location: location() };
+    }
+
+PostfixType
+  = base:PrimaryType suffixes:(_ "[" _ "]")+ {
+      // Apply array type for each []
+      return suffixes.reduce((type) => {
+        return { type: 'ArrayTypeAnnotation', elementType: type, location: location() };
+      }, base);
+    }
+  / PrimaryType
+
+PrimaryType
+  = PromiseType
+  / ArrayTypeAnnotation
+  / ObjectTypeAnnotation
+  / PrimitiveType
+
+ObjectTypeAnnotation
+  = "{" _ props:TypePropertyList _ "}" {
+      return { type: 'ObjectTypeAnnotation', properties: props, location: location() };
+    }
+
+TypePropertyList
+  = head:TypeProperty tail:(_ "," _ TypeProperty)* _ ","? {
+      return [head, ...tail.map(t => t[3])];
+    }
+
+TypeProperty
+  = name:PropertyIdentifier _ optional:"?"? _ ":" _ type:TypeAnnotation {
+      return { name: name.name, type, optional: !!optional };
+    }
+
+ArrayTypeAnnotation
+  = "Array"i _ "<" _ elem:TypeAnnotation _ ">" {
+      return { type: 'ArrayTypeAnnotation', elementType: elem, location: location() };
+    }
+
+PromiseType
+  = "Promise"i _ "<" _ inner:TypeAnnotation _ ">" {
       return { type: 'TypeAnnotation', name: 'Promise', inner, location: location() };
     }
+
+PrimitiveType
+  = "boolean"i !IdentifierPart { return { type: 'BooleanType', location: location() }; }
+  / "number"i !IdentifierPart { return { type: 'NumberType', location: location() }; }
+  / "string"i !IdentifierPart { return { type: 'StringType', location: location() }; }
+  / "void"i !IdentifierPart { return { type: 'VoidType', location: location() }; }
+  / "any"i !IdentifierPart { return { type: 'AnyType', location: location() }; }
+  / "null"i !IdentifierPart { return { type: 'NullType', location: location() }; }
+  / "undefined"i !IdentifierPart { return { type: 'UndefinedType', location: location() }; }
+  / "Int"i !IdentifierPart { return { type: 'TypeAnnotation', name: 'Int', location: location() }; }
+  / "String"i !IdentifierPart { return { type: 'TypeAnnotation', name: 'String', location: location() }; }
+  / "Bool"i !IdentifierPart { return { type: 'TypeAnnotation', name: 'Bool', location: location() }; }
+  / "Json"i !IdentifierPart { return { type: 'TypeAnnotation', name: 'Json', location: location() }; }
   / name:Identifier {
       return { type: 'TypeAnnotation', name: name.name, location: location() };
     }
@@ -714,8 +943,11 @@ Parameters
     }
 
 Parameter
-  = name:Identifier _ ":" _ type:TypeAnnotation {
-      return { name, type, location: location() };
+  = name:Identifier _ ":" _ type:TypeAnnotation _ defaultValue:("=" _ Expression)? {
+      return { name, type, default: defaultValue ? defaultValue[2] : null, location: location() };
+    }
+  / name:Identifier {
+      return { name, type: null, default: null, location: location() };
     }
 
 // ============================================================
@@ -723,7 +955,7 @@ Parameter
 // ============================================================
 
 RunStatement
-  = "run"i _ target:MemberExpression args:CallArguments _ {
+  = "run" _ target:MemberExpression args:CallArguments _ {
       return { type: 'RunStatement', target, arguments: args, location: location() };
     }
 
@@ -736,12 +968,20 @@ Identifier
       return { type: 'Identifier', name, location: location() };
     }
 
+// PropertyIdentifier: allows reserved words as property names (after .)
+// Examples: obj.state, obj.default, this.state
+PropertyIdentifier
+  = name:$([a-zA-Z_][a-zA-Z0-9_]*) {
+      return { type: 'Identifier', name, location: location() };
+    }
+
 ReservedWord
-  = ("package" / "import" / "skill" / "role" / "can" / "Team" / "Agent" / "Skill" /
-     "uses" / "llm" / "default" / "on" / "state" / "playbook" / "resilience" /
+  = ("import" / "skill" / "role" / "can" / "team" / "agent" / "skill" /
+     "uses" / "llm" / "default" / "on" / "state" / "playbook" / "resilience" / "mcp" /
      "export" / "async" / "function" / "var" / "const" / "let" / "if" / "else" / "for" / "of" / "in" / "while" /
+     "try" / "catch" / "finally" / "throw" / "instanceof" /
      "return" / "await" / "send" / "timeout" / "use" / "run" /
-     "override" / "affordance" / "true" / "false" / "null") !IdentifierPart
+     "override" / "affordance" / "amnesia" / "true" / "false" / "null") !IdentifierPart
 
 IdentifierPart
   = [a-zA-Z0-9_]