cactus-react-native 0.1.0 → 0.1.1

package/android/src/main/CMakeLists.txt

@@ -3,11 +3,8 @@ cmake_minimum_required(VERSION 3.10)
 project(cactus)
 
 set(CMAKE_CXX_STANDARD 17)
-
-# Use cactus as the C++ source directory
 set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/../../../../cactus)
 
-# Include directories to match cactus core structure
 include_directories(${SOURCE_DIR})
 include_directories(${SOURCE_DIR}/ggml-cpu)
 include_directories(${SOURCE_DIR}/minja)
@@ -127,7 +124,6 @@ function(build_library target_name cpu_flags)
 
 endfunction()
 
-# Default target (no specific CPU features)
 build_library("cactus" "")
 
 if (${ANDROID_ABI} STREQUAL "arm64-v8a")

package/android/src/main/java/com/cactus/Cactus.java

@@ -21,11 +21,14 @@ import java.util.Random;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.PushbackInputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class Cactus implements LifecycleEventListener {
   public static final String NAME = "Cactus";
 
   private ReactApplicationContext reactContext;
+  private final ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
 
   public Cactus(ReactApplicationContext reactContext) {
     reactContext.addLifecycleEventListener(this);
@@ -95,7 +98,7 @@ public class Cactus implements LifecycleEventListener {
         }
         promise.resolve(result);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
   }
 
   public void initContext(double id, final ReadableMap params, final Promise promise) {
@@ -139,7 +142,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "initContext");
   }
 
@@ -178,7 +181,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "getFormattedChat-" + contextId);
   }
 
@@ -211,7 +214,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "loadSession-" + contextId);
   }
 
@@ -244,12 +247,12 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "saveSession-" + contextId);
   }
 
   public void completion(double id, final ReadableMap params, final Promise promise) {
-    Log.d(NAME, "🟢 BRIDGE: completion() method called with contextId=" + (int)id);
+    Log.d(NAME, "BRIDGE: completion() method called with contextId=" + (int)id);
     final int contextId = (int) id;
     AsyncTask task = new AsyncTask<Void, Void, WritableMap>() {
       private Exception exception;
@@ -260,20 +263,20 @@ public class Cactus implements LifecycleEventListener {
         try {
           LlamaContext context = contexts.get(contextId);
           if (context == null) {
-            Log.e(NAME, "❌ BRIDGE: Context not found for id=" + contextId);
+            Log.e(NAME, "BRIDGE: Context not found for id=" + contextId);
             throw new Exception("Context not found");
           }
-          Log.d(NAME, "✅ BRIDGE: Context found, checking if predicting...");
+          Log.d(NAME, "BRIDGE: Context found, checking if predicting...");
           if (context.isPredicting()) {
-            Log.e(NAME, "❌ BRIDGE: Context is busy (predicting)");
+            Log.e(NAME, "BRIDGE: Context is busy (predicting)");
             throw new Exception("Context is busy");
           }
-          Log.d(NAME, "🚀 BRIDGE: About to call context.completion()...");
+          Log.d(NAME, "BRIDGE: About to call context.completion()...");
           WritableMap result = context.completion(params);
-          Log.d(NAME, "✅ BRIDGE: context.completion() returned successfully");
+          Log.d(NAME, "BRIDGE: context.completion() returned successfully");
           return result;
         } catch (Exception e) {
-          Log.e(NAME, "❌ BRIDGE: Exception in doInBackground: " + e.getMessage());
+          Log.e(NAME, "BRIDGE: Exception in doInBackground: " + e.getMessage());
           exception = e;
         }
         return null;
@@ -281,19 +284,19 @@ public class Cactus implements LifecycleEventListener {
 
       @Override
       protected void onPostExecute(WritableMap result) {
-        Log.d(NAME, "📤 BRIDGE: onPostExecute called");
+        Log.d(NAME, "BRIDGE: onPostExecute called");
         if (exception != null) {
-          Log.e(NAME, "❌ BRIDGE: Rejecting promise with exception: " + exception.getMessage());
+          Log.e(NAME, "BRIDGE: Rejecting promise with exception: " + exception.getMessage());
           promise.reject(exception);
           return;
         }
-        Log.d(NAME, "✅ BRIDGE: Resolving promise with result");
+        Log.d(NAME, "BRIDGE: Resolving promise with result");
         promise.resolve(result);
         tasks.remove(this);
-        Log.d(NAME, "🏁 BRIDGE: completion() finished successfully");
+        Log.d(NAME, "BRIDGE: completion() finished successfully");
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    Log.d(NAME, "📋 BRIDGE: AsyncTask queued for execution");
+    }.executeOnExecutor(singleThreadExecutor);
+    Log.d(NAME, "BRIDGE: AsyncTask queued for execution");
     tasks.put(task, "completion-" + contextId);
   }
 
@@ -332,7 +335,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "stopCompletion-" + contextId);
   }
 
@@ -364,7 +367,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "tokenize-" + contextId);
   }
 
