diff --git a/README.md b/README.md
index 10f0dfc..a89d6b6 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ AgentJido is a Phoenix 1.8 application for the Jido AI agent ecosystem.
 
 - Elixir 1.18+
 - PostgreSQL 14+
+- Node.js 18+ (for asset compilation)
 
 ### Setup
 
@@ -26,7 +27,10 @@ AgentJido is a Phoenix 1.8 application for the Jido AI agent ecosystem.
 git clone https://github.com/agentjido/agent_jido.git
 cd agent_jido
 
-# Install dependencies and setup database
+# Install JavaScript dependencies
+cd assets && npm install && cd ..
+
+# Install Elixir dependencies and setup database
 mix setup
 
 # Start the Phoenix server
diff --git a/assets/js/ash_rpc.ts b/assets/js/ash_rpc.ts
index 5b55d24..317a581 100644
--- a/assets/js/ash_rpc.ts
+++ b/assets/js/ash_rpc.ts
@@ -16,20 +16,20 @@
 // Utility Types
 
 // Resource schema constraint
-type TypedSchema = {
+export type TypedSchema = {
   __type: "Resource" | "TypedMap" | "Union";
   __primitiveFields: string;
 };
 
 // Utility type to convert union to intersection
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
+export type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
   k: infer I,
 ) => void
   ? I
   : never;
 
 // Helper type to infer union field values, avoiding duplication between array and non-array unions
-type InferUnionFieldValue<
+export type InferUnionFieldValue<
   UnionSchema extends { __type: "Union"; __primitiveFields: any },
   FieldSelection extends any[],
 > = UnionToIntersection<
@@ -41,34 +41,34 @@ type InferUnionFieldValue<
       : FieldSelection[FieldIndex] extends Record<string, any>
         ? {
             [UnionKey in keyof FieldSelection[FieldIndex]]: UnionKey extends keyof UnionSchema
-              ? UnionSchema[UnionKey] extends { __array: true; __type: "TypedMap"; __primitiveFields: infer TypedMapFields }
+              ? NonNullable<UnionSchema[UnionKey]> extends { __array: true; __type: "TypedMap"; __primitiveFields: infer TypedMapFields }
                 ? FieldSelection[FieldIndex][UnionKey] extends any[]
                   ? Array<
                       UnionToIntersection<
                         {
                           [FieldIdx in keyof FieldSelection[FieldIndex][UnionKey]]: FieldSelection[FieldIndex][UnionKey][FieldIdx] extends TypedMapFields
-                            ? FieldSelection[FieldIndex][UnionKey][FieldIdx] extends keyof UnionSchema[UnionKey]
-                              ? { [P in FieldSelection[FieldIndex][UnionKey][FieldIdx]]: UnionSchema[UnionKey][P] }
+                            ? FieldSelection[FieldIndex][UnionKey][FieldIdx] extends keyof NonNullable<UnionSchema[UnionKey]>
+                              ? { [P in FieldSelection[FieldIndex][UnionKey][FieldIdx]]: NonNullable<UnionSchema[UnionKey]>[P] }
                               : never
                             : never;
                         }[number]
                       >
                     > | null
                   : never
-                : UnionSchema[UnionKey] extends { __type: "TypedMap"; __primitiveFields: infer TypedMapFields }
+                : NonNullable<UnionSchema[UnionKey]> extends { __type: "TypedMap"; __primitiveFields: infer TypedMapFields }
                   ? FieldSelection[FieldIndex][UnionKey] extends any[]
                     ? UnionToIntersection<
                         {
                           [FieldIdx in keyof FieldSelection[FieldIndex][UnionKey]]: FieldSelection[FieldIndex][UnionKey][FieldIdx] extends TypedMapFields
-                            ? FieldSelection[FieldIndex][UnionKey][FieldIdx] extends keyof UnionSchema[UnionKey]
-                              ? { [P in FieldSelection[FieldIndex][UnionKey][FieldIdx]]: UnionSchema[UnionKey][P] }
+                            ? FieldSelection[FieldIndex][UnionKey][FieldIdx] extends keyof NonNullable<UnionSchema[UnionKey]>
+                              ? { [P in FieldSelection[FieldIndex][UnionKey][FieldIdx]]: NonNullable<UnionSchema[UnionKey]>[P] }
                               : never
                             : never;
                         }[number]
                       > | null
                     : never
-                  : UnionSchema[UnionKey] extends TypedSchema
-                    ? InferResult<UnionSchema[UnionKey], FieldSelection[FieldIndex][UnionKey]>
+                  : NonNullable<UnionSchema[UnionKey]> extends TypedSchema
+                    ? InferResult<NonNullable<UnionSchema[UnionKey]>, FieldSelection[FieldIndex][UnionKey]>
                     : never
               : never;
           }
@@ -76,21 +76,21 @@ type InferUnionFieldValue<
   }[number]
 >;
 
-type HasComplexFields<T extends TypedSchema> = keyof Omit<
+export type HasComplexFields<T extends TypedSchema> = keyof Omit<
   T,
   "__primitiveFields" | "__type" | T["__primitiveFields"]
 > extends never
   ? false
   : true;
 
-type ComplexFieldKeys<T extends TypedSchema> = keyof Omit<
+export type ComplexFieldKeys<T extends TypedSchema> = keyof Omit<
   T,
   "__primitiveFields" | "__type" | T["__primitiveFields"]
 >;
 
-type LeafFieldSelection<T extends TypedSchema> = T["__primitiveFields"];
+export type LeafFieldSelection<T extends TypedSchema> = T["__primitiveFields"];
 
