deepclause-sdk 0.0.11 → 0.0.13

package/dist/prolog-src/deepclause_mi.pl

@@ -241,6 +241,7 @@ process_clause((:- Directive), SessionId) :-
 %% Handle tool/2 with description: tool(Head, Description) :- Body
 process_clause((tool(ToolHead, Description) :- Body), SessionId) :-
     !,
+    (catch(expand_dict_dots(Body, ExpandedBody), _, fail) -> true ; ExpandedBody = Body),
     extract_tool_schema(ToolHead, Description, ToolName, Schema),
     assertz(session_user_tools(SessionId, ToolName)),
     assertz(session_user_tool_schema(SessionId, ToolName, Schema)),
@@ -248,11 +249,12 @@ process_clause((tool(ToolHead, Description) :- Body), SessionId) :-
     format(string(SourceCode), "tool(~w, ~q) :-~n    ~w.", [ToolHead, Description, Body]),
     assertz(SessionId:tool_source(ToolName, SourceCode)),
     % Assert the tool implementation (use just ToolHead for execution)
-    assertz(SessionId:(tool(ToolHead) :- Body)).
+    assertz(SessionId:(tool(ToolHead) :- ExpandedBody)).
 
 %% Handle tool/1 without description: tool(Head) :- Body
 process_clause((tool(ToolHead) :- Body), SessionId) :-
     !,
+    (catch(expand_dict_dots(Body, ExpandedBody), _, fail) -> true ; ExpandedBody = Body),
     extract_tool_schema(ToolHead, none, ToolName, Schema),
     assertz(session_user_tools(SessionId, ToolName)),
     assertz(session_user_tool_schema(SessionId, ToolName, Schema)),
@@ -260,17 +262,86 @@ process_clause((tool(ToolHead) :- Body), SessionId) :-
     format(string(SourceCode), "tool(~w) :-~n    ~w.", [ToolHead, Body]),
     assertz(SessionId:tool_source(ToolName, SourceCode)),
     % Assert the tool implementation
-    assertz(SessionId:(tool(ToolHead) :- Body)).
+    assertz(SessionId:(tool(ToolHead) :- ExpandedBody)).
 
 process_clause((Head :- Body), SessionId) :-
     !,
-    % Regular clause - assert it
-    assertz(SessionId:(Head :- Body)).
+    % Expand dict dot-notation (Dict.Key → get_dict), then assert
+    (   catch(expand_dict_dots(Body, ExpandedBody), _, fail)
+    ->  true
+    ;   ExpandedBody = Body
+    ),
+    assertz(SessionId:(Head :- ExpandedBody)).
 
 process_clause(Fact, SessionId) :-
     % Simple fact
     assertz(SessionId:Fact).
 
+%% ============================================================
+%% Dict Dot-Notation Expansion (compile-time)
+%% ============================================================
+%% SWI-Prolog's dict functional notation (Dict.Key) is normally
+%% expanded by goal_expansion during compilation. Since DML clauses
+%% are loaded via assertz (no goal expansion), we must expand
+%% Dict.Key → get_dict(Key, Dict, Value) manually before asserting.
+%%
+%% Handles:
+%%   Dict.Key = Value   →  get_dict(Key, Dict, Value)
+%%   Value = Dict.Key   →  get_dict(Key, Dict, Value)
+%%   Dict.Key == Value  →  get_dict(Key, Dict, Tmp), Tmp == Value
+%%   Value == Dict.Key  →  get_dict(Key, Dict, Tmp), Tmp == Value
+
+%% expand_dict_dots(+GoalIn, -GoalOut)
+%% Top-level expansion for goal bodies
+expand_dict_dots(Var, Var) :- var(Var), !.
+expand_dict_dots((A, B), (EA, EB)) :- !, expand_dict_dots(A, EA), expand_dict_dots(B, EB).
+expand_dict_dots((A ; B), (EA ; EB)) :- !, expand_dict_dots(A, EA), expand_dict_dots(B, EB).
+expand_dict_dots((A -> B), (EA -> EB)) :- !, expand_dict_dots(A, EA), expand_dict_dots(B, EB).
+
+%% Unification with dict dot access: Dict.Key = Value
+expand_dict_dots(Goal, Result) :-
+    nonvar(Goal),
+    functor(Goal, =, 2),
+    !,
+    arg(1, Goal, A),
+    arg(2, Goal, B),
+    (   nonvar(A), is_dot_access(A, Dict, Key)
+    ->  Result = get_dict(Key, Dict, B)
+    ;   nonvar(B), is_dot_access(B, Dict, Key)
+    ->  Result = get_dict(Key, Dict, A)
+    ;   Result = Goal
+    ).
+
+%% Equality check with dict dot access: Dict.Key == Value
+expand_dict_dots(Goal, Result) :-
+    nonvar(Goal),
+    functor(Goal, ==, 2),
+    !,
+    arg(1, Goal, A),
+    arg(2, Goal, B),
+    (   nonvar(A), is_dot_access(A, Dict, Key)
+    ->  Result = (get_dict(Key, Dict, Tmp), Tmp == B)
+    ;   nonvar(B), is_dot_access(B, Dict, Key)
+    ->  Result = (get_dict(Key, Dict, Tmp), Tmp == A)
+    ;   Result = Goal
+    ).
+
+expand_dict_dots(Goal, Goal).
+
+%% is_dot_access(+Term, -Dict, -Key)
+%% Check if Term is a dict dot-access expression: '.'(Dict, Key) where Key is atom
+is_dot_access(Term, Dict, Key) :-
+    compound(Term),
+    compound_name_arity(Term, '.', 2),
+    arg(1, Term, Dict),
+    arg(2, Term, Key),
+    atom(Key).
+
+%% expand_dict_expr(+ExprIn, -ExprOut)
+%% Expand dict access in value-level expressions (just pass through for now)
+expand_dict_expr(Var, Var) :- var(Var), !.
+expand_dict_expr(Expr, Expr).
+
 %% ============================================================
 %% Tool Schema Extraction
 %% ============================================================
