From bf1244cb3dc13a32691a321b66153a9cd1cbba7e Mon Sep 17 00:00:00 2001
From: omar-abdelgawad <omar.abdelgawad@ejust.edu.eg>
Date: Fri, 30 Jan 2026 22:14:02 +0200
Subject: [PATCH 1/5] changed package name to dagent

---
 .gitignore                                    |   6 +-
 Makefile                                      |   4 +-
 README.md                                     |   2 +-
 docs/index.html                               |  94 ++++++++-----
 docs/manifest.webmanifest                     |  12 +-
 pyproject.toml                                |  14 +-
 scripts/test_coding_agent.py                  |   2 +-
 src/{os_assistant => dagent}/__init__.py      |   0
 src/{os_assistant => dagent}/__main__.py      |   2 +-
 .../command_parser.py                         |   0
 .../configs/__init__.py                       |   0
 .../configs/config.yaml                       |   0
 src/{os_assistant => dagent}/core/__init__.py |   0
 src/{os_assistant => dagent}/core/builder.py  |  12 +-
 .../core/nodes/__init__.py                    |   0
 .../core/nodes/command_generation.py          |  16 +--
 .../core/nodes/context_retrieval.py           |  16 +--
 .../core/nodes/conversation.py                |   8 +-
 .../core/nodes/display_result.py              |   6 +-
 .../core/nodes/domain_analysis.py             |  14 +-
 .../core/nodes/helpers.py                     |   4 +-
 .../core/nodes/information_generation.py      |  16 +--
 .../core/nodes/query_classification.py        |  14 +-
 .../core/nodes/registry.py                    |   0
 .../core/nodes/result_preparation.py          |   6 +-
 .../core/nodes/tool_execution.py              |   8 +-
 .../core/nodes/vision_analysis.py             |   8 +-
 .../core/routing/__init__.py                  |   0
 .../core/routing/logic.py                     |   8 +-
 .../core/routing/rules.py                     |   2 +-
 src/{os_assistant => dagent}/core/state.py    |   2 +-
 src/{os_assistant => dagent}/os_assistant.py  |   2 +-
 .../parsers/json_cleaner.py                   |   0
 src/{os_assistant => dagent}/parsers/setup.py |   8 +-
 .../prompts/command_generator_node.yaml       |   0
 .../prompts/conversation_context_node.yaml    |   0
 .../prompts/domain_analysis_node.yaml         |   0
 .../prompts/information_generator_node.yaml   |   0
 .../prompts/mode_config.yaml                  |   0
 .../prompts/prompt_loader.py                  |   8 +-
 .../prompts/query_classifier_node.yaml        |   0
 src/{os_assistant => dagent}/py.typed         |   0
 .../pydantic_models/__init__.py               |   2 +-
 .../pydantic_models/schemas.py                |   0
 .../tools/__init__.py                         |   0
 .../tools/agentic_rag/.gitignore              |   0
 .../tools/agentic_rag/README.md               |   2 +-
 .../tools/agentic_rag/__init__.py             |   0
 .../tools/agentic_rag/application/init.py     |   2 +-
 .../tools/agentic_rag/application/search.py   |   2 +-
 .../tools/agentic_rag/config/config.py        |   0
 .../tools/agentic_rag/core/agent_rag.py       |   2 +-
 .../tools/agentic_rag/core/chunking.py        |   2 +-
 .../tools/agentic_rag/core/embedding.py       |   2 +-
 .../tools/agentic_rag/core/retrieval.py       |   0
 .../tools/agentic_rag/database/database.py    |   2 +-
 .../agentic_rag/processor/batch_processor.py  |   2 +-
 .../tools/code_agent/README.md                |   0
 .../tools/code_agent/core/__init__.py         |   0
 .../tools/code_agent/core/models.py           |   0
 .../tools/code_agent/core/run_code.py         |   4 +-
 .../tools/code_agent/execution/__init__.py    |   0
 .../tools/code_agent/execution/executors.py   |   4 +-
 .../tools/code_agent/llm/__init__.py          |   0
 .../tools/code_agent/llm/agents.py            |   4 +-
 .../tools/code_agent/llm/prompt_loader.py     |   0
 .../tools/code_agent/llm/prompts.yaml         |   0
 .../code_agent/processing_utils/__init__.py   |   0
 .../processing_utils/json_parsers.py          |   2 +-
 .../processing_utils/markdown_parsers.py      |   0
 .../processing_utils/output_handler.py        |   4 +-
 .../processing_utils/string_utils.py          |   0
 .../structured_output_parsers.py              |   0
 .../tools/code_agent/wrapper.py               |   0
 .../tools/mcp_client/__init__.py              |   0
 .../tools/mcp_client/client.py                |   4 +-
 .../tools/mcp_client/query_router.py          |   4 +-
 .../tools/mcp_client/result_fusion.py         |   2 +-
 .../tools/vision/__init__.py                  |   0
 .../tools/vision/analyzer.py                  |   2 +-
 .../tools/vision/config.py                    |   2 +-
 .../utils/__init__.py                         |   0
 src/{os_assistant => dagent}/utils/device.py  |   0
 .../utils/graph_visualizer.py                 |   0
 src/{os_assistant => dagent}/utils/logger.py  |   4 +-
 .../utils/model_factory.py                    |   2 +-
 .../utils/settings.py                         |   0
 src/dataset_generation/config/config.py       |   2 +-
 src/dataset_generation/core/log_sampler.py    |   2 +-
 .../core/question_generator.py                |   6 +-
 .../core/similarity_checker.py                |   2 +-
 src/evaluator/core/evaluator.py               |   4 +-
 .../tools/agentic_rag/data/example.sqlite     |   0
 streamlit_app/app.py                          |  13 +-
 tests/test_build.py                           |   6 +-
 tests/test_cli.py                             |   8 +-
 uv.lock                                       | 127 +++++++++---------
 97 files changed, 271 insertions(+), 249 deletions(-)
 rename src/{os_assistant => dagent}/__init__.py (100%)
 rename src/{os_assistant => dagent}/__main__.py (95%)
 rename src/{os_assistant => dagent}/command_parser.py (100%)
 rename src/{os_assistant => dagent}/configs/__init__.py (100%)
 rename src/{os_assistant => dagent}/configs/config.yaml (100%)
 rename src/{os_assistant => dagent}/core/__init__.py (100%)
 rename src/{os_assistant => dagent}/core/builder.py (88%)
 rename src/{os_assistant => dagent}/core/nodes/__init__.py (100%)
 rename src/{os_assistant => dagent}/core/nodes/command_generation.py (96%)
 rename src/{os_assistant => dagent}/core/nodes/context_retrieval.py (95%)
 rename src/{os_assistant => dagent}/core/nodes/conversation.py (94%)
 rename src/{os_assistant => dagent}/core/nodes/display_result.py (96%)
 rename src/{os_assistant => dagent}/core/nodes/domain_analysis.py (88%)
 rename src/{os_assistant => dagent}/core/nodes/helpers.py (95%)
 rename src/{os_assistant => dagent}/core/nodes/information_generation.py (96%)
 rename src/{os_assistant => dagent}/core/nodes/query_classification.py (83%)
 rename src/{os_assistant => dagent}/core/nodes/registry.py (100%)
 rename src/{os_assistant => dagent}/core/nodes/result_preparation.py (97%)
 rename src/{os_assistant => dagent}/core/nodes/tool_execution.py (94%)
 rename src/{os_assistant => dagent}/core/nodes/vision_analysis.py (95%)
 rename src/{os_assistant => dagent}/core/routing/__init__.py (100%)
 rename src/{os_assistant => dagent}/core/routing/logic.py (89%)
 rename src/{os_assistant => dagent}/core/routing/rules.py (96%)
 rename src/{os_assistant => dagent}/core/state.py (97%)
 rename src/{os_assistant => dagent}/os_assistant.py (99%)
 rename src/{os_assistant => dagent}/parsers/json_cleaner.py (100%)
 rename src/{os_assistant => dagent}/parsers/setup.py (98%)
 rename src/{os_assistant => dagent}/prompts/command_generator_node.yaml (100%)
 rename src/{os_assistant => dagent}/prompts/conversation_context_node.yaml (100%)
 rename src/{os_assistant => dagent}/prompts/domain_analysis_node.yaml (100%)
 rename src/{os_assistant => dagent}/prompts/information_generator_node.yaml (100%)
 rename src/{os_assistant => dagent}/prompts/mode_config.yaml (100%)
 rename src/{os_assistant => dagent}/prompts/prompt_loader.py (92%)
 rename src/{os_assistant => dagent}/prompts/query_classifier_node.yaml (100%)
 rename src/{os_assistant => dagent}/py.typed (100%)
 rename src/{os_assistant => dagent}/pydantic_models/__init__.py (92%)
 rename src/{os_assistant => dagent}/pydantic_models/schemas.py (100%)
 rename src/{os_assistant => dagent}/tools/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/.gitignore (100%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/README.md (98%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/application/init.py (97%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/application/search.py (99%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/config/config.py (100%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/core/agent_rag.py (98%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/core/chunking.py (98%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/core/embedding.py (97%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/core/retrieval.py (100%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/database/database.py (99%)
 rename src/{os_assistant => dagent}/tools/agentic_rag/processor/batch_processor.py (99%)
 rename src/{os_assistant => dagent}/tools/code_agent/README.md (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/core/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/core/models.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/core/run_code.py (96%)
 rename src/{os_assistant => dagent}/tools/code_agent/execution/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/execution/executors.py (98%)
 rename src/{os_assistant => dagent}/tools/code_agent/llm/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/llm/agents.py (98%)
 rename src/{os_assistant => dagent}/tools/code_agent/llm/prompt_loader.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/llm/prompts.yaml (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/processing_utils/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/processing_utils/json_parsers.py (99%)
 rename src/{os_assistant => dagent}/tools/code_agent/processing_utils/markdown_parsers.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/processing_utils/output_handler.py (85%)
 rename src/{os_assistant => dagent}/tools/code_agent/processing_utils/string_utils.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/processing_utils/structured_output_parsers.py (100%)
 rename src/{os_assistant => dagent}/tools/code_agent/wrapper.py (100%)
 rename src/{os_assistant => dagent}/tools/mcp_client/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/mcp_client/client.py (99%)
 rename src/{os_assistant => dagent}/tools/mcp_client/query_router.py (99%)
 rename src/{os_assistant => dagent}/tools/mcp_client/result_fusion.py (99%)
 rename src/{os_assistant => dagent}/tools/vision/__init__.py (100%)
 rename src/{os_assistant => dagent}/tools/vision/analyzer.py (99%)
 rename src/{os_assistant => dagent}/tools/vision/config.py (98%)
 rename src/{os_assistant => dagent}/utils/__init__.py (100%)
 rename src/{os_assistant => dagent}/utils/device.py (100%)
 rename src/{os_assistant => dagent}/utils/graph_visualizer.py (100%)
 rename src/{os_assistant => dagent}/utils/logger.py (97%)
 rename src/{os_assistant => dagent}/utils/model_factory.py (96%)
 rename src/{os_assistant => dagent}/utils/settings.py (100%)
 delete mode 100644 src/os_assistant/tools/agentic_rag/data/example.sqlite

diff --git a/.gitignore b/.gitignore
index 4c25fd9..d24f7f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,10 +196,10 @@ evaluation_results/*
 src/dataset_generation/update_generated_types.py
 
 # Ignore everything in the data folder
-src/os_assistant/tools/agentic_rag/data/*
+src/dagent/tools/agentic_rag/data/*
 
 # Except the folder itself (optional)
-!src/os_assistant/tools/agentic_rag/data/
+!src/dagent/tools/agentic_rag/data/
 
 # Except this specific file
-!src/os_assistant/tools/agentic_rag/data/example.sqlite
\ No newline at end of file
+!src/dagent/tools/agentic_rag/data/example.sqlite
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 3c1e0bf..c93be56 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,11 @@ setup_and_pull:
 	uv run setup_and_pull_general.py
 
 docker_build:
-	docker build -t os_assistant_dev .
+	docker build -t dagent_dev .
 #   --build-arg FILE_ID=1TDkZPvfC_x1dh5C6EX8ayKTEdYfx1Wb3
 
 docker_run:
-	docker run -it --rm --name os_assistant_dev_container os_assistant_dev
+	docker run -it --rm --name dagent_dev_container dagent_dev
 
 streamlit_run:
 	uv run streamlit run streamlit_app/app.py
diff --git a/README.md b/README.md
index fde6629..50684f5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![PythonVersion](https://img.shields.io/badge/python-3.12-blue)](https://img.shields.io/badge/python-3.12%20%7C%203.9%20%7C%203.10-blue)
 <!-- [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -->
 
-# os_assistant
+# DAgent
 This is a modern template for a python project with the pyproject.toml with some fields to change based on project. It also has tox configured, docs dir for github pages, .github dir with tox-gh-actions configured and more.  
 
 ## Prerequisites
diff --git a/docs/index.html b/docs/index.html
index 801fe07..523dccb 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,15 +1,16 @@
 <!doctype html>
 <html lang="en">
+
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>os_assistant — modern Python project template</title>
-  <meta name="description" content="os_assistant: a modern Python project template with uv, tox, pre-commit, GitHub Pages docs/, and a CLI (osassis)."/>
+  <title>DAgent</title>
+  <meta name="description" content="DAgent: A device-aware assistant." />
   <link rel="icon" href="favicon.svg" type="image/svg+xml" />
   <link rel="manifest" href="manifest.webmanifest" />
   <!-- Social previews -->
-  <meta property="og:title" content="os_assistant — modern Python project template" />
-  <meta property="og:description" content="uv-based workflow, tox, pre-commit, GitHub Actions, docs/ for GitHub Pages, and a CLI (osassis)." />
+  <meta property="og:title" content="DAgent: A device-aware assistant" />
+  <!-- <meta property="og:description" content="uv-based workflow, tox, pre-commit, GitHub Actions, docs/ for GitHub Pages, and a CLI (dagent)." /> -->
   <meta property="og:type" content="website" />
   <meta property="og:url" content="https://<your-user>.github.io/<your-repo>/" />
   <meta property="og:image" content="og.png" />
@@ -17,15 +18,27 @@
   <link rel="stylesheet" href="styles.css" />
   <style>
     /* minor badge tweaks to look nice against dark bg */
-    .badges img { vertical-align: middle; }
-    .kbd { font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; background: rgba(255,255,255,.06); border:1px solid #1d2030; border-radius:6px; padding:.1rem .35rem; }
+    .badges img {
+      vertical-align: middle;
+    }
+
+    .kbd {
+      font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+      background: rgba(255, 255, 255, .06);
+      border: 1px solid #1d2030;
+      border-radius: 6px;
+      padding: .1rem .35rem;
+    }
   </style>
 </head>
+
 <body>
   <header class="site-header container">
-    <a class="brand" href="./" aria-label="os_assistant home">
-      <svg width="28" height="28" viewBox="0 0 24 24" aria-hidden="true"><path d="M12 2l9 5v10l-9 5-9-5V7l9-5z" fill="currentColor"/></svg>
-      <span>os_assistant</span>
+    <a class="brand" href="./" aria-label="dagent home">
+      <svg width="28" height="28" viewBox="0 0 24 24" aria-hidden="true">
+        <path d="M12 2l9 5v10l-9 5-9-5V7l9-5z" fill="currentColor" />
+      </svg>
+      <span>dagent</span>
     </a>
     <nav class="nav">
       <a href="#quickstart">Quickstart</a>
@@ -40,14 +53,16 @@
     <!-- Hero -->
     <section class="hero container">
       <h1>A modern Python template with <span class="accent">uv</span>, tox & a real CLI</h1>
-      <p class="lead">Ready-to-develop structure (pyproject, tox, pre-commit), a <code>docs/</code> site for GitHub Pages, and a typed CLI: <code>osassis</code>.</p>
+      <p class="lead">Ready-to-develop structure (pyproject, tox, pre-commit), a <code>docs/</code> site for GitHub
+        Pages, and a typed CLI: <code>dagent</code>.</p>
 
       <div class="badges" style="margin:12px 0 6px;">
         <a href="https://opensource.org/license/mit/">
           <img alt="license: MIT" src="https://img.shields.io/badge/license-MIT-blue">
         </a>
         <a href="https://github.com/omar-abdelgawad/python-project-template/actions">
-          <img alt="Tests" src="https://github.com/omar-abdelgawad/python-project-template/actions/workflows/tests.yml/badge.svg">
+          <img alt="Tests"
+            src="https://github.com/omar-abdelgawad/python-project-template/actions/workflows/tests.yml/badge.svg">
         </a>
         <img alt="Python versions" src="https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12-blue">
       </div>
@@ -58,12 +73,12 @@ <h1>A modern Python template with <span class="accent">uv</span>, tox & a real C
       </div>
 
       <pre class="code-block" aria-label="shell example"><code>$ git clone &lt;repo_url&gt;
-$ cd os_assistant
+$ cd dagent
 $ uv sync
 $ pre-commit install
 $ cp .env.example .env
 $ python setup_and_pull_general.py
-$ osassis chat</code></pre>
+$ dagent chat</code></pre>
     </section>
 
     <!-- Why/Features -->
@@ -76,11 +91,14 @@ <h3>Clean project setup</h3>
         </article>
         <article class="card">
           <h3>uv workflow</h3>
-          <p>Fast env + deps (<a href="https://docs.astral.sh/uv/getting-started/installation/#installation-methods">uv</a>). Works cross-platform; plays nice with CI.</p>
+          <p>Fast env + deps (<a
+              href="https://docs.astral.sh/uv/getting-started/installation/#installation-methods">uv</a>). Works
+            cross-platform; plays nice with CI.</p>
         </article>
         <article class="card">
           <h3>Quality gates</h3>
-          <p><code>tox</code> runs <code>pytest</code>, <code>ruff</code>, <code>mypy</code>. Pre-commit keeps diffs clean.</p>
+          <p><code>tox</code> runs <code>pytest</code>, <code>ruff</code>, <code>mypy</code>. Pre-commit keeps diffs
+            clean.</p>
         </article>
         <article class="card">
           <h3>Docs-ready</h3>
@@ -101,7 +119,7 @@ <h3>Install</h3>
       <ol class="steps">
         <li><strong>Clone and enter:</strong>
           <pre class="code-block"><code>git clone &lt;repo_url&gt;
-cd os_assistant</code></pre>
+cd dagent</code></pre>
         </li>
         <li><strong>Sync deps (creates venv):</strong>
           <pre class="code-block"><code>uv sync</code></pre>
@@ -111,10 +129,12 @@ <h3>Install</h3>
           <pre class="code-block"><code>pre-commit install</code></pre>
         </li>
         <li><strong>Configure environment:</strong>
-          <details class="details"><summary>Linux/macOS</summary>
+          <details class="details">
+            <summary>Linux/macOS</summary>
             <pre class="code-block"><code>cp .env.example .env</code></pre>
           </details>
-          <details class="details"><summary>Windows (CMD)</summary>
+          <details class="details">
+            <summary>Windows (CMD)</summary>
             <pre class="code-block"><code>copy .env.example .env</code></pre>
           </details>
           <p>Edit <code>.env</code> → set <code>MODEL_BASE_URL</code> (your ngrok link), e.g.:</p>
@@ -122,25 +142,26 @@ <h3>Install</h3>
         </li>
         <li><strong>Setup & pull models:</strong>
           <pre class="code-block"><code>python setup_and_pull_general.py</code></pre>
-          <small>Script: loads <code>.env</code>, sets <code>OLLAMA_HOST</code> from <code>MODEL_BASE_URL</code>, runs <code>ollama pull</code> for required models.</small>
+          <small>Script: loads <code>.env</code>, sets <code>OLLAMA_HOST</code> from <code>MODEL_BASE_URL</code>, runs
+            <code>ollama pull</code> for required models.</small>
         </li>
       </ol>
     </section>
 
     <!-- CLI -->
     <section id="cli" class="container">
-      <h2>CLI usage — <code>osassis</code></h2>
+      <h2>CLI usage — <code>dagent</code></h2>
 
       <h3>Interactive Chat</h3>
-      <pre class="code-block"><code>osassis chat</code></pre>
+      <pre class="code-block"><code>dagent chat</code></pre>
 
       <h3>System Tracing</h3>
       <p>Start tracing file system events in a directory:</p>
-      <pre class="code-block"><code>osassis trace start file_system --dir path/to/watch</code></pre>
+      <pre class="code-block"><code>dagent trace start file_system --dir path/to/watch</code></pre>
       <p>View trace logs with time filtering:</p>
-      <pre class="code-block"><code>osassis trace show file_system --start "yesterday" --end "now"</code></pre>
+      <pre class="code-block"><code>dagent trace show file_system --start "yesterday" --end "now"</code></pre>
       <p>Clear logs for a tracing domain:</p>
-      <pre class="code-block"><code>osassis trace clear file_system</code></pre>
+      <pre class="code-block"><code>dagent trace clear file_system</code></pre>
     </section>
 
     <!-- Build -->
@@ -148,21 +169,26 @@ <h3>System Tracing</h3>
       <h2>Build (dev editable)</h2>
       <p>Editable install via <code>uv pip</code>:</p>
       <pre class="code-block"><code>uv pip install -e .</code></pre>
-      <p>We also use <a href="https://www.gnu.org/software/make/">make</a> as a simple task runner (check the <code>Makefile</code>).</p>
+      <p>We also use <a href="https://www.gnu.org/software/make/">make</a> as a simple task runner (check the
+        <code>Makefile</code>).
+      </p>
     </section>
 
     <!-- Testing -->
     <section id="testing" class="container">
       <h2>Testing with tox</h2>
-      <p><code>tox</code> creates isolated envs and runs <code>pytest</code>, <code>ruff</code>, and <code>mypy</code>:</p>
+      <p><code>tox</code> creates isolated envs and runs <code>pytest</code>, <code>ruff</code>, and <code>mypy</code>:
+      </p>
       <pre class="code-block"><code>make tox</code></pre>
 
       <details class="details" style="margin-top:8px;">
         <summary>CI badges</summary>
         <div class="badges" style="margin:10px 0 0;">
-          <a href="https://opensource.org/license/mit/"><img alt="license: MIT" src="https://img.shields.io/badge/license-MIT-blue"></a>
+          <a href="https://opensource.org/license/mit/"><img alt="license: MIT"
+              src="https://img.shields.io/badge/license-MIT-blue"></a>
           <a href="https://github.com/omar-abdelgawad/python-project-template/actions">
-            <img alt="Tests" src="https://github.com/omar-abdelgawad/python-project-template/actions/workflows/tests.yml/badge.svg">
+            <img alt="Tests"
+              src="https://github.com/omar-abdelgawad/python-project-template/actions/workflows/tests.yml/badge.svg">
           </a>
           <img alt="Python versions" src="https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12-blue">
         </div>
@@ -178,20 +204,24 @@ <h2>FAQ</h2>
       </details>
       <details class="faq">
         <summary>What’s the <code>setup_and_pull_general.py</code> script doing?</summary>
-        <p>Loads <code>.env</code>, exports <code>OLLAMA_HOST</code> from <code>MODEL_BASE_URL</code>, and pulls required models via <code>ollama pull</code>.</p>
+        <p>Loads <code>.env</code>, exports <code>OLLAMA_HOST</code> from <code>MODEL_BASE_URL</code>, and pulls
+          required models via <code>ollama pull</code>.</p>
       </details>
       <details class="faq">
         <summary>Where do docs come from?</summary>
-        <p>This page is served from <code>docs/</code> on GitHub Pages. Add more static pages under <code>docs/</code> as you grow.</p>
+        <p>This page is served from <code>docs/</code> on GitHub Pages. Add more static pages under <code>docs/</code>
+          as you grow.</p>
       </details>
     </section>
   </main>
 
   <footer class="site-footer container">
-    <span>© <span id="year"></span> os_assistant • <a href="https://github.com/omar-abdelgawad/python-project-template">GitHub</a></span>
+    <span>© <span id="year"></span> dagent • <a
+        href="https://github.com/omar-abdelgawad/python-project-template">GitHub</a></span>
     <span><a href="mailto:team@example.com">team@example.com</a></span>
   </footer>
 
   <script src="script.js"></script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/docs/manifest.webmanifest b/docs/manifest.webmanifest
index ec5c59a..fa8b51b 100644
--- a/docs/manifest.webmanifest
+++ b/docs/manifest.webmanifest
@@ -1,11 +1,15 @@
 {
-  "name": "os_assistant",
-  "short_name": "os_assistant",
+  "name": "dagent",
+  "short_name": "dagent",
   "start_url": ".",
   "display": "standalone",
   "background_color": "#0b0c10",
   "theme_color": "#6ee7b7",
   "icons": [
-    { "src": "favicon.svg", "sizes": "any", "type": "image/svg+xml" }
+    {
+      "src": "favicon.svg",
+      "sizes": "any",
+      "type": "image/svg+xml"
+    }
   ]
-}
+}
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 3177428..ece3b8d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 where = ["src"] # list of folders that contain the packages (["."] by default)
 
 [project]
-name = "os-assistant" # appears on pip list only
+name = "dagent" # appears on pip list only
 dynamic = ["version"]
 dependencies = [
   "langchain==0.3.26",
@@ -24,7 +24,7 @@ dependencies = [
   "langchain_huggingface==0.3.0",
   "streamlit==1.52.1",
   "mcp>=1.0.0",
-  "Pillow>=10.0.0",  # Vision/Image processing support
+  "Pillow>=10.0.0",                                                  # Vision/Image processing support
 ]
 
 requires-python = ">=3.12"
@@ -42,22 +42,22 @@ keywords = ["agents", "flow", "llm", "ollama", "knowledge"]
 classifiers = ["Programming Language :: Python :: 3.12"]
 
 [project.scripts]
-osassis = "os_assistant.__main__:main"
+osassis = "dagent.__main__:main"
 
 [dependency-groups]
 dev = ["mypy", "ruff", "pytest", "pytest-cov", "tox", "pre-commit"]
 
 [tool.setuptools.package-data]
-os_assistant = ["py.typed", "configs/*.yaml", "prompts/**/*.yaml"]
+dagent = ["py.typed", "configs/*.yaml", "prompts/**/*.yaml"]
 [tool.setuptools.dynamic]
-version = { attr = "os_assistant.__version__" }
+version = { attr = "dagent.__version__" }
 
 [project.urls]
-Repository = "https://github.com/eyad-hussein/os_assistant"
+Repository = "https://github.com/AhmedMo1242/os_assistant"
 
 ###################################################################################################
 [tool.pytest.ini_options]
-addopts = "--cov=os_assistant" #include all packages under src directory
+addopts = "--cov=dagent" #include all packages under src directory
 testpaths = ["tests"]
 
 [tool.mypy]
diff --git a/scripts/test_coding_agent.py b/scripts/test_coding_agent.py
index 63c76f7..965cff3 100644
--- a/scripts/test_coding_agent.py
+++ b/scripts/test_coding_agent.py
@@ -1,6 +1,6 @@
 import argparse
 
-from os_assistant.tools.code_agent.core.run_code import run_code_execution
+from dagent.tools.code_agent.core.run_code import run_code_execution
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Code execution agent")
diff --git a/src/os_assistant/__init__.py b/src/dagent/__init__.py
similarity index 100%
rename from src/os_assistant/__init__.py
rename to src/dagent/__init__.py
diff --git a/src/os_assistant/__main__.py b/src/dagent/__main__.py
similarity index 95%
rename from src/os_assistant/__main__.py
rename to src/dagent/__main__.py
index 213b1fa..98610da 100644
--- a/src/os_assistant/__main__.py
+++ b/src/dagent/__main__.py
@@ -2,7 +2,7 @@
 
 from tracer.tracer_core import TracerCore
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from .command_parser import CommandParser
 from .os_assistant import OSAssistant
diff --git a/src/os_assistant/command_parser.py b/src/dagent/command_parser.py
similarity index 100%
rename from src/os_assistant/command_parser.py
rename to src/dagent/command_parser.py
diff --git a/src/os_assistant/configs/__init__.py b/src/dagent/configs/__init__.py
similarity index 100%
rename from src/os_assistant/configs/__init__.py
rename to src/dagent/configs/__init__.py
diff --git a/src/os_assistant/configs/config.yaml b/src/dagent/configs/config.yaml
similarity index 100%
rename from src/os_assistant/configs/config.yaml
rename to src/dagent/configs/config.yaml
diff --git a/src/os_assistant/core/__init__.py b/src/dagent/core/__init__.py
similarity index 100%
rename from src/os_assistant/core/__init__.py
rename to src/dagent/core/__init__.py
diff --git a/src/os_assistant/core/builder.py b/src/dagent/core/builder.py
similarity index 88%
rename from src/os_assistant/core/builder.py
rename to src/dagent/core/builder.py
index 3d610c6..8921a01 100644
--- a/src/os_assistant/core/builder.py
+++ b/src/dagent/core/builder.py
@@ -1,8 +1,8 @@
 from langgraph.checkpoint.memory import MemorySaver
 from langgraph.graph import END, StateGraph
 
-import os_assistant.core.nodes as nodes
-from os_assistant.core.nodes.registry import (
+import dagent.core.nodes as nodes
+from dagent.core.nodes.registry import (
     COMMAND_NODE,
     CONTEXT_NODE,
     CONV_CONTEXT_NODE,
@@ -14,15 +14,15 @@
     TOOL_NODE,
     VISION_NODE,
 )
-from os_assistant.core.routing.logic import (
+from dagent.core.routing.logic import (
     branch_on_query_type,
     check_domains_to_process,
     check_for_tool_usage,
     route_after_tool,
 )
-from os_assistant.core.routing.rules import ROUTING_RULES
-from os_assistant.core.state import AssistantState
-from os_assistant.utils.settings import VISION_ENABLED
+from dagent.core.routing.rules import ROUTING_RULES
+from dagent.core.state import AssistantState
+from dagent.utils.settings import VISION_ENABLED
 
 ROUTING_FUNCS = {
     "branch_on_query_type": branch_on_query_type,
diff --git a/src/os_assistant/core/nodes/__init__.py b/src/dagent/core/nodes/__init__.py
similarity index 100%
rename from src/os_assistant/core/nodes/__init__.py
rename to src/dagent/core/nodes/__init__.py
diff --git a/src/os_assistant/core/nodes/command_generation.py b/src/dagent/core/nodes/command_generation.py
similarity index 96%
rename from src/os_assistant/core/nodes/command_generation.py
rename to src/dagent/core/nodes/command_generation.py
index 332f5ba..cec9b95 100644
--- a/src/os_assistant/core/nodes/command_generation.py
+++ b/src/dagent/core/nodes/command_generation.py
@@ -4,25 +4,25 @@
 from langchain.schema import HumanMessage, SystemMessage
 from langchain_ollama import ChatOllama
 
-from os_assistant.core.nodes.helpers import (
+from dagent.core.nodes.helpers import (
     build_combined_context,
     build_tool_context_info,
     is_code_execution_enabled,
     should_force_direct_response,
     tools,
 )
-from os_assistant.core.state import AssistantState
-from os_assistant.parsers.setup import (
+from dagent.core.state import AssistantState
+from dagent.parsers.setup import (
     code_execute_parser,
     command_response_parser,
     fixed_command_response_parser,
     parse_with_fix_and_extract,
 )
-from os_assistant.prompts.prompt_loader import load_prompt
-from os_assistant.pydantic_models.schemas import CommandResponse, ToolExecutionDetails
-from os_assistant.utils import LOGGER
-from os_assistant.utils.model_factory import model
-from os_assistant.utils.settings import (
+from dagent.prompts.prompt_loader import load_prompt
+from dagent.pydantic_models.schemas import CommandResponse, ToolExecutionDetails
+from dagent.utils import LOGGER
+from dagent.utils.model_factory import model
+from dagent.utils.settings import (
     MODEL_BASE_URL,
     MODEL_NAME,
 )
diff --git a/src/os_assistant/core/nodes/context_retrieval.py b/src/dagent/core/nodes/context_retrieval.py
similarity index 95%
rename from src/os_assistant/core/nodes/context_retrieval.py
rename to src/dagent/core/nodes/context_retrieval.py
index 136f8a0..25b4392 100644
--- a/src/os_assistant/core/nodes/context_retrieval.py
+++ b/src/dagent/core/nodes/context_retrieval.py
@@ -9,11 +9,11 @@
 
 from tracer.config import LogDomain
 
-from os_assistant.core.nodes.helpers import is_mcp_enabled, is_rag_enabled
-from os_assistant.core.state import AssistantState
-from os_assistant.tools.agentic_rag.application.search import search_logs
-from os_assistant.utils import LOGGER
-from os_assistant.utils.settings import MCP_FALLBACK_TO_RAG
+from dagent.core.nodes.helpers import is_mcp_enabled, is_rag_enabled
+from dagent.core.state import AssistantState
+from dagent.tools.agentic_rag.application.search import search_logs
+from dagent.utils import LOGGER
+from dagent.utils.settings import MCP_FALLBACK_TO_RAG
 
 
 def context_retrieval_node(state: AssistantState) -> AssistantState:
@@ -118,7 +118,7 @@ def _execute_hybrid_retrieval(
     Returns:
         Tuple of (sql_context, rag_context)
     """
-    from os_assistant.tools.mcp_client import (
+    from dagent.tools.mcp_client import (
         QueryIntent,
         get_mcp_client,
         get_query_router,
@@ -202,7 +202,7 @@ def _execute_sql_query(mcp_client, sql_query: str, state: dict) -> str | None:
     Returns:
         Formatted SQL result string
     """
-    from os_assistant.tools.mcp_client.result_fusion import get_result_fusion
+    from dagent.tools.mcp_client.result_fusion import get_result_fusion
 
     if not sql_query:
         return None
@@ -302,7 +302,7 @@ def _fuse_contexts(
     Returns:
         Combined context string
     """
-    from os_assistant.tools.mcp_client.result_fusion import get_result_fusion
+    from dagent.tools.mcp_client.result_fusion import get_result_fusion
 
     fusion = get_result_fusion()
     fused = fusion.fuse(
diff --git a/src/os_assistant/core/nodes/conversation.py b/src/dagent/core/nodes/conversation.py
similarity index 94%
rename from src/os_assistant/core/nodes/conversation.py
rename to src/dagent/core/nodes/conversation.py
index 76d44d2..2b1bf3a 100644
--- a/src/os_assistant/core/nodes/conversation.py
+++ b/src/dagent/core/nodes/conversation.py
@@ -1,9 +1,9 @@
 from langchain.schema import HumanMessage
 
-from os_assistant.core.state import AssistantState
-from os_assistant.prompts.prompt_loader import load_prompt
-from os_assistant.utils import LOGGER
-from os_assistant.utils.model_factory import model
+from dagent.core.state import AssistantState
+from dagent.prompts.prompt_loader import load_prompt
+from dagent.utils import LOGGER
+from dagent.utils.model_factory import model
 
 
 def conversation_context_node(state: AssistantState) -> AssistantState:
diff --git a/src/os_assistant/core/nodes/display_result.py b/src/dagent/core/nodes/display_result.py
similarity index 96%
rename from src/os_assistant/core/nodes/display_result.py
rename to src/dagent/core/nodes/display_result.py
index 5e864db..f17d0fe 100644
--- a/src/os_assistant/core/nodes/display_result.py
+++ b/src/dagent/core/nodes/display_result.py
@@ -1,11 +1,11 @@
 from datetime import datetime
 
-from os_assistant.core.state import AssistantState
-from os_assistant.pydantic_models.schemas import (
+from dagent.core.state import AssistantState
+from dagent.pydantic_models.schemas import (
     CommandResponse,
     InformationResponse,
 )
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 
 def display_result_node(state: AssistantState) -> AssistantState:
diff --git a/src/os_assistant/core/nodes/domain_analysis.py b/src/dagent/core/nodes/domain_analysis.py
similarity index 88%
rename from src/os_assistant/core/nodes/domain_analysis.py
rename to src/dagent/core/nodes/domain_analysis.py
index f9f1917..314ef64 100644
--- a/src/os_assistant/core/nodes/domain_analysis.py
+++ b/src/dagent/core/nodes/domain_analysis.py
@@ -1,16 +1,16 @@
 from langchain.schema import HumanMessage
 
-from os_assistant.core.nodes.helpers import is_rag_enabled
-from os_assistant.core.state import AssistantState
-from os_assistant.parsers.setup import (
+from dagent.core.nodes.helpers import is_rag_enabled
+from dagent.core.state import AssistantState
+from dagent.parsers.setup import (
     domain_analysis_parser,
     fixed_domain_analysis_parser,
     parse_with_fix_and_extract,
 )
-from os_assistant.prompts.prompt_loader import load_prompt
-from os_assistant.pydantic_models.schemas import DomainAnalysis
-from os_assistant.utils import LOGGER
-from os_assistant.utils.model_factory import model
+from dagent.prompts.prompt_loader import load_prompt
+from dagent.pydantic_models.schemas import DomainAnalysis
+from dagent.utils import LOGGER
+from dagent.utils.model_factory import model
 
 
 def domain_analysis_node(state: AssistantState) -> AssistantState:
diff --git a/src/os_assistant/core/nodes/helpers.py b/src/dagent/core/nodes/helpers.py
similarity index 95%
rename from src/os_assistant/core/nodes/helpers.py
rename to src/dagent/core/nodes/helpers.py
index 25012a9..67dd82e 100644
--- a/src/os_assistant/core/nodes/helpers.py
+++ b/src/dagent/core/nodes/helpers.py
@@ -1,5 +1,5 @@
-from os_assistant.tools.code_agent.wrapper import code_execute_tool
-from os_assistant.utils.settings import ASSISTANT_MODE, MCP_ENABLED
+from dagent.tools.code_agent.wrapper import code_execute_tool
+from dagent.utils.settings import ASSISTANT_MODE, MCP_ENABLED
 
 tools = [code_execute_tool]
 
diff --git a/src/os_assistant/core/nodes/information_generation.py b/src/dagent/core/nodes/information_generation.py
similarity index 96%
rename from src/os_assistant/core/nodes/information_generation.py
rename to src/dagent/core/nodes/information_generation.py
index 06eef0d..4113a01 100644
--- a/src/os_assistant/core/nodes/information_generation.py
+++ b/src/dagent/core/nodes/information_generation.py
@@ -1,28 +1,28 @@
 from langchain.schema import HumanMessage, SystemMessage
 from langchain_ollama import ChatOllama
 
-from os_assistant.core.nodes.helpers import (
+from dagent.core.nodes.helpers import (
     build_combined_context,
     build_tool_context_info,
     is_code_execution_enabled,
     should_force_direct_response,
     tools,
 )
-from os_assistant.core.state import AssistantState
-from os_assistant.parsers.setup import (
+from dagent.core.state import AssistantState
+from dagent.parsers.setup import (
     code_execute_parser,
     fixed_info_response_parser,
     info_response_parser,
     parse_with_fix_and_extract,
 )
-from os_assistant.prompts.prompt_loader import load_prompt
-from os_assistant.pydantic_models.schemas import (
+from dagent.prompts.prompt_loader import load_prompt
+from dagent.pydantic_models.schemas import (
     InformationResponse,
     ToolExecutionDetails,
 )
-from os_assistant.utils import LOGGER
-from os_assistant.utils.model_factory import model
-from os_assistant.utils.settings import (
+from dagent.utils import LOGGER
+from dagent.utils.model_factory import model
+from dagent.utils.settings import (
     MODEL_BASE_URL,
     MODEL_NAME,
 )
diff --git a/src/os_assistant/core/nodes/query_classification.py b/src/dagent/core/nodes/query_classification.py
similarity index 83%
rename from src/os_assistant/core/nodes/query_classification.py
rename to src/dagent/core/nodes/query_classification.py
index 3aebe32..8be95fa 100644
--- a/src/os_assistant/core/nodes/query_classification.py
+++ b/src/dagent/core/nodes/query_classification.py
@@ -1,16 +1,16 @@
 from langchain.schema import HumanMessage
 
-from os_assistant.core.nodes.helpers import build_combined_context
-from os_assistant.core.state import AssistantState
-from os_assistant.parsers.setup import (
+from dagent.core.nodes.helpers import build_combined_context
+from dagent.core.state import AssistantState
+from dagent.parsers.setup import (
     fixed_query_type_parser,
     parse_with_fix_and_extract,
     query_type_parser,
 )
-from os_assistant.prompts.prompt_loader import load_prompt
-from os_assistant.pydantic_models.schemas import QueryTypeResult
-from os_assistant.utils import LOGGER
-from os_assistant.utils.model_factory import model
+from dagent.prompts.prompt_loader import load_prompt
+from dagent.pydantic_models.schemas import QueryTypeResult
+from dagent.utils import LOGGER
+from dagent.utils.model_factory import model
 
 
 def query_classifier_node(state: AssistantState) -> AssistantState:
diff --git a/src/os_assistant/core/nodes/registry.py b/src/dagent/core/nodes/registry.py
similarity index 100%
rename from src/os_assistant/core/nodes/registry.py
rename to src/dagent/core/nodes/registry.py
diff --git a/src/os_assistant/core/nodes/result_preparation.py b/src/dagent/core/nodes/result_preparation.py
similarity index 97%
rename from src/os_assistant/core/nodes/result_preparation.py
rename to src/dagent/core/nodes/result_preparation.py
index 54917e8..c4eafc5 100644
--- a/src/os_assistant/core/nodes/result_preparation.py
+++ b/src/dagent/core/nodes/result_preparation.py
@@ -1,10 +1,10 @@
-from os_assistant.core.state import AssistantState
-from os_assistant.pydantic_models.schemas import (
+from dagent.core.state import AssistantState
+from dagent.pydantic_models.schemas import (
     ContextRetrievalDetails,
     FinalResult,
     InformationResponse,
 )
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 
 def add_mode_note_to_response(response, is_code_execution_enabled):
diff --git a/src/os_assistant/core/nodes/tool_execution.py b/src/dagent/core/nodes/tool_execution.py
similarity index 94%
rename from src/os_assistant/core/nodes/tool_execution.py
rename to src/dagent/core/nodes/tool_execution.py
index 57c7d11..08f5823 100644
--- a/src/os_assistant/core/nodes/tool_execution.py
+++ b/src/dagent/core/nodes/tool_execution.py
@@ -1,7 +1,7 @@
-from os_assistant.core.nodes.helpers import is_code_execution_enabled
-from os_assistant.core.state import AssistantState
-from os_assistant.tools.code_agent.wrapper import code_execute_tool
-from os_assistant.utils import LOGGER
+from dagent.core.nodes.helpers import is_code_execution_enabled
+from dagent.core.state import AssistantState
+from dagent.tools.code_agent.wrapper import code_execute_tool
+from dagent.utils import LOGGER
 
 
 def tool_execution_node(state: AssistantState) -> AssistantState:
diff --git a/src/os_assistant/core/nodes/vision_analysis.py b/src/dagent/core/nodes/vision_analysis.py
similarity index 95%
rename from src/os_assistant/core/nodes/vision_analysis.py
rename to src/dagent/core/nodes/vision_analysis.py
index bf46839..a911150 100644
--- a/src/os_assistant/core/nodes/vision_analysis.py
+++ b/src/dagent/core/nodes/vision_analysis.py
@@ -1,7 +1,7 @@
-from os_assistant.core.state import AssistantState
-from os_assistant.tools.vision import VisionAnalysisResult, get_vision_analyzer
-from os_assistant.utils import LOGGER
-from os_assistant.utils.settings import VISION_ENABLED
+from dagent.core.state import AssistantState
+from dagent.tools.vision import VisionAnalysisResult, get_vision_analyzer
+from dagent.utils import LOGGER
+from dagent.utils.settings import VISION_ENABLED
 
 
 def _test_vision_model(analyzer) -> bool:
diff --git a/src/os_assistant/core/routing/__init__.py b/src/dagent/core/routing/__init__.py
similarity index 100%
rename from src/os_assistant/core/routing/__init__.py
rename to src/dagent/core/routing/__init__.py
diff --git a/src/os_assistant/core/routing/logic.py b/src/dagent/core/routing/logic.py
similarity index 89%
rename from src/os_assistant/core/routing/logic.py
rename to src/dagent/core/routing/logic.py
index 91d6054..358106d 100644
--- a/src/os_assistant/core/routing/logic.py
+++ b/src/dagent/core/routing/logic.py
@@ -1,5 +1,5 @@
-from os_assistant.core.nodes.helpers import is_code_execution_enabled, is_rag_enabled
-from os_assistant.core.nodes.registry import (
+from dagent.core.nodes.helpers import is_code_execution_enabled, is_rag_enabled
+from dagent.core.nodes.registry import (
     COMMAND_NODE,
     CONTEXT_NODE,
     FINAL_NODE,
@@ -7,8 +7,8 @@
     QUERY_CLASS_NODE,
     TOOL_NODE,
 )
-from os_assistant.core.state import AssistantState
-from os_assistant.utils import LOGGER
+from dagent.core.state import AssistantState
+from dagent.utils import LOGGER
 
 
 def check_domains_to_process(state: AssistantState) -> str:
diff --git a/src/os_assistant/core/routing/rules.py b/src/dagent/core/routing/rules.py
similarity index 96%
rename from src/os_assistant/core/routing/rules.py
rename to src/dagent/core/routing/rules.py
index f82dda2..3fca054 100644
--- a/src/os_assistant/core/routing/rules.py
+++ b/src/dagent/core/routing/rules.py
@@ -1,4 +1,4 @@
-from os_assistant.core.nodes.registry import (
+from dagent.core.nodes.registry import (
     COMMAND_NODE,
     CONTEXT_NODE,
     DOMAIN_ANALYSIS_NODE,
diff --git a/src/os_assistant/core/state.py b/src/dagent/core/state.py
similarity index 97%
rename from src/os_assistant/core/state.py
rename to src/dagent/core/state.py
index 2d44de3..66fecaf 100644
--- a/src/os_assistant/core/state.py
+++ b/src/dagent/core/state.py
@@ -1,6 +1,6 @@
 from typing import Any, TypedDict
 
-from os_assistant.pydantic_models.schemas import (
+from dagent.pydantic_models.schemas import (
     CommandResponse,
     DomainAnalysis,
     FinalResult,
diff --git a/src/os_assistant/os_assistant.py b/src/dagent/os_assistant.py
similarity index 99%
rename from src/os_assistant/os_assistant.py
rename to src/dagent/os_assistant.py
index 6d4287f..273df8f 100644
--- a/src/os_assistant/os_assistant.py
+++ b/src/dagent/os_assistant.py
@@ -1,7 +1,7 @@
 import traceback
 import uuid
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from .core.builder import build_assistant_graph
 from .core.state import AssistantState
diff --git a/src/os_assistant/parsers/json_cleaner.py b/src/dagent/parsers/json_cleaner.py
similarity index 100%
rename from src/os_assistant/parsers/json_cleaner.py
rename to src/dagent/parsers/json_cleaner.py
diff --git a/src/os_assistant/parsers/setup.py b/src/dagent/parsers/setup.py
similarity index 98%
rename from src/os_assistant/parsers/setup.py
rename to src/dagent/parsers/setup.py
index f726852..8e073a3 100644
--- a/src/os_assistant/parsers/setup.py
+++ b/src/dagent/parsers/setup.py
@@ -4,16 +4,16 @@
 from langchain_core.exceptions import OutputParserException
 from langchain_core.prompts import PromptTemplate
 
-from os_assistant.parsers.json_cleaner import clean_and_parse_json
-from os_assistant.pydantic_models.schemas import (
+from dagent.parsers.json_cleaner import clean_and_parse_json
+from dagent.pydantic_models.schemas import (
     CodeExecuteRequest,
     CommandResponse,
     DomainAnalysis,
     InformationResponse,
     QueryTypeResult,
 )
-from os_assistant.utils import LOGGER
-from os_assistant.utils.model_factory import fixing_model
+from dagent.utils import LOGGER
+from dagent.utils.model_factory import fixing_model
 
 # --- Parsers Setup ---
 
diff --git a/src/os_assistant/prompts/command_generator_node.yaml b/src/dagent/prompts/command_generator_node.yaml
similarity index 100%
rename from src/os_assistant/prompts/command_generator_node.yaml
rename to src/dagent/prompts/command_generator_node.yaml
diff --git a/src/os_assistant/prompts/conversation_context_node.yaml b/src/dagent/prompts/conversation_context_node.yaml
similarity index 100%
rename from src/os_assistant/prompts/conversation_context_node.yaml
rename to src/dagent/prompts/conversation_context_node.yaml
diff --git a/src/os_assistant/prompts/domain_analysis_node.yaml b/src/dagent/prompts/domain_analysis_node.yaml
similarity index 100%
rename from src/os_assistant/prompts/domain_analysis_node.yaml
rename to src/dagent/prompts/domain_analysis_node.yaml
diff --git a/src/os_assistant/prompts/information_generator_node.yaml b/src/dagent/prompts/information_generator_node.yaml
similarity index 100%
rename from src/os_assistant/prompts/information_generator_node.yaml
rename to src/dagent/prompts/information_generator_node.yaml
diff --git a/src/os_assistant/prompts/mode_config.yaml b/src/dagent/prompts/mode_config.yaml
similarity index 100%
rename from src/os_assistant/prompts/mode_config.yaml
rename to src/dagent/prompts/mode_config.yaml
diff --git a/src/os_assistant/prompts/prompt_loader.py b/src/dagent/prompts/prompt_loader.py
similarity index 92%
rename from src/os_assistant/prompts/prompt_loader.py
rename to src/dagent/prompts/prompt_loader.py
index ba04ab4..0094ede 100644
--- a/src/os_assistant/prompts/prompt_loader.py
+++ b/src/dagent/prompts/prompt_loader.py
@@ -3,8 +3,8 @@
 
 import yaml
 
-from os_assistant.utils import LOGGER, get_os_name
-from os_assistant.utils.settings import ASSISTANT_MODE
+from dagent.utils import LOGGER, get_os_name
+from dagent.utils.settings import ASSISTANT_MODE
 
 # Default fallback prompt for error cases
 DEFAULT_PROMPT = {
@@ -23,7 +23,7 @@ def _load_mode_config():
     if _MODE_CONFIG_CACHE is not None:
         return _MODE_CONFIG_CACHE
 
-    config_path = "src/os_assistant/prompts/mode_config.yaml"
+    config_path = "src/dagent/prompts/mode_config.yaml"
     try:
         with open(config_path, encoding="utf-8") as f:
             config = yaml.safe_load(f)
@@ -78,7 +78,7 @@ def _get_raw_prompt(node_name):
     for the same prompts. All prompts are now unified in the common folder.
     """
     # All prompts are now in the common folder
-    prompt_path = f"src/os_assistant/prompts/{node_name}.yaml"
+    prompt_path = f"src/dagent/prompts/{node_name}.yaml"
     try:
         if os.path.exists(prompt_path):
             with open(prompt_path, encoding="utf-8") as f:
diff --git a/src/os_assistant/prompts/query_classifier_node.yaml b/src/dagent/prompts/query_classifier_node.yaml
similarity index 100%
rename from src/os_assistant/prompts/query_classifier_node.yaml
rename to src/dagent/prompts/query_classifier_node.yaml
diff --git a/src/os_assistant/py.typed b/src/dagent/py.typed
similarity index 100%
rename from src/os_assistant/py.typed
rename to src/dagent/py.typed
diff --git a/src/os_assistant/pydantic_models/__init__.py b/src/dagent/pydantic_models/__init__.py
similarity index 92%
rename from src/os_assistant/pydantic_models/__init__.py
rename to src/dagent/pydantic_models/__init__.py
index 44075ef..dd41730 100644
--- a/src/os_assistant/pydantic_models/__init__.py
+++ b/src/dagent/pydantic_models/__init__.py
@@ -1,6 +1,6 @@
 # This file marks the models directory as a Python package.
 
-from os_assistant.pydantic_models.schemas import (
+from dagent.pydantic_models.schemas import (
     CodeExecuteRequest,
     CommandResponse,
     ContextResult,
diff --git a/src/os_assistant/pydantic_models/schemas.py b/src/dagent/pydantic_models/schemas.py
similarity index 100%
rename from src/os_assistant/pydantic_models/schemas.py
rename to src/dagent/pydantic_models/schemas.py
diff --git a/src/os_assistant/tools/__init__.py b/src/dagent/tools/__init__.py
similarity index 100%
rename from src/os_assistant/tools/__init__.py
rename to src/dagent/tools/__init__.py
diff --git a/src/os_assistant/tools/agentic_rag/.gitignore b/src/dagent/tools/agentic_rag/.gitignore
similarity index 100%
rename from src/os_assistant/tools/agentic_rag/.gitignore
rename to src/dagent/tools/agentic_rag/.gitignore
diff --git a/src/os_assistant/tools/agentic_rag/README.md b/src/dagent/tools/agentic_rag/README.md
similarity index 98%
rename from src/os_assistant/tools/agentic_rag/README.md
rename to src/dagent/tools/agentic_rag/README.md
index b541950..e0da94a 100644
--- a/src/os_assistant/tools/agentic_rag/README.md
+++ b/src/dagent/tools/agentic_rag/README.md
@@ -81,7 +81,7 @@ agentic_rag/
 1. Clone the repository:
 ```bash
 git clone [repository-url]
-cd os_assistant/src/os_assistant/tools/Agentic_RAG
+cd os_assistant/src/dagent/tools/Agentic_RAG
 ```
 
 2. Install dependencies:
diff --git a/src/os_assistant/tools/agentic_rag/__init__.py b/src/dagent/tools/agentic_rag/__init__.py
similarity index 100%
rename from src/os_assistant/tools/agentic_rag/__init__.py
rename to src/dagent/tools/agentic_rag/__init__.py
diff --git a/src/os_assistant/tools/agentic_rag/application/init.py b/src/dagent/tools/agentic_rag/application/init.py
similarity index 97%
rename from src/os_assistant/tools/agentic_rag/application/init.py
rename to src/dagent/tools/agentic_rag/application/init.py
index ec3d672..f420582 100644
--- a/src/os_assistant/tools/agentic_rag/application/init.py
+++ b/src/dagent/tools/agentic_rag/application/init.py
@@ -2,7 +2,7 @@
 
 from tracer.config import LogDomain
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from ..config.config import DEFAULT_CHUNK_OVERLAP, DEFAULT_CHUNK_SIZE
 from ..database.database import LogDatabase
diff --git a/src/os_assistant/tools/agentic_rag/application/search.py b/src/dagent/tools/agentic_rag/application/search.py
similarity index 99%
rename from src/os_assistant/tools/agentic_rag/application/search.py
rename to src/dagent/tools/agentic_rag/application/search.py
index 78b6cc0..365ecbe 100644
--- a/src/os_assistant/tools/agentic_rag/application/search.py
+++ b/src/dagent/tools/agentic_rag/application/search.py
@@ -2,7 +2,7 @@
 
 from tracer.config import LogDomain
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from ..config.config import DEFAULT_TOP_K
 from ..core.agent_rag import summarize_logs
diff --git a/src/os_assistant/tools/agentic_rag/config/config.py b/src/dagent/tools/agentic_rag/config/config.py
similarity index 100%
rename from src/os_assistant/tools/agentic_rag/config/config.py
rename to src/dagent/tools/agentic_rag/config/config.py
diff --git a/src/os_assistant/tools/agentic_rag/core/agent_rag.py b/src/dagent/tools/agentic_rag/core/agent_rag.py
similarity index 98%
rename from src/os_assistant/tools/agentic_rag/core/agent_rag.py
rename to src/dagent/tools/agentic_rag/core/agent_rag.py
index 6bd7dbb..441b9c1 100644
--- a/src/os_assistant/tools/agentic_rag/core/agent_rag.py
+++ b/src/dagent/tools/agentic_rag/core/agent_rag.py
@@ -6,7 +6,7 @@
 from langgraph.graph.message import add_messages
 from pydantic import BaseModel, Field
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from ..config.config import OLLAMA_BASE_URL, OLLAMA_LLM_MODEL
 
diff --git a/src/os_assistant/tools/agentic_rag/core/chunking.py b/src/dagent/tools/agentic_rag/core/chunking.py
similarity index 98%
rename from src/os_assistant/tools/agentic_rag/core/chunking.py
rename to src/dagent/tools/agentic_rag/core/chunking.py
index 4c0fc75..c62e55c 100644
--- a/src/os_assistant/tools/agentic_rag/core/chunking.py
+++ b/src/dagent/tools/agentic_rag/core/chunking.py
@@ -2,7 +2,7 @@
 import math
 from typing import Any
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from ..config.config import DEFAULT_CHUNK_OVERLAP, DEFAULT_CHUNK_SIZE
 
diff --git a/src/os_assistant/tools/agentic_rag/core/embedding.py b/src/dagent/tools/agentic_rag/core/embedding.py
similarity index 97%
rename from src/os_assistant/tools/agentic_rag/core/embedding.py
rename to src/dagent/tools/agentic_rag/core/embedding.py
index dd9ba1b..d1ce3fe 100644
--- a/src/os_assistant/tools/agentic_rag/core/embedding.py
+++ b/src/dagent/tools/agentic_rag/core/embedding.py
@@ -1,7 +1,7 @@
 import numpy as np
 import requests
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from ..config.config import EMBEDDING_MODEL, OLLAMA_BASE_URL
 
diff --git a/src/os_assistant/tools/agentic_rag/core/retrieval.py b/src/dagent/tools/agentic_rag/core/retrieval.py
similarity index 100%
rename from src/os_assistant/tools/agentic_rag/core/retrieval.py
rename to src/dagent/tools/agentic_rag/core/retrieval.py
diff --git a/src/os_assistant/tools/agentic_rag/database/database.py b/src/dagent/tools/agentic_rag/database/database.py
similarity index 99%
rename from src/os_assistant/tools/agentic_rag/database/database.py
rename to src/dagent/tools/agentic_rag/database/database.py
index b8d50e2..55c23e7 100644
--- a/src/os_assistant/tools/agentic_rag/database/database.py
+++ b/src/dagent/tools/agentic_rag/database/database.py
@@ -6,7 +6,7 @@
 
 from tracer.config import LogDomain
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from ..config.config import TIMESTAMP_FORMAT, get_db_path
 
diff --git a/src/os_assistant/tools/agentic_rag/processor/batch_processor.py b/src/dagent/tools/agentic_rag/processor/batch_processor.py
similarity index 99%
rename from src/os_assistant/tools/agentic_rag/processor/batch_processor.py
rename to src/dagent/tools/agentic_rag/processor/batch_processor.py
index 68bb3f3..6532152 100644
--- a/src/os_assistant/tools/agentic_rag/processor/batch_processor.py
+++ b/src/dagent/tools/agentic_rag/processor/batch_processor.py
@@ -5,7 +5,7 @@
 from tracer.config import LogDomain
 from tracer.store.log_reader import LogReader
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from ..core.chunking import chunk_logs
 from ..core.embedding import EmbeddingGenerator
diff --git a/src/os_assistant/tools/code_agent/README.md b/src/dagent/tools/code_agent/README.md
similarity index 100%
rename from src/os_assistant/tools/code_agent/README.md
rename to src/dagent/tools/code_agent/README.md
diff --git a/src/os_assistant/tools/code_agent/core/__init__.py b/src/dagent/tools/code_agent/core/__init__.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/core/__init__.py
rename to src/dagent/tools/code_agent/core/__init__.py
diff --git a/src/os_assistant/tools/code_agent/core/models.py b/src/dagent/tools/code_agent/core/models.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/core/models.py
rename to src/dagent/tools/code_agent/core/models.py
diff --git a/src/os_assistant/tools/code_agent/core/run_code.py b/src/dagent/tools/code_agent/core/run_code.py
similarity index 96%
rename from src/os_assistant/tools/code_agent/core/run_code.py
rename to src/dagent/tools/code_agent/core/run_code.py
index 5b1f191..672199b 100644
--- a/src/os_assistant/tools/code_agent/core/run_code.py
+++ b/src/dagent/tools/code_agent/core/run_code.py
@@ -1,8 +1,8 @@
 import os
 import traceback
 
-from os_assistant.utils import LOGGER
-from os_assistant.utils.settings import CODE_AGENT  # Import the configuration
+from dagent.utils import LOGGER
+from dagent.utils.settings import CODE_AGENT  # Import the configuration
 
 from ..llm.agents import create_code_execution_graph
 from ..processing_utils.output_handler import cleanup_temp_files
diff --git a/src/os_assistant/tools/code_agent/execution/__init__.py b/src/dagent/tools/code_agent/execution/__init__.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/execution/__init__.py
rename to src/dagent/tools/code_agent/execution/__init__.py
diff --git a/src/os_assistant/tools/code_agent/execution/executors.py b/src/dagent/tools/code_agent/execution/executors.py
similarity index 98%
rename from src/os_assistant/tools/code_agent/execution/executors.py
rename to src/dagent/tools/code_agent/execution/executors.py
index da27ea4..dd16838 100644
--- a/src/os_assistant/tools/code_agent/execution/executors.py
+++ b/src/dagent/tools/code_agent/execution/executors.py
@@ -6,8 +6,8 @@
 from contextlib import redirect_stderr, redirect_stdout
 from typing import Any
 
-from os_assistant.utils import LOGGER
-from os_assistant.utils.settings import CWD, TEMP_EXECUTION_FILE
+from dagent.utils import LOGGER
+from dagent.utils.settings import CWD, TEMP_EXECUTION_FILE
 
 from ..core.models import CodeAnalysis
 from ..processing_utils.json_parsers import extract_json_manually
diff --git a/src/os_assistant/tools/code_agent/llm/__init__.py b/src/dagent/tools/code_agent/llm/__init__.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/llm/__init__.py
rename to src/dagent/tools/code_agent/llm/__init__.py
diff --git a/src/os_assistant/tools/code_agent/llm/agents.py b/src/dagent/tools/code_agent/llm/agents.py
similarity index 98%
rename from src/os_assistant/tools/code_agent/llm/agents.py
rename to src/dagent/tools/code_agent/llm/agents.py
index e9e4db8..077604c 100644
--- a/src/os_assistant/tools/code_agent/llm/agents.py
+++ b/src/dagent/tools/code_agent/llm/agents.py
@@ -1,8 +1,8 @@
 from langgraph.graph import END, START, StateGraph
 from langgraph.graph.state import CompiledStateGraph
 
-from os_assistant.utils.model_factory import coding_model, model
-from os_assistant.utils.settings import CODE_AGENT  # Updated import
+from dagent.utils.model_factory import coding_model, model
+from dagent.utils.settings import CODE_AGENT  # Updated import
 
 from ..core.models import CodeAnalysis, CodeExecutionState
 from ..execution.executors import execute_code_in_subprocess
diff --git a/src/os_assistant/tools/code_agent/llm/prompt_loader.py b/src/dagent/tools/code_agent/llm/prompt_loader.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/llm/prompt_loader.py
rename to src/dagent/tools/code_agent/llm/prompt_loader.py
diff --git a/src/os_assistant/tools/code_agent/llm/prompts.yaml b/src/dagent/tools/code_agent/llm/prompts.yaml
similarity index 100%
rename from src/os_assistant/tools/code_agent/llm/prompts.yaml
rename to src/dagent/tools/code_agent/llm/prompts.yaml
diff --git a/src/os_assistant/tools/code_agent/processing_utils/__init__.py b/src/dagent/tools/code_agent/processing_utils/__init__.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/processing_utils/__init__.py
rename to src/dagent/tools/code_agent/processing_utils/__init__.py
diff --git a/src/os_assistant/tools/code_agent/processing_utils/json_parsers.py b/src/dagent/tools/code_agent/processing_utils/json_parsers.py
similarity index 99%
rename from src/os_assistant/tools/code_agent/processing_utils/json_parsers.py
rename to src/dagent/tools/code_agent/processing_utils/json_parsers.py
index 0ced5b5..98f2301 100644
--- a/src/os_assistant/tools/code_agent/processing_utils/json_parsers.py
+++ b/src/dagent/tools/code_agent/processing_utils/json_parsers.py
@@ -1,7 +1,7 @@
 import json
 import re
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from .string_utils import ensure_string
 
diff --git a/src/os_assistant/tools/code_agent/processing_utils/markdown_parsers.py b/src/dagent/tools/code_agent/processing_utils/markdown_parsers.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/processing_utils/markdown_parsers.py
rename to src/dagent/tools/code_agent/processing_utils/markdown_parsers.py
diff --git a/src/os_assistant/tools/code_agent/processing_utils/output_handler.py b/src/dagent/tools/code_agent/processing_utils/output_handler.py
similarity index 85%
rename from src/os_assistant/tools/code_agent/processing_utils/output_handler.py
rename to src/dagent/tools/code_agent/processing_utils/output_handler.py
index 3b26d80..0e13415 100644
--- a/src/os_assistant/tools/code_agent/processing_utils/output_handler.py
+++ b/src/dagent/tools/code_agent/processing_utils/output_handler.py
@@ -1,7 +1,7 @@
 import os
 
-from os_assistant.utils import LOGGER
-from os_assistant.utils.settings import CWD, TEMP_EXECUTION_FILE
+from dagent.utils import LOGGER
+from dagent.utils.settings import CWD, TEMP_EXECUTION_FILE
 
 
 def prepare_execution_environment() -> dict:
diff --git a/src/os_assistant/tools/code_agent/processing_utils/string_utils.py b/src/dagent/tools/code_agent/processing_utils/string_utils.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/processing_utils/string_utils.py
rename to src/dagent/tools/code_agent/processing_utils/string_utils.py
diff --git a/src/os_assistant/tools/code_agent/processing_utils/structured_output_parsers.py b/src/dagent/tools/code_agent/processing_utils/structured_output_parsers.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/processing_utils/structured_output_parsers.py
rename to src/dagent/tools/code_agent/processing_utils/structured_output_parsers.py
diff --git a/src/os_assistant/tools/code_agent/wrapper.py b/src/dagent/tools/code_agent/wrapper.py
similarity index 100%
rename from src/os_assistant/tools/code_agent/wrapper.py
rename to src/dagent/tools/code_agent/wrapper.py
diff --git a/src/os_assistant/tools/mcp_client/__init__.py b/src/dagent/tools/mcp_client/__init__.py
similarity index 100%
rename from src/os_assistant/tools/mcp_client/__init__.py
rename to src/dagent/tools/mcp_client/__init__.py
diff --git a/src/os_assistant/tools/mcp_client/client.py b/src/dagent/tools/mcp_client/client.py
similarity index 99%
rename from src/os_assistant/tools/mcp_client/client.py
rename to src/dagent/tools/mcp_client/client.py
index daa75ac..b91f963 100644
--- a/src/os_assistant/tools/mcp_client/client.py
+++ b/src/dagent/tools/mcp_client/client.py
@@ -7,8 +7,8 @@
 from mcp.client.session import ClientSession
 from mcp.client.streamable_http import streamablehttp_client
 
-from os_assistant.utils import LOGGER
-from os_assistant.utils.settings import MCP_ENABLED, MCP_SERVER_URL
+from dagent.utils import LOGGER
+from dagent.utils.settings import MCP_ENABLED, MCP_SERVER_URL
 
 
 @dataclass
diff --git a/src/os_assistant/tools/mcp_client/query_router.py b/src/dagent/tools/mcp_client/query_router.py
similarity index 99%
rename from src/os_assistant/tools/mcp_client/query_router.py
rename to src/dagent/tools/mcp_client/query_router.py
index 1964d1f..8fc4f3d 100644
--- a/src/os_assistant/tools/mcp_client/query_router.py
+++ b/src/dagent/tools/mcp_client/query_router.py
@@ -6,8 +6,8 @@
 
 from langchain.schema import HumanMessage
 
-from os_assistant.utils import LOGGER
-from os_assistant.utils.model_factory import model
+from dagent.utils import LOGGER
+from dagent.utils.model_factory import model
 
 
 class QueryIntent(Enum):
diff --git a/src/os_assistant/tools/mcp_client/result_fusion.py b/src/dagent/tools/mcp_client/result_fusion.py
similarity index 99%
rename from src/os_assistant/tools/mcp_client/result_fusion.py
rename to src/dagent/tools/mcp_client/result_fusion.py
index 983b0d3..d4fe946 100644
--- a/src/os_assistant/tools/mcp_client/result_fusion.py
+++ b/src/dagent/tools/mcp_client/result_fusion.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass, field
 from typing import Any
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 
 @dataclass
diff --git a/src/os_assistant/tools/vision/__init__.py b/src/dagent/tools/vision/__init__.py
similarity index 100%
rename from src/os_assistant/tools/vision/__init__.py
rename to src/dagent/tools/vision/__init__.py
diff --git a/src/os_assistant/tools/vision/analyzer.py b/src/dagent/tools/vision/analyzer.py
similarity index 99%
rename from src/os_assistant/tools/vision/analyzer.py
rename to src/dagent/tools/vision/analyzer.py
index f059979..62f5949 100644
--- a/src/os_assistant/tools/vision/analyzer.py
+++ b/src/dagent/tools/vision/analyzer.py
@@ -9,7 +9,7 @@
 from langchain.schema import HumanMessage
 from langchain_ollama import ChatOllama
 
-from os_assistant.utils import LOGGER
+from dagent.utils import LOGGER
 
 from .config import VISION_CONFIG, VisionConfig
 
diff --git a/src/os_assistant/tools/vision/config.py b/src/dagent/tools/vision/config.py
similarity index 98%
rename from src/os_assistant/tools/vision/config.py
rename to src/dagent/tools/vision/config.py
index aafd42d..5675107 100644
--- a/src/os_assistant/tools/vision/config.py
+++ b/src/dagent/tools/vision/config.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 
 # Import from settings to maintain consistency
-from os_assistant.utils.settings import MODEL_BASE_URL
+from dagent.utils.settings import MODEL_BASE_URL
 
 
 @dataclass
diff --git a/src/os_assistant/utils/__init__.py b/src/dagent/utils/__init__.py
similarity index 100%
rename from src/os_assistant/utils/__init__.py
rename to src/dagent/utils/__init__.py
diff --git a/src/os_assistant/utils/device.py b/src/dagent/utils/device.py
similarity index 100%
rename from src/os_assistant/utils/device.py
rename to src/dagent/utils/device.py
diff --git a/src/os_assistant/utils/graph_visualizer.py b/src/dagent/utils/graph_visualizer.py
similarity index 100%
rename from src/os_assistant/utils/graph_visualizer.py
rename to src/dagent/utils/graph_visualizer.py
diff --git a/src/os_assistant/utils/logger.py b/src/dagent/utils/logger.py
similarity index 97%
rename from src/os_assistant/utils/logger.py
rename to src/dagent/utils/logger.py
index 0d4e73d..3404c06 100644
--- a/src/os_assistant/utils/logger.py
+++ b/src/dagent/utils/logger.py
@@ -11,7 +11,7 @@
 # for libraries, its better to not configure so we should probably
 # call setup_logging in the main application instead
 
-DEFAULT_LOG_PATH = Path("logs/os_assistant.log")
+DEFAULT_LOG_PATH = Path("logs/dagent.log")
 
 
 class InfoFilter(logging.Filter):
@@ -80,7 +80,7 @@ def setup_logging():
         "==========================================Logging is set up.====================================================="
     )
 
-    return logging.getLogger("os_assistant")
+    return logging.getLogger("dagent")
 
 
 LOGGER = setup_logging()
diff --git a/src/os_assistant/utils/model_factory.py b/src/dagent/utils/model_factory.py
similarity index 96%
rename from src/os_assistant/utils/model_factory.py
rename to src/dagent/utils/model_factory.py
index b6d30ef..77735f5 100644
--- a/src/os_assistant/utils/model_factory.py
+++ b/src/dagent/utils/model_factory.py
@@ -2,7 +2,7 @@
 from langchain_ollama import ChatOllama
 from langchain_openai import ChatOpenAI
 
-import os_assistant.utils.settings as settings
+import dagent.utils.settings as settings
 
 
 def create_model(**overrides):
diff --git a/src/os_assistant/utils/settings.py b/src/dagent/utils/settings.py
similarity index 100%
rename from src/os_assistant/utils/settings.py
rename to src/dagent/utils/settings.py
diff --git a/src/dataset_generation/config/config.py b/src/dataset_generation/config/config.py
index beace75..e540688 100644
--- a/src/dataset_generation/config/config.py
+++ b/src/dataset_generation/config/config.py
@@ -1,4 +1,4 @@
-from os_assistant.utils.settings import EMBEDDING_MODEL, MODEL_BASE_URL, MODEL_NAME
+from dagent.utils.settings import EMBEDDING_MODEL, MODEL_BASE_URL, MODEL_NAME
 
 # LLM Configuration
 DATASET_LLM_MODEL = MODEL_NAME
diff --git a/src/dataset_generation/core/log_sampler.py b/src/dataset_generation/core/log_sampler.py
index bc272f4..cf28ee7 100644
--- a/src/dataset_generation/core/log_sampler.py
+++ b/src/dataset_generation/core/log_sampler.py
@@ -4,7 +4,7 @@
 
 from tracer.config import LogDomain
 
-from os_assistant.tools.agentic_rag.database.database import LogDatabase
+from dagent.tools.agentic_rag.database.database import LogDatabase
 
 from ..config.config import (
     MAX_SEQUENTIAL_LOGS,
diff --git a/src/dataset_generation/core/question_generator.py b/src/dataset_generation/core/question_generator.py
index ddef3dc..b6e6d15 100644
--- a/src/dataset_generation/core/question_generator.py
+++ b/src/dataset_generation/core/question_generator.py
@@ -5,9 +5,9 @@
 from langchain_ollama import ChatOllama
 from tracer.config import LogDomain
 
-from os_assistant.tools.agentic_rag.application.search import search_logs
-from os_assistant.tools.code_agent.wrapper import code_execute_tool
-from os_assistant.utils.settings import MODEL_BASE_URL
+from dagent.tools.agentic_rag.application.search import search_logs
+from dagent.tools.code_agent.wrapper import code_execute_tool
+from dagent.utils.settings import MODEL_BASE_URL
 
 from ..config.config import (
     DATASET_LLM_MODEL,
diff --git a/src/dataset_generation/core/similarity_checker.py b/src/dataset_generation/core/similarity_checker.py
index 6fe7900..433cb18 100644
--- a/src/dataset_generation/core/similarity_checker.py
+++ b/src/dataset_generation/core/similarity_checker.py
@@ -1,7 +1,7 @@
 import json
 import os
 
-from os_assistant.tools.agentic_rag.core.embedding import EmbeddingGenerator
+from dagent.tools.agentic_rag.core.embedding import EmbeddingGenerator
 
 from ..config.config import DATASET_OUTPUT_DIR, SIMILARITY_THRESHOLD, VECTOR_CACHE_SIZE
 
diff --git a/src/evaluator/core/evaluator.py b/src/evaluator/core/evaluator.py
index 829b96c..1b08e82 100644
--- a/src/evaluator/core/evaluator.py
+++ b/src/evaluator/core/evaluator.py
@@ -4,6 +4,7 @@
 from datetime import datetime
 from typing import Any
 
+from dagent.os_assistant import OSAssistant
 from evaluator.config.config import RESULTS_DIR
 from evaluator.core.llm_judge import LLMJudge
 from evaluator.utils.models import (
@@ -12,7 +13,6 @@
     RunningMetrics,
 )
 from evaluator.utils.parser import extract_final_result, validate_evaluation_result
-from os_assistant.os_assistant import OSAssistant
 
 
 class OSAssistantEvaluator:
@@ -303,7 +303,7 @@ def _cleanup_temp_files(self):
                 os.path.join(current_dir, "outputs"),
                 # Add path to code agent output directory
                 os.path.join(
-                    current_dir, "src", "os_assistant", "tools", "code_agent", "outputs"
+                    current_dir, "src", "dagent", "tools", "code_agent", "outputs"
                 ),
             ]
 
diff --git a/src/os_assistant/tools/agentic_rag/data/example.sqlite b/src/os_assistant/tools/agentic_rag/data/example.sqlite
deleted file mode 100644
index e69de29..0000000
diff --git a/streamlit_app/app.py b/streamlit_app/app.py
index 5e56609..90f451d 100644
--- a/streamlit_app/app.py
+++ b/streamlit_app/app.py
@@ -1,17 +1,8 @@
 import re
-import sys
-from pathlib import Path
 
 import streamlit as st
 
-# ========= Path setup: allow imports from src/os_assistant =========
-REPO_ROOT = Path(__file__).resolve().parents[1]
-SRC_DIR = REPO_ROOT / "src"
-if str(SRC_DIR) not in sys.path:
-    sys.path.insert(0, str(SRC_DIR))
-
-# Now we can import your project
-from os_assistant.os_assistant import OSAssistant  # noqa: E402
+from dagent.os_assistant import OSAssistant  # noqa: E402
 
 
 # ========= Helper: get a single assistant instance per session =========
@@ -76,7 +67,7 @@ def to_dict(obj):
 # ========= Streamlit UI =========
 st.set_page_config(page_title="DAgent UI", page_icon="🤖", layout="wide")
 
-st.title("DAgent – Streamlit UI")
+st.title("DAgent – UI")
 
 st.write(
     "Type your query below. The request will be passed to the DAgent graph "
diff --git a/tests/test_build.py b/tests/test_build.py
index 08e7a9b..22f7cd0 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -1,11 +1,11 @@
 """Test module for making sure model package is working"""
 
-import os_assistant
-from os_assistant import __version__
+import dagent
+from dagent import __version__
 
 
 def test_build():
     """Make sure pytest is working."""
     assert True
-    assert os_assistant
+    assert dagent
     assert __version__
diff --git a/tests/test_cli.py b/tests/test_cli.py
index bbf76a8..8142dbb 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -4,8 +4,8 @@
 
 import pytest
 
-from os_assistant.__main__ import main
-from os_assistant.command_parser import CommandParser
+from dagent.__main__ import main
+from dagent.command_parser import CommandParser
 
 
 class TestCommandParser:
@@ -19,7 +19,7 @@ def test_chat_command_parsing(self):
 
     def test_trace_start_command_parsing(self):
         """Test parsing of trace start command."""
-        with patch("os_assistant.command_parser.LogDomain") as mock_log_domain:
+        with patch("dagent.command_parser.LogDomain") as mock_log_domain:
             # Mock LogDomain to return some test domains
             mock_log_domain.__iter__.return_value = [
                 Mock(value="file_system"),
@@ -48,7 +48,7 @@ def test_invalid_command_exits(self):
 class TestMainFunction:
     """Test main function basic functionality."""
 
-    @patch("os_assistant.__main__.OSAssistant")
+    @patch("dagent.__main__.OSAssistant")
     def test_main_chat_command(self, mock_assistant_class):
         """Test main function handles chat command."""
         mock_assistant = Mock()
diff --git a/uv.lock b/uv.lock
index 6645426..bfc2463 100644
--- a/uv.lock
+++ b/uv.lock
@@ -441,6 +441,68 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e8/cb/2da4cc83f5edb9c3257d09e1e7ab7b23f049c7962cae8d842bbef0a9cec9/cryptography-46.0.3-cp38-abi3-win_arm64.whl", hash = "sha256:d89c3468de4cdc4f08a57e214384d0471911a3830fcdaf7a8cc587e42a866372", size = 2918740, upload-time = "2025-10-15T23:18:12.277Z" },
 ]
 
+[[package]]
+name = "dagent"
+source = { editable = "." }
+dependencies = [
+    { name = "langchain" },
+    { name = "langchain-anthropic" },
+    { name = "langchain-community" },
+    { name = "langchain-core" },
+    { name = "langchain-huggingface" },
+    { name = "langchain-ollama" },
+    { name = "langchain-openai" },
+    { name = "langgraph" },
+    { name = "mcp" },
+    { name = "numpy" },
+    { name = "pillow" },
+    { name = "pydantic" },
+    { name = "python-dotenv" },
+    { name = "pyyaml" },
+    { name = "streamlit" },
+    { name = "tracer" },
+]
+
+[package.dev-dependencies]
+dev = [
+    { name = "mypy" },
+    { name = "pre-commit" },
+    { name = "pytest" },
+    { name = "pytest-cov" },
+    { name = "ruff" },
+    { name = "tox" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "langchain", specifier = "==0.3.26" },
+    { name = "langchain-anthropic", specifier = "==0.3.17" },
+    { name = "langchain-community", specifier = "==0.3.27" },
+    { name = "langchain-core", specifier = "==0.3.68" },
+    { name = "langchain-huggingface", specifier = "==0.3.0" },
+    { name = "langchain-ollama", specifier = "==0.3.4" },
+    { name = "langchain-openai", specifier = "==0.3.10" },
+    { name = "langgraph", specifier = "==0.5.2" },
+    { name = "mcp", specifier = ">=1.0.0" },
+    { name = "numpy", specifier = "==2.3.1" },
+    { name = "pillow", specifier = ">=10.0.0" },
+    { name = "pydantic", specifier = "==2.11.7" },
+    { name = "python-dotenv", specifier = "==1.1.1" },
+    { name = "pyyaml", specifier = "==6.0.2" },
+    { name = "streamlit", specifier = "==1.52.1" },
+    { name = "tracer", git = "https://github.com/AhmedYasserrr/tracer.git?rev=v0.1.0" },
+]
+
+[package.metadata.requires-dev]
+dev = [
+    { name = "mypy" },
+    { name = "pre-commit" },
+    { name = "pytest" },
+    { name = "pytest-cov" },
+    { name = "ruff" },
+    { name = "tox" },
+]
+
 [[package]]
 name = "dataclasses-json"
 version = "0.6.7"
@@ -592,7 +654,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/44/69/9b804adb5fd0671f367781560eb5eb586c4d495277c93bde4307b9e28068/greenlet-3.2.4-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:3b67ca49f54cede0186854a008109d6ee71f66bd57bb36abd6d0a0267b540cdd", size = 274079, upload-time = "2025-08-07T13:15:45.033Z" },
     { url = "https://files.pythonhosted.org/packages/46/e9/d2a80c99f19a153eff70bc451ab78615583b8dac0754cfb942223d2c1a0d/greenlet-3.2.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ddf9164e7a5b08e9d22511526865780a576f19ddd00d62f8a665949327fde8bb", size = 640997, upload-time = "2025-08-07T13:42:56.234Z" },
     { url = "https://files.pythonhosted.org/packages/3b/16/035dcfcc48715ccd345f3a93183267167cdd162ad123cd93067d86f27ce4/greenlet-3.2.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f28588772bb5fb869a8eb331374ec06f24a83a9c25bfa1f38b6993afe9c1e968", size = 655185, upload-time = "2025-08-07T13:45:27.624Z" },
-    { url = "https://files.pythonhosted.org/packages/31/da/0386695eef69ffae1ad726881571dfe28b41970173947e7c558d9998de0f/greenlet-3.2.4-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:5c9320971821a7cb77cfab8d956fa8e39cd07ca44b6070db358ceb7f8797c8c9", size = 649926, upload-time = "2025-08-07T13:53:15.251Z" },
     { url = "https://files.pythonhosted.org/packages/68/88/69bf19fd4dc19981928ceacbc5fd4bb6bc2215d53199e367832e98d1d8fe/greenlet-3.2.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c60a6d84229b271d44b70fb6e5fa23781abb5d742af7b808ae3f6efd7c9c60f6", size = 651839, upload-time = "2025-08-07T13:18:30.281Z" },
     { url = "https://files.pythonhosted.org/packages/19/0d/6660d55f7373b2ff8152401a83e02084956da23ae58cddbfb0b330978fe9/greenlet-3.2.4-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3b3812d8d0c9579967815af437d96623f45c0f2ae5f04e366de62a12d83a8fb0", size = 607586, upload-time = "2025-08-07T13:18:28.544Z" },
     { url = "https://files.pythonhosted.org/packages/8e/1a/c953fdedd22d81ee4629afbb38d2f9d71e37d23caace44775a3a969147d4/greenlet-3.2.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:abbf57b5a870d30c4675928c37278493044d7c14378350b3aa5d484fa65575f0", size = 1123281, upload-time = "2025-08-07T13:42:39.858Z" },
@@ -603,7 +664,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/49/e8/58c7f85958bda41dafea50497cbd59738c5c43dbbea5ee83d651234398f4/greenlet-3.2.4-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:1a921e542453fe531144e91e1feedf12e07351b1cf6c9e8a3325ea600a715a31", size = 272814, upload-time = "2025-08-07T13:15:50.011Z" },
     { url = "https://files.pythonhosted.org/packages/62/dd/b9f59862e9e257a16e4e610480cfffd29e3fae018a68c2332090b53aac3d/greenlet-3.2.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cd3c8e693bff0fff6ba55f140bf390fa92c994083f838fece0f63be121334945", size = 641073, upload-time = "2025-08-07T13:42:57.23Z" },
     { url = "https://files.pythonhosted.org/packages/f7/0b/bc13f787394920b23073ca3b6c4a7a21396301ed75a655bcb47196b50e6e/greenlet-3.2.4-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:710638eb93b1fa52823aa91bf75326f9ecdfd5e0466f00789246a5280f4ba0fc", size = 655191, upload-time = "2025-08-07T13:45:29.752Z" },
-    { url = "https://files.pythonhosted.org/packages/f2/d6/6adde57d1345a8d0f14d31e4ab9c23cfe8e2cd39c3baf7674b4b0338d266/greenlet-3.2.4-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:c5111ccdc9c88f423426df3fd1811bfc40ed66264d35aa373420a34377efc98a", size = 649516, upload-time = "2025-08-07T13:53:16.314Z" },
     { url = "https://files.pythonhosted.org/packages/7f/3b/3a3328a788d4a473889a2d403199932be55b1b0060f4ddd96ee7cdfcad10/greenlet-3.2.4-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d76383238584e9711e20ebe14db6c88ddcedc1829a9ad31a584389463b5aa504", size = 652169, upload-time = "2025-08-07T13:18:32.861Z" },
     { url = "https://files.pythonhosted.org/packages/ee/43/3cecdc0349359e1a527cbf2e3e28e5f8f06d3343aaf82ca13437a9aa290f/greenlet-3.2.4-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:23768528f2911bcd7e475210822ffb5254ed10d71f4028387e5a99b4c6699671", size = 610497, upload-time = "2025-08-07T13:18:31.636Z" },
     { url = "https://files.pythonhosted.org/packages/b8/19/06b6cf5d604e2c382a6f31cafafd6f33d5dea706f4db7bdab184bad2b21d/greenlet-3.2.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:00fadb3fedccc447f517ee0d3fd8fe49eae949e1cd0f6a611818f4f6fb7dc83b", size = 1121662, upload-time = "2025-08-07T13:42:41.117Z" },
@@ -614,7 +674,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/22/5c/85273fd7cc388285632b0498dbbab97596e04b154933dfe0f3e68156c68c/greenlet-3.2.4-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:49a30d5fda2507ae77be16479bdb62a660fa51b1eb4928b524975b3bde77b3c0", size = 273586, upload-time = "2025-08-07T13:16:08.004Z" },
     { url = "https://files.pythonhosted.org/packages/d1/75/10aeeaa3da9332c2e761e4c50d4c3556c21113ee3f0afa2cf5769946f7a3/greenlet-3.2.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:299fd615cd8fc86267b47597123e3f43ad79c9d8a22bebdce535e53550763e2f", size = 686346, upload-time = "2025-08-07T13:42:59.944Z" },
     { url = "https://files.pythonhosted.org/packages/c0/aa/687d6b12ffb505a4447567d1f3abea23bd20e73a5bed63871178e0831b7a/greenlet-3.2.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c17b6b34111ea72fc5a4e4beec9711d2226285f0386ea83477cbb97c30a3f3a5", size = 699218, upload-time = "2025-08-07T13:45:30.969Z" },
-    { url = "https://files.pythonhosted.org/packages/dc/8b/29aae55436521f1d6f8ff4e12fb676f3400de7fcf27fccd1d4d17fd8fecd/greenlet-3.2.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b4a1870c51720687af7fa3e7cda6d08d801dae660f75a76f3845b642b4da6ee1", size = 694659, upload-time = "2025-08-07T13:53:17.759Z" },
     { url = "https://files.pythonhosted.org/packages/92/2e/ea25914b1ebfde93b6fc4ff46d6864564fba59024e928bdc7de475affc25/greenlet-3.2.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:061dc4cf2c34852b052a8620d40f36324554bc192be474b9e9770e8c042fd735", size = 695355, upload-time = "2025-08-07T13:18:34.517Z" },
     { url = "https://files.pythonhosted.org/packages/72/60/fc56c62046ec17f6b0d3060564562c64c862948c9d4bc8aa807cf5bd74f4/greenlet-3.2.4-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:44358b9bf66c8576a9f57a590d5f5d6e72fa4228b763d0e43fee6d3b06d3a337", size = 657512, upload-time = "2025-08-07T13:18:33.969Z" },
     { url = "https://files.pythonhosted.org/packages/23/6e/74407aed965a4ab6ddd93a7ded3180b730d281c77b765788419484cdfeef/greenlet-3.2.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:2917bdf657f5859fbf3386b12d68ede4cf1f04c90c3a6bc1f013dd68a22e2269", size = 1612508, upload-time = "2025-11-04T12:42:23.427Z" },
@@ -1426,68 +1485,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/12/ad/f4e1a36a6d1714afb7ffb74b3ababdcb96529cf4e7a216f9f7c8eda837b6/ormsgpack-1.10.0-cp313-cp313-win_amd64.whl", hash = "sha256:534d18acb805c75e5fba09598bf40abe1851c853247e61dda0c01f772234da69", size = 121399, upload-time = "2025-05-24T19:07:40.854Z" },
 ]
 
-[[package]]
-name = "os-assistant"
-source = { editable = "." }
-dependencies = [
-    { name = "langchain" },
-    { name = "langchain-anthropic" },
-    { name = "langchain-community" },
-    { name = "langchain-core" },
-    { name = "langchain-huggingface" },
-    { name = "langchain-ollama" },
-    { name = "langchain-openai" },
-    { name = "langgraph" },
-    { name = "mcp" },
-    { name = "numpy" },
-    { name = "pillow" },
-    { name = "pydantic" },
-    { name = "python-dotenv" },
-    { name = "pyyaml" },
-    { name = "streamlit" },
-    { name = "tracer" },
-]
-
-[package.dev-dependencies]
-dev = [
-    { name = "mypy" },
-    { name = "pre-commit" },
-    { name = "pytest" },
-    { name = "pytest-cov" },
-    { name = "ruff" },
-    { name = "tox" },
-]
-
-[package.metadata]
-requires-dist = [
-    { name = "langchain", specifier = "==0.3.26" },
-    { name = "langchain-anthropic", specifier = "==0.3.17" },
-    { name = "langchain-community", specifier = "==0.3.27" },
-    { name = "langchain-core", specifier = "==0.3.68" },
-    { name = "langchain-huggingface", specifier = "==0.3.0" },
-    { name = "langchain-ollama", specifier = "==0.3.4" },
-    { name = "langchain-openai", specifier = "==0.3.10" },
-    { name = "langgraph", specifier = "==0.5.2" },
-    { name = "mcp", specifier = ">=1.0.0" },
-    { name = "numpy", specifier = "==2.3.1" },
-    { name = "pillow", specifier = ">=10.0.0" },
-    { name = "pydantic", specifier = "==2.11.7" },
-    { name = "python-dotenv", specifier = "==1.1.1" },
-    { name = "pyyaml", specifier = "==6.0.2" },
-    { name = "streamlit", specifier = "==1.52.1" },
-    { name = "tracer", git = "https://github.com/AhmedYasserrr/tracer.git?rev=v0.1.0" },
-]
-
-[package.metadata.requires-dev]
-dev = [
-    { name = "mypy" },
-    { name = "pre-commit" },
-    { name = "pytest" },
-    { name = "pytest-cov" },
-    { name = "ruff" },
-    { name = "tox" },
-]
-
 [[package]]
 name = "packaging"
 version = "24.2"

From 0d8ac1db9198bac749d7d625efcc7d28ca2a3a35 Mon Sep 17 00:00:00 2001
From: omar-abdelgawad <omar.abdelgawad@ejust.edu.eg>
Date: Sat, 31 Jan 2026 12:50:03 +0200
Subject: [PATCH 2/5] fix a type error

---
 README.md                  |  2 +-
 pyproject.toml             |  2 +-
 src/dagent/os_assistant.py | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 50684f5..f29f4f5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 <!-- [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -->
 
 # DAgent
-This is a modern template for a python project with the pyproject.toml with some fields to change based on project. It also has tox configured, docs dir for github pages, .github dir with tox-gh-actions configured and more.  
+This project is an attempt to make a personal assistant that is aware of the device it is running on using the latest agentic technology. The architecture we use for the workflow graph is very simple and easily augmented in the future.  
 
 ## Prerequisites
 Make sure [uv](https://docs.astral.sh/uv/getting-started/installation/#installation-methods) is installed. Here is the install script on macOS and Linux
diff --git a/pyproject.toml b/pyproject.toml
index ece3b8d..b78e9fa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ authors = [
   { name = "Ahmed Gamea", email = "Ahmed.gamea@ejust.edu.eg" },
   { name = "Abdelaziz Serour", email = "abdelaziz.serour@ejust.edu.eg" },
 ]
-description = "A Python package for agents that have os-level knowledge."
+description = "A Python package for agents that have device-level knowledge."
 readme = "README.md"
 license = { file = "LICENSE" }
 keywords = ["agents", "flow", "llm", "ollama", "knowledge"]
diff --git a/src/dagent/os_assistant.py b/src/dagent/os_assistant.py
index 273df8f..ba35483 100644
--- a/src/dagent/os_assistant.py
+++ b/src/dagent/os_assistant.py
@@ -1,5 +1,5 @@
-import traceback
 import uuid
+from typing import TYPE_CHECKING
 
 from dagent.utils import LOGGER
 
@@ -7,12 +7,17 @@
 from .core.state import AssistantState
 from .utils.settings import DOMAINS, GRAPH_VISUALIZE
 
+if TYPE_CHECKING:
+    from langchain_core.runnables import RunnableConfig
+
 
 class OSAssistant:
     def __init__(self):
         self.app = build_assistant_graph()
         self.session_thread_id = str(uuid.uuid4())
-        self.config = {"configurable": {"thread_id": self.session_thread_id}}
+        self.config: RunnableConfig = {
+            "configurable": {"thread_id": self.session_thread_id}
+        }
         self.interaction_count = 0
         self.initialized = False
 
@@ -117,14 +122,13 @@ def run(self):
             try:
                 user_prompt = input("\nEnter your query: ")
                 if user_prompt.lower() == "exit":
-                    LOGGER.info("Exiting OS Assistant.")
                     break
                 if not user_prompt.strip():
                     continue
                 self.process_prompt(user_prompt)
             except KeyboardInterrupt:
-                LOGGER.info("\nExiting OS Assistant.")
+                print()
                 break
             except Exception as e:
-                LOGGER.exception(f"\nAn unexpected error occurred: {e}")
-                traceback.print_exc()
+                LOGGER.exception(f"An unexpected error occurred: {e}")
+        LOGGER.info("Exiting DAgent.")

From 9108ec8f40fed5fa556a0e56aec4457de496f94c Mon Sep 17 00:00:00 2001
From: omar-abdelgawad <omar.abdelgawad@ejust.edu.eg>
Date: Sat, 31 Jan 2026 13:48:47 +0200
Subject: [PATCH 3/5] fix type error and small refactoring

---
 src/dagent/__main__.py     | 25 ++++++++--------
 src/dagent/os_assistant.py | 61 +++++++++++++++++++++-----------------
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/dagent/__main__.py b/src/dagent/__main__.py
index 98610da..efcf5aa 100644
--- a/src/dagent/__main__.py
+++ b/src/dagent/__main__.py
@@ -11,18 +11,19 @@
 def main(argv: Sequence[str] | None = None) -> None:
     args = CommandParser().parse_args(argv)
     LOGGER.debug(f"Parsed arguments: {args}")
-
-    if args.command == "trace":
-        tracer = TracerCore()
-        if args.trace_command == "start":
-            tracer.start_tracing(args.domain, args.dir)
-        elif args.trace_command == "show":
-            tracer.print_logs(args.domain, args.start, args.end)
-        elif args.trace_command == "clear":
-            tracer.clear_logs(args.domain)
-    if args.command == "chat":
-        assistant = OSAssistant()
-        assistant.run()
+    match args.command:
+        case "trace":
+            tracer = TracerCore()
+            match args.trace_command:
+                case "start":
+                    tracer.start_tracing(args.domain, args.dir)
+                case "show":
+                    tracer.print_logs(args.domain, args.start, args.end)
+                case "clear":
+                    tracer.clear_logs(args.domain)
+        case "chat":
+            assistant = OSAssistant()
+            assistant.run()
 
 
 if __name__ == "__main__":
diff --git a/src/dagent/os_assistant.py b/src/dagent/os_assistant.py
index ba35483..30333ff 100644
--- a/src/dagent/os_assistant.py
+++ b/src/dagent/os_assistant.py
@@ -1,5 +1,5 @@
 import uuid
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 from dagent.utils import LOGGER
 
@@ -47,6 +47,7 @@ def process_prompt(self, prompt: str, initial_state: dict | None = None):
         self.interaction_count += 1
 
         if not self.initialized:
+            self.initialized = True
             base_state: AssistantState = {
                 "prompt": prompt,
                 "domains": DOMAINS,
@@ -69,35 +70,39 @@ def process_prompt(self, prompt: str, initial_state: dict | None = None):
             if initial_state:
                 base_state.update(initial_state)
 
-            self.app.invoke(base_state, config=self.config)
-            self.initialized = True
             LOGGER.debug("Initialized assistant.")
+            self.app.invoke(base_state, config=self.config)
         else:
-            current_state = self.app.get_state(config=self.config).values
-            updated_state = {
-                **current_state,
-                "prompt": prompt,
-                # Reset vision state for new query
-                "attached_image": None,
-                "vision_analysis": None,
-                # Reset tool-related state for new query (preserves conversation_history)
-                "tool_context": None,
-                "tool_question": None,
-                "tool_originating_node": None,
-                "raw_tool_results": None,
-                "tool_code": None,
-                "tool_analysis": None,
-                "tool_usage_count": 0,
-                # Reset response state for new query
-                "command_response": None,
-                "information_response": None,
-                "final_result": None,
-                "query_type": None,
-                "domain_analysis": None,
-                "contexts": {},
-                "domains_to_process": [],
-                "current_domain": None,
-            }
+            # Since all nodes in our workflow pass the same state, we can do the following cast.
+            current_state = cast(
+                AssistantState, self.app.get_state(config=self.config).values
+            )
+            updated_state = current_state.copy()
+            updated_state.update(
+                {
+                    "prompt": prompt,
+                    # Reset vision state for new query
+                    "attached_image": None,
+                    "vision_analysis": None,
+                    # Reset tool-related state for new query (preserves conversation_history)
+                    "tool_context": None,
+                    "tool_question": None,
+                    "tool_originating_node": None,
+                    "raw_tool_results": None,
+                    "tool_code": None,
+                    "tool_analysis": None,
+                    "tool_usage_count": 0,
+                    # Reset response state for new query
+                    "command_response": None,
+                    "information_response": None,
+                    "final_result": None,
+                    "query_type": None,
+                    "domain_analysis": None,
+                    "contexts": {},
+                    "domains_to_process": [],
+                    "current_domain": None,
+                }
+            )
             # Merge any additional state (e.g., new image)
             if initial_state:
                 updated_state.update(initial_state)

From bbff5b4ef1ccab1dd6bbc0716a6e6293bf3ba3ce Mon Sep 17 00:00:00 2001
From: omar-abdelgawad <omar.abdelgawad@ejust.edu.eg>
Date: Sat, 31 Jan 2026 14:21:58 +0200
Subject: [PATCH 4/5] added tests for devic.py

---
 src/dagent/utils/__init__.py |  1 +
 src/dagent/utils/device.py   |  3 +++
 tests/test_device.py         | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 tests/test_device.py

diff --git a/src/dagent/utils/__init__.py b/src/dagent/utils/__init__.py
index 7bdb6bf..c806c79 100644
--- a/src/dagent/utils/__init__.py
+++ b/src/dagent/utils/__init__.py
@@ -1,4 +1,5 @@
 from .device import get_os_name
 from .logger import LOGGER
 
+# The following is not the full list because it grows really quickly
 __all__ = ["LOGGER", "get_os_name"]
diff --git a/src/dagent/utils/device.py b/src/dagent/utils/device.py
index a174518..de7a26d 100644
--- a/src/dagent/utils/device.py
+++ b/src/dagent/utils/device.py
@@ -5,4 +5,7 @@ def get_os_name():
     os_type = platform.system()
     if os_type == "Darwin":
         return "macOS"
+    if os_type == "Linux":
+        info = platform.freedesktop_os_release()
+        os_type = f"Linux ({info.get('NAME', 'Unknown')})"
     return os_type
diff --git a/tests/test_device.py b/tests/test_device.py
new file mode 100644
index 0000000..b9d9555
--- /dev/null
+++ b/tests/test_device.py
@@ -0,0 +1,35 @@
+from unittest.mock import patch
+
+from dagent.utils import get_os_name
+
+
+def test_macos():
+    with patch("platform.system", return_value="Darwin"):
+        assert get_os_name() == "macOS"
+
+
+def test_linux_ubuntu():
+    with (
+        patch("platform.system", return_value="Linux"),
+        patch(
+            "platform.freedesktop_os_release",
+            return_value={"NAME": "Ubuntu"},
+        ),
+    ):
+        assert get_os_name() == "Linux (Ubuntu)"
+
+
+def test_linux_unknown():
+    with (
+        patch("platform.system", return_value="Linux"),
+        patch(
+            "platform.freedesktop_os_release",
+            return_value={},
+        ),
+    ):
+        assert get_os_name() == "Linux (Unknown)"
+
+
+def test_windows():
+    with patch("platform.system", return_value="Windows"):
+        assert get_os_name() == "Windows"

From 20f3c62c0310926faaa456975410ed56a5e10b66 Mon Sep 17 00:00:00 2001
From: omar-abdelgawad <omar.abdelgawad@ejust.edu.eg>
Date: Sat, 31 Jan 2026 14:34:27 +0200
Subject: [PATCH 5/5] adjusted type exit to quit statement to be in running cli
 only

---
 src/dagent/os_assistant.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dagent/os_assistant.py b/src/dagent/os_assistant.py
index 30333ff..9ad1bc7 100644
--- a/src/dagent/os_assistant.py
+++ b/src/dagent/os_assistant.py
@@ -33,7 +33,7 @@ def __init__(self):
             except Exception as e:
                 LOGGER.error(f"Graph visualization failed: {e}")
 
-        LOGGER.info("Graph built successfully. Type 'exit' to quit.")
+        LOGGER.info("Graph built successfully.")
         LOGGER.debug(f"Session ID: {self.session_thread_id}")
 
     def process_prompt(self, prompt: str, initial_state: dict | None = None):
@@ -125,7 +125,7 @@ def process_prompt(self, prompt: str, initial_state: dict | None = None):
     def run(self):
         while True:
             try:
-                user_prompt = input("\nEnter your query: ")
+                user_prompt = input("\nType 'exit' to quit.\nEnter your query: ")
                 if user_prompt.lower() == "exit":
                     break
                 if not user_prompt.strip():