dtSpark 1.1.0a7__py3-none-any.whl → 1.1.0a9__py3-none-any.whl

dtSpark/_version.txt

@@ -1 +1 @@
-1.1.0a7
+1.1.0a9

dtSpark/mcp_integration/tool_selector.py

@@ -21,7 +21,7 @@ class ToolSelector:
         'aws_infrastructure': ['ec2', 's3', 'lambda', 'cloudwatch', 'iam', 'vpc', 'rds', 'dynamodb', 'diagram'],
         'elasticsearch': ['elasticsearch', 'search', 'index', 'query', 'aggregation'],
         'ragstore': ['ragstore', 'rag', 'embedding', 'vector', 'semantic'],
-        'documents': ['word', 'excel', 'powerpoint', 'pdf', 'document', 'docx', 'xlsx', 'pptx', 'spreadsheet'],
+        'documents': ['word', 'excel', 'powerpoint', 'pdf', 'docx', 'xlsx', 'pptx', 'spreadsheet'],
         'archives': ['archive', 'zip', 'tar', 'extract', 'compress', 'tgz'],
     }
 
@@ -38,8 +38,8 @@ class ToolSelector:
                               'vpc', 'subnet', 'instance', 'bucket', 'function', 'diagram'],
         'elasticsearch': ['elasticsearch', 'search', 'query', 'index', 'log', 'aggregate'],
         'ragstore': ['ragstore', 'rag', 'embedding', 'semantic', 'vector', 'similarity'],
-        'documents': ['document', 'word', 'excel', 'powerpoint', 'pdf', 'docx', 'xlsx', 'pptx',
-                     'spreadsheet', 'presentation', 'template', 'office'],
+        'documents': ['word doc', 'excel', 'powerpoint', 'pdf', 'docx', 'xlsx', 'pptx',
+                     'spreadsheet', 'presentation', 'office'],
         'archives': ['archive', 'zip', 'tar', 'extract', 'unzip', 'compressed', 'tgz'],
     }
 

dtSpark/tools/builtin.py

