⚡
@@ -346,7 +388,19 @@ body { font-family: var(--font-body); background: var(--bg-primary); color: var(
PRESET
+
+
+
+
+
+
+
+
+
+
+
@@ -364,6 +418,7 @@ body { font-family: var(--font-body); background: var(--bg-primary); color: var(
let currentConvId = null;
let isStreaming = false;
let abortController = null;
+let selectedFile = null;
let profileEnabled = true;
let searchEnabled = true;
let memoryEnabled = true;
@@ -993,7 +1048,8 @@ async function loadConversations() {
convs.forEach(c => {
const div = document.createElement('div');
div.className = 'conv-item' + (c.id === currentConvId ? ' active' : '');
- div.innerHTML = `🗑${c.title}`;
+ const attachIcon = c.attachment_count > 0 ? `` : '';
+ div.innerHTML = `🗑${attachIcon}${c.title}`;
list.appendChild(div);
});
} catch(e) {}
@@ -1043,6 +1099,7 @@ function newChat() {
updateTokenThermometer();
}
+function escapeHtml(str) { const div = document.createElement('div'); div.textContent = str; return div.innerHTML; }
function showWelcome() {
document.getElementById('chatContainer').innerHTML = '';
}
@@ -1128,6 +1185,84 @@ async function sendSearch() {
}
}
+function onFileSelected(event) {
+ const file = event.target.files[0];
+ if (!file) return;
+ selectedFile = file;
+ const preview = document.getElementById('filePreview');
+ const thumb = document.getElementById('filePreviewThumb');
+ const icon = document.getElementById('filePreviewIcon');
+ const nameEl = document.getElementById('filePreviewName');
+ const sizeEl = document.getElementById('filePreviewSize');
+ const notice = document.getElementById('filePreviewNotice');
+ nameEl.textContent = file.name;
+ sizeEl.textContent = (file.size / 1024).toFixed(1) + ' KB';
+ if (file.type.startsWith('image/')) {
+ thumb.style.display = 'block';
+ thumb.src = URL.createObjectURL(file);
+ icon.style.display = 'none';
+ notice.textContent = 'Model does not support image input — filename only will be used as context.';
+ } else {
+ thumb.style.display = 'none';
+ icon.style.display = 'inline';
+ icon.textContent = '📄';
+ notice.textContent = '';
+ }
+ preview.classList.add('visible');
+ event.target.value = '';
+}
+function clearFileSelection() {
+ selectedFile = null;
+ const preview = document.getElementById('filePreview');
+ preview.classList.remove('visible');
+ const thumb = document.getElementById('filePreviewThumb');
+ thumb.src = '';
+}
+function showGallery(convId) {
+ document.getElementById('galleryOverlay').classList.add('visible');
+ loadGallery(convId);
+}
+function closeGallery(event) {
+ if (event && event.target !== event.currentTarget) return;
+ document.getElementById('galleryOverlay').classList.remove('visible');
+}
+async function loadGallery(convId) {
+ const body = document.getElementById('galleryBody');
+ body.innerHTML = '';
+ body.appendChild(div);
+ }
+ } catch(e) {
+ body.innerHTML = '
⚡
JarvisChat — your local coding companion.
Profile + Memory context injected automatically.
Web search kicks in when the model is uncertain.
Use 🔍 to force a web search.
Say "remember that..." to teach me things.
Loading...
';
+ try {
+ const resp = await authFetch('/api/upload/by-conversation/' + encodeURIComponent(convId));
+ const items = await resp.json();
+ if (!items || items.length === 0) {
+ body.innerHTML = 'No attachments in this conversation.
';
+ return;
+ }
+ body.innerHTML = '';
+ for (const item of items) {
+ const div = document.createElement('div');
+ div.className = 'gallery-item';
+ const isImage = item.content_type && item.content_type.startsWith('image/');
+ const thumbHtml = isImage
+ ? ''
+ : '';
+ const expires = new Date(item.expires_at);
+ const expiresStr = expires.toLocaleString();
+ div.innerHTML = thumbHtml + '' + escapeHtml(item.filename) + '
Error loading attachments.
';
+ }
+}
+async function deleteGalleryItem(contextId) {
+ if (!confirm('Delete this attachment? It will also be removed from the RAG corpus.')) return;
+ try {
+ const resp = await authFetch('/api/upload/' + contextId, { method: 'DELETE' });
+ if (resp.ok) {
+ await loadGallery(currentConvId);
+ await loadConversations();
+ }
+ } catch(e) {}
+}
async function sendMessage() {
const input = document.getElementById('userInput');
const message = input.value.trim();
@@ -1150,7 +1285,32 @@ async function sendMessage() {
let ttr = 0;
try {
abortController = new AbortController();
- const resp = await authFetch('/api/chat', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ conversation_id: currentConvId, message, model, system_prompt: presetPrompt }), signal: abortController.signal });
+ let uploadContextId = null;
+ if (selectedFile) {
+ const formData = new FormData();
+ formData.append('file', selectedFile, selectedFile.name);
+ formData.append('mode', 'both');
+ if (currentConvId) formData.append('conversation_id', currentConvId);
+ try {
+ const uploadResp = await authFetch('/api/upload', { method: 'POST', body: formData, signal: abortController.signal });
+ const uploadData = await uploadResp.json();
+ if (uploadResp.ok && uploadData.context_id) {
+ uploadContextId = uploadData.context_id;
+ if (!currentConvId && uploadData.conversation_id) currentConvId = uploadData.conversation_id;
+ } else {
+ throw new Error(uploadData.detail || 'Upload failed');
+ }
+ } catch(e) {
+ if (e.name !== 'AbortError') textEl.textContent = 'Error uploading file: ' + e.message;
+ setStreamingState(false);
+ return;
+ }
+ clearFileSelection();
+ await loadConversations();
+ }
+ const chatBody = { conversation_id: currentConvId, message, model, system_prompt: presetPrompt };
+ if (uploadContextId) chatBody.upload_context_id = uploadContextId;
+ const resp = await authFetch('/api/chat', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(chatBody), signal: abortController.signal });
const reader = resp.body.getReader();
const decoder = new TextDecoder();
let fullText = '';
@@ -1167,7 +1327,13 @@ async function sendMessage() {
try {
const data = JSON.parse(line.slice(6));
if (data.error) { textEl.textContent = 'Error: ' + data.error; setStreamingState(false); return; }
- if (data.conversation_id && !currentConvId) { currentConvId = data.conversation_id; await loadConversations(); }
+ if (data.conversation_id && !currentConvId) {
+ currentConvId = data.conversation_id;
+ if (uploadContextId) {
+ authFetch('/api/upload/' + uploadContextId + '/link', { method: 'PATCH', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ conversation_id: currentConvId }) }).catch(()=>{});
+ }
+ await loadConversations();
+ }
if (data.searching) { textEl.innerHTML = fullText ? renderMarkdown(fullText) + 'Searching...
' : 'Searching...
'; searchTriggered = true; }
if (data.search_results) { textEl.innerHTML = '🔍 Found ' + data.search_results + ' results...
'; fullText = ''; firstToken = true; }
if (data.token) { if (firstToken) { textEl.innerHTML = ''; firstToken = false; ttr = performance.now() - ttrStart; } fullText += data.token; textEl.innerHTML = renderMarkdown(fullText); scrollToBottom(); }
@@ -1296,7 +1462,7 @@ userInput.addEventListener('paste', e => {
e.preventDefault();
const toast = document.createElement('div');
toast.className = 'toast-error';
- toast.textContent = 'Image pasting is not supported — text only.';
+ toast.textContent = 'Use the 📎 button to attach images — paste is text only.';
document.body.appendChild(toast);
setTimeout(() => toast.remove(), 3000);
}
diff --git a/tests/test_chat_streaming_and_memory_paths.py b/tests/test_chat_streaming_and_memory_paths.py
index 53c52ea..439f8c2 100644
--- a/tests/test_chat_streaming_and_memory_paths.py
+++ b/tests/test_chat_streaming_and_memory_paths.py
@@ -141,6 +141,69 @@ def test_chat_auto_search_trigger_emits_search_events(tmp_path: Path, monkeypatc
assert done_events and done_events[-1].get("searched") is True
+def test_chat_with_upload_context_id_injects_document(tmp_path: Path, monkeypatch):
+ captured_payload = {}
+
+ def stream_stub(self, method, url, json=None, timeout=None):
+ nonlocal captured_payload
+ captured_payload = json
+ events = [{"message": {"content": "ok"}, "logprobs": [{"logprob": -0.01}]}, {"done": True, "eval_count": 1, "eval_duration": 1000000000}]
+ return _MockStreamResponse([__import__('json').dumps(e) for e in events])
+
+ monkeypatch.setattr(httpx.AsyncClient, "stream", stream_stub)
+
+ with make_client(tmp_path) as client:
+ sid = client.post("/api/auth/guest", headers={"Origin": "http://testserver"}).json()["session_id"]
+ headers = {"X-Session-ID": sid, "Origin": "http://testserver"}
+
+ db_local = db.get_db()
+ expires = "2099-12-31T23:59:59+00:00"
+ cid = db.insert_upload_context(db_local, "conv-up", "report.txt", "Confidential document content here", expires, "text/plain")
+ db_local.commit()
+ db_local.close()
+
+ resp = client.post(
+ "/api/chat",
+ json={"message": "summarize this", "upload_context_id": cid, "model": config.DEFAULT_MODEL},
+ headers=headers,
+ )
+ assert resp.status_code == 200
+ system_content = next((m["content"] for m in captured_payload.get("messages", []) if m["role"] == "system"), "")
+ assert "Confidential document content here" in system_content
+
+
+def test_chat_with_expired_upload_context_id_silent(tmp_path: Path, monkeypatch):
+ captured_payload = {}
+
+ def stream_stub(self, method, url, json=None, timeout=None):
+ nonlocal captured_payload
+ captured_payload = json
+ events = [{"message": {"content": "ok"}, "logprobs": [{"logprob": -0.01}]}, {"done": True, "eval_count": 1, "eval_duration": 1000000000}]
+ return _MockStreamResponse([__import__('json').dumps(e) for e in events])
+
+ monkeypatch.setattr(httpx.AsyncClient, "stream", stream_stub)
+
+ with make_client(tmp_path) as client:
+ sid = client.post("/api/auth/guest", headers={"Origin": "http://testserver"}).json()["session_id"]
+ headers = {"X-Session-ID": sid, "Origin": "http://testserver"}
+
+ import datetime
+ db_local = db.get_db()
+ expires = (datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(hours=2)).isoformat()
+ cid = db.insert_upload_context(db_local, "conv-exp", "old.txt", "Stale data", expires, "text/plain")
+ db_local.commit()
+ db_local.close()
+
+ resp = client.post(
+ "/api/chat",
+ json={"message": "hi", "upload_context_id": cid, "model": config.DEFAULT_MODEL},
+ headers=headers,
+ )
+ assert resp.status_code == 200
+ system_content = next((m["content"] for m in captured_payload.get("messages", []) if m["role"] == "system"), "")
+ assert "Stale data" not in system_content
+
+
def test_memory_command_paths_remember_and_forget(tmp_path: Path, monkeypatch):
with make_client(tmp_path) as client:
sid = client.post("/api/auth/guest", headers={"Origin": "http://testserver"}).json()[
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 9257ee3..15e83ad 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -152,3 +152,123 @@ def test_upload_both_mode(tmp_path: Path, monkeypatch):
assert data["mode"] == "both"
assert "context_id" in data
assert data["chunks_ingested"] > 0
+
+
+def test_upload_image_type(tmp_path: Path):
+ with make_client(tmp_path) as client:
+ resp = client.post(
+ "/api/upload", headers=_admin_headers(client),
+ data={"mode": "context"},
+ files={"file": ("photo.png", b"fake-png", "image/png")},
+ )
+ assert resp.status_code == 200
+ data = resp.json()
+ assert data["filename"] == "photo.png"
+ assert "context_id" in data
+
+
+def test_get_upload_by_conversation(tmp_path: Path):
+ with make_client(tmp_path) as client:
+ headers = _admin_headers(client)
+ resp1 = client.post("/api/upload", headers=headers,
+ data={"mode": "context", "conversation_id": "conv-gal"},
+ files={"file": ("a.txt", b"alpha")})
+ cid1 = resp1.json()["context_id"]
+ resp2 = client.post("/api/upload", headers=headers,
+ data={"mode": "context", "conversation_id": "conv-gal"},
+ files={"file": ("b.txt", b"beta")})
+ cid2 = resp2.json()["context_id"]
+
+ gal = client.get("/api/upload/by-conversation/conv-gal", headers=headers)
+ assert gal.status_code == 200
+ items = gal.json()
+ assert len(items) == 2
+ assert items[0]["filename"] == "a.txt"
+ assert items[1]["filename"] == "b.txt"
+
+
+def test_link_upload_to_conversation(tmp_path: Path):
+ with make_client(tmp_path) as client:
+ headers = _admin_headers(client)
+ resp = client.post("/api/upload", headers=headers,
+ data={"mode": "context"},
+ files={"file": ("orphan.txt", b"lonely")})
+ cid = resp.json()["context_id"]
+
+ link = client.patch(f"/api/upload/{cid}/link", headers=headers,
+ json={"conversation_id": "new-conv"})
+ assert link.status_code == 200
+
+ gal = client.get("/api/upload/by-conversation/new-conv", headers=headers)
+ assert len(gal.json()) == 1
+
+
+def test_delete_upload_removes_context(tmp_path: Path, monkeypatch):
+ class FakeAsyncClient:
+ class FakeResponse:
+ def __init__(self, status, json_data=None):
+ self.status_code = status
+ self._json = json_data or {}
+
+ def json(self):
+ return self._json
+
+ def __init__(self, *a, **kw):
+ pass
+
+ async def __aenter__(self):
+ return self
+
+ async def __aexit__(self, *a):
+ pass
+
+ async def post(self, url, **kw):
+ if "/points/scroll" in url:
+ return self.FakeResponse(200, {"result": {"points": [{"id": "upload-test.txt-0"}, {"id": "upload-test.txt-1"}]}})
+ if "/points/delete" in url:
+ return self.FakeResponse(200)
+ return self.FakeResponse(200)
+
+ async def put(self, url, **kw):
+ return self.FakeResponse(200)
+
+ monkeypatch.setattr(httpx, "AsyncClient", lambda *a, **kw: FakeAsyncClient())
+
+ with make_client(tmp_path) as client:
+ headers = _admin_headers(client)
+ resp = client.post("/api/upload", headers=headers,
+ data={"mode": "context", "conversation_id": "del-test"},
+ files={"file": ("test.txt", b"delete me")})
+ cid = resp.json()["context_id"]
+
+ del_resp = client.delete(f"/api/upload/{cid}", headers=headers)
+ assert del_resp.status_code == 200
+ assert del_resp.json()["status"] == "ok"
+
+ row = db.get_db().execute("SELECT id FROM upload_context WHERE id = ?", (cid,)).fetchone()
+ assert row is None
+
+
+def test_delete_upload_not_found(tmp_path: Path):
+ with make_client(tmp_path) as client:
+ resp = client.delete("/api/upload/999", headers=_admin_headers(client))
+ assert resp.status_code == 404
+
+
+def test_conversation_list_includes_attachment_count(tmp_path: Path):
+ with make_client(tmp_path) as client:
+ headers = _admin_headers(client)
+ client.post("/api/conversations", headers=headers, json={"title": "NoAttach"})
+ with_attach = client.post("/api/conversations", headers=headers, json={"title": "WithAttach"}).json()
+ conv_id = with_attach["id"]
+ client.post("/api/upload", headers=headers,
+ data={"mode": "context", "conversation_id": conv_id},
+ files={"file": ("f.txt", b"data")})
+
+ list_resp = client.get("/api/conversations", headers=headers)
+ convs = list_resp.json()
+ for c in convs:
+ if c["title"] == "NoAttach":
+ assert c["attachment_count"] == 0
+ if c["title"] == "WithAttach":
+ assert c["attachment_count"] == 1