deepclause-sdk 0.0.72 → 0.0.74

package/dist/prolog-src/deepclause_mi.pl

@@ -17,12 +17,13 @@
 
 :- module(deepclause_mi, [
     parse_dml/5,
-    create_engine/5,
+    create_engine/6,
     step_engine/4,
     destroy_engine/1,
     post_agent_result/4,
     post_exec_result/3,
     post_sample_token_result/3,
+    post_llm_result/3,
     provide_input/2,
     mi/3,
     % Tool engine predicates for isolated tool execution
@@ -48,6 +49,7 @@
 :- dynamic session_agent_result/2. % session_agent_result(SessionId, Result)
 :- dynamic session_exec_result/2.  % session_exec_result(SessionId, Result)
 :- dynamic session_sample_token_result/2. % session_sample_token_result(SessionId, Result)
+:- dynamic session_llm_result/2. % session_llm_result(SessionId, Result)
 :- dynamic session_trace_log/2.    % session_trace_log(SessionId, TraceLog) - accumulated trace entries
 :- dynamic session_trace_enabled/2. % session_trace_enabled(SessionId, true/false)
 :- dynamic session_pending_signal/2. % session_pending_signal(SessionId, Signal) - fallback for engine_fetch
@@ -462,10 +464,10 @@ process_directive(_, _).
 %% Engine Management
 %% ============================================================
 
-%% create_engine(+SessionId, +MemoryId, +Args, +Params, -Engine)
+%% create_engine(+SessionId, +MemoryId, +Args, +Params, +InitialMemory, -Engine)
 %% Args is a list of positional arguments for agent_main
 %% Params is a dict of named parameters (already asserted as param/2 facts)
-create_engine(SessionId, _MemoryId, Args, Params, Engine) :-
+create_engine(SessionId, _MemoryId, Args, Params, InitialMemory, Engine) :-
     assertz(session_params(SessionId, Params)),
     determine_agent_goal(SessionId, Args, Goal),
     % Check if tracing is enabled and store in session state
@@ -474,8 +476,8 @@ create_engine(SessionId, _MemoryId, Args, Params, Engine) :-
     assertz(session_trace_log(SessionId, [])),
     % Check for gas limit in params
     (get_dict(gas_limit, Params, GasLimit) -> true ; GasLimit = -1),
-    % Create initial state with empty memory, params, context stack, trace depth and gas
-    InitialState = state{memory: [], params: Params, context_stack: [], depth: 0, gas_remaining: GasLimit},
+    % Create initial state with provided memory, params, context stack, trace depth and gas
+    InitialState = state{memory: InitialMemory, params: Params, context_stack: [], depth: 0, gas_remaining: GasLimit},
     % Create the engine - pass SessionId and initial state to mi/3
     engine_create(_, 
         deepclause_mi:mi(Goal, InitialState, SessionId),
@@ -565,6 +567,8 @@ process_engine_result(request_exec(Tool, Args), request_exec, '',
     payload{toolName: Tool, args: Args}) :- !.
 process_engine_result(request_sample_token(Prompt, Allowed), request_sample_token, '',
     payload{prompt: Prompt, allowedTokens: Allowed}) :- !.
+process_engine_result(request_llm(Messages), request_llm, '',
+    payload{messages: Messages}) :- !.
 %% Tool result from inline tool execution
 process_engine_result(tool_result(Result), tool_result, '',
     payload{result: Result}) :- !.
@@ -587,6 +591,7 @@ destroy_engine(SessionId) :-
     retractall(session_agent_result(SessionId, _)),
     retractall(session_exec_result(SessionId, _)),
     retractall(session_sample_token_result(SessionId, _)),
+    retractall(session_llm_result(SessionId, _)),
     retractall(session_trace_log(SessionId, _)),
     retractall(session_trace_enabled(SessionId, _)),
     (   current_module(SessionId)
@@ -633,6 +638,12 @@ post_sample_token_result(SessionId, Status, TokenOrError) :-
     assertz(session_sample_token_result(SessionId, result{status: Status, token: TokenOrError})),
     post_signal_to_engine(SessionId, sample_token_done).
 
+%% post_llm_result(+SessionId, +Status, +TextOrError)
+post_llm_result(SessionId, Status, TextOrError) :-
+    retractall(session_llm_result(SessionId, _)),
+    assertz(session_llm_result(SessionId, result{status: Status, text: TextOrError})),
+    post_signal_to_engine(SessionId, llm_done).
+
 %% provide_input(+SessionId, +Input)
 provide_input(SessionId, Input) :-
     assertz(session_pending_input(SessionId, Input)),
@@ -821,6 +832,11 @@ handle_signal(SessionId, exec_done, StateIn, StateOut) :-
     !,
     handle_agent_signals(SessionId, StateIn, StateOut).
 
+handle_signal(SessionId, llm_done, StateIn, StateOut) :-
+    % Stale signal - ignore and continue waiting
+    !,
+    handle_agent_signals(SessionId, StateIn, StateOut).
+
 handle_signal(SessionId, _Unknown, StateIn, StateOut) :-
     % Unknown signal - ignore and continue waiting
     !,
@@ -963,6 +979,8 @@ process_tool_engine_result(request_exec(Tool, Args), request_exec, '',
     payload{toolName: Tool, args: Args}) :- !.
 process_tool_engine_result(request_sample_token(Prompt, Allowed), request_sample_token, '',
     payload{prompt: Prompt, allowedTokens: Allowed}) :- !.
+process_tool_engine_result(request_llm(Messages), request_llm, '',
+    payload{messages: Messages}) :- !.
 process_tool_engine_result(request_agent_loop(Desc, Vars, Tools, Memory, ToolScope), request_agent_loop, '',
     payload{taskDescription: Desc, outputVars: Vars, userTools: Tools, memory: Memory, toolScope: ToolScope}) :- !.
 %% Legacy 4-arg format (no tool scope)
@@ -1229,6 +1247,45 @@ wait_sample_token_signal(SessionId) :-
     ;   wait_sample_token_signal(SessionId)
     ).
 
+mi_call(llm(Messages, Reply), StateIn, StateOut) :-
+    !,
+    consume_gas(StateIn, State1),
+    mi_call_llm(Messages, Reply, State1, StateOut).
+
+mi_call_llm(Messages, Reply, StateIn, StateOut) :-
+    get_session_id(SessionId),
+    get_depth(StateIn, Depth),
+    add_trace_entry(SessionId, llm_call, llm, [Messages], Depth),
+    engine_yield(request_llm(Messages)),
+    wait_llm_signal(SessionId),
+    (   session_llm_result(SessionId, Result)
+    ->  retract(session_llm_result(SessionId, _)),
+        (   Result.status == success
+        ->  Reply = Result.text,
+            add_trace_with_result(SessionId, exit, llm, [Messages], Reply, Depth),
+            StateOut = StateIn
+        ;   (   get_dict(text, Result, ErrorMsg), ErrorMsg \= ""
+            ->  format(atom(WarnMsg), 'Warning: llm/2 failed: ~w', [ErrorMsg])
+            ;   format(atom(WarnMsg), 'Warning: llm/2 failed (status=~w)', [Result.status])
+            ),
+            add_trace_entry(SessionId, fail, llm, [Messages], Depth),
+            engine_yield(output(WarnMsg)),
+            fail
+        )
+    ;   add_trace_entry(SessionId, fail, llm, [Messages], Depth),
+        engine_yield(output('Warning: llm/2 failed (no result returned)')),
+        fail
+    ).
+
+wait_llm_signal(SessionId) :-
+    get_next_signal(SessionId, Signal),
+    (   Signal == llm_done
+    ->  true
+    ;   Signal = error_signal(_)
+    ->  true
+    ;   wait_llm_signal(SessionId)
+    ).
+
 %% mi_call_task_n(+Desc, +Vars, +VarNames, +StateIn, -StateOut)
 mi_call_task_n(Desc, Vars, VarNames, StateIn, StateOut) :-
     !,  % Cut to make this predicate deterministic - no backtracking once started
@@ -1364,6 +1421,11 @@ mi_call(user(Text), StateIn, StateOut) :-
     interpolate_desc(Text, Params, InterpText),
     add_memory(StateIn, user, InterpText, StateOut).
 
+%% mi_call(get_memory(Messages), +StateIn, -StateOut)
+mi_call(get_memory(Messages), StateIn, StateIn) :-
+    !,
+    get_memory(StateIn, Messages).
+
 %% ============================================================
 %% Output Predicates
 %% ============================================================
@@ -2027,10 +2089,12 @@ is_mi_special_predicate(prompt(_,_)).
 is_mi_special_predicate(prompt(_,_,_)).
 is_mi_special_predicate(prompt(_,_,_,_)).
 is_mi_special_predicate(prompt_named(_,_,_)). %% Transformed form of prompt/N
+is_mi_special_predicate(llm(_,_)).
 %% Tool scoping predicates
 is_mi_special_predicate(with_tools(_,_)).
 is_mi_special_predicate(without_tools(_,_)).
 %% Context stack management
+is_mi_special_predicate(get_memory(_)).
 is_mi_special_predicate(push_context).
 is_mi_special_predicate(push_context(_)).
 is_mi_special_predicate(pop_context).

package/dist/runner.d.ts

@@ -25,10 +25,7 @@ export interface InternalRunOptions {
     toolPolicy: ToolPolicy | null;
     onInputRequired: (prompt: string) => Promise<string>;
     signal?: AbortSignal;
-    initialMessages?: Array<{
-        role: 'user' | 'assistant';
-        content: string;
-    }>;
+    initialMessages?: MemoryMessage[];
     compaction?: CompactionOptions;
 }
 /**
@@ -45,7 +42,6 @@ export declare class DMLRunner {
     private engine;
     private sessionId;
     private currentMemory;
-    private initialMessagesApplied;
     constructor(swipl: SWIPLModule, options: RunnerOptions);
     /**
      * Get the current conversation memory
@@ -92,6 +88,10 @@ export declare class DMLRunner {
      * Handle one-token sampling request (sample_token/2-3)
      */
     private handleSampleToken;
+    /**
+     * Handle direct one-shot LLM request (llm/2)
+     */
+    private handleLlm;
     /**
      * Handle exec request (exec() predicate)
      */
@@ -132,6 +132,7 @@ export declare class DMLRunner {
     /**
      * Extract memory from payload (now passed via state threading)
      */
+    private extractMessagesFromValue;
     private extractMemoryFromPayload;
     private serializeMemoryMessages;
     /**
@@ -146,6 +147,10 @@ export declare class DMLRunner {
      * Post one-token sampling result back to Prolog
      */
     private postSampleTokenResult;
+    /**
+     * Post direct llm/2 result back to Prolog
+     */
+    private postLlmResult;
     /**
      * Post tool engine agent loop result back to Prolog
      */

package/dist/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EACV,iBAAiB,EACjB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,UAAU,EACV,QAAQ,EACT,MAAM,YAAY,CAAC;AAuHpB,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,OAAO,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC,EAAE,CAmBnF;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACtD,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;IAClC,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AA2CD;;;;;;;GAOG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,aAAa,CAAuB;gBAEhC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa;IAKtD;;OAEG;IACH,SAAS,IAAI,aAAa,EAAE;IAI5B;;OAEG;IACI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,cAAc,CAAC,QAAQ,CAAC;IAmJ/E;;OAEG;IACH,OAAO,CAAC,SAAS;IAsBjB;;OAEG;IACH,OAAO,CAAC,SAAS;IAMjB;;OAEG;IACH,OAAO,CAAC,WAAW;IAmBnB;;;OAGG;IACH,OAAO,CAAC,SAAS;IAQjB;;OAEG;IACH,OAAO,CAAC,YAAY;IA2BpB;;OAEG;IACH,OAAO,CAAC,YAAY;IAmBpB;;OAEG;IACH,OAAO,CAAC,UAAU;IA4BlB;;OAEG;YACY,eAAe;IA8P9B;;OAEG;YACY,iBAAiB;IAgChC;;OAEG;YACY,SAAS;IA4BxB;;OAEG;YACY,UAAU;IAkDzB;;OAEG;IACH,OAAO,CAAC,YAAY;IA6HpB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAwCzB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAwDvB;;;;;;;;;;;;;;OAcG;YACW,mBAAmB;YA8XnB,uBAAuB;YAoCvB,iBAAiB;YA2DjB,sBAAsB;IAqBpC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAmBhC,OAAO,CAAC,wBAAwB;IAKhC,OAAO,CAAC,uBAAuB;IAM/B;;OAEG;IACH,OAAO,CAAC,eAAe;IAoBvB;;OAEG;IACH,OAAO,CAAC,cAAc;IAkBtB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;OAEG;IACH,OAAO,CAAC,aAAa;IAkBrB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAwB3B;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB;;OAEG;IACH,OAAO,CAAC,KAAK;IAWb;;OAEG;IACH,OAAO,CAAC,OAAO;IAWf;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}

package/dist/runner.js

@@ -8,7 +8,7 @@ import { runAgentLoop } from './agent.js';
 import { executeCompactor, getCompactionBindings, resolveCompactionOptions, } from './compaction.js';
 import { buildToolCompletionEvent, buildToolFailureEvent, buildToolStartEvent, } from './system/runtime/shell-tool-events.js';
 import { checkToolPolicy } from './tools.js';
-import { sampleSingleToken } from './prolog/bridge.js';
+import { generateLlmReply, sampleSingleToken } from './prolog/bridge.js';
 /**
  * Convert swipl-wasm value to plain JavaScript value
  * Handles PrologString, PrologAtom, PrologList, etc.
@@ -142,7 +142,6 @@ export class DMLRunner {
     engine = null;
     sessionId = '';
     currentMemory = [];
-    initialMessagesApplied = false;
     constructor(swipl, options) {
         this.swipl = swipl;
         this.options = options;
@@ -172,8 +171,11 @@ export class DMLRunner {
                     return;
                 }
             }
-            // Memory is now managed internally by the MI via state threading
-            // No external initialization needed
+            // Seed the MI state so top-level DML can inspect initial messages via get_memory/1.
+            this.currentMemory = (options.initialMessages ?? []).map((message) => ({
+                role: message.role,
+                content: message.content,
+            }));
             // Build args and params
             const args = this.buildArgs(options);
             const params = this.buildParams(options);
@@ -235,6 +237,9 @@ export class DMLRunner {
                     case 'request_sample_token':
                         yield* this.handleSampleToken(step.payload, options);
                         break;
+                    case 'request_llm':
+                        yield* this.handleLlm(step.payload, options);
+                        break;
                     case 'wait_input':
                         // Request user input
                         yield { type: 'input_required', prompt: step.prompt };
@@ -366,7 +371,8 @@ export class DMLRunner {
      */
     createEngine(memoryId, args, params) {
         try {
-            const result = this.query(`deepclause_mi:create_engine('${this.sessionId}', '${memoryId}', ${args}, ${params}, Engine)`);
+            const initialMemory = this.serializeMemoryMessages(this.currentMemory);
+            const result = this.query(`deepclause_mi:create_engine('${this.sessionId}', '${memoryId}', ${args}, ${params}, [${initialMemory}], Engine)`);
             if (result && result.Engine) {
                 this.engine = result.Engine;
                 return {};
@@ -436,18 +442,7 @@ export class DMLRunner {
             }
         };
         // Extract memory from payload (now passed via state threading)
-        const memory = this.extractMemoryFromPayload(rawPayload);
-        // Prepend initial conversation messages (from RunOptions.initialMessages)
-        // Only on the FIRST task() call — after that, persistent messages already include them.
-        const initialMsgs = (!this.initialMessagesApplied && options.initialMessages?.length)
-            ? options.initialMessages
-            : undefined;
-        const fullMemory = initialMsgs
-            ? [...initialMsgs, ...memory]
-            : memory;
-        if (initialMsgs)
-            this.initialMessagesApplied = true;
-        const preparedMemory = fullMemory;
+        const preparedMemory = this.extractMemoryFromPayload(rawPayload);
         // Store current memory for getMemory() access
         this.currentMemory = preparedMemory;
         const emitToolEvent = (event) => {
@@ -658,6 +653,33 @@ export class DMLRunner {
             yield { type: 'log', content: `sample_token failed: ${message}` };
         }
     }
+    /**
+     * Handle direct one-shot LLM request (llm/2)
+     */
+    async *handleLlm(payload, options) {
+        const data = payload;
+        const messages = this.extractMessagesFromValue(data.messages);
+        try {
+            const text = await generateLlmReply({
+                messages,
+                modelOptions: {
+                    provider: this.options.provider,
+                    model: this.options.model,
+                    temperature: this.options.temperature,
+                    maxOutputTokens: this.options.maxTokens,
+                    baseUrl: this.options.baseUrl,
+                    providerOptions: this.options.providerOptions,
+                },
+                signal: options.signal,
+            });
+            this.postLlmResult({ success: true, text });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            this.postLlmResult({ success: false, error: message });
+            yield { type: 'log', content: `llm/2 failed: ${message}` };
+        }
+    }
     /**
      * Handle exec request (exec() predicate)
      */
@@ -1024,6 +1046,32 @@ export class DMLRunner {
                         }
                         break;
                     }
+                    case 'request_llm': {
+                        const messages = this.extractMessagesFromValue(payload?.messages);
+                        try {
+                            const text = await generateLlmReply({
+                                messages,
+                                modelOptions: {
+                                    provider: this.options.provider,
+                                    model: this.options.model,
+                                    temperature: this.options.temperature,
+                                    maxOutputTokens: this.options.maxTokens,
+                                    baseUrl: this.options.baseUrl,
+                                    providerOptions: this.options.providerOptions,
+                                },
+                                signal: runContext.signal,
+                            });
+                            this.postLlmResult({ success: true, text });
+                        }
+                        catch (error) {
+                            const message = error instanceof Error ? error.message : String(error);
+                            this.postLlmResult({ success: false, error: message });
+                            if (process.env.DEBUG_RUNNER) {
+                                console.log('[RUNNER] llm/2 request failed:', message);
+                            }
+                        }
+                        break;
+                    }
                     case 'request_agent_loop': {
                         // Tool is calling task() or prompt() - run nested agent loop
                         const taskDescription = String(payload?.taskDescription ?? '');
@@ -1227,6 +1275,7 @@ export class DMLRunner {
             const result = await executeCompactor({
                 binding,
                 messages,
+                emitEvent: params.emitEvent,
                 execute: (request) => this.runBoundCompactor({
                     request,
                     executionContext: params.executionContext,
@@ -1261,6 +1310,7 @@ export class DMLRunner {
                 workspacePath: params.executionContext.workspacePath,
                 gasLimit: binding.compactor.gasLimit,
                 params: compactorParams,
+                initialMessages: params.request.messages,
                 tools,
                 toolPolicy: binding.compactor.toolPolicy ?? (binding.compactor.inheritTools ? params.toolPolicy : null) ?? null,
                 onInputRequired: async (prompt) => {
@@ -1305,22 +1355,25 @@ export class DMLRunner {
     /**
      * Extract memory from payload (now passed via state threading)
      */
-    extractMemoryFromPayload(rawPayload) {
-        const rawMemory = toJsValue(rawPayload.memory);
-        if (!Array.isArray(rawMemory)) {
+    extractMessagesFromValue(rawMessages) {
+        const normalized = toJsValue(rawMessages);
+        if (!Array.isArray(normalized)) {
             return [];
         }
-        return rawMemory.map((m) => {
-            const msg = toJsValue(m);
+        return normalized.map((messageValue) => {
+            const msg = toJsValue(messageValue);
             const role = String(toJsValue(msg.role) ?? 'user');
             const content = String(toJsValue(msg.content) ?? '');
-            // Validate role
             if (role !== 'system' && role !== 'user' && role !== 'assistant') {
                 return { role: 'user', content };
             }
             return { role: role, content };
         });
     }
+    extractMemoryFromPayload(rawPayload) {
+        const rawMemory = toJsValue(rawPayload.memory);
+        return this.extractMessagesFromValue(rawMemory);
+    }
     serializeMemoryMessages(messages) {
         return messages
             .map((message) => `message{role: ${message.role}, content: ${this.toPrologTerm(message.content)}}`)
@@ -1365,6 +1418,19 @@ export class DMLRunner {
             this.query(`deepclause_mi:post_sample_token_result('${this.sessionId}', failure, ${error})`);
         }
     }
+    /**
+     * Post direct llm/2 result back to Prolog
+     */
+    postLlmResult(result) {
+        if (result.success) {
+            const text = this.toPrologTerm(result.text ?? '');
+            this.query(`deepclause_mi:post_llm_result('${this.sessionId}', success, ${text})`);
+        }
+        else {
+            const error = this.toPrologTerm(result.error ?? 'Unknown error');
+            this.query(`deepclause_mi:post_llm_result('${this.sessionId}', failure, ${error})`);
+        }
+    }
     /**
      * Post tool engine agent loop result back to Prolog
      */