@@ -361,7 +361,11 @@ def _get_filesystem_tools(fs_config: Dict[str, Any]) -> List[Dict[str, Any]]:
         tools.extend([
             {
                 "name": "write_file",
-                "description": f"Write content to a file within the allowed path ({allowed_path}). "
+                "description": f"Write text content to a file within the allowed path ({allowed_path}). "
+                              "Use this tool for creating or updating ANY text-based file including HTML, CSS, JavaScript, "
+                              "JSON, YAML, XML, Python, Markdown, plain text, config files, and all other non-binary formats. "
+                              "Do NOT use the Microsoft Office tools (create_word_document, create_excel_document, "
+                              "create_powerpoint_document) for text-based file formats. "
                               "Creates the file if it doesn't exist, or overwrites if it exists. "
                               "Parent directories must already exist (use create_directories first if needed).",
                 "input_schema": {
@@ -1037,6 +1041,8 @@ def _get_document_tools(doc_config: Dict[str, Any]) -> List[Dict[str, Any]]:
             {
                 "name": "create_word_document",
                 "description": f"Create a Microsoft Word document (.docx) within the allowed path ({allowed_path}). "
+                              "ONLY use this tool when the user specifically requests a Word/.docx file. "
+                              "Do NOT use this for HTML, plain text, Markdown, or other text-based formats — use write_file instead. "
                               "Supports creating from scratch with structured content, or using a template with placeholder replacement. "
                               "When using a template, placeholders in the format {{{{placeholder_name}}}} will be replaced with provided values.",
                 "input_schema": {
@@ -1080,6 +1086,8 @@ def _get_document_tools(doc_config: Dict[str, Any]) -> List[Dict[str, Any]]:
             {
                 "name": "create_excel_document",
                 "description": f"Create a Microsoft Excel document (.xlsx) within the allowed path ({allowed_path}). "
+                              "ONLY use this tool when the user specifically requests an Excel/.xlsx spreadsheet. "
+                              "Do NOT use this for CSV or other text-based tabular formats — use write_file instead. "
                               "Creates spreadsheets from structured data. Supports multiple sheets.",
                 "input_schema": {
                     "type": "object",
@@ -1112,6 +1120,8 @@ def _get_document_tools(doc_config: Dict[str, Any]) -> List[Dict[str, Any]]:
             {
                 "name": "create_powerpoint_document",
                 "description": f"Create a Microsoft PowerPoint document (.pptx) within the allowed path ({allowed_path}). "
+                              "ONLY use this tool when the user specifically requests a PowerPoint/.pptx presentation. "
+                              "Do NOT use this for HTML presentations or other text-based formats — use write_file instead. "
                               "Creates presentations with title and content slides. Supports templates with placeholder replacement.",
                 "input_schema": {
                     "type": "object",

dtSpark/web/static/css/dark-theme.css

@@ -101,19 +101,71 @@ body {
     overflow-x: auto;
 }
 
-/* Tool calls */
+/* Tool calls - aligned left like assistant messages */
 .tool-call {
     background-color: #2a3a4a;
     padding: 0.75rem;
     margin: 0.5rem 0;
-    border-radius: 0.25rem;
+    margin-right: 20%;
+    border-radius: 0.5rem;
 }
 
+/* Tool results - aligned right like user messages */
 .tool-result {
     background-color: #3a3a2a;
     padding: 0.75rem;
     margin: 0.5rem 0;
-    border-radius: 0.25rem;
+    margin-left: 20%;
+    border-radius: 0.5rem;
+}
+
+/* Tool message header with icons */
+.tool-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    cursor: pointer;
+}
+
+.tool-header-left {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+}
+
+.tool-header-icons {
+    display: flex;
+    gap: 0.25rem;
+}
+
+.tool-header-icons button {
+    background: none;
+    border: none;
+    color: #aaa;
+    padding: 0.25rem;
+    cursor: pointer;
+    font-size: 0.9rem;
+    transition: color 0.2s;
+}
+
+.tool-header-icons button:hover {
+    color: #fff;
+}
+
+/* Tool content - collapsible */
+.tool-content {
+    display: none;
+    margin-top: 0.5rem;
+}
+
+.tool-content.expanded {
+    display: block;
+}
+
+.tool-content pre {
+    margin: 0;
+    white-space: pre-wrap;
+    word-wrap: break-word;
 }
 
 /* Rollup summary */

dtSpark/web/static/js/chat.js

@@ -167,19 +167,34 @@ function appendToolResults(content, timestamp = null) {
 
         if (Array.isArray(results)) {
             results.forEach((result, index) => {
+                const toolId = generateToolId();
                 const resultDiv = document.createElement('div');
                 resultDiv.className = 'tool-result';
+                resultDiv.id = toolId;
 
-                const toolId = result.tool_use_id || 'unknown';
+                const toolUseId = result.tool_use_id || 'unknown';
                 const resultContent = result.content || JSON.stringify(result);
+                const formattedContent = typeof resultContent === 'string' ? resultContent : JSON.stringify(resultContent, null, 2);
 
                 resultDiv.innerHTML = `
-                    <div class="small">
-                        <strong><i class="bi bi-check-circle-fill"></i> Tool Result ${index + 1}:</strong>
-                        <code>${escapeHtml(toolId)}</code>
-                        ${timestamp ? `<span class="ms-2">${formatTimestamp(timestamp)}</span>` : ''}
+                    <div class="tool-header small" onclick="toggleToolContent('${toolId}')">
+                        <div class="tool-header-left">
+                            <strong><i class="bi bi-check-circle-fill"></i> Tool Result ${index + 1}:</strong>
+                            <code>${escapeHtml(toolUseId)}</code>
+                            ${timestamp ? `<span class="ms-2">${formatTimestamp(timestamp)}</span>` : ''}
+                        </div>
+                        <div class="tool-header-icons">
+                            <button class="tool-copy-btn" onclick="event.stopPropagation(); copyToolContent('${toolId}')" title="Copy to clipboard">
+                                <i class="bi bi-clipboard"></i>
+                            </button>
+                            <button onclick="event.stopPropagation(); toggleToolContent('${toolId}')" title="Expand/Collapse">
+                                <i class="bi bi-chevron-down" id="${toolId}-toggle-icon"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="tool-content" id="${toolId}-content">
+                        <pre class="small mb-0">${escapeHtml(formattedContent)}</pre>
                     </div>
-                    <pre class="small mb-0 mt-1">${escapeHtml(typeof resultContent === 'string' ? resultContent : JSON.stringify(resultContent, null, 2))}</pre>
                 `;
 
                 messagesContainer.appendChild(resultDiv);
@@ -188,11 +203,27 @@ function appendToolResults(content, timestamp = null) {
     } catch (e) {
         console.error('Error parsing tool results:', e);
         // Fall back to displaying the raw content
+        const toolId = generateToolId();
         const resultDiv = document.createElement('div');
         resultDiv.className = 'tool-result';
+        resultDiv.id = toolId;
         resultDiv.innerHTML = `
-            <div class="small"><strong><i class="bi bi-check-circle-fill"></i> Tool Results</strong></div>
-            <pre class="small mb-0 mt-1">${escapeHtml(content)}</pre>
+            <div class="tool-header small" onclick="toggleToolContent('${toolId}')">
+                <div class="tool-header-left">
+                    <strong><i class="bi bi-check-circle-fill"></i> Tool Results</strong>
+                </div>
+                <div class="tool-header-icons">
+                    <button class="tool-copy-btn" onclick="event.stopPropagation(); copyToolContent('${toolId}')" title="Copy to clipboard">
+                        <i class="bi bi-clipboard"></i>
+                    </button>
+                    <button onclick="event.stopPropagation(); toggleToolContent('${toolId}')" title="Expand/Collapse">
+                        <i class="bi bi-chevron-down" id="${toolId}-toggle-icon"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="tool-content" id="${toolId}-content">
+                <pre class="small mb-0">${escapeHtml(content)}</pre>
+            </div>
         `;
         messagesContainer.appendChild(resultDiv);
     }
@@ -225,6 +256,50 @@ function appendRollupSummary(content, timestamp = null) {
     scrollToBottom();
 }
 
+/**
+ * Generate a unique ID for tool elements
+ * @returns {string} Unique ID
+ */
+function generateToolId() {
+    return 'tool-' + Date.now() + '-' + Math.random().toString(36).substr(2, 9);
+}
+
+/**
+ * Toggle tool content visibility
+ * @param {string} toolId - ID of the tool element
+ */
+function toggleToolContent(toolId) {
+    const content = document.getElementById(toolId + '-content');
+    const icon = document.getElementById(toolId + '-toggle-icon');
+    if (content && icon) {
+        content.classList.toggle('expanded');
+        icon.className = content.classList.contains('expanded')
+            ? 'bi bi-chevron-up'
+            : 'bi bi-chevron-down';
+    }
+}
+
+/**
+ * Copy tool content to clipboard
+ * @param {string} toolId - ID of the tool element
+ */
+function copyToolContent(toolId) {
+    const content = document.getElementById(toolId + '-content');
+    if (content) {
+        const pre = content.querySelector('pre');
+        if (pre) {
+            navigator.clipboard.writeText(pre.textContent).then(() => {
+                const btn = document.querySelector(`#${toolId} .tool-copy-btn`);
+                if (btn) {
+                    const originalIcon = btn.innerHTML;
+                    btn.innerHTML = '<i class="bi bi-check"></i>';
+                    setTimeout(() => { btn.innerHTML = originalIcon; }, 1500);
+                }
+            });
+        }
+    }
+}
+
 /**
  * Append a tool call message
  * @param {string} toolName - Tool name
@@ -232,14 +307,28 @@ function appendRollupSummary(content, timestamp = null) {
  */
 function appendToolCall(toolName, toolInput) {
     const messagesContainer = document.getElementById('chat-messages');
+    const toolId = generateToolId();
 
     const toolDiv = document.createElement('div');
     toolDiv.className = 'tool-call';
+    toolDiv.id = toolId;
     toolDiv.innerHTML = `
-        <div class="small">
-            <strong><i class="bi bi-tools"></i> Tool Call:</strong> <code>${escapeHtml(toolName)}</code>
+        <div class="tool-header small" onclick="toggleToolContent('${toolId}')">
+            <div class="tool-header-left">
+                <strong><i class="bi bi-tools"></i> Tool Call:</strong> <code>${escapeHtml(toolName)}</code>
+            </div>
+            <div class="tool-header-icons">
+                <button class="tool-copy-btn" onclick="event.stopPropagation(); copyToolContent('${toolId}')" title="Copy to clipboard">
+                    <i class="bi bi-clipboard"></i>
+                </button>
+                <button onclick="event.stopPropagation(); toggleToolContent('${toolId}')" title="Expand/Collapse">
+                    <i class="bi bi-chevron-down" id="${toolId}-toggle-icon"></i>
+                </button>
+            </div>
+        </div>
+        <div class="tool-content" id="${toolId}-content">
+            <pre class="small mb-0">${escapeHtml(JSON.stringify(toolInput, null, 2))}</pre>
         </div>
-        <pre class="small mb-0 mt-1">${escapeHtml(JSON.stringify(toolInput, null, 2))}</pre>
     `;
 
     messagesContainer.appendChild(toolDiv);
@@ -248,19 +337,33 @@ function appendToolCall(toolName, toolInput) {
 
 /**
  * Append a tool result message
- * @param {string} toolName - Tool name
+ * @param {string} toolName - Tool name or tool_use_id
  * @param {object} toolResult - Tool result data
  */
 function appendToolResult(toolName, toolResult) {
     const messagesContainer = document.getElementById('chat-messages');
+    const toolId = generateToolId();
 
     const resultDiv = document.createElement('div');
     resultDiv.className = 'tool-result';
+    resultDiv.id = toolId;
     resultDiv.innerHTML = `
-        <div class="small">
-            <strong><i class="bi bi-check-circle-fill"></i> Tool Result:</strong> <code>${escapeHtml(toolName)}</code>
+        <div class="tool-header small" onclick="toggleToolContent('${toolId}')">
+            <div class="tool-header-left">
+                <strong><i class="bi bi-check-circle-fill"></i> Tool Result:</strong> <code>${escapeHtml(toolName)}</code>
+            </div>
+            <div class="tool-header-icons">
+                <button class="tool-copy-btn" onclick="event.stopPropagation(); copyToolContent('${toolId}')" title="Copy to clipboard">
+                    <i class="bi bi-clipboard"></i>
+                </button>
+                <button onclick="event.stopPropagation(); toggleToolContent('${toolId}')" title="Expand/Collapse">
+                    <i class="bi bi-chevron-down" id="${toolId}-toggle-icon"></i>
+                </button>
+            </div>
+        </div>
+        <div class="tool-content" id="${toolId}-content">
+            <pre class="small mb-0">${escapeHtml(JSON.stringify(toolResult, null, 2))}</pre>
         </div>
-        <pre class="small mb-0 mt-1">${escapeHtml(JSON.stringify(toolResult, null, 2))}</pre>
     `;
 
     messagesContainer.appendChild(resultDiv);

{dtspark-1.1.0a7.dist-info → dtspark-1.1.0a9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtSpark
-Version: 1.1.0a7
+Version: 1.1.0a9
 Summary: Secure Personal AI Research Kit - Multi-provider LLM CLI/Web interface with MCP tool integration
 Home-page: https://github.com/digital-thought/dtSpark
 Author: Matthew Westwood-Hill

{dtspark-1.1.0a7.dist-info → dtspark-1.1.0a9.dist-info}/RECORD

@@ -4,7 +4,7 @@ dtSpark/_full_name.txt,sha256=wsMYXtT12WMrY9gT1JHiKdE4k7H59psECS6cSD07giQ,31
 dtSpark/_licence.txt,sha256=Mvt5wkOkst8VGlk48vwN3CgHwMHLfmplKSPOUEbTfOw,1071
 dtSpark/_metadata.yaml,sha256=h3PQd2QsY5yUBzS2b6EueTwkmd57svsbAKcwDVVEfIo,188
 dtSpark/_name.txt,sha256=kDZC5_a3iMKIPOUvtLXl0C9N5DiOfgUCsecwTUnkJhs,7
-dtSpark/_version.txt,sha256=IPCpT1ggRHHZbmAfNBVOsWMbPW5eyBS-kaISKoRcAu4,7
+dtSpark/_version.txt,sha256=BL95x5tKVY_IYvsQIBZbtkltbDakQ6h9_tBz4n7OFT8,7
 dtSpark/cli_interface.py,sha256=uNcD8s_h65EJA9xXB_waMfiugwmNYVLdntB2qNn8-Rc,97635
 dtSpark/conversation_manager.py,sha256=VcfZSwrRuuUbVZa8kQVJjHwG4un5HA0nqYuajsUovoI,132593
 dtSpark/launch.py,sha256=j8XYpmDswWUIzhpMc32E0Fhbhk_qhOQUAwJSpqh37f0,892
@@ -48,7 +48,7 @@ dtSpark/llm/manager.py,sha256=Qg9glX5ZhepWaRnb8ILZiPoiwqzC8Y318JgwuJf9m58,5837
 dtSpark/llm/ollama.py,sha256=BQOS6j8nRipoHzPv6gxwzpjucdJ-HLQ3ixNvTEPROKM,20897
 dtSpark/mcp_integration/__init__.py,sha256=pFw-yTSSJ1yx_ksTe94eq8pBrwDD-5Z-UqSM3VO4deQ,157
 dtSpark/mcp_integration/manager.py,sha256=yfSymFPXAN-80Rl0M5D-Upb3vIvRq_tvGAI5wVR-IdQ,25241
-dtSpark/mcp_integration/tool_selector.py,sha256=GHH1pEyi5E2QA2JdfrWFGkZlVucuhSIh4jBJOb54TjU,11029
+dtSpark/mcp_integration/tool_selector.py,sha256=15l2Abr1ouuk0GUoysetnW-e7z-x1MRU1LpYsYJ2xrA,10997
 dtSpark/resources/config.yaml.template,sha256=e_GNNZ2FAVDcx1dQ-Mc41SMEPE9M0JrRWdFyRYqstMA,27454
 dtSpark/safety/__init__.py,sha256=fdcZ4qNbYhH7Un9iKLwNe2GDr_doUmpSgtv-oNS8qPE,460
 dtSpark/safety/llm_service.py,sha256=N2J9_Od-fGGvk9BkddD6CFd81PrJ03sMjSz6egBDYr4,3820
@@ -61,7 +61,7 @@ dtSpark/scheduler/execution_queue.py,sha256=7_yXnGxO-arZTl0qPbyE-kDhZDVXQKT2z9zI
 dtSpark/scheduler/executor.py,sha256=s_-6WKdTYEK1-xjYJNXGcAj6vdN27Cf6TI9zNYPSsk0,51371
 dtSpark/scheduler/manager.py,sha256=vwtmQadqf3cv1QzdZJzFqC0l3bBzIplGZ79BUjfsh4o,12846
 dtSpark/tools/__init__.py,sha256=TPK-c8CmXheEkoiFzL9PMP8ve0hTpw9iIV2xlGLTsMc,147
-dtSpark/tools/builtin.py,sha256=oTdOsxK8x4-DR4wDOYZdBNdZZ7MlqgplM5GLV6OaWQQ,88941
+dtSpark/tools/builtin.py,sha256=NpplsVH0eUVF3b1FevrFe0qVwQJkpfXNghLW4SuNh44,90136
 dtSpark/web/__init__.py,sha256=5OrzA2yIR9NBf9mlTPnrQ0afMJTBuEgnzxq4QmIYe54,428
 dtSpark/web/auth.py,sha256=uSIHwJOiklkjZSpLcznwOL1pVQktKeWifZygt068M9Y,4384
 dtSpark/web/dependencies.py,sha256=ku54-Vb8wYvGVQ8Kluzxj8zm2Re3wDgU5LzFJ0NVIsI,874
@@ -75,9 +75,9 @@ dtSpark/web/endpoints/chat.py,sha256=c5MWZE-SY26Hr0X3DIFU_LQ15m1E-fFZ7hnQbmzXd1w
 dtSpark/web/endpoints/conversations.py,sha256=bIt10Laq1JaFBqB_3E1b3dTdSBxPyKvzgmi_f9QaDc8,13537
 dtSpark/web/endpoints/main_menu.py,sha256=shAP7F5zREbs2A7BmZAIzt5LpR83tZHrNXiFdWgsmFg,20621
 dtSpark/web/endpoints/streaming.py,sha256=qo0ugUWYvJJF5QvvLpuIvFIlVWgOpfPyUK59HeoRgdY,14603
-dtSpark/web/static/css/dark-theme.css,sha256=vMHtvATXuPFYCKlcwexa5ttq15IIffUWiBchxDqxwvo,7673
+dtSpark/web/static/css/dark-theme.css,sha256=K3RwCR3oRU7Iuzrjaa3oRjECCnvzhnJHexw2LDWXyQE,8581
 dtSpark/web/static/js/actions.js,sha256=EI-ur3eNV97flgpUcM4M5YOQtn_VPS1o4aFiPvthx3U,37463
-dtSpark/web/static/js/chat.js,sha256=JE1v7i-Bn6arcMQbbLvV1u-bzlRrjPoJwkuTXTsa84o,21737
+dtSpark/web/static/js/chat.js,sha256=UY28X8is2lrteQhnWePKTSu0KoReZU_M--S1BIfsjXQ,26489
 dtSpark/web/static/js/main.js,sha256=0JUuRtVlWxpRgCZoHwM4_tRxyBrNKwTPQmN_meKEI4M,16133
 dtSpark/web/static/js/sse-client.js,sha256=JZnLDar6j8m7TxuHJ9JQDl7E3LqUiWSbQHt6yMaskPI,9104
 dtSpark/web/templates/actions.html,sha256=08Pk8aqmNEr3uEQTzmnFklETqd1hUcE8PCtUZVMZJso,18875
@@ -88,9 +88,9 @@ dtSpark/web/templates/goodbye.html,sha256=ZdEzgP9MD4kMPrLHkg_3wAod2Hfr9hSTRyBq9f
 dtSpark/web/templates/login.html,sha256=OkLf_uzMYhl_o9ER1RQZc8ch6-bCaiOokEhKbeEl8E8,3274
 dtSpark/web/templates/main_menu.html,sha256=pEJTq642BZ8LeeI5jyuJEU3mfGmGiHlMuMMq2XrBu78,39207
 dtSpark/web/templates/new_conversation.html,sha256=wL9ZZbn3M8ktEoX7H5n4r6XKSEImtO2aXnuNKsB-pEw,8047
-dtspark-1.1.0a7.dist-info/licenses/LICENSE,sha256=jIuWlmbirwQabTwxfzE7SXT1LpCG-y_GRQ3VnoRTKgo,1101
-dtspark-1.1.0a7.dist-info/METADATA,sha256=bc_OuMg8SoQVITt27Pba7vDDJ4rFfQ71x2Agb9-u-uk,7410
-dtspark-1.1.0a7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dtspark-1.1.0a7.dist-info/entry_points.txt,sha256=IpIwa_a6XY8Z2w7DtgYAhpFHHEbha-zhLkyttWd3zpw,76
-dtspark-1.1.0a7.dist-info/top_level.txt,sha256=x-6lMA6vNuxyDNJGNOKI4dyy7L0kOb9V98I5z46bJVY,8
-dtspark-1.1.0a7.dist-info/RECORD,,
+dtspark-1.1.0a9.dist-info/licenses/LICENSE,sha256=jIuWlmbirwQabTwxfzE7SXT1LpCG-y_GRQ3VnoRTKgo,1101
+dtspark-1.1.0a9.dist-info/METADATA,sha256=fHTAEt_e5D4AggJvDhcDKsjqALfpYby7IRgAp7J0uDo,7410
+dtspark-1.1.0a9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dtspark-1.1.0a9.dist-info/entry_points.txt,sha256=IpIwa_a6XY8Z2w7DtgYAhpFHHEbha-zhLkyttWd3zpw,76
+dtspark-1.1.0a9.dist-info/top_level.txt,sha256=x-6lMA6vNuxyDNJGNOKI4dyy7L0kOb9V98I5z46bJVY,8
+dtspark-1.1.0a9.dist-info/RECORD,,