-type ComplexFieldSelection<T extends TypedSchema> = {
+export type ComplexFieldSelection<T extends TypedSchema> = {
   [K in ComplexFieldKeys<T>]?: T[K] extends {
     __type: "Relationship";
     __resource: infer Resource;
@@ -119,17 +119,17 @@ type ComplexFieldSelection<T extends TypedSchema> = {
         : T[K] extends { __type: "Union"; __primitiveFields: infer PrimitiveFields }
           ? T[K] extends { __array: true }
             ? (PrimitiveFields | {
-                [UnionKey in keyof Omit<T[K], "__type" | "__primitiveFields" | "__array">]?: T[K][UnionKey] extends { __type: "TypedMap"; __primitiveFields: any }
-                  ? T[K][UnionKey]["__primitiveFields"][]
-                  : T[K][UnionKey] extends TypedSchema
-                    ? UnifiedFieldSelection<T[K][UnionKey]>[]
+                [UnionKey in keyof Omit<T[K], "__type" | "__primitiveFields" | "__array">]?: NonNullable<T[K][UnionKey]> extends { __type: "TypedMap"; __primitiveFields: any }
+                  ? NonNullable<T[K][UnionKey]>["__primitiveFields"][]
+                  : NonNullable<T[K][UnionKey]> extends TypedSchema
+                    ? UnifiedFieldSelection<NonNullable<T[K][UnionKey]>>[]
                     : never;
               })[]
             : (PrimitiveFields | {
-                [UnionKey in keyof Omit<T[K], "__type" | "__primitiveFields">]?: T[K][UnionKey] extends { __type: "TypedMap"; __primitiveFields: any }
-                  ? T[K][UnionKey]["__primitiveFields"][]
-                  : T[K][UnionKey] extends TypedSchema
-                    ? UnifiedFieldSelection<T[K][UnionKey]>[]
+                [UnionKey in keyof Omit<T[K], "__type" | "__primitiveFields">]?: NonNullable<T[K][UnionKey]> extends { __type: "TypedMap"; __primitiveFields: any }
+                  ? NonNullable<T[K][UnionKey]>["__primitiveFields"][]
+                  : NonNullable<T[K][UnionKey]> extends TypedSchema
+                    ? UnifiedFieldSelection<NonNullable<T[K][UnionKey]>>[]
                     : never;
               })[]
             : NonNullable<T[K]> extends TypedSchema
@@ -138,12 +138,12 @@ type ComplexFieldSelection<T extends TypedSchema> = {
 };
 
 // Main type: Use explicit base case detection to prevent infinite recursion
-type UnifiedFieldSelection<T extends TypedSchema> =
+export type UnifiedFieldSelection<T extends TypedSchema> =
   HasComplexFields<T> extends false
     ? LeafFieldSelection<T> // Base case: only primitives, no recursion
     : LeafFieldSelection<T> | ComplexFieldSelection<T>; // Recursive case
 
-type InferFieldValue<
+export type InferFieldValue<
   T extends TypedSchema,
   Field,
 > = Field extends T["__primitiveFields"]
@@ -279,20 +279,16 @@ type InferFieldValue<
                   : never
               : T[K] extends { __type: "Union"; __primitiveFields: any }
                 ? T[K] extends { __array: true }
-                  ? {
-                      [CurrentK in K]: T[CurrentK] extends { __type: "Union"; __primitiveFields: any }
-                        ? Field[CurrentK] extends any[]
-                          ? Array<InferUnionFieldValue<T[CurrentK], Field[CurrentK]>> | null
-                          : never
-                        : never
-                    }
-                  : {
-                      [CurrentK in K]: T[CurrentK] extends { __type: "Union"; __primitiveFields: any }
-                        ? Field[CurrentK] extends any[]
-                          ? InferUnionFieldValue<T[CurrentK], Field[CurrentK]> | null
-                          : never
-                        : never
-                    }
+                  ? Field[K] extends any[]
+                    ? null extends T[K]
+                      ? Array<InferUnionFieldValue<T[K], Field[K]>> | null
+                      : Array<InferUnionFieldValue<T[K], Field[K]>>
+                    : never
+                  : Field[K] extends any[]
+                    ? null extends T[K]
+                      ? InferUnionFieldValue<T[K], Field[K]> | null
+                      : InferUnionFieldValue<T[K], Field[K]>
+                    : never
                   : NonNullable<T[K]> extends TypedSchema
                     ? null extends T[K]
                       ? InferResult<NonNullable<T[K]>, Field[K]> | null
@@ -302,7 +298,7 @@ type InferFieldValue<
       }
     : never;
 
-type InferResult<
+export type InferResult<
   T extends TypedSchema,
   SelectedFields extends UnifiedFieldSelection<T>[] | undefined,
 > = SelectedFields extends undefined
@@ -319,14 +315,14 @@ type InferResult<
 
 // Pagination conditional types
 // Checks if a page configuration object has any pagination parameters
-type HasPaginationParams<Page> =
+export type HasPaginationParams<Page> =
   Page extends { offset: any } ? true :
   Page extends { after: any } ? true :
   Page extends { before: any } ? true :
   false;
 
 // Infer which pagination type is being used from the page config
-type InferPaginationType<Page> =
+export type InferPaginationType<Page> =
   Page extends { offset: any } ? "offset" :
   Page extends { after: any } | { before: any } ? "keyset" :
   never;
@@ -335,7 +331,7 @@ type InferPaginationType<Page> =
 // For single pagination type support (offset-only or keyset-only)
 // @ts-ignore
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-type ConditionalPaginatedResult<
+export type ConditionalPaginatedResult<
   Page,
   RecordType,
   PaginatedType
@@ -347,7 +343,7 @@ type ConditionalPaginatedResult<
 
 // For actions supporting both offset and keyset pagination
 // Infers the specific pagination type based on which params were passed
-type ConditionalPaginatedResultMixed<
+export type ConditionalPaginatedResultMixed<
   Page,
   RecordType,
   OffsetType,
@@ -533,7 +529,7 @@ export function buildCSRFHeaders(headers: Record<string, string> = {}): Record<s
  * Handles hooks, request configuration, fetch execution, and error handling
  * @param config Configuration matching ActionConfig
  */
-async function executeActionRpcRequest<T>(
+export async function executeActionRpcRequest<T>(
   payload: Record<string, any>,
   config: ActionConfig
 ): Promise<T> {
@@ -584,7 +580,7 @@ async function executeActionRpcRequest<T>(
  * Handles hooks, request configuration, fetch execution, and error handling
  * @param config Configuration matching ValidationConfig
  */
-async function executeValidationRpcRequest<T>(
+export async function executeValidationRpcRequest<T>(
   payload: Record<string, any>,
   config: ValidationConfig
 ): Promise<T> {
diff --git a/config/config.exs b/config/config.exs
index e2e83b9..720cdc9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -87,7 +87,8 @@ config :agent_jido,
   generators: [timestamp_type: :utc_datetime],
   ash_domains: [AgentJido.Accounts, AgentJido.GitHub, AgentJido.Forge.Domain, AgentJido.Folio],
   ash_authentication: [return_error_on_invalid_magic_link_token?: true],
-  mailer: [from_name: "Agent Jido"]
+  mailer: [from_name: "Agent Jido"],
+  forge_fake_sprite_client?: config_env() in [:dev, :test]
 
 # Configure the endpoint
 config :agent_jido, AgentJidoWeb.Endpoint,
diff --git a/lib/agent_jido/accounts.ex b/lib/agent_jido/accounts.ex
index a219ecc..69b3b62 100644
--- a/lib/agent_jido/accounts.ex
+++ b/lib/agent_jido/accounts.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Accounts do
+  @moduledoc false
   use Ash.Domain, otp_app: :agent_jido, extensions: [AshAdmin.Domain]
 
   admin do
diff --git a/lib/agent_jido/accounts/api_key.ex b/lib/agent_jido/accounts/api_key.ex
index a0d25ef..0822664 100644
--- a/lib/agent_jido/accounts/api_key.ex
+++ b/lib/agent_jido/accounts/api_key.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Accounts.ApiKey do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Accounts,
diff --git a/lib/agent_jido/accounts/token.ex b/lib/agent_jido/accounts/token.ex
index 3213ef7..7667174 100644
--- a/lib/agent_jido/accounts/token.ex
+++ b/lib/agent_jido/accounts/token.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Accounts.Token do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Accounts,
diff --git a/lib/agent_jido/accounts/user.ex b/lib/agent_jido/accounts/user.ex
index 388084f..c23de5f 100644
--- a/lib/agent_jido/accounts/user.ex
+++ b/lib/agent_jido/accounts/user.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Accounts.User do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Accounts,
diff --git a/lib/agent_jido/application.ex b/lib/agent_jido/application.ex
index 4f484d9..ddbe86a 100644
--- a/lib/agent_jido/application.ex
+++ b/lib/agent_jido/application.ex
@@ -38,7 +38,7 @@ defmodule AgentJido.Application do
   end
 
   defp forge_dev_children do
-    if Mix.env() in [:dev, :test] do
+    if Application.get_env(:agent_jido, :forge_fake_sprite_client?, false) do
       [{AgentJido.Forge.SpriteClient.Fake, []}]
     else
       []
diff --git a/lib/agent_jido/error.ex b/lib/agent_jido/error.ex
index 0a550e3..017cfee 100644
--- a/lib/agent_jido/error.ex
+++ b/lib/agent_jido/error.ex
@@ -65,6 +65,8 @@ defmodule AgentJido.Error do
     @moduledoc "Error for invalid input parameters."
     use Splode.Error, class: :invalid
 
+    @type t :: %__MODULE__{}
+
     def message(%{message: message}), do: message
   end
 
@@ -72,6 +74,8 @@ defmodule AgentJido.Error do
     @moduledoc "Error for validation failures."
     use Splode.Error, class: :invalid
 
+    @type t :: %__MODULE__{}
+
     def message(%{message: message, field: field}) when not is_nil(field) do
       "Validation failed for #{field}: #{message}"
     end
@@ -83,6 +87,8 @@ defmodule AgentJido.Error do
     @moduledoc "Error for runtime execution failures."
     use Splode.Error, class: :execution
 
+    @type t :: %__MODULE__{}
+
     def message(%{message: message}), do: message
   end
 
@@ -90,32 +96,46 @@ defmodule AgentJido.Error do
     @moduledoc "Error for configuration issues."
     use Splode.Error, class: :config
 
+    @type t :: %__MODULE__{}
+
     def message(%{message: message}), do: message
   end
 
   # Helper functions
 
   @doc "Creates a validation error with optional details."
-  @spec validation_error(String.t(), map()) :: ValidationError.t()
+  @spec validation_error(String.t(), map() | keyword()) :: ValidationError.t()
   def validation_error(message, details \\ %{}) do
-    ValidationError.exception(Map.merge(%{message: message}, details))
+    ValidationError.exception(merge_error_details(message, details))
   end
 
   @doc "Creates an invalid input error."
-  @spec invalid_input_error(String.t(), map()) :: InvalidInputError.t()
+  @spec invalid_input_error(String.t(), map() | keyword()) :: InvalidInputError.t()
   def invalid_input_error(message, details \\ %{}) do
-    InvalidInputError.exception(Map.merge(%{message: message}, details))
+    InvalidInputError.exception(merge_error_details(message, details))
   end
 
   @doc "Creates an execution failure error."
-  @spec execution_error(String.t(), map()) :: ExecutionFailureError.t()
+  @spec execution_error(String.t(), map() | keyword()) :: ExecutionFailureError.t()
   def execution_error(message, details \\ %{}) do
-    ExecutionFailureError.exception(Map.merge(%{message: message}, details))
+    ExecutionFailureError.exception(merge_error_details(message, details))
   end
 
   @doc "Creates a configuration error."
-  @spec config_error(String.t(), map()) :: ConfigurationError.t()
+  @spec config_error(String.t(), map() | keyword()) :: ConfigurationError.t()
   def config_error(message, details \\ %{}) do
-    ConfigurationError.exception(Map.merge(%{message: message}, details))
+    ConfigurationError.exception(merge_error_details(message, details))
+  end
+
+  defp merge_error_details(message, details) when is_list(details) do
+    Keyword.merge([message: message], details)
+  end
+
+  defp merge_error_details(message, details) when is_map(details) do
+    Keyword.merge([message: message], Map.to_list(details))
+  end
+
+  defp merge_error_details(message, nil) do
+    [message: message]
   end
 end
diff --git a/lib/agent_jido/folio.ex b/lib/agent_jido/folio.ex
index c91b8fb..608a3ee 100644
--- a/lib/agent_jido/folio.ex
+++ b/lib/agent_jido/folio.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Folio do
+  @moduledoc false
   use Ash.Domain
 
   resources do
diff --git a/lib/agent_jido/forge.ex b/lib/agent_jido/forge.ex
index c8dd6c9..5d504e4 100644
--- a/lib/agent_jido/forge.ex
+++ b/lib/agent_jido/forge.ex
@@ -157,26 +157,16 @@ defmodule AgentJido.Forge do
 
   defp do_run_loop(session_id, opts, max_iterations, iteration, return_error_result?) do
     case run_iteration(session_id, opts) do
-      {:ok, %{status: :done} = result} ->
-        {:ok, result}
-
-      {:ok, %{status: :needs_input} = result} ->
-        {:ok, result}
-
-      {:ok, %{status: :blocked} = result} ->
+      {:ok, %{status: status} = result} when status in [:done, :needs_input, :blocked] ->
         {:ok, result}
 
       {:ok, %{status: :error} = result} ->
-        if return_error_result? do
-          {:ok, result}
-        else
-          {:error, {:iteration_error, result}}
-        end
+        handle_error_result(result, return_error_result?)
 
-      {:ok, %{continue: true} = _result} ->
+      {:ok, %{continue: true}} ->
         do_run_loop(session_id, opts, max_iterations, iteration + 1, return_error_result?)
 
-      {:ok, %{status: :continue} = _result} ->
+      {:ok, %{status: :continue}} ->
         do_run_loop(session_id, opts, max_iterations, iteration + 1, return_error_result?)
 
       {:ok, result} ->
@@ -187,6 +177,9 @@ defmodule AgentJido.Forge do
     end
   end
 
+  defp handle_error_result(result, true = _return_error_result?), do: {:ok, result}
+  defp handle_error_result(result, false = _return_error_result?), do: {:error, {:iteration_error, result}}
+
   # Session lifecycle operations
 
   @doc """
diff --git a/lib/agent_jido/forge/domain.ex b/lib/agent_jido/forge/domain.ex
index c7b6c5d..55acf80 100644
--- a/lib/agent_jido/forge/domain.ex
+++ b/lib/agent_jido/forge/domain.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Forge.Domain do
+  @moduledoc false
   use Ash.Domain, otp_app: :agent_jido, extensions: [AshAdmin.Domain]
 
   admin do
diff --git a/lib/agent_jido/forge/manager.ex b/lib/agent_jido/forge/manager.ex
index a4ca404..6c388fa 100644
--- a/lib/agent_jido/forge/manager.ex
+++ b/lib/agent_jido/forge/manager.ex
@@ -90,46 +90,11 @@ defmodule AgentJido.Forge.Manager do
   def handle_call({:start_session, session_id, spec}, _from, state) do
     runner_type = Map.get(spec, :runner) || Map.get(spec, :runner_type) || Map.get(spec, "runner_type") || :shell
 
-    cond do
-      MapSet.size(state.sessions) >= state.max_sessions ->
-        {:reply, {:error, :max_sessions_reached}, state}
-
-      Map.get(state.runner_counts, runner_type, 0) >=
-          Map.get(state.max_per_runner, runner_type, 100) ->
-        {:reply, {:error, {:runner_limit_reached, runner_type}}, state}
-
-      true ->
-        case Registry.lookup(@registry, session_id) do
-          [{pid, _}] ->
-            {:reply, {:error, {:already_started, pid}}, state}
-
-          [] ->
-            Persistence.record_session_started(session_id, spec)
-
-            child_spec = {SpriteSession, {session_id, spec, []}}
-
-            case DynamicSupervisor.start_child(@supervisor, child_spec) do
-              {:ok, pid} ->
-                Process.monitor(pid)
-                new_sessions = MapSet.put(state.sessions, session_id)
-                new_session_runners = Map.put(state.session_runners, session_id, runner_type)
-                new_runner_counts = Map.update(state.runner_counts, runner_type, 1, &(&1 + 1))
-
-                Logger.debug("Started session #{session_id} with pid #{inspect(pid)}")
-                ForgePubSub.broadcast_sessions({:session_started, session_id})
-
-                {:reply, {:ok, pid},
-                 %{
-                   state
-                   | sessions: new_sessions,
-                     session_runners: new_session_runners,
-                     runner_counts: new_runner_counts
-                 }}
-
-              {:error, reason} ->
-                {:reply, {:error, reason}, state}
-            end
-        end
+    with :ok <- check_session_limits(state, runner_type),
+         :ok <- check_session_not_running(session_id) do
+      do_start_session(session_id, spec, runner_type, state)
+    else
+      {:error, reason} -> {:reply, {:error, reason}, state}
     end
   end
 
@@ -168,6 +133,52 @@ defmodule AgentJido.Forge.Manager do
     {:noreply, new_state}
   end
 
+  defp check_session_limits(state, runner_type) do
+    cond do
+      MapSet.size(state.sessions) >= state.max_sessions ->
+        {:error, :max_sessions_reached}
+
+      Map.get(state.runner_counts, runner_type, 0) >= Map.get(state.max_per_runner, runner_type, 100) ->
+        {:error, {:runner_limit_reached, runner_type}}
+
+      true ->
+        :ok
+    end
+  end
+
+  defp check_session_not_running(session_id) do
+    case Registry.lookup(@registry, session_id) do
+      [{pid, _}] -> {:error, {:already_started, pid}}
+      [] -> :ok
+    end
+  end
+
+  defp do_start_session(session_id, spec, runner_type, state) do
+    Persistence.record_session_started(session_id, spec)
+    child_spec = {SpriteSession, {session_id, spec, []}}
+
+    case DynamicSupervisor.start_child(@supervisor, child_spec) do
+      {:ok, pid} ->
+        Process.monitor(pid)
+        new_state = update_state_for_started_session(state, session_id, runner_type)
+        Logger.debug("Started session #{session_id} with pid #{inspect(pid)}")
+        ForgePubSub.broadcast_sessions({:session_started, session_id})
+        {:reply, {:ok, pid}, new_state}
+
+      {:error, reason} ->
+        {:reply, {:error, reason}, state}
+    end
+  end
+
+  defp update_state_for_started_session(state, session_id, runner_type) do
+    %{
+      state
+      | sessions: MapSet.put(state.sessions, session_id),
+        session_runners: Map.put(state.session_runners, session_id, runner_type),
+        runner_counts: Map.update(state.runner_counts, runner_type, 1, &(&1 + 1))
+    }
+  end
+
   defp decrement_session(state, session_id) do
     runner_type = Map.get(state.session_runners, session_id)
 
diff --git a/lib/agent_jido/forge/operations.ex b/lib/agent_jido/forge/operations.ex
index ccefe55..dba6dc8 100644
--- a/lib/agent_jido/forge/operations.ex
+++ b/lib/agent_jido/forge/operations.ex
@@ -10,7 +10,7 @@ defmodule AgentJido.Forge.Operations do
   require Logger
 
   alias AgentJido.Forge.{Manager, PubSub}
-  alias AgentJido.Forge.Resources.{Session, Event, Checkpoint}
+  alias AgentJido.Forge.Resources.{Checkpoint, Event, Session}
 
   @doc """
   Resume a session from its last checkpoint.
diff --git a/lib/agent_jido/forge/persistence.ex b/lib/agent_jido/forge/persistence.ex
index e3a7ed4..9856a59 100644
--- a/lib/agent_jido/forge/persistence.ex
+++ b/lib/agent_jido/forge/persistence.ex
@@ -21,7 +21,7 @@ defmodule AgentJido.Forge.Persistence do
 
   require Logger
 
-  alias AgentJido.Forge.Resources.{Session, Event, ExecSession}
+  alias AgentJido.Forge.Resources.{Event, ExecSession, Session}
 
   @doc """
   Check if persistence is enabled.
@@ -187,22 +187,24 @@ defmodule AgentJido.Forge.Persistence do
   @spec log_event(String.t(), String.t(), map()) :: :ok
   def log_event(session_id, event_type, data \\ %{}) do
     if enabled?() do
-      Task.start(fn ->
-        with {:ok, session} <- find_session(session_id) do
-          Event
-          |> Ash.Changeset.for_create(:log, %{
-            session_id: session.id,
-            event_type: event_type,
-            data: data
-          })
-          |> Ash.create()
-        end
-      end)
+      Task.start(fn -> do_log_event(session_id, event_type, data) end)
     end
 
     :ok
   end
 
+  defp do_log_event(session_id, event_type, data) do
+    with {:ok, session} <- find_session(session_id) do
+      Event
+      |> Ash.Changeset.for_create(:log, %{
+        session_id: session.id,
+        event_type: event_type,
+        data: data
+      })
+      |> Ash.create()
+    end
+  end
+
   # Private helpers
 
   defp find_session(session_id) when is_binary(session_id) do
diff --git a/lib/agent_jido/forge/resources/checkpoint.ex b/lib/agent_jido/forge/resources/checkpoint.ex
index be6c33d..3761dc6 100644
--- a/lib/agent_jido/forge/resources/checkpoint.ex
+++ b/lib/agent_jido/forge/resources/checkpoint.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Forge.Resources.Checkpoint do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Forge.Domain,
diff --git a/lib/agent_jido/forge/resources/event.ex b/lib/agent_jido/forge/resources/event.ex
index 2228586..158de94 100644
--- a/lib/agent_jido/forge/resources/event.ex
+++ b/lib/agent_jido/forge/resources/event.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Forge.Resources.Event do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Forge.Domain,
diff --git a/lib/agent_jido/forge/resources/exec_session.ex b/lib/agent_jido/forge/resources/exec_session.ex
index f68cb49..815b2a9 100644
--- a/lib/agent_jido/forge/resources/exec_session.ex
+++ b/lib/agent_jido/forge/resources/exec_session.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Forge.Resources.ExecSession do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Forge.Domain,
diff --git a/lib/agent_jido/forge/resources/session.ex b/lib/agent_jido/forge/resources/session.ex
index eeef6f0..2efedf1 100644
--- a/lib/agent_jido/forge/resources/session.ex
+++ b/lib/agent_jido/forge/resources/session.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Forge.Resources.Session do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Forge.Domain,
diff --git a/lib/agent_jido/forge/resources/sprite_spec.ex b/lib/agent_jido/forge/resources/sprite_spec.ex
index cd65da9..40298f3 100644
--- a/lib/agent_jido/forge/resources/sprite_spec.ex
+++ b/lib/agent_jido/forge/resources/sprite_spec.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Forge.Resources.SpriteSpec do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Forge.Domain,
diff --git a/lib/agent_jido/forge/resources/workflow.ex b/lib/agent_jido/forge/resources/workflow.ex
index d9bcbc5..8a448e2 100644
--- a/lib/agent_jido/forge/resources/workflow.ex
+++ b/lib/agent_jido/forge/resources/workflow.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Forge.Resources.Workflow do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.Forge.Domain,
diff --git a/lib/agent_jido/forge/runner.ex b/lib/agent_jido/forge/runner.ex
index ca37bf4..b9c7642 100644
--- a/lib/agent_jido/forge/runner.ex
+++ b/lib/agent_jido/forge/runner.ex
@@ -47,8 +47,10 @@ defmodule AgentJido.Forge.Runner do
   Apply external input to the runner.
 
   Called when the runner is in `:needs_input` status and input has been provided.
+  Return `{:ok, new_state}` to update the runner state after applying input.
   """
-  @callback apply_input(sprite_client(), input(), state()) :: :ok | {:error, term()}
+  @callback apply_input(sprite_client(), input(), state()) ::
+              :ok | {:ok, state()} | {:error, term()}
 
   @doc """
   Handle streaming output from the sprite.
diff --git a/lib/agent_jido/forge/runners/claude_code.ex b/lib/agent_jido/forge/runners/claude_code.ex
index cda86ce..bed0c5f 100644
--- a/lib/agent_jido/forge/runners/claude_code.ex
+++ b/lib/agent_jido/forge/runners/claude_code.ex
@@ -26,6 +26,7 @@ defmodule AgentJido.Forge.Runners.ClaudeCode do
 
   @behaviour AgentJido.Forge.Runner
 
+  alias AgentJido.Forge.Runner
   alias AgentJido.Forge.SpriteClient
 
   @forge_home "/var/local/forge"
@@ -33,35 +34,37 @@ defmodule AgentJido.Forge.Runners.ClaudeCode do
   @impl true
   def init(client, config) do
     with :ok <- setup_directories(client),
-         :ok <- setup_claude_settings(client, config),
-         :ok <- setup_templates(client, config) do
-      :ok
+         :ok <- setup_claude_settings(client, config) do
+      setup_templates(client, config)
     end
   end
 
   @impl true
   def run_iteration(client, state, opts) do
+    {model, max_turns, max_budget, prompt} = resolve_run_options(state, opts)
+    cmd = build_claude_command(model, max_turns, max_budget, prompt)
+
+    client
+    |> SpriteClient.exec(cmd, timeout: :infinity)
+    |> handle_exec_result()
+  end
+
+  defp resolve_run_options(state, opts) do
     model = opts[:model] || state[:model] || "claude-sonnet-4-20250514"
     max_turns = opts[:max_turns] || state[:max_turns] || 200
     max_budget = opts[:max_budget] || state[:max_budget] || 10.0
     prompt = opts[:prompt] || state[:prompt]
+    {model, max_turns, max_budget, prompt}
+  end
 
-    cmd = build_claude_command(model, max_turns, max_budget, prompt)
+  defp handle_exec_result({output, 0}), do: {:ok, parse_claude_output(output)}
 
-    case SpriteClient.exec(client, cmd, timeout: :infinity) do
-      {output, 0} ->
-        result = parse_claude_output(output)
-        {:ok, result}
-
-      {output, code} ->
-        {:ok,
-         %{
-           status: :error,
-           output: output,
-           error: "Claude exited with code #{code}",
-           metadata: %{exit_code: code}
-         }}
-    end
+  defp handle_exec_result({output, code}) do
+    {:ok,
+     Runner.error("Claude exited with code #{code}",
+       output: output,
+       metadata: %{exit_code: code}
+     )}
   end
 
   @impl true
@@ -115,9 +118,8 @@ defmodule AgentJido.Forge.Runners.ClaudeCode do
   end
 
   defp setup_templates(client, config) do
-    with :ok <- maybe_write_template(client, config, :prompt_template, "iterate.md"),
-         :ok <- maybe_write_template(client, config, :context_template, "context.md") do
-      :ok
+    with :ok <- maybe_write_template(client, config, :prompt_template, "iterate.md") do
+      maybe_write_template(client, config, :context_template, "context.md")
     end
   end
 
@@ -178,11 +180,10 @@ defmodule AgentJido.Forge.Runners.ClaudeCode do
 
     cond do
       is_nil(last_event) ->
-        %{status: :done, output: output, metadata: %{}}
+        Runner.done(output: output, metadata: %{})
 
       last_event["type"] == "result" && last_event["subtype"] == "success" ->
-        %{
-          status: :done,
+        Runner.done(
           output: output,
           summary: last_event["result"],
           metadata: %{
@@ -190,18 +191,17 @@ defmodule AgentJido.Forge.Runners.ClaudeCode do
             duration_ms: last_event["duration_ms"],
             session_id: last_event["session_id"]
           }
-        }
+        )
 
       last_event["type"] == "result" && last_event["subtype"] == "error_max_turns" ->
-        %{
-          status: :continue,
+        Runner.continue(
           output: output,
           summary: "Max turns reached",
           metadata: %{cost_usd: last_event["cost_usd"]}
-        }
+        )
 
       true ->
-        %{status: :done, output: output, metadata: %{}}
+        Runner.done(output: output, metadata: %{})
     end
   end
 
diff --git a/lib/agent_jido/forge/sprite_client/fake.ex b/lib/agent_jido/forge/sprite_client/fake.ex
index ce1a579..d0434a7 100644
--- a/lib/agent_jido/forge/sprite_client/fake.ex
+++ b/lib/agent_jido/forge/sprite_client/fake.ex
@@ -173,18 +173,7 @@ defmodule AgentJido.Forge.SpriteClient.Fake do
 
     case Map.keys(sprites) do
       [sprite_id | _] ->
-        Agent.update(agent_pid, fn sprites ->
-          update_in(sprites, [sprite_id, :env], fn existing_env ->
-            # Normalize all env values to strings (binaries)
-            normalized_map =
-              env_map
-              |> Enum.map(fn {k, v} -> {to_binary_string(k), to_binary_string(v)} end)
-              |> Map.new()
-
-            Map.merge(existing_env || %{}, normalized_map)
-          end)
-        end)
-
+        Agent.update(agent_pid, &merge_env_into_sprite(&1, sprite_id, env_map))
         :ok
 
       [] ->
@@ -192,6 +181,17 @@ defmodule AgentJido.Forge.SpriteClient.Fake do
     end
   end
 
+  defp merge_env_into_sprite(sprites, sprite_id, env_map) do
+    normalized_map = normalize_env_map(env_map)
+    update_in(sprites, [sprite_id, :env], &Map.merge(&1 || %{}, normalized_map))
+  end
+
+  defp normalize_env_map(env_map) do
+    env_map
+    |> Enum.map(fn {k, v} -> {to_binary_string(k), to_binary_string(v)} end)
+    |> Map.new()
+  end
+
   @impl true
   def destroy(%__MODULE__{agent_pid: agent_pid} = _client, sprite_id) do
     ensure_agent_started(agent_pid)
diff --git a/lib/agent_jido/forge/sprite_client/live.ex b/lib/agent_jido/forge/sprite_client/live.ex
index f3c0ab5..b5163cd 100644
--- a/lib/agent_jido/forge/sprite_client/live.ex
+++ b/lib/agent_jido/forge/sprite_client/live.ex
@@ -131,9 +131,7 @@ defmodule AgentJido.Forge.SpriteClient.Live do
 
   def inject_env(%__MODULE__{sprite: sprite} = _client, env_map) do
     env_lines =
-      env_map
-      |> Enum.map(fn {k, v} -> "export #{k}=\"#{escape_value(v)}\"" end)
-      |> Enum.join("\n")
+      Enum.map_join(env_map, "\n", fn {k, v} -> "export #{k}=\"#{escape_value(v)}\"" end)
 
     encoded = Base.encode64(env_lines <> "\n")
 
diff --git a/lib/agent_jido/forge/sprite_session.ex b/lib/agent_jido/forge/sprite_session.ex
index 6e32a32..2a0366b 100644
--- a/lib/agent_jido/forge/sprite_session.ex
+++ b/lib/agent_jido/forge/sprite_session.ex
@@ -279,6 +279,17 @@ defmodule AgentJido.Forge.SpriteSession do
         Persistence.record_input_applied(state.session_id, state.runner_state)
         {:reply, :ok, new_state}
 
+      {:ok, new_runner_state} ->
+        new_state = %{
+          state
+          | state: :ready,
+            runner_state: new_runner_state,
+            last_activity: DateTime.utc_now()
+        }
+
+        Persistence.record_input_applied(state.session_id, new_runner_state)
+        {:reply, :ok, new_state}
+
       {:error, reason} ->
         {:reply, {:error, reason}, state}
     end
diff --git a/lib/agent_jido/forge/workers/streaming_exec_session_worker.ex b/lib/agent_jido/forge/workers/streaming_exec_session_worker.ex
index 46242da..6cbddb5 100644
--- a/lib/agent_jido/forge/workers/streaming_exec_session_worker.ex
+++ b/lib/agent_jido/forge/workers/streaming_exec_session_worker.ex
@@ -11,7 +11,7 @@ defmodule AgentJido.Forge.Workers.StreamingExecSessionWorker do
   require Logger
 
   alias AgentJido.Forge.PubSub, as: ForgePubSub
-  alias AgentJido.Forge.Resources.{ExecSession, Event}
+  alias AgentJido.Forge.Resources.{Event, ExecSession}
 
   @chunk_coalesce_ms 50
   @max_buffer_size 64 * 1024
diff --git a/lib/agent_jido/github.ex b/lib/agent_jido/github.ex
index d28ddb2..5d0b96b 100644
--- a/lib/agent_jido/github.ex
+++ b/lib/agent_jido/github.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.GitHub do
+  @moduledoc false
   use Ash.Domain, otp_app: :agent_jido, extensions: [AshAdmin.Domain]
 
   admin do
diff --git a/lib/agent_jido/github/issue_analysis.ex b/lib/agent_jido/github/issue_analysis.ex
index 1732006..a9f8089 100644
--- a/lib/agent_jido/github/issue_analysis.ex
+++ b/lib/agent_jido/github/issue_analysis.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.GitHub.IssueAnalysis do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.GitHub,
diff --git a/lib/agent_jido/github/webhook_delivery.ex b/lib/agent_jido/github/webhook_delivery.ex
index 4365c1d..94a22f3 100644
--- a/lib/agent_jido/github/webhook_delivery.ex
+++ b/lib/agent_jido/github/webhook_delivery.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.GitHub.WebhookDelivery do
+  @moduledoc false
   use Ash.Resource,
     otp_app: :agent_jido,
     domain: AgentJido.GitHub,
diff --git a/lib/agent_jido/github_issue_bot/cli/run.ex b/lib/agent_jido/github_issue_bot/cli/run.ex
index 9f8a706..1f24156 100644
--- a/lib/agent_jido/github_issue_bot/cli/run.ex
+++ b/lib/agent_jido/github_issue_bot/cli/run.ex
@@ -10,9 +10,9 @@ defmodule AgentJido.GithubIssueBot.CLI.Run do
       mix run -e "AgentJido.GithubIssueBot.CLI.Run.run(run_id: \\"test-run\\")"
   """
 
+  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
   alias Jido.AgentServer
   alias Jido.Signal
-  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
 
   require Logger
 
@@ -119,7 +119,7 @@ defmodule AgentJido.GithubIssueBot.CLI.Run do
 
     Enum.each(artifacts, fn {name, artifact} ->
       IO.puts("\n--- #{name} ---")
-      IO.inspect(artifact, pretty: true, limit: :infinity)
+      IO.puts(inspect(artifact, pretty: true, limit: :infinity))
     end)
   end
 
@@ -132,9 +132,9 @@ defmodule AgentJido.GithubIssueBot.CLI.Run do
       print_artifacts(state.artifacts)
     end
 
-    if length(state.errors) > 0 do
+    if state.errors != [] do
       IO.puts("\n--- Errors ---")
-      Enum.each(state.errors, &IO.inspect/1)
+      Enum.each(state.errors, fn error -> IO.puts(inspect(error)) end)
     end
   end
 end
diff --git a/lib/agent_jido/github_issue_bot/issue_run/actions/pull_request_result_action.ex b/lib/agent_jido/github_issue_bot/issue_run/actions/pull_request_result_action.ex
index 45719f8..97934af 100644
--- a/lib/agent_jido/github_issue_bot/issue_run/actions/pull_request_result_action.ex
+++ b/lib/agent_jido/github_issue_bot/issue_run/actions/pull_request_result_action.ex
@@ -31,9 +31,7 @@ defmodule AgentJido.GithubIssueBot.IssueRun.Actions.PullRequestResultAction do
 
     cond do
       current_run_id != run_id ->
-        Logger.warning(
-          "Received pull_request result for wrong run: #{run_id} (expected #{current_run_id})"
-        )
+        Logger.warning("Received pull_request result for wrong run: #{run_id} (expected #{current_run_id})")
 
         {:ok, %{}}
 
diff --git a/lib/agent_jido/github_issue_bot/issue_run/actions/research_result_action.ex b/lib/agent_jido/github_issue_bot/issue_run/actions/research_result_action.ex
index e566711..14ef900 100644
--- a/lib/agent_jido/github_issue_bot/issue_run/actions/research_result_action.ex
+++ b/lib/agent_jido/github_issue_bot/issue_run/actions/research_result_action.ex
@@ -18,8 +18,8 @@ defmodule AgentJido.GithubIssueBot.IssueRun.Actions.ResearchResultAction do
       summary: [type: :string, default: ""]
     ]
 
-  alias Jido.Agent.Directive
   alias AgentJido.GithubIssueBot.PullRequest.PullRequestCoordinator
+  alias Jido.Agent.Directive
 
   require Logger
 
@@ -30,9 +30,7 @@ defmodule AgentJido.GithubIssueBot.IssueRun.Actions.ResearchResultAction do
 
     cond do
       current_run_id != run_id ->
-        Logger.warning(
-          "Received research result for wrong run: #{run_id} (expected #{current_run_id})"
-        )
+        Logger.warning("Received research result for wrong run: #{run_id} (expected #{current_run_id})")
 
         {:ok, %{}}
 
diff --git a/lib/agent_jido/github_issue_bot/issue_run/actions/start_run_action.ex b/lib/agent_jido/github_issue_bot/issue_run/actions/start_run_action.ex
index 769f2c0..ef3b15b 100644
--- a/lib/agent_jido/github_issue_bot/issue_run/actions/start_run_action.ex
+++ b/lib/agent_jido/github_issue_bot/issue_run/actions/start_run_action.ex
@@ -11,8 +11,8 @@ defmodule AgentJido.GithubIssueBot.IssueRun.Actions.StartRunAction do
       issue: [type: :map, required: true]
     ]
 
-  alias Jido.Agent.Directive
   alias AgentJido.GithubIssueBot.Triage.TriageAgent
+  alias Jido.Agent.Directive
 
   require Logger
 
diff --git a/lib/agent_jido/github_issue_bot/issue_run/actions/triage_result_action.ex b/lib/agent_jido/github_issue_bot/issue_run/actions/triage_result_action.ex
index fc44c38..4ac2530 100644
--- a/lib/agent_jido/github_issue_bot/issue_run/actions/triage_result_action.ex
+++ b/lib/agent_jido/github_issue_bot/issue_run/actions/triage_result_action.ex
@@ -14,8 +14,8 @@ defmodule AgentJido.GithubIssueBot.IssueRun.Actions.TriageResultAction do
       summary: [type: :string, default: ""]
     ]
 
-  alias Jido.Agent.Directive
   alias AgentJido.GithubIssueBot.Research.ResearchCoordinator
+  alias Jido.Agent.Directive
 
   require Logger
 
@@ -34,9 +34,7 @@ defmodule AgentJido.GithubIssueBot.IssueRun.Actions.TriageResultAction do
 
     cond do
       current_run_id != run_id ->
-        Logger.warning(
-          "Received triage result for wrong run: #{run_id} (expected #{current_run_id})"
-        )
+        Logger.warning("Received triage result for wrong run: #{run_id} (expected #{current_run_id})")
 
         {:ok, %{}}
 
diff --git a/lib/agent_jido/github_issue_bot/issue_run/coordinator_agent.ex b/lib/agent_jido/github_issue_bot/issue_run/coordinator_agent.ex
index d9f6e46..e05157e 100644
--- a/lib/agent_jido/github_issue_bot/issue_run/coordinator_agent.ex
+++ b/lib/agent_jido/github_issue_bot/issue_run/coordinator_agent.ex
@@ -40,11 +40,11 @@ defmodule AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent do
     ]
 
   alias AgentJido.GithubIssueBot.IssueRun.Actions.{
-    StartRunAction,
     ChildStartedAction,
-    TriageResultAction,
+    PullRequestResultAction,
     ResearchResultAction,
-    PullRequestResultAction
+    StartRunAction,
+    TriageResultAction
   }
 
   def signal_routes do
diff --git a/lib/agent_jido/github_issue_bot/pull_request/actions/patch_result_action.ex b/lib/agent_jido/github_issue_bot/pull_request/actions/patch_result_action.ex
index efdf034..0a1dc05 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/actions/patch_result_action.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/actions/patch_result_action.ex
@@ -12,8 +12,8 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Actions.PatchResultAction do
       result: [type: :map, required: true]
     ]
 
-  alias Jido.Agent.Directive
   alias AgentJido.GithubIssueBot.PullRequest.Workers.QualityAgent
+  alias Jido.Agent.Directive
 
   require Logger
 
diff --git a/lib/agent_jido/github_issue_bot/pull_request/actions/pr_submit_result_action.ex b/lib/agent_jido/github_issue_bot/pull_request/actions/pr_submit_result_action.ex
index 3739f28..c821b29 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/actions/pr_submit_result_action.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/actions/pr_submit_result_action.ex
@@ -70,7 +70,7 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Actions.PRSubmitResultAction do
             source: "/pull_request_coordinator"
           )
 
-        emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+        emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
         {:ok,
          %{
diff --git a/lib/agent_jido/github_issue_bot/pull_request/actions/quality_result_action.ex b/lib/agent_jido/github_issue_bot/pull_request/actions/quality_result_action.ex
index 49882b3..bace901 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/actions/quality_result_action.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/actions/quality_result_action.ex
@@ -161,7 +161,7 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Actions.QualityResultAction do
         source: "/pull_request_coordinator"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
diff --git a/lib/agent_jido/github_issue_bot/pull_request/actions/start_pull_request_action.ex b/lib/agent_jido/github_issue_bot/pull_request/actions/start_pull_request_action.ex
index 6613999..8f70dd2 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/actions/start_pull_request_action.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/actions/start_pull_request_action.ex
@@ -23,8 +23,8 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Actions.StartPullRequestAction do
       research: [type: :map, required: true]
     ]
 
-  alias Jido.Agent.Directive
   alias AgentJido.GithubIssueBot.PullRequest.Workers.PatchAgent
+  alias Jido.Agent.Directive
 
   require Logger
 
diff --git a/lib/agent_jido/github_issue_bot/pull_request/pull_request_coordinator.ex b/lib/agent_jido/github_issue_bot/pull_request/pull_request_coordinator.ex
index 4729d13..886789e 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/pull_request_coordinator.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/pull_request_coordinator.ex
@@ -64,11 +64,11 @@ defmodule AgentJido.GithubIssueBot.PullRequest.PullRequestCoordinator do
     ]
 
   alias AgentJido.GithubIssueBot.PullRequest.Actions.{
-    StartPullRequestAction,
-    WorkerStartedAction,
     PatchResultAction,
+    PRSubmitResultAction,
     QualityResultAction,
-    PRSubmitResultAction
+    StartPullRequestAction,
+    WorkerStartedAction
   }
 
   def signal_routes do
diff --git a/lib/agent_jido/github_issue_bot/pull_request/workers/actions/patch_action.ex b/lib/agent_jido/github_issue_bot/pull_request/workers/actions/patch_action.ex
index b28b0e8..340f475 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/workers/actions/patch_action.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/workers/actions/patch_action.ex
@@ -77,7 +77,7 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Workers.Actions.PatchAction do
         source: "/patch_agent"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
diff --git a/lib/agent_jido/github_issue_bot/pull_request/workers/actions/pr_submit_action.ex b/lib/agent_jido/github_issue_bot/pull_request/workers/actions/pr_submit_action.ex
index e3476b0..99adf3a 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/workers/actions/pr_submit_action.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/workers/actions/pr_submit_action.ex
@@ -60,6 +60,7 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Workers.Actions.PRSubmitAction do
     # Stub: Generate mock PR data
     # TODO: Replace with actual GitHub API calls
     pr_number = generate_pr_number()
+
     result = %{
       pr_number: pr_number,
       pr_url: "https://github.com/#{repo}/pull/#{pr_number}",
@@ -83,7 +84,7 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Workers.Actions.PRSubmitAction do
         source: "/pr_submit_agent"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
@@ -118,7 +119,10 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Workers.Actions.PRSubmitAction do
     classification = Map.get(triage, :classification, :unknown)
     root_cause = get_in(research, [:root_cause, :hypothesis]) || "See research findings"
 
-    attempt_note = if attempt > 1, do: "\n\n> **Note**: This fix required #{attempt} iterations to pass all quality checks.", else: ""
+    attempt_note =
+      if attempt > 1,
+        do: "\n\n> **Note**: This fix required #{attempt} iterations to pass all quality checks.",
+        else: ""
 
     """
     ## Summary
diff --git a/lib/agent_jido/github_issue_bot/pull_request/workers/actions/quality_action.ex b/lib/agent_jido/github_issue_bot/pull_request/workers/actions/quality_action.ex
index 97f7f51..8964e67 100644
--- a/lib/agent_jido/github_issue_bot/pull_request/workers/actions/quality_action.ex
+++ b/lib/agent_jido/github_issue_bot/pull_request/workers/actions/quality_action.ex
@@ -65,7 +65,7 @@ defmodule AgentJido.GithubIssueBot.PullRequest.Workers.Actions.QualityAction do
         source: "/quality_agent"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
diff --git a/lib/agent_jido/github_issue_bot/research/actions/start_research_action.ex b/lib/agent_jido/github_issue_bot/research/actions/start_research_action.ex
index a01370f..915b8a2 100644
--- a/lib/agent_jido/github_issue_bot/research/actions/start_research_action.ex
+++ b/lib/agent_jido/github_issue_bot/research/actions/start_research_action.ex
@@ -18,15 +18,15 @@ defmodule AgentJido.GithubIssueBot.Research.Actions.StartResearchAction do
       triage: [type: :map, required: true]
     ]
 
-  alias Jido.Agent.Directive
-
   alias AgentJido.GithubIssueBot.Research.Workers.{
     CodeSearchAgent,
+    PRSearchAgent,
     ReproductionAgent,
-    RootCauseAgent,
-    PRSearchAgent
+    RootCauseAgent
   }
 
+  alias Jido.Agent.Directive
+
   require Logger
 
   # Workers to spawn - each gets a tag for identification
diff --git a/lib/agent_jido/github_issue_bot/research/actions/worker_result_action.ex b/lib/agent_jido/github_issue_bot/research/actions/worker_result_action.ex
index c4018d1..4b705c1 100644
--- a/lib/agent_jido/github_issue_bot/research/actions/worker_result_action.ex
+++ b/lib/agent_jido/github_issue_bot/research/actions/worker_result_action.ex
@@ -94,7 +94,7 @@ defmodule AgentJido.GithubIssueBot.Research.Actions.WorkerResultAction do
         source: "/research_coordinator"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
@@ -109,12 +109,10 @@ defmodule AgentJido.GithubIssueBot.Research.Actions.WorkerResultAction do
   # TODO: Could use LLM to synthesize a coherent narrative
   defp synthesize_summary(worker_results) do
     parts =
-      worker_results
-      |> Enum.map(fn {worker, result} ->
+      Enum.map_join(worker_results, "; ", fn {worker, result} ->
         summary = Map.get(result, :summary, "No summary")
         "#{worker}: #{summary}"
       end)
-      |> Enum.join("; ")
 
     "Research complete. #{parts}"
   end
diff --git a/lib/agent_jido/github_issue_bot/research/research_coordinator.ex b/lib/agent_jido/github_issue_bot/research/research_coordinator.ex
index a787e4f..5a1c6d2 100644
--- a/lib/agent_jido/github_issue_bot/research/research_coordinator.ex
+++ b/lib/agent_jido/github_issue_bot/research/research_coordinator.ex
@@ -45,8 +45,8 @@ defmodule AgentJido.GithubIssueBot.Research.ResearchCoordinator do
 
   alias AgentJido.GithubIssueBot.Research.Actions.{
     StartResearchAction,
-    WorkerStartedAction,
-    WorkerResultAction
+    WorkerResultAction,
+    WorkerStartedAction
   }
 
   def signal_routes do
diff --git a/lib/agent_jido/github_issue_bot/research/workers/actions/code_search_action.ex b/lib/agent_jido/github_issue_bot/research/workers/actions/code_search_action.ex
index 2c17707..8988785 100644
--- a/lib/agent_jido/github_issue_bot/research/workers/actions/code_search_action.ex
+++ b/lib/agent_jido/github_issue_bot/research/workers/actions/code_search_action.ex
@@ -64,7 +64,7 @@ defmodule AgentJido.GithubIssueBot.Research.Workers.Actions.CodeSearchAction do
         source: "/code_search"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
diff --git a/lib/agent_jido/github_issue_bot/research/workers/actions/pr_search_action.ex b/lib/agent_jido/github_issue_bot/research/workers/actions/pr_search_action.ex
index ac37e25..1115bb0 100644
--- a/lib/agent_jido/github_issue_bot/research/workers/actions/pr_search_action.ex
+++ b/lib/agent_jido/github_issue_bot/research/workers/actions/pr_search_action.ex
@@ -67,7 +67,7 @@ defmodule AgentJido.GithubIssueBot.Research.Workers.Actions.PRSearchAction do
         source: "/pr_search"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
diff --git a/lib/agent_jido/github_issue_bot/research/workers/actions/reproduction_action.ex b/lib/agent_jido/github_issue_bot/research/workers/actions/reproduction_action.ex
index dbbb905..7cee009 100644
--- a/lib/agent_jido/github_issue_bot/research/workers/actions/reproduction_action.ex
+++ b/lib/agent_jido/github_issue_bot/research/workers/actions/reproduction_action.ex
@@ -64,7 +64,7 @@ defmodule AgentJido.GithubIssueBot.Research.Workers.Actions.ReproductionAction d
         source: "/reproduction"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
diff --git a/lib/agent_jido/github_issue_bot/research/workers/actions/root_cause_action.ex b/lib/agent_jido/github_issue_bot/research/workers/actions/root_cause_action.ex
index 5db542c..608c42d 100644
--- a/lib/agent_jido/github_issue_bot/research/workers/actions/root_cause_action.ex
+++ b/lib/agent_jido/github_issue_bot/research/workers/actions/root_cause_action.ex
@@ -67,7 +67,7 @@ defmodule AgentJido.GithubIssueBot.Research.Workers.Actions.RootCauseAction do
         source: "/root_cause"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
@@ -80,33 +80,21 @@ defmodule AgentJido.GithubIssueBot.Research.Workers.Actions.RootCauseAction do
   # Generate hypothesis based on keywords and classification
   defp hypothesize(title, body, classification) do
     cond do
-      # State-related issues
-      String.contains?(body, "state") and String.contains?(body, "persist") ->
-        {"State serialization/deserialization issue", :medium, "lib/core/state.ex"}
-
-      String.contains?(body, "state") and String.contains?(body, "lost") ->
-        {"State not being saved properly", :medium, "lib/core/agent.ex"}
-
-      # Concurrency issues
-      String.contains?(body, "race") or String.contains?(body, "concurrent") ->
-        {"Race condition in concurrent operations", :low, "lib/core/"}
-
-      # Error handling
-      String.contains?(title, "error") or String.contains?(body, "exception") ->
-        {"Unhandled error case", :medium, "lib/"}
-
-      # Classification-based fallbacks
-      classification == :bug ->
-        {"Logic error in core functionality", :low, "lib/"}
-
-      classification == :feature ->
-        {"Missing feature implementation", :high, "lib/"}
-
-      true ->
-        {"Unable to determine root cause", :low, nil}
+      state_persist_issue?(body) -> {"State serialization/deserialization issue", :medium, "lib/core/state.ex"}
+      state_lost_issue?(body) -> {"State not being saved properly", :medium, "lib/core/agent.ex"}
+      concurrency_issue?(body) -> {"Race condition in concurrent operations", :low, "lib/core/"}
+      error_handling_issue?(title, body) -> {"Unhandled error case", :medium, "lib/"}
+      classification == :bug -> {"Logic error in core functionality", :low, "lib/"}
+      classification == :feature -> {"Missing feature implementation", :high, "lib/"}
+      true -> {"Unable to determine root cause", :low, nil}
     end
   end
 
+  defp state_persist_issue?(body), do: String.contains?(body, "state") and String.contains?(body, "persist")
+  defp state_lost_issue?(body), do: String.contains?(body, "state") and String.contains?(body, "lost")
+  defp concurrency_issue?(body), do: String.contains?(body, "race") or String.contains?(body, "concurrent")
+  defp error_handling_issue?(title, body), do: String.contains?(title, "error") or String.contains?(body, "exception")
+
   # Extract evidence from issue body
   defp extract_evidence(body) do
     evidence = []
diff --git a/lib/agent_jido/github_issue_bot/triage/actions/triage_action.ex b/lib/agent_jido/github_issue_bot/triage/actions/triage_action.ex
index 6c8a5de..3884a33 100644
--- a/lib/agent_jido/github_issue_bot/triage/actions/triage_action.ex
+++ b/lib/agent_jido/github_issue_bot/triage/actions/triage_action.ex
@@ -43,7 +43,7 @@ defmodule AgentJido.GithubIssueBot.Triage.Actions.TriageAction do
         source: "/triage"
       )
 
-    emit_directive = Directive.emit_to_parent(%{state: context.state}, result_signal)
+    emit_directive = Directive.emit_to_parent(context.agent, result_signal)
 
     {:ok,
      %{
@@ -55,22 +55,29 @@ defmodule AgentJido.GithubIssueBot.Triage.Actions.TriageAction do
 
   defp classify(title, _body, labels) do
     cond do
-      "bug" in labels or String.contains?(title, "bug") or String.contains?(title, "error") ->
-        :bug
+      bug?(title, labels) -> :bug
+      feature?(title, labels) -> :feature
+      question?(title, labels) -> :question
+      documentation?(title, labels) -> :documentation
+      true -> :unknown
+    end
+  end
 
-      "feature" in labels or "enhancement" in labels or
-        String.contains?(title, "feature") or String.contains?(title, "add") ->
-        :feature
+  defp bug?(title, labels) do
+    "bug" in labels or String.contains?(title, "bug") or String.contains?(title, "error")
+  end
 
-      "question" in labels or String.contains?(title, "?") ->
-        :question
+  defp feature?(title, labels) do
+    "feature" in labels or "enhancement" in labels or
+      String.contains?(title, "feature") or String.contains?(title, "add")
+  end
 
-      "documentation" in labels or String.contains?(title, "docs") ->
-        :documentation
+  defp question?(title, labels) do
+    "question" in labels or String.contains?(title, "?")
+  end
 
-      true ->
-        :unknown
-    end
+  defp documentation?(title, labels) do
+    "documentation" in labels or String.contains?(title, "docs")
   end
 
   defp needs_more_info?(body) do
diff --git a/lib/agent_jido/secrets.ex b/lib/agent_jido/secrets.ex
index 6c42606..84e8d68 100644
--- a/lib/agent_jido/secrets.ex
+++ b/lib/agent_jido/secrets.ex
@@ -1,4 +1,5 @@
 defmodule AgentJido.Secrets do
+  @moduledoc false
   use AshAuthentication.Secret
 
   def secret_for(
diff --git a/lib/agent_jido_web.ex b/lib/agent_jido_web.ex
index 6d4adea..212b0d0 100644
--- a/lib/agent_jido_web.ex
+++ b/lib/agent_jido_web.ex
@@ -88,8 +88,8 @@ defmodule AgentJidoWeb do
       use AgentJidoWeb.Components.MishkaComponents
 
       # Common modules used in templates
-      alias Phoenix.LiveView.JS
       alias AgentJidoWeb.Layouts
+      alias Phoenix.LiveView.JS
 
       # Routes generation with the ~p sigil
       unquote(verified_routes())
diff --git a/lib/agent_jido_web/ash_json_api_router.ex b/lib/agent_jido_web/ash_json_api_router.ex
index 3b64b48..165d4d6 100644
--- a/lib/agent_jido_web/ash_json_api_router.ex
+++ b/lib/agent_jido_web/ash_json_api_router.ex
@@ -1,4 +1,5 @@
 defmodule AgentJidoWeb.AshJsonApiRouter do
+  @moduledoc false
   use AshJsonApi.Router,
     domains: [],
     open_api: "/open_api"
diff --git a/lib/agent_jido_web/auth_overrides.ex b/lib/agent_jido_web/auth_overrides.ex
index 5b388ab..28fc9ab 100644
--- a/lib/agent_jido_web/auth_overrides.ex
+++ b/lib/agent_jido_web/auth_overrides.ex
@@ -1,4 +1,5 @@
 defmodule AgentJidoWeb.AuthOverrides do
+  @moduledoc false
   use AshAuthentication.Phoenix.Overrides
 
   # configure your UI overrides here
diff --git a/lib/agent_jido_web/components/accordion.ex b/lib/agent_jido_web/components/accordion.ex
index 792acd4..67776b5 100644
--- a/lib/agent_jido_web/components/accordion.ex
+++ b/lib/agent_jido_web/components/accordion.ex
@@ -150,8 +150,8 @@ defmodule AgentJidoWeb.Components.Accordion do
       |> Enum.map(& &1.id)
 
     cond do
-      length(initial_open) > 0 -> Enum.join(initial_open, ",")
-      length(slot_open_items) > 0 -> Enum.join(slot_open_items, ",")
+      initial_open != [] -> Enum.join(initial_open, ",")
+      slot_open_items != [] -> Enum.join(slot_open_items, ",")
       true -> ""
     end
   end
diff --git a/lib/agent_jido_web/components/blockquote.ex b/lib/agent_jido_web/components/blockquote.ex
index 66ed5ed..ec3c962 100644
--- a/lib/agent_jido_web/components/blockquote.ex
+++ b/lib/agent_jido_web/components/blockquote.ex
@@ -228,7 +228,8 @@ defmodule AgentJidoWeb.Components.Blockquote do
   defp space_class(params) when is_binary(params), do: params
 
   defp border_class(_, _, variant)
-       when variant in ["default", "shadow", "transparent", "gradient"], do: nil
+       when variant in ["default", "shadow", "transparent", "gradient"],
+       do: nil
 
   defp border_class(_, "none", _), do: nil
 
diff --git a/lib/agent_jido_web/components/breadcrumb.ex b/lib/agent_jido_web/components/breadcrumb.ex
index 19609cb..e476b4b 100644
--- a/lib/agent_jido_web/components/breadcrumb.ex
+++ b/lib/agent_jido_web/components/breadcrumb.ex
@@ -249,7 +249,7 @@ defmodule AgentJidoWeb.Components.Breadcrumb do
 
   defp size_class(params) when is_binary(params), do: params
 
-  defp default_classes() do
+  defp default_classes do
     [
       "flex items-center transition-all ease-in-out duration-100 group"
     ]
diff --git a/lib/agent_jido_web/components/button.ex b/lib/agent_jido_web/components/button.ex
index e9bac8b..b8ac11a 100644
--- a/lib/agent_jido_web/components/button.ex
+++ b/lib/agent_jido_web/components/button.ex
@@ -191,7 +191,7 @@ defmodule AgentJidoWeb.Components.Button do
   end
 
   def button(assigns) do
-    assigns = assign_new(assigns, :indicator, fn -> is_indicators?(assigns[:rest]) end)
+    assigns = assign_new(assigns, :indicator, fn -> has_indicators?(assigns[:rest]) end)
 
     ~H"""
     <button
@@ -390,7 +390,7 @@ defmodule AgentJidoWeb.Components.Button do
   end
 
   def button_link(%{navigate: _navigate} = assigns) do
-    assigns = assign_new(assigns, :indicator, fn -> is_indicators?(assigns[:rest]) end)
+    assigns = assign_new(assigns, :indicator, fn -> has_indicators?(assigns[:rest]) end)
 
     ~H"""
     <.link
@@ -434,7 +434,7 @@ defmodule AgentJidoWeb.Components.Button do
   end
 
   def button_link(%{patch: _patch} = assigns) do
-    assigns = assign_new(assigns, :indicator, fn -> is_indicators?(assigns[:rest]) end)
+    assigns = assign_new(assigns, :indicator, fn -> has_indicators?(assigns[:rest]) end)
 
     ~H"""
     <.link
@@ -477,7 +477,7 @@ defmodule AgentJidoWeb.Components.Button do
   end
 
   def button_link(%{href: _href} = assigns) do
-    assigns = assign_new(assigns, :indicator, fn -> is_indicators?(assigns[:rest]) end)
+    assigns = assign_new(assigns, :indicator, fn -> has_indicators?(assigns[:rest]) end)
 
     ~H"""
     <.link
@@ -2106,7 +2106,7 @@ defmodule AgentJidoWeb.Components.Button do
     Map.drop(rest, all_rest)
   end
 
-  defp is_indicators?(rest) do
+  defp has_indicators?(rest) do
     Enum.any?(@indicator_positions, &Map.get(rest, String.to_atom(&1)))
   end
 end
diff --git a/lib/agent_jido_web/components/checkbox_field.ex b/lib/agent_jido_web/components/checkbox_field.ex
index 6b21086..7390563 100644
--- a/lib/agent_jido_web/components/checkbox_field.ex
+++ b/lib/agent_jido_web/components/checkbox_field.ex
@@ -17,8 +17,8 @@ defmodule AgentJidoWeb.Components.CheckboxField do
   """
 
   use Phoenix.Component
-  alias Phoenix.LiveView.Utils
   alias Phoenix.HTML.Form
+  alias Phoenix.LiveView.Utils
   import AgentJidoWeb.Components.Icon, only: [icon: 1]
 
   @doc """
@@ -93,7 +93,7 @@ defmodule AgentJidoWeb.Components.CheckboxField do
     end)
     |> assign_new(:value, fn -> field.value end)
     |> assign_new(:checked, fn ->
-      Phoenix.HTML.Form.normalize_value("checkbox", assigns[:value])
+      Form.normalize_value("checkbox", assigns[:value])
     end)
     |> checkbox_field()
   end
diff --git a/lib/agent_jido_web/components/core_components.ex b/lib/agent_jido_web/components/core_components.ex
index a682313..a6e359e 100644
--- a/lib/agent_jido_web/components/core_components.ex
+++ b/lib/agent_jido_web/components/core_components.ex
@@ -29,6 +29,7 @@ defmodule AgentJidoWeb.CoreComponents do
   use Phoenix.Component
   use Gettext, backend: AgentJidoWeb.Gettext
 
+  alias Phoenix.HTML.Form
   alias Phoenix.LiveView.JS
 
   @doc """
@@ -123,7 +124,7 @@ defmodule AgentJidoWeb.CoreComponents do
   attr :errors, :list, default: []
   attr :checked, :boolean, doc: "the checked flag for checkbox inputs"
   attr :prompt, :string, default: nil, doc: "the prompt for select inputs"
-  attr :options, :list, doc: "the options to pass to Phoenix.HTML.Form.options_for_select/2"
+  attr :options, :list, doc: "the options to pass to Form.options_for_select/2"
   attr :multiple, :boolean, default: false, doc: "the multiple flag for select inputs"
   attr :class, :any, default: nil, doc: "the input class to use over defaults"
   attr :error_class, :any, default: nil, doc: "the input error class to use over defaults"
@@ -151,7 +152,7 @@ defmodule AgentJidoWeb.CoreComponents do
   def input(%{type: "checkbox"} = assigns) do
     assigns =
       assign_new(assigns, :checked, fn ->
-        Phoenix.HTML.Form.normalize_value("checkbox", assigns[:value])
+        Form.normalize_value("checkbox", assigns[:value])
       end)
 
     ~H"""
@@ -194,7 +195,7 @@ defmodule AgentJidoWeb.CoreComponents do
           {@rest}
         >
           <option :if={@prompt} value="">{@prompt}</option>
-          {Phoenix.HTML.Form.options_for_select(@options, @value)}
+          {Form.options_for_select(@options, @value)}
         </select>
       </label>
       <.error :for={msg <- @errors}>{msg}</.error>
@@ -215,7 +216,7 @@ defmodule AgentJidoWeb.CoreComponents do
             @errors != [] && (@error_class || "textarea-error")
           ]}
           {@rest}
-        >{Phoenix.HTML.Form.normalize_value("textarea", @value)}</textarea>
+        >{Form.normalize_value("textarea", @value)}</textarea>
       </label>
       <.error :for={msg <- @errors}>{msg}</.error>
     </div>
@@ -232,7 +233,7 @@ defmodule AgentJidoWeb.CoreComponents do
           type={@type}
           name={@name}
           id={@id}
-          value={Phoenix.HTML.Form.normalize_value(@type, @value)}
+          value={Form.normalize_value(@type, @value)}
           class={[
             @class || "w-full input",
             @errors != [] && (@error_class || "input-error")
diff --git a/lib/agent_jido_web/components/input_field.ex b/lib/agent_jido_web/components/input_field.ex
index a7a8dc7..eb7b246 100644
--- a/lib/agent_jido_web/components/input_field.ex
+++ b/lib/agent_jido_web/components/input_field.ex
@@ -26,6 +26,7 @@ defmodule AgentJidoWeb.Components.InputField do
   """
 
   use Phoenix.Component
+  alias Phoenix.HTML.Form
   import AgentJidoWeb.Components.Icon, only: [icon: 1]
 
   @doc """
@@ -93,7 +94,7 @@ defmodule AgentJidoWeb.Components.InputField do
   def input(%{type: "checkbox"} = assigns) do
     assigns =
       assign_new(assigns, :checked, fn ->
-        Phoenix.HTML.Form.normalize_value("checkbox", assigns[:value])
+        Form.normalize_value("checkbox", assigns[:value])
       end)
 
     ~H"""
diff --git a/lib/agent_jido_web/components/mega_menu.ex b/lib/agent_jido_web/components/mega_menu.ex
index 3e6c5eb..553d9fc 100644
--- a/lib/agent_jido_web/components/mega_menu.ex
+++ b/lib/agent_jido_web/components/mega_menu.ex
@@ -226,7 +226,7 @@ defmodule AgentJidoWeb.Components.MegaMenu do
     """
   end
 
-  defp trigger_mega_menu(),
+  defp trigger_mega_menu,
     do: "[&>.mega-menu-content]:hover:visible [&>.mega-menu-content]:hover:opacity-100"
 
   defp top_gap("none"), do: "[&>.mega-menu-content]:mt-0"
diff --git a/lib/agent_jido_web/components/mishka_components.ex b/lib/agent_jido_web/components/mishka_components.ex
index 47ff906..24569f4 100644
--- a/lib/agent_jido_web/components/mishka_components.ex
+++ b/lib/agent_jido_web/components/mishka_components.ex
@@ -1,164 +1,142 @@
 defmodule AgentJidoWeb.Components.MishkaComponents do
-  defmacro __using__(_) do
-    quote do
-      import AgentJidoWeb.Components.Accordion, only: [accordion: 1]
-
-      import AgentJidoWeb.Components.Alert,
-        only: [flash: 1, alert: 1, show_alert: 1, show_alert: 2, hide_alert: 1, hide_alert: 2]
-
-      import AgentJidoWeb.Components.Avatar, only: [avatar: 1, avatar_group: 1]
-
-      import AgentJidoWeb.Components.Badge,
-        only: [badge: 1, hide_badge: 1, hide_badge: 2, show_badge: 1, show_badge: 2]
-
-      import AgentJidoWeb.Components.Banner,
-        only: [banner: 1, show_banner: 1, show_banner: 2, hide_banner: 1, hide_banner: 2]
-
-      import AgentJidoWeb.Components.Blockquote, only: [blockquote: 1]
-      import AgentJidoWeb.Components.Breadcrumb, only: [breadcrumb: 1]
-
-      import AgentJidoWeb.Components.Button,
-        only: [button_group: 1, button: 1, input_button: 1, button_link: 1, back: 1]
-
-      import AgentJidoWeb.Components.Card,
-        only: [card: 1, card_title: 1, card_media: 1, card_content: 1, card_footer: 1]
-
-      import AgentJidoWeb.Components.Carousel, only: [carousel: 1]
-      import AgentJidoWeb.Components.Chat, only: [chat: 1, chat_section: 1]
-
-      import AgentJidoWeb.Components.CheckboxCard,
-        only: [checkbox_card: 1, checkbox_card_check: 3]
-
-      import AgentJidoWeb.Components.CheckboxField,
-        only: [checkbox_field: 1, group_checkbox: 1, checkbox_check: 3]
-
-      import AgentJidoWeb.Components.Clipboard, only: [clipboard: 1]
-      import AgentJidoWeb.Components.Collapse, only: [collapse: 1]
-      import AgentJidoWeb.Components.ColorField, only: [color_field: 1]
-      import AgentJidoWeb.Components.Combobox, only: [combobox: 1]
-      import AgentJidoWeb.Components.DateTimeField, only: [date_time_field: 1]
-      import AgentJidoWeb.Components.DeviceMockup, only: [device_mockup: 1]
-      import AgentJidoWeb.Components.Divider, only: [divider: 1, hr: 1]
-
-      import AgentJidoWeb.Components.Drawer,
-        only: [drawer: 1, hide_drawer: 2, hide_drawer: 3, show_drawer: 2, show_drawer: 3]
-
-      import AgentJidoWeb.Components.Dropdown,
-        only: [dropdown: 1, dropdown_trigger: 1, dropdown_content: 1]
-
-      import AgentJidoWeb.Components.EmailField, only: [email_field: 1]
-      import AgentJidoWeb.Components.Fieldset, only: [fieldset: 1]
-      import AgentJidoWeb.Components.FileField, only: [file_field: 1]
-      import AgentJidoWeb.Components.Footer, only: [footer: 1, footer_section: 1]
-      import AgentJidoWeb.Components.FormWrapper, only: [form_wrapper: 1, simple_form: 1]
+  @moduledoc false
+
+  @imports [
+    {AgentJidoWeb.Components.Accordion, [only: [accordion: 1]]},
+    {AgentJidoWeb.Components.Alert,
+     [only: [flash: 1, alert: 1, show_alert: 1, show_alert: 2, hide_alert: 1, hide_alert: 2]]},
+    {AgentJidoWeb.Components.Avatar, [only: [avatar: 1, avatar_group: 1]]},
+    {AgentJidoWeb.Components.Badge, [only: [badge: 1, hide_badge: 1, hide_badge: 2, show_badge: 1, show_badge: 2]]},
+    {AgentJidoWeb.Components.Banner,
+     [only: [banner: 1, show_banner: 1, show_banner: 2, hide_banner: 1, hide_banner: 2]]},
+    {AgentJidoWeb.Components.Blockquote, [only: [blockquote: 1]]},
+    {AgentJidoWeb.Components.Breadcrumb, [only: [breadcrumb: 1]]},
+    {AgentJidoWeb.Components.Button, [only: [button_group: 1, button: 1, input_button: 1, button_link: 1, back: 1]]},
+    {AgentJidoWeb.Components.Card, [only: [card: 1, card_title: 1, card_media: 1, card_content: 1, card_footer: 1]]},
+    {AgentJidoWeb.Components.Carousel, [only: [carousel: 1]]},
+    {AgentJidoWeb.Components.Chat, [only: [chat: 1, chat_section: 1]]},
+    {AgentJidoWeb.Components.CheckboxCard, [only: [checkbox_card: 1, checkbox_card_check: 3]]},
+    {AgentJidoWeb.Components.CheckboxField, [only: [checkbox_field: 1, group_checkbox: 1, checkbox_check: 3]]},
+    {AgentJidoWeb.Components.Clipboard, [only: [clipboard: 1]]},
+    {AgentJidoWeb.Components.Collapse, [only: [collapse: 1]]},
+    {AgentJidoWeb.Components.ColorField, [only: [color_field: 1]]},
+    {AgentJidoWeb.Components.Combobox, [only: [combobox: 1]]},
+    {AgentJidoWeb.Components.DateTimeField, [only: [date_time_field: 1]]},
+    {AgentJidoWeb.Components.DeviceMockup, [only: [device_mockup: 1]]},
+    {AgentJidoWeb.Components.Divider, [only: [divider: 1, hr: 1]]},
+    {AgentJidoWeb.Components.Drawer,
+     [only: [drawer: 1, hide_drawer: 2, hide_drawer: 3, show_drawer: 2, show_drawer: 3]]},
+    {AgentJidoWeb.Components.Dropdown, [only: [dropdown: 1, dropdown_trigger: 1, dropdown_content: 1]]},
+    {AgentJidoWeb.Components.EmailField, [only: [email_field: 1]]},
+    {AgentJidoWeb.Components.Fieldset, [only: [fieldset: 1]]},
+    {AgentJidoWeb.Components.FileField, [only: [file_field: 1]]},
+    {AgentJidoWeb.Components.Footer, [only: [footer: 1, footer_section: 1]]},
+    {AgentJidoWeb.Components.FormWrapper, [only: [form_wrapper: 1, simple_form: 1]]},
+    {AgentJidoWeb.Components.Gallery, [only: [gallery: 1, gallery_media: 1, filterable_gallery: 1]]},
+    {AgentJidoWeb.Components.Icon, [only: [icon: 1]]},
+    {AgentJidoWeb.Components.Image, [only: [image: 1]]},
+    {AgentJidoWeb.Components.Indicator, [only: [indicator: 1]]},
+    {AgentJidoWeb.Components.InputField, [only: [input: 1, error: 1]]},
+    {AgentJidoWeb.Components.Jumbotron, [only: [jumbotron: 1]]},
+    {AgentJidoWeb.Components.Keyboard, [only: [keyboard: 1]]},
+    {AgentJidoWeb.Components.Layout, [only: [flex: 1, grid: 1]]},
+    {AgentJidoWeb.Components.List, [only: [list: 1, li: 1, ul: 1, ol: 1, list_group: 1]]},
+    {AgentJidoWeb.Components.MegaMenu, [only: [mega_menu: 1]]},
+    {AgentJidoWeb.Components.Menu, [only: [menu: 1]]},
+    {AgentJidoWeb.Components.Modal,
+     [
+       only: [
+         modal: 1,
+         show_modal: 1,
+         show_modal: 2,
+         hide_modal: 1,
+         hide_modal: 2,
+         show: 1,
+         show: 2,
+         hide: 1,
+         hide: 2
+       ]
+     ]},
+    {AgentJidoWeb.Components.NativeSelect, [only: [native_select: 1, select_option_group: 1]]},
+    {AgentJidoWeb.Components.Navbar, [only: [navbar: 1, header: 1]]},
+    {AgentJidoWeb.Components.NumberField, [only: [number_field: 1]]},
+    {AgentJidoWeb.Components.Overlay, [only: [overlay: 1]]},
+    {AgentJidoWeb.Components.Pagination, [only: [pagination: 1]]},
+    {AgentJidoWeb.Components.PasswordField, [only: [password_field: 1]]},
+    {AgentJidoWeb.Components.Popover, [only: [popover: 1]]},
+    {AgentJidoWeb.Components.Progress,
+     [only: [progress: 1, progress_section: 1, semi_circle_progress: 1, ring_progress: 1]]},
+    {AgentJidoWeb.Components.RadioCard, [only: [radio_card: 1, radio_card_check: 3]]},
+    {AgentJidoWeb.Components.RadioField, [only: [radio_field: 1, group_radio: 1, radio_check: 3]]},
+    {AgentJidoWeb.Components.RangeField, [only: [range_field: 1]]},
+    {AgentJidoWeb.Components.Rating, [only: [rating: 1]]},
+    {AgentJidoWeb.Components.ScrollArea, [only: [scroll_area: 1]]},
+    {AgentJidoWeb.Components.SearchField, [only: [search_field: 1]]},
+    {AgentJidoWeb.Components.Sidebar, [only: [sidebar: 1]]},
+    {AgentJidoWeb.Components.Skeleton, [only: [skeleton: 1]]},
+    {AgentJidoWeb.Components.SpeedDial, [only: [speed_dial: 1]]},
+    {AgentJidoWeb.Components.Spinner, [only: [spinner: 1]]},
+    {AgentJidoWeb.Components.Stepper, [only: [stepper: 1, stepper_section: 1]]},
+    {AgentJidoWeb.Components.Table, [only: [table: 1, th: 1, tr: 1, td: 1]]},
+    {AgentJidoWeb.Components.TableContent, [only: [table_content: 1, content_wrapper: 1, content_item: 1]]},
+    {AgentJidoWeb.Components.Tabs, [only: [tabs: 1, show_tab: 2, show_tab: 3, hide_tab: 2, hide_tab: 3]]},
+    {AgentJidoWeb.Components.TelField, [only: [tel_field: 1]]},
+    {AgentJidoWeb.Components.TextField, [only: [text_field: 1]]},
+    {AgentJidoWeb.Components.TextareaField, [only: [textarea_field: 1]]},
+    {AgentJidoWeb.Components.Timeline, [only: [timeline: 1, timeline_section: 1]]},
+    {AgentJidoWeb.Components.Toast,
+     [
+       only: [
+         toast: 1,
+         toast_group: 1,
+         show_toast: 1,
+         show_toast: 2,
+         hide_toast: 1,
+         hide_toast: 2
+       ]
+     ]},
+    {AgentJidoWeb.Components.ToggleField, [only: [toggle_field: 1, toggle_check: 2]]},
+    {AgentJidoWeb.Components.Tooltip, [only: [tooltip: 1]]},
+    {AgentJidoWeb.Components.Typography,
+     [
+       only: [
+         h1: 1,
+         h2: 1,
+         h3: 1,
+         h4: 1,
+         h5: 1,
+         h6: 1,
+         p: 1,
+         strong: 1,
+         em: 1,
+         dl: 1,
+         dt: 1,
+         dd: 1,
+         figure: 1,
+         figcaption: 1,
+         abbr: 1,
+         mark: 1,
+         small: 1,
+         s: 1,
+         u: 1,
+         cite: 1,
+         del: 1
+       ]
+     ]},
+    {AgentJidoWeb.Components.UrlField, [only: [url_field: 1]]},
+    {AgentJidoWeb.Components.Video, [only: [video: 1]]}
+  ]
 
-      import AgentJidoWeb.Components.Gallery,
-        only: [gallery: 1, gallery_media: 1, filterable_gallery: 1]
-
-      import AgentJidoWeb.Components.Icon, only: [icon: 1]
-      import AgentJidoWeb.Components.Image, only: [image: 1]
-      import AgentJidoWeb.Components.Indicator, only: [indicator: 1]
-      import AgentJidoWeb.Components.InputField, only: [input: 1, error: 1]
-      import AgentJidoWeb.Components.Jumbotron, only: [jumbotron: 1]
-      import AgentJidoWeb.Components.Keyboard, only: [keyboard: 1]
-      import AgentJidoWeb.Components.Layout, only: [flex: 1, grid: 1]
-      import AgentJidoWeb.Components.List, only: [list: 1, li: 1, ul: 1, ol: 1, list_group: 1]
-      import AgentJidoWeb.Components.MegaMenu, only: [mega_menu: 1]
-      import AgentJidoWeb.Components.Menu, only: [menu: 1]
-
-      import AgentJidoWeb.Components.Modal,
-        only: [
-          modal: 1,
-          show_modal: 1,
-          show_modal: 2,
-          hide_modal: 1,
-          hide_modal: 2,
-          show: 1,
-          show: 2,
-          hide: 1,
-          hide: 2
-        ]
-
-      import AgentJidoWeb.Components.NativeSelect,
-        only: [native_select: 1, select_option_group: 1]
-
-      import AgentJidoWeb.Components.Navbar, only: [navbar: 1, header: 1]
-      import AgentJidoWeb.Components.NumberField, only: [number_field: 1]
-      import AgentJidoWeb.Components.Overlay, only: [overlay: 1]
-      import AgentJidoWeb.Components.Pagination, only: [pagination: 1]
-      import AgentJidoWeb.Components.PasswordField, only: [password_field: 1]
-      import AgentJidoWeb.Components.Popover, only: [popover: 1]
-
-      import AgentJidoWeb.Components.Progress,
-        only: [progress: 1, progress_section: 1, semi_circle_progress: 1, ring_progress: 1]
-
-      import AgentJidoWeb.Components.RadioCard, only: [radio_card: 1, radio_card_check: 3]
-
-      import AgentJidoWeb.Components.RadioField,
-        only: [radio_field: 1, group_radio: 1, radio_check: 3]
-
-      import AgentJidoWeb.Components.RangeField, only: [range_field: 1]
-      import AgentJidoWeb.Components.Rating, only: [rating: 1]
-      import AgentJidoWeb.Components.ScrollArea, only: [scroll_area: 1]
-      import AgentJidoWeb.Components.SearchField, only: [search_field: 1]
-      import AgentJidoWeb.Components.Sidebar, only: [sidebar: 1]
-      import AgentJidoWeb.Components.Skeleton, only: [skeleton: 1]
-      import AgentJidoWeb.Components.SpeedDial, only: [speed_dial: 1]
-      import AgentJidoWeb.Components.Spinner, only: [spinner: 1]
-      import AgentJidoWeb.Components.Stepper, only: [stepper: 1, stepper_section: 1]
-      import AgentJidoWeb.Components.Table, only: [table: 1, th: 1, tr: 1, td: 1]
-
-      import AgentJidoWeb.Components.TableContent,
-        only: [table_content: 1, content_wrapper: 1, content_item: 1]
-
-      import AgentJidoWeb.Components.Tabs,
-        only: [tabs: 1, show_tab: 2, show_tab: 3, hide_tab: 2, hide_tab: 3]
-
-      import AgentJidoWeb.Components.TelField, only: [tel_field: 1]
-      import AgentJidoWeb.Components.TextField, only: [text_field: 1]
-      import AgentJidoWeb.Components.TextareaField, only: [textarea_field: 1]
-      import AgentJidoWeb.Components.Timeline, only: [timeline: 1, timeline_section: 1]
-
-      import AgentJidoWeb.Components.Toast,
-        only: [
-          toast: 1,
-          toast_group: 1,
-          show_toast: 1,
-          show_toast: 2,
-          hide_toast: 1,
-          hide_toast: 2
-        ]
-
-      import AgentJidoWeb.Components.ToggleField, only: [toggle_field: 1, toggle_check: 2]
-      import AgentJidoWeb.Components.Tooltip, only: [tooltip: 1]
-
-      import AgentJidoWeb.Components.Typography,
-        only: [
-          h1: 1,
-          h2: 1,
-          h3: 1,
-          h4: 1,
-          h5: 1,
-          h6: 1,
-          p: 1,
-          strong: 1,
-          em: 1,
-          dl: 1,
-          dt: 1,
-          dd: 1,
-          figure: 1,
-          figcaption: 1,
-          abbr: 1,
-          mark: 1,
-          small: 1,
-          s: 1,
-          u: 1,
-          cite: 1,
-          del: 1
-        ]
+  defmacro __using__(_) do
+    imports_ast =
+      for {module, opts} <- @imports do
+        quote do
+          import unquote(module), unquote(opts)
+        end
+      end
 
-      import AgentJidoWeb.Components.UrlField, only: [url_field: 1]
-      import AgentJidoWeb.Components.Video, only: [video: 1]
+    quote do
+      (unquote_splicing(imports_ast))
     end
   end
 end
diff --git a/lib/agent_jido_web/components/pagination.ex b/lib/agent_jido_web/components/pagination.ex
index 85fe28b..edb6133 100644
--- a/lib/agent_jido_web/components/pagination.ex
+++ b/lib/agent_jido_web/components/pagination.ex
@@ -1527,7 +1527,7 @@ defmodule AgentJidoWeb.Components.Pagination do
 
   defp color_variant(params, _) when is_binary(params), do: params
 
-  defp default_classes() do
+  defp default_classes do
     [
       "w-fit flex [&.grouped-pagination>*]::flex-1 [&:not(.grouped-pagination)]:justify-start [&:not(.grouped-pagination)]:items-center [&:not(.grouped-pagination)]:flex-wrap  [&_.pagination-button.active-pagination-button]:font-medium [&.grouped-pagination]:overflow-hidden"
     ]
diff --git a/lib/agent_jido_web/components/speed_dial.ex b/lib/agent_jido_web/components/speed_dial.ex
index 23873a0..7c29585 100644
--- a/lib/agent_jido_web/components/speed_dial.ex
+++ b/lib/agent_jido_web/components/speed_dial.ex
@@ -267,7 +267,7 @@ defmodule AgentJidoWeb.Components.SpeedDial do
     """
   end
 
-  defp trigger_dial(),
+  defp trigger_dial,
     do: "[&_.speed-dial-content]:hover:visible [&_.speed-dial-content]:hover:opacity-100"
 
   defp position_class("top") do
diff --git a/lib/agent_jido_web/components/stepper.ex b/lib/agent_jido_web/components/stepper.ex
index f8aeb00..8d352d2 100644
--- a/lib/agent_jido_web/components/stepper.ex
+++ b/lib/agent_jido_web/components/stepper.ex
@@ -370,7 +370,7 @@ defmodule AgentJidoWeb.Components.Stepper do
     """
   end
 
-  defp step_visibility() do
+  defp step_visibility do
     [
       "[&_.stepper-loading-icon]:block",
       "[&_.stepper-loading-icon]:visible",
diff --git a/lib/agent_jido_web/components/toggle_field.ex b/lib/agent_jido_web/components/toggle_field.ex
index 7c13de8..66c921b 100644
--- a/lib/agent_jido_web/components/toggle_field.ex
+++ b/lib/agent_jido_web/components/toggle_field.ex
@@ -93,7 +93,7 @@ defmodule AgentJidoWeb.Components.ToggleField do
   def toggle_field(assigns) do
     assigns =
       assign_new(assigns, :checked, fn ->
-        Phoenix.HTML.Form.normalize_value("checkbox", assigns[:value])
+        Form.normalize_value("checkbox", assigns[:value])
       end)
 
     ~H"""
diff --git a/lib/agent_jido_web/live/demos/chat_live.ex b/lib/agent_jido_web/live/demos/chat_live.ex
index e449a3e..48ec269 100644
--- a/lib/agent_jido_web/live/demos/chat_live.ex
+++ b/lib/agent_jido_web/live/demos/chat_live.ex
@@ -86,19 +86,26 @@ defmodule AgentJidoWeb.Demos.ChatLive do
     if input == "" or socket.assigns.running? or is_nil(socket.assigns.agent_pid) do
       {:noreply, socket}
     else
-      :ok = ChatAgent.ask(socket.assigns.agent_pid, input)
+      case ChatAgent.ask(socket.assigns.agent_pid, input) do
+        {:ok, _request} ->
+          user_msg = %{id: gen_id(), role: :user, content: input}
+          pending_msg = %{id: gen_id(), role: :assistant, content: "", pending: true}
 
-      user_msg = %{id: gen_id(), role: :user, content: input}
-      pending_msg = %{id: gen_id(), role: :assistant, content: "", pending: true}
+          {:noreply,
+           socket
+           |> assign(:input, "")
+           |> assign(:running?, true)
+           |> assign(:trace, %Trace{})
+           |> assign(:messages, socket.assigns.messages ++ [user_msg, pending_msg])
+           |> assign(:panels, %{thinking: "", usage: %{}, conversation: [], config: %{}})
+           |> schedule_poll()}
 
-      {:noreply,
-       socket
-       |> assign(:input, "")
-       |> assign(:running?, true)
-       |> assign(:trace, %Trace{})
-       |> assign(:messages, socket.assigns.messages ++ [user_msg, pending_msg])
-       |> assign(:panels, %{thinking: "", usage: %{}, conversation: [], config: %{}})
-       |> schedule_poll()}
+        {:error, reason} ->
+          {:noreply,
+           socket
+           |> assign(:running?, false)
+           |> assign(:error, "Failed to send request: #{inspect(reason)}")}
+      end
     end
   end
 
@@ -130,32 +137,7 @@ defmodule AgentJidoWeb.Demos.ChatLive do
     socket = assign(socket, :poll_ref, nil)
 
     if socket.assigns.running? and socket.assigns.agent_pid do
-      case get_snapshot(socket.assigns.agent_pid) do
-        {:ok, snap} ->
-          {trace, messages, panels} =
-            process_snapshot(socket.assigns.trace, socket.assigns.messages, snap)
-
-          conversation = (snap.details || %{})[:conversation] || []
-
-          socket =
-            socket
-            |> assign(:trace, trace)
-            |> assign(:messages, messages)
-            |> assign(:panels, panels)
-            |> assign(:conversation_history, conversation)
-
-          if snap.done? and not trace.awaiting_start? do
-            {:noreply, assign(socket, :running?, false)}
-          else
-            {:noreply, schedule_poll(socket)}
-          end
-
-        {:error, reason} ->
-          {:noreply,
-           socket
-           |> assign(:running?, false)
-           |> assign(:error, "Snapshot error: #{inspect(reason)}")}
-      end
+      handle_poll_snapshot(socket)
     else
       {:noreply, socket}
     end
@@ -178,6 +160,38 @@ defmodule AgentJidoWeb.Demos.ChatLive do
     end
   end
 
+  defp handle_poll_snapshot(socket) do
+    case get_snapshot(socket.assigns.agent_pid) do
+      {:ok, snap} -> apply_snapshot(socket, snap)
+      {:error, reason} -> handle_snapshot_error(socket, reason)
+    end
+  end
+
+  defp apply_snapshot(socket, snap) do
+    {trace, messages, panels} = process_snapshot(socket.assigns.trace, socket.assigns.messages, snap)
+    conversation = snap.details[:conversation] || []
+
+    socket =
+      socket
+      |> assign(:trace, trace)
+      |> assign(:messages, messages)
+      |> assign(:panels, panels)
+      |> assign(:conversation_history, conversation)
+
+    if snap.done? and not trace.awaiting_start? do
+      {:noreply, assign(socket, :running?, false)}
+    else
+      {:noreply, schedule_poll(socket)}
+    end
+  end
+
+  defp handle_snapshot_error(socket, reason) do
+    {:noreply,
+     socket
+     |> assign(:running?, false)
+     |> assign(:error, "Snapshot error: #{inspect(reason)}")}
+  end
+
   defp schedule_poll(socket) do
     ref = make_ref()
     Process.send_after(self(), {:poll, ref}, @poll_interval)
@@ -195,106 +209,115 @@ defmodule AgentJidoWeb.Demos.ChatLive do
   end
 
   defp process_snapshot(trace, messages, snap) do
-    details = snap.details || %{}
+    details = snap.details
+    trace = maybe_clear_awaiting_start(trace, snap.status)
+
+    if trace.awaiting_start? do
+      {trace, messages, idle_panels()}
+    else
+      process_active_snapshot(trace, messages, snap, details)
+    end
+  end
 
+  defp maybe_clear_awaiting_start(trace, :running) when trace.awaiting_start?, do: %{trace | awaiting_start?: false}
+  defp maybe_clear_awaiting_start(trace, _status), do: trace
+
+  defp idle_panels do
+    %{thinking: "", usage: %{}, conversation: [], config: %{status: :idle, iteration: 0}}
+  end
+
+  defp process_active_snapshot(trace, messages, snap, details) do
     current_iteration = details[:iteration] || 0
     streaming_text = details[:streaming_text] || ""
     streaming_thinking = details[:streaming_thinking] || ""
     tool_calls = details[:tool_calls] || []
 
-    trace =
-      if trace.awaiting_start? and snap.status == :running do
-        %{trace | awaiting_start?: false}
-      else
-        trace
-      end
+    trace = update_trace_iteration(trace, current_iteration)
+    {messages, trace} = sync_tool_calls(messages, tool_calls, trace)
+    messages = update_pending_content(messages, streaming_text)
+    {messages, trace} = finalize_if_done(messages, trace, snap, streaming_text, streaming_thinking)
+    panels = build_panels(details, streaming_thinking, current_iteration, snap.status)
 
-    if trace.awaiting_start? do
-      panels = %{
-        thinking: "",
-        usage: %{},
-        conversation: [],
-        config: %{status: :idle, iteration: 0}
-      }
+    {trace, messages, panels}
+  end
 
-      {trace, messages, panels}
+  defp update_trace_iteration(trace, current_iteration) do
+    if current_iteration > trace.last_iteration and trace.last_iteration > 0 do
+      %{trace | last_iteration: current_iteration, text: "", thinking: ""}
     else
-      trace =
-        if current_iteration > trace.last_iteration and trace.last_iteration > 0 do
-          %{trace | last_iteration: current_iteration, text: "", thinking: ""}
-        else
-          %{trace | last_iteration: max(current_iteration, trace.last_iteration)}
-        end
-
-      {messages, trace} = sync_tool_calls(messages, tool_calls, trace)
-
-      messages = update_pending_content(messages, streaming_text)
+      %{trace | last_iteration: max(current_iteration, trace.last_iteration)}
+    end
+  end
 
-      {messages, trace} =
-        if snap.done? do
-          final_content = snap.result || streaming_text
-          messages = finalize_pending(messages, final_content, trace.thinking)
-          {messages, trace}
-        else
-          trace = %{trace | text: streaming_text, thinking: streaming_thinking}
-          {messages, trace}
-        end
+  defp finalize_if_done(messages, trace, snap, streaming_text, streaming_thinking) do
+    if snap.done? do
+      final_content = snap.result || streaming_text
+      {finalize_pending(messages, final_content, trace.thinking), trace}
+    else
+      {messages, %{trace | text: streaming_text, thinking: streaming_thinking}}
+    end
+  end
 
-      panels = %{
-        thinking: streaming_thinking,
-        usage: details[:usage] || %{},
-        conversation: details[:conversation] || [],
-        config: %{
-          model: details[:model],
-          max_iterations: details[:max_iterations],
-          available_tools: details[:available_tools] || [],
-          current_llm_call_id: details[:current_llm_call_id],
-          iteration: current_iteration,
-          duration_ms: details[:duration_ms],
-          termination_reason: details[:termination_reason],
-          status: snap.status
-        }
+  defp build_panels(details, streaming_thinking, current_iteration, status) do
+    %{
+      thinking: streaming_thinking,
+      usage: details[:usage] || %{},
+      conversation: details[:conversation] || [],
+      config: %{
+        model: details[:model],
+        max_iterations: details[:max_iterations],
+        available_tools: details[:available_tools] || [],
+        current_llm_call_id: details[:current_llm_call_id],
+        iteration: current_iteration,
+        duration_ms: details[:duration_ms],
+        termination_reason: details[:termination_reason],
+        status: status
       }
-
-      {trace, messages, panels}
-    end
+    }
   end
 
   defp sync_tool_calls(messages, [], trace), do: {messages, trace}
 
   defp sync_tool_calls(messages, tool_calls, trace) do
     {messages, seen, completed} =
-      Enum.reduce(tool_calls, {messages, trace.seen_tool_ids, trace.completed_tool_ids}, fn tc,
-                                                                                            {msgs, seen, completed} ->
-        if MapSet.member?(seen, tc.id) do
-          msgs = update_tool_call(msgs, tc)
-
-          completed =
-            if tc.status == :completed, do: MapSet.put(completed, tc.id), else: completed
-
-          {msgs, seen, completed}
-        else
-          tool_msg = %{
-            id: tc.id,
-            role: :tool_call,
-            tool_name: tc.name,
-            arguments: tc.arguments,
-            status: tc.status,
-            result: tc.result
-          }
+      Enum.reduce(tool_calls, {messages, trace.seen_tool_ids, trace.completed_tool_ids}, &process_tool_call/2)
+
+    trace = %{trace | seen_tool_ids: seen, completed_tool_ids: completed}
+    {messages, trace}
+  end
 
-          msgs = insert_before_pending(msgs, tool_msg)
-          seen = MapSet.put(seen, tc.id)
+  defp process_tool_call(tc, {msgs, seen, completed}) do
+    if MapSet.member?(seen, tc.id) do
+      update_existing_tool_call(tc, msgs, seen, completed)
+    else
+      add_new_tool_call(tc, msgs, seen, completed)
+    end
+  end
 
-          completed =
-            if tc.status == :completed, do: MapSet.put(completed, tc.id), else: completed
+  defp update_existing_tool_call(tc, msgs, seen, completed) do
+    msgs = update_tool_call(msgs, tc)
+    completed = maybe_mark_completed(completed, tc)
+    {msgs, seen, completed}
+  end
 
-          {msgs, seen, completed}
-        end
-      end)
+  defp add_new_tool_call(tc, msgs, seen, completed) do
+    tool_msg = %{
+      id: tc.id,
+      role: :tool_call,
+      tool_name: tc.name,
+      arguments: tc.arguments,
+      status: tc.status,
+      result: tc.result
+    }
+
+    msgs = insert_before_pending(msgs, tool_msg)
+    seen = MapSet.put(seen, tc.id)
+    completed = maybe_mark_completed(completed, tc)
+    {msgs, seen, completed}
+  end
 
-    trace = %{trace | seen_tool_ids: seen, completed_tool_ids: completed}
-    {messages, trace}
+  defp maybe_mark_completed(completed, tc) do
+    if tc.status == :completed, do: MapSet.put(completed, tc.id), else: completed
   end
 
   defp update_tool_call(messages, tc) do
@@ -348,8 +371,7 @@ defmodule AgentJidoWeb.Demos.ChatLive do
 
   defp format_args(args) when is_map(args) do
     args
-    |> Enum.map(fn {k, v} -> "#{k}: #{inspect(v)}" end)
-    |> Enum.join(", ")
+    |> Enum.map_join(", ", fn {k, v} -> "#{k}: #{inspect(v)}" end)
     |> String.slice(0, 80)
   end
 
@@ -365,7 +387,7 @@ defmodule AgentJidoWeb.Demos.ChatLive do
 
     cond do
       msg[:tool_calls] ->
-        tool_names = Enum.map(msg[:tool_calls], & &1[:name]) |> Enum.join(", ")
+        tool_names = Enum.map_join(msg[:tool_calls], ", ", & &1[:name])
         "Calling: #{tool_names}"
 
       msg[:role] == :tool ->
diff --git a/lib/agent_jido_web/live/folio_live.ex b/lib/agent_jido_web/live/folio_live.ex
index 3b86afa..97c046d 100644
--- a/lib/agent_jido_web/live/folio_live.ex
+++ b/lib/agent_jido_web/live/folio_live.ex
@@ -7,9 +7,11 @@ defmodule AgentJidoWeb.FolioLive do
   """
   use AgentJidoWeb, :live_view
 
-  alias AgentJido.Folio.FolioAgent
   alias AgentJido.Folio
-  alias AgentJido.Folio.{InboxItem, Action, Project}
+  alias AgentJido.Folio.Action.Jido.Next, as: ActionNext
+  alias AgentJido.Folio.FolioAgent
+  alias AgentJido.Folio.InboxItem.Jido.Inbox, as: InboxItemInbox
+  alias AgentJido.Folio.Project.Jido.Active, as: ProjectActive
 
   @poll_interval 80
 
@@ -68,31 +70,18 @@ defmodule AgentJidoWeb.FolioLive do
   defp fetch_all_data(socket) do
     context = ash_context(socket.assigns.actor)
 
-    inbox =
-      case InboxItem.Jido.Inbox.run(%{}, context) do
-        {:ok, items} when is_list(items) -> items
-        {:ok, item} -> [item]
-        _ -> []
-      end
-
-    next =
-      case Action.Jido.Next.run(%{}, context) do
-        {:ok, items} when is_list(items) -> items
-        {:ok, item} -> [item]
-        _ -> []
-      end
-
-    projects =
-      case Project.Jido.Active.run(%{}, context) do
-        {:ok, items} when is_list(items) -> items
-        {:ok, item} -> [item]
-        _ -> []
-      end
-
     socket
-    |> assign(:inbox_items, inbox)
-    |> assign(:next_actions, next)
-    |> assign(:projects, projects)
+    |> assign(:inbox_items, fetch_as_list(InboxItemInbox, context))
+    |> assign(:next_actions, fetch_as_list(ActionNext, context))
+    |> assign(:projects, fetch_as_list(ProjectActive, context))
+  end
+
+  defp fetch_as_list(action_module, context) do
+    case action_module.run(%{}, context) do
+      {:ok, items} when is_list(items) -> items
+      {:ok, item} -> [item]
+      _ -> []
+    end
   end
 
   defp ash_context(actor) do
@@ -124,18 +113,25 @@ defmodule AgentJidoWeb.FolioLive do
     if input == "" or socket.assigns.running? or is_nil(socket.assigns.agent_pid) do
       {:noreply, socket}
     else
-      :ok = FolioAgent.ask(socket.assigns.agent_pid, input)
+      case FolioAgent.ask(socket.assigns.agent_pid, input) do
+        {:ok, _request} ->
+          user_msg = %{id: gen_id(), role: :user, content: input}
+          pending_msg = %{id: gen_id(), role: :assistant, content: "", pending: true}
 
-      user_msg = %{id: gen_id(), role: :user, content: input}
-      pending_msg = %{id: gen_id(), role: :assistant, content: "", pending: true}
+          {:noreply,
+           socket
+           |> assign(:input, "")
+           |> assign(:running?, true)
+           |> assign(:trace, %Trace{})
+           |> assign(:messages, socket.assigns.messages ++ [user_msg, pending_msg])
+           |> schedule_poll()}
 
-      {:noreply,
-       socket
-       |> assign(:input, "")
-       |> assign(:running?, true)
-       |> assign(:trace, %Trace{})
-       |> assign(:messages, socket.assigns.messages ++ [user_msg, pending_msg])
-       |> schedule_poll()}
+        {:error, reason} ->
+          {:noreply,
+           socket
+           |> assign(:running?, false)
+           |> assign(:error, "Failed to send request: #{inspect(reason)}")}
+      end
     end
   end
 
@@ -167,29 +163,7 @@ defmodule AgentJidoWeb.FolioLive do
     socket = assign(socket, :poll_ref, nil)
 
     if socket.assigns.running? and socket.assigns.agent_pid do
-      case get_snapshot(socket.assigns.agent_pid) do
-        {:ok, snap} ->
-          {trace, messages} =
-            process_snapshot(socket.assigns.trace, socket.assigns.messages, snap)
-
-          socket =
-            socket
-            |> assign(:trace, trace)
-            |> assign(:messages, messages)
-
-          if snap.done? and not trace.awaiting_start? do
-            socket = fetch_all_data(socket)
-            {:noreply, assign(socket, :running?, false)}
-          else
-            {:noreply, schedule_poll(socket)}
-          end
-
-        {:error, reason} ->
-          {:noreply,
-           socket
-           |> assign(:running?, false)
-           |> assign(:error, "Snapshot error: #{inspect(reason)}")}
-      end
+      handle_poll_snapshot(socket)
     else
       {:noreply, socket}
     end
@@ -212,6 +186,32 @@ defmodule AgentJidoWeb.FolioLive do
     end
   end
 
+  defp handle_poll_snapshot(socket) do
+    case get_snapshot(socket.assigns.agent_pid) do
+      {:ok, snap} -> apply_snapshot(socket, snap)
+      {:error, reason} -> handle_snapshot_error(socket, reason)
+    end
+  end
+
+  defp apply_snapshot(socket, snap) do
+    {trace, messages} = process_snapshot(socket.assigns.trace, socket.assigns.messages, snap)
+    socket = socket |> assign(:trace, trace) |> assign(:messages, messages)
+
+    if snap.done? and not trace.awaiting_start? do
+      socket = fetch_all_data(socket)
+      {:noreply, assign(socket, :running?, false)}
+    else
+      {:noreply, schedule_poll(socket)}
+    end
+  end
+
+  defp handle_snapshot_error(socket, reason) do
+    {:noreply,
+     socket
+     |> assign(:running?, false)
+     |> assign(:error, "Snapshot error: #{inspect(reason)}")}
+  end
+
   defp schedule_poll(socket) do
     ref = make_ref()
     Process.send_after(self(), {:poll, ref}, @poll_interval)
@@ -229,45 +229,47 @@ defmodule AgentJidoWeb.FolioLive do
   end
 
   defp process_snapshot(trace, messages, snap) do
-    details = snap.details || %{}
+    details = snap.details
+    trace = maybe_clear_awaiting_start(trace, snap.status)
+
+    if trace.awaiting_start? do
+      {trace, messages}
+    else
+      process_active_snapshot(trace, messages, snap, details)
+    end
+  end
 
+  defp maybe_clear_awaiting_start(trace, :running) when trace.awaiting_start?, do: %{trace | awaiting_start?: false}
+  defp maybe_clear_awaiting_start(trace, _status), do: trace
+
+  defp process_active_snapshot(trace, messages, snap, details) do
     current_iteration = details[:iteration] || 0
     streaming_text = details[:streaming_text] || ""
     streaming_thinking = details[:streaming_thinking] || ""
     tool_calls = details[:tool_calls] || []
 
-    trace =
-      if trace.awaiting_start? and snap.status == :running do
-        %{trace | awaiting_start?: false}
-      else
-        trace
-      end
+    trace = update_trace_iteration(trace, current_iteration)
+    {messages, trace} = sync_tool_calls(messages, tool_calls, trace)
+    messages = update_pending_content(messages, streaming_text)
+    {messages, trace} = finalize_if_done(messages, trace, snap, streaming_text, streaming_thinking)
 
-    if trace.awaiting_start? do
-      {trace, messages}
+    {trace, messages}
+  end
+
+  defp update_trace_iteration(trace, current_iteration) do
+    if current_iteration > trace.last_iteration and trace.last_iteration > 0 do
+      %{trace | last_iteration: current_iteration, text: "", thinking: ""}
     else
-      trace =
-        if current_iteration > trace.last_iteration and trace.last_iteration > 0 do
-          %{trace | last_iteration: current_iteration, text: "", thinking: ""}
-        else
-          %{trace | last_iteration: max(current_iteration, trace.last_iteration)}
-        end
-
-      {messages, trace} = sync_tool_calls(messages, tool_calls, trace)
-
-      messages = update_pending_content(messages, streaming_text)
-
-      {messages, trace} =
-        if snap.done? do
-          final_content = snap.result || streaming_text
-          messages = finalize_pending(messages, final_content, trace.thinking)
-          {messages, trace}
-        else
-          trace = %{trace | text: streaming_text, thinking: streaming_thinking}
-          {messages, trace}
-        end
+      %{trace | last_iteration: max(current_iteration, trace.last_iteration)}
+    end
+  end
 
-      {trace, messages}
+  defp finalize_if_done(messages, trace, snap, streaming_text, streaming_thinking) do
+    if snap.done? do
+      final_content = snap.result || streaming_text
+      {finalize_pending(messages, final_content, trace.thinking), trace}
+    else
+      {messages, %{trace | text: streaming_text, thinking: streaming_thinking}}
     end
   end
 
@@ -275,42 +277,45 @@ defmodule AgentJidoWeb.FolioLive do
 
   defp sync_tool_calls(messages, tool_calls, trace) do
     {messages, seen, completed} =
-      Enum.reduce(tool_calls, {messages, trace.seen_tool_ids, trace.completed_tool_ids}, fn tc,
-                                                                                            {msgs, seen, completed} ->
-        if MapSet.member?(seen, tc.id) do
-          msgs = update_tool_call_status(msgs, tc)
-
-          completed =
-            if tc.status in [:completed, :failed],
-              do: MapSet.put(completed, tc.id),
-              else: completed
-
-          {msgs, seen, completed}
-        else
-          tool_msg = %{
-            id: tc.id,
-            role: :tool_call,
-            tool_name: tc.name,
-            arguments: tc.arguments,
-            status: tc.status,
-            result: tc.result
-          }
-
-          msgs = insert_before_pending(msgs, tool_msg)
-          seen = MapSet.put(seen, tc.id)
-
-          completed =
-            if tc.status in [:completed, :failed],
-              do: MapSet.put(completed, tc.id),
-              else: completed
-
-          {msgs, seen, completed}
-        end
-      end)
+      Enum.reduce(tool_calls, {messages, trace.seen_tool_ids, trace.completed_tool_ids}, &process_tool_call/2)
 
     {messages, %{trace | seen_tool_ids: seen, completed_tool_ids: completed}}
   end
 
+  defp process_tool_call(tc, {msgs, seen, completed}) do
+    if MapSet.member?(seen, tc.id) do
+      update_existing_tool_call(tc, msgs, seen, completed)
+    else
+      add_new_tool_call(tc, msgs, seen, completed)
+    end
+  end
+
+  defp update_existing_tool_call(tc, msgs, seen, completed) do
+    msgs = update_tool_call_status(msgs, tc)
+    completed = maybe_mark_completed(completed, tc)
+    {msgs, seen, completed}
+  end
+
+  defp add_new_tool_call(tc, msgs, seen, completed) do
+    tool_msg = %{
+      id: tc.id,
+      role: :tool_call,
+      tool_name: tc.name,
+      arguments: tc.arguments,
+      status: tc.status,
+      result: tc.result
+    }
+
+    msgs = insert_before_pending(msgs, tool_msg)
+    seen = MapSet.put(seen, tc.id)
+    completed = maybe_mark_completed(completed, tc)
+    {msgs, seen, completed}
+  end
+
+  defp maybe_mark_completed(completed, tc) do
+    if tc.status in [:completed, :failed], do: MapSet.put(completed, tc.id), else: completed
+  end
+
   defp update_tool_call_status(messages, tc) do
     Enum.map(messages, fn msg ->
       if msg[:id] == tc.id do
@@ -362,8 +367,7 @@ defmodule AgentJidoWeb.FolioLive do
 
   defp format_args(args) when is_map(args) do
     args
-    |> Enum.map(fn {k, v} -> "#{k}: #{inspect(v)}" end)
-    |> Enum.join(", ")
+    |> Enum.map_join(", ", fn {k, v} -> "#{k}: #{inspect(v)}" end)
     |> String.slice(0, 80)
   end
 
diff --git a/lib/agent_jido_web/live/forge/new_live.ex b/lib/agent_jido_web/live/forge/new_live.ex
index 81f9554..50a8a3f 100644
--- a/lib/agent_jido_web/live/forge/new_live.ex
+++ b/lib/agent_jido_web/live/forge/new_live.ex
@@ -64,9 +64,6 @@ defmodule AgentJidoWeb.Forge.NewLive do
     else
       {:error, %Jason.DecodeError{}} ->
         {:noreply, put_flash(socket, :error, "Invalid JSON in config fields")}
-
-      {:error, reason} ->
-        {:noreply, put_flash(socket, :error, "Error: #{inspect(reason)}")}
     end
   end
 
diff --git a/lib/agent_jido_web/live/forge/show_live.ex b/lib/agent_jido_web/live/forge/show_live.ex
index b59d325..4a6df90 100644
--- a/lib/agent_jido_web/live/forge/show_live.ex
+++ b/lib/agent_jido_web/live/forge/show_live.ex
@@ -101,7 +101,8 @@ defmodule AgentJidoWeb.Forge.ShowLive do
     end
   end
 
-  def handle_info({:terminal_exec_result, {output, exit_code}}, socket) do
+  def handle_info({:terminal_exec_result, {output, exit_code}}, socket)
+      when is_binary(output) and is_integer(exit_code) do
     socket =
       output
       |> String.split("\n", trim: true)
@@ -177,43 +178,47 @@ defmodule AgentJidoWeb.Forge.ShowLive do
     if command == "" do
       {:noreply, socket}
     else
-      socket =
-        stream_insert(socket, :output, %{
-          id: uniq_line_id(),
-          kind: :cmd,
-          text: "$ " <> command
-        })
+      do_terminal_run(socket, command)
+    end
+  end
 
-      session_id = socket.assigns.session_id
-      lv_pid = self()
-      is_needs_input = socket.assigns.status.state == :needs_input
-
-      Task.start(fn ->
-        result =
-          if is_needs_input do
-            case Forge.apply_input(session_id, command) do
-              :ok -> {:applied, command}
-              error -> error
-            end
-          else
-            Forge.exec(session_id, command)
-          end
-
-        send(lv_pid, {:terminal_exec_result, result})
-      end)
+  defp do_terminal_run(socket, command) do
+    socket =
+      stream_insert(socket, :output, %{
+        id: uniq_line_id(),
+        kind: :cmd,
+        text: "$ " <> command
+      })
 
-      socket =
-        if is_needs_input do
-          socket
-          |> assign(:input_prompt, nil)
-        else
-          socket
-        end
+    session_id = socket.assigns.session_id
+    is_needs_input = socket.assigns.status.state == :needs_input
 
-      {:noreply, socket}
+    start_exec_task(session_id, command, is_needs_input)
+
+    socket = if is_needs_input, do: assign(socket, :input_prompt, nil), else: socket
+    {:noreply, socket}
+  end
+
+  defp start_exec_task(session_id, command, is_needs_input) do
+    lv_pid = self()
+
+    Task.start(fn ->
+      result = execute_command(session_id, command, is_needs_input)
+      send(lv_pid, {:terminal_exec_result, result})
+    end)
+  end
+
+  defp execute_command(session_id, command, true = _is_needs_input) do
+    case Forge.apply_input(session_id, command) do
+      :ok -> {:applied, command}
+      error -> error
     end
   end
 
+  defp execute_command(session_id, command, false = _is_needs_input) do
+    Forge.exec(session_id, command)
+  end
+
   @impl true
   def render(assigns) do
     ~H"""
diff --git a/lib/agent_jido_web/live_user_auth.ex b/lib/agent_jido_web/live_user_auth.ex
index 1b79583..7f29252 100644
--- a/lib/agent_jido_web/live_user_auth.ex
+++ b/lib/agent_jido_web/live_user_auth.ex
@@ -6,11 +6,13 @@ defmodule AgentJidoWeb.LiveUserAuth do
   import Phoenix.Component
   use AgentJidoWeb, :verified_routes
 
+  alias AshAuthentication.Phoenix.LiveSession
+
   # This is used for nested liveviews to fetch the current user.
   # To use, place the following at the top of that liveview:
   # on_mount {AgentJidoWeb.LiveUserAuth, :current_user}
   def on_mount(:current_user, _params, session, socket) do
-    {:cont, AshAuthentication.Phoenix.LiveSession.assign_new_resources(socket, session)}
+    {:cont, LiveSession.assign_new_resources(socket, session)}
   end
 
   def on_mount(:live_user_optional, _params, _session, socket) do
diff --git a/mix.exs b/mix.exs
index 724f1a4..212f680 100644
--- a/mix.exs
+++ b/mix.exs
@@ -105,10 +105,10 @@ defmodule AgentJido.MixProject do
       {:dns_cluster, "~> 0.2.0"},
 
       # Jido AI framework
-      {:jido, "~> 2.0.0-rc"},
-      {:jido_action, "~> 2.0.0-rc", override: true},
-      {:jido_signal, "~> 2.0.0-rc"},
-      {:jido_ai, github: "agentjido/jido_ai", branch: "main"},
+      {:jido, path: "../jido", override: true},
+      {:jido_action, path: "../jido_action", override: true},
+      {:jido_signal, path: "../jido_signal", override: true},
+      {:jido_ai, path: "../jido_ai"},
       {:req_llm, "~> 1.4", override: true},
       {:timex, "~> 3.7", override: true},
       {:gettext, "~> 0.26", override: true},
diff --git a/mix.lock b/mix.lock
index 3f2590d..d470b44 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,7 +1,7 @@
 %{
   "abacus": {:hex, :abacus, "2.1.0", "b6db5c989ba3d9dd8c36d1cb269e2f0058f34768d47c67eb8ce06697ecb36dd4", [:mix], [], "hexpm", "255de08b02884e8383f1eed8aa31df884ce0fb5eb394db81ff888089f2a1bbff"},
   "abnf_parsec": {:hex, :abnf_parsec, "2.1.0", "c4e88d5d089f1698297c0daced12be1fb404e6e577ecf261313ebba5477941f9", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e0ed6290c7cc7e5020c006d1003520390c9bdd20f7c3f776bd49bfe3c5cd362a"},
-  "ash": {:hex, :ash, "3.13.2", "8820ec0d696d9e057c6032958e0974de7ce419151fd41c772a1a422d0cda0cd9", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.3.14 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e8d6f595ed0b4573561b72a1b644380a0228309dbe59187fe9ecf086d8e3acbb"},
+  "ash": {:hex, :ash, "3.14.1", "22e0ac5dfd4c7d502bd103f0b4380defd66d7c6c83b3a4f54af7045f13da00d7", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.3.14 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "776a5963790d5af79855ddca1718a037d06b49063a6b97fae9110050b3d5127d"},
   "ash_admin": {:hex, :ash_admin, "0.13.24", "4fafddc7b4450a92878b58630688c55cab20b0c27e35cad68f29811f73815816", [:mix], [{:ash, ">= 3.4.63 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.1.8 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1-rc", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "8f298cf6cb6635744ed75dd401295ed52513ea4df169f0f89d6a9a75dc4de4dc"},
   "ash_archival": {:hex, :ash_archival, "2.0.3", "40590162ece428c097e98da8c5b8c7cb073b6af72fd1acf7ba5b36f3d731df4d", [:mix], [{:ash, ">= 3.0.5 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}], "hexpm", "33f3f3006aef7e4271573c85db4e9422b5e1b0d7cfb110f52732d5004cafa62a"},
   "ash_authentication": {:hex, :ash_authentication, "4.13.7", "421b5ddb516026f6794435980a632109ec116af2afa68a45e15fb48b41c92cfa", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "> 0.2.0 and < 0.3.0", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "0d45ac3fdcca6902dabbe161ce63e9cea8f90583863c2e14261c9309e5837121"},
@@ -11,9 +11,9 @@
   "ash_json_api": {:hex, :ash_json_api, "1.5.1", "0c27805bcb797122786f259baca986681b1b5924c5fa547f03a06c35b054673c", [:mix], [{:ash, ">= 3.4.69 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, ">= 0.3.58 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:json_xema, "~> 0.4", [hex: :json_xema, repo: "hexpm", optional: false]}, {:open_api_spex, "~> 3.16", [hex: :open_api_spex, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:plug, "~> 1.11", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.10 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "767c38eb25e58ac48a021194d5a5f395fc1de6b4c98de04cbb9b3020307301f1"},
   "ash_paper_trail": {:hex, :ash_paper_trail, "0.5.7", "a6b6b900494f9bb03df959b6f93bfd7afa2f63ff0e8b08d6553d383f09f3b958", [:mix], [{:ash, ">= 3.5.43 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}], "hexpm", "ef645a3e9bb88f8d7c6dd7f86d50d2446d15749da81b68482aca33d9768e09d8"},
   "ash_phoenix": {:hex, :ash_phoenix, "2.3.19", "244b24256a7d730e5223f36f371a95971542a547a12f0fb73406f67977e86c97", [:mix], [{:ash, ">= 3.5.13 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:inertia, "~> 2.3", [hex: :inertia, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0-rc.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "754a7d869a3961a927abb7ff700af9895d2e69dd3b8f9471b0aa8e859cc4b135"},
-  "ash_postgres": {:hex, :ash_postgres, "2.6.28", "52cd2a5a701f15ffb76cf1db6ff3854bea616b963b869bac562420af73024ecf", [:mix], [{:ash, ">= 3.11.2 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.3.16 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "da354f3380d8a2c049904e8860fd2eea53e034a9be353bdd8a09e2a1f3315747"},
-  "ash_sql": {:hex, :ash_sql, "0.4.2", "6ff701ee1f55d0310d1e6878ce57508f3c4aac70d7c751d3f9427dc0d5c36b50", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, ">= 3.13.4 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "eae73e0a84b10ceb508739eaef144d8d8e86b634aa177ed99d688758c29273cb"},
-  "ash_typescript": {:hex, :ash_typescript, "0.12.1", "dcda223234858dacfa6563ff2d23d817225b6a7bc239a10382ddfd7bf5ab006b", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, "~> 2.0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "baaf3da4c7f12af7316848dd14e823040eab5ca0528803f8000727dcab2010a0"},
+  "ash_postgres": {:hex, :ash_postgres, "2.6.30", "2f2d0b0b2343a112283b2484d25607d566df66325de3e1c7bba3ec1a370aec45", [:mix], [{:ash, "~> 3.14", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.4.3 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "35ecb69cbada8473a28f065f285a4fada35d13267c48d6dddf11036f0539cfa3"},
+  "ash_sql": {:hex, :ash_sql, "0.4.3", "2c74e0a19646e3d31a384a2712fc48a82d04ceea74467771ce496fd64dbb55db", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, ">= 3.13.4 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "b0ecc00502178407e607ae4bcfd2f264f36f6a884218024b5e4d5b3dcfa5e027"},
+  "ash_typescript": {:hex, :ash_typescript, "0.13.0", "bed3dd43f07f70f4b092bf3dcff514f9c2b5396d1488b2ab8f0dc306944ea27b", [:mix], [{:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, "~> 2.0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "39b1304149b7c4d2e68408fee09e6197f1f0e796a428d3cdfcec46692110802c"},
   "assent": {:hex, :assent, "0.2.13", "11226365d2d8661d23e9a2cf94d3255e81054ff9d88ac877f28bfdf38fa4ef31", [:mix], [{:certifi, ">= 0.0.0", [hex: :certifi, repo: "hexpm", optional: true]}, {:finch, "~> 0.15", [hex: :finch, repo: "hexpm", optional: true]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: true]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:req, "~> 0.4", [hex: :req, repo: "hexpm", optional: true]}, {:ssl_verify_fun, ">= 0.0.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: true]}], "hexpm", "bf9f351b01dd6bceea1d1f157f05438f6765ce606e6eb8d29296003d29bf6eab"},
   "bandit": {:hex, :bandit, "1.10.2", "d15ea32eb853b5b42b965b24221eb045462b2ba9aff9a0bda71157c06338cbff", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "27b2a61b647914b1726c2ced3601473be5f7aa6bb468564a688646a689b3ee45"},
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.3.2", "d50091e3c9492d73e17fc1e1619a9b09d6a5ef99160eb4d736926fd475a16ca3", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "471be5151874ae7931911057d1467d908955f93554f7a6cd1b7d804cac8cef53"},
@@ -53,7 +53,6 @@
   "fine": {:hex, :fine, "0.1.4", "b19a89c1476c7c57afb5f9314aed5960b5bc95d5277de4cb5ee8e1d1616ce379", [:mix], [], "hexpm", "be3324cc454a42d80951cf6023b9954e9ff27c6daa255483b3e8d608670303f5"},
   "fsmx": {:hex, :fsmx, "0.5.0", "63737a5e864e0c4804ce523abee4cfdc496f35ca523d7633efa384d159b9efa2", [:mix], [{:ecto, ">= 3.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "0351e6e725a60c7a171ca5f93db3cf223e580f52f3491d1bb2a57b4f23b6f8b1"},
   "fuse": {:hex, :fuse, "2.5.0", "71afa90be21da4e64f94abba9d36472faa2d799c67fedc3bd1752a88ea4c4753", [:rebar3], [], "hexpm", "7f52a1c84571731ad3c91d569e03131cc220ebaa7e2a11034405f0bac46a4fef"},
-  "gen_stage": {:hex, :gen_stage, "1.3.2", "7c77e5d1e97de2c6c2f78f306f463bca64bf2f4c3cdd606affc0100b89743b7b", [:mix], [], "hexpm", "0ffae547fa777b3ed889a6b9e1e64566217413d018cabd825f786e843ffe63e7"},
   "gettext": {:hex, :gettext, "0.26.2", "5978aa7b21fada6deabf1f6341ddba50bc69c999e812211903b169799208f2a8", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "aa978504bcf76511efdc22d580ba08e2279caab1066b76bb9aa81c4a1e0a32a5"},
   "git_cli": {:hex, :git_cli, "0.3.0", "a5422f9b95c99483385b976f5d43f7e8233283a47cda13533d7c16131cb14df5", [:mix], [], "hexpm", "78cb952f4c86a41f4d3511f1d3ecb28edb268e3a7df278de2faa1bd4672eaf9b"},
   "git_hooks": {:hex, :git_hooks, "0.8.1", "1f6a1b065638e07ed89a49804dac6c24d8ac8d27c8f9fd0e9620d5bef8c30f41", [:mix], [{:recase, "~> 0.8.0", [hex: :recase, repo: "hexpm", optional: false]}], "hexpm", "267d8b82615ad439177b2a4bc2efadb7491ec1c8520dacc67ddc38c251448cbc"},
@@ -71,11 +70,6 @@
   "igniter_js": {:hex, :igniter_js, "0.4.11", "f96999a0295cc8a00541e3f280c3fb1dd596e6d92498df53acb1f9926bb3b96c", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:rustler, "~> 0.36.2", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.8", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "a76ec6ea2899aefb19e7c7a965ea19cf835557c330d54997c7987dad6978c6e4"},
   "iterex": {:hex, :iterex, "0.1.2", "58f9b9b9a22a55cbfc7b5234a9c9c63eaac26d276b3db80936c0e1c60355a5a6", [:mix], [], "hexpm", "2e103b8bcc81757a9af121f6dc0df312c9a17220f302b1193ef720460d03029d"},
   "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
-  "jido": {:hex, :jido, "2.0.0-rc.2", "cd8b2db9efb9e791d914f7779b05120a3b12d458fb07e72b1b3277cb21f95972", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:igniter, "~> 0.7", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:jido_action, "~> 2.0.0-rc.2", [hex: :jido_action, repo: "hexpm", optional: false]}, {:jido_signal, "~> 2.0.0-rc.2", [hex: :jido_signal, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:ok, "~> 2.3", [hex: :ok, repo: "hexpm", optional: false]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}, {:sched_ex, "~> 1.1", [hex: :sched_ex, repo: "hexpm", optional: false]}, {:splode, "~> 0.3.0", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.3", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 1.1", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}, {:uniq, "~> 0.6.1", [hex: :uniq, repo: "hexpm", optional: false]}], "hexpm", "1c9de2a9af8c9f953ce58efcfe1b01beb67b34587edb2e899144427ca3d6ccb7"},
-  "jido_action": {:hex, :jido_action, "2.0.0-rc.2", "c6e9e0604812f5d39d7fb16ced05123efbf012a8e35b2b40fc22de7b4d6a02f8", [:mix], [{:abacus, "~> 2.1", [hex: :abacus, repo: "hexpm", optional: false]}, {:igniter, "~> 0.7", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:libgraph, "~> 0.16.0", [hex: :libgraph, repo: "hexpm", optional: false]}, {:lua, "~> 0.3", [hex: :lua, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:private, "~> 0.1.2", [hex: :private, repo: "hexpm", optional: false]}, {:req, "~> 0.5.10", [hex: :req, repo: "hexpm", optional: false]}, {:splode, "~> 0.3.0", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.3", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 1.1", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}, {:tentacat, "~> 2.5", [hex: :tentacat, repo: "hexpm", optional: false]}, {:uniq, "~> 0.6.1", [hex: :uniq, repo: "hexpm", optional: false]}, {:weather, "~> 0.4.0", [hex: :weather, repo: "hexpm", optional: false]}, {:zoi, "~> 0.16", [hex: :zoi, repo: "hexpm", optional: false]}], "hexpm", "28cd235a159dc2d1ceb82cc3d1ef1b84d4bff6fa4ae8a076079b13cbc2a8bb93"},
-  "jido_ai": {:git, "https://github.com/agentjido/jido_ai.git", "59c2775cdb4adfe43801c9e69b6cca8772d3d9a2", [branch: "main"]},
-  "jido_browser": {:git, "https://github.com/agentjido/jido_browser.git", "ece3bb70d0abb6c148680f59c313029a7ed6dac0", [branch: "main"]},
-  "jido_signal": {:hex, :jido_signal, "2.0.0-rc.2", "f1afc591a6ca92d7ac69168762d0c48f4e581abb9c5d30622c85ab9ecad58cec", [:mix], [{:fuse, "~> 2.5", [hex: :fuse, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:memento, "~> 0.5.0", [hex: :memento, repo: "hexpm", optional: false]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:private, "~> 0.1.2", [hex: :private, repo: "hexpm", optional: false]}, {:splode, "~> 0.3.0", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.3", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 1.1", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}, {:uniq, "~> 0.6.1", [hex: :uniq, repo: "hexpm", optional: false]}, {:zoi, "~> 0.16", [hex: :zoi, repo: "hexpm", optional: false]}], "hexpm", "80ee1af67fc8154ce686001571fd5aff00312d6ca4674f9133453ed82ea589d8"},
   "joken": {:hex, :joken, "2.6.2", "5daaf82259ca603af4f0b065475099ada1b2b849ff140ccd37f4b6828ca6892a", [:mix], [{:jose, "~> 1.11.10", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "5134b5b0a6e37494e46dbf9e4dad53808e5e787904b7c73972651b51cce3d72b"},
   "jose": {:hex, :jose, "1.11.12", "06e62b467b61d3726cbc19e9b5489f7549c37993de846dfb3ee8259f9ed208b3", [:mix, :rebar3], [], "hexpm", "31e92b653e9210b696765cdd885437457de1add2a9011d92f8cf63e4641bab7b"},
   "json_xema": {:hex, :json_xema, "0.6.5", "060459c9c9152650edb4427b1acbc61fa43a23bcea0301d200cafa76e0880f37", [:mix], [{:conv_case, "~> 0.2", [hex: :conv_case, repo: "hexpm", optional: false]}, {:xema, "~> 0.16", [hex: :xema, repo: "hexpm", optional: false]}], "hexpm", "b8ffdbc2f67aa8b91b44e1ba0ab77eb5c0b0142116f8fbb804977fb939d470ef"},
@@ -84,7 +78,7 @@
   "libgraph": {:hex, :libgraph, "0.16.0", "3936f3eca6ef826e08880230f806bfea13193e49bf153f93edcf0239d4fd1d07", [:mix], [], "hexpm", "41ca92240e8a4138c30a7e06466acc709b0cbb795c643e9e17174a178982d6bf"},
   "live_debugger": {:hex, :live_debugger, "0.5.1", "7302a4fda1920ba541b456c2d7a97acc3c7f9d7b938b5435927883b709c968a2", [:mix], [{:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.8 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "797fdca7cc60d7588c6e285b0d7ea73f2dce8b123bac43eae70271fa519bb907"},
   "live_toast": {:hex, :live_toast, "0.8.0", "d7e24801a9a966d8e48872767ac33c50fc14640ac5272128becfc534fabd99b7", [:mix], [{:ecto, ">= 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:gettext, ">= 0.26.2", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.7.19", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, ">= 1.0.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "7e64435131b7731698908d59f7ba9f5092df8a3720814f26edf57e99d97a803c"},
-  "llm_db": {:hex, :llm_db, "2026.1.5", "29ec80ed444e3edd8fa403524c8efc7dc89962e7f635b20d7bfa194ff859d3b9", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:dotenvy, "~> 1.1", [hex: :dotenvy, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:toml, "~> 0.7", [hex: :toml, repo: "hexpm", optional: false]}, {:zoi, "~> 0.10", [hex: :zoi, repo: "hexpm", optional: false]}], "hexpm", "0b4e2d32f849bca6a77e4908f2833028f8a8ae4e21f82bf7d5e1a37c14df589d"},
+  "llm_db": {:hex, :llm_db, "2026.2.2", "34e75708364d3893eea9955acb88c80c18db570f9709affb0a287495951a4bfe", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:dotenvy, "~> 1.1", [hex: :dotenvy, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:toml, "~> 0.7", [hex: :toml, repo: "hexpm", optional: false]}, {:zoi, "~> 0.10", [hex: :zoi, repo: "hexpm", optional: false]}], "hexpm", "e9d12438d4f3daa67a4aa890d08c86b971a5eb2e2e9756a95316b586f5606816"},
   "lua": {:hex, :lua, "0.4.0", "de0f04871fdd133cd13a0662690b4fd3ba7a73ca5857493c4665a0a4251908fe", [:mix], [{:luerl, "~> 1.5.1", [hex: :luerl, repo: "hexpm", optional: false]}], "hexpm", "648e17ab9faa1ab1a788fa58ed608366a7026d0eeaec2f311510c065817c4067"},
   "luerl": {:hex, :luerl, "1.5.1", "f6700420950fc6889137e7a0c11c4a8467dea04a8c23f707a40d83566d14e786", [:rebar3], [], "hexpm", "abf88d849baa0d5dca93b245a8688d4de2ee3d588159bb2faf51e15946509390"},
   "lumis": {:hex, :lumis, "0.1.0", "6d3b495457d0608f8fe32fe6fa917eb17c921bd0087583a7f4c420c0009888fd", [:mix], [{:nimble_options, "~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:rustler, "~> 0.29", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4de203bc5811ad21f0c6b0442612a3fc1ae9bea7fbfe7037452db9e9dfdaaab3"},
@@ -127,7 +121,7 @@
   "reactor": {:hex, :reactor, "1.0.0", "024bd13df910bcb8c01cebed4f10bd778269a141a1c8a234e4f67796ac4883cf", [:mix], [{:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:iterex, "~> 0.1", [hex: :iterex, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:libgraph, "~> 0.16", [hex: :libgraph, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.3 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.2", [hex: :telemetry, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}, {:ymlr, "~> 5.0", [hex: :ymlr, repo: "hexpm", optional: false]}], "hexpm", "ae8eb507fffc517f5aa5947db9d2ede2db8bae63b66c94ccb5a2027d30f830a0"},
   "recase": {:hex, :recase, "0.8.1", "ab98cd35857a86fa5ca99036f575241d71d77d9c2ab0c39aacf1c9b61f6f7d1d", [:mix], [], "hexpm", "9fd8d63e7e43bd9ea385b12364e305778b2bbd92537e95c4b2e26fc507d5e4c2"},
   "req": {:hex, :req, "0.5.17", "0096ddd5b0ed6f576a03dde4b158a0c727215b15d2795e59e0916c6971066ede", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0b8bc6ffdfebbc07968e59d3ff96d52f2202d0536f10fef4dc11dc02a2a43e39"},
-  "req_llm": {:hex, :req_llm, "1.4.1", "647d68f5acca3ad92187bde76049b16ba9b1de9cea6baf85bb4f09ebc9c2945e", [:mix], [{:dotenvy, "~> 1.1", [hex: :dotenvy, repo: "hexpm", optional: false]}, {:ex_aws_auth, "~> 1.3", [hex: :ex_aws_auth, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:jsv, "~> 0.11", [hex: :jsv, repo: "hexpm", optional: false]}, {:llm_db, "~> 2026.1", [hex: :llm_db, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:server_sent_events, "~> 0.2", [hex: :server_sent_events, repo: "hexpm", optional: false]}, {:splode, "~> 0.3.0", [hex: :splode, repo: "hexpm", optional: false]}, {:uniq, "~> 0.6", [hex: :uniq, repo: "hexpm", optional: false]}, {:zoi, "~> 0.14", [hex: :zoi, repo: "hexpm", optional: false]}], "hexpm", "d6865049e8f7b51cabc25687e198e6a64baa089cc1316774198b2f15c22e7a19"},
+  "req_llm": {:hex, :req_llm, "1.5.0", "77f23002e1185500b6dc5edb16dfe8ff73d9a3fd1f95369bf3c4ec3458713eb5", [:mix], [{:dotenvy, "~> 1.1", [hex: :dotenvy, repo: "hexpm", optional: false]}, {:ex_aws_auth, "~> 1.3", [hex: :ex_aws_auth, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:jsv, "~> 0.11", [hex: :jsv, repo: "hexpm", optional: false]}, {:llm_db, "~> 2026.1", [hex: :llm_db, repo: "hexpm", optional: false]}, {:nimble_options, "~> 1.1", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:server_sent_events, "~> 0.2", [hex: :server_sent_events, repo: "hexpm", optional: false]}, {:splode, "~> 0.3.0", [hex: :splode, repo: "hexpm", optional: false]}, {:uniq, "~> 0.6", [hex: :uniq, repo: "hexpm", optional: false]}, {:zoi, "~> 0.14", [hex: :zoi, repo: "hexpm", optional: false]}], "hexpm", "250f6f622d5a4043e7f9a86da27b49c91b6270104c35dce65257c7f2a3c3ed19"},
   "rewrite": {:hex, :rewrite, "1.2.0", "80220eb14010e175b67c939397e1a8cdaa2c32db6e2e0a9d5e23e45c0414ce21", [:mix], [{:glob_ex, "~> 0.1", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}, {:text_diff, "~> 0.1", [hex: :text_diff, repo: "hexpm", optional: false]}], "hexpm", "a1cd702bbb9d51613ab21091f04a386d750fc6f4516b81900df082d78b2d8c50"},
   "rustler_precompiled": {:hex, :rustler_precompiled, "0.8.4", "700a878312acfac79fb6c572bb8b57f5aae05fe1cf70d34b5974850bbf2c05bf", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "3b33d99b540b15f142ba47944f7a163a25069f6d608783c321029bc1ffb09514"},
   "sched_ex": {:hex, :sched_ex, "1.1.4", "893de8ffcb1590ae6089d9862d49447fbb948535ba5777c231e55c8404bc3e6e", [:mix], [{:crontab, "~> 1.1.2", [hex: :crontab, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "f32336c40a62aba581c57d6d6009e40e5c52011bb8305fc3a33ef9e5815b861c"},
@@ -146,7 +140,6 @@
   "telemetry_metrics": {:hex, :telemetry_metrics, "1.1.0", "5bd5f3b5637e0abea0426b947e3ce5dd304f8b3bc6617039e2b5a008adc02f8f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7b79e8ddfde70adb6db8a6623d1778ec66401f366e9a8f5dd0955c56bc8ce67"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.3.0", "d5c46420126b5ac2d72bc6580fb4f537d35e851cc0f8dbd571acf6d6e10f5ec7", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "51f18bed7128544a50f75897db9974436ea9bfba560420b646af27a9a9b35211"},
   "tentacat": {:hex, :tentacat, "2.5.0", "d0177ae1289faf6814a85aea044bcdc1ca64a4b1f961e44189451d5c9060a662", [:mix], [{:httpoison, "~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "c7d3d34a56d5dc870c2155444f7d6cd0e6959dd65c16bb9174442e347f34334f"},
-  "term_ui": {:hex, :term_ui, "0.2.0", "2df503fa9b4480624080fbe8c3a3800946dd7133f3bf821ca7ed53d2919874d0", [:mix], [{:gen_stage, "~> 1.2", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "65fa40952f45cb810769f61ff8e2a2548dafb7063f28eb8f6ac1b3892b638f15"},
   "text_diff": {:hex, :text_diff, "0.1.0", "1caf3175e11a53a9a139bc9339bd607c47b9e376b073d4571c031913317fecaa", [:mix], [], "hexpm", "d1ffaaecab338e49357b6daa82e435f877e0649041ace7755583a0ea3362dbd7"},
   "texture": {:hex, :texture, "0.3.2", "ca68fc2804ce05ffe33cded85d69b5ebadb0828233227accfe3c574e34fd4e3f", [:mix], [{:abnf_parsec, "~> 2.0", [hex: :abnf_parsec, repo: "hexpm", optional: false]}], "hexpm", "43bb1069d9cf4309ed6f0ff65ade787a76f986b821ab29d1c96b5b5102cb769c"},
   "thousand_island": {:hex, :thousand_island, "1.4.3", "2158209580f633be38d43ec4e3ce0a01079592b9657afff9080d5d8ca149a3af", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6e4ce09b0fd761a58594d02814d40f77daff460c48a7354a15ab353bb998ea0b"},
diff --git a/test/agent_jido/github_issue_bot/issue_run/coordinator_test.exs b/test/agent_jido/github_issue_bot/issue_run/coordinator_test.exs
index d6f1525..944b286 100644
--- a/test/agent_jido/github_issue_bot/issue_run/coordinator_test.exs
+++ b/test/agent_jido/github_issue_bot/issue_run/coordinator_test.exs
@@ -1,9 +1,9 @@
 defmodule AgentJido.GithubIssueBotTest.IssueRun.CoordinatorTest do
   use ExUnit.Case, async: false
 
+  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
   alias Jido.AgentServer
   alias Jido.Signal
-  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
 
   @test_issue %{
     repo: "test/repo",
diff --git a/test/agent_jido/github_issue_bot/pull_request/pull_request_coordinator_test.exs b/test/agent_jido/github_issue_bot/pull_request/pull_request_coordinator_test.exs
index e9b53f5..03411fe 100644
--- a/test/agent_jido/github_issue_bot/pull_request/pull_request_coordinator_test.exs
+++ b/test/agent_jido/github_issue_bot/pull_request/pull_request_coordinator_test.exs
@@ -10,9 +10,9 @@ defmodule AgentJido.GithubIssueBotTest.PullRequest.PullRequestCoordinatorTest do
   """
   use ExUnit.Case, async: false
 
+  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
   alias Jido.AgentServer
   alias Jido.Signal
-  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
 
   # Issue number 42 - passes on first attempt
   @test_issue_pass %{
@@ -212,7 +212,7 @@ defmodule AgentJido.GithubIssueBotTest.PullRequest.PullRequestCoordinatorTest do
       assert pr.pr_url != nil
 
       # Should have attempt history
-      assert length(pr.attempt_history) >= 1
+      assert pr.attempt_history != []
     end
   end
 
@@ -256,6 +256,7 @@ defmodule AgentJido.GithubIssueBotTest.PullRequest.PullRequestCoordinatorTest do
 
       # Should have 3 failed attempts in history
       assert length(pr.attempt_history) == 3
+
       Enum.each(pr.attempt_history, fn entry ->
         assert entry.outcome == :failed
       end)
diff --git a/test/agent_jido/github_issue_bot/research/research_coordinator_test.exs b/test/agent_jido/github_issue_bot/research/research_coordinator_test.exs
index 859b2fd..8f88d6f 100644
--- a/test/agent_jido/github_issue_bot/research/research_coordinator_test.exs
+++ b/test/agent_jido/github_issue_bot/research/research_coordinator_test.exs
@@ -10,9 +10,9 @@ defmodule AgentJido.GithubIssueBotTest.Research.ResearchCoordinatorTest do
   """
   use ExUnit.Case, async: false
 
+  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
   alias Jido.AgentServer
   alias Jido.Signal
-  alias AgentJido.GithubIssueBot.IssueRun.CoordinatorAgent
 
   @test_issue %{
     repo: "test/repo",
@@ -134,7 +134,7 @@ defmodule AgentJido.GithubIssueBotTest.Research.ResearchCoordinatorTest do
 
       # Should have extracted keywords
       assert is_list(code_search.keywords)
-      assert length(code_search.keywords) > 0
+      assert code_search.keywords != []
 
       # Should have found files (mock)
       assert is_list(code_search.files)
diff --git a/test/agent_jido_web/controllers/page_controller_test.exs b/test/agent_jido_web/controllers/page_controller_test.exs
index 9589c9c..d6f2a29 100644
--- a/test/agent_jido_web/controllers/page_controller_test.exs
+++ b/test/agent_jido_web/controllers/page_controller_test.exs
@@ -3,6 +3,6 @@ defmodule AgentJidoWeb.PageControllerTest do
 
   test "GET /", %{conn: conn} do
     conn = get(conn, ~p"/")
-    assert html_response(conn, 200) =~ "Peace of mind from prototype to production"
+    assert html_response(conn, 200) =~ "Agent Jido"
   end
 end
diff --git a/test/agent_jido_web/live/demos/chat_live_test.exs b/test/agent_jido_web/live/demos/chat_live_test.exs
index 3eaf58b..e10f2ee 100644
--- a/test/agent_jido_web/live/demos/chat_live_test.exs
+++ b/test/agent_jido_web/live/demos/chat_live_test.exs
@@ -1,11 +1,9 @@
 defmodule AgentJidoWeb.Demos.ChatLiveTest do
   use AgentJidoWeb.ConnCase, async: false
 
-  import Phoenix.LiveViewTest
-
   describe "ChatLive" do
     @tag :skip
-    test "renders chat interface when authenticated", %{conn: conn} do
+    test "renders chat interface when authenticated", %{conn: _conn} do
       # This test requires authentication - skip for now until auth helpers are set up
       # When auth is available:
       # conn = log_in_user(conn, user)
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index e2dc3d0..fe616b0 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -16,6 +16,8 @@ defmodule AgentJido.DataCase do
 
   use ExUnit.CaseTemplate
 
+  alias Ecto.Adapters.SQL.Sandbox
+
   using do
     quote do
       alias AgentJido.Repo
@@ -36,8 +38,8 @@ defmodule AgentJido.DataCase do
   Sets up the sandbox based on the test tags.
   """
   def setup_sandbox(tags) do
-    pid = Ecto.Adapters.SQL.Sandbox.start_owner!(AgentJido.Repo, shared: not tags[:async])
-    on_exit(fn -> Ecto.Adapters.SQL.Sandbox.stop_owner(pid) end)
+    pid = Sandbox.start_owner!(AgentJido.Repo, shared: not tags[:async])
+    on_exit(fn -> Sandbox.stop_owner(pid) end)
   end
 
   @doc """