@@ -396,7 +399,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "tokenize-" + contextId);
   }
 
@@ -428,7 +431,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "detokenize-" + contextId);
   }
 
@@ -460,7 +463,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "embedding-" + contextId);
   }
 
@@ -492,7 +495,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "bench-" + contextId);
   }
 
@@ -525,7 +528,7 @@ public class Cactus implements LifecycleEventListener {
           return;
         }
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "applyLoraAdapters-" + contextId);
   }
 
@@ -559,7 +562,7 @@ public class Cactus implements LifecycleEventListener {
         }
         promise.resolve(null);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "removeLoraAdapters-" + contextId);
   }
 
@@ -590,7 +593,7 @@ public class Cactus implements LifecycleEventListener {
         }
         promise.resolve(result);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "getLoadedLoraAdapters-" + contextId);
   }
 
@@ -632,7 +635,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(null);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "releaseContext-" + contextId);
   }
 
@@ -659,7 +662,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(null);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "releaseAllContexts");
   }
 
@@ -718,7 +721,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "initMultimodal-" + contextId);
   }
 
@@ -750,7 +753,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "isMultimodalEnabled-" + contextId);
   }
 
@@ -782,7 +785,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "isMultimodalSupportVision-" + contextId);
   }
 
@@ -814,7 +817,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "isMultimodalSupportAudio-" + contextId);
   }
 
@@ -846,7 +849,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(null);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "releaseMultimodal-" + contextId);
   }
 
@@ -881,7 +884,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "multimodalCompletion-" + contextId);
   }
 
@@ -913,7 +916,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "initVocoder-" + contextId);
   }
 
@@ -945,7 +948,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "isVocoderEnabled-" + contextId);
   }
 
@@ -977,7 +980,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "getTTSType-" + contextId);
   }
 
@@ -1009,7 +1012,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "getFormattedAudioCompletion-" + contextId);
   }
 
@@ -1041,7 +1044,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "getAudioCompletionGuideTokens-" + contextId);
   }
 
@@ -1073,7 +1076,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(result);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "decodeAudioTokens-" + contextId);
   }
 
@@ -1105,7 +1108,7 @@ public class Cactus implements LifecycleEventListener {
         promise.resolve(null);
         tasks.remove(this);
       }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }.executeOnExecutor(singleThreadExecutor);
     tasks.put(task, "releaseVocoder-" + contextId);
   }
 }

package/ios/CMakeLists.txt

