diff --git a/alembic/versions/0017_add_projects.py b/alembic/versions/0017_add_projects.py new file mode 100644 index 0000000..251129f --- /dev/null +++ b/alembic/versions/0017_add_projects.py @@ -0,0 +1,48 @@ +"""Add projects table and project_id to notes.""" + +from alembic import op + +revision = "0017" +down_revision = "0016" + + +def upgrade() -> None: + op.execute(""" + CREATE TABLE IF NOT EXISTS projects ( + id SERIAL PRIMARY KEY, + user_id INTEGER REFERENCES users(id) ON DELETE CASCADE, + title TEXT NOT NULL DEFAULT '', + description TEXT NOT NULL DEFAULT '', + goal TEXT NOT NULL DEFAULT '', + status TEXT NOT NULL DEFAULT 'active', + color TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() + ) + """) + op.execute("CREATE INDEX IF NOT EXISTS ix_projects_user_id ON projects(user_id)") + op.execute("CREATE INDEX IF NOT EXISTS ix_projects_status ON projects(status)") + op.execute("ALTER TABLE notes ADD COLUMN IF NOT EXISTS project_id INTEGER REFERENCES projects(id) ON DELETE SET NULL") + op.execute("CREATE INDEX IF NOT EXISTS ix_notes_project_id ON notes(project_id)") + # Add FK constraint to existing parent_id column (was nullable with no FK) + # Only add if constraint doesn't already exist + op.execute(""" + DO $$ + BEGIN + IF NOT EXISTS ( + SELECT 1 FROM pg_constraint WHERE conname = 'notes_parent_id_fkey' + ) THEN + ALTER TABLE notes ADD CONSTRAINT notes_parent_id_fkey + FOREIGN KEY (parent_id) REFERENCES notes(id) ON DELETE SET NULL; + END IF; + END $$; + """) + + +def downgrade() -> None: + op.execute("ALTER TABLE notes DROP CONSTRAINT IF EXISTS notes_parent_id_fkey") + op.execute("DROP INDEX IF EXISTS ix_notes_project_id") + op.execute("ALTER TABLE notes DROP COLUMN IF EXISTS project_id") + op.execute("DROP INDEX IF EXISTS ix_projects_status") + op.execute("DROP INDEX IF EXISTS ix_projects_user_id") + op.execute("DROP TABLE IF EXISTS projects") diff --git a/alembic/versions/0018_add_push_subscriptions.py b/alembic/versions/0018_add_push_subscriptions.py new file mode 100644 index 0000000..152c5c0 --- /dev/null +++ b/alembic/versions/0018_add_push_subscriptions.py @@ -0,0 +1,28 @@ +"""Add push_subscriptions table for web push notifications.""" + +from alembic import op + +revision = "0018" +down_revision = "0017" + + +def upgrade() -> None: + op.execute(""" + CREATE TABLE IF NOT EXISTS push_subscriptions ( + id SERIAL PRIMARY KEY, + user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + endpoint TEXT NOT NULL, + p256dh TEXT NOT NULL, + auth TEXT NOT NULL, + user_agent TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + last_used TIMESTAMP WITH TIME ZONE, + UNIQUE(user_id, endpoint) + ) + """) + op.execute("CREATE INDEX IF NOT EXISTS ix_push_subscriptions_user_id ON push_subscriptions(user_id)") + + +def downgrade() -> None: + op.execute("DROP INDEX IF EXISTS ix_push_subscriptions_user_id") + op.execute("DROP TABLE IF EXISTS push_subscriptions") diff --git a/alembic/versions/0019_add_events.py b/alembic/versions/0019_add_events.py new file mode 100644 index 0000000..5e28170 --- /dev/null +++ b/alembic/versions/0019_add_events.py @@ -0,0 +1,37 @@ +"""Add events table for internal CalDAV (Radicale) linkage.""" + +from alembic import op + +revision = "0019" +down_revision = "0018" + + +def upgrade() -> None: + op.execute(""" + CREATE TABLE IF NOT EXISTS events ( + id SERIAL PRIMARY KEY, + user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + project_id INTEGER REFERENCES projects(id) ON DELETE SET NULL, + uid TEXT NOT NULL, + title TEXT NOT NULL DEFAULT '', + start_dt TIMESTAMP WITH TIME ZONE NOT NULL, + end_dt TIMESTAMP WITH TIME ZONE, + all_day BOOLEAN NOT NULL DEFAULT FALSE, + description TEXT NOT NULL DEFAULT '', + location TEXT NOT NULL DEFAULT '', + recurrence TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + UNIQUE(user_id, uid) + ) + """) + op.execute("CREATE INDEX IF NOT EXISTS ix_events_user_id ON events(user_id)") + op.execute("CREATE INDEX IF NOT EXISTS ix_events_project_id ON events(project_id)") + op.execute("CREATE INDEX IF NOT EXISTS ix_events_start_dt ON events(start_dt)") + + +def downgrade() -> None: + op.execute("DROP INDEX IF EXISTS ix_events_start_dt") + op.execute("DROP INDEX IF EXISTS ix_events_project_id") + op.execute("DROP INDEX IF EXISTS ix_events_user_id") + op.execute("DROP TABLE IF EXISTS events") diff --git a/alembic/versions/0020_add_milestones.py b/alembic/versions/0020_add_milestones.py new file mode 100644 index 0000000..0af72ed --- /dev/null +++ b/alembic/versions/0020_add_milestones.py @@ -0,0 +1,38 @@ +"""Add milestones table and milestone_id to notes.""" + +from alembic import op + +revision = "0020" +down_revision = "0019" + + +def upgrade() -> None: + op.execute(""" + CREATE TABLE IF NOT EXISTS milestones ( + id SERIAL PRIMARY KEY, + user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + project_id INTEGER NOT NULL REFERENCES projects(id) ON DELETE CASCADE, + title TEXT NOT NULL DEFAULT '', + description TEXT, + status TEXT NOT NULL DEFAULT 'active', + order_index INTEGER NOT NULL DEFAULT 0, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() + ) + """) + op.execute("CREATE INDEX IF NOT EXISTS ix_milestones_user_id ON milestones(user_id)") + op.execute("CREATE INDEX IF NOT EXISTS ix_milestones_project_id ON milestones(project_id)") + + op.execute(""" + ALTER TABLE notes + ADD COLUMN IF NOT EXISTS milestone_id INTEGER REFERENCES milestones(id) ON DELETE SET NULL + """) + op.execute("CREATE INDEX IF NOT EXISTS ix_notes_milestone_id ON notes(milestone_id)") + + +def downgrade() -> None: + op.execute("DROP INDEX IF EXISTS ix_notes_milestone_id") + op.execute("ALTER TABLE notes DROP COLUMN IF EXISTS milestone_id") + op.execute("DROP INDEX IF EXISTS ix_milestones_project_id") + op.execute("DROP INDEX IF EXISTS ix_milestones_user_id") + op.execute("DROP TABLE IF EXISTS milestones") diff --git a/docker-compose.yml b/docker-compose.yml index 1aadce2..1879389 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,10 @@ services: # SEARXNG_URL: "http://searxng:8080" # IMAGE_CACHE_DIR: /data/images # default, change if using a different mount path # IMAGE_MAX_BYTES: "5242880" # 5 MB per image, adjust if needed + # Push notifications (VAPID keys - generate with: python -c "from py_vapid import Vapid01; v=Vapid01(); v.generate_keys(); print(v.private_key, v.public_key)") + VAPID_PRIVATE_KEY: "${VAPID_PRIVATE_KEY:-}" + VAPID_PUBLIC_KEY: "${VAPID_PUBLIC_KEY:-}" + VAPID_CLAIMS_SUB: "${VAPID_CLAIMS_SUB:-mailto:admin@fabledassistant.local}" healthcheck: test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:5000/api/health')"] interval: 10s diff --git a/frontend/index.html b/frontend/index.html index 1915d1d..3cde003 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,6 +4,12 @@ + + + + + + Fabled Assistant diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json new file mode 100644 index 0000000..463e6d0 --- /dev/null +++ b/frontend/public/manifest.json @@ -0,0 +1,17 @@ +{ + "name": "Fabled Assistant", + "short_name": "Fabled", + "description": "Your self-hosted second brain with AI assistance", + "start_url": "/", + "display": "standalone", + "background_color": "#1a1a2e", + "theme_color": "#6c63ff", + "orientation": "portrait-primary", + "icons": [ + { + "src": "/favicon.ico", + "sizes": "any", + "type": "image/x-icon" + } + ] +} diff --git a/frontend/public/sw.js b/frontend/public/sw.js new file mode 100644 index 0000000..cd54d9c --- /dev/null +++ b/frontend/public/sw.js @@ -0,0 +1,35 @@ +// Service Worker for push notifications and PWA support +self.addEventListener('push', event => { + if (!event.data) return; + const data = event.data.json(); + event.waitUntil( + self.registration.showNotification(data.title || 'Fabled Assistant', { + body: data.body || '', + icon: '/favicon.ico', + badge: '/favicon.ico', + data: { url: data.url || '/' }, + }) + ); +}); + +self.addEventListener('notificationclick', event => { + event.notification.close(); + event.waitUntil( + clients.matchAll({ type: 'window', includeUncontrolled: true }).then(clientList => { + const url = event.notification.data.url; + for (const client of clientList) { + if (client.url.includes(url) && 'focus' in client) { + return client.focus(); + } + } + if (clients.openWindow) { + return clients.openWindow(url); + } + }) + ); +}); + +// PWA: serve cached assets for offline support (minimal) +self.addEventListener('fetch', event => { + // Pass-through — no offline caching in v1 +}); diff --git a/frontend/src/components/AppHeader.vue b/frontend/src/components/AppHeader.vue index 6c5a707..1ad4dca 100644 --- a/frontend/src/components/AppHeader.vue +++ b/frontend/src/components/AppHeader.vue @@ -73,6 +73,7 @@ router.afterEach(() => {
Notes + Projects Tasks Chat Settings diff --git a/frontend/src/components/MilestoneSelector.vue b/frontend/src/components/MilestoneSelector.vue new file mode 100644 index 0000000..c817eae --- /dev/null +++ b/frontend/src/components/MilestoneSelector.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/frontend/src/components/ProjectSelector.vue b/frontend/src/components/ProjectSelector.vue new file mode 100644 index 0000000..9399eef --- /dev/null +++ b/frontend/src/components/ProjectSelector.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/frontend/src/components/TagInput.vue b/frontend/src/components/TagInput.vue index 4fa8f36..9dc3b25 100644 --- a/frontend/src/components/TagInput.vue +++ b/frontend/src/components/TagInput.vue @@ -18,7 +18,7 @@ const inputRef = ref(null); let fetchDebounce: ReturnType | null = null; function sanitize(raw: string): string { - return raw.trim().replace(/\s+/g, "-").replace(/^#+/, ""); + return raw.trim().toLowerCase().replace(/\s+/g, "-").replace(/^#+/, ""); } function addTag(raw: string) { diff --git a/frontend/src/main.ts b/frontend/src/main.ts index d33f288..cb8becd 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -9,3 +9,12 @@ const app = createApp(App); app.use(createPinia()); app.use(router); app.mount("#app"); + +// Register service worker for push notifications and PWA +if ('serviceWorker' in navigator) { + window.addEventListener('load', () => { + navigator.serviceWorker.register('/sw.js').catch(() => { + // SW registration failed — app still works, just no push notifications + }) + }) +} diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index e2ac599..a70af7f 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -60,6 +60,16 @@ const router = createRouter({ name: "note-edit", component: () => import("@/views/NoteEditorView.vue"), }, + { + path: "/projects", + name: "projects", + component: () => import("@/views/ProjectListView.vue"), + }, + { + path: "/projects/:id", + name: "project-view", + component: () => import("@/views/ProjectView.vue"), + }, { path: "/tasks", name: "tasks", diff --git a/frontend/src/stores/chat.ts b/frontend/src/stores/chat.ts index 639e130..407efee 100644 --- a/frontend/src/stores/chat.ts +++ b/frontend/src/stores/chat.ts @@ -123,6 +123,7 @@ export const useChatStore = defineStore("chat", () => { includeNoteIds?: number[], think = false, contextNoteTitle?: string, + excludeNoteIds?: number[], ) { if (!currentConversation.value) return; @@ -169,6 +170,7 @@ export const useChatStore = defineStore("chat", () => { content, context_note_id: contextNoteId, include_note_ids: includeNoteIds?.length ? includeNoteIds : undefined, + excluded_note_ids: excludeNoteIds?.length ? excludeNoteIds : undefined, think, }, ); diff --git a/frontend/src/stores/notes.ts b/frontend/src/stores/notes.ts index 6494f3a..4155e4e 100644 --- a/frontend/src/stores/notes.ts +++ b/frontend/src/stores/notes.ts @@ -78,6 +78,7 @@ export const useNotesStore = defineStore("notes", () => { title: string; body: string; tags?: string[]; + project_id?: number | null; }): Promise { try { return await apiPost("/api/notes", data); @@ -89,7 +90,7 @@ export const useNotesStore = defineStore("notes", () => { async function updateNote( id: number, - data: Partial> + data: Partial> ): Promise { try { const note = await apiPut(`/api/notes/${id}`, data); diff --git a/frontend/src/stores/push.ts b/frontend/src/stores/push.ts new file mode 100644 index 0000000..61d9990 --- /dev/null +++ b/frontend/src/stores/push.ts @@ -0,0 +1,108 @@ +import { defineStore } from 'pinia' +import { ref } from 'vue' + +function urlBase64ToUint8Array(base64String: string): Uint8Array { + const padding = '='.repeat((4 - (base64String.length % 4)) % 4) + const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/') + const rawData = window.atob(base64) + const outputArray = new Uint8Array(rawData.length) + for (let i = 0; i < rawData.length; ++i) { + outputArray[i] = rawData.charCodeAt(i) + } + return outputArray +} + +export const usePushStore = defineStore('push', () => { + const isSupported = ref( + 'serviceWorker' in navigator && 'PushManager' in window && 'Notification' in window + ) + const permission = ref( + 'Notification' in window ? Notification.permission : 'denied' + ) + const isSubscribed = ref(false) + const loading = ref(false) + const error = ref(null) + + async function checkSubscription(): Promise { + if (!isSupported.value) return + try { + const reg = await navigator.serviceWorker.ready + const sub = await reg.pushManager.getSubscription() + isSubscribed.value = !!sub + } catch { + isSubscribed.value = false + } + } + + async function subscribe(): Promise { + if (!isSupported.value) { + error.value = 'Push notifications not supported in this browser' + return + } + loading.value = true + error.value = null + try { + // Request permission + permission.value = await Notification.requestPermission() + if (permission.value !== 'granted') { + error.value = 'Notification permission denied' + return + } + + // Fetch VAPID public key + const resp = await fetch('/api/push/vapid-public-key') + if (!resp.ok) { + error.value = 'Push notifications not configured on server' + return + } + const { publicKey } = await resp.json() + + // Register service worker + const reg = await navigator.serviceWorker.register('/sw.js') + await navigator.serviceWorker.ready + + // Subscribe + const sub = await reg.pushManager.subscribe({ + userVisibleOnly: true, + applicationServerKey: urlBase64ToUint8Array(publicKey), + }) + + // Save to server + const saveResp = await fetch('/api/push/subscribe', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(sub.toJSON()), + }) + if (!saveResp.ok) throw new Error('Failed to save subscription') + isSubscribed.value = true + } catch (e: unknown) { + error.value = e instanceof Error ? e.message : 'Failed to subscribe' + } finally { + loading.value = false + } + } + + async function unsubscribe(): Promise { + loading.value = true + error.value = null + try { + const reg = await navigator.serviceWorker.ready + const sub = await reg.pushManager.getSubscription() + if (sub) { + await fetch('/api/push/subscribe', { + method: 'DELETE', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ endpoint: sub.endpoint }), + }) + await sub.unsubscribe() + } + isSubscribed.value = false + } catch (e: unknown) { + error.value = e instanceof Error ? e.message : 'Failed to unsubscribe' + } finally { + loading.value = false + } + } + + return { isSupported, permission, isSubscribed, loading, error, checkSubscription, subscribe, unsubscribe } +}) diff --git a/frontend/src/stores/tasks.ts b/frontend/src/stores/tasks.ts index 7641adc..93476da 100644 --- a/frontend/src/stores/tasks.ts +++ b/frontend/src/stores/tasks.ts @@ -69,6 +69,9 @@ export const useTasksStore = defineStore("tasks", () => { status?: TaskStatus; priority?: TaskPriority; due_date?: string | null; + project_id?: number | null; + milestone_id?: number | null; + parent_id?: number | null; }): Promise { try { return await apiPost("/api/tasks", data); @@ -81,7 +84,7 @@ export const useTasksStore = defineStore("tasks", () => { async function updateTask( id: number, data: Partial< - Pick + Pick > ): Promise { try { diff --git a/frontend/src/types/chat.ts b/frontend/src/types/chat.ts index 51c32df..0b070d0 100644 --- a/frontend/src/types/chat.ts +++ b/frontend/src/types/chat.ts @@ -54,7 +54,8 @@ export interface ConversationDetail extends Conversation { export interface ContextMeta { context_note_id: number | null; context_note_title: string | null; - auto_notes: { id: number; title: string; score?: number | null }[]; + auto_notes: { id: number; title: string; score?: number | null; auto_injected?: boolean }[]; + auto_injected_notes?: { id: number; title: string; score?: number | null }[]; } export interface OllamaStatus { diff --git a/frontend/src/types/note.ts b/frontend/src/types/note.ts index 5b157af..d8ab531 100644 --- a/frontend/src/types/note.ts +++ b/frontend/src/types/note.ts @@ -7,6 +7,8 @@ export interface Note { body: string; tags: string[]; parent_id: number | null; + project_id: number | null; + milestone_id: number | null; status: TaskStatus | null; priority: TaskPriority | null; due_date: string | null; diff --git a/frontend/src/views/ChatView.vue b/frontend/src/views/ChatView.vue index 9919f88..1ea7423 100644 --- a/frontend/src/views/ChatView.vue +++ b/frontend/src/views/ChatView.vue @@ -37,9 +37,15 @@ let noteSearchTimer: ReturnType | null = null; const includedNoteIds = ref>(new Set()); const includedNotes = ref<{ id: number; title: string }[]>([]); -// Suggested notes — auto-found by search, not yet included +// Suggested notes — auto-found by search, not yet included (score 0.45–0.59) const suggestedNotes = ref<{ id: number; title: string; score?: number | null }[]>([]); +// Auto-injected notes — injected automatically because score >= 0.60 +const autoInjectedNotes = ref<{ id: number; title: string; score?: number | null }[]>([]); + +// Note IDs excluded from auto-injection on next message +const excludedNoteIds = ref([]); + let prevConvId: number | null = null; const convId = computed(() => { @@ -98,6 +104,8 @@ watch(convId, async (newId) => { includedNoteIds.value = new Set(); includedNotes.value = []; suggestedNotes.value = []; + autoInjectedNotes.value = []; + excludedNoteIds.value = []; store.lastContextMeta = null; if (newId) { // Skip re-fetch if this conversation is already loaded (avoids race @@ -118,14 +126,35 @@ watch( ); watch( - () => store.lastContextMeta?.auto_notes, - (newNotes) => { - if (!newNotes) return; + () => store.lastContextMeta, + (meta) => { + if (!meta) return; + const alreadyIncluded = includedNoteIds.value; + const alreadyAutoInjected = new Set(autoInjectedNotes.value.map((n) => n.id)); const alreadySuggested = new Set(suggestedNotes.value.map((n) => n.id)); - for (const note of newNotes) { - if (!alreadyIncluded.has(note.id) && !alreadySuggested.has(note.id)) { - suggestedNotes.value.push(note); + + // Process auto_injected_notes (explicitly marked as injected) + const injectedFromMeta = meta.auto_injected_notes ?? []; + for (const note of injectedFromMeta) { + if (!alreadyAutoInjected.has(note.id) && !alreadyIncluded.has(note.id)) { + autoInjectedNotes.value.push(note); + alreadyAutoInjected.add(note.id); + } + } + + // Process auto_notes — auto_injected flag separates injected from suggested + const autoNotes = meta.auto_notes ?? []; + for (const note of autoNotes) { + if (note.auto_injected) { + if (!alreadyAutoInjected.has(note.id) && !alreadyIncluded.has(note.id)) { + autoInjectedNotes.value.push(note); + alreadyAutoInjected.add(note.id); + } + } else { + if (!alreadyIncluded.has(note.id) && !alreadySuggested.has(note.id) && !alreadyAutoInjected.has(note.id)) { + suggestedNotes.value.push(note); + } } } } @@ -182,6 +211,8 @@ async function sendMessage() { undefined, includedNoteIds.value.size ? [...includedNoteIds.value] : undefined, true, // enable thinking in the full chat view + undefined, + excludedNoteIds.value.length ? excludedNoteIds.value : undefined, ); sending.value = false; @@ -303,6 +334,14 @@ function includeNote(note: { id: number; title: string }) { includedNoteIds.value = new Set([...includedNoteIds.value, note.id]); includedNotes.value.push(note); suggestedNotes.value = suggestedNotes.value.filter((n) => n.id !== note.id); + autoInjectedNotes.value = autoInjectedNotes.value.filter((n) => n.id !== note.id); +} + +function excludeAutoNote(noteId: number) { + autoInjectedNotes.value = autoInjectedNotes.value.filter((n) => n.id !== noteId); + if (!excludedNoteIds.value.includes(noteId)) { + excludedNoteIds.value = [...excludedNoteIds.value, noteId]; + } } function removeIncludedNote(noteId: number) { @@ -461,23 +500,31 @@ onUnmounted(() => {
-