@@ -560,6 +631,12 @@ set_context_stack(StateIn, Stack, StateOut) :-
 set_memory(StateIn, Memory, StateOut) :-
     StateOut = StateIn.put(memory, Memory).
 
+%% is_system_memory_message(+Message)
+%% True if the memory message has role=system
+is_system_memory_message(Message) :-
+    is_dict(Message),
+    get_dict(role, Message, system).
+
 %% ============================================================
 %% Tool Scope Helpers
 %% ============================================================
@@ -928,8 +1005,11 @@ mi_call(task(Desc), StateIn, StateOut) :-
     ),
     % Use full messages from agent loop result
     (   get_dict(messages, Result, Messages), Messages \= []
-    ->  % Replace memory with all messages from agent (includes system, history, and new messages)
-        set_memory(StateAfterAgent, Messages, StateOut)
+    ->  % Preserve system messages from current memory (agent only returns user/assistant)
+        get_memory(StateAfterAgent, OldMemory),
+        include(is_system_memory_message, OldMemory, SystemMessages),
+        append(SystemMessages, Messages, NewMemory),
+        set_memory(StateAfterAgent, NewMemory, StateOut)
     ;   % Fallback: just add task description and response (old behavior)
         add_memory(StateAfterAgent, user, InterpDesc, State1),
         (   get_dict(response, Result, Response), Response \= ""
@@ -1040,8 +1120,11 @@ mi_call_task_n(Desc, Vars, VarNames, StateIn, StateOut) :-
     bind_task_variables(Result.variables, VarNames, Vars),
     % Use full messages from agent loop result
     (   get_dict(messages, Result, Messages), Messages \= []
-    ->  % Replace memory with all messages from agent
-        set_memory(StateAfterAgent, Messages, StateOut)
+    ->  % Preserve system messages from current memory (agent only returns user/assistant)
+        get_memory(StateAfterAgent, OldMemory),
+        include(is_system_memory_message, OldMemory, SystemMessages),
+        append(SystemMessages, Messages, NewMemory),
+        set_memory(StateAfterAgent, NewMemory, StateOut)
     ;   % Fallback: just add task description and response (old behavior)
         add_memory(StateAfterAgent, user, InterpDesc, State1),
         (   get_dict(response, Result, Response), Response \= ""
@@ -1585,9 +1668,10 @@ consult_process_term((tool(ToolHead) :- Body), SessionId) :-
     assertz(SessionId:(tool(ToolHead) :- Body)).
 
 consult_process_term((Head :- Body), SessionId) :-
-    % Assert a clause
+    % Expand dict dot-notation, then assert
     !,
-    assertz(SessionId:(Head :- Body)).
+    (catch(expand_dict_dots(Body, ExpandedBody), _, fail) -> true ; ExpandedBody = Body),
+    assertz(SessionId:(Head :- ExpandedBody)).
 
 consult_process_term(Head, SessionId) :-
     % Assert a fact

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepclause-sdk",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "DeepClause CLI Tool and Typescript SDK",
   "type": "module",
   "main": "dist/index.js",

package/src/prolog-src/deepclause_mi.pl

@@ -241,6 +241,7 @@ process_clause((:- Directive), SessionId) :-
 %% Handle tool/2 with description: tool(Head, Description) :- Body
 process_clause((tool(ToolHead, Description) :- Body), SessionId) :-
     !,
+    (catch(expand_dict_dots(Body, ExpandedBody), _, fail) -> true ; ExpandedBody = Body),
     extract_tool_schema(ToolHead, Description, ToolName, Schema),
     assertz(session_user_tools(SessionId, ToolName)),
     assertz(session_user_tool_schema(SessionId, ToolName, Schema)),
@@ -248,11 +249,12 @@ process_clause((tool(ToolHead, Description) :- Body), SessionId) :-
     format(string(SourceCode), "tool(~w, ~q) :-~n    ~w.", [ToolHead, Description, Body]),
     assertz(SessionId:tool_source(ToolName, SourceCode)),
     % Assert the tool implementation (use just ToolHead for execution)
-    assertz(SessionId:(tool(ToolHead) :- Body)).
+    assertz(SessionId:(tool(ToolHead) :- ExpandedBody)).
 
 %% Handle tool/1 without description: tool(Head) :- Body
 process_clause((tool(ToolHead) :- Body), SessionId) :-
     !,
+    (catch(expand_dict_dots(Body, ExpandedBody), _, fail) -> true ; ExpandedBody = Body),
     extract_tool_schema(ToolHead, none, ToolName, Schema),
     assertz(session_user_tools(SessionId, ToolName)),
     assertz(session_user_tool_schema(SessionId, ToolName, Schema)),
@@ -260,17 +262,86 @@ process_clause((tool(ToolHead) :- Body), SessionId) :-
     format(string(SourceCode), "tool(~w) :-~n    ~w.", [ToolHead, Body]),
     assertz(SessionId:tool_source(ToolName, SourceCode)),
     % Assert the tool implementation
-    assertz(SessionId:(tool(ToolHead) :- Body)).
+    assertz(SessionId:(tool(ToolHead) :- ExpandedBody)).
 
 process_clause((Head :- Body), SessionId) :-
     !,
-    % Regular clause - assert it
-    assertz(SessionId:(Head :- Body)).
+    % Expand dict dot-notation (Dict.Key → get_dict), then assert
+    (   catch(expand_dict_dots(Body, ExpandedBody), _, fail)
+    ->  true
+    ;   ExpandedBody = Body
+    ),
+    assertz(SessionId:(Head :- ExpandedBody)).
 
 process_clause(Fact, SessionId) :-
     % Simple fact
     assertz(SessionId:Fact).
 
+%% ============================================================
+%% Dict Dot-Notation Expansion (compile-time)
+%% ============================================================
+%% SWI-Prolog's dict functional notation (Dict.Key) is normally
+%% expanded by goal_expansion during compilation. Since DML clauses
+%% are loaded via assertz (no goal expansion), we must expand
+%% Dict.Key → get_dict(Key, Dict, Value) manually before asserting.
+%%
+%% Handles:
+%%   Dict.Key = Value   →  get_dict(Key, Dict, Value)
+%%   Value = Dict.Key   →  get_dict(Key, Dict, Value)
+%%   Dict.Key == Value  →  get_dict(Key, Dict, Tmp), Tmp == Value
+%%   Value == Dict.Key  →  get_dict(Key, Dict, Tmp), Tmp == Value
+
+%% expand_dict_dots(+GoalIn, -GoalOut)
+%% Top-level expansion for goal bodies
+expand_dict_dots(Var, Var) :- var(Var), !.
+expand_dict_dots((A, B), (EA, EB)) :- !, expand_dict_dots(A, EA), expand_dict_dots(B, EB).
+expand_dict_dots((A ; B), (EA ; EB)) :- !, expand_dict_dots(A, EA), expand_dict_dots(B, EB).
+expand_dict_dots((A -> B), (EA -> EB)) :- !, expand_dict_dots(A, EA), expand_dict_dots(B, EB).
+
+%% Unification with dict dot access: Dict.Key = Value
+expand_dict_dots(Goal, Result) :-
+    nonvar(Goal),
+    functor(Goal, =, 2),
+    !,
+    arg(1, Goal, A),
+    arg(2, Goal, B),
+    (   nonvar(A), is_dot_access(A, Dict, Key)
+    ->  Result = get_dict(Key, Dict, B)
+    ;   nonvar(B), is_dot_access(B, Dict, Key)
+    ->  Result = get_dict(Key, Dict, A)
+    ;   Result = Goal
+    ).
+
+%% Equality check with dict dot access: Dict.Key == Value
+expand_dict_dots(Goal, Result) :-
+    nonvar(Goal),
+    functor(Goal, ==, 2),
+    !,
+    arg(1, Goal, A),
+    arg(2, Goal, B),
+    (   nonvar(A), is_dot_access(A, Dict, Key)
+    ->  Result = (get_dict(Key, Dict, Tmp), Tmp == B)
+    ;   nonvar(B), is_dot_access(B, Dict, Key)
+    ->  Result = (get_dict(Key, Dict, Tmp), Tmp == A)
+    ;   Result = Goal
+    ).
+
+expand_dict_dots(Goal, Goal).
+
+%% is_dot_access(+Term, -Dict, -Key)
+%% Check if Term is a dict dot-access expression: '.'(Dict, Key) where Key is atom
+is_dot_access(Term, Dict, Key) :-
+    compound(Term),
+    compound_name_arity(Term, '.', 2),
+    arg(1, Term, Dict),
+    arg(2, Term, Key),
+    atom(Key).
+
+%% expand_dict_expr(+ExprIn, -ExprOut)
+%% Expand dict access in value-level expressions (just pass through for now)
+expand_dict_expr(Var, Var) :- var(Var), !.
+expand_dict_expr(Expr, Expr).
+
 %% ============================================================
 %% Tool Schema Extraction
 %% ============================================================
@@ -560,6 +631,12 @@ set_context_stack(StateIn, Stack, StateOut) :-
 set_memory(StateIn, Memory, StateOut) :-
     StateOut = StateIn.put(memory, Memory).
 
+%% is_system_memory_message(+Message)
+%% True if the memory message has role=system
+is_system_memory_message(Message) :-
+    is_dict(Message),
+    get_dict(role, Message, system).
+
 %% ============================================================
 %% Tool Scope Helpers
 %% ============================================================
@@ -928,8 +1005,11 @@ mi_call(task(Desc), StateIn, StateOut) :-
     ),
     % Use full messages from agent loop result
     (   get_dict(messages, Result, Messages), Messages \= []
-    ->  % Replace memory with all messages from agent (includes system, history, and new messages)
-        set_memory(StateAfterAgent, Messages, StateOut)
+    ->  % Preserve system messages from current memory (agent only returns user/assistant)
+        get_memory(StateAfterAgent, OldMemory),
+        include(is_system_memory_message, OldMemory, SystemMessages),
+        append(SystemMessages, Messages, NewMemory),
+        set_memory(StateAfterAgent, NewMemory, StateOut)
     ;   % Fallback: just add task description and response (old behavior)
         add_memory(StateAfterAgent, user, InterpDesc, State1),
         (   get_dict(response, Result, Response), Response \= ""
@@ -1040,8 +1120,11 @@ mi_call_task_n(Desc, Vars, VarNames, StateIn, StateOut) :-
     bind_task_variables(Result.variables, VarNames, Vars),
     % Use full messages from agent loop result
     (   get_dict(messages, Result, Messages), Messages \= []
-    ->  % Replace memory with all messages from agent
-        set_memory(StateAfterAgent, Messages, StateOut)
+    ->  % Preserve system messages from current memory (agent only returns user/assistant)
+        get_memory(StateAfterAgent, OldMemory),
+        include(is_system_memory_message, OldMemory, SystemMessages),
+        append(SystemMessages, Messages, NewMemory),
+        set_memory(StateAfterAgent, NewMemory, StateOut)
     ;   % Fallback: just add task description and response (old behavior)
         add_memory(StateAfterAgent, user, InterpDesc, State1),
         (   get_dict(response, Result, Response), Response \= ""
@@ -1585,9 +1668,10 @@ consult_process_term((tool(ToolHead) :- Body), SessionId) :-
     assertz(SessionId:(tool(ToolHead) :- Body)).
 
 consult_process_term((Head :- Body), SessionId) :-
-    % Assert a clause
+    % Expand dict dot-notation, then assert
     !,
-    assertz(SessionId:(Head :- Body)).
+    (catch(expand_dict_dots(Body, ExpandedBody), _, fail) -> true ; ExpandedBody = Body),
+    assertz(SessionId:(Head :- ExpandedBody)).
 
 consult_process_term(Head, SessionId) :-
     % Assert a fact