@@ -24,6 +24,7 @@ set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cactus)
 # Define public headers
 set(PUBLIC_HEADERS
     ${SOURCE_DIR}/cactus.h
+    ${SOURCE_DIR}/cactus_ffi.h
     ${SOURCE_DIR}/llama.h
     ${SOURCE_DIR}/llama-impl.h
     ${SOURCE_DIR}/ggml.h
@@ -42,6 +43,7 @@ add_library(cactus SHARED
     ${SOURCE_DIR}/cactus_tts.cpp
     ${SOURCE_DIR}/cactus_bench.cpp
     ${SOURCE_DIR}/cactus_chat.cpp
+    ${SOURCE_DIR}/cactus_ffi.cpp
     ${SOURCE_DIR}/tools/mtmd/mtmd.cpp
     ${SOURCE_DIR}/tools/mtmd/mtmd-audio.cpp
     ${SOURCE_DIR}/tools/mtmd/clip.cpp

package/ios/cactus.xcframework/ios-arm64/cactus.framework/Headers/cactus_ffi.h

@@ -127,6 +127,15 @@ CACTUS_FFI_EXPORT int cactus_completion_c(
     cactus_completion_result_c_t* result
 );
 
+// **MULTIMODAL COMPLETION**
+CACTUS_FFI_EXPORT int cactus_multimodal_completion_c(
+    cactus_context_handle_t handle,
+    const cactus_completion_params_c_t* params,
+    const char** media_paths,
+    int media_count,
+    cactus_completion_result_c_t* result
+);
+
 CACTUS_FFI_EXPORT void cactus_stop_completion_c(cactus_context_handle_t handle);
 
 CACTUS_FFI_EXPORT cactus_token_array_c_t cactus_tokenize_c(cactus_context_handle_t handle, const char* text);
@@ -207,10 +216,39 @@ CACTUS_FFI_EXPORT cactus_lora_adapters_c_t cactus_get_loaded_lora_adapters_c(cac
 CACTUS_FFI_EXPORT bool cactus_validate_chat_template_c(cactus_context_handle_t handle, bool use_jinja, const char* name);
 CACTUS_FFI_EXPORT char* cactus_get_formatted_chat_c(cactus_context_handle_t handle, const char* messages, const char* chat_template);
 
+// **ADVANCED: Chat with Jinja and Tools Support**
+typedef struct {
+    char* prompt;
+    char* json_schema;
+    char* tools;
+    char* tool_choice;
+    bool parallel_tool_calls;
+} cactus_chat_result_c_t;
+
+CACTUS_FFI_EXPORT cactus_chat_result_c_t cactus_get_formatted_chat_with_jinja_c(
+    cactus_context_handle_t handle, 
+    const char* messages,
+    const char* chat_template,
+    const char* json_schema,
+    const char* tools,
+    bool parallel_tool_calls,
+    const char* tool_choice
+);
+
 // **HIGH PRIORITY: Context Management**
 CACTUS_FFI_EXPORT void cactus_rewind_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT bool cactus_init_sampling_c(cactus_context_handle_t handle);
 
+// **COMPLETION CONTROL**
+CACTUS_FFI_EXPORT void cactus_begin_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_end_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_with_media_c(cactus_context_handle_t handle, const char** media_paths, int media_count);
+
+// **TOKEN PROCESSING**
+CACTUS_FFI_EXPORT int cactus_do_completion_step_c(cactus_context_handle_t handle, char** token_text);
+CACTUS_FFI_EXPORT size_t cactus_find_stopping_strings_c(cactus_context_handle_t handle, const char* text, size_t last_token_size, int stop_type);
+
 // **HIGH PRIORITY: Model Information**
 CACTUS_FFI_EXPORT int32_t cactus_get_n_ctx_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT int32_t cactus_get_n_embd_c(cactus_context_handle_t handle);
@@ -221,6 +259,7 @@ CACTUS_FFI_EXPORT int64_t cactus_get_model_params_c(cactus_context_handle_t hand
 // Memory management functions
 CACTUS_FFI_EXPORT void cactus_free_bench_result_members_c(cactus_bench_result_c_t* result);
 CACTUS_FFI_EXPORT void cactus_free_lora_adapters_c(cactus_lora_adapters_c_t* adapters);
+CACTUS_FFI_EXPORT void cactus_free_chat_result_members_c(cactus_chat_result_c_t* result);
 
 #ifdef __cplusplus
 }

package/ios/cactus.xcframework/ios-arm64_x86_64-simulator/cactus.framework/Headers/cactus_ffi.h

@@ -127,6 +127,15 @@ CACTUS_FFI_EXPORT int cactus_completion_c(
     cactus_completion_result_c_t* result
 );
 
+// **MULTIMODAL COMPLETION**
+CACTUS_FFI_EXPORT int cactus_multimodal_completion_c(
+    cactus_context_handle_t handle,
+    const cactus_completion_params_c_t* params,
+    const char** media_paths,
+    int media_count,
+    cactus_completion_result_c_t* result
+);
+
 CACTUS_FFI_EXPORT void cactus_stop_completion_c(cactus_context_handle_t handle);
 
 CACTUS_FFI_EXPORT cactus_token_array_c_t cactus_tokenize_c(cactus_context_handle_t handle, const char* text);
@@ -207,10 +216,39 @@ CACTUS_FFI_EXPORT cactus_lora_adapters_c_t cactus_get_loaded_lora_adapters_c(cac
 CACTUS_FFI_EXPORT bool cactus_validate_chat_template_c(cactus_context_handle_t handle, bool use_jinja, const char* name);
 CACTUS_FFI_EXPORT char* cactus_get_formatted_chat_c(cactus_context_handle_t handle, const char* messages, const char* chat_template);
 
+// **ADVANCED: Chat with Jinja and Tools Support**
+typedef struct {
+    char* prompt;
+    char* json_schema;
+    char* tools;
+    char* tool_choice;
+    bool parallel_tool_calls;
+} cactus_chat_result_c_t;
+
+CACTUS_FFI_EXPORT cactus_chat_result_c_t cactus_get_formatted_chat_with_jinja_c(
+    cactus_context_handle_t handle, 
+    const char* messages,
+    const char* chat_template,
+    const char* json_schema,
+    const char* tools,
+    bool parallel_tool_calls,
+    const char* tool_choice
+);
+
 // **HIGH PRIORITY: Context Management**
 CACTUS_FFI_EXPORT void cactus_rewind_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT bool cactus_init_sampling_c(cactus_context_handle_t handle);
 
+// **COMPLETION CONTROL**
+CACTUS_FFI_EXPORT void cactus_begin_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_end_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_with_media_c(cactus_context_handle_t handle, const char** media_paths, int media_count);
+
+// **TOKEN PROCESSING**
+CACTUS_FFI_EXPORT int cactus_do_completion_step_c(cactus_context_handle_t handle, char** token_text);
+CACTUS_FFI_EXPORT size_t cactus_find_stopping_strings_c(cactus_context_handle_t handle, const char* text, size_t last_token_size, int stop_type);
+
 // **HIGH PRIORITY: Model Information**
 CACTUS_FFI_EXPORT int32_t cactus_get_n_ctx_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT int32_t cactus_get_n_embd_c(cactus_context_handle_t handle);
@@ -221,6 +259,7 @@ CACTUS_FFI_EXPORT int64_t cactus_get_model_params_c(cactus_context_handle_t hand
 // Memory management functions
 CACTUS_FFI_EXPORT void cactus_free_bench_result_members_c(cactus_bench_result_c_t* result);
 CACTUS_FFI_EXPORT void cactus_free_lora_adapters_c(cactus_lora_adapters_c_t* adapters);
+CACTUS_FFI_EXPORT void cactus_free_chat_result_members_c(cactus_chat_result_c_t* result);
 
 #ifdef __cplusplus
 }

package/ios/cactus.xcframework/tvos-arm64/cactus.framework/Headers/cactus_ffi.h

@@ -127,6 +127,15 @@ CACTUS_FFI_EXPORT int cactus_completion_c(
     cactus_completion_result_c_t* result
 );
 
+// **MULTIMODAL COMPLETION**
+CACTUS_FFI_EXPORT int cactus_multimodal_completion_c(
+    cactus_context_handle_t handle,
+    const cactus_completion_params_c_t* params,
+    const char** media_paths,
+    int media_count,
+    cactus_completion_result_c_t* result
+);
+
 CACTUS_FFI_EXPORT void cactus_stop_completion_c(cactus_context_handle_t handle);
 
 CACTUS_FFI_EXPORT cactus_token_array_c_t cactus_tokenize_c(cactus_context_handle_t handle, const char* text);
@@ -207,10 +216,39 @@ CACTUS_FFI_EXPORT cactus_lora_adapters_c_t cactus_get_loaded_lora_adapters_c(cac
 CACTUS_FFI_EXPORT bool cactus_validate_chat_template_c(cactus_context_handle_t handle, bool use_jinja, const char* name);
 CACTUS_FFI_EXPORT char* cactus_get_formatted_chat_c(cactus_context_handle_t handle, const char* messages, const char* chat_template);
 
+// **ADVANCED: Chat with Jinja and Tools Support**
+typedef struct {
+    char* prompt;
+    char* json_schema;
+    char* tools;
+    char* tool_choice;
+    bool parallel_tool_calls;
+} cactus_chat_result_c_t;
+
+CACTUS_FFI_EXPORT cactus_chat_result_c_t cactus_get_formatted_chat_with_jinja_c(
+    cactus_context_handle_t handle, 
+    const char* messages,
+    const char* chat_template,
+    const char* json_schema,
+    const char* tools,
+    bool parallel_tool_calls,
+    const char* tool_choice
+);
+
 // **HIGH PRIORITY: Context Management**
 CACTUS_FFI_EXPORT void cactus_rewind_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT bool cactus_init_sampling_c(cactus_context_handle_t handle);
 
+// **COMPLETION CONTROL**
+CACTUS_FFI_EXPORT void cactus_begin_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_end_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_with_media_c(cactus_context_handle_t handle, const char** media_paths, int media_count);
+
+// **TOKEN PROCESSING**
+CACTUS_FFI_EXPORT int cactus_do_completion_step_c(cactus_context_handle_t handle, char** token_text);
+CACTUS_FFI_EXPORT size_t cactus_find_stopping_strings_c(cactus_context_handle_t handle, const char* text, size_t last_token_size, int stop_type);
+
 // **HIGH PRIORITY: Model Information**
 CACTUS_FFI_EXPORT int32_t cactus_get_n_ctx_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT int32_t cactus_get_n_embd_c(cactus_context_handle_t handle);
@@ -221,6 +259,7 @@ CACTUS_FFI_EXPORT int64_t cactus_get_model_params_c(cactus_context_handle_t hand
 // Memory management functions
 CACTUS_FFI_EXPORT void cactus_free_bench_result_members_c(cactus_bench_result_c_t* result);
 CACTUS_FFI_EXPORT void cactus_free_lora_adapters_c(cactus_lora_adapters_c_t* adapters);
+CACTUS_FFI_EXPORT void cactus_free_chat_result_members_c(cactus_chat_result_c_t* result);
 
 #ifdef __cplusplus
 }

package/ios/cactus.xcframework/tvos-arm64_x86_64-simulator/cactus.framework/Headers/cactus_ffi.h

@@ -127,6 +127,15 @@ CACTUS_FFI_EXPORT int cactus_completion_c(
     cactus_completion_result_c_t* result
 );
 
+// **MULTIMODAL COMPLETION**
+CACTUS_FFI_EXPORT int cactus_multimodal_completion_c(
+    cactus_context_handle_t handle,
+    const cactus_completion_params_c_t* params,
+    const char** media_paths,
+    int media_count,
+    cactus_completion_result_c_t* result
+);
+
 CACTUS_FFI_EXPORT void cactus_stop_completion_c(cactus_context_handle_t handle);
 
 CACTUS_FFI_EXPORT cactus_token_array_c_t cactus_tokenize_c(cactus_context_handle_t handle, const char* text);
@@ -207,10 +216,39 @@ CACTUS_FFI_EXPORT cactus_lora_adapters_c_t cactus_get_loaded_lora_adapters_c(cac
 CACTUS_FFI_EXPORT bool cactus_validate_chat_template_c(cactus_context_handle_t handle, bool use_jinja, const char* name);
 CACTUS_FFI_EXPORT char* cactus_get_formatted_chat_c(cactus_context_handle_t handle, const char* messages, const char* chat_template);
 
+// **ADVANCED: Chat with Jinja and Tools Support**
+typedef struct {
+    char* prompt;
+    char* json_schema;
+    char* tools;
+    char* tool_choice;
+    bool parallel_tool_calls;
+} cactus_chat_result_c_t;
+
+CACTUS_FFI_EXPORT cactus_chat_result_c_t cactus_get_formatted_chat_with_jinja_c(
+    cactus_context_handle_t handle, 
+    const char* messages,
+    const char* chat_template,
+    const char* json_schema,
+    const char* tools,
+    bool parallel_tool_calls,
+    const char* tool_choice
+);
+
 // **HIGH PRIORITY: Context Management**
 CACTUS_FFI_EXPORT void cactus_rewind_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT bool cactus_init_sampling_c(cactus_context_handle_t handle);
 
+// **COMPLETION CONTROL**
+CACTUS_FFI_EXPORT void cactus_begin_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_end_completion_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_c(cactus_context_handle_t handle);
+CACTUS_FFI_EXPORT void cactus_load_prompt_with_media_c(cactus_context_handle_t handle, const char** media_paths, int media_count);
+
+// **TOKEN PROCESSING**
+CACTUS_FFI_EXPORT int cactus_do_completion_step_c(cactus_context_handle_t handle, char** token_text);
+CACTUS_FFI_EXPORT size_t cactus_find_stopping_strings_c(cactus_context_handle_t handle, const char* text, size_t last_token_size, int stop_type);
+
 // **HIGH PRIORITY: Model Information**
 CACTUS_FFI_EXPORT int32_t cactus_get_n_ctx_c(cactus_context_handle_t handle);
 CACTUS_FFI_EXPORT int32_t cactus_get_n_embd_c(cactus_context_handle_t handle);
@@ -221,6 +259,7 @@ CACTUS_FFI_EXPORT int64_t cactus_get_model_params_c(cactus_context_handle_t hand
 // Memory management functions
 CACTUS_FFI_EXPORT void cactus_free_bench_result_members_c(cactus_bench_result_c_t* result);
 CACTUS_FFI_EXPORT void cactus_free_lora_adapters_c(cactus_lora_adapters_c_t* adapters);
+CACTUS_FFI_EXPORT void cactus_free_chat_result_members_c(cactus_chat_result_c_t* result);
 
 #ifdef __cplusplus
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cactus-react-native",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Run AI models locally on mobile devices",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",